diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html index 5e2ed2e48..f965a8b52 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -149,7 +149,7 @@ -
+
@@ -170,14 +170,14 @@ -
+
-
+
@@ -230,7 +230,7 @@
- - + +
\ No newline at end of file diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html index edf8d0956..c2a70d341 100644 --- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html @@ -1,7 +1,7 @@
-
@@ -18,7 +18,7 @@
- - + +
diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html index e550d2b42..76f285bd8 100644 --- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html @@ -1,15 +1,15 @@

- Adicionar Nota + Adicionar Nota

- Aprovar + Aprovar

- Rejeitar + Rejeitar

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 1f0665295..152aaea38 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -144,7 +144,7 @@
-
+
@@ -174,7 +174,7 @@
-
+
@@ -194,7 +194,7 @@
-
+
@@ -212,7 +212,7 @@

{{document.Assunto}} {{document.appName}} - +

@@ -226,13 +226,13 @@ - + Cancelar - + Gravar diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index ccc50c5a6..d1745e16a 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -99,7 +99,7 @@ *ngFor="let attach of loadedAttachments" (click)="viewDocument(attach.SourceId)"> -

{{attach.SourceName}}

+

{{attach.SourceName}}

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

 diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 4a1205146..8439fbbd6 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -56,7 +56,7 @@
-
@@ -90,13 +90,13 @@
Correspondência por ler
-
-
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index c4f4618c2..d0d3e34e6 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -112,7 +112,7 @@ export class DespachoPage implements OnInit { }); } - getDocumentDetails(forlderId:string, applicationId:string){ + getDocumentDetails(forlderId:string, applicationId:string) { this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{ this.attachments = res.Documents; console.log(res['Documents']); diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html index 82683e678..a7efa5476 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html @@ -1,14 +1,14 @@
-
-
+
@@ -20,7 +20,7 @@ - + Aprovar @@ -109,8 +109,8 @@ -->
- - - + + +
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html index 704c66af1..cf5a304c2 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html @@ -1,12 +1,12 @@
-
+
-
+
@@ -18,7 +18,7 @@ - + Aprovar @@ -81,7 +81,7 @@
--> - +

diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html index 04ee37c33..5dc0e4a27 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.html +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html @@ -1,7 +1,7 @@

-
@@ -32,7 +32,7 @@
-
@@ -54,7 +54,7 @@
-
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index a1078b5ef..0223b877b 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -99,6 +99,8 @@ ion-content{ justify-content: center; .exp-card{ + cursor: pointer; + user-select: none; width: 173px; height: 200px; margin: 7px; @@ -115,6 +117,8 @@ ion-content{ //justify-content: center; } .exp-card-long{ + cursor: pointer; + user-select: none; background: white; box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); background: white; @@ -251,6 +255,8 @@ ion-content{ .exp-card-long{ display: none !important; width: 100% !important; + cursor: pointer; + user-select: none; background: white; box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); background: white; diff --git a/src/app/shared/agenda/approve-event/approve-event.component.html b/src/app/shared/agenda/approve-event/approve-event.component.html index 3fb5cc941..72b536093 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.html +++ b/src/app/shared/agenda/approve-event/approve-event.component.html @@ -84,17 +84,20 @@
-
+
-

Documentos Anexados

- +
Documentos Anexados
+ -

Receita por Natureza

-

{{loadedAttachments.Remetente}}{{loadedAttachments.CreateDate}}

+

{{attach.SourceName}}

+

{{attach.Stakeholders}}{{ attach.CreateDate | date: 'dd-MM-yy' }}
+
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 571ff7c8a..b84df53ba 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.scss +++ b/src/app/shared/agenda/approve-event/approve-event.component.scss @@ -81,7 +81,6 @@ } .bottom-content{ - width: 360px; margin: 0 auto; .bottom-content h3{ 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 d077b09ac..edc58665b 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.ts +++ b/src/app/shared/agenda/approve-event/approve-event.component.ts @@ -7,6 +7,7 @@ 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'; @Component({ @@ -27,6 +28,7 @@ export class ApproveEventComponent implements OnInit { days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"]; @Input() serialNumber:string; + @Input() InstanceId:string; @Input() showAside:boolean; @Output() approveEventDismiss = new EventEmitter(); @@ -40,8 +42,11 @@ export class ApproveEventComponent implements OnInit { private attachmentsService: AttachmentsService, private popoverController: PopoverController, private menu: MenuController, - private alertService: AlertService - ) { } + private alertService: AlertService, + private iab: InAppBrowser + ) { + // $$$ + } ngOnInit() { this.getTask(); @@ -102,10 +107,20 @@ export class ApproveEventComponent implements OnInit { this.modalController.dismiss(null); } - getAttachments(){ - this.attachmentsService.getAttachmentsBySerial(this.serialNumber).subscribe(res=>{ - this.loadedAttachments = res; - console.log(res); + async getAttachments(){ + console.log('load attachment') + this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise(); + + console.log('this.loadedAttachments', this.loadedAttachments) + } + + 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(); + }); } @@ -139,9 +154,9 @@ export class ApproveEventComponent implements OnInit { if(res.data !== ''){ let body = { "serialNumber": serialNumber, "action": "Emendar", - "dataFields": { - "ReviewerComments": res.data, - } + "dataFields": { + "ReviewerComments": res.data, + } } console.log(body); this.processes.PostTaskAction(body); diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html index 7c300b18e..9b689777c 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html @@ -30,7 +30,7 @@ + (click)="openApproveModal(event)">

{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}

diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts index 89dfbc49c..1edfbb72c 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts @@ -31,7 +31,7 @@ export class EventsToApprovePage implements OnInit { private router: Router, //private navParams: NavParams, ) { } -S + ngOnInit() { //this.segment = this.navParams.get('segment'); /* console.log(this.navParams.get('md')); */ @@ -53,29 +53,46 @@ S } - LoadToApproveEvents(){ + LoadToApproveEvents() { this.showLoader = true; this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{ this.showLoader = false; this.eventsPRList = res; + + console.log('this.eventsPRList', this.eventsPRList) }); this.processes.GetToApprovedEvents('MDGPR','false').subscribe(res=>{ this.showLoader = false; this.eventsMDGPRList = res; + + console.log('this.eventsMDGPRList', this.eventsMDGPRList) }); } - async openApproveModal(eventSerialNumber){ + + async openApproveModal(eventToAprove) { let classs; if( window.innerWidth <= 800){ classs = 'modal modal-desktop' } else { classs = 'modal modal-desktop showAsideOptions' } + + let InstanceId; + + console.log(eventToAprove) + + if(!eventToAprove.workflowInstanceDataFields.hasOwnProperty('InstanceId')){ + InstanceId = '' + } else { + InstanceId =eventToAprove.workflowInstanceDataFields.InstanceId + } + const modal = await this.modalController.create({ component: ApproveEventComponent, componentProps:{ - serialNumber: eventSerialNumber, + serialNumber: eventToAprove.serialNumber, + InstanceId: InstanceId , showAside: true, }, cssClass: classs, diff --git a/src/app/shared/header-pr/header-pr.page.scss b/src/app/shared/header-pr/header-pr.page.scss index feafb678e..e44e036b1 100644 --- a/src/app/shared/header-pr/header-pr.page.scss +++ b/src/app/shared/header-pr/header-pr.page.scss @@ -40,6 +40,8 @@ .tab{ height: 65px; + cursor: pointer; + user-select: none; } .active{ diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index 04190fa46..5f4fc93f3 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -33,7 +33,7 @@ Ínicio
-
+
Agenda
diff --git a/src/app/shared/header/header.page.scss b/src/app/shared/header/header.page.scss index f5b221329..4fef9fe3e 100644 --- a/src/app/shared/header/header.page.scss +++ b/src/app/shared/header/header.page.scss @@ -36,6 +36,8 @@ .tab{ height: 65px; + cursor: pointer; + user-select: none; } .active{