+
+
+
+ +
+
+ +
+
+ +
-
- {{loadedEvent.workflowInstanceDataFields.Agenda}} +
+
+

+ {{loadedEvent.workflowInstanceDataFields.Location}} + {{loadedEvent.workflowInstanceDataFields.Agenda}} +

+
+
+ +

{{customDate}}

+

das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}

+

(Não se repete)

+

Repete

+ +
+
+
+ +
+
+
+
Intervenientes
+
+ {{att.Name}} +
+
+
+
+
Detalhes
+ +

+ +
+
+
+ +
+ +
Documentos Anexados
+ + +

{{attach.SourceName}}

+

{{attach.Stakeholders}}{{ attach.CreateDate | date: 'dd-MM-yy' }}

+ + + +
+
+
+ + +
+
+ + + +
+ +
-
- -

{{customDate}}

-

das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}

-

(Não se repete)

-

Repete

- -
-
-
-
-
Intervenientes
- - -

{{loadedEvent.workflowInstanceDataFields.Participants}}

- - -
Detalhes
- -

{{loadedEvent.workflowInstanceDataFields.Body}}

- -
- - - - -
- -

- Emendar -

-

- - - -

-

- Aprovar1 -

- -
- + + + +
+ + + + + + + +
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss index d582ade0e..da7cc1d95 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss @@ -1,16 +1,18 @@ -ion-content{ - --padding-top:0px; - --padding-start: 20px; - --padding-end: 20px; - font-size: 18px; +@import '~src/function.scss'; +.main-content{ + background-color: #fff !important; + border-top-left-radius: 25px; + border-top-right-radius: 25px; } ion-menu{ --height: 225px; } +.display-none-true{ + display: none; + border: 1px solid red; +} .header-content{ - width: 360px; - overflow: auto; - margin: 25px auto; + //margin: 25px auto; } .header-icon-left{ width: 36px; @@ -19,7 +21,6 @@ ion-menu{ float: left; } .header-title{ - width: 264px; font-family: Roboto; font-size: 25px; margin: 0 5px 0 5px; @@ -32,98 +33,148 @@ ion-menu{ font-size: 45px; float: left; } -.upper-content{ - margin-left: 50px; - overflow: auto; - font-size: 18px; - .content-location{ - width: 360px; - margin: 0 auto; - padding: 0; - overflow: auto; - } +.content{ + padding: 30px 20px 0 20px !important; + margin: 0; + float: left; + /* overflow: auto; + width: 100%; + border-right: 1px solid #d8d8d8; */ - .location-detail{ - width: 210px; - font-weight: 700; + .upper-content{ + margin-left: 40px; font-size: 18px; - float: left; - margin: 5px 5px 5px 0px; - } - .button-calendar-type{ - width: 91px; - --border-radius: 12.5px; - --background: #ffb703; - margin-left: 5px; + + .content-location{ + margin-top: 0px !important; + width: 100%; + padding: 0; + } + + .location{ float: left; + } + .event-type-Oficial{ + font-family: Roboto; + border-radius: 20px; + background: #ffb703; + float: right !important; + padding: 5px 13.5px 5px 13.5px; + color: #fff; + } + .event-type-Pessoal{ + font-family: Roboto; + border-radius: 20px; + background: #f05d5e; + float: right !important; + padding: 5px 13.5px 5px 13.5px; + color: #fff; + } + .button-edit-event { + width: 140px; + height: 44px; + border-radius: 22.5px; + --background: #e0e9ee; + --color:#061b52; + } + .content-details p{ + font-size: 16px; + } } - .button-calendar-type ion-button{ - height: 25px; - } - .button-edit-event { - width: 140px; - height: 44px; - border-radius: 22.5px; - --background: #e0e9ee; - --color:#061b52; - } - .content-details p{ + .middle-conten{ + .middle-content h3, .middle-content p{ font-size: 16px; + } + } + + .bottom-content{ + margin: 0 auto; + + .bottom-content h3{ + font-size: 16px; + margin: 0 0 0 10px; + } + .attach-document{ + font-size: 15px; + color: #0d89d1; + margin: 5px 5px 5px 10px; + padding: 5px; + float: left; + } + .attach-icon{ + width: 37px; + font-size: 35px; + float: left; + } + .attach-title-item{ + width: 100%; + font-size: 15px; + color:#0d89d1; + } + /* SPAN */ + .span-left{ + float: left; + font-size: 15x; + } + .span-right{ + text-align: right; + float: right; + font-size: 13px; + } } } -.middle-conten{ - .middle-content h3, .middle-content p{ - font-size: 16px; +.aside-right{ + overflow: auto; + padding: 30px 20px 0 20px !important; + + .arrow-right{ + display: flex; + justify-content: flex-end; + margin-bottom: 20px; + + /* .arrow-right-icon{ + width: 37px; + float: right; + font-size: 35px; + overflow: hidden; + } */ + } + .aside-buttons{ + width: 100% !important; + display: flex; + flex-wrap: wrap; + justify-content: space-between; + + .btn-ok, .btn-cancel, .btn-delete{ + height: auto !important; + font-size: 16px !important; + font-weight: 600 !important; + width: 100% !important; + margin-bottom: 10px !important; + padding: 15px !important; + } + } + .solid { + display: block; + width: 90%; + border-top: 1px solid #ebebeb; + margin: 0 auto !important; + margin-bottom: 10px !important; } } -.bottom-content{ - width: 360px; - margin: 0 auto; - - .bottom-content h3{ - font-size: 16px; - margin: 0 0 0 10px; - } - .attach-document{ - font-size: 15px; - color: #0d89d1; - margin: 5px 5px 5px 10px; - padding: 5px; - float: left; - } - .attach-icon{ - width: 37px; - font-size: 35px; - float: left; - } - .attach-title-item{ - width: 100%; - font-size: 15px; - color:#0d89d1; - } - /* SPAN */ - .span-left{ - float: left; - font-size: 15x; - } - .span-right{ - text-align: right; - float: right; - font-size: 13px; - } -} .buttons{ - width: 360px; - margin: 0 auto; -} + display: flex; + justify-content: space-between; + overflow: auto; + .button-options { height: 44px; - --color: #42b9fe; - /* opacity: 0; */ + --color: #42b9fe; + /* opacity: 0; */ } .button-approve { width: 140px; @@ -138,3 +189,29 @@ ion-menu{ border-radius: 22.5px; --background: #ffe0e0; } +} + + + + +/* @media only screen and (max-width: 1140px) { + .content{ + width: 100%; + } + .aside-right{ + display: none; + } +} */ +/* @media only screen and (min-width: 1140px) { + .div-icon{ + display: none; + } + .content{ + //width: 75%; + border-right: 1px solid #d8d8d8; + } + + .aside-right{ + width: 25%; + } +} */ 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 4715c7e76..1c184f6d3 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 @@ -1,11 +1,14 @@ -import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { MenuController, ModalController, PopoverController } from '@ionic/angular'; -import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/emend-message-modal.page'; -import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page'; +import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core'; +import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; +import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular'; +import { Event } from 'src/app/models/event.model'; import { AlertService } from 'src/app/services/alert.service'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { ProcessesService } from 'src/app/services/processes.service'; +import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/emend-message-modal.page'; +import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page'; +import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; +import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page'; @Component({ selector: 'app-approve-event', @@ -14,95 +17,122 @@ import { ProcessesService } from 'src/app/services/processes.service'; }) export class ApproveEventPage implements OnInit { event: Event; - loadedEvent: any; - loadedAttachments: any; - serialNumber: string; - customDate: any; - today: any; - + loadedEvent:any; + loadedEvent1:any; + loadedAttachments:any; + customDate:any; + today:any; + show: boolean = false; + months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"]; days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"]; + serialNumber:string; + @Input() InstanceId:string; + + @Output() approveEventDismiss = new EventEmitter(); + @Output() closeEventToApprove = new EventEmitter(); + @Output() AproveEventEditEvent = new EventEmitter(); constructor( - private router: Router, + private router:Router, + private activatedRoute: ActivatedRoute, private modalController: ModalController, - private processes: ProcessesService, + private processes:ProcessesService, private attachmentsService: AttachmentsService, private popoverController: PopoverController, private menu: MenuController, private alertService: AlertService, - private activatedRoute: ActivatedRoute, - ) { - this.activatedRoute.paramMap.subscribe(paramMap => - { - if (!paramMap.has("serialNumber")){ - return; - } - else{ - this.serialNumber = paramMap.get('serialNumber'); - console.log(this.serialNumber); - - } - }); - this.loadedEvent = null; - } - - ngOnInit() { - console.log(this.serialNumber); - - this.getTask(); - this.getAttachments(); - } - - notImplemented() { - this.alertService.presentAlert('Funcionalidade em desenvolvimento'); - } - - close() { - this.router.navigate(['/home/gabinete-digital/event-list']); - } - - getTask() { - this.processes.GetTask(this.serialNumber).subscribe(res => { - console.log(res); - this.loadedEvent = res; - this.today = new Date(res.workflowInstanceDataFields.StartDate); - console.log(new Date(this.today)); - this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]); - - }) - } - approveTask(serialNumber: string) { - let body = { "serialNumber": serialNumber, "action": "Aprovar" } - console.log(body); - this.processes.PostTaskAction(body); - this.router.navigate(['/home/gabinete-digital/event-list']); - } - - emendTask(serialNumber: string) { - /* console.log('Emendar'); */ - this.menu.close(); - this.openEmendMessageModal(serialNumber); - this.close(); - } - - rejectTask(serialNumber: string) { - - let body = { "serialNumber": serialNumber, "action": "Rejeitar" } - console.log(body); - this.processes.PostTaskAction(body); - this.router.navigate(['/home/gabinete-digital/event-list']) - this.close(); - } - getAttachments() { - this.attachmentsService.getAttachmentsBySerial(this.serialNumber).subscribe(res => { - this.loadedAttachments = res; - console.log(res); + private iab: InAppBrowser + ) { + this.activatedRoute.queryParams.subscribe(params => { + if(params["serialNumber"]) { + this.serialNumber = params["serialNumber"]; + console.log(params["serialNumber"]); + } }); } - async openOptions(ev: any) { + ngOnInit() { + this.getTask(); + } + + notImplemented(){ + this.alertService.presentAlert('Funcionalidade em desenvolvimento'); + } + + close(){ + /* this.router.navigate(['/home/gabinete-digital/event-list']); */ + this.closeEventToApprove.emit(); + this.modalController.dismiss(); + } + + goBack(){ + let navigationExtras: NavigationExtras = { + queryParams: { + "eventos": true, + } + }; + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } + + async getTask(){ + this.loadedEvent = await this.processes.GetTask(this.serialNumber).toPromise(); + console.log(this.loadedEvent); + this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate); + console.log(new Date(this.today)); + this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]); + let instanceId = this.loadedEvent.workflowInstanceDataFields.InstanceId; + this.getAttachments(instanceId); + } + + approveTask(serialNumber:string){ + let body = { "serialNumber": serialNumber, "action": "Aprovar" } + console.log(body); + this.processes.PostTaskAction(body); + this.modalController.dismiss(serialNumber); + /* this.approveEventDismiss.emit({ + "serialNumber": serialNumber, + "action": "Aprovar", + "saveData": { + loadedEvent: this.loadedEvent, + today: this.today, + customDate: this.customDate + } + }); */ + } + + emendTask(serialNumber:string){ + /* console.log('Emendar'); */ + this.menu.close(); + this.openEmendMessageModal(serialNumber); + this.modalController.dismiss(null); + } + + rejectTask(serialNumber:string){ + + let body = { "serialNumber": serialNumber, "action": "Rejeitar" } + console.log(body); + this.processes.PostTaskAction(body); + this.router.navigate(['/home/gabinete-digital/event-list']); + this.modalController.dismiss(null); + } + + async getAttachments(instanceId:string){ + this.loadedAttachments = await this.attachmentsService.getAttachmentsById(instanceId).toPromise(); + } + + viewDocument(sourceId){ + this.processes.GetDocumentUrl(sourceId, '8').subscribe(res=>{ + /* console.log(res); */ + const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); + const browser = this.iab.create(url,"_blank"); + browser.show(); + + }); + } + + async openOptions(ev:any) { const popover = await this.popoverController.create({ component: EventActionsPopoverPage, cssClass: 'event-actions-popover', @@ -111,14 +141,14 @@ export class ApproveEventPage implements OnInit { }); return await popover.present(); } + openMenu() { this.menu.open(); } - async openEmendMessageModal(serialNumber: string) { + async openEmendMessageModal(serialNumber:string) { const modal = await this.modalController.create({ component: EmendMessageModalPage, - componentProps: { - + componentProps:{ }, cssClass: 'emend-message-modal', backdropDismiss: false @@ -127,22 +157,55 @@ export class ApproveEventPage implements OnInit { await modal.present(); modal.onDidDismiss().then(res => { - if (res.data !== '') { - let body = { - "serialNumber": serialNumber, - "action": "Emendar", - "dataFields": { + console.log(res.data); + + if(res.data !== ''){ + let body = { "serialNumber": serialNumber, + "action": "Emendar", + "dataFields": { "ReviewerUseComment": res.data, } } - console.log(body); - this.processes.PostTaskAction(body); - this.router.navigate(['/home/gabinete-digital/event-list']) + console.log(body); + this.processes.PostTaskAction(body); + //this.router.navigate(['/home/gabinete-digital/event-list']); + this.goToEventsToApprove(); } - else { + else{ //this.alertService.presentAlert('Operação cancelada!'); } }); } + goToEventsToApprove(){ + let navigationExtras: NavigationExtras = { + queryParams: { + "events": true, + } + }; + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } + + + async editar(serialNumber: string) { + + + const modal = await this.modalController.create({ + component: EditEventToApproveComponent, + componentProps: { + serialNumber: serialNumber, + InstanceId:this.InstanceId + }, + cssClass: 'modal modal-desktop', + // backdropDismiss: false + }); + + await modal.present(); + + modal.onDidDismiss().then(res => { + this.getTask(); + }); + + } + } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 210ba4b61..e635edf74 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -96,7 +96,7 @@ export class GabineteDigitalPage implements OnInit { case params["expedientes"]: this.openExpedientListPage(); - this.selectedElement='Correspondence' + this.selectedElement='Correspondence'; break; case params["pendentes"]: @@ -135,7 +135,6 @@ export class GabineteDigitalPage implements OnInit { this.openEventsToApprovePage('MDGPR'); this.selectedElement='approval' } */ - } 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 d55f6a344..488eceaab 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -171,7 +171,7 @@ export class PedidoPage implements OnInit { "action": "Reapreciação", "ActionTypeId": 100000009, "dataFields": { - "ReviewUserComent": note, + "ReviewUserComment": note, }, "AttachmentList" :documents, } @@ -185,7 +185,7 @@ export class PedidoPage implements OnInit { "action": "Arquivo", "ActionTypeId": 95, "dataFields": { - "ReviewUserComent": note, + "ReviewUserComment": note, }, "AttachmentList" :documents, } diff --git a/src/app/shared/agenda/approve-event/approve-event.component.scss b/src/app/shared/agenda/approve-event/approve-event.component.scss index b84df53ba..22ed80b8d 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.scss +++ b/src/app/shared/agenda/approve-event/approve-event.component.scss @@ -50,7 +50,7 @@ .event-type-Oficial{ font-family: Roboto; border-radius: 20px; - background: #fec077; + background: #ffb703; float: right !important; padding: 5px 13.5px 5px 13.5px; color: #fff; diff --git a/src/app/shared/agenda/approve-event/approve-event.component.ts b/src/app/shared/agenda/approve-event/approve-event.component.ts index 94dfaa4de..c4f43703d 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.ts +++ b/src/app/shared/agenda/approve-event/approve-event.component.ts @@ -171,7 +171,7 @@ export class ApproveEventComponent implements OnInit { goToEventsToApprove(){ let navigationExtras: NavigationExtras = { queryParams: { - "events": true, + "eventos": true, } }; this.router.navigate(['/home/gabinete-digital'], navigationExtras); diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html index f7f3b4138..95ede6b49 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html @@ -7,7 +7,7 @@