| /branches/grupo3/impl/src/java/pt/estgp/estgweb/services/courses/CourseReportServices.java |
|---|
| 483,22 → 483,40 |
| } |
| /* Guardar report 7/12/2017 */ |
| /* Guardar report */ |
| public String saveCourseReportDoc(String reportDocumentJson,UserSession session) throws IOException { |
| CourseReportDocument reportDocument = CourseReportDocument.fromJson(reportDocumentJson); |
| Course course = DaoFactory.getCourseDaoImpl().findCourseByCode(reportDocument.getCourseCode()); |
| CourseYear courseYr = DaoFactory.getCourseYearDaoImpl().findCourseYear2(reportDocument.getCourseCode(), reportDocument.getYear()); |
| if(courseYr == null){ |
| courseYr = DomainObjectFactory.createCourseYearImpl(); |
| courseYr.setCourse(course); |
| course.getCourseYears().add(courseYr); |
| courseYr.setImportYear(reportDocument.getYear()); |
| DaoFactory.getCourseYearDaoImpl().save(courseYr); |
| } |
| courseYr.setReportSave(reportDocumentJson); |
| return reportDocument.toJson(); |
| } |
| /* Ler o relatorio */ |
| public String loadCourseReportDoc(UserSession session, String year, String courseCode) throws IOException { |
| CourseYear courseYr = DaoFactory.getCourseYearDaoImpl().findCourseYear2(courseCode, year); |
| String courseReport = null; |
| if(courseYr != null){ |
| courseReport = courseYr.getReportSave(); |
| } |
| return courseReport; |
| } |
| /****************************************************************************/ |
| /* |
| /branches/grupo3/impl/src/java/pt/estgp/estgweb/domain/dao/impl/CourseYearDaoImpl.java |
|---|
| 26,4 → 26,16 |
| .add(eq("c.code",code)).list(); |
| return cYs; |
| } |
| /**/ |
| public CourseYear findCourseYear2(String code, String importYear) |
| { |
| List<CourseYear> cYs = createCriteria() |
| .createAlias("course","c") |
| .add(eq("importYear", importYear)) |
| .add(eq("c.code",code)).list(); |
| if(cYs.isEmpty()) |
| return null; |
| return cYs.get(0); |
| } |
| } |
| /branches/grupo3/impl/src/java/pt/estgp/estgweb/web/controllers/courses/CoursesServicesController.java |
|---|
| 67,4 → 67,17 |
| return new JSONObject(json); |
| } |
| /* */ |
| public JSONObject loadCourseReportDoc(ActionForm form,HttpServletRequest request, HttpServletResponse response) throws Throwable { |
| String courseReportDocument = request.getParameter("courseReportDocument"); |
| IServiceManager sm = ServiceManager.getInstance(); |
| String json = (String) sm.execute(RequestUtils.getRequester(request, response), |
| "LoadCourseReportDoc", |
| new Object[]{courseReportDocument}); |
| return new JSONObject(json); |
| } |
| } |
| /branches/grupo3/impl/src/web/user/courses/coursereport/templates.jsp |
|---|
| 515,7 → 515,7 |
| </td> |
| <td colspan="3" style="font-size: 1.0em !important" ng-if="isInvalidAnfHaveUcs(year,comp.years,$index)"> |
| Unidades que não constam do plano (Verifique a situação com os serviços Académicos antes de continuar) |
| Unidades que não constam do plano (Verifique a situação com os serviços Académicos antes de continuar) |
| poderão constar de um plano antigo ou ter o código siges desatualizado. |
| </td> |
| <td><input readonly="true" type="number" ng-model="year.cumprimentoProgramaPercent" bound-model="avg('cumprimentoProgramaPercent',year,year.semesters)"></td> |
| 685,12 → 685,12 |
| <script type="text/ng-template" id="pt_estgp_estgweb_services_courses_coursereport_documentmodel_learningresults_components_GlobalLearningResultsChartYearImg"> |
| <globallearninglesultschartyearimg> |
| </globallearninglesultschartyearimg> |
| <globallearningresultschartyearimg> |
| </globallearningresultschartyearimg> |
| </script> |
| <script> |
| angular.module("courseReportApp").directive('globallearninglesultschartyearimg', function() { |
| angular.module("courseReportApp").directive('globallearningresultschartyearimg', function() { |
| return { |
| restrict: 'E', |