9,6 → 9,8 |
<%@ page import="org.json.JSONException" %> |
<%@ page import="pt.estgp.estgweb.services.sigesimports.ImportCourseService" %> |
<%@ page import="pt.estgp.estgweb.domain.UserSession" %> |
<%@ page import="pt.estgp.estgweb.domain.Course" %> |
<%@ page import="pt.estgp.estgweb.utils.documentBuilder.Document" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %> |
<%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %> |
18,6 → 20,8 |
<%@taglib prefix="t" tagdir="/WEB-INF/tags" %> |
<jsp:useBean id="UserSession" type="pt.estgp.estgweb.domain.UserSessionImpl" scope="request"/> |
|
<jsp:useBean id="courseReportJson" type="java.lang.String" scope="request"/> |
|
<link rel="stylesheet" href="<%=request.getContextPath()%>/js/jquery-ui-1.12.1/jquery-ui.css"> |
<script src="<%=request.getContextPath()%>/js/jquery-ui-1.12.1/jquery-ui.min.js"></script> |
<link rel="stylesheet" href="<%=request.getContextPath()%>/css/flora-commons/flora.resizable.css"> |
96,7 → 100,20 |
</script> |
|
<% |
AbstractDao.getCurrentSession().beginTransaction(); |
|
CourseReportDocument courseReportJson1; |
courseReportJson1 = Document.fromJson(courseReportJson); |
|
CourseImpl courseImpl = DaoFactory.getCourseDaoImpl().findCourseByCode(courseReportJson1.getCourseCode()); |
request.setAttribute("course",courseImpl); |
|
|
/*String courseCode = request.getParameter("courseCode"); |
AbstractDao.getCurrentSession().beginTransaction(); |
CourseImpl courseImpl = DaoFactory.getCourseDaoImpl().findCourseByCode(courseCode); |
request.setAttribute("course",courseImpl);*/ |
/* |
String courseCode = request.getParameter("courseCode"); |
String year = request.getParameter("year"); |
|
106,8 → 123,8 |
|
CourseReportDocument courseReportDocument = new CourseReportDocument(); |
|
String auxCourseReportDocument; |
auxCourseReportDocument = new CourseReportServices().loadCourseReportDocument(courseCode,year,UserSession); |
//String auxCourseReportDocument; |
//auxCourseReportDocument = new CourseReportServices().loadCourseReportDocument(courseCode,year,UserSession); |
|
try { |
//courseReportDocument = courseReportDocument.fromJson(auxCourseReportDocument); |
117,6 → 134,9 |
e.printStackTrace(); |
} |
|
String courseReportJson = courseReportDocument.toJson(); |
request.setAttribute("courseDocumentJson",courseReportJson); |
request.setAttribute("courseDocument",courseReportDocument); |
|
/*try { |
|
125,12 → 145,10 |
System.out.println(e); |
e.printStackTrace(); |
}*/ |
%> |
|
String courseReportJson = courseReportDocument.toJson(); |
request.setAttribute("courseDocumentJson",courseReportJson); |
request.setAttribute("courseDocument",courseReportDocument); |
|
%> |
|
<%--<a href="javascript:demoFromHTML()" class="button">Run Code</a>--%> |
|
<div class="container-fluid"> |
190,7 → 208,7 |
{ |
|
$scope.docAppSelector = "#courseReportApp"; |
$scope.report = <%=courseReportJson%> |
$scope.report = ${courseReportJson} |
|
$scope.resize = function(evt,ui,comp) { |
//console.log (evt,ui); |
379,5 → 397,5 |
</div><!--container-fluid--> |
|
<% |
AbstractDao.getCurrentSession().getTransaction().commit(); |
|
%> |