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

it changes the labels in the columns of the calendar list, fixes the error

Browse source 
messages.

FEA: ItEr75S09ImproveBandboxFinders
This commit is contained in:
Susana Montes Pedreira 2011-07-20 13:54:23 +02:00
parent 243a1260bc
commit fa457a0e0e
5 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java
View file

@ -428,7 +428,7 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar,
if (newIntervalIncludeAnotherWorkWeek(startDate,
expiringDate, prevVersion, nextVersion)) {
throw new IllegalArgumentException(
"the new version includes a whole version already exists");
"the new work week includes a whole work week already exists");
} else {
LocalDate prevExpiringDate = prevVersion
.getExpiringDate();
@ -463,12 +463,12 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar,
}
} else {
throw new IllegalArgumentException(
"Wrong start date : the new version will be the first one, and the start date must be empty");
"Wrong start date : the new work week will be the first one, and the start date must be empty");
}
}
}
throw new IllegalArgumentException(
"Wrong expiring date : the new version will be the last one, and the expiring date must be empty");
"Wrong expiring date : the new work week will be the last one, and the expiring date must be empty");
}
public boolean newIntervalIncludeAnotherWorkWeek(LocalDate startDate,
@ -496,8 +496,7 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar,
if ((calendarData.getExpiringDate() != null)
&& (startDate.compareTo(calendarData.getExpiringDate()) <= 0)) {
throw new IllegalArgumentException(
"Wrong start date : Version date must be greater than expiring date of "
+ "all versions of this calendar");
"Wrong start date : the new work week includes a whole work week already exists");
}
getLastCalendarData().setExpiringDate(startDate);
@ -516,8 +515,8 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar,
&& (expiringDate.compareTo(firstVersion.getExpiringDate()) >= 0)) {
throw new IllegalArgumentException(
"Wrong expiring date : Version expiring date must be lower than expiring date of "
+ "all versions of this calendar");
"Wrong expiring date : Work week expiring date must be lower than expiring date for "
+ "all work weeks of this calendar");
}
CalendarData newCalendarData = CalendarData.create();
@ -575,7 +574,7 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar,
if (version.getExpiringDate() == null) {
if (getLastCalendarData().getExpiringDate() == null) {
throw new IllegalArgumentException(
"the date is null and overlaps with the last version.");
"the date is null and overlaps with the last work week.");
}
else{
calendarDataVersions.add(version);
@ -588,7 +587,7 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar,
if (version.getExpiringDate().compareTo(new LocalDate()) <= 0) {
throw new IllegalArgumentException(
"You can not add a version with previous date than current date");
"You can not add a work week with previous date than current date");
}
for (int i = 0; i < calendarDataVersions.size(); i++) {
if ((calendarDataVersions.get(i).getExpiringDate() == null)
@ -599,7 +598,7 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar,
&& (calendarDataVersions.get(i - 1).getExpiringDate()
.compareTo(version.getExpiringDate()) >= 0)) {
throw new IllegalArgumentException(
"the date is null and overlap with the other version.");
"the date is null and overlap with the other work week.");
}
calendarDataVersions.add(i, version);
return;
@ -663,7 +662,7 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar,
}
}
throw new RuntimeException("Some version should not be expired");
throw new RuntimeException("Some work week should not be expired");
}
public CalendarData getLastCalendarData() {
@ -739,7 +738,7 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar,
LocalDate expiringDate) throws IllegalArgumentException {
if (calendarData.getExpiringDate() == null) {
throw new IllegalArgumentException("Can not set the expiring date "
+ "because of this is the last version");
+ "because of this is the last work week");
}
Integer index = calendarDataVersions.indexOf(calendarData);
@ -781,7 +780,7 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar,
CalendarData calendarData = getPreviousCalendarData(date);
if (calendarData == null) {
throw new IllegalArgumentException(
"You can not set this date for the first version");
"You can not set this date for the first work week");
}
setExpiringDate(calendarData, validFromDate);
}
@ -1111,7 +1110,7 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar,
}
@SuppressWarnings("unused")
@AssertTrue(message = "the versions: the dates should be corrects and sorted and could not overlap ")
@AssertTrue(message = "the work week: the dates should be corrects and sorted and could not overlap ")
public boolean checkConstraintDateCouldNotOverlap() {
if (calendarDataVersions == null || calendarDataVersions.isEmpty()) {

4
navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java
View file

@ -299,7 +299,7 @@ public class BaseCalendarCRUDController extends GenericForwardComposer {
// append start date of the current work week
Treecell startDateTreecell = new Treecell();
Label startDateLabel = new Label();
Label startDateLabel = new Label("---");
CalendarData version = baseCalendar.getCalendarData(LocalDate
.fromDateFields(new Date()));
CalendarData prevVersion = baseCalendar.getPrevious(version);
@ -313,7 +313,7 @@ public class BaseCalendarCRUDController extends GenericForwardComposer {
// append expiring date of the current work week
Treecell expiringDateTreecell = new Treecell();
Label expiringDateLabel = new Label();
Label expiringDateLabel = new Label("---");
if (version.getExpiringDate() != null) {
expiringDateLabel
.setValue(version.getExpiringDate().toString());

2
navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java
View file

@ -88,8 +88,8 @@ import org.zkoss.zul.api.Window;
* Controller for edit and create one {@link BaseCalendar}. It's separated of
* {@link BaseCalendarCRUDController} to be used from other parts of the
* application.
*
* @author Manuel Rego Casasnovas <mrego@igalia.com>
* @author Susana Montes Pedreira <smontes@wirelessgalicia.com>
*/
public abstract class BaseCalendarEditionController extends
GenericForwardComposer {

3
navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul
View file

@ -31,9 +31,8 @@
</columns>
<rows>
<row>
<label value="${i18n:_('Base calendar')}" />
<label value="${i18n:_('Base calendar type')}" />
<hbox align="right">
<label value="${i18n:_('Type')}:"/>
<combobox id="parentCalendars"
model="@{calendarController.editionController.parentCalendars}"
disabled="@{calendarController.editionController.isNotDerived}"

4
navalplanner-webapp/src/main/webapp/calendars/_list.zul
View file

@ -25,8 +25,8 @@
zclass="z-dottree">
<treecols sizable="true">
<treecol label="${i18n:_('Name')}" />
<treecol label="${i18n:_('From date')}" width="150px" align="center"/>
<treecol label="${i18n:_('Up to date')}" width="150px" align="center"/>
<treecol label="${i18n:_('Inherits from date')}" width="150px" align="center"/>
<treecol label="${i18n:_('Inherits up to date')}" width="150px" align="center"/>
<treecol label="${i18n:_('Operations')}" width="150px" align="center"/>
</treecols>
</tree>