Merge branch 'developer-c' of bitbucket.org:equilibriumito/gabinete-digital into feature/calendar

This commit is contained in:
Peter Maquiran
2021-03-30 15:41:31 +01:00
17 changed files with 96 additions and 68 deletions
@@ -2,7 +2,7 @@
<div class="title width-100">
<label>Eventos para Aprovação</label>
<ion-toolbar>
<ion-segment [(ngModel)]="segment">
<ion-segment [(ngModel)]="profile">
<ion-segment-button value="MDGPR">
Seu calendário
</ion-segment-button>
@@ -17,7 +17,7 @@
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div class="main-content" [ngSwitch]="segment" *ngIf="eventsMDGPRList">
<div class="main-content" [ngSwitch]="profile" *ngIf="eventsMDGPRList">
<!-- <div class="header-content width-100"> -->
<!-- </div> -->
@@ -23,7 +23,7 @@ export class EventsToApprovePage implements OnInit {
categories: string[];
serialnumber:string;
@Input() segment:string;
@Input() profile:string;
constructor(
private processes:ProcessesService,
@@ -35,9 +35,8 @@ S
ngOnInit() {
//this.segment = this.navParams.get('segment');
/* console.log(this.navParams.get('md')); */
console.log(this.segment);
console.log(this.profile);
this.LoadToApproveEvents();
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {