Skip to content

Commit 607778a

Browse files
authored
refactor: generalize EntityBlock to support configurable tooltip (#2561)
1 parent c92021e commit 607778a

34 files changed

+242
-437
lines changed

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/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.

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

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

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

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

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

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

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

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

0 commit comments

Comments
 (0)