improve

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

@@ -66,9 +66,14 @@
             <ion-label>
               <p>{{customDate}}</p>
               <p *ngIf="toDateString(loadedEvent.workflowInstanceDataFields.StartDate) == toDateString(loadedEvent.workflowInstanceDataFields.EndDate)">das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'HH:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
-              <p *ngIf="toDateString(loadedEvent.workflowInstanceDataFields.StartDate) != toDateString(loadedEvent.workflowInstanceDataFields.EndDate)">{{loadedEvent.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ loadedEvent.workflowInstanceDataFields.StartDate | date: 'dd/M/yy'}} </p>
-              <p *ngIf="!loadedEvent.workflowInstanceDataFields.IsRecurring">(Não se repete)</p>
-              <p *ngIf="loadedEvent.workflowInstanceDataFields.IsRecurring">Repete</p>
+              <p *ngIf="toDateString(loadedEvent.workflowInstanceDataFields.StartDate) != toDateString(loadedEvent.workflowInstanceDataFields.EndDate)">{{loadedEvent.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ loadedEvent.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} </p>
+              <p>
+                <span *ngIf="loadedEvent.workflowInstanceDataFields.OccurrenceType == 0">Diário</span>
+                <span *ngIf="loadedEvent.workflowInstanceDataFields.OccurrenceType == 1">Semanal</span>
+                <span *ngIf="loadedEvent.workflowInstanceDataFields.OccurrenceType == 2">Mensal</span>
+                <span *ngIf="loadedEvent.workflowInstanceDataFields.OccurrenceType == 3">Anual</span>
+                <span *ngIf="loadedEvent.workflowInstanceDataFields.OccurrenceType == -1">(Não se repete)</span>            
+              </p>
   
             </ion-label>
           </div>

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

@@ -71,6 +71,7 @@ export class ApproveEventPage implements OnInit {
     this.processes.GetTask(this.serialNumber).subscribe(res => {
       
       this.loadedEvent = res;
+      console.log(this.loadedEvent);
       this.today = new Date(res.workflowInstanceDataFields.StartDate);
       // 
       this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]);
@@ -86,9 +87,9 @@ export class ApproveEventPage implements OnInit {
     try {
       await this.processes.PostTaskAction(body).toPromise()
       this.modalController.dismiss(serialNumber);
-      this.toastService.successMessage()
+      this.toastService._successMessage()
     } catch (error) {
-      this.toastService.badRequest()
+      this.toastService._badRequest()
     } finally {
       this.close()
       loader.remove()
@@ -105,9 +106,9 @@ export class ApproveEventPage implements OnInit {
 
     try {
       await this.processes.PostTaskAction(body).toPromise()
-      this.toastService.successMessage('Evento rejeitado')
+      this.toastService._successMessage('Evento rejeitado')
     } catch (error) {
-      this.toastService.badRequest('Processo não efectuado')
+      this.toastService._badRequest('Processo não efectuado')
     } finally {
       loader.remove()
       this.close()
@@ -171,8 +172,7 @@ export class ApproveEventPage implements OnInit {
     modal.onDidDismiss()
     .then( async (res) => {
       
-
-      if(res.data !== '') {
+      if(res.data.note !== '') {
         let body = { "serialNumber": serialNumber,
         "action": "Emendar",
             "dataFields": {
@@ -184,17 +184,19 @@ export class ApproveEventPage implements OnInit {
 
         try {
           await this.processes.PostTaskAction(body).toPromise();
-          this.toastService.successMessage('Pedido enviado');
+          this.toastService._successMessage('Pedido enviado');
           this.close();
         } catch (error) {
-          this.toastService.badRequest();
+          this.toastService._badRequest();
         }  finally {
           loader.remove()
         }
       }
-      else{
-        
-      }
+      else {
+        if(res.data.option == 'save') {
+          this.toastService._badRequest('É necessário adicionar uma nota');
+        }
+      } 
     });
 
   }

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

@@ -2,14 +2,13 @@
   <!-- Edit event for Inicio -->
   <div class="main-content height-100 d-flex">
   
-
     <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">
             <div class="middle">
-              <ion-label class="title">Editar evento por aprovar </ion-label>
+              <ion-label class="title">Editar evento por aprovar</ion-label>
             </div>
           </div>
         </ion-header>
@@ -157,7 +156,8 @@
                 <mat-form-field appearance="none" class="width-100 date-hour-picker d-none d-md-block">
                   <input matInput [ngxMatDatetimePicker]="picker1"
                     placeholder="Choose a date"
-                    [formControl]="dateControlStart"
+                    [(ngModel)]="eventProcess.workflowInstanceDataFields.StartDate"
+                    [min]="minDate" [max]="maxDate"
                     [disabled]="disabled"
                   >
                   <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
@@ -192,7 +192,8 @@
                 <mat-form-field appearance="none" class="width-100 date-hour-picker d-none d-md-block">
                   <input matInput [ngxMatDatetimePicker]="fim"
                     placeholder="Choose a date"
-                    [formControl]="dateControlEnd"
+                    [(ngModel)]="eventProcess.workflowInstanceDataFields.EndDate"
+                    [min]="endMinDate" [max]="maxDate"
                     [disabled]="disabled"
                   >
                   <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
@@ -366,6 +367,6 @@
 <ion-footer class="background-whit">
   <div class="buttons">
     <button class="btn-cancel cursor-pointer" shape="round" (click)="close()">Cancelar</button>
-    <button class="btn-ok cursor-pointer" shape="round" (click)="save()">Gravar</button>
+    <button class="btn-ok cursor-pointer" shape="round" (click)="gravasAction()">Gravar</button>
   </div>
 </ion-footer>

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

@@ -41,7 +41,7 @@ export class EditEventToApprovePage implements OnInit {
   public showSeconds = false;
   public touchUi = false;
   public enableMeridian = false;
-  public minDate = new Date().toISOString().slice(0,10)
+  public minDate = new Date()
   public endMinDate = new Date(new Date().getTime() + 15 * 60000);
   public maxDate: any;
   public stepHour = 1;
@@ -150,7 +150,7 @@ export class EditEventToApprovePage implements OnInit {
 
   async getTask() {
 
-    this.processes.GetTask(this.serialNumber).subscribe( (result) =>{
+    this.processes.GetTask(this.serialNumber).subscribe( (result) => {
       this.eventProcess = result
 
       this.eventProcess.workflowInstanceDataFields.LastOccurrence = new Date(this.eventProcess.workflowInstanceDataFields.LastOccurrence)
@@ -179,6 +179,9 @@ export class EditEventToApprovePage implements OnInit {
   }
 
   onSelectedRecurringChanged(ev:any) {
+
+    this.calculetedLastOccurrence(ev);
+
     if(ev.length > 1) {
       
       this.eventProcess.workflowInstanceDataFields.OccurrenceType = ev.filter(data => data != '-1');
@@ -188,6 +191,44 @@ export class EditEventToApprovePage implements OnInit {
     }
   }
 
+  calculetedLastOccurrence(type:number){
+    var valor; 
+    var opcao: boolean;
+    if (type == 0) {
+      valor = 7;
+      opcao = true;
+    } else if(type == 1){
+      valor = 30;
+      opcao = true;
+    } else if(type == 2){
+      valor = 1;
+      opcao = false;
+    }else if(type == 3){
+      valor = 5;
+      opcao = false;
+    }
+    this.defineLastOccurrence(valor, opcao);
+  }
+
+
+  defineLastOccurrence(valor:number, opcao:boolean){
+    var time = new Date(this.eventProcess.workflowInstanceDataFields.EndDate);
+    if (opcao == true) {
+      time.setDate(time.getDate() + valor);
+      this.eventProcess.workflowInstanceDataFields.LastOccurrence = time;
+    } else {
+      time = new Date(
+        time.getFullYear() + valor, 
+        time.getMonth(), 
+        time.getDate(), 
+        time.getHours(), 
+        time.getMinutes()
+      );
+      this.eventProcess.workflowInstanceDataFields.LastOccurrence = time;
+    }
+    
+  }
+
   setOtherData() {
     if(this.eventProcess.workflowInstanceDataFields.ParticipantsList) {
       this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e => {
@@ -223,14 +264,12 @@ export class EditEventToApprovePage implements OnInit {
     this.setIntervenientCC.emit([]);
     this.clearContact.emit();
 
-
     this.approveEventDismiss.emit({
-      "serialNumber": this.eventProcess.serialNumber,
-      "action": "Aprovar",
-      "saveData": this.eventProcess
+      serialNumber: this.eventProcess.serialNumber,
+      action: "Aprovar",
+      saveData: this.eventProcess
     });
 
-    
   }
 
 
@@ -276,7 +315,10 @@ export class EditEventToApprovePage implements OnInit {
     if(this.Form.invalid) return false
 
     // set dates to eventProcess object
-    this.getDatepickerData()
+    this.dateControlStart = new FormControl(moment(new Date(this.eventProcess.workflowInstanceDataFields.StartDate)).add(1, 'hours'));
+    this.dateControlEnd = new FormControl(moment(new Date(this.eventProcess.workflowInstanceDataFields.EndDate)).add(1, 'hours'));
+    // this.restoreDatepickerData()
+    // this.getDatepickerData()
 
     this.taskParticipantsCc.forEach( e => {
       e.IsRequired = false
@@ -291,13 +333,14 @@ export class EditEventToApprovePage implements OnInit {
       }
     })
 
+
     const event: EventToApproveEdit = {
       SerialNumber: this.eventProcess.serialNumber,
       Body: this.eventProcess.workflowInstanceDataFields.Body,
       Location: this.eventProcess.workflowInstanceDataFields.Location,
       Subject: this.eventProcess.workflowInstanceDataFields.Subject,
-      StartDate: this.eventProcess.workflowInstanceDataFields.StartDate,
-      EndDate: this.eventProcess.workflowInstanceDataFields.EndDate,
+      StartDate: this.dateControlStart.value,
+      EndDate: this.dateControlEnd.value,
       ReviewUserComment: '',
       Agenda: this.eventProcess.workflowInstanceDataFields.Agenda,
       MDName: this.eventProcess.workflowInstanceDataFields.MDName,
@@ -330,14 +373,14 @@ export class EditEventToApprovePage implements OnInit {
       if(document['action'] == 'add') {
         delete document.action
         this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{
-          // this.toastService.successMessage();
+
         }, error =>{
           this.toastService.badRequest();
         });
       } else if(document['action'] == 'delete') {
         delete document.action
         this.attachmentsService.deleteEventAttachmentById(document.Id).subscribe( res=>{
-          // this.toastService.successMessage()
+
         }, error =>{
           this.toastService.badRequest()
         })
@@ -347,6 +390,42 @@ export class EditEventToApprovePage implements OnInit {
 
   }
 
+  async gravasAction() {
+    
+    await this.save();
+
+    if(this.eventProcess['activityInstanceName'] == 'Editar Evento') {
+      this.reenviar();
+    }
+
+  }
+
+  async reenviar() {
+    let body = {
+      serialNumber: this.eventProcess.serialNumber,
+      action: "Reenviar",
+        dataFields: {
+        ReviewUserComment: "",
+      }
+    }
+    
+    const loader = this.toastService.loading();
+
+    try {
+      await this.processes.PostTaskAction(body).toPromise();
+      this.toastService._successMessage();
+      this.goToApproveEventList();
+    } catch (error) {
+      this.toastService._badRequest();
+    }  finally {
+      loader.remove()
+    }
+  }
+
+  goToApproveEventList() {
+    this.closeEventToApprove.emit();
+    this.modalController.dismiss();
+  }
 
   dynamicSetIntervenient({taskParticipants, taskParticipantsCc}) {
     this.taskParticipants = removeDuplicate(taskParticipants) ;
@@ -472,7 +551,6 @@ export class EditEventToApprovePage implements OnInit {
   }
 
   getDatepickerData() {
-
     this.eventProcess.workflowInstanceDataFields.StartDate = this.dateStart
     this.eventProcess.workflowInstanceDataFields.EndDate = this.dateEnd
 

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

@@ -118,6 +118,7 @@
               [(ngModel)]="postEvent.StartDate"
               [max]="maxDate"
               [disabled]="disabled"
+              [min]="currentDate"
             >
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker1
@@ -146,6 +147,7 @@
               [(ngModel)]="postEvent.EndDate"
               [max]="maxDate"
               [disabled]="disabled"
+              [min]="currentDate"
             >
             <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #fim

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

@@ -48,6 +48,7 @@ export class EditEventPage implements OnInit {
   public stepHour = 1;
   public stepMinute = 5;
   public stepSecond = 5;
+  currentDate = new Date();
 
   Form: FormGroup;
   validateFrom = false
@@ -118,14 +119,6 @@ export class EditEventPage implements OnInit {
       this.setIntervenient.emit(this.taskParticipants);
       this.setIntervenientCC.emit(this.taskParticipantsCc);
 
-      this.isEventEdited = false;
-
-      if(this.postEvent.IsRecurring == false) {
-        this.isRecurring = "Não se repete";
-      }
-      else{
-        this.isRecurring = "Repete";
-      }
     }
 
     this.initCalendarName = this.postEvent.CalendarName;
@@ -136,6 +129,8 @@ export class EditEventPage implements OnInit {
 
     this.postEvent.EventRecurrence.Type = this.postEvent.EventRecurrence.Type.toString();
 
+    this.postEvent.EventRecurrence.LastOccurrence = this.currentDate;
+
     setTimeout(() => {
       this.postEvent.EventRecurrence.Type = this.postEvent.EventRecurrence.Type.toString();
       
@@ -225,6 +220,8 @@ export class EditEventPage implements OnInit {
   }
 
   onSelectedRecurringChanged(ev:any){
+
+    this.calculetedLastOccurrence(ev);
     
     if(ev.length > 1){
       
@@ -235,6 +232,45 @@ export class EditEventPage implements OnInit {
     }
   }
 
+  calculetedLastOccurrence(type:number){
+    console.log(type);
+    var valor; 
+    var opcao: boolean;
+    if (type == 0) {
+      valor = 7;
+      opcao = true;
+    } else if(type == 1){
+      valor = 30;
+      opcao = true;
+    } else if(type == 2){
+      valor = 1;
+      opcao = false;
+    }else if(type == 3){
+      valor = 5;
+      opcao = false;
+    }
+    this.defineLastOccurrence(valor, opcao);
+  }
+
+
+  defineLastOccurrence(valor:number, opcao:boolean){
+    var time = new Date(this.postEvent.EndDate);
+    if (opcao == true) {
+      time.setDate(time.getDate() + valor);
+      this.postEvent.EventRecurrence.LastOccurrence = time;
+    } else {
+      time = new Date(
+        time.getFullYear() + valor, 
+        time.getMonth(), 
+        time.getDate(), 
+        time.getHours(), 
+        time.getMinutes()
+      );
+      this.postEvent.EventRecurrence.LastOccurrence = time;
+    }
+    
+  }
+
 
   async save() {
 

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

@@ -98,6 +98,7 @@
     font-style: normal;
     line-height: normal;
     letter-spacing: normal;
+    text-transform: none ;
     color: var(--title-text-color);
     margin: 0;
     padding: 0;

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

@@ -128,6 +128,7 @@
               placeholder="Choose a date"
               [(ngModel)]="postEvent.StartDate"
               [disabled]="disabled"
+              [min]="currentDate"
             >
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker1
@@ -159,6 +160,7 @@
               placeholder="Choose a date"
               [(ngModel)]="postEvent.EndDate"
               [disabled]="disabled"
+              [min]="currentDate"
             >
             <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #fim

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

@@ -63,6 +63,7 @@ export class NewEventPage implements OnInit {
   public stepHour = 1;
   public stepMinute = 5;
   public stepSecond = 5;
+  currentDate = new Date();
   public color: ThemePalette = 'primary';
   recurringTypes = []
   selectedRecurringType: any;
@@ -364,6 +365,8 @@ export class NewEventPage implements OnInit {
 
   onSelectedRecurringChanged(ev:any){
     
+    this.calculetedLastOccurrence(ev);
+    
     if(ev.length > 1){
       
       this.postEvent.EventRecurrence.Type = ev.filter(data => data != '-1');
@@ -373,8 +376,45 @@ export class NewEventPage implements OnInit {
     }
   }
 
+  calculetedLastOccurrence(type:number){
+    console.log(type);
+    var valor; 
+    var opcao: boolean;
+    if (type == 0) {
+      valor = 7;
+      opcao = true;
+    } else if(type == 1){
+      valor = 30;
+      opcao = true;
+    } else if(type == 2){
+      valor = 1;
+      opcao = false;
+    }else if(type == 3){
+      valor = 5;
+      opcao = false;
+    }
+    this.defineLastOccurrence(valor, opcao);
+  }
 
 
+  defineLastOccurrence(valor:number, opcao:boolean){
+    var time = new Date(this.postEvent.EndDate);
+    if (opcao == true) {
+      time.setDate(time.getDate() + valor);
+      this.postEvent.EventRecurrence.LastOccurrence = time;
+    } else {
+      time = new Date(
+        time.getFullYear() + valor, 
+        time.getMonth(), 
+        time.getDate(), 
+        time.getHours(), 
+        time.getMinutes()
+      );
+      this.postEvent.EventRecurrence.LastOccurrence = time;
+    }
+    
+  }
+
   async save() {
 
     this.injectValidation()

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

@@ -53,13 +53,12 @@
           <p>{{customDate}}</p>
           <p *ngIf="toDateString(loadedEvent.StartDate) == toDateString(loadedEvent.EndDate)">das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}</p>
           <p *ngIf="toDateString(loadedEvent.StartDate) != toDateString(loadedEvent.EndDate)">{{loadedEvent.StartDate | date: 'd/M/yy' }} - {{ loadedEvent.StartDate | date: 'dd/M/yy'}} </p>
-          <p *ngIf="!loadedEvent.IsRecurring">(Não se repete)</p>
-          <p *ngIf="loadedEvent.IsRecurring">
+          <p>
             <span *ngIf="loadedEvent.EventRecurrence.Type == 0">Diário</span>
             <span *ngIf="loadedEvent.EventRecurrence.Type == 1">Semanal</span>
             <span *ngIf="loadedEvent.EventRecurrence.Type == 2">Mensal</span>
             <span *ngIf="loadedEvent.EventRecurrence.Type == 3">Anual</span>
-            <span *ngIf="loadedEvent.EventRecurrence.Type == -1">Nunca</span>            
+            <span *ngIf="loadedEvent.EventRecurrence.Type == -1">(Não se repete)</span>            
           </p>
 
         </ion-label>

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

@@ -105,6 +105,7 @@ export class ViewEventPage implements OnInit {
       this.eventsService.getEvent(this.eventId).subscribe(res => {
         
         this.loadedEvent = res;
+        console.log(this.loadedEvent);
         this.today = new Date(res.StartDate);
         this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]);
       }, (error)=> {