Release 3.41.2

Aam-Digital · Sep 11, 2024 · 0418c65 · 0418c65
2 parents 9a7ac26 + ed9fd7b
commit 0418c65
Show file tree

Hide file tree

Showing 94 changed files with 13,045 additions and 12,676 deletions.
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -35,8 +35,9 @@ COPY --from=base-with-dependencies /opt/app /opt/app
 
 RUN apt-get update && apt-get install -y curl
 WORKDIR /tmp
-# 121.0.6167.139-1~deb12u1 -> 2024-02-01
-ARG CHROMIUM_VERSION=121.0.6167.139-1~deb12u1
+# 120.0.6099.224-1~deb11u1 -> 2024-02-01
+# 128.0.6613.113-1~deb12u1-> 2024-08-30
+ARG CHROMIUM_VERSION=128.0.6613.113-1~deb12u1
 RUN curl -o chromium-common.deb https://ftp.debian.org/debian/pool/main/c/chromium/chromium-common_${CHROMIUM_VERSION}_$(dpkg --print-architecture).deb
 RUN curl -o chromium.deb https://ftp.debian.org/debian/pool/main/c/chromium/chromium_${CHROMIUM_VERSION}_$(dpkg --print-architecture).deb
 RUN apt-get install -y ./chromium-common.deb ./chromium.deb build-essential git libssl-dev

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -116,6 +116,7 @@
     "karma-jasmine": "^5.1.0",
     "karma-jasmine-html-reporter": "^2.1.0",
     "mockdate": "^3.0.5",
+    "ngx-i18nsupport": "^0.17.1",
     "prettier": "^3.3.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

diff --git a/src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html b/src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html
@@ -63,14 +63,13 @@
     </div>
   </div>
 
-  <app-child-block
+  <app-entity-block
     class="margin-small"
     *ngIf="!isFinished"
     [entity]="currentChild"
     [linkDisabled]="true"
-    [tooltipDisabled]="true"
   >
-  </app-child-block>
+  </app-entity-block>
 
   <div *ngIf="!isFinished && currentAttendance" class="tab-wrapper">
     <app-roll-call-tab

diff --git a/src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.ts b/src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.ts
@@ -23,7 +23,6 @@ import { NgClass, NgForOf, NgIf } from "@angular/common";
 import { MatProgressBarModule } from "@angular/material/progress-bar";
 import { MatButtonModule } from "@angular/material/button";
 import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
-import { ChildBlockComponent } from "../../../children/child-block/child-block.component";
 import { RollCallTabComponent } from "./roll-call-tab/roll-call-tab.component";
 import {
   HAMMER_GESTURE_CONFIG,
@@ -34,6 +33,7 @@ import Hammer from "hammerjs";
 import { ConfigurableEnumService } from "../../../../core/basic-datatypes/configurable-enum/configurable-enum.service";
 import { MatTooltipModule } from "@angular/material/tooltip";
 import { ConfirmationDialogService } from "../../../../core/common-components/confirmation-dialog/confirmation-dialog.service";
+import { EntityBlockComponent } from "../../../../core/basic-datatypes/entity/entity-block/entity-block.component";
 
 // Only allow horizontal swiping
 @Injectable()
@@ -65,7 +65,7 @@ class HorizontalHammerConfig extends HammerGestureConfig {
     MatProgressBarModule,
     MatButtonModule,
     FontAwesomeModule,
-    ChildBlockComponent,
+    EntityBlockComponent,
     NgForOf,
     NgClass,
     RollCallTabComponent,

diff --git a/src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.scss b/src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.scss
@@ -4,8 +4,8 @@
 @use "typography/custom-typography";
 
 .cards-wrapper {
-  @include grid-layout.adaptive($min-block-width: 250px);
   margin-top: sizes.$large;
+  @include grid-layout.adaptive($min-block-width: 250px);
 }
 
 .mat-mdc-card[disabled] {

diff --git a/...d-dev-project/children/child-block/child-block-tooltip/child-block-tooltip.component.html b/...d-dev-project/children/child-block/child-block-tooltip/child-block-tooltip.component.html
diff --git a/...d-dev-project/children/child-block/child-block-tooltip/child-block-tooltip.component.scss b/...d-dev-project/children/child-block/child-block-tooltip/child-block-tooltip.component.scss
diff --git a/...ev-project/children/child-block/child-block-tooltip/child-block-tooltip.component.spec.ts b/...ev-project/children/child-block/child-block-tooltip/child-block-tooltip.component.spec.ts
diff --git a/...ild-dev-project/children/child-block/child-block-tooltip/child-block-tooltip.component.ts b/...ild-dev-project/children/child-block/child-block-tooltip/child-block-tooltip.component.ts
diff --git a/...child-dev-project/children/child-block/child-block-tooltip/child-block-tooltip.stories.ts b/...child-dev-project/children/child-block/child-block-tooltip/child-block-tooltip.stories.ts
diff --git a/src/app/child-dev-project/children/child-block/child-block.component.html b/src/app/child-dev-project/children/child-block/child-block.component.html
diff --git a/src/app/child-dev-project/children/child-block/child-block.component.scss b/src/app/child-dev-project/children/child-block/child-block.component.scss
diff --git a/src/app/child-dev-project/children/child-block/child-block.component.spec.ts b/src/app/child-dev-project/children/child-block/child-block.component.spec.ts
diff --git a/src/app/child-dev-project/children/child-block/child-block.component.ts b/src/app/child-dev-project/children/child-block/child-block.component.ts