Fixe go back

This commit is contained in:
Peter Maquiran
2021-06-30 11:59:57 +01:00
parent b2af086bd2
commit deecf47f58
8 changed files with 64 additions and 54 deletions
@@ -2,14 +2,14 @@
<app-header></app-header>
</ion-header>
<ion-content id="main-content">
<div class="main-content d-flex height-100">
<div *ngIf="loadedEvent" class="content d-flex flex-column width-100">
<ion-content id="main-content" >
<div class="main-content d-flex height-100" *ngIf="loadedEvent" >
<div class="content d-flex flex-column width-100" *ngIf="loadedEvent.workflowInstanceDataFields">
<div class="header-content width-100 d-flex justify-space-between">
<div (click)="goBack()" class="header-icon-left cursor-pointer">
<ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
</div>
<div class="header-title flex-grow-1 cursor-pointer">
<div class="header-title flex-grow-1 cursor-pointer" *ngIf="loadedEvent.workflowInstanceDataFields.Subject">
<label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
</div>
<div (click)="editar(loadedEvent.serialNumber)" class="header-icon-right display-none-true">
@@ -1,6 +1,6 @@
import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { AnimationController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
import { Event } from 'src/app/models/event.model';
import { AlertService } from 'src/app/services/alert.service';
import { AttachmentsService } from 'src/app/services/attachments.service';
@@ -9,8 +9,6 @@ import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/
import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page';
import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { ToastService } from 'src/app/services/toast.service';
@Component({
@@ -20,8 +18,7 @@ import { ToastService } from 'src/app/services/toast.service';
})
export class ApproveEventPage implements OnInit {
event: Event;
loadedEvent:any;
loadedEvent1:any;
loadedEvent:any = false
loadedAttachments:any;
customDate:any;
today:any;
@@ -51,7 +48,6 @@ export class ApproveEventPage implements OnInit {
private animationController: AnimationController,
private toastService: ToastService,
) {
this.activatedRoute.paramMap.subscribe(params => {
console.log(params["params"]);
@@ -260,9 +256,7 @@ export class ApproveEventPage implements OnInit {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
async editar(serialNumber: string) {
const modal = await this.modalController.create({
component: EditEventToApproveComponent,
@@ -282,7 +276,4 @@ export class ApproveEventPage implements OnInit {
}
}
@@ -1,11 +1,10 @@
import { Component, OnInit } from '@angular/core';
import { EventBody } from 'src/app/models/eventbody.model';
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 } from '@ionic/angular';
import { ApproveEventModalPage } from './approve-event-modal/approve-event-modal.page';
import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
import { NavigationEnd, Router } from '@angular/router';
@Component({
selector: 'app-event-list',
@@ -13,11 +12,13 @@ import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angula
styleUrls: ['./event-list.page.scss'],
})
export class EventListPage implements OnInit {
// [desktop] event list to approve
profile:string;
segment:string;
showLoader: boolean;
eventsPRList: any;
eventsMDGPRList: any;
eventsPRList: any = []
eventsMDGPRList: any = []
eventPerson: EventPerson;
eventBody: EventBody;
categories: string[];
@@ -27,8 +28,7 @@ export class EventListPage implements OnInit {
constructor(
private processes:ProcessesService,
private modalController: ModalController,
private router: Router,
private activatedRoute: ActivatedRoute,
private router: Router
) { }
ngOnInit() {