Author: bpoussin Date: 2012-06-22 18:07:34 +0200 (Fri, 22 Jun 2012) New Revision: 185 Url: http://chorem.org/repositories/revision/chorem/185 Log: amelioration dashboard (mais toujours pas fini) Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp trunk/chorem-webmotion/src/main/webapp/css/chorem.less Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-06-22 16:07:13 UTC (rev 184) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-06-22 16:07:34 UTC (rev 185) @@ -731,7 +731,7 @@ WikittyQueryResultTreeNode<Category> treeResults = client.findTreeNode(Category.class, c.getWikittyId(), Integer.MAX_VALUE, false, null); if (treeResults != null) { - CollectionUtils.addAll(categoriesTree, treeResults.iterator()); + CollectionUtils.addAll(categoriesTree, treeResults.preorderEnumeration()); } } Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp 2012-06-22 16:07:13 UTC (rev 184) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp 2012-06-22 16:07:34 UTC (rev 185) @@ -13,6 +13,7 @@ <table class="table table-striped table-bordered table-condensed"> <thead> <tr> + <th>Category</th> <c:forEach var="d" items="${dates}"> <th>${d}</th> </c:forEach> @@ -21,13 +22,11 @@ <tbody> <c:forEach var="c" items="${categoriesTree}"> <tr> - <td class="level${c.level}">${c.userObject}</td> - </tr> - <tr> + <td><span class="level level${c.level}" level="${c.level}">${c.userObject}</span></td> <c:forEach var="d" items="${dates}"> - <td>${values.get(d).get(c.userObject)}</td> + <td><span>${values.get(d).get(c.userObject)}</span></td> </c:forEach> </tr> - </tbody> - </c:forEach> + </c:forEach> + </tbody> </table> Modified: trunk/chorem-webmotion/src/main/webapp/css/chorem.less =================================================================== --- trunk/chorem-webmotion/src/main/webapp/css/chorem.less 2012-06-22 16:07:13 UTC (rev 184) +++ trunk/chorem-webmotion/src/main/webapp/css/chorem.less 2012-06-22 16:07:34 UTC (rev 185) @@ -17,3 +17,24 @@ color: rgba(82, 168, 236, 0.796875); font-weight: bolder; } + +.categorylevel (@level) { + margin-left: @level * 10px; +} + +span.level1 { + .categorylevel (1); +} +span.level2 { + .categorylevel (2); +} +span.level3 { + .categorylevel (3); +} +span.level4 { + .categorylevel (4); +} +span.level5 { + .categorylevel (5); +} +