Release 3.25.1

.github/workflows/pull-request-update.yml

@@ -28,6 +28,19 @@ jobs:
             BUILD=${{ false }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
+      - name: Run tests with timezone
+        uses: docker/build-push-action@v3
+        with:
+          context: ./
+          file: ./build/Dockerfile
+          builder: ${{ steps.buildx.outputs.name }}
+          target: builder
+          build-args: |
+            RUN_TESTS=${{ true }}
+            TZ=America/Detroit
+            BUILD=${{ false }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
   deploy-prod-image:
     runs-on: ubuntu-latest
     steps:

build/Dockerfile

@@ -3,7 +3,7 @@
 # Run the following commands from the root folder to build, run and kill the application
 # >> docker build -f build/Dockerfile -t aam-digital .
 # >> docker run -p=80:80 aam-digital
-FROM node:16.14.2-alpine3.15 as builder
+FROM node:16.14.2-alpine3.15 AS builder
 WORKDIR /app
 
 COPY package*.json ./
@@ -32,6 +32,12 @@ RUN if [ "$UPLOAD_COVERAGE" = true ] ; then \
     chmod +x ./cc-test-reporter &&\
     ./cc-test-reporter before-build ; fi
 
+ARG TZ
+RUN if [ -n "${TZ}" ] ; then \
+    apk --no-cache add tzdata && \
+    cp /usr/share/zoneinfo/Europe/Brussels /etc/localtime && \
+    echo "$TZ" >  /etc/timezone ; fi
+
 # When set to true, chromium is installed an tests are executed
 ARG RUN_TESTS=false
 ARG CHROME_BIN=/usr/bin/chromium-browser
@@ -59,7 +65,7 @@ ARG SENTRY_ORG
 ARG SENTRY_PROJECT
 RUN if [ "$SENTRY_AUTH_TOKEN" != "" ] ; then \
     npm install -g @sentry/cli &&\
-    sentry-cli --auth-token=$SENTRY_AUTH_TOKEN releases --org=$SENTRY_ORG --project=$SENTRY_PROJECT files ndb-core@$APP_VERSION upload-sourcemaps dist  && \
+    sentry-cli --auth-token="$SENTRY_AUTH_TOKEN" releases --org="$SENTRY_ORG" --project="$SENTRY_PROJECT" files "ndb-core@$APP_VERSION" upload-sourcemaps dist  && \
     rm dist/*.map ; fi
 
 ### PROD image

src/app/child-dev-project/attendance/attendance.service.spec.ts

@@ -41,10 +41,10 @@ describe("AttendanceService", () => {
     activity1 = RecurringActivity.create("activity 1");
     activity2 = RecurringActivity.create("activity 2");
 
-    e1_1 = createEvent(new Date("2020-01-01"), activity1.getId(true));
-    e1_2 = createEvent(new Date("2020-01-02"), activity1.getId(true));
-    e1_3 = createEvent(new Date("2020-03-02"), activity1.getId(true));
-    e2_1 = createEvent(new Date("2020-01-01"), activity2.getId(true));
+    e1_1 = createEvent(moment("2020-01-01").toDate(), activity1.getId(true));
+    e1_2 = createEvent(moment("2020-01-02").toDate(), activity1.getId(true));
+    e1_3 = createEvent(moment("2020-03-02").toDate(), activity1.getId(true));
+    e2_1 = createEvent(moment("2020-01-01").toDate(), activity2.getId(true));
 
     TestBed.configureTestingModule({
       imports: [DatabaseTestingModule],
@@ -69,40 +69,50 @@ describe("AttendanceService", () => {
   });
 
   it("gets events for a date", async () => {
-    const actualEvents = await service.getEventsOnDate(new Date("2020-01-01"));
+    const actualEvents = await service.getEventsOnDate(
+      moment("2020-01-01").toDate(),
+    );
     expectEntitiesToMatch(actualEvents, [e1_1, e2_1]);
   });
 
   it("gets events including Notes for a date", async () => {
-    const note1 = Note.create(new Date("2020-01-01"), "manual event note 1");
+    const note1 = Note.create(
+      moment("2020-01-01").toDate(),
+      "manual event note 1",
+    );
     note1.addChild("1");
     note1.addChild("2");
     note1.category = meetingInteractionCategory;
     await entityMapper.save(note1);
 
-    const note2 = Note.create(new Date("2020-01-02"), "manual event note 2");
+    const note2 = Note.create(
+      moment("2020-01-02").toDate(),
+      "manual event note 2",
+    );
     note2.addChild("1");
     note2.category = meetingInteractionCategory;
     await entityMapper.save(note2);
 
     const nonMeetingNote = Note.create(
-      new Date("2020-01-02"),
+      moment("2020-01-02").toDate(),
       "manual event note 3",
     );
     nonMeetingNote.addChild("1");
     nonMeetingNote.category = defaultInteractionTypes.find((t) => !t.isMeeting);
     await entityMapper.save(nonMeetingNote);
 
     const actualEvents = await service.getEventsOnDate(
-      new Date("2020-01-01"),
-      new Date("2020-01-02"),
+      moment("2020-01-01").toDate(),
+      moment("2020-01-02").toDate(),
     );
 
     expectEntitiesToMatch(actualEvents, [e1_1, e1_2, e2_1, note1, note2]);
   });
 
   it("gets empty array for a date without events", async () => {
-    const actualEvents = await service.getEventsOnDate(new Date("2007-01-01"));
+    const actualEvents = await service.getEventsOnDate(
+      moment("2007-01-01").toDate(),
+    );
     expect(actualEvents).toBeEmpty();
   });
 
@@ -210,7 +220,7 @@ describe("AttendanceService", () => {
     const childSchoolRelation = new ChildSchoolRelation();
     childSchoolRelation.childId = "testChild";
     childSchoolRelation.schoolId = "testSchool";
-    childSchoolRelation.start = new Date("2020-01-01");
+    childSchoolRelation.start = moment("2020-01-01").toDate();
     const testActivity = RecurringActivity.create("new activity");
     testActivity.linkedGroups.push("testSchool");
 
@@ -329,10 +339,10 @@ describe("AttendanceService", () => {
 
   it("should load the events for a date with date-picker format", async () => {
     const datePickerDate = new Date(
-      new Date("2021-04-05").setHours(0, 0, 0, 0),
+      moment("2021-04-05").toDate().setHours(0, 0, 0, 0),
     );
     const sameDayEvent = EventNote.create(
-      new Date("2021-04-05"),
+      moment("2021-04-05").toDate(),
       "Same Day Event",
     );
     sameDayEvent.category = meetingInteractionCategory;

src/app/child-dev-project/attendance/attendance.service.ts

@@ -32,18 +32,27 @@ export class AttendanceService {
         by_date: {
           map: `(doc) => {
             if (doc._id.startsWith("${EventNote.ENTITY_TYPE}")) {
-              var d = new Date(doc.date || null);
-              var dString = d.getFullYear() + "-" + String(d.getMonth()+1).padStart(2, "0") + "-" + String(d.getDate()).padStart(2, "0")
-              emit(dString);
+              if (doc.date && doc.date.length === 10) {
+                emit(doc.date);
+              } else {
+                var d = new Date(doc.date || null);
+                var dString = d.getFullYear() + "-" + String(d.getMonth()+1).padStart(2, "0") + "-" + String(d.getDate()).padStart(2, "0");
+                emit(dString);
+              }
             }
           }`,
         },
         // TODO: remove this and use general Note's relatedEntities index?
         by_activity: {
           map: `(doc) => {
             if (doc._id.startsWith("${EventNote.ENTITY_TYPE}") && doc.relatesTo) {
-              var d = new Date(doc.date || null);
-              var dString = d.getFullYear() + "-" + String(d.getMonth()+1).padStart(2, "0") + "-" + String(d.getDate()).padStart(2, "0")
+              var dString;
+              if (doc.date && doc.date.length === 10) {
+                dString = doc.date;
+              } else {            
+                var d = new Date(doc.date || null);
+                dString = d.getFullYear() + "-" + String(d.getMonth()+1).padStart(2, "0") + "-" + String(d.getDate()).padStart(2, "0");
+              }
               emit(doc.relatesTo + "_" + dString);
             }
           }`,

src/app/child-dev-project/children/children-components.ts

@@ -45,11 +45,11 @@ export const childrenComponents: ComponentTuple[] = [
       ).then((c) => c.ChildrenBmiDashboardComponent),
   ],
   [
-    "EducationalMaterial",
+    "RelatedEntitiesWithSummary",
     () =>
       import(
-        "./educational-material/educational-material-component/educational-material.component"
-      ).then((c) => c.EducationalMaterialComponent),
+        "../../core/entity-details/related-entities-with-summary/related-entities-with-summary.component"
+      ).then((c) => c.RelatedEntitiesWithSummaryComponent),
   ],
   [
     "BmiBlock",

src/app/child-dev-project/children/children.service.spec.ts

@@ -269,6 +269,22 @@ describe("ChildrenService", () => {
     res = await service.getNotesRelatedTo(s1.getId(true));
     expect(res).toEqual([n1]);
   });
+
+  it("should return the correct notes in a timespan", async () => {
+    const n1 = Note.create(moment("2023-01-01").toDate());
+    const n2 = Note.create(moment("2023-01-02").toDate());
+    const n3 = Note.create(moment("2023-01-03").toDate());
+    const n4 = Note.create(moment("2023-01-03").toDate());
+    const n5 = Note.create(moment("2023-01-04").toDate());
+    await entityMapper.saveAll([n1, n2, n3, n4, n5]);
+
+    const res = await service.getNotesInTimespan(
+      moment("2023-01-02"),
+      moment("2023-01-03"),
+    );
+
+    expect(res).toEqual(jasmine.arrayWithExactContents([n2, n3, n4]));
+  });
 });
 
 function generateChildEntities(): Child[] {

src/app/child-dev-project/children/children.service.ts

@@ -222,9 +222,12 @@ export class ChildrenService {
           map: `(doc) => {
             if (!doc._id.startsWith("${Note.ENTITY_TYPE}")) return;
             if (!Array.isArray(doc.children) || !doc.date) return;
-            var d = new Date(doc.date || null);
-            var dString = d.getFullYear() + "-" + String(d.getMonth()+1).padStart(2, "0") + "-" + String(d.getDate()).padStart(2, "0")
-            emit(dString);
+            if (doc.date.length === 10) {
+              emit(doc.date);
+            } else {            
+              var d = new Date(doc.date || null);
+              emit(d.getFullYear() + "-" + String(d.getMonth()+1).padStart(2, "0") + "-" + String(d.getDate()).padStart(2, "0"));
+            }
           }`,
         },
       },
@@ -246,12 +249,15 @@ export class ChildrenService {
           map: `(doc) => {
             if (!doc._id.startsWith("${Note.ENTITY_TYPE}")) return;
             if (!Array.isArray(doc.relatedEntities)) return;
-
-            var d = new Date(doc.date || null);
-            var dateString = d.getFullYear() + "-" + String(d.getMonth()+1).padStart(2, "0") + "-" + String(d.getDate()).padStart(2, "0")
-
+            var dString;
+            if (doc.date && doc.date.length === 10) {
+              dString = doc.date;
+            } else {            
+              var d = new Date(doc.date || null);
+              dString = d.getFullYear() + "-" + String(d.getMonth()+1).padStart(2, "0") + "-" + String(d.getDate()).padStart(2, "0");
+            }
             doc.relatedEntities.forEach((relatedEntity) => {
-              emit([relatedEntity, dateString]);
+              emit([relatedEntity, dString]);
             });
           }`,
         },