change. Create 1 obs by ingredient

src/main/java/fr/inrae/po2engine/model/dataModel/CompositionFile.java

@@ -40,10 +40,7 @@ import org.json.JSONObject;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class CompositionFile extends GenericFile{
 
@@ -91,12 +88,27 @@ public class CompositionFile extends GenericFile{
             }
             if(p.getType().equals(DataPartType.RAW_DATA) || p.getType().equals(DataPartType.CALC_DATA)) {
                 if(p.getNBLine() > 1) { // first line is for header (attri / value / object / unit/ comment )
-                    // need to create new Observation
-                    ObservationFile obsFile = new ObservationFile(stepFile);
-                    obsFile.setId("Composition for " + this.getCompositionID().getValue().get());
-                    obsFile.setFoi(this.getFileName());
-                    TablePart newTable = obsFile.createObsData(true);
-                    newTable.mapPart(p);
+                    // need to create new Observations
+                    for(int i = 1; i< p.getNBLine(); i++) { // line 0 is header
+                        // create new DataPart. Only keeping currentLine
+                        DataPart newPart = new DataPart(data);
+                        newPart.setType(p.getType());
+                        newPart.setLineTable(p.getLineTable());
+                        newPart.addLine(new ArrayList<>(p.getHeader())); // clone header
+                        newPart.addLine(new ArrayList<>(p.getLine(i))); // clone ingredient description
+
+                        ObservationFile obsFile = new ObservationFile(stepFile);
+                        obsFile.setFoi(this.getFileName());
+                        obsFile.setId("composition for " + this.getCompositionID().getValue().get());
+
+                        TablePart newTable = obsFile.createObsData(true);
+                        newTable.mapPart(newPart);
+                        SimpleTable st = ((SimpleTable)newTable.getTable());
+                        if(st.getSize() >= 0 && st.getLine(0).get(SimpleTable.ObjK) != null) {
+                            String ingr = st.getLine(0).get(SimpleTable.ObjK).getValue().get();
+                            obsFile.setId("composition in "+ingr+" for " + this.getCompositionID().getValue().get());
+                        }
+                    }
                 }
             }
             if(p.getType().equals(DataPartType.MATERIAL_USED)) { ///////////////////////////////////////////:: on remonte ces infos sur l'étape