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

src/app/models/event.model.ts

@@ -19,7 +19,7 @@ export class Event{
     AppointmentState: number;
     TimeZone: string;
     Organizer: string;
-    Categories: string[];
+    Categories: string;
     HasAttachments: boolean;
     EventRecurrence?: EventRecurrence;
 

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

@@ -74,7 +74,7 @@
 
           <div *ngIf="Form && validateFrom" >
             <div *ngIf="Form.get('CalendarName').invalid " class="input-errror-message">
-              {{ postEvent.Categories[0] }}
+              {{ postEvent.Categories }}
               <div *ngIf="Form.get('CalendarName').errors?.required">
                 Campo obrigatório.
               </div>
@@ -88,8 +88,8 @@
               </div>
               <div class="ion-input-class" [class.input-error]="Form?.get('Categories')?.invalid  && validateFrom ">
                 <ion-select  placeholder="Selecione tipo de evento*"
-                [(ngModel)]="postEvent.Categories[0]"
+                [(ngModel)]="postEvent.Categories"
-                selectedText="{{postEvent.Categories[0]}}"
+                selectedText="{{postEvent.Categories}}"
                 interface="action-sheet"
                 Cancel-text="Cancelar" required>
                   <ion-select-option value="Reunião">Reunião</ion-select-option>
@@ -103,7 +103,7 @@
 
           <div *ngIf="Form && validateFrom" >
             <div *ngIf="Form.get('Categories').invalid " class="input-errror-message">
-              {{ postEvent.Categories[0] }}
+              {{ postEvent.Categories}}
               <div *ngIf="Form.get('Categories').errors?.required">
                 Campo obrigatório.
               </div>

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

@@ -162,7 +162,7 @@ export class EditEventPage implements OnInit {
       CalendarName: new FormControl(this.postEvent.CalendarName, [
         Validators.required
       ]),
-      Categories: new FormControl(this.postEvent.Categories[0], [
+      Categories: new FormControl(this.postEvent.Categories, [
         Validators.required
       ]),
       IsRecurring: new FormControl(this.postEvent.IsRecurring, [

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

@@ -90,7 +90,7 @@
         </div>
         <div class="ion-input-class" [class.input-error]="Form?.get('Categories')?.invalid  && validateFrom ">
           <ion-select  placeholder="Selecione tipo de evento*"
-          [(ngModel)]="postEvent.Categories[0]" 
+          [(ngModel)]="postEvent.Categories"
           interface="action-sheet"
           Cancel-text="Cancelar" required>
             <ion-select-option value="Reunião">Reunião</ion-select-option>
@@ -104,7 +104,7 @@
 
     <!-- <div *ngIf="Form && validateFrom" >
       <div *ngIf="Form.get('Categories').invalid " class="input-errror-message">
-        {{ postEvent.Categories[0] }}
+        {{ postEvent.Categories }}
         <div *ngIf="Form.get('Categories').errors?.required">
           Campo obrigatório.
         </div>

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

@@ -114,7 +114,7 @@ export class NewEventPage implements OnInit {
         AppointmentState: 0,
         TimeZone: '',
         Organizer: '',
-        Categories: ['Reunião'],
+        Categories: 'Reunião',
         HasAttachments: false,
         EventRecurrence: {Type:'-1'},
       };
@@ -136,7 +136,7 @@ export class NewEventPage implements OnInit {
         AppointmentState: 0,
         TimeZone: '',
         Organizer: '',
-        Categories: ['Reunião'],
+        Categories: 'Reunião',
         HasAttachments: false,
         EventRecurrence: {Type:'-1'},
       };
@@ -207,7 +207,7 @@ export class NewEventPage implements OnInit {
       Date: new FormControl(this.dateValid, [
         Validators.required
       ]),
-      Categories: new FormControl(this.postEvent.Categories[0], [
+      Categories: new FormControl(this.postEvent.Categories, [
         Validators.required
       ]),
       participantes: new FormControl(this.taskParticipants, [

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

@@ -293,7 +293,6 @@ export class ApproveEventPage implements OnInit {
 
     modal.onDidDismiss().then(res => {
       this.getTask();
-      this.goBack();
     });
 
   }

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

@@ -88,7 +88,7 @@
 
               <ion-select  placeholder="Selecione tipo de evento*"
               class="d-block d-md-none"
-              [(ngModel)]="postData.Categories[0]" 
+              [(ngModel)]="postData.Categories"
               interface="action-sheet"
               Cancel-text="Cancelar" required>
                 <ion-select-option value="Reunião">Reunião</ion-select-option>
@@ -100,7 +100,7 @@
 
               <mat-form-field class="d-none d-md-block" appearance="none" class="width-100" placeholder="Sample Type" required>
                 <!-- <input matInput type="text" > -->
-                <mat-select [(ngModel)]="postData.Categories[0]" >
+                <mat-select [(ngModel)]="postData.Categories" >
                   <mat-option value="Reunião">
                     Reunião
                   </mat-option>

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

@@ -146,7 +146,7 @@ export class BookMeetingModalPage implements OnInit {
      this.dateControlEnd = new FormControl(moment(new Date(new Date().getTime() + 15 * 60000)));
 
 
-     this.postData.Categories = ['Reunião']
+     this.postData.Categories = 'Reunião'
     }
 
   ngOnInit() {
@@ -208,7 +208,7 @@ export class BookMeetingModalPage implements OnInit {
       participantes: new FormControl(this.taskParticipants, [
         Validators.required
       ]),
-      Categories: new FormControl(this.postData.Categories[0], [
+      Categories: new FormControl(this.postData.Categories, [
         Validators.required
       ]),
 
@@ -249,7 +249,7 @@ export class BookMeetingModalPage implements OnInit {
       AppointmentState: 0,
       TimeZone: 'UTC',
       Organizer: null,
-      Categories: ['Reunião'],
+      Categories: 'Reunião',
       HasAttachments: true,
       EventRecurrence: null,
     }

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

@@ -197,7 +197,7 @@ export class ExpedientTaskModalPage implements OnInit {
       // CalendarName: new FormControl(this.postEvent.CalendarName, [
       //   Validators.required
       // ]),
-      // Categories: new FormControl(this.postEvent.Categories[0], [
+      // Categories: new FormControl(this.postEvent.Categories, [
       //   Validators.required
       // ]),
       // IsRecurring: new FormControl(this.postEvent.IsRecurring, [

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

@@ -210,7 +210,7 @@ export class EditEventToApprovePage implements OnInit {
         Validators.required,
       ]),
       //CalendarName: new FormControl(this.postEvent.CalendarName),
-      // Categories: new FormControl(this.postEvent.Categories[0], [
+      // Categories: new FormControl(this.postEvent.Categories, [
       //   Validators.required
       // ]),
       dateStart: new FormControl(this.dateStart, [
@@ -253,26 +253,25 @@ export class EditEventToApprovePage implements OnInit {
     })
 
     const event: any = {
-      Agenda: this.eventProcess.workflowInstanceDataFields.Agenda,
+      SerialNumber: this.eventProcess.serialNumber,
       Body: this.eventProcess.workflowInstanceDataFields.Body,
-      EndDate: this.eventProcess.workflowInstanceDataFields.EndDate,
-      EventType: this.eventProcess.workflowInstanceDataFields.EventType,
-      IsAllDayEvent: this.eventProcess.workflowInstanceDataFields.IsAllDayEvent,
-      IsRecurring: this.eventProcess.workflowInstanceDataFields.IsRecurring,
       Location: this.eventProcess.workflowInstanceDataFields.Location,
       Subject: this.eventProcess.workflowInstanceDataFields.Subject,
-      serialNumber: this.eventProcess.serialNumber,
       StartDate: this.eventProcess.workflowInstanceDataFields.StartDate,
-      MDEmail: this.eventProcess.workflowInstanceDataFields.MDEmail,
+      EndDate: this.eventProcess.workflowInstanceDataFields.EndDate,
+      ReviewUserComment: '',
       MDName: this.eventProcess.workflowInstanceDataFields.MDName,
+      MDEmail: this.eventProcess.workflowInstanceDataFields.MDEmail,
+      IsAllDayEvent: this.eventProcess.workflowInstanceDataFields.IsAllDayEvent,
+      Status: null,
+      EventType: this.eventProcess.workflowInstanceDataFields.EventType,
+      IsRecurring: this.eventProcess.workflowInstanceDataFields.IsRecurring,
       Message: this.eventProcess.workflowInstanceDataFields.Message,
       EventRecurrence: {
         Type: this.eventProcess.workflowInstanceDataFields.OccurrenceType,
         LastOccurrence: this.eventProcess.workflowInstanceDataFields.LastOccurrence,
       },
       ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList,
-      Private: false,
-      ReviewUserComment: ''
     }
 
 

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

@@ -87,7 +87,7 @@
 
           <mat-form-field appearance="none" floatLabel="never" class="width-100" required>
             <!-- <input matInput type="text" > -->
-            <mat-select placeholder="Selecione o tipo de evento*" matInput [(ngModel)]="postEvent.Categories[0]" >
+            <mat-select placeholder="Selecione o tipo de evento*" matInput [(ngModel)]="postEvent.Categories" >
               <mat-option value="Reunião">
                 Reunião
               </mat-option>

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

@@ -204,7 +204,7 @@ export class EditEventPage implements OnInit {
         Validators.required,
       ]),
       CalendarName: new FormControl(this.postEvent.CalendarName),
-      Categories: new FormControl(this.postEvent.Categories[0], [
+      Categories: new FormControl(this.postEvent.Categories, [
         Validators.required
       ]),
       dateStart: new FormControl(this.dateStart, [

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

@@ -74,7 +74,7 @@
 
           <mat-form-field appearance="none" class="width-100" placeholder="Sample Type" required>
             <!-- <input matInput type="text" > -->
-            <mat-select [(value)]="postEvent.Categories[0]" >
+            <mat-select [(value)]="postEvent.Categories" >
               <mat-option value="Reunião">
                 Reunião
               </mat-option>

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

@@ -169,7 +169,7 @@ export class NewEventPage implements OnInit {
           AppointmentState: 0,
           TimeZone: '',
           Organizer: '',
-          Categories: ['Reunião'],
+          Categories: 'Reunião',
           HasAttachments: false,
           EventRecurrence: {Type:'-1'},
         };
@@ -191,7 +191,7 @@ export class NewEventPage implements OnInit {
           AppointmentState: 0,
           TimeZone: '',
           Organizer: '',
-          Categories: ['Reunião'],
+          Categories: 'Reunião',
           HasAttachments: false,
           EventRecurrence: {Type:'-1'},
         };
@@ -238,7 +238,7 @@ export class NewEventPage implements OnInit {
         Validators.required,
       ]),
       CalendarName: new FormControl(this.postEvent.CalendarName),
-      Categories: new FormControl(this.postEvent.Categories[0], [
+      Categories: new FormControl(this.postEvent.Categories, [
         Validators.required
       ]),
       dateStart: new FormControl(this.postEvent.StartDate, [

src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html

@@ -77,7 +77,7 @@
                 <ion-datetime
                   class="d-block d-md-none"
                   placeholder="Início"
-                  [(ngModel)]="eventProcess.workflowInstanceDataFields.StartDate"
+                  [(ngModel)]="startDate"
                   displayFormat="D MMM YYYY H:mm"
                   minuteValues="0,15,30,45"
                   monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
@@ -90,7 +90,7 @@
                 class="width-100 date-hour-picker d-none d-md-block">
                   <input matInput [ngxMatDatetimePicker]="picker1"
                     placeholder="Choose a date"
-                    [(ngModel)]="eventProcess.workflowInstanceDataFields.StartDate"
+                    [(ngModel)]="startDate"
                     [min]="minDate" [max]="maxDate"
                     [disabled]="disabled"
                   >
@@ -116,7 +116,7 @@
                 <ion-datetime
                   class="d-block d-md-none"
                   placeholder="Fim"
-                  [(ngModel)]="eventProcess.workflowInstanceDataFields.EndDate"
+                  [(ngModel)]="endDate"
                   displayFormat="D MMM YYYY H:mm"
                   minuteValues="0,15,30,45"
                   monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
@@ -129,7 +129,7 @@
                 class="width-100 date-hour-picker d-none d-md-block">
                   <input matInput [ngxMatDatetimePicker]="fim"
                     placeholder="Choose a date"
-                    [(ngModel)]="eventProcess.workflowInstanceDataFields.EndDate"
+                    [(ngModel)]="endDate"
                     [min]="minDate" [max]="maxDate"
                     [disabled]="disabled"
                   >
@@ -232,7 +232,7 @@
               <div class="ion-icon-class">
                 <ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
               </div>
-              <div class="ion-input-class-no-height d-flex">
+              <div (click)="addParticipants()" class="ion-input-class-no-height d-flex">
                 <div class="list-people flex-grow-1">
                   <ion-item lines="none">
                     <ion-list>
@@ -241,7 +241,7 @@
                     </ion-list>
                   </ion-item>
                 </div>
-                <div class="add-people cursor-pointer"  (click)="addParticipants()">
+                <div class="add-people cursor-pointer">
                   <ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
                 </div>
               </div>

src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts

@@ -13,6 +13,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { ToastService } from 'src/app/services/toast.service';
 import { Event } from '../../../models/event.model';
 import { NgxMatDateFormats, NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
+import { NavigationExtras, Router } from '@angular/router';
 
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
@@ -94,7 +95,8 @@ export class EditEventToApproveComponent implements OnInit {
   segment:string = "true";
   profile:string;
   eventAttendees: EventPerson[];
-
+  startDate: Date;
+  endDate: Date;
   loadedEventAttachments: Attachment[];
   taskParticipants: any = [];
   taskParticipantsCc: any = [];
@@ -115,31 +117,18 @@ export class EditEventToApproveComponent implements OnInit {
     private processes:ProcessesService,
     private animationController: AnimationController,
     private toastService: ToastService,
+    private router:Router,
   ) {
     // Edit event to approve
     this.serialNumber = this.navParams.get('serialNumber');
-
     this.isEventEdited = false;
-
-
-
   }
 
 
 
   ngOnInit() {
     this.getTask()
-    console.log('HERE');
     this.getRecurrenceTypes();
-
-    this.selectedRecurringType = this.eventProcess.workflowInstanceDataFields.OccurrenceType;
-
-    setTimeout(() => {
-      this.selectedRecurringType = this.eventProcess.workflowInstanceDataFields.OccurrenceType;
-      console.log(this.selectedRecurringType);
-    }, 1000);
-
-
   }
 
   async getTask() {
@@ -149,6 +138,9 @@ export class EditEventToApproveComponent implements OnInit {
 
     this.eventProcess = result
 
+      this.startDate = new Date(this.eventProcess.workflowInstanceDataFields.StartDate);
+      this.endDate = new Date(this.eventProcess.workflowInstanceDataFields.EndDate);
+
       // description
       let body : any =this.eventProcess.workflowInstanceDataFields.Body.replace(/<[^>]+>/g, '')
       this.eventProcess.workflowInstanceDataFields.Body = body
@@ -205,10 +197,26 @@ export class EditEventToApproveComponent implements OnInit {
     }
   }
 
+  goBack() {
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "eventos": true,
+      }
+    };
+    if( window.innerWidth < 801) {
+      this.router.navigate(['/home/gabinete-digital/event-list']);
+    } else {
+      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    }
+
+  }
+
 
 
   close() {
     this.modalController.dismiss();
+    console.log('CLOSE');
+
   }
 
   save() {
@@ -232,8 +240,8 @@ export class EditEventToApproveComponent implements OnInit {
       Body: this.eventProcess.workflowInstanceDataFields.Body,
       Location: this.eventProcess.workflowInstanceDataFields.Location,
       Subject: this.eventProcess.workflowInstanceDataFields.Subject,
-      StartDate: this.eventProcess.workflowInstanceDataFields.StartDate,
+      StartDate: this.startDate,
-      EndDate: this.eventProcess.workflowInstanceDataFields.EndDate,
+      EndDate: this.endDate,
       ReviewUserComment: '',
       MDName: this.eventProcess.workflowInstanceDataFields.MDName,
       MDEmail: this.eventProcess.workflowInstanceDataFields.MDEmail,
@@ -277,8 +285,8 @@ export class EditEventToApproveComponent implements OnInit {
 
     })
 
-
+    this.modalController.dismiss();
-    //this.modalController.dismiss();
+    this.goBack();
 
   }
 
@@ -326,8 +334,9 @@ export class EditEventToApproveComponent implements OnInit {
 
   addParticipants(){
     this.adding = 'intervenient'
-
     this.openAttendees();
+    console.log('LOGS');
+
   }
 
   addParticipantsCC(){