diff --git a/apps/maarch_entreprise/Views/action-administration.component.html b/apps/maarch_entreprise/Views/action-administration.component.html index af79b1f5615ec02f553bbca7d63cb0e1b1203ac4..855d0c50537452d6d4a4c4f91100ef872c92d4c4 100755 --- a/apps/maarch_entreprise/Views/action-administration.component.html +++ b/apps/maarch_entreprise/Views/action-administration.component.html @@ -17,14 +17,13 @@ <form class="form-horizontal" (ngSubmit)="onSubmit()" #actionsFormUp="ngForm"> <div class="form-group"> <mat-form-field> - <input matInput [(ngModel)]="action.label_action" required name="action_name" id="action_name" title="{{lang.description}}" - type="text" placeholder="{{lang.description}}" required> + <input matInput [(ngModel)]="action.label_action" required name="action_name" id="action_name" title="{{lang.actionName}}" + type="text" placeholder="{{lang.actionName}}" maxlength="255"> </mat-form-field> </div> <div class="form-group"> <mat-form-field> - <mat-select id="status" name="status" title="{{lang.associatedStatus}}" placeholder="{{lang.associatedStatus}}" [(ngModel)]="action.id_status" - required> + <mat-select id="status" name="status" title="{{lang.associatedStatus}}" placeholder="{{lang.associatedStatus}}" [(ngModel)]="action.id_status" required> <mat-option *ngFor="let status of statuses" [value]="status.id"> {{status.label_status}} </mat-option> diff --git a/apps/maarch_entreprise/Views/actions-administration.component.html b/apps/maarch_entreprise/Views/actions-administration.component.html index 814154ec09fc73074df352cec7720918cf5f9091..0e7717f90096a087028b976733c867ecfc7af71d 100755 --- a/apps/maarch_entreprise/Views/actions-administration.component.html +++ b/apps/maarch_entreprise/Views/actions-administration.component.html @@ -30,7 +30,7 @@ <mat-cell *matCellDef="let element"> {{element.id}} </mat-cell> </ng-container> <ng-container matColumnDef="label_action"> - <mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.description}}</mat-header-cell> + <mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.actionName}}</mat-header-cell> <mat-cell *matCellDef="let element"> {{element.label_action}} </mat-cell> </ng-container> <ng-container matColumnDef="history"> diff --git a/apps/maarch_entreprise/Views/status-administration.component.html b/apps/maarch_entreprise/Views/status-administration.component.html index 60172bb914437e35dbb3fccee0f92c7b283697c9..f2d65bba6a2a7d3eac83afa3d34f9859553430ec 100755 --- a/apps/maarch_entreprise/Views/status-administration.component.html +++ b/apps/maarch_entreprise/Views/status-administration.component.html @@ -18,7 +18,7 @@ <div class="form-group"> <div class="col-sm-12"> <mat-form-field> - <input matInput name="label_status" id="label_status" maxlength="50" [(ngModel)]="status.label_status" title="{{lang.description}}" placeholder="{{lang.description}}" type="text" required> + <input matInput name="label_status" id="label_status" maxlength="50" [(ngModel)]="status.label_status" title="{{lang.statusName}}" placeholder="{{lang.statusName}}" type="text" required> </mat-form-field> </div> </div> diff --git a/apps/maarch_entreprise/Views/statuses-administration.component.html b/apps/maarch_entreprise/Views/statuses-administration.component.html index db9ab7b9618df6849cad5a37df7b438e47dcebd8..360bff070c45ddfba6cec61ef65e792521c47fdf 100755 --- a/apps/maarch_entreprise/Views/statuses-administration.component.html +++ b/apps/maarch_entreprise/Views/statuses-administration.component.html @@ -37,7 +37,7 @@ <mat-cell *matCellDef="let element"> {{element.id}} </mat-cell> </ng-container> <ng-container matColumnDef="label_status"> - <mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.description}}</mat-header-cell> + <mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.statusName}}</mat-header-cell> <mat-cell *matCellDef="let element"> {{element.label_status}} </mat-cell> </ng-container> <ng-container matColumnDef="identifier"> diff --git a/apps/maarch_entreprise/js/angular/lang/lang-en.js b/apps/maarch_entreprise/js/angular/lang/lang-en.js index 3b2a5e6bc7aa4dbf49db6a41fbdcbe8d78f74c61..11cca7ea9c72671aa6e40bc964fec7175229f9cf 100755 --- a/apps/maarch_entreprise/js/angular/lang/lang-en.js +++ b/apps/maarch_entreprise/js/angular/lang/lang-en.js @@ -9,6 +9,7 @@ exports.LANG_EN = { "actionHistory": "Log action in history", "actionHistoryDesc": "Lets you plot this action in the document history. It is strongly recommended to check this option", "actionModification": "Action modification", + "actionName": "Action name", "actionPage": "Result page of the action", "actions": "Action(s)", "actionUpdated": "Action updated", @@ -111,6 +112,7 @@ exports.LANG_EN = { "statusDeleted": "Status deleted", "statuses": "Statuses", "statusModification": "Status modification", + "statusName": "Status name", "statusUpdated": "Status updated", "suspend": "Suspend", "system": "System", diff --git a/apps/maarch_entreprise/js/angular/lang/lang-en.ts b/apps/maarch_entreprise/js/angular/lang/lang-en.ts index 0294f33ce7e1a3d82af19e34051e559142b5521e..9576d0bd02d837d38bf2b0b8f4f00717c08dd9e3 100755 --- a/apps/maarch_entreprise/js/angular/lang/lang-en.ts +++ b/apps/maarch_entreprise/js/angular/lang/lang-en.ts @@ -7,6 +7,7 @@ export const LANG_EN = { "actionHistory" : "Log action in history", "actionHistoryDesc" : "Lets you plot this action in the document history. It is strongly recommended to check this option", "actionModification" : "Action modification", + "actionName" : "Action name", "actionPage" : "Result page of the action", "actions" : "Action(s)", "actionUpdated" : "Action updated", @@ -109,6 +110,7 @@ export const LANG_EN = { "statusDeleted" : "Status deleted", "statuses" : "Statuses", "statusModification" : "Status modification", + "statusName" : "Status name", "statusUpdated" : "Status updated", "suspend" : "Suspend", "system" : "System", diff --git a/apps/maarch_entreprise/js/angular/lang/lang-fr.js b/apps/maarch_entreprise/js/angular/lang/lang-fr.js index 74030a1bb1a5e56ea8c59624f2faecc2216292a2..4580b93da0ead8f30d389d824080b1d380b217d0 100755 --- a/apps/maarch_entreprise/js/angular/lang/lang-fr.js +++ b/apps/maarch_entreprise/js/angular/lang/lang-fr.js @@ -11,6 +11,7 @@ exports.LANG_FR = { "actionHistory": "Tracer l'action", "actionHistoryDesc": "Permet tracer cette action dans l'historique du document. Il est fortement recommandé de cocher cette option.", "actionModification": "Modification de l'action", + "actionName": "Nom de l'action", "actionPage": "Page de résultat de l'action", "actions": "Action(s)", "actionUpdated": "Action modifiée", @@ -142,6 +143,7 @@ exports.LANG_FR = { "statusDeleted": "Statut supprimé", "statuses": "Statut(s)", "statusModification": "Modification du statut", + "statusName": "Nom du statut", "statusUpdated": "Statut mis à jour", "string": "Chaine de caratère", "suspend": "Suspendre", diff --git a/apps/maarch_entreprise/js/angular/lang/lang-fr.ts b/apps/maarch_entreprise/js/angular/lang/lang-fr.ts index f4a27a978f42b42da44af22b81bfdd5d9c32393e..8391be835c62d0ebd5c173b6ac8d39d1a93a2941 100755 --- a/apps/maarch_entreprise/js/angular/lang/lang-fr.ts +++ b/apps/maarch_entreprise/js/angular/lang/lang-fr.ts @@ -9,6 +9,7 @@ export const LANG_FR = { "actionHistory" : "Tracer l'action", "actionHistoryDesc" : "Permet tracer cette action dans l'historique du document. Il est fortement recommandé de cocher cette option.", "actionModification" : "Modification de l'action", + "actionName" : "Nom de l'action", "actionPage" : "Page de résultat de l'action", "actions" : "Action(s)", "actionUpdated" : "Action modifiée", @@ -140,6 +141,7 @@ export const LANG_FR = { "statusDeleted" : "Statut supprimé", "statuses" : "Statut(s)", "statusModification" : "Modification du statut", + "statusName" : "Nom du statut", "statusUpdated" : "Statut mis à jour", "string" : "Chaine de caratère", "suspend" : "Suspendre",