Close #220 #221

Author: Open Lowcode SAS

src/org/openlowcode/client/graphic/widget/table/EditableTreeTable.java

@@ -490,7 +490,6 @@ private void resize() {
 		});
 
 		ObservableList<TreeTableColumn<EditableTreeTableLineItem<Wrapper<E>>, ?>> columns = treetableview.getColumns();
-		int totalwidth = 0;
 		for (int i=0;i<columns.size();i++) {
 			columns.get(i).widthProperty().addListener(new  ChangeListener<Number>() {
 

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

@@ -58,7 +58,7 @@ public void setDependentPropertyLinkedfromchildren(Linkedfromchildren<E, F> rela
 	 * Creates the property
 	 * 
 	 * @param definition    definition of the property
-	 * @param parentpayload pâyload of the parent object
+	 * @param parentpayload payload of the parent object
 	 */
 	public Hasmultidimensionalchild(
 			HasmultidimensionalchildDefinition<E, F> definition,

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

@@ -26,7 +26,8 @@
 import org.openlowcode.server.data.properties.multichild.MultidimensionchildHelper;
 
 /**
- * A helper to manage the loading of objects with the Hasmultidimensionalchild property
+ * A helper to manage the loading of objects with the Hasmultidimensionalchild
+ * property
  * 
  * @author <a href="https://openlowcode.com/" rel="nofollow">Open Lowcode
  *         SAS</a>
@@ -62,11 +63,11 @@ public void setPayloadHelper(MultichildValueHelper<F, ?, E> payloadhelper) {
 	public MultichildValueHelper<F, ?, E> getPayloadHelper() {
 		return this.payloadhelper;
 	}
-	
+
 	/**
 	 * @return
 	 */
-	public MultichildValueHelper<F,?,E> getMainValueHelper() {
+	public MultichildValueHelper<F, ?, E> getMainValueHelper() {
 		return this.mainvaluehelper;
 	}
 
@@ -82,8 +83,6 @@ public HasmultidimensionalchildFlatFileLoaderHelper(
 		payloadhelper = helper.getPayloadValueHelper();
 	}
 
-	
-
 	@Override
 	public FlatFileLoaderColumn<E> getFlatFileLoaderColumn(
 			DataObjectDefinition<E> objectdefinition,
@@ -108,23 +107,26 @@ public FlatFileLoaderColumn<E> getFlatFileLoaderColumn(
 		if (columnattributes.length >= 2) {
 			if (maincolumnattribute.equals(this.mainvaluehelper.getFieldName())) {
 				String maincolumnvalue = columnattributes[1];
-				String[] extraattributes =null;
-				if (columnattributes.length>2) {
-					extraattributes = new String[columnattributes.length-2];
-					for (int i=0;i<columnattributes.length-2;i++) extraattributes[i] = columnattributes[i+2];
+				String[] extraattributes = null;
+				if (columnattributes.length > 2) {
+					extraattributes = new String[columnattributes.length - 2];
+					for (int i = 0; i < columnattributes.length - 2; i++)
+						extraattributes[i] = columnattributes[i + 2];
 				}
-				
-				return mainvaluehelper.new MainValueFlatFileLoader(this, locale, maincolumnvalue,payloadhelper,extraattributes);
+
+				return mainvaluehelper.new MainValueFlatFileLoader(this, locale, maincolumnvalue, payloadhelper,
+						extraattributes);
 			}
 		}
 		if (maincolumnattribute.equals("#TOTAL#")) {
 			logger.finest("  >>> get total flat file loader");
-			String[] extraattributes =null;
-			if (columnattributes.length>1) {
-				extraattributes = new String[columnattributes.length-1];
-				for (int i=0;i<columnattributes.length-1;i++) extraattributes[i] = columnattributes[i+1];
+			String[] extraattributes = null;
+			if (columnattributes.length > 1) {
+				extraattributes = new String[columnattributes.length - 1];
+				for (int i = 0; i < columnattributes.length - 1; i++)
+					extraattributes[i] = columnattributes[i + 1];
 			}
-			return this.payloadhelper.new MainValueTotalFlatFileLoader(this,locale,payloadhelper,extraattributes);
+			return this.payloadhelper.new MainValueTotalFlatFileLoader(this, locale, payloadhelper, extraattributes);
 		}
 		potentialattributes.append(',');
 		potentialattributes.append(mainvaluehelper.getFieldName());
@@ -160,8 +162,8 @@ public void executeAtEndOfLine(E objecforprocessing) {
 
 	}
 
-	public String getDebugForLineAndColumnKey(String linekey,String columnkey) {
-		if (childrenbykey.get(linekey)==null) {
+	public String getDebugForLineAndColumnKey(String linekey, String columnkey) {
+		if (childrenbykey.get(linekey) == null) {
 			StringBuffer droplinekey = new StringBuffer(" Line key not existing, given value = ");
 			droplinekey.append(linekey);
 			droplinekey.append(", valid keys = ");
@@ -184,18 +186,18 @@ public String getDebugForLineAndColumnKey(String linekey,String columnkey) {
 			droplinekey.append(' ');
 		}
 		return droplinekey.toString();
-		
-		
+
 	}
-	
+
 	public ArrayList<F> getChildrenForLine(String linekey) {
 		Iterator<F> values = childrenbykey.get(linekey).values().iterator();
 		ArrayList<F> valueslist = new ArrayList<F>();
-		while (values.hasNext()) valueslist.add(values.next());
+		while (values.hasNext())
+			valueslist.add(values.next());
 		return valueslist;
-		
+
 	}
-	
+
 	public F getChildForLineAndColumnKey(String linekey, String columnkey) {
 		if (childrenbykey == null) {
 			StringBuffer error = new StringBuffer("Children list not initiated for linekey = " + linekey
@@ -219,57 +221,63 @@ public F getFirstChildForLineKey(String key) {
 		return childrenbykey.get(key).values().iterator().next();
 	}
 
+	private void putChildInKeyMap(E currentobject,F child) {
+		String keyforchild = this.helper.generateKeyForObject(child, true);
+
+		HashMap<String, F> currentobjectsforkey = childrenbykey.get(keyforchild);
+		if (currentobjectsforkey == null) {
+			currentobjectsforkey = new HashMap<String, F>();
+			childrenbykey.put(keyforchild, currentobjectsforkey);
+			logger.finest("--- adding child map for key " + keyforchild);
+		}
+		String mainvalue = this.helper.getMainValueHelper().getAndPrint(child);
+		F current = currentobjectsforkey.get(mainvalue);
+		if (current != null)
+			logger.warning("  -- Duplicate child for secondary key = " + keyforchild + " for main value "
+					+ mainvalue + " for object = " + currentobject.dropIdToString());
+		if (current == null) {
+			currentobjectsforkey.put(mainvalue, child);
+			logger.finest("      adding element for primary " + keyforchild + " secondary " + mainvalue + " for id "
+					+ child.dropIdToString());
+		}
+	}
+	
 	public void initColumnsForObject(E currentobject) {
 		F[] children = hasmultidimensionalchilddefinition.getChildren(currentobject.getId());
-		logger.finest(" ---------------- Generating keys for "+currentobject.dropIdToString()+" - "+(children!=null?children.length:"NULL")+" child(ren)---------------------------");
+		logger.finest(" ---------------- Generating keys for " + currentobject.dropIdToString() + " - "
+				+ (children != null ? children.length : "NULL") + " child(ren)---------------------------");
 		childrenbykey = new HashMap<String, HashMap<String, F>>();
 		for (int i = 0; i < children.length; i++) {
 			F child = children[i];
-			String keyforchild = this.helper.generateKeyForObject(child, true);
-
-			HashMap<String, F> currentobjectsforkey = childrenbykey.get(keyforchild);
-			if (currentobjectsforkey == null) {
-				currentobjectsforkey = new HashMap<String, F>();
-				childrenbykey.put(keyforchild, currentobjectsforkey);
-				logger.finest("--- adding child map for key "+keyforchild);
-			}
-			String mainvalue = this.helper.getMainValueHelper().getAndPrint(child);
-			F current = currentobjectsforkey.get(mainvalue);
-			if (current != null)
-				logger.warning("  -- Duplicate child for secondary key = " + keyforchild + " for main value "
-						+ mainvalue + " for object = " + currentobject.dropIdToString());
-			if (current == null) {
-				currentobjectsforkey.put(mainvalue, child);
-				logger.finest("      adding element for primary "+keyforchild+" secondary "+mainvalue+" for id "+child.dropIdToString());
-			}
+			this.putChildInKeyMap(currentobject, child);
 		}
 
 	}
 
 	public String[] generateKeyAndLoadExistingData(E currentobject) {
-		
+
 		// Find why two logics with children in initColumn and method below
 		initColumnsForObject(currentobject);
 		F[] children = hasmultidimensionalchilddefinition.getChildren(currentobject.getId());
-		HashMap<String,String> classificationkeys = new HashMap<String,String>();
+		HashMap<String, String> classificationkeys = new HashMap<String, String>();
 		for (int i = 0; i < children.length; i++) {
 			F child = children[i];
 			String keyforchild = this.helper.generateKeyForObject(child, true);
-			classificationkeys.put(keyforchild,keyforchild);
+			classificationkeys.put(keyforchild, keyforchild);
 		}
 		Set<String> keys = classificationkeys.keySet();
 		Iterator<String> keyiterator = keys.iterator();
 		logger.finest(" ---------------- key drop -------------------");
-		while (keyiterator.hasNext()) logger.finest("         key "+keyiterator.next());
+		while (keyiterator.hasNext())
+			logger.finest("         key " + keyiterator.next());
 		logger.finest(" ----------------------------------------");
 		return keys.toArray(new String[0]);
 
 	}
 
 	private ArrayList<String> secondaryvalues = new ArrayList<String>();
 	private E contextobject = null;
-	
-	
+
 	public void setSecondaryValueForLoading(int index, String string) {
 		if (secondaryvalues.size() <= index)
 			for (int i = secondaryvalues.size(); i < index + 1; i++)
@@ -287,17 +295,66 @@ public String getContextKey() {
 	}
 
 	public void setContext(E object) {
-		boolean same=false;
-		if (contextobject!=null) {
+		boolean same = false;
+		if (contextobject != null) {
 			if (object.getId().equals(contextobject.getId())) {
-				same=true;
+				same = true;
 			}
 		}
 		if (!same) {
-			contextobject=object;
+			contextobject = object;
 			this.initColumnsForObject(contextobject);
 		}
-		
+
+	}
+
+	/**
+	 * generates a new row of objects for the given context, and inserts them.
+	 * 
+	 * @param parent          parent object for generating new row
+	 * @param extraattributes
+	 * @param applocale
+	 * @return true if the new row for context could be generated, false else
+	 */
+	public boolean generateNewRowForContext(
+			E parent,
+			ChoiceValue<ApplocaleChoiceDefinition> applocale,
+			String[] extraattributes) {
+		boolean iscontextvalid = true;
+		logger.fine("---------------------- generate new row for context ----------------");
+		for (int i = 0; i < secondaryvalues.size(); i++) {
+			String value = secondaryvalues.get(i);
+			logger.fine("   > Evaluating value "+value);
+			MultichildValueHelper<F, ?, E> helper = secondvaluehelpers.get(i);
+			boolean valid = helper.isTextValid(value, applocale, extraattributes);
+			if (!valid) {
+				logger.fine("      !!! INVALID !!! ");
+				iscontextvalid = false;
+			}
+		}
+		if (!iscontextvalid)
+			return false;
+		DataObjectDefinition<F> childdefinition = this.hasmultidimensionalchilddefinition
+				.getRelatedDefinitionLinkedFromChildren().getChildObjectDefinition();
+		F firstblank = childdefinition.generateBlank();
+		for (int i = 0; i < secondaryvalues.size(); i++) {
+			String value = secondaryvalues.get(i);
+			MultichildValueHelper<F, ?, E> helper = secondvaluehelpers.get(i);
+			helper.fillWithValue(firstblank, value, applocale, extraattributes);
+		}
+		logger.fine(" -> First blank = "+firstblank.dropToString());
+		ArrayList<F> newobjects = mainvaluehelper.generateElementsForAllMandatory(firstblank,parent);
+		logger.fine("Generating elements number = "+(newobjects==null?"null":newobjects.size()));
+		if (newobjects!=null) if (newobjects.size()>0) {
+			for (int i=0;i<newobjects.size();i++) {
+				F newobject = newobjects.get(i);
+				newobject.setmultidimensionparentidwithoutupdate(parent.getId());
+				putChildInKeyMap(parent,newobject);
+			}
+			newobjects.get(0).getMassiveInsert().insert(newobjects.toArray(childdefinition.generateArrayTemplate()));
+			
+		}
+		return true;
 	}
 
 }

src/org/openlowcode/server/data/properties/multichild/MultichildValueHelper.java

@@ -230,6 +230,22 @@ public void fillCell(Cell cell, E object, String[] extraattributes) {
 		this.cellfiller.apply(cell, extraattributes, this.getter.apply(object));
 	}
 
+	/**
+	 * @param cell
+	 * @param parsedvalue
+	 * @param locale
+	 * @param extraattributes
+	 * @since 1.12
+	 */
+	public void fillWithValue(
+			E object,
+			String parsedvalue,
+			ChoiceValue<ApplocaleChoiceDefinition> locale,
+			String[] extraattributes) {
+		F payload = this.payloadparser.apply(parsedvalue, locale, extraattributes);
+		this.setter.accept(object, payload);
+	}
+
 	/**
 	 * @param cell
 	 * @param value
@@ -531,8 +547,16 @@ public boolean load(G object, Object value, PostUpdateProcessingStore<G> postupd
 			E relevantchild = helper.getChildForLineAndColumnKey(helpercontextkey,
 					MultichildValueHelper.this.print(mainvalue));
 			if (relevantchild == null) {
-				throw new RuntimeException("Did not find existing child for key, debug = " + helper
-						.getDebugForLineAndColumnKey(helpercontextkey, MultichildValueHelper.this.print(mainvalue)));
+
+				boolean valid = helper.generateNewRowForContext(object, applocale, extraattributes);
+				if (valid) {
+					relevantchild = helper.getChildForLineAndColumnKey(helpercontextkey,
+							MultichildValueHelper.this.print(mainvalue));
+				} else
+
+					throw new RuntimeException(
+							"Did not find existing child for key, debug = " + helper.getDebugForLineAndColumnKey(
+									helpercontextkey, MultichildValueHelper.this.print(mainvalue)));
 			}
 			return this.payloadhelper.LoadIfDifferent(relevantchild, value, applocale, extraattributes);
 
@@ -565,6 +589,8 @@ protected boolean putContentInCell(G currentobject, Cell cell, String context) {
 	 * @since 1.12
 	 */
 	public boolean isValid(E optionalorinvalid) {
+		if (this.allowothervalues())
+			return true;
 		F value = getter.apply(optionalorinvalid);
 		F[] mandatoryvalues = this.getMandatoryValues();
 		F[] optionalvalues = this.getOptionalValues();
@@ -577,6 +603,41 @@ public boolean isValid(E optionalorinvalid) {
 		return false;
 	}
 
+	public boolean isTextValid(
+			String text,
+			ChoiceValue<ApplocaleChoiceDefinition> applocale,
+			String[] extraattributes) {
+		F payload = payloadparser.apply(text, applocale, extraattributes);
+		if (this.allowothervalues())
+			return true;
+		F[] mandatoryvalues = this.getMandatoryValues();
+		F[] optionalvalues = this.getOptionalValues();
+		for (int i = 0; i < mandatoryvalues.length; i++)
+			if (payload.equals(mandatoryvalues[i]))
+				return true;
+		for (int i = 0; i < optionalvalues.length; i++)
+			if (payload.equals(optionalvalues[i]))
+				return true;
+		return false;
+	}
+
+	/**
+	 * @param thisoptional
+	 * @return
+	 * @since 1.12
+	 */
+	public ArrayList<E> generateElementsForAllMandatory(E thisoptional, G thisparent) {
+		ArrayList<E> returnelements = new ArrayList<E>();
+		this.setContext(thisparent);
+		F[] allmandatories = this.getMandatoryValues();
+		for (int i = 0; i < allmandatories.length; i++) {
+			E thischild = thisoptional.deepcopy();
+			setter.accept(thischild, allmandatories[i]);
+			returnelements.add(thischild);
+		}
+		return returnelements;
+	}
+
 	/**
 	 * @param thisoptional
 	 * @param childrenbykey
@@ -601,7 +662,7 @@ public ArrayList<E> getMissingElementsForKey(
 		while (existingvalues.hasNext()) {
 			F value = existingvalues.next();
 			E newoptional = thisoptional.deepcopy();
-			payloadhelper.set(newoptional,null);
+			payloadhelper.set(newoptional, null);
 			this.setter.accept(newoptional, value);
 			String keyforobject = multidimensionhelper.generateKeyForObject(newoptional);
 			if (!childrenbykey.containsKey(keyforobject))

src/org/openlowcode/server/data/properties/multichild/MultidimensionchildHelper.java

@@ -244,4 +244,6 @@ public ArrayList<E> getOtherPrimaryelements(E thisoptional, HashMap<String, E> c
 
 
 
+	
+
 }