Evarisk#3693 [AuditReportDocument] fix: repair data form riskassessme…

…ntdocument
evarisk-micka · Apr 5, 2024 · 8cc6d18 · 8cc6d18
1 parent 2c9e95e
commit 8cc6d18
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/class/digiriskdocuments.class.php b/class/digiriskdocuments.class.php
@@ -90,6 +90,9 @@ public function DigiriskFillJSON() {
 				$this->json = $this->InformationsSharingFillJSON();
 				break;
             case "auditreportdocument":
+                $riskAssessmentDocument = new RiskAssessmentDocument($this->db);
+                $this->json = $riskAssessmentDocument->RiskAssessmentDocumentFillJSON();
+                break;
 			case "riskassessmentdocument":
 				$this->json = $this->RiskAssessmentDocumentFillJSON();
 				break;

diff --git a/class/digiriskdolibarrdocuments/auditreportdocument.class.php b/class/digiriskdolibarrdocuments/auditreportdocument.class.php
@@ -24,7 +24,6 @@
 
 // Load DigiriskDolibarr librairies
 require_once __DIR__ . '/../digiriskdocuments.class.php';
-require_once __DIR__ . './riskassessmentdocument.class.php';
 
 /**
  * Class for AuditReportDocument
@@ -51,9 +50,4 @@ public function __construct(DoliDB $db)
     {
         parent::__construct($db, $this->module, $this->element);
     }
-
-    public function RiskAssessmentDocumentFillJSON() {
-        $riskassessmentDocument = new RiskAssessmentDocument($this->db);
-        return $riskassessmentDocument->RiskAssessmentDocumentFillJSON();
-    }
 }
diff --git a/...arr/digiriskdolibarrdocuments/auditreportdocument/doc_auditreportdocument_odt.modules.php b/...arr/digiriskdolibarrdocuments/auditreportdocument/doc_auditreportdocument_odt.modules.php
@@ -126,7 +126,7 @@ public function write_file(SaturneDocuments $objectDocument, Translate $outputLa
         $objectDocument->DigiriskFillJSON();
 
         $previousObjectDocumentElement = $objectDocument->element;
-        $objectDocument->element       = 'riskassessmentdocument@digiriskdolibarr';
+        $objectDocument->element       = $objectDocument->element . '@digiriskdolibarr';
         complete_substitutions_array($tmpArray, $outputLangs, $objectDocument);
         $objectDocument->element = $previousObjectDocumentElement;
 

diff --git a/core/substitutions/functions_digiriskdolibarr.lib.php b/core/substitutions/functions_digiriskdolibarr.lib.php
@@ -138,6 +138,7 @@ function digiriskdolibarr_completesubstitutionarray(&$substitutionarray, $langs,
 
 			break;
 
+        case 'auditreportdocument@digiriskdolibarr':
 		case 'riskassessmentdocument@digiriskdolibarr':
 
 			$riskassessmentdocument = json_decode($object->json, false, 512, JSON_UNESCAPED_UNICODE)->RiskAssessmentDocument;