Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1539 → Rev 1540

/branches/v3/impl/src/web/admin/courses/course.jsp
286,8 → 286,9
<bean:message key="course.studies.plan"/>(Versão nova PAE)
 
<baco:hasRole role="admin,all,servicesStudiesPlans">
<a class="btn btn-warning" href="<%=request.getContextPath()%>/user/adminStudyPlans.do?courseId=<%=CourseView.getId()%>">
<span class="glyphicon glyphicon-pencil"></span> Gerir Planos</a>
<button class="btn btn-warning" type="button" onclick="set(this.form,'submitAndAdminStudyPlan');this.form.submit()">
<span class="glyphicon glyphicon-pencil"></span> Gerir Planos
</button>
</baco:hasRole>
<baco:hasNotRole role="admin,all,servicesStudiesPlans">
<label class="text-info"> Necessita do papel de Gestão de Planos de Estudos para editar os planos</label>
/branches/v3/impl/src/web/user/courses/topnavPlansAdminFromCourseEdit.jsp
12,7 → 12,7
 
AbstractDao.getCurrentSession().beginTransaction();
 
long courseId;
Long courseId;
Course course;
if(request.getAttribute("CourseStudiesPlansAdminForm") != null)
{
21,7 → 21,11
}
else
{
courseId = Long.parseLong(request.getParameter("courseId"));
if(request.getParameter("courseId") != null)
courseId = Long.parseLong(request.getParameter("courseId"));
else
courseId = (Long) request.getAttribute("courseId");
 
//provavelmente era mais facil ter um Form Nested com toda a informação, ou então faz-se isso numa pagina propria para editar o plano em questão
}
course = DaoFactory.getCourseDaoImpl().load(courseId);
/branches/v3/impl/src/web/user/courses/selectCourse.jsp
1,11 → 1,13
<%@ page import="jomm.dao.impl.AbstractDao" %>
<%@ page import="pt.estgp.estgweb.domain.CourseDepartment" %>
<%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
<%@ page import="pt.estgp.estgweb.domain.views.CourseView" %>
<%@ page import="pt.estgp.estgweb.web.utils.RequestUtils" %>
<%@ page import="pt.utl.ist.berserk.logic.serviceManager.IServiceManager" %>
<%@ page import="pt.utl.ist.berserk.logic.serviceManager.ServiceManager" %>
<%@ page import="java.util.List" %>
<%@ page import="pt.estgp.estgweb.domain.dao.impl.ConfigurationDaoImpl" %>
<%@ page import="pt.estgp.estgweb.domain.*" %>
<%@ page import="pt.estgp.estgweb.web.UserSessionProxy" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
13,6 → 15,7
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
<jsp:useBean id="UserSession" type="pt.estgp.estgweb.domain.UserSessionImpl" scope="request"/>
<%
IServiceManager sm = ServiceManager.getInstance();
String[] names = new String[]{};
33,13 → 36,18
<table class="tablesorter tablesorterfiltered">
<thead>
<tr>
<th class="filter-name filter-select">SITE IPP</th>
<th class="filter-name filter-select"><bean:message key="status"/></th>
<th><bean:message key="course.code"/>(SIGES)</th>
<th class="filter-name filter-select responsiveChosenFilter"><bean:message key="course.label"/></th>
<th class="filter-name filter-select"><bean:message key="course.degree"/></th>
<th class="filter-name filter-select"><bean:message key="course.area"/></th>
<th class="filter-name filter-select"><bean:message key="course.importYear"/></th>
<th><bean:message key="course.validation.role"/></th>
<th>
<bean:message key="course.coordinator"/>
<%--<bean:message key="course.validation.role"/>--%>
 
</th>
<th><bean:message key="course.studies.plan"/></th>
<th></th>
</tr>
48,6 → 56,14
<logic:iterate id="course" name="Courses" type="pt.estgp.estgweb.domain.views.CourseView">
<tr>
<td>
<logic:equal value="true" name="course" property="showStudiesPlan">
<label class="label label-success"><bean:message key="yes"/></label>
</logic:equal>
<logic:equal value="false" name="course" property="showStudiesPlan">
<bean:message key="no"/>
</logic:equal>
</td>
<td>
<logic:equal value="true" name="course" property="status">
<bean:message key="yes"/>
</logic:equal>
69,22 → 85,51
</baco:hasRole>--%>
${course.courseDepartment.name}
</td>
<td>${course.importYear}</td>
<td>
<logic:present name="course" property="validationRole">
<%
if(course.getImportYear().equals(UserSession.getNowConfiguration().getInterfaceImportYear()))
{
%><label class="label label-info">${course.importYear}</label><%
}
else
{
%>${course.importYear}<%
}
%>
 
</td>
<td>
 
<logic:notEqual name="course" property="coordinator.name" value="">
${course.coordinator.name}
</logic:notEqual>
<logic:equal name="course" property="coordinator.name" value="">
---
</logic:equal>
 
<%--<logic:present name="course" property="validationRole">
<bean:message key="user.role.${course.validationRole}"/>
</logic:present>
<logic:notPresent name="course" property="validationRole">
---
</logic:notPresent>
</logic:notPresent>--%>
 
</td>
<td>
<logic:present name="CourseView" property="studiesPlan">
 
<logic:equal name="course" property="studiesPlanVersion" value="">
---
</logic:equal>
<logic:notEqual name="course" property="studiesPlanVersion" value="">
<label class="label label-info">v${course.studiesPlanVersion}</label>
</logic:notEqual>
 
<%--</logic:notEqual>
<a href="<%=request.getContextPath()%>/repositoryStream/${course.studiesPlanStreamId}"><bean:message key="course.studies.plan"/></a>
</logic:present>
<logic:notPresent name="CourseView" property="studiesPlan">
<logic:notPresent name="course" property="studiesPlan">
---
</logic:notPresent>
</logic:notPresent>--%>
</td>
<td>
<a class="btn btn-warning" href="<%=request.getContextPath()%>/user/courseControllerFromServiceZone.do?dispatch=editAdmin&courseView.id=${course.id}">