Close #282 Close #284

Author: Open Lowcode SAS

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

@@ -119,17 +119,20 @@ public void addlines(E object, F[] newlines) {
 			childrenbykey.put(key, thischild);
 		}
 		ArrayList<F> allobjectstoinsert = new ArrayList<F>();
+		
 		for (int i = 0; i < newlines.length; i++) {
 			F thisline = newlines[i];
-			boolean invalid = helper.isInvalid(thisline);
-			if (!invalid) {
- 			ArrayList<F> missingforthisoptional = helper.getOtherPrimaryelements(thisline, childrenbykey);
-			for (int j = 0; j < missingforthisoptional.size(); j++) {
-				F thismissing = missingforthisoptional.get(j);
-				allobjectstoinsert.add(thismissing);
-				childrenbykey.put(helper.generateKeyForObject(thismissing), thismissing);
-
-			}
+			boolean valid = helper.isValidOrVoid(thisline);
+			if (valid) {
+				ArrayList<F> multipliedlines = helper.multiplyforvoidfields(thisline,previouschildren);
+				for (int j=0;j<multipliedlines.size();j++) {
+					ArrayList<F> missingforthisoptional = helper.getOtherPrimaryelements(multipliedlines.get(j), childrenbykey);
+					for (int k = 0; k < missingforthisoptional.size(); k++) {
+						F thismissing = missingforthisoptional.get(k);
+						allobjectstoinsert.add(thismissing);
+						childrenbykey.put(helper.generateKeyForObject(thismissing), thismissing);
+					}
+				}
 			}
 		}
 

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

@@ -720,5 +720,9 @@ public ArrayList<E> getMissingElementsForKey(
 		}
 		return missingvalues;
 	}
+	
+	public SecondaryValueSelection<E,F,G> getSecondaryValueSelectionForField() {
+		return new SecondaryValueSelection<E,F,G>(this);
+	}
 
 }

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

@@ -215,6 +215,59 @@ public BiConsumer<E, E> getConsolidator() {
 
 
 
+	/**
+	 * Specific treatment for new lines.
+	 * 
+	 * @param newline
+	 * @return true if the element has at least one valid criteria and null criterias (no invalid criteria)
+	 * @since 1.15
+	 */
+	public boolean isValidOrVoid(E newline) {
+		boolean hasonevalidelement=false;
+		for (int i=0;i<this.secondarycriteriavaluehelpers.size();i++) {
+			MultichildValueHelper<E, ?, F> helper = this.secondarycriteriavaluehelpers.get(i);
+			if (!helper.allowUserValue()) if (!helper.allowothervalues()) {
+				boolean isvalid = helper.isValid(newline);
+				if (isvalid) hasonevalidelement=true;
+				if (!isvalid) if (helper.get(newline)!=null) return false;
+			}
+		}
+		if (hasonevalidelement) return true;
+		return false;
+	}
+	
+	/**
+	 * Multiply the blank objects
+	 * 
+	 * @param thisline
+	 * @param previouschildren
+	 * @return
+	 * @since 1.15
+	 */
+	public ArrayList<E> multiplyforvoidfields(E thisline, E[] previouschildren) {
+		ArrayList<E> newlines = new ArrayList<E>();
+		boolean hasonenullcriteria=false;
+		for (int i=0;i<this.secondarycriteriavaluehelpers.size();i++) {
+			MultichildValueHelper<E, ?, F> helper = this.secondarycriteriavaluehelpers.get(i);
+			if (helper.get(thisline)==null) hasonenullcriteria=true;
+		}
+		if (!hasonenullcriteria) newlines.add(thisline);
+		if (hasonenullcriteria) {
+			
+			newlines.add(thisline);
+			for (int i=0;i<this.secondarycriteriavaluehelpers.size();i++) {
+				MultichildValueHelper<E, ?, F> helper = this.secondarycriteriavaluehelpers.get(i);
+				if (helper.get(thisline)==null) {
+					SecondaryValueSelection<E, ?, F> secondaryvalueselection = helper.getSecondaryValueSelectionForField();
+					secondaryvalueselection.GetAllValuesFromExistingObjects(previouschildren);
+					newlines = secondaryvalueselection.createclonesforallvalues(newlines);
+				}
+			}
+		}
+		return newlines;
+		
+	}
+	
 	/**
 	 * @param a child object
 	 * @return true if invalid
@@ -246,4 +299,6 @@ public ArrayList<E> getOtherPrimaryelements(E thisoptional, HashMap<String, E> c
 
 
 
+	
+
 }

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

@@ -0,0 +1,84 @@
+/********************************************************************************
+ * Copyright (c) 2020 [Open Lowcode SAS](https://openlowcode.com/)
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0 .
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ********************************************************************************/
+
+package org.openlowcode.server.data.properties.multichild;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+import org.openlowcode.server.data.DataObject;
+import org.openlowcode.server.data.properties.MultidimensionchildInterface;
+import org.openlowcode.server.data.properties.UniqueidentifiedInterface;
+
+/**
+ * A class holding a selection of secondary values 
+ * 
+ * @author <a href="https://openlowcode.com/" rel="nofollow">Open Lowcode
+ *         SAS</a>
+ *
+ * @param <E> type of child object
+ * @param <F> payload of the field
+ * @param <G> type of the parent object (or any other object to be used)
+ * @since 1.15
+ */
+public class SecondaryValueSelection<
+E extends DataObject<E> & UniqueidentifiedInterface<E> & MultidimensionchildInterface<E, G>,
+F extends Object,
+G extends DataObject<G> & UniqueidentifiedInterface<G>> {
+	private MultichildValueHelper<E,F,G> valuehelper;
+	private HashMap<String,F> existingvalues;
+	/**
+	 * Creates a secondary value selection for the secondary field
+	 * 
+	 * @param valuehelper secondary field helper
+	 */
+	public SecondaryValueSelection(MultichildValueHelper<E,F,G> valuehelper) {
+		this.valuehelper = valuehelper;
+	}
+	
+	/**
+	 * Initializes the object with all the values present in the existing objects
+	 * 
+	 * @param existingobjects all existing children of the parent for the Multidimensionchild
+	 */
+	public void GetAllValuesFromExistingObjects(E[] existingobjects) {
+		existingvalues = new HashMap<String,F>();
+		if (existingobjects!=null) for (int i=0;i<existingobjects.length;i++) {
+			E existingobject = existingobjects[i];
+			F value = valuehelper.get(existingobject);
+			if (value!=null) existingvalues.put(valuehelper.print(value), value);
+		}
+	}
+	
+	/**
+	 * multiplies the objects given in entry setting one value
+	 * 
+	 * @param entryvalues entry values
+	 * @return one clone per value from existing object for the 
+	 */
+	public ArrayList<E> createclonesforallvalues(ArrayList<E> entryvalues) {
+		ArrayList<E> newvalues = new ArrayList<E>();
+		for (int i=0;i<entryvalues.size();i++) {
+			E originvalue = entryvalues.get(i);
+			Iterator<Entry<String, F>> valuesiterator = existingvalues.entrySet().iterator();
+			while (valuesiterator.hasNext()) {
+				F valueforfield = valuesiterator.next().getValue();
+				E copy = originvalue.deepcopy();
+				valuehelper.set(copy, valueforfield);
+				newvalues.add(copy);
+			}
+			
+		}
+		return newvalues;
+	}
+	
+}