Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1329 → Rev 1330

/branches/v3/impl/src/java/pt/estgp/estgweb/domain/QuestionarioPedagogicoUnidadeCurricularAfetaImpl.java
New file
0,0 → 1,7
package pt.estgp.estgweb.domain;
 
/**
* Created by jorgemachado on 23/03/16.
*/
public class QuestionarioPedagogicoUnidadeCurricularAfetaImpl extends QuestionarioPedagogicoUnidadeCurricularAfeta {
}
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/QuestionarioRespostaRequisitadaImpl.java
New file
0,0 → 1,7
package pt.estgp.estgweb.domain;
 
/**
* Created by jorgemachado on 23/03/16.
*/
public class QuestionarioRespostaRequisitadaImpl extends QuestionarioRespostaRequisitada {
}
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/QuestionarioPedagogicoCursoAfetoImpl.java
New file
0,0 → 1,7
package pt.estgp.estgweb.domain;
 
/**
* Created by jorgemachado on 23/03/16.
*/
public class QuestionarioPedagogicoCursoAfetoImpl extends QuestionarioPedagogicoCursoAfeto {
}
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/QuestionarioRespostaImpl.java
New file
0,0 → 1,7
package pt.estgp.estgweb.domain;
 
/**
* Created by jorgemachado on 23/03/16.
*/
public class QuestionarioRespostaImpl extends QuestionarioResposta {
}
/branches/v3/impl/src/hbm/pt/estgp/estgweb/domain/OlapQuestionarios.hbm.xml
92,6 → 92,7
<property name="respondido" type="boolean" index="respondidoIndex"/>
<property name="dataInicio" type="timestamp"/>
<property name="dataFim" type="timestamp"/>
<property name="questionario" type="long"/>
 
<many-to-one name="tipologia" class="pt.estgp.estgweb.domain.OlapEntityQuestionarioTipologia" outer-join="false" lazy="proxy"/>
<many-to-one name="docente" class="pt.estgp.estgweb.domain.OlapEntityQuestionarioDocente" outer-join="false" lazy="proxy"/>
106,7 → 107,7
<many-to-one name="timeLine" class="pt.estgp.estgweb.domain.OlapHistoryDimension" outer-join="false" lazy="proxy"/>
 
<!--Assim e possivel Filtrar por questionario uso a dimensao questionario-->
<many-to-one name="questionario" class="pt.estgp.estgweb.domain.Questionario" outer-join="false" lazy="proxy"/>
<!--<many-to-one name="questionario" class="pt.estgp.estgweb.domain.Questionario" outer-join="false" lazy="proxy"/>-->
</class>
 
<class name="pt.estgp.estgweb.domain.OlapStarQuestionarioAnswer" table="olap_star_quest_answer">
/branches/v3/impl/src/hbm/pt/estgp/estgweb/domain/Questionarios.hbm.xml
210,4 → 210,77
<subclass name="pt.estgp.estgweb.domain.QuestionarioHistoryDriveImpl" discriminator-value="QuestionarioHistoryDriveImpl"/>
</class>
 
 
<class name="pt.estgp.estgweb.domain.QuestionarioRespostaRequisitada" table="questionario_resposta_requisitada" abstract="true">
<meta attribute="extends">pt.estgp.estgweb.domain.DomainObject</meta>
<meta attribute="scope-class">public abstract</meta>
<id name="id" type="long" unsaved-value="0">
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<many-to-one name="questionario" class="pt.estgp.estgweb.domain.Questionario" lazy="proxy" outer-join="false"/>
<many-to-one name="user" class="pt.estgp.estgweb.domain.User" lazy="proxy" outer-join="false"/>
<many-to-one name="resposta" class="pt.estgp.estgweb.domain.QuestionarioResposta" lazy="false" outer-join="true"/>
<subclass name="pt.estgp.estgweb.domain.QuestionarioRespostaRequisitadaImpl" discriminator-value="QuestionarioRespostaRequisitadaImpl"/>
</class>
 
<class name="pt.estgp.estgweb.domain.QuestionarioResposta" table="questionario_resposta" abstract="true">
<meta attribute="extends">pt.estgp.estgweb.domain.DomainObject</meta>
<meta attribute="scope-class">public abstract</meta>
<id name="id" type="long" unsaved-value="0">
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<many-to-one name="user" class="pt.estgp.estgweb.domain.User" lazy="proxy" outer-join="false"/>
<subclass name="pt.estgp.estgweb.domain.QuestionarioRespostaImpl" discriminator-value="QuestionarioRespostaImpl"/>
</class>
 
<!--PEDAGOGICO QUESTIONARIO ATRIBUICOES-->
 
<class name="pt.estgp.estgweb.domain.QuestionarioPedagogicoCursoAfeto" table="questionario_curso_afeto" abstract="true">
<meta attribute="extends">pt.estgp.estgweb.domain.DomainObject</meta>
<meta attribute="scope-class">public abstract</meta>
<id name="id" type="long" unsaved-value="0">
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="codigoCurso" type="string"/>
<property name="ano" type="string"/>
<property name="semestre" type="string"/>
<property name="nome" type="string"/>
<many-to-one name="questionario" class="pt.estgp.estgweb.domain.Questionario" lazy="proxy" outer-join="false"/>
<many-to-one name="course" class="pt.estgp.estgweb.domain.Course" lazy="proxy" outer-join="false"/>
<set name="unidadesAfetas" cascade="delete" lazy="true" order-by="id asc">
<key column="cursoAfeto"/>
<one-to-many class="pt.estgp.estgweb.domain.QuestionarioPedagogicoUnidadeCurricularAfeta" />
</set>
<subclass name="pt.estgp.estgweb.domain.QuestionarioPedagogicoCursoAfetoImpl" discriminator-value="QuestionarioPedagogicoCursoAfetoImpl"/>
</class>
 
<class name="pt.estgp.estgweb.domain.QuestionarioPedagogicoUnidadeCurricularAfeta" table="questionario_curso_afeto" abstract="true">
<meta attribute="extends">pt.estgp.estgweb.domain.DomainObject</meta>
<meta attribute="scope-class">public abstract</meta>
<id name="id" type="long" unsaved-value="0">
<generator class="native"/>
</id>
<discriminator column="discriminator"/>
<timestamp source="db" name="updateDate" unsaved-value="null"/>
<property name="saveDate" type="timestamp"/>
<property name="codigoUnidade" type="string"/>
<property name="marked" type="boolean"/>
<property name="profs" type="int"/>
<property name="addedTipologias" type="int"/>
<property name="turmaWithoutProf" type="int"/>
<property name="tipologiasJson" type="text">
<column name="tipologias_json" sql-type="MEDIUMTEXT"/>
</property>
<many-to-one name="cursoAfeto" class="pt.estgp.estgweb.domain.QuestionarioPedagogicoCursoAfeto" lazy="proxy" outer-join="false"/>
<many-to-one name="courseUnit" class="pt.estgp.estgweb.domain.CourseUnit" lazy="proxy" outer-join="false"/>
<subclass name="pt.estgp.estgweb.domain.QuestionarioPedagogicoUnidadeCurricularAfetaImpl" discriminator-value="QuestionarioPedagogicoUnidadeCurricularAfetaImpl"/>
</class>
 
 
 
</hibernate-mapping>
/branches/v3/impl/src/web/admin/questionarios/questionarioAdmin.jsp
221,7 → 221,7
<div class="alert alert-disabled col-md-2 col-sm-2">
<bean:message key="questionario.state.PROCESSING"/>
</div>
<div class="col-md-1 col-sm-1 vcenter alert"><span class="glyphicon glyphicon-chevron-right"/></div>
<div class="col-md-1 col-sm-1 vcenter alert hidden-xs"><span class="glyphicon glyphicon-chevron-right"/></div>
<%
}
if( questionario.getStateEnum().getPosition() < QuestionarioImpl.State.PROCESSING_WITH_ANSWERS.getPosition())
263,7 → 263,7
</div>
</div>
</div>
<html:link styleClass="btn btn-success" action="/admin/listQuestionarios">Voltar</html:link>
<html:link styleClass="btn btn-danger" action="/admin/listQuestionarios">Voltar</html:link>
</div>
</div>
</div>
/branches/v3/impl/src/web/admin/questionarios/pedagogicoEstudante/questionarioAdminPanel.jsp
1,6 → 1,7
<%@ page import="pt.estgp.estgweb.utils.DatesUtils" %>
<%@ page import="java.util.List" %>
<%@ page import="pt.estgp.estgweb.web.form.questionarios.QuestionarioForm" %>
<%@ page import="pt.estgp.estgweb.domain.QuestionarioImpl" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %>
12,110 → 13,161
<jsp:useBean id="Questionario" type="pt.estgp.estgweb.domain.QuestionarioImpl" scope="request"/>
 
<baco:clearOperation name="Questionario" op="QUESTIONARIO_ASSIGNATION_OPERATIONS">
<logic:empty name="Questionario" property="year">
<script>
$(document).ready(
function(){
$("#yearSemestreForm").show();
}
);
</script>
</logic:empty>
<logic:notEmpty name="Questionario" property="year">
<div class="col-md-3 col-sm-3" id="yearSemestreInfo">
<div class="list-group">
<div class="list-group-item">
<bean:message key="survey.list.form.year"/>: ${Questionario.year}
<div class="row">
<logic:empty name="Questionario" property="year">
<script>
$(document).ready(
function(){
$("#yearSemestreForm").show();
}
);
</script>
</logic:empty>
<logic:notEmpty name="Questionario" property="year">
<div class="col-md-3 col-sm-3" id="yearSemestreInfo">
<div class="list-group">
<div class="list-group-item">
<bean:message key="survey.list.form.year"/>: ${Questionario.year}
</div>
<div class="list-group-item">
Semestre: ${Questionario.semestre}
</div>
</div>
<baco:clearOperation name="Questionario" op="QUESTIONARIO_SET_ANO_SEMESTRE">
<button class="btn btn-default" type="button" onclick="$('#yearSemestreForm').show();$('#yearSemestreInfo').hide()">Modificar</button>
</baco:clearOperation>
</div>
<div class="list-group-item">
Semestre: ${Questionario.semestre}
</logic:notEmpty>
 
<baco:clearOperation name="Questionario" op="QUESTIONARIO_SET_ANO_SEMESTRE">
<div class="col-md-6" style="display: none" id="yearSemestreForm">
<div class="panel panel-default">
<div class="panel-body">
 
<html:form styleClass="form-horizontal" action="/admin/questionariosPaeYearSemestre">
<%
QuestionarioForm qFr = (QuestionarioForm) request.getAttribute("QuestionarioForm");
if(qFr.getQuestionario().getId() <= 0)
qFr.setQuestionario(Questionario);
%>
<input type="hidden" name="dispatch" value="setYearSemestre"/>
<html:hidden property="questionario.id"/>
<div class="form-group">
<label class="control-label col-sm-2" for="year"><bean:message key="survey.list.form.year"/></label>
<div class="col-sm-10">
<%
List<String> years = DatesUtils.getImportYears(10);
%>
<html:select styleClass="form-control" styleId="year" property="questionario.year">
<html:option value="">Escolha Ano</html:option>
<%
for(String year:years)
{
request.setAttribute("year",year);
%>
<html:option value="${year}">${year}</html:option>
<%
}
%>
</html:select>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="semestre">Semestre:</label>
<div class="col-sm-10">
<html:select styleClass="form-control" styleId="semestre" property="questionario.semestre">
<html:option value="">Escolha semestre</html:option>
<html:option value="A">Anual</html:option>
<html:option value="S1">Semestre 1</html:option>
<html:option value="S2">Semestre 2</html:option>
<html:option value="T1">Trimestre 1</html:option>
<html:option value="T2">Trimestre 2</html:option>
<html:option value="T3">Trimestre 3</html:option>
<html:option value="T4">Trimestre 4</html:option>
</html:select>
</div>
</div>
<button class="btn btn-default" type="button" onclick="this.form.action = this.form.action + '#NOWTASK';this.form.submit();"><bean:message key="confirm"/></button>
</html:form>
</div>
</div>
</div>
</div>
<baco:clearOperation name="Questionario" op="QUESTIONARIO_SET_ANO_SEMESTRE">
<button class="btn btn-default" type="button" onclick="$('#yearSemestreForm').show();$('#yearSemestreInfo').hide()">Modificar</button>
</baco:clearOperation>
<baco:notClearOperation name="Questionario" op="QUESTIONARIO_SET_ANO_SEMESTRE">
<button class="btn btn-danger" type="button" data-toggle="modal" data-target="#confirm-ModalGeneric" data-message="Esta operação irá anular os cursos e unidades atribuidos anteriormente!! Tem a certeza que deseja prosseguir?" data-href="<%=request.getContextPath()%>/admin/questionariosPaeSelectCourses.do?dispatch=revertAssignationsCourses&questionario.id=${Questionario.id}">Anular Atribuições</button>
</baco:notClearOperation>
</div>
</logic:notEmpty>
<hr class="visible-xs"/>
<baco:clearOperation name="Questionario" op="QUESTIONARIO_SCHEDULLE_SEE_SELECT_COURSES">
<div class="col-md-3 col-sm-3">
<div class="list-group">
 
<baco:clearOperation name="Questionario" op="QUESTIONARIO_SET_ANO_SEMESTRE">
<div class="col-md-6" style="display: none" id="yearSemestreForm">
<div class="panel panel-default">
<div class="panel-body">
<%
if(Questionario.getSubStatePedagodigoEnum().getPosition() >= QuestionarioImpl.SubStatePedagogico.COURSES_ASSIGNED.getPosition())
request.setAttribute("classAssignCourses","btn-success");
else
request.setAttribute("classAssignCourses","btn-warning");
%>
<div class="list-group-item">
<html:link styleClass="btn ${classAssignCourses}" action="/admin/questionarioPedagogicoStartChooseCourses?questionarioId=${Questionario.id}">
Selecção de Cursos
</html:link>
</div>
 
<html:form styleClass="form-horizontal" action="/admin/questionariosPaeYearSemestre">
<logic:equal value="ASSIGNING_COURSES" name="Questionario" property="substate">
<div class="list-group-item">
<div class="alert alert-warning alert-small">
Os cursos estão em atribuição
</div>
</div>
</logic:equal>
<%
QuestionarioForm qFr = (QuestionarioForm) request.getAttribute("QuestionarioForm");
if(qFr.getQuestionario().getId() <= 0)
qFr.setQuestionario(Questionario);
if(Questionario.getSubStatePedagodigoEnum().getPosition() >= QuestionarioImpl.SubStatePedagogico.COURSES_ASSIGNED.getPosition())
{
%>
<input type="hidden" name="dispatch" value="setYearSemestre"/>
<html:hidden property="questionario.id"/>
<div class="form-group">
<label class="control-label col-sm-2" for="year"><bean:message key="survey.list.form.year"/></label>
<div class="col-sm-10">
<%
List<String> years = DatesUtils.getImportYears(10);
%>
<html:select styleClass="form-control" styleId="year" property="questionario.year">
<html:option value="">Escolha Ano</html:option>
<%
for(String year:years)
{
request.setAttribute("year",year);
%>
<html:option value="${year}">${year}</html:option>
<%
}
%>
</html:select>
<div class="list-group-item">
<div class="alert alert-info alert-small">
Cursos atribuidos
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="semestre">Semestre:</label>
<div class="col-sm-10">
<html:select styleClass="form-control" styleId="semestre" property="questionario.semestre">
<html:option value="">Escolha semestre</html:option>
<html:option value="A">Anual</html:option>
<html:option value="S1">Semestre 1</html:option>
<html:option value="S2">Semestre 2</html:option>
<html:option value="T1">Trimestre 1</html:option>
<html:option value="T2">Trimestre 2</html:option>
<html:option value="T3">Trimestre 3</html:option>
<html:option value="T4">Trimestre 4</html:option>
</html:select>
</div>
<%
}
%>
 
</div>
 
</div>
</baco:clearOperation>
<hr class="visible-xs"/>
<baco:clearOperation name="Questionario" op="QUESTIONARIO_CHANGE_TIPOLOGIES">
<div class="col-md-3 col-sm-3">
<div class="list-group">
<div class="list-group-item">
<html:link styleClass="btn btn-warning" action="/admin/questionarioPedagogicoStartChooseCourses?questionarioId=${Questionario.id}">
 
Verificar Atribuições
</html:link>
</div>
<button class="btn btn-default" type="button" onclick="this.form.action = this.form.action + '#NOWTASK';this.form.submit();"><bean:message key="confirm"/></button>
</html:form>
</div>
</div>
</div>
</div>
</baco:clearOperation>
 
<baco:clearOperation name="Questionario" op="QUESTIONARIO_SCHEDULLE_SEE_SELECT_COURSES">
</baco:clearOperation>
<hr class="visible-xs"/>
<baco:clearOperation name="Questionario" op="QUESTIONARIO_START_ASSIGN_ANSWERS">
<div class="col-md-3 col-sm-3">
<html:link styleClass="btn btn-warning" action="/admin/questionarioPedagogicoStartChooseCourses?questionarioId=${Questionario.id}">
Selecção de Cursos
</html:link>
<div class="list-group">
<div class="list-group-item">
<html:link styleClass="btn btn-warning" action="/admin/questionarioPedagogicoStartChooseCourses?questionarioId=${Questionario.id}">
Iniciar Atribuição de Respostas
</html:link>
</div>
</div>
</div>
</baco:clearOperation>
<baco:clearOperation name="Questionario" op="QUESTIONARIO_CHANGE_TIPOLOGIES">
<div class="col-md-3 col-sm-3">
<html:link styleClass="btn btn-warning" action="/admin/questionarioPedagogicoStartChooseCourses?questionarioId=${Questionario.id}">
Verificar Atribuições
</html:link>
</div>
<hr/>
<div class="row">
<div class="col-md-12 col-sm-12">
<baco:notClearOperation name="Questionario" op="QUESTIONARIO_SET_ANO_SEMESTRE">
<button class="btn btn-danger" type="button" data-toggle="modal" data-target="#confirm-ModalGeneric" data-message="Esta operação irá anular os cursos e unidades atribuidos anteriormente!! Tem a certeza que deseja prosseguir?" data-href="<%=request.getContextPath()%>/admin/questionariosPaeSelectCourses.do?dispatch=revertAssignationsCourses&questionario.id=${Questionario.id}">Anular Atribuições</button>
</baco:notClearOperation>
</div>
</baco:clearOperation>
<baco:clearOperation name="Questionario" op="QUESTIONARIO_START_ASSIGN_ANSWERS">
<div class="col-md-3 col-sm-3">
<html:link styleClass="btn btn-warning" action="/admin/questionarioPedagogicoStartChooseCourses?questionarioId=${Questionario.id}">
Iniciar Atribuição de Respostas
</html:link>
</div>
</baco:clearOperation>
</div>
</baco:clearOperation>
<baco:notClearOperation name="Questionario" op="QUESTIONARIO_ASSIGNATION_OPERATIONS">
Não pode aceder a esta area, não está autorizado a efetuar operações de atribuição.