save

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

@@ -261,9 +261,6 @@ export class GabineteDigitalPage implements OnInit {
     this.processesbackend.GetToApprovedEvents('Agenda','true').subscribe(res=>{
       this.count_ev_apr = res;
     });
-    /* this.processesbackend.GetToApprovedEvents('MDGPR','true').subscribe(res=>{
-      this.count_ev_md = res;
-    }); */
 
     this.showLoader = false;
 

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

@@ -21,6 +21,7 @@ import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'
 import { MAT_DATE_LOCALE } from '@angular/material/core';
 import { MatDatepickerModule } from '@angular/material/datepicker';
 import { MatInputModule } from '@angular/material/input';
+import { MatDialogModule } from '@angular/material/dialog';
 
 @NgModule({
   imports: [
@@ -28,6 +29,7 @@ import { MatInputModule } from '@angular/material/input';
     FormsModule,
     IonicModule,
     EditEventToApprovePageRoutingModule,
+    // Angular material
     MatDatepickerModule,
     MatInputModule,
     MatNativeDateModule,
@@ -37,7 +39,8 @@ import { MatInputModule } from '@angular/material/input';
     NgxMatMomentModule,
     MatSelectModule,
     MatButtonModule,
-    ReactiveFormsModule
+    ReactiveFormsModule,
+    MatDialogModule,
   ],
   declarations: [EditEventToApprovePage],
   exports: [EditEventToApprovePage]

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

@@ -8,7 +8,7 @@
         <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 TK</ion-label>
             </div>
           </div>
         </ion-header>
@@ -70,8 +70,10 @@
                 </ion-select>
 
 
-                <mat-form-field appearance="none"  class="d-none d-md-block width-100" >
+                <mat-form-field appearance="none"
-                  <mat-select placeholder="Selecione agenda" [(ngModel)]="eventProcess.workflowInstanceDataFields.Agenda" >
+                class="d-none d-md-block width-100" >
+                  <mat-select placeholder="Selecione agenda"
+                  [(ngModel)]="eventProcess.workflowInstanceDataFields.Agenda" >
                     <mat-option value="Oficial">
                       Oficial
                     </mat-option>
@@ -176,31 +178,23 @@
                 <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
               </div>
               <div class="ion-input-class">
-                <ion-select 
-                placeholder="Selecione repetição"
-                class="d-block d-md-none" 
-                [(ngModel)]="eventProcess.workflowInstanceDataFields.IsRecurring"
-                selectedText="{{isRecurring}}" 
-                interface="action-sheet" 
-                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>
-                </ion-select>
 
                 <mat-form-field
-                  class="width-100 d-none d-md-block" 
+                  class="width-100 d-block "
                   placeholder="Selecione repetição"
                   value="false"
                   interface="action-sheet"
                   required
                   appearance="none"
                 >
-                  <mat-select [(value)]="eventProcess.workflowInstanceDataFields.IsRecurring">
+                <mat-select
-                    <mat-option value="false">
+                  [(ngModel)]="eventProcess.workflowInstanceDataFields.OccurrenceType"
-                      Não se repete
+                  (ngModelChange)="onSelectedRecurringChanged($event)"
-                    </mat-option>
+                  >
-                    <mat-option value="true">
+                    <mat-option
-                      Repete
+                    *ngFor="let recurring of recurringTypes" value="{{recurring.Code}}"
+                    >
+                    {{recurring.Description}}
                     </mat-option>
                   </mat-select>
                 </mat-form-field>
@@ -209,6 +203,34 @@
             </div>
           </div>
 
+          <div *ngIf="eventProcess.workflowInstanceDataFields.OccurrenceType != '-1'"
+            class="container-div width-100">
+            <div class="ion-item-class-2 d-flex">
+              <div class="ion-icon-class">
+                <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
+              </div>
+              <div class="ion-input-class flex-grow-1">
+
+                <mat-form-field class="date-hour-picker d-none d-md-block">
+                  <input matInput [ngxMatDatetimePicker]="occurrrence"
+                    placeholder="Choose a date"
+                    [(ngModel)]="eventProcess.workflowInstanceDataFields.LastOccurrence"
+                    [disabled]="disabled"
+                  >
+                  <mat-datepicker-toggle id="last-occurrence" matSuffix [for]="occurrrence"></mat-datepicker-toggle>
+                  <ngx-mat-datetime-picker #occurrrence
+                    [showSpinners]="showSpinners"
+                    [showSeconds]="showSeconds"
+                    [stepHour]="stepHour" [stepMinute]="stepMinute"
+                    [stepSecond]="stepSecond"
+                    [touchUi]="touchUi"
+                    >
+                  </ngx-mat-datetime-picker>
+                </mat-form-field>
+
+              </div>
+            </div>
+          </div>
 
 
           <div class="container-div width-100">

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

@@ -45,6 +45,8 @@ export class EditEventToApprovePage implements OnInit {
   public stepSecond = 5;
   public dateControlStart = new FormControl(moment("DD MM YYYY hh"));
   public dateControlEnd = new FormControl(moment("DD MM YYYY hh"));
+  recurringTypes: any;
+  selectedRecurringType: any;
 
   showLoader = false
 
@@ -127,12 +129,16 @@ export class EditEventToApprovePage implements OnInit {
 
   ngOnInit() {
 
+    console.log('EDITAR');
+
+
     if(this.restoreTemporaryData()){
       this.setOtherData()
     } else {
       this.getTask();
 
     }
+    this.getRecurrenceTypes();
 
   }
 
@@ -156,6 +162,24 @@ export class EditEventToApprovePage implements OnInit {
     })
   }
 
+  getRecurrenceTypes() {
+    this.eventsService.getRecurrenceTypes().subscribe(res=>{
+      console.log(res);
+      this.recurringTypes = res;
+    });
+  }
+
+  onSelectedRecurringChanged(ev:any){
+    console.log(ev);
+    if(ev.length > 1){
+      console.log(ev.filter(data => data != '-1'));
+      this.eventProcess.workflowInstanceDataFields.OccurrenceType = ev.filter(data => data != '-1');
+    }
+    if(ev.length == 0){
+      this.eventProcess.workflowInstanceDataFields.OccurrenceType = "-1";
+    }
+  }
+
   setOtherData() {
     if(this.eventProcess.workflowInstanceDataFields.ParticipantsList) {
       this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e => {
@@ -274,6 +298,7 @@ export class EditEventToApprovePage implements OnInit {
       ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList,
     }
 
+    console.log(event);
 
     this.eventsService.postEventToApproveEdit(event).subscribe(()=>{
       this.toastService.successMessage('Evento editado');

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

@@ -171,7 +171,7 @@
                   required
                   appearance="none"
                 >
-                  <mat-select [(ngModel)]="eventProcess.workflowInstanceDataFields.OccurrenceType"
+                <mat-select [(ngModel)]="eventProcess.workflowInstanceDataFields.OccurrenceType"
                   (ngModelChange)="onSelectedRecurringChanged($event)"
                   >
                     <mat-option