Merge pull request #706 from LINCnil/prepare-new-pdf

Implements pdf from scratch
LINCnil · Feb 21, 2023 · 901947a · 901947a
2 parents ddcebb8 + 5e11b99
commit 901947a
Show file tree

Hide file tree

Showing 24 changed files with 5,814 additions and 950 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "@angular/platform-browser-dynamic": "~11.0.9",
     "@angular/router": "~11.0.9",
     "@angular/service-worker": "~11.0.9",
-    "@atnos/pia-i18n": "^0.0.13",
+    "@atnos/pia-i18n": "^0.0.14",
     "@ngx-translate/core": "^13.0.0",
     "@ngx-translate/http-loader": "^6.0.0",
     "@types/intro.js": "^2.4.8",

diff --git a/src/app/modules/pia/content/evaluations/evaluations.component.html b/src/app/modules/pia/content/evaluations/evaluations.component.html
@@ -190,9 +190,7 @@
           >
             <p
               class="pia-evaluationBlock-gauge"
-              [innerHTML]="
-                'evaluations.gauges.seriousness' | translate: riskName
-              "
+              [innerHTML]="'evaluations.gauges.seriousness' | translate"
             ></p>
             <div class="pia-gaugeBlock">
               <input
@@ -226,9 +224,7 @@
 
             <p
               class="pia-evaluationBlock-gauge"
-              [innerHTML]="
-                'evaluations.gauges.likelihood' | translate: riskName
-              "
+              [innerHTML]="'evaluations.gauges.likelihood' | translate"
             ></p>
             <div class="pia-gaugeBlock">
               <input

diff --git a/src/app/modules/pia/content/evaluations/evaluations.component.ts b/src/app/modules/pia/content/evaluations/evaluations.component.ts
@@ -29,7 +29,6 @@ import { EvaluationService } from 'src/app/services/evaluation.service';
 })
 export class EvaluationsComponent
   implements OnInit, AfterViewChecked, OnDestroy, DoCheck {
-  private riskSubscription: Subscription;
   private placeholderSubscription: Subscription;
   evaluationForm: FormGroup;
   @Input() editMode:
@@ -47,7 +46,6 @@ export class EvaluationsComponent
   previousGauges = { x: 0, y: 0 };
   previousReferenceTo: string;
   hasResizedContent = false;
-  riskName: any;
   actionPlanCommentElementId: string;
   evaluationCommentElementId: string;
   editor: any;
@@ -73,23 +71,6 @@ export class EvaluationsComponent
       this.loading = false;
     });
 
-    this.riskName = {
-      value: this.translateService.instant(
-        'sections.3.items.' + this.item.id + '.title'
-      )
-    };
-
-    // Updating translations when changing language (risks' names)
-    this.riskSubscription = this.translateService.onLangChange.subscribe(
-      (event: LangChangeEvent) => {
-        this.riskName = {
-          value: this.translateService.instant(
-            'sections.3.items.' + this.item.id + '.title'
-          )
-        };
-      }
-    );
-
     // Updating translations when changing language (comments' placeholders)
     this.placeholderSubscription = this.translateService.onLangChange.subscribe(
       (event: LangChangeEvent) => {
@@ -143,7 +124,6 @@ export class EvaluationsComponent
   }
 
   ngOnDestroy(): void {
-    this.riskSubscription.unsubscribe();
     this.placeholderSubscription.unsubscribe();
     tinymce.remove(this.editor);
     tinymce.remove(this.editorEvaluationComment);