Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

src/app/modals/create-process/create-process.page.html

@@ -176,6 +176,7 @@
         (setIntervenient)="setIntervenient($event)"
         (setIntervenientCC)="setIntervenientCC($event)"
         (setContact)="setContact($event)"
+        (dynamicSetIntervenient)="dynamicSetIntervenient($event)"
       ></app-attendee-modal>
     </div>
 

src/app/modals/create-process/create-process.page.ts

@@ -647,6 +647,12 @@ export class CreateProcessPage implements OnInit {
     
   }
 
+
+  dynamicSetIntervenient({taskParticipants, taskParticipantsCc}){
+    this.taskParticipants = taskParticipants;
+    this.taskParticipantsCc = taskParticipantsCc;
+  }
+
   async setIntervenient(data) {
     this.taskParticipants = data;
   }

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

@@ -21,6 +21,8 @@ export class EditEventPage implements OnInit {
 
   Form: FormGroup;
   validateFrom = false
+  public endMinDate = new Date(new Date().getTime() + 15 * 60000);
+  public minDate = new Date().toISOString().slice(0,10)
   
   postEvent: Event;
   isRecurring:string;
@@ -32,7 +34,6 @@ export class EditEventPage implements OnInit {
   eventAttendees: EventPerson[];
   selectedSegment: string;
   selectedDate: Date;
-  minDate: string;
   initCalendarName: string;
   caller:string;
   recurringTypes: any;
@@ -44,6 +45,8 @@ export class EditEventPage implements OnInit {
   taskParticipantsCc: any = [];
   adding: "intervenient" | "CC" = "intervenient";
 
+  
+
 
   showAttendees = false;
 
@@ -165,6 +168,7 @@ export class EditEventPage implements OnInit {
       IsRecurring: new FormControl(this.postEvent.IsRecurring, [
         Validators.required
       ]),
+      
       // participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [
       //   Validators.required
       // ]),

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html

@@ -219,6 +219,7 @@
         (setIntervenient)="setIntervenient($event)"
         (setIntervenientCC)="setIntervenientCC($event)"
         (setContact)="setContact($event)"
+        (dynamicSetIntervenient)="dynamicSetIntervenient($event)"
       ></app-attendee-modal>
     </div>
 

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

@@ -48,7 +48,7 @@ export class ExpedienteDetailPage implements OnInit {
     public popoverController: PopoverController,
     private activatedRoute: ActivatedRoute,
     private toastService: ToastService,
-    ) {
+  ) {
       this.activatedRoute.paramMap.subscribe(params => {
         if(params["params"].SerialNumber) {
           this.serialnumber = params["params"].SerialNumber;
@@ -57,7 +57,7 @@ export class ExpedienteDetailPage implements OnInit {
           this.caller = params["params"].caller;
         }
       });
-    }
+  }
 
   ngOnInit() {
     this.LoadTaskDetail(this.serialnumber);

src/app/shared/agenda/edit-event/edit-event.page.html

@@ -112,7 +112,7 @@
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
-        <div class="ion-input-class flex-grow-1">
+        <div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Date')?.invalid  && validateFrom ">
 
           <mat-form-field appearance="none" floatLabel="never" class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="picker1"
@@ -127,6 +127,7 @@
               [showSeconds]="showSeconds"
               [stepHour]="stepHour" [stepMinute]="stepMinute"
               [stepSecond]="stepSecond"
+              [min]="endMinDate"
               [touchUi]="touchUi">
             </ngx-mat-datetime-picker>
           </mat-form-field>
@@ -140,7 +141,7 @@
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
-        <div class="ion-input-class flex-grow-1">
+        <div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Date')?.invalid  && validateFrom ">
 
           <mat-form-field appearance="none" floatLabel="never" floatLabel="never" class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="fim"

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

@@ -20,7 +20,7 @@ import * as moment from 'moment';
 })
 
 export class EditEventPage implements OnInit {
-
+  
   stEvent: Event;
   isRecurring:string;
   isEventEdited: boolean;
@@ -42,7 +42,7 @@ export class EditEventPage implements OnInit {
   public touchUi = false;
   public enableMeridian = false;
   public minDate = new Date().toISOString().slice(0,10)
-  public endMinDate = new Date(new Date().getTime() + 15 * 60000);
+  public endMinDate = new Date(new Date().getTime() + 15 * 60000).toISOString().slice(0,10)
   public maxDate: any;
   public stepHour = 1;
   public stepMinute = 5;
@@ -219,6 +219,9 @@ export class EditEventPage implements OnInit {
       participantes: new FormControl(this.taskParticipants, [
         Validators.required
       ]),
+      Date: new FormControl(this.dateControlStart.toLocaleString() > this.dateControlEnd.toLocaleString()? 'ok': null,[
+        Validators.required
+      ]),
 
     })
   }

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

@@ -266,6 +266,9 @@ export class NewEventPage implements OnInit {
       participantes: new FormControl(this.taskParticipants, [
         Validators.required
       ]),
+      Date: new FormControl(this.dateControlStart.toLocaleString() > this.dateControlEnd.toLocaleString()? 'ok': null,[
+        Validators.required
+      ]),
 
     })
   }