{{ task.Folio }}
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 66266bbd9..8d777b442 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
@@ -58,7 +58,8 @@ export class DespachosPrPage implements OnInit {
customTaskPipe = new CustomTaskPipe()
SessionStore = SessionStore
environment = environment
-
+ filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
+
constructor(
private processes: ProcessesService,
private modalController: ModalController,
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.module.ts b/src/app/pages/gabinete-digital/despachos/despachos.module.ts
index 0c2c4b18b..563c75780 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.module.ts
+++ b/src/app/pages/gabinete-digital/despachos/despachos.module.ts
@@ -9,6 +9,20 @@ import { DespachosPageRoutingModule } from './despachos-routing.module';
import { DespachosPage } from './despachos.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
+//
+import { MatInputModule } from '@angular/material/input';
+import { MatNativeDateModule } from '@angular/material/core';
+
+import {
+ NgxMatDatetimePickerModule,
+ NgxMatNativeDateModule,
+ NgxMatTimepickerModule
+} from '@angular-material-components/datetime-picker';
+
+import { ReactiveFormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatSelectModule } from '@angular/material/select';
+import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
@NgModule({
imports: [
@@ -18,6 +32,15 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
DespachosPageRoutingModule,
BtnModalDismissPageModule,
+ //
+ MatInputModule,
+ MatNativeDateModule,
+ NgxMatDatetimePickerModule,
+ NgxMatTimepickerModule,
+ NgxMatNativeDateModule,
+ NgxMatMomentModule,
+ MatSelectModule,
+ MatButtonModule,
],
declarations: [
DespachosPage,
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html
index b0ada5ab6..6cd5c1a69 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html
@@ -7,8 +7,41 @@
-
Despachos
+
Despachos
+
+
+
+
+
+ Para hoje
+
+
+
+ Novos
+
+
+
+ Lidos
+
+
+
+ Não lidos
+
+
+
+
+ Em atraso
+
+
+
+ Todos
+
+
+
+
+
+
@@ -37,7 +70,7 @@
(click)="GoToDespacho(task.SerialNumber)"
>
-
+
{{ task.Folio }}
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
index 0cbdfcc8c..aabbd7070 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
@@ -18,7 +18,8 @@ import { TaskService } from 'src/app/services/task.service'
export class DespachosPage implements OnInit {
despachoStore = DespachoStore;
-
+ filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
+
constructor(
private router: Router,
private despachoRule: DespachoService,
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html
index 644a7ab22..45907df9c 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html
@@ -52,7 +52,7 @@
{
+
+ const filter = this.TaskService.despachoStore.list.filter(task => this.TaskService.filter(task, this.filterName))
+
+ }
+ })
+
}
goToDespacho({ SerialNumber } : customTask) {
diff --git a/src/app/store/deplomas.service.ts b/src/app/store/deplomas.service.ts
index 2536de57a..e9ec626a8 100644
--- a/src/app/store/deplomas.service.ts
+++ b/src/app/store/deplomas.service.ts
@@ -29,6 +29,13 @@ export class DeplomasService {
diplomasGerarListNewCount = []
diplomasParaAssinarNewCount = []
+ callbacks: {
+ [key: string]: {
+ funx: Function
+ id: string
+ }
+ } = {}
+
constructor() {
this.keyNameDiplomasAssinado = (SHA1("DeplomasService"+"diplomasAssinado")).toString()
this.keyNameDiplomasReview = (SHA1("DeplomasService"+"diplomasReview")).toString()
@@ -58,6 +65,15 @@ export class DeplomasService {
}
+ registerCallback({funx, id}) {
+ this.callbacks[id] = { funx, id}
+ }
+
+ runCallback() {
+ for (const [key, value] of Object.entries(this.callbacks)) {
+ value.funx()
+ }
+ }
get deplomasReviewCount() {
return this._diplomasReviewCount
diff --git a/src/app/store/despacho-store.service.ts b/src/app/store/despacho-store.service.ts
index e901370cb..da501ce9e 100644
--- a/src/app/store/despacho-store.service.ts
+++ b/src/app/store/despacho-store.service.ts
@@ -15,6 +15,13 @@ export class DespachoStoreService {
private keyName: string;
private _count = 0
+ callbacks: {
+ [key: string]: {
+ funx: Function
+ id: string
+ }
+ } = {}
+
ObjectQueryService = new ObjectQueryService()
newList = []
@@ -72,6 +79,17 @@ export class DespachoStoreService {
}
+ registerCallback({funx, id}) {
+ this.callbacks[id] = { funx, id}
+ }
+
+
+ runCallback() {
+ for (const [key, value] of Object.entries(this.callbacks)) {
+ value.funx()
+ }
+ }
+
Query() {
return {
Update: (select:Function, update:Function) => {
diff --git a/src/app/store/despachospr-store.service.ts b/src/app/store/despachospr-store.service.ts
index d42560d8b..83b6f4e24 100644
--- a/src/app/store/despachospr-store.service.ts
+++ b/src/app/store/despachospr-store.service.ts
@@ -13,6 +13,13 @@ private _list = []
private keyName: string;
newList = [];
+callbacks: {
+ [key: string]: {
+ funx: Function
+ id: string
+ }
+} = {}
+
constructor() {
this.keyName = (SHA1("DespachosprStoreService")).toString()
@@ -25,6 +32,17 @@ constructor() {
}
+registerCallback({funx, id}) {
+ this.callbacks[id] = { funx, id}
+}
+
+runCallback() {
+ for (const [key, value] of Object.entries(this.callbacks)) {
+ value.funx()
+ }
+}
+
+
get list() {
return this._list || []
}
diff --git a/src/app/store/eventoaprovacao-store.service.ts b/src/app/store/eventoaprovacao-store.service.ts
index b8956e7b0..4d734819a 100644
--- a/src/app/store/eventoaprovacao-store.service.ts
+++ b/src/app/store/eventoaprovacao-store.service.ts
@@ -19,6 +19,13 @@ export class EventoaprovacaoStoreService {
private _countsAll = 0
+ callbacks: {
+ [key: string]: {
+ funx: Function
+ id: string
+ }
+ } = {}
+
newList = []
constructor() {
@@ -36,6 +43,18 @@ export class EventoaprovacaoStoreService {
}
+
+ registerCallback({funx, id}) {
+ this.callbacks[id] = { funx, id}
+ }
+
+ runCallback() {
+ for (const [key, value] of Object.entries(this.callbacks)) {
+ value.funx()
+ }
+ }
+
+
get countAll() {
return this._countsAll
}
diff --git a/src/app/store/expedientegd-store.service.ts b/src/app/store/expedientegd-store.service.ts
index 45ab8804c..2ca794a82 100644
--- a/src/app/store/expedientegd-store.service.ts
+++ b/src/app/store/expedientegd-store.service.ts
@@ -16,6 +16,13 @@ export class ExpedientegdStoreService {
newList = []
+ callbacks: {
+ [key: string]: {
+ funx: Function
+ id: string
+ }
+ } = {}
+
constructor() {
this.keyName = (SHA1("EventoaprovacaoStoreService")).toString()
@@ -28,6 +35,17 @@ export class ExpedientegdStoreService {
}
+ registerCallback({funx, id}) {
+ this.callbacks[id] = { funx, id}
+ }
+
+ runCallback() {
+ for (const [key, value] of Object.entries(this.callbacks)) {
+ value.funx()
+ }
+ }
+
+
get list() {
return this._list
}
diff --git a/src/app/store/pedidos-store.service.ts b/src/app/store/pedidos-store.service.ts
index aabca26ed..7628d4f8a 100644
--- a/src/app/store/pedidos-store.service.ts
+++ b/src/app/store/pedidos-store.service.ts
@@ -18,6 +18,13 @@ export class PedidosStoreService {
listParecerCount: Event[] = []
listDeferimentoCount: Event[] = []
+
+ callbacks: {
+ [key: string]: {
+ funx: Function
+ id: string
+ }
+ } = {}
constructor() {
@@ -36,6 +43,17 @@ export class PedidosStoreService {
}, 10)
}
+
+ registerCallback({funx, id}) {
+ this.callbacks[id] = { funx, id}
+ }
+
+ runCallback() {
+ for (const [key, value] of Object.entries(this.callbacks)) {
+ value.funx()
+ }
+ }
+
get listparecer(): any[] {
return this._listParecer || []
diff --git a/src/app/store/pendestes-store.service.ts b/src/app/store/pendestes-store.service.ts
index d01db39ce..32b2717d0 100644
--- a/src/app/store/pendestes-store.service.ts
+++ b/src/app/store/pendestes-store.service.ts
@@ -15,6 +15,13 @@ export class PendestesStoreService {
newList = []
+ callbacks: {
+ [key: string]: {
+ funx: Function
+ id: string
+ }
+ } = {}
+
constructor() {
this.keyName = (SHA1("PendestesStoreService")).toString()
@@ -28,6 +35,17 @@ export class PendestesStoreService {
}
+ registerCallback({funx, id}) {
+ this.callbacks[id] = { funx, id}
+ }
+
+ runCallback() {
+ for (const [key, value] of Object.entries(this.callbacks)) {
+ value.funx()
+ }
+ }
+
+
get list() {
return this._list
}
diff --git a/version/git-version.ts b/version/git-version.ts
index 4ac0b3141..721e07384 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "34acfed80",
- "SHA": "34acfed80e82e6ba4b4d6e10b92186974ca7364d",
+ "shortSHA": "9c304e23d",
+ "SHA": "9c304e23d7f19029c7bb11093b1aea253abf4af3",
"branch": "feature/gabineteLabels",
"lastCommitAuthor": "'Peter Maquiran'",
- "lastCommitTime": "'Wed Apr 19 09:18:25 2023 +0100'",
- "lastCommitMessage": "fix new task",
- "lastCommitNumber": "4921",
+ "lastCommitTime": "'Wed Apr 19 09:35:47 2023 +0100'",
+ "lastCommitMessage": "another one",
+ "lastCommitNumber": "4922",
"change": "",
- "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html",
+ "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.module.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.module.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.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/store/deplomas.service.ts\n\tmodified: src/app/store/despacho-store.service.ts\n\tmodified: src/app/store/despachospr-store.service.ts\n\tmodified: src/app/store/eventoaprovacao-store.service.ts\n\tmodified: src/app/store/expedientegd-store.service.ts\n\tmodified: src/app/store/pedidos-store.service.ts\n\tmodified: src/app/store/pendestes-store.service.ts",
"changeAuthor": "peter.maquiran"
}
\ No newline at end of file