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

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

Browse Source
This commit is contained in:
Peter Maquiran
2021-07-05 15:37:47 +01:00
parent 9d7b7e541b 74e8b3d0aa
commit fa6e2c699d
12 changed files with 6 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/gabinete-digital/despachos/despachos.page.ts
-1
View File
@@ -86,7 +86,6 @@ export class DespachosPage implements OnInit {
}
openExpedientDetailPage(data){
console.log(data);
this.openExpedientDetail.emit(data);
}
src/app/shared/gabinete-digital/expedients/expedients.page.ts
+1 -6
View File
@@ -44,14 +44,12 @@ export class ExpedientsPage implements OnInit {
this.LoadList();
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
this.doRefresh();
this.LoadList();
}
});
}
segmentChanged(){
console.log(this.segment);
this.LoadList();
}
@@ -66,7 +64,6 @@ export class ExpedientsPage implements OnInit {
LoadList(){
this.processes.GetTasksList("Expediente", false).subscribe(result => {
console.log(result);
this.taskslist = new Array();
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
res.forEach(element => {
@@ -86,12 +83,10 @@ export class ExpedientsPage implements OnInit {
}
this.taskslist.push(task);
});
console.log(this.taskslist);
});
}
doRefresh() {
console.log('refresh expedientes1');
this.LoadList();
}
src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+3 -3
View File
@@ -28,8 +28,8 @@
</ion-refresher-content>
</ion-refresher>
<div class="width-100" [ngSwitch]="segment">
<div *ngIf="parecerList" class="overflow-y-auto height-100">
<div class="width-100 overflow-y-auto height-100" [ngSwitch]="segment">
<div *ngIf="parecerList">
<ion-list *ngSwitchCase="'parecer'">
<!-- *ngFor = "let task of parecerList; let i = index"
(click)="viewExpedientDetail(task.SerialNumber)" -->
@@ -64,7 +64,7 @@
</ion-list>
</div>
<div *ngIf="deferimentoList" class="overflow-y-auto height-100">
<div *ngIf="deferimentoList">
<ion-list *ngSwitchCase="'deferimento'">
<ion-item
class="expediente ion-no-padding cursor-pointer"
src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
-6
View File
@@ -102,7 +102,6 @@ export class PedidosPage implements OnInit {
}
this.parecerList.push(task);
});
console.log(this.parecerList);
}
else if(this.segment == 'deferimento') {
@@ -110,8 +109,6 @@ export class PedidosPage implements OnInit {
this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
this.taskslist = result;
console.log(result);
this.deferimentoList = new Array();
let res = result.reverse();
res.forEach(element => {
@@ -134,11 +131,9 @@ export class PedidosPage implements OnInit {
}
this.deferimentoList.push(task);
});
console.log(this.deferimentoList);
});
}
console.log(this.taskType);
}
doRefresh() {
@@ -152,7 +147,6 @@ export class PedidosPage implements OnInit {
}
async viewPedidoDetail(serialNumber:any) {
console.log(this.profile);
const modal = await this.modalController.create({
component: PedidoPage,
src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+1 -67
View File
@@ -48,7 +48,7 @@ export class PendentesPage implements OnInit {
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
this.doRefresh();
this.LoadList();
}
});
}
@@ -57,10 +57,6 @@ export class PendentesPage implements OnInit {
this.LoadList();
}
notImplemented(){
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
openExpedientDetailPage(data){
console.log(data);
this.openExpedientDetail.emit(data);
@@ -69,9 +65,7 @@ export class PendentesPage implements OnInit {
async LoadList(){
this.showLoader = true;
this.pendentesList = [];
console.log('clear');
let despachos = await this.processes.GetTasksList("Despacho", false).toPromise();
let pareceres = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
let deferimentos = await this.processes.GetTasksList("Pedido de Deferimento", false).toPromise();
@@ -85,7 +79,6 @@ export class PendentesPage implements OnInit {
let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
this.totalDocs = res.DocumentsTotal;
console.log(res.DocumentsTotal);
let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1);
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
@@ -132,12 +125,7 @@ export class PendentesPage implements OnInit {
doRefresh() {
console.log('Refresh pendentes');
this.LoadList();
setTimeout(() => {
}, 2000);
}
async viewTaskDetails(serialNumber:string, workflowName:string) {
@@ -152,60 +140,6 @@ export class PendentesPage implements OnInit {
this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
}
}
async openDespacho(serialNumber:string){
const modal = await this.modalController.create({
component: DespachoPage,
componentProps:{
enterAnimation: "",
serialNumber: serialNumber,
profile: this.profile,
},
cssClass: 'modal modal-desktop',
});
await modal.present();
modal.onDidDismiss().then((res)=>{
console.log('refresh list');
this.LoadList();
});
}
async openPedido(serialNumber:string){
const modal = await this.modalController.create({
component: PedidoPage,
componentProps:{
enterAnimation: "",
serialNumber: serialNumber,
profile: this.profile,
},
cssClass: 'modal modal-desktop',
});
await modal.present();
modal.onDidDismiss().then((res)=>{
console.log('refresh list');
this.LoadList();
});
}
async viewExpedientDetail(serialNumber:any) {
console.log(this.profile);
const modal = await this.modalController.create({
component: ExpedienteDetailPage,
componentProps:{
enterAnimation: "",
serialNumber: serialNumber,
profile: this.profile,
},
cssClass: 'modal modal-desktop',
});
await modal.present();
modal.onDidDismiss().then((res)=>{
console.log('refresh list');
this.LoadList();
});
}
}