LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Verschiedene BugFixes 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1320 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2011-12-06 20:54:50 +00:00
parent 16bb369677
commit 1ec33ceaaf
2 changed files with 171 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProject.java
View File

@ -6,7 +6,9 @@ import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.OID; import com.arsdigita.persistence.OID;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List; import java.util.List;
/** /**
@ -117,8 +119,22 @@ public class SciProject extends GenericOrganizationalUnit {
} }
public Date getEnd() { public Date getEnd() {
if (get(END) != null) {
final Date endDate = (Date) get(END);
final Calendar end = new GregorianCalendar();
end.setTime(endDate);
if (getEndSkipDay() && (end.get(Calendar.DAY_OF_MONTH) == 1)) {
end.add(Calendar.MONTH, 1);
end.add(Calendar.DAY_OF_MONTH, -1);
return end.getTime();
} else {
return (Date) get(END); return (Date) get(END);
} }
} else {
return (Date) get(END);
}
}
public void setEnd(Date end) { public void setEnd(Date end) {
set(END, end); set(END, end);
@ -182,7 +198,6 @@ public class SciProject extends GenericOrganizationalUnit {
set(FUNDING_VOLUME, fundingVolume); set(FUNDING_VOLUME, fundingVolume);
} }
/*Method is not use commented out. /*Method is not use commented out.
* @Override * @Override
public boolean hasContacts() { public boolean hasContacts() {
@ -345,7 +360,6 @@ public class SciProject extends GenericOrganizationalUnit {
} }
} }
}*/ }*/
@Override @Override
public List<ExtraXMLGenerator> getExtraXMLGenerators() { public List<ExtraXMLGenerator> getExtraXMLGenerators() {
final List<ExtraXMLGenerator> generators = super.getExtraXMLGenerators(); final List<ExtraXMLGenerator> generators = super.getExtraXMLGenerators();