Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Client
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
web-et-numerique
Factory
Resin
Client
Commits
0e82b75c
Commit
0e82b75c
authored
4 years ago
by
Jérémie BRISON
Browse files
Options
Downloads
Patches
Plain Diff
fix(form): add page(isPassNumeric)
parent
cd586281
No related branches found
No related tags found
3 merge requests
!68
Recette
,
!67
Dev
,
!66
Fix/form design create structure
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app/form/form.component.html
+10
-0
10 additions, 0 deletions
src/app/form/form.component.html
src/app/form/form.component.ts
+3
-2
3 additions, 2 deletions
src/app/form/form.component.ts
with
13 additions
and
2 deletions
src/app/form/form.component.html
+
10
−
0
View file @
0e82b75c
...
...
@@ -928,6 +928,16 @@
</div>
</ng-container>
</div>
<div
*ngIf=
"currentPage == 17"
class=
"page"
>
<div
class=
"title"
>
<h3>
Acceptez-vous le Pass numérique APTIC ?
</h3>
</div>
<app-radio-form
[selectedOption]=
"isInArray('passNumerique', 'labelsQualifications')"
(selectedEvent)=
"updateChoice('passNumerique', 'labelsQualifications')"
>
</app-radio-form>
</div>
</form>
</div>
<div
...
...
This diff is collapsed.
Click to expand it.
src/app/form/form.component.ts
+
3
−
2
View file @
0e82b75c
...
...
@@ -48,7 +48,7 @@ export class FormComponent implements OnInit {
public
structureId
:
string
;
//New var form
public
currentPage
=
1
4
;
public
currentPage
=
1
7
;
public
progressStatus
=
0
;
public
nbPagesForm
=
20
;
public
accountForm
:
FormGroup
;
...
...
@@ -275,7 +275,7 @@ export class FormComponent implements OnInit {
}
// Check if a FormControl value is in FormArray
public
isInArray
(
term
:
string
,
formControlName
):
boolean
{
public
isInArray
(
term
:
string
,
formControlName
:
string
):
boolean
{
if
(
this
.
structureForm
.
controls
[
formControlName
].
value
)
{
return
this
.
structureForm
.
controls
[
formControlName
].
value
.
includes
(
term
);
}
...
...
@@ -366,6 +366,7 @@ export class FormComponent implements OnInit {
this
.
getStructureControl
(
'
nbTablets
'
).
valid
&&
this
.
getStructureControl
(
'
nbNumericTerminal
'
).
valid
,
};
this
.
pagesValidation
[
17
]
=
{
valid
:
this
.
getStructureControl
(
'
labelsQualifications
'
).
valid
};
this
.
updatePageValid
();
}
...
...
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