Skip to content

Commit 0418c65

Browse files
authored
Release 3.41.2
2 parents 9a7ac26 + ed9fd7b commit 0418c65

File tree

94 files changed

+13045
-12676
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+13045
-12676
lines changed

build/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ COPY --from=base-with-dependencies /opt/app /opt/app
3535

3636
RUN apt-get update && apt-get install -y curl
3737
WORKDIR /tmp
38-
# 121.0.6167.139-1~deb12u1 -> 2024-02-01
39-
ARG CHROMIUM_VERSION=121.0.6167.139-1~deb12u1
38+
# 120.0.6099.224-1~deb11u1 -> 2024-02-01
39+
# 128.0.6613.113-1~deb12u1-> 2024-08-30
40+
ARG CHROMIUM_VERSION=128.0.6613.113-1~deb12u1
4041
RUN curl -o chromium-common.deb https://ftp.debian.org/debian/pool/main/c/chromium/chromium-common_${CHROMIUM_VERSION}_$(dpkg --print-architecture).deb
4142
RUN curl -o chromium.deb https://ftp.debian.org/debian/pool/main/c/chromium/chromium_${CHROMIUM_VERSION}_$(dpkg --print-architecture).deb
4243
RUN apt-get install -y ./chromium-common.deb ./chromium.deb build-essential git libssl-dev

package-lock.json

Lines changed: 444 additions & 129 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
"karma-jasmine": "^5.1.0",
117117
"karma-jasmine-html-reporter": "^2.1.0",
118118
"mockdate": "^3.0.5",
119+
"ngx-i18nsupport": "^0.17.1",
119120
"prettier": "^3.3.3",
120121
"react": "^18.3.1",
121122
"react-dom": "^18.3.1",

src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,13 @@
6363
</div>
6464
</div>
6565

66-
<app-child-block
66+
<app-entity-block
6767
class="margin-small"
6868
*ngIf="!isFinished"
6969
[entity]="currentChild"
7070
[linkDisabled]="true"
71-
[tooltipDisabled]="true"
7271
>
73-
</app-child-block>
72+
</app-entity-block>
7473

7574
<div *ngIf="!isFinished && currentAttendance" class="tab-wrapper">
7675
<app-roll-call-tab

src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import { NgClass, NgForOf, NgIf } from "@angular/common";
2323
import { MatProgressBarModule } from "@angular/material/progress-bar";
2424
import { MatButtonModule } from "@angular/material/button";
2525
import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
26-
import { ChildBlockComponent } from "../../../children/child-block/child-block.component";
2726
import { RollCallTabComponent } from "./roll-call-tab/roll-call-tab.component";
2827
import {
2928
HAMMER_GESTURE_CONFIG,
@@ -34,6 +33,7 @@ import Hammer from "hammerjs";
3433
import { ConfigurableEnumService } from "../../../../core/basic-datatypes/configurable-enum/configurable-enum.service";
3534
import { MatTooltipModule } from "@angular/material/tooltip";
3635
import { ConfirmationDialogService } from "../../../../core/common-components/confirmation-dialog/confirmation-dialog.service";
36+
import { EntityBlockComponent } from "../../../../core/basic-datatypes/entity/entity-block/entity-block.component";
3737

3838
// Only allow horizontal swiping
3939
@Injectable()
@@ -65,7 +65,7 @@ class HorizontalHammerConfig extends HammerGestureConfig {
6565
MatProgressBarModule,
6666
MatButtonModule,
6767
FontAwesomeModule,
68-
ChildBlockComponent,
68+
EntityBlockComponent,
6969
NgForOf,
7070
NgClass,
7171
RollCallTabComponent,

src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
@use "typography/custom-typography";
55

66
.cards-wrapper {
7-
@include grid-layout.adaptive($min-block-width: 250px);
87
margin-top: sizes.$large;
8+
@include grid-layout.adaptive($min-block-width: 250px);
99
}
1010

1111
.mat-mdc-card[disabled] {

src/app/child-dev-project/children/child-block/child-block-tooltip/child-block-tooltip.component.html

Lines changed: 0 additions & 29 deletions
This file was deleted.

src/app/child-dev-project/children/child-block/child-block-tooltip/child-block-tooltip.component.scss

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/app/child-dev-project/children/child-block/child-block-tooltip/child-block-tooltip.component.spec.ts

Lines changed: 0 additions & 29 deletions
This file was deleted.

src/app/child-dev-project/children/child-block/child-block-tooltip/child-block-tooltip.component.ts

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)