adempiere#1697, Add improvements for source code, reference to issue:

adempiere#1908
erpcya · Oct 4, 2018 · f06db7b · f06db7b
1 parent 5c8dbaa
commit f06db7b
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 34 deletions.
diff --git a/base/src/org/spin/util/FieldCondition.java b/base/src/org/spin/util/FieldCondition.java
@@ -141,4 +141,8 @@ public boolean isValid(HashMap<String, Object> value) {
     	return false;
     }
 
+	@Override
+	public String toString() {
+		return "FieldCondition [styleSheet=" + styleSheet + ", condition=" + condition + "]";
+	}
 }
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/GridTabRowRenderer.java b/zkwebui/WEB-INF/src/org/adempiere/webui/component/GridTabRowRenderer.java
@@ -397,11 +397,14 @@ else if (DisplayType.isNumeric(gridField[i].getDisplayType())) {
 			}
 
 			//	FR [ 1697 ]
-			definition = FieldDefinition.getInstance(gridField[i].getVO());
-			FieldCondition condition = definition.getConditionValid(columnValues);
-			div.setStyle(divStyle);
-			if(condition != null && condition.isValid()) {
-				div.setStyle(divStyle+condition.getStyleSheet());
+			//	Validate field condition
+			if(gridField[i].getAD_FieldDefinition_ID() > 0) {
+				definition = FieldDefinition.getInstance(gridField[i].getVO());
+				FieldCondition condition = definition.getConditionValid(columnValues);
+				div.setStyle(divStyle);
+				if(condition != null && condition.isValid()) {
+					div.setStyle(divStyle + condition.getStyleSheet());
+				}
 			}
 
 			div.setReadOnly(!gridField[i].isEditable(true));
@@ -688,39 +691,38 @@ public void setADWindowPanel(AbstractADWindowPanel windowPanel) {
 	 * Valid Condition for Change Div Style
 	 */
 	public void validCondition() {
-				if(definition == null)
-					return;
-				FieldCondition condition = definition.getConditionValid(null);
-				if(condition == null)
-					return;
-
-				Row currentRow = getCurrentRow();
-
-				String divStyle = DIVSTYLE;
-				GridField[] gridField = gridTab.getFields();
-
-				for(int i=0; i < gridField.length; i++) {
-					if(gridField[i].getAD_FieldDefinition_ID() != 0) {
-						if(condition.isValid(null)) {
-							if (DisplayType.YesNo == gridField[i].getDisplayType() || DisplayType.Image == gridField[i].getDisplayType()) {
-								divStyle += "text-align:center; ";
-							}
-							else if (DisplayType.isNumeric(gridField[i].getDisplayType())) {
-								divStyle += "text-align:right; ";
-							}
-							List divList = currentRow.getChildren();
-							for(int j=0; j< divList.size(); j++ ) {
-								if(divList.get(j) instanceof Div) {
-									Div div = (Div)divList.get(j);
-									if(div.getAttribute("columnName").equals(gridField[i].getColumnName())) {
-										div.setStyle(divStyle+condition.getStyleSheet());
-										div.invalidate();
-									}
-								}
+		if(definition == null)
+			return;
+		FieldCondition condition = definition.getConditionValid(null);
+		if(condition == null)
+			return;
+
+		Row currentRow = getCurrentRow();
+
+		String divStyle = DIVSTYLE;
+		GridField[] gridField = gridTab.getFields();
+		//	Iterate it
+		for(int i=0; i < gridField.length; i++) {
+			if(gridField[i].getAD_FieldDefinition_ID() != 0) {
+				if(condition.isValid(null)) {
+					if (DisplayType.YesNo == gridField[i].getDisplayType() || DisplayType.Image == gridField[i].getDisplayType()) {
+						divStyle += "text-align:center; ";
+					} else if (DisplayType.isNumeric(gridField[i].getDisplayType())) {
+						divStyle += "text-align:right; ";
+					}
+					List<?> divList = currentRow.getChildren();
+					for(int j=0; j< divList.size(); j++ ) {
+						if(divList.get(j) instanceof Div) {
+							Div div = (Div)divList.get(j);
+							if(div.getAttribute("columnName").equals(gridField[i].getColumnName())) {
+								div.setStyle(divStyle + condition.getStyleSheet());
+								div.invalidate();
 							}
 						}
 					}
 				}
+			}
+		}
 	}
 
 	 /**