ITOTEAM-525 send the rigth category and ownertype

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

@@ -15,9 +15,8 @@ import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
 import { EventToApproveEdit } from 'src/app/models/event.model';
 import { ThemeService } from 'src/app/services/theme.service'
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
-import { DomSanitizerService } from 'src/app/services/DomSanitizer.service';
 import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service';
-
+import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer';
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -137,7 +136,6 @@ export class EditEventToApprovePage implements OnInit {
     private toastService: ToastService,
     public ThemeService: ThemeService,
     public httpErrorHandler: HttpErrorHandle,
-    private domSanitizeService: DomSanitizerService,
     private agendaDataRepository: AgendaDataRepositoryService
   ) {
     this.isEventEdited = false;
@@ -316,7 +314,8 @@ export class EditEventToApprovePage implements OnInit {
     })
   }
 
-  async save() {
+  @XTracerAsync({name:'desktop/edit-event', bugPrint: true, daley: 4000})
+  async save(tracing?: TracingType) {
 
     this.injectValidation()
     this.runValidation()
@@ -375,18 +374,21 @@ export class EditEventToApprovePage implements OnInit {
       const calendar = await this.agendaDataRepository.getCalendarByUserId((this.eventProcess as any).owner.wxUserId)
       if(calendar.isOk()) {
 
-        this.agendaDataRepository.updateEvent(this.eventProcess.serialNumber, event, false, calendar.value).subscribe((value) => {
+        this.agendaDataRepository.updateEvent(this.eventProcess.serialNumber, event, false, calendar.value, tracing).subscribe((value) => {
           console.log(value)
           this.close()
+          tracing.setAttribute('outcome', 'success')
 
         }, ((error) => {
           console.log('edit event error: ', error)
+          tracing.setAttribute('outcome', 'failed')
         }));
 
         this.agendaDataRepository.addEventAttendee(this.eventProcess.serialNumber, this.eventProcess.workflowInstanceDataFields.ParticipantsList).subscribe((value) => {
           console.log(value)
         }, ((error) => {
           console.log('add Attendee error: ', error)
+          tracing.setAttribute('failed.attendees', 'true')
         }));
 
         if (this.addedAttachmentsList.length > 0) {
@@ -395,6 +397,7 @@ export class EditEventToApprovePage implements OnInit {
           }, ((error) => {
             this.showLoader = false
             console.log('add attachment error: ', error)
+            tracing.setAttribute('failed.add.attachment', 'true')
           }));
         }
 
@@ -404,6 +407,7 @@ export class EditEventToApprovePage implements OnInit {
           }, ((error) => {
             this.showLoader = false
             console.log('remove attachment error: ', error)
+            tracing.setAttribute('failed.remove.attachment', 'true')
           }));
         }
 

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

@@ -19,6 +19,7 @@ import { Utils } from 'src/app/services/Repositorys/Agenda/utils';
 import { Observable } from 'rxjs';
 import { TableSharedCalendar } from 'src/app/services/Repositorys/Agenda/agenda-local-data-source.service';
 import { RoleIdService } from 'src/app/services/role-id.service'
+import { XTracerAsync, TracingType } from 'src/app/services/monitoring/opentelemetry/tracer';
 @Component({
   selector: 'app-edit-event',
   templateUrl: './edit-event.page.html',
@@ -413,7 +414,8 @@ export class EditEventPage implements OnInit {
     }
   }
 
-  async save_v2(editAllEvent) {
+  @XTracerAsync({name:'desktop/edit-event', bugPrint: true, daley: 4000})
+  async save_v2(editAllEvent, tracing?: TracingType) {
     this.injectValidation()
     this.runValidation()
 
@@ -431,7 +433,7 @@ export class EditEventPage implements OnInit {
 
       if(calendar.isOk()) {
         this.showLoader = true;
-        this.agendaDataRepository.updateEvent(this._postEvent.EventId, this._postEvent, editAllEvent, calendar.value).subscribe((value) => {
+        this.agendaDataRepository.updateEvent(this._postEvent.EventId, this._postEvent, editAllEvent, calendar.value, tracing).subscribe((value) => {
           console.log(value)
 
           this.httpErrorHandle.httpsSucessMessagge('Editar evento')
@@ -439,14 +441,17 @@ export class EditEventPage implements OnInit {
           this.deleteTemporaryData();
           this.showLoader = false;
           this.close();
+          tracing.setAttribute('outcome', 'success')
 
         }, ((error) => {
           console.log('edit event error: ', error)
+          tracing.setAttribute('outcome', 'failed')
         }));
 
         this.agendaDataRepository.addEventAttendee(this._postEvent.EventId, this._postEvent.Attendees).subscribe((value) => {
           console.log(value)
         }, ((error) => {
+          tracing.setAttribute('failed.attendees', 'true')
           console.log('add Attendee error: ', error)
         }));
 
@@ -456,6 +461,7 @@ export class EditEventPage implements OnInit {
             console.log(value)
           }, ((error) => {
             this.showLoader = false
+            tracing.setAttribute('failed.add.attachment', 'true')
             console.log('add attachment error: ', error)
           }));
         }

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

@@ -32,6 +32,7 @@ import { ChangeProfileService } from 'src/app/services/change-profile.service';
 import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service';
 import { RoleIdService } from 'src/app/services/role-id.service'
 import { TableSharedCalendar } from 'src/app/services/Repositorys/Agenda/agenda-local-data-source.service';
+import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer';
 
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
@@ -219,8 +220,6 @@ export class NewEventPage implements OnInit {
       this.setIntervenientCC.emit(this.taskParticipantsCc);
 
       this.setDefaultTime();
-    } else {
-      this.hasChangeCalendar = true
     }
 
 
@@ -548,7 +547,8 @@ export class NewEventPage implements OnInit {
 
   }
 
-  async save_v2() {
+  @XTracerAsync({name:'desktop/create-event', bugPrint: true})
+  async save_v2(tracing?: TracingType) {
     this.injectValidation()
     this.runValidation()
 
@@ -567,16 +567,22 @@ export class NewEventPage implements OnInit {
 
     const calendar = await this.agendaDataRepository.getCalendarByUserId(this.selectedUserCalendar)
     if(calendar.isOk()) {
-      this.agendaDataRepository.createEvent(this.postEvent, this.documents, calendar.value).subscribe((value) => {
+
+      try {
+        const value = await this.agendaDataRepository.createEvent(this.postEvent, this.documents, calendar.value, tracing).toPromise()
         console.log(value)
         this.afterSave();
         this.hhtpErrorHandle.httpsSucessMessagge('new event')
         loader.remove();
-      }, ((error) => {
+        tracing.setAttribute('outcome', 'success')
+      } catch (error) {
         console.log('create event error: ', error)
+        tracing.setAttribute('outcome', 'failed')
         loader.remove();
         this.hhtpErrorHandle.httpStatusHandle(error.status)
-      }));
+      }
+
+    } else {
 
     }
 
@@ -634,7 +640,8 @@ export class NewEventPage implements OnInit {
       segment: this.segment,
       CalendarName: this.CalendarName,
       documents: this.documents,
-      selectedUserCalendar: this.selectedUserCalendar
+      selectedUserCalendar: this.selectedUserCalendar,
+      hasChangeCalendar: this.hasChangeCalendar
     }
   }
 
@@ -655,6 +662,7 @@ export class NewEventPage implements OnInit {
       this.CalendarName = restoredData.CalendarName
       this.documents = restoredData.documents
       this.selectedUserCalendar = restoredData.selectedUserCalendar
+      this.hasChangeCalendar = restoredData.hasChangeCalendar
 
       // restore dater for date and hours picker
 

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

@@ -184,7 +184,7 @@
               </div>
             </div>
           </div> -->
-<!-- 
+<!--
           <div *ngIf="eventProcess.workflowInstanceDataFields.OccurrenceType != '-1'"
             class="container-div width-100">
             <div class="ion-item-class-2 d-flex">

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

@@ -15,6 +15,7 @@ import { NavigationExtras, Router } from '@angular/router';
 import { ThemeService } from 'src/app/services/theme.service'
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'
 import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service';
+import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer';
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -51,7 +52,6 @@ export class EditEventToApproveComponent implements OnInit {
   public stepHour = 1;
   public stepMinute = 15;
   public stepSecond = 5;
-  recurringTypes: any;
   selectedRecurringType: any;
   currentDate = new Date()
 
@@ -135,7 +135,6 @@ export class EditEventToApproveComponent implements OnInit {
   ngOnInit() {
     console.log('Here you ares')
     this.getTask()
-    this.getRecurrenceTypes();
   }
 
   ngOnDestroy() {
@@ -199,12 +198,6 @@ export class EditEventToApproveComponent implements OnInit {
     /* }) */
   }
 
-  getRecurrenceTypes() {
-    this.eventsService.getRecurrenceTypes().subscribe(res => {
-
-      this.recurringTypes = res;
-    });
-  }
 
   onSelectedRecurringChanged(ev: any) {
 
@@ -270,7 +263,8 @@ export class EditEventToApproveComponent implements OnInit {
     this.modalController.dismiss();
   }
 
-  async save() {
+  @XTracerAsync({name:'desktop/edit-event', bugPrint: true, daley: 4000})
+  async save(tracing?: TracingType) {
     // set dates to eventProcess object
 
     this.taskParticipantsCc.forEach(e => {
@@ -319,20 +313,23 @@ export class EditEventToApproveComponent implements OnInit {
       const calendar = await this.agendaDataRepository.getCalendarByUserId((this.eventProcess as any).owner.wxUserId)
 
       if(calendar.isOk()) {
-        this.agendaDataRepository.updateEvent(this.eventProcess.serialNumber, event,false, calendar.value).subscribe((value) => {
+        this.agendaDataRepository.updateEvent(this.eventProcess.serialNumber, event,false, calendar.value, tracing).subscribe((value) => {
           console.log(value)
           this.httpErroHalde.httpsSucessMessagge('Editar evento')
           window['approve-event-getTask']()
           this.close();
+          tracing.setAttribute('outcome', 'success')
         }, ((error) => {
           this.httpErroHalde.httpStatusHandle(error)
           console.log('edit event error: ', error)
+          tracing.setAttribute('outcome', 'failed')
         }));
 
         this.agendaDataRepository.addEventAttendee(this.eventProcess.serialNumber, this.eventProcess.workflowInstanceDataFields.ParticipantsList).subscribe((value) => {
-          console.log(value)
+
         }, ((error) => {
           console.log('add Attendee error: ', error)
+          tracing.setAttribute('failed.attendees', 'true')
         }));
 
 
@@ -342,6 +339,7 @@ export class EditEventToApproveComponent implements OnInit {
           }, ((error) => {
             this.showLoader = false
             console.log('add attachment error: ', error)
+            tracing.setAttribute('failed.add.attachment', 'true')
           }));
         }
 
@@ -351,6 +349,7 @@ export class EditEventToApproveComponent implements OnInit {
           }, ((error) => {
             this.showLoader = false
             console.log('remove attachment error: ', error)
+            tracing.setAttribute('failed.remove.attachment', 'true')
           }));
         }