From b2d19879a713ab018e36ba2a1385ff9c28364469 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 6 Nov 2024 10:43:19 +0100 Subject: [PATCH] fix gabinete error text --- .../generic/task-details/task-details.page.ts | 22 +++++-------------- version/git-version.ts | 12 +++++----- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts index 21fd8a95f..2a6299407 100644 --- a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts +++ b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts @@ -48,20 +48,10 @@ export class TaskDetailsPage implements OnInit { this.DeviceService.isDesktop(); this.loggeduser = SessionStore.user - - // if(this.task.Note) { - // this.task.Note = this.sanitizeHtml(this.task.Note) as any - // } - - // if(this.fulltask?.workflowInstanceDataFields?.TaskMessage) { - // this.fulltask.workflowInstanceDataFields.TaskMessage = this.sanitizeHtml(this.fulltask.workflowInstanceDataFields.TaskMessage); - // } - - setTimeout(() => { console.log('change', this.task.Note); // this.task.Note = this.sanitizeHtml(this.task.Note) as any - if(this.text.nativeElement) { + if(this.text?.nativeElement) { (this.text.nativeElement as HTMLDivElement).innerHTML = this.decode(this.task.Note) } @@ -71,7 +61,7 @@ export class TaskDetailsPage implements OnInit { setTimeout(() => { console.log('change', this.task.Note); // this.task.Note = this.sanitizeHtml(this.task.Note) as any - if(this.text.nativeElement) { + if(this.text?.nativeElement) { (this.text.nativeElement as HTMLDivElement).innerHTML = this.decode(this.task.Note) } @@ -80,7 +70,7 @@ export class TaskDetailsPage implements OnInit { setTimeout(() => { console.log('change', this.task.Note); // this.task.Note = this.sanitizeHtml(this.task.Note) as any - if(this.text.nativeElement) { + if(this.text?.nativeElement) { (this.text.nativeElement as HTMLDivElement).innerHTML = this.decode(this.task.Note) } @@ -89,7 +79,7 @@ export class TaskDetailsPage implements OnInit { setTimeout(() => { console.log('change', this.task.Note); // this.task.Note = this.sanitizeHtml(this.task.Note) as any - if(this.text.nativeElement) { + if(this.text?.nativeElement) { (this.text.nativeElement as HTMLDivElement).innerHTML = this.decode(this.task.Note) } @@ -98,7 +88,7 @@ export class TaskDetailsPage implements OnInit { setTimeout(() => { console.log('change', this.task.Note); // this.task.Note = this.sanitizeHtml(this.task.Note) as any - if(this.text.nativeElement) { + if(this.text?.nativeElement) { (this.text.nativeElement as HTMLDivElement).innerHTML = this.decode(this.task.Note) } @@ -108,7 +98,7 @@ export class TaskDetailsPage implements OnInit { setTimeout(() => { console.log('change', this.task.Note); // this.task.Note = this.sanitizeHtml(this.task.Note) as any - if(this.text.nativeElement) { + if(this.text?.nativeElement) { (this.text.nativeElement as HTMLDivElement).innerHTML = this.decode(this.task.Note) } diff --git a/version/git-version.ts b/version/git-version.ts index a30cf9387..3bde737a5 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,11 +1,11 @@ export let versionData = { - "shortSHA": "5c0bd094c", - "SHA": "5c0bd094ca5cb379aa625187cc5afb47f576ffec", + "shortSHA": "5c18f281b", + "SHA": "5c18f281bc053ecb7db47fbeb4355aa40634dcac", "branch": "feature/login-v2", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Wed Nov 6 09:20:31 2024 +0100'", - "lastCommitMessage": "remove userName", - "lastCommitNumber": "6127", - "changeStatus": "On branch feature/login-v2\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/core/user/entity/userEntity.ts\n\tnew file: src/app/core/user/mapper/user-login.ts\n\tmodified: src/app/core/user/repository/user-remote-repository.ts\n\tmodified: src/app/core/user/use-case/user-login-use-case.service.ts\n\tmodified: src/app/modals/create-process/create-process.page.ts\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/models/user.model.ts\n\tmodified: src/app/pages/events/attendees/attendees.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/app/pages/inactivity/inactivity.page.ts\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/services/attachments.service.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/services/organic-entity.service.ts\n\tmodified: src/app/services/processes.service.ts\n\tmodified: src/app/services/publications.service.ts\n\tmodified: src/app/services/search.service.ts\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts\n\tmodified: src/app/ui/agenda/agenda.page.ts\n\tmodified: src/app/ui/agenda/component/event-list/event-list.page.ts\n\tmodified: src/app/ui/agenda/component/new-event/new-event.page.ts\n\tmodified: src/app/ui/agenda/modal/new-event/new-event.page.ts\n\tmodified: src/app/ui/login/inactivity/inactivity.page.ts\n\tmodified: src/app/ui/shared/components/header-pr/header-pr.page.ts\n\tmodified: src/app/ui/shared/components/header/header.page.ts", + "lastCommitTime": "'Wed Nov 6 10:38:58 2024 +0100'", + "lastCommitMessage": "change login v1 to v2", + "lastCommitNumber": "6128", + "changeStatus": "On branch feature/login-v2\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts\n\tmodified: version/git-version.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file