From 34dbd84f869a75d0b99e90ea7d901faf30f4f6dc Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 19 Jun 2024 18:55:36 +0100 Subject: [PATCH] fix ageanda update --- src/app/interceptors/token.interceptors.ts | 4 ++-- .../monitoring/opentelemetry/opentelemetry.ts | 11 +++++------ .../edit-event-to-approve.page.ts | 6 +++--- .../edit-event-to-approve/edit-event.page.ts | 4 +++- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/app/interceptors/token.interceptors.ts b/src/app/interceptors/token.interceptors.ts index 3097ebb91..7d000259e 100644 --- a/src/app/interceptors/token.interceptors.ts +++ b/src/app/interceptors/token.interceptors.ts @@ -23,7 +23,7 @@ export class TokenInterceptor implements HttpInterceptor { null ); - private excludedDomains = [ environment.apiChatUrl]; // Add the domains you want to exclude + private excludedDomains = [ 'Login', environment.apiChatUrl]; // Add the domains you want to exclude constructor(private http: HttpClient, private router: Router,private httpErrorHandle: HttpErrorHandle,) { } @@ -129,7 +129,7 @@ export class TokenInterceptor implements HttpInterceptor { if(pathBeforeGoOut != "/auth") { this.httpErrorHandle.httpsSucessMessagge('sessonExpired') } - + }) } return of(false); diff --git a/src/app/services/monitoring/opentelemetry/opentelemetry.ts b/src/app/services/monitoring/opentelemetry/opentelemetry.ts index 766504b2b..c764a3a2a 100644 --- a/src/app/services/monitoring/opentelemetry/opentelemetry.ts +++ b/src/app/services/monitoring/opentelemetry/opentelemetry.ts @@ -15,12 +15,11 @@ function createProvider(serviceName) { provider.addSpanProcessor(new SimpleSpanProcessor(new ZipkinExporter({ url: 'https://5-180-182-151.cloud-xip.com:85/zipkin-endpoint/api/v2/spans', serviceName: serviceName, - // Uncomment and customize the following if needed - // getExportRequestHeaders: () => { - // return { - // foo: 'bar', - // }; - // } + getExportRequestHeaders: () => { + return { + 'Authorization': 'Basic ' + btoa('tabteste@006:tabteste@006'), + }; + } }))); provider.register(); diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts index 3daccc65a..c6c1060cc 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts @@ -374,6 +374,8 @@ export class EditEventToApprovePage implements OnInit { /* await this.eventsService.postEventToApproveEdit(event).toPromise() */ this.agendaDataRepository.updateEvent(this.eventProcess.serialNumber, event, false).subscribe((value) => { console.log(value) + this.close() + }, ((error) => { console.log('edit event error: ', error) })); @@ -402,8 +404,6 @@ export class EditEventToApprovePage implements OnInit { })); } - this.close() - this.httpErrorHandler.httpsSucessMessagge('Editar evento'); } catch (e) { @@ -577,7 +577,7 @@ export class EditEventToApprovePage implements OnInit { this.loadedAttachments = result - // + // } deleteAttachment(attachment: Attachment, index) { diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index be1f95cf3..44dec41a9 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -326,6 +326,9 @@ export class EditEventToApproveComponent implements OnInit { this.agendaDataRepository.updateEvent(this.eventProcess.serialNumber, event,false).subscribe((value) => { console.log(value) + window['approve-event-getTask']() + + this.close(); }, ((error) => { console.log('edit event error: ', error) })); @@ -388,7 +391,6 @@ export class EditEventToApproveComponent implements OnInit { }) */ - this.close(); } async openAttendees() {