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

Fix align issues due to colspan in the first column of capacity and total rows

Browse source 
FEA: ItEr76S28UserDashboard
This commit is contained in:
Manuel Rego Casasnovas 2012-05-29 12:52:13 +02:00
parent 6b01da1240
commit f1be35c432
1 changed files with 29 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -155,12 +155,7 @@ public class MonthlyTimesheetController extends GenericForwardComposer
}
private void appendTotalColumn(Row row, final OrderElement orderElement) {
Textbox textbox = new Textbox();
textbox.setWidth(EFFORT_DURATION_TEXTBOX_WIDTH);
textbox.setId(getTotalColumnTextboxId(orderElement));
textbox.setDisabled(true);
row.appendChild(textbox);
row.appendChild(getDisabledTextbox(getTotalColumnTextboxId(orderElement)));
updateTotalColumn(orderElement);
}
@ -190,16 +185,19 @@ public class MonthlyTimesheetController extends GenericForwardComposer
private void appendTotalForDays(Row row) {
for (LocalDate day = start; day.compareTo(end) <= 0; day = day
.plusDays(1)) {
Textbox textbox = new Textbox();
textbox.setWidth(EFFORT_DURATION_TEXTBOX_WIDTH);
textbox.setId(getTotalRowTextboxId(day));
textbox.setDisabled(true);
row.appendChild(textbox);
row.appendChild(getCenteredCell(getDisabledTextbox(getTotalRowTextboxId(day))));
updateTotalRow(day);
}
}
private Textbox getDisabledTextbox(String id) {
Textbox textbox = new Textbox();
textbox.setWidth(EFFORT_DURATION_TEXTBOX_WIDTH);
textbox.setId(id);
textbox.setDisabled(true);
return textbox;
}
private String getTotalRowTextboxId(LocalDate date) {
return "textbox-total-row-" + date;
}
@ -212,12 +210,7 @@ public class MonthlyTimesheetController extends GenericForwardComposer
}
private void appendTotalColumn(Row row) {
Textbox textbox = new Textbox();
textbox.setWidth(EFFORT_DURATION_TEXTBOX_WIDTH);
textbox.setId(getTotalTextboxId());
textbox.setDisabled(true);
row.appendChild(textbox);
row.appendChild(getAlignLeftCell(getDisabledTextbox(getTotalTextboxId())));
updateTotalColumn();
}
@ -244,12 +237,28 @@ public class MonthlyTimesheetController extends GenericForwardComposer
.plusDays(1)) {
EffortDuration capacity = monthlyTimesheetModel
.getResourceCapacity(day);
Util.appendLabel(row, capacity.toFormattedString());
row.appendChild(getCenteredCell(new Label(capacity
.toFormattedString())));
totalCapacity = totalCapacity.plus(capacity);
}
Util.appendLabel(row, totalCapacity.toFormattedString());
row.appendChild(getAlignLeftCell(new Label(totalCapacity
.toFormattedString())));
}
private Cell getCenteredCell(Component component) {
Cell cell = new Cell();
cell.setAlign("center");
cell.appendChild(component);
return cell;
}
private Cell getAlignLeftCell(Component component) {
Cell cell = new Cell();
cell.setAlign("left");
cell.appendChild(component);
return cell;
}
};