From 2d4216a6b0aa5e4ce24c8a34b949d21bd937048c Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 5 Jul 2021 11:15:55 +0100 Subject: [PATCH] Improve validation for desktop --- .../book-meeting-modal.page.html | 44 +++++++++++++------ .../book-meeting-modal.page.scss | 2 +- .../book-meeting-modal.page.ts | 10 ++++- .../expedient-task-modal.page.scss | 1 + .../expediente-detail.page.ts | 19 ++++---- .../edit-event-to-approve.page.html | 7 +-- .../shared/agenda/new-event/new-event.page.ts | 2 +- src/global.scss | 16 +++++-- 8 files changed, 66 insertions(+), 35 deletions(-) diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html index b7a5cff9d..714f59e17 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -9,24 +9,41 @@
-
+
+
+
+
+ Campo obrigatório. +
+
+ O campo deve ter pelo menos 4 caracteres. +
+
+
+
-
+
- - - Campo obrigatório - +
+
+
+
+ Campo obrigatório. +
+
+ O campo deve ter pelo menos 4 caracteres. +
+
@@ -34,7 +51,7 @@
-
+
- + Oficial @@ -79,11 +96,11 @@ value="2020-11-19T11:06Z"> - + @@ -105,7 +122,7 @@
-
+
- + @@ -168,6 +185,7 @@ value="false" interface="action-sheet" required + appearance="none" > diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss index 7a4a2d624..24d21b73b 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss @@ -205,4 +205,4 @@ .close-button { display: block !important; } -} \ No newline at end of file +} diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 85e72fbce..13ca787db 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -54,8 +54,11 @@ export class BookMeetingModalPage implements OnInit { public showSeconds = false; public touchUi = false; public enableMeridian = false; - public minDate: any; - public maxDate: any; + public minDate = new Date(); + + // curent timestamp + 15 minutes + public endMinDate = new Date(new Date().getTime() + 15 * 60000); + public stepHour = 1; public stepMinute = 5; public stepSecond = 5; @@ -138,6 +141,9 @@ export class BookMeetingModalPage implements OnInit { /* Set + 30minutes to seleted datetime */ let selectedEndDate = new Date(); /* this.postData.EndDate = new Date(selectedEndDate.setMinutes(new Date().getMinutes() + 30)); */ + + this.dateControlStart = new FormControl(moment(new Date())); + this.dateControlEnd = new FormControl(moment(new Date(new Date().getTime() + 15 * 60000))); } ngOnInit() { diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss index dc6eba1ed..c082ed853 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss @@ -53,6 +53,7 @@ float: left; overflow: hidden; flex: 1; + min-height: 44px; } .ion-input-class-no-height{ border: 1px solid #ebebeb; diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index e5271162e..2f1abe4e9 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -3,20 +3,15 @@ import { ProcessesService } from 'src/app/services/processes.service'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { EventsService } from 'src/app/services/events.service'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; -import { DailyWorkTask } from '../../../../models/dailyworktask.model'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; -import { formatDate } from '@angular/common'; import { Event } from '../../../../models/event.model'; -import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular'; -import { AlertService } from 'src/app/services/alert.service'; +import { ModalController, PopoverController } from '@ionic/angular'; import { ExpedientTaskModalPage } from '../expedient-task-modal/expedient-task-modal.page'; import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.page'; import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; import { momentG } from 'src/plugin/momentG' import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page'; import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page'; -import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page'; -import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page'; import { ToastService } from 'src/app/services/toast.service'; @Component({ @@ -43,20 +38,16 @@ export class ExpedienteDetailPage implements OnInit { hideSendToPendentes = true - constructor( private processes: ProcessesService, private iab: InAppBrowser, private attachments: AttachmentsService, private events: EventsService, - private menu: MenuController, private router: Router, private modalController: ModalController, - private alertService: AlertService, public popoverController: PopoverController, private activatedRoute: ActivatedRoute, private toastService: ToastService, - private animationController: AnimationController, ) { this.activatedRoute.paramMap.subscribe(params => { if(params["params"].SerialNumber) { @@ -164,6 +155,11 @@ export class ExpedienteDetailPage implements OnInit { }); }) + + + console.log('this.task', this.task) + console.log('this.task.DocumentURL', this.task.DocumentURL) + }); @@ -185,9 +181,10 @@ export class ExpedienteDetailPage implements OnInit { } } - viewDocument(){ + viewDocument() { this.processes.GetDocumentUrl(this.task.DocId, this.task.FsId).subscribe(res=>{ const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); + const browser = this.iab.create(url,"_blank"); browser.show(); diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html index aef08ebf8..ade072d39 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html @@ -70,7 +70,7 @@ - + Oficial @@ -111,7 +111,7 @@ > - + - + diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 00a5f9554..073538d0a 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -134,7 +134,7 @@ export class NewEventPage implements OnInit { this.loggeduser = userService.ValidatedUser; this.dateControlStart = new FormControl(moment(new Date())); - this.dateControlEnd = new FormControl(moment(new Date())); + this.dateControlEnd = new FormControl(moment(new Date(new Date().getTime() + 15 * 60000))); } ngOnInit() { diff --git a/src/global.scss b/src/global.scss index 1d64dd900..ff578d2b0 100644 --- a/src/global.scss +++ b/src/global.scss @@ -955,11 +955,11 @@ background: rgb(92, 92, 92); .date-hour-picker { margin-top: -6px; - + label#mat-form-field-label-7 { display: none; } - + .span.ng-tns-c193-4, .ng-star-inserted { // display: none; } @@ -967,7 +967,7 @@ background: rgb(92, 92, 92); .ng-star-inserted{ // display: none; position: absolute; - width: 447px; + width: 100%; height: 43px; opacity: 0; button { @@ -975,7 +975,15 @@ background: rgb(92, 92, 92); height: 100%; } } -} + button { + width: 100%; + height: 100%; + } + + .mat-datepicker-toggle, mat-datepicker-toggle { + width: 100%; + } + } .mat-active span { color: #0d89d1 !important;