From 15a22e28bee040e9e34b650bcdf3dfd448e977d3 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 6 Aug 2021 09:42:34 +0100 Subject: [PATCH 1/6] improve --- src/app/Rules/despacho.service.ts | 25 ++++++++----------- .../create-process/create-process.page.ts | 2 -- .../document-detail/document-detail.page.html | 3 ++- .../expediente-detail.page.html | 11 ++++---- 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/src/app/Rules/despacho.service.ts b/src/app/Rules/despacho.service.ts index ca5392df6..04c1d2ac5 100644 --- a/src/app/Rules/despacho.service.ts +++ b/src/app/Rules/despacho.service.ts @@ -50,7 +50,6 @@ export class DespachoService { // }, // "AttachmentList" :documents, // } - // return this.processes.CompleteTask(body) // } @@ -93,7 +92,6 @@ export class DespachoService { // } } - rexecucao({note, documents, serialnumber}) { let body = { "serialNumber": serialnumber, @@ -123,18 +121,17 @@ export class DespachoService { return this.processes.CompleteTask(body) } - - Finalizar({serialNumber}) { - const body = { - "serialNumber": serialNumber, - "action": "Conhecimento", - "ActionTypeId": 104, - "dataFields": { - "ReviewUserComment": '', - }, - "AttachmentList" :null, - } - } + // Finalizar({serialNumber}) { + // const body = { + // "serialNumber": serialNumber, + // "action": "Conhecimento", + // "ActionTypeId": 104, + // "dataFields": { + // "ReviewUserComment": '', + // }, + // "AttachmentList" :null, + // } + // } sendExpedienteToPending(serialnumber) { return this.processes.SetTaskToPending(serialnumber) diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index c43dde0ed..7c4bb7607 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -198,7 +198,6 @@ export class CreateProcessPage implements OnInit { async saveTask() { - if(!this.p.userRole(['PR'])) { this.injectValidation() this.runValidation() @@ -239,7 +238,6 @@ export class CreateProcessPage implements OnInit { this.dispatchFolder.SubjectTypes = this.selectedTypes; const loader = this.toastService.loading() - switch (this.loggeduser.Profile) { case 'MDGPR': diff --git a/src/app/modals/document-detail/document-detail.page.html b/src/app/modals/document-detail/document-detail.page.html index df3087c99..f5db52381 100644 --- a/src/app/modals/document-detail/document-detail.page.html +++ b/src/app/modals/document-detail/document-detail.page.html @@ -53,7 +53,8 @@
- + +
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index f2b6f2748..178e963cd 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -93,16 +93,15 @@
+ + - -
- - - - + + +
From 5034fb629d9c7fe12b27d09ae2b3dd61b8f883ec Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 6 Aug 2021 09:52:10 +0100 Subject: [PATCH 2/6] Improve --- .../expediente-detail/expediente-detail.page.html | 3 +++ .../expediente-detail/expediente-detail.page.scss | 15 +++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index 178e963cd..b5de202b4 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -93,8 +93,11 @@
+
Responder ao PR
+
Solicitar revisão
+
Outras opções
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss index 15ada0551..42679c0d6 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss @@ -316,3 +316,18 @@ ion-button{ width: 25%; } } + +.option-desc { + display: flex; + color: #828282; + width: 100%; + justify-content: space-between; + align-items: center; + font-size: 11pt; + .option-desc-line { + height: 1px; + flex-grow: 1; + background-color: #e0e0e0; + padding-left: 4px; + } +} \ No newline at end of file From a10d56b6145b0c8bce7c80c442a0de507afc97de Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 6 Aug 2021 10:24:57 +0100 Subject: [PATCH 3/6] Change --- .../pages/gabinete-digital/pedidos/pedido/pedido.page.html | 3 ++- src/app/shared/agenda/edit-event/edit-event.page.html | 5 ++--- src/app/shared/agenda/new-event/new-event.page.html | 1 - src/global.scss | 4 ++-- 4 files changed, 6 insertions(+), 7 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 0d3bbfdef..bb10b3c3c 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -116,7 +116,8 @@
- + + diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html index ac92d52b0..6ac05c151 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -140,7 +140,7 @@
-
+
+ [stepSecond]="stepSecond"> diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html index cb8fc62f5..a9a5b7147 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -149,7 +149,6 @@ [showSeconds]="showSeconds" [stepHour]="stepHour" [stepMinute]="stepMinute" [stepSecond]="stepSecond" - [touchUi]="touchUi" > diff --git a/src/global.scss b/src/global.scss index 15593bbbd..309d86b11 100644 --- a/src/global.scss +++ b/src/global.scss @@ -988,8 +988,8 @@ background: rgb(92, 92, 92); height: 43px; opacity: 0; button { - width: 100%; - height: 100%; + width: 100% !important; + height: 100% !important; } } button { From 9d955381152c126c841d33d1b9fdf1bedc14e828 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 6 Aug 2021 10:28:00 +0100 Subject: [PATCH 4/6] Change message --- .../expedient-task-modal/expedient-task-modal.page.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index f8ec0f16b..91d3e02c4 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -432,7 +432,7 @@ export class ExpedientTaskModalPage implements OnInit { try { this.taskResult = await this.processes.postParecerPr(this.postData).toPromise(); - await this.toastService.badRequest('Processo não efetuado'); + await this.toastService.successMessage('Pedido enviado'); this.modalController.dismiss(action_parecer_pr); } catch (error) { From 5e04c70d5d6a3c9a6142e5d1f6e42110d9222fc1 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 6 Aug 2021 10:38:12 +0100 Subject: [PATCH 5/6] Improve --- .../expediente/expediente-detail/expediente-detail.page.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index b5de202b4..eb72b7b35 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -93,8 +93,8 @@
-
Responder ao PR
- +
Enviar para o PR
+
Solicitar revisão
Outras opções
From 22911bf88ef43d8f2241d86c75388921c6258758 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 6 Aug 2021 10:45:57 +0100 Subject: [PATCH 6/6] improve --- src/app/pages/gabinete-digital/gabinete-digital.page.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index a11d52157..c2ca112ec 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -110,7 +110,7 @@
-

Correspondencia

+

Expediente

{{expedientegbstore.count}} Documentos

@@ -167,7 +167,7 @@

{{ despachoprstore.count }} Documentos

-
+