make improvements

This commit is contained in:
Tiago Kayaya
2020-11-09 14:00:10 +01:00
parent d3dd83c8a8
commit 247c6e0a51
15 changed files with 217 additions and 143 deletions
@@ -47,14 +47,19 @@
<ion-toolbar>
<ion-item lines="none">
<p>
<ion-button class="button-edit-event" shape="round" (click)="emendarTask(loadedEvent.serialNumber)">Emendar</ion-button>
<ion-button class="button-edit-event" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Emendar</ion-button>
</p>
<p>
<ion-button class="button-options" shape="round" fill="clear" (click)="openOptions(loadedEvent)"><ion-icon slot="icon-only" name="ellipsis-vertical-outline"></ion-icon></ion-button>
<ion-button disabled class="button-options" shape="round" fill="clear" (click)="openOptions($event)"><ion-icon slot="icon-only" name="ellipsis-vertical-outline"></ion-icon></ion-button>
</p>
<p>
<ion-button class="button-approve" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</ion-button>
</p>
</ion-item>
</ion-item>
<ion-item>
<p>
<ion-button class="button-reject" shape="round" (click)="rejectTask(loadedEvent.serialNumber)">Rejeitar</ion-button>
</p>
</ion-item>
</ion-toolbar>
</ion-footer>
@@ -17,13 +17,21 @@ ion-toolbar{
--background: #e0e9ee;
--color:#061b52;
}
.button-options {
height: 44px;
--color: #42b9fe;
}
.button-approve {
width: 140px;
height: 44px;
border-radius: 22.5px;
--background: #42b9fe;
}
.button-options {
height: 44px;
--color: #42b9fe;
opacity: 0;
}
.button-approve {
width: 140px;
height: 44px;
border-radius: 22.5px;
--background: #42b9fe;
}
.button-reject {
width: 140px;
height: 44px;
--color: #d30a0a;
border-radius: 22.5px;
--background: #ffe0e0;
}
@@ -27,44 +27,19 @@ export class ApproveEventModalPage implements OnInit {
}
ngOnInit() {
console.log(this.serialNumber);
this.getTask();
this.event = {
EventId: '1',
Subject: 'Reunião do Conselho de Ministros',
Body: null,
Location: 'Palácio Presidencial, Luanda',
CalendarId: 'string',
CalendarName: 'Oficial',
StartDate: new Date,
EndDate: new Date,
EventType: 'Reunião',
Attendees: null,
IsMeeting: true,
IsRecurring: false,
AppointmentState: 2,
TimeZone: '',
Organizer: '',
Categories: null,
HasAttachments: false,
}
}
close(){
this.router.navigate(['/home/gabinete-digital']);
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
}
getTask(){
this.processes.GetTask(this.serialNumber).subscribe(res => {
console.log(res);
this.loadedEvent = res;
})
}
editEvent(){
}
approveTask(serialNumber:string){
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
@@ -73,7 +48,15 @@ export class ApproveEventModalPage implements OnInit {
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
}
emendarTask(serialNumber:string){
emendTask(serialNumber:string){
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);
}
rejectTask(serialNumber:string){
let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
console.log(body);
@@ -1,7 +1,7 @@
<ion-list>
<ion-item>
<p>
<ion-button class="button-edit-event" shape="round" (click)="editTask()">Emendar</ion-button>
<ion-button class="button-edit-event" shape="round" (click)="emendarTask()">Emendar</ion-button>
</p>
<p>
<ion-button class="button-approve" shape="round" (click)="approveTask()">Aprovar</ion-button>
@@ -1,5 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { NavParams, PopoverController } from '@ionic/angular';
import { Router } from '@angular/router';
import { ModalController, NavParams, PopoverController } from '@ionic/angular';
import { ProcessesService } from 'src/app/services/processes.service';
@Component({
selector: 'app-event-actions-popover',
@@ -9,18 +11,32 @@ import { NavParams, PopoverController } from '@ionic/angular';
export class EventActionsPopoverPage implements OnInit {
constructor(private navParams: NavParams,
private popoverController: PopoverController,) { }
private processes:ProcessesService,
private router:Router,
private modalController: ModalController,
private popoverController: PopoverController,) {
/* this.serialNumber = this.navParams.get('serialNumber'); */
}
ngOnInit() {
}
closePopover(){
this.popoverController.dismiss();
}
approveTask(){
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);
}
editTask(){
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);
}
deleteTask(){