From 0efec4a16bdfee2708c41baba68319258201ca03 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 19 May 2023 12:00:51 +0100 Subject: [PATCH 1/5] generate fix --- src/app/pages/agenda/agenda.page.html | 17 +- .../chat/messages/contacts/contacts.page.html | 2 +- .../chat/messages/contacts/contacts.page.ts | 15 +- src/app/pages/events/events.page.html | 10 +- src/app/pages/events/events.page.scss | 6 +- src/app/pages/events/events.page.ts | 180 +++--------------- .../despacho-pr/despacho-pr.page.html | 7 +- .../despachos/despacho/despacho.page.html | 7 +- .../diploma-assinar/diploma-assinar.page.html | 7 +- .../diplomas-gerar/diplomas-gerar.page.html | 7 +- .../diplomas/diploma/diploma.page.html | 7 +- .../approve-event/approve-event.page.ts | 5 + .../expediente-detail.page.html | 6 +- .../expediente-pr/expediente-pr.page.html | 8 +- .../gabinete-digital.page.html | 62 ++++-- .../gabinete-digital.page.scss | 5 + .../pedidos/pedido/pedido.page.html | 7 +- src/app/services/chat/chat-system.service.ts | 2 +- .../approve-event/approve-event.page.ts | 5 + .../chat/messages/contacts/contacts.page.html | 2 +- .../chat/messages/contacts/contacts.page.ts | 12 +- .../new-action/new-action.page.scss | 1 + version/git-version.ts | 12 +- 23 files changed, 184 insertions(+), 208 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 40bdf13a5..da0b3d1ad 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -25,6 +25,14 @@ +
+ + +

@@ -82,15 +90,6 @@ --> -
- - -
-
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.html b/src/app/pages/chat/messages/contacts/contacts.page.html index 4158db867..ed4e55190 100644 --- a/src/app/pages/chat/messages/contacts/contacts.page.html +++ b/src/app/pages/chat/messages/contacts/contacts.page.html @@ -31,7 +31,7 @@
- +
{{header}} diff --git a/src/app/pages/chat/messages/contacts/contacts.page.ts b/src/app/pages/chat/messages/contacts/contacts.page.ts index 3b3a3d47c..e358d0aec 100644 --- a/src/app/pages/chat/messages/contacts/contacts.page.ts +++ b/src/app/pages/chat/messages/contacts/contacts.page.ts @@ -23,7 +23,8 @@ export class ContactsPage implements OnInit { room:any; dm:any; sessionStore = SessionStore - + userList = this.ChatSystemService.users + constructor( private modalController: ModalController, private http: HttpClient, @@ -45,8 +46,16 @@ export class ContactsPage implements OnInit { // this.loadUsers(); } - onChange(event){ - this.textSearch = event.detail.value; + + onChange(event) { + + this.textSearch = event.detail.value.toLowerCase(); + + this.userList = this.ChatSystemService.users.filter((e) => { + const username = e.name.toLowerCase() + return username.includes(this.textSearch) + }) + } diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index aa6aeda8e..8c9f4d3a8 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -105,9 +105,9 @@
-
{{event.Location}}
-
-

{{event.Subject}}

+
{{event.Subject}}
+
+

{{event.Location}}

@@ -227,9 +227,9 @@
-
{{event.Location}}
+
{{event.Subject}}
-

{{event.Subject}}

+

{{event.Location}}

diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index bf51a65ed..dce9934ea 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -448,7 +448,8 @@ ion-toolbar{ width: 78%; .location{ font-family: Roboto; - font-size: 13px; + font-size: 15px; + font-weight: bold; color: black; width: 100%; @@ -456,8 +457,7 @@ ion-toolbar{ .description{ width: 100%; font-family: Roboto; - font-size: 15px; - font-weight: bold; + font-size: 13px; //color: #0d89d1; color: var(--title-text-color) } diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 8ca659276..8054ab706 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -107,6 +107,7 @@ export class EventsPage implements OnInit { this.router.events.forEach((event) => { if (event instanceof NavigationEnd && event.url == '/home/events') { + this.getEventsFromLocalDb() this.RefreshEvents(); setTimeout(() => { this.LoadList(); @@ -122,6 +123,9 @@ export class EventsPage implements OnInit { this.hideSearch(); }); + + // this.getEventsFromLocalDb(); + } hideSearch() { @@ -169,71 +173,15 @@ export class EventsPage implements OnInit { this.totalEvent = onwEvent.length; } + this.storage.set('events', this.listToPresent) + } this.showLoader = false; this.showAgendaLoader = false; } - addEventToDb(list) { - if (this.platform.is('desktop') || this.platform.is('mobileweb')) { - this.storage.set('events', list).then(() => { - // - }) - } else { - if (list.length > 0) { - list.forEach(element => { - this.sqliteservice.addEvent(element) - - this.sqliteservice.getAllEvents().then((event: any[] = []) => { - let todayEvents = new Array() - event.forEach((element) => { - let eventObject = { - AppointmentState: element.AppointmentState, - Attachments: element.Attachments, - Attendees: element.Attendees, - CalendarId: element.CalendarId, - CalendarName: element.CalendarName, - Category: element.Category, - EndDate: element.EndDate, - EventId: element.EventId, - EventRecurrence: element.EventRecurrence, - EventType: element.EventType, - HasAttachments: element.HasAttachments, - HumanDate: element.HumanDate, - IsAllDayEvent: element.IsAllDayEvent, - IsMeeting: element.IsMeeting, - IsRecurring: element.IsRecurring, - Location: element.Location, - Organizer: element.Organizer, - Profile: element.Profile, - StartDate: element.StartDate, - Subject: element.Subject - } - todayEvents.push(eventObject); - }) - - }) - }); - } - } - } - - addProcessToDb(list) { - - if (this.platform.is('desktop') || this.platform.is('mobileweb')) { - this.storage.set('process', list).then(() => { - // - }) - } else { - if (list.length > 0) { - list.forEach(element => { - this.sqliteservice.addProcess(element) - }); - } - } - } getEventsFromLocalDb() { @@ -241,105 +189,28 @@ export class EventsPage implements OnInit { let month = date.getMonth() + 1; //date.setMonth(date.getMonth() + 1); let dateToday = date.getFullYear() + "-" + month + "-" + date.getDate(); - // ('dateeeeee', dateToday) - if (this.platform.is('desktop') || this.platform.is('mobileweb')) { - this.storage.get('events').then((events: any[] = []) => { - // - if(Array.isArray(events)) { - this.listToPresent = events - this.totalEvent = this.listToPresent.length - this.currentEvent = this.listToPresent[0].Subject - this.currentHoursMinutes = this.listToPresent[0].StartDate + this.storage.get('events').then((events: any[] = []) => { + // + + if(Array.isArray(events)) { + this.listToPresent = events + this.totalEvent = this.listToPresent.length + this.currentEvent = this.listToPresent[0].Subject + this.currentHoursMinutes = this.listToPresent[0].StartDate + } + // + }) + + this.storage.get('process').then((process: any[] = []) => { + // + if(Array.isArray(process)) { + this.listToPresentexpediente = process; } - // - }) + }) - this.storage.get('process').then((process: any[] = []) => { - // - if(Array.isArray(process)) { - const ExpedienteTask = process.map(e => this.expedienteTaskPipe.transform(e)) - this.listToPresentexpediente = ExpedienteTask; - } - }) + this.showLoader = false; - this.showLoader = false; - - } else { - this.sqliteservice.getAllEvents().then((event: any[] = []) => { - let todayEvents = new Array() - event.forEach((element) => { - let eventObject = { - AppointmentState: element.AppointmentState, - Attachments: element.Attachments, - Attendees: element.Attendees, - CalendarId: element.CalendarId, - CalendarName: element.CalendarName, - Category: element.Category, - EndDate: element.EndDate, - EventId: element.EventId, - EventRecurrence: element.EventRecurrence, - EventType: element.EventType, - HasAttachments: element.HasAttachments, - HumanDate: element.HumanDate, - IsAllDayEvent: element.IsAllDayEvent, - IsMeeting: element.IsMeeting, - IsRecurring: element.IsRecurring, - Location: element.Location, - Organizer: element.Organizer, - Profile: element.Profile, - StartDate: element.StartDate, - Subject: element.Subject - } - let starteDate = momentG(new Date(element.StartDate), 'yyyy-MM-dd'); - // - if (dateToday == starteDate) { - todayEvents.push(eventObject); - } - }) - this.listToPresent = todayEvents - if(this.listToPresent?.length) { - this.totalEvent = this.listToPresent.length - this.currentEvent = this.listToPresent[0].Subject - this.currentHoursMinutes = this.listToPresent[0].StartDate - } - // - }) - - this.sqliteservice.getprocessByworkflow("Expediente").then((process: any[] = []) => { - - // - - if (process.length > 0 || process != undefined) { - - var expedientlist: any = new Array(); - process.forEach((element) => { - if(JSON.parse(element.workflowInstanceDataFields).TaskMessage || JSON.parse(element.workflowInstanceDataFields).Note) { - - let task = { - activityInstanceName: element.activityInstanceName, - deadline: null, - serialNumber: element.serialNumber, - taskStartDate: element.taskStartDate, - totalDocuments: element.totalDocuments, - workflowDisplayName: element.workflowDisplayName, - workflowInstanceDataFields: JSON.parse(element.workflowInstanceDataFields) - } - expedientlist.push(task); - - } - }) - - // - const ExpedienteTask = expedientlist.map(e => this.expedienteTaskPipe.transform(e)) - this.listToPresentexpediente = ExpedienteTask; - - } - - this.showLoader = false; - }) - } - // }); } @@ -408,12 +279,13 @@ export class EventsPage implements OnInit { LoadList() { this.showCorrespondenciasLoader = true this.processes.GetTaskListExpediente(false).subscribe(result => { - this.addProcessToDb(result); let ExpedienteTask = result.map(e => this.expedienteTaskPipe.transform(e)) this.listToPresentexpediente = ExpedienteTask; + this.storage.set('process', ExpedienteTask) + this.showCorrespondenciasLoader = false }, ((error) => { diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html index 87348484e..17cbfd6f8 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html @@ -21,9 +21,14 @@
-

{{customDate}}{{ task.activityInstanceName }}

+

{{customDate}}

+ +

{{ task.DeadlineType }}

 + +

{{ task.activityInstanceName }}

+
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html index 2861e2530..599a4ae46 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html @@ -21,9 +21,14 @@
-

{{customDate}}{{ task.activityInstanceName }}

+

{{customDate}}

+ +

{{ task.DeadlineType }}

 + +

{{ task.activityInstanceName }}

+
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html index 7b13ce150..69e9c050c 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html @@ -26,9 +26,14 @@
-

{{customDate}}{{ task.activityInstanceName }}

+

{{customDate}}

+ +

{{ task.DeadlineType }}

 + +

{{ task.activityInstanceName }}

+
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html index 53db81b72..4a74644b6 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html @@ -25,9 +25,14 @@
-

{{customDate}}{{ task.activityInstanceName }}

+

{{customDate}}

+ +

{{ task.DeadlineType }}

 + +

{{ task.activityInstanceName }}

+
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html index b238b79bd..0fa1f0a44 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html @@ -24,9 +24,14 @@
-

{{customDate}}{{ task.activityInstanceName }}

+

{{customDate}}

+ +

{{ task.DeadlineType }}

 + +

{{ task.activityInstanceName }}

+
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index 8d548c884..f8a2b4862 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -149,6 +149,7 @@ export class ApproveEventPage implements OnInit { await this.processes.PostTaskAction(body).toPromise() this.goBack(); this.httpErrorHandle.httpsSucessMessagge('Evento aprovação') + this.TaskService.loadEventosParaAprovacao(); } catch (error) { this.httpErrorHandle.httpStatusHandle(error) @@ -195,6 +196,7 @@ export class ApproveEventPage implements OnInit { this.offlineManager.storeRequestData('event-listRever', body); }); this.httpErrorHandle.httpsSucessMessagge('Rever') + this.TaskService.loadEventosParaAprovacao(); this.goBack(); } catch (error) { this.httpErrorHandle.httpStatusHandle(error) @@ -218,6 +220,7 @@ export class ApproveEventPage implements OnInit { try { await this.processes.PostTaskAction(body).toPromise(); this.httpErrorHandle.httpsSucessMessagge('Rejeitar') + this.TaskService.loadEventosParaAprovacao(); this.goBack(); } catch (error) { this.httpErrorHandle.httpStatusHandle(error) @@ -301,6 +304,7 @@ export class ApproveEventPage implements OnInit { await this.processes.PostTaskAction(body).toPromise(); this.goBack(); this.httpErrorHandle.httpsSucessMessagge('Rever') + this.TaskService.loadEventosParaAprovacao(); } catch (error) { this.httpErrorHandle.httpStatusHandle(error) } finally { @@ -342,6 +346,7 @@ export class ApproveEventPage implements OnInit { await modal.present(); modal.onDidDismiss().then(res => { + this.TaskService.loadEventosParaAprovacao(); this.getTask(); }); diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index 084edece5..e68c8cd0b 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -27,8 +27,12 @@
-

{{customDate}}{{ task.WorkflowName }}

+

{{customDate}}

 + +

{{ task.WorkflowName }}

+ +
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html index 59ee5b8d3..be32a4c61 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html @@ -30,7 +30,13 @@
-

{{customDate}}{{ task.activityInstanceName }}

+

{{customDate}}

+ + +

{{ task.DeadlineType }}

+ + +

{{ task.activityInstanceName }}
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 2803016a0..c186b27ba 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -1,9 +1,9 @@ - +
@@ -12,26 +12,56 @@
- Gabinete Digital + Gabinete Digital + + + + + Para hoje + + + + Novos + + + + Lidos + + + + Não lidos + + + + Em atraso + + + + Todos + + + +
- - - - - - - - + + + + + + + + +
-
-
+
+
@@ -42,12 +72,12 @@ -
+
-
+
@@ -61,7 +91,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 348180670..9596712e2 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -717,3 +717,8 @@ ion-content{ width: 20px; } } + + +.activeTab { + color: #cf1521; +} \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index 5b0e8213e..57495dd70 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -23,9 +23,14 @@
-

{{customDate}}{{ task.activityInstanceName }}

+

{{customDate}}

+ +

{{ task.DeadlineType }}

 + +

{{ task.activityInstanceName }}

+
diff --git a/src/app/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts index 0bcc5fa80..0df38810d 100644 --- a/src/app/services/chat/chat-system.service.ts +++ b/src/app/services/chat/chat-system.service.ts @@ -117,8 +117,8 @@ export class ChatSystemService { private async ReLoadChat() { - await this.chatService.refreshtoken(); await this.restoreUsers(); + await this.chatService.refreshtoken(); await this.getUser(); await this.restoreRooms(); await this.getAllRooms(); diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts index e88f1ab7c..33fa63000 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -93,6 +93,7 @@ export class ApproveEventPage implements OnInit { await this.processes.PostTaskAction(body).toPromise() this.modalController.dismiss(serialNumber); this.httpErroHandle.httpsSucessMessagge('Aprovar') + this.TaskService.loadEventosParaAprovacao(); } catch (error) { this.httpErroHandle.httpStatusHandle(error) } finally { @@ -112,6 +113,7 @@ export class ApproveEventPage implements OnInit { try { await this.processes.PostTaskAction(body).toPromise() this.httpErroHandle.httpsSucessMessagge('Rejeitar'); + this.TaskService.loadEventosParaAprovacao(); } catch (error) { this.httpErroHandle.httpStatusHandle(error) @@ -201,6 +203,7 @@ export class ApproveEventPage implements OnInit { try { await this.processes.PostTaskAction(body).toPromise(); this.httpErroHandle.httpsSucessMessagge('Rever') + this.TaskService.loadEventosParaAprovacao(); this.close(); } catch (error) { this.httpErroHandle.httpStatusHandle(error) @@ -213,6 +216,8 @@ export class ApproveEventPage implements OnInit { this.toastService._badRequest('É necessário adicionar uma nota'); } } + + } else { } diff --git a/src/app/shared/chat/messages/contacts/contacts.page.html b/src/app/shared/chat/messages/contacts/contacts.page.html index 839f9ea23..275ec29b7 100644 --- a/src/app/shared/chat/messages/contacts/contacts.page.html +++ b/src/app/shared/chat/messages/contacts/contacts.page.html @@ -31,7 +31,7 @@
- +
{{header}} diff --git a/src/app/shared/chat/messages/contacts/contacts.page.ts b/src/app/shared/chat/messages/contacts/contacts.page.ts index 1cf48b0bb..242903778 100644 --- a/src/app/shared/chat/messages/contacts/contacts.page.ts +++ b/src/app/shared/chat/messages/contacts/contacts.page.ts @@ -28,6 +28,9 @@ export class ContactsPage implements OnInit { @Output() backToChat:EventEmitter = new EventEmitter(); @Output() closeAllDesktopComponents:EventEmitter = new EventEmitter(); + + userList = this.ChatSystemService.users + constructor( private modalController: ModalController, private chatService: ChatService, @@ -46,7 +49,14 @@ export class ContactsPage implements OnInit { } onChange(event) { - this.textSearch = event.detail.value; + + this.textSearch = event.detail.value.toLowerCase(); + + this.userList = this.ChatSystemService.users.filter((e) => { + const username = e.name.toLowerCase() + return username.includes(this.textSearch) + }) + } openMessagesPage(username:string) { diff --git a/src/app/shared/publication/new-action/new-action.page.scss b/src/app/shared/publication/new-action/new-action.page.scss index 646cc659e..8422825b7 100644 --- a/src/app/shared/publication/new-action/new-action.page.scss +++ b/src/app/shared/publication/new-action/new-action.page.scss @@ -88,6 +88,7 @@ font-size: 25px; } .ion-item-class-2{ margin: 0px auto; + overflow: hidden; } .ion-icon-class{ width: 45px; diff --git a/version/git-version.ts b/version/git-version.ts index 232213037..3a025a0ae 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "ef882e8ff", - "SHA": "ef882e8ff15e33bf250aceb4f21876f626391d1b", + "shortSHA": "a526b9153", + "SHA": "a526b9153217d80d3d345ee51e91347f7e0fe21d", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon May 8 10:52:54 2023 +0100'", - "lastCommitMessage": "fix", - "lastCommitNumber": "4935", + "lastCommitTime": "'Thu May 18 17:40:52 2023 +0100'", + "lastCommitMessage": "fix box sixing", + "lastCommitNumber": "4936", "change": "", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: readme.md\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/models/user.model.ts\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.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/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.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\n\tmodified: src/environments/suport/doneIt.ts\n\tmodified: version/git-version.ts", + "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/chat/messages/contacts/contacts.page.html\n\tmodified: src/app/pages/chat/messages/contacts/contacts.page.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.scss\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.html\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.ts\n\tmodified: src/app/shared/publication/new-action/new-action.page.scss", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 2def687fa30799468fdda5ac5723462bddc164b9 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 19 May 2023 13:01:10 +0100 Subject: [PATCH 2/5] alignmente --- .../despacho-pr/despacho-pr.page.scss | 2 +- .../despachos/despacho/despacho.page.scss | 2 +- .../diploma-assinar/diploma-assinar.page.scss | 2 +- .../diplomas-gerar/diplomas-gerar.page.scss | 2 +- .../diplomas/diploma/diploma.page.scss | 2 +- .../expediente-detail.page.scss | 2 +- .../expediente-pr/expediente-pr.page.scss | 2 +- .../gabinete-digital.page.html | 23 +++++++++++++------ .../gabinete-digital.page.scss | 9 ++++++++ .../gabinete-digital/gabinete-digital.page.ts | 2 +- .../pedidos/pedido/pedido.page.scss | 2 +- src/global.scss | 8 +++++++ version/git-version.ts | 12 +++++----- 13 files changed, 48 insertions(+), 22 deletions(-) diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss index 0ad45013c..005a549ec 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss @@ -96,7 +96,7 @@ ion-button{ .upper-content{ font-family: Roboto; - margin-left: 41px; + margin-left: 36px; font-size: 18px; .label{ diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss index bf2144bc2..ff9d8918c 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss @@ -55,7 +55,7 @@ ion-button{ .upper-content{ font-family: Roboto; margin-top: 15px; - margin-left: 41px; + margin-left: 36px; font-size: 18px; .label{ diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss index 47b8d66dd..2199028ff 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss @@ -115,7 +115,7 @@ ion-button{ .upper-content{ font-family: Roboto; - margin-left: 41px; + margin-left: 36px; font-size: 18px; .label{ diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss index 47b8d66dd..2199028ff 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss @@ -115,7 +115,7 @@ ion-button{ .upper-content{ font-family: Roboto; - margin-left: 41px; + margin-left: 36px; font-size: 18px; .label{ diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss index a51ce3e25..59b101ac1 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss @@ -97,7 +97,7 @@ ion-button{ .upper-content{ font-family: Roboto; - margin-left: 41px; + margin-left: 36px; font-size: 18px; .label{ diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss index 43e56c179..7e579fcf7 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss @@ -95,7 +95,7 @@ ion-button{ .upper-content{ font-family: Roboto; - margin-left: 41px; + margin-left: 36px; font-size: 18px; .label{ diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss index 46df34636..b603df196 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss @@ -95,7 +95,7 @@ ion-button{ .upper-content{ font-family: Roboto; - margin-left: 41px; + margin-left: 36px; font-size: 18px; .label{ diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index c186b27ba..eef89ac11 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -48,21 +48,30 @@
- - + + +
+
+ +
+
+ +
+
-
+
-
+
-
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 9596712e2..86da78e37 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -721,4 +721,13 @@ ion-content{ .activeTab { color: #cf1521; +} + + + +ion-segment-button { + width: 27px; + height: 11px; + min-width: 27px; + min-height: 27px; } \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index d31c52eea..0ad5a10b7 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -97,7 +97,7 @@ export class GabineteDigitalPage implements OnInit { filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' hideSearchBtn: boolean = false; - showSearch = false; + showSearch = true; searchSubject: string = ''; AllProcess = [] diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss index 4241aa5ec..38ea4af3b 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss @@ -61,7 +61,7 @@ ion-button{ .upper-content{ font-family: Roboto; - margin-left: 41px; + margin-left: 36px; font-size: 18px; .label{ diff --git a/src/global.scss b/src/global.scss index 39f569efb..ff69700ae 100644 --- a/src/global.scss +++ b/src/global.scss @@ -885,6 +885,14 @@ ion-icon{ } +@media only screen and (max-width: 450px) { + + ::-webkit-scrollbar { + width: 4px !important; + height: 4px !important; + } +} + ::-webkit-scrollbar { width: 10px; height: 10px; diff --git a/version/git-version.ts b/version/git-version.ts index 3a025a0ae..00359a9bf 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "a526b9153", - "SHA": "a526b9153217d80d3d345ee51e91347f7e0fe21d", + "shortSHA": "0efec4a16", + "SHA": "0efec4a16bdfee2708c41baba68319258201ca03", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu May 18 17:40:52 2023 +0100'", - "lastCommitMessage": "fix box sixing", - "lastCommitNumber": "4936", + "lastCommitTime": "'Fri May 19 12:00:51 2023 +0100'", + "lastCommitMessage": "generate fix", + "lastCommitNumber": "4937", "change": "", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/chat/messages/contacts/contacts.page.html\n\tmodified: src/app/pages/chat/messages/contacts/contacts.page.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.scss\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.html\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.ts\n\tmodified: src/app/shared/publication/new-action/new-action.page.scss", + "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.scss\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss\n\tmodified: src/global.scss", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 181a9dbd768e46ac982079fdcc5178ad35ff050d Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 19 May 2023 15:02:02 +0100 Subject: [PATCH 3/5] fix --- src/app/pages/events/events.page.ts | 11 +++++++++-- src/app/pages/login/login.page.scss | 1 + version/git-version.ts | 12 ++++++------ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 8054ab706..9e388f070 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -196,8 +196,15 @@ export class EventsPage implements OnInit { if(Array.isArray(events)) { this.listToPresent = events this.totalEvent = this.listToPresent.length - this.currentEvent = this.listToPresent[0].Subject - this.currentHoursMinutes = this.listToPresent[0].StartDate + + try { + this.currentEvent = this.listToPresent[0].Subject + } catch (error) {} + + try { + this.currentHoursMinutes = this.listToPresent[0].StartDate + } catch (error) {} + } // }) diff --git a/src/app/pages/login/login.page.scss b/src/app/pages/login/login.page.scss index 2375491db..f24e5345f 100644 --- a/src/app/pages/login/login.page.scss +++ b/src/app/pages/login/login.page.scss @@ -14,6 +14,7 @@ ion-content{ width: 100vw; height: 100vh; overflow: auto; + position: absolute; } .wrapper{ diff --git a/version/git-version.ts b/version/git-version.ts index 00359a9bf..38cd888f8 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "0efec4a16", - "SHA": "0efec4a16bdfee2708c41baba68319258201ca03", + "shortSHA": "2def687fa", + "SHA": "2def687fa30799468fdda5ac5723462bddc164b9", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri May 19 12:00:51 2023 +0100'", - "lastCommitMessage": "generate fix", - "lastCommitNumber": "4937", + "lastCommitTime": "'Fri May 19 13:01:10 2023 +0100'", + "lastCommitMessage": "alignmente", + "lastCommitNumber": "4938", "change": "", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.scss\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss\n\tmodified: src/global.scss", + "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/login/login.page.scss", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 033a6c331c21852d9e950fb47f44fd4f8f3d466a Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 23 May 2023 11:56:12 +0100 Subject: [PATCH 4/5] improve --- .../despachos-pr/despachos-pr.page.html | 15 +- .../despachos-pr/despachos-pr.page.ts | 16 +- .../despachos/despachos.page.html | 13 +- .../despachos/despachos.page.ts | 18 +- .../diplomas-assinar.page.html | 12 +- .../diplomas-assinar/diplomas-assinar.page.ts | 15 +- .../diplomas-gerar/diplomas-gerar.page.html | 26 +++ .../diplomas-gerar/diplomas-gerar.page.ts | 15 +- .../diplomas/diplomas.page.html | 15 +- .../diplomas/diplomas.page.ts | 29 +++- .../event-list/event-list.page.html | 14 +- .../event-list/event-list.page.ts | 12 +- .../expediente/expediente.page.html | 22 ++- .../expediente/expediente.page.ts | 19 +- .../expedientes-pr/expedientes-pr.page.html | 12 +- .../expedientes-pr/expedientes-pr.page.ts | 16 +- .../gabinete-digital.page.html | 70 ++++---- .../gabinete-digital/gabinete-digital.page.ts | 162 +++++++----------- .../pedidos/pedidos.page.html | 53 +++++- .../gabinete-digital/pedidos/pedidos.page.ts | 29 +++- .../pendentes/pendentes.page.html | 15 +- .../pendentes/pendentes.page.ts | 19 +- src/app/services/task.service.ts | 72 +++++--- .../agenda/event-list/event-list.page.ts | 12 +- .../all-processes/all-processes.page.html | 14 +- .../all-processes/all-processes.page.ts | 25 ++- .../despachos-pr/despachos-pr.page.html | 13 +- .../despachos-pr/despachos-pr.page.ts | 14 +- .../despachos/despachos.page.html | 14 +- .../despachos/despachos.page.ts | 17 +- .../diplomas-assinar.page.html | 13 +- .../diplomas-assinar/diplomas-assinar.page.ts | 19 +- .../diplomas-gerar/diplomas-gerar.page.html | 16 +- .../diplomas-gerar/diplomas-gerar.page.ts | 38 +++- .../diplomas/diplomas.page.html | 13 +- .../diplomas/diplomas.page.ts | 25 ++- .../events-to-approve.page.html | 13 +- .../events-to-approve.page.ts | 23 ++- .../expedientes-pr/expedientes-pr.page.html | 13 +- .../expedientes-pr/expedientes-pr.page.ts | 16 +- .../expedients/expedients.page.html | 14 +- .../expedients/expedients.page.ts | 18 +- .../pedidos/pedidos.page.html | 13 +- .../gabinete-digital/pedidos/pedidos.page.ts | 25 ++- .../pendentes/pendentes.page.html | 13 +- .../pendentes/pendentes.page.ts | 16 +- src/assets/images/theme/gov/crescente.svg | 6 + src/assets/images/theme/gov/decrescente.svg | 6 + version/git-version.ts | 12 +- 49 files changed, 832 insertions(+), 278 deletions(-) create mode 100644 src/assets/images/theme/gov/crescente.svg create mode 100644 src/assets/images/theme/gov/decrescente.svg diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html index c7f2908ef..8f05fc666 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -8,7 +8,17 @@
{{environment.dispatchPR }}
-
+
+ +
+ + +
+ +
+ +
+ @@ -61,11 +71,12 @@
+
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 +

+
+
+
+ + +
+ +
+ + +
+
+
+ +
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 + + + + + +
+ + +
+ +
+ +
+ +
-
-
- + @@ -69,82 +20,13 @@ -
- - -
- -
- -
-
-
- {{ task.Folio }} - Para hoje - Nova -
-
- - - -
-
-
-
- {{task.Senders}} -
-
-
-
- {{task.activityInstanceName}} -
-
- {{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }} -
-
-
-
- - -
- -
- Lista vazia -
- - - -
+ + diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss index 8b1fa1eaf..b13eb43b8 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss @@ -6,11 +6,12 @@ .header-2 { border-top-right-radius: 24px; border-top-left-radius: 24px; + background-color: white; } -ion-content, .header-2, .main-content{ - padding: 30px 20px 0 20px !important; +ion-content, .main-content{ background-color: white; + padding: 30px 20px 0 20px !important; } .main-content { padding-top: 0px !important; 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 5c0d03bda..ab3b55b6b 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 @@ -115,6 +115,10 @@ export class DespachosPrPage implements OnInit { this.dynamicSearch(); } + changeFilterName(filterName) { + this.filterName = filterName + } + async dynamicSearch() { if(this.showSearch && this.searchSubject) { @@ -138,8 +142,8 @@ export class DespachosPrPage implements OnInit { this.LoadList(); } - goToDespachoPr(serialNumber: any) { - this.router.navigate(['/home/gabinete-digital/despachos-pr', serialNumber, 'gabinete-digital']); + goToDespachoPr({SerialNumber}) { + this.router.navigate(['/home/gabinete-digital/despachos-pr', SerialNumber, 'gabinete-digital']); } notImplemented() { diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html index 0fa1f0a44..e30df8389 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html @@ -1,9 +1,9 @@
-
+
-
-
+
+
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts index f463250a8..639945b28 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts @@ -23,6 +23,7 @@ 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'; +import { TaskListHeaderPageModule } from 'src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.module'; @NgModule({ @@ -32,6 +33,7 @@ import { NgxMatMomentModule } from '@angular-material-components/moment-adapter' IonicModule, DiplomasPageRoutingModule, BtnModalDismissPageModule, + TaskListHeaderPageModule, // MatInputModule, MatNativeDateModule, diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html index aa33329d9..79a73b37a 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html @@ -2,90 +2,18 @@ -
- -
Diplomas
-
- - -
-
- - -
- -
- -
-
- -
- - - - - Para hoje - - - - Novos - - - - Lidos - - - - Não lidos - - - - - Em atraso - - - - Todos - - - - - -
- -
-
@@ -116,7 +44,7 @@ (click)="goToDiploma(task.SerialNumber)" lines="none" > -
+
{{ task.Folio }} @@ -183,12 +111,12 @@
-
+
{{ task.Folio }} diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.scss b/src/app/pages/gabinete-digital/diplomas/diplomas.page.scss index 121695281..53a8202b1 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.scss +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.scss @@ -7,9 +7,10 @@ .header-2 { border-top-right-radius: 24px; border-top-left-radius: 24px; + background-color: white; } - ion-content, .header-2, .main-content{ + ion-content, .main-content{ padding: 30px 20px 0 20px !important; background-color: white; } diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts index a4db033c4..f3ae56a5d 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts @@ -21,6 +21,7 @@ export class DiplomasPage implements OnInit, OnDestroy { showLoader: boolean; totalDocs: any; serialNumber: string; + headerName = "Diplomas" segment: string; @@ -114,6 +115,10 @@ export class DiplomasPage implements OnInit, OnDestroy { this.dynamicSearch(); } + changeFilterName(filterName) { + this.filterName = filterName + } + async dynamicSearch() { if(this.showSearch && this.searchSubject) { diff --git a/src/app/pages/gabinete-digital/expediente/expediente.module.ts b/src/app/pages/gabinete-digital/expediente/expediente.module.ts index b7f28497e..2b01007de 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.module.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.module.ts @@ -21,6 +21,8 @@ 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'; +import { TaskListPageModule } from 'src/app/shared/gabinete-digital/generic/task-list/task-list.module' + @NgModule({ @@ -28,6 +30,7 @@ import { NgxMatMomentModule } from '@angular-material-components/moment-adapter' CommonModule, FormsModule, IonicModule, + TaskListPageModule, // MatInputModule, MatNativeDateModule, diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.module.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.module.ts index 290beb3d2..2905ef7b2 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.module.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.module.ts @@ -8,6 +8,7 @@ import { ExpedientesPrPageRoutingModule } from './expedientes-pr-routing.module' import { ExpedientesPrPage } from './expedientes-pr.page'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; +import { TaskListPageModule } from 'src/app/shared/gabinete-digital/generic/task-list/task-list.module' import { MatInputModule } from '@angular/material/input'; @@ -23,6 +24,7 @@ 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'; +import { TaskListHeaderPageModule } from 'src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.module'; @NgModule({ imports: [ @@ -31,7 +33,9 @@ import { NgxMatMomentModule } from '@angular-material-components/moment-adapter' IonicModule, ExpedientesPrPageRoutingModule, BtnModalDismissPageModule, - // + TaskListPageModule, + TaskListHeaderPageModule, + // MatInputModule, MatNativeDateModule, NgxMatDatetimePickerModule, 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 0b05b84b5..3881541d5 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 @@ -1,142 +1,33 @@ - - - + - - -
-
Expediente
-
- -
- - -
- -
- -
- - - - - - Para hoje - - - - Novos - - - - Lidos - - - - Não lidos - - - - Em atraso - - - - Todos - - - - - -
-
-
+ + + + + - - - - - - -
- - -
-
-
-
- {{ task.Subject }} - Para hoje - Nova -
-
- - - -
-
-
-
- {{task.Senders}} -
-
-
-
- {{task.activityInstanceName}} -
-
- {{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }} -
-
-
-
- -
- -
- Lista vazia -
- - -
- - - - - - - -

-

-

- - - - - - - -

-

-

- - - -
-
+ + + diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss index 2f5b5b8d4..6f529aa36 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss @@ -7,9 +7,10 @@ .header-2 { border-top-right-radius: 24px; border-top-left-radius: 24px; + background-color: white; } -ion-content, .header-2, .main-content{ +ion-content, .main-content{ padding: 30px 20px 0 20px !important; background-color: white; } 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 a2ae45544..9d0a7c1bf 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 @@ -41,7 +41,8 @@ export class ExpedientesPrPage implements OnInit { searchSubject = '' list = [] ordinance: string = 'old' - + headerName = "Expediente" + constructor( private processes:ProcessesService, private modalController: ModalController, @@ -85,6 +86,11 @@ export class ExpedientesPrPage implements OnInit { this.dynamicSearch(); } + + changeFilterName(filterName) { + this.filterName = filterName + } + async dynamicSearch() { if(this.showSearch && this.searchSubject) { @@ -136,9 +142,9 @@ export class ExpedientesPrPage implements OnInit { }, 2000); } - goToExpediente(serialNumber:any){ + goToExpediente({SerialNumber}){ //this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']); - this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'gabinete-digital']); + this.router.navigate(['/home/gabinete-digital/expediente', SerialNumber, 'gabinete-digital']); } async viewExpedientDetail(serialNumber:any) { @@ -159,13 +165,7 @@ export class ExpedientesPrPage implements OnInit { } goBack() { - // let navigationExtras: NavigationExtras = { - // queryParams: { - // "expedientes-pr": true, - // } - // }; - // this.router.navigate(['/home/gabinete-digital'], navigationExtras); - + this.RouteService.goBack(); } diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.module.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.module.ts index 1e72efa3e..b9cf000cc 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.module.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.module.ts @@ -24,6 +24,8 @@ import { MatButtonModule } from '@angular/material/button'; import { MatSelectModule } from '@angular/material/select'; import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'; +import { TaskListHeaderPageModule } from 'src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.module'; + @NgModule({ imports: [ diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html index 04083dd93..1d38c3df8 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html @@ -3,18 +3,27 @@ - -
-
Pedidos
-
- -
- - + +
+
+
+ + +
+
Pedidos
+
-
- +
+ +
+
+ +
+ +
+ +
@@ -53,6 +62,7 @@
+ @@ -77,40 +87,15 @@ -
- -
-

- Order por: - Mais Recentes - Mais Antigos -

-
-
-
- - -
- -
- - -
-
-
-
-
+
-
@@ -146,11 +131,11 @@
-
+
@@ -190,7 +175,7 @@
Lista vazia @@ -199,7 +184,7 @@
Lista vazia @@ -207,7 +192,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts index 0dcc6a836..5e05adac6 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts @@ -121,7 +121,6 @@ export class PedidosPage implements OnInit { this.listPedidosParecer = this.TaskService.reorderList(this.ordinance, listPedidosParecer) - const listPedidosDeferimento = this.pedidosstorage.listdeferimento.filter((task) => { let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject subject = subject.toLowerCase(); diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.module.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.module.ts index 95aa00052..fc5cfc23d 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.module.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.module.ts @@ -24,6 +24,7 @@ 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'; +import { TaskListHeaderPageModule } from 'src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.module'; @NgModule({ @@ -35,6 +36,7 @@ import { NgxMatMomentModule } from '@angular-material-components/moment-adapter' BtnModalDismissPageModule, // entryComponents TaskListPageModule, + TaskListHeaderPageModule, // MatInputModule, MatNativeDateModule, diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html index 01cfff82d..d2a297cf3 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html @@ -1,59 +1,14 @@ - - - - - - -
-
Pendentes
-
- -
- - -
- -
- -
- - - - - - Para hoje - - - - Novos - - - - Lidos - - - - Não lidos - - - - - Em atraso - - - - Todos - - - - - - -
-
+ @@ -71,6 +26,7 @@ diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss b/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss index 94990800b..fcf3a61d5 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss @@ -7,11 +7,7 @@ .header-2 { border-top-right-radius: 24px; border-top-left-radius: 24px; -} - -.header-2{ - padding: 30px 20px 0 20px !important; - background-color: white; + background-color: white; } .main-content { diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts index 514d15834..c8b4544c0 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts @@ -46,6 +46,7 @@ export class PendentesPage implements OnInit { searchSubject = '' list = [] ordinance: string = 'old' + headerName = "Pendentes" constructor( private processes: ProcessesService, @@ -99,6 +100,11 @@ export class PendentesPage implements OnInit { this.dynamicSearch(); } + changeFilterName(filterName) { + this.filterName = filterName + } + + async dynamicSearch() { if(this.showSearch && this.searchSubject) { diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index e6ebcf1a5..ed941468c 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -151,7 +151,7 @@ export class PublicationsPage implements OnInit { this.publicationsEventFolderList = folders.filter((e)=>e.ActionType == 'Evento') this.publicationsTravelFolderList = folders.filter((e)=>e.ActionType != 'Evento') - // ActionModel.create(folders) + ActionModel.create(folders) await this.storage.set('actionsEvents', this.publicationsEventFolderList); await this.storage.set('actionsViagens', this.publicationsTravelFolderList); diff --git a/src/app/pipes/evento-approve.pipe.ts b/src/app/pipes/evento-approve.pipe.ts index 1c6e31593..931cc7777 100644 --- a/src/app/pipes/evento-approve.pipe.ts +++ b/src/app/pipes/evento-approve.pipe.ts @@ -31,6 +31,7 @@ export class EventoApprovePipe implements PipeTransform { "Status": fullTask.workflowInstanceDataFields.Status, "Deadline": fullTask.deadline, "TaskStatus": fullTask.taskStatus, + "TaskReceiveDate": fullTask.taskReceiveDate }, obj ) diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 12b418fe0..40cbca0e6 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -850,6 +850,9 @@ export class EventsService { const puturl = environment.apiURL + 'calendar/md'; let params = new HttpParams(); + const now = new Date(); + event.TimeZone = now.getTimezoneOffset().toString() + params = params.set("CalendarName", calendarName); let options: any; @@ -878,6 +881,9 @@ export class EventsService { const puturl = environment.apiURL + 'calendar/pr'; let params = new HttpParams(); + const now = new Date(); + event.TimeZone = now.getTimezoneOffset().toString() + params = params.set("CalendarName", calendarName); let options: any; @@ -908,6 +914,9 @@ export class EventsService { const puturl = environment.apiURL + 'Calendar/PostEvent'; let params = new HttpParams(); + const now = new Date() + event.TimeZone = now.getTimezoneOffset().toString() + params = params.set("CalendarName", calendarName); let options: any; diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts index 8c8eda8ae..cf11df522 100644 --- a/src/app/services/task.service.ts +++ b/src/app/services/task.service.ts @@ -137,7 +137,7 @@ export class TaskService { sortArrayISODate(myArray: any): any[] { - return myArray.sort((a,b) => Date.parse(b.TaskReceiveDate || b.taskReceiveDate || b.taskStartDate || b.TaskStartDate) - Date.parse(a.TaskReceiveDate || a.taskReceiveDate || a.taskStartDate || a.TaskStartDate)) + return myArray.sort((a,b) => Date.parse(b.CreateDate || b.taskStartDate || b.TaskStartDate || b.TaskReceiveDate || b.taskReceiveDate ) - Date.parse(a.CreateDate || b.taskStartDate || b.TaskStartDate || a.TaskReceiveDate || a.taskReceiveDate )) } reorderList(orderBy: string, list) { diff --git a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html index 486dfa439..0a1ad87e4 100644 --- a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html +++ b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html @@ -1,7 +1,6 @@
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.module.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.module.ts index 7e53cf76c..cb7027590 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.module.ts +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.module.ts @@ -19,11 +19,11 @@ import { 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'; - +import { TaskListHeaderPageModule } from '../generic/task-list-header/task-list-header.module'; @NgModule({ @@ -32,6 +32,7 @@ import { NgxMatMomentModule } from '@angular-material-components/moment-adapter' FormsModule, IonicModule, DespachosPrPageRoutingModule, + TaskListHeaderPageModule, // entryComponents TaskListPageModule, // 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 b386d20c8..405ca43f6 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 @@ -1,88 +1,14 @@ - -
-
- {{ environment.dispatchPR}} -
-
- - - -
-
- - -
- -
- -
-
- -
- - - - - Para hoje - - - - Novos - - - - Lidos - - - - Não lidos - - - - Em atraso - - - - Todos - - - - -
- - -
-
+ diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts index 1e19aa479..990d84d71 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -65,6 +65,10 @@ constructor ( } + changeFilterName(filterName) { + this.filterName = filterName + } + async LoadList() { this.skeletonLoader = true; diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts index 80b738356..4b704e0a8 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts @@ -7,6 +7,9 @@ import { IonicModule } from '@ionic/angular'; import { DiplomasAssinarPageRoutingModule } from './diplomas-assinar-routing.module'; import { DiplomasAssinarPage } from './diplomas-assinar.page'; +import { TaskListPageModule } from 'src/app/shared/gabinete-digital/generic/task-list/task-list.module' + + import { MatInputModule } from '@angular/material/input'; import { MatNativeDateModule } from '@angular/material/core'; @@ -29,6 +32,7 @@ import { NgxMatMomentModule } from '@angular-material-components/moment-adapter' FormsModule, IonicModule, DiplomasAssinarPageRoutingModule, + TaskListPageModule, // MatInputModule, MatNativeDateModule, 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 53c0c5e5f..724cef891 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 @@ -94,88 +94,13 @@ - -
- -
- - - - -
- - -
-
-
- {{ task.Folio || task.workflowInstanceDataFields.Subject }} - Para hoje - Nova -
-
- - - -
-
-
-
- {{task.Senders}} -
-
-
-
- {{task.activityInstanceName}} -
-
- {{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }} -
-
-
-
- - -
- -
- 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 19571f48d..c22844323 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 @@ -95,8 +95,8 @@ export class DiplomasAssinarPage implements OnInit { } - goToDiploma(serialNumber:any){ - this.router.navigate(['/home/gabinete-digital/diplomas-assinar',serialNumber,'gabinete-digital']); + goToDiploma({SerialNumber}){ + this.router.navigate(['/home/gabinete-digital/diplomas-assinar',SerialNumber,'gabinete-digital']); } doRefresh(event) { diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html b/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html deleted file mode 100644 index 733e08b7e..000000000 --- a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html +++ /dev/null @@ -1,97 +0,0 @@ - - -
-
Expediente
-
- -
-
- - - - - - - -
-
- - -
-
-
-
- {{ task.Subject }} - Para hoje - Nova -
-
- - - -
-
-
-
- {{task.Senders}} -
-
-
-
- {{task.activityInstanceName}} -
-
- {{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }} -
-
-
-
- -
- -
- Lista vazia -
- -
- - - - - - - -

-

-

- - - - - - - -

-

-

- - - -
-
- - - diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.scss b/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.scss deleted file mode 100644 index a238b635c..000000000 --- a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.scss +++ /dev/null @@ -1,161 +0,0 @@ -@import '~src/function.scss'; -//CONTENT -:host{ - margin: 0; -} -.title{ - font-family: Roboto; - font-size: 25px; - color:#000; - overflow: auto; - padding: 30px 20px 0 20px !important; - - .thetitle{ - width: fit-content; - float: left; - } - .theicon{ - width: fit-content; - float: right; - } - } -//DIV -ion-item{ - --background: none; -} -.item { - //border-radius: 15px; - //box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); - //Sborder: solid 1px #e9e9e9; - //background-color: var(--white); - margin: 0 auto; - //padding: 10px; - overflow: auto; - } - -/* New CSS */ -.content{ - padding: 0px 20px 0 20px !important; -} -.expediente{ - border-radius: 15px; - box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); - border:1px solid #e9e9e9 !important; - //background-color: transparent; - margin-bottom: 10px !important; - padding: 15px; -} -.exp-list-item{ - //width: 368px; - overflow: auto; - //border-bottom: 1px solid gray; - margin: 10px auto; -} - -.exp-top-detail{ - width: 100%; - float: left; - font-family: Roboto; - font-size: 12pt; - font-weight: 700; - color: var(--title-text-color); - padding-left: 3px; - - .subject{ - width: 84%; - float: left; - } - - .exp-icon{ - width: fit-content; - float: right; - //font-size: 13px; - margin: 0 !important; - padding: 0 !important; - - ion-icon{ - font-size: 12pt; - color: #42b9fe; - float: left; - } - label{ - font-size: 10pt; - } - } -} -.exp-middle-detail, .exp-bottom-detail{ - margin-bottom: 5px; - -} -.exp-middle-detail{ - font-size: 12pt; - width: 100%; - overflow: auto; - - .exp-workflow{ - float: left; - margin: 0 !important; - - .label{ - border-radius: 15px; - background: var(--label-bg-color); - //font-size: 12px; - float: right; - padding: 2.5px 13.5px 2.5px 13.5px; - color: #fff; - } - } - .exp-date{ - width: auto; - font-family: Roboto; - font-size: 10pt; - font-weight: normal; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: #797979; - float: right; - } -} -.exp-bottom-detail{ - font-size: 8pt; - width: 100%; - overflow: auto; - padding-left: 3px; - - .exp-remetente{ - //width: 200px; - font-family: Roboto; - //font-size: 13px; - font-weight: normal; - color: #000000; - float: left; - //border: 1px solid red; - } -} -.div-top-header{ - width: 400px; - margin: 6px auto; - background-color: #0782c9; - overflow: auto; -} -.div-search{ - font-size: 45px; - float: left; - margin: 0 0 0 10px -} -.div-logo{ - background: transparent; - width: 150px; - margin: 2.5px 0 2.5px 71px; - float: left; -} -.div-logo img{ - width: 100%; -} -.div-profile{ - font-size: 45px; - float: right; - margin-right: 10px; -} diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts deleted file mode 100644 index 5b90d7686..000000000 --- a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts +++ /dev/null @@ -1,121 +0,0 @@ -import { Component, Input, OnInit } from '@angular/core'; -import { NavigationStart, Router } from '@angular/router'; -import { ProcessesService } from 'src/app/services/processes.service'; -import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; -import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; -import { ThemeService } from 'src/app/services/theme.service' -import { SortService } from 'src/app/services/functions/sort.service'; -import { Storage } from '@ionic/storage'; -import { TaskService } from 'src/app/services/task.service' - - -@Component({ - selector: 'app-expedients', - templateUrl: './expedients.page.html', - styleUrls: ['./expedients.page.scss'], -}) -export class ExpedientsPage implements OnInit { - segment: string; - - serialNumber: string; - - @Input() profile: string; - skeletonLoader = true - expedientegbstore = ExpedienteGdStore - - expedienteTaskPipe = new ExpedienteTaskPipe() - - constructor( - private processes: ProcessesService, - private router: Router, - public ThemeService: ThemeService, - private sortService: SortService, - private storage: Storage, - public TaskService: TaskService - ) { - this.profile = 'mdgpr'; - - } - - ngOnInit() { - //Inicializar segment - this.segment = "expedientes"; - this.LoadList() - - this.router.events.forEach((event) => { - if (event instanceof NavigationStart && - event.url.startsWith('/home/gabinete-digital?expedientes=true')) { - if (window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { - this.LoadList() - } else { - this.LoadList() - } - } - }); - - } - - segmentChanged() { - this.LoadList(); - } - - LoadList() { - - this.skeletonLoader = true - - this.processes.GetTaskListExpediente(false).subscribe(result => { - let taskslist = []; - - let res = result.filter(data => data.workflowInstanceDataFields.Status == "Active"); - res.forEach(element => { - let task = this.expedienteTaskPipe.transform(element) - taskslist.push(task); - - }); - taskslist = this.sortService.sortDate(taskslist, 'CreateDate') - // this.addProcessTODb(taskslist); - taskslist = taskslist.filter(function(item) { - return item.activityInstanceName != 'Retificar Expediente' - }) - this.expedientegbstore.reset(taskslist); - - }, (error) => { - this.skeletonLoader = false - //this.getEventsFromLocalDb(); - console.log('stop') - }, () =>{ - this.skeletonLoader = false - }); - } - - // addProcessTODb(task) { - // this.storage.set('gabinete-expediente', task).then(() => { - - // }) - // } - - // getEventsFromLocalDb() { - // this.storage.get('gabinete-expediente').then((expediente) => { - // taskslist = expediente - // }) - // } - - doRefresh(event) { - if (event) { - setTimeout(() => { - try { - event?.target?.complete(); -} catch(error) {} - }, 2000); - } - setTimeout(() => { - this.LoadList(); - }, 1000) - - } - - goToExpediente(serialNumber: any) { - this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'gabinete-digital']); - } - - } diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.module.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.module.ts index 774e83e90..889f83d8d 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.module.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.module.ts @@ -22,6 +22,8 @@ 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'; +import { TaskListPageModule } from 'src/app/shared/gabinete-digital/generic/task-list/task-list.module' + @@ -31,6 +33,7 @@ import { NgxMatMomentModule } from '@angular-material-components/moment-adapter' FormsModule, IonicModule, DiplomasPageRoutingModule, + TaskListPageModule, // MatInputModule, MatNativeDateModule, diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html index b129c9ce9..70dea4fa3 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html @@ -32,7 +32,6 @@
--> -
@@ -43,7 +42,7 @@
- +
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 2457c365f..0fed35832 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 @@ -4,7 +4,6 @@ import { EventPerson } from 'src/app/models/eventperson.model'; import { ProcessesService } from 'src/app/services/processes.service'; import { ModalController } from '@ionic/angular'; import { NavigationStart, Router } from '@angular/router'; -import { LoginUserRespose } from 'src/app/models/user.model'; import { AuthService } from 'src/app/services/auth.service'; import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service'; import { SortService } from 'src/app/services/functions/sort.service'; @@ -99,13 +98,17 @@ export class EventsToApprovePage implements OnInit { if(this.showSearch && this.searchSubject) { - this.list = this.eventoaprovacaostore.get(this.segment).filter((task) => { + const 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()) }) + + this.list = this.TaskService.reorderList(this.ordinance, list) } else { - this.list = this.eventoaprovacaostore.get(this.segment) + const list = this.eventoaprovacaostore.get(this.segment) + + this.list = this.TaskService.reorderList(this.ordinance, list) } } diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.module.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.module.ts index b34f07ff5..1b0de04e0 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.module.ts +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.module.ts @@ -22,6 +22,8 @@ import { MatButtonModule } from '@angular/material/button'; import { MatSelectModule } from '@angular/material/select'; import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'; +import { TaskListPageModule } from 'src/app/shared/gabinete-digital/generic/task-list/task-list.module' + @NgModule({ @@ -30,6 +32,7 @@ import { NgxMatMomentModule } from '@angular-material-components/moment-adapter' FormsModule, IonicModule, ExpedientesPrPageRoutingModule, + TaskListPageModule, // MatInputModule, MatNativeDateModule, 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 25fd40594..01a19e823 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 @@ -88,78 +88,13 @@ -
- - -
-
-
-
- {{ task.Subject }} - Para hoje - Nova -
-
- - - -
-
-
-
- {{task.Senders}} -
-
-
-
- {{task.activityInstanceName}} -
-
- {{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }} -
-
-
-
- - - -
- 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 d8b708479..06bd79148 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 @@ -150,9 +150,9 @@ export class ExpedientesPrPage implements OnInit { }, 2000); } - goToExpediente(serialNumber:any){ + goToExpediente({SerialNumber}){ /* this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']); */ - this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'gabinete-digital']); + this.router.navigate(['/home/gabinete-digital/expediente', SerialNumber, 'gabinete-digital']); } } diff --git a/src/app/shared/gabinete-digital/expedients/expedients.module.ts b/src/app/shared/gabinete-digital/expedients/expedients.module.ts index 104ab239d..7e90c7ba7 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.module.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.module.ts @@ -22,6 +22,8 @@ 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'; +import { TaskListPageModule } from 'src/app/shared/gabinete-digital/generic/task-list/task-list.module' + @NgModule({ @@ -30,6 +32,7 @@ import { NgxMatMomentModule } from '@angular-material-components/moment-adapter' FormsModule, IonicModule, ExpedientsPageRoutingModule, + TaskListPageModule, // MatInputModule, MatNativeDateModule, diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html index 9da44ba68..ba3b6afe3 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.html +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html @@ -46,7 +46,7 @@
- +
@@ -67,7 +67,6 @@ Não lidos - Em atraso @@ -96,78 +95,13 @@ -
-
- - -
-
-
-
- {{ task.Subject }} - Para hoje - Nova -
-
- - - -
-
-
-
- {{task.Senders}} -
-
-
-
- {{task.activityInstanceName}} -
-
- {{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }} -
-
-
-
- -
- -
- 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 34aa9f0e8..a0f8e2900 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -147,17 +147,6 @@ export class ExpedientsPage implements OnInit { }); } - // addProcessTODb(task) { - // this.storage.set('gabinete-expediente', task).then(() => { - - // }) - // } - - // getEventsFromLocalDb() { - // this.storage.get('gabinete-expediente').then((expediente) => { - // this.taskslist = expediente - // }) - // } doRefresh(event) { if (event) { @@ -174,8 +163,8 @@ export class ExpedientsPage implements OnInit { } - goToExpediente(serialNumber: any) { - this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'gabinete-digital']); + goToExpediente({SerialNumber}) { + this.router.navigate(['/home/gabinete-digital/expediente', SerialNumber, 'gabinete-digital']); } } diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients-routing.module.ts b/src/app/shared/gabinete-digital/generic/task-list-header/task-list-header-routing.module.ts similarity index 62% rename from src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients-routing.module.ts rename to src/app/shared/gabinete-digital/generic/task-list-header/task-list-header-routing.module.ts index d5c5b384e..9e646807e 100644 --- a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients-routing.module.ts +++ b/src/app/shared/gabinete-digital/generic/task-list-header/task-list-header-routing.module.ts @@ -1,12 +1,12 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { ExpedientsPage } from './expedients.page'; +import { TaskListHeaderPage } from './task-list-header.page'; const routes: Routes = [ { path: '', - component: ExpedientsPage + component: TaskListHeaderPage } ]; @@ -14,4 +14,4 @@ const routes: Routes = [ imports: [RouterModule.forChild(routes)], exports: [RouterModule], }) -export class ExpedientsPageRoutingModule {} +export class TaskListHeaderPageRoutingModule {} diff --git a/src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.module.ts b/src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.module.ts new file mode 100644 index 000000000..38cdfda85 --- /dev/null +++ b/src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.module.ts @@ -0,0 +1,27 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { TaskListHeaderPageRoutingModule } from './task-list-header-routing.module'; + +import { TaskListHeaderPage } from './task-list-header.page'; +import { MatSelectModule } from '@angular/material/select'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; + + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + TaskListHeaderPageRoutingModule, + // + MatSelectModule, + BtnModalDismissPageModule + ], + declarations: [TaskListHeaderPage], + exports: [TaskListHeaderPage] +}) +export class TaskListHeaderPageModule {} diff --git a/src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.html b/src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.html new file mode 100644 index 000000000..1a5f9a34c --- /dev/null +++ b/src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.html @@ -0,0 +1,92 @@ +
+ +
+
+
+ + + +
+ {{ headerName }} +
+
+ + + +
+
+ + +
+ +
+ +
+
+ +
+ + + + + Para hoje + + + + Novos + + + + Lidos + + + + Não lidos + + + + Em atraso + + + + Todos + + + + +
+ + +
+
+ +
\ No newline at end of file diff --git a/src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.scss b/src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.scss new file mode 100644 index 000000000..98750f943 --- /dev/null +++ b/src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.scss @@ -0,0 +1,17 @@ +.main-header{ + font-family: Roboto; + font-size: 25px; + color:#000; + overflow: auto; + padding: 30px 20px 0 20px !important; + margin: 0; + + .thetitle{ + width: fit-content; + float: left; + } + .theicon{ + width: fit-content; + float: right; + } +} \ No newline at end of file diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.spec.ts b/src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.spec.ts similarity index 59% rename from src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.spec.ts rename to src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.spec.ts index 0d73188e6..8c6df7178 100644 --- a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.spec.ts +++ b/src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.spec.ts @@ -1,19 +1,19 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { IonicModule } from '@ionic/angular'; -import { ExpedientsPage } from './expedients.page'; +import { TaskListHeaderPage } from './task-list-header.page'; -describe('ExpedientsPage', () => { - let component: ExpedientsPage; - let fixture: ComponentFixture; +describe('TaskListHeaderPage', () => { + let component: TaskListHeaderPage; + let fixture: ComponentFixture; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ ExpedientsPage ], + declarations: [ TaskListHeaderPage ], imports: [IonicModule.forRoot()] }).compileComponents(); - fixture = TestBed.createComponent(ExpedientsPage); + fixture = TestBed.createComponent(TaskListHeaderPage); component = fixture.componentInstance; fixture.detectChanges(); })); diff --git a/src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.ts b/src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.ts new file mode 100644 index 000000000..28497c224 --- /dev/null +++ b/src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.ts @@ -0,0 +1,30 @@ +import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; +import { environment } from 'src/environments/environment'; +import { ThemeService } from 'src/app/services/theme.service'; + +@Component({ + selector: 'app-task-list-header', + templateUrl: './task-list-header.page.html', + styleUrls: ['./task-list-header.page.scss'], +}) +export class TaskListHeaderPage implements OnInit { + + @Input() headerName = 'name' + @Input() goBackButton = false + @Input() loading = true + @Input() loaderTop = false; + @Input() loaderBottom = false; + @Output() goBack = new EventEmitter(); + @Output() reorderList = new EventEmitter(); + @Output() changeFilterName = new EventEmitter(); + + environment = environment + filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' + @Input() ordinance: string = 'old' + + constructor( + public ThemeService: ThemeService, + ) { } + + ngOnInit() {} +} diff --git a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html index 9a179cb56..7335a213a 100644 --- a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html +++ b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html @@ -1,8 +1,8 @@ -
+
-
- +
+
Lista vazia
-
+
diff --git a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.ts b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.ts index 64bfa5965..494f71ebe 100644 --- a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.ts +++ b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.ts @@ -18,9 +18,7 @@ export class TaskListPage implements OnInit { constructor( public ThemeService: ThemeService, public TaskService: TaskService - ) { - - } + ) {} ngOnInit() {} diff --git a/src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header-routing.module.ts b/src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header-routing.module.ts new file mode 100644 index 000000000..7fca2565a --- /dev/null +++ b/src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { TaskListtHeaderPage } from './task-listt-header.page'; + +const routes: Routes = [ + { + path: '', + component: TaskListtHeaderPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class TaskListtHeaderPageRoutingModule {} diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.module.ts b/src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.module.ts similarity index 50% rename from src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.module.ts rename to src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.module.ts index 12474c13f..1541df8d4 100644 --- a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.module.ts +++ b/src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.module.ts @@ -4,18 +4,17 @@ import { FormsModule } from '@angular/forms'; import { IonicModule } from '@ionic/angular'; -import { ExpedientsPageRoutingModule } from './expedients-routing.module'; +import { TaskListtHeaderPageRoutingModule } from './task-listt-header-routing.module'; -import { ExpedientsPage } from './expedients.page'; +import { TaskListtHeaderPage } from './task-listt-header.page'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - ExpedientsPageRoutingModule + TaskListtHeaderPageRoutingModule ], - exports: [ExpedientsPage], - declarations: [ExpedientsPage] + declarations: [TaskListtHeaderPage] }) -export class ExpedientsPageModule {} +export class TaskListtHeaderPageModule {} diff --git a/src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.page.html b/src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.page.html new file mode 100644 index 000000000..250c0a278 --- /dev/null +++ b/src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.page.html @@ -0,0 +1,9 @@ + + + taskListtHeader + + + + + + diff --git a/src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.page.scss b/src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.page.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.page.spec.ts b/src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.page.spec.ts new file mode 100644 index 000000000..57630201e --- /dev/null +++ b/src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { TaskListtHeaderPage } from './task-listt-header.page'; + +describe('TaskListtHeaderPage', () => { + let component: TaskListtHeaderPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ TaskListtHeaderPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(TaskListtHeaderPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.page.ts b/src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.page.ts new file mode 100644 index 000000000..9ad9cb3ea --- /dev/null +++ b/src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-task-listt-header', + templateUrl: './task-listt-header.page.html', + styleUrls: ['./task-listt-header.page.scss'], +}) +export class TaskListtHeaderPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/environments/environment.ts b/src/environments/environment.ts index ee55c1414..16a865ce9 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,4 +4,4 @@ import { doneITDev } from './suport/doneIt' import { DevDev } from './suport/dev' -export const environment: Environment = doneITDev \ No newline at end of file +export const environment: Environment = DevDev \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index 0ba457b07..2371f4409 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "181a9dbd7", - "SHA": "181a9dbd768e46ac982079fdcc5178ad35ff050d", + "shortSHA": "033a6c331", + "SHA": "033a6c331c21852d9e950fb47f44fd4f8f3d466a", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri May 19 15:02:02 2023 +0100'", - "lastCommitMessage": "fix", - "lastCommitNumber": "4939", + "lastCommitTime": "'Tue May 23 11:56:12 2023 +0100'", + "lastCommitMessage": "improve", + "lastCommitNumber": "4940", "change": "", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\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.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\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.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.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/pages/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.html\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\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.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-gerar/diplomas-gerar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.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\tnew file: src/assets/images/theme/gov/crescente.svg\n\tnew file: src/assets/images/theme/gov/decrescente.svg", + "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/app-routing.module.ts\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.scss\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.module.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.module.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.module.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.module.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.module.ts\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.html\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.scss\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/app/pipes/evento-approve.pipe.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.module.ts\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.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module.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\tdeleted: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html\n\tdeleted: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.scss\n\tdeleted: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.module.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.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.module.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.module.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.html\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\trenamed: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients-routing.module.ts -> src/app/shared/gabinete-digital/generic/task-list-header/task-list-header-routing.module.ts\n\tnew file: src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.module.ts\n\tnew file: src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.html\n\tnew file: src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.scss\n\trenamed: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.spec.ts -> src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.spec.ts\n\tnew file: src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.ts\n\tmodified: src/app/shared/gabinete-digital/generic/task-list/task-list.page.html\n\tmodified: src/app/shared/gabinete-digital/generic/task-list/task-list.page.ts\n\tnew file: src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header-routing.module.ts\n\trenamed: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.module.ts -> src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.module.ts\n\tnew file: src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.page.html\n\tnew file: src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.page.scss\n\tnew file: src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.page.spec.ts\n\tnew file: src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.page.ts\n\tmodified: src/environments/environment.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file