From 14cd3004136a25559e95250c3b07e086f22033b6 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 27 Apr 2021 18:58:04 +0000 Subject: [PATCH] --- docs/8.0/ayanova/docs/adm-import.md | 10 ++++++++++ server/AyaNova/resource/rpt/ay-report.js | 11 ++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/docs/8.0/ayanova/docs/adm-import.md b/docs/8.0/ayanova/docs/adm-import.md index 16e6c65e..980623c8 100644 --- a/docs/8.0/ayanova/docs/adm-import.md +++ b/docs/8.0/ayanova/docs/adm-import.md @@ -1,3 +1,13 @@ # ADM-IMPORT Placeholder +NOTE: AyaNova 8's native data interchange format is JSON as JSON supports hiearchical structured data of the type AyaNova uses for nearly all it's object types. + +For this reason, import ONLY supports JSON format files. Importing CSV files is *not* supported. + +A 3rd party tool can be used to convert CSV files to JSON if necessary. +https://duckduckgo.com/?t=ffab&q=csv+to+json&ia=web + + + + TODO: How to use the IMPORT feature, limitations, auto tag, etc diff --git a/server/AyaNova/resource/rpt/ay-report.js b/server/AyaNova/resource/rpt/ay-report.js index 1030b6c7..f6a673c9 100644 --- a/server/AyaNova/resource/rpt/ay-report.js +++ b/server/AyaNova/resource/rpt/ay-report.js @@ -66,27 +66,28 @@ function ayRegisterHelpers() { }); Handlebars.registerHelper("ayLogo", function (size) { - if (this.ayServerMetaData) { + + if (AYMETA.ayServerMetaData) { switch (size) { case "small": - if (!this.ayServerMetaData.HasSmallLogo) { + if (!AYMETA.ayServerMetaData.HasSmallLogo) { return ""; } break; case "medium": - if (!this.ayServerMetaData.HasMediumLogo) { + if (!AYMETA.ayServerMetaData.HasMediumLogo) { return ""; } break; case "large": - if (!this.ayServerMetaData.HasLargeLogo) { + if (!AYMETA.ayServerMetaData.HasLargeLogo) { return ""; } break; } } var url = `${Handlebars.escapeExpression( - this.ayServerMetaData.ayApiUrl + AYMETA.ayServerMetaData.ayApiUrl )}logo/${size}`; return new Handlebars.SafeString(""); });