diff --git a/src/frontend/app/attachments/attachments-list.component.html b/src/frontend/app/attachments/attachments-list.component.html
index e7a580b81567a9732f67a3d077945c11af02f125..c90d2c6ef8e53ca36f52146cacff303a99170973 100644
--- a/src/frontend/app/attachments/attachments-list.component.html
+++ b/src/frontend/app/attachments/attachments-list.component.html
@@ -95,88 +95,6 @@
</div>
</mat-expansion-panel>
</mat-accordion>
-
- <!-- div class="line subInfos">
- <div title="{{attachment.identifier}} (n°{{attachment.res_id}})">{{attachment.identifier}}</div>
- <div title="{{attachmentTypes[attachment.attachment_type].label}}" style="text-align:center;">
- {{attachmentTypes[attachment.attachment_type].label}}
- </div>
- <div *ngIf="attachment.update_date == null" title='{{attachment.creation_date | date : "le dd/MM/y à HH:mm"}} par {{attachment.firstname_typist}}
- {{attachment.lastname_typist}}' style="text-align:right;">
- {{attachment.creation_date | timeAgo}}
- </div>
- <div *ngIf="attachment.update_date != null" style="text-align:right;"
- title='{{attachment.update_date | date : "le dd/MM/y à HH:mm"}} par {{attachment.firstname_updated}} {{attachment.lastname_updated}}'>
- {{attachment.update_date | timeAgo}}
- </div>
- </div>
- <div class="line">
- <div style="text-align:center;padding: 5px;">
- {{attachment.title | shorten: 50: '...'}}
- </div>
- </div>
- <div class="line subInfosBottom">
- <div>{{attachment.status}}</div>
- <div *ngIf="attachment.return_date != null && attachment.effective == null"
- title='{{attachment.return_date | date : "le dd/MM/y à HH:mm"}}' style="text-align:right;">
- <i class="fa fa-stopwatch" title="Date de retour attendue"></i> <span
- [innerHTML]="attachment.return_date | timeLimit"></span>
- </div>
- <div *ngIf="attachment.effective != null" style="text-align:right;">
- <i class="fa fa-lock" title="Date de retour"></i> <span
- title='{{attachment.effective_date | date : "le dd/MM/y à HH:mm"}}'
- [innerHTML]="attachment.effective_date | timeAgo"></span>
- </div>
- </div> -->
</div>
</mat-card>
-</ng-container>
-
-<!--<mat-nav-list *ngIf="!loading">
- <div *ngIf="attachments.length == 0" style="text-align:center;font-size:24px;font-weight:bold;opacity:0.3;">
- AUCUN ATTACHEMENT
- </div>
- <ng-container *ngFor="let attachment of attachments">
- <a target="_blank" href="index.php?display=true&module=attachments&page=view_attachment&res_id_master={{resIds[0]}}&id={{attachment.res_id}}" mat-list-item (click)="openLink($event)" style="height:auto;">
- <span mat-line>
- <div style="display:flex;color: rgba(0,0,0,0.4);font-size: 90%;overflow: hidden;text-overflow: ellipsis;">
- <span style="flex:1;text-align: center;">
- <small color="primary" *ngIf="attachment.update_date != null" title='{{attachment.update_date | date : "le dd/MM/y à HH:mm"}}'>Modifié
- par {{attachment.firstname_updated}} {{attachment.lastname_updated}} ({{attachment.update_date | timeAgo}})</small>
- </span>
- </div>
- <div style="display:flex;">
- <div style="text-align: center;align-items: center;padding-right: 15px;width:180px;">
- <div style="color: rgba(0,0,0,0.4);font-size: 90%;overflow: hidden;text-overflow: ellipsis;" title="{{attachmentTypes[attachment.attachment_type].label}}">{{attachmentTypes[attachment.attachment_type].label}}</div>
- <div class="fa fa-paperclip fa-2x" title="{{attachment.status}}" color="primary"></div>
- <div style="color: rgba(0,0,0,0.4);font-size: 90%;padding:5px;" title="{{attachment.identifier}} (n°{{attachment.res_id}})">{{attachment.identifier}}</div>
- </div>
- <div style="flex:5;">
- <div style="display:flex;color: rgba(0,0,0,0.4);font-size: 90%;overflow: hidden;text-overflow: ellipsis;">
- <span style="flex:1" title='{{attachment.creation_date | date : "le dd/MM/y à HH:mm"}}'>
- <i class="fa fa-calendar" title="Date d'enregistrement"></i> {{attachment.creation_date | timeAgo}}
- </span>
- <span style="flex:1;text-align: right;">
- <span *ngIf="attachment.return_date != null && attachment.effective == null" title='{{attachment.return_date | date : "le dd/MM/y à HH:mm"}}'>
- <i class="fa fa-stopwatch" title="Date de retour attendue"></i> <span [innerHTML]="attachment.return_date | timeLimit"></span>
- </span>
- <span *ngIf="attachment.effective != null">
- <i class="fa fa-lock" title="Date de retour"></i> <span title='{{attachment.effective_date | date : "le dd/MM/y à HH:mm"}}' [innerHTML]="attachment.effective_date | timeAgo"></span>
- </span>
- </span>
- </div>
- <div style="padding-top:10px;padding-bottom:10px;">
- {{attachment.title}}
- </div>
- <div style="display:flex;color: rgba(0,0,0,0.4);font-size: 90%;overflow: hidden;text-overflow: ellipsis;">
- <span style="flex:1"><i class="fa fa-user" title="Auteur"></i> {{attachment.firstname_typist}}
- {{attachment.lastname_typist}}</span>
- <span style="flex:1;text-align: right;">{{attachment.status}}</span>
- </div>
- </div>
- </div>
- </span>
- </a>
- <mat-divider style="margin:10px;"></mat-divider>
- </ng-container>
-</mat-nav-list>-->
\ No newline at end of file
+</ng-container>
\ No newline at end of file
diff --git a/src/frontend/app/signature-book.component.html b/src/frontend/app/signature-book.component.html
index 237dc8f2c76e2637c4f9871e9c57457095a5671d..2dcb1ecd6178597488171e755ebbadad79f7af9a 100755
--- a/src/frontend/app/signature-book.component.html
+++ b/src/frontend/app/signature-book.component.html
@@ -93,7 +93,7 @@
<div *ngIf="leftSelectedThumbnail > 0 && signatureBook.documents[leftSelectedThumbnail].format != 'pdf' && !signatureBook.documents[leftSelectedThumbnail].isConverted" [ngStyle]="{'height': showTopLeftPanel ? '79%' : '96%'}" class="visaNoPdfWarning">
<div style="padding-top: 25%;">Aucun aperçu disponible<br/><sub>La version PDF du fichier "{{signatureBook.documents[leftSelectedThumbnail].title}}.{{signatureBook.documents[leftSelectedThumbnail].format}}" n'est pas disponible.</sub></div>
<div class="visaPjView">
- <a title="{{lang.dlAttachment}}" href="index.php?display=true&module=attachments&page=view_attachment&res_id_master={{resId}}&id={{signatureBook.documents[leftSelectedThumbnail].res_id}}" target="_blank">
+ <a title="{{lang.dlAttachment}}" href="../../rest/resources/{{resId}}/attachments/{{signatureBook.documents[leftSelectedThumbnail].res_id}}/originalContent" target="_blank">
<i class="fa fa-download fa-2x"></i>
</a>
</div>
@@ -180,7 +180,7 @@
<div *ngIf="signatureBook.attachments[rightSelectedThumbnail].format != 'pdf' && signatureBook.attachments[rightSelectedThumbnail].status != 'TMP' && !signatureBook.attachments[rightSelectedThumbnail].isConverted" [ngStyle]="{'height': showTopRightPanel ? '79%' : '96%'}" class="visaNoPdfWarning">
<div style="padding-top: 25%;">Aucun aperçu disponible<br/><sub>La version PDF du fichier "{{signatureBook.attachments[rightSelectedThumbnail].title}}.{{signatureBook.attachments[rightSelectedThumbnail].format}}" n'est pas disponible.</sub></div>
<div class="visaPjView">
- <a title="{{lang.dlAttachment}}" href="index.php?display=true&module=attachments&page=view_attachment&res_id_master={{resId}}&id={{signatureBook.attachments[rightSelectedThumbnail].res_id}}" target="_blank">
+ <a title="{{lang.dlAttachment}}" href="../../rest/resources/{{resId}}/attachments/{{signatureBook.attachments[rightSelectedThumbnail].res_id}}/originalContent" target="_blank">
<i class="fa fa-download fa-2x"></i>
</a>
</div>
@@ -197,7 +197,7 @@
(mouseenter)="showSignaturesPanel = true" (mouseleave)="showSignaturesPanel = false" class="pjSign" [ngClass]="[signatureBook.attachments[rightSelectedThumbnail].status == 'SIGN' ? 'signed' : '']" [ngStyle]="{'box-shadow': signatureBook.listinstance.requested_signature ? 'inset 0px 0px 5px 0px red' : 'inset 0px 0px 5px 0px #656565;'}">
<span *ngIf="signatureBook.attachments[rightSelectedThumbnail].status != 'SIGN' && signatureBook.signatures[0]" style="cursor: pointer">
<span *ngIf="!loadingSign">
- <img *ngFor="let signature of signatureBook.signatures; let i = index" src="{{coreUrl}}rest/users/{{signature.user_serial_id}}/signatures/{{signature.id}}/content" (click)="signFile(signatureBook.attachments[rightSelectedThumbnail], signature)" [ngStyle]="{'display': !showSignaturesPanel && i > 0 ? 'none' : ''}" title="{{signature.signature_label}}">
+ <img *ngFor="let signature of signatureBook.signatures; let i = index" src="../../rest/users/{{signature.user_serial_id}}/signatures/{{signature.id}}/content" (click)="signFile(signatureBook.attachments[rightSelectedThumbnail], signature)" [ngStyle]="{'display': !showSignaturesPanel && i > 0 ? 'none' : ''}" title="{{signature.signature_label}}">
</span>
<i *ngIf="loadingSign" class="fa fa-spinner fa-pulse fa-2x fa-fw"></i>
</span>
@@ -257,7 +257,7 @@
<span>{{version.relation}}</span>
<span>{{lang.object}} : </span>
<span>{{version.title}}</span>
- <a style="color:#135F7F" title="{{lang.dlAttachment}}" href="index.php?display=true&module=attachments&page=view_attachment&res_id_master={{resId}}&id={{version.resId}}" target="_blank">
+ <a style="color:#135F7F" title="{{lang.dlAttachment}}" href="../../rest/resources/{{resId}}/attachments/{{version.resId}}/originalContent" target="_blank">
<i class="fa fa-download fa-2x"></i>
</a>
</div>
diff --git a/src/frontend/app/signature-book.component.ts b/src/frontend/app/signature-book.component.ts
index c83e02efde02d247fd16d10ffa4c4408888d8718..1d6d4327fffd9115d3dcf3e51654d67b735e93f3 100755
--- a/src/frontend/app/signature-book.component.ts
+++ b/src/frontend/app/signature-book.component.ts
@@ -416,7 +416,7 @@ export class SignatureBookComponent implements OnInit {
this.http.get(path, signature)
.subscribe((data : any) => {
if (data.status == 0) {
- this.rightViewerLink = "index.php?display=true&module=attachments&page=view_attachment&res_id_master=" + this.resId + "&id=" + data.new_id + "&isVersion=false";
+ this.rightViewerLink = "../../rest/res/" + this.resId + "/attachments/" + data.new_id + "/content";
this.signatureBook.attachments[this.rightSelectedThumbnail].viewerLink = this.rightViewerLink;
this.signatureBook.attachments[this.rightSelectedThumbnail].status = 'SIGN';
this.signatureBook.attachments[this.rightSelectedThumbnail].idToDl = data.new_id;