diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index b809f3b70..a7f0c7ddf 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -153,9 +153,9 @@
- + - +
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 64062f9b8..fbf4c24c0 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -50,6 +50,7 @@ export class PedidoPage implements OnInit { intervenientes: any = [] cc: any = []; loggeduser: LoginUserRespose; + taskArrayActions = []; constructor(private activatedRoute: ActivatedRoute, private processes: ProcessesService, @@ -113,6 +114,7 @@ export class PedidoPage implements OnInit { date.setMonth(date.getMonth() + 1); let taskDate = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds(); + this.taskArrayActions = res.actions this.task = { "SerialNumber": res.serialNumber, "Folio": res.workflowInstanceDataFields.Subject, @@ -190,6 +192,10 @@ export class PedidoPage implements OnInit { }); } + checkStringInArray(str) { + return this.taskArrayActions.includes(str); + } + updateProcess(res) { if (this.platform.is('desktop') || this.platform.is('mobileweb')) { } else { @@ -339,7 +345,8 @@ export class PedidoPage implements OnInit { serialNumber: this.task.SerialNumber, fulltask: this.fulltask, taskAction: taskAction, - showEnviarPendentes: false + showEnviarPendentes: false, + actions: this.taskArrayActions }, translucent: true }); diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 53e46dc6d..8d86b5b7a 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -226,7 +226,6 @@ export class NewEventPage implements OnInit { } setDefaultTime() { - console.log(this.CalendarDate) this.postEvent.StartDate = this.roundTimeQuarterHour(this.CalendarDate); this.postEvent.EndDate = this.postEvent.StartDate; } diff --git a/src/app/shared/popover/request-options/request-options.page.html b/src/app/shared/popover/request-options/request-options.page.html index 55d683e44..593e95eae 100644 --- a/src/app/shared/popover/request-options/request-options.page.html +++ b/src/app/shared/popover/request-options/request-options.page.html @@ -35,9 +35,9 @@
- + - + diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts index 78ac68331..d8c317807 100644 --- a/src/app/shared/popover/request-options/request-options.page.ts +++ b/src/app/shared/popover/request-options/request-options.page.ts @@ -26,6 +26,7 @@ export class RequestOptionsPage implements OnInit { profile:string; serialNumber : string; showEnviarPendentes = false; + taskActions = []; constructor( private popoverController: PopoverController, @@ -40,6 +41,7 @@ export class RequestOptionsPage implements OnInit { this.task = this.navParams.get('task'); this.fulltask = this.navParams.get('fulltask'); this.serialNumber = this.navParams.get('serialNumber'); + this.taskActions = this.navParams.get('actions'); this.activatedRoute.queryParams.subscribe(params => { if(params["serialNumber"]) { @@ -71,6 +73,10 @@ export class RequestOptionsPage implements OnInit { }; } + checkStringInArray(str) { + return this.taskActions.includes(str); + } + close() { this.popoverController.dismiss('close') } diff --git a/version/git-version.ts b/version/git-version.ts index 63b7dd3df..d64c17b89 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "18b647e70", - "SHA": "18b647e7023b6fc305dcb61cd06b6ad871eebaf8", + "shortSHA": "3fd2803a3", + "SHA": "3fd2803a3b3d92fdbcf66863b580d74e6e284b69", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Feb 6 16:31:55 2023 +0100'", - "lastCommitMessage": "fix merge", - "lastCommitNumber": "4740", + "lastCommitTime": "'Mon Feb 6 17:54:06 2023 +0100'", + "lastCommitMessage": "time", + "lastCommitNumber": "4741", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/publications/new-action/new-action.page.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts", + "changeStatus": "On branch no_bug_movemente\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/popover/request-options/request-options.page.html\n\tmodified: src/app/shared/popover/request-options/request-options.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file