Merge pull request #1206 from Aam-Digital/tracking-install

small fixes

src/app/child-dev-project/attendance/activity-attendance-section/activity-attendance-section.component.html

@@ -22,6 +22,7 @@
   [records]="records"
   [columns]="columns"
   [showEntity]="showDetails.bind(this)"
+  [getBackgroundColor]="getBackgroundColor"
   [editable]="false"
 >
 </app-entity-subrecord>

src/app/child-dev-project/attendance/activity-attendance-section/activity-attendance-section.component.ts

@@ -147,4 +147,8 @@ export class ActivityAttendanceSectionComponent
       forChild: this.forChild,
     });
   }
+
+  getBackgroundColor?: (rec: ActivityAttendance) => string = (
+    rec: ActivityAttendance
+  ) => rec.getColor(this.forChild);
 }

src/app/child-dev-project/attendance/model/activity-attendance.ts

@@ -2,7 +2,10 @@ import { AttendanceLogicalStatus } from "./attendance-status";
 import { RecurringActivity } from "./recurring-activity";
 import { defaultAttendanceStatusTypes } from "../../../core/config/default-config/default-attendance-status-types";
 import { EventNote } from "./event-note";
-import { WarningLevel } from "../../../core/entity/model/warning-level";
+import {
+  getWarningLevelColor,
+  WarningLevel,
+} from "../../../core/entity/model/warning-level";
 import { Entity } from "../../../core/entity/model/entity";
 
 /**
@@ -214,6 +217,10 @@ export class ActivityAttendance extends Entity {
       return WarningLevel.OK;
     }
   }
+
+  public getColor(forChildId?: string): string {
+    return getWarningLevelColor(this.getWarningLevel(forChildId));
+  }
 }
 
 /**

src/app/core/ui/ui/ui.component.scss

@@ -85,6 +85,7 @@ app-search {
 .site-logo {
   width: 180px;
   padding: 8px;
+  margin: auto;
 }
 
 .user-nav-button {

src/app/pwa-install/pwa-install.component.html

@@ -3,6 +3,9 @@
   mat-button
   class="pwa-install-button"
   style="background-color: #ff9800"
+  angulartics2On="click"
+  angularticsCategory="UserAction"
+  angularticsAction="install_app"
   fxFlex
   (click)="pwaInstallButtonClicked()"
 >

src/app/pwa-install/pwa-install.component.spec.ts

@@ -4,9 +4,9 @@ import { PwaInstallComponent } from "./pwa-install.component";
 import { PwaInstallModule } from "./pwa-install.module";
 import { PwaInstallService, PWAInstallType } from "./pwa-install.service";
 import { MatSnackBar } from "@angular/material/snack-bar";
-import { FontAwesomeTestingModule } from "@fortawesome/angular-fontawesome/testing";
 import { Subject } from "rxjs";
 import { take } from "rxjs/operators";
+import { MockedTestingModule } from "../utils/mocked-testing.module";
 
 describe("PwaInstallComponent", () => {
   let mockPWAInstallService: jasmine.SpyObj<PwaInstallService>;
@@ -20,7 +20,7 @@ describe("PwaInstallComponent", () => {
     );
     mockSnackbar = jasmine.createSpyObj(["openFromTemplate"]);
     await TestBed.configureTestingModule({
-      imports: [PwaInstallModule, FontAwesomeTestingModule],
+      imports: [PwaInstallModule, MockedTestingModule],
       providers: [
         { provide: PwaInstallService, useValue: mockPWAInstallService },
         { provide: MatSnackBar, useValue: mockSnackbar },

src/app/pwa-install/pwa-install.module.ts

@@ -10,6 +10,7 @@ import { MatToolbarModule } from "@angular/material/toolbar";
 import { PwaInstallService } from "./pwa-install.service";
 import { MatSnackBarModule } from "@angular/material/snack-bar";
 import { WINDOW_TOKEN } from "../utils/di-tokens";
+import { Angulartics2Module } from "angulartics2";
 @NgModule({
   declarations: [PwaInstallComponent],
   imports: [
@@ -21,6 +22,7 @@ import { WINDOW_TOKEN } from "../utils/di-tokens";
     MatSidenavModule,
     MatToolbarModule,
     MatSnackBarModule,
+    Angulartics2Module,
   ],
   providers: [PwaInstallService, { provide: WINDOW_TOKEN, useValue: window }],
   exports: [PwaInstallComponent],