| /branches/grupo4/impl/src/java/pt/estgp/estgweb/services/courses/CourseReportServices.java |
|---|
| 637,16 → 637,15 |
| // Vai se preciso, fica já feito mas não sei ao certo o que falta por nos serviços, etc. |
| public String loadReportEdit(String courseCode,String year,UserSession session) { |
| CourseYear courseYear = DaoFactory.getCourseYearDaoImpl().findCourseYear(courseCode, year).get(0); |
| List<CourseYear> courseYear = DaoFactory.getCourseYearDaoImpl().findCourseYear(courseCode, year); |
| String courseReportJson = null; |
| if (courseYear != null) { |
| courseReportJson = courseYear.getCourseReportDocument(); |
| } |
| if (courseReportJson == null) { |
| if (!courseYear.isEmpty()) { |
| courseReportJson = courseYear.get(0).getCourseReportDocument(); |
| }else { |
| CourseReportDocument courseReport = null; |
| try { |
| CourseReportDocument courseReport = createNewCourseReportDocument(courseCode, year); |
| courseReport = new CourseReportServices().createNewCourseReportDocument(courseCode, year); |
| courseReportJson = courseReport.toJson(); |
| saveReportEdit(courseReportJson, session); |
| } catch (Throwable e) { |
| 663,22 → 662,26 |
| //Serviço qur guarda o relatorio que ja foi editado |
| public void saveReportEdit(String reportDocumentJson,UserSession session) throws IOException { |
| public String saveReportEdit(String reportDocumentJson,UserSession session) throws IOException { |
| CourseReportDocument reportDocument = CourseReportDocument.fromJson(reportDocumentJson); |
| CourseYear courseYear = DaoFactory.getCourseYearDaoImpl().findCourseYear(reportDocument.getCourseCode(), reportDocument.getYear()).get(0); |
| List<CourseYear> courseYear = DaoFactory.getCourseYearDaoImpl().findCourseYear(reportDocument.getCourseCode(), reportDocument.getYear()); |
| if (courseYear == null){ |
| if (courseYear.isEmpty()) { |
| Course course = DaoFactory.getCourseDaoImpl().findCourseByCode(reportDocument.getCourseCode()); |
| courseYear = DomainObjectFactory.createCourseYearImpl(); |
| courseYear.setCourse(course); |
| course.getCourseYears().add(courseYear); |
| courseYear.setImportYear(reportDocument.getYear()); |
| DaoFactory.getCourseYearDaoImpl().save(courseYear); |
| CourseYearImpl courseYearImpl = DomainObjectFactory.createCourseYearImpl(); |
| courseYearImpl.setCourse(course); |
| courseYearImpl.setCourseReportDocument(reportDocumentJson); |
| course.getCourseYears().add(courseYearImpl); |
| courseYearImpl.setImportYear(reportDocument.getYear()); |
| DaoFactory.getCourseYearDaoImpl().save(courseYearImpl); |
| }else { |
| courseYear.get(0).setCourseReportDocument(reportDocumentJson); |
| } |
| courseYear.setCourseReportDocument(reportDocumentJson); |
| return reportDocumentJson; |
| } |
| /branches/grupo4/impl/src/java/pt/estgp/estgweb/filters/filters/IsCoordenator.java |
|---|
| 33,6 → 33,7 |
| return; |
| //Vai buscar o Curso |
| Course codigoCurso = (CourseImpl) request.getServiceParameters().getParameter((String) filterParameters.getParameter(0)); |
| CourseImpl curso = DaoFactory.getCourseDaoImpl().findCourseByCode(codigoCurso.getCode()); |
| /branches/grupo4/impl/src/java/pt/estgp/estgweb/web/controllers/courses/CoursesServicesController.java |
|---|
| 49,7 → 49,7 |
| //Controlador que faz load e faz forward para |
| public ActionForward loadController( |
| public ActionForward startLoadEdit( |
| ActionMapping mapping, |
| ActionForm form, |
| HttpServletRequest request, |
| 57,9 → 57,20 |
| throws Throwable, ServletException |
| { |
| //fazer load aqui |
| System.out.println("Mapping XICO"); |
| //System.out.println("Mapping XICO"); |
| //LoadReportEdit |
| String courseCode = request.getParameter("courseCode"); |
| String year = request.getParameter("year"); |
| IServiceManager sm = ServiceManager.getInstance(); |
| String json = (String) sm.execute(RequestUtils.getRequester(request, response), |
| "LoadReportEdit", |
| new Object[]{courseCode, year}); |
| // |
| request.setAttribute("reportDocument", json); |
| return mapping.findForward("reportEdit"); // Vai para o dispach |
| } |
| 68,7 → 79,7 |
| IServiceManager sm = ServiceManager.getInstance(); |
| String json = (String) sm.execute(RequestUtils.getRequester(request, response), |
| "SaveCourseReportDocument", |
| "SaveReportEdit", |
| new Object[]{courseReportDocument}); |
| return new JSONObject(json); |
| } |
| /branches/grupo4/impl/src/web/user/utils/reportEdit.jsp |
|---|
| 95,20 → 95,9 |
| <% |
| String courseCode = request.getParameter("courseCode"); |
| String year = request.getParameter("year"); |
| AbstractDao.getCurrentSession().beginTransaction(); |
| CourseImpl courseImpl = DaoFactory.getCourseDaoImpl().findCourseByCode(courseCode); |
| request.setAttribute("course",courseImpl); |
| CourseReportDocument courseReport = null; |
| try { |
| courseReport = new CourseReportServices().createNewCourseReportDocument(courseCode, year); |
| } catch (Throwable e) { |
| System.out.println(e); |
| e.printStackTrace(); |
| } |
| String courseReportJson = courseReport.toJson(); |
| request.setAttribute("courseDocumentJson",courseReportJson); |
| request.setAttribute("courseDocument",courseReport); |
| %> |
| <%--<a href="javascript:demoFromHTML()" class="button">Run Code</a>--%> |
| 170,7 → 159,7 |
| { |
| $scope.docAppSelector = "#courseReportApp"; |
| $scope.report = <%=courseReportJson%> |
| $scope.report = ${reportDocument} |
| $scope.resize = function(evt,ui,comp) { |
| //console.log (evt,ui); |