Dive Results dashboard

projects/planner/src/app/app.module.ts

@@ -1,94 +1,99 @@
-import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
-import { ReactiveFormsModule  } from '@angular/forms';
-import { ServiceWorkerModule } from '@angular/service-worker';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { DatePipe, DecimalPipe } from '@angular/common';
+import {BrowserModule} from '@angular/platform-browser';
+import {NgModule} from '@angular/core';
+import {ReactiveFormsModule} from '@angular/forms';
+import {ServiceWorkerModule} from '@angular/service-worker';
+import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
+import {FontAwesomeModule} from '@fortawesome/angular-fontawesome';
+import {DatePipe, DecimalPipe} from '@angular/common';
 
-import { ClipboardModule } from 'ngx-clipboard';
-import { MdbCollapseModule } from 'mdb-angular-ui-kit/collapse';
-import { MdbDropdownModule } from 'mdb-angular-ui-kit/dropdown';
-import { MdbFormsModule } from 'mdb-angular-ui-kit/forms';
-import { MdbTabsModule } from 'mdb-angular-ui-kit/tabs';
-import { MdbAccordionModule } from 'mdb-angular-ui-kit/accordion';
+import {ClipboardModule} from 'ngx-clipboard';
+import {MdbCollapseModule} from 'mdb-angular-ui-kit/collapse';
+import {MdbDropdownModule} from 'mdb-angular-ui-kit/dropdown';
+import {MdbFormsModule} from 'mdb-angular-ui-kit/forms';
+import {MdbTabsModule} from 'mdb-angular-ui-kit/tabs';
+import {MdbAccordionModule} from 'mdb-angular-ui-kit/accordion';
 
-import { environment } from '../environments/environment';
-import { AppRoutingModule } from './app-routing.module';
-import { AppComponent } from './app.component';
-import { TanksSimpleComponent } from './tanks-simple/tanks-simple.component';
-import { TanksComplexComponent } from './tanks-complex/tanks-complex.component';
-import { DiverComponent } from './diver/diver.component';
-import { DiveOptionsComponent } from './diveoptions/diveoptions.component';
-import { DiveInfoComponent } from './diveinfo/diveinfo.component';
-import { MainMenuComponent } from './mainmenu/mainmenu.component';
-import { DashboardComponent } from './dashboard/dashboard.component';
-import { GaslabelComponent } from './gaslabel/gaslabel.component';
-import { SacComponent } from './sac/sac.component';
-import { NitroxComponent } from './nitrox/nitrox.component';
-import { WayPointsComponent } from './waypoints/waypoints.component';
-import { ProfileChartComponent } from './profilechart/profilechart.component';
-import { AboutComponent } from './about/about.component';
-import { AppFooterComponent } from './footer/footer.component';
-import { DepthsSimpleComponent } from './depths-simple/depths-simple.component';
-import { DepthsComplexComponent } from './depths-complex/depths-complex.component';
-import { TankChartComponent } from './tank-chart/tank-chart.component';
-import { AppSettingsComponent } from './app-settings/app-settings.component';
-import { CalculatingComponent } from './calculating/calculating.component';
-import { NdlLimitsComponent } from './ndl-limits/ndl-limits.component';
-import { SalinityComponent } from './salinity/salinity.component';
-import { AltitudeComponent } from './altitude/altitude.component';
-import { GradientsComponent } from './gradients/gradients.component';
-import { DepthComponent } from './depth/depth.component';
-import { OxygenComponent } from './oxygen/oxygen.component';
+import {environment} from '../environments/environment';
+import {AppRoutingModule} from './app-routing.module';
+import {AppComponent} from './app.component';
+import {TanksSimpleComponent} from './tanks-simple/tanks-simple.component';
+import {TanksComplexComponent} from './tanks-complex/tanks-complex.component';
+import {DiverComponent} from './diver/diver.component';
+import {DiveOptionsComponent} from './diveoptions/diveoptions.component';
+import {DiveInfoComponent} from './diveinfo/diveinfo.component';
+import {MainMenuComponent} from './mainmenu/mainmenu.component';
+import {DashboardComponent} from './dashboard/dashboard.component';
+import {GaslabelComponent} from './gaslabel/gaslabel.component';
+import {SacComponent} from './sac/sac.component';
+import {NitroxComponent} from './nitrox/nitrox.component';
+import {WayPointsComponent} from './waypoints/waypoints.component';
+import {ProfileChartComponent} from './profilechart/profilechart.component';
+import {AboutComponent} from './about/about.component';
+import {AppFooterComponent} from './footer/footer.component';
+import {DepthsSimpleComponent} from './depths-simple/depths-simple.component';
+import {DepthsComplexComponent} from './depths-complex/depths-complex.component';
+import {TankChartComponent} from './tank-chart/tank-chart.component';
+import {AppSettingsComponent} from './app-settings/app-settings.component';
+import {CalculatingComponent} from './calculating/calculating.component';
+import {NdlLimitsComponent} from './ndl-limits/ndl-limits.component';
+import {SalinityComponent} from './salinity/salinity.component';
+import {AltitudeComponent} from './altitude/altitude.component';
+import {GradientsComponent} from './gradients/gradients.component';
+import {DepthComponent} from './depth/depth.component';
+import {OxygenComponent} from './oxygen/oxygen.component';
 
-import { DurationPipe } from './pipes/duration.pipe';
-import { PlannerService } from './shared/planner.service';
-import { PreferencesStore } from './shared/preferencesStore';
-import { UnitConversion } from './shared/UnitConversion';
-import { SelectedWaypoint } from './shared/selectedwaypointService';
-import { WorkersFactory } from './shared/workers.factory';
-import { WorkersFactoryCommon } from './shared/serial.workers.factory';
-import { NdlService } from './shared/ndl.service';
-import { OptionsService } from './shared/options.service';
-import { PpO2Component } from './pp-o2/pp-o2.component';
-import { DelayedScheduleService } from './shared/delayedSchedule.service';
-import { AppinfoComponent } from './appinfo/appinfo.component';
-import { DiveIssuesComponent } from './dive-issues/dive-issues.component';
-import { InputControls } from './shared/inputcontrols';
-import { ValidatorGroups } from './shared/ValidatorGroups';
-import { DepthsService } from './shared/depths.service';
-import { TanksService } from './shared/tanks.service';
-import { SacCalculatorService } from './shared/sac-calculator.service';
-import { NitroxCalculatorService } from './shared/nitrox-calculator.service';
-import { SettingsNormalizationService } from './shared/settings-normalization.service';
-import { ViewSwitchService } from './shared/viewSwitchService';
-import { OxygenDropDownComponent } from './oxygen-dropdown/oxygen-dropdown.component';
-import { Preferences } from './shared/preferences';
-import { PlanUrlSerialization } from './shared/PlanUrlSerialization';
-import { WayPointsService } from './shared/waypoints.service';
-import { PlanTabsComponent } from './plan.tabs/plan.tabs.component';
-import { TankSizeComponent } from './tank.size/tank.size.component';
-import { StopsFilter } from './shared/stopsFilter.service';
-import { ViewStates } from './shared/viewStates';
-import { Urls } from './shared/navigation.service';
-import { SubViewStorage } from './shared/subViewStorage';
-import { DashboardStartUp } from './shared/startUp';
-import { AltitudeCalcComponent } from './altitude-calc/altitude-calc.component';
-import { WeightCalcComponent } from './weight/weight.component';
-import { GasPropertiesCalcComponent } from './gas.props/gas.props.component';
-import { DiffComponent } from './diff/diff.component';
-import { DiveResults } from './shared/diveresults';
-import { DiveSchedules } from './shared/dive.schedules';
-import { RedundanciesComponent } from './redundancies/redundancies.component';
-import { RedundanciesService } from './shared/redundancies.service';
-import { ReloadDispatcher } from './shared/reloadDispatcher';
-import { ManagedDiveSchedules } from './shared/managedDiveSchedules';
-import { WaypointsDifferenceComponent } from './diff/waypoints/diff-waypoints.component';
-import { DiveInfoDifferenceComponent } from './diff/diveinfo/diff-diveinfo.component';
-import { ProfileDifferenceChartComponent } from './diff/profilechart/diff-profilechart.component';
-import { MaskitoModule } from '@maskito/angular';
-import { SurfaceIntervalComponent } from './surface-interval/surface-interval.component';
+import {DurationPipe} from './pipes/duration.pipe';
+import {PlannerService} from './shared/planner.service';
+import {PreferencesStore} from './shared/preferencesStore';
+import {UnitConversion} from './shared/UnitConversion';
+import {SelectedWaypoint} from './shared/selectedwaypointService';
+import {WorkersFactory} from './shared/workers.factory';
+import {WorkersFactoryCommon} from './shared/serial.workers.factory';
+import {NdlService} from './shared/ndl.service';
+import {OptionsService} from './shared/options.service';
+import {PpO2Component} from './pp-o2/pp-o2.component';
+import {DelayedScheduleService} from './shared/delayedSchedule.service';
+import {AppinfoComponent} from './appinfo/appinfo.component';
+import {DiveIssuesComponent} from './dive-issues/dive-issues.component';
+import {InputControls} from './shared/inputcontrols';
+import {ValidatorGroups} from './shared/ValidatorGroups';
+import {DepthsService} from './shared/depths.service';
+import {TanksService} from './shared/tanks.service';
+import {SacCalculatorService} from './shared/sac-calculator.service';
+import {NitroxCalculatorService} from './shared/nitrox-calculator.service';
+import {SettingsNormalizationService} from './shared/settings-normalization.service';
+import {ViewSwitchService} from './shared/viewSwitchService';
+import {OxygenDropDownComponent} from './oxygen-dropdown/oxygen-dropdown.component';
+import {Preferences} from './shared/preferences';
+import {PlanUrlSerialization} from './shared/PlanUrlSerialization';
+import {WayPointsService} from './shared/waypoints.service';
+import {PlanTabsComponent} from './plan.tabs/plan.tabs.component';
+import {TankSizeComponent} from './tank.size/tank.size.component';
+import {StopsFilter} from './shared/stopsFilter.service';
+import {ViewStates} from './shared/viewStates';
+import {Urls} from './shared/navigation.service';
+import {SubViewStorage} from './shared/subViewStorage';
+import {DashboardStartUp} from './shared/startUp';
+import {AltitudeCalcComponent} from './altitude-calc/altitude-calc.component';
+import {WeightCalcComponent} from './weight/weight.component';
+import {GasPropertiesCalcComponent} from './gas.props/gas.props.component';
+import {DiffComponent} from './diff/diff.component';
+import {DiveResults} from './shared/diveresults';
+import {DiveSchedules} from './shared/dive.schedules';
+import {RedundanciesComponent} from './redundancies/redundancies.component';
+import {RedundanciesService} from './shared/redundancies.service';
+import {ReloadDispatcher} from './shared/reloadDispatcher';
+import {ManagedDiveSchedules} from './shared/managedDiveSchedules';
+import {WaypointsDifferenceComponent} from './diff/waypoints/diff-waypoints.component';
+import {DiveInfoDifferenceComponent} from './diff/diveinfo/diff-diveinfo.component';
+import {ProfileDifferenceChartComponent} from './diff/profilechart/diff-profilechart.component';
+import {MaskitoModule} from '@maskito/angular';
+import {SurfaceIntervalComponent} from './surface-interval/surface-interval.component';
+import {TestDataInjector} from './diff/testData/testDataInjector';
+import {ProfileComparatorService} from './shared/profileComparatorService';
+import {LoadTestDataComponent} from './diff/testData/loadtestdata/loadtestdata.component';
+import {WaypointsDifferenceService} from './shared/waypoints-difference.service';
+import {DiveInfoResultsDifferenceComponent} from './diff/diveinfo/results/diff-diveinfo-results.component';
 
 const ANGULAR_MODULES = [
     AppRoutingModule,
@@ -148,7 +153,9 @@ const COMPONENTS = [
     WeightCalcComponent,
     WaypointsDifferenceComponent,
     DiveInfoDifferenceComponent,
-    ProfileDifferenceChartComponent
+    ProfileDifferenceChartComponent,
+    LoadTestDataComponent,
+    DiveInfoResultsDifferenceComponent
 ];
 
 const SERVICES = [
@@ -182,7 +189,10 @@ const SERVICES = [
     ValidatorGroups,
     ViewStates,
     ViewSwitchService,
-    WayPointsService
+    WayPointsService,
+    TestDataInjector,
+    ProfileComparatorService,
+    WaypointsDifferenceService
 ];
 
 @NgModule({

projects/planner/src/app/diff/diff.component.html

@@ -1,14 +1,15 @@
+<!--<app-loadtestdata></app-loadtestdata>-->
+
 <div class="mt-5">
     <div class="row">
-        <div class="col-12 col-lg-12 col-xl-6 col-xxl-6 mt-4">
+        <div class="col-12 col-xl-6 col-xxl-6 mt-4">
             <app-diff-profilechart></app-diff-profilechart>
         </div>
-        <div class="col-md-6 col-xl-6 mt-4">
-            <app-diff-waypoints [data]="testData"></app-diff-waypoints>
+        <div class="col-xl-6 mt-4">
+            <app-diff-waypoints></app-diff-waypoints>
         </div>
-        <div class="col-md-6 col-xl-5 col-xxl-3 mt-4">
+        <div class="col-xl-6 col-xxl-6 mt-4">
             <app-diff-diveinfo></app-diff-diveinfo>
         </div>
     </div>
 </div>
-

projects/planner/src/app/diff/diff.component.spec.ts

@@ -1,14 +1,24 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {ComponentFixture, TestBed} from '@angular/core/testing';
 
-import { DiffComponent } from './diff.component';
+import {DiffComponent} from './diff.component';
+import {ProfileComparatorService} from '../shared/profileComparatorService';
+import {DiveSchedules} from '../shared/dive.schedules';
+import {UnitConversion} from '../shared/UnitConversion';
+import {ReloadDispatcher} from '../shared/reloadDispatcher';
 
 describe('DiffComponent', () => {
     let component: DiffComponent;
     let fixture: ComponentFixture<DiffComponent>;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            declarations: [DiffComponent]
+            declarations: [DiffComponent],
+            providers: [
+                ProfileComparatorService,
+                DiveSchedules,
+                UnitConversion,
+                ReloadDispatcher
+            ]
         });
         fixture = TestBed.createComponent(DiffComponent);
         component = fixture.componentInstance;

projects/planner/src/app/diff/diff.component.ts

@@ -1,61 +1,12 @@
 import {Component} from '@angular/core';
-import {WayPointsService} from '../shared/waypoints.service';
-import {UnitConversion} from '../shared/UnitConversion';
-import {Segments, StandardGases, Tank, Time} from 'scuba-physics';
-import {WayPoint} from '../shared/models';
-
-export class TestData {
-    public readonly wayPointsA: WayPoint[];
-    public readonly tanksA: Tank[];
-
-    public readonly wayPointsB: WayPoint[];
-    public readonly tanksB: Tank[];
-
-    constructor() {
-        const units = new UnitConversion();
-        const waypointService = new WayPointsService(units);
-
-        this.tanksA = [
-            new Tank(24, 200, 21),
-            new Tank(11, 200, 50),
-            new Tank(11, 150, 100),
-        ];
-        this.tanksA[0].consumed = 120;
-        this.tanksA[1].consumed = 80;
-        this.tanksA[2].consumed = 60;
-
-        const segmentsA = new Segments();
-        segmentsA.add(0, 40, StandardGases.air, Time.oneMinute * 2);
-        segmentsA.add(40, 40, StandardGases.air, Time.oneMinute * 10);
-        segmentsA.add(40, 21, StandardGases.air, Time.oneMinute * 2);
-        segmentsA.add(21, 21, StandardGases.ean50, Time.oneMinute);
-        segmentsA.add(21, 3, StandardGases.ean50, Time.oneMinute * 3);
-        segmentsA.add(3, 3, StandardGases.oxygen, Time.oneMinute * 6);
-        segmentsA.add(3, 0, StandardGases.oxygen, Time.oneMinute);
-        this.wayPointsA = waypointService.calculateWayPoints(segmentsA.items);
-
-        this.tanksB = [
-            new Tank(24, 200, 21),
-            new Tank(11, 200, 50)
-        ];
-        this.tanksB[0].consumed = 90;
-        this.tanksB[1].consumed = 40;
-
-        const segmentsB = new Segments();
-        segmentsB.add(0, 30, StandardGases.air, Time.oneMinute * 4);
-        segmentsB.add(30, 30, StandardGases.air, Time.oneMinute * 10);
-        segmentsB.add(30, 15, StandardGases.air, Time.oneMinute * 3);
-        segmentsB.add(15, 15, StandardGases.ean50, Time.oneMinute);
-        segmentsB.add(15, 0, StandardGases.ean50, Time.oneMinute * 2);
-        this.wayPointsB = waypointService.calculateWayPoints(segmentsB.items);
-    }
-}
+import {ProfileComparatorService} from '../shared/profileComparatorService';
 
 @Component({
     selector: 'app-diff',
     templateUrl: './diff.component.html',
     styleUrls: ['./diff.component.scss']
 })
 export class DiffComponent {
-    public testData = new TestData();
+    constructor(public profileComparatorService: ProfileComparatorService) {
+    }
 }

projects/planner/src/app/diff/diveinfo/diff-diveinfo.component.html

@@ -1 +1,15 @@
-<app-diveinfo></app-diveinfo>
+<div class="card">
+    <div class="card-header">
+        <div class="float-start mt-1">
+            <fa-icon [icon]="icon" class="me-3"></fa-icon>
+            <span>Dive Results</span>
+        </div>
+    </div>
+
+    <div class="card-body card-minheight">
+        <div class="pb-3">
+            <app-diff-diveinfo-results></app-diff-diveinfo-results>
+        </div>
+    </div>
+</div>
+

projects/planner/src/app/diff/diveinfo/diff-diveinfo.component.spec.ts

@@ -1,6 +1,6 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {ComponentFixture, TestBed} from '@angular/core/testing';
 
-import { DiveInfoDifferenceComponent } from './diff-diveinfo.component';
+import {DiveInfoDifferenceComponent} from './diff-diveinfo.component';
 
 describe('DiveInfoDifferenceComponent', () => {
     let component: DiveInfoDifferenceComponent;

projects/planner/src/app/diff/diveinfo/diff-diveinfo.component.ts

@@ -1,10 +1,11 @@
-import { Component } from '@angular/core';
+import {Component} from '@angular/core';
+import {faSlidersH} from '@fortawesome/free-solid-svg-icons';
 
 @Component({
     selector: 'app-diff-diveinfo',
     templateUrl: './diff-diveinfo.component.html',
     styleUrls: ['./diff-diveinfo.component.scss']
 })
 export class DiveInfoDifferenceComponent {
-
+    public icon = faSlidersH;
 }