DMC/scipro
7
0
Fork 0
Code Issues42 Pull Requests4 Actions Projects1 Releases Wiki Activity

implemented the functionality to save activityplans as templates

Browse Source
This commit is contained in:
Fredrik Norberg 2011-07-21 11:05:16 +02:00
parent f6bff289b9
commit b8fdeee59c
4 changed files with 19 additions and 8 deletions
src/main
java/se/su/dsv/scipro
schedule/templates/panels
ScheduleTemplateDetailsPanel.javaScheduleTemplateFormPanel.java
util
TemplateGenerator.java
resources/META-INF
persistence.xml

1
src/main/java/se/su/dsv/scipro/schedule/templates/panels/ScheduleTemplateDetailsPanel.java

@ -34,6 +34,7 @@ public class ScheduleTemplateDetailsPanel extends Panel {
public ScheduleTemplateDetailsPanel(String id, final ScheduleTemplate st){
super(id);
template = scheduleTemplateDao.reLoad(st);
add(new Label("templateName", template.getTemplateName()));

4
src/main/java/se/su/dsv/scipro/schedule/templates/panels/ScheduleTemplateFormPanel.java

@ -52,9 +52,9 @@ public class ScheduleTemplateFormPanel extends Panel {
template = new ScheduleTemplate();
template.setCreator(SciProSession.get().getUser());
template.setSysAdminTemplate(isSysAdminView);
}/* else { //test, might not be able to remove this
} else { //test, might not be able to remove this
template = scheduleTemplateDao.reLoad(template);
}*/
}
Class<? extends MenuPage> responseClass = null;
if(isSysAdminView){
responseClass = AdminScheduleTemplatesPage.class;

18
src/main/java/se/su/dsv/scipro/util/TemplateGenerator.java

@ -13,6 +13,7 @@ import org.joda.time.DateMidnight;
import se.su.dsv.scipro.SciProSession;
import se.su.dsv.scipro.data.dao.interfaces.ProjectDao;
import se.su.dsv.scipro.data.dao.interfaces.ProjectScheduleDao;
import se.su.dsv.scipro.data.dao.interfaces.ScheduleTemplateDao;
import se.su.dsv.scipro.data.dataobjects.Project;
import se.su.dsv.scipro.data.dataobjects.ProjectEvent;
import se.su.dsv.scipro.data.dataobjects.ProjectEventTemplate;
@ -21,8 +22,11 @@ import se.su.dsv.scipro.data.dataobjects.ScheduleTemplate;
public class TemplateGenerator { //based on ScheduleGenerator
/*@SpringBean
private ProjectScheduleDao projectscheduleDao;*/
@SpringBean
private ProjectScheduleDao scheduleTemplateDao;
private ScheduleTemplateDao scheduleTemplateDao;
@SpringBean
private ProjectDao projectDao;
@ -67,6 +71,11 @@ public class TemplateGenerator { //based on ScheduleGenerator
DateMidnight datePointer = new DateMidnight(startDate);
projectEventTemplate = new ArrayList<ProjectEventTemplate>();
int counter = 0;
template = new ScheduleTemplate();
template.setCreator(SciProSession.get().getUser());
template.setSysAdminTemplate(false);
template.setTemplateName("");
for(ProjectEvent pe : projectEvents){
counter ++;
@ -83,16 +92,17 @@ public class TemplateGenerator { //based on ScheduleGenerator
pet.setEstimatedTimeConsumption(durationInDays);
pet.setNumberInOrder(counter);
pet.setRequireHandIn(pe.isRequireHandIn());
pet.setScheduleTemplate(template);
datePointer = datePointer.plusDays(durationInDays);
templateEstimatedDays += durationInDays;
projectEventTemplate.add(pet);
}
template = new ScheduleTemplate();
template.setCreator(SciProSession.get().getUser());
template.setSysAdminTemplate(false);
template.setProjectEventTemplates(projectEventTemplate);
template = scheduleTemplateDao.save(template);
return template;

4
src/main/resources/META-INF/persistence.xml

@ -88,8 +88,8 @@
<property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5Dialect" />
<property name="hibernate.connection.driver_class" value="com.mysql.jdbc.Driver"></property>
<property name="hibernate.connection.url" value="jdbc:mysql://localhost/scipro"></property>
<property name="hibernate.connection.username" value="root"></property>
<property name="hibernate.connection.password" value="juju"></property>
<property name="hibernate.connection.username" value="scipro"></property>
<property name="hibernate.connection.password" value="pighleef"></property>
<property name="hibernate.connection.provider_class" value="org.hibernate.connection.C3P0ConnectionProvider"></property>
<property name="hibernate.c3p0.min_size" value="3"></property>
<property name="hibernate.c3p0.max_size" value="6"></property>