diff --git a/src/app/modals/document-detail/document-detail.page.html b/src/app/modals/document-detail/document-detail.page.html index 6a8b7a1c0..05ebef0bf 100644 --- a/src/app/modals/document-detail/document-detail.page.html +++ b/src/app/modals/document-detail/document-detail.page.html @@ -34,7 +34,7 @@
Status
-

{{LoadedDocument.Status}}

+

{{LoadedDocument.Status}}

@@ -49,18 +49,15 @@
- - {{ LoadedDocument | json }} -
- +
diff --git a/src/app/modals/document-detail/document-detail.page.ts b/src/app/modals/document-detail/document-detail.page.ts index b691626d1..0a7790cfe 100644 --- a/src/app/modals/document-detail/document-detail.page.ts +++ b/src/app/modals/document-detail/document-detail.page.ts @@ -89,16 +89,16 @@ export class DocumentDetailPage implements OnInit { Subject: this.LoadedDocument.Assunto }, } - } else if (this.LoadedDocument.ApplicationID == 8) { + } else if (this.LoadedDocument.ApplicationID == 8 || this.LoadedDocument.ApplicationId == 8) { task = { - serialNumber: this.LoadedDocument.SourceId, - taskStartDate: this.LoadedDocument.CreateDate, + serialNumber: this.LoadedDocument.DocId, + taskStartDate: this.LoadedDocument.DocDate, isEvent: true, workflowInstanceDataFields: { - FsId: this.LoadedDocument.ApplicationID, + FsId: this.LoadedDocument.ApplicationID || this.LoadedDocument.ApplicationId, FolderID: null, - DocId: this.LoadedDocument.SourceId, - Subject: this.LoadedDocument.SourceName + DocId: this.LoadedDocument.DocId, + Subject: this.LoadedDocument.Assunto } } } @@ -120,10 +120,8 @@ export class DocumentDetailPage implements OnInit { await modal.present(); modal.onDidDismiss().then( async(res)=>{}); - } - async openBookMeetingModal() { let task; @@ -133,6 +131,8 @@ export class DocumentDetailPage implements OnInit { serialNumber: this.LoadedDocument.DispatchNumber, taskStartDate: this.LoadedDocument.DateDispatch, isEvent: true, + Folio: this.LoadedDocument.Assunto, + FsId: this.LoadedDocument.ApplicationID, workflowInstanceDataFields: { FsId: this.LoadedDocument.ApplicationID, FolderID: null, @@ -140,11 +140,13 @@ export class DocumentDetailPage implements OnInit { Subject: this.LoadedDocument.Assunto }, } - } else if (this.LoadedDocument.ApplicationID == 8) { + } else if (this.LoadedDocument.ApplicationID == 8 || this.LoadedDocument.ApplicationId == 8) { task = { serialNumber: this.LoadedDocument.SourceId, taskStartDate: this.LoadedDocument.CreateDate, isEvent: true, + Folio: this.LoadedDocument.Assunto, + FsId: this.LoadedDocument.ApplicationID, workflowInstanceDataFields: { FsId: this.LoadedDocument.ApplicationID, FolderID: null, @@ -172,5 +174,4 @@ export class DocumentDetailPage implements OnInit { modal.onDidDismiss(); } - } \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index a5dbaf60b..4a7dab8dc 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -215,7 +215,6 @@ export class BookMeetingModalPage implements OnInit { }) } - async saveTask(){ if(this.loggeduser.Profile == 'MDGPR') { @@ -224,9 +223,10 @@ export class BookMeetingModalPage implements OnInit { } - if(this.Form.invalid) return false - + // if(this.Form.invalid) return false + alert('!') + let Attendees = this.taskParticipants.concat(this.taskParticipantsCc); this.eventBody={ diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 278946784..479cfb263 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -158,7 +158,7 @@
- {{ searchDocument.Assunto}} -- {{ searchDocument.ApplicationType}} + {{ searchDocument.Assunto}} {{ searchDocument.appName}}
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index 28bf13ee2..ece2b0057 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html @@ -61,6 +61,9 @@ {{task.activityInstanceName}}
+ + {{ task.CreateDate }} + {{ task.CreateDate | date: 'dd-MM-yy' }}