diff --git a/package-lock.json b/package-lock.json index 7b35965e7..92be8b07a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -99,7 +99,7 @@ "angular-svg-icon": "^12.0.0", "angular-tag-cloud-module": "^5.2.2", "base64-js": "^1.5.1", - "beast-orm": "^1.1.3", + "beast-orm": "^1.1.5", "bootstrap": "^4.5.0", "browser-image-resizer": "^2.4.1", "build": "0.1.4", @@ -8834,9 +8834,9 @@ } }, "node_modules/beast-orm": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.1.3.tgz", - "integrity": "sha512-stZiiliGzvP1b2BPHGo2l2gZlw9CgrnpMhOLvvC1e3JekbSrOFIGt1/kwNMfLhg81c2ZHpfRBnNo5Nw6NQxzRw==" + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.1.5.tgz", + "integrity": "sha512-/ubSO+8pp5NhW+AnK+sNaPXyyieHRuRNLxNUXhtMeJRZYbhyGLa5iH4hGP1hrB27Ximt+MnySWva2ct6dFP+aA==" }, "node_modules/big-integer": { "version": "1.6.49", @@ -45622,9 +45622,9 @@ } }, "beast-orm": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.1.3.tgz", - "integrity": "sha512-stZiiliGzvP1b2BPHGo2l2gZlw9CgrnpMhOLvvC1e3JekbSrOFIGt1/kwNMfLhg81c2ZHpfRBnNo5Nw6NQxzRw==" + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.1.5.tgz", + "integrity": "sha512-/ubSO+8pp5NhW+AnK+sNaPXyyieHRuRNLxNUXhtMeJRZYbhyGLa5iH4hGP1hrB27Ximt+MnySWva2ct6dFP+aA==" }, "big-integer": { "version": "1.6.49" diff --git a/package.json b/package.json index 54a4e0fed..0d248cf0d 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "angular-svg-icon": "^12.0.0", "angular-tag-cloud-module": "^5.2.2", "base64-js": "^1.5.1", - "beast-orm": "^1.1.3", + "beast-orm": "^1.1.5", "bootstrap": "^4.5.0", "browser-image-resizer": "^2.4.1", "build": "0.1.4", 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 8d777b442..97bff24f5 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 @@ -59,7 +59,10 @@ export class DespachosPrPage implements OnInit { SessionStore = SessionStore environment = environment filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' - + showSearch = false + searchSubject = '' + list = [] + constructor( private processes: ProcessesService, private modalController: ModalController, @@ -99,8 +102,25 @@ export class DespachosPrPage implements OnInit { this.backgroundservice.registerBackService('Online', () => { this.LoadList() }); + + this.dynamicSearch() } + + async dynamicSearch() { + + if(this.showSearch && this.searchSubject) { + + this.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()) + }) + } else { + this.list = this.TaskService.AllProcess + } + + } segmentChanged(ev: any) { this.LoadList(); diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html index 6cd5c1a69..5b7b0b262 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.html +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html @@ -10,6 +10,43 @@
Despachos
+
+
+
+ + + +
+ + +
+
+ +
+ +
+ + +
+ + + +
+
+
+
+
+ diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.scss b/src/app/pages/gabinete-digital/despachos/despachos.page.scss index c61d396f9..b106ba21b 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.scss +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.scss @@ -238,4 +238,26 @@ ion-item{ .label-deadline { -} \ 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/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts index aabbd7070..16ca646db 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts @@ -19,6 +19,10 @@ export class DespachosPage implements OnInit { despachoStore = DespachoStore; filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' + showSearch = false + searchSubject = '' + list = [] + hideSearchBtn: boolean = false; constructor( private router: Router, @@ -51,8 +55,40 @@ export class DespachosPage implements OnInit { this.LoadList(); }); + this.dynamicSearch() } + + async dynamicSearch() { + + if(this.showSearch && this.searchSubject) { + + this.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()) + }) + } else { + this.list = this.TaskService.AllProcess + } + + } + + openSearch() { + this.dynamicSearch() + } + async closeSearch() { + this.searchSubject = '' + this.dynamicSearch() + } + + async basicSearch() { + this.dynamicSearch() + } + + + + async refreshing() { setTimeout(() => { this.LoadList(); 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 272587f33..ef113e6b6 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 @@ -29,7 +29,9 @@ export class DiplomasAssinarPage implements OnInit { skeletonLoader = true deplomasStore = DeplomasStore filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' - + showSearch = false + searchSubject = '' + list = [] constructor( private processes:ProcessesService, @@ -56,6 +58,23 @@ export class DiplomasAssinarPage implements OnInit { } } }); + this.dynamicSearch() + } + + + async dynamicSearch() { + + if(this.showSearch && this.searchSubject) { + + this.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()) + }) + } else { + this.list = this.TaskService.AllProcess + } + } 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 f73c0eaf1..23312d9ba 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 @@ -30,7 +30,10 @@ export class DiplomasGerarPage implements OnInit { deplomasStore = DeplomasStore filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' - + showSearch = false + searchSubject = '' + list = [] + constructor( private processes:ProcessesService, private modalController: ModalController, @@ -56,7 +59,24 @@ export class DiplomasGerarPage implements OnInit { } } }); - } + this.dynamicSearch() + } + + + async dynamicSearch() { + + if(this.showSearch && this.searchSubject) { + + this.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()) + }) + } else { + this.list = this.TaskService.AllProcess + } + + } diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts index f5fe3903f..8accfd925 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts @@ -32,6 +32,9 @@ export class DiplomasPage implements OnInit, OnDestroy { customTaskPipe = new CustomTaskPipe() filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' + showSearch = false + searchSubject = '' + constructor( private processes: ProcessesService, private router: Router, @@ -85,6 +88,23 @@ export class DiplomasPage implements OnInit, OnDestroy { this.LoadList(); }); + this.dynamicSearch() + } + + + async dynamicSearch() { + + if(this.showSearch && this.searchSubject) { + + this.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()) + }) + } else { + this.list = this.TaskService.AllProcess + } + } async getTotalDocs(DocId: any) { 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 f4f2166d6..c5691d854 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,6 +45,9 @@ export class EventListPage implements OnInit { filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' showFilter = false + showSearch = false + searchSubject = '' + list = [] constructor( private processes: ProcessesService, private modalController: ModalController, diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index d7d284f4c..fdfc388ad 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -36,6 +36,10 @@ export class ExpedientePage implements OnInit { listToPresent= [] + showSearch = false + searchSubject = '' + list = [] + filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' constructor( private processes: ProcessesService, @@ -80,6 +84,23 @@ export class ExpedientePage implements OnInit { this.backgroundservice.registerBackService('Online', () => { this.LoadList(); }); + this.dynamicSearch() + } + + + async dynamicSearch() { + + if(this.showSearch && this.searchSubject) { + + this.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()) + }) + } else { + this.list = this.TaskService.AllProcess + } + } LoadList() { 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 cb0030854..8c6684cee 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 @@ -36,6 +36,11 @@ export class ExpedientesPrPage implements OnInit { expedienteTaskPipe = new ExpedienteTaskPipe() filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' + + showSearch = false + searchSubject = '' + list = [] + constructor( private processes:ProcessesService, private modalController: ModalController, @@ -68,6 +73,23 @@ export class ExpedientesPrPage implements OnInit { } }); + this.dynamicSearch() + } + + + async dynamicSearch() { + + if(this.showSearch && this.searchSubject) { + + this.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()) + }) + } else { + this.list = this.TaskService.AllProcess + } + } LoadList() { diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts index 6f2d0fba2..5f2b33eb0 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts @@ -43,6 +43,10 @@ export class PedidosPage implements OnInit { @Output() openExpedientDetail: EventEmitter = new EventEmitter(); filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' + showSearch = false + searchSubject = '' + list = [] + constructor( private router: Router, private processes: ProcessesService, @@ -90,6 +94,23 @@ export class PedidosPage implements OnInit { this.backgroundservice.registerBackService('Online', () => { this.getFromDb(); }); + this.dynamicSearch() + } + + + async dynamicSearch() { + + if(this.showSearch && this.searchSubject) { + + this.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()) + }) + } else { + this.list = this.TaskService.AllProcess + } + } goBack() { diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts index e12fdc8d5..db73bc9d7 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts @@ -41,6 +41,10 @@ export class PendentesPage implements OnInit { listToPresent = []; filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' + showSearch = false + searchSubject = '' + list = [] + constructor( private processes: ProcessesService, private alertService: AlertService, @@ -81,6 +85,23 @@ export class PendentesPage implements OnInit { this.LoadList(); }); + this.dynamicSearch() + } + + + async dynamicSearch() { + + if(this.showSearch && this.searchSubject) { + + this.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()) + }) + } else { + this.list = this.TaskService.AllProcess + } + } segmentChanged(ev: any) { diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html index 45907df9c..652f1b149 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.html +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html @@ -2,41 +2,82 @@
Despachos
-
+
- - - - Para hoje - +
+
+
+ + + +
+ - - Novos - +
+
+ +
+ +
+ + +
- - Lidos - + + +
+
+
+
+
+ +
+ + + + + Para hoje + + + + Novos + + + + Lidos + + + + Não lidos + + + + + Em atraso + + + + Todos + + + + + +
- - Não lidos - - - - - Em atraso - - - - Todos - - - - -
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.scss b/src/app/shared/gabinete-digital/despachos/despachos.page.scss index 193e35618..911ef3a79 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.scss +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.scss @@ -218,3 +218,27 @@ ion-item{ float: right; margin-right: 10px; } + + + +.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/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts index 10c16f891..1f3c0dc88 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts @@ -3,7 +3,8 @@ import { customTask } from '../../../models/dailyworktask.model'; import { NavigationStart, Router } from '@angular/router'; import { DespachoStore } from 'src/app/store/despacho-store.service'; import { DespachoService } from 'src/app/Rules/despacho.service'; -import { TaskService } from 'src/app/services/task.service' +import { TaskService } from 'src/app/services/task.service'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-despachos', @@ -15,12 +16,16 @@ export class DespachosPage implements OnInit { despachoStore = DespachoStore; skeletonLoader = true; filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' - + showSearch = false + searchSubject = '' + list = [] + hideSearchBtn: boolean = false; constructor ( private router: Router, private despachoRule: DespachoService, - public TaskService: TaskService + public TaskService: TaskService, + public ThemeService: ThemeService, ) {} ngOnInit() { @@ -48,6 +53,37 @@ export class DespachosPage implements OnInit { } + + async dynamicSearch() { + + if(this.showSearch && this.searchSubject) { + + this.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()) + }) + } else { + this.list = this.TaskService.AllProcess + } + + } + + + openSearch() { + this.dynamicSearch() + } + async closeSearch() { + this.searchSubject = '' + this.dynamicSearch() + } + + async basicSearch() { + this.dynamicSearch() + } + + + goToDespacho({ SerialNumber } : customTask) { this.router.navigate(['/home/gabinete-digital/despachos',SerialNumber,'gabinete-digital']); } diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html index 145416865..a9ada1cb8 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html @@ -3,7 +3,45 @@
-
+
+ +
+
+
+ + + +
+ + +
+
+ +
+ +
+ + +
+ + + +
+
+
+
+
+ diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss index 7a53fe3e7..1f6335094 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss @@ -230,3 +230,29 @@ left: 50%; margin: -35px 0 0 -35px; } + + + + + +.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/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 7790d06c9..eba29d0d3 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 @@ -13,6 +13,7 @@ import { SessionStore } from 'src/app/store/session.service'; import { EventsService } from 'src/app/services/events.service'; import { environment } from 'src/environments/environment'; import { TaskService } from 'src/app/services/task.service' +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-events-to-approve', @@ -37,6 +38,11 @@ export class EventsToApprovePage implements OnInit { environment = environment filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' + + showSearch = false + searchSubject = '' + list = [] + hideSearchBtn: boolean = false; constructor( private processes:ProcessesService, @@ -46,7 +52,8 @@ export class EventsToApprovePage implements OnInit { private sortService: SortService, private storage: Storage, public eventService: EventsService, - public TaskService: TaskService + public TaskService: TaskService, + public ThemeService: ThemeService, ) {} @@ -75,6 +82,38 @@ export class EventsToApprovePage implements OnInit { } + + + async dynamicSearch() { + + if(this.showSearch && this.searchSubject) { + + this.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()) + }) + } else { + this.list = this.TaskService.AllProcess + } + + } + + + openSearch() { + this.dynamicSearch() + } + async closeSearch() { + this.searchSubject = '' + this.dynamicSearch() + } + + async basicSearch() { + this.dynamicSearch() + } + + + segmentChanged(ev: any) { this.LoadToApproveEvents(); } 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 0160347b2..0dbee077d 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 @@ -2,7 +2,45 @@
Expediente
-
+
+ +
+
+
+ + + +
+ + +
+
+ +
+ +
+ + +
+ + + +
+
+
+
+
+ diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss index a238b635c..f7d121f38 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss @@ -159,3 +159,29 @@ ion-item{ float: right; margin-right: 10px; } + + + + + +.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/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index b2ee7f390..837d04eed 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 @@ -28,6 +28,11 @@ export class ExpedientesPrPage implements OnInit { loggeduser: LoginUserRespose; filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' + showSearch = false + searchSubject = '' + list = [] + hideSearchBtn: boolean = false; + @Output() openExpedientDetail:EventEmitter = new EventEmitter(); constructor( @@ -60,6 +65,37 @@ export class ExpedientesPrPage implements OnInit { } + + async dynamicSearch() { + + if(this.showSearch && this.searchSubject) { + + this.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()) + }) + } else { + this.list = this.TaskService.AllProcess + } + + } + + + openSearch() { + this.dynamicSearch() + } + async closeSearch() { + this.searchSubject = '' + this.dynamicSearch() + } + + async basicSearch() { + this.dynamicSearch() + } + + + openExpedientDetailPage(data){ this.openExpedientDetail.emit(data); diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html index 3651a81ab..1eb65d2e9 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.html +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html @@ -2,7 +2,45 @@
Expediente
-
+
+ +
+
+
+ + + +
+ + +
+
+ +
+ +
+ + +
+ + + +
+
+
+
+
+ diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.scss b/src/app/shared/gabinete-digital/expedients/expedients.page.scss index a238b635c..1a528fd2b 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.scss +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.scss @@ -159,3 +159,33 @@ ion-item{ float: right; margin-right: 10px; } + + + + +.search-input-container{ + background-color: white; + border-radius: 27.5px; + border: solid 1px #ebebeb; + font-size: 14px; + + input { + padding: 0px !important; + padding-left: 8px !important; + } + .icon{ + color: #797979; + width: 35px; + height: 35px; + display: flex; + justify-content: center; + font-size: 25px; + align-items: center; + } + .input-text{ + width: 100%; + } + .icon-z{ + width: 20px; + } +} diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index fe51ddbc3..93bb47598 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -25,7 +25,11 @@ export class ExpedientsPage implements OnInit { expedienteTaskPipe = new ExpedienteTaskPipe() filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' - + showSearch = false + searchSubject = '' + list = [] + hideSearchBtn: boolean = false; + constructor( private processes: ProcessesService, private router: Router, @@ -63,6 +67,36 @@ export class ExpedientsPage implements OnInit { } + + async dynamicSearch() { + + if(this.showSearch && this.searchSubject) { + + this.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()) + }) + } else { + this.list = this.TaskService.AllProcess + } + + } + + + openSearch() { + this.dynamicSearch() + } + async closeSearch() { + this.searchSubject = '' + this.dynamicSearch() + } + + async basicSearch() { + this.dynamicSearch() + } + + segmentChanged() { this.LoadList(); } diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index bbb058c9a..b99352787 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html @@ -2,7 +2,45 @@
Pedidos
-
+
+ +
+
+
+ + + +
+ + +
+
+ +
+ +
+ + +
+ + + +
+
+
+
+
+ diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss b/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss index 90a4be095..32512749d 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss @@ -234,3 +234,28 @@ ion-item{ left: 50%; margin: -35px 0 0 -35px; } + + + + +.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/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index 02a3bbcbd..feb818987 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -41,6 +41,11 @@ export class PedidosPage implements OnInit { customTaskPipe = new CustomTaskPipe() filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' + showSearch = false + searchSubject = '' + list = [] + hideSearchBtn: boolean = false; + constructor( private router: Router, private processes:ProcessesService, @@ -71,6 +76,37 @@ export class PedidosPage implements OnInit { } + + async dynamicSearch() { + + if(this.showSearch && this.searchSubject) { + + this.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()) + }) + } else { + this.list = this.TaskService.AllProcess + } + + } + + + openSearch() { + this.dynamicSearch() + } + async closeSearch() { + this.searchSubject = '' + this.dynamicSearch() + } + + async basicSearch() { + this.dynamicSearch() + } + + + segmentChanged(ev: any) { this.LoadList(); } diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html index 56df760d9..ceff2a38c 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html @@ -2,7 +2,45 @@
Pendentes
-
+
+ +
+
+
+ + + +
+ + +
+
+ +
+ +
+ + +
+ + + +
+
+
+
+
+ diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.scss b/src/app/shared/gabinete-digital/pendentes/pendentes.page.scss index 3fd913976..ee13c9244 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.scss +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.scss @@ -221,3 +221,28 @@ ion-item{ float: right; margin-right: 10px; } + + + + +.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/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts index 6944e6b93..0fbeebd12 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts @@ -9,6 +9,8 @@ import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; import { SortService } from 'src/app/services/functions/sort.service'; import { Storage } from '@ionic/storage'; import { SessionStore } from 'src/app/store/session.service'; +import { TaskService } from 'src/app/services/task.service' +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-pendentes', @@ -27,13 +29,18 @@ export class PendentesPage implements OnInit { segment:string; @Output() openExpedientDetail:EventEmitter = new EventEmitter(); filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' - + showSearch = false + searchSubject = '' + list = [] + hideSearchBtn: boolean = false; constructor( private processes:ProcessesService, private router: Router, private sortService: SortService, - private storage: Storage + private storage: Storage, + public TaskService: TaskService, + public ThemeService: ThemeService ) { this.loggeduser = SessionStore.user; } @@ -54,6 +61,36 @@ export class PendentesPage implements OnInit { } + + async dynamicSearch() { + + if(this.showSearch && this.searchSubject) { + + this.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()) + }) + } else { + this.list = this.TaskService.AllProcess + } + + } + + + openSearch() { + this.dynamicSearch() + } + async closeSearch() { + this.searchSubject = '' + this.dynamicSearch() + } + + async basicSearch() { + this.dynamicSearch() + } + + async LoadList(){ this.skeletonLoader = true; this.processes.GetPendingTasks(false).subscribe(async (pendentes) => { diff --git a/src/app/store/deplomas.service.ts b/src/app/store/deplomas.service.ts index d7b903e68..f8d61c518 100644 --- a/src/app/store/deplomas.service.ts +++ b/src/app/store/deplomas.service.ts @@ -61,6 +61,7 @@ export class DeplomasService { this._diplomasGerarList = restoreDiplomasGerarList.list || [] this._diplomasGerarListCount = parseInt(restoreDiplomasGerarList.count) || 0 + this.runCallback() }, 10) } @@ -131,6 +132,8 @@ export class DeplomasService { if(window['all-process-gabinete']) { window['all-process-gabinete']() } + + this.runCallback() } resetDiplomasParaAssinar(value: any[]) { @@ -142,6 +145,8 @@ export class DeplomasService { if(window['all-process-gabinete']) { window['all-process-gabinete']() } + + this.runCallback() } resetDiplomasReview(value: any[]) { @@ -152,6 +157,8 @@ export class DeplomasService { if(window['all-process-gabinete']) { window['all-process-gabinete']() } + + this.runCallback() } resetDiplomaGerar(value: any[]) { @@ -163,6 +170,8 @@ export class DeplomasService { if(window['all-process-gabinete']) { window['all-process-gabinete']() } + + this.runCallback() } diff --git a/src/app/store/despacho-store.service.ts b/src/app/store/despacho-store.service.ts index 52a97c5b0..b1e8852b6 100644 --- a/src/app/store/despacho-store.service.ts +++ b/src/app/store/despacho-store.service.ts @@ -35,47 +35,9 @@ export class DespachoStoreService { let restore = localstoreService.get(this.keyName, {}) this._list = restore.list || [] this._count = parseInt(restore.count) || 0 + + this.runCallback() }, 10) - - - setTimeout(()=>{ - - // this.Query().Update( - // (select:customTask): boolean => select.Folio == 'Formação', - // (update:customTask) => update.Folio = 'Formação 5' - // ) - - // this.Query().Update( - // (select:customTask): boolean => select.Folio == 'Formação', - // (update:customTask) => { - // update.Folio = 'Formação 7'; - // update.DocumentURL = 'peter'; - // } - // ) - - // this.Query().Update( - // (select:customTask): boolean => select.Folio == 'Formação', - // (update:customTask): customTask => ({ - // CreateDate: '', - // DocId: 0, - // DocumentURL: '', - // DocumentsQty: '', - // FolderID: 0, - // Folio:' ', - // Remetente: '', - // Senders: '', - // SerialNumber: '', - // Status: '', - // WorkflowName: '', - // activityInstanceName: '' - // }) - // ) - - // this.Query().Delete( - // (select: customTask): boolean => select.DocId == 3 && select.DocId >= 1 - // ) - - }, 5000) } @@ -141,6 +103,7 @@ export class DespachoStoreService { this._count = this._list.length } + this.runCallback() setTimeout(()=>{ localstoreService.set(this.keyName,{ list: this._list, diff --git a/src/app/store/despachospr-store.service.ts b/src/app/store/despachospr-store.service.ts index 79865ec92..82c25fa12 100644 --- a/src/app/store/despachospr-store.service.ts +++ b/src/app/store/despachospr-store.service.ts @@ -29,6 +29,7 @@ constructor() { setTimeout(()=>{ let restore = localstoreService.get(this.keyName, {}) this._list = restore.list || [] + this.runCallback() }, 10) } @@ -71,6 +72,7 @@ private save() { }) }, 10) + this.runCallback() this.updateNewCount() } diff --git a/src/app/store/eventoaprovacao-store.service.ts b/src/app/store/eventoaprovacao-store.service.ts index 722e8f712..60d4181c5 100644 --- a/src/app/store/eventoaprovacao-store.service.ts +++ b/src/app/store/eventoaprovacao-store.service.ts @@ -43,6 +43,7 @@ export class EventoaprovacaoStoreService { this._list = list || {} this.updateCount(); + this.runCallback() }, 10) } @@ -78,6 +79,7 @@ export class EventoaprovacaoStoreService { this._list[segment] = [] this._counts[segment] = 0 } + value = value.map( e => this.EventoApprovePipe.transform(e, e)) @@ -92,6 +94,8 @@ export class EventoaprovacaoStoreService { list: this._list, counts: this._counts }) + + this.runCallback() }, 10) if(window['all-process-gabinete']) { diff --git a/src/app/store/expedientegd-store.service.ts b/src/app/store/expedientegd-store.service.ts index 7b10d1bcd..a8aabc7b8 100644 --- a/src/app/store/expedientegd-store.service.ts +++ b/src/app/store/expedientegd-store.service.ts @@ -32,6 +32,8 @@ export class ExpedientegdStoreService { let restore = localstoreService.get(this.keyName, {}) this._list = restore.list || [] this._count = parseInt(restore.count) || 0 + + this.runCallback() }, 10) } @@ -61,6 +63,8 @@ export class ExpedientegdStoreService { if(window['all-process-gabinete']) { window['all-process-gabinete']() } + + this.runCallback() } private save() { diff --git a/src/app/store/pedidos-store.service.ts b/src/app/store/pedidos-store.service.ts index 32b510952..2ef807a83 100644 --- a/src/app/store/pedidos-store.service.ts +++ b/src/app/store/pedidos-store.service.ts @@ -40,6 +40,8 @@ export class PedidosStoreService { this._listDeferimento = restoreParecer.listParecer || [] this._countparecer = parseInt(restoreParecer.count) || 0 this._countDeferiemnto = parseInt(restoreDeferimento.count) || 0 + + this.runCallback() }, 10) @@ -85,6 +87,8 @@ export class PedidosStoreService { this.countparecer = this._listParecer.length this.saveDeferimento() + + this.runCallback() if(window['all-process-gabinete']) { window['all-process-gabinete']() } @@ -95,6 +99,7 @@ export class PedidosStoreService { this.countdeferimento =this._listDeferimento.length this.saveParecer() + this.runCallback() if(window['all-process-gabinete']) { window['all-process-gabinete']() } diff --git a/src/app/store/pendestes-store.service.ts b/src/app/store/pendestes-store.service.ts index 66bfb3191..c51c1ef50 100644 --- a/src/app/store/pendestes-store.service.ts +++ b/src/app/store/pendestes-store.service.ts @@ -32,6 +32,8 @@ export class PendestesStoreService { let restore = localstoreService.get(this.keyName, {}) this._list = restore.list || [] this._count = parseInt(restore.count) || 0 + + this.runCallback() }, 10) } @@ -66,6 +68,8 @@ export class PendestesStoreService { if(window['all-process-gabinete']) { window['all-process-gabinete']() } + + this.runCallback() } private save() { diff --git a/src/global.scss b/src/global.scss index 76641119e..28bbbe359 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1483,6 +1483,7 @@ ion-textarea.heigh-200 textarea { padding-right: 5px; border-radius: 1px; font-size: 14px; + width: 110px; .mat-form-field-infix { diff --git a/version/git-version.ts b/version/git-version.ts index aeb75714f..364b1c5c4 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "8d88b613c", - "SHA": "8d88b613cb520268618af660c72d39d048eb965d", + "shortSHA": "bd8b3c350", + "SHA": "bd8b3c350188df5f337bb8e215730d9a8f7400e8", "branch": "feature/gabineteLabels", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Apr 25 10:13:45 2023 +0100'", + "lastCommitTime": "'Fri Apr 28 12:56:45 2023 +0100'", "lastCommitMessage": "fix", - "lastCommitNumber": "4931", + "lastCommitNumber": "4932", "change": "", - "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/messages/messages.page.html\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/task-deadline.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.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/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", + "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.scss\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.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.scss\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.scss\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.scss\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.scss\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.scss\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.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\n\tmodified: src/global.scss\n\tmodified: version/git-version.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file