peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 05:16:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve

Browse Source
This commit is contained in:
Peter Maquiran
2021-06-09 15:32:54 +01:00
parent 1595d592e6 2283b52df0
commit 34022cf51a
15 changed files with 119 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+1 -1
View File
@@ -7,7 +7,7 @@
</button>
</div>
<ion-toolbar>
<ion-segment [(ngModel)]="segment">
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
<ion-segment-button value="MDGPR">
Seu calendário
</ion-segment-button>
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+21 -17
View File
@@ -36,37 +36,45 @@ export class EventsToApprovePage implements OnInit {
ngOnInit() {
this.segment = this.loggeduser.Profile;
console.log(this.segment);
this.LoadToApproveEvents();
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
this.doRefresh();
this.LoadToApproveEvents();
}
});
window.onresize = (event) => {
// if not mobile remove all component
if( window.innerWidth <= 1024){
this.modalController.dismiss();
}
};
}
LoadToApproveEvents() {
segmentChanged(ev: any) {
this.LoadToApproveEvents();
}
async LoadToApproveEvents() {
this.showLoader = true;
let prEvents = await this.processes.GetToApprovedEvents('PR','false').toPromise();
this.eventsPRList = prEvents;
console.log(this.eventsPRList);
this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{
/* this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{
this.showLoader = false;
this.eventsPRList = res;
console.log('this.eventsPRList', this.eventsPRList)
});
this.processes.GetToApprovedEvents('MDGPR','false').subscribe(res=>{
}); */
let mdEvents = await this.processes.GetToApprovedEvents('MDGPR','false').toPromise();
this.eventsMDGPRList = mdEvents;
console.log(this.eventsMDGPRList);
/* this.processes.GetToApprovedEvents('MDGPR','false').subscribe(res=>{
this.showLoader = false;
this.eventsMDGPRList = res;
console.log('this.eventsMDGPRList', this.eventsMDGPRList)
});
}); */
this.showLoader = false;
}
goToEventDetail(eventToAprove){
@@ -121,11 +129,7 @@ export class EventsToApprovePage implements OnInit {
doRefresh() {
console.log('Refresh Events');
this.LoadToApproveEvents();
console.log('refresh');
setTimeout(() => {
}, 2000);
}
close(){
this.modalController.dismiss(null);
src/app/shared/gabinete-digital/expedients/expedients.page.ts
+5 -2
View File
@@ -1,5 +1,5 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask } from '../../../models/dailyworktask.model';
@@ -32,8 +32,10 @@ export class ExpedientsPage implements OnInit {
private modalController: ModalController,
private alertService: AlertService,
private router: Router,
private activatedRoute: ActivatedRoute,
) {
this.profile = 'mdgpr';
}
ngOnInit() {
@@ -101,7 +103,8 @@ export class ExpedientsPage implements OnInit {
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
"from": "gabinete"
"from": "gabinete",
"type": "pendentes"
}
};
this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+16 -14
View File
@@ -155,32 +155,34 @@ export class PendentesPage implements OnInit {
goToDespacho(serialNumber:any){
let navigationExtras: NavigationExtras = {
queryParams: {
queryParams: {
"serialNumber": serialNumber,
}
}
};
this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras);
this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras);
}
goToPedido(serialNumber:any){
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
}
};
this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);
}
goToPedido(serialNumber:any) {
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
}
}
this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);
}
goToExpediente(serialNumber:any){
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
"from": "gabinete"
"from": "gabinete",
"type": "pendentes"
}
};
}
this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras)
this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
}
async openDespacho(serialNumber:string){