diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index 54e6d6ad3..0b3fd939f 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -55,7 +55,7 @@
{{event.Location}}
-
{{event.Subject}}
+
{{event.Subject.substring(0,maxSubjectLength)}}
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index a7f108370..5a14be94a 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -43,7 +43,8 @@ export class EventsPage implements OnInit {
public profile:string;
currentEvent: any;
- eventsList: Event[];
+ eventsList: Event[];
+ maxSubjectLength = 140;
officialeventsList: Event[];
personaleventsList: Event[];
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
index b79c2a7ee..36632cd8e 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -88,8 +88,6 @@ export class DespachoPage implements OnInit {
}
goBack() {
- // window.history.back()
-
if (window.innerWidth <= 800) {
this.router.navigate(['/home/gabinete-digital/despachos']);
} else {
@@ -100,7 +98,6 @@ export class DespachoPage implements OnInit {
}
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
-
}
@@ -140,12 +137,16 @@ export class DespachoPage implements OnInit {
console.log(users);
});
+ console.log(this.task.FolderId);
+
this.getDocumentDetails(this.task.FolderId, '361');
});
}
getDocumentDetails(forlderId:string, applicationId:string) {
+ console.log(forlderId);
+
this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{
this.attachments = res.Documents;
console.log(res['Documents']);
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
index ed82d9461..1ea664a91 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
@@ -80,12 +80,15 @@ export class DespachosPage implements OnInit {
}
async LoadList() {
-
+ console.log('HERE');
+
let result = await this.processes.GetTasksList("Despacho", false).toPromise();
//let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
this.despachoList = new Array();
console.log(result);
+ console.log('OI');
+
await result.forEach( (element, index) => {
@@ -101,7 +104,7 @@ export class DespachosPage implements OnInit {
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
- "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+ "DocId": element.workflowInstanceDataFields.DispatchDocId,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
@@ -110,9 +113,14 @@ export class DespachosPage implements OnInit {
});
+ console.log(this.despachoList);
+
+
this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
this.despachoList.forEach( (element, index) => {
+ console.log(element);
+
// let aplicationId = element.workflowInstanceDataFields.SourceSecFsID;
let FolderID = element['FolderID'];
diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts
index 6a382fb71..1ec0cd1b6 100644
--- a/src/app/services/processes.service.ts
+++ b/src/app/services/processes.service.ts
@@ -244,11 +244,13 @@ export class ProcessesService {
}
GetDocumentDetails(DocId:string, FsId:string){
+ console.log(DocId);
+
const geturl = environment.apiURL + 'search/documents';
let params = new HttpParams();
params = params.set("docId", DocId);
- params = params.set("applicationid", FsId);
+ params = params.set("applicationId", FsId);
let options = {
headers: this.headers,
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
index 2868d4dc8..ed8b1de8b 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -127,7 +127,8 @@ goToDespachoPr(serialNumber:any){
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
- "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+ "DocId": element.workflowInstanceDataFields.DispatchDocID,
+ "FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
index 89031e4d4..fbfb80fbb 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
@@ -96,6 +96,8 @@ export class DespachosPage implements OnInit {
}
async LoadList(){
+ console.log('HERE DESK');
+
let result = await this.processes.GetTasksList("Despacho", false).toPromise();
//let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
@@ -117,7 +119,8 @@ export class DespachosPage implements OnInit {
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
- "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+ "DocId": element.workflowInstanceDataFields.DispatchDocId,
+ "FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
@@ -129,6 +132,8 @@ export class DespachosPage implements OnInit {
this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
this.despachoList.forEach( (element, index) => {
+ console.log(element['FolderID']);
+
// let aplicationId = element.workflowInstanceDataFields.SourceSecFsID;
let FolderID = element['FolderID'];
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
index 79a58e660..437e27e36 100644
--- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
@@ -81,7 +81,8 @@ serialNumber:string;
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
- "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+ "DocId": element.workflowInstanceDataFields.DispatchDocID,
+ "FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
@@ -100,7 +101,8 @@ serialNumber:string;
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Sender,
"DocumentsQty": 0,
- "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+ "DocId": element.workflowInstanceDataFields.DispatchDocID,
+ "FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
index 2f5ab780c..3b001438e 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
@@ -84,7 +84,8 @@ constructor(
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
- "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+ "DocId": element.workflowInstanceDataFields.DispatchDocID,
+ "FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
@@ -103,7 +104,8 @@ constructor(
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
- "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+ "DocId": element.workflowInstanceDataFields.DispatchDocID,
+ "FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
@@ -136,7 +138,8 @@ constructor(
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
- "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+ "DocId": element.workflowInstanceDataFields.DispatchDocID,
+ "FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
@@ -156,7 +159,8 @@ constructor(
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
- "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+ "DocId": element.workflowInstanceDataFields.DispatchDocID,
+ "FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
index 61e31131b..e803456a8 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
@@ -95,7 +95,8 @@ export class PedidosPage implements OnInit {
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
- "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+ "DocId": element.workflowInstanceDataFields.ParecerDocID,
+ "FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
@@ -127,6 +128,7 @@ export class PedidosPage implements OnInit {
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+ "FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}