mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 12:37:53 +00:00
12 lines
7.3 KiB
TypeScript
12 lines
7.3 KiB
TypeScript
export let versionData = {
|
|
"shortSHA": "5aca929c3",
|
|
"SHA": "5aca929c3df0dc9bcafda292de6e8df805e472ba",
|
|
"branch": "feature/gabineteLabels",
|
|
"lastCommitAuthor": "'Peter Maquiran'",
|
|
"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 <div class=\"header-title\">\n <label>Eventos para Aprovação</label>\n </div>\n+ <div style=\"float:right\" *ngIf=\"showFilter\">\n+ <mat-form-field class=\"task-filter-input\" appearance=\"none\" color=\"ion-color-secondary\" placeholder=\"Selecione agenda\">\n+ <mat-select [(value)]=\"filterName\">\n+\n+ <mat-option value=\"Para hoje\" >\n+ Para hoje\n+ </mat-option>\n+\n+ <mat-option value=\"Novos\" >\n+ Novos\n+ </mat-option>\n+\n+ <mat-option value=\"Lidos\" >\n+ Lidos\n+ </mat-option>\n+\n+ <mat-option value=\"Não Lidos\" >\n+ Não lidos\n+ </mat-option>\n+\n+ <mat-option value=\"Todos\" >\n+ Todos\n+ </mat-option>\n+\n+ </mat-select>\n+ </mat-form-field>\n+ </div>\n <ion-toolbar>\n <ion-segment [(ngModel)]=\"segment\" (ionChange)=\"segmentChanged($event)\">\n <!-- <ion-segment-button value=\"MDGPR\">\ndiff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.scss b/src/app/pages/gabinete-digital/event-list/event-list.page.scss\nindex 11d6545ef..4297cb229 100644\n--- a/src/app/pages/gabinete-digital/event-list/event-list.page.scss\n+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.scss\n@@ -54,22 +54,26 @@ ion-item-sliding{\n background-color: var(--white);\n border-radius: 5px;\n border-right: 5px solid #99e47b;\n+ border-left: unset !important;\n overflow: auto;\n }\n .content-pr-Pessoal{\n background-color: var(--white);\n border-radius: 5px;\n border-right: 5px solid #958bfc;\n+ border-left: unset !important;\n overflow: auto;\n }\n .content-mdgpr-Oficial{\n border-radius: 5px;\n border-right: 5px solid #ffb703;\n+ border-left: unset !important;\n overflow: auto;\n }\n .content-mdgpr-Pessoal{\n border-radius: 5px;\n border-right: 5px solid #f05d5e;\n+ border-left: unset !important;\n overflow: auto;\n }\n \ndiff --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\nindex 767efac30..e2d208690 100644\n--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts\n+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts\n@@ -42,6 +42,8 @@ export class EventListPage implements OnInit {\n eventsList: any = []\n color: 'pr' | 'mdgpr'\n environment = environment\n+ filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'\n+ showFilter = false\n \n constructor(\n private processes: ProcessesService,\n@@ -60,6 +62,10 @@ export class EventListPage implements OnInit {\n \n ngOnInit() {\n \n+ if(window.location.pathname.includes('gabinete-digital')) {\n+ this.showFilter = true\n+ }\n+ \n if(!this.segment) {\n if(this.eventService.calendarNamesAry.includes('Meu calendario')) {\n this.segment = 'Meu calendario';\ndiff --git a/src/app/shared/agenda/event-list/event-list.module.ts b/src/app/shared/agenda/event-list/event-list.module.ts\nindex c6e334490..3c7e51f94 100644\n--- a/src/app/shared/agenda/event-list/event-list.module.ts\n+++ b/src/app/shared/agenda/event-list/event-list.module.ts\n@@ -8,12 +8,38 @@ import { EventListPageRoutingModule } from './event-list-routing.module';\n \n import { EventListPage } from './event-list.page';\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+\n @NgModule({\n imports: [\n CommonModule,\n FormsModule,\n IonicModule,\n- EventListPageRoutingModule\n+ EventListPageRoutingModule,\n+ //\n+ MatInputModule,\n+ MatNativeDateModule,\n+ NgxMatDatetimePickerModule,\n+ NgxMatTimepickerModule,\n+ NgxMatNativeDateModule,\n+ NgxMatMomentModule,\n+ MatSelectModule,\n+ MatButtonModule,\n ],\n declarations: [EventListPage],\n exports: [EventListPage]",
|
|
"changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: version/git-version.ts\n\nChanges not staged for commit:\n (use \"git add <file>...\" to update what will be committed)\n (use \"git restore <file>...\" to discard changes in working directory)\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.module.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.scss\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.module.ts",
|
|
"changeAuthor": "peter.maquiran"
|
|
} |