Evarisk#4023 [Risk] fix: set date_creation of risk and evaluation the…

… same as date_riskassessment
evarisk-micka · Jul 18, 2024 · ccfd20c · ccfd20c
1 parent 6ec532f
commit ccfd20c
Showing 1 changed file with 23 additions and 19 deletions.
diff --git a/view/digirisktools.php b/view/digirisktools.php
@@ -219,20 +219,22 @@
 
 			//Risk
 			foreach ($digiriskExportArray['risks'] as $digiriskExportRisk) {
-				$risk->ref        = $refRiskMod->getNextValue($risk);
-                $risk->status     = Risk::STATUS_VALIDATED;
-				$risk->category   = $risk->getDangerCategoryPositionByName($digiriskExportRisk['danger_category']['name']);
-				$risk->fk_element = $digiriskElement->fetch_id_from_wp_digi_id($digiriskExportRisk['parent_id']);
-				$risk->fk_projet  = $conf->global->DIGIRISKDOLIBARR_DU_PROJECT;
-
-				if ( ! $error) {
+				$risk->ref           = $refRiskMod->getNextValue($risk);
+                $risk->status        = Risk::STATUS_VALIDATED;
+				$risk->category      = $risk->getDangerCategoryPositionByName($digiriskExportRisk['danger_category']['name']);
+				$risk->fk_element    = $digiriskElement->fetch_id_from_wp_digi_id($digiriskExportRisk['parent_id']);
+				$risk->fk_projet     = $conf->global->DIGIRISKDOLIBARR_DU_PROJECT;
+                $risk->date_creation = $digiriskExportRisk['evaluation']['date']['raw'];
+
+				if (!$error) {
 					$result = $risk->create($user, true);
 					if ($result > 0) {
 						$riskAssessment->ref                 = $refRiskAssessmentMod->getNextValue($riskAssessment);
 						$riskAssessment->date_riskassessment = $digiriskExportRisk['evaluation']['date']['raw'];
-						$riskAssessment->cotation            = $digiriskExportRisk['current_equivalence'];
-						$riskAssessment->status              = 1;
-						$riskAssessment->fk_risk             = $risk->id;
+                        $riskAssessment->date_creation       = $digiriskExportRisk['evaluation']['date']['raw'];
+                        $riskAssessment->cotation            = $digiriskExportRisk['current_equivalence'];
+                        $riskAssessment->status              = RiskAssessment::STATUS_VALIDATED;
+                        $riskAssessment->fk_risk             = $risk->id;
 
 						if ($digiriskExportRisk['evaluation_method']['name'] == 'Evarisk') {
 							$riskassessment_variables = array_values($digiriskExportRisk['evaluation']['variables']);
@@ -418,19 +420,21 @@
 
 			//Risk
 			foreach ($digiriskExportArray['risks'] as $digiriskExportRisk) {
-				$risk->ref        = $refRiskMod->getNextValue($risk);
-                $risk->status     = Risk::STATUS_VALIDATED;
-				$risk->category   = $risk->getDangerCategoryPositionByName($digiriskExportRisk['danger_category']['name']);
-				$risk->fk_element = $digiriskElement->fetch_id_from_wp_digi_id($digiriskExportRisk['parent_id']);
-				$risk->fk_projet  = $conf->global->DIGIRISKDOLIBARR_DU_PROJECT;
-
-				if ( ! $error) {
+				$risk->ref           = $refRiskMod->getNextValue($risk);
+                $risk->status        = Risk::STATUS_VALIDATED;
+				$risk->category      = $risk->getDangerCategoryPositionByName($digiriskExportRisk['danger_category']['name']);
+				$risk->fk_element    = $digiriskElement->fetch_id_from_wp_digi_id($digiriskExportRisk['parent_id']);
+				$risk->fk_projet     = $conf->global->DIGIRISKDOLIBARR_DU_PROJECT;
+                $risk->date_creation = $digiriskExportRisk['evaluation']['date']['raw'];
+
+                if (!$error) {
 					$result = $risk->create($user, true);
 					if ($result > 0) {
 						$riskAssessment->ref                 = $refRiskAssessmentMod->getNextValue($riskAssessment);
-						$riskAssessment->date_riskassessment = $digiriskExportRisk['evaluation']['date']['raw'];
+                        $riskAssessment->date_riskassessment = $digiriskExportRisk['evaluation']['date']['raw'];
+                        $riskAssessment->date_creation       = $digiriskExportRisk['evaluation']['date']['raw'];
 						$riskAssessment->cotation            = $digiriskExportRisk['current_equivalence'];
-						$riskAssessment->status              = 1;
+						$riskAssessment->status              = RiskAssessment::STATUS_VALIDATED;
 						$riskAssessment->fk_risk             = $risk->id;
 
 						if ($digiriskExportRisk['evaluation_method']['name'] == 'Evarisk') {