Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Maarch
MaarchCourrier
Commits
4004253f
Commit
4004253f
authored
Oct 21, 2021
by
Hamza HRAMCHI
Browse files
FIX #18428 TIME 0:40 show communications means in contact details modal
parent
9ac132ac
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/frontend/app/contact/contact-detail/contact-detail.component.html
View file @
4004253f
...
...
@@ -95,19 +95,36 @@
<p
mat-line
class=
"contact-content"
[class.newData]=
"isNewValue('notes')"
[title]=
"contact.notes"
>
{{contact.notes}}
</p>
</mat-list-item>
<mat-list-item
class=
"contact-item"
*ngIf=
"!functionsService.empty(contact.communicationMeans)"
[title]=
"'lang.communicationMean' | translate"
>
<mat-icon
mat-list-icon
class=
"contact-group fas fa-hashtag"
></mat-icon>
<p
mat-line
class=
"contact-content"
[class.newData]=
"isNewValue('communicationMeans')"
[title]=
"contact.communicationMeans"
>
{{contact.communicationMeans}}
</p>
</mat-list-item>
<mat-list-item
class=
"contact-item"
*ngIf=
"!functionsService.empty(contact.externalId) && !functionsService.empty(contact.externalId['m2m'])"
[title]=
"'lang.IdMaarch2Maarch' | translate"
>
<mat-icon
mat-list-icon
class=
"contact-group fas fa-hashtag"
></mat-icon>
<p
mat-line
class=
"contact-content"
[title]=
"contact.externalId['m2m']"
>
{{contact.externalId['m2m']}}
</p>
</mat-list-item>
<ng-container
*ngIf=
"!functionsService.empty(contact.communicationMeans)"
>
<mat-list-item
class=
"contact-item"
*ngIf=
"!functionsService.empty(contact.communicationMeans.url)"
[title]=
"'lang.communicationMean' | translate"
>
<mat-icon
mat-list-icon
class=
"contact-group fas fa-hashtag"
></mat-icon>
<p
mat-line
class=
"contact-content"
[class.newData]=
"isNewValue('communicationMeans.url')"
[title]=
"contact.communicationMeans.url"
>
{{contact.communicationMeans.url}}
</p>
</mat-list-item>
<mat-list-item
class=
"contact-item"
*ngIf=
"!functionsService.empty(contact.communicationMeans.email)"
[title]=
"'lang.emailM2M' | translate"
>
<mat-icon
mat-list-icon
class=
"contact-group fas fa-hashtag"
></mat-icon>
<p
mat-line
class=
"contact-content"
[class.newData]=
"isNewValue('communicationMeans.email')"
[title]=
"contact.communicationMeans.email"
>
{{contact.communicationMeans.email}}
</p>
</mat-list-item>
<mat-list-item
class=
"contact-item"
*ngIf=
"!functionsService.empty(contact.communicationMeans.login)"
[title]=
"'lang.userIdMaarch2MaarchDesc' | translate"
>
<mat-icon
mat-list-icon
class=
"contact-group fas fa-hashtag"
></mat-icon>
<p
mat-line
class=
"contact-content"
[class.newData]=
"isNewValue('communicationMeans.login')"
[title]=
"contact.communicationMeans.login"
>
{{contact.communicationMeans.login}}
</p>
</mat-list-item>
<mat-list-item
class=
"contact-item"
*ngIf=
"!functionsService.empty(contact.externalId) && !functionsService.empty(contact.externalId['m2m'])"
[title]=
"'lang.IdMaarch2Maarch' | translate"
>
<mat-icon
mat-list-icon
class=
"contact-group fas fa-hashtag"
></mat-icon>
<p
mat-line
class=
"contact-content"
[title]=
"contact.externalId['m2m']"
>
{{contact.externalId['m2m']}}
</p>
</mat-list-item>
</ng-container>
<ng-container
*ngFor=
"let keyVal of contact.customFields | keyvalue"
>
<mat-list-item
class=
"contact-item"
*ngIf=
"keyVal.value.value !== null"
>
<mat-icon
mat-list-icon
class=
"contact-group fas fa-hashtag"
...
...
src/lang/lang-en.json
View file @
4004253f
...
...
@@ -2561,7 +2561,6 @@
"userIdMaarch2MaarchDesc"
:
"User ID with a web service account"
,
"userPasswordMaarch2MaarchDesc"
:
"User password with a web service account"
,
"m2mPasswordMsg"
:
"The password for your <b>web service user</b> is not defined"
,
"urlUndefinedFormat"
:
"Communications url is not a valid URL"
"urlUndefinedFormat"
:
"Communications url is not a valid URL"
,
"emailM2M"
:
"Email for an indirect connection between applications (sending email for the digital fold)"
}
src/lang/lang-fr.json
View file @
4004253f
...
...
@@ -2552,5 +2552,6 @@
"userPasswordMaarch2MaarchDesc"
:
"Mot de passe de l'utilisateur avec un compte webservice"
,
"m2mPasswordMsg"
:
"Le mot de passe de votre <b>utilisateur webservice</b> n'est pas défini"
,
"urlUndefinedFormat"
:
"L'URL de communication n'est pas une URL valide"
,
"uriServerExample"
:
"Exemple: https://demo.maarchcourrier.com"
"uriServerExample"
:
"Exemple: https://demo.maarchcourrier.com"
,
"emailM2M"
:
"Courriel pour une connexion indirecte entre les applications (envoi de mail pour le pli numérique)"
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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