diff --git a/src/app/attachment/controllers/AttachmentController.php b/src/app/attachment/controllers/AttachmentController.php index ab3f8695bddf22d54351b863c3437265017fb262..dbfb654caa593aab873db44e1f0a9ab6430d6454 100755 --- a/src/app/attachment/controllers/AttachmentController.php +++ b/src/app/attachment/controllers/AttachmentController.php @@ -510,7 +510,7 @@ class AttachmentController } if (empty($fileContent)) { - $fileContent = file_get_contents($pathToDocument); + return $response->withStatus(404)->withJson(['errors' => 'Converted Document not found']); } if ($fileContent === false) { return $response->withStatus(404)->withJson(['errors' => 'Document not found on docserver']); diff --git a/src/frontend/app/attachments/attachments-list.component.html b/src/frontend/app/attachments/attachments-list.component.html index 6c69f4ea47dccecb4c6c7905838e5a5d4f7e4b15..8bf51cc42e30598f083256cb6ac4c212d9d1b853 100644 --- a/src/frontend/app/attachments/attachments-list.component.html +++ b/src/frontend/app/attachments/attachments-list.component.html @@ -7,13 +7,13 @@ style="padding-left:20px;padding-right:20px;"> <input matInput placeholder="{{lang.searchByAttachmentType}}" #listFilter> </mat-form-field> - <mat-card *ngFor="let attachment of attachments | filterList:listFilter.value:'typeLabel'" + <mat-card *ngFor="let attachment of attachments | filterList:listFilter.value:'typeLabel'" [class.signed]="attachment.status==='SIGN'" [style.background-image]="'url('+attachment.thumbnailUrl+')'" style="padding:0;margin: 30px;min-height: 300px;background-size: cover;overflow: hidden;" (mouseover)="$event.stopPropagation();toggleInfo(attachment,true)" > <div class="layout" *ngIf="attachment.hideMainInfo" [@myAnimation] (click)="showAttachment(attachment)"> <button mat-raised-button color="primary" (click)="$event.stopPropagation();showAttachment(attachment)">Voir le document</button> - <button mat-raised-button color="warn" (click)="$event.stopPropagation();deleteAttachment(attachment)">Supprimer le document</button> + <button mat-raised-button color="warn" *ngIf="attachment.status!=='SIGN'" (click)="$event.stopPropagation();deleteAttachment(attachment)">Supprimer le document</button> </div> <div class="pjToolsContent"> <button *ngIf="attachment.relation > 1" color="primary" class="versionButton" mat-button @@ -52,10 +52,10 @@ {{attachment.typeLabel}} </div> <div class="subInfos" *ngIf="attachment.hideMainInfo"> - {{attachment.creationDate | timeAgo}} + signé le {{attachment.modificationDate | timeAgo}} par {{attachment.typist}} </div> <div class="statusInfo"> - {{attachment.status}} + {{lang['attachment_'+attachment.status]}} </div> <!--<mat-accordion> <mat-expansion-panel> diff --git a/src/frontend/app/attachments/attachments-list.component.scss b/src/frontend/app/attachments/attachments-list.component.scss index 7d587c580ada28fe620f20acb7b7c0d10d1ba6d5..529b5d31b0f42c6f095b035e9c990de9a370e44e 100644 --- a/src/frontend/app/attachments/attachments-list.component.scss +++ b/src/frontend/app/attachments/attachments-list.component.scss @@ -92,6 +92,16 @@ color: #666; } +.signed { + border: solid 1px green; + .infosPj { + background: green; + } + .mainInfos, .subInfos, .stateInfo, .statusInfo, .subInfosBottom { + color: white; + } +} + .mat-icon { height: auto; } diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts index 82ddfd48d7c7487825efb7266e99cab26db866bc..759b3306cb69c2c46fe0bf6a4168b7990f8305bd 100755 --- a/src/frontend/lang/lang-en.ts +++ b/src/frontend/lang/lang-en.ts @@ -1268,4 +1268,8 @@ export const LANG_EN = { "viewPersonalData": "View users' personal data", "managePersonalData": "Update or delete users' personal data", "attachmentDeleted": "Attachment deleted", + "attachment_A_TRA": "To process", + "attachment_SIGN": "Signed", + "attachment_FRZ": "Freez", + "attachment_TRA": "Processed", }; diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts index 4f9543d067219ad4a9fa99028760af8b953f079d..000b97ade154aa8aabcbff6dc01e9332189e6552 100755 --- a/src/frontend/lang/lang-fr.ts +++ b/src/frontend/lang/lang-fr.ts @@ -1305,4 +1305,8 @@ export const LANG_FR = { "viewPersonalData": "Voir les données personnelles de l'utilisateur", "managePersonalData": "Modifier ou supprimer les données personnelles de l'utilisateur", "attachmentDeleted": "Pièce jointe supprimée", + "attachment_A_TRA": "À traiter", + "attachment_SIGN": "Signée", + "attachment_FRZ": "Gelée", + "attachment_TRA": "Traitée", }; diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts index c08f245535e5a3024d6a3ff67cc406f6e24ed30d..6508ea8284398f0b5a691a25a4c2cce351244099 100755 --- a/src/frontend/lang/lang-nl.ts +++ b/src/frontend/lang/lang-nl.ts @@ -1293,4 +1293,8 @@ export const LANG_NL = { "viewPersonalData": "View users' personal data", //_TO_TRANSLATE "managePersonalData": "Update or delete users' personal data", //_TO_TRANSLATE "attachmentDeleted": "Attachment deleted", //_TO_TRANSLATE + "attachment_A_TRA": "To process", //_TO_TRANSLATE + "attachment_SIGN": "Signed", //_TO_TRANSLATE + "attachment_FRZ": "Freez", //_TO_TRANSLATE + "attachment_TRA": "Processed", //_TO_TRANSLATE };