Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1538 → Rev 1540

/branches/v3/impl/src/java/pt/estgp/estgweb/domain/views/CourseView.java
81,6 → 81,9
private List<CourseUnitView> courseUnitsWithProgramCheckedT4;
private List<CourseUnitView> courseUnitsWithProgramNotCheckedT4;
 
//NEW VERSION
private String studiesPlanVersion = "";
//OLD VERSION STUDIES PLAN
private String studiesPlanStreamId;
private RepositoryFileImpl studiesPlan;
private String htmlResult;
177,6 → 180,10
this.externalSiteServer = course.getExternalSiteServer();
this.status = course.isStatus();
this.showStudiesPlan = course.isShowStudiesPlan();
if(course.getStudiesPlans() != null && course.getStudiesPlans().size() > 0)
{
studiesPlanVersion = course.getStudiesPlans().iterator().next().getVersion() + "";
}
this.userGroupStudents = course.getUserGroupStudents();
if(course.getStudiesPlan() != null)
this.studiesPlanStreamId = course.getStudiesPlan();
768,6 → 775,14
this.showStudiesPlan = showStudiesPlan;
}
 
public String getStudiesPlanVersion() {
return studiesPlanVersion;
}
 
public void setStudiesPlanVersion(String studiesPlanVersion) {
this.studiesPlanVersion = studiesPlanVersion;
}
 
public boolean isSeparatedUnits(String year)
{
for(CourseYearView cyv: courseYearViews)
/branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/courses/CoursesController.java
288,6 → 288,24
}
}
 
public ActionForward submitAndAdminStudyPlan(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
throws ServletException
{
ActionForward forward = submit(mapping,form,request,response);
if(forward.getPath() == mapping.getInputForward().getPath())
{
CourseForm cF = (CourseForm) form;
long id = cF.getCourseView().getId();
request.setAttribute("courseId",id);
return mapping.findForward("adminStudiesPlans");
}
return forward;
 
}
 
public ActionForward submit(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,