Called reload when selecting dive in tanks, options and depths

jirkapok · Dec 3, 2023 · c801846 · c801846
1 parent f68eec8
commit c801846
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/projects/planner/src/app/altitude/altitude.component.ts b/projects/planner/src/app/altitude/altitude.component.ts
@@ -24,6 +24,7 @@ export class AltitudeComponent implements OnInit {
     @Input()
     public altitudeForm!: FormGroup;
 
+    // TODO move to unit defaults
     private metricLevels = [0, 300, 800, 1500];
     private imperialLevels = [0, 1000, 2600, 5000];
 

diff --git a/projects/planner/src/app/diveoptions/diveoptions.component.ts b/projects/planner/src/app/diveoptions/diveoptions.component.ts
@@ -97,6 +97,7 @@ export class DiveOptionsComponent extends Streamed implements OnInit {
         return this.inputs.controlInValid(ascentSpeed50perc);
     }
 
+    // TODO fix property binding when changing selected dive
     public get options(): OptionsService {
         return this.schedules.selectedOptions;
     }
@@ -123,7 +124,10 @@ export class DiveOptionsComponent extends Streamed implements OnInit {
         });
 
         this.dispatcher.optionsReloaded$.pipe(takeUntil(this.unsubscribe$))
-            .subscribe(() => this.reloadForm());
+            .subscribe(() => this.reload());
+
+        this.dispatcher.selectedChanged$.pipe(takeUntil(this.unsubscribe$))
+            .subscribe(() => this.reload());
     }
 
     // public reset(): void {
@@ -168,13 +172,13 @@ export class DiveOptionsComponent extends Streamed implements OnInit {
     public useRecreational(): void {
         this.options.useRecreational();
         this.fireChanged();
-        this.reloadForm();
+        this.reload();
     }
 
     public useRecommended(): void {
         this.options.useRecommended();
         this.fireChanged();
-        this.reloadForm();
+        this.reload();
     }
 
     public switchStopsRounding(): void {
@@ -240,7 +244,7 @@ export class DiveOptionsComponent extends Streamed implements OnInit {
         this.dispatcher.sendOptionsChanged();
     }
 
-    private reloadForm(): void {
+    private reload(): void {
         this.optionsForm.patchValue({
             maxEND: Precision.round(this.options.maxEND, 1),
             problem: Precision.round(this.options.problemSolvingDuration, 1),

diff --git a/projects/planner/src/app/tanks-complex/tanks-complex.component.ts b/projects/planner/src/app/tanks-complex/tanks-complex.component.ts
@@ -73,6 +73,9 @@ export class TanksComplexComponent extends Streamed implements OnInit {
 
         this.dispatcher.tanksReloaded$.pipe(takeUntil(this.unsubscribe$))
             .subscribe(() => this.reloadAll());
+
+        this.dispatcher.selectedChanged$.pipe(takeUntil(this.unsubscribe$))
+            .subscribe(() => this.reloadAll());
     }
 
     public gasSac(index: number): number {