Merge branch 'feature/agenda-new-api-eudes' into feature/agenda-new-api-eudes-backup

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

@@ -144,6 +144,68 @@
             </div>
         </div>
 
+        <div class="container-div">
+          <div class="ion-item-class-2 d-flex">
+            <div class="ion-icon-class">
+              <ion-icon slot="start" src="assets/images/icons-reapet.svg"></ion-icon>
+            </div>
+            <div class="ion-input-class flex-grow-1 justify-center align-center material-inputs">
+      
+              <mat-form-field appearance="none" class="width-100" placeholder="Sample Type" required>
+                <!-- <input matInput type="text" > -->
+                <mat-select [(value)]="postEvent.EventRecurrence.frequency" >
+                  <mat-option value="never">
+                    Nunca
+                  </mat-option>
+                  <mat-option value="daily">
+                    Diário
+                  </mat-option>
+                  <mat-option value="weekly">
+                    Semanalmente
+                  </mat-option>
+                  <mat-option value="monthly">
+                    Mensal
+                  </mat-option>
+                  <mat-option value="yearly">
+                    Anual
+                  </mat-option>
+                </mat-select>
+              </mat-form-field>
+      
+            </div>
+          </div>
+        </div>
+      
+        <div *ngIf="postEvent.EventRecurrence.frequency != 'never'" class="container-div">
+          <div class="ion-item-class-2 d-flex" >
+            <div class="ion-icon-class">
+              <ion-icon slot="start" src="assets/images/icons-reapet.svg"></ion-icon>
+            </div>
+      
+            <div  class="ion-input-class flex-grow-1 justify-center align-center material-inputs materia-top" >
+      
+              <mat-form-field appearance="none" class="date-hour-picker">
+                <input matInput [ngxMatDatetimePicker]="picker1"
+                  placeholder="Data Fim de Recorrência*"
+                  [(ngModel)]="postEvent.EventRecurrence.until"
+                  [disabled]="disabled"
+                >
+                <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" ></mat-datepicker-toggle>
+                <ngx-mat-datetime-picker #picker1
+                  [showSpinners]="showSpinners"
+                  [showSeconds]="showSeconds"
+                  [stepHour]="stepHour" [stepMinute]="stepMinute"
+                  [stepSecond]="stepSecond"
+                  [touchUi]="touchUi"
+                  [hideTime]="true"
+                  >
+                </ngx-mat-datetime-picker>
+              </mat-form-field>
+      
+            </div>
+          </div>
+        </div>
+
           <div *ngIf="allDayCheck" class="container-div width-100">
             <div class="ion-item-class-2 width-100">
               <div class="ion-icon-class">

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

@@ -20,6 +20,7 @@ import { environment } from 'src/environments/environment';
 import { ContactsService } from 'src/app/services/contacts.service';
 import { DomSanitizerService } from 'src/app/services/DomSanitizer.service';
 import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service';
+import { Utils } from 'src/app/services/Repositorys/Agenda/utils';
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -105,7 +106,8 @@ export class EditEventPage implements OnInit {
     private httpErrorHandle: HttpErrorHandle,
     private contactsService: ContactsService,
     private domSanitazerService: DomSanitizerService,
-    private agendaDataRepository: AgendaDataRepositoryService
+    private agendaDataRepository: AgendaDataRepositoryService,
+    private utils: Utils
   ) {
 
     /* this.postEvent = new Event(); */
@@ -154,7 +156,7 @@ export class EditEventPage implements OnInit {
       })
     }
 
-    if (this.postEvent.IsRecurring == false) {
+    if (this.postEvent.EventRecurrence.frequency == 'never') {
       this.isRecurring = "Não se repete";
     }
     else {
@@ -168,6 +170,7 @@ export class EditEventPage implements OnInit {
   }
 
   ngOnInit() {
+    this.postEvent.EventRecurrence.frequency = this.utils.recurenceTypeSeleted(this.postEvent.EventRecurrence.frequency)
     console.log(this.postEvent?.Attachments)
     console.log(this.loadedEventAttachments)
     window.onresize = (event) => {

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

@@ -19,7 +19,7 @@
       <ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Assunto*" [(ngModel)]="postEvent.Subject"></ion-input>
     </div>
 
-    <div class="container-div" >
+    <div *ngIf="(sharedCalendar | async) as calendarData" class="container-div" >
       <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>
@@ -29,22 +29,15 @@
           <mat-form-field appearance="none"  class="width-100" color="ion-color-secondary"  placeholder="Selecione agenda">
             <mat-select [(value)]="CalendarName" (selectionChange)="changeAgenda()">
 
-              <!-- <mat-option *ngFor="let calendars of _eventService.calendarNamesAry; let i = index" value="{{calendars}}">
-                <div *ngIf="calendars != 'Meu calendario' && calendars == 'Presidente da República'"> {{ environment.agendaPR}} </div>
-                <div *ngIf="calendars != 'Meu calendario' && calendars == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
-                <div *ngIf="calendars != 'Meu calendario' && calendars != 'Ministro e Director do Gabinete do PR' && calendars != 'Presidente da República'"> Agenda do {{calendars}} </div>
-                
-                <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div> -->
-                <mat-option *ngFor="let calendars of eventService.calendarNamesAry" value="{{calendars.Fullname || calendars}}">
-                 <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
-                 <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
-                 <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
-                 <div *ngIf="calendars == 'Meu calendario'"> 
-                  <!-- <span *ngIf="SessionStore.user.Profile == 'PR' ">Agenda do PR</span>
-                  <span *ngIf="SessionStore.user.Profile == 'MDGPR' ">Agenda do MDGPR</span>
-                  <span *ngIf="SessionStore.user.Profile != 'MDGPR' && SessionStore.user.Profile != 'PR'  ">Minha agenda</span> -->
+              <mat-option *ngFor="let calendars of calendarData" value="{{calendars.wxUserId}}">
+
+                <div *ngIf="calendars.roleId == RoleIdService.PRES">PR </div>
+                <div *ngIf="calendars.roleId == RoleIdService.MD && calendars.roleId != SessionStore.user.RoleID">AGENDA DO MDGPR</div>
+                <div *ngIf="calendars.roleId != RoleIdService.MD && calendars.roleId != RoleIdService.PRES && calendars.wxFullName && calendars.wxUserId != SessionStore.user.UserId"> Agenda do {{calendars.wxFullName}} </div>
+                <div *ngIf="calendars.wxUserId == SessionStore.user.UserId ">
                   Minha agenda
-                 </div>
+                </div>
+    
               </mat-option>
 
             </mat-select>
@@ -120,6 +113,68 @@
           </ion-item>
         </div>
     </div>
+
+    <div class="container-div">
+      <div class="ion-item-class-2 d-flex">
+        <div class="ion-icon-class">
+          <ion-icon slot="start" src="assets/images/icons-reapet.svg"></ion-icon>
+        </div>
+        <div class="ion-input-class flex-grow-1 justify-center align-center material-inputs">
+
+          <mat-form-field appearance="none" class="width-100" placeholder="Sample Type" required>
+            <!-- <input matInput type="text" > -->
+            <mat-select [(value)]="postEvent.EventRecurrence.frequency" >
+              <mat-option value="never">
+                Nunca
+              </mat-option>
+              <mat-option value="daily">
+                Diário
+              </mat-option>
+              <mat-option value="weekly">
+                Semanalmente
+              </mat-option>
+              <mat-option value="monthly">
+                Mensal
+              </mat-option>
+              <mat-option value="yearly">
+                Anual
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+
+        </div>
+      </div>
+    </div>
+  
+    <div *ngIf="postEvent.EventRecurrence.frequency != 'never'" class="container-div">
+      <div class="ion-item-class-2 d-flex" >
+        <div class="ion-icon-class">
+          <ion-icon slot="start" src="assets/images/icons-reapet.svg"></ion-icon>
+        </div>
+  
+        <div  class="ion-input-class flex-grow-1 justify-center align-center material-inputs materia-top" >
+  
+          <mat-form-field appearance="none" class="date-hour-picker">
+            <input matInput [ngxMatDatetimePicker]="picker1"
+              placeholder="Data Fim de Recorrência*"
+              [(ngModel)]="postEvent.EventRecurrence.until"
+              [disabled]="disabled"
+            >
+            <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" ></mat-datepicker-toggle>
+            <ngx-mat-datetime-picker #picker1
+              [showSpinners]="showSpinners"
+              [showSeconds]="showSeconds"
+              [stepHour]="stepHour" [stepMinute]="stepMinute"
+              [stepSecond]="stepSecond"
+              [touchUi]="touchUi"
+              [hideTime]="true"
+              >
+            </ngx-mat-datetime-picker>
+          </mat-form-field>
+  
+        </div>
+      </div>
+    </div>
     
 
 
@@ -259,7 +314,7 @@
     </div>
 
 
-    <div *ngIf="postEvent.EventRecurrence.Type != '-1'" class="container-div width-100">
+<!--     <div *ngIf="postEvent.EventRecurrence.Type != '-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>
@@ -285,7 +340,7 @@
 
         </div>
       </div>
-    </div>
+    </div> -->
 
     <div class="container-div">
       <div class="ion-item-class-2">

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

@@ -29,6 +29,10 @@ import { MatDatepickerModule } from '@angular/material/datepicker';
 import { MomentDateAdapter } from '@angular/material-moment-adapter';
 import { EventInputDTO } from '../../../services/Repositorys/Agenda/agendaDataModels';
 import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service';
+import { Observable } from 'rxjs';
+import { TableSharedCalendar } from 'src/app/services/Repositorys/Agenda/agenda-local-data-source.service';
+import { map } from 'rxjs/operators';
+import { RoleIdService } from 'src/app/services/role-id.service'
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -116,6 +120,9 @@ export class NewEventPage implements OnInit {
   eventPersons: EventPerson[];
   contacts: EventPerson[];
   allDayCheck: boolean = false;
+  eventRecurence = 'never';
+  sharedCalendar: Observable<TableSharedCalendar[]>
+  selectedUserCalendar:any;
 
 
   constructor(
@@ -133,7 +140,8 @@ export class NewEventPage implements OnInit {
     private contactsService: ContactsService,
     private domSanitazerService: DomSanitizerService,
     private dateAdapter: DateAdapter<Date>,
-    private agendaDataRepository: AgendaDataRepositoryService
+    private agendaDataRepository: AgendaDataRepositoryService,
+    public RoleIdService: RoleIdService,
   ) {
     this.loggeduser = SessionStore.user;
     this.postEvent = new Event();
@@ -146,6 +154,40 @@ export class NewEventPage implements OnInit {
     this.selectedDate = this.navParams.get('eventSelectedDate');
     this.taskParticipants = this.navParams.get('attendees');
     this.CalendarDate = this.navParams.get('CalendarDate')
+
+    // Define the role priorities
+    const rolePriorities: { [key: number]: number } = {
+      100000014: 1, // Presidente da República
+      100000011: 2, // Vice Presidente (example role ID)
+      // Add other roles with their priorities here
+    };
+
+    this.sharedCalendar = this.agendaDataRepository.getShareCalendarItemsLive().pipe(
+      map(data => data.sort((a, b) => {
+        console.log('Raw data:', data); // Debug line
+        const priorityA = rolePriorities[a.roleId] || Infinity;
+        const priorityB = rolePriorities[b.roleId] || Infinity;
+        return priorityA - priorityB;
+      }))
+    )
+
+
+    this.setCalendarByDefault(true)
+  }
+
+  async setCalendarByDefault(force) {
+    if (!this.selectedUserCalendar || force) {
+
+      const data = await this.agendaDataRepository.geCalendars()
+
+      const prObject = data.find(e => e?.roleId == 100000014)
+      if(prObject) {
+        this.selectedUserCalendar = prObject.wxUserId
+      } else {
+        this.selectedUserCalendar = SessionStore.user.UserId
+      }
+
+    }
   }
 
   ngOnInit() {
@@ -187,7 +229,8 @@ export class NewEventPage implements OnInit {
         Organizer: '',
         Category: 'Reunião',
         HasAttachments: false,
-        EventRecurrence: { Type: '-1', LastOccurrence: this.autoEndTime },
+        EventRecurrence: { frequency: this.eventRecurence, until: this.autoEndTime,
+          Type: ''  },
       };
     }
     else {
@@ -209,7 +252,8 @@ export class NewEventPage implements OnInit {
         Organizer: '',
         Category: 'Reunião',
         HasAttachments: false,
-        EventRecurrence: { Type: '-1', LastOccurrence: this.autoEndTime },
+        EventRecurrence: { frequency: this.eventRecurence, until: this.autoEndTime,
+          Type: ''  },
       };
     }