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

Merge pull request #20 from mvanmiddelkoop/PersonalDashboard-TasklistEnhancements

Browse source 
PersonalDashboard TasklistEnhancements
This commit is contained in:
Jeroen Baten 2015-04-01 15:50:54 +02:00
commit 69fbbeee15
3 changed files with 74 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaController.java
View file

@ -58,22 +58,28 @@ public class MyTasksAreaController extends GenericForwardComposer {
@Override
public void render(Row row, Object data) throws Exception {
// MvanMiddelkoop feb 2015 - changed columns: added total budgeted
// hours for resource, added Notes, removed Code (not of any use,
// technical code)
Task task = (Task) data;
row.setValue(task);
Util.appendLabel(row, task.getName());
OrderElement orderElement = task.getOrderElement();
Util.appendLabel(row, orderElement.getCode());
Util.appendLabel(row, orderElement.getOrder().getName());
Util.appendLabel(row, task.getName());
Util.appendLabel(row, orderElement.getDescription());
Util.appendLabel(row, task.getStartAsLocalDate().toString());
Util.appendLabel(row, task.getEndAsLocalDate().toString());
Util.appendLabel(row, getProgress(orderElement));
Util.appendLabel(
row,
_("{0} h", task.getSumOfAssignedEffort()
.toHoursAsDecimalWithScale(0).toString()));
Util.appendLabel(row, _("{0} h", orderElement.getEffortAsString()));
Util.appendLabel(row, getProgress(orderElement));
appendTimeTrackingButton(row, task);
}

55
libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaModel.java
View file

@ -24,6 +24,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import org.joda.time.LocalDate;
import org.libreplan.business.advance.entities.AdvanceMeasurement;
import org.libreplan.business.advance.entities.DirectAdvanceAssignment;
import org.libreplan.business.common.daos.IConfigurationDAO;
@ -39,6 +40,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/* mvanmiddelkoop jan 2015 - to use from and to date in tasks */
/**
* Model for for "My tasks" area in the user dashboard window
@ -66,23 +68,61 @@ public class MyTasksAreaModel implements IMyTasksAreaModel {
return new ArrayList<Task>();
}
/*
* mvanmiddelkoop jan 2015 - Tasks from <settings> months ago to
* <settings> month ahead
*/
LocalDate myTodayDate = LocalDate.now();
int since = 1;
if (user.getResourcesLoadFilterPeriodSince() != null) {
since = user.getResourcesLoadFilterPeriodSince();
}
int to = 3;
if (user.getResourcesLoadFilterPeriodTo() != null) {
to = user.getResourcesLoadFilterPeriodTo();
}
List<SpecificResourceAllocation> resourceAllocations = resourceAllocationDAO
.findSpecificAllocationsRelatedTo(scenarioManager.getCurrent(),
UserDashboardUtil.getBoundResourceAsList(user), null,
null);
UserDashboardUtil.getBoundResourceAsList(user),
myTodayDate.minusMonths(since),
myTodayDate.plusMonths(to));
List<Task> tasks = new ArrayList<Task>();
for (SpecificResourceAllocation each : resourceAllocations) {
Task task = each.getTask();
forceLoad(task);
tasks.add(task);
if (task != null) {
forceLoad(task);
/* mvanmiddelkoop jan 2015 - show only unfinished tasks */
if (task.getAdvancePercentage().intValue() < 1) {
tasks.add(task);
}
}
}
sortTasksDescendingByStartDate(tasks);
/*
* mvanmiddelkoop jan 2015 - Sort Ascending instead of Descending
* sortTasksDescendingByStartDate(tasks);
*/
sortTasksAscendingByStartDate(tasks);
return tasks;
}
/* mvanmiddelkoop jan 2015 - Sort Ascending instead of Descending */
private void sortTasksAscendingByStartDate(List<Task> tasks) {
Collections.sort(tasks, new Comparator<Task>() {
@Override
public int compare(Task o1, Task o2) {
return o1.getIntraDayStartDate().compareTo(
o2.getIntraDayStartDate());
}
});
}
private void sortTasksDescendingByStartDate(List<Task> tasks) {
Collections.sort(tasks, new Comparator<Task>() {
@ -106,6 +146,11 @@ public class MyTasksAreaModel implements IMyTasksAreaModel {
advanceMeasurement.getValue();
}
}
// MvanMiddelkoop feb 2015 - to show the budgeted hours, prevent
// LazyLoad errors
task.getSumOfAssignedEffort();
task.getOrderElement().getDescription();
}
@Override

20
libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul
View file

@ -24,21 +24,25 @@
<grid model="@{controller.tasks}" mold="paging" sclass="clickable-rows"
pageSize="10" rowRenderer="@{controller.tasksRenderer}">
<columns sizable="true">
<column label="${i18n:_('Name')}"
sort="auto(name)" />
<column label="${i18n:_('Code')}"
sort="auto(orderElement.code)" />
<!-- MvanMiddelkoop feb 2015 - changed columns, added description and budgeted hours -->
<column label="${i18n:_('Project')}"
sort="auto(orderElement.order.name)" />
<column width="200px" label="${i18n:_('Task')}"
sort="auto(task.name)" />
<column width="300px" label="${i18n:_('Description')}"
sort="auto(orderElement.description)" />
<column label="${i18n:_('Start date')}"
sort="auto(startDate)"
sortDirection="descending" />
sort="auto(startDate)"/>
<!-- MvanMiddelkoop feb 2015 - changed sorting to ascending
sortDirection="descending" /-->
<column label="${i18n:_('End date')}"
sort="auto(endDate)" />
<column label="${i18n:_('Progress')}"
sort="auto(orderElement.advancePercentage)" />
<column label="${i18n:_('Work budgeted')}"
sort="auto(task.sumOfAssignedEffort)" />
<column label="${i18n:_('Work done')}"
sort="auto(orderElement.sumChargedEffort.totalChargedEffort)" />
<column label="${i18n:_('Progress')}"
sort="auto(orderElement.advancePercentage)" />
<column label="${i18n:_('Operations')}" />
</columns>
</grid>