diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
index 97bff24f5..5c0d03bda 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -63,6 +63,8 @@ export class DespachosPrPage implements OnInit {
searchSubject = ''
list = []
+ ordinance: string = 'old'
+
constructor(
private processes: ProcessesService,
private modalController: ModalController,
@@ -106,18 +108,28 @@ export class DespachosPrPage implements OnInit {
this.dynamicSearch()
}
+ reorderList(orderBy: string) {
+
+ this.ordinance = orderBy;
+
+ this.dynamicSearch();
+ }
async dynamicSearch() {
if(this.showSearch && this.searchSubject) {
- this.list = this.TaskService.despachoStore.list.filter((task) => {
+ const searchedList =this.TaskService.despachoprstore.list.filter((task) => {
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
subject = subject.toLowerCase();
return subject.includes(this.searchSubject.toLowerCase())
})
+
+ this.list = this.TaskService.reorderList(this.ordinance, searchedList)
} else {
- this.list = this.TaskService.AllProcess
+
+ const list = this.TaskService.despachoprstore.list
+ this.list = this.TaskService.reorderList(this.ordinance, list)
}
}
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html
index 1ea116f8d..d6c239621 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html
@@ -8,7 +8,17 @@
Despachos
-
+
+
+
+
@@ -60,6 +70,7 @@
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
index ac1a88b49..e3bcd05f5 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
@@ -23,7 +23,8 @@ export class DespachosPage implements OnInit {
searchSubject = ''
list = []
hideSearchBtn: boolean = false;
-
+ ordinance: string = 'old'
+
constructor(
private router: Router,
private despachoRule: DespachoService,
@@ -63,13 +64,16 @@ export class DespachosPage implements OnInit {
if(this.showSearch && this.searchSubject) {
- this.list = this.TaskService.despachoStore.list.filter((task) => {
+ const searchedList = this.TaskService.despachoStore.list.filter((task) => {
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
subject = subject.toLowerCase();
return subject.includes(this.searchSubject.toLowerCase())
})
+
+ this.list = this.TaskService.reorderList(this.ordinance, searchedList)
} else {
- this.list = this.TaskService.AllProcess
+ const list = this.despachoStore.list
+ this.list = this.TaskService.reorderList(this.ordinance, list)
}
}
@@ -87,7 +91,13 @@ export class DespachosPage implements OnInit {
}
-
+ reorderList(orderBy: string) {
+
+ this.ordinance = orderBy;
+
+ this.dynamicSearch();
+ }
+
async refreshing() {
setTimeout(() => {
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
index 048d25b75..fa0fcdfb3 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
@@ -7,7 +7,14 @@
Diplomas
-
+
+
@@ -27,8 +34,6 @@
Não lidos
-
-
Em atraso
@@ -60,6 +65,7 @@
+
+
+
+
+
+
+
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
index ef113e6b6..315199465 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
@@ -32,6 +32,7 @@ export class DiplomasAssinarPage implements OnInit {
showSearch = false
searchSubject = ''
list = []
+ ordinance: string = 'recent'
constructor(
private processes:ProcessesService,
@@ -61,18 +62,28 @@ export class DiplomasAssinarPage implements OnInit {
this.dynamicSearch()
}
+ reorderList(orderBy: string) {
+
+ this.ordinance = orderBy;
+
+ this.dynamicSearch();
+ }
+
async dynamicSearch() {
if(this.showSearch && this.searchSubject) {
- this.list = this.TaskService.despachoStore.list.filter((task) => {
+ const list = this.TaskService.despachoStore.list.filter((task) => {
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
subject = subject.toLowerCase();
return subject.includes(this.searchSubject.toLowerCase())
})
+
+ this.list = this.TaskService.reorderList(this.ordinance, list)
} else {
- this.list = this.TaskService.AllProcess
+ const list = this.TaskService.AllProcess
+ this.list = this.TaskService.reorderList(this.ordinance, list)
}
}
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
index 51aaae62a..b5c06d54d 100644
--- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
@@ -31,6 +31,32 @@
+
+
+
+
+
+
+ + Order por: + Mais Recentes + Mais Antigos +
+
+
+
+
+
+
+
+
+
+
+
+ = 1">
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts
index 23312d9ba..5cba0c112 100644
--- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts
@@ -33,6 +33,7 @@ export class DiplomasGerarPage implements OnInit {
showSearch = false
searchSubject = ''
list = []
+ ordinance: string = 'old'
constructor(
private processes:ProcessesService,
@@ -62,18 +63,28 @@ export class DiplomasGerarPage implements OnInit {
this.dynamicSearch()
}
+ reorderList(orderBy: string) {
+
+ this.ordinance = orderBy;
+
+ this.dynamicSearch();
+ }
+
async dynamicSearch() {
if(this.showSearch && this.searchSubject) {
- this.list = this.TaskService.despachoStore.list.filter((task) => {
+ const list = this.deplomasStore.DiplomaGerarList.filter((task) => {
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
subject = subject.toLowerCase();
return subject.includes(this.searchSubject.toLowerCase())
})
+
+ this.list = this.TaskService.reorderList(this.ordinance, list)
} else {
- this.list = this.TaskService.AllProcess
+ const list = this.deplomasStore.DiplomaGerarList
+ this.list = this.TaskService.reorderList(this.ordinance, list)
}
}
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
index 8b394dbcd..aa33329d9 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
@@ -3,8 +3,9 @@
+
Diplomas
-
+
+
+
@@ -91,6 +103,7 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
index 8183a9375..a4db033c4 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
@@ -31,9 +31,10 @@ export class DiplomasPage implements OnInit, OnDestroy {
showSearch = false
searchSubject = ''
- listDiplomasPorValidar = []
- listDiplomasAssinadosPR = []
+ listDiplomasPorValidar = [];
+ listDiplomasAssinadosPR = [];
hideSearchBtn: boolean = false;
+ ordinance: string = 'old';
constructor(
private processes: ProcessesService,
@@ -105,26 +106,42 @@ export class DiplomasPage implements OnInit, OnDestroy {
}
+
+ reorderList(orderBy: string) {
+
+ this.ordinance = orderBy;
+
+ this.dynamicSearch();
+ }
+
async dynamicSearch() {
if(this.showSearch && this.searchSubject) {
- this.listDiplomasAssinadosPR = this.deplomasStore.diplomasAssinadoList.filter((task) => {
+ const listDiplomasAssinadosPR = this.deplomasStore.diplomasAssinadoList.filter((task) => {
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
subject = subject.toLowerCase();
return subject.includes(this.searchSubject.toLowerCase())
})
- this.listDiplomasPorValidar = this.deplomasStore.diplomasReviewList.filter((task) => {
+ this.listDiplomasAssinadosPR = this.TaskService.reorderList(this.ordinance, listDiplomasAssinadosPR)
+
+ const listDiplomasPorValidar = this.deplomasStore.diplomasReviewList.filter((task) => {
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
subject = subject.toLowerCase();
return subject.includes(this.searchSubject.toLowerCase())
})
+ this.listDiplomasPorValidar = this.TaskService.reorderList(this.ordinance, listDiplomasPorValidar)
+
} else {
- this.listDiplomasAssinadosPR = this.deplomasStore.diplomasAssinadoList
- this.listDiplomasPorValidar = this.deplomasStore.diplomasReviewList
+ const listDiplomasAssinadosPR = this.deplomasStore.diplomasAssinadoList
+ const listDiplomasPorValidar = this.deplomasStore.diplomasReviewList
+
+
+ this.listDiplomasPorValidar = this.TaskService.reorderList(this.ordinance, listDiplomasPorValidar)
+ this.listDiplomasAssinadosPR = this.TaskService.reorderList(this.ordinance, listDiplomasAssinadosPR)
}
}
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html
index 5c870660c..f497d7085 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.html
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html
@@ -10,7 +10,19 @@
-
+
+
+
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
index c5691d854..4ecb1ce8f 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
@@ -45,9 +45,11 @@ export class EventListPage implements OnInit {
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
showFilter = false
- showSearch = false
+ showSearch = false
searchSubject = ''
list = []
+ ordinance: string = 'old'
+
constructor(
private processes: ProcessesService,
private modalController: ModalController,
@@ -105,6 +107,14 @@ export class EventListPage implements OnInit {
}
+ reorderList(orderBy: string) {
+
+ this.ordinance = orderBy;
+
+ // this.dynamicSearch();
+ }
+
+
getEventToAproveFromDB() {
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html
index 498c98da2..912fe57ed 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html
@@ -10,8 +10,21 @@
-
+
+
+
+
+
+
+
+
+
+
-
+
+
@@ -62,7 +76,7 @@
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index c173b0ba8..0371ef326 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -39,6 +39,7 @@ export class ExpedientePage implements OnInit {
showSearch = false
searchSubject = ''
list = []
+ ordinance: string = 'old'
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
constructor(
@@ -88,17 +89,29 @@ export class ExpedientePage implements OnInit {
}
+ reorderList(orderBy: string) {
+
+ this.ordinance = orderBy;
+
+ this.dynamicSearch();
+ }
+
+
async dynamicSearch() {
if(this.showSearch && this.searchSubject) {
- this.list = this.TaskService.despachoStore.list.filter((task) => {
+ const searchedList = this.expedientegbstore.list.filter((task) => {
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
subject = subject.toLowerCase();
return subject.includes(this.searchSubject.toLowerCase())
})
+
+ this.list = this.TaskService.reorderList(this.ordinance, searchedList)
} else {
- this.list = this.TaskService.AllProcess
+
+ const list = this.expedientegbstore.list
+ this.list = this.TaskService.reorderList(this.ordinance, list)
}
}
@@ -122,7 +135,7 @@ export class ExpedientePage implements OnInit {
this.taskslist = this.taskslist.filter(function(item) {
return item.activityInstanceName != 'Retificar Expediente'
})
- this.listToPresent = this.sortService.sortDate(this.taskslist, 'taskStartDate')
+ this.listToPresent = this.sortService.sortDate(this.taskslist, 'TaskStartDate').reverse()
this.expedientegbstore.reset(this.listToPresent);
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
index 945bff8fc..0b05b84b5 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
@@ -8,7 +8,17 @@
Expediente
-
+
+
+
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index 8c6684cee..a2ae45544 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -37,9 +37,10 @@ export class ExpedientesPrPage implements OnInit {
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
- showSearch = false
+ showSearch = false
searchSubject = ''
list = []
+ ordinance: string = 'old'
constructor(
private processes:ProcessesService,
@@ -77,17 +78,26 @@ export class ExpedientesPrPage implements OnInit {
}
+ reorderList(orderBy: string) {
+
+ this.ordinance = orderBy;
+
+ this.dynamicSearch();
+ }
+
async dynamicSearch() {
if(this.showSearch && this.searchSubject) {
- this.list = this.TaskService.despachoStore.list.filter((task) => {
+ const list = this.expedienteGdStore.list.filter((task) => {
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
subject = subject.toLowerCase();
return subject.includes(this.searchSubject.toLowerCase())
})
+ this.list = this.TaskService.reorderList(this.ordinance, list)
} else {
- this.list = this.TaskService.AllProcess
+ const list = this.expedienteGdStore.list
+ this.list = this.TaskService.reorderList(this.ordinance, list)
}
}
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index eef89ac11..b3653d605 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -11,37 +11,49 @@
+
+
+
+
+
+
+
+
-
+
Gabinete Digital
-
-
+
+
+
+
+
+ Para hoje
+
+
+
+ Novos
+
+
+
+ Lidos
+
+
+
+ Não lidos
+
+
+
+ Em atraso
+
-
- Para hoje
-
-
-
- Novos
-
-
-
- Lidos
-
-
-
- Não lidos
-
-
-
- Em atraso
-
-
-
- Todos
-
-
-
-
+
+ Todos
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+