From 0b4cafda22aba43e3e2acb6f454b2a8ae51ef467 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 9 Mar 2023 15:15:06 +0100 Subject: [PATCH] remove all date --- .../pages/agenda/new-event/new-event.page.ts | 1 + src/app/pages/search/search.module.ts | 25 +++++++ src/app/pages/search/search.page.html | 25 ++++++- src/app/pages/search/search.page.ts | 67 +++++++++++++++++-- version/git-version.ts | 12 ++-- 5 files changed, 117 insertions(+), 13 deletions(-) diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index f6a3f174a..3b00ac7cb 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -226,6 +226,7 @@ export class NewEventPage implements OnInit { _date .setMinutes(minutes + 15) return _date } + setStartDate() { if(!this.postEvent.StartDate) { this.postEvent.StartDate = this.roundTimeQuarterHour(); diff --git a/src/app/pages/search/search.module.ts b/src/app/pages/search/search.module.ts index 9191a7ca8..27ae27bff 100644 --- a/src/app/pages/search/search.module.ts +++ b/src/app/pages/search/search.module.ts @@ -10,6 +10,21 @@ import { SearchPage } from './search.page'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; /* */ /* import { TagCloudModule } from 'angular-tag-cloud-module'; */ +import { MatDatepickerModule } from '@angular/material/datepicker'; +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: [ @@ -20,6 +35,16 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn- /* */ SearchPageRoutingModule, BtnModalDismissPageModule, + NgxMatDatetimePickerModule, + NgxMatNativeDateModule, + NgxMatTimepickerModule, + NgxMatMomentModule, + MatDatepickerModule, + MatInputModule, + MatNativeDateModule, + ReactiveFormsModule, + MatButtonModule, + MatSelectModule ], declarations: [SearchPage], schemas: [CUSTOM_ELEMENTS_SCHEMA] diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 3bf731fd7..56a9b572b 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -59,18 +59,37 @@ -
  • -
    - +
    + + + + + + + +
    +
    • diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 453e3869d..f0bfa1c51 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, ViewChild } from '@angular/core'; import { ModalController, NavParams } from '@ionic/angular'; import { SearchService } from "../../services/search.service"; import { formatDate } from '@angular/common'; @@ -14,14 +14,40 @@ import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.pag import { Router } from '@angular/router'; import { environment } from 'src/environments/environment'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; +import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; +import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; + +const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { + parse: { + dateInput: "YYYY-MMMM-DD HH:mm" + }, + display: { + dateInput: "DD MMM YYYY H:mm", + monthYearLabel: "MMM YYYY", + dateA11yLabel: "LL", + monthYearA11yLabel: "MMMM YYYY" + } +} @Component({ selector: 'app-search', templateUrl: './search.page.html', styleUrls: ['./search.page.scss'], + providers: [ + { provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS }, + ] }) export class SearchPage implements OnInit { + public showSpinners = true; + public showSeconds = false; + public touchUi = false; + public enableMeridian = false; + public stepHour = 1; + public stepMinute = 15; + public stepSecond = 15; + // + // https params searchSubject: string; searchDocumentDate: string; @@ -61,6 +87,9 @@ export class SearchPage implements OnInit { showSearchInput = false + + @ViewChild('picker1') picker1: any; + constructor(private modalController: ModalController, private search: SearchService, private modalCtrl: ModalController, @@ -213,6 +242,38 @@ export class SearchPage implements OnInit { } + roundTimeQuarterHour(timeToReturn = new Date()) { + let date: any = new Date(timeToReturn) || new Date(); + const minutes = date.getMinutes(); + date.setSeconds(0); + + if(minutes % 15 != 0) { + + if (minutes > 45) { + date.setMinutes(60) + } else if (minutes > 30) { + date.setMinutes(45) + } else if (minutes > 15) { + date.setMinutes(30) + } else if (minutes > 0) { + date.setMinutes(15) + } + + } + + return date + } + + clickDate() { + if(!this.searchDocumentDate) { + this.searchDocumentDate = this.roundTimeQuarterHour() + } + } + + clearInputDocumentDate() { + this.searchDocumentDate = ""; + } + loadWordCloud() { setTimeout(() => { @@ -720,9 +781,7 @@ export class SearchPage implements OnInit { this.searchSender = ""; } - clearInputDocumentDate(){ - this.searchDocumentDate = ""; - } + clearInputOrganicEntity(){ this.searchOrganicEntiry = ""; diff --git a/version/git-version.ts b/version/git-version.ts index 2684cb814..368550285 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "79509a305", - "SHA": "79509a305538f7ae6e4d0327e3a314fe37954f3e", + "shortSHA": "9253c33f0", + "SHA": "9253c33f08f05215aa3d2fc84b8b48f6df66f312", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Mar 9 12:22:54 2023 +0100'", - "lastCommitMessage": "merge", - "lastCommitNumber": "4852", + "lastCommitTime": "'Thu Mar 9 12:56:11 2023 +0100'", + "lastCommitMessage": "fix gabinete", + "lastCommitNumber": "4853", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\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/shared/gabinete-digital/all-processes/all-processes.page.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/search/search.module.ts\n\tmodified: src/app/pages/search/search.page.html\n\tmodified: src/app/pages/search/search.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file