From 7671705193d70a5c86c17616ae082b3bb6a5d3e9 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 13 Apr 2023 15:44:16 +0100 Subject: [PATCH 1/3] add filter to all list and approve event --- src/app/pipes/evento-approve.pipe.spec.ts | 8 +++++ src/app/pipes/evento-approve.pipe.ts | 37 +++++++++++++++++++++++ src/app/pipes/pipes.module.ts | 3 +- version/git-version.ts | 14 ++++----- 4 files changed, 54 insertions(+), 8 deletions(-) create mode 100644 src/app/pipes/evento-approve.pipe.spec.ts create mode 100644 src/app/pipes/evento-approve.pipe.ts diff --git a/src/app/pipes/evento-approve.pipe.spec.ts b/src/app/pipes/evento-approve.pipe.spec.ts new file mode 100644 index 000000000..9f8ec0808 --- /dev/null +++ b/src/app/pipes/evento-approve.pipe.spec.ts @@ -0,0 +1,8 @@ +import { EventoApprovePipe } from './evento-approve.pipe'; + +describe('EventoApprovePipe', () => { + it('create an instance', () => { + const pipe = new EventoApprovePipe(); + expect(pipe).toBeTruthy(); + }); +}); diff --git a/src/app/pipes/evento-approve.pipe.ts b/src/app/pipes/evento-approve.pipe.ts new file mode 100644 index 000000000..e0910ce96 --- /dev/null +++ b/src/app/pipes/evento-approve.pipe.ts @@ -0,0 +1,37 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ + name: 'eventoApprove' +}) +export class EventoApprovePipe implements PipeTransform { + + transform(fullTask): unknown { + let date = new Date(fullTask.taskStartDate); + let month = date.getMonth() + 1; + let taskDate = date.getFullYear() + "-" + month +"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); + + return { + "SerialNumber": fullTask.serialNumber, + "Folio": fullTask.workflowInstanceDataFields.Subject, + "Event": { + StartDate: '', + EndDate: '', + Agenda: '', + Location: '' + }, + "CreateDate": taskDate, + "TaskStartDate": fullTask.taskStartDate, + "DocumentURL": fullTask.workflowInstanceDataFields.ViewerRequest, + "Remetente": fullTask.workflowInstanceDataFields.Remetente, + "DocumentsQty": fullTask.totalDocuments, + "DocId": fullTask.workflowInstanceDataFields.DispatchDocId, + "FolderID": fullTask.workflowInstanceDataFields.FolderID, + "WorkflowName": fullTask.workflowDisplayName, + "activityInstanceName": fullTask.activityInstanceName, + "Status": fullTask.workflowInstanceDataFields.Status, + "Deadline": fullTask.deadline, + "TaskStatus": fullTask.taskStatus + } + } + +} diff --git a/src/app/pipes/pipes.module.ts b/src/app/pipes/pipes.module.ts index 351e00d4c..2d3ab2605 100644 --- a/src/app/pipes/pipes.module.ts +++ b/src/app/pipes/pipes.module.ts @@ -7,10 +7,11 @@ import { PublicationPipe } from './publication.pipe'; import { ExpedienteTaskPipe } from './expediente-task.pipe'; import { ParticipantsPipe } from './participants.pipe'; import { SafehtmlPipe } from './safehtml.pipe'; +import { EventoApprovePipe } from './evento-approve.pipe'; @NgModule({ - declarations: [FilterPipe, SearchDocumentPipe, CustomTaskPipe, EventPipe, PublicationPipe, ExpedienteTaskPipe, ParticipantsPipe, SafehtmlPipe], + declarations: [FilterPipe, SearchDocumentPipe, CustomTaskPipe, EventPipe, PublicationPipe, ExpedienteTaskPipe, ParticipantsPipe, SafehtmlPipe, EventoApprovePipe], exports: [FilterPipe, SafehtmlPipe], imports: [] }) diff --git a/version/git-version.ts b/version/git-version.ts index da2ba38ba..94d0e8330 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "f8614029a", - "SHA": "f8614029af16d0de93330a48cba69a45036f095e", + "shortSHA": "53c91682d", + "SHA": "53c91682d333cbc63f30c4d1f1cfb841f918b17c", "branch": "feature/gabineteLabels", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Apr 13 12:51:38 2023 +0100'", - "lastCommitMessage": "add labels", - "lastCommitNumber": "4898", - "change": "", - "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html", + "lastCommitTime": "'Thu Apr 13 13:17:39 2023 +0100'", + "lastCommitMessage": "improve code name", + "lastCommitNumber": "4899", + "change": "diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html\nindex 542f64fe3..c9b470f38 100644\n--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html\n+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html\n@@ -301,8 +301,8 @@\n \n \n

Despachos
\n- =2\">{{ despachoStore.newList.length}} Despachos novos\n- {{ despachoStore.newList.length}} Despacho novo\n+ =2\">{{ despachoStore.newList.length}} Despachos novos\n+ {{ despachoStore.newList.length}} Despacho novo\n

\n

{{despachoStore.count}} Documentos

\n \n@@ -369,6 +369,8 @@\n =2\">{{ pendentesstore.newList.length}} Meus Pendente\n {{ pendentesstore.newList.length}} Meu Pendent\n

\n+\n+

{{pendentesstore.count}} Documentos

\n \n \n \ndiff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts\nindex d2f87d0e8..bc85fc218 100644\n--- a/src/app/services/task.service.ts\n+++ b/src/app/services/task.service.ts\n@@ -35,9 +35,9 @@ export class TaskService {\n filter(item, attribute) {\n \n if(attribute == 'Para hoje') {\n- return this.deadlineIsToday(item.TaskStartDate)\n+ return this.deadlineIsToday(item.TaskStartDate || item.taskStartDate)\n } else if (attribute == 'Novos') {\n- return this.lessThen24Hours(item.TaskStartDate)\n+ return this.lessThen24Hours(item.TaskStartDate || item.taskStartDate)\n } else if (attribute == 'Lidos') {\n return item.TaskStatus == 'open'\n } else if (attribute == 'Não lidos') {\ndiff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.module.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.module.ts\nindex 6d85dc1b2..cd9f47d22 100644\n--- a/src/app/shared/gabinete-digital/all-processes/all-processes.module.ts\n+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.module.ts\n@@ -8,12 +8,37 @@ import { AllProcessesPageRoutingModule } from './all-processes-routing.module';\n \n import { AllProcessesPage } from './all-processes.page';\n \n+\n+import { MatInputModule } from '@angular/material/input';\n+import { MatNativeDateModule } from '@angular/material/core';\n+\n+import {\n+ NgxMatDatetimePickerModule,\n+ NgxMatNativeDateModule,\n+ NgxMatTimepickerModule\n+} from '@angular-material-components/datetime-picker';\n+\n+import { ReactiveFormsModule } from '@angular/forms';\n+import { MatButtonModule } from '@angular/material/button';\n+import { MatSelectModule } from '@angular/material/select';\n+import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';\n+\n+\n @NgModule({\n imports: [\n CommonModule,\n FormsModule,\n IonicModule,\n- AllProcessesPageRoutingModule\n+ AllProcessesPageRoutingModule,\n+ //\n+ MatInputModule,\n+ MatNativeDateModule,\n+ NgxMatDatetimePickerModule,\n+ NgxMatTimepickerModule,\n+ NgxMatNativeDateModule,\n+ NgxMatMomentModule,\n+ MatSelectModule,\n+ MatButtonModule,\n ],\n exports: [AllProcessesPage],\n declarations: [AllProcessesPage]\ndiff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html\nindex a3e1e1380..c2fb22c9c 100644\n--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n@@ -2,11 +2,39 @@\n \n
\n
Todas as tarefas
\n- \n+ -->\n+
\n \n \n \n@@ -28,54 +56,59 @@\n
\n \n \n-
\n-
\n-
\n-\n- \n- \n- {{ task.Folio || task.Subject || task.workflowInstanceDataFields.Subject}}\n-
\n-
\n- \n- \n- \n-
\n-
\n-
\n-
\n- {{task.Senders }}\n- {{ task.workflowInstanceDataFields.Sender }}\n+
\n+
\n+
\n+
\n+ \n+ \n+ \n+ {{ task.Folio || task.Subject || task.workflowInstanceDataFields.Subject}}\n+ Para hoje\n+ Nova\n+
\n+
\n+ \n+ \n+ \n+
\n
\n-
\n-
\n-
\n- {{task.customDate}}\n+
\n+
\n+ {{task.Senders }}\n+ {{ task.workflowInstanceDataFields.Sender }}\n+
\n
\n-
\n-
\n-
\n- \n- \n- Agenda {{task.Agenda}} do Titular\n- \n- \n- A sua agenda {{task.Agenda}}\n- \n+
\n+
\n+ {{task.customDate}}\n+
\n
\n-
\n-
\n-
\n- {{task.activityInstanceName}}\n+
\n+
\n+ \n+ \n+ Agenda {{task.Agenda}} do Titular\n+ \n+ \n+ A sua agenda {{task.Agenda}}\n+ \n+
\n
\n-
\n- {{ task.CreateDate || task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}\n+
\n+
\n+ {{task.activityInstanceName}}\n+
\n+
\n+ {{ task.CreateDate || task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}\n+
\n
\n
\n
\n+\n
\n \n
\ndiff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss b/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss\nindex d0b314011..362d4a2aa 100644\n--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss\n+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss\n@@ -164,3 +164,7 @@ ion-list{\n }\n }\n }\n+\n+.new-task {\n+ height: 23px;\n+}\n\\ No newline at end of file\ndiff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\nindex 52d46e24e..fa9dd5240 100644\n--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n@@ -11,7 +11,7 @@ import { DespachosprStore } from 'src/app/store/despachospr-store.service';\n import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service';\n import { PedidosStore } from 'src/app/store/pedidos-store.service';\n import { SessionStore } from 'src/app/store/session.service';\n-\n+import { TaskService } from 'src/app/services/task.service'\n \n @Component({\n selector: 'app-all-processes',\n@@ -35,10 +35,12 @@ export class AllProcessesPage implements OnInit {\n deplomasStore = DeplomasStore\n \n AllProcess = []\n-\n+ filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'\n+ \n constructor(\n private router: Router,\n- public ThemeService: ThemeService\n+ public ThemeService: ThemeService,\n+ public TaskService: TaskService\n ) {\n this.loggeduser = SessionStore.user;\n \ndiff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts\nindex cbc598559..32a14447f 100644\n--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts\n+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts\n@@ -7,13 +7,37 @@ import { IonicModule } from '@ionic/angular';\n import { EventsToApprovePageRoutingModule } from './events-to-approve-routing.module';\n \n import { EventsToApprovePage } from './events-to-approve.page';\n+import { MatInputModule } from '@angular/material/input';\n+import { MatNativeDateModule } from '@angular/material/core';\n+\n+import {\n+ NgxMatDatetimePickerModule,\n+ NgxMatNativeDateModule,\n+ NgxMatTimepickerModule\n+} from '@angular-material-components/datetime-picker';\n+\n+import { ReactiveFormsModule } from '@angular/forms';\n+import { MatButtonModule } from '@angular/material/button';\n+import { MatSelectModule } from '@angular/material/select';\n+import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';\n+\n+\n \n @NgModule({\n imports: [\n CommonModule,\n FormsModule,\n IonicModule,\n- EventsToApprovePageRoutingModule\n+ EventsToApprovePageRoutingModule,\n+ //\n+ MatInputModule,\n+ MatNativeDateModule,\n+ NgxMatDatetimePickerModule,\n+ NgxMatTimepickerModule,\n+ NgxMatNativeDateModule,\n+ NgxMatMomentModule,\n+ MatSelectModule,\n+ MatButtonModule,\n ],\n declarations: [EventsToApprovePage],\n exports: [EventsToApprovePage]\ndiff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\nindex 25ce63e6d..33452bbcf 100644\n--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n@@ -3,9 +3,34 @@\n
\n
\n \n- \n+
\n+ \n+ \n+ \n+ \n+ Para hoje\n+ \n+ \n+ \n+ Novos\n+ \n+ \n+ \n+ Lidos\n+ \n+ \n+ \n+ Não lidos\n+ \n+ \n+ \n+ Todos\n+ \n+ \n+ \n+ \n+
\n+\n
\n \n \n@@ -40,16 +65,22 @@\n *ngFor=\"let event of eventoaprovacaostore.get(segment)\"\n (click)=\"goToEventDetail(event)\"\n >\n- \n-
\n-
\n-

{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}

\n-

{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}

\n-
\n-
\n-

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}

\n-

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}

\n-

{{event.workflowInstanceDataFields.Subject}}

\n+
\n+ \n+
\n+
\n+

{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}

\n+

{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}

\n+
\n+
\n+
{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}
\n+
{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}
\n+
{{event.workflowInstanceDataFields.Subject}}
\n+
\n+
\n+ Para hoje\n+ Nova\n+
\n
\n
\n
\ndiff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss\nindex 39ddfe79c..7a53fe3e7 100644\n--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss\n+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss\n@@ -70,7 +70,7 @@\n float: left;\n margin-left: 10px;\n }\n- .approve-event-detail p{\n+ .approve-event-detail .p{\n //width: 250px;\n font-family: Roboto;\n font-size: 13px;\n@@ -83,8 +83,7 @@\n margin: 0;\n padding-bottom: 10px;\n }\n- .approve-event-detail h3{\n- width: 250px;\n+ .approve-event-detail .h3{\n font-family: Roboto;\n font-size: 15px;\n font-weight: bold;\ndiff --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\nindex b43ffcd67..3363b1a1e 100644\n--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n@@ -12,7 +12,7 @@ import { Storage } from '@ionic/storage';\n import { SessionStore } from 'src/app/store/session.service';\n import { EventsService } from 'src/app/services/events.service';\n import { environment } from 'src/environments/environment';\n-\n+import { TaskService } from 'src/app/services/task.service'\n \n @Component({\n selector: 'app-events-to-approve',\n@@ -35,7 +35,9 @@ export class EventsToApprovePage implements OnInit {\n color: 'pr' | 'mdgpr'\n eventoaprovacaostore = EventoAprovacaoStore;\n environment = environment\n-\n+ filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'\n+ \n+ \n constructor(\n private processes:ProcessesService,\n private modalController: ModalController,\n@@ -44,6 +46,7 @@ export class EventsToApprovePage implements OnInit {\n private sortService: SortService,\n private storage: Storage,\n public eventService: EventsService,\n+ public TaskService: TaskService\n )\n {}", + "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tnew file: src/app/pipes/evento-approve.pipe.spec.ts\n\tnew file: src/app/pipes/evento-approve.pipe.ts\n\tmodified: src/app/pipes/pipes.module.ts\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.module.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.scss\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 5aca929c3df0dc9bcafda292de6e8df805e472ba Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 13 Apr 2023 16:15:46 +0100 Subject: [PATCH 2/3] improve --- .../despachos-pr/despachos-pr.page.html | 2 +- .../despachos/despachos.page.html | 2 +- .../diplomas-assinar.page.html | 2 +- .../diplomas-gerar/diplomas-gerar.page.html | 2 +- .../diplomas/diplomas.page.html | 2 +- .../expediente/expediente.page.html | 2 +- .../expedientes-pr/expedientes-pr.page.html | 2 +- .../gabinete-digital.page.html | 6 +- .../pedidos/pedidos.page.html | 2 +- src/app/services/task.service.ts | 14 ++- .../all-processes/all-processes.module.ts | 27 +++- .../all-processes/all-processes.page.html | 119 +++++++++++------- .../all-processes/all-processes.page.scss | 4 + .../all-processes/all-processes.page.ts | 8 +- .../diplomas-assinar.page.html | 2 +- .../diplomas-gerar/diplomas-gerar.page.html | 2 +- .../diplomas/diplomas.page.html | 2 +- .../events-to-approve.module.ts | 26 +++- .../events-to-approve.page.html | 57 +++++++-- .../events-to-approve.page.scss | 5 +- .../events-to-approve.page.ts | 7 +- .../expedientes-pr/expedientes-pr.page.html | 2 +- .../expedients/expedients.page.html | 2 +- .../generic/task-list/task-list.page.html | 2 +- src/global.scss | 5 + version/git-version.ts | 14 +-- 26 files changed, 226 insertions(+), 94 deletions(-) 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 ee0804385..a832e29c3 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 @@ -41,7 +41,7 @@
- {{ task.Folio }} + {{ task.Folio }} Para hoje Nova
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html index 227254f1c..5bc5dbe4e 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.html +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html @@ -40,7 +40,7 @@
- {{ task.Folio }} + {{ task.Folio }} Para hoje Nova
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 349ef6a93..3f726d2dd 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 @@ -68,7 +68,7 @@
- {{ task.Folio || task.workflowInstanceDataFields.Subject }} + {{ task.Folio || task.workflowInstanceDataFields.Subject }} Para hoje Nova
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 89e41b4fd..b47ea02af 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 @@ -43,7 +43,7 @@
- {{ task.Folio }} + {{ task.Folio }} Para hoje Nova
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html index 19a379fd9..73f651114 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html @@ -65,7 +65,7 @@
- {{ task.Folio }} + {{ task.Folio }} Para hoje Nova
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html index 46797d718..b05e4ba94 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -62,7 +62,7 @@
- {{ task.Subject }} + {{ task.Subject }} Para hoje Nova
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 c284c405b..90eb11dc4 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 @@ -61,7 +61,7 @@
- {{ task.Subject }} + {{ task.Subject }} Para hoje Nova
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 542f64fe3..c9b470f38 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -301,8 +301,8 @@

Despachos
- {{ despachoStore.newList.length}} Despachos novos - {{ despachoStore.newList.length}} Despacho novo + {{ despachoStore.newList.length}} Despachos novos + {{ despachoStore.newList.length}} Despacho novo

{{despachoStore.count}} Documentos

@@ -369,6 +369,8 @@ {{ pendentesstore.newList.length}} Meus Pendente {{ pendentesstore.newList.length}} Meu Pendent

+ +

{{pendentesstore.count}} Documentos

diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html index bda08d3b7..63e7a666d 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html @@ -77,7 +77,7 @@
- {{ task.Folio }} + {{ task.Folio }} Para hoje Nova
diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts index d2f87d0e8..c4a9fa4af 100644 --- a/src/app/services/task.service.ts +++ b/src/app/services/task.service.ts @@ -35,15 +35,19 @@ export class TaskService { filter(item, attribute) { if(attribute == 'Para hoje') { - return this.deadlineIsToday(item.TaskStartDate) + return this.deadlineIsToday(item.TaskStartDate || item.taskStartDate) } else if (attribute == 'Novos') { - return this.lessThen24Hours(item.TaskStartDate) + return this.lessThen24Hours(item.TaskStartDate || item.taskStartDate) } else if (attribute == 'Lidos') { - return item.TaskStatus == 'open' + return item.TaskStatus == 'Open' || item.taskStatus == 'Open' } else if (attribute == 'Não lidos') { - return item.TaskStatus != 'open' + return item.TaskStatus != 'Open' && item.taskStatus != 'Open' } - return true } + + + seen(item) { + return item.TaskStatus == 'Open' || item.taskStatus == 'Open' + } } diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.module.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.module.ts index 6d85dc1b2..cd9f47d22 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.module.ts +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.module.ts @@ -8,12 +8,37 @@ import { AllProcessesPageRoutingModule } from './all-processes-routing.module'; import { AllProcessesPage } from './all-processes.page'; + +import { MatInputModule } from '@angular/material/input'; +import { MatNativeDateModule } from '@angular/material/core'; + +import { + NgxMatDatetimePickerModule, + NgxMatNativeDateModule, + NgxMatTimepickerModule +} from '@angular-material-components/datetime-picker'; + +import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { MatSelectModule } from '@angular/material/select'; +import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'; + + @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - AllProcessesPageRoutingModule + AllProcessesPageRoutingModule, + // + MatInputModule, + MatNativeDateModule, + NgxMatDatetimePickerModule, + NgxMatTimepickerModule, + NgxMatNativeDateModule, + NgxMatMomentModule, + MatSelectModule, + MatButtonModule, ], exports: [AllProcessesPage], declarations: [AllProcessesPage] diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html index a3e1e1380..3999a5922 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html @@ -2,11 +2,39 @@
Todas as tarefas
- + --> +
@@ -28,54 +56,59 @@
-
-
-
- - - - {{ task.Folio || task.Subject || task.workflowInstanceDataFields.Subject}} +
+
+
+
+ + + + {{ task.Folio || task.Subject || task.workflowInstanceDataFields.Subject}} + Para hoje + Nova +
+
+ + + +
-
- - - +
+
+ {{task.Senders }} + {{ task.workflowInstanceDataFields.Sender }} +
-
-
-
- {{task.Senders }} - {{ task.workflowInstanceDataFields.Sender }} +
+
+ {{task.customDate}} +
-
-
-
- {{task.customDate}} +
+
+ + + Agenda {{task.Agenda}} do Titular + + + A sua agenda {{task.Agenda}} + +
-
-
-
- - - Agenda {{task.Agenda}} do Titular - - - A sua agenda {{task.Agenda}} - -
-
-
-
- {{task.activityInstanceName}} -
-
- {{ task.CreateDate || task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }} +
+
+ {{task.activityInstanceName}} +
+
+ {{ task.CreateDate || task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }} +
+
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss b/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss index d0b314011..362d4a2aa 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss @@ -164,3 +164,7 @@ ion-list{ } } } + +.new-task { + height: 23px; +} \ No newline at end of file diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts index 52d46e24e..fa9dd5240 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts @@ -11,7 +11,7 @@ import { DespachosprStore } from 'src/app/store/despachospr-store.service'; import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service'; import { PedidosStore } from 'src/app/store/pedidos-store.service'; import { SessionStore } from 'src/app/store/session.service'; - +import { TaskService } from 'src/app/services/task.service' @Component({ selector: 'app-all-processes', @@ -35,10 +35,12 @@ export class AllProcessesPage implements OnInit { deplomasStore = DeplomasStore AllProcess = [] - + filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos' + constructor( private router: Router, - public ThemeService: ThemeService + public ThemeService: ThemeService, + public TaskService: TaskService ) { this.loggeduser = SessionStore.user; 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 f1aaf9c35..83115d5cb 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 @@ -63,7 +63,7 @@
- {{ task.Folio || task.workflowInstanceDataFields.Subject }} + {{ task.Folio || task.workflowInstanceDataFields.Subject }}
diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html index 3de4a47e1..40a8fe7b3 100644 --- a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html +++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html @@ -59,7 +59,7 @@
- {{ task.Folio }} + {{ task.Folio }}
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html index 8d42bd441..774dbab4d 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html @@ -58,7 +58,7 @@
- {{ task.Folio }} + {{ task.Folio }}
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts index cbc598559..32a14447f 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts @@ -7,13 +7,37 @@ import { IonicModule } from '@ionic/angular'; import { EventsToApprovePageRoutingModule } from './events-to-approve-routing.module'; import { EventsToApprovePage } from './events-to-approve.page'; +import { MatInputModule } from '@angular/material/input'; +import { MatNativeDateModule } from '@angular/material/core'; + +import { + NgxMatDatetimePickerModule, + NgxMatNativeDateModule, + NgxMatTimepickerModule +} from '@angular-material-components/datetime-picker'; + +import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { MatSelectModule } from '@angular/material/select'; +import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'; + + @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - EventsToApprovePageRoutingModule + EventsToApprovePageRoutingModule, + // + MatInputModule, + MatNativeDateModule, + NgxMatDatetimePickerModule, + NgxMatTimepickerModule, + NgxMatNativeDateModule, + NgxMatMomentModule, + MatSelectModule, + MatButtonModule, ], declarations: [EventsToApprovePage], exports: [EventsToApprovePage] diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html index 25ce63e6d..33452bbcf 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html @@ -3,9 +3,34 @@
- +
+ + + + + Para hoje + + + + Novos + + + + Lidos + + + + Não lidos + + + + Todos + + + + +
+
@@ -40,16 +65,22 @@ *ngFor="let event of eventoaprovacaostore.get(segment)" (click)="goToEventDetail(event)" > - -
-
-

{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}

-

{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}

-
-
-

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}

-

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}

-

{{event.workflowInstanceDataFields.Subject}}

+
+ +
+
+

{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}

+

{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}

+
+
+
{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}
+
{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}
+
{{event.workflowInstanceDataFields.Subject}}
+
+
+ Para hoje + Nova +
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss index 39ddfe79c..7a53fe3e7 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss @@ -70,7 +70,7 @@ float: left; margin-left: 10px; } - .approve-event-detail p{ + .approve-event-detail .p{ //width: 250px; font-family: Roboto; font-size: 13px; @@ -83,8 +83,7 @@ margin: 0; padding-bottom: 10px; } - .approve-event-detail h3{ - width: 250px; + .approve-event-detail .h3{ font-family: Roboto; font-size: 15px; font-weight: bold; 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 b43ffcd67..3363b1a1e 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 @@ -12,7 +12,7 @@ import { Storage } from '@ionic/storage'; import { SessionStore } from 'src/app/store/session.service'; import { EventsService } from 'src/app/services/events.service'; import { environment } from 'src/environments/environment'; - +import { TaskService } from 'src/app/services/task.service' @Component({ selector: 'app-events-to-approve', @@ -35,7 +35,9 @@ export class EventsToApprovePage implements OnInit { color: 'pr' | 'mdgpr' eventoaprovacaostore = EventoAprovacaoStore; environment = environment - + filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos' + + constructor( private processes:ProcessesService, private modalController: ModalController, @@ -44,6 +46,7 @@ export class EventsToApprovePage implements OnInit { private sortService: SortService, private storage: Storage, public eventService: EventsService, + public TaskService: TaskService ) {} 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 5c4f81373..df246026b 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 @@ -47,7 +47,7 @@
- {{ task.Subject }} + {{ task.Subject }}
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html index a3faf33a6..9c9318994 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.html +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html @@ -56,7 +56,7 @@
- {{ task.Subject }} + {{ task.Subject }} Para hoje Nova
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 2b0c274be..79226afa7 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 @@ -13,7 +13,7 @@
- {{ task.Folio }} + {{ task.Folio }} Para hoje Nova
diff --git a/src/global.scss b/src/global.scss index e4296eb4e..fe33adb38 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1491,3 +1491,8 @@ ion-textarea.heigh-200 textarea { .lowercase { text-transform: lowercase; } + + +.gb-seen { + font-weight: normal !important; +} \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index 94d0e8330..f16ddb1ae 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "53c91682d", - "SHA": "53c91682d333cbc63f30c4d1f1cfb841f918b17c", + "shortSHA": "767170519", + "SHA": "7671705193d70a5c86c17616ae082b3bb6a5d3e9", "branch": "feature/gabineteLabels", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Apr 13 13:17:39 2023 +0100'", - "lastCommitMessage": "improve code name", - "lastCommitNumber": "4899", - "change": "diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html\nindex 542f64fe3..c9b470f38 100644\n--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html\n+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html\n@@ -301,8 +301,8 @@\n \n
\n

Despachos
\n- =2\">{{ despachoStore.newList.length}} Despachos novos\n- {{ despachoStore.newList.length}} Despacho novo\n+ =2\">{{ despachoStore.newList.length}} Despachos novos\n+ {{ despachoStore.newList.length}} Despacho novo\n

\n

{{despachoStore.count}} Documentos

\n
\n@@ -369,6 +369,8 @@\n =2\">{{ pendentesstore.newList.length}} Meus Pendente\n {{ pendentesstore.newList.length}} Meu Pendent\n

\n+\n+

{{pendentesstore.count}} Documentos

\n
\n \n \ndiff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts\nindex d2f87d0e8..bc85fc218 100644\n--- a/src/app/services/task.service.ts\n+++ b/src/app/services/task.service.ts\n@@ -35,9 +35,9 @@ export class TaskService {\n filter(item, attribute) {\n \n if(attribute == 'Para hoje') {\n- return this.deadlineIsToday(item.TaskStartDate)\n+ return this.deadlineIsToday(item.TaskStartDate || item.taskStartDate)\n } else if (attribute == 'Novos') {\n- return this.lessThen24Hours(item.TaskStartDate)\n+ return this.lessThen24Hours(item.TaskStartDate || item.taskStartDate)\n } else if (attribute == 'Lidos') {\n return item.TaskStatus == 'open'\n } else if (attribute == 'Não lidos') {\ndiff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.module.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.module.ts\nindex 6d85dc1b2..cd9f47d22 100644\n--- a/src/app/shared/gabinete-digital/all-processes/all-processes.module.ts\n+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.module.ts\n@@ -8,12 +8,37 @@ import { AllProcessesPageRoutingModule } from './all-processes-routing.module';\n \n import { AllProcessesPage } from './all-processes.page';\n \n+\n+import { MatInputModule } from '@angular/material/input';\n+import { MatNativeDateModule } from '@angular/material/core';\n+\n+import {\n+ NgxMatDatetimePickerModule,\n+ NgxMatNativeDateModule,\n+ NgxMatTimepickerModule\n+} from '@angular-material-components/datetime-picker';\n+\n+import { ReactiveFormsModule } from '@angular/forms';\n+import { MatButtonModule } from '@angular/material/button';\n+import { MatSelectModule } from '@angular/material/select';\n+import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';\n+\n+\n @NgModule({\n imports: [\n CommonModule,\n FormsModule,\n IonicModule,\n- AllProcessesPageRoutingModule\n+ AllProcessesPageRoutingModule,\n+ //\n+ MatInputModule,\n+ MatNativeDateModule,\n+ NgxMatDatetimePickerModule,\n+ NgxMatTimepickerModule,\n+ NgxMatNativeDateModule,\n+ NgxMatMomentModule,\n+ MatSelectModule,\n+ MatButtonModule,\n ],\n exports: [AllProcessesPage],\n declarations: [AllProcessesPage]\ndiff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html\nindex a3e1e1380..c2fb22c9c 100644\n--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n@@ -2,11 +2,39 @@\n \n
\n
Todas as tarefas
\n- \n+ -->\n+
\n
\n \n \n@@ -28,54 +56,59 @@\n
\n \n \n-
\n-
\n-
\n-\n- \n- \n- {{ task.Folio || task.Subject || task.workflowInstanceDataFields.Subject}}\n-
\n-
\n- \n- \n- \n-
\n-
\n-
\n-
\n- {{task.Senders }}\n- {{ task.workflowInstanceDataFields.Sender }}\n+
\n+
\n+
\n+
\n+ \n+ \n+ \n+ {{ task.Folio || task.Subject || task.workflowInstanceDataFields.Subject}}\n+ Para hoje\n+ Nova\n+
\n+
\n+ \n+ \n+ \n+
\n
\n-
\n-
\n-
\n- {{task.customDate}}\n+
\n+
\n+ {{task.Senders }}\n+ {{ task.workflowInstanceDataFields.Sender }}\n+
\n
\n-
\n-
\n-
\n- \n- \n- Agenda {{task.Agenda}} do Titular\n- \n- \n- A sua agenda {{task.Agenda}}\n- \n+
\n+
\n+ {{task.customDate}}\n+
\n
\n-
\n-
\n-
\n- {{task.activityInstanceName}}\n+
\n+
\n+ \n+ \n+ Agenda {{task.Agenda}} do Titular\n+ \n+ \n+ A sua agenda {{task.Agenda}}\n+ \n+
\n
\n-
\n- {{ task.CreateDate || task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}\n+
\n+
\n+ {{task.activityInstanceName}}\n+
\n+
\n+ {{ task.CreateDate || task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}\n+
\n
\n
\n
\n+\n
\n \n
\ndiff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss b/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss\nindex d0b314011..362d4a2aa 100644\n--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss\n+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss\n@@ -164,3 +164,7 @@ ion-list{\n }\n }\n }\n+\n+.new-task {\n+ height: 23px;\n+}\n\\ No newline at end of file\ndiff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\nindex 52d46e24e..fa9dd5240 100644\n--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n@@ -11,7 +11,7 @@ import { DespachosprStore } from 'src/app/store/despachospr-store.service';\n import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service';\n import { PedidosStore } from 'src/app/store/pedidos-store.service';\n import { SessionStore } from 'src/app/store/session.service';\n-\n+import { TaskService } from 'src/app/services/task.service'\n \n @Component({\n selector: 'app-all-processes',\n@@ -35,10 +35,12 @@ export class AllProcessesPage implements OnInit {\n deplomasStore = DeplomasStore\n \n AllProcess = []\n-\n+ filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'\n+ \n constructor(\n private router: Router,\n- public ThemeService: ThemeService\n+ public ThemeService: ThemeService,\n+ public TaskService: TaskService\n ) {\n this.loggeduser = SessionStore.user;\n \ndiff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts\nindex cbc598559..32a14447f 100644\n--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts\n+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts\n@@ -7,13 +7,37 @@ import { IonicModule } from '@ionic/angular';\n import { EventsToApprovePageRoutingModule } from './events-to-approve-routing.module';\n \n import { EventsToApprovePage } from './events-to-approve.page';\n+import { MatInputModule } from '@angular/material/input';\n+import { MatNativeDateModule } from '@angular/material/core';\n+\n+import {\n+ NgxMatDatetimePickerModule,\n+ NgxMatNativeDateModule,\n+ NgxMatTimepickerModule\n+} from '@angular-material-components/datetime-picker';\n+\n+import { ReactiveFormsModule } from '@angular/forms';\n+import { MatButtonModule } from '@angular/material/button';\n+import { MatSelectModule } from '@angular/material/select';\n+import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';\n+\n+\n \n @NgModule({\n imports: [\n CommonModule,\n FormsModule,\n IonicModule,\n- EventsToApprovePageRoutingModule\n+ EventsToApprovePageRoutingModule,\n+ //\n+ MatInputModule,\n+ MatNativeDateModule,\n+ NgxMatDatetimePickerModule,\n+ NgxMatTimepickerModule,\n+ NgxMatNativeDateModule,\n+ NgxMatMomentModule,\n+ MatSelectModule,\n+ MatButtonModule,\n ],\n declarations: [EventsToApprovePage],\n exports: [EventsToApprovePage]\ndiff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\nindex 25ce63e6d..33452bbcf 100644\n--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n@@ -3,9 +3,34 @@\n
\n
\n \n- \n+
\n+ \n+ \n+ \n+ \n+ Para hoje\n+ \n+ \n+ \n+ Novos\n+ \n+ \n+ \n+ Lidos\n+ \n+ \n+ \n+ Não lidos\n+ \n+ \n+ \n+ Todos\n+ \n+ \n+ \n+ \n+
\n+\n
\n \n \n@@ -40,16 +65,22 @@\n *ngFor=\"let event of eventoaprovacaostore.get(segment)\"\n (click)=\"goToEventDetail(event)\"\n >\n- \n-
\n-
\n-

{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}

\n-

{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}

\n-
\n-
\n-

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}

\n-

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}

\n-

{{event.workflowInstanceDataFields.Subject}}

\n+
\n+ \n+
\n+
\n+

{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}

\n+

{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}

\n+
\n+
\n+
{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}
\n+
{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}
\n+
{{event.workflowInstanceDataFields.Subject}}
\n+
\n+
\n+ Para hoje\n+ Nova\n+
\n
\n
\n
\ndiff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss\nindex 39ddfe79c..7a53fe3e7 100644\n--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss\n+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss\n@@ -70,7 +70,7 @@\n float: left;\n margin-left: 10px;\n }\n- .approve-event-detail p{\n+ .approve-event-detail .p{\n //width: 250px;\n font-family: Roboto;\n font-size: 13px;\n@@ -83,8 +83,7 @@\n margin: 0;\n padding-bottom: 10px;\n }\n- .approve-event-detail h3{\n- width: 250px;\n+ .approve-event-detail .h3{\n font-family: Roboto;\n font-size: 15px;\n font-weight: bold;\ndiff --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\nindex b43ffcd67..3363b1a1e 100644\n--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n@@ -12,7 +12,7 @@ import { Storage } from '@ionic/storage';\n import { SessionStore } from 'src/app/store/session.service';\n import { EventsService } from 'src/app/services/events.service';\n import { environment } from 'src/environments/environment';\n-\n+import { TaskService } from 'src/app/services/task.service'\n \n @Component({\n selector: 'app-events-to-approve',\n@@ -35,7 +35,9 @@ export class EventsToApprovePage implements OnInit {\n color: 'pr' | 'mdgpr'\n eventoaprovacaostore = EventoAprovacaoStore;\n environment = environment\n-\n+ filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'\n+ \n+ \n constructor(\n private processes:ProcessesService,\n private modalController: ModalController,\n@@ -44,6 +46,7 @@ export class EventsToApprovePage implements OnInit {\n private sortService: SortService,\n private storage: Storage,\n public eventService: EventsService,\n+ public TaskService: TaskService\n )\n {}", - "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tnew file: src/app/pipes/evento-approve.pipe.spec.ts\n\tnew file: src/app/pipes/evento-approve.pipe.ts\n\tmodified: src/app/pipes/pipes.module.ts\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.module.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.scss\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts", + "lastCommitTime": "'Thu Apr 13 15:44:16 2023 +0100'", + "lastCommitMessage": "add filter to all list and approve event", + "lastCommitNumber": "4900", + "change": "", + "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.html\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.module.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.scss\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.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.module.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.html\n\tmodified: src/app/shared/gabinete-digital/generic/task-list/task-list.page.html\n\tmodified: src/global.scss", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 332bdded24b6461a134807f7d5ae2e7ec11834bb Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 14 Apr 2023 08:12:53 +0100 Subject: [PATCH 3/3] fix gabinete --- version/git-version.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/version/git-version.ts b/version/git-version.ts index f16ddb1ae..f2f81a8a7 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "767170519", - "SHA": "7671705193d70a5c86c17616ae082b3bb6a5d3e9", + "shortSHA": "5aca929c3", + "SHA": "5aca929c3df0dc9bcafda292de6e8df805e472ba", "branch": "feature/gabineteLabels", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Apr 13 15:44:16 2023 +0100'", - "lastCommitMessage": "add filter to all list and approve event", - "lastCommitNumber": "4900", - "change": "", - "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.html\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.module.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.scss\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.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.module.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.html\n\tmodified: src/app/shared/gabinete-digital/generic/task-list/task-list.page.html\n\tmodified: src/global.scss", + "lastCommitTime": "'Thu Apr 13 16:15:46 2023 +0100'", + "lastCommitMessage": "improve", + "lastCommitNumber": "4901", + "change": "diff --git a/src/app/pages/gabinete-digital/event-list/event-list.module.ts b/src/app/pages/gabinete-digital/event-list/event-list.module.ts\nindex bff51dc67..46b14e4c5 100644\n--- a/src/app/pages/gabinete-digital/event-list/event-list.module.ts\n+++ b/src/app/pages/gabinete-digital/event-list/event-list.module.ts\n@@ -11,6 +11,22 @@ import { SharedModule } from 'src/app/shared/shared.module';\n \n import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';\n \n+import { MatInputModule } from '@angular/material/input';\n+\n+import { MatNativeDateModule } from '@angular/material/core';\n+\n+import {\n+ NgxMatDatetimePickerModule,\n+ NgxMatNativeDateModule,\n+ NgxMatTimepickerModule\n+} from '@angular-material-components/datetime-picker';\n+\n+import { ReactiveFormsModule } from '@angular/forms';\n+import { MatButtonModule } from '@angular/material/button';\n+import { MatSelectModule } from '@angular/material/select';\n+import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';\n+\n+\n @NgModule({\n imports: [\n CommonModule,\n@@ -19,6 +35,15 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-\n \n EventListPageRoutingModule,\n BtnModalDismissPageModule,\n+ //\n+ MatInputModule,\n+ MatNativeDateModule,\n+ NgxMatDatetimePickerModule,\n+ NgxMatTimepickerModule,\n+ NgxMatNativeDateModule,\n+ NgxMatMomentModule,\n+ MatSelectModule,\n+ MatButtonModule,\n ],\n declarations: [EventListPage],\n exports: [EventListPage]\ndiff --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\nindex a5f593b34..fd6bf294e 100644\n--- a/src/app/pages/gabinete-digital/event-list/event-list.page.html\n+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html\n@@ -10,6 +10,33 @@\n
\n \n
\n+
\n+ \n+ \n+\n+ \n+ Para hoje\n+ \n+\n+ \n+ Novos\n+ \n+\n+ \n+ Lidos\n+ \n+\n+ \n+ Não lidos\n+ \n+\n+ \n+ Todos\n+ \n+\n+ \n+ \n+
\n \n \n