From b5185793c990a1ba16ec58729cba146b83cfa8bc Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 11 Sep 2020 22:45:08 +0000 Subject: [PATCH] --- server/AyaNova/biz/ReportBiz.cs | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/server/AyaNova/biz/ReportBiz.cs b/server/AyaNova/biz/ReportBiz.cs index 71638d8d..fecb60b0 100644 --- a/server/AyaNova/biz/ReportBiz.cs +++ b/server/AyaNova/biz/ReportBiz.cs @@ -406,17 +406,30 @@ namespace AyaNova.Biz log.LogDebug($"Preparing page: adding Server meta data"); //Server meta data - var serverMeta = $"{{ayApiUrl:`{apiUrl}`}}"; + var logo = await ct.Logo.AsNoTracking().SingleOrDefaultAsync(); + + var HasSmallLogo = "false"; + var HasMediumLogo = "false"; + var HasLargeLogo = "false"; + if (logo != null) + { + if (logo.Small != null) HasSmallLogo = "true"; + if (logo.Medium != null) HasMediumLogo = "true"; + if (logo.Large != null) HasLargeLogo = "true"; + } + var serverMeta = $"{{ayApiUrl:`{apiUrl}`, HasSmallLogo:{HasSmallLogo}, HasMediumLogo:{HasMediumLogo}, HasLargeLogo:{HasLargeLogo},}}"; + log.LogDebug($"Preparing page: adding Report meta data"); //Custom fields definition for report usage - string CustomFieldsTemplate="null"; - var FormCustomization = await ct.FormCustom.AsNoTracking().SingleOrDefaultAsync(z => z.FormKey == report.ObjectType.ToString()); - if(FormCustomization!=null){ - CustomFieldsTemplate=FormCustomization.Template; - } - + string CustomFieldsTemplate = "null"; + var FormCustomization = await ct.FormCustom.AsNoTracking().SingleOrDefaultAsync(z => z.FormKey == report.ObjectType.ToString()); + if (FormCustomization != null) + { + CustomFieldsTemplate = FormCustomization.Template; + } + //Report meta data var reportMeta = $"{{Id:{report.Id},Name:`{report.Name}`,Notes:`{report.Notes}`,ObjectType:`{report.ObjectType}`,CustomFieldsDefinition:{CustomFieldsTemplate},DataListKey:`{reportParam.DataListKey}`,ListView:`{reportParam.ListView}`,SelectedRowIds: `{string.Join(",", reportParam.SelectedRowIds)}`}}";