Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1536 → Rev 1540

/branches/v3/impl/conf/WEB-INF/struts/struts-courses.xml
64,8 → 64,9
scope="request"
parameter="dispatch"
validate="false"
input="page.separators.serviceZone">
input="page.select.course.from.service.zone">
<forward name="submit" path="page.submit.course.from.service.zone"/>
<forward name="adminStudiesPlans" path="page.admin.course.studyplans"/>
<forward name="load.courses.programs" path="page.courses.programs.from.service.zone"/>
<forward name="load.directed.coordinated.courses" path="page.directed.coordinated.courses.from.service.zone"/>
<forward name="confirm.courses.programs" path="page.separators.serviceZone"/>
/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/domain/dao/impl/JobServiceTaskSchedulerDaoImpl.java
1,5 → 1,12
package pt.estgp.estgweb.domain.dao.impl;
 
import jomm.dao.DaoException;
import org.hibernate.HibernateException;
import org.hibernate.criterion.Order;
import pt.estgp.estgweb.domain.JobServiceTaskScheduler;
 
import java.util.List;
 
/**
* @author Jorge Machado
* @date 28/Fev/2008
16,6 → 23,18
}
 
 
public List<JobServiceTaskScheduler> findAllOrderByDescription()
{
try
{
return createCriteria().addOrder(Order.asc("description")).list();
}
catch (HibernateException e)
{
throw new DaoException(e);
}
}
 
 
 
}
/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,
/branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/configuration/SchedulerTasksController.java
63,10 → 63,15
JobServiceTaskSchedulerImpl d = (JobServiceTaskSchedulerImpl) sm.execute(RequestUtils.getRequester(request, response), "LoadJobServiceTaskScheduler", args, names);
for(JobServiceTaskSchedulerParameter p: d.getServiceTaskSchedulerParameters())
{
if(p.getName().equals(ServiceJob.JOB_importYear_KEY))
if(p.getName().equals(ServiceJob.JOB_institution_KEY))
{
sf.setJobInstitutionCode(p.getObject());
}
else if(p.getName().equals(ServiceJob.JOB_importYear_KEY))
{
sf.setJobImportYearKey(p.getObject());
}else if(p.getName().equals(ServiceJob.JOB_semestre_KEY))
}
else if(p.getName().equals(ServiceJob.JOB_semestre_KEY))
{
sf.setJobSemestreKey(p.getObject());
}
/branches/v3/impl/src/web/admin/courses/course.jsp
223,6 → 223,7
request.setAttribute("targetRoles",targetRoles);
%>
<html:select styleClass="form-control" onchange="alertPermissions()" property="courseView.validationRole">
<html:option value=""></html:option>
<logic:iterate id="role" name="targetRoles">
<html:option value="${role}" key="user.role.${role}"/>
</logic:iterate>
285,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/admin/configuration/tasks.jsp
5,6 → 5,7
<%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
<%@ page import="java.util.List" %>
<%@ page import="pt.estgp.estgweb.utils.ConfigProperties" %>
<%@ page import="java.util.Collections" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
46,7 → 47,7
 
<%
AbstractDao.getCurrentSession().beginTransaction();
List<JobServiceTaskScheduler> schedulledTasks = DaoFactory.getJobServiceTaskSchedulerDaoImpl().findAll();
List<JobServiceTaskScheduler> schedulledTasks = DaoFactory.getJobServiceTaskSchedulerDaoImpl().findAllOrderByDescription();
request.setAttribute("tasks",schedulledTasks);
%>
 
/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}">