#1491 [RiskAssessmentDocument] fix: send translation to js

Evarisk · Jun 8, 2024 · 7a1d949 · 7a1d949
1 parent 9b2b41b
commit 7a1d949
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/js/digiriskdolibarr.min.js b/js/digiriskdolibarr.min.js
diff --git a/js/modules/document.js b/js/modules/document.js
@@ -66,7 +66,7 @@ window.digiriskdolibarr.document.displayLoader = function(  ) {
   window.saturne.loader.display($(this).closest('.div-table-responsive-no-min'));
 };
 
-window.digiriskdolibarr.document.generateDocument = async function (generationUrl) {
+window.digiriskdolibarr.document.generateDocument = async function (generationUrl, documentGeneratedText) {
   const token = window.saturne.toolbox.getToken()
 
   return await $.ajax({
@@ -78,10 +78,12 @@ window.digiriskdolibarr.document.generateDocument = async function (generationUr
   }).done(function(data) {
     $('.wpeo-loader').removeClass('wpeo-loader')
     $('.loader').html('<i class="fas fa-check" style="color: green"></i>')
+
     const digiriskElementText = $(data).find('.refid').text()
-    const digiriskElementRef = digiriskElementText.split("Description")[0].trim();
-    const documentName = $(data).find('#builddoc_form').find('.documentdownload').first().text();
-    const textToShow = 'Document généré : ' + digiriskElementRef + ' => ' + documentName
+    const digiriskElementRef = digiriskElementText.split(/Description|Projet/)[0].trim();
+    const documentName        = $(data).find('#builddoc_form').find('.documentdownload').first().text()
+    const textToShow   = documentGeneratedText + ' : ' + digiriskElementRef + ' => ' + documentName
+
     window.digiriskdolibarr.document.updateModal(textToShow)
     return data
   });
@@ -97,6 +99,7 @@ window.digiriskdolibarr.document.showAdvancementModal = async function () {
 
   const groupmentUrl = $('#groupmentUrl').val()
   const riskAssessmentDocumentUrl = $('#riskAssessmentDocumentUrl').val()
+  const documentGeneratedText = $('#documentGeneratedText').val()
 
   const digiriskElementIds = $('#digiriskElementIds').val()
   const digiriskElementIdsArray = digiriskElementIds.split(',')
@@ -107,15 +110,15 @@ window.digiriskdolibarr.document.showAdvancementModal = async function () {
   for (let i = 0; i<digiriskElementIdsArray.length; i++) {
     const id = digiriskElementIdsArray[i]
     if (id > 0) {
-      await window.digiriskdolibarr.document.generateDocument(groupmentUrl + '&id=' + id)
+      await window.digiriskdolibarr.document.generateDocument(groupmentUrl + '&id=' + id, documentGeneratedText)
       completedElements++;
       const progress = Math.floor((completedElements / totalElements) * 100);
       $("#progressbar .ui-progressbar-value").animate({ width: progress + "%" }, 500);
 
     }
   }
 
-  const riskassessmentdocumentPage = await window.digiriskdolibarr.document.generateDocument(riskAssessmentDocumentUrl)
+  const riskassessmentdocumentPage = await window.digiriskdolibarr.document.generateDocument(riskAssessmentDocumentUrl, documentGeneratedText)
   completedElements++;
   const progress = Math.floor((completedElements / totalElements) * 100);
   $("#progressbar .ui-progressbar-value").animate({ width: progress + "%" }, 500);

diff --git a/langs/fr_FR/digiriskdolibarr.lang b/langs/fr_FR/digiriskdolibarr.lang
@@ -728,6 +728,8 @@ GenerateZipArchiveWithDigiriskElementDocuments            = Génération d'une a
 GenerateZipArchiveWithDigiriskElementDocumentsDescription = Génération automatique d'une archive ZIP contenant le Document Unique et toutes les fiches de poste lors de la génération du Document Unique
 RiskAssessmentDocumentDescription                         = Plan d'action Document Unique
 RiskAssessmentDocumentGeneration                          = Génération du Document Unique
+DocumentGenerated                                         = Document généré
+
 # Boxes - Widget
 LastGenerateDate             = DU généré le
 NextGenerateDate             = Prochain DU le

diff --git a/view/digiriskstandard/digiriskstandard_riskassessmentdocument.php b/view/digiriskstandard/digiriskstandard_riskassessmentdocument.php
@@ -620,6 +620,7 @@
 
 $groupmentUrl              = DOL_URL_ROOT . '/custom/digiriskdolibarr/view/digiriskelement/digiriskelement_card.php?forcebuilddoc=1';
 $riskAssessmentDocumentUrl = DOL_URL_ROOT . '/custom/digiriskdolibarr/view/digiriskstandard/digiriskstandard_riskassessmentdocument.php?action=builddoc&model='.$riskassessmentDocumentModel;
+$documentGeneratedText     = $langs->trans('DocumentGenerated');
 
 $digiriskElementList = $digiriskelement->getActiveDigiriskElements();
 $digiriskElementIds  = '';
@@ -632,6 +633,7 @@
 print '<input hidden id="groupmentUrl" value="' . $groupmentUrl . '">';
 print '<input hidden id="riskAssessmentDocumentUrl" value="' . $riskAssessmentDocumentUrl . '">';
 print '<input hidden id="digiriskElementIds" value="' . $digiriskElementIds . '">';
+print '<input hidden id="documentGeneratedText" value="' . $documentGeneratedText . '">';
 
 ?>
     <div id="generationModal" class="wpeo-modal">