| /impl/src/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitDaoImpl.java |
|---|
| 496,4 → 496,36 |
| .add((eq("ce.closed", false))) |
| .list(); |
| } |
| public List<CourseMissingValidationEvaluation> loadMissingEvaluation(UserSession userSession) |
| { |
| List<CourseMissingValidationEvaluation> result = new ArrayList<CourseMissingValidationEvaluation>(); |
| List<Course> courses = DaoFactory.getCourseDaoImpl().findAll(); |
| for(Course course: courses) |
| { |
| if(userSession.getUser().hasRole(course.getValidationRole())) |
| { |
| List<CourseUnit> courseUnits = loadMissingEvaluation(course.getId()); |
| if(courseUnits != null && courseUnits.size() > 0) |
| { |
| CourseMissingValidationEvaluation c = new CourseMissingValidationEvaluation(); |
| c.course = course; |
| c.courseUnits = courseUnits; |
| result.add(c); |
| } |
| } |
| } |
| return result; |
| } |
| public List<CourseUnit> loadMissingEvaluation(long courseId) |
| { |
| return createCriteria() |
| .createAlias("course", "c") |
| .createAlias("courseUnitEvaluation", "ce") |
| .add(eq("c.id", courseId)) |
| .add(not(eq("importYear", DatesUtils.getImportYear()))) |
| .add((or(isNull("evaluationStreamId"), eq("evaluationStreamId", "")))) |
| .list(); |
| } |
| } |
| /impl/src/web/user/home/teacher.jsp |
|---|
| 214,7 → 214,8 |
| HibernateUtils.getCurrentSession().beginTransaction(); |
| List<CourseUnitDaoImpl.CourseMissingValidationProgram> result = DaoFactory.getCourseUnitDaoImpl().loadMissingProgramValidate(UserSession); |
| List<CourseUnitDaoImpl.CourseMissingValidationEvaluation> result2 = DaoFactory.getCourseUnitDaoImpl().loadMissingEvaluationValidate(UserSession); |
| if(result.size() > 0 || result2.size() > 0) |
| List<CourseUnitDaoImpl.CourseMissingValidationEvaluation> result3 = DaoFactory.getCourseUnitDaoImpl().loadMissingEvaluation(UserSession); |
| if(result.size() > 0 || result2.size() > 0 || result3.size()>0) |
| { |
| %> |
| <div class="block"> |
| 276,6 → 277,40 |
| } |
| %> |
| <% |
| if(result3.size()>0) |
| { |
| %> |
| <li> |
| <p>Relatórios de avaliação ainda não preenchidos</p> |
| <ul> |
| <% |
| for(CourseUnitDaoImpl.CourseMissingValidationEvaluation mis:result3) |
| { |
| %> |
| <li><%=mis.course.getName()%> / <%=mis.course.getCode()%> |
| <ul> |
| <% |
| for(CourseUnit cu: mis.courseUnits) |
| { |
| %> |
| <li><a href="<%=request.getContextPath()%>/user/startLoadCourseUnitEvaluation.do?courseUnitId=<%=cu.getId()%>"><%=cu.getImportYear()%> / <%=cu.getName()%> / <%=cu.getCode()%></a></li> |
| <% |
| } |
| %> |
| </ul> |
| </li> |
| <% |
| } |
| %> |
| </ul> |
| </li> |
| <% |
| } |
| %> |
| </ul> |
| </div> |
| <% |