/branches/v3/impl/src/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioDaoImpl.java |
---|
10,6 → 10,7 |
import pt.estgp.estgweb.domain.QuestionarioImpl; |
import pt.estgp.estgweb.domain.QuestionarioPedagogicoCursoAfeto; |
import pt.estgp.estgweb.domain.QuestionarioResposta; |
import pt.estgp.estgweb.domain.QuestionarioRespostaRequisitada; |
import java.util.List; |
83,7 → 84,22 |
return 0; |
} |
public long getNumeroRespostasRequisitadas(long questionarioId) |
{ |
Query q = getCurrentSession().createQuery |
("select count(r.id) from r in class " + QuestionarioRespostaRequisitada.class.getName() + " " + |
" JOIN r.questionario q " + |
" where q.id = " + questionarioId); |
Object result = q.uniqueResult(); |
if(result != null && ((Long)result) > 0) |
{ |
return (Long)result; |
} |
else |
return 0; |
} |
public static class QuestionarioStatsVars |
{ |
public long cursos; |
95,6 → 111,8 |
public long profsDeUsadas; |
public long unidadesUsadas; |
public long profsTimeStudents; |
public long respostasRequisitadas; |
public long respostasObtidas; |
} |
117,6 → 135,7 |
"from " + QuestionarioPedagogicoCursoAfeto.class.getName() + " c " + |
"JOIN c.questionario q " + |
"JOIN c.unidadesAfetas u " + |
"WHERE q.id = :id " + |
"GROUP BY q.id"); |
137,6 → 156,8 |
if(((Long) results[8]) != questionarioStatsVars.unidades) |
logger.error("TEM UM ERRO NA QUERY, a contagem de usadas com o distinct da diferente de com o SUM"); |
questionarioStatsVars.profsTimeStudents = (Long) results[9]; |
questionarioStatsVars.respostasRequisitadas = getNumeroRespostasRequisitadas(questionarioId); |
questionarioStatsVars.respostasObtidas = getNumeroRespostas(questionarioId); |
} |
return questionarioStatsVars; |
/branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/authenticate/AuthenticateController.java |
---|
139,7 → 139,7 |
UserSession userSession = UserSessionProxy.loadUserSessionFromRequest(request); |
if(userSession.getUser() == null) |
return mapping.findForward("welcome"); |
return mapping.findForward(Globals.SYSTEM_REDIRECTIONS_POLICY_INDEX_WELCOME); |
IServiceManager sm = ServiceManager.getInstance(); |
Object[] args = new Object[]{}; |
//to send good by message |
/branches/v3/impl/src/doc/estgweb.eap |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/branches/v3/impl/src/web/css/ipp/style.css |
---|
1,4 → 1,5 |
/****************************Text Size*************************************************/ |
@font-face { |
6,13 → 7,16 |
src: url("../EM-Decima.Pro/OTF/Decima%20Pro.otf") format("opentype"); |
} |
body{ |
background-color: #FDFBF5 !important; |
} |
#header |
{ |
height: 60px; |
background-color: white; |
border-bottom: 1px solid #8a6100; |
padding: 3px; |
} |
#header .logo |
{ |
98,6 → 102,7 |
PADDING-TOP: 5px; |
text-align: center; |
margin-top:5px; |
background-color: white; |
} |
187,8 → 192,21 |
.navbar-collapse { |
max-height:none !important; |
} |
.logoIpp |
{ |
height: 45px; |
} |
.navbar-brand |
{ |
padding:2px; |
margin-right: 25px; |
} |
.navbar-brand-2 |
{ |
padding:15px; !important |
margin-right: 25px; !important |
} |
/** LIST ITEM INFO PARECIDO AO WARNING ANTIGO PRIMARY |
.list-group-item-info { |
color: #8a6100 !important; |
/branches/v3/impl/src/web/layout/themes/ipp/separators.jsp |
---|
101,7 → 101,12 |
<span class="icon-bar"></span> |
<span class="icon-bar"></span> |
</button> |
<a class="navbar-brand" href="#"> PAE v1</a> |
<a class="navbar-brand" href="#"> |
<img class="logoIpp" src="<%=request.getContextPath()%>/layout/themes/ipp/logo.png"/> |
</a> |
<a class="navbar-brand navbar-brand-2"> |
PAE v1 |
</a> |
</div> |
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> |
<ul class="nav navbar-nav"> |
/branches/v3/impl/src/web/user/home/panels/emailSet.jsp |
---|
19,7 → 19,7 |
%> |
<div class="col-md-4 col-sm-12 col-xs-12"> |
<div class="panel panel-default"> |
<div class="panel-heading">Preferências</div> |
<div class="panel-body"> |
92,7 → 92,6 |
</div> |
</div> |
</div> |
<% |
/branches/v3/impl/src/web/user/home/teacherPae.jsp |
---|
20,9 → 20,8 |
<%--<jsp:include page="todosAfazer.jsp"/>--%> |
<jsp:include page="/user/questionarios/pedagogicoEstudante/questionariosDocenteAbertos.jsp"/> |
<jsp:include page="panels/emailSet.jsp"/> |
<div class="row"> |
<div class="col-md-8 col-sm-12 col-xs-12"> |
<jsp:include page="/user/questionarios/pedagogicoEstudante/questionariosDocenteAbertos.jsp"/> |
<baco:hasRole role="admin,all,questionarios.gerais,questionarios.admin"> |
<div class="col-md-6 col-sm-12 col-xs-12"> |
<jsp:include page="panels/configsInfo.jsp"/> |
31,13 → 30,22 |
<div class="col-md-6 col-sm-12 col-xs-12"> |
<jsp:include page="panels/questionarios.jsp"/> |
<jsp:include page="panels/configsGeraisSistema.jsp"/> |
<jsp:include page="panels/academicTools.jsp"/> |
</div> |
</baco:hasRole> |
</div> |
<div class="col-md-4 col-sm-12 col-xs-12"> |
<jsp:include page="panels/emailSet.jsp"/> |
<jsp:include page="panels/academicTools.jsp"/> |
</div> |
/branches/v3/impl/src/web/user/home/studentPae.jsp |
---|
9,6 → 9,9 |
<jsp:useBean id="UserSession" type="pt.estgp.estgweb.domain.UserSession" scope="request"/> |
<jsp:include page="/user/questionarios/respostasRequisitadas.jsp"/> |
<jsp:include page="panels/emailSet.jsp"/> |
<div class="col-md-8 col-sm-12 col-xs-12"> |
<jsp:include page="/user/questionarios/respostasRequisitadas.jsp"/> |
</div> |
<div class="col-md-4 col-sm-12 col-xs-12"> |
<jsp:include page="panels/emailSet.jsp"/> |
</div> |
/branches/v3/impl/src/web/user/questionarios/respostaQuestionario.jsp |
---|
83,6 → 83,7 |
<html:form action="/user/questionariosPaeResposta" styleId="respostaForm"> |
<input type="hidden" name="dispatch" value="submitResposta"/> |
<div class="panel panel-default"> |
<div class="panel-heading">1 - Identificação da Unidade Curricular</div> |
<div class="panel-body"> |
/branches/v3/impl/src/web/user/questionarios/questionarioStatePROCESSING.jsp |
---|
18,12 → 18,11 |
<% |
AbstractDao.getCurrentSession().beginTransaction(); |
long respostas = DaoFactory.getQuestionarioDaoImpl().getNumeroRespostas(Questionario.getId()); |
QuestionarioDaoImpl.QuestionarioStatsVars questionarioStatsVars = DaoFactory.getQuestionarioDaoImpl().loadQuestionarioStatsPedagogico(Questionario.getId()); |
%> |
<%=respostas%> Respostas |
<%=questionarioStatsVars.respostasObtidas%> Respostas de <%=questionarioStatsVars.respostasRequisitadas%> |
</div> |
</div> |
<div class="col-sm-6"> |
41,6 → 40,8 |
<th>Turmas Selecionadas</th> |
<th>Alunos Selecionados</th> |
<th>Professores Selecionados</th> |
<th>Respostas Requisitadas</th> |
<th>Respondidos</th> |
</thead> |
<tbody> |
51,6 → 52,8 |
<td><%=questionarioStatsVars.turmas%></td> |
<td><%=questionarioStatsVars.alunosDeUsadas%></td> |
<td><%=questionarioStatsVars.profsDeUsadas%></td> |
<td><%=questionarioStatsVars.respostasRequisitadas%></td> |
<td><%=questionarioStatsVars.respostasObtidas%></td> |
</tbody> |
</table> |
/branches/v3/impl/src/web/user/questionarios/pedagogicoEstudante/questionariosDocenteAbertos.jsp |
---|
22,7 → 22,7 |
{ |
%> |
<div class="col-md-8 col-sm-12 col-xs-12"> |
<div class="col-md-12 col-sm-12 col-xs-12"> |
<div class="alert alert-success">Olá ${UserSession.shortName} não existem quaisquer questionários ativos nos quais esteja a ser avaliado.</div> |
<div class="alert alert-success">Vá consultando o sistema pois poderemos ativar algum questionário e poderá saber por aqui se os seus alunos estão a responder. Obrigado</div> |
</div> |
33,7 → 33,7 |
{ |
%> |
<div class="col-md-8 col-sm-12 col-xs-12"> |
<div class="col-md-12 col-sm-12 col-xs-12"> |
<div class="panel panel-info"> |
<div class="panel-heading">Olá ${UserSession.shortName}. Existem questinários onde está a ser avaliado <span class="glyphicon glyphicon-alert"/></div> |
<div class="panel-body"> |