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

everything works now

Browse Source
This commit is contained in:
Fredrik Friis 2012-02-14 14:23:24 +09:00
parent 5ef595ca0b
commit 3c2a70deb9
3 changed files with 9 additions and 4 deletions
src/main/java/se/su/dsv/scipro
data/dao/jpa
ProjectDaoJPAImp.java
project/panels
ProjectManagementPanel.html
reusable
FilterProjectClassPanel.java

2
src/main/java/se/su/dsv/scipro/data/dao/jpa/ProjectDaoJPAImp.java

@ -542,7 +542,7 @@ public class ProjectDaoJPAImp extends AbstractDaoJPAImp<Project> implements Proj
}
public QuerySet projectClasses(Collection<ProjectClass> projectClasses) {
if (projectClasses != null) {
if (projectClasses != null && !projectClasses.isEmpty()) {
getQuery().combine(
new Query().where("_.projectClass IN (:projectClasses)")
.parameter("projectClasses", projectClasses));

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

@ -11,10 +11,11 @@
<div wicket:id="filterStringPanel"></div>
<label>Created between: </label>
<div wicket:id="filterDatesPanel"></div>
<label>Level: </label>
<div wicket:id="filterProjectClassPanel"></div>
</div>
<div><button wicket:id="newLink">Create new project</button></div>
<div class="right"><button wicket:id="newLink">Create new project</button></div>
<div wicket:id="dialog">
<div wicket:id="panel"></div>
</div>
@ -23,14 +24,14 @@
<table class="rounded-corner" >
<thead>
<tr>
<th><a href="#" wicket:id="titleSort">Title</a></th>
<th class="rounded-left-top"><a href="#" wicket:id="titleSort">Title</a></th>
<!-- <th>Title</th> -->
<th>Level</th>
<th>Author(s)</th>
<th>Supervisor</th>
<th>Reviewer</th>
<th>Status</th>
<th>Edit</th>
<th class="rounded-right-top">Edit</th>
</tr>
</thead>
<tfoot>

4
src/main/java/se/su/dsv/scipro/reusable/FilterProjectClassPanel.java

@ -75,6 +75,8 @@ public abstract class FilterProjectClassPanel extends Panel{
System.out.println("adding" + wrapper.getProjectClass().getName());
selectedProjectClasses.add(wrapper.getProjectClass());
onUpdateFilter(target);
Iterator<ProjectClass> it = selectedProjectClasses.iterator();
while (it.hasNext()) {
System.out.println(it.next().getName());
@ -85,6 +87,8 @@ public abstract class FilterProjectClassPanel extends Panel{
System.out.println("removing" + wrapper.getProjectClass().getName());
selectedProjectClasses.remove(wrapper.getProjectClass());
onUpdateFilter(target);
Iterator<ProjectClass> it = selectedProjectClasses.iterator();
while (it.hasNext()) {
System.out.println(it.next().getName());