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

Import fix for calendars

Browse source
This commit is contained in:
claur 2015-06-29 16:57:24 +02:00
parent ee87790488
commit e7c01ceee2
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
openproj_core/src/com/projity/pm/calendar/WorkWeek.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
@ -138,7 +138,7 @@ public class WorkWeek implements Cloneable,Serializable {
if (workDay[i]==null){
System.out.println();
}
workDay[i].initialize(); // calc hours - fixes bug in importing project 2007 files
else workDay[i].initialize(); // calc hours - fixes bug in importing project 2007 files
}
updateWorkingDuration();
}

16
projectlibre_exchange/src/com/projectlibre/core/pm/exchange/converters/mpx/MpxCalendarConverter.java
View file

@ -47,7 +47,7 @@ the CPAL as a work which combines Covered Code or portions thereof with code not
governed by the terms of the CPAL. However, in addition to the other notice
obligations, all copies of the Covered Code in Executable and Source Code form
distributed must, as a form of attribution of the original author, include on each
user interface screen the "OpenProj" and ÒProjectLibreÓ logos visible to all users.
user interface screen the "OpenProj" and "ProjectLibre" logos visible to all users.
The OpenProj logo should be located horizontally aligned with the menu bar and left
justified on the top left of the screen adjacent to the File menu. The logo must be
at least 100 x 25 pixels. When users click on the "OpenProj" logo it must direct them
@ -68,9 +68,9 @@ the CPAL as a work which combines Covered Code or portions thereof with code not
governed by the terms of the CPAL. However, in addition to the other notice
obligations, all copies of the Covered Code in Executable and Source Code form
distributed must, as a form of attribution of the original author, include on each
user interface screen the "OpenProj" and ÒProjectLibreÓ logos visible to all users.
user interface screen the "OpenProj" and "ProjectLibre" logos visible to all users.
The OpenProj logo should be located horizontally aligned with the menu bar and left
justified on the top left of the screen adjacent to the File menu. ÊThe logo must be
justified on the top left of the screen adjacent to the File menu. The logo must be
at least 100 x 25 pixels. When users click on the "OpenProj" logo it must direct them
back to http://www.projity.com.
*/
@ -126,9 +126,13 @@ public class MpxCalendarConverter {
WorkDay day=null;
if (mpxDay == null) {
if (mpxCalendar.isDerived() &&
mpxBaseCalendar!=null &&
mpxBaseCalendar.isWorkingDay(mpxDayId))
day = WorkDay.getNonWorkingDay();
mpxBaseCalendar!=null){
if (mpxDayType==net.sf.mpxj.DayType.DEFAULT)
day=calendar.getBase().getWeek().getDay(i);
// day = WorkDay.getDefaultDay();
else if (mpxBaseCalendar.isWorkingDay(mpxDayId)) //TODO correct?
day = WorkDay.getNonWorkingDay();
}
} else {
day=new WorkDay(DayType.getInstance(mpxDayType.getValue()));
rangeConverter.from(mpxDay,day);