RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show summary of filtered results

Browse source 
FEA: ItEr76S29WorkReports
This commit is contained in:
Diego Pino 2012-05-29 10:19:36 +02:00
parent f9014bb1c7
commit ae77a1b388
2 changed files with 141 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

124
libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java
View file

@ -133,6 +133,8 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
private ListModel allHoursType;
private List<WorkReportLine> filterWorkReportLines = new ArrayList<WorkReportLine>();
private final static String MOLD = "paging";
private final static int PAGING = 10;
@ -161,6 +163,8 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
private Grid gridListQuery;
private Grid gridSummary;
private Autocomplete filterResource;
private Datebox filterStartDateLine;
@ -695,6 +699,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
private void loadComponentslistLines(Component window) {
gridListQuery = (Grid) window.getFellow("gridListQuery");
gridSummary = (Grid) window.getFellow("gridSummary");
filterResource = (Autocomplete) window.getFellow("filterResource");
filterStartDateLine = (Datebox) window.getFellow("filterStartDateLine");
filterFinishDateLine = (Datebox) window
@ -1586,7 +1591,35 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
*/
public List<WorkReportLine> getQueryWorkReportLines() {
return workReportModel.getAllWorkReportLines();
List<WorkReportLine> result = workReportModel.getAllWorkReportLines();
updateSummary(result);
return result;
}
private void updateSummary() {
updateSummary(filterWorkReportLines);
}
private void updateSummary(List<WorkReportLine> workReportLines) {
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());
}
private Integer totalTasks(List<WorkReportLine> workReportLines) {
return Integer.valueOf(workReportLines.size());
}
private EffortDuration totalHours(List<WorkReportLine> workReportLines) {
EffortDuration result = EffortDuration.zero();
for (WorkReportLine each: workReportLines) {
result = result.sum(result, each.getEffort());
}
return result;
}
public void sortQueryWorkReportLines() {
@ -1614,6 +1647,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
public void onApplyFilterWorkReportLines(Event event) {
createPredicateLines();
filterByPredicateLines();
updateSummary();
}
private void createPredicateLines() {
@ -1678,11 +1712,12 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
}
private void filterByPredicateLines() {
List<WorkReportLine> filterWorkReportLines = new ArrayList<WorkReportLine>();
filterWorkReportLines.clear();
for (IPredicate each : predicates) {
filterWorkReportLines.addAll(workReportModel
.getFilterWorkReportLines(each));
}
// refreshWorkReportLines();
gridListQuery.setModel(new SimpleListModel(filterWorkReportLines
.toArray()));
gridListQuery.invalidate();
@ -1787,4 +1822,89 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
reloadWorkReportLines();
}
/**
*
* @author Diego Pino García <dpino@igalia.com>
*
*/
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();
}
public String getTotalHours() {
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);
}
}
}

19
libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul
View file

@ -73,6 +73,7 @@
</panelchildren>
</panel>
<separator bar="false" spacing="20px" orient="horizontal"/>
<grid id="gridListQuery" mold="paging" pageSize="15"
model="@{controller.queryWorkReportLines}"
onInitRender ="controller.sortQueryWorkReportLines();"
@ -120,6 +121,24 @@
</row>
</rows>
</grid>
<separator bar="false" spacing="20px" orient="horizontal"/>
<grid id="gridSummary">
<columns>
<column label="${i18n:_('Resource')}" align="center"/>
<column label="${i18n:_('Task')}" align="center"/>
<column label="${i18n:_('From')}" align="center"/>
<column label="${i18n:_('To')}" align="center"/>
<column label="${i18n:_('Hours type')}" align="center"/>
<column label="${i18n:_('Type')}" align="center"/>
<column label="${i18n:_('Total tasks')}" align="center"/>
<column label="${i18n:_('Total hours')}" align="center"/>
</columns>
<rows>
</rows>
</grid>
</window>
<window id="createWindow" title="${i18n:_('Edit work report')}">