Close #212 Close #209

Open Lowcode SAS · Open Lowcode SAS · commit a099d90f67f1 · 2020-09-13T06:40:19.000+02:00
diff --git a/src/org/openlowcode/client/graphic/widget/CTextField.java b/src/org/openlowcode/client/graphic/widget/CTextField.java
@@ -27,7 +27,6 @@
 import org.openlowcode.client.graphic.widget.table.LargeTextTableCell;
 import org.openlowcode.client.graphic.widget.table.ObjectDataElementKeyExtractor;
 import org.openlowcode.client.graphic.widget.table.ObjectTableRow;
-import org.openlowcode.client.graphic.widget.tools.CChoiceFieldValue;
 import org.openlowcode.client.runtime.PageActionManager;
 import org.openlowcode.tools.structure.ArrayDataElt;
 import org.openlowcode.tools.structure.ArrayDataEltType;
diff --git a/src/org/openlowcode/design/data/ChoiceField.java b/src/org/openlowcode/design/data/ChoiceField.java
@@ -164,12 +164,12 @@ public Field copy(String newname, String newdisplaylabel) {
 
 	@Override
 	public String writeCellExtractor() {
-		return "(a,b)->(ChoiceDataObjectFieldFlatFileLoaderColumn.getContentFromCell( a, "+StringFormatter.formatForJavaClass(choice.getName())+"ChoiceDefinition.get(), null, false,\"MultiChildLoader\"))";
+		return "(a,b,c)->(ChoiceDataObjectFieldFlatFileLoaderColumn.getContentFromCell( a, "+StringFormatter.formatForJavaClass(choice.getName())+"ChoiceDefinition.get(), null, false,\"MultiChildLoader\"))";
 	}
 
 	@Override
 	public String writeCellFiller() {
-		return "(a,b)->ChoiceDataObjectFieldFlatFileLoaderColumn.putContentInCell(a,b)";
+		return "(a,b,c)->ChoiceDataObjectFieldFlatFileLoaderColumn.putContentInCell(a,c)";
 	}
 
 	@Override
@@ -178,7 +178,7 @@ public String writePayloadFiller() {
 	}
 
 	@Override
-	public String writeStringPrinter() {
+	public String writeStringPrinterAndConsolidator() {
 		return "(a)->(ChoiceValue.print(a))";
 	}
 
diff --git a/src/org/openlowcode/design/data/DecimalField.java b/src/org/openlowcode/design/data/DecimalField.java
@@ -164,6 +164,7 @@ public void writeDependentClass(SourceGenerator sg, Module module) throws IOExce
 		sg.wl("import org.openlowcode.server.data.formula.SumOnLinkRightObject;");
 		sg.wl("import org.openlowcode.server.data.formula.SumProductOnLinkRightObject;");
 		sg.wl("import org.openlowcode.server.data.formula.LinkToLeftReverseNavigator;");
+		sg.wl("import org.openlowcode.server.data.helpers.ReportTree;");
 	}
 
 	@Override
@@ -203,13 +204,12 @@ public Field copy(String newname, String newdisplaylabel) {
 
 	@Override
 	public String writeCellExtractor() {
-		return "(a,b)->(DecimalDataObjectFieldFlatFileLoaderColumn.getContentFromCell( a," + scale + "," + length
-				+ " ,b, 0,null))";
+		return "(a,b,c)->(DecimalDataObjectFieldFlatFileLoaderColumn.getContentFromCell( a,2,12 ,b, (c!=null?(c.length>0?DecimalDataObjectFieldFlatFileLoaderColumn.parseMultiplierForImport(c[0]):0):0),null))";
 	}
 
 	@Override
 	public String writeCellFiller() {
-		return "(a,b)->DecimalDataObjectFieldFlatFileLoaderColumn.putContentInCell(a,b,null)";
+		return "(a,b,c)->DecimalDataObjectFieldFlatFileLoaderColumn.putContentInCell(a,c,(b!=null?(b.length>0?b[0]:null):null))";
 	}
 
 	@Override
@@ -218,7 +218,7 @@ public String writePayloadFiller() {
 	}
 
 	@Override
-	public String writeStringPrinter() {
-		return "(a)->(DecimalDataObjectField.printDecimal(a))";
+	public String writeStringPrinterAndConsolidator() {
+		return "(a)->(DecimalDataObjectField.printDecimal(a)),(a,b)->(ReportTree.sumIfNotNull(a, b))";
 	}
 }
diff --git a/src/org/openlowcode/design/data/EncryptedStringField.java b/src/org/openlowcode/design/data/EncryptedStringField.java
@@ -118,7 +118,7 @@ public String writePayloadFiller() {
 		return "Not yet implemented";
 	}
 	@Override
-	public String writeStringPrinter() {
+	public String writeStringPrinterAndConsolidator() {
 		return "(a)->(not yet implemented)";
 	}
 }
diff --git a/src/org/openlowcode/design/data/Field.java b/src/org/openlowcode/design/data/Field.java
@@ -212,10 +212,10 @@ public Field copy() {
 	public abstract String writePayloadFiller();
 
 	/**
-	 * write a printer for the type of object managed in the dielf
+	 * write a printer for the type of object managed in the field and consolidator if applicable
 	 * 
 	 * @return the function source code
 	 * @since 1.11
 	 */
-	public abstract String writeStringPrinter();
+	public abstract String writeStringPrinterAndConsolidator();
 }
diff --git a/src/org/openlowcode/design/data/IntegerField.java b/src/org/openlowcode/design/data/IntegerField.java
@@ -104,7 +104,7 @@ public String writePayloadFiller() {
 		return "Not yet implemented";
 	}
 	@Override
-	public String writeStringPrinter() {
+	public String writeStringPrinterAndConsolidator() {
 		return "(a)->(not yet implemented)";
 	}
 }
diff --git a/src/org/openlowcode/design/data/LargeBinaryField.java b/src/org/openlowcode/design/data/LargeBinaryField.java
@@ -108,7 +108,7 @@ public String writePayloadFiller() {
 	}
 	
 	@Override
-	public String writeStringPrinter() {
+	public String writeStringPrinterAndConsolidator() {
 		return "(a)->(not yet implemented)";
 	}
 }
diff --git a/src/org/openlowcode/design/data/MultipleChoiceField.java b/src/org/openlowcode/design/data/MultipleChoiceField.java
@@ -148,7 +148,7 @@ public String writePayloadFiller() {
 		return "Not yet implemented";
 	}
 	@Override
-	public String writeStringPrinter() {
+	public String writeStringPrinterAndConsolidator() {
 		return "(a)->(not yet implemented)";
 	}
 }
diff --git a/src/org/openlowcode/design/data/StringField.java b/src/org/openlowcode/design/data/StringField.java
@@ -271,7 +271,7 @@ public String writePayloadFiller() {
 		return "Not yet implemented";
 	}
 	@Override
-	public String writeStringPrinter() {
+	public String writeStringPrinterAndConsolidator() {
 		return "(a)->(a)";
 	}
 }
diff --git a/src/org/openlowcode/design/data/TimePeriodField.java b/src/org/openlowcode/design/data/TimePeriodField.java
@@ -137,20 +137,20 @@ public Field copy(String newname, String newdisplaylabel) {
 	
 	@Override
 	public String writeCellExtractor() {
-		return "(a,b)->(TimePeriod.generateFromObject(a))";
+		return "(a,b,c)->(TimePeriod.generateFromObject(a))";
 	}
 
 	@Override
 	public String writeCellFiller() {
-		return "(a,b)->TimePeriodDataObjectFieldFlatFileLoader.putContentInCell(a,b)";
+		return "(a,b,c)->TimePeriodDataObjectFieldFlatFileLoader.putContentInCell(a,c)";
 	}
 	
 	@Override
 	public String writePayloadFiller() {
 		return "Not yet implemented";
 	}
 	@Override
-	public String writeStringPrinter() {
+	public String writeStringPrinterAndConsolidator() {
 		return "(a)->(TimePeriod.encode(a))";
 	}
 
diff --git a/src/org/openlowcode/design/data/TimestampField.java b/src/org/openlowcode/design/data/TimestampField.java
@@ -172,7 +172,7 @@ public String writePayloadFiller() {
 		return "Not yet implemented";
 	}
 	@Override
-	public String writeStringPrinter() {
+	public String writeStringPrinterAndConsolidator() {
 		return "Not yet implemented";
 	}
 }
diff --git a/src/org/openlowcode/design/data/properties/basic/HasMultiDimensionalChild.java b/src/org/openlowcode/design/data/properties/basic/HasMultiDimensionalChild.java
@@ -158,7 +158,7 @@ private void writeHelperForValue(
 		sg.wl("					(a)->a.get" + attributeclass + "(),");
 		sg.wl("					" + field.writeCellFiller() + ",");
 		sg.wl("					" + field.writeCellExtractor() + ",");
-		sg.wl("					"+field.writeStringPrinter()+");");
+		sg.wl("					"+field.writeStringPrinterAndConsolidator()+");");
 		if (!payload)
 			sg.wl("			helper.setChildHelper(" + attributefield + "fieldchildhelper" + (main ? ",true" : "")+");");
 		if (payload)
diff --git a/src/org/openlowcode/server/data/loader/ConditionalAliasListHelper.java b/src/org/openlowcode/server/data/loader/ConditionalAliasListHelper.java
@@ -125,14 +125,21 @@ public static <Y extends Object,Z extends FieldChoiceDefinition<Z>> boolean isAl
 			ChoiceValue<Z> filter,
 			HashMap<Y, ChoiceValue<Z>[]> restrictions) {
 		if (!restrictions.containsKey(alias)) {
+			logger.severe("    >>> No restriction for dynamic alias "+alias+" for selection "+filter);
 			return true;
 		} else {
-			if (filter == null)
+			if (filter == null) {
+				logger.severe("    >>> dynamic alias "+alias+" discarded  "+filter);
 				return false;
+			}
 			ChoiceValue<Z>[] restrictionsforalias = restrictions.get(alias);
 			for (int i = 0; i < restrictionsforalias.length; i++) {
-				if (restrictionsforalias[i].getStorageCode().equals(filter.getStorageCode()))
+				if (restrictionsforalias[i].getStorageCode().equals(filter.getStorageCode())) {
+					logger.severe("    >>> dynamic alias "+alias+" valid for selected choice"+filter);
 					return true;
+				} else {
+					logger.severe("     >>> dynamic alias "+alias+" selected choice "+restrictionsforalias[i]+" is not valid, user asked for "+filter);
+				}
 			}
 			return false;
 		}
diff --git a/src/org/openlowcode/server/data/loader/ConditionalAliasListParentHelper.java b/src/org/openlowcode/server/data/loader/ConditionalAliasListParentHelper.java
@@ -104,17 +104,16 @@ public String[] getSpecificAliasList(ChoiceValue<F> selectedvalue, DataObjectId<
 				logger.severe(" starting processing alias " + i + "   -  " + staticalias);
 				for (int j = 0; j < dynamicaliases.length; j++) {
 					Pair<String, String> thisdynamicalias = dynamicaliases[j];
-					ChoiceValue<F>[] conditionalforthisalias = conditionaldynamicaliaslist.get(thisdynamicalias);
-					boolean show = true;
-					if (conditionalforthisalias != null)
-						show = isAliasValid(thisdynamicalias, selectedvalue, conditionaldynamicaliaslist);
+					boolean show =  isAliasValid(thisdynamicalias, selectedvalue, conditionaldynamicaliaslist);
 					if (show) {
 						FlatFileExtractorDynamicAliasParentFilter<E,G,F> helper = this.dynamicaliaslistparenthelper.get(thisdynamicalias);
 						if (helper == null)
 							throw new RuntimeException("Dynamic Alias '" + thisdynamicalias.getFirstobject() + "' - ' "
 									+ thisdynamicalias.getSecondobject()
 									+ "' does not have an helper. Please check the definition ");
 						String[] relevantdynamics = helper.generateForExport(objectdefinition,parent,selectedvalue);
+					
+						
 						if (relevantdynamics != null)
 							for (int k = 0; k < relevantdynamics.length; k++) {
 								String thisdynamicpart = relevantdynamics[k];
diff --git a/src/org/openlowcode/server/data/properties/HasmultidimensionalchildFlatFileLoaderHelper.java b/src/org/openlowcode/server/data/properties/HasmultidimensionalchildFlatFileLoaderHelper.java
@@ -95,10 +95,24 @@ 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];
+				}
 				
-				return mainvaluehelper.new MainValueFlatFileLoader(this, locale, maincolumnvalue,payloadhelper);
+				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];
+			}
+			return this.payloadhelper.new MainValueTotalFlatFileLoader(this,locale,payloadhelper,extraattributes);
+		}
 		potentialattributes.append(',');
 		potentialattributes.append(mainvaluehelper.getFieldName());
 		throw new RuntimeException("No Loader found for attribute " + maincolumnattribute + ", potential attributes "
@@ -161,6 +175,14 @@ public String getDebugForLineAndColumnKey(String linekey,String columnkey) {
 		
 	}
 	
+	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());
+		return valueslist;
+		
+	}
+	
 	public F getChildForLineAndColumnKey(String linekey, String columnkey) {
 		if (childrenbykey == null) {
 			StringBuffer error = new StringBuffer("Children list not initiated for linekey = " + linekey
diff --git a/src/org/openlowcode/server/data/properties/multichild/ConstantMultiChildValueHelper.java b/src/org/openlowcode/server/data/properties/multichild/ConstantMultiChildValueHelper.java
@@ -11,7 +11,6 @@
 package org.openlowcode.server.data.properties.multichild;
 
 import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
 import java.util.function.Function;
 
 import org.apache.poi.ss.usermodel.Cell;
@@ -20,6 +19,8 @@
 import org.openlowcode.server.data.DataObject;
 import org.openlowcode.server.data.properties.MultidimensionchildInterface;
 import org.openlowcode.server.data.properties.UniqueidentifiedInterface;
+import org.openlowcode.tools.misc.TriConsumer;
+import org.openlowcode.tools.misc.TriFunction;
 
 /**
  * @author <a href="https://openlowcode.com/" rel="nofollow">Open Lowcode
@@ -41,16 +42,16 @@ public class ConstantMultiChildValueHelper<
 	private boolean allowothervalues;
 	private F defaultforotherdata;
 	
-	public ConstantMultiChildValueHelper(String fieldname,F[] minimumvalues,BiConsumer<E, F> setter, Function<E, F> getter,BiConsumer<Cell, F> cellfiller,
-			BiFunction<Object,ChoiceValue<ApplocaleChoiceDefinition>, F> payloadparser,Function<F, String> printer) {
+	public ConstantMultiChildValueHelper(String fieldname,F[] minimumvalues,BiConsumer<E, F> setter, Function<E, F> getter,TriConsumer<Cell,String[], F> cellfiller,
+			TriFunction<Object,ChoiceValue<ApplocaleChoiceDefinition>,String[], F> payloadparser,Function<F, String> printer) {
 		super(fieldname,setter, getter,cellfiller,payloadparser,printer);
 		this.minimumvalues=minimumvalues;
 		this.maximumvalues=null;
 		this.allowothervalues=true;
 		this.defaultforotherdata=null;
 	}
-	public ConstantMultiChildValueHelper(String fieldname,F[] minimumvalues,F defaultforotherdata,BiConsumer<E, F> setter, Function<E, F> getter,BiConsumer<Cell, F> cellfiller,
-			BiFunction<Object,ChoiceValue<ApplocaleChoiceDefinition>, F> payloadparser,Function<F, String> printer) {
+	public ConstantMultiChildValueHelper(String fieldname,F[] minimumvalues,F defaultforotherdata,BiConsumer<E, F> setter, Function<E, F> getter,TriConsumer<Cell,String[], F> cellfiller,
+			TriFunction<Object,ChoiceValue<ApplocaleChoiceDefinition>,String[], F> payloadparser,Function<F, String> printer) {
 		super(fieldname,setter, getter,cellfiller,payloadparser,printer);
 		this.minimumvalues=minimumvalues;
 		this.maximumvalues=null;
diff --git a/src/org/openlowcode/server/data/properties/multichild/MultichildValueHelper.java b/src/org/openlowcode/server/data/properties/multichild/MultichildValueHelper.java
diff --git a/src/org/openlowcode/tools/misc/TriConsumer.java b/src/org/openlowcode/tools/misc/TriConsumer.java

Original file line number	Diff line number	Diff line change
`@@ -164,12 +164,12 @@ public Field copy(String newname, String newdisplaylabel) {`
`164`	`164`
`165`	`165`	`@Override`
`166`	`166`	`public String writeCellExtractor() {`
`167`		`- return "(a,b)->(ChoiceDataObjectFieldFlatFileLoaderColumn.getContentFromCell( a, "+StringFormatter.formatForJavaClass(choice.getName())+"ChoiceDefinition.get(), null, false,\"MultiChildLoader\"))";`
	`167`	`+ return "(a,b,c)->(ChoiceDataObjectFieldFlatFileLoaderColumn.getContentFromCell( a, "+StringFormatter.formatForJavaClass(choice.getName())+"ChoiceDefinition.get(), null, false,\"MultiChildLoader\"))";`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`@Override`
`171`	`171`	`public String writeCellFiller() {`
`172`		`- return "(a,b)->ChoiceDataObjectFieldFlatFileLoaderColumn.putContentInCell(a,b)";`
	`172`	`+ return "(a,b,c)->ChoiceDataObjectFieldFlatFileLoaderColumn.putContentInCell(a,c)";`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`@Override`
`@@ -178,7 +178,7 @@ public String writePayloadFiller() {`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`@Override`
`181`		`- public String writeStringPrinter() {`
	`181`	`+ public String writeStringPrinterAndConsolidator() {`
`182`	`182`	`return "(a)->(ChoiceValue.print(a))";`
`183`	`183`	`}`
`184`	`184`
Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,7 @@ public void writeDependentClass(SourceGenerator sg, Module module) throws IOExce`
`164`	`164`	`sg.wl("import org.openlowcode.server.data.formula.SumOnLinkRightObject;");`
`165`	`165`	`sg.wl("import org.openlowcode.server.data.formula.SumProductOnLinkRightObject;");`
`166`	`166`	`sg.wl("import org.openlowcode.server.data.formula.LinkToLeftReverseNavigator;");`
	`167`	`+ sg.wl("import org.openlowcode.server.data.helpers.ReportTree;");`
`167`	`168`	`}`
`168`	`169`
`169`	`170`	`@Override`
`@@ -203,13 +204,12 @@ public Field copy(String newname, String newdisplaylabel) {`
`203`	`204`
`204`	`205`	`@Override`
`205`	`206`	`public String writeCellExtractor() {`
`206`		`- return "(a,b)->(DecimalDataObjectFieldFlatFileLoaderColumn.getContentFromCell( a," + scale + "," + length`
`207`		`- + " ,b, 0,null))";`
	`207`	`+ return "(a,b,c)->(DecimalDataObjectFieldFlatFileLoaderColumn.getContentFromCell( a,2,12 ,b, (c!=null?(c.length>0?DecimalDataObjectFieldFlatFileLoaderColumn.parseMultiplierForImport(c[0]):0):0),null))";`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`@Override`
`211`	`211`	`public String writeCellFiller() {`
`212`		`- return "(a,b)->DecimalDataObjectFieldFlatFileLoaderColumn.putContentInCell(a,b,null)";`
	`212`	`+ return "(a,b,c)->DecimalDataObjectFieldFlatFileLoaderColumn.putContentInCell(a,c,(b!=null?(b.length>0?b[0]:null):null))";`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`@Override`
`@@ -218,7 +218,7 @@ public String writePayloadFiller() {`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`@Override`
`221`		`- public String writeStringPrinter() {`
`222`		`- return "(a)->(DecimalDataObjectField.printDecimal(a))";`
	`221`	`+ public String writeStringPrinterAndConsolidator() {`
	`222`	`+ return "(a)->(DecimalDataObjectField.printDecimal(a)),(a,b)->(ReportTree.sumIfNotNull(a, b))";`
`223`	`223`	`}`
`224`	`224`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public String writePayloadFiller() {`
`118`	`118`	`return "Not yet implemented";`
`119`	`119`	`}`
`120`	`120`	`@Override`
`121`		`- public String writeStringPrinter() {`
	`121`	`+ public String writeStringPrinterAndConsolidator() {`
`122`	`122`	`return "(a)->(not yet implemented)";`
`123`	`123`	`}`
`124`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -212,10 +212,10 @@ public Field copy() {`
`212`	`212`	`public abstract String writePayloadFiller();`
`213`	`213`
`214`	`214`	`/**`
`215`		`- * write a printer for the type of object managed in the dielf`
	`215`	`+ * write a printer for the type of object managed in the field and consolidator if applicable`
`216`	`216`	`*`
`217`	`217`	`* @return the function source code`
`218`	`218`	`* @since 1.11`
`219`	`219`	`*/`
`220`		`- public abstract String writeStringPrinter();`
	`220`	`+ public abstract String writeStringPrinterAndConsolidator();`
`221`	`221`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public String writePayloadFiller() {`
`104`	`104`	`return "Not yet implemented";`
`105`	`105`	`}`
`106`	`106`	`@Override`
`107`		`- public String writeStringPrinter() {`
	`107`	`+ public String writeStringPrinterAndConsolidator() {`
`108`	`108`	`return "(a)->(not yet implemented)";`
`109`	`109`	`}`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public String writePayloadFiller() {`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`@Override`
`111`		`- public String writeStringPrinter() {`
	`111`	`+ public String writeStringPrinterAndConsolidator() {`
`112`	`112`	`return "(a)->(not yet implemented)";`
`113`	`113`	`}`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public String writePayloadFiller() {`
`148`	`148`	`return "Not yet implemented";`
`149`	`149`	`}`
`150`	`150`	`@Override`
`151`		`- public String writeStringPrinter() {`
	`151`	`+ public String writeStringPrinterAndConsolidator() {`
`152`	`152`	`return "(a)->(not yet implemented)";`
`153`	`153`	`}`
`154`	`154`	`}`
Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ public String writePayloadFiller() {`
`271`	`271`	`return "Not yet implemented";`
`272`	`272`	`}`
`273`	`273`	`@Override`
`274`		`- public String writeStringPrinter() {`
	`274`	`+ public String writeStringPrinterAndConsolidator() {`
`275`	`275`	`return "(a)->(a)";`
`276`	`276`	`}`
`277`	`277`	`}`
Original file line number	Diff line number	Diff line change
`@@ -137,20 +137,20 @@ public Field copy(String newname, String newdisplaylabel) {`
`137`	`137`
`138`	`138`	`@Override`
`139`	`139`	`public String writeCellExtractor() {`
`140`		`- return "(a,b)->(TimePeriod.generateFromObject(a))";`
	`140`	`+ return "(a,b,c)->(TimePeriod.generateFromObject(a))";`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`@Override`
`144`	`144`	`public String writeCellFiller() {`
`145`		`- return "(a,b)->TimePeriodDataObjectFieldFlatFileLoader.putContentInCell(a,b)";`
	`145`	`+ return "(a,b,c)->TimePeriodDataObjectFieldFlatFileLoader.putContentInCell(a,c)";`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`@Override`
`149`	`149`	`public String writePayloadFiller() {`
`150`	`150`	`return "Not yet implemented";`
`151`	`151`	`}`
`152`	`152`	`@Override`
`153`		`- public String writeStringPrinter() {`
	`153`	`+ public String writeStringPrinterAndConsolidator() {`
`154`	`154`	`return "(a)->(TimePeriod.encode(a))";`
`155`	`155`	`}`
`156`	`156`