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

ItEr42S17CUGravacionModelosUnidadesTraballoItEr41S20: Extracting assigmnets table part

Browse source
This commit is contained in:
Óscar González Fernández 2010-01-07 12:55:23 +01:00
parent 5b3ede6df1
commit a85669b7ca
3 changed files with 56 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsToOrderElementController.java
View file

@ -58,6 +58,7 @@ import org.zkoss.zul.Treecell;
import org.zkoss.zul.Treeitem;
import org.zkoss.zul.TreeitemRenderer;
import org.zkoss.zul.Treerow;
import org.zkoss.zul.Vbox;
import org.zkoss.zul.api.Textbox;
import org.zkoss.zul.impl.MessageboxDlg;
@ -86,10 +87,14 @@ public class AssignedMaterialsToOrderElementController extends
private Tab tbAssignedMaterials;
private Vbox assignmentsBox;
@Override
public void doAfterCompose(Component comp) throws Exception {
super.doAfterCompose(comp);
comp.setVariable("assignedMaterialsController", this, true);
Executions.createComponents("/orders/_assignmentsBox.zul",
assignmentsBox, new HashMap<String, String>());
}
public void openWindow(OrderElement orderElement) {

50
navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul Normal file
View file

@ -0,0 +1,50 @@
<panel title="${i18n:_('Materials')}" border="normal">
<panelchildren>
<newdatasortablegrid id="gridMaterials"
fixedLayout="false"
model="@{assignedMaterialsController.assignedMaterials}">
<columns>
<newdatasortablecolumn label="${i18n:_('Code')}" />
<newdatasortablecolumn label="${i18n:_('Date')}" />
<newdatasortablecolumn label="${i18n:_('Units')}" />
<newdatasortablecolumn label="${i18n:_('Unit type')}" />
<newdatasortablecolumn label="${i18n:_('Unit price')}" />
<newdatasortablecolumn label="${i18n:_('Total price')}" />
<newdatasortablecolumn label="${i18n:_('Category')}" />
<newdatasortablecolumn label="${i18n:_('Status')}" />
<newdatasortablecolumn label="" />
</columns>
<rows>
<row self="@{each='assignedMaterial'}" value="@{assignedMaterial}">
<textbox value="@{assignedMaterial.material.code}"
constraint="no empty:${i18n:_('cannot be null or empty')}"
readonly="true" />
<datebox value="@{assignedMaterial.estimatedAvailability}" />
<doublebox value="@{assignedMaterial.units}"
onChange="assignedMaterialsController.updateTotalPrice(self.parent)" />
<listbox mold="select" model="@{unitTypes}"
selectedItem="@{assignedMaterial.material.unitType}" disabled="true" />
<doublebox value="@{assignedMaterial.unitPrice}"
onChange="assignedMaterialsController.updateTotalPrice(self.parent)" />
<doublebox value="@{assignedMaterial.totalPrice}"
onChange="assignedMaterialsController.updateUnitPrice(self.parent)" />
<label value="@{assignedMaterial.material.category.name}" width="150px" />
<listbox mold="select" model="@{materialStatus}"
selectedItem="@{assignedMaterial.status}"/>
<hbox>
<button sclass="icono"
image="/common/img/ico_borrar1.png"
hoverImage="/common/img/ico_borrar.png"
tooltiptext="${i18n:_('Delete')}"
onClick="assignedMaterialsController.showRemoveMaterialAssignmentDlg(self.parent.parent.value)">
</button>
<button label="${i18n:_('Split')}"
tooltiptext="${i18n:_('Split assignment')}"
onClick="assignedMaterialsController.showSplitMaterialAssignmentDlg(self.parent.parent.value)">
</button>
</hbox>
</row>
</rows>
</newdatasortablegrid>
</panelchildren>
</panel>

53
navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul
View file

@ -60,58 +60,7 @@
</vbox>
<!-- Materials -->
<vbox>
<panel title="${i18n:_('Materials')}"
border="normal">
<panelchildren>
<newdatasortablegrid id="gridMaterials"
fixedLayout="false"
model="@{assignedMaterialsController.assignedMaterials}">
<columns>
<newdatasortablecolumn label="${i18n:_('Code')}" />
<newdatasortablecolumn label="${i18n:_('Date')}" />
<newdatasortablecolumn label="${i18n:_('Units')}" />
<newdatasortablecolumn label="${i18n:_('Unit type')}" />
<newdatasortablecolumn label="${i18n:_('Unit price')}" />
<newdatasortablecolumn label="${i18n:_('Total price')}" />
<newdatasortablecolumn label="${i18n:_('Category')}" />
<newdatasortablecolumn label="${i18n:_('Status')}" />
<newdatasortablecolumn label="" />
</columns>
<rows>
<row self="@{each='assignedMaterial'}" value="@{assignedMaterial}">
<textbox value="@{assignedMaterial.material.code}"
constraint="no empty:${i18n:_('cannot be null or empty')}"
readonly="true" />
<datebox value="@{assignedMaterial.estimatedAvailability}" />
<doublebox value="@{assignedMaterial.units}"
onChange="assignedMaterialsController.updateTotalPrice(self.parent)" />
<listbox mold="select" model="@{unitTypes}"
selectedItem="@{assignedMaterial.material.unitType}" disabled="true" />
<doublebox value="@{assignedMaterial.unitPrice}"
onChange="assignedMaterialsController.updateTotalPrice(self.parent)" />
<doublebox value="@{assignedMaterial.totalPrice}"
onChange="assignedMaterialsController.updateUnitPrice(self.parent)" />
<label value="@{assignedMaterial.material.category.name}" width="150px" />
<listbox mold="select" model="@{materialStatus}"
selectedItem="@{assignedMaterial.status}"/>
<hbox>
<button sclass="icono"
image="/common/img/ico_borrar1.png"
hoverImage="/common/img/ico_borrar.png"
tooltiptext="${i18n:_('Delete')}"
onClick="assignedMaterialsController.showRemoveMaterialAssignmentDlg(self.parent.parent.value)">
</button>
<button label="${i18n:_('Split')}"
tooltiptext="${i18n:_('Split assignment')}"
onClick="assignedMaterialsController.showSplitMaterialAssignmentDlg(self.parent.parent.value)">
</button>
</hbox>
</row>
</rows>
</newdatasortablegrid>
</panelchildren>
</panel>
<vbox id="assignmentsBox">
</vbox>
</hbox>
</tabpanel>