Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1996 → Rev 1997

/branches/grupo5/impl/conf/berserk/fd.xml
305,7 → 305,7
<description>
Checks if the requester is teacher in course commission
</description>
<isTransactional>true</isTransactional>
<isTransactional>false</isTransactional>
</filter>
 
 
/branches/grupo5/impl/src/java/pt/estgp/estgweb/services/courses/CourseReportServices.java
588,11 → 588,9
 
public String saveCourseReportDocument (String reportDocumentJson, UserSession session) throws IOException, JSONException
{
System.out.println(reportDocumentJson);
System.out.println("111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111");
CourseReportDocument courseReportDocument = Document.fromJson(reportDocumentJson);
System.out.println("222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222");
//CourseReportDocument courseReportDocument = CourseReportDocument.fromJson(reportDocumentJson);
 
Course course = DaoFactory.getCourseDaoImpl().findCourseByCode(courseReportDocument.getCourseCode());
List<CourseYear> courseYear = DaoFactory.getCourseYearDaoImpl().findCourseYear(courseReportDocument.getCourseCode(), courseReportDocument.getYear());
 
634,16 → 632,7
try {
CourseReportDocument courseReport = createNewCourseReportDocument(courseCode, year);
courseReportJson = courseReport.toJson();
//System.out.println(courseReportJson);
//System.out.println("UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU");
saveCourseReportDocument(courseReportJson, session);
 
//System.out.println("OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO");
//courseReportJson = new CourseReportServices().createNewCourseReportDocument(courseCode, year).toJson();
//System.out.println(courseReportJson);
//System.out.println("UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU");
//courseReport = saveCourseReportDocument(courseReport,session);
//courseReport = loadCourseReportDocument(courseCode, year,session);
} catch (Throwable e) {
System.out.println(e);
e.printStackTrace();
/branches/grupo5/impl/src/java/pt/estgp/estgweb/filters/filters/IsCoordinatorInCourseImpl.java
35,12 → 35,11
if (userSession.getUser().isSuperuser())
return;
 
//request.getServiceParameters().getParameter((String) filterParameters.getParameter(0));//Returns NULL atm
 
String courseCode = (String) request.getServiceParameters().getParameter((String) filterParameters.getParameter(0));
 
String courseCode = "44";
 
CourseImpl course = DaoFactory.getCourseDaoImpl().findCourseByCode(courseCode);
 
if(!course.isFromCourseCommission(userSession.getUser()))
{
logger.warn(userSession.getUser().getUsername() + ":try access restricted area");
/branches/grupo5/impl/src/java/pt/estgp/estgweb/web/controllers/courses/CoursesServicesController.java
78,20 → 78,6
}
 
 
/* AA 7/12/2017 */
 
/*public JSONObject SaveCourseReportDocument(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),
"SaveCourseReportDocument",
new Object[]{courseReportDocument});
return new JSONObject(json);
}*/
 
 
public ActionForward startEdit(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Throwable, ServletException
{
String courseCode = request.getParameter("courseCode");
100,7 → 86,8
IServiceManager sm = ServiceManager.getInstance();
String json = (String) sm.execute(RequestUtils.getRequester(request, response),
"LoadCourseReportDocument",
new Object[]{courseCode,year});
new Object[]{courseCode,year},
new String[]{"courseCode", "year"});
 
request.setAttribute("courseReportJson", json);
//request.setAttribute("courseCode", courseCode);