RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed material categories service, updated examples and documentation.

Browse source 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
This commit is contained in:
Manuel Rego Casasnovas 2010-09-18 12:52:55 +02:00
parent 60ec3c11cd
commit 53d22d9af4
5 changed files with 29 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/src/technical/guia-desenvolvemento/guia-integracion-terceiros.rst
View file

@ -372,14 +372,14 @@ Exemplo de ficheiro de importación
<material code="TOR15" description="Tornillos Serie-15" price="123.12" unit-type="10" disabled="false"/>
</material-list>
<children>
<material-category code=20" name="Tornillos Planos" >
<material-category code="20" name="Tornillos Planos" >
<material-list>
<material code="TORP12" description="Tornillos Serie-12" price="123.12" unit-type="10" disabled="false"/>
<material code="TORP13" description="Tornillos Serie-13" price="123.12" unit-type="10" disabled="false"/>
<material code="TORP15" description="Tornillos Serie-15" price="123.12" unit-type="10" disabled="false"/>
</material-list>
</material-category>
<material-category code=23" name="Tornillos Estrella" >
<material-category code="23" name="Tornillos Estrella" >
<material-list>
<material code="TORE12" description="Tornillos Serie-12" price="123.12" unit-type="10" disabled="false"/>
<material code="TORE13" description="Tornillos Serie-13" price="123.12" unit-type="10" disabled="false"/>

2
navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/api/MaterialCategoryDTO.java
View file

@ -43,7 +43,7 @@ public class MaterialCategoryDTO extends IntegrationEntityDTO {
@XmlAttribute
public String parent;
@XmlElement
@XmlElement(name = "children")
public MaterialCategoryListDTO subcategories;
@XmlElementWrapper(name = "material-list")

4
navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/api/MaterialDTO.java
View file

@ -37,10 +37,10 @@ public class MaterialDTO extends IntegrationEntityDTO {
@XmlAttribute
public String description;
@XmlAttribute
@XmlAttribute(name = "price")
public BigDecimal defaultPrice;
@XmlAttribute
@XmlAttribute(name = "unit-type")
public String unitType;
@XmlAttribute

60
scripts/rest-clients/material-categories-sample.xml
View file

@ -1,42 +1,26 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<material-category-list xmlns="http://rest.ws.navalplanner.org">
<material-category name="Imported materials without category"
code="000-000" />
<material-category name="ship hull" code="000-001">
<material-list>
<material disabled="false" unitType="000-002"
defaultPrice="6.00" description="fiberglass"
code="000-002" />
<material disabled="false" defaultPrice="9.50"
description="steel" code="000-003" />
<material disabled="false" unitType="000-006"
defaultPrice="8.00" description="aluminum" code="000-001" />
</material-list>
</material-category>
<material-category name="paint"
code="000-003">
<subcategories>
<material-category parent="000-003"
name="Antifouling"
code="000-003-001">
<material-list>
<material disabled="false" defaultPrice="7.50"
description="autopulimentante de alto rendimiento"
code="000-004" />
<material disabled="false" defaultPrice="5.60"
description="High Performance autopulimentante"
code="000-005" />
</material-list>
</material-category>
<material-category parent="000-003"
name="GelCoat" code="000-003-002">
<material-list>
<material disabled="false" defaultPrice="0.00"
description="polyester finish" code="000-006" />
<material disabled="false" defaultPrice="0.00"
description="polyester finish with gun" code="000-007" />
</material-list>
</material-category>
</subcategories>
<material-category code="10" name="Screws" >
<material-list>
<material code="SCREW12" description="Screws Serie-12" price="123.12" unit-type="10" disabled="false"/>
<material code="SCREW13" description="Screws Serie-13" price="123.12" unit-type="10" disabled="false"/>
<material code="SCREW15" description="Screws Serie-15" price="123.12" unit-type="10" disabled="false"/>
</material-list>
<children>
<material-category code="20" name="Slotted Screws" >
<material-list>
<material code="SCREWS12" description="Screws Serie-12" price="123.12" unit-type="10" disabled="false"/>
<material code="SCREWS13" description="Screws Serie-13" price="123.12" unit-type="10" disabled="false"/>
<material code="SCREWS15" description="Screws Serie-15" price="123.12" unit-type="10" disabled="false"/>
</material-list>
</material-category>
<material-category code="23" name="Phillips Screws" >
<material-list>
<material code="SCREWP12" description="Screws Serie-12" price="123.12" unit-type="10" disabled="false"/>
<material code="SCREWP13" description="Screws Serie-13" price="123.12" unit-type="10" disabled="false"/>
<material code="SCREWP15" description="Screws Serie-15" price="123.12" unit-type="10" disabled="true"/>
</material-list>
</material-category>
</children>
</material-category>
</material-category-list>

2
scripts/rest-clients/unit-types-sample.xml
View file

@ -9,6 +9,8 @@
<unit-type measure="m3" code="000-007" />
<unit-type measure="tn" code="000-008" />
<unit-type measure="box" code="10" />
<!-- code repeated -->
<unit-type measure="m1" code="000-001" />
<!-- without code -->