DMC/scipro
7
0
Fork 0
Code Issues30 Pull Requests3 Actions Projects1 Releases Wiki Activity

deletion of projects no longer results in errors

Browse Source
This commit is contained in:
Fredrik Friis 2012-02-29 14:10:20 +09:00
parent 2658a51490
commit 7d294432c0
3 changed files with 51 additions and 35 deletions
src/main/java/se/su/dsv/scipro
data/facade
ProjectFacade.java
project/panels
ProjectManagementPanel.htmlProjectManagementPanel.java

17
src/main/java/se/su/dsv/scipro/data/facade/ProjectFacade.java

@ -4,6 +4,7 @@ import java.util.Date;
import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@ -11,12 +12,14 @@ import se.su.dsv.scipro.data.dao.interfaces.CheckListDao;
import se.su.dsv.scipro.data.dao.interfaces.CheckListQuestionDao;
import se.su.dsv.scipro.data.dao.interfaces.CheckListTemplateDao;
import se.su.dsv.scipro.data.dao.interfaces.ProjectDao;
import se.su.dsv.scipro.data.dao.interfaces.UserSettingsDao;
import se.su.dsv.scipro.data.dataobjects.CheckList;
import se.su.dsv.scipro.data.dataobjects.CheckListQuestion;
import se.su.dsv.scipro.data.dataobjects.CheckListTemplate;
import se.su.dsv.scipro.data.dataobjects.ChecklistCategory;
import se.su.dsv.scipro.data.dataobjects.Project;
import se.su.dsv.scipro.data.dataobjects.ProjectClass;
import se.su.dsv.scipro.data.dataobjects.Student;
import se.su.dsv.scipro.data.enums.ProjectStatus;
import se.su.dsv.scipro.data.enums.StateOfMind;
@ -32,6 +35,9 @@ public class ProjectFacade {
@Autowired
private CheckListQuestionDao checkListQuestionDao;
@Autowired
private UserSettingsDao userSettingsDao;
@Autowired
private ProjectDao projectDao;
@Autowired
@ -48,6 +54,17 @@ public class ProjectFacade {
}
}
public void deleteProject(Project project){
project = projectDao.reLoad(project);
for (Student s : project.getProjectParticipants()){
if (userSettingsDao.getUserSettings(s.getUser()).getActiveProject()!=null && userSettingsDao.getUserSettings(s.getUser()).getActiveProject().equals(project)){
userSettingsDao.getUserSettings(s.getUser()).setActiveProject(null);
userSettingsDao.save(userSettingsDao.getUserSettings(s.getUser()));
}
}
projectDao.delete(project);
}
public void generateChecklists(Project project){
List<CheckListTemplate> templates;
project = projectDao.reLoad(project);

8
src/main/java/se/su/dsv/scipro/project/panels/ProjectManagementPanel.html

@ -45,8 +45,8 @@
<th>Supervisor</th>
<th>Reviewer</th>
<th>Status</th>
<th class="rounded-right-top">Edit</th>
<!-- <th class="rounded-right-top">Delete</th> -->
<th>Edit</th>
<th class="rounded-right-top">Delete</th>
</tr>
</thead>
<tfoot>
@ -64,12 +64,12 @@
<td wicket:id="statusLabel">Other role</td>
<!-- <td wicket:id="editLabel">Other role</td> -->
<td><a href="#" wicket:id="testLink">Edit</a></td>
<!-- <td><a href="#" wicket:id="deleteLink">Delete</a></td> -->
<td><a href="#" wicket:id="deleteLink">Delete</a></td>
</tr>
</tbody>
<tbody>
<tr>
<td wicket:id="emptyLabel" colspan="7"></td>
<td wicket:id="emptyLabel" colspan="8"></td>
</tr>
</tbody>
</table>

25
src/main/java/se/su/dsv/scipro/project/panels/ProjectManagementPanel.java

@ -21,6 +21,7 @@ import se.su.dsv.scipro.admin.pages.ProjectManagementPage;
import se.su.dsv.scipro.data.dao.interfaces.Dao.SortableParams.Sort;
import se.su.dsv.scipro.data.dao.interfaces.ProjectDao;
import se.su.dsv.scipro.data.dataobjects.Project;
import se.su.dsv.scipro.data.facade.ProjectFacade;
import se.su.dsv.scipro.dataproviders.NewProjectDataProvider;
import se.su.dsv.scipro.reusable.DatesPanel;
import se.su.dsv.scipro.reusable.FilterProjectClassPanel;
@ -31,7 +32,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
public class ProjectManagementPanel extends Panel {
@SpringBean
private ProjectDao projectDao;
private ProjectFacade projectFacade;
private static final long serialVersionUID = 1L;
@ -130,18 +131,16 @@ public class ProjectManagementPanel extends Panel {
};
item.add(testLink);
// AjaxLink deleteLink = new AjaxLink<Void>("deleteLink"){
// private static final long serialVersionUID = 1L;
// @Override
// public void onClick(AjaxRequestTarget target) {
// Project p2 = projectDao.reLoad(p);
// projectDao.delete(p2);
// ajaxRefresh(target);
// }
//
// };
// item.add(deleteLink);
//>>>>>>> cascade
AjaxLink deleteLink = new AjaxLink<Void>("deleteLink"){
private static final long serialVersionUID = 1L;
@Override
public void onClick(AjaxRequestTarget target) {
projectFacade.deleteProject(p);
ajaxRefresh(target);
}
};
item.add(deleteLink);
}
};