Merge branch 'master' into codex/change-itemindaterange-to-local-helper

Author: dogi

couchdb-setup.sh

@@ -18,13 +18,6 @@ upsert_doc() {
   fi
 }
 
-# Function for insert mock data docs
-insert_docs() {
-  DB=$1
-  DOC_LOC=$2
-  curl -H 'Content-Type: application/json' -X POST $COUCHURL/$DB/_bulk_docs -d @$DOC_LOC $PROXYHEADER
-}
-
 # Function to add databases
 insert_dbs() {
   DBS=$1
@@ -68,25 +61,6 @@ else
   COUCHURL=http://$COUCHUSER:$COUCHPASSWORD@$HOST:$PORT
 fi
 
-# Adding attachments to database documents
-# To add attachment added two file (resources-mock.json and resources-attachment-mockup.json)
-# Ids must match between two files
-insert_attachments() {
-  DB=$1
-  DOC_LOC=$2
-  # Use echo $(<$DOC_LOC) to be able to run in Windows
-  INPUTS=$(echo $(<$DOC_LOC) | jq -c '.[]')
-  for i in $INPUTS
-  do
-    ID=$(echo $i | jq -r '.doc_id' )
-    FILE_NAME=$(echo $i | jq -r '.file_name')
-    FILE_LOCATION=$(echo $i | jq -r '.file_location')
-    FILE_TYPE=$(echo $i | jq -r '.file_type')
-    REV=$(curl $COUCHURL/$DB/$ID | jq -r '._rev' $PROXYHEADER)
-    curl -X PUT $COUCHURL/$DB/$ID/$FILE_NAME?rev=$REV --data-binary @$FILE_LOCATION -H Content-Type:$FILE_TYPE $PROXYHEADER
-  done
-}
-
 # Reads one JSON file to update multiple databases
 # JSON file needs a 'dbName' field with a string and
 # a 'json' field with the JSON to be updated

package.json

@@ -3,7 +3,7 @@
   "license": "AGPL-3.0",
   "version": "0.22.68",
   "myplanet": {
-    "latest": "v0.54.19",
+    "latest": "v0.54.54",
     "min": "v0.52.45"
   },
   "scripts": {

src/app/home/home-router.module.ts

@@ -14,7 +14,7 @@ import { NewsListComponent } from '../news/news-list.component';
 import { AuthService } from '../shared/auth-guard.service';
 import { UnsavedChangesGuard } from '../shared/unsaved-changes.guard';
 
-export function dashboardPath(route): string {
+function dashboardPath(route): string {
   return `${myDashboardRoute}/${route}`;
 }
 

src/app/manager-dashboard/reports/reports-health.component.ts

@@ -1,8 +1,9 @@
 import { Component, Input, OnChanges, EventEmitter, Output, ViewChild } from '@angular/core';
-import { Chart, ChartConfiguration, LineController } from 'chart.js';
+import type { ChartConfiguration } from 'chart.js';
+import { loadChart } from '../../shared/chart-utils';
 import { StateService } from '../../shared/state.service';
 import { HealthService } from '../../health/health.service';
-import { generateWeeksArray, filterByDate, weekDataLabels, scaleLabel } from './reports.utils';
+import { generateWeeksArray, filterByDate, weekDataLabels } from './reports.utils';
 import { ReportsService } from './reports.service';
 import { millisecondsToDay } from '../../meetups/constants';
 import { dedupeShelfReduce, styleVariables } from '../../shared/utils';
@@ -14,8 +15,6 @@ import { MatSelect } from '@angular/material/select';
 import { MatOption } from '@angular/material/autocomplete';
 import { ReportsDetailActivitiesComponent } from './reports-detail-activities.component';
 
-Chart.register(LineController);
-
 @Component({
   selector: 'planet-reports-health',
   templateUrl: './reports-health.component.html',
@@ -130,7 +129,10 @@ export class ReportsHealthComponent implements OnChanges {
     });
   }
 
-  setChart({ data, chartName }) {
+  async setChart({ data, chartName }) {
+    const { Chart } = await loadChart([
+      'LineController', 'LineElement', 'PointElement', 'CategoryScale', 'LinearScale', 'Title', 'Tooltip'
+    ]);
     const updateChart = this.charts.find(chart => chart.canvas.id === chartName);
     if (updateChart) {
       updateChart.data = data;
@@ -141,6 +143,7 @@ export class ReportsHealthComponent implements OnChanges {
       setTimeout(() => this.setChart({ data, chartName }));
       return;
     }
+    const axisTitleFont = { size: 12, weight: 'bold' as const };
     const chartConfig: ChartConfiguration<'line'> = {
       type: 'line',
       data,
@@ -153,9 +156,13 @@ export class ReportsHealthComponent implements OnChanges {
         scales: {
           y: {
             type: 'linear',
-            ticks: {  precision: 0 }
+            ticks: { precision: 0 },
+            title: { display: true, text: $localize`Diagnoses`, font: axisTitleFont }
           },
-          x: { title: { display: true, text: 'Week of' } }
+          x: {
+            type: 'category',
+            title: { display: true, text: $localize`Week of`, font: axisTitleFont }
+          }
         },
       }
     };

src/app/manager-dashboard/reports/reports.utils.ts

@@ -124,10 +124,6 @@ export const generateWeeksArray = (dateRange: { startDate: Date, endDate: Date }
   return weeks;
 };
 
-export const scaleLabel = (labelString: string) => ({
-  display: true, labelString, fontSize: 12, fontStyle: 'bold'
-});
-
 export const sortingOptionsMap = {
   'logins': [
     { name: $localize`Login Time Ascending`, value: 'loginTimeAsc' },

src/app/shared/chart-utils.ts

@@ -39,10 +39,17 @@ export async function loadChart(keys: RegisterableKey[] = []): Promise<ChartJsMo
 }
 
 export function createChartCanvas(width = 300, height = 400): { canvas: HTMLCanvasElement; ctx: CanvasRenderingContext2D | null } {
+  const dpr = typeof window !== 'undefined' ? (window.devicePixelRatio || 1) : 1;
   const canvas = document.createElement('canvas');
-  canvas.width = width;
-  canvas.height = height;
-  return { canvas, ctx: canvas.getContext('2d') };
+  canvas.width = width * dpr;
+  canvas.height = height * dpr;
+  canvas.style.width = `${width}px`;
+  canvas.style.height = `${height}px`;
+  const ctx = canvas.getContext('2d');
+  if (ctx) {
+    ctx.scale(dpr, dpr);
+  }
+  return { canvas, ctx };
 }
 
 export function renderNoDataPlaceholder(ctx: CanvasRenderingContext2D, canvas: HTMLCanvasElement, message = 'No data available'): string {

src/app/submissions/submissions.service.ts

@@ -588,31 +588,35 @@ export class SubmissionsService {
   }
 
   async generateChartImage(data: any): Promise<string> {
-    const { Chart } = await loadChart([
-      'BarController', 'DoughnutController', 'BarElement', 'ArcElement', 'LinearScale', 'CategoryScale', 'Legend', 'Tooltip', 'Title'
-    ]);
-    const { canvas, ctx } = createChartCanvas(300, 400);
     const isBar = data.chartType === 'bar';
     const isRatingScale = data.isRatingScale || false;
+    const { Chart } = await loadChart(isBar
+      ? [ 'BarController', 'BarElement', 'LinearScale', 'CategoryScale', 'Legend', 'Tooltip', 'Title' ]
+      : [ 'DoughnutController', 'ArcElement', 'Legend', 'Tooltip', 'Title' ]
+    );
+    const { canvas, ctx } = createChartCanvas(300, 400);
 
     if (!ctx) {
       return '';
     }
     const hasData = Array.isArray(data.data) && data.data.some((value: number) => Number(value) > 0);
 
     if (!hasData) {
-      renderNoDataPlaceholder(ctx, canvas, 'No data available');
+      return renderNoDataPlaceholder(ctx, canvas, 'No data available');
     }
 
     const maxCount = Math.max(...data.data);
+    const axisTitleFont = { size: 12, weight: 'bold' as const };
+    const xAxisText = isRatingScale ? $localize`Rating` : $localize`Choice`;
+    const yAxisText = isRatingScale ? $localize`Number of responses` : $localize`% of responders`;
+    const backgroundColor = data.labels.map((_, i) => CHART_COLORS[i % CHART_COLORS.length]);
     const chartConfig: ChartConfiguration<'bar' | 'doughnut', number[], string> = {
       type: isBar ? 'bar' : 'doughnut',
       data: {
         labels: data.labels,
         datasets: [ {
           data: data.data,
-          label: isRatingScale ? 'selection/choices(1-9)' : (isBar ? '% of responders/selection' : undefined),
-          backgroundColor: CHART_COLORS
+          backgroundColor
         } ]
       },
       options: {
@@ -621,19 +625,24 @@ export class SubmissionsService {
         indexAxis: 'x',
         plugins: {
           legend: {
-            display: true,
+            display: !isBar,
             labels: {
-              boxWidth: isBar ? 0 : 50,
-              boxHeight: isBar ? 0 : 20
+              boxWidth: 50,
+              boxHeight: 20
             }
           }
         },
         scales: isBar ? {
+          x: {
+            type: 'category',
+            title: { display: true, text: xAxisText, font: axisTitleFont }
+          },
           y: {
             type: 'linear',
             beginAtZero: true,
             max: isRatingScale ? maxCount > 0 ? Math.ceil(maxCount / 10) * 10 : 10 : 100,
-            ticks: { precision: 0, stepSize: 2 }
+            ticks: { precision: 0 },
+            title: { display: true, text: yAxisText, font: axisTitleFont }
           }
         } : {},
         animation: false
@@ -644,11 +653,16 @@ export class SubmissionsService {
     try {
       chart.update();
 
+      ctx.fillStyle = '#000000';
+      ctx.textAlign = 'center';
+      ctx.textBaseline = 'middle';
+      ctx.font = '12px sans-serif';
+
       if (isBar && data.userCounts) {
         chart.getDatasetMeta(0).data.forEach((bar, index) => {
           const count = data.userCounts[index];
           if (count > 0) {
-            ctx.fillText(`${count}`, bar.x - 2.5 , bar.y);
+            ctx.fillText(`${count}`, bar.x, bar.y - 6);
           }
         });
       } else {
@@ -658,7 +672,7 @@ export class SubmissionsService {
           const percentage = total > 0 ? ((count / total) * 100).toFixed(1) : '0';
           if (count > 0) {
             const pos = element.tooltipPosition();
-            ctx.fillText(`${count}(${percentage}%)`, pos.x - 15, pos.y);
+            ctx.fillText(`${count} (${percentage}%)`, pos.x, pos.y);
           }
         });
       }

src/app/teams/teams.utils.ts

@@ -1,6 +1,4 @@
-export const memberCompare = (member1, member2) => member1.userId === member2.userId && member1.userPlanetCode === member2.userPlanetCode;
-
-export const memberNameCompare = (member1, member2) => {
+const memberNameCompare = (member1, member2) => {
   const memberName = (member) =>
     (member.userDoc && member.userDoc.doc.lastName) ||
     (member.userId || '').split(':')[1] ||
@@ -9,6 +7,8 @@ export const memberNameCompare = (member1, member2) => {
   return memberName(member1).localeCompare(memberName(member2));
 };
 
+export const memberCompare = (member1, member2) => member1.userId === member2.userId && member1.userPlanetCode === member2.userPlanetCode;
+
 export const memberSort = (member1, member2, leader) => memberCompare(member1, leader) ?
   -1 :
   memberCompare(member2, leader) ?