From f2e95cc8b645b981d94b85ff0e05cfb2364aa140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Mon, 6 Feb 2023 17:11:30 +0100 Subject: [PATCH] action verification added to pedido details --- .../gabinete-digital/pedidos/pedido/pedido.page.html | 4 ++-- .../gabinete-digital/pedidos/pedido/pedido.page.ts | 9 ++++++++- .../request-options/request-options.page.html | 4 ++-- .../popover/request-options/request-options.page.ts | 6 ++++++ version/git-version.ts | 12 ++++++------ 5 files changed, 24 insertions(+), 11 deletions(-) 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/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 addd789e5..0a48bd91d 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "9f13967ae", - "SHA": "9f13967ae3f2c7986e9c58d14c8501601da77735", + "shortSHA": "9c3cdf2ac", + "SHA": "9c3cdf2ac51007c8c0453419c91c73e8be0e707f", "branch": "no_bug_movemente", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Mon Feb 6 14:02:38 2023 +0100'", - "lastCommitMessage": "condintion added to publication details", - "lastCommitNumber": "4731", + "lastCommitTime": "'Mon Feb 6 15:34:46 2023 +0100'", + "lastCommitMessage": "notification added to chat grup", + "lastCommitNumber": "4737", "change": "", - "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 3 and 5 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/chat/chat.page.ts\n\tmodified: src/app/pages/events/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/events/event-detail-modal/event-detail-modal.page.ts\n\tmodified: src/app/pages/events/event-detail/event-detail.page.ts\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/app/pages/publications/new-action/new-action.page.html\n\tmodified: src/app/pages/publications/new-action/new-action.page.ts\n\tmodified: src/app/pages/publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/events/edit-event/edit-event.page.ts\n\tmodified: src/app/services/events/event-detail-modal/event-detail-modal.page.ts\n\tmodified: src/app/services/events/event-detail/event-detail.page.ts\n\tmodified: src/app/services/events/events.page.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts", + "changeStatus": "On branch no_bug_movemente\nYour branch is behind 'origin/no_bug_movemente' by 3 commits, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\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/popover/request-options/request-options.page.html\n\tmodified: src/app/shared/popover/request-options/request-options.page.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file