Rev 1936 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1936 | Rev 1974 | ||
---|---|---|---|
Line 14... | Line 14... | ||
14 | <%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %> |
14 | <%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %> |
15 | <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> |
15 | <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> |
16 | <%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %> |
16 | <%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %> |
17 | <%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %> |
17 | <%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %> |
18 | <%@taglib prefix="t" tagdir="/WEB-INF/tags" %> |
18 | <%@taglib prefix="t" tagdir="/WEB-INF/tags" %> |
- | 19 | <jsp:useBean id="UserSession" type="pt.estgp.estgweb.domain.UserSessionImpl" scope="request"/> |
|
19 | 20 | ||
20 | <link rel="stylesheet" href="<%=request.getContextPath()%>/js/jquery-ui-1.12.1/jquery-ui.css"> |
21 | <link rel="stylesheet" href="<%=request.getContextPath()%>/js/jquery-ui-1.12.1/jquery-ui.css"> |
21 | <script src="<%=request.getContextPath()%>/js/jquery-ui-1.12.1/jquery-ui.min.js"></script> |
22 | <script src="<%=request.getContextPath()%>/js/jquery-ui-1.12.1/jquery-ui.min.js"></script> |
22 | <link rel="stylesheet" href="<%=request.getContextPath()%>/css/flora-commons/flora.resizable.css"> |
23 | <link rel="stylesheet" href="<%=request.getContextPath()%>/css/flora-commons/flora.resizable.css"> |
23 | <script src="https://cdnjs.cloudflare.com/ajax/libs/jspdf/1.3.2/jspdf.min.js"></script> |
24 | <script src="https://cdnjs.cloudflare.com/ajax/libs/jspdf/1.3.2/jspdf.min.js"></script> |
Line 101... | Line 102... | ||
101 | 102 | ||
102 | AbstractDao.getCurrentSession().beginTransaction(); |
103 | AbstractDao.getCurrentSession().beginTransaction(); |
103 | CourseImpl courseImpl = DaoFactory.getCourseDaoImpl().findCourseByCode(courseCode); |
104 | CourseImpl courseImpl = DaoFactory.getCourseDaoImpl().findCourseByCode(courseCode); |
104 | request.setAttribute("course",courseImpl); |
105 | request.setAttribute("course",courseImpl); |
105 | 106 | ||
106 | CourseReportDocument courseReportDocument = null; |
107 | CourseReportDocument courseReportDocument = new CourseReportDocument(); |
107 | 108 | ||
108 | String auxCourseReportDocument; |
109 | String auxCourseReportDocument; |
109 | auxCourseReportDocument = new CourseReportServices().loadCourseReportDocument(courseCode,year); |
110 | auxCourseReportDocument = new CourseReportServices().loadCourseReportDocument(courseCode,year,UserSession); |
110 | 111 | ||
111 | try { |
112 | try { |
112 | courseReportDocument = courseReportDocument.fromJson(auxCourseReportDocument); |
113 | //courseReportDocument = courseReportDocument.fromJson(auxCourseReportDocument); |
- | 114 | courseReportDocument = new CourseReportServices().createNewCourseReportDocument(courseCode, year); |
|
113 | }catch (Throwable e) { |
115 | }catch (Throwable e) { |
114 | System.out.println(e); |
116 | System.out.println(e); |
115 | e.printStackTrace(); |
117 | e.printStackTrace(); |
116 | } |
118 | } |
- | 119 | ||
- | 120 | ||
117 | /*try { |
121 | /*try { |
118 | courseReport = new CourseReportServices().createNewCourseReportDocument(courseCode, year); |
- | |
- | 122 | ||
119 | } catch (Throwable e) { |
123 | } catch (Throwable e) { |
- | 124 | courseReportDocument = new CourseReportServices().createNewCourseReportDocument(courseCode, year); |
|
120 | System.out.println(e); |
125 | System.out.println(e); |
121 | e.printStackTrace(); |
126 | e.printStackTrace(); |
122 | }*/ |
127 | }*/ |
123 | 128 | ||
124 | String courseReportJson = courseReportDocument.toJson(); |
129 | String courseReportJson = courseReportDocument.toJson(); |