Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
web-et-numerique
web-et-numerique-internet
data.grandlyon.com
web-portal
components
custom-apps
web-app
Commits
5ddff623
Commit
5ddff623
authored
Jan 13, 2021
by
Matthieu BENOIST
Browse files
Merge branch 'DOS63936' into 'master'
Corrects some remaining sonarqube bug reports See merge request
!118
parents
0cd33442
57f7345a
Pipeline
#10217
passed with stage
in 6 minutes and 42 seconds
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
src/app/core/components/feedback/feedback.component.ts
View file @
5ddff623
...
...
@@ -61,7 +61,10 @@ export class FeedbackComponent implements OnInit {
this
.
feedbackForm
.
get
(
'
email
'
).
valueChanges
.
subscribe
(
(
emailValue
)
=>
{
emailValue
===
''
||
emailValue
===
null
?
consent
.
setValue
(
false
)
:
null
;
if
(
emailValue
===
''
||
emailValue
===
null
)
{
consent
.
setValue
(
false
);
}
if
(
emailValue
!==
null
&&
emailValue
!==
''
)
{
consent
.
setValidators
([
Validators
.
requiredTrue
]);
}
else
{
...
...
@@ -115,7 +118,12 @@ export class FeedbackComponent implements OnInit {
}
get
feedbackHasEmail
()
{
return
this
.
feedbackForm
.
get
(
'
email
'
).
value
&&
this
.
feedbackForm
.
get
(
'
email
'
).
value
;
if
(
this
.
feedbackForm
.
get
(
'
email
'
).
value
!==
null
&&
this
.
feedbackForm
.
get
(
'
email
'
).
value
!==
''
)
{
return
true
;
}
else
{
return
false
;
}
}
get
shouldAnimateClosing
()
{
...
...
src/app/dataset-detail/components/dataset-table/dataset-table.component.html
View file @
5ddff623
...
...
@@ -6,10 +6,10 @@
(keydown.enter)=
"sortBy(key)"
[tabindex]=
"isDisplayed ? 0 : -1"
[attr.role]=
"'columnheader'"
>
<span
class=
"sort-icons"
>
<span
class=
"icon"
>
<span
class=
"fas fa-sort-up"
[ngClass]=
"{'icon-red': sortValue
===
key && sortOrder === 'desc'}"
></span
>
<span
class=
"fas fa-sort-up"
[ngClass]=
"{'icon-red': sortValue
.includes(
key
)
&& sortOrder === 'desc'}"
></span>
</span>
<span
class=
"icon"
>
<span
class=
"fas fa-sort-down"
[ngClass]=
"{'icon-red': sortValue
===
key && sortOrder === 'asc'}"
></span
>
<span
class=
"fas fa-sort-down"
[ngClass]=
"{'icon-red': sortValue
.includes(
key
)
&& sortOrder === 'asc'}"
></span>
</span>
</span>
<span
class=
"column-title"
[ngClass]=
"{'active': sortValue === key}"
>
{{ key }}
</span>
...
...
src/app/user/components/user-profil/user-info/user-info.component.html
View file @
5ddff623
...
...
@@ -10,11 +10,11 @@
(keyup)=
"toUppercase(userInfoUpdateForm, 'firstName')"
[ngClass]=
"{'has-error': fieldIsInvalid(userInfoUpdateForm, 'firstName'), 'is-valid': fieldIsValid(userInfoUpdateForm, 'firstName')}"
>
<span
class=
"icon is-small is-right is-icon-success"
*ngIf=
"fieldIsValid(userInfoUpdateForm, 'firstName')"
>
<
i
class=
"fas fa-check-circle"
></
i
>
<
span
class=
"fas fa-check-circle"
></
span
>
</span>
<span
class=
"icon is-small is-right is-icon-warning"
*ngIf=
"fieldIsInvalid(userInfoUpdateForm, 'firstName')"
>
<
i
class=
"fas fa-exclamation-circle"
></
i
>
<
span
class=
"fas fa-exclamation-circle"
></
span
>
</span>
</p>
...
...
@@ -38,10 +38,10 @@
(keyup)=
"toUppercase(userInfoUpdateForm,'lastName')"
[ngClass]=
"{'has-error': fieldIsInvalid(userInfoUpdateForm, 'lastName'), 'is-valid': fieldIsValid(userInfoUpdateForm, 'lastName')}"
>
<span
class=
"icon is-small is-right is-icon-success"
*ngIf=
"fieldIsValid(userInfoUpdateForm, 'lastName')"
>
<
i
class=
"fas fa-check-circle"
></
i
>
<
span
class=
"fas fa-check-circle"
></
span
>
</span>
<span
class=
"icon is-small is-right is-icon-warning"
*ngIf=
"fieldIsInvalid(userInfoUpdateForm, 'lastName')"
>
<
i
class=
"fas fa-exclamation-circle"
></
i
>
<
span
class=
"fas fa-exclamation-circle"
></
span
>
</span>
</p>
...
...
@@ -187,4 +187,4 @@
</footer>
</div>
<button
class=
"modal-close is-large"
aria-label=
"close"
(click)=
"closeDeleteAccountModal()"
></button>
</div>
\ No newline at end of file
</div>
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment