Evarisk#3856 [RiskAssessment] fix: update environmental risk cotations

evarisk-micka · Apr 26, 2024 · 893c65e · 893c65e
1 parent ee3c313
commit 893c65e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/js/digiriskdolibarr.min.js b/js/digiriskdolibarr.min.js
diff --git a/js/modules/riskAssessment.js b/js/modules/riskAssessment.js
@@ -170,11 +170,11 @@ window.digiriskdolibarr.evaluation.createEvaluation = function ( event ) {
 			date: date,
 			riskId: riskToAssign,
 			criteres: {
-				gravite: criteres['gravite'] ? criteres['gravite'] : 0,
-				occurrence: criteres['occurrence'] ? criteres['occurrence'] : 0,
-				protection: criteres['protection'] ? criteres['protection'] : 0,
-				formation: criteres['formation'] ? criteres['formation'] : 0,
-				exposition: criteres['exposition'] ? criteres['exposition'] : 0
+        gravite: criteres['gravite'] ? criteres['gravite'] : 0,
+        occurrence: criteres['occurrence'] ? criteres['occurrence'] : (criteres['frequence'] ? criteres['frequence'] : 0),
+        protection: criteres['protection'] ? criteres['protection'] : (criteres['historique'] ? criteres['historique'] : 0),
+        formation: criteres['formation'] ? criteres['formation'] : (criteres['maitrise'] ? criteres['maitrise'] : 0),
+        exposition: criteres['exposition'] ? criteres['exposition'] : (criteres['milieu'] ? criteres['milieu'] : 0)
 			}
 		}),
 		processData: false,
@@ -341,10 +341,10 @@ window.digiriskdolibarr.evaluation.saveEvaluation = function ( event ) {
 			evaluationID: evaluationID,
 			criteres: {
 				gravite: criteres['gravite'] ? criteres['gravite'] : 0,
-				occurrence: criteres['occurrence'] ? criteres['occurrence'] : 0,
-				protection: criteres['protection'] ? criteres['protection'] : 0,
-				formation: criteres['formation'] ? criteres['formation'] : 0,
-				exposition: criteres['exposition'] ? criteres['exposition'] : 0
+				occurrence: criteres['occurrence'] ? criteres['occurrence'] : (criteres['frequence'] ? criteres['frequence'] : 0),
+				protection: criteres['protection'] ? criteres['protection'] : (criteres['historique'] ? criteres['historique'] : 0),
+				formation: criteres['formation'] ? criteres['formation'] : (criteres['maitrise'] ? criteres['maitrise'] : 0),
+				exposition: criteres['exposition'] ? criteres['exposition'] : (criteres['milieu'] ? criteres['milieu'] : 0)
 			}
 		}),
 		contentType: false,