Evarisk#3691 [RiskList] add: improve css and also do shared risk

evarisk-micka · Feb 14, 2024 · f82d39c · f82d39c
1 parent 33183b6
commit f82d39c
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 25 deletions.
diff --git a/admin/config/riskassessmentdocument.php b/admin/config/riskassessmentdocument.php
@@ -183,7 +183,7 @@
     'AlternateListRiskParentView' => [
         'name'        => 'AlternateListRiskParentView',
         'description' => 'AlternateListRiskParentViewDescription',
-        'code'        => 'DIGIRISKDOLIBARR_ALTERNATE_LIST_RISK_PARENT_VIEW',
+        'code'        => 'DIGIRISKDOLIBARR_RISK_LIST_PARENT_VIEW',
     ],
 	'RiskDescriptionPrefill' => [
 		'name'        => 'RiskDescriptionPrefill',

diff --git a/class/riskanalysis/risk.class.php b/class/riskanalysis/risk.class.php
@@ -78,7 +78,7 @@ class Risk extends SaturneObject
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),
-		'fk_element' => array('type' => 'integer', 'label' => 'ParentElement', 'enabled' => '1', 'position' => 9, 'notnull' => 1, 'visible' => 1,),
+		'fk_element' => array('type' => 'integer', 'label' => 'ParentElement', 'enabled' => '1', 'position' => 9, 'notnull' => 1, 'visible' => 1, 'csslist' => 'minwidth200 maxwidth300 widthcentpercentminusxx'),
 		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => 4, 'noteditable' => '1', 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'comment' => "Reference of object"),
 		'ref_ext' => array('type' => 'varchar(128)', 'label' => 'RefExt', 'enabled' => '1', 'position' => 30, 'notnull' => 0, 'visible' => 0,),
 		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => '1', 'position' => 8, 'notnull' => 1, 'visible' => 0,),

diff --git a/core/modules/modDigiriskDolibarr.class.php b/core/modules/modDigiriskDolibarr.class.php
@@ -656,6 +656,7 @@ public function __construct($db)
 			$i++ => ['DIGIRISKDOLIBARR_SHOW_INHERITED_RISKS_IN_LISTINGS', 'integer', 0, '', 0, 'current'],
 			$i++ => ['DIGIRISKDOLIBARR_SHOW_SHARED_RISKS', 'integer', 0, '', 0, 'current'],
 			$i++ => ['DIGIRISKDOLIBARR_SHOW_RISK_ORIGIN', 'integer', 1, '', 0, 'current'],
+            $i++ => ['DIGIRISKDOLIBARR_RISK_LIST_PARENT_VIEW', 'integer', 0, '', 0, 'current'],
 
 			// CONST RISK ASSESSMENT
 			$i++ => ['DIGIRISKDOLIBARR_MAIN_AGENDA_ACTIONAUTO_RISKASSESSMENT_CREATE', 'integer', 1, '', 0, 'current'],

diff --git a/core/tpl/riskanalysis/risk/digiriskdolibarr_risklist_view.tpl.php b/core/tpl/riskanalysis/risk/digiriskdolibarr_risklist_view.tpl.php
@@ -1053,7 +1053,7 @@ class="risk-evaluation-cotation cotation"><?php echo $shownCotation; ?></div>
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 foreach ($risk->fields as $key => $val) {
-	$cssforfield                        = (empty($val['css']) ? '' : $val['css']);
+    $cssforfield                        = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '') . 'center';
 	if ( ! empty($arrayfields['r.' . $key]['checked'])) {
 		print '<td class="liste_titre' . ($cssforfield ? ' ' . $cssforfield : '') . '">';
@@ -1093,7 +1093,7 @@ class="risk-evaluation-cotation cotation"><?php echo $shownCotation; ?></div>
 }
 
 foreach ($evaluation->fields as $key => $val) {
-	$cssforfield                        = (empty($val['css']) ? '' : $val['css']);
+    $cssforfield                        = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '') . 'center';
 	if ( ! empty($arrayfields['evaluation.' . $key]['checked'])) {
 		print '<td class="liste_titre' . '">';
@@ -1120,7 +1120,7 @@ class="risk-evaluation-cotation cotation"><?php echo $shownCotation; ?></div>
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 foreach ($risk->fields as $key => $val) {
-	$cssforfield                        = (empty($val['css']) ? '' : $val['css']);
+    $cssforfield                        = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '') . 'center';
 	if ( ! empty($arrayfields['r.' . $key]['checked'])) {
 		print getTitleFieldOfList($arrayfields['r.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 'r.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : '')) . "\n";
@@ -1169,7 +1169,7 @@ class="risk-evaluation-cotation cotation"><?php echo $shownCotation; ?></div>
 	// Show here line of result
 	print '<tr class="oddeven risk-row risk_row_' . $risk->id . ' risk-row-content-' . $risk->id . '" id="risk_row_' . $risk->id . '">';
 	foreach ($risk->fields as $key => $val) {
-		$cssforfield                                 = (empty($val['css']) ? '' : $val['css']);
+        $cssforfield                                 = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 		if ($key == 'status') $cssforfield          .= ($cssforfield ? ' ' : '') . 'center';
 		elseif ($key == 'ref') $cssforfield         .= ($cssforfield ? ' ' : '') . 'nowrap';
 		elseif ($key == 'category') $cssforfield    .= ($cssforfield ? ' ' : '') . 'risk-category';
@@ -1179,18 +1179,17 @@ class="risk-evaluation-cotation cotation"><?php echo $shownCotation; ?></div>
 			if ($key == 'status') print $risk->getLibStatut(5);
 			elseif ($key == 'fk_element') {
 				if (is_object($activeDigiriskElementList[$risk->fk_element])) {
-                    if (!getDolGlobalInt('DIGIRISKDOLIBARR_ALTERNATE_LIST_RISK_PARENT_VIEW')) {
+                    // Display either parent element or every parent elements of the risk according to conf
+                    if (!getDolGlobalInt('DIGIRISKDOLIBARR_RISK_LIST_PARENT_VIEW')) {
                         print $activeDigiriskElementList[$risk->fk_element]->getNomUrl(1, 'blank', 0, '', -1, 1);
                     } else {
                         $digiriskElementIds = $activeDigiriskElementList[$risk->fk_element]->getBranch($risk->fk_element);
-                        $count              = 0;
 
                         if (!empty($digiriskElementIds)) {
                             $digiriskElementIds = array_reverse($digiriskElementIds);
 
-                            foreach ($digiriskElementIds as $digiriskElementId) {
-                                $count++;
-                                print $count . str_repeat(' - ', $count) . $activeDigiriskElementList[$digiriskElementId]->getNomUrl(1, 'blank', 0, '', -1, 1) . '</br>';
+                            foreach ($digiriskElementIds as $key => $digiriskElementId) {
+                                print str_repeat(' - ', $key + 1) . $activeDigiriskElementList[$digiriskElementId]->getNomUrl(1, 'blank', 0, '', -1, 1) . '</br>';
                             }
                         }
                     }
@@ -1330,7 +1329,7 @@ class="risk-evaluation-cotation cotation"><?php echo $shownCotation; ?></div>
 
 	// Store properties in $lastEvaluation
 	foreach ($evaluation->fields as $key => $val) {
-		$cssforfield                              = (empty($val['css']) ? '' : $val['css']);
+        $cssforfield                              = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 		if ($key == 'status') $cssforfield       .= ($cssforfield ? ' ' : '') . 'center';
 		elseif ($key == 'ref') $cssforfield      .= ($cssforfield ? ' ' : '') . 'nowrap';
 		elseif ($key == 'cotation') $cssforfield .= ($cssforfield ? ' ' : '') . 'risk-evaluation-list-container-' . $risk->id;

diff --git a/core/tpl/riskanalysis/risk/digiriskdolibarr_sharedrisklist_view.tpl.php b/core/tpl/riskanalysis/risk/digiriskdolibarr_sharedrisklist_view.tpl.php
@@ -405,7 +405,7 @@
 $risk->fields = dol_sort_array($risk->fields, 'position');
 
 foreach ($risk->fields as $key => $val) {
-	$cssforfield                        = (empty($val['css']) ? '' : $val['css']);
+    $cssforfield                        = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '') . 'center';
 	if ( ! empty($arrayfields['r.' . $key]['checked'])) {
 		print '<td class="liste_titre' . ($cssforfield ? ' ' . $cssforfield : '') . '">';
@@ -450,7 +450,7 @@
 
 
 foreach ($evaluation->fields as $key => $val) {
-	$cssforfield                        = (empty($val['css']) ? '' : $val['css']);
+    $cssforfield                        = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '') . 'center';
 	if ( ! empty($arrayfields['evaluation.' . $key]['checked'])) {
 		print '<td class="liste_titre' . '">';
@@ -477,7 +477,7 @@
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 foreach ($risk->fields as $key => $val) {
-	$cssforfield                        = (empty($val['css']) ? '' : $val['css']);
+    $cssforfield                        = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '') . 'center';
 	if ( ! empty($arrayfields['r.' . $key]['checked'])) {
 		print getTitleFieldOfList($arrayfields['r.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 'r.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : ''), $arrayfields['r.' . $key]['disablesort']) . "\n";
@@ -531,7 +531,7 @@
 	$risk->fields = dol_sort_array($risk->fields, 'position');
 
 	foreach ($risk->fields as $key => $val) {
-		$cssforfield                                 = (empty($val['css']) ? '' : $val['css']);
+        $cssforfield                                 = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 		if ($key == 'status') $cssforfield          .= ($cssforfield ? ' ' : '') . 'center';
 		elseif ($key == 'ref') $cssforfield         .= ($cssforfield ? ' ' : '') . 'nowrap';
 		elseif ($key == 'category') $cssforfield    .= ($cssforfield ? ' ' : '') . 'risk-category';
@@ -542,12 +542,24 @@
 			elseif ($key == 'entity') { ?>
 				<?php
 				print getNomUrlEntity($risk, 1, 'nolink', 1);
-			} elseif ($key == 'fk_element') { ?>
-				<?php
-				if (is_object($alldigiriskelement[$risk->fk_element])) {
-					print $alldigiriskelement[$risk->fk_element]->getNomUrl(1, 'nolink', 0, '', -1, 1);
-				}
-			} elseif ($key == 'category') { ?>
+			} elseif ($key == 'fk_element') {
+                if (is_object($alldigiriskelement[$risk->fk_element])) {
+                    // Display either parent element or every parent elements of the risk according to conf
+                    if (!getDolGlobalInt('DIGIRISKDOLIBARR_RISK_LIST_PARENT_VIEW')) {
+                        print $alldigiriskelement[$risk->fk_element]->getNomUrl(1, 'blank', 0, '', -1, 1);
+                    } else {
+                        $digiriskElementIds = $alldigiriskelement[$risk->fk_element]->getBranch($risk->fk_element);
+
+                        if (!empty($digiriskElementIds)) {
+                            $digiriskElementIds = array_reverse($digiriskElementIds);
+
+                            foreach ($digiriskElementIds as $key => $digiriskElementId) {
+                                print str_repeat(' - ', $key + 1) . $alldigiriskelement[$digiriskElementId]->getNomUrl(1, 'blank', 0, '', -1, 1) . '</br>';
+                            }
+                        }
+                    }
+                }
+            } elseif ($key == 'category') { ?>
 				<div class="table-cell table-50 cell-risk" data-title="Risque">
 					<div class="wpeo-dropdown dropdown-large category-danger padding wpeo-tooltip-event" aria-label="<?php echo $risk->getDangerCategoryName($risk) ?>">
 						<img class="danger-category-pic hover" src="<?php echo DOL_URL_ROOT . '/custom/digiriskdolibarr/img/categorieDangers/' . $risk->getDangerCategory($risk) . '.png' ; ?>"/>
@@ -588,7 +600,7 @@
 
 	// Store properties in $lastEvaluation
 	foreach ($evaluation->fields as $key => $val) {
-		$cssforfield                              = (empty($val['css']) ? '' : $val['css']);
+        $cssforfield                              = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 		if ($key == 'status') $cssforfield       .= ($cssforfield ? ' ' : '') . 'center';
 		elseif ($key == 'ref') $cssforfield      .= ($cssforfield ? ' ' : '') . 'nowrap';
 		elseif ($key == 'cotation') $cssforfield .= ($cssforfield ? ' ' : '') . 'risk-evaluation-list-container-' . $risk->id;

diff --git a/langs/fr_FR/digiriskdolibarr.lang b/langs/fr_FR/digiriskdolibarr.lang
@@ -930,8 +930,8 @@ RiskUnlinkedFromEntityRefLabel           = Dissociation du risque %s avec
 TheDigiriskelement                       = l'élément Digirisk
 DefaultProjectContactType                = Rôle par défaut attribué au projet Document Unique
 DefaultTaskContactType                   = Rôle par défaut attribué aux tâches du projet Document Unique
-AlternateListRiskParentView              = Afficher tous les éléments parents
-AlternateListRiskParentViewDescription   = Afficher tous les éléments parents d'un risque dans la liste des risques
+RiskListParentView                       = Afficher tous les éléments parents
+RiskListParentViewDescription            = Afficher tous les éléments parents d'un risque dans la liste des risques
 
 # Stats - Statistiques
 GreyRisk   = Risque faible