mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 13:02:56 +00:00
Fixe go back
This commit is contained in:
@@ -13,7 +13,7 @@
|
||||
</ion-header> -->
|
||||
|
||||
<ion-content id="main-content">
|
||||
<div class="main-content d-flex height-100">
|
||||
<div class="main-content d-flex height-100" *ngIf="loadedEvent">
|
||||
<div class="content d-flex flex-column">
|
||||
<div class="header-content width-100 d-flex justify-space-between">
|
||||
<div (click)="close()" class="header-icon-left cursor-pointer">
|
||||
|
||||
@@ -10,10 +10,8 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
|
||||
import { EventsService } from 'src/app/services/events.service';
|
||||
import { ProcessesService } from 'src/app/services/processes.service';
|
||||
import { ToastService } from 'src/app/services/toast.service';
|
||||
import { Event } from '../../../models/event.model';
|
||||
import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
|
||||
|
||||
|
||||
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
|
||||
parse: {
|
||||
dateInput: "YYYY-MMMM-DD HH:mm"
|
||||
@@ -163,19 +161,23 @@ export class EditEventToApprovePage implements OnInit {
|
||||
else {
|
||||
this.isRecurring = "Repete";
|
||||
}
|
||||
|
||||
this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e => {
|
||||
if(e.IsRequired) {
|
||||
this.taskParticipants.push(e);
|
||||
} else {
|
||||
this.taskParticipantsCc.push(e);
|
||||
}
|
||||
})
|
||||
|
||||
if(this.eventProcess.workflowInstanceDataFields.ParticipantsList) {
|
||||
this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e => {
|
||||
if(e.IsRequired) {
|
||||
this.taskParticipants.push(e);
|
||||
} else {
|
||||
this.taskParticipantsCc.push(e);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
close() {
|
||||
console.log('CLOSE');
|
||||
|
||||
window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = {}
|
||||
|
||||
this.closeComponent.emit();
|
||||
/* this.setIntervenient.emit([]);
|
||||
@@ -316,7 +318,6 @@ export class EditEventToApprovePage implements OnInit {
|
||||
|
||||
restoreTemporaryData(): boolean {
|
||||
|
||||
|
||||
const restoredData = window['temp.path:/shared/agenda/edit-event-to-approve.ts']
|
||||
|
||||
if(JSON.stringify(restoredData) != "{}" && undefined != restoredData) {
|
||||
|
||||
@@ -12,7 +12,7 @@ import { NavigationEnd, Router } from '@angular/router';
|
||||
styleUrls: ['./event-list.page.scss'],
|
||||
})
|
||||
export class EventListPage implements OnInit {
|
||||
|
||||
// [desktop] event list to approve
|
||||
|
||||
showLoader: boolean;
|
||||
eventsPRList: any;
|
||||
@@ -38,7 +38,7 @@ export class EventListPage implements OnInit {
|
||||
|
||||
/* console.log(this.profile); */
|
||||
|
||||
if(this.profile == "mdgpr"){
|
||||
if(this.profile == "mdgpr") {
|
||||
this.profile = 'MDGPR'
|
||||
} else {
|
||||
this.profile = 'PR'
|
||||
@@ -53,7 +53,7 @@ export class EventListPage implements OnInit {
|
||||
});
|
||||
}
|
||||
|
||||
LoadToApproveEvents(){
|
||||
LoadToApproveEvents() {
|
||||
this.showLoader = true;
|
||||
|
||||
this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{
|
||||
@@ -65,22 +65,20 @@ export class EventListPage implements OnInit {
|
||||
this.eventsMDGPRList = res;
|
||||
});
|
||||
}
|
||||
async openApproveModal(eventSerialNumber, data){
|
||||
async openApproveModal(eventSerialNumber, data) {
|
||||
|
||||
let a =this.eventsMDGPRList.filter((elem)=>{
|
||||
console.log(eventSerialNumber," ",elem.serialNumber)
|
||||
return eventSerialNumber == elem.serialNumber
|
||||
});
|
||||
|
||||
console.log(a);
|
||||
|
||||
this.approveEventDismiss.emit({
|
||||
"serialNumber": eventSerialNumber,
|
||||
"action": "Aprovar",
|
||||
"saveData": data
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
doRefresh(event) {
|
||||
this.LoadToApproveEvents();
|
||||
console.log('refresh');
|
||||
|
||||
Reference in New Issue
Block a user