Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1204 → Rev 1209

/impl/conf/language/MessageResourcesCourse.properties
40,7 → 40,7
course.C=Acções de Formação de Curta Duração
course.A=Formações Avançadas
course.O=Outras Formações
course.T=TeSP
course.T=CTeSP
course.D=Diploma de Estudos Superiores Especializados
course.H=Doutoramento
course.Z=Desconhecido
/impl/src/java/pt/estgp/estgweb/services/courseunits/SaveCourseUnitEvaluation.java
61,7 → 61,7
evaluation = new CourseUnitEvaluationImpl();
DaoFactory.getCourseUnitEvaluationDaoImpl().save(evaluation);
c.setCourseUnitEvaluation(evaluation);
cupv.setCourseUnitEvaluation(evaluation);
 
}
//
 
105,6 → 105,7
//TODO novo
evaluation.setTeacherComplete(false);
}
cupv.setCourseUnitEvaluation(evaluation);
 
 
if(!cupv.isAutosave())
/impl/src/web/admin/courses/courseComissions.jsp
34,6 → 34,7
<%
String importYear = request.getParameter("importYear");
 
String nowInterfaceImportYear = DaoFactory.getConfigurationDaoImpl().getInterfaceImportYear();
 
if(importYear == null || importYear.length()==0)
{
86,16 → 87,18
<thead>
<tr>
<th>Codigo</th>
<th>Grau</th>
<th>Tipo de Curso</th>
<th>Curso</th>
<baco:hasRole role="services,admin,all">
<th>Activo</th>
<th>Papel Comissão Curso</th>
<th>Unidades <%=importYear%></th>
<th>Unidades noutros anos</th>
</baco:hasRole>
<th>Comissão de Curso</th>
<baco:hasRole role="services,admin,all">
<th></th>
<th>Unidades</th>
<th>Editar</th>
</baco:hasRole>
</tr>
</thead>
109,7 → 112,9
int unitsSize=DaoFactory.getCourseDaoImpl().countCoursesUnits(importYear,c.getId());
int unitsSizeOthers=DaoFactory.getCourseDaoImpl().countCoursesUnitsNot(importYear, c.getId());
int totalUnits = unitsSize + unitsSizeOthers;
if(totalUnits > 0 || userSession.getUser().isAdmin() || userSession.getUser().hasRole("services"))
//So da verdadeiro se estivermos neste ano e ele estiver inativo
boolean notActiveAndActualThisYear = nowInterfaceImportYear.equals(importYear) && !cv.isStatus();
if((totalUnits > 0 && !notActiveAndActualThisYear) || userSession.getUser().isAdmin() || userSession.getUser().hasRole("services"))
{
%>
 
118,6 → 123,7
<td><bean:message key="course.${CourseView.degreeCleanCode}"/></td>
<td>${CourseView.name}</td>
<baco:hasRole role="services,admin,all">
<td>${CourseView.status}</td>
<td>
<logic:notEmpty name="CourseView" property="validationRole">
<bean:message key="user.role.${CourseView.validationRole}"/>
157,7 → 163,13
<a class="btn btn-default" target="_blank" href="<%=request.getContextPath()%>/user/courseCourseUnits.do?courseId=<%=c.getId()%>">
<span class="glyphicon glyphicon-list-alt"></span>
</a>
 
</td>
<td>
<a class="btn btn-warning" target="_blank" href="<%=request.getContextPath()%>/user/courseControllerFromServiceZone.do?dispatch=edit&courseView.id=<%=c.getId()%>">
<span class="glyphicon glyphicon-pencil"></span>
</a>
</td>
</baco:hasRole>
</tr>
<%
/impl/src/web/user/courseunits/courseunitEvaluation.jsp
322,9 → 322,10
 
function serData()
{
$("#dispatch").val("saveEvaluation");
var data = $("#formEval").serialize().replace(/%0D%0A/g, '%0A').replace(/\r?\n/g, "\r\n");
//alert(data);
$("#dispatch").val("saveEvaluation");
 
//alert($("#dispatch").val())
$("#autosave").html("Enviando...")
$.post('<%=request.getContextPath()%>/user/courseUnitEvaluationController.do', data + "&json=true",