diff --git a/ayanova/src/components/gz-data-table.vue b/ayanova/src/components/gz-data-table.vue index 0332570b..b926bb13 100644 --- a/ayanova/src/components/gz-data-table.vue +++ b/ayanova/src/components/gz-data-table.vue @@ -456,7 +456,7 @@ export default { refresh() { this.getDataFromApi(); }, - getDataTableSourceOptions() { + getReportDataOptions(AyaType) { let vm = this; //called when parent form needs the selected id's or the list view options needed to rehydrate the entire list of id's in the same order and filter //i.e. for reporting, bulk operations etc @@ -471,7 +471,13 @@ export default { return z.id; }); } + /* 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 + */ return { + ObjectType:ayaType selectedRowIds: selectedRowIds, dataListKey: vm.dataListKey, listView: untokenizeListView(vm.listView) diff --git a/ayanova/src/components/report-selector-control.vue b/ayanova/src/components/report-selector-control.vue index 6f97da24..1bdaaa02 100644 --- a/ayanova/src/components/report-selector-control.vue +++ b/ayanova/src/components/report-selector-control.vue @@ -63,7 +63,7 @@ export default { data: () => ({ rights: window.$gz.role.getRights(window.$gz.type.Report), ayaType: null, - sourceData: {}, + reportDataOptions: {}, isVisible: false, resolve: null, reject: null, @@ -75,10 +75,10 @@ export default { selectedReport: null }), methods: { - async open(ayaType, sourceData) { + async open(ayaType, reportDataOptions) { let vm = this; - if (ayaType == null || sourceData == null) { - throw "report-selector:Open missing type and or sourceData"; + if (ayaType == null || reportDataOptions == null) { + throw "report-selector:Open missing type and or reportDataOptions"; } this.ayaType = ayaType; @@ -90,7 +90,7 @@ export default { // listView: untokenizeListView(vm.listView) // } - this.sourceData = sourceData; + this.reportDataOptions = reportDataOptions; //rights @@ -126,7 +126,7 @@ export default { params: { recordid: 0, ayaType: this.ayaType, - sourceData: this.sourceData + reportDataOptions: this.reportDataOptions } }); } diff --git a/ayanova/src/views/ay-report-edit.vue b/ayanova/src/views/ay-report-edit.vue index 67961fc6..fc998b18 100644 --- a/ayanova/src/views/ay-report-edit.vue +++ b/ayanova/src/views/ay-report-edit.vue @@ -157,8 +157,8 @@ export default { window.$gz.eventBus.$on("menu-click", clickHandler); //route params MUST have source data - if (!vm.$route.params.sourceData) { - throw "ay-report-edit::created - missing sourceData route parameter"; + if (!vm.$route.params.reportDataOptions) { + throw "ay-report-edit::created - missing reportDataOptions route parameter"; } //id 0 means create a new record don't load one @@ -766,22 +766,22 @@ async function fetchTranslatedText(vm) { //////////////////// // async function fetchReportData(vm) { - let sourceData = vm.$route.params.sourceData; + let reportDataOptions = vm.$route.params.reportDataOptions; vm.obj.objectType = vm.$route.params.ayaType; - if (!sourceData) { - throw "ay-report-edit:fetchReportData - route parameter sourceData is missing or empty, unable to init report designer"; + if (!reportDataOptions) { + throw "ay-report-edit:fetchReportData - route parameter reportDataOptions is missing or empty, unable to init report designer"; } if (vm.obj.objectType == null) { throw "ay-report-edit:fetchReportData - route parameter ayaType is missing or empty, unable to init report designer"; } - /* public class ObjectReportDataParameter - { - public AyaType ObjectType { get; set; } - public long[] ObjectIdArray { get; set; } - } */ + /* 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 res = await window.$gz.api.upsert("report/object-report-data", { ObjectType: vm.obj.objectType, - ObjectIdArray: sourceData + ObjectIdArray: reportDataOptions }); //We never expect there to be no data here if (!res.hasOwnProperty("data")) { diff --git a/ayanova/src/views/widgets.vue b/ayanova/src/views/widgets.vue index 26c4f174..00fd7724 100644 --- a/ayanova/src/views/widgets.vue +++ b/ayanova/src/views/widgets.vue @@ -80,7 +80,7 @@ async function clickHandler(menuItem) { let res = await m.vm.$refs.reportSelector.open( window.$gz.type.Widget, - m.vm.$refs.gzdatatable.getDataTableSourceOptions() + m.vm.$refs.gzdatatable.getReportDataOptions() ); //if null for no selection