Replaced obsolete Moskito module

jirkapok · Feb 29, 2024 · 4300950 · 4300950
1 parent f644e46
commit 4300950
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/projects/planner/src/app/app.module.ts b/projects/planner/src/app/app.module.ts
@@ -87,7 +87,6 @@ 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';
@@ -150,7 +149,6 @@ const COMPONENTS = [
     RedundanciesComponent,
     SacComponent,
     SalinityComponent,
-    SurfaceIntervalComponent,
     TankChartComponent,
     TanksComplexComponent,
     TanksSimpleComponent,
@@ -162,6 +160,10 @@ const COMPONENTS = [
     LoadTestDataComponent
 ];
 
+const STANDALONE = [
+    SurfaceIntervalComponent,
+];
+
 const SERVICES = [
     { provide: WorkersFactoryCommon, useClass: WorkersFactory },
     DatePipe,
@@ -205,14 +207,14 @@ const SERVICES = [
     imports: [
         ...ANGULAR_MODULES,
         ...MDB_MODULES,
+        STANDALONE,
         ClipboardModule,
         ServiceWorkerModule.register('ngsw-worker.js', {
             enabled: environment.production,
             // Register the ServiceWorker as soon as the application is stable
             // or after 30 seconds (whichever comes first).
             registrationStrategy: 'registerWhenStable:30000'
-        }),
-        MaskitoModule  // TODO replace obsolite MaskitoModule
+        })
     ],
     exports: [],
     providers: SERVICES,

diff --git a/projects/planner/src/app/depths-simple/depths-simple.component.spec.ts b/projects/planner/src/app/depths-simple/depths-simple.component.spec.ts
@@ -20,8 +20,7 @@ import { DiveSchedules } from '../shared/dive.schedules';
 import { ReloadDispatcher } from '../shared/reloadDispatcher';
 import { Time } from 'scuba-physics';
 import { SurfaceIntervalComponent } from '../surface-interval/surface-interval.component';
-import { MaskitoModule } from '@maskito/angular';
-import { DepthComponent } from "../depth/depth.component";
+import { DepthComponent } from '../depth/depth.component';
 
 export class SimpleDepthsPage {
     constructor(private fixture: ComponentFixture<DepthsSimpleComponent>) { }
@@ -55,8 +54,8 @@ describe('Depths Simple Component', () => {
 
     beforeEach(async () => {
         await TestBed.configureTestingModule({
-            declarations: [ DepthsSimpleComponent, SurfaceIntervalComponent, DepthComponent ],
-            imports: [ ReactiveFormsModule, MaskitoModule ],
+            declarations: [ DepthsSimpleComponent, DepthComponent ],
+            imports: [ ReactiveFormsModule, SurfaceIntervalComponent ],
             providers: [
                 WorkersFactoryCommon, PlannerService,
                 UnitConversion, InputControls, DiveSchedules,

diff --git a/projects/planner/src/app/surface-interval/surface-interval.component.spec.ts b/projects/planner/src/app/surface-interval/surface-interval.component.spec.ts
@@ -13,7 +13,7 @@ describe('SurfaceIntervalComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            declarations: [SurfaceIntervalComponent],
+            imports: [ SurfaceIntervalComponent ],
             providers: [
                 DiveSchedules, UnitConversion, DecimalPipe,
                 ReloadDispatcher, InputControls, ValidatorGroups

diff --git a/projects/planner/src/app/surface-interval/surface-interval.component.ts b/projects/planner/src/app/surface-interval/surface-interval.component.ts
@@ -1,18 +1,30 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { AbstractControl, FormControl, FormGroup, NonNullableFormBuilder } from '@angular/forms';
+import {
+    AbstractControl, FormControl, FormGroup,
+    NonNullableFormBuilder, ReactiveFormsModule
+} from '@angular/forms';
 import { maskitoTimeOptionsGenerator } from '@maskito/kit';
+import { MaskitoDirective } from '@maskito/angular';
 import { DiveSchedules } from '../shared/dive.schedules';
 import { takeUntil } from 'rxjs';
 import { ReloadDispatcher } from '../shared/reloadDispatcher';
 import { Streamed } from '../shared/streamed';
 import { DateFormats } from '../shared/formaters';
 import { InputControls } from '../shared/inputcontrols';
 import { ValidatorGroups } from '../shared/ValidatorGroups';
+import { MdbDropdownModule } from 'mdb-angular-ui-kit/dropdown';
+import { MdbFormsModule } from 'mdb-angular-ui-kit/forms';
+import { NgIf } from '@angular/common';
 
 @Component({
     selector: 'app-surface-interval',
     templateUrl: './surface-interval.component.html',
-    styleUrls: ['./surface-interval.component.scss']
+    styleUrls: ['./surface-interval.component.scss'],
+    standalone: true,
+    imports: [
+        MaskitoDirective, ReactiveFormsModule,
+        MdbDropdownModule, MdbFormsModule, NgIf
+    ]
 })
 export class SurfaceIntervalComponent extends Streamed implements OnInit {
     @Input() public form!: FormGroup;