Rev 1916 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1916 | Rev 1929 | ||
---|---|---|---|
Line 90... | Line 90... | ||
90 | }, margins |
90 | }, margins |
91 | ); |
91 | ); |
92 | } |
92 | } |
93 | </script> |
93 | </script> |
94 | 94 | ||
95 | <% |
- | |
96 | String courseCode = request.getParameter("courseCode"); |
- | |
97 | String year = request.getParameter("year"); |
- | |
98 | - | ||
99 | String courseReportJson = null; |
95 | <script>ping()</script> |
100 | try { |
- | |
101 | IServiceManager sm = ServiceManager.getInstance(); |
- | |
102 | courseReportJson = (String) sm.execute(RequestUtils.getRequester(request, response), |
96 | <jsp:useBean id="courseReportJson" type="java.lang.String" scope="request"/> |
103 | "LoadCourseReportDocument", |
- | |
104 | new Object[]{courseCode, year}); |
- | |
105 | } catch (Throwable throwable) { |
- | |
106 | throwable.printStackTrace(); |
- | |
107 | } |
- | |
108 | request.setAttribute("courseDocumentJson",courseReportJson); |
97 | <jsp:useBean id="course" type="pt.estgp.estgweb.domain.CourseImpl" scope="request"/> |
109 | 98 | ||
110 | 99 | <% |
|
111 | AbstractDao.getCurrentSession().beginTransaction(); |
100 | //AbstractDao.getCurrentSession().beginTransaction(); |
112 | CourseImpl courseImpl = DaoFactory.getCourseDaoImpl().findCourseByCode(courseCode); |
- | |
113 | request.setAttribute("course",courseImpl); |
- | |
114 | - | ||
115 | //request.setAttribute("courseDocument",courseReport); |
- | |
116 | %> |
101 | %> |
117 | <%--<a href="javascript:demoFromHTML()" class="button">Run Code</a>--%> |
102 | <%--<a href="javascript:demoFromHTML()" class="button">Run Code</a>--%> |
118 | 103 | ||
119 | <div class="container-fluid"> |
104 | <div class="container-fluid"> |
120 | 105 | ||
Line 171... | Line 156... | ||
171 | 156 | ||
172 | courseReportApp.controller('courseReportAppController', function($scope) |
157 | courseReportApp.controller('courseReportAppController', function($scope) |
173 | { |
158 | { |
174 | 159 | ||
175 | $scope.docAppSelector = "#courseReportApp"; |
160 | $scope.docAppSelector = "#courseReportApp"; |
176 | $scope.report = <%=courseReportJson%> |
161 | $scope.report = ${courseReportJson} |
177 | 162 | ||
178 | $scope.resize = function(evt,ui,comp) { |
163 | $scope.resize = function(evt,ui,comp) { |
179 | //console.log (evt,ui); |
164 | //console.log (evt,ui); |
180 | comp.width = ui.size.width; |
165 | comp.width = ui.size.width; |
181 | comp.height = ui.size.height; |
166 | comp.height = ui.size.height; |
Line 364... | Line 349... | ||
364 | </div><!--Panel--> |
349 | </div><!--Panel--> |
365 | 350 | ||
366 | </div><!--container-fluid--> |
351 | </div><!--container-fluid--> |
367 | 352 | ||
368 | <% |
353 | <% |
369 | AbstractDao.getCurrentSession().getTransaction().commit(); |
354 | //AbstractDao.getCurrentSession().getTransaction().commit(); |
370 | %> |
355 | %> |
371 | 356 |