From 8e742c57ae3c43674c2b5e86912d0d88e1a346c2 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Wed, 6 Jun 2012 13:01:27 +0200
Subject: [PATCH] Add new section for expenses in user dashboard

FEA: ItEr76S28UserDashboard
---
 .../main/webapp/myaccount/_expensesArea.zul   | 37 +++++++++++++++++++
 .../main/webapp/myaccount/_myTasksArea.zul    |  2 +-
 .../main/webapp/myaccount/userDashboard.zul   |  3 ++
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul

diff --git a/libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul b/libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul
new file mode 100644
index 000000000..45be5a316
--- /dev/null
+++ b/libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul
@@ -0,0 +1,37 @@
+<!--
+  This file is part of LibrePlan
+
+  Copyright (C) 2012 Igalia, S.L.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as
+  published by the Free Software Foundation, either version 3 of the
+  License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public
+  License along with this program.  If not, see
+  <http://www.gnu.org/licenses/>.
+ -->
+
+<groupbox>
+    <caption label="${i18n:_('Expenses')}" />
+
+    <grid mold="paging" pageSize="10">
+        <columns sizable="true">
+            <column label="${i18n:_('Description')}" />
+            <column label="${i18n:_('Code')}" />
+            <column label="${i18n:_('Total')}" />
+            <column label="${i18n:_('First expense')}" />
+            <column label="${i18n:_('Last expense')}" />
+            <column label="${i18n:_('Operations')}" />
+        </columns>
+    </grid>
+
+    <button label="${i18n:_('New expense sheet')}" />
+
+</groupbox>
\ No newline at end of file
diff --git a/libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul b/libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul
index ac43980ee..157b2725e 100644
--- a/libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul
+++ b/libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul
@@ -21,7 +21,7 @@
 <groupbox apply="org.libreplan.web.users.dashboard.MyTasksAreaController">
     <caption label="${i18n:_('My tasks')}" />
 
-    <grid id="listing" model="@{controller.tasks}" mold="paging"
+    <grid model="@{controller.tasks}" mold="paging"
         pageSize="10" rowRenderer="@{controller.tasksRenderer}">
         <columns sizable="true">
             <column label="${i18n:_('Name')}"
diff --git a/libreplan-webapp/src/main/webapp/myaccount/userDashboard.zul b/libreplan-webapp/src/main/webapp/myaccount/userDashboard.zul
index 3cb0af540..80059f510 100644
--- a/libreplan-webapp/src/main/webapp/myaccount/userDashboard.zul
+++ b/libreplan-webapp/src/main/webapp/myaccount/userDashboard.zul
@@ -28,6 +28,7 @@
 
 <?component name="my-tasks-area" inline="true" macroURI="_myTasksArea.zul"?>
 <?component name="monthly-timesheets-area" inline="true" macroURI="_monthlyTimesheetsArea.zul"?>
+<?component name="expenses-area" inline="true" macroURI="_expensesArea.zul"?>
 
 <zk>
 
@@ -40,5 +41,7 @@
 
         <monthly-timesheets-area />
 
+        <expenses-area />
+
     </window>
 </zk>