Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1528 → Rev 1529

/branches/v3/impl/src/java/pt/estgp/estgweb/domain/views/CourseUnitView.java
58,6 → 58,7
private UserView validatorUser;
private boolean teacherCompleteEvaluation = false;
private boolean validEvaluation = false;
private boolean validationEvaluation = false;
private int programSize;
private String extension;
private List<CourseUnitAssignementView> courseUnitAssignements;
166,6 → 167,7
{
evaluationStreamId = courseUnit.getEvaluationStreamId();
validEvaluation = courseUnit.getCourseUnitEvaluation().isClosed();
validationEvaluation = courseUnit.getCourseUnitEvaluation().isTeacherComplete();
teacherCompleteEvaluation = courseUnit.getCourseUnitEvaluation().isTeacherComplete();
}
 
264,6 → 266,9
return validEvaluation;
}
 
public boolean isValidationEvaluation() {
return validationEvaluation;
}
 
public long getCoordinatorId() {
return coordinatorId;
/branches/v3/impl/src/web/imgs/check.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream
/branches/v3/impl/src/web/user/courseunits/courseunitEvaluation.jsp
375,49 → 375,54
<div class="alert alert-success"><bean:message key="courseunit.evaluation.dtp.info"/></div>
</logic:equal>
 
<div class="row-centered">
<!-- ESTADOS -->
 
 
 
<div class="row-centered clearfix">
<baco:clearOperation name="CourseUnitView" property="courseUnit" op="EVALUATION_INFO_STATE_EDIT">
<div class="alert alert-info col-md-3 col-sm-3">
<bean:message key="courseunit.evaluation.state.edit"/>
<div class="alert alert-warning col-md-3 col-sm-3">
<span class="glyphicon glyphicon-edit"></span> Em edição (Qualquer docente da unidade pode editar e entregar)
</div>
<div class="col-md-1 col-sm-1 vcenter alert"><span class="glyphicon glyphicon-chevron-right"/></div>
<div class="alert alert-disabled col-md-3 col-sm-3">
<bean:message key="courseunit.evaluation.state.complete"/>
<span class="glyphicon glyphicon-education"></span> Comissão aguarda entrega do docente
</div>
<div class="col-md-1 col-sm-1 vcenter alert"><span class="glyphicon glyphicon-chevron-right"/></div>
<div class="alert alert-disabled col-md-3 col-sm-3">
<bean:message key="courseunit.evaluation.state.closed"/>
<span class="glyphicon glyphicon-flag"></span> <bean:message key="courseunit.evaluation.state.closed"/>
</div>
</baco:clearOperation>
<baco:clearOperation name="CourseUnitView" property="courseUnit" op="EVALUATION_INFO_STATE_COMPLETE">
<div class="alert alert-info col-md-3 col-sm-3">
<bean:message key="courseunit.evaluation.state.edit"/>
<div class="alert alert-success col-md-3 col-sm-3">
<span class="glyphicon glyphicon-edit"></span> Entregue pelo Docente
</div>
<div class="col-md-1 col-sm-1 vcenter alert"><span class="glyphicon glyphicon-chevron-right"/></div>
<div class="alert alert-info col-md-3 col-sm-3">
<bean:message key="courseunit.evaluation.state.complete"/>
<div class="alert alert-warning col-md-3 col-sm-3">
<span class="glyphicon glyphicon-education"></span> Em <bean:message key="courseunit.evaluation.state.complete"/> pela comissão
</div>
<div class="col-md-1 col-sm-1 vcenter alert"><span class="glyphicon glyphicon-chevron-right"/></div>
<div class="alert alert-disabled col-md-3 col-sm-3">
<bean:message key="courseunit.evaluation.state.closed"/>
<span class="glyphicon glyphicon-flag"></span> <bean:message key="courseunit.evaluation.state.closed"/>
</div>
</baco:clearOperation>
<baco:clearOperation name="CourseUnitView" property="courseUnit" op="EVALUATION_INFO_STATE_CLOSED">
<div class="alert alert-info col-md-3 col-sm-3">
<bean:message key="courseunit.evaluation.state.edit"/>
<div class="alert alert-success col-md-3 col-sm-3">
<span class="glyphicon glyphicon-edit"></span> Entregue pelo Docente
</div>
<div class="col-md-1 col-sm-1 vcenter alert"><span class="glyphicon glyphicon-chevron-right"/></div>
<div class="alert alert-info col-md-3 col-sm-3">
<bean:message key="courseunit.evaluation.state.complete"/>
<div class="alert alert-success col-md-3 col-sm-3">
<span class="glyphicon glyphicon-education"></span> Validado pela Comissão
</div>
<div class="col-md-1 col-sm-1 vcenter alert"><span class="glyphicon glyphicon-chevron-right"/></div>
<div class="alert alert-info col-md-3 col-sm-3">
<bean:message key="courseunit.evaluation.state.closed"/>
<div class="alert alert-success col-md-3 col-sm-3">
<span class="glyphicon glyphicon-flag"></span> <bean:message key="courseunit.evaluation.state.closed"/>
</div>
</baco:clearOperation>
</div>
 
<div class="row-centered">
 
<div class="row-centered clearfix">
<div class="col-md-3 col-sm-3">
<baco:clearOperation name="CourseUnitView" property="courseUnit" op="EVALUATION_TRANSITATE_TO_EDIT">
<html:form action="/user/courseUnitEvaluationController">
433,7 → 438,7
<div class="col-md-1 col-sm-1"></div>
<div class="col-md-3 col-sm-3">
<baco:clearOperation name="CourseUnitView" property="courseUnit" op="EVALUATION_TRANSITATE_TO_COMPLETE">
<button type="button" class="btn btn-default">
<button type="button" class="btn btn-default" onclick="$('#buttonTeacherCompleteEvaluation').click()">
<bean:message key="courseunit.evaluation.transit.to.complete"/>
</button>
</baco:clearOperation>
441,11 → 446,16
<div class="col-md-1 col-sm-1"></div>
<div class="col-md-3 col-sm-3">
<baco:clearOperation name="CourseUnitView" property="courseUnit" op="EVALUATION_TRANSITATE_TO_CLOSE">
<button type="button" class="btn btn-default" onclick="set(form,'publishEvaluation');submitFormWaitAutoSave(form);"><bean:message key="courseunit.evaluation.transit.to.closed"/></button>
<button type="button" class="btn btn-default" onclick="$('#buttonPublishEvaluation').click()"><bean:message key="courseunit.evaluation.transit.to.closed"/></button>
</baco:clearOperation>
</div>
</div>
 
 
 
 
 
 
</div>
<div class="panel-body">
 
614,11 → 624,11
</baco:clearOperation>
 
<baco:clearOperation name="CourseUnitView" property="courseUnit" op="EVALUATION_TRANSITATE_TO_COMPLETE">
<button type="button" class="btn btn-default" onclick="set(form,'teacherCompleteEvaluation');submitFormWaitAutoSave(form);"><bean:message key="courseunit.evaluation.transit.to.complete"/></button>
<button type="button" id="buttonTeacherCompleteEvaluation" class="btn btn-default" onclick="set(form,'teacherCompleteEvaluation');submitFormWaitAutoSave(form);"><bean:message key="courseunit.evaluation.transit.to.complete"/></button>
</baco:clearOperation>
 
<baco:clearOperation name="CourseUnitView" property="courseUnit" op="EVALUATION_TRANSITATE_TO_CLOSE">
<button type="button" class="btn btn-default" onclick="set(form,'publishEvaluation');submitFormWaitAutoSave(form);"><bean:message key="courseunit.evaluation.transit.to.closed"/></button>
<button type="button" id="buttonPublishEvaluation" class="btn btn-default" onclick="set(form,'publishEvaluation');submitFormWaitAutoSave(form);"><bean:message key="courseunit.evaluation.transit.to.closed"/></button>
</baco:clearOperation>
 
 
/branches/v3/impl/src/web/user/courseunits/courseunit.jsp
76,14 → 76,35
<%
if(UserSession.getUser().isTeacher() && courseUnitViewInEvaluation != null)
{
if(courseUnitViewInEvaluation.isValidationEvaluation())
{
%>
<div class="row">
<div class="col-sm-8">
<div class="alert alert-warning" role="alert">Atenção tem um relatório de avaliação em fase de VALIDAÇÃO PELA COMISSÂO DE CURSO no ano <%=courseUnitViewInEvaluation.getImportYear()%> (Entrar no <%=courseUnitViewInEvaluation.getImportYear()%> pelo menu lateral esquerdo antes de clicar em relatório de avaliação e confirmar no titulo da unidade).</div>
</div>
</div>
<%
}
else if(courseUnitViewInEvaluation.isValidEvaluation())
{
%>
 
<%
}
else
{
 
 
%>
<div class="row">
<div class="col-sm-8">
<div class="alert alert-warning" role="alert">Atenção tem um relatório de avaliação em fase de preenchimento no ano <%=courseUnitViewInEvaluation.getImportYear()%> (Entrar no <%=courseUnitViewInEvaluation.getImportYear()%> pelo menu lateral esquerdo antes de clicar em relatório de avaliação e confirmar no titulo da unidade).</div>
<div class="alert alert-warning" role="alert">Atenção tem um relatório de avaliação em fase de preenchimento pelos DOCENTES no ano <%=courseUnitViewInEvaluation.getImportYear()%> (Entrar no <%=courseUnitViewInEvaluation.getImportYear()%> pelo menu lateral esquerdo antes de clicar em relatório de avaliação e confirmar no titulo da unidade).</div>
</div>
</div>
<%
}
 
<%
}
%>
</baco:isAuthenticated>
/branches/v3/impl/src/web/user/courseunits/menu.jsp
123,11 → 123,26
<%
if(activePeriod && !CourseUnitView.isValidEvaluation())
{
if(CourseUnitView.isValidationEvaluation())
{
%>
<img src="<%=request.getContextPath()%>/imgs/check.gif" width="35px"/>
<%
}
else
{
%>
<img src="<%=request.getContextPath()%>/imgs/preencher.gif" width="35px"/>
<%
}
}
else
{
%>
<span class="glyphicon glyphicon-ok"></span>
<%
}
%>
</html:link>
</li>
</baco:clearOperation>
282,11 → 297,27
<%
if(courseUnitViewInEvaluation !=null && courseUnitViewInEvaluation.getId()==item.getId())
{
if(item.isValidationEvaluation())
{
%>
<img src="<%=request.getContextPath()%>/imgs/check.gif" width="35px"/>
<%
}
else
{
%>
 
<img src="<%=request.getContextPath()%>/imgs/preencher.gif" width="35px"/>
<%
}
}
else
{
%>
<span class="glyphicon glyphicon-ok"></span>
<%
}
%>
</html:link>
</logic:notEqual>