Skip to content

Commit 9d46ad3

Browse files
author
Théo David
committed
#1491 [RiskAssessmentDocument] fix: scroll down after line adding
1 parent 7a1d949 commit 9d46ad3

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
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: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,13 @@ window.digiriskdolibarr.document.displayLoader = function( ) {
6666
window.saturne.loader.display($(this).closest('.div-table-responsive-no-min'));
6767
};
6868

69+
// Fonction pour faire défiler vers le bas
70+
window.digiriskdolibarr.document.scrollToBottom = function( ) {
71+
const modalContent = $('.modal-content');
72+
modalContent.animate({ scrollTop: modalContent.prop("scrollHeight") }, 100);
73+
}
74+
75+
// Appeler la fonction de défilement
6976
window.digiriskdolibarr.document.generateDocument = async function (generationUrl, documentGeneratedText) {
7077
const token = window.saturne.toolbox.getToken()
7178

@@ -83,7 +90,7 @@ window.digiriskdolibarr.document.generateDocument = async function (generationUr
8390
const digiriskElementRef = digiriskElementText.split(/Description|Projet/)[0].trim();
8491
const documentName = $(data).find('#builddoc_form').find('.documentdownload').first().text()
8592
const textToShow = documentGeneratedText + ' : ' + digiriskElementRef + ' => ' + documentName
86-
93+
window.digiriskdolibarr.document.scrollToBottom();
8794
window.digiriskdolibarr.document.updateModal(textToShow)
8895
return data
8996
});

view/digiriskstandard/digiriskstandard_riskassessmentdocument.php

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -638,10 +638,16 @@
638638
?>
639639
<div id="generationModal" class="wpeo-modal">
640640
<div class="modal-container">
641-
<h2><?php echo $langs->trans('RiskAssessmentDocumentGeneration')?></h2>
642-
<div id="progressbar"><div class="ui-progressbar-value"></div></div>
643-
<ul id="generationStatus">
644-
</ul>
641+
<div class="modal-header">
642+
<h2><?php echo $langs->trans('RiskAssessmentDocumentGeneration')?></h2>
643+
</div>
644+
<div id="progressbar">
645+
<div class="ui-progressbar-value"></div>
646+
</div>
647+
<div class="modal-content">
648+
<ul id="generationStatus">
649+
</ul>
650+
</div>
645651
</div>
646652
</div>
647653
<?php

0 commit comments

Comments
 (0)