improvements in events to approve

This commit is contained in:
tiago.kayaya
2021-05-21 10:05:59 +01:00
parent 11dd874cfa
commit 2f9378eb0f
17 changed files with 497 additions and 358 deletions
@@ -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;
@@ -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);
@@ -7,7 +7,7 @@
</button>
</div>
</div>
<!-- <ion-toolbar>
<ion-toolbar>
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
<ion-segment-button value="validar">
Diplomas por validar
@@ -16,7 +16,7 @@
Diplomas assinados PR
</ion-segment-button>
</ion-segment>
</ion-toolbar> -->
</ion-toolbar>
</ion-header>
<ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
@@ -29,8 +29,10 @@
<ion-list class="width-100" *ngSwitchCase="'MDGPR'" >
<ion-item
class="item ion-no-padding width-100 cursor-pointer"
*ngFor="let event of eventsMDGPRList"
(click)="openApproveModal(event)">
*ngFor="let event of eventsMDGPRList"
(click)="goToEventDetail(event)"
>
<!-- (click)="openApproveModal(event)" -->
<div class="event-mdgpr-{{event.workflowInstanceDataFields.Agenda}} width-100">
<div class="approve-event-time">
<p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
@@ -4,7 +4,7 @@ import { EventPerson } from 'src/app/models/eventperson.model';
import { Event } from 'src/app/models/event.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { ModalController, NavParams } from '@ionic/angular';
import { NavigationEnd, Router } from '@angular/router';
import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
import { ApproveEventComponent } from '../../agenda/approve-event/approve-event.component';
@Component({
@@ -70,6 +70,23 @@ export class EventsToApprovePage implements OnInit {
});
}
goToEventDetail(eventToAprove){
let InstanceId;
if(!eventToAprove.workflowInstanceDataFields.hasOwnProperty('InstanceId')){
InstanceId = ''
} else {
InstanceId =eventToAprove.workflowInstanceDataFields.InstanceId
}
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": eventToAprove.serialNumber,
}
};
this.router.navigate(['/home/gabinete-digital/event-list/approve-event'], navigationExtras)
}
async openApproveModal(eventToAprove) {
let classs;
if( window.innerWidth <= 800){