diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index 4a56825d6..622aa4572 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -121,7 +121,6 @@ export class ApproveEventPage implements OnInit { this.processes.GetTask(this.serialNumber).subscribe(async res => { this.loadedEvent = res - console.log('1111=1=1=1=') this.addProcessToDB(this.loadedEvent) try { diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts index 55847ce4a..54444b063 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -55,6 +55,10 @@ export class ApproveEventPage implements OnInit { ) { // Event to approve list + + window['edit-approve-event-desktop'] = ()=> { + this.getTask() + } } toDateString(e) { @@ -168,6 +172,7 @@ export class ApproveEventPage implements OnInit { }); return await popover.present().then(() =>{ this.TaskService.loadEventosParaAprovacao() + this.getTask() }) } diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts index 5020fd780..49f9cda23 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts @@ -372,14 +372,14 @@ export class EditEventToApprovePage implements OnInit { if(document['action'] == 'add') { delete document.action this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{ - + window['edit-approve-event-desktop']() }, error =>{ this.toastService.badRequest(); }); } else if(document['action'] == 'delete') { delete document.action this.attachmentsService.deleteEventAttachmentById(document.Id).subscribe( res=>{ - + window['edit-approve-event-desktop']() }, error =>{ this.toastService.badRequest() }) diff --git a/version/git-version.ts b/version/git-version.ts index c917c77e6..36148a320 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "de531bc55", - "SHA": "de531bc5508a74ef4ad4407aef91d729cb82faf3", + "shortSHA": "04b5373ea", + "SHA": "04b5373eaa358edf7036441f15eb88461a1242a3", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Sat Jun 10 12:19:46 2023 +0100'", - "lastCommitMessage": "improve", - "lastCommitNumber": "4961", + "lastCommitTime": "'Sat Jun 10 14:17:41 2023 +0100'", + "lastCommitMessage": "remove limites", + "lastCommitNumber": "4962", "change": "", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: .gitignore\n\tmodified: src/app/models/beast-orm.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/processes.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts\n\tmodified: version/git-version.ts", + "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file