From ef882e8ff15e33bf250aceb4f21876f626391d1b Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 8 May 2023 10:52:54 +0100 Subject: [PATCH] fix --- src/app/models/dailyworktask.model.ts | 1 + .../despachos/despachos.page.html | 37 ------ .../gabinete-digital.page.html | 4 +- .../despachos-pr/despachos-pr.page.html | 93 ++++++++++---- .../despachos-pr/despachos-pr.page.scss | 27 +++- .../despachos-pr/despachos-pr.page.ts | 42 +++++++ .../despachos/despachos.page.html | 37 +++++- .../despachos/despachos.page.ts | 8 +- .../diplomas-assinar.page.html | 105 +++++++++++----- .../diplomas-assinar/diplomas-assinar.page.ts | 39 +++++- .../diplomas/diplomas.page.html | 116 ++++++++++++------ .../diplomas/diplomas.page.ts | 51 ++++++++ .../events-to-approve.page.html | 103 +++++++++++----- .../events-to-approve.page.ts | 9 +- .../expedientes-pr/expedientes-pr.page.html | 104 +++++++++++----- .../expedientes-pr/expedientes-pr.page.ts | 6 +- .../expedients/expedients.page.html | 110 +++++++++++------ .../expedients/expedients.page.ts | 10 +- .../pedidos/pedidos.page.html | 114 +++++++++++------ .../gabinete-digital/pedidos/pedidos.page.ts | 25 +++- .../pendentes/pendentes.page.html | 98 ++++++++++----- .../pendentes/pendentes.page.ts | 8 +- src/global.scss | 28 ++++- version/git-version.ts | 14 +-- 24 files changed, 861 insertions(+), 328 deletions(-) diff --git a/src/app/models/dailyworktask.model.ts b/src/app/models/dailyworktask.model.ts index 4caf03926..0760b364b 100644 --- a/src/app/models/dailyworktask.model.ts +++ b/src/app/models/dailyworktask.model.ts @@ -171,6 +171,7 @@ export interface expedienteTask { } export interface ExpedienteTask { + workflowInstanceDataFields?: any; Folio: string SerialNumber: string Senders : string diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html index 5b7b0b262..6cd5c1a69 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.html +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html @@ -10,43 +10,6 @@
Despachos
-
-
-
- - - -
- - -
-
- -
- -
- - -
- - - -
-
-
-
-
- diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index f4e5f0eb2..35ccdc5ec 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -245,8 +245,8 @@

Despachos {{ environment.despachoLabel }}
- {{ TaskService.despachoprstore.newList.length}} Despachos correspondências novos - {{ TaskService.despachoprstore.newList.length}} Despacho correspondência novo + {{ TaskService.despachoprstore.newList.length}} correspondências novos + {{ TaskService.despachoprstore.newList.length}} correspondência novo

diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html index 6e2c56222..f0a74c9b7 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -4,36 +4,77 @@

{{ environment.dispatchPR}}
-
- - +
- - Para hoje - +
+
+
+ + + +
+ - - Novos - +
+
+ +
+ +
+ + +
- - Lidos - + + +
+
+
+
+
- - Não lidos - +
+ + + + + Para hoje + + + + Novos + + + + Lidos + + + + Não lidos + + + + Em atraso + + + + Todos + + + + +
- - Em atraso - - - - Todos - - - - @@ -52,7 +93,7 @@ { + let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject + subject = subject.toLowerCase(); + return subject.includes(this.searchSubject.toLowerCase()) + }) + } else { + this.list = this.despachosprstore.list + } + + } + + + openSearch() { + this.dynamicSearch() + } + async closeSearch() { + this.searchSubject = '' + this.dynamicSearch() + } + + async basicSearch() { + this.dynamicSearch() + } + + + refreshing(){ setTimeout(() => { this.LoadList(); diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html index b40fde39a..9145a341a 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.html +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html @@ -7,7 +7,42 @@ --> +
+
+
+ + + +
+ +
+
+ +
+ +
+ + +
+ + + +
+
+
+
+
@@ -58,7 +93,7 @@ { - const filter = this.TaskService.despachoStore.list.filter(task => this.TaskService.filter(task, this.filterName)) + this.list = this.TaskService.despachoStore.list.filter(task => this.TaskService.filter(task, this.filterName)) } }) + + this.dynamicSearch(); + } @@ -93,6 +94,7 @@ export class DespachosPage implements OnInit { this.skeletonLoader = true; await this.despachoRule.getList({updateStore: true}) + this.dynamicSearch() this.skeletonLoader = false; } diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html index 824c4cf70..396fd33fa 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -2,36 +2,77 @@
Diplomas para assinar
-
- - +
+
+
+
+ + + +
+ - - Para hoje - +
+
+ +
+ +
+ + +
- - Novos - - - - Lidos - - - - Não lidos - - - - Todos - - - - Em atraso - - - - + + +
+
+
+
+
+ +
+ + + + + Para hoje + + + + Novos + + + + Lidos + + + + Não lidos + + + + + Em atraso + + + + Todos + + + + + +
@@ -51,7 +92,7 @@
-
+
@@ -59,7 +100,7 @@ (click)="viewExpedientDetail(task.SerialNumber)" -->
@@ -97,13 +138,13 @@
Lista vazia
-
+
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index 6ff9ec17d..d8aadee14 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -21,7 +21,12 @@ export class DiplomasAssinarPage implements OnInit { deplomasStore = DeplomasStore customTaskPipe = new CustomTaskPipe() filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' - + // + showSearch = false + searchSubject = '' + list = [] + hideSearchBtn: boolean = false; + constructor( private processes:ProcessesService, @@ -45,8 +50,40 @@ export class DiplomasAssinarPage implements OnInit { } }); + this.dynamicSearch() } + + + async dynamicSearch() { + + if(this.showSearch && this.searchSubject) { + + this.list = this.deplomasStore.diplomasParaAssinarList.filter((task) => { + let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject + subject = subject.toLowerCase(); + return subject.includes(this.searchSubject.toLowerCase()) + }) + } else { + this.list = this.deplomasStore.diplomasParaAssinarList + } + + } + + + openSearch() { + this.dynamicSearch() + } + async closeSearch() { + this.searchSubject = '' + this.dynamicSearch() + } + + async basicSearch() { + this.dynamicSearch() + } + + goToDiploma(serialNumber:any){ this.router.navigate(['/home/gabinete-digital/diplomas-assinar',serialNumber,'gabinete-digital']); } diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html index e1337437b..37301f69a 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html @@ -2,39 +2,77 @@
Diplomas
-
- - +
+
+
+
+ + + +
+ - - Para hoje - +
+
+ +
+ +
+ + +
- - Novos - - - - Lidos - - - - Não lidos - - - - - Em atraso - - - - - Todos - - - - - + + +
+
+
+
+
+ +
+ + + + + Para hoje + + + + Novos + + + + Lidos + + + + Não lidos + + + + + Em atraso + + + + Todos + + + + + +
@@ -55,11 +93,11 @@
-
+
@@ -93,11 +131,11 @@
-
+
@@ -135,7 +173,7 @@
Lista vazia @@ -144,7 +182,7 @@
Lista vazia @@ -154,7 +192,7 @@
- + @@ -182,7 +220,7 @@
- + diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts index c70c2578f..3f202d90b 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts @@ -29,6 +29,14 @@ export class DiplomasPage implements OnInit { deplomasStore = DeplomasStore customTaskPipe = new CustomTaskPipe() + + showSearch = false + searchSubject = '' + listDiplomasPorValidar = [] + listDiplomasAssinadosPR = [] + hideSearchBtn: boolean = false; + + constructor( private processes:ProcessesService, private router: Router, @@ -53,8 +61,49 @@ export class DiplomasPage implements OnInit { }); + this.dynamicSearch(); } + + async dynamicSearch() { + + if(this.showSearch && this.searchSubject) { + + this.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) => { + let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject + subject = subject.toLowerCase(); + return subject.includes(this.searchSubject.toLowerCase()) + }) + + } else { + + this.listDiplomasAssinadosPR = this.deplomasStore.diplomasAssinadoList + this.listDiplomasPorValidar = this.deplomasStore.diplomasReviewList + } + + } + + + openSearch() { + this.dynamicSearch() + } + async closeSearch() { + this.searchSubject = '' + this.dynamicSearch() + } + + async basicSearch() { + this.dynamicSearch() + } + + segmentChanged(ev: any) { this.LoadList(); } @@ -68,6 +117,8 @@ export class DiplomasPage implements OnInit { await this.TaskService.loadDiplomas() + this.dynamicSearch() + this.showLoader = false; this.skeletonLoader = false } 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 bccfcca96..b797519a5 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 @@ -6,36 +6,77 @@
- - +
+
+
+ + + +
+ - - Para hoje - - - - Novos - - - - Lidos - - - - Não lidos - +
+
+ +
+ +
+ + +
+ + +
+
+
+
+
+ +
+ + + + + Para hoje + + + + Novos + + + + Lidos + + + + Não lidos + + + + + Em atraso + + + + Todos + + + + + +
- - Em atraso - - - - Todos - - -
-
@@ -45,7 +86,7 @@ Minha agenda --> - +
Minha agenda
{{ environment.agendaPR }}
environment.agendaVP
@@ -69,7 +110,7 @@
@@ -94,9 +135,9 @@
-
+
-
+
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 - +
+
+ +
+ +
+ + +
- - Novos - + + +
+
+
+
+
+ +
+ + + + + Para hoje + + + + Novos + + + + Lidos + + + + Não lidos + + + + + Em atraso + + + + Todos + + + + + +
- - Lidos - - - - Não lidos - - - - - Em atraso - - - - - Todos - - -
-
@@ -46,10 +86,10 @@
- +
@@ -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 @@
- +
@@ -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 - +
+
+ +
+ +
+ + +
- - Novos - - - - Lidos - - - - Não lidos - - - - - Em atraso - - - - Todos - - - - + + +
+
+
+
+
+ +
+ + + + + Para hoje + + + + Novos + + + + Lidos + + + + Não lidos + + + + + Em atraso + + + + Todos + + + + + +
@@ -63,13 +103,13 @@
-
+
-
@@ -105,11 +145,11 @@
-
+
@@ -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 - +
+
+ +
+ +
+ + +
- - Novos - - - - Lidos - - - - Não lidos - - - - - Em atraso - - - - Todos - - - - + + +
+
+
+
+
+ +
+ + + + + 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