Close #131

Author: Open Lowcode SAS

src/org/openlowcode/design/data/properties/basic/ComputedDecimal.java

@@ -43,9 +43,11 @@ public class ComputedDecimal
 	private int precision;
 	private int scale;
 	private String fieldlabel;
+	private int priority;
 
+	
 	/**
-	 * creates a computed decimal field with a formatter
+	 * creates a computed decimal field with a formatter with default priority for display
 	 * 
 	 * @param name             name of the field (should be valid java attribute
 	 *                         name)
@@ -66,12 +68,40 @@ public ComputedDecimal(
 			int scale,
 			FormulaDefinitionElement formula,
 			DecimalFormatter decimalformatter) {
+		this(name,fieldlabel,precision,scale,formula,decimalformatter,100);
+	}
+	
+	/**
+	 * creates a computed decimal field with a formatter
+	 * 
+	 * @param name             name of the field (should be valid java attribute
+	 *                         name)
+	 * @param fieldlabel       label in default language
+	 * 
+	 * @param precision        (digits to the right of decimal point (e.g. 533.33
+	 *                         has precision on 2)
+	 * @param scale            total number of digits of the number (e.g. 533.33 is
+	 *                         5 digits)
+	 * @param formula          formula to calculate the field value
+	 * @param decimalformatter formatter for the field (if graphical display is
+	 *                         expected)
+	 * @param priority         priority for the field display
+	 */
+	public ComputedDecimal(
+			String name,
+			String fieldlabel,
+			int precision,
+			int scale,
+			FormulaDefinitionElement formula,
+			DecimalFormatter decimalformatter,
+			int priority) {
 		super(name, "COMPUTEDDECIMAL");
 		this.formula = formula;
 		this.decimalformatter = decimalformatter;
 		this.precision = precision;
 		this.scale = scale;
 		this.fieldlabel = fieldlabel;
+		this.priority = priority;
 	}
 
 	@Override
@@ -88,7 +118,7 @@ public void controlAfterParentDefinition() {
 		this.setExtraAttributes(",\"" + fieldlabel.replace("\"", "\\\"") + "\"," + precision + "," + scale
 				+ ",new Formula(" + StringFormatter.formatForJavaClass(parent.getName()) + ".getComputeddecimalfor"
 				+ this.getInstancename().toLowerCase() + "Extractor()," + formula.generateFormulaElement() + "),"
-				+ (decimalformatter != null ? decimalformatter.generateDefinition() : "null"));
+				+ (decimalformatter != null ? decimalformatter.generateDefinition() : "null")+","+priority);
 		alltriggers = new ArrayList<CalculatedFieldTriggerPath>();
 		formula.setTriggersOnSourceFields(new CalculatedFieldTriggerPath(this));
 
@@ -97,15 +127,14 @@ public void controlAfterParentDefinition() {
 	/**
 	 * creates a computed decimal field without a formatter
 	 * 
-	 * @param name             name of the field (should be valid java attribute
-	 *                         name)
-	 * @param fieldlabel       label in default language
+	 * @param name       name of the field (should be valid java attribute name)
+	 * @param fieldlabel label in default language
 	 * 
-	 * @param precision        (digits to the right of decimal point (e.g. 533.33
-	 *                         has precision on 2)
-	 * @param scale            total number of digits of the number (e.g. 533.33 is
-	 *                         5 digits)
-	 * @param formula          formula to calculate the field value
+	 * @param precision  (digits to the right of decimal point (e.g. 533.33 has
+	 *                   precision on 2)
+	 * @param scale      total number of digits of the number (e.g. 533.33 is 5
+	 *                   digits)
+	 * @param formula    formula to calculate the field value
 	 */
 	public ComputedDecimal(String name, String fieldlabel, int precision, int scale, FormulaDefinitionElement formula) {
 		this(name, fieldlabel, precision, scale, formula, null);

src/org/openlowcode/server/data/properties/ComputeddecimalDefinition.java

@@ -35,11 +35,14 @@
  *
  * @param <E> parent data object
  */
-public class ComputeddecimalDefinition<E extends DataObject<E>> extends DataObjectPropertyDefinition<E> {
+public class ComputeddecimalDefinition<E extends DataObject<E>>
+		extends
+		DataObjectPropertyDefinition<E> {
 	private DecimalStoredField computedValue;
 	private String label;
 	private Formula<E> formula;
 	private SDecimalFormatter formatter;
+	private int priority;
 
 	public Formula<E> getFormula() {
 		return this.formula;
@@ -58,15 +61,24 @@ public Formula<E> getFormula() {
 	 *                     digits after comma)
 	 * @param formula      the formula to compute the decimal
 	 * @param formatter    formatter of the decimal field
+	 * @param priority     priority for the display field (between -1000 and 1000)
 	 */
-	public ComputeddecimalDefinition(DataObjectDefinition<E> parentobject, String name, String label, int precision,
-			int scale, Formula<E> formula, SDecimalFormatter formatter) {
+	public ComputeddecimalDefinition(
+			DataObjectDefinition<E> parentobject,
+			String name,
+			String label,
+			int precision,
+			int scale,
+			Formula<E> formula,
+			SDecimalFormatter formatter,
+			int priority) {
 		super(parentobject, name);
 		computedValue = new DecimalStoredField(this.getName().toUpperCase(), null, precision, scale);
 		this.addFieldSchema(computedValue);
 		this.label = label;
 		this.formula = formula;
 		this.formatter = formatter;
+		this.priority = priority;
 	}
 
 	@Override
@@ -85,17 +97,19 @@ public FieldSchemaForDisplay<E>[] setFieldSchemaToDisplay() {
 		FieldSchemaForDisplay<E>[] returnvalue = new FieldSchemaForDisplay[1];
 		if (formatter == null)
 			returnvalue[0] = new FieldSchemaForDisplay<E>(label, "Calculated field for " + label, computedValue, false,
-					false, 100, 20, this.parentobject);
+					false, priority, 20, this.parentobject);
 		if (formatter != null)
 			returnvalue[0] = new FieldSchemaForDisplay<E>(label, "Calculated field for " + label, computedValue,
-					formatter, false, false, 100, 20, this.parentobject);
+					formatter, false, false, priority, 20, this.parentobject);
 
 		return returnvalue;
 	}
 
 	@Override
-	public FlatFileLoaderColumn<E> getFlatFileLoaderColumn(DataObjectDefinition<E> objectdefinition,
-			String[] columnattributes, PropertyExtractor<E> propertyextractor,
+	public FlatFileLoaderColumn<E> getFlatFileLoaderColumn(
+			DataObjectDefinition<E> objectdefinition,
+			String[] columnattributes,
+			PropertyExtractor<E> propertyextractor,
 			ChoiceValue<ApplocaleChoiceDefinition> locale) {
 		throw new RuntimeException("Not yet implemented");
 	}