diff --git a/apps/maarch_entreprise/Views/basket-list.component.html b/apps/maarch_entreprise/Views/basket-list.component.html index 3365770f68e96f7b94fd893ccdb10ea438d7304b..2ab53c4c3031182f0a5db084365b53f1e46ffbb9 100644 --- a/apps/maarch_entreprise/Views/basket-list.component.html +++ b/apps/maarch_entreprise/Views/basket-list.component.html @@ -43,7 +43,7 @@ <td mat-cell *matCellDef="let row" [ngStyle]="{'width': mobileMode ? '30%' : '10%'}" style="text-align:center;overflow:hidden;text-overflow: ellipsis;white-space: nowrap;padding: 5px;vertical-align: middle;"> <div *ngIf="row.closing_date == null && mobileMode" id="{{row.res_id}}_creation_date" style="color: rgba(0,0,0,0.4);font-size: 90%;overflow: hidden;text-overflow: ellipsis;" title='{{row.creation_date | date : "le dd/MM/y à HH:mm"}}'> - <i class="fa fa-calendar" title="date d'enregistrement"></i> {{row.creation_date | timeAgo}} + <i class="fa fa-calendar" title="{{lang.creationDate}}"></i> {{row.creation_date | timeAgo}} </div> <div *ngIf="!mobileMode" style="padding-top: 5px;color: rgba(0,0,0,0.4);font-size: 90%;overflow: hidden;text-overflow: ellipsis;" title="{{lang[row.category_id]}}"> {{lang[row.category_id]}} @@ -60,7 +60,7 @@ <ng-container matColumnDef="subject"> <td mat-cell *matCellDef="let row" style="width:50%;overflow:hidden;text-overflow: ellipsis;white-space: nowrap;padding: 5px;vertical-align: middle;"> <div *ngIf="row.closing_date == null && mobileMode" style="color: rgba(0,0,0,0.4);font-size: 90%;overflow: hidden;text-overflow: ellipsis;text-align: right;"> - <i class="fa fa-stopwatch" title="date limite de traitement"></i> + <i class="fa fa-stopwatch" title="{{lang.processLimitDate}}"></i> <span [innerHTML]="row.process_limit_date | timeLimit" title='{{row.process_limit_date | date : "le dd/MM/y à HH:mm"}}'></span> </div> <div style="overflow: hidden;text-overflow: ellipsis;" title="{{row.subject}}"> @@ -74,8 +74,8 @@ </div> <div *ngIf="!mobileMode && (row.folder_name || row.case_label)"> - <span *ngIf="row.folder_name" class="label label-default" style="background-color:rgba(0,0,0,0.2);margin-left: 5px;margin-right: 5px;" title="Dossier"><i class="fa fa-folder"></i> {{row.folder_name}}</span> - <span *ngIf="row.case_label" class="label label-default" style="background-color:rgba(0,0,0,0.2);margin-left: 5px;margin-right: 5px;" title="Affaire"><i class="fa fa-suitcase"></i> {{row.case_label}}</span> + <span *ngIf="row.folder_name" class="label label-default" style="background-color:rgba(0,0,0,0.2);margin-left: 5px;margin-right: 5px;" title="{{lang.folder}}"><i class="fa fa-folder"></i> {{row.folder_name}}</span> + <span *ngIf="row.case_label" class="label label-default" style="background-color:rgba(0,0,0,0.2);margin-left: 5px;margin-right: 5px;" title="{{lang.case}}"><i class="fa fa-suitcase"></i> {{row.case_label}}</span> </div> <!--<div> <button mat-stroked-button color="primary" style="margin:5px;line-height: 20px;width: 150px;overflow: hidden;text-overflow: ellipsis;">réponse du zpfezk zekf opezf</button> @@ -110,14 +110,14 @@ <td mat-cell *matCellDef="let row" style="text-align: right;width:15%;overflow:hidden;text-overflow: ellipsis;white-space: nowrap;padding: 5px;vertical-align: middle;"> <div *ngIf="row.closing_date == null" id="{{row.res_id}}_creation_date" style="color: rgba(0,0,0,0.4);font-size: 90%;overflow: hidden;text-overflow: ellipsis;" title='{{row.creation_date | date : "le dd/MM/y à HH:mm"}}'> - <i class="fa fa-calendar" title="date d'enregistrement"></i> {{row.creation_date | timeAgo}} + <i class="fa fa-calendar" title="{{lang.creationDate}}"></i> {{row.creation_date | timeAgo}} </div> <div *ngIf="row.closing_date == null" style="color: rgba(0,0,0,0.4);font-size: 90%;overflow: hidden;text-overflow: ellipsis;"> - <i class="fa fa-stopwatch" title="date limite de traitement"></i> + <i class="fa fa-stopwatch" title="{{lang.processLimitDate}}"></i> <span [innerHTML]="row.process_limit_date | timeLimit" title='{{row.process_limit_date | date : "le dd/MM/y à HH:mm"}}'></span> </div> <div *ngIf="row.closing_date != null" style="color: rgba(0,0,0,0.4);font-size: 90%;overflow: hidden;text-overflow: ellipsis;"> - <i class="fa fa-lock" title="date de clôture"></i> + <i class="fa fa-lock" title="{{lang.closingDate}}"></i> <span title='{{row.closing_date | date : "le dd/MM/y à HH:mm"}}'>{{row.closing_date | timeAgo}}</span> </div> <div style="white-space:normal;"> diff --git a/apps/maarch_entreprise/Views/home.component.html b/apps/maarch_entreprise/Views/home.component.html index 16b90814301453bfb059a0ad798ea81284ec4db7..bf1916e0b6db95195201fee49c01db90456f6502 100755 --- a/apps/maarch_entreprise/Views/home.component.html +++ b/apps/maarch_entreprise/Views/home.component.html @@ -35,7 +35,7 @@ <td mat-cell *matCellDef="let row" [ngStyle]="{'width': mobileMode ? '30%' : '15%'}" style="text-align:center;overflow:hidden;text-overflow: ellipsis;white-space: nowrap;padding: 5px;vertical-align: middle;"> <div *ngIf="row.closing_date == null && mobileMode" id="{{row.res_id}}_creation_date" style="color: rgba(0,0,0,0.4);font-size: 90%;overflow: hidden;text-overflow: ellipsis;" title='{{row.creation_date | date : "le dd/MM/y à HH:mm"}}'> - <i class="fa fa-calendar" title="date d'enregistrement"></i> {{row.creation_date | timeAgo}} + <i class="fa fa-calendar" title="{{lang.creationDate}}"></i> {{row.creation_date | timeAgo}} </div> <div style="overflow: hidden;text-overflow: ellipsis;"> <mat-icon [ngStyle]="{'color': row.priority_color}" color="primary" class="{{row.status_icon.charAt(0)}}{{row.status_icon.charAt(1)}} {{row.status_icon}} {{row.status_icon.charAt(0)}}{{row.status_icon.charAt(1)}}-2x" title="{{row.status_label}} ({{row.status_id}})"></mat-icon> @@ -49,7 +49,7 @@ <ng-container matColumnDef="subject"> <td mat-cell *matCellDef="let row" style="width:45%;overflow:hidden;text-overflow: ellipsis;padding: 5px;vertical-align: middle;"> <div *ngIf="row.closing_date == null && mobileMode" style="color: rgba(0,0,0,0.4);font-size: 90%;overflow: hidden;text-overflow: ellipsis;text-align: right;"> - <i class="fa fa-stopwatch" title="date limite de traitement"></i> + <i class="fa fa-stopwatch" title="{{lang.processLimitDate}}"></i> <span [innerHTML]="row.process_limit_date | timeLimit" title='{{row.process_limit_date | date : "le dd/MM/y à HH:mm"}}'></span> </div> <div style="overflow: hidden;line-height: 1.5em;height: 3em;overflow: hidden;" title="{{row.subject}}"> @@ -61,14 +61,14 @@ <td mat-cell *matCellDef="let row" style="text-align: right;width:15%;overflow:hidden;text-overflow: ellipsis;white-space: nowrap;padding: 5px;vertical-align: middle;"> <div *ngIf="row.closing_date == null" id="{{row.res_id}}_creation_date" style="color: rgba(0,0,0,0.4);font-size: 90%;overflow: hidden;text-overflow: ellipsis;" title='{{row.creation_date | date : "le dd/MM/y à HH:mm"}}'> - <i class="fa fa-calendar" title="date d'enregistrement"></i> {{row.creation_date | timeAgo}} + <i class="fa fa-calendar" title="{{lang.creationDate}}"></i> {{row.creation_date | timeAgo}} </div> <div *ngIf="row.closing_date == null" style="color: rgba(0,0,0,0.4);font-size: 90%;overflow: hidden;text-overflow: ellipsis;"> - <i class="fa fa-stopwatch" title="date limite de traitement"></i> + <i class="fa fa-stopwatch" title="{{lang.processLimitDate}}"></i> <span [innerHTML]="row.process_limit_date | timeLimit" title='{{row.process_limit_date | date : "le dd/MM/y à HH:mm"}}'></span> </div> <div *ngIf="row.closing_date != null" style="color: rgba(0,0,0,0.4);font-size: 90%;overflow: hidden;text-overflow: ellipsis;"> - <i class="fa fa-lock" title="date de clôture"></i> + <i class="fa fa-lock" title="{{lang.closingDate}}"></i> <span title='{{row.closing_date | date : "le dd/MM/y à HH:mm"}}'>{{row.closing_date | timeAgo}}</span> </div> <div> diff --git a/apps/maarch_entreprise/js/angular/lang/lang-en.ts b/apps/maarch_entreprise/js/angular/lang/lang-en.ts index 63e0cf871b36e106318db2617ae60ee1f0ebc9af..4582b1c2915ee48edd222d0c0f9f031477c6d171 100755 --- a/apps/maarch_entreprise/js/angular/lang/lang-en.ts +++ b/apps/maarch_entreprise/js/angular/lang/lang-en.ts @@ -69,6 +69,7 @@ export const LANG_EN = { "canBeSearched" : "Searchable", "cancel" : "Cancel", "cases" : "Cases", + "case" : "Case", "changeMyPassword" : "Change my password", "chooseBasket" : "Choose a basket", "chooseCategoryAssociation" : "Choose one or some associatedd categories", @@ -514,6 +515,8 @@ export const LANG_EN = { 'contactsGroups' : 'Contact(s) group(s)', "contactsGroupModification" : "Contacts group modification", "contactGroupCreation" : "Contacts group creation", + "creationDate" : "Creation date", + "closingDate" : "Closing date", "creation_date" : "Creation date", "private" : "Private", "public" : "Public", diff --git a/apps/maarch_entreprise/js/angular/lang/lang-fr.ts b/apps/maarch_entreprise/js/angular/lang/lang-fr.ts index e97829e7fff0cd51e28650fedf201d26aa11775c..1196e2ed6ccd8f2956eceea6fe4e37bd1c6e7520 100755 --- a/apps/maarch_entreprise/js/angular/lang/lang-fr.ts +++ b/apps/maarch_entreprise/js/angular/lang/lang-fr.ts @@ -81,6 +81,7 @@ export const LANG_FR = { "cantMoveDoctype" : "Le type de document peut uniquement être déplacé dans une sous-chemise", "cantMoveFirstLevel" : "La sous-chemise peut uniquement être déplacée dans une chemise", "cases" : "Affaires", + "case" : "Affaire", "changeMyPassword" : "Modifier mon mot de passe", "chooseBasket" : "Choisissez une bannette", "chooseCategoryAssociation" : "Choisissez une ou plusieurs catégories associée", @@ -536,7 +537,8 @@ export const LANG_FR = { 'contactsGroups' : 'Groupement(s) de contact(s)', "contactsGroupModification" : "Modification du groupement de contact", "contactGroupCreation" : "Création d'un groupement de contact", - "creationDate" : "Date de création", + "creationDate" : "Date de création", + "closingDate" : "Date de clôture", "private" : "Privé", "public" : "Public", "contactsGroupDesc" : "Si le groupement est public, tous les utilisateurs pourront utiliser celui-ci. Sinon il est privé, et seul le créateur pourra l'utiliser",