Replaced nodeco exceeded with event

jirkapok · Aug 17, 2024 · 62a8015 · 62a8015
1 parent 52a147e
commit 62a8015
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 17 deletions.
diff --git a/projects/planner/src/app/dive-issues/dive-issues.component.html b/projects/planner/src/app/dive-issues/dive-issues.component.html
@@ -19,12 +19,6 @@
             shorter than currently planned dive. Use larger tank, fill it with more gas, reduce dive
             duration or planned depth.</span>
     </div>
-    <div *ngIf="dive.diveInfoCalculated && dive.noDecoExceeded" class="alert alert-info">
-        <fa-icon [icon]="info" class="me-2"></fa-icon>
-        <span>No decompression time for current depth exceeded (For no decompression dive set dive time
-            maximum
-            to {{ noDeco | number:'1.0-0' }} min)!</span>
-    </div>
     <div *ngIf="dive.diveInfoCalculated && dive.otuExceeded" class="alert alert-warning">
         <fa-icon [icon]="warning" class="me-2"></fa-icon>
         <span>Exceeded 80 % of maximum single exposure oxygen toxicity units
@@ -40,6 +34,14 @@
     </div>
 
     <ng-container *ngFor="let event of events">
+        <div *ngIf="isNoDeco(event)" class="alert alert-info">
+            <fa-icon [icon]="info" class="me-2"></fa-icon>
+            <strong>{{ event.timeStamp | duration:event.timeStamp
+                }} min, {{ eventDepthFor(event) | number:'1.0-0' }} {{units.length}}: </strong>
+            <span>No decompression time for current depth exceeded (For no decompression dive set dive time
+            maximum
+            to {{ noDeco | number:'1.0-0' }} min)!</span>
+        </div>
         <div *ngIf="isLowPpO2(event)" class="alert alert-warning">
             <fa-icon [icon]="warning" class="me-2"></fa-icon>
             <strong>{{ event.timeStamp | duration:event.timeStamp

diff --git a/projects/planner/src/app/dive-issues/dive-issues.component.ts b/projects/planner/src/app/dive-issues/dive-issues.component.ts
@@ -33,7 +33,6 @@ export class DiveIssuesComponent {
         return this.schedules.selectedDepths.planDuration + 1;
     }
 
-    // TODO replace noDeco from dive results by event
     public get noDeco(): number {
         return this.dive.noDecoTime;
     }
@@ -42,6 +41,10 @@ export class DiveIssuesComponent {
         return this.schedules.selectedResult;
     }
 
+    public isNoDeco(event: Event): boolean {
+        return event.type === EventType.noDecoEnd;
+    }
+
     public isLowPpO2(event: Event): boolean {
         return event.type === EventType.lowPpO2;
     }

diff --git a/projects/planner/src/app/shared/diveresults.ts b/projects/planner/src/app/shared/diveresults.ts
@@ -73,10 +73,6 @@ export class DiveResults {
         return this._diveInfoCalculated && this.noDecoTime < DiveResults.maxAcceptableNdl;
     }
 
-    public get noDecoExceeded(): boolean {
-        return this.planDuration > this.noDecoTime;
-    }
-
     /** the only errors preventing draw chart */
     public get hasErrors(): boolean {
         return this.calculated && (this.failed || this.notEnoughTime);

diff --git a/projects/planner/src/app/shared/planner.service.spec.ts b/projects/planner/src/app/shared/planner.service.spec.ts
@@ -155,12 +155,6 @@ describe('PlannerService', () => {
             planner.calculate(1);
             expect(dive.notEnoughGas).toBeTruthy();
         });
-
-        it('30m for 20 minutes no decompression time exceeded', () => {
-            depthsService.planDuration = 20;
-            planner.calculate(1);
-            expect(dive.noDecoExceeded).toBeTruthy();
-        });
     });
 
     describe('Manage tanks', () => {