-
+
-
+
@@ -111,7 +111,7 @@
- Adicionar intervenientes + Adicionar intervenientes {{participant.Name}} @@ -132,7 +132,7 @@
- Com conhecimento + Com conhecimento {{participant.Name}} @@ -188,6 +188,11 @@
+ + - Adicionar intervenientes + Adicionar intervenientes {{participant.Name}} @@ -86,7 +86,7 @@
- Com conhecimento + Com conhecimento {{participant.Name}} 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 d49f3fae8..279ba212d 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -139,7 +139,7 @@
- Adicionar intervenientes + Adicionar intervenientes {{participant.Name}} @@ -162,7 +162,7 @@
- Como conhecido + Como conhecido {{participant.Name}} diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html index 610f85ecb..c99755369 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -60,7 +60,7 @@
-
+
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html index c0ca45367..7c63a6baa 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.html +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html @@ -56,7 +56,7 @@
-
+
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index 979919e9b..2b0f5b3e6 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -143,7 +143,7 @@
- Adicionar intervenientes + Adicionar intervenientes {{participant.Name}} @@ -164,7 +164,7 @@
- Adicionar intervenientes + Adicionar intervenientes {{participant.Name}} diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html index 65b660eca..da437d04f 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html @@ -52,7 +52,7 @@
-
+
diff --git a/src/global.scss b/src/global.scss index 900b5fa11..7144cefa4 100644 --- a/src/global.scss +++ b/src/global.scss @@ -717,6 +717,12 @@ body, .blue-background{ background: #0782C9 !important;} ion-content { --background:none; } +.header-default-padding{ + padding: 30px 20px 0 20px !important; + } +.content-default-padding{ + padding: 0px 20px 0 20px !important; +} From 16e697731d01cc38e98ba3f1d090cc0f5ca8edc2 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 21 Jun 2021 11:00:06 +0100 Subject: [PATCH 3/7] save --- .../expediente-detail.page.ts | 8 +++-- src/app/services/events.service.ts | 35 ++++++++++++++++--- 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index d8a004d70..360619358 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -135,7 +135,7 @@ export class ExpedienteDetailPage implements OnInit { async LoadTaskDetail(serial: string) { this.processes.GetTask(serial).subscribe(res => { - console.log(res); + //console.log(res); this.task = { "SerialNumber": res.serialNumber, @@ -151,10 +151,10 @@ export class ExpedienteDetailPage implements OnInit { "WorkflowName": res.workflowDisplayName, } - console.log('task', this.task); + //console.log('task', this.task); this.fulltask = res; - console.log('GetTask', res); + //console.log('GetTask', res); let thedate = new Date(this.task.CreateDate); this.customDate = this.days[thedate.getDay()]+ ", " + thedate.getDate() +" de " + ( this.months[thedate.getMonth()]); @@ -303,6 +303,8 @@ export class ExpedienteDetailPage implements OnInit { } async openBookMeetingModal(task: any) { + console.log(task); + let classs; if( window.innerWidth <= 800){ classs = 'book-meeting-modal modal modal-desktop' diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 6c7853d63..8159936c8 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -397,15 +397,42 @@ export class EventsService { postExpedientEvent(docId:any, body:any, sharedagenda:string, serialNumber:any, applicationID:any){ const geturl = environment.apiURL + 'calendar/' + ((sharedagenda != '') ? sharedagenda : 'CreateEventExpediente')+'/event'; let params = new HttpParams(); + let options; params = params.set("DocId", docId); params = params.set("SerialNumber", serialNumber); params = params.set("applicationID", applicationID); - let options = { - headers: this.headers, - params: params - }; + switch (this.loggeduser.Profile) { + case 'MDGPR': + if(body.CalendarName == 'Pessoal'){ + options = { + headers: this.headersMdPessoal, + params: params + }; + } + else if(body.CalendarName == 'Oficial'){ + options = { + headers: this.headersMdOficial, + params: params + }; + } + break; + case 'PR': + if(body.CalendarName == 'Pessoal'){ + options = { + headers: this.headersPrPessoal, + params: params + }; + } + else if(body.CalendarName == 'Oficial'){ + options = { + headers: this.headersPrOficial, + params: params + }; + } + break; + } return this.http.post(`${geturl}`, body, options) } createTaskEvent(folderId:any, body:any, sharedagenda:string, serialNumber:any, applicationID:any){ From 240d3ad8e523e22d215b85910387f5b67f0ca490 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 21 Jun 2021 11:40:05 +0100 Subject: [PATCH 4/7] save --- .../discart-expedient-modal.page.html | 14 +++---- .../discart-expedient-modal.page.scss | 22 ++-------- .../book-meeting-modal.page.ts | 22 ++++++++-- .../opts-expediente/opts-expediente.page.ts | 2 + src/theme/variables.scss | 40 ++++++++++++++++--- 5 files changed, 64 insertions(+), 36 deletions(-) diff --git a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html index 971ed12f6..af5ce3919 100644 --- a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html +++ b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html @@ -12,13 +12,9 @@
- - - - - - - - - +
+ + +
+ diff --git a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.scss b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.scss index 0188510aa..005553fac 100644 --- a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.scss +++ b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.scss @@ -20,23 +20,7 @@ ion-content{ } .buttons{ - width: 100%; - margin: 0 auto; - padding: 5px 0 5px 0; + display: flex; + justify-content: space-between; + padding: 15px 0 15px 0; } - - .button-reject { - width: 130px; - height: 44px; - --color: #d30a0a; - border-radius: 22.5px; - --background: #ffe0e0; - margin: 0 12px 0 0px; - } - .button-approve { - width: 130px; - height: 44px; - border-radius: 22.5px; - --background: #42b9fe; - margin: 0 0px 0 12px; - } \ No newline at end of file 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 a3159dcc1..e9677c103 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 @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; +import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { AnimationController, ModalController, NavParams } from '@ionic/angular'; import { AddParticipantsCcModalPage } from '../add-participants-cc-modal/add-participants-cc-modal.page'; import { AddParticipantsModalPage } from '../add-participants-modal/add-participants-modal.page'; @@ -57,6 +57,7 @@ export class BookMeetingModalPage implements OnInit { authService: AuthService, private animationController: AnimationController, private toastService: ToastService, + private activatedRoute: ActivatedRoute, ) { this.taskParticipants = []; this.loggeduser = authService.ValidatedUser; @@ -98,6 +99,19 @@ export class BookMeetingModalPage implements OnInit { cancelTask(){ this.modalController.dismiss(null); } + goBack() { + this.modalController.dismiss(null); + let navigationExtras: NavigationExtras = { + queryParams: { + "expedientes": true, + } + } + if( window.innerWidth < 801) { + this.router.navigate(['/home/gabinete-digital/expediente']); + } else { + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } + } async saveTask(){ // issue12323423 @@ -140,9 +154,11 @@ export class BookMeetingModalPage implements OnInit { await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "pr",this.task.SerialNumber, this.task.FsId).toPromise() break; } - + + this.modalController.dismiss(); this.distartExpedientModal(); - this.toastService.successMessage('Reunião criada') + this.toastService.successMessage('Reunião criada'); + } catch (error) { this.toastService.badRequest('Reunião não criada') } diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts index 81eb25ab9..17068ef18 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -60,6 +60,7 @@ export class OptsExpedientePage implements OnInit { } async openBookMeetingModal() { + this.close(); let classs; if( window.innerWidth <= 800){ classs = 'book-meeting-modal modal modal-desktop' @@ -77,6 +78,7 @@ export class OptsExpedientePage implements OnInit { await modal.present(); modal.onDidDismiss(); } + async openExpedientActionsModal(taskAction: any, task: any) { //this.modalController.dismiss(); let classs; diff --git a/src/theme/variables.scss b/src/theme/variables.scss index a9d800520..127cba229 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -467,18 +467,19 @@ $app-theme: mat-light-theme(( overflow: auto; --background: #fff; } -.btn-ok{ - width: 170px !important; + +.btn-ok-no-width{ height: 45px !important; - margin: 0 auto !important; + margin: 0 auto; padding:0 !important; border-radius: 22.5px; background-color: #42b9fe; color: #ffffff !important; } -.btn-ok-no-width{ +.btn-ok{ + width: 170px !important; height: 45px !important; - margin: 0 auto; + margin: 0 auto !important; padding:0 !important; border-radius: 22.5px; background-color: #42b9fe; @@ -504,6 +505,35 @@ $app-theme: mat-light-theme(( color: #061b52 !important; margin: 0 auto !important; } +.btn-ok-medium{ + width: 130px !important; + height: 45px !important; + margin: 0 auto !important; + padding:0 !important; + border-radius: 22.5px; + background-color: #42b9fe; + color: #ffffff !important; +} +.btn-delete-medium{ + display: block; + width: 130px !important; + height: 45px !important; + margin: 0 auto !important; + padding:0 !important; + border-radius: 22.5px; + background-color: #ffe0e0; + color: #d30a0a !important; +} +.btn-cancel-medium{ + display: block; + width: 130px !important; + height: 45px !important; + padding:0 !important; + border-radius: 22.5px; + background-color: #e0e9ee; + color: #061b52 !important; + margin: 0 auto !important; +} .btn-no-color{ background-color: #fff; } From 8627a4bc19584f8cda706b9ce46d5bc259b1a67a Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 21 Jun 2021 12:46:19 +0100 Subject: [PATCH 5/7] save --- .../modals/create-process/create-process.page.html | 4 ++-- .../modals/create-process/create-process.page.scss | 3 +++ src/app/modals/create-process/create-process.page.ts | 12 ++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index 53598956e..ec66be23f 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -25,7 +25,7 @@
- +
@@ -40,7 +40,7 @@
- +
diff --git a/src/app/modals/create-process/create-process.page.scss b/src/app/modals/create-process/create-process.page.scss index 4027733a7..8d65f1756 100644 --- a/src/app/modals/create-process/create-process.page.scss +++ b/src/app/modals/create-process/create-process.page.scss @@ -186,3 +186,6 @@ text-align: right; float: right; font-size: 13px; } +.icon-time{ + color: #797979b0; +} diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index d2cf3fa16..26873ce2b 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -116,16 +116,16 @@ export class CreateProcessPage implements OnInit { } ngOnInit() { + this.getSubjectType(); + setTimeout(() => { + this.selectedTypes = ['99999850']; + }, 500); + console.log(this.postData.DispatchFolder.SubjectTypes); this.taskDate = new Date(this.task.taskStartDate); - this.getSubjectType(); - - if(this.selectedTypes.length > 1){ - console.log('Yes'); - - } } + onSelectedTypesChanged(ev:any){ console.log(ev); if(ev.length > 1){ From 96d213b18775f37025079a490179ab297deb7b05 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 21 Jun 2021 12:54:54 +0100 Subject: [PATCH 6/7] save --- src/app/pages/agenda/new-event/new-event.page.html | 2 +- src/app/pages/agenda/new-event/new-event.page.scss | 3 +++ src/app/pages/agenda/new-event/new-event.page.ts | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index 63d64ad9e..d475fa8dd 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -54,7 +54,7 @@
- +
Date: Mon, 21 Jun 2021 13:59:45 +0100 Subject: [PATCH 7/7] save --- .../expedient-task-modal/expedient-task-modal.page.html | 4 ++-- .../expedient-task-modal/expedient-task-modal.page.scss | 3 +++ src/app/shared/agenda/new-event/new-event.page.html | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index 2aa8745b5..84f20c6f7 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -25,7 +25,7 @@
- +
@@ -40,7 +40,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss index e65b8d8d9..79005ca36 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss @@ -205,5 +205,8 @@ font-size: 13px; -ms-border-radius: 18px; -o-border-radius: 18px; } +.icon-time{ + color: #797979b0; +} 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 bb8cc2961..7e0449f6b 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -80,7 +80,7 @@
- +