diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
index eba29d0d3..fe141f75c 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
@@ -39,10 +39,12 @@ export class EventsToApprovePage implements OnInit {
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
+ //
showSearch = false
searchSubject = ''
list = []
hideSearchBtn: boolean = false;
+
constructor(
private processes:ProcessesService,
@@ -80,6 +82,7 @@ export class EventsToApprovePage implements OnInit {
}
});
+ this.dynamicSearch()
}
@@ -88,13 +91,13 @@ export class EventsToApprovePage implements OnInit {
if(this.showSearch && this.searchSubject) {
- this.list = this.TaskService.despachoStore.list.filter((task) => {
+ this.list = this.eventoaprovacaostore.get(this.segment).filter((task) => {
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
subject = subject.toLowerCase();
return subject.includes(this.searchSubject.toLowerCase())
})
} else {
- this.list = this.TaskService.AllProcess
+ this.list = this.eventoaprovacaostore.get(this.segment)
}
}
@@ -138,6 +141,7 @@ export class EventsToApprovePage implements OnInit {
}
this.eventoaprovacaostore.save(segment, this.eventsList)
+ this.dynamicSearch()
} else {
@@ -153,6 +157,7 @@ export class EventsToApprovePage implements OnInit {
this.eventsList = this.eventsList
this.showLoader = false;
this.eventoaprovacaostore.save(segment, this.eventsList)
+ this.dynamicSearch()
}
this.showLoader = false;
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
index de730f58d..f3b6a245a 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
@@ -5,37 +5,77 @@
-
-
+
+
+
+
+
+
+
+
-
- Para hoje
-
+
+
+
+
+
+
+
+
+
+ Para hoje
+
+
+
+ Novos
+
+
+
+ Lidos
+
+
+
+ Não lidos
+
+
+
+
+ Em atraso
+
+
+
+ Todos
+
+
+
+
+
+
-
- Lidos
-
-
-
- Não lidos
-
-
-
-
- Em atraso
-
-
-
-
- Todos
-
-
-
-
@@ -46,10 +86,10 @@
-
= 1">
+ = 1">
@@ -84,13 +124,13 @@
Lista vazia
-
+
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index 837d04eed..931c7aaf8 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -63,6 +63,7 @@ export class ExpedientesPrPage implements OnInit {
}
});
+ this.dynamicSearch()
}
@@ -70,13 +71,13 @@ export class ExpedientesPrPage implements OnInit {
if(this.showSearch && this.searchSubject) {
- this.list = this.TaskService.despachoStore.list.filter((task) => {
+ this.list = this.expedienteGdStore.list.filter((task) => {
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
subject = subject.toLowerCase();
return subject.includes(this.searchSubject.toLowerCase())
})
} else {
- this.list = this.TaskService.AllProcess
+ this.list = this.expedienteGdStore.list
}
}
@@ -113,6 +114,7 @@ export class ExpedientesPrPage implements OnInit {
this.expedienteGdStore.reset(this.taskslist);
this.skeletonLoader = false;
+ this.dynamicSearch()
}, (error) => {
this.skeletonLoader = false
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html
index df1e58596..8dbe6dcc1 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.html
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html
@@ -4,38 +4,76 @@
Expediente
+
-
-
-
-
- Para hoje
-
-
-
- Novos
-
-
-
- Lidos
-
-
-
- Não lidos
-
-
-
-
- Em atraso
-
-
-
- Todos
-
-
-
-
-
+
+
+
+
+
+ Para hoje
+
+
+
+ Novos
+
+
+
+ Lidos
+
+
+
+ Não lidos
+
+
+
+
+ Em atraso
+
+
+
+ Todos
+
+
+
+
+
+
@@ -55,10 +93,10 @@
-
=0">
+ =0">
@@ -93,14 +131,14 @@
Lista vazia
-
-
+
+
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index 93bb47598..9d224b60d 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -65,20 +65,23 @@ export class ExpedientsPage implements OnInit {
}
});
+ this.dynamicSearch()
+
}
- async dynamicSearch() {
+
+ async dynamicSearch() {
if(this.showSearch && this.searchSubject) {
- this.list = this.TaskService.despachoStore.list.filter((task) => {
+ this.list = this.expedientegbstore.list.filter((task) => {
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
subject = subject.toLowerCase();
return subject.includes(this.searchSubject.toLowerCase())
})
} else {
- this.list = this.TaskService.AllProcess
+ this.list = this.expedientegbstore.list
}
}
@@ -121,6 +124,7 @@ export class ExpedientsPage implements OnInit {
})
this.expedientegbstore.reset(taskslist);
+ this.dynamicSearch()
}, (error) => {
this.skeletonLoader = false
// this.getEventsFromLocalDb();
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
index 8361421e9..0ad7eabb2 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
@@ -5,36 +5,76 @@
-
-
+
+
+
+
+
+
+
+
-
- Para hoje
-
+
+
+
+
+
+
+
+
+
+ Para hoje
+
+
+
+ Novos
+
+
+
+ Lidos
+
+
+
+ Não lidos
+
+
+
+
+ Em atraso
+
+
+
+ Todos
+
+
+
+
+
+
@@ -63,13 +103,13 @@
-
= 1">
+
= 1">
-
@@ -105,11 +145,11 @@
- = 1">
+
= 1">
@@ -147,7 +187,7 @@
Lista vazia
@@ -156,7 +196,7 @@
Lista vazia
@@ -165,7 +205,7 @@
-
+
@@ -191,7 +231,7 @@
-
+
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
index feb818987..c146a9b4b 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
@@ -43,7 +43,8 @@ export class PedidosPage implements OnInit {
showSearch = false
searchSubject = ''
- list = []
+ listPedidosParecer = []
+ listPedidosDeferimento = []
hideSearchBtn: boolean = false;
constructor(
@@ -74,6 +75,9 @@ export class PedidosPage implements OnInit {
}
});
+
+ this.dynamicSearch()
+
}
@@ -81,13 +85,24 @@ export class PedidosPage implements OnInit {
if(this.showSearch && this.searchSubject) {
- this.list = this.TaskService.despachoStore.list.filter((task) => {
+ this.listPedidosParecer = this.pedidosstore.listparecer.filter((task) => {
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
subject = subject.toLowerCase();
return subject.includes(this.searchSubject.toLowerCase())
})
+
+
+ this.listPedidosDeferimento = this.pedidosstore.listdeferimento.filter((task) => {
+ let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
+ subject = subject.toLowerCase();
+ return subject.includes(this.searchSubject.toLowerCase())
+ })
+
} else {
- this.list = this.TaskService.AllProcess
+
+ this.listPedidosParecer = this.pedidosstore.listparecer
+ this.listPedidosDeferimento = this.pedidosstore.listdeferimento
+
}
}
@@ -129,6 +144,7 @@ export class PedidosPage implements OnInit {
this.skeletonLoader = false
}
+
let allParecer = parecer.concat(parecerPr).reverse();
this.parecerList = new Array();
@@ -142,6 +158,8 @@ export class PedidosPage implements OnInit {
this.pedidosstore.resetparecer(this.sortService.sortDate(this.parecerList, 'CreateDate'));
+ this.dynamicSearch()
+
}
else if(this.segment == 'deferimento') {
this.taskType = "Pedido de Deferimento";
@@ -159,6 +177,7 @@ export class PedidosPage implements OnInit {
this.pedidosstore.resetdeferimento(this.sortService.sortDate(this.deferimentoList, 'CreateDate'));
+ this.dynamicSearch()
},() => {
this.skeletonLoader = false
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
index 850768f2d..81f2ff004 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
@@ -5,36 +5,76 @@
-
-
+
+
+
+
+
+
+
+
-
- Para hoje
-
+
+
+
+
+
+
+
+
+
+ Para hoje
+
+
+
+ Novos
+
+
+
+ Lidos
+
+
+
+ Não lidos
+
+
+
+
+ Em atraso
+
+
+
+ Todos
+
+
+
+
+
+
@@ -52,7 +92,7 @@
{
+ this.list = this.pendentesstore.list.filter((task) => {
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
subject = subject.toLowerCase();
return subject.includes(this.searchSubject.toLowerCase())
})
} else {
- this.list = this.TaskService.AllProcess
+ this.list = this.pendentesstore.list
}
}
-
openSearch() {
this.dynamicSearch()
}
@@ -111,6 +111,8 @@ export class PendentesPage implements OnInit {
this.storage.set('pendente-list',pendentesList).then(() => {
})
+
+ this.dynamicSearch()
}, (error) => {
this.skeletonLoader = false;
diff --git a/src/global.scss b/src/global.scss
index 28bbbe359..39f569efb 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -1502,4 +1502,30 @@ ion-textarea.heigh-200 textarea {
.gb-seen {
font-weight: normal !important;
-}
\ No newline at end of file
+}
+
+
+
+
+
+.search-input-container{
+ background-color: white;
+ border-radius: 27.5px;
+ border: solid 1px #ebebeb;
+ font-size: 14px;
+ .icon{
+ color: #797979;
+ width: 41px;
+ height: 41px;
+ display: flex;
+ justify-content: center;
+ font-size: 25px;
+ align-items: center;
+ }
+ .input-text{
+ width: 100%;
+ }
+ .icon-z{
+ width: 20px;
+ }
+}
diff --git a/version/git-version.ts b/version/git-version.ts
index 8faf42bb5..44d61ffeb 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "9208b055f",
- "SHA": "9208b055f224cf76815320387baf3eeaef9888c4",
- "branch": "feature/gabineteLabels",
+ "shortSHA": "073f04e54",
+ "SHA": "073f04e541a403a0b6d51f432942c8078d7ac4ff",
+ "branch": "feature/gabinete-search",
"lastCommitAuthor": "'Peter Maquiran'",
- "lastCommitTime": "'Thu May 4 09:48:04 2023 +0100'",
- "lastCommitMessage": "add search",
- "lastCommitNumber": "4933",
+ "lastCommitTime": "'Thu May 4 10:18:16 2023 +0100'",
+ "lastCommitMessage": "remove search",
+ "lastCommitNumber": "4934",
"change": "",
- "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.html\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.html",
+ "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/models/dailyworktask.model.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.html\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.html\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/global.scss",
"changeAuthor": "peter.maquiran"
}
\ No newline at end of file