mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 21:06:06 +00:00
Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer
This commit is contained in:
@@ -44,6 +44,7 @@ export class NewGroupPage implements OnInit {
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
console.log(this.documents)
|
||||
|
||||
}
|
||||
|
||||
@@ -86,6 +87,7 @@ export class NewGroupPage implements OnInit {
|
||||
this.addContacts(res.result);
|
||||
|
||||
this.wsChatMethodsService.subscribeToRoomUpdate(res.result.rid, res.result);
|
||||
console.log(res.result.rid)
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -692,6 +692,8 @@ export class ExpedienteDetailPage implements OnInit {
|
||||
this.newGroup();
|
||||
}
|
||||
else {
|
||||
console.log(this.task)
|
||||
console.log(this.fulltask)
|
||||
this.dataService.set("newGroup", true);
|
||||
this.dataService.set("task", this.task);
|
||||
this.dataService.set("newGroupName", this.task.Folio);
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
<ion-list>
|
||||
<div
|
||||
class="expediente ion-no-padding ion-no-margin cursor-pointer"
|
||||
*ngFor = "let task of expedientegbstore.list"
|
||||
*ngFor = "let task of listToPresent"
|
||||
(click)="goToExpediente(task.SerialNumber)"
|
||||
>
|
||||
<div class="item width-100">
|
||||
@@ -67,13 +67,13 @@
|
||||
</ion-list>
|
||||
|
||||
<div
|
||||
*ngIf="!skeletonLoader && expedientegbstore.list.length == 0 && expedientegbstore.list.length == 0"
|
||||
*ngIf="!skeletonLoader && listToPresent.length == 0 && listToPresent.length == 0"
|
||||
class="empty-list d-flex height-100 align-center justify-content-center"
|
||||
>
|
||||
<span>Lista vazia</span>
|
||||
</div>
|
||||
|
||||
<div *ngIf="skeletonLoader && expedientegbstore.list.length == 0">
|
||||
<div *ngIf="skeletonLoader && listToPresent.length == 0">
|
||||
|
||||
<ion-list>
|
||||
<ion-item>
|
||||
|
||||
@@ -81,6 +81,9 @@ export class ExpedientePage implements OnInit {
|
||||
this.taskslist.push(task);
|
||||
this.addProcessTODb(task);
|
||||
});
|
||||
this.taskslist = this.taskslist.filter(function(item) {
|
||||
return item.activityInstanceName != 'Retificar Expediente'
|
||||
})
|
||||
this.listToPresent = this.sortService.sortDate(this.taskslist, 'taskStartDate')
|
||||
|
||||
|
||||
@@ -152,6 +155,9 @@ export class ExpedientePage implements OnInit {
|
||||
|
||||
});
|
||||
|
||||
this.taskslist = this.taskslist.filter(function(item) {
|
||||
return item.activityInstanceName != 'Retificar Expediente'
|
||||
})
|
||||
this.listToPresent = this.taskslist
|
||||
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user