Fix

src/app/modals/create-process/create-process.page.ts

@@ -546,7 +546,7 @@ export class CreateProcessPage implements OnInit {
           taskParticipants: this.taskParticipants,
           taskParticipantsCc: this.taskParticipantsCc
         },
-        cssClass: 'attendee',
+        cssClass: 'attendee modal-desktop',
         backdropDismiss: false
       });
 

src/app/modals/profile/profile.page.ts

@@ -213,7 +213,6 @@ export class ProfilePage implements OnInit {
 
   logout() {
     SessionStore.setInativity(false)
-    window['inactivity/function']()
     
     setTimeout(() => {
       this.router.navigate(['/inactivity']);

src/app/models/event.model.ts

@@ -127,6 +127,7 @@ export interface EventToApproveEdit {
     MDEmail: string;
     IsAllDayEvent: boolean;
     Status: string;
+    Category: string
     EventType: string;
     IsRecurring: boolean;
     ParticipantsList: ParticipantsList[];
@@ -140,4 +141,59 @@ export interface EventToApproveEdit {
     InstanceId?: string;
 }
 
-// ================================================================================
+// // ================================================================================
+// export interface EventToApproveDetails {
+//     serialNumber: string;
+//     originator: {
+//         email: string;
+//         manager: string;
+//         displayName: string;
+//         fqn: string;
+//         username: string;
+//     }[]
+//     actions: string[];
+//     activityInstanceName: string;
+//     workflowInstanceFolio: string;
+//     taskStartDate: string;
+//     workflowID: number;
+//     workflowInstanceID: number;
+//     workflowName: string;
+//     workflowDisplayName: string;
+//     formURL: string;
+//     workflowInstanceDataFields: {
+//         Body: string;
+//         Location: string;
+//         Subject: string;
+//         StartDate: string;
+//         EndDate: string;
+//         Participants: string;
+//         CC: string;
+//         Private: boolean;
+//         ReviewUserComment: string;
+//         MDName: string;
+//         MDEmail: string;
+//         OriginatorComments: string;
+//         Agenda: string;
+//         EventType: string;
+//         TimeZone: string;
+//         EventID: string;
+//         HasAttachments: boolean;
+//         ParticipantsList: {
+//             $type?: any;
+//             EmailAddress: string;
+//             Name: string;
+//             IsRequired: boolean;
+//         }[]
+//         EventOrganizer: string;
+//         CreatEvent: string;
+//         IsAllDayEvent: boolean;
+//         MDwxUserID: number;
+//         SerializedItem: string;
+//         DeserializedItem: string;
+//         Status: string;
+//         Message: string;
+//         InstanceId: string;
+//     }
+//     totalDocuments?: any;
+//     Documents?: any;
+// }

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

@@ -265,7 +265,7 @@ export class EditEventPage implements OnInit {
           taskParticipants: this.taskParticipants,
           taskParticipantsCc: this.taskParticipantsCc
         },
-        cssClass: 'attendee',
+        cssClass: 'modal attendee modal-desktop',
         backdropDismiss: false
       });
 
@@ -279,9 +279,14 @@ export class EditEventPage implements OnInit {
           const newAttendees: EventPerson[] = data['taskParticipants'];
           const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
 
+          if(newAttendees.length) {
             this.setIntervenient(newAttendees);
+          }
+          if(newAttendeesCC) {
             this.setIntervenientCC(newAttendeesCC);
           }
+          
+        }
       });
     }
 

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

@@ -3,7 +3,7 @@
     <div class="main-header">
       <div class="title-content width-100">
         <div class="middle">
-          <ion-label class="title">Novo Evento</ion-label>
+          <ion-label class="title">Novo Evento 21313123</ion-label>
         </div>
       </div>
     </div>

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

@@ -296,9 +296,9 @@ export class NewEventPage implements OnInit {
     const modal = await this.modalController.create({
       component: AttendeesPageModal,
        componentProps: {
-        eventAttendees: this.postEvent.Attendees,
         adding: this.adding,
-        taskParticipants: this.taskParticipants
+        taskParticipants: this.taskParticipants,
+        taskParticipantsCc: this.taskParticipantsCc
       },
       cssClass: 'attendee modal modal-desktop',
       backdropDismiss: false
@@ -308,19 +308,27 @@ export class NewEventPage implements OnInit {
 
     modal.onDidDismiss().then((data) => {
 
-      if(data){
+      if(data) {
         data = data['data'];
+        if(data) {
 
           const newAttendees: EventPerson[] = data['taskParticipants'];
           const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
           
+          if(newAttendees.length) {
             this.setIntervenient(newAttendees);
+          }
+          if(newAttendeesCC) {
             this.setIntervenientCC(newAttendeesCC);
           }
+          
+        }
+
+      }
     });
   }
 
-  setIntervenient(data){
+  setIntervenient(data) {
     this.taskParticipants = data;
     this.postEvent.Attendees = data;
   }
@@ -329,7 +337,7 @@ export class NewEventPage implements OnInit {
     this.taskParticipantsCc = data;
   }
 
-  addParticipants(){
+  addParticipants() {
     this.adding = 'intervenient'
     this.openAttendees();
   }

src/app/services/notifications.service.ts

@@ -219,7 +219,9 @@ export class NotificationsService {
               //this.jsonstore.createCollection('Notifications',message);
               this.DataArray.push(message)
               console.log("On ReceiveNotification", this.DataArray)
-              this.storageService.store("Notifications",JSON.stringify(this.DataArray))
+              this.storageService.store("Notifications",JSON.stringify(this.DataArray)).then(()=>{
+
+              })
               
               console.log(message);
               var data = JSON.parse(message.payload);

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

@@ -87,6 +87,48 @@
             </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('Categories')?.invalid  && validateFrom ">
+  
+                <ion-select  placeholder="Selecione tipo de evento*"
+                class="d-block d-md-none"
+                [(ngModel)]="eventProcess.workflowInstanceDataFields.Category"
+                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>
+                  <ion-select-option value="Conferência">Conferência</ion-select-option>
+                  <ion-select-option value="Encontro">Encontro</ion-select-option>
+                </ion-select>
+  
+  
+                <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)]="eventProcess.workflowInstanceDataFields.Category" >
+                    <mat-option value="Reunião">
+                      Reunião
+                    </mat-option>
+                    <mat-option value="Viagem">
+                      Viagem
+                    </mat-option>
+                    <mat-option value="Conferência">
+                      Conferência
+                    </mat-option>
+                    <mat-option value="Encontro">
+                      Encontro
+                    </mat-option>
+                  </mat-select>
+                </mat-form-field>
+  
+  
+              </div>
+            </div>
+          </div>
+
           <div *ngIf="Form && validateFrom" >
             <div *ngIf="Form.get('participantes').invalid " class="input-errror-message">
               <div *ngIf="Form.get('participantes').errors?.required">

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

@@ -72,6 +72,7 @@ export class EditEventToApprovePage implements OnInit {
     workflowInstanceDataFields:{
       Body: "",
       OccurrenceType: '',
+      Category: '',
       LastOccurrence: '',
       IsRecurring: false,
       ParticipantsList: [],
@@ -146,7 +147,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.restoreDatepickerData()
@@ -302,6 +303,7 @@ export class EditEventToApprovePage implements OnInit {
         LastOccurrence: this.eventProcess.workflowInstanceDataFields.LastOccurrence,
       },
       ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList,
+      Category: this.eventProcess.workflowInstanceDataFields.Category
     }
 
     try {

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

@@ -55,7 +55,7 @@
       </div>
     </div>
 
-
+   123123
     <div class="container-div">
       <div class="ion-item-class-2 width-100 d-flex">
         <div class="ion-icon-class">

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

@@ -68,6 +68,49 @@
             </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*"
+                class="d-block d-md-none"
+                [(ngModel)]="eventProcess.workflowInstanceDataFields.Category"
+                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>
+                  <ion-select-option value="Conferência">Conferência</ion-select-option>
+                  <ion-select-option value="Encontro">Encontro</ion-select-option>
+                </ion-select>
+  
+  
+                <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)]="eventProcess.workflowInstanceDataFields.Category" >
+                    <mat-option value="Reunião">
+                      Reunião
+                    </mat-option>
+                    <mat-option value="Viagem">
+                      Viagem
+                    </mat-option>
+                    <mat-option value="Conferência">
+                      Conferência
+                    </mat-option>
+                    <mat-option value="Encontro">
+                      Encontro
+                    </mat-option>
+                  </mat-select>
+                </mat-form-field>
+  
+  
+              </div>
+            </div>
+          </div>
+
           <div class="container-div width-100">
             <div class="ion-item-class-2 width-100">
               <div class="ion-icon-class">

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

@@ -68,6 +68,7 @@ export class EditEventToApproveComponent implements OnInit {
     workflowInstanceDataFields:{
       Body: "",
       OccurrenceType: '',
+      Category: '',
       LastOccurrence: '',
       ParticipantsList: [],
       Agenda: '',
@@ -135,6 +136,7 @@ export class EditEventToApproveComponent implements OnInit {
     console.log(result);
 
     this.eventProcess = result
+    this.eventProcess.workflowInstanceDataFields.Category = result.workflowInstanceDataFields.EventType
 
     this.startDate = new Date(this.eventProcess.workflowInstanceDataFields.StartDate);
     this.endDate = new Date(this.eventProcess.workflowInstanceDataFields.EndDate);
@@ -254,6 +256,7 @@ export class EditEventToApproveComponent implements OnInit {
         LastOccurrence: this.eventProcess.workflowInstanceDataFields.LastOccurrence,
       },
       ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList,
+      Category: this.eventProcess.workflowInstanceDataFields.Category
     }
 
     console.log(event);
@@ -307,15 +310,20 @@ export class EditEventToApproveComponent implements OnInit {
 
       modal.onDidDismiss().then((data) => {
 
-        if(data){
+        if(data) {
           data = data['data'];
 
           const newAttendees: EventPerson[] = data['taskParticipants'];
           const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
 
+          if(newAttendees.length) {
             this.setIntervenient(newAttendees);
+          }
+          if(newAttendeesCC) {
             this.setIntervenientCC(newAttendeesCC);
           }
+          
+        }
       });
     } else {
       this.showAttendees = true