From 5499b36f19a7123b88b3947f7378d44a9b2f6fe0 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 15 Apr 2020 23:23:43 +0000 Subject: [PATCH] --- ayanova/src/api/gzreport.js | 31 ------------------- .../src/components/wiki-viewer-control.vue | 14 +++++++++ ayanova/src/main.js | 5 +-- ayanova/src/views/widget.vue | 2 ++ 4 files changed, 19 insertions(+), 33 deletions(-) delete mode 100644 ayanova/src/api/gzreport.js create mode 100644 ayanova/src/components/wiki-viewer-control.vue diff --git a/ayanova/src/api/gzreport.js b/ayanova/src/api/gzreport.js deleted file mode 100644 index 323a57e7..00000000 --- a/ayanova/src/api/gzreport.js +++ /dev/null @@ -1,31 +0,0 @@ -export default { - ///////////////////////////////////////////////////////// - // - // GET REPORT LIST FOR REPORT KEY SPECIFIED - // available to current user logged in - availableReports: function(reportKey) { - //STUB: this will need to hit the server to get the info required - return [ - { text: "First test report " + reportKey, value: 1 }, - { text: "Some other report " + reportKey, value: 2 }, - { text: "Sample report " + reportKey, value: 3 }, - { - text: "Bob's personal report, it's a good one! " + reportKey, - value: 4 - }, - { text: "Test report five " + reportKey, value: 5 }, - { text: "Test report six " + reportKey, value: 6 }, - { text: "Test report seven " + reportKey, value: 7 }, - { text: "Test report eight " + reportKey, value: 8 }, - { text: "Test report nine " + reportKey, value: 9 }, - { text: "Test report ten " + reportKey, value: 10 }, - { text: "Test report eleven " + reportKey, value: 11 }, - { text: "Test report twelve " + reportKey, value: 12 }, - { text: "Test report thirteen " + reportKey, value: 13 }, - { text: "Test report fourteen " + reportKey, value: 14 }, - { text: "Test report fifteen " + reportKey, value: 15 }, - { text: "Test report sixteen " + reportKey, value: 16 }, - { text: "Test report seventeen " + reportKey, value: 17 } - ]; - } -}; diff --git a/ayanova/src/components/wiki-viewer-control.vue b/ayanova/src/components/wiki-viewer-control.vue new file mode 100644 index 00000000..b2f4656c --- /dev/null +++ b/ayanova/src/components/wiki-viewer-control.vue @@ -0,0 +1,14 @@ + + diff --git a/ayanova/src/main.js b/ayanova/src/main.js index e5212f28..38da46bb 100644 --- a/ayanova/src/main.js +++ b/ayanova/src/main.js @@ -25,7 +25,7 @@ import gzutil from "./api/gzutil"; import translation from "./api/translation"; import locale from "./api/locale"; import gzapi from "./api/gzapi"; -import gzreport from "./api/gzreport"; + import gzform from "./api/gzform"; import gzformcustomtemplate from "./api/form-custom-template"; import authorizationroles from "./api/authorizationroles"; @@ -45,6 +45,7 @@ import decimalControl from "./components/decimal-control.vue"; import errorControl from "./components/error-control.vue"; import reportSelectorControl from "./components/report-selector-control.vue"; import reportViewerControl from "./components/report-viewer-control.vue"; +import wikiViewerControl from "./components/wiki-viewer-control.vue"; ///////////////////////////////////////////////////////////////// // LIBS AND GLOBAL ITEMS @@ -71,7 +72,6 @@ window.$gz = { _: lodash, api: gzapi, form: gzform, - report: gzreport, errorHandler: errorhandler, store: store, clientInfo: ayaNovaVersion, @@ -174,6 +174,7 @@ Vue.component("gz-decimal", decimalControl); Vue.component("gz-error", errorControl); Vue.component("gz-report-selector", reportSelectorControl); Vue.component("gz-report-viewer", reportViewerControl); +Vue.component("gz-wiki-viewer", wikiViewerControl); //3rd party components Vue.use(VueCurrencyInput); diff --git a/ayanova/src/views/widget.vue b/ayanova/src/views/widget.vue index a503f442..bda8346a 100644 --- a/ayanova/src/views/widget.vue +++ b/ayanova/src/views/widget.vue @@ -2,6 +2,7 @@ + @@ -303,6 +304,7 @@ export default { endDate: null, notes: null, count: null, + wikiContent: null, customFields: "{}", tags: [], userId: null