Skip to content

Commit 7a1d949

Browse files
committed
#1491 [RiskAssessmentDocument] fix: send translation to js
1 parent 9b2b41b commit 7a1d949

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

js/digiriskdolibarr.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/modules/document.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ window.digiriskdolibarr.document.displayLoader = function( ) {
6666
window.saturne.loader.display($(this).closest('.div-table-responsive-no-min'));
6767
};
6868

69-
window.digiriskdolibarr.document.generateDocument = async function (generationUrl) {
69+
window.digiriskdolibarr.document.generateDocument = async function (generationUrl, documentGeneratedText) {
7070
const token = window.saturne.toolbox.getToken()
7171

7272
return await $.ajax({
@@ -78,10 +78,12 @@ window.digiriskdolibarr.document.generateDocument = async function (generationUr
7878
}).done(function(data) {
7979
$('.wpeo-loader').removeClass('wpeo-loader')
8080
$('.loader').html('<i class="fas fa-check" style="color: green"></i>')
81+
8182
const digiriskElementText = $(data).find('.refid').text()
82-
const digiriskElementRef = digiriskElementText.split("Description")[0].trim();
83-
const documentName = $(data).find('#builddoc_form').find('.documentdownload').first().text();
84-
const textToShow = 'Document généré : ' + digiriskElementRef + ' => ' + documentName
83+
const digiriskElementRef = digiriskElementText.split(/Description|Projet/)[0].trim();
84+
const documentName = $(data).find('#builddoc_form').find('.documentdownload').first().text()
85+
const textToShow = documentGeneratedText + ' : ' + digiriskElementRef + ' => ' + documentName
86+
8587
window.digiriskdolibarr.document.updateModal(textToShow)
8688
return data
8789
});
@@ -97,6 +99,7 @@ window.digiriskdolibarr.document.showAdvancementModal = async function () {
9799

98100
const groupmentUrl = $('#groupmentUrl').val()
99101
const riskAssessmentDocumentUrl = $('#riskAssessmentDocumentUrl').val()
102+
const documentGeneratedText = $('#documentGeneratedText').val()
100103

101104
const digiriskElementIds = $('#digiriskElementIds').val()
102105
const digiriskElementIdsArray = digiriskElementIds.split(',')
@@ -107,15 +110,15 @@ window.digiriskdolibarr.document.showAdvancementModal = async function () {
107110
for (let i = 0; i<digiriskElementIdsArray.length; i++) {
108111
const id = digiriskElementIdsArray[i]
109112
if (id > 0) {
110-
await window.digiriskdolibarr.document.generateDocument(groupmentUrl + '&id=' + id)
113+
await window.digiriskdolibarr.document.generateDocument(groupmentUrl + '&id=' + id, documentGeneratedText)
111114
completedElements++;
112115
const progress = Math.floor((completedElements / totalElements) * 100);
113116
$("#progressbar .ui-progressbar-value").animate({ width: progress + "%" }, 500);
114117

115118
}
116119
}
117120

118-
const riskassessmentdocumentPage = await window.digiriskdolibarr.document.generateDocument(riskAssessmentDocumentUrl)
121+
const riskassessmentdocumentPage = await window.digiriskdolibarr.document.generateDocument(riskAssessmentDocumentUrl, documentGeneratedText)
119122
completedElements++;
120123
const progress = Math.floor((completedElements / totalElements) * 100);
121124
$("#progressbar .ui-progressbar-value").animate({ width: progress + "%" }, 500);

langs/fr_FR/digiriskdolibarr.lang

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -728,6 +728,8 @@ GenerateZipArchiveWithDigiriskElementDocuments = Génération d'une a
728728
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
729729
RiskAssessmentDocumentDescription = Plan d'action Document Unique
730730
RiskAssessmentDocumentGeneration = Génération du Document Unique
731+
DocumentGenerated = Document généré
732+
731733
# Boxes - Widget
732734
LastGenerateDate = DU généré le
733735
NextGenerateDate = Prochain DU le

view/digiriskstandard/digiriskstandard_riskassessmentdocument.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -620,6 +620,7 @@
620620

621621
$groupmentUrl = DOL_URL_ROOT . '/custom/digiriskdolibarr/view/digiriskelement/digiriskelement_card.php?forcebuilddoc=1';
622622
$riskAssessmentDocumentUrl = DOL_URL_ROOT . '/custom/digiriskdolibarr/view/digiriskstandard/digiriskstandard_riskassessmentdocument.php?action=builddoc&model='.$riskassessmentDocumentModel;
623+
$documentGeneratedText = $langs->trans('DocumentGenerated');
623624

624625
$digiriskElementList = $digiriskelement->getActiveDigiriskElements();
625626
$digiriskElementIds = '';
@@ -632,6 +633,7 @@
632633
print '<input hidden id="groupmentUrl" value="' . $groupmentUrl . '">';
633634
print '<input hidden id="riskAssessmentDocumentUrl" value="' . $riskAssessmentDocumentUrl . '">';
634635
print '<input hidden id="digiriskElementIds" value="' . $digiriskElementIds . '">';
636+
print '<input hidden id="documentGeneratedText" value="' . $documentGeneratedText . '">';
635637

636638
?>
637639
<div id="generationModal" class="wpeo-modal">

0 commit comments

Comments
 (0)