Distinguished calculated results in diff

jirkapok · Apr 5, 2024 · fa70de9 · fa70de9
1 parent 6969fb3
commit fa70de9
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 7 deletions.
diff --git a/projects/planner/src/app/diff/gasconsumed/diff-gas-consumed/diff-gas-consumed.component.html b/projects/planner/src/app/diff/gasconsumed/diff-gas-consumed/diff-gas-consumed.component.html
@@ -8,8 +8,10 @@
 
     <div class="card-body card-minheight card-max-height-md">
         <div class="pb-3">
-            <app-diff-gas-consumed-tank-chart *ngFor="let gasDiff of gasesDifference" [gasDiff]="gasDiff">
-            </app-diff-gas-consumed-tank-chart>
+            <ng-container *ngIf="profileDif.showConsumption">
+                <app-diff-gas-consumed-tank-chart *ngFor="let gasDiff of gasesDifference" [gasDiff]="gasDiff">
+                </app-diff-gas-consumed-tank-chart>
+            </ng-container>
         </div>
     </div>
 </div>
diff --git a/projects/planner/src/app/diff/gasconsumed/diff-gas-consumed/diff-gas-consumed.component.ts b/projects/planner/src/app/diff/gasconsumed/diff-gas-consumed/diff-gas-consumed.component.ts
@@ -1,6 +1,7 @@
 import { Component } from '@angular/core';
 import { faSlidersH } from '@fortawesome/free-solid-svg-icons';
 import { GasesComparisonService, ConsumedGasDifference } from '../../../shared/diff/gases-comparison.service';
+import { ProfileComparatorService } from '../../../shared/diff/profileComparatorService';
 
 @Component({
     selector: 'app-diff-gas-consumed',
@@ -10,7 +11,7 @@ import { GasesComparisonService, ConsumedGasDifference } from '../../../shared/d
 export class GasConsumedDifferenceComponent {
     public icon = faSlidersH;
 
-    constructor(public gasesDiff: GasesComparisonService) {
+    constructor(public profileDif: ProfileComparatorService, public gasesDiff: GasesComparisonService) {
     }
 
     public get gasesDifference(): ConsumedGasDifference[] {

diff --git a/projects/planner/src/app/diff/waypoints/diff-waypoints.component.html b/projects/planner/src/app/diff/waypoints/diff-waypoints.component.html
@@ -6,9 +6,9 @@
         </div>
     </div>
     <div id="body" class="hide card-minheight card-max-height-md">
-        <app-calculating [show]="!profileDiff.bothResultsCalculated"></app-calculating>
+        <app-calculating [show]="!profileDiff.profilesCalculated"></app-calculating>
 
-        <table *ngIf="profileDiff.bothResultsCalculated"
+        <table *ngIf="profileDiff.profilesCalculated"
             id="waypointsDiffTable" class="table table-sm p-0 text-center table-hover" >
             <thead class="table-light sticky-top">
             <tr>

diff --git a/projects/planner/src/app/shared/diff/profileComparatorService.ts b/projects/planner/src/app/shared/diff/profileComparatorService.ts
@@ -104,6 +104,10 @@ export class ProfileComparatorService extends Streamed {
         return this.profileAResults.profileCalculated && this.profileBResults.profileCalculated;
     }
 
+    public get showConsumption(): boolean {
+        return this.profileAResults.showResults && this.profileBResults.showResults;
+    }
+
     private get wayPointsA(): WayPoint[]{
         return this.profileAResults.wayPoints;
     }

diff --git a/projects/planner/src/app/shared/diff/profileCompoarator.service.spec.ts b/projects/planner/src/app/shared/diff/profileCompoarator.service.spec.ts
@@ -114,12 +114,25 @@ describe('ProfileComparison service', () => {
             expect(sut.profilesCalculated).toBeFalsy();
         });
 
-        it('Profiles are already calculated', () => {
-            // TODO distinguish profile calculated, consumption and diveInfo
+        it('Dive profiles are already calculated', () => {
             sut.profileAResults.profileFinished();
             sut.profileBResults.profileFinished();
             expect(sut.profilesCalculated).toBeTruthy();
         });
+
+        it('Dive results are already calculated', () => {
+            sut.profileAResults.diveInfoFinished();
+            sut.profileAResults.consumptionFinished();
+            sut.profileBResults.diveInfoFinished();
+            sut.profileBResults.consumptionFinished();
+            expect(sut.bothResultsCalculated).toBeTruthy();
+        });
+
+        it('Consumption are already calculated', () => {
+            sut.profileAResults.consumptionFinished();
+            sut.profileBResults.consumptionFinished();
+            expect(sut.showConsumption).toBeTruthy();
+        });
     });
 
     describe('Select new profile', () => {