From 54b5730fcdab3da4096b8964148df553ac4c2c02 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 11 Jul 2024 22:15:50 +0200 Subject: [PATCH 1/2] native: fix warings in search --- native/MainPage.qml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/native/MainPage.qml b/native/MainPage.qml index 09f918d..4f7a33b 100644 --- a/native/MainPage.qml +++ b/native/MainPage.qml @@ -185,12 +185,19 @@ Rectangle { filteredApiDataModel.clear() for (var i = 0; i < apiDataModel.count; ++i) { var item = apiDataModel.get(i) - if (item.name.toLowerCase().indexOf(searchText.toLowerCase()) !== -1 || - item.key.toLowerCase().indexOf(searchText.toLowerCase()) !== -1 || - item.amount.toLowerCase().indexOf(searchText.toLowerCase()) !== -1 || - item.start.toLowerCase().indexOf(searchText.toLowerCase()) !== -1 || - item.end.toLowerCase().indexOf(searchText.toLowerCase()) !== -1 || - item.group.toLowerCase().indexOf(searchText.toLowerCase()) !== -1) { + var name = item.name ? item.name.toString().toLowerCase() : "" + var key = item.key ? item.key.toString().toLowerCase() : "" + var amount = item.amount ? item.amount.toString().toLowerCase() : "" + var start = item.start ? item.start.toString().toLowerCase() : "" + var end = item.end ? item.end.toString().toLowerCase() : "" + var group = item.group ? item.group.toString().toLowerCase() : "" + + if (name.indexOf(searchText.toLowerCase()) !== -1 || + key.indexOf(searchText.toLowerCase()) !== -1 || + amount.indexOf(searchText.toLowerCase()) !== -1 || + start.indexOf(searchText.toLowerCase()) !== -1 || + end.indexOf(searchText.toLowerCase()) !== -1 || + group.indexOf(searchText.toLowerCase()) !== -1) { filteredApiDataModel.append(item) } } From 359bfc5ced5e5fc71fbaa9d9b862e6c8b87b64ae Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 11 Jul 2024 22:19:10 +0200 Subject: [PATCH 2/2] native: make infinity symbol work --- native/MainPage.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/native/MainPage.qml b/native/MainPage.qml index 4f7a33b..23687a3 100644 --- a/native/MainPage.qml +++ b/native/MainPage.qml @@ -167,9 +167,10 @@ Rectangle { name: jsonResponse[i].licenses[ii].name, start: jsonResponse[i].licenses[ii].start ?? "Indefinitely", end: jsonResponse[i].licenses[ii].end ?? "Indefinitely", - amount: jsonResponse[i].licenses[ii].amount ?? "∞", + amount: jsonResponse[i].licenses[ii].amount ? jsonResponse[i].licenses[ii].amount.toString() : "∞", key: jsonResponse[i].licenses[ii].key }); + } } filterModel() // Filter the model after loading data