#2313 [JS] fix: loader saveEvaluation only on column riskassessment

Evarisk · Sep 20, 2022 · 8261aa1 · 8261aa1
1 parent 3600139
commit 8261aa1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/core/tpl/riskanalysis/risk/digiriskdolibarr_inheritedrisklist_view.tpl.php b/core/tpl/riskanalysis/risk/digiriskdolibarr_inheritedrisklist_view.tpl.php
@@ -489,9 +489,8 @@
 			$cssforfield                              = (empty($val['css']) ? '' : $val['css']);
 			if ($key == 'status') $cssforfield       .= ($cssforfield ? ' ' : '') . 'center';
 			elseif ($key == 'ref') $cssforfield      .= ($cssforfield ? ' ' : '') . 'nowrap';
-			elseif ($key == 'cotation') $cssforfield .= ($cssforfield ? ' ' : '') . 'nowrap';
+			elseif ($key == 'cotation') $cssforfield .= ($cssforfield ? ' ' : '') . 'risk-evaluation-list-container-' . $risk->id;
 			if ( ! empty($arrayfields['evaluation.' . $key]['checked'])) {
-				$cssforfield = '';
 				print '<td' . ($cssforfield ? ' class="' . $cssforfield . '"' : '') . ' style="vertical-align: top;">';
 				if ($key == 'cotation') {
 					require './../../core/tpl/riskanalysis/riskassessment/digiriskdolibarr_riskassessment_view.tpl.php';

diff --git a/core/tpl/riskanalysis/risk/digiriskdolibarr_risklist_view.tpl.php b/core/tpl/riskanalysis/risk/digiriskdolibarr_risklist_view.tpl.php
@@ -1208,9 +1208,8 @@ class="risk-evaluation-cotation cotation"><?php echo $request; ?></div>
 			$cssforfield                              = (empty($val['css']) ? '' : $val['css']);
 			if ($key == 'status') $cssforfield       .= ($cssforfield ? ' ' : '') . 'center';
 			elseif ($key == 'ref') $cssforfield      .= ($cssforfield ? ' ' : '') . 'nowrap';
-			elseif ($key == 'cotation') $cssforfield .= ($cssforfield ? ' ' : '') . 'nowrap';
+			elseif ($key == 'cotation') $cssforfield .= ($cssforfield ? ' ' : '') . 'risk-evaluation-list-container-' . $risk->id;
 			if ( ! empty($arrayfields['evaluation.' . $key]['checked'])) {
-				$cssforfield = '';
 				print '<td' . ($cssforfield ? ' class="' . $cssforfield . '"' : '') . ' style="vertical-align: top;">';
 				if ($key == 'cotation') {
 					require './../../core/tpl/riskanalysis/riskassessment/digiriskdolibarr_riskassessment_view.tpl.php';

diff --git a/core/tpl/riskanalysis/risk/digiriskdolibarr_sharedrisklist_view.tpl.php b/core/tpl/riskanalysis/risk/digiriskdolibarr_sharedrisklist_view.tpl.php
@@ -593,9 +593,8 @@
 			$cssforfield                              = (empty($val['css']) ? '' : $val['css']);
 			if ($key == 'status') $cssforfield       .= ($cssforfield ? ' ' : '') . 'center';
 			elseif ($key == 'ref') $cssforfield      .= ($cssforfield ? ' ' : '') . 'nowrap';
-			elseif ($key == 'cotation') $cssforfield .= ($cssforfield ? ' ' : '') . 'nowrap';
+			elseif ($key == 'cotation') $cssforfield .= ($cssforfield ? ' ' : '') . 'risk-evaluation-list-container-' . $risk->id;
 			if ( ! empty($arrayfields['evaluation.' . $key]['checked'])) {
-				$cssforfield = '';
 				print '<td' . ($cssforfield ? ' class="' . $cssforfield . '"' : '') . ' style="vertical-align: top;">';
 				if ($key == 'cotation') {
 					require './../../core/tpl/riskanalysis/riskassessment/digiriskdolibarr_riskassessment_view.tpl.php';

diff --git a/js/digiriskdolibarr.js.php b/js/digiriskdolibarr.js.php
@@ -2304,7 +2304,7 @@
 	})
 
 	window.eoxiaJS.loader.display($(this));
-	window.eoxiaJS.loader.display($('#risk_row_' + riskId));
+	window.eoxiaJS.loader.display($('.risk-evaluation-list-container-'+riskId));
 
 	let token = $('.fichecenter.risklist').find('input[name="token"]').val();