diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index aac79f007..41995b9e0 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -71,7 +71,9 @@ export class ExpedienteDetailPage implements OnInit { "DocumentURL": res.workflowInstanceDataFields.ViewerRequest, "Remetente": res.workflowInstanceDataFields.Sender, "Note": res.workflowInstanceDataFields.Note, - "FolderId": res.workflowInstanceDataFields.FolderID + "FolderId": res.workflowInstanceDataFields.FolderID, + "FsId": res.workflowInstanceDataFields.FsId, + "DocId": res.workflowInstanceDataFields.DocId, } this.fulltask = res; console.log(res); @@ -107,9 +109,13 @@ export class ExpedienteDetailPage implements OnInit { } viewDocument(){ - const url: string = this.task.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); - const browser = this.iab.create(url,"_blank"); - browser.show(); + this.processes.GetDocumentUrl(this.task.DocId, this.task.FsId).subscribe(res=>{ + console.log(res); + const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); + const browser = this.iab.create(url,"_blank"); + browser.show(); + + }); } openMenu() { diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index 0c2938706..48750b8b0 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -133,6 +133,20 @@ export class ProcessesService { }; return this.http.post(`${geturl}`,'', options); } + + GetDocumentUrl(DocId:string, FsId:string): Observable{ + const geturl = environment.apiURL + 'ecm/document/viewrequestshort'; + let params = new HttpParams(); + + params = params.set("DocId", DocId); + params = params.set("applicationid", FsId); + + let options = { + headers: this.headers, + params: params + }; + return this.http.get(`${geturl}`, options); + } postDespatcho(body:any){ const geturl = environment.apiURL + 'Processes/CreateDispatch'; diff --git a/src/app/shared/agenda/approve-event/approve-event.component.html b/src/app/shared/agenda/approve-event/approve-event.component.html index abacd0068..bfe3ff7ba 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.html +++ b/src/app/shared/agenda/approve-event/approve-event.component.html @@ -92,7 +92,7 @@
- +