diff --git a/src/app/Rules/despacho.service.ts b/src/app/Rules/despacho.service.ts index 2ff5130c4..89d801ddf 100644 --- a/src/app/Rules/despacho.service.ts +++ b/src/app/Rules/despacho.service.ts @@ -79,7 +79,11 @@ export class DespachoService { solicitarParecer({note ='', documents = [], serialnumber, activityInstanceName}) { let body; - if(activityInstanceName == 'Concluir Despacho' || activityInstanceName == 'Concluir Parecer' || activityInstanceName == 'Concluir Deferimento'){ + if(activityInstanceName == 'Concluir Despacho' + || activityInstanceName == 'Concluir Parecer' + || activityInstanceName == 'Concluir Deferimento' + || activityInstanceName == 'Tarefa de Deferimento' + ){ body = { "serialNumber": serialnumber, "action": "Parecer", @@ -109,7 +113,11 @@ export class DespachoService { EfectuarDespacho({note = '', documents = [], serialnumber, activityInstanceName}) { let body; - if(activityInstanceName == 'Concluir Despacho' || activityInstanceName == 'Concluir Parecer' || activityInstanceName == 'Concluir Deferimento'){ + if(activityInstanceName == 'Concluir Despacho' + || activityInstanceName == 'Concluir Parecer' + || activityInstanceName == 'Concluir Deferimento' + || activityInstanceName == 'Tarefa de Deferimento' + ){ body = { "serialNumber": serialnumber, "action": "Despacho", 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 1c7e55605..262b21dc0 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -52,7 +52,7 @@ export class DespachoPage implements OnInit { private despachoService: DespachoService, private location: Location, public p: PermissionService, - + ) { this.activatedRoute.paramMap.subscribe(params => { 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 b525a8cd9..a563b56ee 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 @@ -226,7 +226,7 @@ export class BookMeetingModalPage implements OnInit { this.runValidation() if(this.Form.invalid) return false } - + let Attendees = this.taskParticipants.concat(this.taskParticipantsCc); this.eventBody={ @@ -284,15 +284,16 @@ export class BookMeetingModalPage implements OnInit { } else if(this.task.FsId == '361') { + const loader = this.toastService.loading() try { switch (this.loggeduser.Profile) { case 'MDGPR': - await this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise(); + await this.calendarService.createTaskEvent(this.task.FolderID | this.task.FolderId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise(); break; case 'PR': - await this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "pr",this.task.SerialNumber, this.task.FsId).toPromise(); + await this.calendarService.createTaskEvent(this.task.FolderID | this.task.FolderId, this.postData, "pr",this.task.SerialNumber, this.task.FsId).toPromise(); break; } this.close(); @@ -307,7 +308,7 @@ export class BookMeetingModalPage implements OnInit { } if(true) { - // + // } } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 852c5e3e6..20f96d556 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -155,9 +155,8 @@ ion-segment-button{ .exp-card-long{ cursor: pointer; user-select: none; - //background: white; + background: white; box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); - //Sbackground: white; width: 360px; margin: 7px 20px; border-radius: 15px; @@ -518,6 +517,7 @@ ion-list{ } } } + @media only screen and (min-width: 801px) { .title{ font-size: 25px !important;