Index: ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java =================================================================== diff -u -r18645 -r18656 --- ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java (.../CSSDTestDataProcess.java) (revision 18645) +++ ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java (.../CSSDTestDataProcess.java) (revision 18656) @@ -2047,16 +2047,19 @@ MaterialInstance materialInstance4 = new MaterialInstance(); materialInstance4.setMaterialDefinition(materialDefinition3); materialInstance4.setCount(4); + materialInstance4.setMaterialName(materialDefinition3.getName()); materialInstance4.setTousse(tousseDefinition2); MaterialInstance materialInstance55 = new MaterialInstance(); materialInstance55.setMaterialDefinition(materialDefinition4); materialInstance55.setCount(2); + materialInstance55.setMaterialName(materialDefinition4.getName()); materialInstance55.setTousse(tousseDefinition2); MaterialInstance materialInstance66 = new MaterialInstance(); materialInstance66.setMaterialDefinition(materialDefinition5); materialInstance66.setCount(5); + materialInstance66.setMaterialName(materialDefinition5.getName()); materialInstance66.setTousse(tousseDefinition2); tousseDefinition2.setMaterialInstances(new ArrayList()); @@ -2127,11 +2130,13 @@ MaterialInstance materialInstance5 = new MaterialInstance(); materialInstance5.setMaterialDefinition(materialDefinition1); materialInstance5.setTousse(tousseDefinition3); + materialInstance5.setMaterialName(materialDefinition1.getName()); materialInstance5.setCount(1); MaterialInstance materialInstance6 = new MaterialInstance(); materialInstance6.setMaterialDefinition(materialDefinition3); materialInstance6.setTousse(tousseDefinition3); + materialInstance6.setMaterialName(materialDefinition3.getName()); materialInstance6.setCount(2); tousseDefinition3.setMaterialInstances(new ArrayList()); @@ -2165,11 +2170,13 @@ MaterialInstance materialInstance7 = new MaterialInstance(); materialInstance7.setMaterialDefinition(materialDefinition2); materialInstance7.setTousse(tousseDefinition4); + materialInstance7.setMaterialName(materialDefinition2.getName()); materialInstance7.setCount(5); MaterialInstance materialInstance8 = new MaterialInstance(); materialInstance8.setMaterialDefinition(materialDefinition3); materialInstance8.setTousse(tousseDefinition4); + materialInstance8.setMaterialName(materialDefinition3.getName()); materialInstance8.setCount(4); tousseDefinition4.setMaterialInstances(new ArrayList()); @@ -2197,11 +2204,13 @@ MaterialInstance materialInstance9 = new MaterialInstance(); materialInstance9.setMaterialDefinition(materialDefinition4); materialInstance9.setTousse(tousseDefinition5); + materialInstance9.setMaterialName(materialDefinition4.getName()); materialInstance9.setCount(7); MaterialInstance materialInstance10 = new MaterialInstance(); materialInstance10.setMaterialDefinition(materialDefinition5); materialInstance10.setTousse(tousseDefinition5); + materialInstance10.setMaterialName(materialDefinition5.getName()); materialInstance10.setCount(2); tousseDefinition5 @@ -2229,21 +2238,25 @@ MaterialInstance materialInstance11 = new MaterialInstance(); materialInstance11.setMaterialDefinition(materialDefinition4); materialInstance11.setTousse(tousseDefinition6); + materialInstance11.setMaterialName(materialDefinition4.getName()); materialInstance11.setCount(7); MaterialInstance materialInstance12 = new MaterialInstance(); materialInstance12.setMaterialDefinition(materialDefinition5); materialInstance12.setTousse(tousseDefinition6); + materialInstance12.setMaterialName(materialDefinition5.getName()); materialInstance12.setCount(3); MaterialInstance materialInstance13 = new MaterialInstance(); materialInstance13.setMaterialDefinition(materialDefinition6); materialInstance13.setTousse(tousseDefinition6); + materialInstance13.setMaterialName(materialDefinition6.getName()); materialInstance13.setCount(4); MaterialInstance materialInstance14 = new MaterialInstance(); materialInstance14.setMaterialDefinition(materialDefinition7); materialInstance14.setTousse(tousseDefinition6); + materialInstance14.setMaterialName(materialDefinition7.getName()); materialInstance14.setCount(1); tousseDefinition6 @@ -2281,6 +2294,7 @@ MaterialInstance materialInstance100 = new MaterialInstance(); materialInstance100.setMaterialDefinition(materialDefinition2); materialInstance100.setTousse(tousseDefinition7); + materialInstance100.setMaterialName(materialDefinition2.getName()); materialInstance100.setCount(7); tousseDefinition7.setMaterialInstances(new ArrayList());