509,6 → 509,41 |
.list(); |
} |
|
public List<CourseUnit> loadTeacherUnitsMissingEvaluation(UserSession userSession) |
{ |
String activeYear = DaoFactory.getConfigurationDaoImpl().getCourseUnitEvaluationActiveYear(); |
if(activeYear == null) |
return new ArrayList<CourseUnit>(); |
|
List<CourseUnit> nulls = |
createCriteria() |
.createAlias("teachers","t") |
.add(eq("importYear", DaoFactory.getConfigurationDaoImpl().getCourseUnitEvaluationActiveYear())) |
//.add(not(eq("importYear", DaoFactory.getConfigurationDaoImpl().getInterfaceImportYear()))) |
//.add(ge("importYear", "201415" )) |
//.add(isNull("courseUnitEvaluation")) |
//todo novo testar |
.add(eq("t.id", userSession.getUser().getId())) |
.add(isNull("courseUnitEvaluation")) |
.list(); |
|
List<CourseUnit> teacherCompleteFalse = |
createCriteria() |
.createAlias("courseUnitEvaluation", "ce") |
.createAlias("teachers","t") |
.add(eq("t.id",userSession.getUser().getId())) |
.add(eq("importYear", DaoFactory.getConfigurationDaoImpl().getCourseUnitEvaluationActiveYear())) |
//.add(not(eq("importYear", DaoFactory.getConfigurationDaoImpl().getInterfaceImportYear()))) |
//.add(ge("importYear", "201415" )) |
//.add(isNull("courseUnitEvaluation")) |
//todo novo testar |
.add(eq("ce.teacherComplete",false)) |
.list(); |
teacherCompleteFalse.addAll(nulls); |
return teacherCompleteFalse; |
} |
|
|
public List<CourseMissingValidationEvaluation> loadMissingEvaluation(UserSession userSession) |
{ |
List<CourseMissingValidationEvaluation> result = new ArrayList<CourseMissingValidationEvaluation>(); |
535,17 → 570,32 |
if(DaoFactory.getConfigurationDaoImpl().getCourseUnitEvaluationActiveYear()==null) |
return new ArrayList<CourseUnit>(); |
|
return createCriteria() |
List<CourseUnit> nulls = |
createCriteria() |
.createAlias("course", "c") |
.createAlias("courseUnitEvaluation", "ce") |
.add(eq("c.id", courseId)) |
.add(eq("importYear", DaoFactory.getConfigurationDaoImpl().getCourseUnitEvaluationActiveYear())) |
//.add(not(eq("importYear", DaoFactory.getConfigurationDaoImpl().getInterfaceImportYear()))) |
//.add(ge("importYear", "201415" )) |
//.add(isNull("courseUnitEvaluation")) |
//todo novo testar |
.add(or(isNull("courseUnitEvaluation"),(eq("ce.teacherComplete", false)))) |
.add(isNull("courseUnitEvaluation")) |
.list(); |
|
List<CourseUnit> teacherCompleteFalse = |
createCriteria() |
.createAlias("course", "c") |
.createAlias("courseUnitEvaluation", "ce") |
.add(eq("c.id", courseId)) |
.add(eq("importYear", DaoFactory.getConfigurationDaoImpl().getCourseUnitEvaluationActiveYear())) |
//.add(not(eq("importYear", DaoFactory.getConfigurationDaoImpl().getInterfaceImportYear()))) |
//.add(ge("importYear", "201415" )) |
//.add(isNull("courseUnitEvaluation")) |
//todo novo testar |
.add(eq("ce.teacherComplete", false)) |
.list(); |
teacherCompleteFalse.addAll(nulls); |
return teacherCompleteFalse; |
} |
|
public CourseUnit loadByEvaluationStreamId(String identifier) |