| /impl/conf/language/MessageResourcesCourse.properties |
|---|
| 91,3 → 91,5 |
| course.menu.publicacoes=Publicações |
| status=Curso Activo |
| courses.fill.course=Por favor escolha pelo menos um curso nos filtros. |
| /impl/src/java/pt/estgp/estgweb/services/courses/CoursesCommonServices.java |
|---|
| 125,13 → 125,13 |
| int missing = DaoFactory.getCourseUnitDaoImpl().countMissingProgramGivenCourse(course.getId()); |
| if(missing > 0) |
| { |
| DefaultToDo defaultToDo = new DefaultToDo(course.getName(),null,null, "course.courseunit.program.objectives.todo",""+missing,"/user/startLoadCoursesProgramsFromHome.do#" + course.getId()); |
| DefaultToDo defaultToDo = new DefaultToDo(course.getName(),null,null, "course.courseunit.program.objectives.todo",""+missing,"/user/startLoadCoursesProgramsFromHome.do?courseId=" + course.getId() + "#" + course.getId()); |
| todos.add(defaultToDo); |
| } |
| int missingValidate = DaoFactory.getCourseUnitDaoImpl().countMissingProgramValidateCourse(course.getId()); |
| if(missingValidate > 0) |
| { |
| DefaultToDo defaultToDo = new DefaultToDo(course.getName(),null,null, "course.courseunit.program.validate.todo",""+missingValidate,"/user/startLoadCoursesProgramsFromHome.do#" + course.getId()); |
| DefaultToDo defaultToDo = new DefaultToDo(course.getName(),null,null, "course.courseunit.program.validate.todo",""+missingValidate,"/user/startLoadCoursesProgramsFromHome.do?courseId=" + course.getId() + "#" + course.getId()); |
| todos.add(defaultToDo); |
| } |
| } |
| 145,7 → 145,7 |
| int missing = DaoFactory.getCourseUnitDaoImpl().countMissingProgramGivenCourse(course.getId()); |
| if(missing > 0) |
| { |
| DefaultToDo defaultToDo = new DefaultToDo(course.getName(),null,null, "course.courseunit.program.objectives.todo",""+missing,"/user/startLoadCoursesProgramsFromHome.do#" + course.getId()); |
| DefaultToDo defaultToDo = new DefaultToDo(course.getName(),null,null, "course.courseunit.program.objectives.todo",""+missing,"/user/startLoadCoursesProgramsFromHome.do?courseId=" + course.getId() + "#" + course.getId()); |
| todos.add(defaultToDo); |
| } |
| } |
| /impl/src/java/pt/estgp/estgweb/services/courseunits/DirectedCoordinatedCourses.java |
|---|
| 1,8 → 1,8 |
| package pt.estgp.estgweb.services.courseunits; |
| import jomm.utils.AutoFillArrayList; |
| import pt.estgp.estgweb.domain.views.CourseView; |
| import java.util.ArrayList; |
| import java.util.List; |
| /** |
| 75,7 → 75,8 |
| public List<CourseView> getMerge() |
| { |
| if(merge == null) |
| merge = new AutoFillArrayList<CourseView>(CourseView.class); |
| //merge = new AutoFillArrayList<CourseView>(CourseView.class); |
| merge = new ArrayList<CourseView>(); |
| return merge; |
| } |
| /impl/src/java/pt/estgp/estgweb/services/courseunits/DirectedCoordinatedUnitsService.java |
|---|
| 96,6 → 96,13 |
| if(importYear == null) |
| importYear = DaoFactory.getConfigurationDaoImpl().getInterfaceImportYear(); |
| DirectedCoordinatedCourses directedCoordinatedCourses; |
| if(courseId <= 0) |
| { |
| directedCoordinatedCourses = new DirectedCoordinatedCourses(); |
| return directedCoordinatedCourses; |
| } |
| /** |
| * Area and Course Initialization |
| */ |
| 142,7 → 149,7 |
| courseViews.add(cV); |
| } |
| fill(courseViews, semestre, importYear, teachersSituationEnum); |
| DirectedCoordinatedCourses directedCoordinatedCourses = new DirectedCoordinatedCourses(); |
| directedCoordinatedCourses = new DirectedCoordinatedCourses(); |
| directedCoordinatedCourses.setMerge(courseViews); |
| directedCoordinatedCourses.setArea(area); |
| directedCoordinatedCourses.setCourseId(courseId); |
| /impl/src/java/pt/estgp/estgweb/web/controllers/courses/CoursesController.java |
|---|
| 284,6 → 284,11 |
| CourseForm cF = (CourseForm) form; |
| String importYear = cF.getImportYear(); |
| long courseId = cF.getCourseId(); |
| if(courseId <= 0) |
| { |
| addError(request,"courses.fill.course"); |
| return mapping.findForward("load.courses.programs"); |
| } |
| String semestre = cF.getSemestre(); |
| String area = cF.getArea(); |
| DirectedCoordinatedUnitsService.TeachersSituationEnum teachersSituationEnum = cF.getTeacherSituationEnum(); |
| /impl/src/web/user/home/teacher.jsp |
|---|
| 280,7 → 280,7 |
| for(CourseUnitDaoImpl.CourseMissingValidationProgram mis:result) |
| { |
| %> |
| <li><a href="<%=request.getContextPath()%>/user/startLoadCoursesProgramsFromHome.do#<%=mis.course.getId()%>"><%=mis.course.getName()%> (<%=mis.courseUnits.size()%>)</a></li> |
| <li><a href="<%=request.getContextPath()%>/user/startLoadCoursesProgramsFromHome.do?courseId=<%=mis.course.getId()%>#<%=mis.course.getId()%>"><%=mis.course.getName()%> (<%=mis.courseUnits.size()%>)</a></li> |
| <% |
| } |
| %> |