diff --git a/src/app/pages/agenda/agenda-routing.module.ts b/src/app/pages/agenda/agenda-routing.module.ts index 39936810f..4b34c552f 100644 --- a/src/app/pages/agenda/agenda-routing.module.ts +++ b/src/app/pages/agenda/agenda-routing.module.ts @@ -10,6 +10,10 @@ const routes: Routes = [ }, { path: 'approve-event-modal', loadChildren: () => import('./approve-event-modal/approve-event-modal.module').then( m => m.ApproveEventModalPageModule) + }, + { + path: 'event-actions-popover', + loadChildren: () => import('./event-actions-popover/event-actions-popover.module').then( m => m.EventActionsPopoverPageModule) } ]; diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html index 5b476944c..453dff270 100644 --- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html +++ b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html @@ -28,7 +28,7 @@ Detalhes - MINEC, MINFIN + {{loadedEvent.workflowInstanceDataFields.Body}} @@ -45,8 +45,16 @@ - Emendar - - Aprovar + + + Emendar + + + + + + Aprovar + + 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 656aa6661..94da77766 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 @@ -1,3 +1,6 @@ +ion-toolbar{ + padding: 10px; +} .location-detail{ font-size: 18px; } @@ -5,22 +8,22 @@ width: 91px; height: 25px; --border-radius: 12.5px; - --background-color: #ffb703; + --background: #ffb703; } .button-edit-event { - width: 170px; + width: 140px; height: 44px; border-radius: 22.5px; - background-color: #e0e9ee; + --background: #e0e9ee; + --color:#061b52; } .button-options { - width: 36px; - height: 35px; - object-fit: contain; + height: 44px; + --color: #42b9fe; } .button-approve { - width: 170px; + width: 140px; height: 44px; border-radius: 22.5px; - background-color: #42b9fe; + --background: #42b9fe; } \ No newline at end of file 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 3c100df59..a9aecc7dc 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 @@ -1,8 +1,9 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; -import { ModalController, NavParams } from '@ionic/angular'; +import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular'; import { Event } from 'src/app/models/event.model'; import { ProcessesService } from 'src/app/services/processes.service'; +import { EventActionsPopoverPage } from '../event-actions-popover/event-actions-popover.page'; @Component({ selector: 'app-approve-event-modal', @@ -19,6 +20,7 @@ export class ApproveEventModalPage implements OnInit { private modalController: ModalController, private navParams: NavParams, private processes:ProcessesService, + private popoverController: PopoverController, ) { this.serialNumber = this.navParams.get('serialNumber'); @@ -64,12 +66,32 @@ export class ApproveEventModalPage implements OnInit { editEvent(){ } - openOptions(){ - + approveTask(serialNumber:string){ + let body = { "serialNumber": serialNumber, "action": "Aprovar" } + console.log(body); + this.processes.PostTaskAction(body); + this.router.navigate(['/home/gabinete-digital/event-list']); + this.modalController.dismiss(null); } - approveEvent(){ - + emendarTask(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 openOptions(ev:any) { + const popover = await this.popoverController.create({ + component: EventActionsPopoverPage, + cssClass: 'event-actions-popover', + event: ev, + translucent: true + }); + return await popover.present(); + } + } diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover-routing.module.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover-routing.module.ts new file mode 100644 index 000000000..534ad7730 --- /dev/null +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { EventActionsPopoverPage } from './event-actions-popover.page'; + +const routes: Routes = [ + { + path: '', + component: EventActionsPopoverPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class EventActionsPopoverPageRoutingModule {} diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.module.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.module.ts new file mode 100644 index 000000000..2a372e235 --- /dev/null +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.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 { EventActionsPopoverPageRoutingModule } from './event-actions-popover-routing.module'; + +import { EventActionsPopoverPage } from './event-actions-popover.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + EventActionsPopoverPageRoutingModule + ], + declarations: [EventActionsPopoverPage] +}) +export class EventActionsPopoverPageModule {} 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 new file mode 100644 index 000000000..419ce023b --- /dev/null +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html @@ -0,0 +1,15 @@ + + + + Emendar + + + Aprovar + + + + + Rejeitar + + + diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.scss b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.scss new file mode 100644 index 000000000..c8693464f --- /dev/null +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.scss @@ -0,0 +1,24 @@ +.button-edit-event { + /* width: 140px; */ + height: 44px; + border-radius: 22.5px; + --background: #e0e9ee; + --color:#061b52; +} +.button-options { + height: 44px; + --color: #42b9fe; +} +.button-approve { + /* width: 140px; */ + height: 44px; + border-radius: 22.5px; + --background: #42b9fe; +} +.button-discart-event { + /* width: 140px; */ + height: 44px; + border-radius: 22.5px; + --background: #d30a0a; + --color:#fff; +} \ No newline at end of file diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.spec.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.spec.ts new file mode 100644 index 000000000..890a3b4e0 --- /dev/null +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { EventActionsPopoverPage } from './event-actions-popover.page'; + +describe('EventActionsPopoverPage', () => { + let component: EventActionsPopoverPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ EventActionsPopoverPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(EventActionsPopoverPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts new file mode 100644 index 000000000..ea497062b --- /dev/null +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts @@ -0,0 +1,29 @@ +import { Component, OnInit } from '@angular/core'; +import { NavParams, PopoverController } from '@ionic/angular'; + +@Component({ + selector: 'app-event-actions-popover', + templateUrl: './event-actions-popover.page.html', + styleUrls: ['./event-actions-popover.page.scss'], +}) +export class EventActionsPopoverPage implements OnInit { + + constructor(private navParams: NavParams, + private popoverController: PopoverController,) { } + + ngOnInit() { + } + closePopover(){ + this.popoverController.dismiss(); + } + approveTask(){ + + } + editTask(){ + + } + deleteTask(){ + + } + +} diff --git a/src/app/services/attachments.service.ts b/src/app/services/attachments.service.ts index 164e35a85..003c0200d 100644 --- a/src/app/services/attachments.service.ts +++ b/src/app/services/attachments.service.ts @@ -41,8 +41,6 @@ export class AttachmentsService { params = params.set("Source", source.toString()); /* params = params.set("SourceId", sourceid); */ - - let options = { headers: this.headers, params: params diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index df9023666..63e09cb6e 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -84,6 +84,16 @@ export class ProcessesService { return this.http.get(`${geturl}`, options); } + PostTaskAction(body:any){ + const geturl = environment.apiURL + 'Tasks/Complete'; + + let options = { + headers: this.headers, + }; + return this.http.post(`${geturl}`,body, options); + } + + diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 2c2589081..d465d3644 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -252,4 +252,6 @@ } */ .capitalizeText{ text-transform: capitalize; -} \ No newline at end of file +} +/* .event-actions-popover ion-list{ +} */ \ No newline at end of file
MINEC, MINFIN
{{loadedEvent.workflowInstanceDataFields.Body}}
+ Emendar +
+ +
+ Aprovar +
+ Rejeitar +