DMC/scipro
7
0
Fork 0
Code Issues43 Pull Requests9 Actions Projects1 Releases Wiki Activity

Merge branch 'target' into develop

Browse Source
This commit is contained in:
Fredrik Friis 2012-02-09 14:04:40 +09:00
commit b034253933
1 changed files with 11 additions and 1 deletions

12
src/main/java/se/su/dsv/scipro/match/dao/jpa/ProjectIdeaDaoJPAImp.java

@ -3,7 +3,9 @@ package se.su.dsv.scipro.match.dao.jpa;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.springframework.stereotype.Repository;
import se.su.dsv.scipro.data.dao.jpa.AbstractDaoJPAImp;
@ -50,10 +52,18 @@ public class ProjectIdeaDaoJPAImp extends AbstractDaoJPAImp<ProjectIdea>
projectClasses.add(projectClass);
querySet.projectClasses(projectClasses);
}
//we dont want to include inactive, refused, rejected ideas etc
Set<Match.Status> statusesToInclude = new HashSet<Match.Status>();
statusesToInclude.add(Match.Status.PUBLISHED);
statusesToInclude.add(Match.Status.CONFIRMED);
statusesToInclude.add(Match.Status.PENDING);
return getJpaTemplate().execute(
// querySet.supervisor(supervisor).projectCreated(false).countCallback());
// querySet.supervisor(supervisor).matchDateAfter(supervisor.getBachelorTargetCountFromDate()).countCallback());
querySet.supervisor(supervisor).matchDateAfter(supervisor.getCountFromDate(projectClass)).countCallback());
// querySet.supervisor(supervisor).matchDateAfter(supervisor.getCountFromDate(projectClass)).countCallback());
querySet.supervisor(supervisor).statuses(statusesToInclude).matchDateAfter(supervisor.getCountFromDate(projectClass)).countCallback());
}
@Override