From fc0db6ce82112ab2772a24b77b8a4475936944ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= Date: Mon, 25 Jun 2012 13:28:12 +0200 Subject: [PATCH] Revamped component on timesheet lines report to show found tasks information The grid had a lot of duplicated information, only the label with number of tasks and total hours was neccessary. FEA: ItEr76S04BugFixing --- .../WorkReportQueryController.java | 72 ++----------------- .../webapp/workreports/workReportQuery.zul | 34 +++------ 2 files changed, 17 insertions(+), 89 deletions(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java index 54c8df48a..dd989f9a5 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java @@ -3,7 +3,7 @@ * * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2011 Igalia, S.L. + * Copyright (C) 2010-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 @@ -59,7 +59,7 @@ import org.zkoss.zul.Comboitem; import org.zkoss.zul.Constraint; import org.zkoss.zul.Datebox; import org.zkoss.zul.Grid; -import org.zkoss.zul.Row; +import org.zkoss.zul.Label; import org.zkoss.zul.SimpleListModel; import org.zkoss.zul.api.Window; @@ -97,7 +97,7 @@ public class WorkReportQueryController extends GenericForwardComposer { private Grid gridListQuery; - private Grid gridSummary; + private Label gridSummary; private Window listQueryWindow; @@ -193,11 +193,7 @@ public class WorkReportQueryController extends GenericForwardComposer { WorkReportLineSummary summary = new WorkReportLineSummary( totalTasks(workReportLines), totalHours(workReportLines)); - // Remove row if it exists - if (gridSummary.getRows().getFirstChild() != null) { - gridSummary.getRows().getFirstChild().detach(); - } - gridSummary.getRows().appendChild(summary.toRow()); + gridSummary.setValue(summary.toString()); } private Integer totalTasks(List workReportLines) { @@ -355,58 +351,16 @@ public class WorkReportQueryController extends GenericForwardComposer { */ class WorkReportLineSummary { - private Resource resource; - - private OrderElement task; - - private Date startDate; - - private Date finishDate; - - private TypeOfWorkHours hoursType; - - private String type; - private Integer totalTasks; private EffortDuration totalHours; private WorkReportLineSummary(Integer totalTasks, EffortDuration totalHours) { - this.resource = getSelectedResource(); - this.task = getSelectedOrderElement(); - this.startDate = filterStartDateLine.getValue(); - this.finishDate = filterFinishDateLine.getValue(); - this.hoursType = getSelectedHoursType(); - this.type = filterType.getValue(); this.totalTasks = totalTasks; this.totalHours = totalHours; } - public String getResource() { - return resource != null ? resource.getShortDescription() : ""; - } - - public String getTask() { - return task != null ? task.getName() : ""; - } - - public String getStartDate() { - return startDate != null ? startDate.toString() : ""; - } - - public String getFinishDate() { - return finishDate != null ? finishDate.toString() : ""; - } - - public String getHoursType() { - return hoursType != null ? hoursType.getName() : ""; - } - - public String getType() { - return type; - } - public String getTotalTasks() { return totalTasks.toString(); } @@ -415,21 +369,9 @@ public class WorkReportQueryController extends GenericForwardComposer { return totalHours.toFormattedString(); } - public Row toRow() { - Row result = new Row(); - result.appendChild(label(getResource())); - result.appendChild(label(getTask())); - result.appendChild(label(getStartDate())); - result.appendChild(label(getFinishDate())); - result.appendChild(label(getHoursType())); - result.appendChild(label(getType())); - result.appendChild(label(getTotalTasks())); - result.appendChild(label(getTotalHours())); - return result; - } - - private org.zkoss.zul.Label label(String value) { - return new org.zkoss.zul.Label(value); + public String toString() { + return _("Tasks") + " " + getTotalTasks() + ". " + + _("Total hours") + " " + getTotalHours() + "."; } } diff --git a/libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul b/libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul index b6106b338..1771ac32f 100644 --- a/libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul +++ b/libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul @@ -3,7 +3,7 @@ Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e Desenvolvemento Tecnolóxico de Galicia - Copyright (C) 2010-2011 Igalia, S.L. + Copyright (C) 2010-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 @@ -33,14 +33,13 @@ - - - + +
+ -
+ - - - - + + - - - - - - - - - - - - - -