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

Add timesheet summary box

Browse source 
FEA: ItEr76S28UserDashboard
This commit is contained in:
Manuel Rego Casasnovas 2012-06-06 10:54:29 +02:00
parent 981f1b2425
commit 4d57057d74
2 changed files with 164 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

164
libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java
View file

@ -87,6 +87,18 @@ public class MonthlyTimesheetController extends GenericForwardComposer
private IMessagesForUser messagesForUser;
private Label summaryTotalMonthlyTimesheet;
private Label summaryTotalOther;
private Label summaryTotal;
private Label summaryTotalCapacity;
private Label summaryTotalExtraPerDay;
private Label summaryTotalExtra;
@Resource
private IMonthlyTimesheetController monthlyTimesheetController;
@ -117,6 +129,9 @@ public class MonthlyTimesheetController extends GenericForwardComposer
break;
case EXTRA:
renderExtraRow(row);
// This is the last row so we can load the info in the summary
updateSummary();
break;
default:
throw new IllegalStateException(
@ -181,6 +196,7 @@ public class MonthlyTimesheetController extends GenericForwardComposer
updateExtraRow(date);
updateTotalColumn();
updateTotalExtraColumn();
updateSummary();
}
});
@ -406,46 +422,6 @@ public class MonthlyTimesheetController extends GenericForwardComposer
textbox.setValue(effortDurationToString(totalExtra));
}
private String getTotalRowTextboxId(final OrderElement orderElement) {
return "textbox-total-row" + orderElement.getId();
}
private String getTotalColumnTextboxId(LocalDate date) {
return "textbox-total-column-" + date;
}
private String getTotalTextboxId() {
return "textbox-total";
}
private String getOtherRowTextboxId(final OrderElement orderElement) {
return "textbox-other-row" + orderElement.getId();
}
private String getOtherColumnTextboxId(LocalDate date) {
return "textbox-other-column-" + date;
}
private String getTotalOtherTextboxId() {
return "textbox-other-capacity";
}
private String getCapcityColumnTextboxId(LocalDate date) {
return "textbox-capacity-column-" + date;
}
private String getTotalCapacityTextboxId() {
return "textbox-total-capacity";
}
private String getExtraColumnTextboxId(LocalDate date) {
return "textbox-extra-column-" + date;
}
private String getTotalExtraTextboxId() {
return "textbox-total-extra";
}
private Textbox getDisabledTextbox(String id) {
Textbox textbox = new Textbox();
textbox.setWidth(EFFORT_DURATION_TEXTBOX_WIDTH);
@ -478,22 +454,6 @@ public class MonthlyTimesheetController extends GenericForwardComposer
cell.setStyle("background-color: #FFEEEE");
}
private String effortDurationToString(EffortDuration effort) {
if (effort == null || effort.isZero()) {
return "";
}
return effort.toFormattedString();
}
private EffortDuration effortDurationFromString(String effort) {
if (StringUtils.isBlank(effort)) {
return EffortDuration.zero();
}
return EffortDuration.parseFromFormattedString(effort);
}
};
@Override
@ -685,6 +645,98 @@ public class MonthlyTimesheetController extends GenericForwardComposer
return !monthlyTimesheetModel.isCurrentUser();
}
private static String getTotalRowTextboxId(final OrderElement orderElement) {
return "textbox-total-row" + orderElement.getId();
}
private static String getTotalColumnTextboxId(LocalDate date) {
return "textbox-total-column-" + date;
}
private static String getTotalTextboxId() {
return "textbox-total";
}
private static String getOtherRowTextboxId(final OrderElement orderElement) {
return "textbox-other-row" + orderElement.getId();
}
private static String getOtherColumnTextboxId(LocalDate date) {
return "textbox-other-column-" + date;
}
private static String getTotalOtherTextboxId() {
return "textbox-other-capacity";
}
private static String getCapcityColumnTextboxId(LocalDate date) {
return "textbox-capacity-column-" + date;
}
private static String getTotalCapacityTextboxId() {
return "textbox-total-capacity";
}
private static String getExtraColumnTextboxId(LocalDate date) {
return "textbox-extra-column-" + date;
}
private static String getTotalExtraTextboxId() {
return "textbox-total-extra";
}
private static String effortDurationToString(EffortDuration effort) {
if (effort == null || effort.isZero()) {
return "";
}
return effort.toFormattedString();
}
private static EffortDuration effortDurationFromString(String effort) {
if (StringUtils.isBlank(effort)) {
return EffortDuration.zero();
}
return EffortDuration.parseFromFormattedString(effort);
}
public void updateSummary() {
EffortDuration total = getEffortDurationFromTextbox(getTotalTextboxId());
EffortDuration other = EffortDuration.zero();
if (monthlyTimesheetModel.hasOtherReports()) {
other = getEffortDurationFromTextbox(getTotalOtherTextboxId());
}
EffortDuration capacity = getEffortDurationFromTextbox(getTotalCapacityTextboxId());
EffortDuration extraPerDay = getEffortDurationFromTextbox(getTotalExtraTextboxId());
EffortDuration timesheet = total.minus(other);
EffortDuration extra = EffortDuration.zero();
if (total.compareTo(capacity) > 0) {
extra = total.minus(capacity);
}
if (monthlyTimesheetModel.hasOtherReports()) {
summaryTotalMonthlyTimesheet
.setValue(timesheet.toFormattedString());
summaryTotalOther.setValue(other.toFormattedString());
}
summaryTotal.setValue(total.toFormattedString());
summaryTotalCapacity.setValue(capacity.toFormattedString());
summaryTotalExtraPerDay.setValue(extraPerDay.toFormattedString());
summaryTotalExtra.setValue(extra.toFormattedString());
}
private EffortDuration getEffortDurationFromTextbox(String id) {
return effortDurationFromString(((Textbox) timesheet.getFellow(id))
.getValue());
}
public boolean hasOtherReports() {
return monthlyTimesheetModel.hasOtherReports();
}
}
/**

75
libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul
View file

@ -47,25 +47,62 @@
disabled="@{controller.lastMonth}" />
</div>
<groupbox style="margin-top: 5px" closable="false">
<caption label="${i18n:_('Timesheet data')}" />
<grid fixedLayout="true">
<columns>
<column width="200px" />
<column />
</columns>
<rows>
<row>
<label value="${i18n:_('Date')}" />
<label value="@{controller.date}" />
</row>
<row>
<label value="${i18n:_('Resource')}" />
<label value="@{controller.resource}" />
</row>
</rows>
</grid>
</groupbox>
<hbox>
<groupbox style="margin-top: 5px" closable="false">
<caption label="${i18n:_('Timesheet data')}" />
<grid fixedLayout="true">
<columns>
<column width="200px" />
<column />
</columns>
<rows>
<row>
<label value="${i18n:_('Date')}" />
<label value="@{controller.date}" />
</row>
<row>
<label value="${i18n:_('Resource')}" />
<label value="@{controller.resource}" />
</row>
</rows>
</grid>
</groupbox>
<groupbox style="margin-top: 5px" closable="false">
<caption label="${i18n:_('Timesheet summary')}" />
<grid fixedLayout="true">
<columns>
<column width="200px" />
<column />
</columns>
<rows>
<row visible="@{controller.hasOtherReports}">
<label value="${i18n:_('Total monthly timesheet')}" />
<label id="summaryTotalMonthlyTimesheet" />
</row>
<row visible="@{controller.hasOtherReports}">
<label value="${i18n:_('Total other')}" />
<label id="summaryTotalOther" />
</row>
<row>
<label value="${i18n:_('Total')}" />
<label id="summaryTotal" />
</row>
<row>
<label value="${i18n:_('Total capacity')}" />
<label id="summaryTotalCapacity" />
</row>
<row>
<label value="${i18n:_('Total extra per day')}" />
<label id="summaryTotalExtraPerDay" />
</row>
<row>
<label value="${i18n:_('Total extra')}" />
<label id="summaryTotalExtra" />
</row>
</rows>
</grid>
</groupbox>
</hbox>
<groupbox style="margin-top: 5px" closable="false">
<caption label="${i18n:_('Time tracking')}" />