From bb6fc58a41e7b206030ff5edc1c1bce6c3369a77 Mon Sep 17 00:00:00 2001
From: jojohoch <joachim.hoch@iqb.hu-berlin.de>
Date: Wed, 27 Apr 2022 16:34:48 +0200
Subject: [PATCH] [player] Rename ValidatorService to ValidationService
- Remove TODOS
---
projects/player/src/app/app.component.ts | 4 ++--
.../element-compound-group.component.ts | 4 ++--
.../element-input-group.component.ts | 4 ++--
.../element-text-input-group.component.ts | 4 ++--
.../src/app/directives/element-form-group.directive.ts | 4 ++--
.../player/src/app/directives/unit-state.directive.ts | 4 ++--
...ator.service.spec.ts => validation.service.spec.ts} | 8 ++++----
.../{validator.service.ts => validation.service.ts} | 10 ++--------
8 files changed, 18 insertions(+), 24 deletions(-)
rename projects/player/src/app/services/{validator.service.spec.ts => validation.service.spec.ts} (52%)
rename projects/player/src/app/services/{validator.service.ts => validation.service.ts} (64%)
diff --git a/projects/player/src/app/app.component.ts b/projects/player/src/app/app.component.ts
index c8fe26411..f8a9a5e6b 100644
--- a/projects/player/src/app/app.component.ts
+++ b/projects/player/src/app/app.component.ts
@@ -11,7 +11,7 @@ import { MetaDataService } from './services/meta-data.service';
import { UnitStateService } from './services/unit-state.service';
import { MediaPlayerService } from './services/media-player.service';
import { Page, Unit } from 'common/interfaces/unit';
-import { ValidatorService } from './services/validator.service';
+import { ValidationService } from './services/validation.service';
import { UnitFactory } from 'common/util/unit.factory';
import { SanitizationService } from 'common/services/sanitization.service';
import { UnitUtils } from 'common/util/unit-utils';
@@ -38,7 +38,7 @@ export class AppComponent implements OnInit {
private unitStateService: UnitStateService,
private mediaPlayerService: MediaPlayerService,
private elementModelElementCodeMappingService: ElementModelElementCodeMappingService,
- private validatorService: ValidatorService,
+ private validatorService: ValidationService,
private sanitizationService: SanitizationService) {
this.isStandalone = window === window.parent;
}
diff --git a/projects/player/src/app/components/element-compound-group/element-compound-group.component.ts b/projects/player/src/app/components/element-compound-group/element-compound-group.component.ts
index 23feb33db..deaea7c64 100644
--- a/projects/player/src/app/components/element-compound-group/element-compound-group.component.ts
+++ b/projects/player/src/app/components/element-compound-group/element-compound-group.component.ts
@@ -10,7 +10,7 @@ import { ElementComponent } from 'common/directives/element-component.directive'
import { ElementModelElementCodeMappingService } from '../../services/element-model-element-code-mapping.service';
import { MessageService } from 'common/services/message.service';
import { VeronaSubscriptionService } from 'verona/services/verona-subscription.service';
-import { ValidatorService } from '../../services/validator.service';
+import { ValidationService } from '../../services/validation.service';
import { KeypadService } from '../../services/keypad.service';
import { TextFieldComponent } from 'common/components/ui-elements/text-field.component';
import { ElementFormGroupDirective } from '../../directives/element-form-group.directive';
@@ -38,7 +38,7 @@ export class ElementCompoundGroupComponent extends ElementFormGroupDirective imp
public translateService: TranslateService,
public messageService: MessageService,
public veronaSubscriptionService: VeronaSubscriptionService,
- public validatorService: ValidatorService
+ public validatorService: ValidationService
) {
super();
}
diff --git a/projects/player/src/app/components/element-input-group/element-input-group.component.ts b/projects/player/src/app/components/element-input-group/element-input-group.component.ts
index 7382f698c..9b1e2b96f 100644
--- a/projects/player/src/app/components/element-input-group/element-input-group.component.ts
+++ b/projects/player/src/app/components/element-input-group/element-input-group.component.ts
@@ -12,7 +12,7 @@ import { ElementFormGroupDirective } from '../../directives/element-form-group.d
import { MessageService } from 'common/services/message.service';
import { VeronaSubscriptionService } from 'verona/services/verona-subscription.service';
import { ElementComponent } from 'common/directives/element-component.directive';
-import { ValidatorService } from '../../services/validator.service';
+import { ValidationService } from '../../services/validation.service';
@Component({
selector: 'aspect-element-input-group',
@@ -34,7 +34,7 @@ export class ElementInputGroupComponent extends ElementFormGroupDirective implem
public translateService: TranslateService,
public messageService: MessageService,
public veronaSubscriptionService: VeronaSubscriptionService,
- public validatorService: ValidatorService
+ public validatorService: ValidationService
) {
super();
}
diff --git a/projects/player/src/app/components/element-text-input-group/element-text-input-group.component.ts b/projects/player/src/app/components/element-text-input-group/element-text-input-group.component.ts
index 58a231e19..9f5237075 100644
--- a/projects/player/src/app/components/element-text-input-group/element-text-input-group.component.ts
+++ b/projects/player/src/app/components/element-text-input-group/element-text-input-group.component.ts
@@ -11,7 +11,7 @@ import { ElementModelElementCodeMappingService } from '../../services/element-mo
import { MessageService } from 'common/services/message.service';
import { VeronaSubscriptionService } from 'verona/services/verona-subscription.service';
import { ElementComponent } from 'common/directives/element-component.directive';
-import { ValidatorService } from '../../services/validator.service';
+import { ValidationService } from '../../services/validation.service';
import { ElementFormGroupDirective } from '../../directives/element-form-group.directive';
import { TextAreaComponent } from 'common/components/ui-elements/text-area.component';
import { TextFieldComponent } from 'common/components/ui-elements/text-field.component';
@@ -40,7 +40,7 @@ export class ElementTextInputGroupComponent extends ElementFormGroupDirective im
public translateService: TranslateService,
public messageService: MessageService,
public veronaSubscriptionService: VeronaSubscriptionService,
- public validatorService: ValidatorService,
+ public validatorService: ValidationService,
public deviceService: DeviceService
) {
super();
diff --git a/projects/player/src/app/directives/element-form-group.directive.ts b/projects/player/src/app/directives/element-form-group.directive.ts
index ce08286a4..cdb95531b 100644
--- a/projects/player/src/app/directives/element-form-group.directive.ts
+++ b/projects/player/src/app/directives/element-form-group.directive.ts
@@ -12,7 +12,7 @@ import { ElementGroupDirective } from './element-group.directive';
import { VopNavigationDeniedNotification } from 'verona/models/verona';
import { MessageService } from 'common/services/message.service';
import { VeronaSubscriptionService } from 'verona/services/verona-subscription.service';
-import { ValidatorService } from '../services/validator.service';
+import { ValidationService } from '../services/validation.service';
@Directive()
export abstract class ElementFormGroupDirective extends ElementGroupDirective implements OnDestroy {
@@ -22,7 +22,7 @@ export abstract class ElementFormGroupDirective extends ElementGroupDirective im
abstract translateService: TranslateService;
abstract messageService: MessageService;
abstract veronaSubscriptionService: VeronaSubscriptionService;
- abstract validatorService: ValidatorService;
+ abstract validatorService: ValidationService;
ngUnsubscribe = new Subject<void>();
diff --git a/projects/player/src/app/directives/unit-state.directive.ts b/projects/player/src/app/directives/unit-state.directive.ts
index 1b291808e..2bee0c53c 100644
--- a/projects/player/src/app/directives/unit-state.directive.ts
+++ b/projects/player/src/app/directives/unit-state.directive.ts
@@ -6,7 +6,7 @@ import { UnitStateService } from '../services/unit-state.service';
import { MediaPlayerService } from '../services/media-player.service';
import { VeronaSubscriptionService } from 'verona/services/verona-subscription.service';
import { VeronaPostService } from 'verona/services/verona-post.service';
-import { ValidatorService } from '../services/validator.service';
+import { ValidationService } from '../services/validation.service';
@Directive({
selector: '[aspectUnitState]'
@@ -19,7 +19,7 @@ export class UnitStateDirective implements OnInit, OnDestroy {
private mediaPlayerService: MediaPlayerService,
private veronaSubscriptionService: VeronaSubscriptionService,
private veronaPostService: VeronaPostService,
- private validatorService: ValidatorService
+ private validatorService: ValidationService
) {}
ngOnInit(): void {
diff --git a/projects/player/src/app/services/validator.service.spec.ts b/projects/player/src/app/services/validation.service.spec.ts
similarity index 52%
rename from projects/player/src/app/services/validator.service.spec.ts
rename to projects/player/src/app/services/validation.service.spec.ts
index 70df3671e..5d0fcd183 100644
--- a/projects/player/src/app/services/validator.service.spec.ts
+++ b/projects/player/src/app/services/validation.service.spec.ts
@@ -1,11 +1,11 @@
import { TestBed } from '@angular/core/testing';
-import { ValidatorService } from './validator.service';
+import { ValidationService } from './validation.service';
-describe('ValidatorService', () => {
- let service: ValidatorService;
+describe('ValidationService', () => {
+ let service: ValidationService;
beforeEach(() => {
TestBed.configureTestingModule({});
- service = TestBed.inject(ValidatorService);
+ service = TestBed.inject(ValidationService);
});
it('should be created', () => {
diff --git a/projects/player/src/app/services/validator.service.ts b/projects/player/src/app/services/validation.service.ts
similarity index 64%
rename from projects/player/src/app/services/validator.service.ts
rename to projects/player/src/app/services/validation.service.ts
index 5927b33ac..30d41a7fe 100644
--- a/projects/player/src/app/services/validator.service.ts
+++ b/projects/player/src/app/services/validation.service.ts
@@ -5,12 +5,10 @@ import { Progress } from 'verona/models/verona';
@Injectable({
providedIn: 'root'
})
-export class ValidatorService {
+export class ValidationService {
private formControls: FormControl[] = [];
get responseProgress(): Progress {
- // TODO wenn am ende nur die Länge interessiert, warum dann erstmal
- // alle formControls in der Variable speichern?
const validFormControls = this.formControls
.filter(control => control.valid && control.value !== '' && control.value !== null);
if (validFormControls.length === this.formControls.length) {
@@ -20,11 +18,7 @@ export class ValidatorService {
}
registerFormControl(control: FormControl): void {
- // TODO wie ist das Scenario in dem das Control schon drin ist?
- // Lieber an der Wurzel beheben, als hier Fehler verschlucken!
- if (!this.formControls.includes(control)) {
- this.formControls.push(control);
- }
+ this.formControls.push(control);
}
reset(): void {
--
GitLab