Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
verona-modules-aspect
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IQB
verona-modules-aspect
Commits
a55035a1
Commit
a55035a1
authored
2 years ago
by
jojohoch
Browse files
Options
Downloads
Patches
Plain Diff
[player] Fix validation errors of slider
parent
9ae5dc8b
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
projects/player/src/app/directives/element-form-group.directive.ts
+9
-8
9 additions, 8 deletions
...player/src/app/directives/element-form-group.directive.ts
with
9 additions
and
8 deletions
projects/player/src/app/directives/element-form-group.directive.ts
+
9
−
8
View file @
a55035a1
...
@@ -5,16 +5,16 @@ import {
...
@@ -5,16 +5,16 @@ import {
import
{
takeUntil
}
from
'
rxjs/operators
'
;
import
{
takeUntil
}
from
'
rxjs/operators
'
;
import
{
TranslateService
}
from
'
@ngx-translate/core
'
;
import
{
TranslateService
}
from
'
@ngx-translate/core
'
;
import
{
Subject
}
from
'
rxjs
'
;
import
{
Subject
}
from
'
rxjs
'
;
import
{
UnitStateService
}
from
'
../services/unit-state.service
'
;
import
{
ElementModelElementCodeMappingService
}
from
'
../services/element-model-element-code-mapping.service
'
;
import
{
ElementGroupDirective
}
from
'
./element-group.directive
'
;
import
{
VopNavigationDeniedNotification
}
from
'
player/modules/verona/models/verona
'
;
import
{
VopNavigationDeniedNotification
}
from
'
player/modules/verona/models/verona
'
;
import
{
MessageService
}
from
'
common/services/message.service
'
;
import
{
MessageService
}
from
'
common/services/message.service
'
;
import
{
VeronaSubscriptionService
}
from
'
player/modules/verona/services/verona-subscription.service
'
;
import
{
VeronaSubscriptionService
}
from
'
player/modules/verona/services/verona-subscription.service
'
;
import
{
ValidationService
}
from
'
../services/validation.service
'
;
import
{
LogService
}
from
'
player/modules/logging/services/log.service
'
;
import
{
LogService
}
from
'
player/modules/logging/services/log.service
'
;
import
{
InputElement
,
InputElementValue
}
from
'
common/models/elements/element
'
;
import
{
InputElement
,
InputElementValue
}
from
'
common/models/elements/element
'
;
import
{
SliderElement
}
from
'
common/models/elements/input-elements/slider
'
;
import
{
SliderElement
}
from
'
common/models/elements/input-elements/slider
'
;
import
{
ValidationService
}
from
'
../services/validation.service
'
;
import
{
ElementGroupDirective
}
from
'
./element-group.directive
'
;
import
{
ElementModelElementCodeMappingService
}
from
'
../services/element-model-element-code-mapping.service
'
;
import
{
UnitStateService
}
from
'
../services/unit-state.service
'
;
@
Directive
()
@
Directive
()
export
abstract
class
ElementFormGroupDirective
extends
ElementGroupDirective
implements
OnDestroy
{
export
abstract
class
ElementFormGroupDirective
extends
ElementGroupDirective
implements
OnDestroy
{
...
@@ -32,7 +32,7 @@ export abstract class ElementFormGroupDirective extends ElementGroupDirective im
...
@@ -32,7 +32,7 @@ export abstract class ElementFormGroupDirective extends ElementGroupDirective im
elementModels
.
forEach
(
elementModel
=>
{
elementModels
.
forEach
(
elementModel
=>
{
const
initialValue
=
this
.
elementModelElementCodeMappingService
const
initialValue
=
this
.
elementModelElementCodeMappingService
.
mapToElementModelValue
(
this
.
unitStateService
.
getElementCodeById
(
elementModel
.
id
)?.
value
,
elementModel
);
.
mapToElementModelValue
(
this
.
unitStateService
.
getElementCodeById
(
elementModel
.
id
)?.
value
,
elementModel
);
const
formControl
=
new
FormControl
(
initialValue
,
this
.
getValidators
(
elementModel
));
const
formControl
=
new
FormControl
(
initialValue
,
ElementFormGroupDirective
.
getValidators
(
elementModel
));
this
.
form
.
addControl
(
elementModel
.
id
,
formControl
);
this
.
form
.
addControl
(
elementModel
.
id
,
formControl
);
formControl
.
valueChanges
formControl
.
valueChanges
.
pipe
(
takeUntil
(
this
.
ngUnsubscribe
))
.
pipe
(
takeUntil
(
this
.
ngUnsubscribe
))
...
@@ -42,7 +42,7 @@ export abstract class ElementFormGroupDirective extends ElementGroupDirective im
...
@@ -42,7 +42,7 @@ export abstract class ElementFormGroupDirective extends ElementGroupDirective im
value
:
this
.
elementModelElementCodeMappingService
.
mapToElementCodeValue
(
inputValue
,
elementModel
.
type
)
value
:
this
.
elementModelElementCodeMappingService
.
mapToElementCodeValue
(
inputValue
,
elementModel
.
type
)
});
});
});
});
if
(
this
.
needsValidation
(
elementModel
))
{
if
(
ElementFormGroupDirective
.
needsValidation
(
elementModel
))
{
this
.
validatorService
.
registerFormControl
(
formControl
);
this
.
validatorService
.
registerFormControl
(
formControl
);
}
}
});
});
...
@@ -60,11 +60,11 @@ export abstract class ElementFormGroupDirective extends ElementGroupDirective im
...
@@ -60,11 +60,11 @@ export abstract class ElementFormGroupDirective extends ElementGroupDirective im
}
}
}
}
private
needsValidation
=
(
elementModel
:
InputElement
):
boolean
=>
[
private
static
needsValidation
=
(
elementModel
:
InputElement
):
boolean
=>
[
elementModel
.
required
,
!!
elementModel
.
minLength
,
!!
elementModel
.
maxLength
,
!!
elementModel
.
pattern
elementModel
.
required
,
!!
elementModel
.
minLength
,
!!
elementModel
.
maxLength
,
!!
elementModel
.
pattern
].
some
(
validator
=>
validator
);
].
some
(
validator
=>
validator
);
private
getValidators
=
(
elementModel
:
InputElement
)
=>
{
private
static
getValidators
=
(
elementModel
:
InputElement
)
=>
{
const
validators
:
ValidatorFn
[]
=
[];
const
validators
:
ValidatorFn
[]
=
[];
if
(
elementModel
.
required
)
{
if
(
elementModel
.
required
)
{
switch
(
elementModel
.
type
)
{
switch
(
elementModel
.
type
)
{
...
@@ -72,6 +72,7 @@ export abstract class ElementFormGroupDirective extends ElementGroupDirective im
...
@@ -72,6 +72,7 @@ export abstract class ElementFormGroupDirective extends ElementGroupDirective im
validators
.
push
(
Validators
.
requiredTrue
);
validators
.
push
(
Validators
.
requiredTrue
);
break
;
break
;
case
'
slider
'
:
case
'
slider
'
:
validators
.
push
(
Validators
.
required
);
validators
.
push
(
Validators
.
min
((
elementModel
as
SliderElement
).
minValue
+
1
));
validators
.
push
(
Validators
.
min
((
elementModel
as
SliderElement
).
minValue
+
1
));
break
;
break
;
default
:
default
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment