Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 15:09:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

remove the unused client-side stuff from model

Browse source
This commit is contained in:
howard-stearns 2018-06-08 15:48:39 -07:00
parent d9daa3495a
commit f0d486a6a5
1 changed files with 5 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
interface/resources/qml/hifi/models/PSFListModel.qml
View file

@ -38,23 +38,11 @@ Item {
onSortKeyChanged: if (initialized) { getFirstPage('delayClear'); } onSortKeyChanged: if (initialized) { getFirstPage('delayClear'); }
onSearchFilterChanged: { onSearchFilterChanged: {
if (!initialized) { return; } if (!initialized) { return; }
if (searchItemTest) { getFirstPage('delayClear');
var filteredCopy = applySearchItemTest(copyOfItems);
finalModel.clear();
finalModel.append(filteredCopy);
debugView('after searchFilterChanged');
} else { // TODO: fancy timer against fast typing.
getFirstPage('delayClear');
}
} }
onTagsFilterChanged: if (initialized) { getFirstPage('delayClear'); } onTagsFilterChanged: if (initialized) { getFirstPage('delayClear'); }
property int itemsPerPage: 100; property int itemsPerPage: 100;
// If the endpoint doesn't do search, tags, sort, these functions can be supplied to do it here.
property var searchItemTest: null;
property bool localSort: false;
property var copyOfItems: [];
// State. // State.
property int currentPageToRetrieve: 0; // 0 = before first page. -1 = we have them all. Otherwise 1-based page number. property int currentPageToRetrieve: 0; // 0 = before first page. -1 = we have them all. Otherwise 1-based page number.
property bool retrievedAtLeastOnePage: false; property bool retrievedAtLeastOnePage: false;
@ -65,7 +53,6 @@ Item {
if (!delayedClear) { finalModel.clear(); } if (!delayedClear) { finalModel.clear(); }
currentPageToRetrieve = 1; currentPageToRetrieve = 1;
retrievedAtLeastOnePage = false; retrievedAtLeastOnePage = false;
copyOfItems = [];
} }
// Processing one page. // Processing one page.
@ -98,20 +85,7 @@ Item {
if (response.total_pages && (response.total_pages === currentPageToRetrieve)) { if (response.total_pages && (response.total_pages === currentPageToRetrieve)) {
currentPageToRetrieve = -1; currentPageToRetrieve = -1;
} }
if (searchItemTest) {
if (searchFilter) {
processed = applySearchItemTest(processed);
}
copyOfItems = copyOfItems.concat(processed);
}
if (localSort) {
copyOfItems = copyOfItems.concat(processed);
if (sortProperty) {
sortCopy(sortProperty, sortAscending);
processed = copyOfItems;
delayedClear = true; // see next conditional
}
}
if (delayedClear) { if (delayedClear) {
finalModel.clear(); finalModel.clear();
delayedClear = false; delayedClear = false;
@ -119,15 +93,6 @@ Item {
finalModel.append(processed); // FIXME keep index steady, and apply any post sort finalModel.append(processed); // FIXME keep index steady, and apply any post sort
retrievedAtLeastOnePage = true; retrievedAtLeastOnePage = true;
debugView('after handlePage'); debugView('after handlePage');
if (searchItemTest && searchFilter && listView && listView.atYEnd && (currentPageToRetrieve >= 0)) {
getNextPage(); // too fancy??
}
if (listView) { console.debug('handlePage completed', listModelName, 'model:', model.count, 'view:', listView.count); }
}
function applySearchItemTest(items) {
return items.filter(function (item) {
return searchItemTest(searchFilter, item);
});
} }
function debugView(label) { function debugView(label) {
if (!listView) { return; } if (!listView) { return; }
@ -147,12 +112,13 @@ Item {
'per_page=' + itemsPerPage, 'per_page=' + itemsPerPage,
'page=' + currentPageToRetrieve 'page=' + currentPageToRetrieve
]; ];
if (!searchItemTest && searchFilter) { if (searchFilter) {
parameters.splice(parameters.length, 0, 'search=' + searchFilter); parameters.splice(parameters.length, 0, 'search=' + searchFilter);
} }
if (!localSort && sortKey) { if (sortKey) {
parameters.splice(parameters.length, 0, 'sort=' + sortKey); parameters.splice(parameters.length, 0, 'sort=' + sortKey);
} }
var parametersSeparator = /\?/.test(url) ? '&' : '?'; var parametersSeparator = /\?/.test(url) ? '&' : '?';
url = url + parametersSeparator + parameters.join('&'); url = url + parametersSeparator + parameters.join('&');
console.debug('getPage', listModelName, currentPageToRetrieve); console.debug('getPage', listModelName, currentPageToRetrieve);
@ -202,27 +168,4 @@ Item {
ListModel { ListModel {
id: finalModel; id: finalModel;
} }
function sortCopy(sortProperty, isAscending) {
console.debug('client sort', listModelName, sortProperty, isAscending, copyOfItems.length, 'items');
var before = isAscending ? -1 : 1;
var after = -1 * before;
copyOfItems.sort(function (a, b) {
var aValue = a[sortProperty].toString().toLowerCase(),
bValue = b[sortProperty].toString().toLowerCase();
if (!aValue && !bValue) {
return 0;
} else if (!aValue) {
return after;
} else if (!bValue) {
return before;
}
switch (true) {
case (aValue < bValue): return before;
case (aValue > bValue): return after;
default: return 0;
}
});
}
} }