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

ItEr35S14CUAdministracionMateriaisItEr34S14: Substitute material grid for sortable grid

Browse source
This commit is contained in:
Diego Pino Garcia 2009-11-23 10:47:10 +01:00 • committed by Javier Moran Rua
parent f03ef91542
commit 4bfe05639d
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/Material.java
View file

@ -32,7 +32,7 @@ import org.navalplanner.business.common.BaseEntity;
* @author Jacobo Aragunde Perez <jaragunde@igalia.com>
*
*/
public class Material extends BaseEntity {
public class Material extends BaseEntity implements Comparable {
@NotNull
@NotEmpty
@ -110,4 +110,11 @@ public class Material extends BaseEntity {
this.unitType = unitType;
}
@Override
public int compareTo(Object arg0) {
final Material material = (Material) arg0;
return code.compareTo(material.getCode());
}
}

16
navalplanner-webapp/src/main/webapp/materials/materials.zul
View file

@ -73,16 +73,16 @@
<panelchildren>
<button label="${i18n:_('Add')}"
onClick="materialsController.addMaterialToMaterialCategory(categoriesTree.selectedItem)" />
<grid id="gridMaterials"
<newdatasortablegrid id="gridMaterials"
fixedLayout="true"
model="@{materialsController.materials}">
<columns>
<column label="${i18n:_('Code')}" />
<column label="${i18n:_('Description')}" />
<column label="${i18n:_('Unit price')}" />
<column label="${i18n:_('Unit type')}" />
<column label="${i18n:_('Disabled')}" />
<column label="" />
<newdatasortablecolumn label="${i18n:_('Code')}" />
<newdatasortablecolumn label="${i18n:_('Description')}" />
<newdatasortablecolumn label="${i18n:_('Unit price')}" />
<newdatasortablecolumn label="${i18n:_('Unit type')}" />
<newdatasortablecolumn label="${i18n:_('Disabled')}" />
<newdatasortablecolumn label="" />
</columns>
<rows>
<row self="@{each='material'}" value="@{material}">
@ -101,7 +101,7 @@
</button>
</row>
</rows>
</grid>
</newdatasortablegrid>
</panelchildren>
</panel>