WebSVN - bacoAlunos - Path Comparison - / Rev 1400 and / Rev 1419

Ignore whitespace Rev 1400 → Rev 1419

 /branches/v3/impl/conf/language/MessageResources.properties
 ,7 → 388,7
 username=Nome de Utilizador
 password=Palavra Passe
 username.pae=Número de Aluno/Docente
-password.pae=Palavra Passe ou Número do Cartão de Cidadão (BI)
+password.pae=<label class="label label-info" style="font-size:1.3em">Número</label> do <label class="label label-success" style="font-size:1.5em">Cartão de Cidadão</label> <label class="label label-info" style="font-size:1.2em">ou bilhete de identidade</label>
 password.again=Repita a password
 submit=Entrar
 edit=Editar
 ,6 → 1787,7
 #
 ################################################################################
+error.questionario.com.respostas.nao.pode.efetuar.op=Operação não permitida, Existem Respostas
 error.questionario.p.without.group=Verifique a pergunta {0} nao tem grupo
 error.questionario.group.without.p=Verifique o grupo {0} nao tem pergunta
 warn.questionario.repeated.in.time=Aviso: Já existe um questionário ({0}) nesse ano e semestre na categoria histórica escolhida
 ,8 → 1800,12
 questionarios.courses.start=Atribuição de Cursos Iniciada
 questionarios.answers.start=Atribuição de Respostas Iniciada
 questionario.tipologias.update.success=Tipologias atualizadas com sucesso
+questionario.resposta=Resposta a Questionário
+questionario.resposta.com.sucesso=A sua resposta foi submetida com sucesso ao nosso sistema de avaliação. Obrigado
+questionario.respostas.grupos.1.2.3=Os grupos 1 2 e 3 são obrigatórios por favor responda às questões. Obrigado.
 ################################################################################
 #
 # REMINDERS  MESSAGE RESOURCES
 ,6 → 1915,7
 questionario.answerprocessor=Processador de Respostas
 # SERVICE ZONE
 survey.admin=Administração do Questionário {0}
+survey.see=Acompanhar Questionário {0}
 surveys=Questionários
 survey.newEdit.survey=Formulário do Questionário
 survey.create.survey=Criar Questionário

 /branches/v3/impl/conf/WEB-INF/struts/tiles-pae-questionarios.xml
 ,6 → 13,12
         <put name="body" value="/user/questionarios/questionariosList.jsp"/>
     </definition>
+    <definition name="page.pae.see.questionarios" extends="page.pae.separators.home">
+        <put name="separator" value="1" type="string"/>
+        <put name="topnav" value="/user/questionarios/topnavQuestionarioList.jsp"/>
+        <put name="body" value="/user/questionarios/questionariosSee.jsp"/>
+    </definition>
     <definition name="page.pae.questionario.newEdit" extends="page.pae.separators.home">
         <put name="separator" value="1" type="string"/>
         <put name="topnav" value="/user/questionarios/topnavQuestionarioNewEdit.jsp"/>
 ,6 → 32,13
     </definition>
+    <definition name="page.pae.questionario.see" extends="page.pae.separators.home">
+        <put name="separator" value="1" type="string"/>
+        <put name="topnav" value="/user/questionarios/topnavQuestionarioSee.jsp"/>
+        <put name="body" value="/user/questionarios/pedagogicoEstudante/questionarioDashBoard.jsp"/>
+    </definition>
     <!-- Modulo do Pedagogico Estudantes -->
     <definition name="page.pae.questionario.courses.selection" extends="page.pae.separators.home">
         <put name="separator" value="1" type="string"/>
 ,4 → 57,11
     </definition>
+    <definition name="page.pae.questionario.resposta.questionario" extends="page.pae.separators.home">
+        <put name="separator" value="1" type="string"/>
+        <put name="topnav" value="/user/questionarios/topnavQuestionarioResposta.jsp"/>
+        <put name="body" value="/user/questionarios/respostaQuestionario.jsp"/>
+    </definition>
 </tiles-definitions>

 /branches/v3/impl/conf/WEB-INF/struts/struts-pae-questionarios.xml
 ,6 → 9,7
     <form-beans>
         <form-bean type="pt.estgp.estgweb.web.form.questionarios.QuestionarioForm" name="QuestionarioForm"/>
+        <form-bean type="pt.estgp.estgweb.web.form.questionarios.QuestionarioRespostaForm" name="QuestionarioRespostaForm"/>
     </form-beans>
     <global-exceptions>
 ,10 → 33,14
         <action path="/user/startNewQuestionario" forward="/user/questionariosPaeNoValidation.do?dispatch=startNew"/>
         <action path="/user/listQuestionarios" forward="page.pae.questionario.list"/>
+        <action path="/user/seeQuestionarios" forward="page.pae.see.questionarios"/>
         <action path="/user/adminQuestionario" forward="page.pae.questionario.admin"/>
+        <action path="/user/seeQuestionario" forward="page.pae.questionario.see"/>
         <action path="/user/formQuestionariosPae" forward="/user/questionariosPaeNoValidation.do?dispatch=form"/>
         <action path="/user/deleteQuestionario" forward="/user/questionariosPaeNoValidation.do?dispatch=deleteQuestionario"/>
+        <action path="/user/startRespostaQuestionario" forward="page.pae.questionario.resposta.questionario"/>
         <action path="/user/questionariosPaeStartAfectacoes" forward="/user/questionariosPaeNoValidation.do?dispatch=startAfetacoes"/>
         <action path="/user/questionariosPaeNoValidation"
 ,11 → 79,22
             <forward name="admin" path="page.pae.questionario.admin"/>
         </action>
+        <action path="/user/questionariosPaeResposta"
+                type="pt.estgp.estgweb.web.controllers.questionarios.QuestionarioYearSemestreController"
+                name="QuestionarioRespostaForm"
+                scope="request"
+                parameter="dispatch"
+                validate="true"
+                input="page.pae.questionario.resposta.questionario">
+            <forward name="success" path="page.pae.separators.home"/>
+        </action>
         <!--%%%%%%%%%%%%%%%%  Pedagogico Alunos Modulo  %%%%%%%%%%%%%%%%%%%-->
         <action path="/user/questionarioPedagogicoStartChooseCourses" forward="page.pae.questionario.courses.selection"/>
         <action path="/user/questionarioPedagogicoStartCheckCourses" forward="page.pae.questionario.courses.check"/>
         <action path="/user/questionarioPedagogicoStartAssignAnswers" forward="page.pae.questionario.assign.answers"/>
         <action path="/user/questionariosPaeSelectCourses"
                 type="pt.estgp.estgweb.web.controllers.questionarios.QuestionarioCourseSelectionController"
                 name="QuestionarioForm"

 /branches/v3/impl/conf/berserk/sd.xml
 ,6 → 2642,61
     <service>
+        <name>QuestionarioPutAssignedAnswers</name>
+        <implementationClass>pt.estgp.estgweb.services.questionarios.QuestionariosService</implementationClass>
+        <description></description>
+        <isTransactional>true</isTransactional>
+        <defaultMethod>putAssignedAnswers</defaultMethod>
+        <filterChains>
+            <chain name="Logger"/>
+            <chain name="Session"/>
+            <chain name="AuthenticatedUsers"/>
+            <chain name="QuestionarioClearancesPre"/>
+        </filterChains>
+    </service>
+    <service>
+        <name>QuestionarioRevertAssignationDetails</name>
+        <implementationClass>pt.estgp.estgweb.services.questionarios.QuestionariosService</implementationClass>
+        <description></description>
+        <isTransactional>true</isTransactional>
+        <defaultMethod>revertAssignationDetails</defaultMethod>
+        <filterChains>
+            <chain name="Logger"/>
+            <chain name="Session"/>
+            <chain name="AuthenticatedUsers"/>
+            <chain name="QuestionarioClearancesPre"/>
+        </filterChains>
+    </service>
+    <service>
+        <name>QuestionarioStartProcessement</name>
+        <implementationClass>pt.estgp.estgweb.services.questionarios.QuestionariosService</implementationClass>
+        <description></description>
+        <isTransactional>true</isTransactional>
+        <defaultMethod>startProcessement</defaultMethod>
+        <filterChains>
+            <chain name="Logger"/>
+            <chain name="Session"/>
+            <chain name="AuthenticatedUsers"/>
+            <chain name="QuestionarioClearancesPre"/>
+        </filterChains>
+    </service>
+    <service>
+        <name>QuestionarioStopProcessement</name>
+        <implementationClass>pt.estgp.estgweb.services.questionarios.QuestionariosService</implementationClass>
+        <description></description>
+        <isTransactional>true</isTransactional>
+        <defaultMethod>stopProcessement</defaultMethod>
+        <filterChains>
+            <chain name="Logger"/>
+            <chain name="Session"/>
+            <chain name="AuthenticatedUsers"/>
+            <chain name="QuestionarioClearancesPre"/>
+        </filterChains>
+    </service>
+    <service>
         <name>RunJobSelectCourses</name>
         <implementationClass>pt.estgp.estgweb.services.questionarios.pedagogico.UpdateCoursesAndUnitsJobService</implementationClass>
         <description></description>
 ,6 → 2770,18
             <chain name="QuestionarioClearancesPre"/>
         </filterChains>
     </service>
+    <service>
+        <name>QuestionarioSalvarResposta</name>
+        <implementationClass>pt.estgp.estgweb.services.questionarios.QuestionariosService</implementationClass>
+        <description></description>
+        <isTransactional>true</isTransactional>
+        <defaultMethod>salvarResposta</defaultMethod>
+        <filterChains>
+            <chain name="Logger"/>
+            <chain name="Session"/>
+            <chain name="AuthenticatedUsers"/>
+        </filterChains>
+    </service>
     <service>

 /branches/v3/impl/src/java/pt/estgp/estgweb/Globals.java
 ,9 → 432,12
     public static final boolean MODO_PAE_ENABLED = ConfigProperties.getBooleanProperty("mode.pae.enabled");
     public static final String QUESTIONARIOS_GERAIS = "questionarios.gerais";
     public static final String QUESTIONARIOS_ADMIN = "questionarios.admin";
-    public static final String QUESTIONARIOS_ASSIGNEMENTS_ADMIN = "questionarios.atribuicoes.admin";
+    public static final String QUESTIONARIOS_ASSIGNEMENTS_CHECK_STUDENTS_ADMIN = "questionarios.atribuicoes.admin";
     public static final String QUESTIONARIOS_ASSIGNEMENTS_CHECK_TEACHERS_ADMIN = "questionarios.atribuicoes.check_teachers";
     public static final String QUESTIONARIOS_TIPOLOGIAS_ADMIN = "questionarios.tipologias.admin";
+    public static final String ROLE_PRESIDENTE_CONCELHO_PEDAGOGICO = "pedagogicCouncil.president";
     public static final boolean USE_XSL_CACHE =ConfigProperties.getBooleanProperty("xsl.use.cache");

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportTeachersService.java
 ,13 → 672,20
                 //na criacao de questionarios é natural que falhe alguma coisa por haver aqui unidades a mais
                 //por isso devera ser ai feita a verificacao destes casos
                 boolean separateTurmas = ImportCourseService.loadCourseYearTurmasPolicy(disciplina.getCodigoCurso(), year, logmessages, this);
-                /*
-                este procedimento requer que a turma venha do siges, neste momento nao vem
-                if(separateTurmas)
-                    loadedunits = DaoFactory.getCourseUnitDaoImpl().loadBySigesCodeUniqueWithTurma("" + disciplina.getCodigo(), "" + disciplina.getCodigoCurso(), "" + disciplina.getCdDuracao(), "" + disciplina.getCdLectivo(),disciplina.getCdTurma());
-                else
-                    loadedunits = DaoFactory.getCourseUnitDaoImpl().loadBySigesCodeUnique("" + disciplina.getCodigo(), "" + disciplina.getCodigoCurso(), "" + disciplina.getCdDuracao(), "" + disciplina.getCdLectivo());
-                */
+                //este procedimento requer que a turma venha do siges, neste momento nao vem
+                //Este procedimento foi colocado por mim a 6 de Junho para que os questionarios tenham os profs certos nas disciplinas
+                //e não em duplicado, daqui para baixo o código nunca compara com separateTurmas, o mapa apenas é acedido aqui
+                //porque daqui para baixo uma vez carregadas as turmas persistentes do SIGES apenas o id é comparado para ver se fica ou se é removida
+                //Vamos apenas ter de  verificar que o código de turma vem na associação do docente à turma.
+                //NAO DA A TURMA NUNCA VEM DO SIGENS PARA NAO DUPLICAR TURMAS NO JOIN
+                //RESOVE-SE NA ATRIBUICAO DE RESPOSTAS DOS QUESTINARIOS SO SE METE O QUE TEM SUMARIO SE O CURSO FOR DE TURMAS
+                //SEPARADAS
+                //if(separateTurmas)
+                //    loadedunits = DaoFactory.getCourseUnitDaoImpl().loadBySigesCodeUniqueWithTurma("" + disciplina.getCodigo(), "" + disciplina.getCodigoCurso(), "" + disciplina.getCdDuracao(), "" + disciplina.getCdLectivo(),disciplina.getCdTurma());
+                //else
+                //    loadedunits = DaoFactory.getCourseUnitDaoImpl().loadBySigesCodeUnique("" + disciplina.getCodigo(), "" + disciplina.getCodigoCurso(), "" + disciplina.getCdDuracao(), "" + disciplina.getCdLectivo());
                 loadedunits = DaoFactory.getCourseUnitDaoImpl().loadBySigesCodeUnique("" + disciplina.getCodigo(), "" + disciplina.getCodigoCurso(), "" + disciplina.getCdDuracao(), "" + disciplina.getCdLectivo());
                 /*******Logging************************/
                 if(loadedunits.size() > 1 && !separateTurmas)

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportCourseService.java
 ,7 → 257,7
      * @param logMessages
      * @return
      */
-    protected static boolean loadCourseYearTurmasPolicy(int codigoDoCurso,String year,DefaultLogMessages logMessages,ServiceJob service) {
+    public static boolean loadCourseYearTurmasPolicy(int codigoDoCurso,String year,DefaultLogMessages logMessages,ServiceJob service) {
         Boolean turmasSeparated = courseYearTurmasPolicy.get(codigoDoCurso + "-" + year);
         if(turmasSeparated != null)

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/questionarios/pedagogico/AssignAnswersJobService.java
 ,6 → 2,7
 import org.apache.log4j.Logger;
 import pt.estgp.estgweb.domain.*;
+import pt.estgp.estgweb.domain.dao.DaoFactory;
 import pt.estgp.estgweb.services.jobs.JobDeamon;
 import pt.estgp.estgweb.services.jobs.ServiceJob;
 import pt.estgp.estgweb.web.exceptions.NotAuthorizedException;
 ,6 → 21,15
     public static final Logger logger = Logger.getLogger(AssignAnswersJobService.class);
+    /**
+     * CRIAR O JOB PARA O RUNNER
+     *
+     * @param questionarioId
+     * @param session
+     * @param questionarioCleared
+     * @return
+     * @throws NotAuthorizedException
+     */
     public QuestionarioImpl runJobAssignAnswers(long questionarioId, UserSession session, QuestionarioImpl questionarioCleared) throws NotAuthorizedException {
         if(!questionarioCleared.isClear((UserSessionImpl) session,QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_START_ASSIGN_ANSWERS.name()) )
 ,15 → 37,23
             throw new NotAuthorizedException("Nao tem autorização para atribuir respostas ao questionario " + questionarioId);
         }
+        /*******VERIFICACAO DE RESPOSTAS*********/
+        long respostas = DaoFactory.getQuestionarioDaoImpl().getNumeroRespostas(questionarioId);
+        if(respostas > 0)
+        {
+            logger.warn("Vai falhar tem respostas, deixar correr para avisar o user no log");
+        }
+        else
+        {
+            //Nao muda de estado porque pode sempre gerar as respostas quando está em estado COURSES_ASSIGNED
+            ( questionarioCleared).setSubStatePedagogicoClass(QuestionarioImpl.SubStatePedagogico.ASSIGNING_ANSWERS);
+        }
         //CRIAR ATIVIDADE DE ATRIBUICAO DE RESPOSTAS
-        //Nao muda de estado porque pode sempre gerar as respostas quando está em estado COURSES_ASSIGNED
-        ( questionarioCleared).setSubStatePedagogicoClass(QuestionarioImpl.SubStatePedagogico.ASSIGNING_ANSWERS);
         Set<JobServiceTaskParameter> paramsJob = new HashSet<JobServiceTaskParameter>();
         JobServiceTaskParameterImpl paramJob = DomainObjectFactory.createJobServiceTaskParameterImpl();
         paramJob.setName(ServiceJob.JOB_questionario_id_KEY);
         paramJob.setDescription("ID do questionário");

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/questionarios/pedagogico/AnswersAlunosProcessor.java
 ,6 → 9,8
 import pt.estgp.estgweb.services.logresults.LogMessageTypeEnum;
 import pt.estgp.estgweb.services.logresults.impl.DefaultLogMessage;
 import pt.estgp.estgweb.services.logresults.impl.DefaultLogMessages;
+import pt.estgp.estgweb.services.sigesimports.ImportCourseService;
+import pt.estgp.estgweb.web.exceptions.NotAuthorizedException;
 import java.util.ArrayList;
 import java.util.HashMap;
 ,8 → 32,11
     int respostasRequisitadas = 0;
     private static Logger logger = Logger.getLogger(AnswersAlunosProcessor.class);
     /**
-     *
+     * #############  JOB TASK ############
+     * #############  JOB TASK ############
      * @return
      * @throws Throwable
      */
 ,6 → 44,22
     protected ILogMessages runJobServiceTask() throws Throwable
     {
+        long questionarioId = Long.parseLong(getParametersMap().get(ServiceJob.JOB_questionario_id_KEY).getObject());
+        DefaultLogMessages logMessages = new DefaultLogMessages();
+        /*****VERIFICACAO DE RESPOSTAS********/
+        long respostas = DaoFactory.getQuestionarioDaoImpl().getNumeroRespostas(questionarioId);
+        if(respostas > 0)
+        {
+            logMessages.addMessage(new DefaultLogMessage("error.questionario.com.respostas.nao.pode.efetuar.op", LogMessageTypeEnum.WARNING,
+                    "Operação não permitida, Existem Respostas"));
+            logger.warn(logMessages.getLastMessage());
+            serviceLogError(logMessages.getLastMessage());
+            throw new NotAuthorizedException("Nao tem autorização para agendar atribuições de cursos num questioário com respostas");
+        }
         unidadesNaoUtilizadas = 0;
         unidadesUtilizadas = 0;
         unidadesMarcadas = 0;
 ,8 → 68,8
         cursosUtilizados = 0;
         respostasRequisitadas = 0;
-        DefaultLogMessages logMessages = new DefaultLogMessages();
-        long questionarioId = Long.parseLong(getParametersMap().get(ServiceJob.JOB_questionario_id_KEY).getObject());
         QuestionarioImpl q = (QuestionarioImpl) DaoFactory.getQuestionarioDaoImpl().load(questionarioId);
 ,7 → 117,6
                     serviceLogInfo(msg);
                     if(!unidadeCurricularAfeta.isUsar())
                     {
                         unidadesNaoUtilizadas++;
 ,6 → 128,18
                     else
                     {
                         CourseUnitImpl cuImpl = (CourseUnitImpl) DaoFactory.getCourseUnitDaoImpl().narrow(unidadeCurricularAfeta.getCourseUnit());
+                        CourseImpl courseImpl = (CourseImpl) DaoFactory.getCourseDaoImpl().narrow(unidadeCurricularAfeta.getCourseUnit().getCourse());
+                        boolean separateTurmas = false;
+                        try{
+                            separateTurmas = ImportCourseService.loadCourseYearTurmasPolicy(Integer.parseInt(unidadeCurricularAfeta.getCursoAfeto().getCodigoCurso()), q.getYear(), logMessages, this);
+                        }catch(Throwable e)
+                        {
+                            msg = "!!! Código de Curso inválido a tentar verificar politica de turmas separadas, vai assumir falso";
+                            serviceLogError(msg);
+                            logger.error(msg);
+                            logMessages.addMessage(new DefaultLogMessage("questionario.answers.assigning", LogMessageTypeEnum.ERROR,msg));
+                        }
                         unidadesUtilizadas++;
                         verificaAlertasUnidade(logMessages, unidadeCurricularAfeta);
                         List<CourseUnitImpl.Tipologia> tipologias;
 ,11 → 149,11
                             //TODO ALTERAR QUANDO GERIRMOS USADAS PARA JA SO SE USAM SUMARIOS
                             for(CourseUnitImpl.Tipologia tMerge: tipologias)
                             {
-                                if(tMerge.isSumario())
-                                {
-                                    tMerge.setUse(true);
-                                    break;
-                                }
+                                //if(tMerge.isSumario())
+                                //{
+                                tMerge.setUse(true);
+                                //    break;
+                                //}
                             }
                         }
                         else
 ,14 → 166,27
                             }
                         }
-                        //Lista de Professores para ir removendo à medida que sao usados para no final confirmar se algum
-                        //não tinha tipologia vamos coloca-lo manualmente
                         Map<String,Teacher> professoresEsperados = new HashMap<String, Teacher>();
                         for(Teacher t: cuImpl.getTeachers()) { professoresEsperados.put(t.getSigesCode() + "", t); }
                         for(CourseUnitImpl.Tipologia tMerge: tipologias) { professoresEsperados.remove(tMerge.getCdDocente()); }
-                        List<CourseUnitImpl.Tipologia> tipologiasEmFalta = criarTipologiasRequisitadasSimplesParaProfsForaDasTurmasPorFaltaDeSumarios(logMessages, q, unidadeCurricularAfeta, cuImpl, professoresEsperados);
-                        tipologias.addAll(tipologiasEmFalta);
+                        if(separateTurmas)
+                        {
+                            if(professoresEsperados.size() > 0)
+                            {
+                                msg = "!!! Unidade de um curso de turmas separadas, vamos usar apenas as tipologias para atribuir respostas, não vamos adicionar professores que não sumariaram";
+                                serviceLogWarn(msg);
+                                logger.warn(msg);
+                                logMessages.addMessage(new DefaultLogMessage("questionario.answers.assigning", LogMessageTypeEnum.WARNING,msg));
+                            }
+                        }
+                        else
+                        {
+                            //Lista de Professores para ir removendo à medida que sao usados para no final confirmar se algum
+                            //não tinha tipologia vamos coloca-lo manualmente
+                            List<CourseUnitImpl.Tipologia> tipologiasEmFalta = criarTipologiasRequisitadasSimplesParaProfsForaDasTurmasPorFaltaDeSumarios(logMessages, q, unidadeCurricularAfeta, cuImpl, professoresEsperados);
+                            tipologias.addAll(tipologiasEmFalta);
+                        }
                         for(CourseUnitImpl.Tipologia tMerge: tipologias)
                         {
 ,23 → 292,23
             tipo.setCdTurma(cdTurma);
             tipo.setDsTipologia(dsTipologia);
             tipo.setUnidadeAfeta(unidadeCurricularAfeta);
-            CourseUnitImpl.TipologiaPersistent tMergePersistente = cuImpl.loadPersistent(tMerge);
-            if(tMergePersistente == null)
-            {
-                msg = "Tipologia não devolve persistente falha no professor ou na turma (docente:" + tMerge.getCdDocente() + ", turma: " + tMerge.getCdTurma() + ") para a unidade: " + unidadeCurricularAfeta.getCodigoUnidade() + " " + unidadeCurricularAfeta.getNome();
-                serviceLogError(msg);
-                logger.error(msg);
-                logMessages.addMessage(new DefaultLogMessage("questionario.answers.assigning", LogMessageTypeEnum.ERROR,msg));
-            }
-            else
-            {
+            try{
+                CourseUnitImpl.TipologiaPersistent tMergePersistente = cuImpl.loadPersistent(tMerge);
                 tipo.setNomeDocente(tMergePersistente.getTeacher().getName());
                 tipo.setDocenteAfeto(tMergePersistente.getTeacher());
                 tipo.setTurmaAfeta(tMergePersistente.getCourseUnitTurma());
                 DaoFactory.getQuestionarioPedagogicoTipologiaRequisitadaDaoImpl().save(tipo);
                 criarAlunosRequisitados(q, tipo, tMergePersistente.getCourseUnitTurma(),unidadeCurricularAfeta,cursoAfeto);
             }
+            catch(CourseUnitImpl.TipologiaLoadExeption exp)
+            {
+                msg = "Tipologia não devolve persistente " + exp.getMessage() + " (docente:" + tMerge.getCdDocente() + ", turma: " + tMerge.getCdTurma() + ") para a unidade: " + unidadeCurricularAfeta.getCodigoUnidade() + " " + unidadeCurricularAfeta.getNome() + " do curso de " + cursoAfeto.getNome() + "(" + cursoAfeto.getCodigoCurso() +")";
+                serviceLogError(msg);
+                logger.error(msg);
+                logMessages.addMessage(new DefaultLogMessage("questionario.answers.assigning", LogMessageTypeEnum.ERROR,msg));
+            }
             //Depois o home tem de procurar respostas requisitadas sem resposta
             //para cada uma vai pelo aluno requisitado buscar a turma o docente e pela
             //unidade afeta a unidade e o curso

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/questionarios/pedagogico/UpdateCoursesAndUnitsJobService.java
 ,13 → 95,33
         return new String[0];
     }
+    /*************
+     * CRIAR O JOB PARA O RUNNER
+     * @param questionarioId
+     * @param coursesList
+     * @param session
+     * @param questionarioCleared
+     * @return
+     * @throws NotAuthorizedException
+     */
     public QuestionarioImpl runJobSelectCourses(long questionarioId,String[] coursesList,UserSession session,QuestionarioImpl questionarioCleared) throws NotAuthorizedException {
         if(!questionarioCleared.isClear((UserSessionImpl) session,QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SCHEDULLE_SELECT_COURSES.name()))
         {
             throw new NotAuthorizedException("Nao tem autorização para agendar atribuições de cursos");
         }
-        ( questionarioCleared).setSubStatePedagogicoClass(QuestionarioImpl.SubStatePedagogico.ASSIGNING_COURSES);
+        /*******VERIFICACAO DE RESPOSTAS*********/
+        long respostas = DaoFactory.getQuestionarioDaoImpl().getNumeroRespostas(questionarioId);
+        if(respostas == 0)
+        {
+            (questionarioCleared).setSubStatePedagogicoClass(QuestionarioImpl.SubStatePedagogico.ASSIGNING_COURSES);
+        }
+        else
+        {
+            logger.warn("Vai falhar no serviço, deixar falhar para visar o user");
+        }
         JSONArray jsonArray = new JSONArray();
         for(String sele: coursesList)
         {
 ,6 → 165,15
         {
             throw new NotAuthorizedException("Nao tem autorização para agendar atribuições de cursos");
         }
+        long respostas = DaoFactory.getQuestionarioDaoImpl().getNumeroRespostas(questionarioId);
+        if(respostas > 0)
+        {
+            logMessages.addMessage(new DefaultLogMessage("error.questionario.com.respostas.nao.pode.efetuar.op", LogMessageTypeEnum.WARNING,
+                    "Operação não permitida, Existem Respostas"));
+            logger.warn(logMessages.getLastMessage());
+            serviceLogError(logMessages.getLastMessage());
+            return logMessages;
+        }
         for(QuestionarioPedagogicoCursoAfeto cu : DaoFactory.getQuestionarioPedagogicoCursoAfetoDaoImpl().find(questionarioId))
         {
             int unidades = 0;
 ,16 → 182,18
                 unidades = cu.getUnidadesAfetas().size();
                 for(QuestionarioPedagogicoUnidadeCurricularAfeta unidadeCurricularAfeta: cu.getUnidadesAfetas())
                 {
-                    logger.info("Reverting Unidade Curricular Afeta " + unidadeCurricularAfeta.getCodigoUnidade() + " - " + unidadeCurricularAfeta.getNome());
-                    unidadeCurricularAfeta.setCursoAfeto(null);
-                    DaoFactory.getQuestionarioPedagogicoUnidadeCurricularAfetaDaoImpl().delete(unidadeCurricularAfeta);
+                    String msg = "Reverting Unidade Curricular Afeta " + unidadeCurricularAfeta.getCodigoUnidade() + " - " + unidadeCurricularAfeta.getNome();
+                    logger.info(msg);
+                    logMessages.addMessage(new DefaultLogMessage("questionario.courses.selection", LogMessageTypeEnum.WARNING,msg));
                     if(unidadeCurricularAfeta.getTipologiasRequisitadas() != null && unidadeCurricularAfeta.getTipologiasRequisitadas().size() > 0)
                     {
-                        String msg = "A unidade " + unidadeCurricularAfeta.getCodigoUnidade() + " tem tipologias requisitadas que tem de ser removidas primeiro, iremos remover todas as tipologias e respostas candidatas associadas";
+                        msg = "A unidade " + unidadeCurricularAfeta.getCodigoUnidade() + " tem tipologias requisitadas que tem de ser removidas primeiro, iremos remover todas as tipologias e respostas candidatas associadas";
                         logger.warn(msg);
                         logMessages.addMessage(new DefaultLogMessage("questionario.courses.selection", LogMessageTypeEnum.WARNING,msg));
                         removeTipologiasERespostasCascade(unidadeCurricularAfeta);
                     }
+                    unidadeCurricularAfeta.setCursoAfeto(null);
+                    DaoFactory.getQuestionarioPedagogicoUnidadeCurricularAfetaDaoImpl().delete(unidadeCurricularAfeta);
                 }
             }
             String msg = "Removendo curso afeto:" + cu.getNome() + " e " + unidades + " uniades afetas";
 ,6 → 211,17
     public static ILogMessages revertAllRespostasCandidatas(long questionarioId, ServiceJob serviceJob) throws NotAuthorizedException {
         DefaultLogMessages logMessages = new DefaultLogMessages();
+        long respostas = DaoFactory.getQuestionarioDaoImpl().getNumeroRespostas(questionarioId);
+        if(respostas > 0)
+        {
+            logMessages.addMessage(new DefaultLogMessage("error.questionario.com.respostas.nao.pode.efetuar.op", LogMessageTypeEnum.WARNING,
+                    "Operação não permitida, Existem Respostas"));
+            logger.warn(logMessages.getLastMessage());
+            serviceJob.serviceLogError(logMessages.getLastMessage());
+            throw new NotAuthorizedException(logMessages.getLastMessage());
+        }
         String msg = "Revertendo respostas candidatas do questionario " + questionarioId;
         logger.info(msg);
         serviceJob.serviceLogInfo(msg);
 ,9 → 251,6
                     }
                 }
             }
-            msg = "Removendo curso afeto:" + cu.getNome() + " e " + unidades + " uniades afetas";
-            logger.info(msg);
-            serviceJob.serviceLogWarn(msg);
             logMessages.addMessage(new DefaultLogMessage("questionario.courses.selection", LogMessageTypeEnum.INFO,msg));
         }
         return logMessages;
 ,6 → 292,8
     /**
      *
+     * #############  JOB TASK ############
+     * #############  JOB TASK ############
      * @return
      * @throws Throwable
      */
 ,6 → 305,17
         long questionarioId = Long.parseLong(getParametersMap().get(ServiceJob.JOB_questionario_id_KEY).getObject());
         QuestionarioImpl q = (QuestionarioImpl) DaoFactory.getQuestionarioDaoImpl().load(questionarioId);
+        /********VERIFICACAO DE RESPOSTAS***********/
+        long respostas = DaoFactory.getQuestionarioDaoImpl().getNumeroRespostas(questionarioId);
+        if(respostas > 0)
+        {
+            logMessages.addMessage(new DefaultLogMessage("error.questionario.com.respostas.nao.pode.efetuar.op", LogMessageTypeEnum.WARNING,
+                    "Operação não permitida, Existem Respostas"));
+            logger.warn(logMessages.getLastMessage());
+            serviceLogError(logMessages.getLastMessage());
+            throw new NotAuthorizedException("Nao tem autorização para agendar atribuições de cursos num questioário com respostas");
+        }
         String[] coursesList = deserializeCoursesList(q);
         //Colocamos já aqui o estado para nao se poder mudar o Ano e o Semestre
 ,7 → 424,7
         DaoFactory.getQuestionarioPedagogicoCursoAfetoDaoImpl().delete(cursoAfeto);
     }
-    private void removeUnselectedUnits(QuestionarioPedagogicoCursoAfeto cursoAfetado, List<String> newUnidadesCodesList) {
+    private void removeUnselectedUnits(QuestionarioPedagogicoCursoAfeto cursoAfetado, List<Long> newUnidadesCodesList) {
         /** logging **/
         String msg = "Removing unselected units from course: " + cursoAfetado.getCodigoCurso();
         serviceLogInfo(msg);
 ,7 → 433,7
         Set<QuestionarioPedagogicoUnidadeCurricularAfeta> allUnidades =  cursoAfetado.getUnidadesAfetas();
         for(QuestionarioPedagogicoUnidadeCurricularAfeta unidadeAfeta: allUnidades)
         {
-            if(!newUnidadesCodesList.contains(unidadeAfeta.getCodigoUnidade()))
+            if(!newUnidadesCodesList.contains(unidadeAfeta.getCourseUnit().getId()))
             {
                 /** logging **/
                 msg = "--->Deleting unidade: " + unidadeAfeta.getCodigoUnidade();
 ,7 → 502,7
-        List<String> newUnitCodesList = new ArrayList<String>();
+        List<Long> newUnitCodesList = new ArrayList<Long>();
         int countUnits = 0;
         List<CourseUnitDaoImpl.CourseUnitResult> results = DaoFactory.getCourseUnitDaoImpl().loadCourseUnits(c.getId(), q.getSemestre(), q.getYear());
         int totalUnits =  results.size();
 ,7 → 510,7
         {
             countUnits++;
             CourseUnit cu = DaoFactory.getCourseUnitDaoImpl().load(cur.id);
-            newUnitCodesList.add(cu.getCode());
+            newUnitCodesList.add(cu.getId());
             /** logging **/
             msg = "---->(" + countUnits + " of " + totalUnits  +") CourseUnit loaded: " + cu.getName() + "(" + cu.getCode() + ")";
             serviceLogInfo(msg);
 ,10 → 534,10
         String msg;
         QuestionarioPedagogicoUnidadeCurricularAfetaImpl unidadeAfeta = null;
-        List<QuestionarioPedagogicoUnidadeCurricularAfeta> unidadesFound = DaoFactory.getQuestionarioPedagogicoUnidadeCurricularAfetaDaoImpl().find(cursoAfeto.getQuestionario().getId(), cursoAfeto.getCodigoCurso(), cu.getCode());
+        List<QuestionarioPedagogicoUnidadeCurricularAfeta> unidadesFound = DaoFactory.getQuestionarioPedagogicoUnidadeCurricularAfetaDaoImpl().find(cursoAfeto.getQuestionario().getId(), cursoAfeto.getCodigoCurso(), cu.getId());
         if(unidadesFound != null && unidadesFound.size() > 1)
         {
-            msg = "Encontradas mais que uma unidade nos mesmos códigos: curso:" +cursoAfeto.getCodigoCurso() + ", unidade " + cu.getCode() + " apagando um";
+            msg = "Encontradas mais que uma unidade nos mesmos códigos: curso:" +cursoAfeto.getCodigoCurso() + ", unidade " + cu.getCode() + " com id sistema(" + cu.getId() + ") apagando um";
             serviceLogWarn(msg);
             logger.warn(msg);
             logMessages.addMessage(new DefaultLogMessage("questionario.courses.selection", LogMessageTypeEnum.WARNING,msg));

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/questionarios/PedagogicoAlunosProcessor.java
 ,109 → 47,129
         questionario.setSubStatePedagogicoClass(QuestionarioImpl.SubStatePedagogico.START);
     }
     public void initClearances(QuestionarioImpl q, UserSessionImpl usession, SimpleClearanceRuledSupport s)
     {
-        if((usession.getUser().isSuperuserOrAdmin()
-                || usession.getUser().hasRole(Globals.QUESTIONARIOS_ADMIN)))
+        if(q.getStateEnum() == QuestionarioImpl.State.ASSIGNATION_DETAILS)
+            assignationDetailsClearances(q, usession, s);
+        if(q.getStateEnum() == QuestionarioImpl.State.STOPED_WITH_ANSWERS || q.getStateEnum() == QuestionarioImpl.State.PROCESSING || q.getStateEnum() == QuestionarioImpl.State.PROCESSING_WITH_ANSWERS)
         {
-            if(q.getSubStatePedagodigoEnum() == QuestionarioImpl.SubStatePedagogico.START ||
-                    q.getSubStatePedagodigoEnum() == QuestionarioImpl.SubStatePedagogico.YEAR_SEMESTRE_ASSIGNED)
-                s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SET_ANO_SEMESTRE.name(),usession);
+            if(usession.getUser().hasRole(Globals.ROLE_PRESIDENTE_CONCELHO_PEDAGOGICO))
+            {
+                s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SEE_DASHBOARD.name(),usession);
+                s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SEE_FORM.name(),usession);
+            }
         }
+    }
-        if(q.getSubStatePedagodigoEnum().getPosition() >= QuestionarioImpl.SubStatePedagogico.YEAR_SEMESTRE_ASSIGNED.getPosition() &&
-                q.getSubStatePedagodigoEnum().getPosition() < QuestionarioImpl.SubStatePedagogico.FINNISHED_ANSWERS_GENERATING.getPosition())
+    private void assignationDetailsClearances(QuestionarioImpl q, UserSessionImpl usession, SimpleClearanceRuledSupport s) {
+        if(q.getStateEnum() == QuestionarioImpl.State.ASSIGNATION_DETAILS)
         {
-            s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SCHEDULLE_SEE_SELECT_COURSES.name(),usession);
             if((usession.getUser().isSuperuserOrAdmin()
                     || usession.getUser().hasRole(Globals.QUESTIONARIOS_ADMIN)))
             {
-                if(q.getCourseSelectionTaskId() <= 0 || q.getSubStatePedagodigoEnum().getPosition() == QuestionarioImpl.SubStatePedagogico.COURSES_ASSIGNED.getPosition())
-                    s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SCHEDULLE_SELECT_COURSES.name(),usession);
-                else
+                if(q.getSubStatePedagodigoEnum() == QuestionarioImpl.SubStatePedagogico.START ||
+                        q.getSubStatePedagodigoEnum() == QuestionarioImpl.SubStatePedagogico.YEAR_SEMESTRE_ASSIGNED)
+                    s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SET_ANO_SEMESTRE.name(),usession);
+            }
+            if(q.getSubStatePedagodigoEnum().getPosition() >= QuestionarioImpl.SubStatePedagogico.YEAR_SEMESTRE_ASSIGNED.getPosition() &&
+                    q.getSubStatePedagodigoEnum().getPosition() < QuestionarioImpl.SubStatePedagogico.FINNISHED_ANSWERS_GENERATING.getPosition())
+            {
+                s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SCHEDULLE_SEE_SELECT_COURSES.name(),usession);
+                if((usession.getUser().isSuperuserOrAdmin()
+                        || usession.getUser().hasRole(Globals.QUESTIONARIOS_ADMIN)))
                 {
-                    JobServiceTask task = DaoFactory.getJobServiceTaskDaoImpl().load(q.getCourseSelectionTaskId());
-                    if(task.isExecuted() || (task.getSaveDate() != null &&
-                            System.currentTimeMillis()-task.getSaveDate().getTime()>1800000)) //half hour blocked, 30 minutos
+                    if(q.getCourseSelectionTaskId() <= 0 || q.getSubStatePedagodigoEnum().getPosition() == QuestionarioImpl.SubStatePedagogico.COURSES_ASSIGNED.getPosition())
+                        s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SCHEDULLE_SELECT_COURSES.name(),usession);
+                    else
                     {
-                        if(!task.isExecuted() && System.currentTimeMillis()-task.getSaveDate().getTime()>1800000)
+                        JobServiceTask task = DaoFactory.getJobServiceTaskDaoImpl().load(q.getCourseSelectionTaskId());
+                        if(task.isExecuted() || (task.getSaveDate() != null &&
+                                System.currentTimeMillis()-task.getSaveDate().getTime()>1800000)) //half hour blocked, 30 minutos
                         {
-                            q.setSubStatePedagogicoClass(QuestionarioImpl.SubStatePedagogico.YEAR_SEMESTRE_ASSIGNED);//rolling back to year semestre assigned
+                            if(!task.isExecuted() && System.currentTimeMillis()-task.getSaveDate().getTime()>1800000)
+                            {
+                                q.setSubStatePedagogicoClass(QuestionarioImpl.SubStatePedagogico.YEAR_SEMESTRE_ASSIGNED);//rolling back to year semestre assigned
+                            }
+                            task.setExecuted(true);
+                            s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SCHEDULLE_SELECT_COURSES.name(),usession);
                         }
-                        task.setExecuted(true);
-                        s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SCHEDULLE_SELECT_COURSES.name(),usession);
                     }
                 }
             }
-        }
-        if(q.getSubStatePedagodigoEnum().getPosition() >= QuestionarioImpl.SubStatePedagogico.COURSES_ASSIGNED.getPosition() &&
-                q.getSubStatePedagodigoEnum().getPosition() < QuestionarioImpl.SubStatePedagogico.FINNISHED_ANSWERS_GENERATING.getPosition())
-        {
+            if(q.getSubStatePedagodigoEnum().getPosition() >= QuestionarioImpl.SubStatePedagogico.COURSES_ASSIGNED.getPosition() &&
+                    q.getSubStatePedagodigoEnum().getPosition() < QuestionarioImpl.SubStatePedagogico.FINNISHED_ANSWERS_GENERATING.getPosition())
+            {
-            if((usession.getUser().isSuperuserOrAdmin()
-                    || usession.getUser().hasRole(Globals.QUESTIONARIOS_ADMIN))
-                    || usession.getUser().hasRole(Globals.QUESTIONARIOS_TIPOLOGIAS_ADMIN))
-            {
-                s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_CHANGE_TIPOLOGIES.name(),usession);
-            }
+                if((usession.getUser().isSuperuserOrAdmin()
+                        || usession.getUser().hasRole(Globals.QUESTIONARIOS_ADMIN))
+                        || usession.getUser().hasRole(Globals.QUESTIONARIOS_TIPOLOGIAS_ADMIN))
+                {
+                    s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_CHANGE_TIPOLOGIES.name(),usession);
+                }
-            if((usession.getUser().isSuperuserOrAdmin()
-                    || usession.getUser().hasRole(Globals.QUESTIONARIOS_ADMIN))
-                    || usession.getUser().hasRole(Globals.QUESTIONARIOS_ASSIGNEMENTS_ADMIN))
-            {
-                s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_CHANGE_ASSIGNEMENTS.name(),usession);
-            }
+                if((usession.getUser().isSuperuserOrAdmin()
+                        || usession.getUser().hasRole(Globals.QUESTIONARIOS_ADMIN))
+                        || usession.getUser().hasRole(Globals.QUESTIONARIOS_ASSIGNEMENTS_CHECK_STUDENTS_ADMIN))
+                {
+                    s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_CHANGE_ASSIGNEMENTS.name(),usession);
+                    //s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_CHANGE_ASSIGNEMENTS_USE_UNIT.name(),usession);
+                }
-            if((usession.getUser().isSuperuserOrAdmin()
-                    || usession.getUser().hasRole(Globals.QUESTIONARIOS_ADMIN))
-                    || usession.getUser().hasRole(Globals.QUESTIONARIOS_ASSIGNEMENTS_CHECK_TEACHERS_ADMIN))
-            {
-                s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_CHANGE_ASSIGNEMENTS_CHECK_TEACHERS.name(),usession);
-                s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_CHANGE_ASSIGNEMENTS_USE_UNIT.name(),usession);
-            }
+                if((usession.getUser().isSuperuserOrAdmin()
+                        || usession.getUser().hasRole(Globals.QUESTIONARIOS_ADMIN))
+                        || usession.getUser().hasRole(Globals.QUESTIONARIOS_ASSIGNEMENTS_CHECK_TEACHERS_ADMIN))
+                {
+                    s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_CHANGE_ASSIGNEMENTS_CHECK_TEACHERS.name(),usession);
+                    s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_CHANGE_ASSIGNEMENTS_USE_UNIT.name(),usession);
+                }
-            if((usession.getUser().isSuperuserOrAdmin()
-                    || usession.getUser().hasRole(Globals.QUESTIONARIOS_ADMIN)))
-            {
+                if((usession.getUser().isSuperuserOrAdmin()
+                        || usession.getUser().hasRole(Globals.QUESTIONARIOS_ADMIN)))
+                {
-                s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SEE_START_ASSIGN_ANSWERS.name(),usession);
-                s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_REVERT_ALL_ASSIGNEMENTS.name(),usession);
+                    s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SEE_START_ASSIGN_ANSWERS.name(),usession);
+                    s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_REVERT_ALL_ASSIGNEMENTS.name(),usession);
-                //ATRIBUIR RESPOSTAS MAS SO DEPOIS DE CURSOS ATRIBUIDOS
-                if(q.getAnswerGenerationTaskId() <= 0 || q.getSubStatePedagodigoEnum().getPosition() == QuestionarioImpl.SubStatePedagogico.ANSWERS_ASSIGNED.getPosition())
-                    s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_START_ASSIGN_ANSWERS.name(),usession);
-                else
-                {
-                    JobServiceTask task = DaoFactory.getJobServiceTaskDaoImpl().load(q.getAnswerGenerationTaskId());
-                    if(task.isExecuted() || (task.getSaveDate() != null &&
-                            System.currentTimeMillis()-task.getSaveDate().getTime()>1800000)) //half hour blocked, 30 minutos
+                    //ATRIBUIR RESPOSTAS MAS SO DEPOIS DE CURSOS ATRIBUIDOS
+                    if(q.getAnswerGenerationTaskId() <= 0 || q.getSubStatePedagodigoEnum().getPosition() == QuestionarioImpl.SubStatePedagogico.ANSWERS_ASSIGNED.getPosition())
+                        s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_START_ASSIGN_ANSWERS.name(),usession);
+                    else
                     {
-                        if(!task.isExecuted() && System.currentTimeMillis()-task.getSaveDate().getTime()>1800000)
+                        JobServiceTask task = DaoFactory.getJobServiceTaskDaoImpl().load(q.getAnswerGenerationTaskId());
+                        if(task.isExecuted() || (task.getSaveDate() != null &&
+                                System.currentTimeMillis()-task.getSaveDate().getTime()>1800000)) //half hour blocked, 30 minutos
                         {
-                            q.setSubStatePedagogicoClass(QuestionarioImpl.SubStatePedagogico.COURSES_ASSIGNED);//rolling back to courses assigned
+                            if(!task.isExecuted() && System.currentTimeMillis()-task.getSaveDate().getTime()>1800000)
+                            {
+                                q.setSubStatePedagogicoClass(QuestionarioImpl.SubStatePedagogico.COURSES_ASSIGNED);//rolling back to courses assigned
+                            }
+                            task.setExecuted(true);
+                            s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_START_ASSIGN_ANSWERS.name(),usession);
                         }
-                        task.setExecuted(true);
-                        s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_START_ASSIGN_ANSWERS.name(),usession);
                     }
                 }
             }
-        }
-        if(q.getSubStatePedagodigoEnum().getPosition() == QuestionarioImpl.SubStatePedagogico.ANSWERS_ASSIGNED.getPosition())
-        {
-            if((usession.getUser().isSuperuserOrAdmin()
-                    || usession.getUser().hasRole(Globals.QUESTIONARIOS_ADMIN)))
+            if(q.getSubStatePedagodigoEnum().getPosition() == QuestionarioImpl.SubStatePedagogico.ANSWERS_ASSIGNED.getPosition())
             {
-                s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_FINNISH_ASSIGNEMENTS.name(),usession);
+                if((usession.getUser().isSuperuserOrAdmin()
+                        || usession.getUser().hasRole(Globals.QUESTIONARIOS_ADMIN)))
+                {
+                    s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_PUT_ANSWERS_ASSIGNED.name(),usession);
+                }
             }
         }
     }
     @Override

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/questionarios/QuestionariosService.java
 ,5 → 1,6
 package pt.estgp.estgweb.services.questionarios;
+import org.apache.log4j.Logger;
 import pt.estgp.estgweb.domain.*;
 import pt.estgp.estgweb.domain.dao.DaoFactory;
 import pt.estgp.estgweb.domain.views.QuestionarioView;
 ,6 → 15,8
 public class QuestionariosService implements IService
 {
+    private static final Logger logger = Logger.getLogger(QuestionariosService.class);
     //NEW QUESTIONARIOS COME BY THIS SERVICE
     public QuestionarioImpl newQuestionarioForm(QuestionarioImpl qform, UserSession userSession) throws NotAuthorizedException
     {
 ,4 → 116,82
         }
     }
+    /**
+     * Passa para o estado ASSIGNED_ANSWERS
+     * @param questionarioId
+     * @param userSession
+     * @param questionarioCleared
+     * @return
+     */
+    public QuestionarioImpl putAssignedAnswers(long questionarioId, UserSession userSession,QuestionarioImpl questionarioCleared)
+    {
+        if(questionarioCleared.isClear((UserSessionImpl) userSession,QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_PUT_ANSWERS_ASSIGNED.toString()))
+        {
+            questionarioCleared.setStateClass(QuestionarioImpl.State.ASSIGNED_ANSWERS);
+        }
+        return questionarioCleared;
+    }
+    public QuestionarioImpl revertAssignationDetails(long questionarioId, UserSession userSession,QuestionarioImpl questionarioCleared)
+    {
+        if(questionarioCleared.isClear((UserSessionImpl) userSession,QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_REVERT_TO_ASSIGNATION_DETAILS.toString()))
+        {
+            questionarioCleared.setStateClass(QuestionarioImpl.State.ASSIGNATION_DETAILS);
+        }
+        return questionarioCleared;
+    }
+    public QuestionarioImpl startProcessement(long questionarioId, UserSession userSession,QuestionarioImpl questionarioCleared)
+    {
+        if(questionarioCleared.isClear((UserSessionImpl) userSession, QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_START_PROCESSEMENT.toString()))
+        {
+            if(questionarioCleared.getStateEnum() == QuestionarioImpl.State.ASSIGNED_ANSWERS)
+                questionarioCleared.setStateClass(QuestionarioImpl.State.PROCESSING);
+            else if(questionarioCleared.getStateEnum() == QuestionarioImpl.State.STOPED_WITH_ANSWERS)
+                questionarioCleared.setStateClass(QuestionarioImpl.State.PROCESSING_WITH_ANSWERS);
+        }
+        return questionarioCleared;
+    }
+    public QuestionarioImpl stopProcessement(long questionarioId, UserSession userSession,QuestionarioImpl questionarioCleared)
+    {
+        if(questionarioCleared.isClear((UserSessionImpl) userSession,QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_STOP_PROCESSEMENT.toString()))
+        {
+            if(questionarioCleared.getStateEnum() == QuestionarioImpl.State.PROCESSING)
+                questionarioCleared.setStateClass(QuestionarioImpl.State.ASSIGNED_ANSWERS);
+            else if(questionarioCleared.getStateEnum() == QuestionarioImpl.State.PROCESSING_WITH_ANSWERS)
+                questionarioCleared.setStateClass(QuestionarioImpl.State.STOPED_WITH_ANSWERS);
+        }
+        return questionarioCleared;
+    }
+    public void salvarResposta(QuestionarioResposta resposta,Long alunoRequisitadoId,UserSession userSession) throws NotAuthorizedException {
+        Questionario q = DaoFactory.getQuestionarioDaoImpl().load(resposta.getQuestionario().getId());
+        QuestionarioImpl questionario = (QuestionarioImpl) DaoFactory.getQuestionarioDaoImpl().narrow(q);
+        QuestionarioPedagogicoAlunoRequisitado alunoRequisitado = DaoFactory.getQuestionarioPedagogicoAlunoRequisitadoDaoImpl().load(alunoRequisitadoId);
+        if(questionario.getStateEnum() != QuestionarioImpl.State.PROCESSING && questionario.getStateEnum() != QuestionarioImpl.State.PROCESSING_WITH_ANSWERS )
+        {
+            throw new NotAuthorizedException("O questionário interrompido por razões administrativas, por favor tente mais tarde");
+        }
+        if(!((alunoRequisitado.getRespostaRequisitada().getQuestionario().getId() == questionario.getId())
+                &&
+                alunoRequisitado.getRespostaRequisitada().getResposta() == null
+                &&
+                alunoRequisitado.getAluno().getId() == userSession.getUser().getId()))
+        {
+            throw new NotAuthorizedException("Não está autorizado a submeter esta resposta.");
+        }
+        resposta.setId(0);
+        resposta.setQuestionario(questionario);
+        resposta.setUser(alunoRequisitado.getAluno());
+        alunoRequisitado.getRespostaRequisitada().setResposta(resposta);
+        DaoFactory.getQuestionarioRespostaDaoImpl().save(resposta);
+        questionario.setStateClass(QuestionarioImpl.State.PROCESSING_WITH_ANSWERS);
+    }
 }

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/entity/EntityServiceJson.java
 ,12 → 2,13
 import com.owlike.genson.Genson;
 import com.owlike.genson.TransformationException;
-import pt.estgp.estgweb.domain.CourseUnit;
+import pt.estgp.estgweb.domain.*;
 import pt.estgp.estgweb.domain.dao.DaoFactory;
 import pt.utl.ist.berserk.logic.serviceManager.IService;
 import java.io.IOException;
 import java.io.Serializable;
+import java.util.ArrayList;
 /**
  * Created by jorgemachado on 22/03/16.
 ,8 → 28,37
             .create();
+    static Genson userGenson = new Genson.Builder()
+            .exclude(Object.class)
+            .exclude(User.class)
+            .exclude(GenericUser.class)
+            .exclude(Student.class)
+            .exclude(Teacher.class)
+            .include("id", User.class)
+            .include("name", User.class)
+            .include("sigesCode", User.class)
+            .include("email", User.class)
+            .include("roles", User.class)
+            .create();
+    public String courseUnit(CourseUnit cu) throws IOException, TransformationException {
+        return courseUnitGenson.serialize(cu);
+    }
     public String courseUnit(Serializable s) throws IOException, TransformationException {
         CourseUnit cu = DaoFactory.getCourseUnitDaoImpl().get(s);
         return courseUnitGenson.serialize(cu);
     }
+    public String user(Serializable s) throws IOException, TransformationException {
+        User u = DaoFactory.getUserDaoImpl().get(s);
+        return userGenson.serialize(u);
+    }
+    public String user(User u) throws IOException, TransformationException {
+        return userGenson.serialize(u);
+    }
+    public String user(ArrayList<User> users) throws IOException, TransformationException {
+        return userGenson.serialize(users);
+    }
 }

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/StudentImpl.java
 ,6 → 3,7
 import jomm.utils.StringsUtils;
 import org.apache.log4j.Logger;
 import pt.estgp.estgweb.Globals;
+import pt.estgp.estgweb.utils.RoleManager;
 import pt.utl.ist.berserk.logic.serviceManager.IServiceManager;
 import pt.utl.ist.berserk.logic.serviceManager.ServiceManager;
 ,8 → 51,11
         return subscribedCoursesOldYearsView;
     }
-    public String getManagedRole() {
-        return STUDENT_ROLE;
+    public String getManagedRole()
+    {
+        List<String> roles = new ArrayList<String>();
+        roles.add(STUDENT_ROLE);
+        return RoleManager.getSerialRoles(roles);
     }
     public List<CourseUnit> getSubscribedUnitsViewS1()

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/DomainObjectFactory.java
 ,4 → 419,8
     public static QuestionarioRespostaRequisitadaImpl createQuestionarioRespostaRequisitadaImpl(){
         return new QuestionarioRespostaRequisitadaImpl();
     }
+    public static QuestionarioRespostaImpl createQuestionarioRespostaImpl() {
+        return new QuestionarioRespostaImpl();
+    }
 }

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/UserImpl.java
 ,4 → 112,11
     {
         return DesUtils.getInstance().decrypt(getPop3password());
     }*/
+    public String getShortName()
+    {
+        if(getName() != null)
+            return getName().split(" ")[0];
+        return getName();
+    }
 }

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/QuestionarioImpl.java
 ,7 → 30,7
         CREATED(1),
         ASSIGNATION_DETAILS(2),
-        ASSIGNING_ANSWERS_PROCESSEMENT(3),
+        ASSIGNING_ANSWERS_PROCESSEMENT(3), //NAO USADO NO PEDAGOGIGO OS ESTADOS INTERNOS RESOLVEM O PROBLEMA
         ASSIGNED_ANSWERS(4),
         PROCESSING(5),
         PROCESSING_WITH_ANSWERS(6),
 ,7 → 289,7
         if((usession.getUser().isSuperuserOrAdmin()
                 || usession.getUser().hasRole(Globals.QUESTIONARIOS_ADMIN))
-                || usession.getUser().hasRole(Globals.QUESTIONARIOS_ASSIGNEMENTS_ADMIN)
+                || usession.getUser().hasRole(Globals.QUESTIONARIOS_ASSIGNEMENTS_CHECK_STUDENTS_ADMIN)
                 || usession.getUser().hasRole(Globals.QUESTIONARIOS_TIPOLOGIAS_ADMIN)
                 || usession.getUser().hasRole(Globals.QUESTIONARIOS_ASSIGNEMENTS_CHECK_TEACHERS_ADMIN)
                 || usession.getUser().hasRole(Globals.QUESTIONARIOS_GERAIS))
 ,24 → 310,49
                     s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_DELETE.name(),usession);
                     s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SAVE_ANSWER_PROCESSOR.name(),usession);
                 }
+                if(getStateEnum() == State.ASSIGNED_ANSWERS)
+                {
+                    s.addClearance(QuestionarioClearancesOperation.QUESTIONARIO_REVERT_TO_ASSIGNATION_DETAILS.name(),usession);
+                    s.addClearance(QuestionarioClearancesOperation.QUESTIONARIO_START_PROCESSEMENT.name(),usession);
+                }
+                if(getStateEnum() == State.PROCESSING)
+                {
+                    s.addClearance(QuestionarioClearancesOperation.QUESTIONARIO_STOP_PROCESSEMENT.name(),usession);
+                }
+                if(getStateEnum() == State.PROCESSING_WITH_ANSWERS)
+                {
+                    s.addClearance(QuestionarioClearancesOperation.QUESTIONARIO_STOP_PROCESSEMENT.name(),usession);
+                }
+                if(getStateEnum() == State.STOPED_WITH_ANSWERS)
+                {
+                    s.addClearance(QuestionarioClearancesOperation.QUESTIONARIO_START_PROCESSEMENT.name(),usession);
+                }
+                if(getStateEnum() == QuestionarioImpl.State.ASSIGNATION_DETAILS)
+                {
+                    s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SAVE_FORM.name(),usession);
+                }
             }
             //ANO SEMESTRE ESPECIFICO apenas neste estado, em atribuição de respostas e respostas atribuidas já não permite
             if(getStateEnum() == QuestionarioImpl.State.ASSIGNATION_DETAILS)
             {
-                if((usession.getUser().isSuperuserOrAdmin()
-                        || usession.getUser().hasRole(Globals.QUESTIONARIOS_ADMIN)))
-                {
-                    s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SAVE_FORM.name(),usession);
-                }
                 s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_ASSIGNATION_OPERATIONS.name(),usession);
+            }
-                getiAnswersProcessorClass().initClearances(this,usession,s);
-            }
-            if(getStateEnum() == State.ASSIGNING_ANSWERS_PROCESSEMENT)
+            if(getStateEnum() == QuestionarioImpl.State.STOPED_WITH_ANSWERS || getStateEnum() == QuestionarioImpl.State.PROCESSING || getStateEnum() == QuestionarioImpl.State.PROCESSING_WITH_ANSWERS)
             {
+                if(usession.getUser().isSuperuserOrAdmin()
+                        || usession.getUser().hasRole(Globals.QUESTIONARIOS_ADMIN)
+                        || usession.getUser().hasRole(Globals.QUESTIONARIOS_GERAIS))
+                {
+                    s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SEE_DASHBOARD.name(),usession);
+                    s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SEE_FORM.name(),usession);
+                }
             }
         }
+        //AS CLEARANCES SAO VERIFICADAS LA DENTRO PARA TODOS OS ESTADOS
+        getiAnswersProcessorClass().initClearances(this,usession,s);
         setClearanceRuledSupport(s);
     }
 ,6 → 369,13
         QUESTIONARIO_DELETE,
         QUESTIONARIO_REVERT_ALL_ASSIGNEMENTS,
+        QUESTIONARIO_PUT_ANSWERS_ASSIGNED,
+        QUESTIONARIO_REVERT_TO_ASSIGNATION_DETAILS,
+        QUESTIONARIO_START_PROCESSEMENT,
+        QUESTIONARIO_STOP_PROCESSEMENT,
         /*Pedagogico Cursos*/
         QUESTIONARIO_SET_ANO_SEMESTRE,
         QUESTIONARIO_SCHEDULLE_SELECT_COURSES,
 ,7 → 386,9
         QUESTIONARIO_CHANGE_ASSIGNEMENTS,
         QUESTIONARIO_CHANGE_ASSIGNEMENTS_CHECK_TEACHERS,
         QUESTIONARIO_CHANGE_ASSIGNEMENTS_USE_UNIT,
-        QUESTIONARIO_FINNISH_ASSIGNEMENTS,
+        QUESTIONARIO_SEE_DASHBOARD
         ;
         public static QuestionarioClearancesOperation parse(String clearance)

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/CourseUnitImpl.java
 ,8 → 511,36
             setTipologias(tipologias.serialize());
     }
-    public TipologiaPersistent loadPersistent(Tipologia myTipo)
+    public static class TipologiaLoadExeption extends Exception
     {
+        boolean teacherFail = false;
+        boolean turmaFail = false;
+        public TipologiaLoadExeption(boolean teacherFail, boolean turmaFail) {
+            this.teacherFail = teacherFail;
+            this.turmaFail = turmaFail;
+        }
+        public boolean isTeacherFail() {
+            return teacherFail;
+        }
+        public boolean isTurmaFail() {
+            return turmaFail;
+        }
+        @Override
+        public String getMessage() {
+            return "Professor: " + (teacherFail? "Falhou" : "OK") + " Turma: " + (turmaFail? "Falhou" : "OK");
+        }
+    }
+    /**
+     *
+     * @param myTipo
+     * @return
+     */
+    public TipologiaPersistent loadPersistent(Tipologia myTipo) throws TipologiaLoadExeption
+    {
         TipologiaPersistent tipologiaPersistent = new TipologiaPersistent();
         tipologiaPersistent.setHorRef(myTipo.isHorRef());
         tipologiaPersistent.setExtra(myTipo.isExtra());
 ,7 → 554,7
         if(tipologiaPersistent.getCourseUnitTurma() == null || tipologiaPersistent.getTeacher() == null)
         {
             logger.error("Turma ou professor nao encontrados enquanto fazia uma tipologia persistente: turma:" + myTipo.getCdTurma() + " teacher code: " + myTipo.getCdDocente());
-            return null;
+            throw new TipologiaLoadExeption(tipologiaPersistent.getTeacher() == null,tipologiaPersistent.getCourseUnitTurma() == null);
         }
         return tipologiaPersistent;
     }

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/dao/impl/UserDaoImpl.java
 ,6 → 10,7
 import pt.estgp.estgweb.domain.User;
 import pt.estgp.estgweb.domain.dao.DaoUtils;
 import pt.estgp.estgweb.services.common.SearchTypeEnum;
+import pt.estgp.estgweb.utils.RoleManager;
 import java.io.Serializable;
 import java.util.ArrayList;
 ,6 → 134,16
         }
     }
+    public List<User> loadRoleUsers(String role, int maxResults, int firstResult)
+    {
+        Criteria c = createCriteria()
+                .add(like("roles","%" + role + RoleManager.ROLE_SEPARATOR +"%"))
+                .addOrder(Order.asc("name"))
+                .setMaxResults(maxResults)
+                .setFirstResult(firstResult);
+        return c.list();
+    }
     public List<User> loadRoleUsers(String role)
     {
         if(role == null || role.trim().length() == 0)

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioDaoImpl.java
 ,15 → 1,20
 package pt.estgp.estgweb.domain.dao.impl;
 import jomm.dao.DaoException;
+import jomm.dao.impl.AbstractDao;
 import org.apache.log4j.Logger;
 import org.hibernate.Criteria;
 import org.hibernate.HibernateException;
+import org.hibernate.Query;
 import org.hibernate.criterion.Order;
 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;
-import static org.hibernate.criterion.Restrictions.eq;
+import static org.hibernate.criterion.Restrictions.*;
 /**
  * @author Jorge Machado
 ,5 → 68,128
         }
     }
+    public List<QuestionarioImpl> findProcessing()
+    {
+        try
+        {
+            Criteria criteria = createCriteria();
+            criteria.add(or(eq("state",QuestionarioImpl.State.PROCESSING.name()),eq("state",QuestionarioImpl.State.PROCESSING_WITH_ANSWERS.name())));
+            return criteria.list();
+        }
+        catch (HibernateException e)
+        {
+            throw new DaoException(e);
+        }
+    }
+    public List<QuestionarioImpl> findNotClosed()
+    {
+        try
+        {
+            Criteria criteria = createCriteria();
+            criteria.add(not(or(or(eq("state",QuestionarioImpl.State.CLOSED.name()),eq("state",QuestionarioImpl.State.PROCESSING_OLAP.name())),
+                    eq("state",QuestionarioImpl.State.OLAP.name()))))
+                    .addOrder(Order.desc("id"));
+            return criteria.list();
+        }
+        catch (HibernateException e)
+        {
+            throw new DaoException(e);
+        }
+    }
+    public long getNumeroRespostas(long questionarioId)
+    {
+        Query q = getCurrentSession().createQuery
+                ("select count(r.id) from r in class " + QuestionarioResposta.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 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;
+        public long unidades;
+        public long profs;
+        public long alunos;
+        public long turmas;
+        public long alunosDeUsadas;
+        public long profsDeUsadas;
+        public long unidadesUsadas;
+        public long profsTimeStudents;
+        public long respostasRequisitadas;
+        public long respostasObtidas;
+    }
+    public QuestionarioStatsVars loadQuestionarioStatsPedagogico(long questionarioId)
+    {
+        QuestionarioStatsVars questionarioStatsVars = new QuestionarioStatsVars();
+        Query q = AbstractDao.getCurrentSession().createQuery("SELECT " +
+                " count(distinct c.id) AS cursos " +
+                ",count(distinct u.id) AS unidades " +
+                ",sum (u.profs) AS profs " +
+                ",sum (u.turmas) AS turmas " +
+                ",sum (u.students) AS students " +
+                ",sum (case when u.usar = true then u.students else 0 end) AS alunosDeUsadas " +
+                ",sum (case when u.usar = true then u.profs else 0 end) AS profsDeUsadas " +
+                ",sum (case when u.usar = true then 1 else 0 end) AS unidadesUsadas " +
+                ",sum (case when u.usar = true then 1 else 1 end) AS unidadesTodasCheck " +
+                ",sum (case when u.usar = true then (u.profs * u.students) else 0 end) AS respostasEsperadas " +
+                "from " + QuestionarioPedagogicoCursoAfeto.class.getName() + " c " +
+                "JOIN c.questionario q " +
+                "JOIN c.unidadesAfetas u " +
+                "WHERE q.id = :id " +
+                "GROUP BY q.id");
+        q.setLong("id",questionarioId);
+        Object[] results = (Object[]) q.uniqueResult();
+        if(results != null && results[0] != null)
+        {
+            questionarioStatsVars.cursos = (Long) results[0];
+            questionarioStatsVars.unidades = (Long) results[1];
+            questionarioStatsVars.profs =   (Long) results[2];
+            questionarioStatsVars.turmas =   (Long) results[3];
+            questionarioStatsVars.alunos =   (Long) results[4];
+            questionarioStatsVars.alunosDeUsadas =   (Long) results[5];
+            questionarioStatsVars.profsDeUsadas =   (Long) results[6];
+            questionarioStatsVars.unidadesUsadas =   (Long) results[7];
+            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/domain/dao/impl/QuestionarioPedagogicoCursoAfetoDaoImpl.java
 ,18 → 58,8
         public long naoUsadas;
     }
-    public static class QuestionarioStatsVars
-    {
-        public long cursos;
-        public long unidades;
-        public long profs;
-        public long alunos;
-        public long turmas;
-        public long alunosDeUsadas;
-        public long profsDeUsadas;
-        public long unidadesUsadas;
-    }
     public CourseStatsVars loadStats(long cursoAfetoId)
     {
         CourseStatsVars courseStatsVars = new CourseStatsVars();
 ,44 → 91,24
         return courseStatsVars;
     }
-    public QuestionarioStatsVars loadQuestionarioStats(long questionarioId)
+    public long countRespostas(long cursoAfetoId)
     {
-        QuestionarioStatsVars questionarioStatsVars = new QuestionarioStatsVars();
         Query q = AbstractDao.getCurrentSession().createQuery("SELECT " +
-                " count(distinct c.id) AS cursos " +
-                ",count(distinct u.id) AS unidades " +
-                ",sum (u.profs) AS profs " +
-                ",sum (u.turmas) AS turmas " +
-                ",sum (u.students) AS students " +
-                ",sum (case when u.usar = true then u.students else 0 end) AS alunosDeUsadas " +
-                ",sum (case when u.usar = true then u.profs else 0 end) AS profsDeUsadas " +
-                ",sum (case when u.usar = true then 1 else 0 end) AS unidadesUsadas " +
-                ",sum (case when u.usar = true then 1 else 1 end) AS unidadesTodasCheck " +
+                " count(distinct r.id) AS respostas " +
                 "from " + QuestionarioPedagogicoCursoAfeto.class.getName() + " c " +
-                "JOIN c.questionario q " +
                 "JOIN c.unidadesAfetas u " +
-                "WHERE q.id = :id " +
-                "GROUP BY u.id");
+                "JOIN u.tipologiasRequisitadas t " +
+                "JOIN t.alunosRequisitados a " +
+                "JOIN a.respostaRequisitada rR " +
+                "JOIN rR.resposta r  " +
+                "WHERE c.id = :id ");
-        q.setLong("id",questionarioId);
-        Object[] results = (Object[]) q.uniqueResult();
+        q.setLong("id",cursoAfetoId);
+        Object result = q.uniqueResult();
+        if(result != null)
+            return (Long) result;
+        return 0;
+    }
-        if(results != null && results[0] != null)
-        {
-            questionarioStatsVars.cursos = (Long) results[0];
-            questionarioStatsVars.unidades = (Long) results[1];
-            questionarioStatsVars.profs =   (Long) results[2];
-            questionarioStatsVars.turmas =   (Long) results[3];
-            questionarioStatsVars.alunos =   (Long) results[4];
-            questionarioStatsVars.alunosDeUsadas =   (Long) results[5];
-            questionarioStatsVars.profsDeUsadas =   (Long) results[6];
-            questionarioStatsVars.unidadesUsadas =   (Long) results[7];
-            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");
-        }
-        return questionarioStatsVars;
-    }
 }

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioPedagogicoUnidadeCurricularAfetaDaoImpl.java
 ,16 → 16,16
         return (QuestionarioPedagogicoUnidadeCurricularAfetaDaoImpl) myInstance;
     }
-    public List<QuestionarioPedagogicoUnidadeCurricularAfeta> find(long questionarioId, String cursoCode,String codeUnidade)
+    public List<QuestionarioPedagogicoUnidadeCurricularAfeta> find(long questionarioId, String cursoCode,Long idUnidade)
     {//pt.estgp.estgweb.domain.dao.DaoFactory.getQuestionarioPedagogicoUnidadeCurricularAfetaDaoImpl().getCurrentSession().createCriteria(QuestionarioPedagogicoUnidadeCurricularAfeta.class).add(eq("cursoAfeto.id","1")).list()
             //add(eq("cuA.questionario.id", new Long(20))).add(eq("codigoUnidade","209535")).add(eq("cuA.codigoCurso","9119"))
         Query q = getCurrentSession().createQuery("select c from c in class " + QuestionarioPedagogicoUnidadeCurricularAfeta.class.getName() + " " +
             " join c.cursoAfeto as curso " +
                 "where curso.questionario.id = :questionarioId and curso.codigoCurso = :codigoCurso" +
-            " and c.codigoUnidade = :codigoUnidade");
+            " and c.courseUnit.id = :idUnidade");
         q.setLong("questionarioId", questionarioId);
         q.setString("codigoCurso", cursoCode);
-        q.setString("codigoUnidade",codeUnidade);
+        q.setLong("idUnidade",idUnidade);
         return q.list();
         /*DaoFactory.getCourseDaoImpl()

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/UserSessionImpl.java
 ,4 → 308,11
         return getUser() == null;
     }
+    public String getShortName()
+    {
+        if(getName() != null)
+            return getName().split(" ")[0];
+        return getName();
+    }
 }

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/form/questionarios/QuestionarioRespostaForm.java
 New file
 ,0 → 1,71
+package pt.estgp.estgweb.web.form.questionarios;
+import org.apache.struts.action.ActionErrors;
+import org.apache.struts.action.ActionMapping;
+import pt.estgp.estgweb.domain.DomainObjectFactory;
+import pt.estgp.estgweb.domain.QuestionarioResposta;
+import pt.estgp.estgweb.domain.QuestionarioRespostaImpl;
+import pt.estgp.estgweb.web.form.ApplicationForm;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+/**
+ * Created by jorgemachado on 05/06/16.
+ */
+public class QuestionarioRespostaForm extends ApplicationForm
+{
+    QuestionarioRespostaImpl resposta = DomainObjectFactory.createQuestionarioRespostaImpl();
+    public QuestionarioRespostaForm() {
+        resposta.setQuestionario(DomainObjectFactory.createQuestionarioImpl());
+    }
+    long alunoRequesitadoId;
+    public long getAlunoRequesitadoId() {
+        return alunoRequesitadoId;
+    }
+    public void setAlunoRequesitadoId(long alunoRequesitadoId) {
+        this.alunoRequesitadoId = alunoRequesitadoId;
+    }
+    public QuestionarioRespostaImpl getResposta() {
+        return resposta;
+    }
+    public void setResposta(QuestionarioRespostaImpl resposta) {
+        this.resposta = resposta;
+    }
+    @Override
+    public ActionErrors validate(ActionMapping mapping, HttpServletRequest request) {
+        ActionErrors errors = new ActionErrors();
+        List<String> respostasVazias = new ArrayList<String>();
+        for(int i = 1; i <= 17; i++)
+        {
+            try {
+                String r = (String) QuestionarioResposta.class.getMethod("getR"+i).invoke(resposta);
+                if(r == null || r.trim().length() == 0)
+                {
+                    if(respostasVazias.size() == 0)
+                        addMessage(errors, request, "questionario.respostas.grupos.1.2.3");
+                    respostasVazias.add("" + i);
+                }
+            }
+            catch (Throwable e)
+            {
+                System.err.println("Erro nao esperado metodo getR" + i + " nao existe na resposta");
+                e.printStackTrace();
+            }
+        }
+        if(respostasVazias.size() > 0)
+            request.setAttribute("respostasVazias",respostasVazias);
+        return errors;
+    }
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/questionarios/QuestionarioYearSemestreController.java
 ,6 → 3,7
 import org.apache.struts.action.*;
 import pt.estgp.estgweb.domain.QuestionarioImpl;
 import pt.estgp.estgweb.web.form.questionarios.QuestionarioForm;
+import pt.estgp.estgweb.web.form.questionarios.QuestionarioRespostaForm;
 import pt.estgp.estgweb.web.utils.RequestUtils;
 import pt.utl.ist.berserk.logic.serviceManager.IServiceManager;
 import pt.utl.ist.berserk.logic.serviceManager.ServiceManager;
 ,4 → 53,25
         }
         return mapping.findForward("admin");
     }
+    public ActionForward submitResposta(ActionMapping mapping,
+                                         ActionForm form,
+                                         HttpServletRequest request,
+                                         HttpServletResponse response)
+            throws Throwable
+    {
+        QuestionarioRespostaForm frm = (QuestionarioRespostaForm) form;
+        IServiceManager sm = ServiceManager.getInstance();
+        String[] names = {"resposta","alunoRequisitadoId"};
+        Object[] args = {frm.getResposta(),frm.getAlunoRequesitadoId()};
+        sm.execute(RequestUtils.getRequester(request, response),"QuestionarioSalvarResposta",args,names);
+        addMessage(request,"questionario.resposta.com.sucesso");
+        return mapping.findForward("success");
+    }
 }

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/questionarios/QuestionarioController.java
 ,5 → 141,120
     }
+    public ActionForward putInAssignedAnwsers(ActionMapping mapping,
+                                           ActionForm form,
+                                           HttpServletRequest request,
+                                           HttpServletResponse response)
+            throws Throwable
+    {
+        QuestionarioForm frm = (QuestionarioForm) form;
+        long questionarioId;
+        if(request.getParameter("questionarioId")!=null)
+            questionarioId = Long.parseLong(request.getParameter("questionarioId"));
+        else
+            questionarioId = frm.getQuestionario().getId();
+        IServiceManager sm = ServiceManager.getInstance();
+        String[] names = {"questionarioId"};
+        Object[] args = {questionarioId};
+        QuestionarioImpl affected = (QuestionarioImpl) sm.execute(RequestUtils.getRequester(request, response),"QuestionarioPutAssignedAnswers",args,names);
+        frm.setQuestionario(affected);
+        return mapping.findForward("admin");
+    }
+    public ActionForward revertAssignationDetails(ActionMapping mapping,
+                                              ActionForm form,
+                                              HttpServletRequest request,
+                                              HttpServletResponse response)
+            throws Throwable
+    {
+        QuestionarioForm frm = (QuestionarioForm) form;
+        long questionarioId;
+        if(request.getParameter("questionarioId")!=null)
+            questionarioId = Long.parseLong(request.getParameter("questionarioId"));
+        else
+            questionarioId = frm.getQuestionario().getId();
+        IServiceManager sm = ServiceManager.getInstance();
+        String[] names = {"questionarioId"};
+        Object[] args = {questionarioId};
+        QuestionarioImpl affected = (QuestionarioImpl) sm.execute(RequestUtils.getRequester(request, response),"QuestionarioRevertAssignationDetails",args,names);
+        frm.setQuestionario(affected);
+        return mapping.findForward("admin");
+    }
+    public ActionForward stopProcessement(ActionMapping mapping,
+                                                  ActionForm form,
+                                                  HttpServletRequest request,
+                                                  HttpServletResponse response)
+            throws Throwable
+    {
+        QuestionarioForm frm = (QuestionarioForm) form;
+        long questionarioId;
+        if(request.getParameter("questionarioId")!=null)
+            questionarioId = Long.parseLong(request.getParameter("questionarioId"));
+        else
+            questionarioId = frm.getQuestionario().getId();
+        IServiceManager sm = ServiceManager.getInstance();
+        String[] names = {"questionarioId"};
+        Object[] args = {questionarioId};
+        QuestionarioImpl affected = (QuestionarioImpl) sm.execute(RequestUtils.getRequester(request, response),"QuestionarioStopProcessement",args,names);
+        frm.setQuestionario(affected);
+        return mapping.findForward("admin");
+    }
+    public ActionForward startProcessement(ActionMapping mapping,
+                                            ActionForm form,
+                                            HttpServletRequest request,
+                                            HttpServletResponse response)
+            throws Throwable
+    {
+        QuestionarioForm frm = (QuestionarioForm) form;
+        long questionarioId;
+        if(request.getParameter("questionarioId")!=null)
+            questionarioId = Long.parseLong(request.getParameter("questionarioId"));
+        else
+            questionarioId = frm.getQuestionario().getId();
+        IServiceManager sm = ServiceManager.getInstance();
+        String[] names = {"questionarioId"};
+        Object[] args = {questionarioId};
+        QuestionarioImpl affected = (QuestionarioImpl) sm.execute(RequestUtils.getRequester(request, response),"QuestionarioStartProcessement",args,names);
+        frm.setQuestionario(affected);
+        return mapping.findForward("admin");
+    }
 }

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/authenticate/AuthenticateController.java
 ,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/BacoV32016/processos/QuestionariosAccess/importMdb.sh
 New file
 ,0 → 1,23
+MDB_FILE=$1
+QUESTDATA=$2
+QUESTPERIODO=$3
+TABLES="INQUERITO PROFESSOR CURSO DISCIPLINA PROFESSOR_DISCIPLINA R_DISCIPLINA R_DOCENTE"
+echo "Using file:$1 in year $2 semestre $3"
+echo "drop database inqueritos$QUESTDATA$QUESTPERIODO;" | mysql -uroot
+echo "create database inqueritos$QUESTDATA$QUESTPERIODO;" | mysql -uroot
+#mdb-schema inquerito_final.mdb | sed "s/Double/int/" | sed "s/Long Integer/int/" | sed "s/\[//" | sed "s/\]//" | sed "s/\Text (.*)/varchar(250)/" | sed "s/Boolean/BIT(1)/" | sed "s/Numeric (.*)/int/" | sed "s/Cópia de /copia_de_/" | mysql -uroot inqueritos_$QUESTDATA_$QUESTPERIODO
+#mdb-schema -S inquerito_final.mdb mysql | mysql -uroot inqueritos$QUESTDATA$QUESTPERIODO
+mdb-schema -S inquerito_final.mdb mysql | grep -i CREATE | cut -f 3 -d " " | sed "s/\`//" | sed "s/\`//" | grep -v mdb > tmp_tables
+echo $TABLES
+for i in $TABLES
+do
+echo "Exporting $i to mysql"
+mdb-schema -S -T $i inquerito_final.mdb mysql | mysql -uroot inqueritos$QUESTDATA$QUESTPERIODO
+mdb-export -I mysql -H inquerito_final.mdb $i | mysql -uroot inqueritos$QUESTDATA$QUESTPERIODO
+done
 Property changes:
 Added: svn:executable
 + *

 /branches/v3/impl/src/doc/BacoV32016/processos/QuestionariosAccess/scriptMdbToolsExportMdbMySql.rtf
 New file
 ,0 → 1,16
+{\rtf1\ansi\ansicpg1252\cocoartf1348\cocoasubrtf170
+{\fonttbl\f0\fnil\fcharset0 Menlo-Regular;}
+{\colortbl;\red255\green255\blue255;}
+\paperw11900\paperh16840\margl1440\margr1440\vieww15780\viewh8400\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
+\f0\fs22 \cf0 \CocoaLigature0 \
+exportar MDB com mdbtools para linux\
+\
+mdb-schema inquerito_final.mdb | sed "s/Long Integer/int/" | sed "s/\\[//" | sed "s/\\]//" | sed "s/\\Text (.*)/varchar(250)/" | sed "s/Boolean/BIT(1)/" | sed "s/Numeric \\(.*\\)/int/"\
+\
+\
+ESCOLHER APENAS AS TABELAS DESEJADAS\
+\
+\
+mdb-export -I mysql inquerito_final.mdb INQUERITO  | mysql -uroot inqueritos_201415_S2}

/branches/v3/impl/src/doc/siges/ModeloDeInformacaoPAE-EmVigor.docx
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/branches/v3/impl/src/hbm/pt/estgp/estgweb/domain/GenericUser.hbm.xml
17,6 → 17,7
<property name="username" type="string" unique="true" length="50" index="usernameIndex"/>
<property name="name" type="string" index="nameIndex"/>
<property name="email" type="string" index="emailIndex"/>
<property name="preferrefEmail" type="string" index="emailIndex"/>
<property name="roles" type="string" index="rolesIndex">
<column name="roles" sql-type="TEXT"/>
</property>

 /branches/v3/impl/src/hbm/pt/estgp/estgweb/domain/OlapQuestionarios.hbm.xml
 ,7 → 123,7
         <many-to-one name="starQuestionario" class="pt.estgp.estgweb.domain.OlapStarQuestionario" outer-join="false" lazy="proxy"/>
         <many-to-one name="perguntaGrupo" class="pt.estgp.estgweb.domain.OlapEntityQuestionarioPerguntaGrupo" outer-join="false" lazy="proxy"/>
-        <many-to-one name="pergunta1_5" class="pt.estgp.estgweb.domain.OlapEntityQuestionarioPergunta1_5" outer-join="false" lazy="proxy"/>
+        <many-to-one name="perguntaNumero" class="pt.estgp.estgweb.domain.OlapEntityQuestionarioPerguntaNumero" outer-join="false" lazy="proxy"/>
     </class>
 ,7 → 133,7
         </id>
         <property name="nome" type="string"/>
     </class>
-    <class name="pt.estgp.estgweb.domain.OlapEntityQuestionarioPergunta1_5" table="olap_e_quest_p1_5">
+    <class name="pt.estgp.estgweb.domain.OlapEntityQuestionarioPerguntaNumero" table="olap_e_quest_p">
         <id name="id" type="long" unsaved-value="0">
             <generator class="native"/>
         </id>

 /branches/v3/impl/src/hbm/pt/estgp/estgweb/domain/Questionarios.hbm.xml
 ,8 → 240,8
         <property name="saveDate" type="timestamp"/>
-        <property name="timeStart" type="timestamp"/>
-        <property name="timeEnd" type="timestamp"/>
+        <property name="timeStart" type="long"/>
+        <property name="timeEnd" type="long"/>
         <property name="totalTime" type="long"/>
 ,46 → 352,46
         <property name="timeTakenRt10" type="long"/>
         <!--Hora do Clique-->
-        <property name="timeEventR1" type="timestamp"/>
-        <property name="timeEventR2" type="timestamp"/>
-        <property name="timeEventR3" type="timestamp"/>
-        <property name="timeEventR4" type="timestamp"/>
-        <property name="timeEventR5" type="timestamp"/>
-        <property name="timeEventR6" type="timestamp"/>
-        <property name="timeEventR7" type="timestamp"/>
-        <property name="timeEventR8" type="timestamp"/>
-        <property name="timeEventR9" type="timestamp"/>
-        <property name="timeEventR10" type="timestamp"/>
-        <property name="timeEventR11" type="timestamp"/>
-        <property name="timeEventR12" type="timestamp"/>
-        <property name="timeEventR13" type="timestamp"/>
-        <property name="timeEventR14" type="timestamp"/>
-        <property name="timeEventR15" type="timestamp"/>
-        <property name="timeEventR16" type="timestamp"/>
-        <property name="timeEventR17" type="timestamp"/>
-        <property name="timeEventR18" type="timestamp"/>
-        <property name="timeEventR19" type="timestamp"/>
-        <property name="timeEventR20" type="timestamp"/>
-        <property name="timeEventR21" type="timestamp"/>
-        <property name="timeEventR22" type="timestamp"/>
-        <property name="timeEventR23" type="timestamp"/>
-        <property name="timeEventR24" type="timestamp"/>
-        <property name="timeEventR25" type="timestamp"/>
-        <property name="timeEventR26" type="timestamp"/>
-        <property name="timeEventR27" type="timestamp"/>
-        <property name="timeEventR28" type="timestamp"/>
-        <property name="timeEventR29" type="timestamp"/>
-        <property name="timeEventR30" type="timestamp"/>
-        <property name="timeEventR31" type="timestamp"/>
-        <property name="timeEventR32" type="timestamp"/>
-        <property name="timeEventR33" type="timestamp"/>
-        <property name="timeEventR34" type="timestamp"/>
-        <property name="timeEventR35" type="timestamp"/>
-        <property name="timeEventR36" type="timestamp"/>
-        <property name="timeEventR37" type="timestamp"/>
-        <property name="timeEventR38" type="timestamp"/>
-        <property name="timeEventR39" type="timestamp"/>
-        <property name="timeEventR40" type="timestamp"/>
+        <property name="timeEventR1" type="long"/>
+        <property name="timeEventR2" type="long"/>
+        <property name="timeEventR3" type="long"/>
+        <property name="timeEventR4" type="long"/>
+        <property name="timeEventR5" type="long"/>
+        <property name="timeEventR6" type="long"/>
+        <property name="timeEventR7" type="long"/>
+        <property name="timeEventR8" type="long"/>
+        <property name="timeEventR9" type="long"/>
+        <property name="timeEventR10" type="long"/>
+        <property name="timeEventR11" type="long"/>
+        <property name="timeEventR12" type="long"/>
+        <property name="timeEventR13" type="long"/>
+        <property name="timeEventR14" type="long"/>
+        <property name="timeEventR15" type="long"/>
+        <property name="timeEventR16" type="long"/>
+        <property name="timeEventR17" type="long"/>
+        <property name="timeEventR18" type="long"/>
+        <property name="timeEventR19" type="long"/>
+        <property name="timeEventR20" type="long"/>
+        <property name="timeEventR21" type="long"/>
+        <property name="timeEventR22" type="long"/>
+        <property name="timeEventR23" type="long"/>
+        <property name="timeEventR24" type="long"/>
+        <property name="timeEventR25" type="long"/>
+        <property name="timeEventR26" type="long"/>
+        <property name="timeEventR27" type="long"/>
+        <property name="timeEventR28" type="long"/>
+        <property name="timeEventR29" type="long"/>
+        <property name="timeEventR30" type="long"/>
+        <property name="timeEventR31" type="long"/>
+        <property name="timeEventR32" type="long"/>
+        <property name="timeEventR33" type="long"/>
+        <property name="timeEventR34" type="long"/>
+        <property name="timeEventR35" type="long"/>
+        <property name="timeEventR36" type="long"/>
+        <property name="timeEventR37" type="long"/>
+        <property name="timeEventR38" type="long"/>
+        <property name="timeEventR39" type="long"/>
+        <property name="timeEventR40" type="long"/>
         <property name="timeEventRt1" type="long"/>
         <property name="timeEventRt2" type="long"/>
 ,6 → 405,7
         <property name="timeEventRt10" type="long"/>
         <many-to-one name="user" class="pt.estgp.estgweb.domain.User" lazy="proxy" outer-join="false"/>
+        <many-to-one name="questionario" class="pt.estgp.estgweb.domain.Questionario" lazy="proxy" outer-join="false"/>
         <subclass name="pt.estgp.estgweb.domain.QuestionarioRespostaImpl" discriminator-value="QuestionarioRespostaImpl"/>
     </class>

 /branches/v3/impl/src/web/admin/configuration/taskLog.jsp
 ,7 → 130,7
             if(startStatus == "")
                 startStatus = data.status;
-            if(data.progress >= 100 && startStatus != data.status)
+            if((  (data.status != "STARTED" && data.status != "PENDING" ) || data.progress >= 100 ) && startStatus != data.status)
             {
                 if($("#<%=logid%>").closest('.task-log').length > 0)
                     window.location.href = $("#<%=logid%>").closest('.task-log').data("href");

 /branches/v3/impl/src/web/css/ipp/style.css
 ,4 → 1,5
 /****************************Text Size*************************************************/
 @font-face {
 ,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
 {
 ,6 → 102,7
     PADDING-TOP: 5px;
     text-align: center;
     margin-top:5px;
+    background-color: white;
 }
 ,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/auth/index.jsp
 ,7 → 15,7
         </div>
     </logic:notEmpty>
     <div class="row">
-        <div class="col-sm-4">
+        <div class="col-sm-6">
             <html:errors/>
             <jomm:messages/>
             <form role="form" action="<%=request.getContextPath()%><%=Globals.SYSTEM_REDIRECTIONS_POLICY_AUTHENTICATION_ACTION%>" method="post">

 /branches/v3/impl/src/web/layout/themes/scripts-default.jsp
 ,6 → 222,8
     {
         $(".tablesorterfiltered").wrap( "<div class=\"table-responsive\"></div>" )
+        $(".tablesortersimple").wrap( "<div class=\"table-responsive\"></div>" )
+        $(".tablesorter-blue").wrap( "<div class=\"table-responsive\"></div>" )
         evaluateTableSorters();
     }

 /branches/v3/impl/src/web/layout/themes/ipp/separators.jsp
 ,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/emailSetService.jsp
 New file
 ,0 → 1,26
+<%@ page import="jomm.dao.impl.AbstractDao" %>
+<%@ page import="pt.estgp.estgweb.domain.User" %>
+<%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
+<%@ page import="org.json.JSONObject" %>
+<%@ page contentType="application/json;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" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
+<%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
+<jsp:useBean id="UserSession" type="pt.estgp.estgweb.domain.UserSessionImpl" scope="request"/>
+<%
+    String email = request.getParameter("preferredEmail");
+    AbstractDao.getCurrentSession().beginTransaction();
+    User u = DaoFactory.getUserDaoImpl().load(UserSession.getUser().getId());
+    u.setPreferrefEmail(email);
+    AbstractDao.getCurrentSession().getTransaction().commit();
+    JSONObject jsonObject = new JSONObject();
+    jsonObject.put("result","OK");
+    out.print(jsonObject.toString());
+%>

 /branches/v3/impl/src/web/user/home/panels/questionarios.jsp
 ,12 → 6,17
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
 <%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
 <%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
-<baco:hasRole role="admin,all,services,questionarios.gerais,questionarios.admin">
+<baco:hasRole role="admin,all,services,questionarios.gerais,questionarios.admin,pedagogicCouncil.president">
     <div class="panel panel-primary">
-        <div class="panel-heading">Questionários Pedagógicos</div>
+        <div class="panel-heading">Questionários</div>
         <div class="panel-body">
             <div class="list-group">
-                <div class="list-group-item"><html:link action="/user/listQuestionarios">Administração de Questionários</html:link></div>
+                <baco:hasRole role="admin,all,services,questionarios.gerais,questionarios.admin">
+                    <div class="list-group-item"><html:link action="/user/listQuestionarios">Administração de Questionários</html:link></div>
+                </baco:hasRole>
+                <baco:hasRole role="admin,all,services,questionarios.gerais,questionarios.admin,pedagogicCouncil.president">
+                    <div class="list-group-item"><html:link action="/user/seeQuestionarios">Acompanhamento de Questionários</html:link></div>
+                </baco:hasRole>
                 <%-- <div class="list-group-item"><html:link action="/user/configurationSchedulleTasks.do">Consulta de Resultados</html:link></div>--%>
             </div>
         </div>

 /branches/v3/impl/src/web/user/home/panels/emailSet.jsp
 New file
 ,0 → 1,99
+<%@ page import="jomm.dao.impl.AbstractDao" %>
+<%@ page import="pt.estgp.estgweb.domain.Teacher" %>
+<%@ page import="pt.estgp.estgweb.domain.User" %>
+<%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
+<%@ 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" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
+<%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
+<jsp:useBean id="UserSession" type="pt.estgp.estgweb.domain.UserSessionImpl" scope="request"/>
+<%
+    AbstractDao.getCurrentSession().beginTransaction();
+    User u = DaoFactory.getUserDaoImpl().load(UserSession.getUser().getId());
+%>
+        <div class="panel panel-default">
+            <div class="panel-heading">Preferências</div>
+            <div class="panel-body">
+                <div class="alert alert-info">${UserSession.shortName} neste momento as informações que temos para <%=UserSession.getUser() instanceof Teacher?"si":"ti"%> são enviadas para os seguintes emails, se preferir<%=UserSession.getUser() instanceof Teacher?"":"es"%> receber noutro endereço <%=UserSession.getUser() instanceof Teacher?"diga-nos":"diz-nos"%> qual para que possamos informar sempre que haja novidades. Obrigado</div>
+                <div class="panel panel-default">
+                    <div class="panel-heading">Emails por onde <%=UserSession.getUser() instanceof Teacher?"o":"te"%> contactamos:</div>
+                    <div class="panel-body">
+                        <div class="list-group">
+                            <%
+                                if(u.getEmail() != null && u.getEmail().trim().length() > 0)
+                                {
+                            %>
+                            <div class="list-group-item"><%=u.getEmail()%></div>
+                            <%
+                                }
+                                if(u.getOutEmail() != null && u.getOutEmail().trim().length() > 0)
+                                {
+                            %>
+                            <div class="list-group-item"><%=u.getOutEmail()%></div>
+                            <%
+                                }
+                                if(u.getPreferrefEmail() != null && u.getPreferrefEmail().trim().length() > 0)
+                                {
+                            %>
+                            <div class="list-group-item"><%=u.getPreferrefEmail()%> <i class="badge">preferido</i></div>
+                            <%
+                                }
+                            %>
+                        </div>
+                    </div>
+                </div>
+                <script>
+                    $(document).ready(
+                            function(){
+                                $("#preferidoBtn").on("click",function(){
+                                    email = $("#preferido").val();
+                                    if(email == "")
+                                        alert("Por favor coloque um endereço de email antes de confirmar");
+                                    else
+                                    {
+                                        $.getJSON('<%=request.getContextPath()%>/user/home/panels/emailSetService.jsp',{"preferredEmail":email},
+                                                function(data){
+                                                    if(data.result=="OK")
+                                                    {
+                                                        window.location = "<%=request.getContextPath()%>/user/homePae.do"
+                                                    }
+                                                });
+                                    }
+                                })
+                            }
+                    );
+                </script>
+                <div class="panel panel-default">
+                    <div class="panel-body">
+                        <div class="form-horizontal">
+                            <div class="form-group">
+                                <label class="control-label col-sm-4" for="preferido">Email Preferido:</label>
+                                <div class="col-sm-8">
+                                    <input id="preferido" class="form-control" type="text" name="preferredEmail"/>
+                                </div>
+                            </div>
+                            <button id="preferidoBtn" type="button" class="btn btn-success">Modificar Preferido</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+<%
+    AbstractDao.getCurrentSession().getTransaction().commit();
+%>

 /branches/v3/impl/src/web/user/home/teacherPae.jsp
 ,30 → 12,44
 <%--<link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/css/offcanvas.css"/>--%>
-    <logic:notMatch value="TeacherImpl" name="UserSession" property="user.class.name">
-        <div class="alert alert-warning">
-            <bean:message key="profile.bad.profile.teacher.iregular.user.class"/>
-        </div>
-    </logic:notMatch>
+<logic:notMatch value="TeacherImpl" name="UserSession" property="user.class.name">
+    <div class="alert alert-warning">
+        <bean:message key="profile.bad.profile.teacher.iregular.user.class"/>
+    </div>
+</logic:notMatch>
-    <jsp:include page="todosAfazer.jsp"/>
+<%--<jsp:include page="todosAfazer.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"/>
             <jsp:include page="panels/docs.jsp"/>
-            <jsp:include page="panels/questionarios.jsp"/>
             <jsp:include page="panels/configsGeraisSistema.jsp"/>
+        </div>
+        <div class="col-md-6 col-sm-12 col-xs-12">
             <jsp:include page="panels/academicTools.jsp"/>
         </div>
     </baco:hasRole>
+</div>
+<div class="col-md-4 col-sm-12 col-xs-12">
+    <baco:hasRole role="admin,all,questionarios.gerais,questionarios.admin,pedagogicCouncil.president">
+        <jsp:include page="panels/questionarios.jsp"/>
+    </baco:hasRole>
+    <jsp:include page="panels/emailSet.jsp"/>
+</div>
-</div>

 /branches/v3/impl/src/web/user/home/studentPae.jsp
 ,14 → 1,3
-<%@ page import="jomm.utils.MessageResources" %>
-<%@ page import="pt.estgp.estgweb.Globals" %>
-<%@ page import="pt.estgp.estgweb.domain.CourseUnit" %>
-<%@ page import="pt.estgp.estgweb.domain.StudentImpl" %>
-<%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
-<%@ page import="pt.estgp.estgweb.domain.views.AnnouncementView" %>
-<%@ page import="pt.estgp.estgweb.utils.DatesUtils" %>
-<%@ page import="pt.estgp.estgweb.web.utils.RequestUtils" %>
-<%@ page import="pt.utl.ist.berserk.logic.serviceManager.IServiceManager" %>
-<%@ page import="pt.utl.ist.berserk.logic.serviceManager.ServiceManager" %>
-<%@ page import="java.util.List" %>
 <%@ 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" %>
 ,3 → 9,11
 <jsp:useBean id="UserSession" type="pt.estgp.estgweb.domain.UserSession" scope="request"/>
+<div class="col-md-8 col-sm-12 col-xs-12">
+    <html:errors/>
+    <jomm:messages/>
+    <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/topnavQuestionarioResposta.jsp
 New file
 ,0 → 1,11
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="jomm.web.utils.NavPlaceServer"%>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/user/homePae.do", "intranet.separator.home.back");
+    topNav.addNavPlace(null, "questionario.resposta");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /branches/v3/impl/src/web/user/questionarios/questionarioAdmin.jsp
 ,9 → 90,18
                         </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.ASSIGNED_ANSWERS.getPosition())
+                        {
+                        %>
+                        <div class="alert alert-success col-md-2 col-sm-2">
+                            <bean:message key="questionario.state.ASSIGNED_ANSWERS"/>
+                        </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.getPosition())
-                            {
+                        if( questionario.getStateEnum().getPosition() > QuestionarioImpl.State.PROCESSING.getPosition())
+                        {
                         %>
                         <div class="alert alert-success col-md-2 col-sm-2">
                             <bean:message key="questionario.state.PROCESSING"/>
 ,12 → 165,12
                             <bean:message key="questionario.state.${Questionario.state}"/>
                         </label>
                         <%
-                            if( questionario.getStateEnum().getPosition() > QuestionarioImpl.State.ASSIGNATION_DETAILS.getPosition())
+                            if( questionario.getStateEnum().getPosition() > QuestionarioImpl.State.ASSIGNATION_DETAILS.getPosition() && questionario.getStateEnum().getPosition() < QuestionarioImpl.State.ASSIGNED_ANSWERS.getPosition())
                             {
                         %>
                             <logic:present name="Questionario" property="substate">
                                 <logic:notEqual value="" name="Questionario" property="substate">
-                                    <bean:message key="questionario.state.${Questionario.state}"/>
+                                    <bean:message key="questionario.state.${Questionario.substate}"/>
                                 </logic:notEqual>
                             </logic:present>
                         <%
 ,11 → 209,20
                         </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.getPosition())
-                            {
+                        }
+                        if( questionario.getStateEnum().getPosition() < QuestionarioImpl.State.ASSIGNED_ANSWERS.getPosition())
+                        {
                         %>
                         <div class="alert alert-disabled col-md-2 col-sm-2">
+                            <bean:message key="questionario.state.ASSIGNED_ANSWERS"/>
+                        </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.getPosition())
+                        {
+                        %>
+                        <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 hidden-xs"><span class="glyphicon glyphicon-chevron-right"/></div>

 /branches/v3/impl/src/web/user/questionarios/questionarioStateSTOPED_WITH_ANSWERS.jsp
 ,4 → 6,7
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
 <%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
 <%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
-Estado  Parado para responder com Respostas
+<jsp:include page="pedagogicoEstudante/questionarioDashBoard.jsp"/>

/branches/v3/impl/src/web/user/questionarios/questionariosList.jsp
36,6 → 36,7
<thead>
<tr>
<th>Num. Control</th>
<th>Descrição</th>
<th>Ano</th>
<th>Semestre</th>
<th>Administrar</th>
48,7 → 49,7
<tbody>
<%
AbstractDao.getCurrentSession().beginTransaction();
List<QuestionarioImpl> questionarios = DaoFactory.getQuestionarioDaoImpl().findSortedBy(0, 10, "id");
List<QuestionarioImpl> questionarios = DaoFactory.getQuestionarioDaoImpl().findSortedBy(0, 30, "id");

//As transacoes tem de estar fechadas para se chamar a tag initClearances
for(QuestionarioImpl q: questionarios)
58,6 → 59,7
<baco:initClearances name="q"/>
<tr>
<td>${q.id}</td>
<td>${q.description}</td>
<td>${q.year}</td>
<td>${q.semestre}</td>
<td>

 /branches/v3/impl/src/web/user/questionarios/respostasRequisitadas.jsp
 New file
 ,0 → 1,8
+<%@ page import="jomm.dao.impl.AbstractDao" %>
+<%@ page import="org.hibernate.Query" %>
+<%@ page import="java.util.ArrayList" %>
+<%@ page import="java.util.HashMap" %>
+<%@ page import="java.util.List" %>
+<%@ page import="pt.estgp.estgweb.domain.*" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<jsp:include page="pedagogicoEstudante/respostasRequisitadas.jsp"/>

 /branches/v3/impl/src/web/user/questionarios/questionariosSee.jsp
 New file
 ,0 → 1,122
+<%@ page import="jomm.dao.impl.AbstractDao" %>
+<%@ page import="pt.estgp.estgweb.domain.Questionario" %>
+<%@ page import="pt.estgp.estgweb.domain.QuestionarioImpl" %>
+<%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
+<%@ page import="java.util.List" %>
+<%@ 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" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
+<%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
+<jsp:include page="headerQuestionarios.jsp"/>
+<div class="container-fluid" style="margin-top: 10px">
+    <div class="panel panel-primary">
+        <div class="panel-heading clearfix">
+            Questionários
+            <baco:hasRole role="questionarios.admin,all,admin">
+                <html:link styleClass="btn btn-default btn-sm pull-right" action="/user/startNewQuestionario">Criar Novo <span class="glyphicon glyphicon-plus"> </span></html:link>
+            </baco:hasRole>
+            <a class="btn btn-default" href="#" data-toggle="modal" data-target="#modalHelpQuestionario">
+                <span class="glyphicon glyphicon-question-sign"></span> Ajuda sobre Processo dos Questionários
+            </a>
+        </div>
+        <div class="panel-body">
+            <html:errors/>
+            <jomm:messages/>
+            <table class="tablesorterfiltered">
+                <thead>
+                    <tr>
+                        <th>Num. Control</th>
+                        <th>Descrição</th>
+                        <th>Ano</th>
+                        <th>Semestre</th>
+                        <th>Acompanhar</th>
+                        <th>Formulário</th>
+                        <th>Estado</th>
+                        <th>Alterado a</th>
+                    </tr>
+                </thead>
+                <tbody>
+<%
+                AbstractDao.getCurrentSession().beginTransaction();
+                List<QuestionarioImpl> questionarios = DaoFactory.getQuestionarioDaoImpl().findNotClosed();
+                //As transacoes tem de estar fechadas para se chamar a tag initClearances
+                for(QuestionarioImpl q: questionarios)
+                {
+                    request.setAttribute("q",q);
+%>
+                    <baco:initClearances name="q"/>
+<%
+                    if(q.getStateEnum().getPosition() >= QuestionarioImpl.State.PROCESSING.getPosition())
+                    {
+%>
+                    <tr>
+                        <td>${q.id}</td>
+                        <td>${q.description}</td>
+                        <td>${q.year}</td>
+                        <td>${q.semestre}</td>
+                        <td>
+                            <baco:clearOperation name="q" op="QUESTIONARIO_SEE_DASHBOARD">
+                                <html:link styleClass="btn btn-default" action="/user/seeQuestionario?questionarioId=${q.id}">Acompanhar</html:link></td>
+                            </baco:clearOperation>
+                        <td>
+                            <baco:clearOperation name="q" op="QUESTIONARIO_SEE_FORM">
+                                <%
+                                    if(q.getStateEnum().getPosition() < QuestionarioImpl.State.PROCESSING.getPosition())
+                                    {
+                                %>
+                                <html:link action="/user/formQuestionariosPae?questionario.id=${q.id}" styleClass="btn btn-default">Folumário</html:link>
+                                <%
+                                    }
+                                    else if (q.getStateEnum().getPosition() < QuestionarioImpl.State.OLAP.getPosition())
+                                    {
+                                %>
+                                <html:link action="/user/formQuestionariosPae?questionario.id=${q.id}" styleClass="btn btn-warning">Trancado</html:link>
+                                <%
+                                    }
+                                    else
+                                    {
+                                %>
+                                <html:link action="/user/formQuestionariosPae?questionario.id=${q.id}" styleClass="btn btn-success">Terminado</html:link>
+                                <%
+                                    }
+                                %>
+                            </baco:clearOperation>
+                        </td>
+                        <td>
+                            <logic:equal name="q" property="state" value="OLAP">
+                                <div class="alert alert-success alert-small" >
+                                    <bean:message key="questionario.state.${q.state}"/>
+                                </div>
+                            </logic:equal>
+                            <logic:notEqual name="q" property="state" value="OLAP">
+                                <div class="alert alert-warning alert-small">
+                                    <bean:message key="questionario.state.${q.state}"/>
+                                </div>
+                            </logic:notEqual>
+                        </td>
+                        <td><%=pt.estgp.estgweb.web.utils.DatesUtils.getStringFromDate(q.getUpdateDate())%></td>
+                    </tr>
+<%
+                    }
+                }
+                AbstractDao.getCurrentSession().getTransaction().commit();
+%>
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>

 /branches/v3/impl/src/web/user/questionarios/respostaQuestionario.jsp
 New file
 ,0 → 1,279
+<%@ page import="jomm.dao.impl.AbstractDao" %>
+<%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
+<%@ page import="pt.estgp.estgweb.web.form.questionarios.QuestionarioRespostaForm" %>
+<%@ page import="java.util.List" %>
+<%@ page import="pt.estgp.estgweb.domain.*" %>
+<%@ 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" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
+<%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
+<jsp:useBean id="UserSession" type="pt.estgp.estgweb.domain.UserSessionImpl" scope="request"/>
+<%
+    QuestionarioRespostaForm form = (QuestionarioRespostaForm) request.getAttribute("QuestionarioRespostaForm");
+    long alunoRequesitadoId;
+    if(form != null)
+    {
+        alunoRequesitadoId = form.getAlunoRequesitadoId();
+    }
+    else
+    {
+        alunoRequesitadoId = Long.parseLong(request.getParameter("alunoRequisitadoId"));
+    }
+    request.setAttribute("alunoRequisitadoId",alunoRequesitadoId);
+    AbstractDao.getCurrentSession().beginTransaction();
+    //todo MUDAR AQUI QUANDO HOUVER OUTROS TIPOS DE QUESTIONARIOS ASSIM CARREGA O ALUNO
+    //NAO DEVE SER PRECISO PORQUE A LISTAGEM E ESPECIFICA DO PEDAGOGICO
+    QuestionarioPedagogicoAlunoRequisitado alunoRequisitado
+            = DaoFactory.getQuestionarioPedagogicoAlunoRequisitadoDaoImpl().load(alunoRequesitadoId);
+    QuestionarioRespostaRequisitada respostaRequisitada
+            = alunoRequisitado.getRespostaRequisitada();
+    Questionario qLoad = respostaRequisitada.getQuestionario();
+    QuestionarioImpl questionario = (QuestionarioImpl) DaoFactory.getQuestionarioDaoImpl().narrow(qLoad);
+    request.setAttribute("questionario",questionario);
+    if(respostaRequisitada.getUser().getId() != UserSession.getUser().getId() || (questionario.getStateEnum() != QuestionarioImpl.State.PROCESSING &&
+            questionario.getStateEnum() != QuestionarioImpl.State.PROCESSING_WITH_ANSWERS))
+    {
+%>
+        <div class="panel panel-danger">
+            <div class="panel-heading">ATENÇÃO</div>
+            <div class="panel-body">
+                <div class="alert alert-danger">Lamentamos mas o questionário ao qual está a tentar responder não lhe pertence!</div>
+            </div>
+        </div>
+<%
+    }
+    else if(respostaRequisitada.getResposta() != null)
+    {
+%>
+        <div class="panel panel-info">
+            <div class="panel-heading">ATENÇÃO</div>
+            <div class="panel-body">
+                <div class="alert alert-info">O questionário que está a tentar responder já está entregue. Obrigado!</div>
+            </div>
+        </div>
+<%
+    }
+    else
+    {
+%>
+        <style>
+            .questionarioTable
+            {
+                width: 100%;
+            }
+            .questionarioTable .pergunta
+            {
+                width: 60%;
+            }
+            .questionarioTable td
+            {
+                padding: 10px;
+            }
+            .questionarioTable input[type=radio]
+            {
+                margin-right: 4px;
+            }
+            .questionarioTable tr
+            {
+                border-bottom: 1px solid #939393;
+            }
+            .questionarioTable tr.nao-respondida
+            {
+            }
+            .questionarioTable tr.respondida
+            {
+                background-color: #e2ffef;
+            }
+        </style>
+        <script>
+            //START SERVICE PING
+            var lastEvent = 0;
+            var lastDiferentElementEvent = 0;
+            var lastDiferentElement;
+            function addEvent(targetElementId,targetDurationElementId)
+            {
+                $("#"+targetElementId).closest("tr").removeClass("alert-warning");
+                $("#"+targetElementId).closest("tr").removeClass("nao-respondida");
+                $("#"+targetElementId).closest("tr").addClass("respondida");
+                if(targetElementId != lastDiferentElement)
+                {
+                    lastDiferentElementEvent = lastEvent;
+                    lastDiferentElement = targetElementId;
+                    var eventTime = new Date().getTime();
+                    $("#" + targetElementId).val(""+eventTime);
+                    $("#" + targetDurationElementId).val(""+(eventTime-lastEvent));
+                    lastEvent = eventTime;
+                }
+                else
+                {
+                    var eventTime = new Date().getTime();
+                    $("#" + targetElementId).val(""+eventTime);
+                    $("#" + targetDurationElementId).val(""+(eventTime-lastDiferentElementEvent));
+                    lastEvent = eventTime;
+                }
+            }
+            $(document).ready(
+                    function()
+                    {
+                        ping();
+                        var startTime = new Date().getTime();
+                        $("#timeStart").val(startTime+"");
+                        lastDiferentElementEvent = startTime;
+                        lastEvent = startTime;
+                        lastDiferentElement = null;
+                        $("#submeterBtn").on("click",function()
+                        {
+                            var end = new Date().getTime();
+                            $("#timeEnd").val(end+"");
+                            $("#totalTime").val((end-startTime)+"");
+                            $("#respostaForm").submit();
+                        });
+                        <%
+                            if(request.getAttribute("respostasVazias")!= null)
+                            {
+                                List<String> respostasVazias = (List<String>) request.getAttribute("respostasVazias");
+                               for(String resposta: respostasVazias)
+                                {
+                        %>
+                                $("#pergunta<%=resposta%>").removeClass("nao-respondida").addClass("alert-warning");
+                        <%
+                                }
+                            }
+                        %>
+                    }
+            );
+        </script>
+        <div class="panel panel-default">
+            <div class="panel-heading">Resposta ao Questionário de
+                <label class="label label-pill label-default" style="font-size: 1.1em"><%=alunoRequisitado.getTipologiaRequisitada().getUnidadeAfeta().getNome()%></label>
+                (<%=alunoRequisitado.getTipologiaRequisitada().getUnidadeAfeta().getCodigoUnidade()%>)
+                de <%=alunoRequisitado.getTipologiaRequisitada().getUnidadeAfeta().getCursoAfeto().getNome()%>
+                (<%=alunoRequisitado.getTipologiaRequisitada().getUnidadeAfeta().getCursoAfeto().getCodigoCurso()%>)
+                Periodo lectivo (<%=questionario.getYear()%> - <%=questionario.getSemestre()%>)
+                <br/>
+                Docente: <label class="label label-pill label-info" style="font-size: 1.1em"><%=alunoRequisitado.getTipologiaRequisitada().getNomeDocente()%> (<%=alunoRequisitado.getTipologiaRequisitada().getCdDocente()%>)</label>
+                /
+                <label class="label label-pill label-default" style="font-size: 1.1em"><%=alunoRequisitado.getTipologiaRequisitada().getDsTipologia()%>
+            </div>
+            <div class="panel-body">
+                <html:errors/>
+                <jomm:messages/>
+                <div class="panel panel-default">
+                    <div class="panel-body">
+                        <%=qLoad.getIntroHtml()%>
+                    </div>
+                    <div class="panel-body">
+                        <p class="lead">Nas suas respostas deverá considerar 1 para nada satisfeito e 5 para muito satisfeito</p>
+                    </div>
+                </div>
+                <html:form action="/user/questionariosPaeResposta" styleId="respostaForm">
+                    <input type="hidden" name="dispatch" value="submitResposta"/>
+                    <html:hidden styleId="timeStart" property="resposta.timeStart"/>
+                    <html:hidden styleId="timeEnd" property="resposta.timeEnd"/>
+                    <html:hidden styleId="totalTime" property="resposta.totalTime"/>
+                    <html:hidden property="alunoRequesitadoId" value="${alunoRequisitadoId}"/>
+                    <html:hidden property="resposta.questionario.id" value="${questionario.id}"/>
+                    <jsp:useBean id="QuestionarioRespostaForm" type="pt.estgp.estgweb.web.form.questionarios.QuestionarioRespostaForm" scope="request"/>
+                    <div class="panel panel-primary">
+                        <div class="panel-heading">Identificação da Unidade Curricular</div>
+                        <div class="panel-body">
+                            <p>Curso: <label class="label label-pill label-default" style="font-size: 1.1em"><%=alunoRequisitado.getTipologiaRequisitada().getUnidadeAfeta().getCursoAfeto().getNome()%></label> (<%=alunoRequisitado.getTipologiaRequisitada().getUnidadeAfeta().getCursoAfeto().getCodigoCurso()%>)</p>
+                            <p>Unidade Curricular: <label class="label label-pill label-default" style="font-size: 1.1em"><%=alunoRequisitado.getTipologiaRequisitada().getUnidadeAfeta().getNome()%></label> (<%=alunoRequisitado.getTipologiaRequisitada().getUnidadeAfeta().getCodigoUnidade()%>)</p>
+                            <p>Docente em Avaliação: <label class="label label-pill label-default" style="font-size: 1.1em"><%=alunoRequisitado.getTipologiaRequisitada().getNomeDocente()%></label> (<%=alunoRequisitado.getTipologiaRequisitada().getCdDocente()%>)</p>
+                            <p>Tipologia de Aulas: <label class="label label-pill label-default" style="font-size: 1.1em"><%=alunoRequisitado.getTipologiaRequisitada().getDsTipologia()%></label> </p>
+                        </div>
+                    </div>
+                    <%
+                        for(int i = 1;i<=10;i++)
+                        {
+                            String titulo = (String) QuestionarioImpl.class.getMethod("getGroup" + i + "Title").invoke(questionario);
+                            String groupCode = ""+i;
+                            if(titulo != null && titulo.trim().length() > 0)
+                            {
+                    %>
+                                <div class="panel panel-default">
+                                    <div class="panel-heading">
+                                        <%=(i)%> - <%=titulo%>
+                                    </div>
+                                    <div class="panel-body">
+                                        <table class="questionarioTable">
+                                    <%
+                                        for(int p = 1; p <= 40; p++)
+                                        {
+                                            request.setAttribute("p",p);
+                                            String pGroup = (String) QuestionarioImpl.class.getMethod("getP" + p + "Group").invoke(questionario);
+                                            if(pGroup.equals(groupCode))
+                                            {
+                                                String pergunta = (String) QuestionarioImpl.class.getMethod("getP" + p).invoke(questionario);
+                                                String resposta = (String) QuestionarioResposta.class.getMethod("getR" + p).invoke(QuestionarioRespostaForm.getResposta());
+                                                String naoRespondida = resposta != null && Long.parseLong(resposta) > 0 ? "respondida":" nao-respondida";
+                                    %>
+                                            <tr id="pergunta${p}" class="pergunta <%=naoRespondida%>">
+                                                <td>
+                                                    <%=pergunta%>
+                                                    <html:hidden property="resposta.timeEventR${p}" styleId="timeEventR${p}"/>
+                                                    <html:hidden property="resposta.timeTakenR${p}" styleId="timeTakenR${p}"/>
+                                                </td>
+                                                <td style="padding-left: 10px"><html:radio property="resposta.r${p}" value="1" onclick="addEvent('timeEventR${p}','timeTakenR${p}');">1</html:radio></td>
+                                                <td style="padding-left: 10px"><html:radio property="resposta.r${p}" value="2" onclick="addEvent('timeEventR${p}','timeTakenR${p}');">2</html:radio></td>
+                                                <td style="padding-left: 10px"><html:radio property="resposta.r${p}" value="3" onclick="addEvent('timeEventR${p}','timeTakenR${p}');">3</html:radio></td>
+                                                <td style="padding-left: 10px"><html:radio property="resposta.r${p}" value="4" onclick="addEvent('timeEventR${p}','timeTakenR${p}');">4</html:radio></td>
+                                                <td style="padding-left: 10px"><html:radio property="resposta.r${p}" value="5" onclick="addEvent('timeEventR${p}','timeTakenR${p}');">5</html:radio></td>
+                                            </tr>
+                                    <%
+                                            }
+                                        }
+                                    %>
+                                        </table>
+                                    </div>
+                                </div>
+                    <%
+                            }
+                        }
+                    %>
+                    <button class="btn btn-success" type="button" id="submeterBtn">Submeter</button>
+                </html:form>
+            </div>
+        </div>
+<%
+    }
+    AbstractDao.getCurrentSession().getTransaction().commit();
+%>

 /branches/v3/impl/src/web/user/questionarios/questionarioStateASSIGNED_ANSWERS.jsp
 ,4 → 6,14
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
 <%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
 <%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
-Estado  Respostas Atribuidas Tarefas disponiveis
+<jsp:useBean id="Questionario" type="pt.estgp.estgweb.domain.QuestionarioImpl" scope="request"/>
+<div class="col-sm-6">
+    <baco:clearOperation name="Questionario" op="QUESTIONARIO_REVERT_TO_ASSIGNATION_DETAILS">
+        <button class="btn btn-danger" type="button" data-toggle="modal" data-target="#confirm-ModalGeneric" data-message="Esta operação irá parar o questionário e os alunos não poderão responder!! Tem a certeza que deseja prosseguir?" data-href="<%=request.getContextPath()%>/user/questionariosPaeYearSemestre.do?dispatch=revertAssignationDetails&questionarioId=${Questionario.id}"><span class="glyphicon glyphicon-chevron-left"> </span> Voltar às Atribuições</button>
+    </baco:clearOperation>
+</div>
+<div class="col-sm-6">
+    <baco:clearOperation name="Questionario" op="QUESTIONARIO_START_PROCESSEMENT">
+        <button class="btn btn-success" type="button" data-toggle="modal" data-target="#confirm-ModalGeneric" data-message="Esta operação irá abrir as respostas aos alunos!! Tem a certeza que deseja prosseguir?" data-href="<%=request.getContextPath()%>/user/questionariosPaeYearSemestre.do?dispatch=startProcessement&questionarioId=${Questionario.id}">Abrir Respostas aos Alunos <span class="glyphicon glyphicon-play"></span></button>
+    </baco:clearOperation>
+</div>

/branches/v3/impl/src/web/user/questionarios/QuestionarioState.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

 /branches/v3/impl/src/web/user/questionarios/topnavQuestionarioSee.jsp
 New file
 ,0 → 1,17
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="jomm.web.utils.NavPlaceServer"%>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%
+    String qId = request.getParameter("questionarioId");
+    if(qId == null)
+        qId = request.getParameter("questionario.id");
+    Long questionarioId = Long.parseLong(qId);
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/user/homePae.do", "intranet.separator.home.back");
+    topNav.addNavPlace("/user/seeQuestionarios.do", "surveys");
+    topNav.addNavPlace(null, "survey.see",""+questionarioId);
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /branches/v3/impl/src/web/user/questionarios/questionarioStatePROCESSING_WITH_ANSWERS.jsp
 ,3 → 1,9
+<%@ page import="jomm.dao.impl.AbstractDao" %>
+<%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
+<%@ page import="pt.estgp.estgweb.domain.dao.impl.QuestionarioDaoImpl" %>
+<%@ page import="java.util.List" %>
+<%@ page import="pt.estgp.estgweb.domain.QuestionarioPedagogicoCursoAfeto" %>
 <%@ 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" %>
 ,4 → 12,8
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
 <%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
 <%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
-Estado  Aberto para Responder com Respostas
+<jsp:useBean id="Questionario" type="pt.estgp.estgweb.domain.QuestionarioImpl" scope="request"/>
+<jsp:include page="pedagogicoEstudante/questionarioDashBoard.jsp"/>

 /branches/v3/impl/src/web/user/questionarios/questionarioStatePROCESSING.jsp
 ,3 → 1,9
+<%@ page import="jomm.dao.impl.AbstractDao" %>
+<%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
+<%@ page import="pt.estgp.estgweb.domain.dao.impl.QuestionarioDaoImpl" %>
+<%@ page import="java.util.List" %>
+<%@ page import="pt.estgp.estgweb.domain.QuestionarioPedagogicoCursoAfeto" %>
 <%@ 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" %>
 ,4 → 12,8
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
 <%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
 <%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
-Estado  Aberto para Responder
+<jsp:useBean id="Questionario" type="pt.estgp.estgweb.domain.QuestionarioImpl" scope="request"/>
+<jsp:include page="pedagogicoEstudante/questionarioDashBoard.jsp"/>

 /branches/v3/impl/src/web/user/questionarios/pedagogicoEstudante/pedagogicoEstudanteAssignAnswers.jsp
 ,10 → 1,9
 <%@ page import="jomm.dao.impl.AbstractDao" %>
-<%@ page import="org.hibernate.Query" %>
+<%@ page import="jomm.utils.MessageResources" %>
 <%@ page import="pt.estgp.estgweb.domain.JobServiceTaskImpl" %>
 <%@ page import="pt.estgp.estgweb.domain.QuestionarioImpl" %>
-<%@ page import="pt.estgp.estgweb.domain.QuestionarioPedagogicoCursoAfeto" %>
 <%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
-<%@ page import="pt.estgp.estgweb.domain.dao.impl.QuestionarioPedagogicoCursoAfetoDaoImpl" %>
+<%@ page import="pt.estgp.estgweb.domain.dao.impl.QuestionarioDaoImpl" %>
 <%@ page import="pt.estgp.estgweb.utils.ConfigProperties" %>
 <%@ page import="pt.estgp.estgweb.web.form.configuration.SchedulleTasksForm" %>
 <%@ page import="pt.estgp.estgweb.web.utils.RequestUtils" %>
 ,7 → 102,15
                                     schedulleTasksForm.setJobServiceTask(job);
                                     schedulleTasksForm.setId(job.getId());
                                     request.setAttribute("SchedulleTasksForm",schedulleTasksForm);
+                                    if(job.getStatusEnum() == JobServiceTaskImpl.JobStatus.FAILED ||
+                                       job.getStatusEnum() == JobServiceTaskImpl.JobStatus.UNKNOWN_ERROR ||
+                                       job.getStatusEnum() == JobServiceTaskImpl.JobStatus.FINISHED_ERRORS )
+                                    {
                                 %>
+                                <div class="alert alert-danger"><%=MessageResources.getInstance(request).getMessage("job.status."+job.getStatus())%>, Consulte o Log</div>
+                                <%
+                                    }
+                                %>
                                 <div class="task-log task-log-xs" data-href="<%=request.getContextPath()%>/user/questionarioPedagogicoStartAssignAnswers.do?questionarioId=${Questionario.id}">
                                     <jsp:include page="/admin/configuration/taskLog.jsp"/>
                                 </div>
 ,44 → 130,10
                     <div class="col-sm-12" style="margin-top: 20px">
                         <%
-                            //QuestionarioPedagogicoCursoAfetoDaoImpl.QuestionarioStatsVars questionarioStatsVars = DaoFactory.getQuestionarioPedagogicoCursoAfetoDaoImpl().loadQuestionarioStats(questionarioId);
-                            QuestionarioPedagogicoCursoAfetoDaoImpl.QuestionarioStatsVars questionarioStatsVars = new QuestionarioPedagogicoCursoAfetoDaoImpl.QuestionarioStatsVars();
-                            Query q = AbstractDao.getCurrentSession().createQuery("SELECT " +
-                                    " count(distinct c.id) AS cursos " +
-                                    ",count(distinct u.id) AS unidades " +
-                                    ",sum (u.profs) AS profs " +
-                                    ",sum (u.turmas) AS turmas " +
-                                    ",sum (u.students) AS students " +
-                                    ",sum (case when u.usar = true then u.students else 0 end) AS alunosDeUsadas " +
-                                    ",sum (case when u.usar = true then u.profs else 0 end) AS profsDeUsadas " +
-                                    ",sum (case when u.usar = true then 1 else 0 end) AS unidadesUsadas " +
-                                    ",sum (case when u.usar = true then 1 else 1 end) AS unidadesTodasCheck " +
-                                    ",sum (case when u.usar = true then (u.profs * u.students) else 0 end) AS respostasEsperadas " +
-                                    "from " + QuestionarioPedagogicoCursoAfeto.class.getName() + " c " +
-                                    "JOIN c.questionario q " +
-                                    "JOIN c.unidadesAfetas u " +
-                                    "WHERE q.id = :id " +
-                                    "GROUP BY q.id");
+                            QuestionarioDaoImpl.QuestionarioStatsVars questionarioStatsVars = DaoFactory.getQuestionarioDaoImpl().loadQuestionarioStatsPedagogico(questionarioId);
-                            q.setLong("id",questionarioId);
-                            Object[] results = (Object[]) q.uniqueResult();
-                            if(results != null && results[0] != null)
-                            {
-                                questionarioStatsVars.cursos = (Long) results[0];
-                                questionarioStatsVars.unidades = (Long) results[1];
-                                questionarioStatsVars.profs =   (Long) results[2];
-                                questionarioStatsVars.turmas =   (Long) results[3];
-                                questionarioStatsVars.alunos =   (Long) results[4];
-                                questionarioStatsVars.alunosDeUsadas =   (Long) results[5];
-                                questionarioStatsVars.profsDeUsadas =   (Long) results[6];
-                                questionarioStatsVars.unidadesUsadas =   (Long) results[7];
-                                if(((Long) results[8]) != questionarioStatsVars.unidades)
-                                    out.print("TEM UM ERRO NA QUERY, a contagem de usadas com o distinct da diferente de com o SUM");
-                            }
                         %>
                         <div class="alert alert-info">Por favor confira estes valores com os resultados apresentados no LOG</div>
                         <table class="tablesorter-blue">
 ,7 → 155,7
                                 <td><%=questionarioStatsVars.turmas%></td>
                                 <td><%=questionarioStatsVars.alunosDeUsadas%></td>
                                 <td><%=questionarioStatsVars.profsDeUsadas%></td>
-                                <td><%=(Long) results[9]%></td>
+                                <td><%=questionarioStatsVars.profsTimeStudents%></td>
                             </tbody>
                         </table>
                     </div>

 /branches/v3/impl/src/web/user/questionarios/pedagogicoEstudante/questionariosDocenteAbertos.jsp
 New file
 ,0 → 1,122
+<%@ page import="jomm.dao.impl.AbstractDao" %>
+<%@ page import="org.hibernate.Query" %>
+<%@ page import="java.util.ArrayList" %>
+<%@ page import="java.util.HashMap" %>
+<%@ page import="java.util.List" %>
+<%@ page import="pt.estgp.estgweb.domain.*" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<jsp:useBean id="UserSession" type="pt.estgp.estgweb.domain.UserSessionImpl" scope="request"/>
+<%
+    AbstractDao.getCurrentSession().beginTransaction();
+    Query q = AbstractDao.getCurrentSession().createQuery(
+            "select t from t in class " + QuestionarioPedagogicoTipologiaRequisitada.class.getName() +
+                    " where t.docenteAfeto.id = " + UserSession.getUser().getId() + " and " +
+                    " (t.unidadeAfeta.cursoAfeto.questionario.state = :s1 OR t.unidadeAfeta.cursoAfeto.questionario.state = :s2)"
+    );
+    q.setString("s1","PROCESSING_WITH_ANSWERS");
+    q.setString("s2","PROCESSING");
+    List<QuestionarioPedagogicoTipologiaRequisitada> tipologiaRequisitadas = q.list();
+    if(tipologiaRequisitadas.size() == 0)
+    {
+%>
+<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>
+<%
+}
+else if(tipologiaRequisitadas.size() > 0)
+{
+%>
+<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">
+            <div class="list-group">
+                <%
+                    HashMap<Questionario,List<QuestionarioPedagogicoTipologiaRequisitada>> tipologiasOrdenadas = new HashMap<Questionario, List<QuestionarioPedagogicoTipologiaRequisitada>>();
+                    for(QuestionarioPedagogicoTipologiaRequisitada tipologiaRequisitada: tipologiaRequisitadas)
+                    {
+                        List<QuestionarioPedagogicoTipologiaRequisitada> tipologias = tipologiasOrdenadas.get(tipologiaRequisitada.getUnidadeAfeta().getCursoAfeto().getQuestionario());
+                        if(tipologias == null)
+                        {
+                            tipologias = new ArrayList<QuestionarioPedagogicoTipologiaRequisitada>();
+                            tipologiasOrdenadas.put(tipologiaRequisitada.getUnidadeAfeta().getCursoAfeto().getQuestionario(),tipologias);
+                        }
+                        tipologias.add(tipologiaRequisitada);
+                    }
+                    for(Questionario questionario: tipologiasOrdenadas.keySet())
+                    {
+                %>
+                <h2><%=questionario.getDescription()%></h2>
+                <%
+                    HashMap<QuestionarioPedagogicoCursoAfeto,Boolean> cursosAfetoHashMap = new HashMap<QuestionarioPedagogicoCursoAfeto, Boolean>();
+                    for(QuestionarioPedagogicoTipologiaRequisitada tipologiaRequisitada: tipologiasOrdenadas.get(questionario))
+                    {
+                        cursosAfetoHashMap.put(tipologiaRequisitada.getUnidadeAfeta().getCursoAfeto(),true);
+                    }
+                    for(QuestionarioPedagogicoCursoAfeto cursoAfeto: cursosAfetoHashMap.keySet())
+                    {
+                %>
+                <h3><%=cursoAfeto.getNome()%></h3>
+                <div class="list-group">
+                    <%--<div class="list-group-item list-group-item-heading clearfix">
+                        Unidade Curricular (Código da Unidade) <label class="label label-pill label-success" style="font-size: 1em">Questionários Preenchidos</label> de <label class="label label-pill label-info" style="font-size: 1em">Número de Solicitados</label> <label class="badge badge-info">Tipologia de Aula</label>
+                    </div>--%>
+                    <%
+                        for(QuestionarioPedagogicoTipologiaRequisitada tipologiaRequisitada: tipologiasOrdenadas.get(questionario))
+                        {
+                            if(tipologiaRequisitada.getUnidadeAfeta().getCursoAfeto() == cursoAfeto)
+                            {
+                    %>
+                    <div class="list-group-item clearfix" >
+                            <%
+                                Query qRespondidos = AbstractDao.getCurrentSession().createQuery("" +
+                                        "select count(distinct r.id) from t in class " + QuestionarioPedagogicoTipologiaRequisitada.class.getName() + " " +
+                                        " join t.alunosRequisitados a " +
+                                        " join a.respostaRequisitada rR " +
+                                        " join rR.resposta r " +
+                                        " where t.id = :id group by t "
+                                );
+                                qRespondidos.setLong("id",tipologiaRequisitada.getId());
+                                //List e = qRespondidos.list();
+                                Object respondidos = qRespondidos.uniqueResult();
+                            %>
+                        <label class="label label-pill <%=respondidos == null ? "label-warning" : "label-success"%>" style="font-size: 1em"><%=respondidos == null ? 0 : ((Long)respondidos)%></label>
+                        respondidos de
+                        <label class="label label-pill label-info" style="font-size: 1em"><%=tipologiaRequisitada.getAlunosRequisitados().size()%></label>
+                        <%=tipologiaRequisitada.getUnidadeAfeta().getNome()%>
+                        (<%=tipologiaRequisitada.getUnidadeAfeta().getCodigoUnidade()%>)
+                        <label class="badge badge-info"><%=tipologiaRequisitada.getDsTipologia()%></label>
+                    </div>
+                    <%
+                            }
+                        }
+                    %>
+                </div>
+                <%
+                        }
+                    }
+                %>
+            </div>
+        </div>
+    </div>
+</div>
+<%
+    }
+    AbstractDao.getCurrentSession().getTransaction().commit();
+%>

 /branches/v3/impl/src/web/user/questionarios/pedagogicoEstudante/pedagogicoEstudanteCoursesSelection.jsp
 ,16 → 1,16
 <%@ page import="jomm.dao.impl.AbstractDao" %>
+<%@ page import="jomm.utils.MessageResources" %>
+<%@ page import="pt.estgp.estgweb.domain.Course" %>
+<%@ page import="pt.estgp.estgweb.domain.JobServiceTaskImpl" %>
+<%@ page import="pt.estgp.estgweb.domain.QuestionarioImpl" %>
 <%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
 <%@ page import="pt.estgp.estgweb.domain.views.CourseView" %>
 <%@ page import="pt.estgp.estgweb.utils.ConfigProperties" %>
+<%@ page import="pt.estgp.estgweb.web.form.configuration.SchedulleTasksForm" %>
 <%@ page import="pt.estgp.estgweb.web.utils.RequestUtils" %>
 <%@ page import="pt.utl.ist.berserk.logic.serviceManager.IServiceManager" %>
 <%@ page import="pt.utl.ist.berserk.logic.serviceManager.ServiceManager" %>
 <%@ page import="java.util.List" %>
-<%@ page import="pt.estgp.estgweb.web.form.configuration.SchedulleTasksForm" %>
-<%@ page import="pt.estgp.estgweb.domain.*" %>
-<%@ page import="pt.estgp.estgweb.services.jobs.ServiceJob" %>
-<%@ page import="pt.estgp.estgweb.services.questionarios.pedagogico.UpdateCoursesAndUnitsJobService" %>
-<%@ page import="pt.estgp.estgweb.web.form.questionarios.QuestionarioForm" %>
 <%@ 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" %>
 ,6 → 275,14
                                     schedulleTasksForm.setJobServiceTask(job);
                                     schedulleTasksForm.setId(job.getId());
                                     request.setAttribute("SchedulleTasksForm",schedulleTasksForm);
+                                    if(job.getStatusEnum() == JobServiceTaskImpl.JobStatus.FAILED ||
+                                            job.getStatusEnum() == JobServiceTaskImpl.JobStatus.UNKNOWN_ERROR ||
+                                            job.getStatusEnum() == JobServiceTaskImpl.JobStatus.FINISHED_ERRORS )
+                                    {
+                                    %>
+                                    <div class="alert alert-danger"><%=MessageResources.getInstance(request).getMessage("job.status."+job.getStatus())%>, Consulte o Log</div>
+                                    <%
+                                        }
                                 %>
                                 <div class="task-log task-log-xs" data-href="<%=request.getContextPath()%>/user/questionarioPedagogicoStartChooseCourses.do?questionarioId=${Questionario.id}">
                                     <jsp:include page="/admin/configuration/taskLog.jsp"/>

 /branches/v3/impl/src/web/user/questionarios/pedagogicoEstudante/questionarioDashBoard.jsp
 New file
 ,0 → 1,135
+<%@ page import="jomm.dao.impl.AbstractDao" %>
+<%@ page import="pt.estgp.estgweb.domain.Questionario" %>
+<%@ page import="pt.estgp.estgweb.domain.QuestionarioImpl" %>
+<%@ page import="pt.estgp.estgweb.domain.QuestionarioPedagogicoCursoAfeto" %>
+<%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
+<%@ page import="pt.estgp.estgweb.domain.dao.impl.QuestionarioDaoImpl" %>
+<%@ page import="java.util.List" %>
+<%@ page import="pt.estgp.estgweb.web.exceptions.NotAuthorizedException" %>
+<%@ 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" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
+<%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
+<jsp:useBean id="UserSession" type="pt.estgp.estgweb.domain.UserSessionImpl" scope="request"/>
+<%
+    String questionarioIdStr = request.getParameter("questionarioId");
+    if(questionarioIdStr == null)
+        questionarioIdStr = (String) request.getAttribute("questionarioId");
+    if(questionarioIdStr == null)
+    {
+        if(request.getAttribute("Questionario")!=null)
+        {
+            Questionario quest = (Questionario) request.getAttribute("Questionario");
+            questionarioIdStr = quest.getId() + "";
+        }
+    }
+    long questionarioId = Long.parseLong(questionarioIdStr);
+    AbstractDao.getCurrentSession().beginTransaction();
+    QuestionarioImpl questionario = (QuestionarioImpl) DaoFactory.getQuestionarioDaoImpl().load(questionarioId);
+    questionario.initClearances(UserSession,true);
+    request.setAttribute("Questionario",questionario);
+    if(!questionario.isClear(UserSession,QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SEE_DASHBOARD.name()))
+    {
+        return; //NAO PODE VER O PAINEL
+    }
+    else
+    {
+        QuestionarioDaoImpl.QuestionarioStatsVars questionarioStatsVars = DaoFactory.getQuestionarioDaoImpl().loadQuestionarioStatsPedagogico(questionarioId);
+%>
+<div class="col-sm-6">
+    <div class="alert alert-info">
+        <%=questionarioStatsVars.respostasObtidas%> respostas obtidas de <%=questionarioStatsVars.respostasRequisitadas%> possiveis
+    </div>
+</div>
+<div class="col-sm-6">
+    <baco:clearOperation name="Questionario" op="QUESTIONARIO_STOP_PROCESSEMENT">
+        <button class="btn btn-danger" type="button" data-toggle="modal" data-target="#confirm-ModalGeneric" data-message="Esta operação irá parar o questionário e os alunos não poderão responder!! Tem a certeza que deseja prosseguir?" data-href="<%=request.getContextPath()%>/user/questionariosPaeYearSemestre.do?dispatch=stopProcessement&questionarioId=${Questionario.id}"><span class="icon icon-stop"> </span> Parar Questionário</button>
+    </baco:clearOperation>
+    <baco:clearOperation name="Questionario" op="QUESTIONARIO_START_PROCESSEMENT">
+        <button class="btn btn-success" type="button" data-toggle="modal" data-target="#confirm-ModalGeneric" data-message="Esta operação irá abrir o questionário para os alunos!! Tem a certeza que deseja prosseguir?" data-href="<%=request.getContextPath()%>/user/questionariosPaeYearSemestre.do?dispatch=startProcessement&questionarioId=${Questionario.id}"><span class="icon icon-play"> </span> Iniciar Questionário</button>
+    </baco:clearOperation>
+</div>
+<div class="col-sm-12">
+        <table class="tablesorter-blue">
+            <thead>
+            <th>Cursos Selecionados</th>
+            <th>Total de Unidades</th>
+            <th>Unidades Não Selecionadas</th>
+            <th>Unidades Selecionadas</th>
+            <th>Turmas Selecionadas</th>
+            <th>Alunos Selecionados</th>
+            <th>Professores Selecionados</th>
+            <th>Respondidos</th>
+            <th>Por Responder</th>
+            <th>Respostas Requisitadas</th>
+            </thead>
+            <tbody>
+            <td><%=questionarioStatsVars.cursos%></td>
+            <td><%=questionarioStatsVars.unidades%></td>
+            <td><%=questionarioStatsVars.unidades - questionarioStatsVars.unidadesUsadas%></td>
+            <td><%=questionarioStatsVars.unidadesUsadas%></td>
+            <td><%=questionarioStatsVars.turmas%></td>
+            <td><%=questionarioStatsVars.alunosDeUsadas%></td>
+            <td><%=questionarioStatsVars.profsDeUsadas%></td>
+            <td><label class="label label-success" style="font-size: 1em"><%=questionarioStatsVars.respostasObtidas%></label></td>
+            <td><label class="label label-danger" style="font-size: 1em"><%=(questionarioStatsVars.respostasRequisitadas-questionarioStatsVars.respostasObtidas)%></label></td>
+            <td><label class="label label-info" style="font-size: 1em"><%=questionarioStatsVars.respostasRequisitadas%></label></td>
+            </tbody>
+        </table>
+</div>
+<div class="col-sm-12">
+    <table class="tablesorterfiltered">
+        <thead>
+            <th class="filter-name filter-select">Instituição</th>
+            <th>Código</th>
+            <th>Curso</th>
+            <th>Unidades</th>
+            <th>Respondidos</th>
+            <th>Por Responder</th>
+            <th>Total</th>
+        </thead>
+        <tbody>
+    <%
+        List<Long> cursos = DaoFactory.getQuestionarioPedagogicoCursoAfetoDaoImpl().findCursosAfetosIds(questionarioId);
+        for(Long cursoId: cursos)
+        {
+            QuestionarioPedagogicoCursoAfeto cursoAfeto = DaoFactory.getQuestionarioPedagogicoCursoAfetoDaoImpl().load(cursoId);
+            long respostasCurso = DaoFactory.getQuestionarioPedagogicoCursoAfetoDaoImpl().countRespostas(cursoId);
+            request.setAttribute("cursoAfeto",cursoAfeto);
+    %>
+        <tr>
+            <td><%=cursoAfeto.getNomeInstituicao()%></td>
+            <td><%=cursoAfeto.getCodigoCurso()%></td>
+            <td><%=cursoAfeto.getNome()%></td>
+            <td>
+                <a href="#" data-href="<%=request.getContextPath()%>/user/questionarios/pedagogicoEstudante/questionarioCourseDashBoard.jsp?cursoAfetoId=${cursoAfeto.id}" data-title="Acompanhamento de questionários do curso (${cursoAfeto.codigoCurso}) ${cursoAfeto.nome} da ${cursoAfeto.nomeInstituicao})" data-toggle="modal" data-target="#modalAjaxRequest">
+                    <%=cursoAfeto.getUnidadesAfetas().size()%>
+                </a>
+            </td>
+            <td><label class="label <%=respostasCurso > 0 ? "label-success":"label-warning"%>" style="font-size: 1em"><%=respostasCurso%></label></td>
+            <td><label class="label label-danger" style="font-size: 1em"><%=cursoAfeto.getStatRespostasRequisitadas() - respostasCurso%></label></td>
+            <td><label class="label label-info" style="font-size: 1em"><%=cursoAfeto.getStatRespostasRequisitadas()%></label></td>
+        </tr>
+    <%
+        }
+        AbstractDao.getCurrentSession().getTransaction().commit();
+    %>
+        </tbody>
+    </table>
+</div>
+<%
+    }//FIM DE PAINEL CLEARED
+%>

 /branches/v3/impl/src/web/user/questionarios/pedagogicoEstudante/respostasRequisitadas.jsp
 New file
 ,0 → 1,110
+<%@ page import="jomm.dao.impl.AbstractDao" %>
+<%@ page import="org.hibernate.Query" %>
+<%@ page import="java.util.ArrayList" %>
+<%@ page import="java.util.HashMap" %>
+<%@ page import="java.util.List" %>
+<%@ page import="pt.estgp.estgweb.domain.*" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<jsp:useBean id="UserSession" type="pt.estgp.estgweb.domain.UserSessionImpl" scope="request"/>
+<%
+    AbstractDao.getCurrentSession().beginTransaction();
+    Query q = AbstractDao.getCurrentSession().createQuery(
+            "select a from a in class " + QuestionarioPedagogicoAlunoRequisitado.class.getName() +
+                    " join a.aluno u " +
+                    " where a.respostaRequisitada.resposta is null and u.id = " + UserSession.getUser().getId() + " and " +
+                    " (a.respostaRequisitada.questionario.state = :s1 OR a.respostaRequisitada.questionario.state = :s2)"
+    );
+    q.setString("s1","PROCESSING_WITH_ANSWERS");
+    q.setString("s2","PROCESSING");
+    List<QuestionarioPedagogicoAlunoRequisitado> alunosRequisitados = q.list();
+    if(alunosRequisitados.size() == 0)
+    {
+%>
+<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 em falta da tua parte.</div>
+    <div class="alert alert-success">Vai consultando o sistema pois poderemos ativar algum questionário e a tua opinião é muito importante para nós. Obrigado</div>
+</div>
+<%
+}
+else if(alunosRequisitados.size() > 0)
+{
+%>
+<div class="col-md-12 col-sm-12 col-xs-12">
+    <div class="panel panel-info">
+        <div class="panel-heading">Olá ${UserSession.shortName}. Tens questinários por responder <span class="glyphicon glyphicon-alert"/></div>
+        <div class="panel-body">
+            <div class="list-group">
+                <%
+                    HashMap<Questionario,List<QuestionarioPedagogicoAlunoRequisitado>> alunosOrdenados = new HashMap<Questionario, List<QuestionarioPedagogicoAlunoRequisitado>>();
+                    for(QuestionarioPedagogicoAlunoRequisitado alunoRequisitado: alunosRequisitados)
+                    {
+                        List<QuestionarioPedagogicoAlunoRequisitado> alunos = alunosOrdenados.get(alunoRequisitado.getRespostaRequisitada().getQuestionario());
+                        if(alunos == null)
+                        {
+                            alunos = new ArrayList<QuestionarioPedagogicoAlunoRequisitado>();
+                            alunosOrdenados.put(alunoRequisitado.getRespostaRequisitada().getQuestionario(),alunos);
+                        }
+                        alunos.add(alunoRequisitado);
+                    }
+                    for(Questionario questionario: alunosOrdenados.keySet())
+                    {
+                %>
+                <h2><%=questionario.getDescription()%></h2>
+                <%
+                    HashMap<QuestionarioPedagogicoCursoAfeto,Boolean> cursosAfetoHashMap = new HashMap<QuestionarioPedagogicoCursoAfeto, Boolean>();
+                    for(QuestionarioPedagogicoAlunoRequisitado alunoRequisitado: alunosOrdenados.get(questionario))
+                    {
+                        cursosAfetoHashMap.put(alunoRequisitado.getTipologiaRequisitada().getUnidadeAfeta().getCursoAfeto(),true);
+                    }
+                    if(cursosAfetoHashMap.size() > 1)
+                    {
+                %>
+                <div class="alert alert-info">${UserSession.shortName} tens mais que um curso, isto pode acontecer por teres unidades extra-curriculares, deves responder a todos os questionários mesmo os que não são do teu curso</div>
+                <%
+                    }
+                    for(QuestionarioPedagogicoCursoAfeto cursoAfeto: cursosAfetoHashMap.keySet())
+                    {
+                %>
+                <h3><%=cursoAfeto.getNome()%></h3>
+                <div class="list-group">
+                    <div class="list-group-item list-group-item-heading clearfix">
+                        Unidade Curricular (Código da Unidade) <label class="label label-pill label-info" style="font-size: 1em">Professor</label> <label class="badge badge-info">Tipologia de Aula</label>
+                    </div>
+                    <%
+                        for(QuestionarioPedagogicoAlunoRequisitado alunoRequisitado: alunosOrdenados.get(questionario))
+                        {
+                            if(alunoRequisitado.getTipologiaRequisitada().getUnidadeAfeta().getCursoAfeto() == cursoAfeto)
+                            {
+                    %>
+                    <div class="list-group-item clearfix" >
+                        <a href="<%=request.getContextPath()%>/user/startRespostaQuestionario.do?alunoRequisitadoId=<%=alunoRequisitado.getId()%>">
+                            <%=alunoRequisitado.getTipologiaRequisitada().getUnidadeAfeta().getNome()%>
+                            (<%=alunoRequisitado.getTipologiaRequisitada().getUnidadeAfeta().getCodigoUnidade()%>)
+                        </a>
+                        <label class="label label-pill label-info" style="font-size: 1em"><%=alunoRequisitado.getTipologiaRequisitada().getNomeDocente()%></label>
+                        <label class="badge badge-info"><%=alunoRequisitado.getTipologiaRequisitada().getDsTipologia()%></label>
+                    </div>
+                    <%
+                            }
+                        }
+                    %>
+                </div>
+                <%
+                        }
+                    }
+                %>
+            </div>
+        </div>
+    </div>
+</div>
+<%
+    }
+    AbstractDao.getCurrentSession().getTransaction().commit();
+%>

 /branches/v3/impl/src/web/user/questionarios/pedagogicoEstudante/questionarioAdminPanel.jsp
 ,8 → 168,8
                 <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()%>/user/questionariosPaeSelectCourses.do?dispatch=revertAssignements&questionario.id=${Questionario.id}#NOWTASK">Anular Atribuições</button>
             </baco:clearOperation>
-            <baco:clearOperation name="Questionario" op="QUESTIONARIO_FINNISH_ASSIGNEMENTS">
-                <button class="btn btn-success pull-right" type="button" >Terminar Atribuições / INICIAR PROCESSAMENTO DO QUESTIONÁRIO</button>
+            <baco:clearOperation name="Questionario" op="QUESTIONARIO_PUT_ANSWERS_ASSIGNED">
+                <a class="btn btn-success pull-right" type="button" href="<%=request.getContextPath()%>/user/questionariosPaeYearSemestre.do?dispatch=putInAssignedAnwsers&questionarioId=${Questionario.id}">Terminar Atribuições</a>
             </baco:clearOperation>
         </div>
     </div>

 /branches/v3/impl/src/web/user/questionarios/pedagogicoEstudante/questionarioCourseDashBoard.jsp
 New file
 ,0 → 1,102
+<%@ page import="jomm.dao.impl.AbstractDao" %>
+<%@ page import="org.hibernate.Query" %>
+<%@ page import="pt.estgp.estgweb.domain.Questionario" %>
+<%@ page import="pt.estgp.estgweb.domain.QuestionarioImpl" %>
+<%@ page import="pt.estgp.estgweb.domain.QuestionarioPedagogicoCursoAfeto" %>
+<%@ page import="pt.estgp.estgweb.domain.QuestionarioPedagogicoUnidadeCurricularAfeta" %>
+<%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
+<%@ page import="java.util.List" %>
+<%@ 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" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
+<%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
+<jsp:useBean id="UserSession" type="pt.estgp.estgweb.domain.UserSessionImpl" scope="request"/>
+<%
+    String cursoAfetoId = request.getParameter("cursoAfetoId");
+    AbstractDao.getCurrentSession().beginTransaction();
+    QuestionarioPedagogicoCursoAfeto cursoAfeto = DaoFactory.getQuestionarioPedagogicoCursoAfetoDaoImpl().load(Long.parseLong(cursoAfetoId));
+    Questionario questionarioV = cursoAfeto.getQuestionario();
+    QuestionarioImpl questionario = (QuestionarioImpl) DaoFactory.getQuestionarioDaoImpl().narrow(questionarioV);
+    questionario.initClearances(UserSession,true);
+    request.setAttribute("Questionario",questionario);
+    if(!questionario.isClear(UserSession,QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SEE_DASHBOARD.name()))
+    {
+        return; //NAO PODE VER O PAINEL
+    }
+    else
+    {
+        Query q = AbstractDao.getCurrentSession().createQuery(
+                "select " +
+                        " u.codigoUnidade " +
+                        ",u.nome " +
+                        ",t.cdDocente " +
+                        ",t.nomeDocente " +
+                        ",t.dsTipologia " +
+                        ",t.cdTurma " +
+                        ",sum (case when u.usar = true AND rR.resposta is null then 1 else 0 end) AS porResponder " +
+                        ",sum (case when u.usar = true AND rR.resposta is null then 0 else 1 end) AS respostasObtidas " +
+                        ",count(distinct a.aluno)" +
+                        " from u in class " + QuestionarioPedagogicoUnidadeCurricularAfeta.class.getName() + " " +
+                        " join u.cursoAfeto c " +
+                        " join u.tipologiasRequisitadas t " +
+                        " join t.alunosRequisitados a " +
+                        " join a.respostaRequisitada rR " +
+                        " left join rR.resposta r " +
+                        " where c.id = :id group by t.id order by u.nome asc");
+        q.setLong("id",cursoAfeto.getId());
+        List<Object[]> tipologias = q.list();
+%>
+<div class="col-sm-12">
+    <table class="tablesorterfiltered">
+        <thead>
+            <th>Código</th>
+            <th>Unidade</th>
+            <th>Código Docente</th>
+            <th class="filter-name filter-select">Docente</th>
+            <th>Tipologia</th>
+            <th>Turma</th>
+            <th>Por Responder</th>
+            <th>Respondidos</th>
+            <th>Estudantes</th>
+        </thead>
+        <tbody>
+    <%
+        for(Object[] tipologia: tipologias)
+        {
+    %>
+        <tr>
+            <td><%=tipologia[0]%></td>
+            <td><%=tipologia[1]%></td>
+            <td><%=tipologia[2]%></td>
+            <td><%=tipologia[3]%></td>
+            <td><%=tipologia[4]%></td>
+            <td><%=tipologia[5]%></td>
+            <td><label class="label label-danger" style="font-size: 1em"><%=tipologia[6]%></label></td>
+            <td><label class="label <%=((Long)tipologia[7]) > 0 ? "label-success":"label-warning"%>" style="font-size: 1em"><%=tipologia[7]%></label></td>
+            <td><label class="label label-info" style="font-size: 1em"><%=tipologia[8]%></label></td>
+        </tr>
+    <%
+        }
+    %>
+        </tbody>
+    </table>
+</div>
+<%
+        AbstractDao.getCurrentSession().getTransaction().commit();
+    }//FIM DE PAINEL CLEARED
+%>

 /branches/v3/impl/src/web/user/questionarios/pedagogicoEstudante/pedagogicoCourseCheckUnidadeAfeta.jsp
 ,13 → 53,53
             <tbody>
             <logic:iterate id="tipologia" name="tipologias" type="pt.estgp.estgweb.domain.CourseUnitImpl.Tipologia">
                 <%
-                    CourseUnitImpl.TipologiaPersistent tipoPersistente = courseUnit.loadPersistent(tipologia);
-                    if(tipoPersistente == null)
+                    try
                     {
+                        CourseUnitImpl.TipologiaPersistent tipoPersistente = courseUnit.loadPersistent(tipologia);
+                        request.setAttribute("tipoPersistente",tipoPersistente);
+                %>
+                        <tr>
+                            <td>${tipologia.cdDocente}</td>
+                            <td>${tipoPersistente.teacher.name}</td>
+                            <td>${tipologia.dsTipologia}</td>
+                            <td>${tipologia.ocorrencias}</td>
+                            <td>${tipologia.cdTurma}</td>
+                            <td>
+                                <a href="#" data-href="<%=request.getContextPath()%>/user/courseunits/listStudentsService.jsp?courseUnitView.id=${unidade.courseUnit.id}&filterTurma=${tipologia.cdTurma}" data-title="Alunos da turma ${tipologia.cdTurma} da unidade de ${unidade.nome} (${unidade.codigoUnidade}) do curso de ${unidade.cursoAfeto.nome} (${unidade.cursoAfeto.codigoCurso})" data-toggle="modal" data-target="#modalAjaxRequest">
+                                    <%=tipoPersistente.getCourseUnitTurma().getStudents().size()%>
+                                </a>
+                            </td>
+                            <td>
+                                <logic:equal value="true" name="tipologia" property="extra">
+                                    <span class="glyphicon glyphicon-asterisk"></span>
+                                </logic:equal>
+                            </td>
+                            <td>
+                                <logic:equal value="true" name="tipologia" property="horRef">
+                                    <span class="glyphicon glyphicon-asterisk"></span>
+                                </logic:equal>
+                            </td>
+                            <td>
+                                <logic:equal value="true" name="tipologia" property="sumario">
+                                    <span class="glyphicon glyphicon-asterisk"></span>
+                                </logic:equal>
+                            </td>
+                            <td>
+                                <logic:equal value="true" name="tipologia" property="sumario">
+                                    <span class="glyphicon glyphicon-ok"></span>
+                                </logic:equal>
+                            </td>
+                        </tr>
+                <%
+                }
+                catch(CourseUnitImpl.TipologiaLoadExeption exp)
+                {
                         unidade.setMarked(true);
                         if(unidade.getObs() != null && unidade.getObs().indexOf("Tipologia inexistente")<0)
                             ((QuestionarioPedagogicoUnidadeCurricularAfetaImpl)unidade).addObs(
-                                    "Tipologia inexistente nesta unidade, possivelmente foi devida a sumários de uma turma paralela noutro curso Verificar: " + tipologia.getCdTurma() + " verificar se esta turma ou par sua têm curso associado. "
+                                    "Tipologia falhou " + exp.getMessage() + " nesta unidade, possivelmente foi devida a sumários de uma turma paralela noutro curso Verificar: " + tipologia.getCdTurma() + " verificar se esta turma ou par sua têm curso associado. "
                                      + tipologia.getCdDocente() + " " + tipologia.getDsTipologia());
                 %>
                 <script>
 ,47 → 140,10
                     </td>
                 </tr>--%>
                 <%
-                    }
-                    else
-                    {
-                        request.setAttribute("tipoPersistente",tipoPersistente);
-                %>
-                <tr>
-                    <td>${tipologia.cdDocente}</td>
-                    <td>${tipoPersistente.teacher.name}</td>
-                    <td>${tipologia.dsTipologia}</td>
-                    <td>${tipologia.ocorrencias}</td>
-                    <td>${tipologia.cdTurma}</td>
-                    <td>
-                        <a href="#" data-href="<%=request.getContextPath()%>/user/courseunits/listStudentsService.jsp?courseUnitView.id=${unidade.courseUnit.id}&filterTurma=${tipologia.cdTurma}" data-title="Alunos da turma ${tipologia.cdTurma} da unidade de ${unidade.nome} (${unidade.codigoUnidade}) do curso de ${unidade.cursoAfeto.nome} (${unidade.cursoAfeto.codigoCurso})" data-toggle="modal" data-target="#modalAjaxRequest">
-                            <%=tipoPersistente.getCourseUnitTurma().getStudents().size()%>
-                        </a>
-                    </td>
-                    <td>
-                        <logic:equal value="true" name="tipologia" property="extra">
-                            <span class="glyphicon glyphicon-asterisk"></span>
-                        </logic:equal>
-                    </td>
-                    <td>
-                        <logic:equal value="true" name="tipologia" property="horRef">
-                            <span class="glyphicon glyphicon-asterisk"></span>
-                        </logic:equal>
-                    </td>
-                    <td>
-                        <logic:equal value="true" name="tipologia" property="sumario">
-                            <span class="glyphicon glyphicon-asterisk"></span>
-                        </logic:equal>
-                    </td>
-                    <td>
-                        <logic:equal value="true" name="tipologia" property="sumario">
-                            <span class="glyphicon glyphicon-ok"></span>
-                        </logic:equal>
-                    </td>
-                </tr>
-                <%
                     }
                     DaoFactory.getCourseUnitDaoImpl().evict(unidade.getCourseUnit());
                 %>
             </logic:iterate>

 /branches/v3/impl/src/web/user/questionarios/pedagogicoEstudante/pedagogicoCourseCheckCursoAfeto.jsp
 ,6 → 246,9
                         <baco:clearOperation name="Questionario" op="QUESTIONARIO_CHANGE_ASSIGNEMENTS_USE_UNIT">
                             <html:checkbox styleClass="usarCheck" name="unidade" property="usar"/>
                         </baco:clearOperation>
+                        <baco:notClearOperation name="Questionario" op="QUESTIONARIO_CHANGE_ASSIGNEMENTS_USE_UNIT">
+                            <html:checkbox styleClass="usarCheck" name="unidade" property="usar" disabled="true"/>
+                        </baco:notClearOperation>
                     </td>
                     <td>
                         <baco:clearOperation name="Questionario" op="QUESTIONARIO_CHANGE_ASSIGNEMENTS">

 /branches/v3/impl/src/web/user/search/listRoleUserJson.jsp
 New file
 ,0 → 1,35
+<%@ page import="jomm.dao.impl.AbstractDao" %>
+<%@ page import="pt.estgp.estgweb.domain.User" %>
+<%@ page import="java.util.List" %>
+<%@ page import="static org.hibernate.criterion.Restrictions.like" %>
+<%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
+<%@ page import="com.owlike.genson.Genson" %>
+<%@ page import="org.json.JSONArray" %>
+<%@ page import="pt.estgp.estgweb.services.entity.EntityServiceJson" %>
+<%@ page import="java.util.ArrayList" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
+<%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
+<%@ page contentType="application/json;charset=UTF-8" language="java" %>
+<%
+    String role = request.getParameter("role");
+    String pag = request.getParameter("pag");
+    int firstResult = pag==null ? 0 : Integer.parseInt(pag) * 20;
+    AbstractDao.getCurrentSession().beginTransaction();
+    List<User> users = DaoFactory.getUserDaoImpl().loadRoleUsers(role,20,firstResult);
+    ArrayList<User> users1 = new ArrayList<User>();
+    users1.addAll(users);
+    EntityServiceJson entityServiceJson = new EntityServiceJson();
+    String uSerial = entityServiceJson.user(users1);
+    out.print(uSerial);
+    AbstractDao.getCurrentSession().getTransaction().commit();
+%>

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioPedagogicoCursoAfeto.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Pagina.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.ArrayList;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitDeliverable.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitProgramPart2.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioResposta.java
 ,5 → 1,5
 package pt.estgp.estgweb.domain;
-// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
+// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9
 import java.util.Date;
 ,8 → 12,8
      private long id;
      private Date saveDate;
-     private Date timeStart;
-     private Date timeEnd;
+     private long timeStart;
+     private long timeEnd;
      private long totalTime;
      private String r1;
      private String r2;
 ,46 → 115,46
      private long timeTakenRt8;
      private long timeTakenRt9;
      private long timeTakenRt10;
-     private Date timeEventR1;
-     private Date timeEventR2;
-     private Date timeEventR3;
-     private Date timeEventR4;
-     private Date timeEventR5;
-     private Date timeEventR6;
-     private Date timeEventR7;
-     private Date timeEventR8;
-     private Date timeEventR9;
-     private Date timeEventR10;
-     private Date timeEventR11;
-     private Date timeEventR12;
-     private Date timeEventR13;
-     private Date timeEventR14;
-     private Date timeEventR15;
-     private Date timeEventR16;
-     private Date timeEventR17;
-     private Date timeEventR18;
-     private Date timeEventR19;
-     private Date timeEventR20;
-     private Date timeEventR21;
-     private Date timeEventR22;
-     private Date timeEventR23;
-     private Date timeEventR24;
-     private Date timeEventR25;
-     private Date timeEventR26;
-     private Date timeEventR27;
-     private Date timeEventR28;
-     private Date timeEventR29;
-     private Date timeEventR30;
-     private Date timeEventR31;
-     private Date timeEventR32;
-     private Date timeEventR33;
-     private Date timeEventR34;
-     private Date timeEventR35;
-     private Date timeEventR36;
-     private Date timeEventR37;
-     private Date timeEventR38;
-     private Date timeEventR39;
-     private Date timeEventR40;
+     private long timeEventR1;
+     private long timeEventR2;
+     private long timeEventR3;
+     private long timeEventR4;
+     private long timeEventR5;
+     private long timeEventR6;
+     private long timeEventR7;
+     private long timeEventR8;
+     private long timeEventR9;
+     private long timeEventR10;
+     private long timeEventR11;
+     private long timeEventR12;
+     private long timeEventR13;
+     private long timeEventR14;
+     private long timeEventR15;
+     private long timeEventR16;
+     private long timeEventR17;
+     private long timeEventR18;
+     private long timeEventR19;
+     private long timeEventR20;
+     private long timeEventR21;
+     private long timeEventR22;
+     private long timeEventR23;
+     private long timeEventR24;
+     private long timeEventR25;
+     private long timeEventR26;
+     private long timeEventR27;
+     private long timeEventR28;
+     private long timeEventR29;
+     private long timeEventR30;
+     private long timeEventR31;
+     private long timeEventR32;
+     private long timeEventR33;
+     private long timeEventR34;
+     private long timeEventR35;
+     private long timeEventR36;
+     private long timeEventR37;
+     private long timeEventR38;
+     private long timeEventR39;
+     private long timeEventR40;
      private long timeEventRt1;
      private long timeEventRt2;
      private long timeEventRt3;
 ,6 → 166,7
      private long timeEventRt9;
      private long timeEventRt10;
      private User user;
+     private Questionario questionario;
     public QuestionarioResposta() {
     }
 ,18 → 186,18
     public void setSaveDate(Date saveDate) {
         this.saveDate = saveDate;
     }
-    public Date getTimeStart() {
+    public long getTimeStart() {
         return this.timeStart;
     }
-    public void setTimeStart(Date timeStart) {
+    public void setTimeStart(long timeStart) {
         this.timeStart = timeStart;
     }
-    public Date getTimeEnd() {
+    public long getTimeEnd() {
         return this.timeEnd;
     }
-    public void setTimeEnd(Date timeEnd) {
+    public void setTimeEnd(long timeEnd) {
         this.timeEnd = timeEnd;
     }
     public long getTotalTime() {
 ,284 → 907,284
     public void setTimeTakenRt10(long timeTakenRt10) {
         this.timeTakenRt10 = timeTakenRt10;
     }
-    public Date getTimeEventR1() {
+    public long getTimeEventR1() {
         return this.timeEventR1;
     }
-    public void setTimeEventR1(Date timeEventR1) {
+    public void setTimeEventR1(long timeEventR1) {
         this.timeEventR1 = timeEventR1;
     }
-    public Date getTimeEventR2() {
+    public long getTimeEventR2() {
         return this.timeEventR2;
     }
-    public void setTimeEventR2(Date timeEventR2) {
+    public void setTimeEventR2(long timeEventR2) {
         this.timeEventR2 = timeEventR2;
     }
-    public Date getTimeEventR3() {
+    public long getTimeEventR3() {
         return this.timeEventR3;
     }
-    public void setTimeEventR3(Date timeEventR3) {
+    public void setTimeEventR3(long timeEventR3) {
         this.timeEventR3 = timeEventR3;
     }
-    public Date getTimeEventR4() {
+    public long getTimeEventR4() {
         return this.timeEventR4;
     }
-    public void setTimeEventR4(Date timeEventR4) {
+    public void setTimeEventR4(long timeEventR4) {
         this.timeEventR4 = timeEventR4;
     }
-    public Date getTimeEventR5() {
+    public long getTimeEventR5() {
         return this.timeEventR5;
     }
-    public void setTimeEventR5(Date timeEventR5) {
+    public void setTimeEventR5(long timeEventR5) {
         this.timeEventR5 = timeEventR5;
     }
-    public Date getTimeEventR6() {
+    public long getTimeEventR6() {
         return this.timeEventR6;
     }
-    public void setTimeEventR6(Date timeEventR6) {
+    public void setTimeEventR6(long timeEventR6) {
         this.timeEventR6 = timeEventR6;
     }
-    public Date getTimeEventR7() {
+    public long getTimeEventR7() {
         return this.timeEventR7;
     }
-    public void setTimeEventR7(Date timeEventR7) {
+    public void setTimeEventR7(long timeEventR7) {
         this.timeEventR7 = timeEventR7;
     }
-    public Date getTimeEventR8() {
+    public long getTimeEventR8() {
         return this.timeEventR8;
     }
-    public void setTimeEventR8(Date timeEventR8) {
+    public void setTimeEventR8(long timeEventR8) {
         this.timeEventR8 = timeEventR8;
     }
-    public Date getTimeEventR9() {
+    public long getTimeEventR9() {
         return this.timeEventR9;
     }
-    public void setTimeEventR9(Date timeEventR9) {
+    public void setTimeEventR9(long timeEventR9) {
         this.timeEventR9 = timeEventR9;
     }
-    public Date getTimeEventR10() {
+    public long getTimeEventR10() {
         return this.timeEventR10;
     }
-    public void setTimeEventR10(Date timeEventR10) {
+    public void setTimeEventR10(long timeEventR10) {
         this.timeEventR10 = timeEventR10;
     }
-    public Date getTimeEventR11() {
+    public long getTimeEventR11() {
         return this.timeEventR11;
     }
-    public void setTimeEventR11(Date timeEventR11) {
+    public void setTimeEventR11(long timeEventR11) {
         this.timeEventR11 = timeEventR11;
     }
-    public Date getTimeEventR12() {
+    public long getTimeEventR12() {
         return this.timeEventR12;
     }
-    public void setTimeEventR12(Date timeEventR12) {
+    public void setTimeEventR12(long timeEventR12) {
         this.timeEventR12 = timeEventR12;
     }
-    public Date getTimeEventR13() {
+    public long getTimeEventR13() {
         return this.timeEventR13;
     }
-    public void setTimeEventR13(Date timeEventR13) {
+    public void setTimeEventR13(long timeEventR13) {
         this.timeEventR13 = timeEventR13;
     }
-    public Date getTimeEventR14() {
+    public long getTimeEventR14() {
         return this.timeEventR14;
     }
-    public void setTimeEventR14(Date timeEventR14) {
+    public void setTimeEventR14(long timeEventR14) {
         this.timeEventR14 = timeEventR14;
     }
-    public Date getTimeEventR15() {
+    public long getTimeEventR15() {
         return this.timeEventR15;
     }
-    public void setTimeEventR15(Date timeEventR15) {
+    public void setTimeEventR15(long timeEventR15) {
         this.timeEventR15 = timeEventR15;
     }
-    public Date getTimeEventR16() {
+    public long getTimeEventR16() {
         return this.timeEventR16;
     }
-    public void setTimeEventR16(Date timeEventR16) {
+    public void setTimeEventR16(long timeEventR16) {
         this.timeEventR16 = timeEventR16;
     }
-    public Date getTimeEventR17() {
+    public long getTimeEventR17() {
         return this.timeEventR17;
     }
-    public void setTimeEventR17(Date timeEventR17) {
+    public void setTimeEventR17(long timeEventR17) {
         this.timeEventR17 = timeEventR17;
     }
-    public Date getTimeEventR18() {
+    public long getTimeEventR18() {
         return this.timeEventR18;
     }
-    public void setTimeEventR18(Date timeEventR18) {
+    public void setTimeEventR18(long timeEventR18) {
         this.timeEventR18 = timeEventR18;
     }
-    public Date getTimeEventR19() {
+    public long getTimeEventR19() {
         return this.timeEventR19;
     }
-    public void setTimeEventR19(Date timeEventR19) {
+    public void setTimeEventR19(long timeEventR19) {
         this.timeEventR19 = timeEventR19;
     }
-    public Date getTimeEventR20() {
+    public long getTimeEventR20() {
         return this.timeEventR20;
     }
-    public void setTimeEventR20(Date timeEventR20) {
+    public void setTimeEventR20(long timeEventR20) {
         this.timeEventR20 = timeEventR20;
     }
-    public Date getTimeEventR21() {
+    public long getTimeEventR21() {
         return this.timeEventR21;
     }
-    public void setTimeEventR21(Date timeEventR21) {
+    public void setTimeEventR21(long timeEventR21) {
         this.timeEventR21 = timeEventR21;
     }
-    public Date getTimeEventR22() {
+    public long getTimeEventR22() {
         return this.timeEventR22;
     }
-    public void setTimeEventR22(Date timeEventR22) {
+    public void setTimeEventR22(long timeEventR22) {
         this.timeEventR22 = timeEventR22;
     }
-    public Date getTimeEventR23() {
+    public long getTimeEventR23() {
         return this.timeEventR23;
     }
-    public void setTimeEventR23(Date timeEventR23) {
+    public void setTimeEventR23(long timeEventR23) {
         this.timeEventR23 = timeEventR23;
     }
-    public Date getTimeEventR24() {
+    public long getTimeEventR24() {
         return this.timeEventR24;
     }
-    public void setTimeEventR24(Date timeEventR24) {
+    public void setTimeEventR24(long timeEventR24) {
         this.timeEventR24 = timeEventR24;
     }
-    public Date getTimeEventR25() {
+    public long getTimeEventR25() {
         return this.timeEventR25;
     }
-    public void setTimeEventR25(Date timeEventR25) {
+    public void setTimeEventR25(long timeEventR25) {
         this.timeEventR25 = timeEventR25;
     }
-    public Date getTimeEventR26() {
+    public long getTimeEventR26() {
         return this.timeEventR26;
     }
-    public void setTimeEventR26(Date timeEventR26) {
+    public void setTimeEventR26(long timeEventR26) {
         this.timeEventR26 = timeEventR26;
     }
-    public Date getTimeEventR27() {
+    public long getTimeEventR27() {
         return this.timeEventR27;
     }
-    public void setTimeEventR27(Date timeEventR27) {
+    public void setTimeEventR27(long timeEventR27) {
         this.timeEventR27 = timeEventR27;
     }
-    public Date getTimeEventR28() {
+    public long getTimeEventR28() {
         return this.timeEventR28;
     }
-    public void setTimeEventR28(Date timeEventR28) {
+    public void setTimeEventR28(long timeEventR28) {
         this.timeEventR28 = timeEventR28;
     }
-    public Date getTimeEventR29() {
+    public long getTimeEventR29() {
         return this.timeEventR29;
     }
-    public void setTimeEventR29(Date timeEventR29) {
+    public void setTimeEventR29(long timeEventR29) {
         this.timeEventR29 = timeEventR29;
     }
-    public Date getTimeEventR30() {
+    public long getTimeEventR30() {
         return this.timeEventR30;
     }
-    public void setTimeEventR30(Date timeEventR30) {
+    public void setTimeEventR30(long timeEventR30) {
         this.timeEventR30 = timeEventR30;
     }
-    public Date getTimeEventR31() {
+    public long getTimeEventR31() {
         return this.timeEventR31;
     }
-    public void setTimeEventR31(Date timeEventR31) {
+    public void setTimeEventR31(long timeEventR31) {
         this.timeEventR31 = timeEventR31;
     }
-    public Date getTimeEventR32() {
+    public long getTimeEventR32() {
         return this.timeEventR32;
     }
-    public void setTimeEventR32(Date timeEventR32) {
+    public void setTimeEventR32(long timeEventR32) {
         this.timeEventR32 = timeEventR32;
     }
-    public Date getTimeEventR33() {
+    public long getTimeEventR33() {
         return this.timeEventR33;
     }
-    public void setTimeEventR33(Date timeEventR33) {
+    public void setTimeEventR33(long timeEventR33) {
         this.timeEventR33 = timeEventR33;
     }
-    public Date getTimeEventR34() {
+    public long getTimeEventR34() {
         return this.timeEventR34;
     }
-    public void setTimeEventR34(Date timeEventR34) {
+    public void setTimeEventR34(long timeEventR34) {
         this.timeEventR34 = timeEventR34;
     }
-    public Date getTimeEventR35() {
+    public long getTimeEventR35() {
         return this.timeEventR35;
     }
-    public void setTimeEventR35(Date timeEventR35) {
+    public void setTimeEventR35(long timeEventR35) {
         this.timeEventR35 = timeEventR35;
     }
-    public Date getTimeEventR36() {
+    public long getTimeEventR36() {
         return this.timeEventR36;
     }
-    public void setTimeEventR36(Date timeEventR36) {
+    public void setTimeEventR36(long timeEventR36) {
         this.timeEventR36 = timeEventR36;
     }
-    public Date getTimeEventR37() {
+    public long getTimeEventR37() {
         return this.timeEventR37;
     }
-    public void setTimeEventR37(Date timeEventR37) {
+    public void setTimeEventR37(long timeEventR37) {
         this.timeEventR37 = timeEventR37;
     }
-    public Date getTimeEventR38() {
+    public long getTimeEventR38() {
         return this.timeEventR38;
     }
-    public void setTimeEventR38(Date timeEventR38) {
+    public void setTimeEventR38(long timeEventR38) {
         this.timeEventR38 = timeEventR38;
     }
-    public Date getTimeEventR39() {
+    public long getTimeEventR39() {
         return this.timeEventR39;
     }
-    public void setTimeEventR39(Date timeEventR39) {
+    public void setTimeEventR39(long timeEventR39) {
         this.timeEventR39 = timeEventR39;
     }
-    public Date getTimeEventR40() {
+    public long getTimeEventR40() {
         return this.timeEventR40;
     }
-    public void setTimeEventR40(Date timeEventR40) {
+    public void setTimeEventR40(long timeEventR40) {
         this.timeEventR40 = timeEventR40;
     }
     public long getTimeEventRt1() {
 ,6 → 1264,13
     public void setUser(User user) {
         this.user = user;
     }
+    public Questionario getQuestionario() {
+        return this.questionario;
+    }
+    public void setQuestionario(Questionario questionario) {
+        this.questionario = questionario;
+    }

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioTipologia.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitBlog.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Reminder.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/RecordEventOrganization.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/RecordPaper.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Configuration.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/PageContent.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapStarQuestionarioAnswer.java
 ,5 → 1,5
 package pt.estgp.estgweb.domain;
-// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
+// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9
 import java.util.Date;
 ,7 → 17,7
      private int intResposta;
      private OlapStarQuestionario starQuestionario;
      private OlapEntityQuestionarioPerguntaGrupo perguntaGrupo;
-     private OlapEntityQuestionarioPergunta1_5 pergunta1_5;
+     private OlapEntityQuestionarioPerguntaNumero perguntaNumero;
     public OlapStarQuestionarioAnswer() {
     }
 ,12 → 72,12
     public void setPerguntaGrupo(OlapEntityQuestionarioPerguntaGrupo perguntaGrupo) {
         this.perguntaGrupo = perguntaGrupo;
     }
-    public OlapEntityQuestionarioPergunta1_5 getPergunta1_5() {
-        return this.pergunta1_5;
+    public OlapEntityQuestionarioPerguntaNumero getPerguntaNumero() {
+        return this.perguntaNumero;
     }
-    public void setPergunta1_5(OlapEntityQuestionarioPergunta1_5 pergunta1_5) {
-        this.pergunta1_5 = pergunta1_5;
+    public void setPerguntaNumero(OlapEntityQuestionarioPerguntaNumero perguntaNumero) {
+        this.perguntaNumero = perguntaNumero;
     }

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SurveyStatsGraphic.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SessionObject.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.io.Serializable;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitBlogPost.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/JobParameter.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/GenericUser.java
 ,5 → 1,5
 package pt.estgp.estgweb.domain;
-// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
+// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9
 import java.util.Date;
 ,6 → 17,7
      private String username;
      private String name;
      private String email;
+     private String preferrefEmail;
      private String roles;
      private String authenticationCertificate;
      private Date authenticationCertificateExpire;
 ,6 → 76,13
     public void setEmail(String email) {
         this.email = email;
     }
+    public String getPreferrefEmail() {
+        return this.preferrefEmail;
+    }
+    public void setPreferrefEmail(String preferrefEmail) {
+        this.preferrefEmail = preferrefEmail;
+    }
     public String getRoles() {
         return this.roles;
     }

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/ComunicationFolder.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Student.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitProgram.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitQuestion.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Announcement.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/UrlStatDay.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Survey.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/AssessmentQuestionPossibleAnswer.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/RecordThesis.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/PageSection.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.ArrayList;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SurveyQuestionCandidateAnswer.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/RecordProject.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/PageExternalObject.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SruSourceCollection.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioInstituicao.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/RecordJob.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitTurma.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/ConfigurationGradesStatusEpoca.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Teacher.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SurveyResponse.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/PageRepositoryFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Record.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitSummary.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/RepositoryFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/ProcessEventFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/ProcessEvent.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseYear.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Blog.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/RepositoryFileVersion.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Assessment.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/UserRoleConfig.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SessionObjectId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapStarQuestionario.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BlogPost.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SruSource.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioPedagogicoUnidadeCurricularAfeta.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/ManagedIdentifier.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Course.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/PageExternalUrl.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitGrade.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/UrlStatMonth.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SurveyQuestionItem.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/AssessmentResponse.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioTurma.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/UrlStatDayId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Page.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioPedagogicoAlunoRequisitado.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/JobServiceTask.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Process.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/User.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Image.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Questionario.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapHistoryDimension.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/RecordDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitSummaryDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/RecordOtherDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapHistoryDimensionDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UserRoleConfigDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapEntityQuestionarioPerguntaNumeroDao.java
 New file
 ,0 → 1,39
+package pt.estgp.estgweb.domain.dao.impl;
+// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9
+import org.apache.log4j.Logger;
+/**
+ * Home object for domain model class OlapEntityQuestionarioPerguntaNumero.
+ * @author Jorge Machado - Hibernate Tools
+ */
+import jomm.dao.IDomainObjectDao;
+import jomm.dao.impl.AbstractDao;
+import pt.estgp.estgweb.domain.OlapEntityQuestionarioPerguntaNumero;
+public class OlapEntityQuestionarioPerguntaNumeroDao extends AbstractDao<OlapEntityQuestionarioPerguntaNumero> {
+//public class OlapEntityQuestionarioPerguntaNumeroDao extends AbstractDao implements IDomainObjectDao {
+    private static final Logger log = Logger.getLogger(OlapEntityQuestionarioPerguntaNumeroDao.class);
+    protected static OlapEntityQuestionarioPerguntaNumeroDao myInstance = null;
+    protected OlapEntityQuestionarioPerguntaNumeroDao(){
+        super();
+    }
+    public static OlapEntityQuestionarioPerguntaNumeroDao getInstance() {
+        if (myInstance == null)
+            myInstance = new OlapEntityQuestionarioPerguntaNumeroDao();
+        return myInstance;
+    }
+    protected Class getReferenceClass() {
+        return OlapEntityQuestionarioPerguntaNumero.class;
+    }
+}

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitEvaluationDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SruSourceDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SurveyStructuralNodeDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SurveyDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioRespostaRequisitadaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/PageSectionDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/PageExternalUrlDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitBlogDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/RecordProjectDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapEntityQuestionarioCursoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapStarQuestionarioAnswerDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ConfigurationGradesStatusEpocaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitTurmaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/RecordJobDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ManagedIdentifierCollectionDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitAnnouncementDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/JobServiceTaskDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ProcessDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UserDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/JobServiceTaskParameterDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/DigitalDeliveryCategoryDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatYearDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseYearDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ImageDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapEntityQuestionarioCursoDegreeDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ComunicationFolderDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/RepositoryFileVersionDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/AssessmentDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitQuestionDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitProgramDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BlogPostDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatDayDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioHistoryDriveDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitAssignementDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioPedagogicoCursoAfetoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/PaginaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitDeliverableDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioRespostaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapEntityQuestionarioTipologiaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ConfigurationGradesEpocaAvaliacaoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ConfigurationDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/PageContentDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatDayIdDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/JobDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/GenericUserDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/JobParameterDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SurveyResponseDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/PageRepositoryFileDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioPedagogicoAlunoRequisitadoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/JobServiceTaskSchedulerParameterDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapEntityQuestionarioPerguntaGrupoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ProcessEventFileDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ProcessEventDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UserSessionDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SurveyQuestionDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapEntityQuestionarioUnidadeDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapStarQuestionarioDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapEntityQuestionarioDocenteDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapEntityQuestionarioTurmaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/AssessmentResponseDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SurveyQuestionItemDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatMonthDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SurveyQuestionAnswerDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/RecordPaperDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapEntityQuestionarioInstituicaoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SigesUserDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitBlogPostDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SessionObjectDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SurveyStatsGraphicDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/TeacherDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/PageDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapEntityQuestionarioPeriodoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/JobServiceTaskSchedulerDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/AssessmentQuestionDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/RepositoryFileDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/DigitalDeliveryDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatMonthIdDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BlogDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/TesteDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/MetaProcessDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/StudentDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SessionObjectIdDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/DigitalDeliveryTargetDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapEntityQuestionarioAnoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/AnnouncementDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioPedagogicoUnidadeCurricularAfetaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/GroupDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ConfigurationDirectoryDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/AssessmentQuestionItemDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUserAssociationDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatYearIdDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ConfigurationGradesDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/AssessmentQuestionAnswerDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SeccaoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/AssessmentQuestionPossibleAnswerDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/RecordThesisDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ManagedIdentifierDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitProgramPart2Dao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SurveyQuestionCandidateAnswerDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitGradeDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/RecordEventOrganizationDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ReminderDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/PageExternalObjectDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SruSourceCollectionDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioPedagogicoTipologiaRequisitadaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 4/Mai/2016 14:54:11 by Hibernate Tools 3.2.0.b9
// Generated 3/Jun/2016 2:18:42 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Teste.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioUnidade.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SurveyQuestion.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioPerguntaNumero.java
 New file
 ,0 → 1,39
+package pt.estgp.estgweb.domain;
+// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9
+/**
+ * OlapEntityQuestionarioPerguntaNumero generated by hbm2java
+ */
+public class OlapEntityQuestionarioPerguntaNumero  implements java.io.Serializable {
+     private long id;
+     private String pergunta;
+    public OlapEntityQuestionarioPerguntaNumero() {
+    }
+    public long getId() {
+        return this.id;
+    }
+    public void setId(long id) {
+        this.id = id;
+    }
+    public String getPergunta() {
+        return this.pergunta;
+    }
+    public void setPergunta(String pergunta) {
+        this.pergunta = pergunta;
+    }
+}

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/DigitalDeliveryTarget.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Group.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/ConfigurationDirectory.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/AssessmentQuestionItem.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUserAssociation.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/UrlStatYearId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioDocente.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitAssignement.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioHistoryDrive.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioRespostaRequisitada.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnit.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SurveyQuestionAnswer.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/ConfigurationGradesEpocaAvaliacao.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioCurso.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioPedagogicoTipologiaRequisitada.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SigesUser.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Job.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.io.Serializable;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/ManagedIdentifierCollection.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitAnnouncement.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioPeriodo.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/JobServiceTaskScheduler.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/AssessmentQuestion.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioPerguntaGrupo.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/JobServiceTaskSchedulerParameter.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/JobServiceTaskParameter.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/DigitalDeliveryCategory.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/UrlStatYear.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/RecordOther.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/DigitalDelivery.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/UrlStatMonthId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/UserSession.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioCursoDegree.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/MetaProcess.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitEvaluation.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioAno.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SurveyStructuralNode.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/ConfigurationGrades.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/AssessmentQuestionAnswer.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Seccao.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/UrlStat.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 1/Jun/2016 14:02:06 by Hibernate Tools 3.2.0.b9
// Generated 5/Jun/2016 12:17:52 by Hibernate Tools 3.2.0.b9


import java.util.Date;

Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1400 → Rev 1419