From 0f0aab3a557fe2d39b992e2a5c72a430800a5e02 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Mon, 27 Aug 2012 13:21:39 +0200 Subject: [PATCH] Rename monthly timesheets to personal timesheets in the UI FEA: ItEr77S07PersonalTimesheetsPeriodictyConfiguration --- .../business/costcategories/entities/TypeOfWorkHours.java | 2 +- .../business/workreports/entities/WorkReport.java | 6 +++--- .../web/users/dashboard/MonthlyTimesheetController.java | 8 ++++---- .../web/users/dashboard/UserDashboardController.java | 2 +- .../web/workreports/WorkReportCRUDController.java | 2 +- libreplan-webapp/src/main/webapp/common/configuration.zul | 2 +- .../src/main/webapp/myaccount/_monthlyTimesheetsArea.zul | 2 +- .../src/main/webapp/myaccount/monthlyTimesheet.zul | 6 +++--- .../src/main/webapp/workreports/workReport.zul | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java b/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java index d40956e34..e0ad6a20e 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java +++ b/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java @@ -143,7 +143,7 @@ public class TypeOfWorkHours extends IntegrationEntity implements IHumanIdentifi } } - @AssertTrue(message = "type of work hours for monthly timesheets cannot be disabled") + @AssertTrue(message = "type of work hours for personal timesheets cannot be disabled") public boolean checkMonthlyTimesheetsTypeOfWorkHoursNotDisabled() { if (!isNewObject() && !getEnabled()) { TypeOfWorkHours typeOfWorkHours = Registry.getConfigurationDAO() diff --git a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java index 2ba500d53..c29b67e31 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java +++ b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java @@ -470,7 +470,7 @@ public class WorkReport extends IntegrationEntity implements return result; } - @AssertTrue(message = "only one timesheet line per day and task is allowed in monthly timesheets") + @AssertTrue(message = "only one timesheet line per day and task is allowed in personal timesheets") public boolean checkConstraintOnlyOneWorkReportLinePerDayAndOrderElementInMonthlyTimesheet() { if (!getWorkReportType().isMonthlyTimesheetsType()) { return true; @@ -492,7 +492,7 @@ public class WorkReport extends IntegrationEntity implements return true; } - @AssertTrue(message = "In monthly timesheets, all timesheet lines should be in the same month") + @AssertTrue(message = "In personal timesheets, all timesheet lines should be in the same month") public boolean checkConstraintAllWorkReportLinesInTheSameMonthInMonthlyTimesheet() { if (!getWorkReportType().isMonthlyTimesheetsType()) { return true; @@ -516,7 +516,7 @@ public class WorkReport extends IntegrationEntity implements return true; } - @AssertTrue(message = "resource has to be bound to a user in monthly timesheets") + @AssertTrue(message = "resource has to be bound to a user in personal timesheets") public boolean checkConstraintResourceIsBoundInMonthlyTimesheet() { if (!getWorkReportType().isMonthlyTimesheetsType()) { return true; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java index d6b47cc74..31121c333 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java @@ -508,7 +508,7 @@ public class MonthlyTimesheetController extends GenericForwardComposer breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); breadcrumbs.appendChild(new Label(_("My dashboard"))); breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); - breadcrumbs.appendChild(new Label(_("Monthly timesheet"))); + breadcrumbs.appendChild(new Label(_("Personal timesheet"))); } @Override @@ -639,7 +639,7 @@ public class MonthlyTimesheetController extends GenericForwardComposer goToCreateOrEditFormForResource(monthlyTimesheetModel.getDate(), monthlyTimesheetModel.getWorker()); } - messagesForUser.showMessage(Level.INFO, _("Monthly timesheet saved")); + messagesForUser.showMessage(Level.INFO, _("Personal timesheet saved")); Util.reloadBindings(timesheet); } @@ -675,7 +675,7 @@ public class MonthlyTimesheetController extends GenericForwardComposer if (monthlyTimesheetModel.isModified()) { throw new WrongValueException( previousMonth, - _("There are unsaved changes in the current monthly timesheet, please save before moving")); + _("There are unsaved changes in the current personal timesheet, please save before moving")); } sendToMonthlyTimesheet(monthlyTimesheetModel.getDate().minusMonths(1)); } @@ -684,7 +684,7 @@ public class MonthlyTimesheetController extends GenericForwardComposer if (monthlyTimesheetModel.isModified()) { throw new WrongValueException( nextMonth, - _("There are unsaved changes in the current monthly timesheet, please save before moving")); + _("There are unsaved changes in the current personal timesheet, please save before moving")); } sendToMonthlyTimesheet(monthlyTimesheetModel.getDate().plusMonths(1)); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java index 417943795..d41f18230 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java @@ -57,7 +57,7 @@ public class UserDashboardController extends GenericForwardComposer { String monthlyTimesheet = new LocalDate(timesheetSave) .toString("MMMM y"); messagesForUser.showMessage(Level.INFO, - _("Monthly timesheet \"{0}\" saved", monthlyTimesheet)); + _("Personal timesheet \"{0}\" saved", monthlyTimesheet)); } String expenseSheetSaved = Executions.getCurrent().getParameter( diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java index 195197f13..e8c11e1e1 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java @@ -190,7 +190,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements "timesheet_saved"); if (!StringUtils.isBlank(timesheetSave)) { messagesForUser.showMessage(Level.INFO, - _("Monthly timesheet saved")); + _("Personal timesheet saved")); } } diff --git a/libreplan-webapp/src/main/webapp/common/configuration.zul b/libreplan-webapp/src/main/webapp/common/configuration.zul index de1a5da71..892c612bd 100644 --- a/libreplan-webapp/src/main/webapp/common/configuration.zul +++ b/libreplan-webapp/src/main/webapp/common/configuration.zul @@ -69,7 +69,7 @@ selectedElement="@{configurationController.defaultCalendar}" /> -