From cfbb70c2847f181796cd82e8d677e49088eb6e5a Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 25 Aug 2020 17:46:48 +0000
Subject: [PATCH]

---
 devdocs/deploy.txt                             |  7 +++++++
 server/AyaNova/AyaNova.csproj                  | 10 ++++++++--
 server/AyaNova/Controllers/ReportController.cs |  2 +-
 server/AyaNova/resource/en.json                |  1 +
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/devdocs/deploy.txt b/devdocs/deploy.txt
index 24c7f7fc..f7f6169e 100644
--- a/devdocs/deploy.txt
+++ b/devdocs/deploy.txt
@@ -240,3 +240,10 @@ IMPORTANT NOTES:
 DOCKER / LINUX CHEAT SHEET
 	Alpine linux enter container and run shell from docker: 
 			 docker run -it [container_id] /bin/ash
+
+
+
+ <!-- <Target Name="CopyCustomContent" AfterTargets="AfterBuild">
+    <Copy SourceFiles=".\resource\ay-report.js;" DestinationFolder="$(OutDir)\resource\rpt" />
+    <!-- <Copy SourceFiles=".\resource\rpt\ay-report.js;.\resource\rpt\ay-hb.js;.\resource\rpt\ay-md.js" DestinationFolder="$(OutDir)\resource\rpt" /> -->
+  </Target> -->
\ No newline at end of file
diff --git a/server/AyaNova/AyaNova.csproj b/server/AyaNova/AyaNova.csproj
index 166a1aee..270a66c5 100644
--- a/server/AyaNova/AyaNova.csproj
+++ b/server/AyaNova/AyaNova.csproj
@@ -45,8 +45,14 @@
   </ItemGroup>
 
   <Target Name="CopyCustomContent" AfterTargets="AfterBuild">
-    <Copy SourceFiles=".\resource\de.json;.\resource\reportjs\ay-report.js;.\resource\en.json;.\resource\es.json;.\resource\fr.json" DestinationFolder="$(OutDir)\resource" />
-    <Copy SourceFiles=".\resource\reportjs\ay-report.js;.\resource\reportjs\ay-hb.js;.\resource\reportjs\ay-md.js" DestinationFolder="$(OutDir)\resource\reportjs" />
+    <Copy SourceFiles=".\resource\de.json;.\resource\en.json;.\resource\es.json;.\resource\fr.json" DestinationFolder="$(OutDir)\resource" />
+    <!-- <Copy SourceFiles=".\resource\rpt\ay-report.js;.\resource\rpt\ay-hb.js;.\resource\rpt\ay-md.js" DestinationFolder="$(OutDir)\resource\rpt" /> -->
   </Target>
 
+   <ItemGroup>
+    <Content Include=".\resource\rpt\*.*">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>  
+  </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/server/AyaNova/Controllers/ReportController.cs b/server/AyaNova/Controllers/ReportController.cs
index 8f03d0f5..c4b6c1bc 100644
--- a/server/AyaNova/Controllers/ReportController.cs
+++ b/server/AyaNova/Controllers/ReportController.cs
@@ -87,7 +87,7 @@ namespace AyaNova.Api.Controllers
             //var localIpAddress = httpConnectionFeature?.LocalIpAddress;
 
             //todo: validate files are present somehow?            
-            var ReportJSFolderPath = Path.Combine(ServerBootConfig.AYANOVA_CONTENT_ROOT_PATH, "resource", "reportjs");
+            var ReportJSFolderPath = Path.Combine(ServerBootConfig.AYANOVA_CONTENT_ROOT_PATH, "resource", "rpt");
             if (!Directory.Exists(ReportJSFolderPath))
                 throw new System.Exception($"E1012: \"reportjs\" folder not found where expected: \"{ReportJSFolderPath}\", installation damaged?");
 
diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json
index f2fd726d..8627b8cf 100644
--- a/server/AyaNova/resource/en.json
+++ b/server/AyaNova/resource/en.json
@@ -1921,4 +1921,5 @@
   "ShutDownServer": "Shut down server",
   "AreYouSureShutDown": "Are you certain you want to shut down the server?",
   "ViewServerConfiguration": "View server configuration"
+  
 }
\ No newline at end of file