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

Bug #1351: Replaced by a label the disabled listbox to display material unit type

Browse source 
FEA: ItEr76S04BugFixing
This commit is contained in:
Lorenzo Tilve Álvaro 2012-01-30 16:38:36 +01:00
parent ff3bdbc05e
commit dde910ff8d
3 changed files with 21 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsModel.java
View file

@ -104,6 +104,7 @@ public abstract class AssignedMaterialsModel<T, A> implements
private void initializeMaterial(Material material) {
material.getDescription();
material.getCategory().getName();
material.getUnitType().getMeasure();
}
@Transactional(readOnly = true)

21
libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul
View file

@ -23,30 +23,27 @@
sizedByContent="true"
model="@{assignedMaterialsController.assignedMaterials}">
<columns width="100%">
<newdatasortablecolumn label="${i18n:_('Code')}" hflex="1" />
<newdatasortablecolumn label="${i18n:_('Code')}" />
<newdatasortablecolumn label="${i18n:_('Name')}" hflex="1" />
<newdatasortablecolumn label="${i18n:_('Receipt date')}" />
<newdatasortablecolumn label="${i18n:_('Units')}" />
<newdatasortablecolumn label="${i18n:_('Unit type')}" />
<newdatasortablecolumn label="${i18n:_('Unit type')}" align="center" />
<newdatasortablecolumn label="${i18n:_('Unit price')}" />
<newdatasortablecolumn label="${i18n:_('Total price')}" />
<newdatasortablecolumn label="${i18n:_('Category')}" hflex="1"/>
<newdatasortablecolumn label="${i18n:_('Status')}" />
<newdatasortablecolumn label="${i18n:_('Op.')}" />
</columns>
<rows>
<row self="@{each='assignedMaterial'}" value="@{assignedMaterial}">
<row self="@{each='assignedMaterial'}" value="@{assignedMaterial}" tooltiptext="@{assignedMaterial.material.category.name}">
<label value="@{assignedMaterial.material.code}" hflex="true" />
<label value="@{assignedMaterial.material.description}" hflex="true" />
<datebox value="@{assignedMaterial.estimatedAvailability}" />
<doublebox value="@{assignedMaterial.units}"
onChange="assignedMaterialsController.updateTotalPrice(self.parent)" />
<listbox mold="select" model="@{assignedMaterialsController.unitTypes}"
onSelect = "assignedMaterialsController.selectUnitType(self)"
itemRenderer="@{assignedMaterialsController.renderer}"
disabled="true"/>
onChange="assignedMaterialsController.updateTotalPrice(self.parent)" style="text-align:right" />
<label value="@{assignedMaterial.material.unitType.measure}"/>
<doublebox value="@{assignedMaterial.unitPrice}"
onChange="assignedMaterialsController.updateTotalPrice(self.parent)" />
<doublebox value="@{assignedMaterial.totalPrice}" disabled="${true}"/>
<label value="@{assignedMaterial.material.category.name}" />
onChange="assignedMaterialsController.updateTotalPrice(self.parent)" style="text-align:right" />
<doublebox value="@{assignedMaterial.totalPrice}" style="text-align:right" disabled="true" />
<listbox mold="select" model="@{materialStatus}"
selectedItem="@{assignedMaterial.status}"
itemRenderer="org.libreplan.web.common.EnumsListitemRenderer" />

28
libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul
View file

@ -47,9 +47,9 @@
width="280px" rows="10" vflex="true" multiple="false"
onSelect="assignedMaterialsController.refreshMaterialAssigments()">
<treecols>
<treecol label="Name" />
<treecol label="Units" width="50px" />
<treecol label="Price" width="50px" />
<treecol label="Name" hflex="1"/>
<treecol label="Units" width="50" />
<treecol label="Price" width="50" />
</treecols>
</tree>
</panelchildren>
@ -59,11 +59,9 @@
<groupbox style="margin-top: 5px" closable="false">
<caption label="${i18n:_('Required materials')}" />
<button label="${i18n:_('Add materials')}" style="margin-bottom: 5px"
onClick="materialsAccordion.setSelectedIndex(1);" />
<!-- Materials -->
<vbox id="assignmentsBox" width="100%">
</vbox>
@ -74,22 +72,23 @@
<tabpanel>
<!-- Material search -->
<hbox width="100%" hflex="1">
<hbox>
<!-- Categories -->
<panel title="${i18n:_('Categories')}" border="normal">
<panel title="${i18n:_('Categories')}" border="normal" width="280px">
<panelchildren>
<toolbarbutton style="text-decoration: none" label="${i18n:_('Unselect')}"
onClick="assignedMaterialsController.clearSelectionAllCategoriesTree()" />
<tree id="allCategoriesTree" width="100%" rows="10" vflex="true" hflex="true" multiple="false">
<tree id="allCategoriesTree" rows="10" vflex="true" multiple="false"
sizedByContent="false">
<treecols>
<treecol label="Name" width="250px" hflex="true"/>
<treecol label="Name" hflex="1" />
</treecols>
</tree>
</panelchildren>
</panel>
<!-- Found materials -->
<panel title="${i18n:_('Materials')}" border="normal">
<panel title="${i18n:_('Available materials')}" border="normal" hflex="1">
<panelchildren>
<!-- Search textbox -->
@ -111,17 +110,12 @@
<listheader label="${i18n:_('Name')}" width="100px" hflex="1"/>
<listheader label="${i18n:_('Unit type')}" width="70px" />
<listheader label="${i18n:_('Unit price')}" width="70px"/>
<listheader label="${i18n:_('Category')}" width="100px"/>
<listheader label="${i18n:_('Category')}" width="120px"/>
</listhead>
<listitem self="@{each='material'}" value="@{material}">
<listcell label="@{material.code}" />
<listcell label="@{material.description}" />
<listcell>
<listbox mold="select" model="@{assignedMaterialsController.unitTypes}"
onSelect = "assignedMaterialsController.selectUnitType(self)"
itemRenderer="@{assignedMaterialsController.renderer}"
disabled="true"/>
</listcell>
<listcell label="@{material.unitType.measure}" />
<listcell label="@{material.defaultUnitPrice}" />
<listcell label="@{material.category.name}" />
</listitem>