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

Rename monthly timesheets to personal timesheets in the UI

Browse source 
FEA: ItEr77S07PersonalTimesheetsPeriodictyConfiguration
This commit is contained in:
Manuel Rego Casasnovas 2012-08-27 13:21:39 +02:00
parent 9a7af06595
commit 0f0aab3a55
9 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java
View file

@ -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()

6
libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java
View file

@ -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;

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

@ -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));

2
libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java
View file

@ -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(

2
libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java
View file

@ -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"));
}
}

2
libreplan-webapp/src/main/webapp/common/configuration.zul
View file

@ -69,7 +69,7 @@
selectedElement="@{configurationController.defaultCalendar}" />
</row>
<row>
<label value="${i18n:_('Hours type for monthly timesheets')}" />
<label value="${i18n:_('Hours type for personal timesheets')}" />
<bandboxSearch
finder="TypeOfWorkHoursBandboxFinder"
selectedElement="@{configurationController.monthlyTimesheetsTypeOfWorkHours, access='both'}" />

2
libreplan-webapp/src/main/webapp/myaccount/_monthlyTimesheetsArea.zul
View file

@ -19,7 +19,7 @@
-->
<groupbox apply="org.libreplan.web.users.dashboard.MonthlyTimesheetsAreaController">
<caption label="${i18n:_('Monthly timesheets')}" />
<caption label="${i18n:_('Personal timesheets')}" />
<grid model="@{controller.monthlyTimesheets}" mold="paging"
pageSize="10" rowRenderer="@{controller.monthlyTimesheetsRenderer}"

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

@ -18,7 +18,7 @@
<http://www.gnu.org/licenses/>.
-->
<?page id="exceptionDayTypesList" title="${i18n:_('LibrePlan: Monthly timesheet')}" ?>
<?page id="exceptionDayTypesList" title="${i18n:_('LibrePlan: Personal timesheet')}" ?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
@ -29,7 +29,7 @@
<zk>
<window apply="org.libreplan.web.users.dashboard.MonthlyTimesheetController"
self="@{define(content)}" title="${i18n:_('Monthly timesheet')}">
self="@{define(content)}" title="${i18n:_('Personal timesheet')}">
<div id="messagesContainer" />
@ -81,7 +81,7 @@
</columns>
<rows>
<row visible="@{controller.hasOtherReports}">
<label value="${i18n:_('Total monthly timesheet')}" />
<label value="${i18n:_('Total personal timesheet')}" />
<label id="summaryTotalMonthlyTimesheet" />
</row>
<row visible="@{controller.hasOtherReports}">

2
libreplan-webapp/src/main/webapp/workreports/workReport.zul
View file

@ -129,7 +129,7 @@
</rows>
</grid>
<button onClick="controller.createOrEditMonthlyTimesheet();"
label="${i18n:_('Go to monthly timesheet')}" />
label="${i18n:_('Go to personal timesheet')}" />
</popup>
</window>