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

Merge pull request #25 from lmann99/add-start-end-dates-to-weekly-personal-timesheet-dashboard

Browse source 
Add day of week to personal timesheet date display
This commit is contained in:
lmann99 2017-02-05 12:10:20 -05:00 • committed by GitHub
commit b7fd49b881
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetDTO.java
View file

@ -35,8 +35,14 @@ import org.libreplan.business.workreports.entities.WorkReport;
*/
public class PersonalTimesheetDTO {
private static final String d_Y_PATTERN = "d Y";
private static final String MMMM_d_PATTERN = "MMMM d";
private static final String MMMM_Y_PATTERN = "MMMM y";
private static final String MMMM_d_Y_PATTERN = "MMMM d y";
private LocalDate date;
private WorkReport workReport;
@ -108,20 +114,20 @@ public class PersonalTimesheetDTO {
String string = date.toString("w");
if (start.getMonthOfYear() == end.getMonthOfYear()) {
string += " (" + date.toString(MMMM_Y_PATTERN) + ")";
string += " (" + start.toString(MMMM_d_PATTERN) + " - " + end.toString(d_Y_PATTERN) + ")";
} else {
if (start.getYear() == end.getYear()) {
string += " (" + start.toString("MMMM") + " - " + end.toString(MMMM_Y_PATTERN) + ")";
string += " (" + start.toString(MMMM_d_PATTERN) + " - " + end.toString(MMMM_d_Y_PATTERN) + ")";
} else {
string += " (" + start.toString(MMMM_Y_PATTERN) + " - " + end.toString(MMMM_Y_PATTERN) + ")";
string += " (" + start.toString(MMMM_d_Y_PATTERN) + " - " + end.toString(MMMM_d_Y_PATTERN) + ")";
}
}
return _("Week {0}", string);
case TWICE_MONTHLY:
return (date.getDayOfMonth() <= 15)
? _("{0} 1st fortnight", date.toString(MMMM_Y_PATTERN))
: _("{0} 2nd fortnight", date.toString(MMMM_Y_PATTERN));
? _("{0} 1st fortnight", date.toString(MMMM_d_Y_PATTERN))
: _("{0} 2nd fortnight", date.toString(MMMM_d_Y_PATTERN));
case MONTHLY:
default: