This commit is contained in:
@@ -412,11 +412,9 @@ 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
|
||||||
//lxistView: undefined,
|
|
||||||
selectLists: {
|
selectLists: {
|
||||||
savedFilters: []
|
savedFilters: []
|
||||||
},
|
},
|
||||||
|
|
||||||
headers: [],
|
headers: [],
|
||||||
serverColumns: [],
|
serverColumns: [],
|
||||||
serverFilter: [],
|
serverFilter: [],
|
||||||
@@ -440,10 +438,6 @@ export default {
|
|||||||
props: {
|
props: {
|
||||||
formKey: String,
|
formKey: String,
|
||||||
dataListKey: String,
|
dataListKey: String,
|
||||||
metaView: {
|
|
||||||
type: String,
|
|
||||||
default: undefined
|
|
||||||
},
|
|
||||||
clientCriteria: {
|
clientCriteria: {
|
||||||
type: String,
|
type: String,
|
||||||
default: undefined
|
default: undefined
|
||||||
@@ -646,16 +640,10 @@ export default {
|
|||||||
});
|
});
|
||||||
selectedRowIds.reverse();
|
selectedRowIds.reverse();
|
||||||
}
|
}
|
||||||
/* public AyaType ObjectType { get; set; }
|
|
||||||
public long[] SelectedRowIds { get; set; }
|
|
||||||
public string DataListKey { get; set; }
|
|
||||||
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,
|
||||||
// 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(
|
||||||
@@ -669,10 +657,6 @@ export default {
|
|||||||
this.selected.splice(0, this.selected.length - 1);
|
this.selected.splice(0, this.selected.length - 1);
|
||||||
}
|
}
|
||||||
//emit event to parent form of selected rows
|
//emit event to parent form of selected rows
|
||||||
//Note vm this bubbles up all the columns of all the selected rows
|
|
||||||
//so, to be more efficient for now will just send the ID's until I see a need for other shit
|
|
||||||
//de-lodash
|
|
||||||
//this.$emit("selection-change", window.$gz. _.map(this.selected, "id"));
|
|
||||||
|
|
||||||
this.$emit(
|
this.$emit(
|
||||||
"selection-change",
|
"selection-change",
|
||||||
@@ -689,41 +673,7 @@ export default {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
// resetLxistView: function() {
|
|
||||||
// let vm = this;
|
|
||||||
// console.log("ResetLxistView setting activefilter back to 0 ZERO");
|
|
||||||
// vm.activeFilterId = 0;
|
|
||||||
// vm.lxistView = undefined;
|
|
||||||
// vm.dataTablePagingOptions.page = 1;
|
|
||||||
// saveFormSettings(vm);
|
|
||||||
// //needs to show as temp unsaved filter or overridden or something
|
|
||||||
// },
|
|
||||||
|
|
||||||
selectedFilterChanged: async function() {
|
selectedFilterChanged: async function() {
|
||||||
// let vm = this;
|
|
||||||
|
|
||||||
// //first prevent the following changes from triggering a fetch
|
|
||||||
// vm.loading = true;
|
|
||||||
// //always go back to page one on a change of data list view
|
|
||||||
// vm.dataTablePagingOptions.page = 1;
|
|
||||||
|
|
||||||
// for (let i = vm.selectLists.savedFilters.length - 1; i >= 0; i--) {
|
|
||||||
// if (vm.selectLists.savedFilters[i].id === -1) {
|
|
||||||
// vm.selectLists.savedFilters.splice(i, 1);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
// if (vm.activeFilterId == 0) {
|
|
||||||
// //default view, no saved, no cached
|
|
||||||
// vm.lxistView = undefined;
|
|
||||||
// saveFormSettings(vm);
|
|
||||||
// } else if (vm.activeFilterId > 0) {
|
|
||||||
// await fetchLxistView(vm);
|
|
||||||
// saveFormSettings(vm);
|
|
||||||
// }
|
|
||||||
|
|
||||||
// //fetch data because lxistview has changed
|
|
||||||
// vm.loading = false;
|
|
||||||
await this.getDataFromApi();
|
await this.getDataFromApi();
|
||||||
},
|
},
|
||||||
gridCellButtonClick(key, i, ot) {
|
gridCellButtonClick(key, i, ot) {
|
||||||
@@ -884,11 +834,6 @@ function buildHeaders(columnData) {
|
|||||||
h.flt = true;
|
h.flt = true;
|
||||||
}
|
}
|
||||||
//Sortable?
|
//Sortable?
|
||||||
// if (!cm.ns) {
|
|
||||||
// //yes, is sortable
|
|
||||||
// h.srt = true;
|
|
||||||
// } else
|
|
||||||
|
|
||||||
if (cm.ns) {
|
if (cm.ns) {
|
||||||
h.sortable = false;
|
h.sortable = false;
|
||||||
}
|
}
|
||||||
@@ -1230,26 +1175,4 @@ function loadFormSettings(vm) {
|
|||||||
vm.dataTablePagingOptions.page = formSettings.temp.page;
|
vm.dataTablePagingOptions.page = formSettings.temp.page;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/*
|
|
||||||
for (let i = 0; i < vm.effectiveListView.length; i++) {
|
|
||||||
let lvItem = vm.effectiveListView[i];
|
|
||||||
//de-lodash
|
|
||||||
//let fld = window.$gz. _.find(vm.fieldDefinitions, ["fieldKey", lvItem.fld]);
|
|
||||||
let fld = vm.fieldDefinitions.find(z => z.fieldKey == lvItem.fld);
|
|
||||||
let o = {
|
|
||||||
key: fld.fieldKey,
|
|
||||||
title: vm.$ay.t(fld.tKey),
|
|
||||||
include: true,
|
|
||||||
isFilterable: fld.isFilterable,
|
|
||||||
isSortable: fld.isSortable,
|
|
||||||
enumType: fld.enumType,
|
|
||||||
uiFieldDataType: fld.uiFieldDataType,
|
|
||||||
isCustomField: fld.isCustomField,
|
|
||||||
sort: lvItem.sort || null,
|
|
||||||
filter: lvItem.filter || { any: false, items: [] },
|
|
||||||
tempFilterOperator: null,
|
|
||||||
tempFilterToken: null,
|
|
||||||
tempFilterValue: null
|
|
||||||
};
|
|
||||||
*/
|
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -19,7 +19,6 @@
|
|||||||
:dataListSort="dataListSort"
|
:dataListSort="dataListSort"
|
||||||
:showSelect="rights.read"
|
:showSelect="rights.read"
|
||||||
:reload="reload"
|
:reload="reload"
|
||||||
:metaView="metaView"
|
|
||||||
:ridColumnOpenable="false"
|
:ridColumnOpenable="false"
|
||||||
v-on:selection-change="handleSelected"
|
v-on:selection-change="handleSelected"
|
||||||
data-cy="serviceBanksTable"
|
data-cy="serviceBanksTable"
|
||||||
|
|||||||
@@ -15,7 +15,6 @@
|
|||||||
:dataListSort="dataListSort"
|
:dataListSort="dataListSort"
|
||||||
:showSelect="rights.read"
|
:showSelect="rights.read"
|
||||||
:reload="reload"
|
:reload="reload"
|
||||||
:metaView="metaView"
|
|
||||||
v-on:selection-change="handleSelected"
|
v-on:selection-change="handleSelected"
|
||||||
data-cy="usersTable"
|
data-cy="usersTable"
|
||||||
>
|
>
|
||||||
@@ -27,32 +26,7 @@
|
|||||||
const FORM_KEY = "adm-users";
|
const FORM_KEY = "adm-users";
|
||||||
export default {
|
export default {
|
||||||
created() {
|
created() {
|
||||||
//STATIC FILTER Inside users only
|
|
||||||
this.metaView = JSON.stringify([
|
|
||||||
{
|
|
||||||
fld: "usertype",
|
|
||||||
filter: {
|
|
||||||
items: [
|
|
||||||
{ op: "!=", value: 3 },
|
|
||||||
{ op: "!=", value: 4 }
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]);
|
|
||||||
|
|
||||||
//outside users only
|
|
||||||
// this.metaView = JSON.stringify([
|
|
||||||
// {
|
|
||||||
// fld: "usertype",
|
|
||||||
// filter: {
|
|
||||||
// items: [
|
|
||||||
// { op: "=", value: 3 },
|
|
||||||
// { op: "=", value: 4 }
|
|
||||||
// ],
|
|
||||||
// any: true
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// ]);
|
|
||||||
|
|
||||||
this.rights = window.$gz.role.getRights(window.$gz.type.User);
|
this.rights = window.$gz.role.getRights(window.$gz.type.User);
|
||||||
window.$gz.eventBus.$on("menu-click", clickHandler);
|
window.$gz.eventBus.$on("menu-click", clickHandler);
|
||||||
@@ -67,7 +41,7 @@ export default {
|
|||||||
dataListKey: "InsideUserDataList",
|
dataListKey: "InsideUserDataList",
|
||||||
dataListFilter: "",
|
dataListFilter: "",
|
||||||
dataListSort: "",
|
dataListSort: "",
|
||||||
metaView: undefined,
|
|
||||||
rights: window.$gz.role.defaultRightsObject(),
|
rights: window.$gz.role.defaultRightsObject(),
|
||||||
ayType: window.$gz.type.User,
|
ayType: window.$gz.type.User,
|
||||||
selectedItems: [],
|
selectedItems: [],
|
||||||
|
|||||||
@@ -19,7 +19,6 @@
|
|||||||
:dataListSort="dataListSort"
|
:dataListSort="dataListSort"
|
||||||
:showSelect="rights.read"
|
:showSelect="rights.read"
|
||||||
:reload="reload"
|
:reload="reload"
|
||||||
:metaView="metaView"
|
|
||||||
v-on:selection-change="handleSelected"
|
v-on:selection-change="handleSelected"
|
||||||
data-cy="reviewsTable"
|
data-cy="reviewsTable"
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -43,31 +43,6 @@ export default {
|
|||||||
}`;
|
}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
// if (vm.$route.params.filter) {
|
|
||||||
// let metaFilter = [];
|
|
||||||
// //pre-filter by PartNumber or warehouse name or both
|
|
||||||
// if (vm.$route.params.filter.PartPartNumber != null) {
|
|
||||||
// metaFilter.push({
|
|
||||||
// fld: "PartPartNumber",
|
|
||||||
// filter: {
|
|
||||||
// items: [{ op: "=", value: vm.$route.params.filter.PartPartNumber }]
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
|
|
||||||
// if (vm.$route.params.filter.PartWarehouseName != null) {
|
|
||||||
// metaFilter.push({
|
|
||||||
// fld: "PartWarehouseName",
|
|
||||||
// filter: {
|
|
||||||
// items: [
|
|
||||||
// { op: "=", value: vm.$route.params.filter.PartWarehouseName }
|
|
||||||
// ]
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
// vm.metaView = JSON.stringify(metaFilter);
|
|
||||||
// }
|
|
||||||
|
|
||||||
generateMenu(vm);
|
generateMenu(vm);
|
||||||
},
|
},
|
||||||
beforeDestroy() {
|
beforeDestroy() {
|
||||||
|
|||||||
@@ -45,30 +45,6 @@ export default {
|
|||||||
}`;
|
}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
// if (vm.$route.params.filter) {
|
|
||||||
// vm.clientCriteria = "";
|
|
||||||
// //pre-filter by PartNumber or warehouse name or both
|
|
||||||
// if (vm.$route.params.filter.PartPartNumber != null) {
|
|
||||||
// metaFilter.push({
|
|
||||||
// fld: "PartPartNumber",
|
|
||||||
// filter: {
|
|
||||||
// items: [{ op: "=", value: vm.$route.params.filter.PartPartNumber }]
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
|
|
||||||
// if (vm.$route.params.filter.PartWarehouseName != null) {
|
|
||||||
// metaFilter.push({
|
|
||||||
// fld: "PartWarehouseName",
|
|
||||||
// filter: {
|
|
||||||
// items: [
|
|
||||||
// { op: "=", value: vm.$route.params.filter.PartWarehouseName }
|
|
||||||
// ]
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
// vm.clientCriteria = `PartPartNumber:`;
|
|
||||||
// }
|
|
||||||
generateMenu(vm);
|
generateMenu(vm);
|
||||||
},
|
},
|
||||||
beforeDestroy() {
|
beforeDestroy() {
|
||||||
|
|||||||
Reference in New Issue
Block a user