From cdc38d6e848a5212f8a38947d834985cce63392e Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 8 Feb 2021 22:29:53 +0000 Subject: [PATCH] --- ayanova/devdocs/rando-todo.txt | 4 +-- ayanova/devdocs/todo.txt | 2 +- .../data-table-filter-manager-control.vue | 6 ---- ayanova/src/components/extensions-control.vue | 3 +- .../src/views/ay-data-list-column-view.vue | 11 ++------ ayanova/src/views/ay-report-edit.vue | 28 ------------------- .../views/inv-part-inventory-transactions.vue | 3 +- 7 files changed, 8 insertions(+), 49 deletions(-) diff --git a/ayanova/devdocs/rando-todo.txt b/ayanova/devdocs/rando-todo.txt index 17addad8..32c15b18 100644 --- a/ayanova/devdocs/rando-todo.txt +++ b/ayanova/devdocs/rando-todo.txt @@ -161,8 +161,8 @@ todo: ON HOLD TIL LATER Lagging typing in name field on customize form for data -todo: erasedatabase for import causes a conflict with client cached settings like listview etc - Noticed it when v8 migrate and superuser account getting error about missing datalistview when reviewing imported data +todo: erasedatabase for import causes a conflict with client cached settings like lxistview etc + Noticed it when v8 migrate and superuser account getting error about missing datalxistview when reviewing imported data was easy to just switch to the default view and force it to reset for that grid so not life or death issue for sure Client needs to also erase it's cache, but how will it know? Maybe not a significant issue, if needs addressing look into a flag of some kind, maybe a version match or something diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index e99351a8..0c4afd65 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -9,7 +9,7 @@ MISC ITEMS THAT CAME UP todo (after) Test TEST **TEST** - Test all column types are properly filterable including ENUMS and TAGS + Clean up the server and client code including the wierd props not being used set on all list forms etc get rid of the countless commented out lines that are now irrelevant and will just cause confusion in future diff --git a/ayanova/src/components/data-table-filter-manager-control.vue b/ayanova/src/components/data-table-filter-manager-control.vue index 5c608f0e..d59fb78e 100644 --- a/ayanova/src/components/data-table-filter-manager-control.vue +++ b/ayanova/src/components/data-table-filter-manager-control.vue @@ -194,12 +194,6 @@ export default { // async function initForm(vm) { await fetchTranslatedText(vm); - // populateSelectionLists(vm); - // await populateFieldDefinitions(vm); - // await fetchTranslatedFieldNames(vm); - // await setEffectiveListView(vm); - - // await fetchEnums(vm); } //////////////////// diff --git a/ayanova/src/components/extensions-control.vue b/ayanova/src/components/extensions-control.vue index fd94bb9a..fd68d1c5 100644 --- a/ayanova/src/components/extensions-control.vue +++ b/ayanova/src/components/extensions-control.vue @@ -58,8 +58,7 @@ export default { dataListSelection: { ObjectType: 0, selectedRowIds: [], - dataListKey: null, - listView: null + dataListKey: null }, headers: [], errorObj: [], diff --git a/ayanova/src/views/ay-data-list-column-view.vue b/ayanova/src/views/ay-data-list-column-view.vue index 4837d242..d99201b2 100644 --- a/ayanova/src/views/ay-data-list-column-view.vue +++ b/ayanova/src/views/ay-data-list-column-view.vue @@ -208,7 +208,7 @@ export default { let columnView = { userId: vm.$store.state.userId, listKey: vm.dataListKey, - columns: JSON.stringify(generateListViewFromEdited(vm)), + columns: JSON.stringify(generateColumnViewFromEditView(vm)), sort: vm.obj.sort //not set here, just keep existing one that was fetched when opened this form }; @@ -402,11 +402,6 @@ async function fetchColumnView(vm) { //////////////////// // function initWorkingView(vm) { - // if (vm.effectiveListView == null) { - // throw new Error( - // "ay-data-list::initWorkingView - effectiveListView is not set" - // ); - // } if (vm.fieldDefinitions == null) { throw new Error( "ay-data-list::initWorkingView - fieldDefinitions are not set" @@ -416,7 +411,7 @@ function initWorkingView(vm) { let ret = []; let columns = JSON.parse(vm.obj.columns); - //Pass 1, iterate the listview first + //Pass 1, iterate the columns first for (let i = 0; i < columns.length; i++) { //de-lodash //let fld = window.$gz. _.find(vm.fieldDefinitions, ["fieldKey", lvItem.fld]); @@ -463,7 +458,7 @@ function initWorkingView(vm) { // // Convert editedList view to real list view and return // -function generateListViewFromEdited(vm) { +function generateColumnViewFromEditView(vm) { let ret = []; for (let i = 0; i < vm.editView.length; i++) { diff --git a/ayanova/src/views/ay-report-edit.vue b/ayanova/src/views/ay-report-edit.vue index 6f1b7583..f8035b07 100644 --- a/ayanova/src/views/ay-report-edit.vue +++ b/ayanova/src/views/ay-report-edit.vue @@ -891,15 +891,6 @@ Handlebars.registerHelper('loud', function (aString) { return; } - /* - public class RenderReportParameter - { - public long ReportId { get; set; } - public long[] SelectedRowIds { 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 - } -*/ let reportDataOptions = vm.$route.params.reportDataOptions; if (!reportDataOptions) { throw new Error( @@ -911,19 +902,6 @@ Handlebars.registerHelper('loud', function (aString) { //Meta data from client for use by report script reportDataOptions.ClientMeta = window.$gz.api.reportClientMetaData(); - // { - // UserName: vm.$store.state.userName, - // Authorization: "Bearer " + window.$gz.store.state.apiToken, //api token for using api methods as current user viewing report - // TimeZoneName: window.$gz.locale.getResolvedTimeZoneName(), - // LanguageName: window.$gz.locale.getBrowserLanguages(), - // Hour12: window.$gz.locale.getHour12(), - // CurrencyName: window.$gz.locale.getCurrencyName(), - // LanguageName: window.$gz.locale.getBrowserFirstLanguage(), - // DefaultLocale: window.$gz.locale - // .getBrowserFirstLanguage() - // .split("-", 1)[0] - // }; - window.$gz.form.setFormState({ vm: vm, loading: true @@ -1130,12 +1108,6 @@ async function fetchTranslatedText(vm) { //////////////////// // async function fetchReportData(vm) { - /* public AyaType ObjectType { get; set; } - public long[] SelectedRowIds { 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 - */ - let reportDataOptions = vm.$route.params.reportDataOptions; if (!reportDataOptions) { vm.reportData = null; diff --git a/ayanova/src/views/inv-part-inventory-transactions.vue b/ayanova/src/views/inv-part-inventory-transactions.vue index 0b50bb6e..b3fcfb85 100644 --- a/ayanova/src/views/inv-part-inventory-transactions.vue +++ b/ayanova/src/views/inv-part-inventory-transactions.vue @@ -54,8 +54,7 @@ export default { ayType: window.$gz.type.PartInventory, selectedItems: [], clientCriteria: undefined, - reload: false, - resetListView: false + reload: false }; }, methods: {