6,13 → 6,13 |
import org.hibernate.criterion.Criterion; |
import org.hibernate.criterion.Order; |
import org.hibernate.sql.JoinFragment; |
import pt.estgp.estgweb.domain.CourseUnit; |
import pt.estgp.estgweb.domain.CourseUnitImpl; |
import pt.estgp.estgweb.domain.Teacher; |
import pt.estgp.estgweb.domain.*; |
import pt.estgp.estgweb.domain.dao.DaoFactory; |
import pt.estgp.estgweb.domain.dao.DaoUtils; |
import pt.estgp.estgweb.services.common.SearchTypeEnum; |
import pt.estgp.estgweb.utils.DatesUtils; |
|
import java.util.ArrayList; |
import java.util.List; |
|
import static org.hibernate.criterion.Restrictions.*; |
429,4 → 429,71 |
q.setLong(0,unit); |
return q.list(); |
} |
|
public static class CourseMissingValidationProgram |
{ |
public Course course; |
public List<CourseUnit> courseUnits; |
} |
public List<CourseMissingValidationProgram> loadMissingProgramValidate(UserSession userSession) |
{ |
List<CourseMissingValidationProgram> result = new ArrayList<CourseMissingValidationProgram>(); |
List<Course> courses = DaoFactory.getCourseDaoImpl().findAll(DatesUtils.getImportYear()); |
for(Course course: courses) |
{ |
if(userSession.getUser().hasRole(course.getValidationRole())) |
{ |
List<CourseUnit> courseUnits = loadMissingProgramValidateGivenCourse(course.getId()); |
if(courseUnits != null && courseUnits.size() > 0) |
{ |
CourseMissingValidationProgram c = new CourseMissingValidationProgram(); |
c.course = course; |
c.courseUnits = courseUnits; |
result.add(c); |
} |
} |
} |
return result; |
} |
public static class CourseMissingValidationEvaluation |
{ |
public Course course; |
public List<CourseUnit> courseUnits; |
} |
|
public List<CourseMissingValidationEvaluation> loadMissingEvaluationValidate(UserSession userSession) |
{ |
List<CourseMissingValidationEvaluation> result = new ArrayList<CourseMissingValidationEvaluation>(); |
List<Course> courses = DaoFactory.getCourseDaoImpl().findAll(DatesUtils.getImportYear()); |
for(Course course: courses) |
{ |
if(userSession.getUser().hasRole(course.getValidationRole())) |
{ |
List<CourseUnit> courseUnits = loadMissingEvaluationValidateGivenCourse(course.getId()); |
if(courseUnits != null && courseUnits.size() > 0) |
{ |
CourseMissingValidationEvaluation c = new CourseMissingValidationEvaluation(); |
c.course = course; |
c.courseUnits = courseUnits; |
result.add(c); |
} |
} |
} |
return result; |
} |
|
/* |
* Neste caso apenas se validam as do ano anterior*/ |
|
public List<CourseUnit> loadMissingEvaluationValidateGivenCourse(long courseId) |
{ |
return createCriteria() |
.createAlias("course", "c") |
.createAlias("courseUnitEvaluation", "ce") |
.add(eq("c.id", courseId)) |
.add(not(eq("importYear", DatesUtils.getImportYear()))) |
.add((and(isNotNull("evaluationStreamId"), not(eq("evaluationStreamId", ""))))) |
.add((eq("ce.closed", false))) |
.list(); |
} |
} |