This commit is contained in:
2021-02-04 19:35:50 +00:00
parent 17659ef190
commit 828363c843

View File

@@ -14,9 +14,6 @@
> >
</gz-data-table-filter-manager> </gz-data-table-filter-manager>
<v-card> <v-card>
<!-- {{ dataTablePagingOptions }}
{{ headers }} -->
{{ activeFilterId }}
<v-card-title> <v-card-title>
<v-select <v-select
v-model="activeFilterId" v-model="activeFilterId"
@@ -388,7 +385,7 @@ export default {
dataTablePagingOptions: {}, dataTablePagingOptions: {},
lastDataTablePagingOptions: {}, lastDataTablePagingOptions: {},
activeFilterId: 0, //<--0 signifies to select default as it's uninitialized activeFilterId: 0, //<--0 signifies to select default as it's uninitialized
listView: undefined, //lxistView: undefined,
selectLists: { selectLists: {
savedFilters: [] savedFilters: []
}, },
@@ -593,13 +590,13 @@ export default {
/* public AyaType ObjectType { get; set; } /* public AyaType ObjectType { get; set; }
public long[] SelectedRowIds { get; set; } public long[] SelectedRowIds { get; set; }
public string DataListKey { get; set; } public string DataListKey { get; set; }
public string ListView { get; set; }//optional, if null or empty will use default list view built into DataList public string LxistView { get; set; }//optional, if null or empty will use default list view built into DataList
*/ */
return { return {
ObjectType: ayaType, ObjectType: ayaType,
selectedRowIds: selectedRowIds, selectedRowIds: selectedRowIds,
dataListKey: vm.dataListKey, dataListKey: vm.dataListKey,
// listView: untokenizeListView(vm.listView), // lxistView: untokenizeLxistView(vm.lxistView),
filterId: vm.activeFilterId, filterId: vm.activeFilterId,
clientCriteria: vm.clientCriteria, clientCriteria: vm.clientCriteria,
clientTimeStamp: window.$gz.locale.clientLocalZoneTimeStamp( clientTimeStamp: window.$gz.locale.clientLocalZoneTimeStamp(
@@ -633,15 +630,15 @@ export default {
} }
}); });
}, },
resetListView: function() { // resetLxistView: function() {
let vm = this; // let vm = this;
console.log("ResetListView setting activefilter back to 0 ZERO"); // console.log("ResetLxistView setting activefilter back to 0 ZERO");
vm.activeFilterId = 0; // vm.activeFilterId = 0;
vm.listView = undefined; // vm.lxistView = undefined;
vm.dataTablePagingOptions.page = 1; // vm.dataTablePagingOptions.page = 1;
saveFormSettings(vm); // saveFormSettings(vm);
//needs to show as temp unsaved filter or overridden or something // //needs to show as temp unsaved filter or overridden or something
}, // },
selectedFilterChanged: async function() { selectedFilterChanged: async function() {
// let vm = this; // let vm = this;
@@ -659,14 +656,14 @@ export default {
// if (vm.activeFilterId == 0) { // if (vm.activeFilterId == 0) {
// //default view, no saved, no cached // //default view, no saved, no cached
// vm.listView = undefined; // vm.lxistView = undefined;
// saveFormSettings(vm); // saveFormSettings(vm);
// } else if (vm.activeFilterId > 0) { // } else if (vm.activeFilterId > 0) {
// await fetchListView(vm); // await fetchLxistView(vm);
// saveFormSettings(vm); // saveFormSettings(vm);
// } // }
// //fetch data because listview has changed // //fetch data because lxistview has changed
// vm.loading = false; // vm.loading = false;
await this.getDataFromApi(); await this.getDataFromApi();
}, },
@@ -771,7 +768,7 @@ export default {
//Put back selected items //Put back selected items
vm.selected = [...preSelected]; vm.selected = [...preSelected];
//persist the paging options and listview stuff so user sees same page and list on refresh or leave and return scenario //persist the paging options and filter stuff so user sees same page and list on refresh or leave and return scenario
saveFormSettings(vm); saveFormSettings(vm);
} }
} catch (err) { } catch (err) {
@@ -790,14 +787,15 @@ export default {
//loadFormSettings(vm); //loadFormSettings(vm);
vm.loading = false; vm.loading = false;
vm.getDataFromApi(); vm.getDataFromApi();
},
beforeUpdate() {
// //WTF is beforeUpdate doing and what is resetlistview doing??
// console.log("data-table: BEFORE UPDATE CALLED WTF?");
// if (this.clientCriteria != null && this.activeFilterId != 0) {
// this.resetListView();
// }
} }
// ,
// beforeUpdate() {
// // //WTF is beforeUpdate doing and what is resetlxistview doing??
// // console.log("data-table: BEFORE UPDATE CALLED WTF?");
// // if (this.clientCriteria != null && this.activeFilterId != 0) {
// // this.resetLxistView();
// // }
// }
}; };
//Called by getDataFromApi on retrieval of list with columnData //Called by getDataFromApi on retrieval of list with columnData
@@ -1156,90 +1154,4 @@ function loadFormSettings(vm) {
} }
} }
// ////////////////////
// //
// function untokenizeListView(lvJson) {
// //if it has one or more tokens
// //iterate the array and build a new array with substituted tokens with the correct date and time in them
// //format of a date token filter
// //[{"fld":"widgetname"},{"fld":"widgetstartdate","filter":{"items":[{"op":"=","value":"*past90days*","token":true}]}},{"fld":"widgetenddate"}]
// if (lvJson == null) {
// return lvJson;
// }
// //See if it has any date tokens
// if (lvJson.indexOf('"token":true') == -1) {
// return lvJson;
// }
// //we have one or more tokens, substitute them in the filter array
// let ret = [];
// let lv = JSON.parse(lvJson);
// //iterate the incoming and copy to the outgoing directly
// //except if a date token filter then substitute our own filter object in place
// for (let ilv = 0; ilv < lv.length; ilv++) {
// //listview object
// let lvo = lv[ilv];
// //instantiate return object
// let reto = {};
// //copy over field name to return object
// reto.fld = lvo.fld;
// //sort?
// if (lvo.sort) {
// reto.sort = lvo.sort;
// }
// //does it have a filter?
// if (lvo.filter) {
// //yes, so copy / transform as required
// //create an empty filter items array on return object
// reto.filter = { items: [] };
// //"any" property set?
// if (lvo.filter.any) {
// reto.filter.any = true;
// }
// //iterate the filter items in the source lvo object
// for (let j = 0; j < lvo.filter.items.length; j++) {
// //get this filter item
// let fi = lvo.filter.items[j];
// //no token shortcut
// if (!fi.token) {
// //just copy it out
// reto.filter.items.push(fi);
// } else {
// //it has a date token so let's build it out
// //filter item value contains the token, op is always equals
// let filterDates = relativeDatefilterCalculator.tokenToDates(fi.value);
// //create and add a new filter item for each not undefined value
// //{ after: undefined, before: undefined }
// //AFTER DATE?
// if (filterDates.after) {
// reto.filter.items.push({
// op: ">", //was GreaterThanOrEqualTo but that doesn't make sense, it's only greater than was seeing wrong return data as relative date filter already adjusts for boundaries
// value: filterDates.after
// });
// }
// //BEFORE DATE?
// if (filterDates.before) {
// reto.filter.items.push({
// op: "<", //was LessThanOrEqualTo but see above for after ===-----^
// value: filterDates.before
// });
// }
// }
// }
// //end of has filter if condition
// }
// //push the return object into the return array
// ret.push(reto);
// //end of iterate lv loop
// }
// return JSON.stringify(ret);
// } //[{"fld":"widgetname"},{"fld":"widgetstartdate","filter":{"items":[{"op":"=","value":"*past90days*","token":true}]}},{"fld":"widgetenddate"}]
</script> </script>