diff --git a/ayanova/src/api/gzapi.js b/ayanova/src/api/gzapi.js index 7b9383ae..4e6bc00d 100644 --- a/ayanova/src/api/gzapi.js +++ b/ayanova/src/api/gzapi.js @@ -631,6 +631,24 @@ export default { } catch (error) { handleError("uploadLogo", error, route); } + }, + /////////////////////////////////// + // REPORT CLIENT META DATA + // + // + reportClientMetaData() { + return { + UserName: window.$gz.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.getBrowserTimeZoneName(), + 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] + }; } //--------------- diff --git a/ayanova/src/components/report-selector-control.vue b/ayanova/src/components/report-selector-control.vue index 4de15b2d..1687516c 100644 --- a/ayanova/src/components/report-selector-control.vue +++ b/ayanova/src/components/report-selector-control.vue @@ -101,6 +101,8 @@ export default { throw "Missing report data unable to render report"; } reportDataOptions.ReportId = reportId; + //Meta data from client for use by report script + reportDataOptions.ClientMeta = window.$gz.api.reportClientMetaData(); let url = "report/render"; diff --git a/ayanova/src/views/ay-report-edit.vue b/ayanova/src/views/ay-report-edit.vue index 68e8d1ce..9ae217f4 100644 --- a/ayanova/src/views/ay-report-edit.vue +++ b/ayanova/src/views/ay-report-edit.vue @@ -139,6 +139,8 @@ import * as monaco from "monaco-editor"; Logo as helper in handlebars? that would be easy peasy I think if it's supported +When in report designer it should show how the html generated by the renderer as a diagnostic assistant + Make up sample reports for widget that show off the basics including logo etc make them auto generate (import from files?) with sample data in seeder @@ -746,18 +748,20 @@ Handlebars.registerHelper('loud', function (aString) { reportDataOptions.ReportId = vm.obj.id; //Meta data from client for use by report script - reportDataOptions.ClientMeta = { - 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.getBrowserTimeZoneName(), - 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] - }; + 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.getBrowserTimeZoneName(), + // 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,