diff --git a/src/frontend/app/administration/list/list-administration.component.ts b/src/frontend/app/administration/list/list-administration.component.ts
index d7dae5fd9a4bfc9ce58eb1572876b300a6b9f66e..088a24314949ca6d93a052f7524d26eddadad19c 100644
--- a/src/frontend/app/administration/list/list-administration.component.ts
+++ b/src/frontend/app/administration/list/list-administration.component.ts
@@ -299,7 +299,7 @@ export class ListAdministrationComponent implements OnInit {
if (mm < 10) {
mm = '0' + mm;
}
- today = dd + '_' + mm + '_' + yyyy;
+ today = dd + '-' + mm + '-' + yyyy;
downloadLink.setAttribute('download', "export_maarch_" + today + ".csv");
document.body.appendChild(downloadLink);
downloadLink.click();
diff --git a/src/frontend/app/list/summarySheet/summary-sheet.component.html b/src/frontend/app/list/summarySheet/summary-sheet.component.html
index cf194f194bea5baea8cd97161afd8c9812808974..2ef4f21a5f37584bcd3f35529270f54d797b8906 100644
--- a/src/frontend/app/list/summarySheet/summary-sheet.component.html
+++ b/src/frontend/app/list/summarySheet/summary-sheet.component.html
@@ -4,7 +4,7 @@
</div>
<div class="row header">
<div class="col-md-4 text-left" [class.disabled]="!withQrcode">
- <mat-button-toggle-group style="position: absolute;top:-9px;left:0px;" multiple (change)="toggleQrcode()">
+ <mat-button-toggle-group style="position: absolute;top:-2px;left:0px;" multiple (change)="toggleQrcode()">
<mat-button-toggle style="width: 40px;height: 40px;" class="qrcode" [checked]="withQrcode" title="{{lang.toggleQrcode}}">
<mat-icon fontSet="fas" fontIcon="fa-qrcode" style="height: auto;font-size: 30px;"></mat-icon>
</mat-button-toggle>
@@ -28,7 +28,7 @@
(cdkDropListDropped)="drop($event)">
<ng-container *ngFor="let item of dataAvailable; let i=index">
<div class="columns" [class.disabled]="!item.enabled" *ngIf="item.unit !== 'qrcode'" cdkDrag id="{{item.id}}"
- style="position: relative;" (click)="item.enabled = !item.enabled">
+ style="position: relative;">
<div class="unitTitle">
<div class="handleDrag" cdkDragHandle>
<svg width="24px" fill="currentColor" viewBox="0 0 24 24">
@@ -40,7 +40,7 @@
<input matInput placeholder="Libellé" [(ngModel)]="item.label" (click)="$event.stopPropagation();">
</mat-form-field>
</div>
- <div class="row" class="unitData">
+ <div class="row" class="unitData" (click)="item.enabled = !item.enabled">
<div class="{{item.css}}" *ngFor="let itemData of item.desc">
{{itemData}}
</div>
diff --git a/src/frontend/app/list/summarySheet/summary-sheet.component.scss b/src/frontend/app/list/summarySheet/summary-sheet.component.scss
index 4d43a3ec15a16e1fef482cfdb9fd671ed0e1c283..d769b6ea2c99f42ba3ddd1dee0f112d9ffca796c 100644
--- a/src/frontend/app/list/summarySheet/summary-sheet.component.scss
+++ b/src/frontend/app/list/summarySheet/summary-sheet.component.scss
@@ -37,7 +37,7 @@
.unitTitle {
display: flex;
- cursor: move;
+ cursor: initial;
position: absolute;
top: 2px;
left: 5px;
@@ -45,6 +45,7 @@
}
.unitData {
+ cursor: pointer;
margin-top: 30px;
width: 100%;
opacity: 0.5;
@@ -78,7 +79,6 @@
align-items: center;
justify-content: space-between;
box-sizing: border-box;
- cursor: pointer;
background: white;
font-size: 14px;
}
diff --git a/src/frontend/app/list/summarySheet/summary-sheet.component.ts b/src/frontend/app/list/summarySheet/summary-sheet.component.ts
index eca68c69123c0b2ef0c97d36fa3699002fff767f..c2583e3fdb4c376762c0695e298beb30432d946b 100644
--- a/src/frontend/app/list/summarySheet/summary-sheet.component.ts
+++ b/src/frontend/app/list/summarySheet/summary-sheet.component.ts
@@ -73,12 +73,12 @@ export class SummarySheetComponent implements OnInit {
enabled: true
},
{
- id: 'avisWorkflow',
+ id: 'opinionWorkflow',
unit: 'avisWorkflow',
label: this.lang.avis,
css: 'col-md-4 text-center',
desc: [
- this.lang.firstname + ' ' + this.lang.lastname + ' (' + this.lang.destinationEntity + ')',
+ this.lang.firstname + ' ' + this.lang.lastname + ' (' + this.lang.destination + ')',
this.lang.role,
this.lang.processDate
],
@@ -90,7 +90,7 @@ export class SummarySheetComponent implements OnInit {
label: this.lang.visaWorkflow,
css: 'col-md-4 text-center',
desc: [
- this.lang.firstname + ' ' + this.lang.lastname + ' (' + this.lang.destinationEntity + ')',
+ this.lang.firstname + ' ' + this.lang.lastname + ' (' + this.lang.destination + ')',
this.lang.role,
this.lang.processDate
],
@@ -160,8 +160,8 @@ export class SummarySheetComponent implements OnInit {
if (mm < 10) {
mm = '0' + mm;
}
- today = dd + '/' + mm + '/' + yyyy;
- downloadLink.setAttribute('download', this.lang.summarySheets + " (" + today + ").pdf");
+ today = dd + '-' + mm + '-' + yyyy;
+ downloadLink.setAttribute('download', this.lang.summarySheetsAlt + "_" + today + ".pdf");
document.body.appendChild(downloadLink);
downloadLink.click();
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index 1adf4cee544dec0f46df3198e9d8f58196550693..9981925d0a9726b7fa60e2c5cda033ede6558a51 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -782,6 +782,7 @@ export const LANG_EN = {
"toExport" : "Export",
"summarySheet" : "Summary sheet",
"summarySheets" : "Summary sheet(s)",
+ "summarySheetsAlt" : "Summary sheets",
"appName" : "Application name",
"printDate" : "Print date",
"genSummarySheets" : "Generate Summary sheets",
@@ -798,4 +799,5 @@ export const LANG_EN = {
"deleteUnit" : "Delete unit",
"addCustomUnit" : "Add custom unit",
"selectedElements" : "selected element(s)",
+ "destination" : "entity destination",
};
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index 0f0e68ea23ccda8cd97fa598c36539c4fa1ea016..f68ef045ab6aaa4c2da24e5f3094de19ba18e2de 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -807,10 +807,11 @@ export const LANG_FR = {
"removeAllDatas" : "Enlever toutes les données",
"toExport" : "Exporter",
"summarySheet" : "Fiche de liaison",
- "summarySheets" : "Fiche(s) de liaison(s)",
+ "summarySheets" : "Fiche(s) de liaison",
+ "summarySheetsAlt" : "Fiches de liaison",
"appName" : "Nom de l'application",
"printDate" : "Date d'impression",
- "genSummarySheets" : "Générer les fiches de liaisons",
+ "genSummarySheets" : "Générer les fiches de liaison",
"mailDate" : "Date du courrier",
"mailType" : "Type de courrier",
"initiator" : "Opérateur",
@@ -821,7 +822,9 @@ export const LANG_FR = {
"content" : "Contenu",
"freeNote" : "Note libre",
"toggleQrcode" : "Afficher / cacher l'identifiant courrier (qrcode)",
- "deleteUnit" : "Supprimer le bloc",
- "addCustomUnit" : "Ajouter un bloc custom",
+ "deleteUnit" : "Supprimer la zone",
+ "addCustomUnit" : "Ajouter une zone libre",
"selectedElements" : "élément(s) sélectionné(s)",
+ "destination" : "entité traitante",
+
};
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index 49cc002b169b6a688bd0b1d9a515f77b50b86656..1dba5367c96e8aa7d8828fd1a51ff226e6f24155 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -811,6 +811,7 @@ export const LANG_NL = {
"toExport" : "_TO_TRANSLATE",
"summarySheet" : "_TO_TRANSLATE",
"summarySheets" : "_TO_TRANSLATE",
+ "summarySheetsAlt" : "_TO_TRANSLATE",
"appName" : "_TO_TRANSLATE",
"printDate" : "_TO_TRANSLATE",
"genSummarySheets" : "_TO_TRANSLATE",
@@ -827,4 +828,5 @@ export const LANG_NL = {
"deleteUnit" : "_TO_TRANSLATE",
"addCustomUnit" : "_TO_TRANSLATE",
"selectedElements" : "_TO_TRANSLATE",
+ "destination" : "_TO_TRANSLATE",
};