From 4408f965d14898939cd0ca15346d5efd6b4db343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= Date: Thu, 6 Jun 2013 19:17:56 +0200 Subject: [PATCH] Added empty cell renderer to criterion to include the cost category FEA: ItEr77S17AutomaticBudgeting --- .../web/resources/criterion/CriterionTreeController.java | 6 ++++++ .../main/webapp/resources/criterions/_criterionsTree.zul | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java index a13ee6662..d50c95829 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java @@ -179,6 +179,11 @@ public class CriterionTreeController extends GenericForwardComposer { tr.setDraggable("true"); tr.setDroppable("true"); + // Treecell with the code of the Criterion + Treecell cellForCostCategory = new Treecell(); + Textbox costCategoryLabel = new Textbox("Cost category combo"); + cellForCostCategory.appendChild(costCategoryLabel); + // Treecell with the code of the Criterion Treecell cellForCode = new Treecell(); cellForCode.setStyle("center"); @@ -200,6 +205,7 @@ public class CriterionTreeController extends GenericForwardComposer { })); cellForName.setParent(tr); + cellForCostCategory.setParent(tr); cellForCode.setParent(tr); cellForActive.setParent(tr); diff --git a/libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul b/libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul index 665cef39c..6887a1e8a 100644 --- a/libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul +++ b/libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul @@ -39,7 +39,8 @@ sclass="orderTree" fixedLayout="true" mold="paging"> - + +