From b218acc5f31e5f1addb16f1755ed0a4e55455368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= Date: Tue, 20 Apr 2010 20:46:45 +0200 Subject: [PATCH] ItEr55S13CUAdministracionMateriaisItEr37S11: Changed the title of the materials list panel according to the selected category --- .../web/materials/MaterialsController.java | 16 ++++++++++++++++ .../src/main/webapp/materials/materials.zul | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java index c2ceaa7c2..096563fd9 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java @@ -66,6 +66,7 @@ import org.zkoss.zul.Treechildren; import org.zkoss.zul.Treeitem; import org.zkoss.zul.TreeitemRenderer; import org.zkoss.zul.Treerow; +import org.zkoss.zul.api.Panel; /** * Controller for {@link Material} materials @@ -93,6 +94,8 @@ public class MaterialsController extends private Component messagesContainer; + private Panel materialsPanel; + private UnitTypeListRenderer unitTypeListRenderer = new UnitTypeListRenderer(); @Override @@ -464,9 +467,22 @@ public class MaterialsController extends public void refreshMaterials() { final List materials = getMaterials(); gridMaterials.setModel(new SimpleListModel(materials)); + refreshMaterialsListTitle(); Util.reloadBindings(gridMaterials); } + private void refreshMaterialsListTitle() { + Treeitem treeitem = categoriesTree.getSelectedItem(); + if (treeitem != null) { + materialsPanel.setTitle(_("List of materials for category: {0}", + ((MaterialCategory) treeitem.getValue()).getName())); + } + else { + materialsPanel.setTitle + (_("List of materials for all categories (select one to filter)")); + } + } + public List getMaterials() { return getMaterials(categoriesTree.getSelectedItem()); } diff --git a/navalplanner-webapp/src/main/webapp/materials/materials.zul b/navalplanner-webapp/src/main/webapp/materials/materials.zul index 5077b0b86..92af282a7 100644 --- a/navalplanner-webapp/src/main/webapp/materials/materials.zul +++ b/navalplanner-webapp/src/main/webapp/materials/materials.zul @@ -71,8 +71,8 @@ - +