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

@@ -3,7 +3,7 @@
   <div class="main-content height-100">
 
     <div class="content d-flex flex-column width-md-100 height-100">
-      
+
       <div class="main-header pt-30 px-20 background-white pb-15">
         <ion-header>
           <div class="title-content">
@@ -14,13 +14,13 @@
         </ion-header>
       </div>
       <ion-item-sliding class="overflow-y-auto">
-  
+
         <div class="px-20">
           <div class="ion-item-container width-100" [class.input-error]="Form?.get('Subject')?.invalid && validateFrom ">
             <ion-input  placeholder="Assunto*" [(ngModel)]="postEvent.Subject"></ion-input>
           </div>
 
-          
+
           <div *ngIf="Form && validateFrom" >
             <div *ngIf="Form.get('Subject').invalid " class="input-errror-message">
               <div *ngIf="Form.get('Subject').errors?.required">
@@ -53,7 +53,7 @@
               </div>
             </div>
           </div>
-        
+
           <div class="container-div width-100">
             <div class="ion-item-class-2">
               <div class="ion-icon-class">
@@ -61,9 +61,9 @@
               </div>
               <div class="ion-input-class">
                 <ion-select  placeholder="Selecione agenda*"
-                selectedText="{{postEvent.CalendarName}}" 
+                selectedText="{{postEvent.CalendarName}}"
-                [(ngModel)]="postEvent.CalendarName" 
+                [(ngModel)]="postEvent.CalendarName"
-                interface="action-sheet" Cancel-text="Cancelar" 
+                interface="action-sheet" Cancel-text="Cancelar"
                 required>
                   <ion-select-option value="Oficial">Oficial</ion-select-option>
                   <ion-select-option value="Pessoal">Pessoal</ion-select-option>
@@ -74,23 +74,23 @@
 
           <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>
             </div>
           </div>
-    
+
           <div class="container-div width-100">
             <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('Categories')?.invalid  && validateFrom ">
-                <ion-select  placeholder="Selecione tipo de evento*" 
+                <ion-select  placeholder="Selecione tipo de evento*"
-                [(ngModel)]="postEvent.Categories[0]"
+                [(ngModel)]="postEvent.Categories"
-                selectedText="{{postEvent.Categories[0]}}"
+                selectedText="{{postEvent.Categories}}"
-                interface="action-sheet" 
+                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>
@@ -103,27 +103,27 @@
 
           <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>
             </div>
           </div>
-        
+
           <div class="container-div width-100">
             <div class="ion-item-class-2 width-100">
               <div class="ion-icon-class">
                 <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
               </div>
               <div class="ion-input-class width-100" [class.input-error]="Form?.get('Date')?.invalid  && validateFrom ">
-                <ion-datetime 
+                <ion-datetime
                   placeholder="Início"
                   [(ngModel)]="postEvent.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"
-                  min="{{minDate}}"  
+                  min="{{minDate}}"
-                  max="2025" 
+                  max="2025"
                 >
                 </ion-datetime>
                 <!-- <ion-input placeholder="Data início" [(ngModel)]="postData.StartDate"></ion-input> -->
@@ -137,14 +137,14 @@
                 <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 
+                <ion-datetime
                   placeholder="Fim"
                   [(ngModel)]="postEvent.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"
-                  min="{{minDate}}" 
+                  min="{{minDate}}"
-                  max="2025" 
+                  max="2025"
                 >
                 </ion-datetime>
                 <!-- <ion-input placeholder="Data fim" [(ngModel)]="postData.EndDate"></ion-input> -->
@@ -161,28 +161,28 @@
                 <ion-select  placeholder="Selecione a repetição*"
                 [(ngModel)]="selectedRecurringType"
                 (ngModelChange)="onSelectedRecurringChanged($event)"
-                interface="action-sheet" 
+                interface="action-sheet"
                 Cancel-text="Cancelar" required>
                   <ion-select-option *ngFor="let recurring of recurringTypes" value="{{recurring.Code}}">{{recurring.Description}}</ion-select-option>
                 </ion-select>
               </div>
             </div>
           </div>
-          
+
           <div *ngIf="selectedRecurringType != '-1'" class="container-div width-100">
             <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">
-                <ion-datetime 
+                <ion-datetime
                   placeholder="Última ocorrência"
                   [(ngModel)]="postEvent.EventRecurrence.LastOccurrence"
                   displayFormat="D MMM YYYY H:mm"
                   minuteValues="0,15,30,45"
                   monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
                   min="2021"
-                  max="2025" 
+                  max="2025"
                 >
                 </ion-datetime>
                 <!-- <ion-input placeholder="Data fim" [(ngModel)]="postData.EndDate"></ion-input> -->
@@ -252,16 +252,16 @@
               </div>
               <div class="attach-document">
                 <ion-label>Adicionar documentos</ion-label>
-              </div> 
+              </div>
             </ion-label>
           </div>
-          
+
-          <div class="d-flex container-div width-100"  *ngFor="let document of loadedEventAttachments; let i = index" > 
+          <div class="d-flex container-div width-100"  *ngFor="let document of loadedEventAttachments; let i = index" >
             <ion-list class="width-100 list" *ngIf="!document.remove">
               <ion-item class="width-100 ion-no-border ion-no-padding">
               <ion-label class="width-100">
-                <p class="p-item-title d-flex ion-justify-content-between"> 
+                <p class="p-item-title d-flex ion-justify-content-between">
-                  <span class="attach-title-item">{{document.SourceName}}</span> 
+                  <span class="attach-title-item">{{document.SourceName}}</span>
                   <span class="close-button text-black" (click)="deleteAttachment(document.Id, i)" >
                     <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
                   </span>
@@ -277,11 +277,11 @@
               </ion-label>
             </ion-item>
             </ion-list>
-          </div> 
+          </div>
 
 
         </div>
-        
+
 
 
       </ion-item-sliding>
@@ -298,7 +298,7 @@
       (dynamicSetIntervenient)="dynamicSetIntervenient($event)"
     ></app-attendee-modal>
 
-  </div>    
+  </div>
 </ion-content>
 
 <ion-footer class="background-whit">
@@ -306,4 +306,4 @@
     <button class="btn-cancel cursor-pointer" shape="round" (click)="close()">Cancelar</button>
     <button class="btn-ok cursor-pointer" shape="round" (click)="save()">Gravar</button>
   </div>
-</ion-footer>
+</ion-footer>

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

@@ -13,7 +13,7 @@
 <ion-content>
   <div class="main-content">
     <!-- <input type="text" ngbDatepicker #d="ngbDatepicker"/> -->
-    
+
     <div class="ion-item-container" [class.input-error]="Form?.get('Subject')?.invalid && validateFrom ">
       <ion-input  placeholder="Assunto*" [(ngModel)]="postEvent.Subject"></ion-input>
     </div>
@@ -43,7 +43,7 @@
       <!-- <span class="error ion-padding" >
         Campo obrigatório
       </span> -->
-  
+
     </div>
 
     <!-- <div *ngIf="Form && validateFrom" >
@@ -56,7 +56,7 @@
         </div>
       </div>
     </div> -->
-  
+
     <div class="container-div">
       <div class="ion-item-class-2">
         <div class="ion-icon-class">
@@ -64,9 +64,9 @@
         </div>
         <div class="ion-input-class" [class.input-error]="Form?.get('CalendarName')?.invalid  && validateFrom ">
           <ion-select  placeholder="Selecione agenda*"
-          selectedText="{{postEvent.CalendarName}}" 
+          selectedText="{{postEvent.CalendarName}}"
-          [(ngModel)]="postEvent.CalendarName" 
+          [(ngModel)]="postEvent.CalendarName"
-          interface="action-sheet" Cancel-text="Cancelar" 
+          interface="action-sheet" Cancel-text="Cancelar"
           required>
             <ion-select-option value="Oficial">Oficial</ion-select-option>
             <ion-select-option value="Pessoal">Pessoal</ion-select-option>
@@ -89,9 +89,9 @@
           <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
         </div>
         <div class="ion-input-class" [class.input-error]="Form?.get('Categories')?.invalid  && validateFrom ">
-          <ion-select  placeholder="Selecione tipo de evento*" 
+          <ion-select  placeholder="Selecione tipo de evento*"
-          [(ngModel)]="postEvent.Categories[0]" 
+          [(ngModel)]="postEvent.Categories"
-          interface="action-sheet" 
+          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>
@@ -104,26 +104,26 @@
 
     <!-- <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>
       </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 ">
-          <ion-datetime 
+          <ion-datetime
             placeholder="Início*"
             [(ngModel)]="postEvent.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"
-            min="{{minDate}}" 
+            min="{{minDate}}"
             max="2025"
           >
           </ion-datetime>
@@ -131,14 +131,14 @@
         </div>
       </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 ">
-          <ion-datetime 
+          <ion-datetime
             placeholder="Fim*"
             [(ngModel)]="postEvent.EndDate"
             displayFormat="D MMM YYYY H:mm"
@@ -146,51 +146,51 @@
             monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
             min="{{minDate}}"
             max="2025"
-            
+
           >
           </ion-datetime>
           <!-- <ion-input placeholder="Data fim" [(ngModel)]="postData.EndDate"></ion-input> -->
         </div>
       </div>
     </div>
-    
+
     <div class="container-div width-100">
       <div class="ion-item-class-2">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
         </div>
         <div class="ion-input-class" [class.input-error]="Form?.get('Categories')?.invalid  && validateFrom ">
-          <ion-select  placeholder="Selecione a repetição*" 
+          <ion-select  placeholder="Selecione a repetição*"
           [(ngModel)]="selectedRecurringType"
           (ngModelChange)="onSelectedRecurringChanged($event)"
-          interface="action-sheet" 
+          interface="action-sheet"
           Cancel-text="Cancelar" required>
             <ion-select-option *ngFor="let recurring of recurringTypes" value="{{recurring.Code}}">{{recurring.Description}}</ion-select-option>
           </ion-select>
         </div>
       </div>
     </div>
-    
+
     <div *ngIf="selectedRecurringType != '-1'" class="container-div width-100">
       <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">
-          <ion-datetime 
+          <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" 
+            max="2045"
           >
           </ion-datetime>
           <!-- <ion-input placeholder="Data fim" [(ngModel)]="postData.EndDate"></ion-input> -->
         </div>
       </div>
     </div>
-    
+
     <div class="container-div">
       <div class="ion-item-class-2">
         <div class="ion-icon-class">
@@ -217,7 +217,7 @@
         </div>
       </div>
     </div>
-    
+
     <div class="container-div">
       <div class="ion-item-class-2">
         <div class="ion-icon-class">
@@ -245,20 +245,20 @@
         </div>
       </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-description.svg"></ion-icon>
         </div>
         <div class="ion-input-class-no-height flex-grow-1">
-          
+
           <ion-textarea  [(ngModel)]="postEvent.Body.Text"  placeholder="Detalhes" ></ion-textarea>
-          
+
         </div>
       </div>
     </div>
-    
+
    <div  class="ion-item-container-no-border cursor-pointer"  (click)="getDoc()">
       <ion-label>
         <div class="attach-icon">
@@ -266,27 +266,27 @@
         </div>
         <div class="attach-document">
           <ion-label>Adicionar documentos</ion-label>
-        </div> 
+        </div>
       </ion-label>
     </div>
-    
+
-    <div   *ngFor="let document of documents; let i = index" > 
+    <div   *ngFor="let document of documents; let i = index" >
       <ion-list class="list">
         <ion-item>
         <ion-label>
-          <p class="d-flex ion-justify-content-between"> 
+          <p class="d-flex ion-justify-content-between">
-            <span class="attach-title-item">{{document.Assunto}}</span> 
+            <span class="attach-title-item">{{document.Assunto}}</span>
-            <span class="app-name">{{document.appName}}</span> 
+            <span class="app-name">{{document.appName}}</span>
             <span class="close-button text-black cursor-pointer" (click)="removeAttachment(i)" >
               <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
             </span>
-          </p> 
+          </p>
           <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yy'}} </span></p>
         </ion-label>
       </ion-item>
       </ion-list>
     </div>
-  </div>    
+  </div>
 </ion-content>
 <ion-footer class="ion-no-border d-flex justify-center px-20">
   <ion-toolbar class=" ">
@@ -302,4 +302,4 @@
       </ion-button>
     </ion-buttons>
   </ion-toolbar>
-</ion-footer>
+</ion-footer>

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

@@ -8,7 +8,7 @@
         </div>
       </div>
       <div class="overflow-y-auto content-default-padding">
-        
+
         <div class="ion-item-container width-100" [class.input-error]="Form?.get('Subject')?.invalid && validateFrom ">
           <ion-input placeholder="Assunto*" [(ngModel)]="postData.Subject"></ion-input>
         </div>
@@ -52,11 +52,11 @@
               <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
             </div>
             <div class="ion-input-class" >
-              <ion-select 
+              <ion-select
-                class="d-block d-md-none" 
+                class="d-block d-md-none"
-                [(ngModel)]="postData.CalendarName" 
+                [(ngModel)]="postData.CalendarName"
-                placeholder="Selecione repetição" 
+                placeholder="Selecione repetição"
-                interface="action-sheet" 
+                interface="action-sheet"
                 Cancel-text="Cancelar" required>
                 <ion-select-option value="Oficial">Oficial</ion-select-option>
                 <ion-select-option value="Pessoal">Pessoal</ion-select-option>
@@ -85,11 +85,11 @@
               <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
             </div>
             <div class="ion-input-class" [class.input-error]="Form?.get('Categories')?.invalid  && validateFrom ">
- 
+
-              <ion-select  placeholder="Selecione tipo de evento*" 
+              <ion-select  placeholder="Selecione tipo de evento*"
               class="d-block d-md-none"
-              [(ngModel)]="postData.Categories[0]" 
+              [(ngModel)]="postData.Categories"
-              interface="action-sheet" 
+              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>
@@ -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>
@@ -116,7 +116,7 @@
                 </mat-select>
               </mat-form-field>
 
-  
+
             </div>
           </div>
           </div>
@@ -127,10 +127,10 @@
             <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 
+            <ion-datetime
               class="d-block d-md-none"
               placeholder="Início*"
-              [(ngModel)]="postData.StartDate" 
+              [(ngModel)]="postData.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"
@@ -138,19 +138,19 @@
               max="2025"
               value="2020-11-19T11:06Z">
             </ion-datetime>
-           
+
             <mat-form-field appearance="none" class="width-100 date-hour-picker  d-md-block">
-              <input matInput [ngxMatDatetimePicker]="picker1" 
+              <input matInput [ngxMatDatetimePicker]="picker1"
-                placeholder="Choose a date*" 
+                placeholder="Choose a date*"
                 [formControl]="dateControlStart"
                 [min]="minDate"
                 [disabled]="disabled"
               >
               <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
-              <ngx-mat-datetime-picker #picker1 
+              <ngx-mat-datetime-picker #picker1
-                [showSpinners]="showSpinners" 
+                [showSpinners]="showSpinners"
                 [showSeconds]="showSeconds"
-                [stepHour]="stepHour" [stepMinute]="stepMinute" 
+                [stepHour]="stepHour" [stepMinute]="stepMinute"
                 [stepSecond]="stepSecond"
                 [touchUi]="touchUi">
               </ngx-mat-datetime-picker>
@@ -166,30 +166,30 @@
               <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 
+              <ion-datetime
                 class="d-block d-md-none"
                 placeholder="Fim*"
-                [(ngModel)]="postData.EndDate" 
+                [(ngModel)]="postData.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"
-                min="{{ionicMinDate}}" 
+                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">
-                <input matInput [ngxMatDatetimePicker]="fim" 
+                <input matInput [ngxMatDatetimePicker]="fim"
-                  placeholder="Choose a date*S" 
+                  placeholder="Choose a date*S"
                   [formControl]="dateControlEnd"
-                  [min]="endMinDate" 
+                  [min]="endMinDate"
                   [disabled]="disabled"
                 >
                 <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
-                <ngx-mat-datetime-picker #fim 
+                <ngx-mat-datetime-picker #fim
-                  [showSpinners]="showSpinners" 
+                  [showSpinners]="showSpinners"
                   [showSeconds]="showSeconds"
-                  [stepHour]="stepHour" [stepMinute]="stepMinute" 
+                  [stepHour]="stepHour" [stepMinute]="stepMinute"
                   [stepSecond]="stepSecond"
                   [touchUi]="touchUi">
                 </ngx-mat-datetime-picker>
@@ -204,15 +204,15 @@
               <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
             </div>
             <div class="ion-input-class">
-              <ion-select 
+              <ion-select
                 class="d-block d-md-none"
-                [(ngModel)]="postData.IsRecurring" 
+                [(ngModel)]="postData.IsRecurring"
-                placeholder="Selecione repetição*" 
+                placeholder="Selecione repetição*"
-                value="false" 
+                value="false"
-                interface="action-sheet" 
+                interface="action-sheet"
-                Cancel-text="Cancelar" 
+                Cancel-text="Cancelar"
                 required
-                
+
               >
                 <ion-select-option value="false">Não se repete</ion-select-option>
                 <ion-select-option value="true">Repete</ion-select-option>
@@ -224,9 +224,9 @@
 
               <mat-form-field
                 floatLabel="never"
-                class="width-100 d-none d-md-block" 
+                class="width-100 d-none d-md-block"
-                value="false" 
+                value="false"
-                interface="action-sheet" 
+                interface="action-sheet"
                 required
                 appearance="none"
               >
@@ -307,21 +307,21 @@
             </div>
             <div class="attach-document">
               <ion-label>Anexar Documentos</ion-label>
-            </div> 
+            </div>
           </ion-label>
         </div>
 
-        <div class="list "  *ngFor="let document of documents; let i = index" > 
+        <div class="list "  *ngFor="let document of documents; let i = index" >
           <ion-list>
             <ion-item>
             <ion-label>
-              <p class="d-flex ion-justify-content-between"> 
+              <p class="d-flex ion-justify-content-between">
-                <span class="attach-title-item">{{document.Assunto}}</span> 
+                <span class="attach-title-item">{{document.Assunto}}</span>
-                <span class="app-name">{{document.appName}}</span> 
+                <span class="app-name">{{document.appName}}</span>
                 <span class="close-button text-black" (click)="removeAttachment(i)" >
                   <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
                 </span>
-              </p> 
+              </p>
               <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yy'}} </span></p>
             </ion-label>
           </ion-item>
@@ -331,12 +331,12 @@
     </div>
 
     <div class="aside-righ flex-grow-1">
-      <app-empty-container 
+      <app-empty-container
-          [texto]="emptyTextDescription" 
+          [texto]="emptyTextDescription"
-          *ngIf="!showAttendees" 
+          *ngIf="!showAttendees"
           class="d-flex height-100 flex-column">
       </app-empty-container>
-      <app-attendee-modal class=" d-flex flex-column height-100" 
+      <app-attendee-modal class=" d-flex flex-column height-100"
         *ngIf="showAttendees"
         [footer]="false"
         [taskParticipants]="taskParticipants"

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

@@ -47,7 +47,7 @@ const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
 })
 
 export class BookMeetingModalPage implements OnInit {
-  
+
   public date: any;
   public disabled = false;
   public showSpinners = true;
@@ -94,12 +94,12 @@ export class BookMeetingModalPage implements OnInit {
   @ViewChild('fim') fim: any;
   @ViewChild('inicio') inicio: any;
   @ViewChild('picker1') picker1: any;
-  
+
   task: any;
-  
+
   taskParticipants: EventPerson[];
   taskParticipantsCc: EventPerson[] = [];
-  
+
   taskDocId:string;
   loadedAttachments:any;
   documents:SearchDocument[] = [];
@@ -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() {
@@ -170,12 +170,12 @@ export class BookMeetingModalPage implements OnInit {
   close(){
     this.modalController.dismiss(null);
   }
-  
+
   goBack() {
     this.modalController.dismiss(null);
     window.history.back();
   }
-  
+
 
   runValidation() {
     this.validateFrom  = true
@@ -208,13 +208,13 @@ 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
       ]),
 
     })
   }
-  
+
 
   async saveTask(){
 
@@ -225,8 +225,8 @@ export class BookMeetingModalPage implements OnInit {
 
 
     if(this.Form.invalid) return false
-    
+
-    
+
     let Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
 
     this.eventBody={
@@ -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,
     }
@@ -263,7 +263,7 @@ export class BookMeetingModalPage implements OnInit {
           case 'MDGPR':
             await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise();
             break;
-        
+
           case 'PR':
             await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "pr",this.task.SerialNumber, this.task.FsId).toPromise()
             break;
@@ -289,7 +289,7 @@ export class BookMeetingModalPage implements OnInit {
           case 'MDGPR':
             await this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise();
             break;
-        
+
           case 'PR':
             await this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "pr",this.task.SerialNumber, this.task.FsId).toPromise();
             break;
@@ -302,7 +302,7 @@ export class BookMeetingModalPage implements OnInit {
       } finally {
         loader.remove()
       }
-      
+
     }
   }
 
@@ -325,7 +325,7 @@ export class BookMeetingModalPage implements OnInit {
       await modal.present();
 
       modal.onDidDismiss().then((data) => {
-        
+
         if(data) {
           data = data['data'];
 
@@ -336,14 +336,14 @@ export class BookMeetingModalPage implements OnInit {
           this.setIntervenientCC(newAttendeesCC);
         }
       });
-      
+
     } else {
       this.showAttendees = true;
     }
   }
 
   async addParticipantsCc() {
-    
+
     this.adding = "CC";
 
     if(window.innerWidth <= 800) {
@@ -361,7 +361,7 @@ export class BookMeetingModalPage implements OnInit {
       await modal.present();
 
       modal.onDidDismiss().then((data) => {
-        
+
         if(data){
           data = data['data'];
 
@@ -414,7 +414,7 @@ export class BookMeetingModalPage implements OnInit {
   removeAttachment(index: number){
     this.documents = this.documents.filter( (e, i) =>  index != i);
   }
-  
+
   validateFormInputs(){
     let formLocation = this.postData.Location.trim();
     if(!this.postData.Location && formLocation.length <= 0){
@@ -434,10 +434,10 @@ export class BookMeetingModalPage implements OnInit {
   setIntervenient(data){
     this.taskParticipants = data;
   }
-  
+
   setIntervenientCC(data){
     this.taskParticipantsCc = data;
   }
 
 
-}
+}

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

@@ -56,7 +56,7 @@ export class ExpedientTaskModalPage implements OnInit {
 
   taskDate: Date;
   taskDescription: string;
-  
+
   loadedAttachments:any;
   documents:SearchDocument[] = [];
 
@@ -104,7 +104,7 @@ export class ExpedientTaskModalPage implements OnInit {
 
       this.loggeduser = userAuth.ValidatedUser;
       this.task = this.navParams.get('task');
-      
+
       this.taskType = this.navParams.get('taskAction');
 
       this.selectedTypes = ['99999850'];
@@ -123,7 +123,7 @@ export class ExpedientTaskModalPage implements OnInit {
         NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber,
 
       };
-      
+
       this.postData.DispatchFolder = this.dispatchFolder;
       this.postData.UsersSelected = this.participants;
       /* By Default TypeDeadline should be 'Normal' */
@@ -139,7 +139,7 @@ export class ExpedientTaskModalPage implements OnInit {
 
   ngOnInit() {
     console.log(this.postData);
-    
+
     this.taskDate = new Date(this.task.taskStartDate);
     if(!this.task.hasOwnProperty('isEvent')) {
       this.getAttachments();
@@ -162,7 +162,7 @@ export class ExpedientTaskModalPage implements OnInit {
     this.router.navigate(['/home/gabinete-digital/expediente']);
     this.modalController.dismiss(null);
   }
-  
+
   getSubjectType() {
     this.processes.GetSubjectType().subscribe(res=>{
       console.log(res);
@@ -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, [
@@ -209,7 +209,7 @@ export class ExpedientTaskModalPage implements OnInit {
 
     })
   }
-  // 
+  //
   async saveTask(){
 
     if(this.loggeduser.Profile == 'MDGPR') {
@@ -239,7 +239,7 @@ export class ExpedientTaskModalPage implements OnInit {
         UserType:  val.IsRequired?"I": "CC"
       };
     })
-    
+
     let docs = {
       ProcessInstanceID: "",
       Attachments: []
@@ -271,7 +271,7 @@ export class ExpedientTaskModalPage implements OnInit {
                 DispatchFolder: this.dispatchFolder,
                 AttachmentList: docs,
               }
-              
+
               console.log(this.postData);
 
               try {
@@ -279,7 +279,7 @@ export class ExpedientTaskModalPage implements OnInit {
                 this.taskResult = await this.processes.postDespatcho(this.postData).toPromise();
                 await this.toastService.successMessage('Processo efetuado');
                 this.modalController.dismiss();
-                
+
               } catch (error) {
                 await this.toastService.badRequest('Processo não efetuado')
               } finally {
@@ -288,7 +288,7 @@ export class ExpedientTaskModalPage implements OnInit {
 
               console.log('this.taskResult', this.taskResult);
               break;
-    
+
             case '1':
               this.postData = {
                 DistributionType: "Paralelo",
@@ -299,7 +299,7 @@ export class ExpedientTaskModalPage implements OnInit {
                 DispatchFolder: this.dispatchFolder,
                 AttachmentList: docs
               }
-              
+
               let action_parecer = {
                 "serialNumber": this.task.serialNumber,
                 "action": "Tratado",
@@ -313,7 +313,7 @@ export class ExpedientTaskModalPage implements OnInit {
                 this.taskResult = await this.processes.postParecer(this.postData).toPromise();
                 await this.toastService.successMessage('Pedido enviado');
                 this.modalController.dismiss(action_parecer);
-                
+
               } catch (error) {
                 await this.toastService.badRequest('Processo não efetuado')
               } finally {
@@ -324,7 +324,7 @@ export class ExpedientTaskModalPage implements OnInit {
               this.postData = {
                 DistributionType: "Paralelo",
                 CountryCode: 'AO',
-                Priority: this.postData.Priority, 
+                Priority: this.postData.Priority,
                 UserEmail: this.loggeduser.Email,
                 UsersSelected: attendees,
                 DispatchFolder: this.dispatchFolder,
@@ -372,7 +372,7 @@ export class ExpedientTaskModalPage implements OnInit {
               AttachmentList: docs,
             }
             console.log(this.postData);
-            
+
             let action_despacho_pr = {
               "serialNumber": this.task.serialNumber,
               "action": "Tratado",
@@ -394,7 +394,7 @@ export class ExpedientTaskModalPage implements OnInit {
 
             console.log('this.taskResult', this.taskResult);
             break;
-  
+
           case '1':
             this.postData = {
               DistributionType: "Paralelo",
@@ -405,7 +405,7 @@ export class ExpedientTaskModalPage implements OnInit {
               DispatchFolder: this.dispatchFolder,
               AttachmentList: docs
             }
-            
+
             let action_parecer_pr = {
               "serialNumber": this.task.serialNumber,
               "action": "Tratado",
@@ -453,11 +453,11 @@ export class ExpedientTaskModalPage implements OnInit {
         cssClass: 'attendee modal modal-desktop',
         backdropDismiss: false
       });
-  
+
       await modal.present();
-  
+
       modal.onDidDismiss().then((data) => {
-        
+
         if(data){
           data = data['data'];
 
@@ -472,11 +472,11 @@ export class ExpedientTaskModalPage implements OnInit {
       this.showAttendees = true
     }
   }
- 
+
   async setIntervenient(data) {
     this.taskParticipants = data;
   }
-  
+
   async setIntervenientCC(data) {
     this.taskParticipantsCc = data;
   }
@@ -485,7 +485,7 @@ export class ExpedientTaskModalPage implements OnInit {
     this.adding = 'intervenient'
     this.openAttendees();
   }
-  
+
   async addParticipantsCc() {
     this.adding = "CC";
     this.openAttendees();
@@ -507,14 +507,14 @@ export class ExpedientTaskModalPage implements OnInit {
       cssClass: 'discart-expedient-modal',
       backdropDismiss: false
     });
-    
+
     await modal.present();
     modal.onDidDismiss().then(res=>{
       if(res['data']=='close'){
         console.log('Expedient Discard closed');
         this.modalController.dismiss(res['data'])
       }
-      
+
     });
   }
 
@@ -523,13 +523,13 @@ export class ExpedientTaskModalPage implements OnInit {
     if(this.adding == "intervenient"){
       this.taskParticipants = data;
     } else if (this.adding == "CC") {
-      
+
       this.taskParticipantsCc = data;
     }
-    
+
   }
 
-  
+
 
   async closeComponent() {
     this.showAttendees = false;
@@ -586,4 +586,4 @@ export class ExpedientTaskModalPage implements OnInit {
 
   }
 
-}
+}

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, [
@@ -268,13 +268,13 @@ export class EditEventPage implements OnInit {
           "EventId": this.postEvent.EventId,
           "CalendarDestinationName": this.postEvent.CalendarName,
         }
-        
+
         console.log(body);
 
         try {
           await this.eventsService.changeAgenda(body).toPromise();
         } catch (e) {}
-        
+
       }
       this.showLoader = false;
       this.toastService.successMessage()

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

@@ -140,7 +140,7 @@ export class NewEventPage implements OnInit {
     if(!this.restoreTemporaryData()){
       // clear
 
-      
+
       this.eventBody = { BodyType : "1", Text : ""};
       this.postEvent.Body = this.eventBody;
 
@@ -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, [
@@ -423,7 +423,7 @@ export class NewEventPage implements OnInit {
           loader.remove()
           this.showLoader = false
           this.toastService.badRequest('Evento não criado')
-      
+
         });
 
     }

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(){