Merge pull request #764 from atnos/fix-preview-data-displaying

Fix preview data displaying
LINCnil · Sep 6, 2024 · c2fde88 · c2fde88
2 parents c6018d9 + 1d996c0
commit c2fde88
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 15 deletions.
diff --git a/src/app/modules/pia/content/measures/measures.component.ts b/src/app/modules/pia/content/measures/measures.component.ts
@@ -352,6 +352,7 @@ export class MeasuresComponent implements OnInit, OnDestroy {
       tinymce.init({
         branding: false,
         menubar: false,
+        entity_encoding: 'raw',
         statusbar: false,
         plugins: 'autoresize lists',
         forced_root_block: false,

diff --git a/src/app/modules/pia/content/questions/questions.component.ts b/src/app/modules/pia/content/questions/questions.component.ts
@@ -499,6 +499,7 @@ export class QuestionsComponent implements OnInit, OnDestroy {
       tinymce.init({
         branding: false,
         menubar: false,
+        entity_encoding: 'raw',
         statusbar: false,
         plugins: 'autoresize lists',
         forced_root_block: false,

diff --git a/src/app/modules/pia/export/export.component.ts b/src/app/modules/pia/export/export.component.ts
@@ -710,6 +710,8 @@ export class ExportComponent implements OnInit {
         const htmlRegexStrong2 = /<\/strong>/g;
         string = string.replace(htmlRegexStrong, ' **');
         string = string.replace(htmlRegexStrong2, '**');
+        const htmlRegexAnd = /&amp;/g;
+        string = string.replace(htmlRegexAnd, '&');
         const htmlRegexLi = /<li>/g;
         string = string.replace(htmlRegexLi, '- ');
         const htmlRegexBr = /<br \/>/g;

diff --git a/src/app/modules/pia/preview/preview.component.ts b/src/app/modules/pia/preview/preview.component.ts
@@ -6,6 +6,7 @@ import {
   Output,
   EventEmitter
 } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 import { PiaService } from 'src/app/services/pia.service';
 import { AppDataService } from 'src/app/services/app-data.service';
 import { TranslateService } from '@ngx-translate/core';
@@ -43,6 +44,7 @@ export class PreviewComponent implements OnInit, AfterViewChecked {
   public download = false;
 
   constructor(
+    private route: ActivatedRoute,
     public authService: AuthService,
     public actionPlanService: ActionPlanService,
     private translateService: TranslateService,
@@ -59,22 +61,29 @@ export class PreviewComponent implements OnInit, AfterViewChecked {
     this.content = [];
     this.dataNav = this.appDataService.dataNav;
 
-    this.showPia();
+    this.piaService
+      .find(parseInt(this.route.snapshot.params.id))
+      .then(async (pia: Pia) => {
+        this.pia = pia;
+        this.actionPlanService.data = this.dataNav;
+        this.actionPlanService.pia = this.pia;
+        this.showPia();
 
-    if (this.pia.is_archive === 1) {
-      this.fromArchives = true;
-    }
+        if (this.pia.is_archive === 1) {
+          this.fromArchives = true;
+        }
 
-    // Load PIA's revisions
-    const revision = new Revision();
-    this.revisionService.findAllByPia(this.pia.id).then(resp => {
-      this.revisions = resp;
-    });
+        // Load PIA's revisions
+        const revision = new Revision();
+        this.revisionService.findAllByPia(this.pia.id).then(resp => {
+          this.revisions = resp;
+        });
 
-    if (this.pia.structure_data) {
-      this.appDataService.dataNav = this.pia.structure_data;
-    }
-    this.data = this.appDataService.dataNav;
+        if (this.pia.structure_data) {
+          this.appDataService.dataNav = this.pia.structure_data;
+        }
+        this.data = this.appDataService.dataNav;
+      });
   }
 
   ngAfterViewChecked(): void {
@@ -121,8 +130,6 @@ export class PreviewComponent implements OnInit, AfterViewChecked {
    */
   async showPia(): Promise<void> {
     this.prepareDpoData();
-    this.actionPlanService.data = this.dataNav;
-    this.actionPlanService.pia = this.pia;
     this.actionPlanService.listActionPlan();
     this.getJsonInfo();
   }