GuillaumeHemmen/projectlibre-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/projectlibre/code synced 2024-11-01 03:21:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

calendar fix

Browse source
This commit is contained in:
claur 2015-07-29 10:57:10 +02:00
parent e7c01ceee2
commit 8a4d2d0d70
5 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
openproj_build/build.properties
View file

@ -28,19 +28,19 @@ macapp=ProjectLibre.app
wixbuild=projectlibre_wix
version_name=1.6.0
version=1.6.0
version_name=1.6.2
version=1.6.2
#windows
numericVersion3=1.6.0
numericVersion3=1.6.2
#mac
numericVersion4=1.6.0.0
numericVersion4=1.6.2.0
#Linux
rpm_version=1.6.0
rpm_version=1.6.2
rpm_revision=1
deb_version=1.6.0
deb_version=1.6.2
deb_revision=1
#rpm_builds=redhat,suse,mageia

9
openproj_core/src/com/projity/pm/calendar/CalendarDefinition.java
View file

@ -30,7 +30,7 @@ in Exhibits A and B of the license at http://www.projity.com/license. You should
use the latest text at http://www.projity.com/license for your modifications.
You may not remove this license text from the source files.]
Attribution Information: Attribution Copyright Notice: Copyright <EFBFBD> 2006, 2007
Attribution Information: Attribution Copyright Notice: Copyright (c) 2006, 2007
Projity, Inc. Attribution Phrase (not exceeding 10 words): Powered by OpenProj,
an open source solution from Projity. Attribution URL: http://www.projity.com
Graphic Image as provided in the Covered Code as file: openproj_logo.png with
@ -454,10 +454,9 @@ public class CalendarDefinition implements WorkCalendar, Cloneable {
return result;
}
private WorkingHours getNext(long day) {
WorkDay workDay;
if (day == exceptionDay) {
workDay = exceptions[i]; // move index, save off new value for exception day
i += step;
@ -469,6 +468,10 @@ public class CalendarDefinition implements WorkCalendar, Cloneable {
} else {
workDay = week.getWeekDay(dayOfWeek(day));
}
if (workDay==null)
workDay=WorkDay.getDefaultWorkDay();
return workDay.getWorkingHours();
}

2
openproj_core/src/com/projity/pm/calendar/WorkingCalendar.java
View file

@ -30,7 +30,7 @@ in Exhibits A and B of the license at http://www.projity.com/license. You should
use the latest text at http://www.projity.com/license for your modifications.
You may not remove this license text from the source files.]
Attribution Information: Attribution Copyright Notice: Copyright <EFBFBD> 2006, 2007
Attribution Information: Attribution Copyright Notice: Copyright (c) 2006, 2007
Projity, Inc. Attribution Phrase (not exceeding 10 words): Powered by OpenProj,
an open source solution from Projity. Attribution URL: http://www.projity.com
Graphic Image as provided in the Covered Code as file: openproj_logo.png with

2
openproj_exchange/src/com/projectlibre/core/pm/exchange/converters/openproj/OpenprojCalendarConverter.java
View file

@ -100,6 +100,8 @@ public class OpenprojCalendarConverter {
WorkingCalendar baseCalendar = null;
if (calendar.getBase()!=null){
baseCalendar=state.getMappedOpenprojBaseCalendar(calendar.getId());
if (baseCalendar==null)
baseCalendar=openprojStandardCalendar;
try {
openprojCalendar.setBaseCalendar(baseCalendar);
} catch (CircularDependencyException e) {

2
openproj_ui/src/com/projity/dialog/calendar/ChangeWorkingTimeDialogBox.java
View file

@ -30,7 +30,7 @@ in Exhibits A and B of the license at http://www.projity.com/license. You should
use the latest text at http://www.projity.com/license for your modifications.
You may not remove this license text from the source files.]
Attribution Information: Attribution Copyright Notice: Copyright © 2006, 2007
Attribution Information: Attribution Copyright Notice: Copyright (c) 2006, 2007
Projity, Inc. Attribution Phrase (not exceeding 10 words): Powered by OpenProj,
an open source solution from Projity. Attribution URL: http://www.projity.com
Graphic Image as provided in the Covered Code as file: openproj_logo.png with