Merge pull request #70 from ApitechFR/fix-condition

fix: only first condition eventually applied
ApitechFR · Sep 2, 2024 · c535275 · c535275
2 parents 85fe946 + 26a00e8
commit c535275
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/ScadaWeb/OpenPlugins/PlgSchShapeComp/wwwroot/SchShapeComp/js/shapecomp-render.js b/ScadaWeb/OpenPlugins/PlgSchShapeComp/wwwroot/SchShapeComp/js/shapecomp-render.js
@@ -573,17 +573,15 @@ scada.scheme.DynamicTextRenderer.prototype.updateData = function (
 		//add condition textContente to set spanText
 		if (props.conditions && cnlDataExt.d.stat > 0) {
 			var cnlVal = cnlDataExt.d.val;
+			let isConditionSatisfied = false;
 			for (var cond of props.conditions) {
-				if (scada.scheme.calc.conditionSatisfied(cond, cnlVal)) {
+				if (!isConditionSatisfied && scada.scheme.calc.conditionSatisfied(cond, cnlVal)) {
+					isConditionSatisfied = true;
 					if (cond.textContent) {
 						spanText.text(cond.textContent);
 					}
-				}
-				//update font size
-				if (scada.scheme.calc.conditionSatisfied(cond, cnlVal)) {
 					this.setFontSize(spanComp, cond.fontSize);
 				}
-				break;
 			}
 		}