peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 13:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
tiago.kayaya
2021-04-21 16:54:34 +01:00
parent 75c51fd868 ef1c260f77
commit 4fdd5dc83d
9 changed files with 98 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/event-list/event-list.page.ts
+2 -2
View File
@@ -41,12 +41,12 @@ export class EventListPage implements OnInit {
}
// this.LoadToApproveEvents();
this.LoadToApproveEvents();
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
// this.LoadToApproveEvents();
this.LoadToApproveEvents();
}
});
src/app/pages/gabinete-digital/gabinete-digital.page.html
+4 -4
View File
@@ -123,14 +123,14 @@
<!-- Aside right -->
<div class="aside-content d-none flex-column height-100">
<!--
<app-empty-container [texto]="emptyTextDescription" *ngIf="showEmptyContainer" class="d-flex height-100 flex-column"></app-empty-container>
<app-events-to-approve [profile]="'MDGPR'" *ngIf="showEventsToApprove" class="d-flex height-100 flex-column"></app-events-to-approve>
<app-expedients (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showExpedients"></app-expedients>
<app-expediente (openExpedientList)="openExpedientListPage()" [profile]="profile" [serialNumber]="serialNumber" class="d-flex height-100 flex-column" *ngIf="showExpedientDetail"></app-expediente>
-->
<app-expedients (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showExpedients"></app-expedients>
<app-expediente (openExpedientList)="openExpedientListPage()" [profile]="profile" [serialNumber]="serialNumber" class="d-flex height-100 flex-column" *ngIf="showExpedientDetail"></app-expediente>
</div>
</div>
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+14 -9
View File
@@ -1,7 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { ProcessesService } from 'src/app/services/processes.service';
import { AlertService } from 'src/app/services/alert.service';
import { EventsService } from 'src/app/services/events.service';
import { ModalController } from '@ionic/angular';
import { EventListPage } from './event-list/event-list.page';
import { ExpedientePage } from './expediente/expediente.page';
@@ -59,16 +58,22 @@ export class GabineteDigitalPage implements OnInit {
};
this.activatedRoute.queryParams.subscribe(params => {
if(params["show"]){
// this.openExpedientListPage();
if(params["show"]) {
this.openExpedientListPage();
this.selectedElement='Correspondence'
}
else if(params["events"]){
// this.openEventsToApprovePage("MDGPR");
else if(params["events"]) {
this.openEventsToApprovePage("MDGPR");
this.selectedElement='approval'
} else {
this.openEventsToApprovePage('MDGPR');
this.selectedElement='approval'
}
});
}
}
closeAllDesktopComponent(){
this.desktopComponent = {
@@ -83,11 +88,11 @@ export class GabineteDigitalPage implements OnInit {
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
//this.LoadCounts();
this.LoadCounts();
}
});
// this.LoadCounts();
this.LoadCounts();
/* this.eventService.getAllMdEvents.subscribe(res=>{
console.log(res);