From 2470e0abfc9ad022e8a7a9e9566e52fbe4d9a41e Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 6 Feb 2023 12:11:14 +0100
Subject: [PATCH] fix book meeting modal

---
 .../document-set-up-meeting.page.html         |  2 +-
 .../book-meeting-modal.page.html              | 80 ++-----------------
 .../book-meeting-modal.page.ts                | 14 +---
 version/git-version.ts                        | 12 +--
 4 files changed, 16 insertions(+), 92 deletions(-)

diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
index 676f22833..222fd1dd2 100644
--- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
+++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
@@ -8,7 +8,7 @@
           <!-- *ngIf="p.userRole('PR')" -->
           <!-- *ngIf="p.role(['PR','MD']).permissionAnyOf(['view','edit'])" -->
 
-          <label >Convocar Reunião /././</label>
+          <label >Convocar Reunião</label>
         </div>
       </div>
       <div class="overflow-y-auto content-default-padding">
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 4e7d0f496..11e3c0cba 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
@@ -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">
@@ -87,19 +87,8 @@
             </div>
             <div class="ion-input-class" [class.input-error]="Form?.get('Categories')?.invalid  && validateFrom ">
 
-              <ion-select  placeholder="Selecione tipo de evento*"
-              class="d-block d-md-none"
-              [(ngModel)]="postData.Category"
-              interface="action-sheet"
-              Cancel-text="Cancelar" required>
-                <ion-select-option value="Reunião">Reunião</ion-select-option>
-                <ion-select-option value="Viagem">Viagem</ion-select-option>
-                <ion-select-option value="Conferência">Conferência</ion-select-option>
-                <ion-select-option value="Encontro">Encontro</ion-select-option>
-              </ion-select>
 
-
-              <mat-form-field class="d-none d-md-block" appearance="none" class="width-100" placeholder="Sample Type" required>
+              <mat-form-field appearance="none" class="width-100" placeholder="Sample Type" required>
                 <!-- <input matInput type="text" > -->
                 <mat-select [(ngModel)]="postData.Category" >
                   <mat-option value="Reunião">
@@ -128,23 +117,11 @@
             <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
-              class="d-block d-md-none"
-              placeholder="Início*"
-              [(ngModel)]="postData.StartDate"
-              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="{{ionicMinDate}}"
-              max="2025"
-              value="2020-11-19T11:06Z">
-            </ion-datetime>
 
-            <mat-form-field appearance="none" class="width-100 date-hour-picker  d-md-block">
+            <mat-form-field appearance="none" class="width-100 date-hour-picker">
               <input matInput [ngxMatDatetimePicker]="picker1"
                 placeholder="Choose a date*"
                 [formControl]="dateControlStart"
-                [min]="minDate"
                 [disabled]="disabled"
               >
               <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" (click)="setStartDate()"></mat-datepicker-toggle>
@@ -167,24 +144,13 @@
               <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
             </div>
             <div class="ion-input-class  flex-grow-1" [class.input-error]="Form?.get('Date')?.invalid  && validateFrom ">
-              <ion-datetime
-                class="d-block d-md-none"
-                placeholder="Fim*"
-                [(ngModel)]="postData.EndDate"
-                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="{{ionicMinDate}}"
-                max="2025"
-                value="2020-11-19T11:06Z">
-              </ion-datetime>
 
-              <mat-form-field appearance="none" class="date-hour-picker width-100 d-none d-md-block">
+              <mat-form-field appearance="none" class="date-hour-picker width-100 ">
                 <input matInput [ngxMatDatetimePicker]="fim"
                   placeholder="Fim*"
                   [formControl]="dateControlEnd"
-                  [min]="endMinDate"
                   [disabled]="disabled"
+                  [min] = "dateControlStart.value"
                 >
                 <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" (click)="setEndDate()"></mat-datepicker-toggle>
                 <ngx-mat-datetime-picker #fim
@@ -199,28 +165,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)]="EventRecurrenceType"
-                >
-                  <mat-option
-                  *ngFor="let recurring of recurringTypes" value="{{recurring.Code}}"
-                  >
-                  {{recurring.Description}}
-                  </mat-option>
-                </mat-select>
-              </mat-form-field>
-
-            </div>
-          </div>
-        </div> -->
 
         <div *ngIf="EventRecurrenceType != '-1'" class="container-div width-100">
           <div class="ion-item-class-2 d-flex">
@@ -228,24 +172,13 @@
               <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
             </div>
             <div (click)="openLastOccurrence()" class="ion-input-class flex-grow-1">
-              <!-- <ion-datetime
-                placeholder="Última ocorrência"
-                [(ngModel)]="postEvent.EventRecurrence.LastOccurrence"
-                displayFormat="DD MMM YYYY"
-                monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-                min="2021"
-                max="2045"
-              >
-              </ion-datetime> -->
-              <!-- <ion-input placeholder="Data fim" [(ngModel)]="postData.EndDate"></ion-input> -->
-
-             <!--  [formControl]="dateControlOccurrence" -->
 
               <mat-form-field class="date-hour-picker">
                 <input matInput [ngxMatDatetimePicker]="occurrrence"
                   placeholder="Choose a date"
                   [(ngModel)]="Occurrence"
                   [disabled]="disabled"
+                  [min]="dateStart"
                 >
                 <mat-datepicker-toggle id="last-occurrence" matSuffix [for]="occurrrence"></mat-datepicker-toggle>
                 <ngx-mat-datetime-picker #occurrrence
@@ -254,6 +187,7 @@
                   [stepHour]="stepHour" [stepMinute]="stepMinute"
                   [stepSecond]="stepSecond"
                   [touchUi]="touchUi"
+                  
                   >
                 </ngx-mat-datetime-picker>
               </mat-form-field>
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 f4c86aaa9..5a2398734 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
@@ -75,21 +75,11 @@ export class BookMeetingModalPage implements OnInit {
   showLoader = false
 
   get dateStart () {
-    if( window.innerWidth < 801) {
-      return this.postData.StartDate;
-    }
-    else{
-      return this.dateControlStart.value;
-    }
+    return this.dateControlStart.value;
   }
 
   get dateEnd () {
-    if( window.innerWidth < 801) {
-      return this.postData.EndDate;
-    }
-    else{
-      return this.dateControlEnd.value;
-    }
+    return this.dateControlEnd.value;
   }
 
   @ViewChild('picker') picker: any;
diff --git a/version/git-version.ts b/version/git-version.ts
index 10972fa7b..b0c55bd13 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "092f5f7f6",
-  "SHA": "092f5f7f6feec5064a7eb8c538d3e0a072bd602b",
+  "shortSHA": "009f2fa92",
+  "SHA": "009f2fa9283b293f24900817e05b25aeb1e45cb2",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Feb 6 10:55:44 2023 +0100'",
-  "lastCommitMessage": "improve message",
-  "lastCommitNumber": "4730",
+  "lastCommitTime": "'Mon Feb 6 11:38:15 2023 +0100'",
+  "lastCommitMessage": "improve",
+  "lastCommitNumber": "4731",
   "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/modals/document-set-up-meeting/document-set-up-meeting.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/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",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file