+ +
{{loadedEvent.workflowInstanceDataFields.Location}} @@ -22,31 +45,32 @@ {{loadedEvent.workflowInstanceDataFields.Agenda}}
+

{{customDate}}

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

(Não se repete)

 +
- - - -

Intervenientes

-

{{loadedEvent.workflowInstanceDataFields.Participants}}

- - - - -

Detalhes

-

{{loadedEvent.workflowInstanceDataFields.Body}}

- - - -
+
- Documentos Anexados + +

Intervenientes

+

{{loadedEvent.workflowInstanceDataFields.Participants}}

+ + + +

Detalhes

+

{{loadedEvent.workflowInstanceDataFields.Body}}

+ + +
+ +
+

Documentos Anexados

Receita por Natureza

@@ -58,12 +82,15 @@ +

Emendar

- + + +

Aprovar @@ -74,5 +101,6 @@ Rejeitar

+
diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.scss b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.scss index a06d1980f..88b854402 100644 --- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.scss +++ b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.scss @@ -4,6 +4,9 @@ ion-content{ --padding-end: 20px; font-size: 18px; } +ion-menu{ + --height: 225px; +} .header-content{ width: 360px; overflow: auto; @@ -30,9 +33,10 @@ ion-content{ float: left; overflow: auto; } -.main-content{ +.upper-content{ margin-left: 50px; overflow: auto; + font-size: 18px; } .content-location{ width: 360px; @@ -44,6 +48,7 @@ ion-content{ .location-detail{ width: 210px; font-weight: 700; + font-size: 18px; float: left; margin: 5px 5px 5px 0px; } @@ -64,6 +69,20 @@ ion-content{ --background: #e0e9ee; --color:#061b52; } + .content-details p{ + font-size: 16px; + } + .middle-content h3, .middle-content p{ + font-size: 16px; + } + .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; @@ -91,6 +110,10 @@ ion-content{ float: right; font-size: 13px; } +.buttons{ + width: 360px; + margin: 0 auto; +} .button-options { height: 44px; diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts index 2a67acb21..e4ce88182 100644 --- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts +++ b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts @@ -2,7 +2,9 @@ import { Component, OnInit } from '@angular/core'; import { 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 { ProcessesService } from 'src/app/services/processes.service'; +import { EmendMessageModalPage } from '../emend-message-modal/emend-message-modal.page'; import { EventActionsPopoverPage } from '../event-actions-popover/event-actions-popover.page'; @Component({ @@ -16,22 +18,19 @@ export class ApproveEventModalPage implements OnInit { serialNumber:string; customDate:any; today:any; - - 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"]; - - - constructor( private router:Router, private modalController: ModalController, private navParams: NavParams, private processes:ProcessesService, private popoverController: PopoverController, + private menu: MenuController, + private alertService: AlertService, ) { this.serialNumber = this.navParams.get('serialNumber'); @@ -46,6 +45,9 @@ export class ApproveEventModalPage implements OnInit { } + notImplemented(){ + this.alertService.presentAlert('Funcionalidade em desenvolvimento'); + } close(){ this.router.navigate(['/home/gabinete-digital/event-list']); @@ -66,22 +68,25 @@ export class ApproveEventModalPage implements OnInit { let body = { "serialNumber": serialNumber, "action": "Aprovar" } console.log(body); this.processes.PostTaskAction(body); + this.alertService.presentAlert('Operação realizada com sucesso!'); this.router.navigate(['/home/gabinete-digital/event-list']); this.modalController.dismiss(null); } + emendTask(serialNumber:string){ + console.log('Emendar'); + this.menu.close(); + this.openEmendMessageModal(serialNumber); - let body = { "serialNumber": serialNumber, "action": "Emendar" } - console.log(body); - this.processes.PostTaskAction(body); - this.router.navigate(['/home/gabinete-digital/event-list']); - this.modalController.dismiss(null); + /* this.modalController.dismiss(null); */ } + rejectTask(serialNumber:string){ let body = { "serialNumber": serialNumber, "action": "Rejeitar" } console.log(body); this.processes.PostTaskAction(body); + this.alertService.presentAlert('Operação realizada com sucesso!'); this.router.navigate(['/home/gabinete-digital/event-list']); this.modalController.dismiss(null); } @@ -95,7 +100,38 @@ export class ApproveEventModalPage implements OnInit { }); return await popover.present(); } - - + openMenu() { + this.menu.open(); + } + async openEmendMessageModal(serialNumber:string) { + const modal = await this.modalController.create({ + component: EmendMessageModalPage, + componentProps:{ + + }, + cssClass: 'emend-message-modal', + backdropDismiss: false + }); + await modal.present(); + + modal.onDidDismiss().then(res => { + if(res.data !== ''){ + let body = { "serialNumber": serialNumber, + "action": "Emendar", + "dataFields": { + "ReviewerComments": res.data, + } + } + console.log(body); + this.processes.PostTaskAction(body); + this.alertService.presentAlert('Operação realizada com sucesso!'); + this.router.navigate(['/home/gabinete-digital/event-list']); + } + else{ + this.alertService.presentAlert('Operação cancelada!'); + } + }); +} + } diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal-routing.module.ts b/src/app/pages/agenda/emend-message-modal/emend-message-modal-routing.module.ts new file mode 100644 index 000000000..290308239 --- /dev/null +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { EmendMessageModalPage } from './emend-message-modal.page'; + +const routes: Routes = [ + { + path: '', + component: EmendMessageModalPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class EmendMessageModalPageRoutingModule {} diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.module.ts b/src/app/pages/agenda/emend-message-modal/emend-message-modal.module.ts new file mode 100644 index 000000000..d5b082e4e --- /dev/null +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { EmendMessageModalPageRoutingModule } from './emend-message-modal-routing.module'; + +import { EmendMessageModalPage } from './emend-message-modal.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + EmendMessageModalPageRoutingModule + ], + declarations: [EmendMessageModalPage] +}) +export class EmendMessageModalPageModule {} 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 new file mode 100644 index 000000000..cccbb6bd7 --- /dev/null +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html @@ -0,0 +1,26 @@ + +
+
+ +
+
+ +
+
+ + + + + + + + + +
+ + Cancelar + Gravar + +
+ + diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss new file mode 100644 index 000000000..54851ac15 --- /dev/null +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss @@ -0,0 +1,41 @@ +.header-content{ + width: 360px; + overflow: auto; + margin: 25px auto; + } + .header-icon-left{ + width: 36px; + font-size: 33px; + color: #42b9fe; + float: left; + } + .header-title{ + width: 264px; + font-family: Roboto; + font-size: 25px; + margin: 0 5px 0 5px; + padding: 0; + color:#000; + float: left; + } +.buttons{ + width: 320px; + margin: 0 auto; + padding: 5px 0 5px 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/agenda/emend-message-modal/emend-message-modal.page.spec.ts b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.spec.ts new file mode 100644 index 000000000..35e4c9ef7 --- /dev/null +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { EmendMessageModalPage } from './emend-message-modal.page'; + +describe('EmendMessageModalPage', () => { + let component: EmendMessageModalPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ EmendMessageModalPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(EmendMessageModalPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts new file mode 100644 index 000000000..9af0b1761 --- /dev/null +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts @@ -0,0 +1,25 @@ +import { Component, OnInit } from '@angular/core'; +import { ModalController } from '@ionic/angular'; + +@Component({ + selector: 'app-emend-message-modal', + templateUrl: './emend-message-modal.page.html', + styleUrls: ['./emend-message-modal.page.scss'], +}) +export class EmendMessageModalPage implements OnInit { + emendMessage: string = ''; + + constructor( + private modalController: ModalController, + ) { } + + ngOnInit() { + } + close(){ + this.modalController.dismiss(''); + } + save(){ + this.modalController.dismiss(this.emendMessage); + } + +} 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 c5541f59d..9f78c4ff5 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 @@ -48,17 +48,7 @@
- - - - - - Inbox - - - - Open Menu - +
diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index 8387e8c97..18b447ac9 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -91,7 +91,7 @@ export class ProcessesService { headers: this.headers, }; return this.http.post(`${geturl}`, body, options).toPromise().then(res =>{ - /* console.log(res); */ + console.log(res); }); } diff --git a/src/theme/variables.scss b/src/theme/variables.scss index d465d3644..830a85c76 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -250,6 +250,12 @@ --border-radius: 10px; padding: 25px; } */ +.emend-message-modal{ + --height: 50%; + --border-radius: 10px; + padding: 25px; + background: rgba(51, 51, 51, 0.3); +} .capitalizeText{ text-transform: capitalize; }