dsw-report was added to dc-analytics

Author: MakarovS96

Dockerfile

@@ -51,6 +51,8 @@ RUN iris start $ISC_PACKAGE_INSTANCENAME quietly EmergencyId=sys,sys && \
     /bin/echo -e "sys\nsys\n" \
     | iris stop $ISC_PACKAGE_INSTANCENAME quietly
 
+RUN apt update && apt install -y git && git clone https://github.com/intersystems-community/dsw-reports.git && cp -r dsw-reports/src/web/reports /usr/irissys/csp/dsw/ && cp -r src/reports /usr/irissys/csp/dsw/ && rm -rf dsw-reports
+
 COPY ./other/dcanalytics.json /usr/irissys/csp/dsw/configs/
 
 COPY ./fixoverlay.sh ./

src/reports/week/config.js

@@ -20,7 +20,7 @@ function beforeWeekDates(UTCtimezone) {
  * @returns {{REPORT_NAME: string, BLOCKS: *[], NAMESPACE: string}}
  */
 function getConfiguration(params) {
-    if (params.ns == undefined || params.ns == null) params.ns = "COMMUNITYPUBLIC";
+    if (params.ns == undefined || params.ns == null) params.ns = "DCANALYTICS";
     if (params.filter == undefined || params.filter == null) params.filter = "NOW-1";
     if (params.date_string == undefined || params.date_string == null) params.date_string = beforeWeekDates(-5);
     return {
@@ -67,7 +67,7 @@ function getReportBlocks(params) {
             title: "Posts by Members",
             note: "",
             widget: {
-                url: server + "/dswpub/index.html#!/d/Week/WeekView.dashboard?FILTERS=TARGET:*;FILTER:%5BDateDimension%5D.%5BH1%5D.%5BWeekYear%5D.%26%5B"+filter+"%5D&widget=0&height=450&showValues=true&ns=" + namespace,
+                url: server + "/dsw/index.html#!/d/Week/WeekView.dashboard?FILTERS=TARGET:*;FILTER:%5BDateDimension%5D.%5BH1%5D.%5BWeekYear%5D.%26%5B"+filter+"%5D&widget=0&height=450&showValues=true&ns=" + namespace,
                 width: 1000,
                 height: 450
             }
@@ -76,7 +76,7 @@ function getReportBlocks(params) {
         title: "Posts Daily",
         note: "",
         widget: {
-            url: server + "/dswpub/index.html#!/d/Week/WeekView.dashboard?FILTERS=TARGET:*;FILTER:%5BDateDimension%5D.%5BH1%5D.%5BWeekYear%5D.%26%5B"+filter+"%5D&widget=1&height=300&isLegend=true" + namespace,
+            url: server + "/dsw/index.html#!/d/Week/WeekView.dashboard?FILTERS=TARGET:*;FILTER:%5BDateDimension%5D.%5BH1%5D.%5BWeekYear%5D.%26%5B"+filter+"%5D&widget=1&height=300&isLegend=true" + namespace,
             width: 800,
             height: 350
         },
@@ -100,15 +100,15 @@ function getReportBlocks(params) {
     title: "Comments by Members",
     note: "",
     widget: {
-        url: server + "/dswpub/index.html#!/d/Week/WeekView.dashboard?FILTERS=TARGET:*;FILTER:%5BDateDimension%5D.%5BH1%5D.%5BWeekYear%5D.%26%5B"+filter+"%5D&widget=2&height=450&showValues=true&ns=" + namespace,
+        url: server + "/dsw/index.html#!/d/Week/WeekView.dashboard?FILTERS=TARGET:*;FILTER:%5BDateDimension%5D.%5BH1%5D.%5BWeekYear%5D.%26%5B"+filter+"%5D&widget=2&height=450&showValues=true&ns=" + namespace,
         width: 1000,
         height: 750
     }
 }, {
     title: "Comments Daily",
     note: "",
     widget: {
-        url: server + "/dswpub/index.html#!/d/Week/WeekView.dashboard?FILTERS=TARGET:*;FILTER:%5BDateDimension%5D.%5BH1%5D.%5BWeekYear%5D.%26%5B"+filter+"%5D&widget=3&height=300&isLegend=true" + namespace,
+        url: server + "/dsw/index.html#!/d/Week/WeekView.dashboard?FILTERS=TARGET:*;FILTER:%5BDateDimension%5D.%5BH1%5D.%5BWeekYear%5D.%26%5B"+filter+"%5D&widget=3&height=300&isLegend=true" + namespace,
         width: 800,
         height: 350
     },
@@ -132,23 +132,23 @@ function getReportBlocks(params) {
     title: "Posts by Groups",
     note: "",
     widget: {
-    url: server + "/dswpub/index.html#!/d/Week/WeekView.dashboard?FILTERS=TARGET:*;FILTER:%5BDateDimension%5D.%5BH1%5D.%5BWeekYear%5D.%26%5B"+filter+"%5D&widget=4&height=400&ns=" + namespace,
+    url: server + "/dsw/index.html#!/d/Week/WeekView.dashboard?FILTERS=TARGET:*;FILTER:%5BDateDimension%5D.%5BH1%5D.%5BWeekYear%5D.%26%5B"+filter+"%5D&widget=4&height=400&ns=" + namespace,
     width: 1000,
     height: 400
         }
 }, {
     title: "Comments by Groups",
     note: "",
     widget: {
-    url: server + "/dswpub/index.html#!/d/Week/WeekView.dashboard?FILTERS=TARGET:*;FILTER:%5BDateDimension%5D.%5BH1%5D.%5BWeekYear%5D.%26%5B"+filter+"%5D&widget=5&height=400&ns=" + namespace,
+    url: server + "/dsw/index.html#!/d/Week/WeekView.dashboard?FILTERS=TARGET:*;FILTER:%5BDateDimension%5D.%5BH1%5D.%5BWeekYear%5D.%26%5B"+filter+"%5D&widget=5&height=400&ns=" + namespace,
     width: 1000,
     height: 800
         }
 }, {
     title: "Articles and Announcements of the week",
     note: "",
     widget: {
-        url: server + "/dswpub/index.html#!/d/Week/DigestLists.dashboard?widget=0&height=500&isLegend=false" + namespace,
+        url: server + "/dsw/index.html#!/d/Week/DigestLists.dashboard?widget=0&height=500&isLegend=false" + namespace,
         width: 800,
         height: 500
     },
@@ -193,7 +193,7 @@ function getReportBlocks(params) {
     title: "Questions of the week",
     note: "",
     widget: {
-        url: server + "/dswpub/index.html#!/d/Week/DigestLists.dashboard?widget=1&height=1000&isLegend=false" + namespace,
+        url: server + "/dsw/index.html#!/d/Week/DigestLists.dashboard?widget=1&height=1000&isLegend=false" + namespace,
         width: 800,
         height: 1000
     },