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..1078b135c 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 @@ -23,7 +23,7 @@ Lidos - + Não lidos @@ -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..191bbb791 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html @@ -18,7 +18,7 @@ Lidos - + Não lidos @@ -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..e6629b3ba 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -26,7 +26,7 @@ Lidos - + Não lidos @@ -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..cd76d0f93 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 @@ -24,7 +24,7 @@ Lidos - + Não lidos @@ -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..0424760b6 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html @@ -22,7 +22,7 @@ Lidos - + Não lidos @@ -77,7 +77,7 @@
- {{ task.Folio }} + {{ task.Folio }} Para hoje Nova
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html index e259769b7..6573aee0a 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html @@ -23,7 +23,7 @@ Lidos - + Não lidos 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/src/app/services/task.service.ts b/src/app/services/task.service.ts index d2f87d0e8..e5fa75790 100644 --- a/src/app/services/task.service.ts +++ b/src/app/services/task.service.ts @@ -33,17 +33,24 @@ export class TaskService { } filter(item, attribute) { + console.log('ITEM-ATRI',item) + console.log('ITEM-ATRI',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..0f87d71fd 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/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html index e6b30c2de..db51022d4 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 @@ -20,7 +20,7 @@ Lidos - + Não lidos diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html index a3785a151..97bfb38e5 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.html +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html @@ -21,7 +21,7 @@ Lidos - + Não lidos 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..5188035b0 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 @@ -18,7 +18,7 @@ Lidos - + Não lidos @@ -63,7 +63,8 @@
- {{ task.Folio || task.workflowInstanceDataFields.Subject }} + {{ task.taskStatus || task.TaskStatus }} + {{ 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..194e4c461 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 @@ -18,7 +18,7 @@ Lidos - + Não lidos @@ -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..32a6e1c6a 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html @@ -18,7 +18,7 @@ Lidos - + Não lidos @@ -58,7 +58,8 @@
- {{ task.Folio }} + {{ task.taskStatus || task.TaskStatus }} + {{ task.Folio }}
@@ -95,7 +96,8 @@
- {{ task.Folio }} + {{ task.taskStatus || task.TaskStatus }} + {{ task.Folio }}
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts index 0fa6f2762..73b6ce9ce 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts @@ -114,6 +114,7 @@ export class DiplomasPage implements OnInit { "Status": element.workflowInstanceDataFields.Status, "Deadline": element.deadline, "TaskStartDate": element.taskStartDate, + "TaskStatus": element.taskStatus } } 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..7e357a598 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..c7459359c 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 @@ -18,7 +18,7 @@ Lidos - + Não lidos @@ -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..13f91383c 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.html +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html @@ -18,7 +18,7 @@ Lidos - + Não lidos @@ -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/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index 39d8bd1de..0ddb671a6 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html @@ -18,7 +18,7 @@ Lidos - + Não lidos diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html index 069841fd7..fccf468b4 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html @@ -18,7 +18,7 @@ Lidos - + Não lidos diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 53f31b337..38a854fa6 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -3,4 +3,4 @@ import { oaprProd } from './suport/oapr' import { doneITProd } from './suport/doneIt' -export const environment: Environment = oaprProd; \ No newline at end of file +export const environment: Environment = doneITProd; \ No newline at end of file diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 8141263a4..2588b107b 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -3,4 +3,4 @@ import { oaprDev } from './suport/oapr' import { doneITDev } from './suport/doneIt' -export const environment: Environment = oaprDev \ No newline at end of file +export const environment: Environment = doneITDev \ No newline at end of file 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 c8fb75dc6..13090ed92 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "53c91682d", - "SHA": "53c91682d333cbc63f30c4d1f1cfb841f918b17c", + "shortSHA": "98bbbc4da", + "SHA": "98bbbc4da21010930ef496259e2c1111af26b9ed", "branch": "feature/gabineteLabels", - "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Apr 13 13:17:39 2023 +0100'", - "lastCommitMessage": "improve code name", - "lastCommitNumber": "4899", + "lastCommitAuthor": "'Eudes Inácio'", + "lastCommitTime": "'Fri Apr 14 10:36:32 2023 +0100'", + "lastCommitMessage": "envirement changed", + "lastCommitNumber": "4900", "change": "", - "changeStatus": "On branch feature/gabineteLabels\nYour branch is behind 'origin/feature/gabineteLabels' by 3 commits, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts", + "changeStatus": "On branch feature/gabineteLabels\nYour branch and 'origin/feature/gabineteLabels' have diverged,\nand have 1 and 3 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\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/pages/gabinete-digital/pendentes/pendentes.page.html\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\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/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-gerar/diplomas-gerar.page.html\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.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/app/shared/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.html\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts\n\tmodified: src/global.scss", "changeAuthor": "eudes.inacio" } \ No newline at end of file