| /impl/conf/language/MessageResources.properties |
|---|
| 362,6 → 362,7 |
| delete=Apagar |
| confirm=Confirmar |
| save=Salvar |
| deliverEvaluation=Entregar Avaliação |
| add=Adicionar |
| put=Colocar |
| remove=Remover |
| /impl/src/java/pt/estgp/estgweb/services/courseunits/SaveCourseUnitEvaluation.java |
|---|
| 98,8 → 98,8 |
| else |
| { |
| evaluation.setClosed(false); |
| //TODO TIRAR ISTO NO PROXIMO ANO |
| evaluation.setTeacherComplete(true); |
| //TODO novo |
| evaluation.setTeacherComplete(false); |
| } |
| createPdf(evaluation,c,usession,errors); |
| 128,12 → 128,13 |
| )) |
| { |
| evaluation.setClosed(false); |
| evaluation.setTeacherComplete(false); |
| } |
| CourseUnitEvaluationView cupv = new CourseUnitEvaluationView(evaluation); |
| return cupv; |
| } |
| //TODO TEACHER COMPLETE OPEN |
| //TODO TEACHER COMPLETE OPEN not in use coordinatores open and close every fields |
| public CourseUnitEvaluationView setTeacherIncomplete(Long coursUnitId, UserSession usession) throws ServiceException { |
| CourseUnit c = DaoFactory.getCourseUnitDaoImpl().get(coursUnitId); |
| /impl/src/java/pt/estgp/estgweb/web/controllers/courseunits/CourseUnitsEvaluationController.java |
|---|
| 116,6 → 116,45 |
| } |
| } |
| public ActionForward teacherCompleteEvaluation(ActionMapping mapping, |
| ActionForm form, |
| HttpServletRequest request, |
| HttpServletResponse response) |
| throws ServletException |
| { |
| try |
| { |
| CourseUnitEvaluationForm cUF = (CourseUnitEvaluationForm) form; |
| long id = cUF.getCourseUnitView().getId(); |
| CourseUnitEvaluationView cuV = cUF.getCourseUnitEvaluationView(); |
| cuV.setTeacherComplete(true); |
| IServiceManager sm = ServiceManager.getInstance(); |
| Object[] args = new Object[]{cuV, id}; |
| sm.execute(RequestUtils.getRequester(request, response), "SaveCourseUnitEvaluation", args); |
| CourseUnitView cV = loadCourseUnitView(id,true,false, mapping, request, response); |
| cUF.setCourseUnitView(cV); |
| request.setAttribute("CourseUnitView", cV); |
| addMessage(request,"courseunit.evaluation.success"); |
| return mapping.findForward("load"); |
| } |
| catch (FilterChainFailedException e) |
| { |
| return mapping.findForward("error401"); |
| } |
| catch (NotFoundException e) |
| { |
| return mapping.findForward("error404"); |
| } |
| catch (Throwable e) |
| { |
| logger.error(e, e); |
| return mapping.findForward("error500"); |
| } |
| } |
| public ActionForward publishEvaluation(ActionMapping mapping, |
| ActionForm form, |
| HttpServletRequest request, |
| /impl/src/updates/version/release2015-11.txt |
|---|
| 69,3 → 69,7 |
| meter ftp server ionline configurável |
| ver o que fazer com o POP se vai ou nao ao gmail |
| - todo Lembrar de adicionar codigo de instituição ao importador de sumarios |
| - todo lembrar de tirar o teacherComplete dos saves e meter os savez no JSP |
| /impl/src/web/user/courseunits/courseunitEvaluation.jsp |
|---|
| 47,6 → 47,7 |
| } |
| boolean closed = CourseUnitEvaluationForm.getCourseUnitEvaluationView().getCourseUnitEvaluation().isClosed(); |
| boolean teacherComplete = CourseUnitEvaluationForm.getCourseUnitEvaluationView().getCourseUnitEvaluation().isTeacherComplete(); |
| %> |
| 315,6 → 316,17 |
| <% |
| } |
| if(!closed && editTeacherPart && !teacherComplete) |
| { |
| %> |
| <input type="button" value="<bean:message key="deliverEvaluation"/>" onclick="set(form,'teacherCompleteEvaluation');form.submit()"/> |
| <% |
| } |
| if(!closed && editCoordinatorPart) |
| { |
| %> |