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

Fix

Browse Source
This commit is contained in:
Peter Maquiran
2021-07-17 14:02:05 +01:00
parent 133e3ad122
commit b1c165bf87
23 changed files with 240 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
+2 -2
View File
@@ -10,7 +10,7 @@
<ion-label *ngIf="loggeduser.Profile =='PR'" >Despachos</ion-label>
</div>
<div class="theicon btn-refresh">
<button class="btn-no-color" (click)="doRefresh($event)">
<button class="btn-no-color" (click)="doRefresh()">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
</button>
</div>
@@ -18,7 +18,7 @@
<div *ngIf="loggeduser.Profile =='MDGPR'" class="bottom-title d-flex"><h3 class="bottom-text">Presidente da República</h3></div>
</ion-header>
<ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
<ion-refresher-content
pullingIcon="chevron-down-circle-outline"
pullingText="deslize para actualizar"
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+15 -7
View File
@@ -15,7 +15,7 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar
import { AuthService } from 'src/app/services/auth.service';
import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
import { User } from 'src/app/models/user.model';
import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
import { NavigationEnd, NavigationExtras, NavigationStart, Router } from '@angular/router';
import { __awaiter } from 'tslib';
@Component({
@@ -68,10 +68,15 @@ export class DespachosPrPage implements OnInit {
const location = window.location
const pathname = location.pathname + location.search
this.LoadList();
this.router.events.forEach((event) => {
if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
this.LoadList();
if (event instanceof NavigationStart && event.url.startsWith(pathname)) {
if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
this.doRefresh()
} else {
this.LoadList()
}
}
});
@@ -154,9 +159,12 @@ export class DespachosPrPage implements OnInit {
});
}
doRefresh(event) {
this.LoadList();
event.target.complete();
doRefresh() {
setTimeout(()=>{
this.LoadList();
}, 1000)
}
async viewExpedientDetail(serialNumber:any) {
src/app/pages/gabinete-digital/despachos/despachos.page.ts
+10 -5
View File
@@ -14,7 +14,7 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar
import { AuthService } from 'src/app/services/auth.service';
import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
import { NavigationEnd, NavigationExtras, NavigationStart, Router } from '@angular/router';
@Component({
selector: 'app-despachos',
@@ -62,10 +62,15 @@ export class DespachosPage implements OnInit {
const location = window.location
const pathname = location.pathname + location.search
this.LoadList();
this.router.events.forEach((event) => {
if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
this.LoadList();
if (event instanceof NavigationStart && event.url.startsWith(pathname)) {
if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
this.refreshing()
} else {
this.LoadList()
}
}
});
@@ -74,7 +79,7 @@ export class DespachosPage implements OnInit {
async refreshing() {
setTimeout(() => {
this.LoadList();
}, 1500);
}, 1000);
}
segmentChanged(ev: any) {
src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+16 -11
View File
@@ -35,10 +35,15 @@ export class DiplomasAssinarPage implements OnInit {
ngOnInit() {
const location = window.location
const pathname = location.pathname + location.search
this.LoadList();
this.router.events.forEach((event) => {
if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
this.LoadList();
if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
this.refreshing()
} else {
this.LoadList()
}
}
});
}
@@ -53,17 +58,17 @@ export class DiplomasAssinarPage implements OnInit {
}
async refreshing() {
setTimeout(() => {
this.LoadList();
}, 1500);
}
setTimeout(() => {
this.LoadList();
}, 1000);
}
doRefresh(event) {
this.LoadList();
setTimeout(() => {
event.target.complete();
}, 2000);
}
doRefresh(event) {
setTimeout(() => {
this.LoadList();
}, 1000);
}
async LoadList(){
src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+11 -10
View File
@@ -44,10 +44,15 @@ constructor(
const location = window.location
const pathname = location.pathname + location.search
this.LoadList();
this.router.events.forEach((event) => {
if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
this.LoadList();
if (event instanceof NavigationStart && event.url.startsWith(pathname)) {
if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
this.refreshing()
} else {
this.LoadList()
}
}
});
@@ -232,18 +237,14 @@ constructor(
async refreshing() {
setTimeout(() => {
this.LoadList();
}, 1500);
}, 1000);
}
async doRefresh(event) {
console.log('refresh');
//this.loadDiplomas();
this.LoadList();
setTimeout(() => {
event.target.complete();
}, 2000);
this.LoadList();
}, 1000);
}
goBack() {
src/app/pages/gabinete-digital/event-list/event-list.page.html
+1 -1
View File
@@ -2,7 +2,7 @@
<app-header></app-header>
</ion-header>
<ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<ion-refresher-content>
</ion-refresher-content>
src/app/pages/gabinete-digital/event-list/event-list.page.ts
+15 -11
View File
@@ -4,7 +4,7 @@ import { EventPerson } from 'src/app/models/eventperson.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 { NavigationEnd, Router } from '@angular/router';
import { NavigationEnd, NavigationStart, Router } from '@angular/router';
@Component({
selector: 'app-event-list',
@@ -36,14 +36,17 @@ export class EventListPage implements OnInit {
ngOnInit() {
this.segment = 'MDGPR';
this.refreshing();
const location = window.location
const pathname = location.pathname + location.search
this.LoadToApproveEvents();
this.router.events.forEach((event) => {
if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
this.LoadToApproveEvents();
if (event instanceof NavigationStart && event.url.startsWith(pathname)) {
if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
this.doRefresh()
} else {
this.LoadToApproveEvents()
}
}
});
@@ -114,15 +117,16 @@ export class EventListPage implements OnInit {
refreshing() {
setTimeout(() => {
this.LoadToApproveEvents();
}, 1500);
}, 1000);
}
doRefresh(event) {
this.LoadToApproveEvents();
doRefresh() {
setTimeout(() => {
event.target.complete();
}, 2000);
this.LoadToApproveEvents();
}, 1000);
}
close(){
this.modalController.dismiss(null);
}
src/app/pages/gabinete-digital/expediente/expediente.page.ts
+12 -6
View File
@@ -1,5 +1,5 @@
import { Component, Input, OnInit } from '@angular/core';
import { NavigationEnd, Router } from '@angular/router';
import { NavigationEnd, NavigationStart, Router } from '@angular/router';
import { DailyWorkTask } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { ModalController } from '@ionic/angular';
@@ -32,10 +32,16 @@ export class ExpedientePage implements OnInit {
const location = window.location
const pathname = location.pathname + location.search
this.LoadList();
this.router.events.forEach((event) => {
if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
this.LoadList();
if (event instanceof NavigationStart && event.url.startsWith(pathname)) {
if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
this.refreshing()
} else {
this.LoadList()
}
}
});
@@ -74,14 +80,14 @@ export class ExpedientePage implements OnInit {
async refreshing() {
setTimeout(() => {
this.LoadList();
}, 1500);
}, 1000);
}
doRefresh(event) {
this.LoadList();
setTimeout(() => {
event.target.complete();
}, 2000);
}, 1000);
}
goBack() {
src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+11 -5
View File
@@ -1,5 +1,5 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
import { NavigationEnd, NavigationExtras, NavigationStart, Router } from '@angular/router';
import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask } from '../../../models/dailyworktask.model';
@@ -42,10 +42,16 @@ export class ExpedientesPrPage implements OnInit {
const location = window.location
const pathname = location.pathname + location.search
this.LoadList();
this.router.events.forEach((event) => {
if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
this.LoadList();
if (event instanceof NavigationStart && event.url.startsWith(pathname)) {
if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
this.refreshing()
} else {
this.LoadList()
}
}
});
@@ -121,7 +127,7 @@ export class ExpedientesPrPage implements OnInit {
refreshing() {
setTimeout(() => {
this.LoadList();
}, 1500);
}, 1000);
}
doRefresh(event) {
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
-1
View File
@@ -71,7 +71,6 @@
</ion-list>
</div>
</div>
<div *ngIf="task" class="aside-right flex-column height-100">
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+5 -5
View File
@@ -476,9 +476,9 @@ export class PedidoPage implements OnInit {
let navigationExtras: NavigationExtras;
if (this.task.WorkflowName == 'Pedido de Deferimento') {
if (this.task.activityInstanceName == 'Concluir Deferimento') {
navigationExtras= { queryParams: {"deferimento": true,}};
} else if (this.task.WorkflowName == 'Pedido de Parecer') {
} else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
navigationExtras = { queryParams: {"parecer": true,}};
}
@@ -493,12 +493,12 @@ export class PedidoPage implements OnInit {
let navigationExtras: NavigationExtras;
if (this.task.WorkflowName == 'Pedido de Deferimento') {
if (this.task.activityInstanceName == 'Concluir Deferimento') {
navigationExtras= { queryParams: {"deferimento": true,}};
} else if (this.task.WorkflowName == 'Pedido de Parecer') {
} else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
navigationExtras = { queryParams: {"parecer": true,}};
}
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
}
src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+6 -2
View File
@@ -57,8 +57,12 @@ export class PedidosPage implements OnInit {
if(event instanceof NavigationStart && '/home/gabinete-digital/pedidos?parecer=true'.startsWith(event.url) ||
event instanceof NavigationStart && '/home/gabinete-digital/pedidos?deferimento=true'.startsWith(event.url)
) {
alert('resfresh')
this.refreshing()
if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
this.refreshing()
} else {
this.LoadList()
}
}
});
}
src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+5 -1
View File
@@ -44,7 +44,11 @@ export class PendentesPage implements OnInit {
this.router.events.forEach((event) => {
if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
this.LoadList();
if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
this.refreshing()
} else {
this.LoadList()
}
}
});