change date picker

src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html

@@ -164,6 +164,7 @@
                   placeholder="Fim*"
                   [(ngModel)]="postData.EndDate"
                   [disabled]="disabled"
+                  [min]="postData.StartDate"
                 >
                 <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" (click)="setEndDate()"></mat-datepicker-toggle>
                 <ngx-mat-datetime-picker #fim

src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts

@@ -165,6 +165,10 @@ export class DocumentSetUpMeetingPage implements OnInit {
     this.validateFrom  = true
   }
 
+  get dateValid() {
+    return new Date(this.postData.StartDate).getTime() < new Date(this.postData.EndDate).getTime() ? 'ok': null
+  }
+
   injectValidation() {
 
     this.Form = new FormGroup({
@@ -178,7 +182,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
       CalendarName: new FormControl(this.postData.CalendarName, [
         // Validators.required
       ]),
-      Date: new FormControl( (this.postData.StartDate < this.postData.EndDate), [
+      Date: new FormControl( (this.dateValid), [
         Validators.required
       ]),
       participantes: new FormControl(this.taskParticipants, [

src/app/pages/agenda/new-event/new-event.page.html

@@ -122,7 +122,6 @@
               placeholder="Data Inicio*"
               [(ngModel)]="postEvent.StartDate"
               [disabled]="disabled"
-              [min]="currentDate"
             >
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" (click)="setStartDate()"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker1
@@ -171,28 +170,6 @@
       </div>
     </div>
 
-    <!-- <div class="container-div width-100">
-      <div class="ion-item-class-2 d-flex">
-        <div class="ion-icon-class">
-          <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
-        </div>
-        <div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('dateOccurrence')?.invalid  && validateFrom ">
-
-          <mat-form-field   appearance="none" floatLabel="never" class="width-100" value="false" interface="action-sheet" required>
-            <mat-select placeholder="Selecione repetição*"
-            [(ngModel)]="postEvent.EventRecurrence.Type"
-            (ngModelChange)="onSelectedRecurringChanged($event)">
-              <mat-option
-              *ngFor="let recurring of recurringTypes" value="{{recurring.Code}}"
-              >
-              {{recurring.Description}}
-              </mat-option>
-            </mat-select>
-          </mat-form-field>
-
-        </div>
-      </div>
-    </div> -->
 
     <div *ngIf="postEvent.EventRecurrence.Type != '-1'" class="container-div width-100">
       <div class="ion-item-class-2 d-flex">

src/app/pages/chat/chat.page.ts

@@ -410,7 +410,7 @@ export class ChatPage implements OnInit {
 
   doRefresh(event) {
     setTimeout(() => {
-      event.target.complete();
+      event?.target?.complete();
     }, 1000);
   }
 

src/app/pages/events/edit-event/edit-event.page.ts

@@ -211,9 +211,9 @@ export class EditEventPage implements OnInit {
   }
   doRefresh(event){
     /* this.RefreshEvents(); */
-    event.target.complete();
+    event?.target?.complete();
      setTimeout(() => {
-       event.target.complete();
+       event?.target?.complete();
      }, 2000);
 
   }

src/app/pages/events/event-detail-modal/event-detail-modal.page.ts

@@ -209,9 +209,9 @@ export class EventDetailModalPage implements OnInit {
   }
   doRefresh(event){
     /* this.RefreshEvents(); */
-    event.target.complete();
+    event?.target?.complete();
      setTimeout(() => {
-       event.target.complete();
+       event?.target?.complete();
      }, 2000);
 
   }

src/app/pages/events/event-detail/event-detail.page.ts

@@ -207,9 +207,9 @@ export class EventDetailPage implements OnInit {
   }
   doRefresh(event){
     /* this.RefreshEvents(); */
-    event.target.complete();
+    event?.target?.complete();
      setTimeout(() => {
-       event.target.complete();
+       event?.target?.complete();
      }, 2000);
 
   }

src/app/pages/events/events.page.ts

@@ -129,7 +129,7 @@ export class EventsPage implements OnInit {
   doRefresh(event) {
     if (event) {
       setTimeout(() => {
-        event.target.complete();
+        event?.target?.complete();
       }, 2000);
     }
     this.RefreshEvents();

src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts

@@ -227,7 +227,7 @@ export class DespachosPrPage implements OnInit {
   doRefresh(event) {
     if (event) {
       setTimeout(() => {
-        event.target.complete();
+        event?.target?.complete();
       }, 2000);
     }
     setTimeout(() => {

src/app/pages/gabinete-digital/despachos/despachos.page.ts

@@ -117,7 +117,7 @@ export class DespachosPage implements OnInit {
     this.LoadList();
 
     setTimeout(() => {
-      event.target.complete();
+      event?.target?.complete();
     }, 2000);
   }
 

src/app/pages/gabinete-digital/event-list/event-list.page.ts

@@ -232,7 +232,7 @@ export class EventListPage implements OnInit {
 
     setTimeout(() => {
       this.LoadToApproveEvents();
-      event.target.complete();
+      event?.target?.complete();
     }, 1000);
   }
 

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html

@@ -4,7 +4,7 @@
     <div class="content d-flex flex-column width-100 height-100 ">
       <div class="header-content header-default-padding">
         <div class="header-title">
-          <label>Convocar Reunião::..::</label>
+          <label>Convocar Reunião</label>
         </div>
       </div>
       <div class="overflow-y-auto content-default-padding">

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts

@@ -224,11 +224,7 @@ export class BookMeetingModalPage implements OnInit {
   }
 
   get dateValid() {
-    if (window.innerWidth <= 800) {
+    return new Date(this.dateControlStart.value).getTime() < new Date(this.dateControlEnd.value).getTime() ? 'ok': null
-      return this.postData.StartDate < this.postData.EndDate? ['ok']: []
-    } else {
-      return ['ok']
-    }
   }
 
   injectValidation() {

src/app/pages/gabinete-digital/expediente/expediente.page.ts

@@ -103,7 +103,7 @@ export class ExpedientePage implements OnInit {
   doRefresh(event) {
     this.LoadList();
     setTimeout(() => {
-      event.target.complete();
+      event?.target?.complete();
     }, 1000);
   }
 

src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts

@@ -95,7 +95,7 @@ export class ExpedientesPrPage implements OnInit {
   doRefresh(event) {
     this.LoadList();
     setTimeout(() => {
-      event.target.complete();
+      event?.target?.complete();
     }, 2000);
   }
 

src/app/pages/gabinete-digital/pedidos/pedidos.page.ts

@@ -299,7 +299,7 @@ export class PedidosPage implements OnInit {
   doRefresh(event) {
     this.LoadList();
     setTimeout(() => {
-      event.target.complete();
+      event?.target?.complete();
     }, 2000);
   }
 

src/app/pages/gabinete-digital/pendentes/pendentes.page.ts

@@ -170,7 +170,7 @@ export class PendentesPage implements OnInit {
     this.LoadList();
 
     setTimeout(() => {
-      event.target.complete();
+      event?.target?.complete();
     }, 2000);
   }
 

src/app/pages/publications/new-action/new-action.page.html

@@ -28,17 +28,9 @@
         <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
       </div>
       <div class="ion-input-class" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
-        <ion-datetime
-          [(ngModel)]="folder.DateBegin"
-          class="d-block d-md-none"
-          placeholder="Data início*"
-          displayFormat="D MMM YYYY H:mm"
-          minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
-          monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-          max="2025">
-        </ion-datetime>
 
-        <mat-form-field appearance="none" class="date-hour-picker d-none d-md-block">
+
+        <mat-form-field appearance="none" class="date-hour-picker">
           <input matInput [ngxMatDatetimePicker]="picker1"
             placeholder="Data inicio*"
             [formControl]="dateControlStart"
@@ -59,28 +51,18 @@
     </div>
   </div>
 
+
   <div class="container-div">
     <div class="ion-item-class-2">
       <div class="ion-icon-class">
         <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
       </div>
-      <div class="ion-input-class" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
+      <div class="ion-input-class" [class.input-error]="Form?.get('Date')?.invalid && validateFrom">
-        <ion-datetime
-          class="d-block d-md-none"
-          [(ngModel)]="folder.DateEnd"
-          placeholder="Data de fim*"
-          displayFormat="D MMM YYYY H:mm"
-          minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
-          monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-          min="{{minDate}}"
-          max="2025">
-        </ion-datetime>
 
-        <mat-form-field appearance="none" class="date-hour-picker d-none d-md-block">
+        <mat-form-field appearance="none" class="date-hour-picker">
           <input matInput [ngxMatDatetimePicker]="fim"
             placeholder="Data de fim*"
             [formControl]="dateControlEnd"
-            [min]="endMinDate"
             [disabled]="disabled"
           >
           <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" (click)="setEndDate()"></mat-datepicker-toggle>

src/app/pages/publications/new-action/new-action.page.ts

@@ -75,8 +75,8 @@ export class NewActionPage implements OnInit {
     this.dateControlStart = new FormControl(moment(new Date()));
     this.dateControlEnd = new FormControl(moment(new Date(new Date().getTime() + 15 * 60000)));
 
-    // this.folder.DateBegin =  new Date().toISOString()
+    // this.dateControlStart.value =  new Date().toISOString()
-    // this.folder.DateEnd = (new Date(new Date().getTime() + 15 * 60000)).toISOString()
+    // this.dateControlEnd.value = (new Date(new Date().getTime() + 15 * 60000)).toISOString()
 
   }
 
@@ -85,33 +85,18 @@ export class NewActionPage implements OnInit {
     // this.setDefaultTime()
   }
 
-  setDefaultTime() {
-    this.folder.DateBegin =  new Date().toISOString()
-    this.folder.DateEnd = (new Date(new Date().getTime() + 15 * 60000)).toISOString()
-  }
 
   segmentChanged(ev: any) {
     
   }
 
   get dateValid() {
-    var validado: boolean;
+    return new Date(this.dateStart).getTime() < new Date(this.dateEnd).getTime() ? 'ok': null
-
-    if (window.innerWidth <= 800) {
-      if ((this.folder.DateBegin < this.folder.DateEnd)) {
-        validado = true;
-      } else {
-        validado = false;
-      }
-      return validado == true ? ['ok']: [];
-    } else {
-      return ['ok']
-    }
   }
 
   runValidation() {
     this.validateFrom  = true;
-    if(new Date(this.folder.DateBegin).getTime() > new Date(this.folder.DateEnd).getTime()){
+    if(new Date(this.dateControlStart.value).getTime() > new Date(this.dateControlEnd.value).getTime()){
       this.toastService._badRequest("A data de início não pode ser superior a data de fim");
     }
   }
@@ -144,8 +129,8 @@ export class NewActionPage implements OnInit {
       ProcessId: null,
       Description: this.folder.Description,
       Detail: this.folder.Detail,
-      DateBegin: this.folder.DateBegin,
+      DateBegin: this.dateControlStart.value,
-      DateEnd: this.folder.DateEnd,
+      DateEnd: this.dateControlEnd.value,
       ActionType: this.segment,
     }
 

src/app/pages/publications/publication-detail/publication-detail.page.ts

@@ -54,7 +54,7 @@ export class PublicationDetailPage implements OnInit {
     this.getPublicationDetail();
 
     setTimeout(() => {
-      event.target.complete();
+      event?.target?.complete();
     }, 2000);
   }
 

src/app/pages/publications/publications.page.ts

@@ -124,7 +124,7 @@ export class PublicationsPage implements OnInit {
   doRefresh(event) {
     this.getActions();
     setTimeout(() => {
-      event.target.complete();
+      event?.target?.complete();
     }, 250);
   }
 

src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts

@@ -63,7 +63,7 @@ export class PublicationDetailPage implements OnInit {
     this.getPublicationDetail();
 
     setTimeout(() => {
-      event.target.complete();
+      event?.target?.complete();
     }, 2000);
   }
 

src/app/pages/publications/view-publications/view-publications.page.ts

@@ -98,7 +98,7 @@ export class ViewPublicationsPage implements OnInit {
       //this.testForkJoin()
       this.getPublicationDetail();
       this.getPublicationsIds();
-      event.target.complete();
+      event?.target?.complete();
     //}, 3000);
 
   }

src/app/services/events/edit-event/edit-event.page.ts

@@ -206,9 +206,9 @@ export class EditEventPage implements OnInit {
   }
   doRefresh(event){
     /* this.RefreshEvents(); */
-    event.target.complete();
+    event?.target?.complete();
      setTimeout(() => {
-       event.target.complete();
+       event?.target?.complete();
      }, 2000);
 
   }

src/app/services/events/event-detail-modal/event-detail-modal.page.ts

@@ -203,9 +203,9 @@ export class EventDetailModalPage implements OnInit {
   }
   doRefresh(event){
     /* this.RefreshEvents(); */
-    event.target.complete();
+    event?.target?.complete();
      setTimeout(() => {
-       event.target.complete();
+       event?.target?.complete();
      }, 2000);
 
   }

src/app/services/events/event-detail/event-detail.page.ts

@@ -204,9 +204,9 @@ export class EventDetailPage implements OnInit {
   }
   doRefresh(event){
     /* this.RefreshEvents(); */
-    event.target.complete();
+    event?.target?.complete();
      setTimeout(() => {
-       event.target.complete();
+       event?.target?.complete();
      }, 2000);
 
   }

src/app/services/events/events.page.ts

@@ -125,7 +125,7 @@ export class EventsPage implements OnInit {
   doRefresh(event) {
     this.RefreshEvents();
     this.LoadList();
-    event.target.complete();
+    event?.target?.complete();
   }
 
   onSegmentChange() {

src/app/shared/agenda/event-list/event-list.page.ts

@@ -168,7 +168,7 @@ export class EventListPage implements OnInit {
     this.LoadToApproveEvents();
     
     setTimeout(() => {
-      event.target.complete();
+      event?.target?.complete();
     }, 2000);
   }
 

src/app/shared/gabinete-digital/all-processes/all-processes.page.ts

@@ -62,7 +62,7 @@ export class AllProcessesPage implements OnInit {
   doRefresh(event) {
     if (event) {
       setTimeout(() => {
-        event.target.complete();
+        event?.target?.complete();
       }, 2000);
     }
     setTimeout(() => {

src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts

@@ -89,13 +89,13 @@ constructor (
   doRefresh(event) {
     if (event) {
       setTimeout(() => {
-        event.target.complete();
+        event?.target?.complete();
       }, 2000);
     }
     
     setTimeout(() => {
       this.LoadList();
-      //event.target.complete();
+      //event?.target?.complete();
     }, 1000);
   }
 

src/app/shared/gabinete-digital/despachos/despachos.page.ts

@@ -49,7 +49,7 @@ export class DespachosPage implements OnInit {
   doRefresh(event) {
     if (event) {
       setTimeout(() => {
-        event.target.complete();
+        event?.target?.complete();
       }, 2000);
     }
 

src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts

@@ -52,7 +52,7 @@ export class DiplomasAssinarPage implements OnInit {
   doRefresh(event) {
     if (event) {
       setTimeout(() => {
-        event.target.complete();
+        event?.target?.complete();
       }, 2000);
     }
 

src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts

@@ -41,7 +41,7 @@ export class DiplomasGerarPage implements OnInit {
   doRefresh(event) {
     if (event) {
       setTimeout(() => {
-        event.target.complete();
+        event?.target?.complete();
       }, 2000);
     }
     

src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts

@@ -97,7 +97,7 @@ export class ExpedientsPage implements OnInit {
   doRefresh(event) {
     if (event) {
       setTimeout(() => {
-        event.target.complete();
+        event?.target?.complete();
       }, 2000);
     }
       setTimeout(() => {

src/app/shared/gabinete-digital/diplomas/diplomas.page.ts

@@ -127,7 +127,7 @@ export class DiplomasPage implements OnInit {
   doRefresh(event) {
     if (event) {
       setTimeout(() => {
-        event.target.complete();
+        event?.target?.complete();
       }, 2000);
     }
 

src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts

@@ -87,7 +87,7 @@ export class ExpedientesPrPage implements OnInit {
   doRefresh(event) {
     this.LoadList();
     setTimeout(() => {
-      event.target.complete();
+      event?.target?.complete();
     }, 2000);
   }
 

src/app/shared/gabinete-digital/expedients/expedients.page.ts

@@ -96,7 +96,7 @@ export class ExpedientsPage implements OnInit {
   doRefresh(event) {
     if (event) {
       setTimeout(() => {
-        event.target.complete();
+        event?.target?.complete();
       }, 2000);
     }
 

src/app/shared/gabinete-digital/pedidos/pedidos.page.ts

@@ -124,7 +124,7 @@ export class PedidosPage implements OnInit {
   doRefresh(event) {
     if (event) {
       setTimeout(() => {
-        event.target.complete();
+        event?.target?.complete();
       }, 2000);
     }
     setTimeout(() => {

src/app/shared/gabinete-digital/pendentes/pendentes.page.ts

@@ -90,7 +90,7 @@ export class PendentesPage implements OnInit {
   doRefresh(event) {
     if (event) {
       setTimeout(() => {
-        event.target.complete();
+        event?.target?.complete();
       }, 2000);
     }
 

src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts

@@ -54,7 +54,7 @@ export class PublicationDetailPage implements OnInit {
     this.getPublicationDetail();
 
     setTimeout(() => {
-      event.target.complete();
+      event?.target?.complete();
     }, 2000);
   }
 

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "009f2fa92",
+  "shortSHA": "2470e0abf",
-  "SHA": "009f2fa9283b293f24900817e05b25aeb1e45cb2",
+  "SHA": "2470e0abfc9ad022e8a7a9e9566e52fbe4d9a41e",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Feb 6 11:38:15 2023 +0100'",
+  "lastCommitTime": "'Mon Feb 6 12:11:14 2023 +0100'",
-  "lastCommitMessage": "improve",
+  "lastCommitMessage": "fix book meeting modal",
-  "lastCommitNumber": "4731",
+  "lastCommitNumber": "4732",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts",
+  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.html\n\tmodified:   src/app/pages/chat/chat.page.ts\n\tmodified:   src/app/pages/events/edit-event/edit-event.page.ts\n\tmodified:   src/app/pages/events/event-detail-modal/event-detail-modal.page.ts\n\tmodified:   src/app/pages/events/event-detail/event-detail.page.ts\n\tmodified:   src/app/pages/events/events.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos/despachos.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified:   src/app/pages/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified:   src/app/pages/publications/new-action/new-action.page.html\n\tmodified:   src/app/pages/publications/new-action/new-action.page.ts\n\tmodified:   src/app/pages/publications/publication-detail/publication-detail.page.ts\n\tmodified:   src/app/pages/publications/publications.page.ts\n\tmodified:   src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified:   src/app/pages/publications/view-publications/view-publications.page.ts\n\tmodified:   src/app/services/events/edit-event/edit-event.page.ts\n\tmodified:   src/app/services/events/event-detail-modal/event-detail-modal.page.ts\n\tmodified:   src/app/services/events/event-detail/event-detail.page.ts\n\tmodified:   src/app/services/events/events.page.ts\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.ts\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.ts\n\tmodified:   src/app/shared/gabinete-digital/despachos/despachos.page.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified:   src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified:   src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified:   src/app/shared/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified:   src/app/shared/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified:   src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified:   version/git-version.ts",
   "changeAuthor": "peter.maquiran"
 }