Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1687 → Rev 1688

/branches/v3/impl/conf/language/MessageResources.properties
1359,6 → 1359,10
courseunits.contentsGrants.INTERNAL=interno ESTG
 
 
 
courseunit.program.sending=Envio em Curso
courseunit.program.sending.text=A ficha está a ser enviada ao sistema... por favor aguarde
 
courseunit.program.objectivos=Objetivos da aprendizagem (conhecimentos, aptidões e competências) a desenvolver pelos estudantes, operacionalização dos objetivos e medição do seu grau de cumprimento)
courseunit.program.conteudosProgramaticos=Conteúdos
courseunit.program.prerequisitos=Pré-requisitos
/branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/courseunits/CourseUnitsEvaluationController.java
128,7 → 128,7
else
return mapping.findForward("edit.evaluation");
*/
return true;
return go;
 
}
catch (Throwable e)
/branches/v3/impl/src/web/layout/headerTools.jsp
338,6 → 338,7
if($(".web-messages-errors-baco").length)
{
$('#errorsBacoModal .content-errors').html($(".web-messages-errors-baco").html());
$('.modal').modal("hide");
$('#errorsBacoModal').modal({
show: 'true'
});
350,6 → 351,7
$("#modalWebMessages modal-title").html(title);
$('#modalWebMessages .content-web-messages').html( $(".web-messages").html());
$('#modalWebMessages .content-aditional').html( "");
$('.modal').modal("hide");
$('#modalWebMessages').modal({
show: 'true'
});
362,6 → 364,7
$("#modalWebMessages .modal-title").html(title);
$('#modalWebMessages .content-web-messages').html( $(".web-messages").html());
$('#modalWebMessages .content-aditional').html( aditionalHtml);
$('.modal').modal("hide");
$('#modalWebMessages').modal({
show: 'true'
});
374,18 → 377,20
$("#modalWebMessages .modal-title").html(title);
$('#modalWebMessages .content-web-messages').html($(refContainer + " .web-messages").html());
$('#modalWebMessages .content-aditional').html( "");
$('.modal').modal("hide");
$('#modalWebMessages').modal({
show: 'true'
});
}
}
function modalWebMessagesGivenContainer(title,refContainer,targetOkUrl)
function modalWebMessagesGivenContainerAndTarget(title,refContainer,targetOkUrl)
{
if($(refContainer + " .web-messages").length)
{
$("#modalWebMessages .modal-title").html(title);
$('#modalWebMessages .content-web-messages').html($(refContainer + " .web-messages").html());
$('#modalWebMessages .content-aditional').html( "");
$('.modal').modal("hide");
$('#modalWebMessages').modal({
show: 'true'
});
/branches/v3/impl/src/web/user/courseunits/courseunitEvaluation.jsp
769,12 → 769,14
}
else
{
modalWebMessagesGivenContainer("Avaliação Salva","#formEval","<%=request.getContextPath()%>/user/startLoadCourseUnitEvaluation.do?courseUnitId=${CourseUnitView.id}");
//so passa o URL para reload se correr tudo bem
modalWebMessagesGivenContainerAndTarget("Avaliação Salva","#formEval","<%=request.getContextPath()%>/user/startLoadCourseUnitEvaluation.do?courseUnitId=${CourseUnitView.id}");
}
},
function()
{
$('#myModal').modal("hide");
//nao passa o URL para reload para nao estragar os dados
modalWebMessagesGivenContainer("Avaliação Salva","#formEval");
}
);
/branches/v3/impl/src/web/user/courseunits/courseunitProgram.jsp
444,6 → 444,9
function saveData(action)
{
 
$('#programSendingModal').modal({
show: 'true'
});
$("#ProgramForm input[name='dispatch']").val(action);
var data = $("#ProgramForm").serialize().replace(/%0D%0A/g, '%0A').replace(/\r?\n/g, "\r\n");
//alert(data);
457,6 → 460,7
dataType: "json",
statusCode: {
401:function() {
$('.modal').modal("hide");
$("#modalAuthentication").modal({ show : 'true'});
}
},
516,4 → 520,26
});
}
 
</script>
</script>
 
<div class="modal fade" id="programSendingModal" role="dialog" >
<div class="modal-dialog" data-width="760" style="display: block; width: 760px; margin-top: 50px;" aria-hidden="false">
 
<!-- Modal content-->
<div class="modal-content">
<div class="modal-header">
 
<h1 class="modal-title"><bean:message key="courseunit.program.sending"/></h1>
</div>
<div class="modal-body">
<p>
<bean:message key="courseunit.program.sending.text"/> <img src="<%=request.getContextPath()%>/imgs/wait.gif"/>
</p>
</div>
<div class="modal-footer">
 
</div>
</div>
 
</div>
</div>