-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1406 from Aam-Digital/master
Co-authored-by: Schottkyc137 <45085299+Schottkyc137@users.noreply.github.com> Co-authored-by: MattKNichols <mattknichols@gmail.com> Co-authored-by: Sebastian <sebastian.leidig@gmail.com>
- Loading branch information
Showing
46 changed files
with
1,539 additions
and
9,627 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,4 +12,4 @@ module.exports = { | |
| "core": { | ||
| "builder": "@storybook/builder-webpack5" | ||
| } | ||
| } | ||
| } | ||
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
102 changes: 52 additions & 50 deletions
102
src/app/child-dev-project/children/aser/model/skill-levels.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,57 +1,59 @@ | ||
| import { | ||
| ConfigurableEnumConfig, | ||
| ConfigurableEnumValue, | ||
| EMPTY, | ||
| } from "../../../../core/configurable-enum/configurable-enum.interface"; | ||
| import { Ordering } from "../../../../core/configurable-enum/configurable-enum-ordering"; | ||
|
|
||
| export type SkillLevel = ConfigurableEnumValue & { passed?: boolean }; | ||
| export type SkillLevel = Ordering.EnumValue & { passed?: boolean }; | ||
|
|
||
| export const readingLevels: ConfigurableEnumConfig<SkillLevel> = [ | ||
| EMPTY, | ||
| { | ||
| id: "Nothing", | ||
| label: $localize`:Label reading level:Nothing`, | ||
| }, | ||
| { | ||
| id: "Read Letters", | ||
| label: $localize`:Label reading level:Read Letters`, | ||
| }, | ||
| { | ||
| id: "Read Words", | ||
| label: $localize`:Label reading level:Read Words`, | ||
| }, | ||
| { | ||
| id: "Read Sentence", | ||
| label: $localize`:Label reading level:Read Sentence`, | ||
| }, | ||
| { | ||
| id: "Read Paragraph", | ||
| label: $localize`:Label reading level:Read Paragraph`, | ||
| passed: true, | ||
| }, | ||
| ]; | ||
| export const readingLevels: ConfigurableEnumConfig<SkillLevel> = | ||
| Ordering.imposeTotalOrdering([ | ||
| EMPTY, | ||
| { | ||
| id: "Nothing", | ||
| label: $localize`:Label reading level:Nothing`, | ||
| }, | ||
| { | ||
| id: "Read Letters", | ||
| label: $localize`:Label reading level:Read Letters`, | ||
| }, | ||
| { | ||
| id: "Read Words", | ||
| label: $localize`:Label reading level:Read Words`, | ||
| }, | ||
| { | ||
| id: "Read Sentence", | ||
| label: $localize`:Label reading level:Read Sentence`, | ||
| }, | ||
| { | ||
| id: "Read Paragraph", | ||
| label: $localize`:Label reading level:Read Paragraph`, | ||
| passed: true, | ||
| }, | ||
| ]); | ||
|
|
||
| export const mathLevels: ConfigurableEnumConfig<SkillLevel> = [ | ||
| EMPTY, | ||
| { | ||
| id: "Nothing", | ||
| label: $localize`:Label math level:Nothing`, | ||
| }, | ||
| { | ||
| id: "Numbers 1-9", | ||
| label: $localize`:Label math level:Numbers 1-9`, | ||
| }, | ||
| { | ||
| id: "Numbers 10-99", | ||
| label: $localize`:Label math level:Numbers 10-99`, | ||
| }, | ||
| { | ||
| id: "Subtraction", | ||
| label: $localize`:Label math level:Subtraction`, | ||
| }, | ||
| { | ||
| id: "Division", | ||
| label: $localize`:Label math level:Division`, | ||
| passed: true, | ||
| }, | ||
| ]; | ||
| export const mathLevels: ConfigurableEnumConfig<SkillLevel> = | ||
| Ordering.imposeTotalOrdering([ | ||
| EMPTY, | ||
| { | ||
| id: "Nothing", | ||
| label: $localize`:Label math level:Nothing`, | ||
| }, | ||
| { | ||
| id: "Numbers 1-9", | ||
| label: $localize`:Label math level:Numbers 1-9`, | ||
| }, | ||
| { | ||
| id: "Numbers 10-99", | ||
| label: $localize`:Label math level:Numbers 10-99`, | ||
| }, | ||
| { | ||
| id: "Subtraction", | ||
| label: $localize`:Label math level:Subtraction`, | ||
| }, | ||
| { | ||
| id: "Division", | ||
| label: $localize`:Label math level:Division`, | ||
| passed: true, | ||
| }, | ||
| ]); |
16 changes: 16 additions & 0 deletions
16
...d-dev-project/children/child-block/child-block-tooltip/child-block-tooltip.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| <img [src]="entity?.photo?.photo?.value" class="child-pic" alt=""/> | ||
| <div> | ||
| <!-- Font-weight is applied as style to override the default --> | ||
| <h3 style="font-weight: bold">{{ entity?.name }}</h3> | ||
| <a><fa-icon icon="phone"></fa-icon> {{ entity?.phone }}</a> | ||
| <p *ngIf="entity?.schoolId || entity?.schoolClass"> | ||
| <app-school-block | ||
| [entityId]="entity?.schoolId" | ||
| [linkDisabled]="true" | ||
| ></app-school-block | ||
| >, | ||
| <ng-container i18n="The class a child is attending|e.g. 'class 8'" *ngIf="entity.schoolClass"> | ||
| class {{ entity?.schoolClass }} | ||
| </ng-container> | ||
| </p> | ||
| </div> |
18 changes: 18 additions & 0 deletions
18
...d-dev-project/children/child-block/child-block-tooltip/child-block-tooltip.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| @use "@angular/material" as mat; | ||
|
|
||
| .child-pic { | ||
| width: 80px; | ||
| height: 80px; | ||
| border-radius: 100vmax; | ||
| object-fit: cover; | ||
| border: 3px solid mat.get-color-from-palette(mat.$grey-palette, 500); | ||
| @include mat.elevation(2); | ||
| } | ||
|
|
||
| :host { | ||
| padding: 0.5em; | ||
| display: flex; | ||
| flex-direction: row; | ||
| gap: 2em; | ||
| align-items: center; | ||
| } |
Oops, something went wrong.