WebSVN - bacoAlunos - Path Comparison - / Rev 1325 and / Rev 1326

Ignore whitespace Rev 1325 → Rev 1326

 /branches/v3/impl/conf/language/MessageResources.properties
 ,6 → 105,7
 #roles
+user.role.questionarios.admin=Administração de Questionarios
 user.role.all=Todos
 user.role.admin=Administrador
 user.role.student=Estudante
 ,7 → 1767,10
 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
+questionario.year.semestre.ok=Ano e Semestre alterados com sucesso
+questionarios.choose.courses=Selecção de Cursos
 ################################################################################
 #
 ,6 → 1869,8
 questionario.state.PROCESSING_OLAP=Gerando Cubos OLAP
 questionario.state.OLAP=Cubos OLAP Terminados
+questionario.historydrive=Categoria Histórica
+questionario.answerprocessor=Processador de Respostas
 # SERVICE ZONE
 survey.admin=Administração de Questionário
 surveys=Questionários

 /branches/v3/impl/conf/WEB-INF/struts/tiles-pae-questionarios.xml
 ,6 → 25,12
         <put name="body" value="/admin/questionarios/questionarioAdmin.jsp"/>
     </definition>
-    page.pae.questionario.newEdit
+    <!-- Modulo do Pedagogico Estudantes -->
+    <definition name="page.pae.questionario.courses.selection" extends="page.pae.separators.home">
+        <put name="separator" value="1" type="string"/>
+        <put name="topnav" value="/admin/questionarios/pedagogicoEstudante/topnavQuestionarioPedagogicoCoursesAdmin.jsp"/>
+        <put name="body" value="/admin/questionarios/pedagogicoEstudante/pedagogicoEstudanteCoursesSelection.jsp"/>
+    </definition>
 </tiles-definitions>

 /branches/v3/impl/conf/WEB-INF/struts/struts-pae-questionarios.xml
 ,11 → 29,16
+        <action path="/admin/startNewQuestionario" forward="/admin/questionariosPaeNoValidation.do?dispatch=startNew"/>
         <action path="/admin/listQuestionarios" forward="page.pae.questionario.list"/>
         <action path="/admin/adminQuestionario" forward="page.pae.questionario.admin"/>
-        <action path="/admin/newQuestionario" forward="page.pae.questionario.newEdit"/>
-        <action path="/admin/formQuestionariosPae" forward="/admin/questionariosPaeLoads.do?dispatch=form"/>
-        <action path="/admin/questionariosPaeLoads"
+        <action path="/admin/formQuestionariosPae" forward="/admin/questionariosPaeNoValidation.do?dispatch=form"/>
+        <action path="/admin/deleteQuestionario" forward="/admin/questionariosPaeNoValidation.do?dispatch=deleteQuestionario"/>
+        <action path="/admin/questionariosPaeStartAfectacoes" forward="/admin/questionariosPaeNoValidation.do?dispatch=startAfetacoes"/>
+        <action path="/admin/questionariosPaeNoValidation"
                 type="pt.estgp.estgweb.web.controllers.questionarios.QuestionarioController"
                 name="QuestionarioForm"
                 scope="request"
 ,6 → 47,7
                 input="page.pae.questionario.list">
             <forward name="list" path="page.pae.questionario.list"/>
             <forward name="newEdit" path="page.pae.questionario.newEdit"/>
+            <forward name="admin" path="page.pae.questionario.admin"/>
         </action>
         <!--Authentication-->
         <action path="/admin/questionariosPae"
 ,14 → 56,31
                 scope="request"
                 parameter="dispatch"
                 validate="true"
-                input="page.pae.questionario.list">
+                input="page.pae.questionario.newEdit">
             <forward name="list" path="page.pae.questionario.list"/>
             <forward name="success" path="page.pae.separators.home"/>
         </action>
+        <action path="/admin/questionariosPaeYearSemestre"
+                type="pt.estgp.estgweb.web.controllers.questionarios.QuestionarioYearSemestreController"
+                name="QuestionarioForm"
+                scope="request"
+                parameter="dispatch"
+                validate="false"
+                input="page.pae.questionario.list">
+            <forward name="list" path="page.pae.questionario.list"/>
+            <forward name="newEdit" path="page.pae.questionario.newEdit"/>
+            <forward name="admin" path="page.pae.questionario.admin"/>
+        </action>
+        <!--%%%%%%%%%%%%%%%%  Pedagogico Alunos Modulo  %%%%%%%%%%%%%%%%%%%-->
+        <action path="/admin/questionarioPedagogicoStartChooseCourses" forward="page.pae.questionario.courses.selection"/>
+        <!--%%%%%%%%%%%%%%%%  Pedagogico Alunos Modulo  %%%%%%%%%%%%%%%%%%%-->
     </action-mappings>
 </struts-config>

 /branches/v3/impl/conf/WEB-INF/tlds/baco.tld
 ,4 → 412,19
             <rtexprvalue>false</rtexprvalue>
         </attribute>
     </tag>
+    <tag>
+        <name>initClearances</name>
+        <tagclass>pt.estgp.estgweb.web.tags.InitClearancesTag</tagclass>
+        <attribute>
+            <name>name</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>property</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
 </taglib>

 /branches/v3/impl/conf/berserk/sd.xml
 ,6 → 2489,89
+    <!--Questionarios New-->
+    <service>
+        <name>loadQuestionarioAdmin</name>
+        <implementationClass>pt.estgp.estgweb.services.questionarios.QuestionariosService</implementationClass>
+        <description></description>
+        <isTransactional>true</isTransactional>
+        <defaultMethod>loadQuestionario</defaultMethod>
+        <filterChains>
+            <chain name="Logger"/>
+            <chain name="Session"/>
+            <chain name="AuthenticatedUsers"/>
+            <chain name="QuestionarioClearancesPre"/>
+        </filterChains>
+    </service>
+    <service>
+        <name>NewQuestionarioForm</name>
+        <implementationClass>pt.estgp.estgweb.services.questionarios.QuestionariosService</implementationClass>
+        <description></description>
+        <isTransactional>true</isTransactional>
+        <defaultMethod>newQuestionarioForm</defaultMethod>
+        <filterChains>
+            <chain name="Logger"/>
+            <chain name="Session"/>
+            <chain name="AuthenticatedUsers"/>
+            <chain name="AdminsOrQuestionarioAdmins"/>
+        </filterChains>
+    </service>
+    <service>
+        <name>saveQuestionarioForm</name>
+        <implementationClass>pt.estgp.estgweb.services.questionarios.QuestionariosService</implementationClass>
+        <description></description>
+        <isTransactional>true</isTransactional>
+        <defaultMethod>saveQuestionarioForm</defaultMethod>
+        <filterChains>
+            <chain name="Logger"/>
+            <chain name="Session"/>
+            <chain name="AuthenticatedUsers"/>
+            <chain name="QuestionarioClearancesPreSave"/>
+        </filterChains>
+    </service>
+    <service>
+        <name>setAnoSemestre</name>
+        <implementationClass>pt.estgp.estgweb.services.questionarios.QuestionariosService</implementationClass>
+        <description></description>
+        <isTransactional>true</isTransactional>
+        <defaultMethod>setAnoSemestre</defaultMethod>
+        <filterChains>
+            <chain name="Logger"/>
+            <chain name="Session"/>
+            <chain name="AuthenticatedUsers"/>
+            <chain name="QuestionarioClearancesPre"/>
+        </filterChains>
+    </service>
+    <service>
+        <name>SetQuestionarioAssignDetailsState</name>
+        <implementationClass>pt.estgp.estgweb.services.questionarios.QuestionariosService</implementationClass>
+        <description>Altera o estado para afetacoes</description>
+        <isTransactional>true</isTransactional>
+        <defaultMethod>setAssignDetailsState</defaultMethod>
+        <filterChains>
+            <chain name="Logger"/>
+            <chain name="Session"/>
+            <chain name="AuthenticatedUsers"/>
+            <chain name="QuestionarioClearancesPre"/>
+        </filterChains>
+    </service>
+    <service>
+        <name>DeleteQuestionario</name>
+        <implementationClass>pt.estgp.estgweb.services.questionarios.QuestionariosService</implementationClass>
+        <description></description>
+        <isTransactional>true</isTransactional>
+        <defaultMethod>deleteQuestionario</defaultMethod>
+        <filterChains>
+            <chain name="Logger"/>
+            <chain name="Session"/>
+            <chain name="AuthenticatedUsers"/>
+            <chain name="QuestionarioClearancesPre"/>
+        </filterChains>
+    </service>
+    DeleteQuestionario
 </serviceDefinitions>

 /branches/v3/impl/conf/berserk/fd.xml
 ,5 → 245,14
     </filter>
+    <filter>
+        <!--Require parameter with questionario id-->
+        <name>QuestionarioClearances</name>
+        <implementationClass>pt.estgp.estgweb.filters.filters.QuestionarioClearancesFilter</implementationClass>
+        <description>This filter fullfill clearances support for questionario with service parameter unitId regarding the user in session</description>
+        <isTransactional>false</isTransactional>
+    </filter>
 </filterDefinitions>

 /branches/v3/impl/conf/berserk/fcd.xml
 ,6 → 62,7
         <invocationTiming>1</invocationTiming>
         <filterClass>pt.estgp.estgweb.filters.chains.AdminControlFilter</filterClass>
     </filterChain>
     <filterChain>
         <name>IdentifiersCollectionCreator</name>
         <expression>AuthenticatedUsers &amp;&amp; RoleUsers("identifiersCollectionCreator")</expression>
 ,7 → 459,31
         <filterClass>pt.estgp.estgweb.filters.chains.LoadControlFilter</filterClass>
     </filterChain>
+    <filterChain>
+        <!--Require parameter unitId with unit id-->
+        <name>QuestionarioClearancesPre</name>
+        <expression>QuestionarioClearances("questionarioId")</expression>
+        <description>See Filter description</description>
+        <invocationTiming>1</invocationTiming>
+        <filterClass>pt.estgp.estgweb.filters.chains.LoadControlFilter</filterClass>
+    </filterChain>
+    <filterChain>
+        <!--Require parameter unitId with unit id-->
+        <name>QuestionarioClearancesPreSave</name>
+        <expression>QuestionarioClearances("questionario.id")</expression>
+        <description>See Filter description</description>
+        <invocationTiming>1</invocationTiming>
+        <filterClass>pt.estgp.estgweb.filters.chains.LoadControlFilter</filterClass>
+    </filterChain>
+    <filterChain>
+        <name>AdminsOrQuestionarioAdmins</name>
+        <expression>AuthenticatedUsers &amp;&amp; (RoleUsers("admin") || RoleUsers("questionarios.admin"))</expression>
+        <description>Admins Control Chain</description>
+        <invocationTiming>1</invocationTiming>
+        <filterClass>pt.estgp.estgweb.filters.chains.AdminControlFilter</filterClass>
+    </filterChain>
 </filterChainsDefinitions>

 /branches/v3/impl/src/java/pt/estgp/estgweb/utils/ReflectionBean.java
 ,9 → 3,11
 import pt.estgp.estgweb.domain.Announcement;
 import pt.estgp.estgweb.domain.DomainObjectFactory;
 import pt.estgp.estgweb.domain.UserImpl;
+import pt.utl.ist.berserk.logic.serviceManager.ServiceParameters;
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
 import java.util.Date;
 import java.util.StringTokenizer;
 ,5 → 76,12
         System.out.println(r.invoke(a));
     }
+    public static Serializable lookup(ServiceParameters serviceParameters, String bean) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
+        ReflectionBean r = new ReflectionBean(bean);
+        Object serializableObjectContainer = serviceParameters.getParameter(r.getName());
+        Serializable serializable = (Serializable) r.invoke(serializableObjectContainer);
+        return serializable;
+    }
 }

/branches/v3/impl/src/java/pt/estgp/estgweb/Globals.java
425,6 → 425,7
public static final String SYSTEM_REDIRECTIONS_POLICY_AUTHENTICATION_ACTION = ConfigProperties.getProperty("system.redirections.policy.authentication.action");


public static final String QUESTIONARIOS_ADMIN = "questionarios.admin";
public static final boolean USE_XSL_CACHE =ConfigProperties.getBooleanProperty("xsl.use.cache");

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/questionarios/QuestionariosService.java
 New file
 ,0 → 1,127
+package pt.estgp.estgweb.services.questionarios;
+import pt.estgp.estgweb.domain.*;
+import pt.estgp.estgweb.domain.dao.DaoFactory;
+import pt.estgp.estgweb.domain.views.QuestionarioView;
+import pt.estgp.estgweb.web.exceptions.NotAuthorizedException;
+import pt.utl.ist.berserk.logic.serviceManager.IService;
+import java.util.List;
+/**
+ * Created by jorgemachado on 21/03/16.
+ */
+public class QuestionariosService implements IService
+{
+    //NEW QUESTIONARIOS COME BY THIS SERVICE
+    public QuestionarioImpl newQuestionarioForm(QuestionarioImpl qform, UserSession userSession) throws NotAuthorizedException
+    {
+        if(qform.getQuestionarioHistoryDrive().getId() > 0)
+        {
+            QuestionarioHistoryDrive hist = DaoFactory.getQuestionarioHistoryDriveDaoImpl().load(qform.getQuestionarioHistoryDrive().getId());
+            qform.setQuestionarioHistoryDrive(hist);
+        }
+        else
+        {
+            qform.setQuestionarioHistoryDrive(null);
+        }
+        DaoFactory.getQuestionarioDaoImpl().save(qform);
+        return qform;
+    }
+    public QuestionarioImpl saveQuestionarioForm(QuestionarioImpl qform, UserSession userSession, QuestionarioImpl questionarioCleared) throws NotAuthorizedException {
+        if(qform.getQuestionarioHistoryDrive().getId() > 0)
+        {
+            QuestionarioHistoryDrive hist = DaoFactory.getQuestionarioHistoryDriveDaoImpl().load(qform.getQuestionarioHistoryDrive().getId());
+            qform.setQuestionarioHistoryDrive(hist);
+        }
+        else
+        {
+            qform.setQuestionarioHistoryDrive(null);
+        }
+        Questionario qPersistent = questionarioCleared;
+        if(questionarioCleared.isClear((UserSessionImpl) userSession,QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SAVE_FORM.name()))
+        {
+            QuestionarioView qv = new QuestionarioView(qform);
+            if(questionarioCleared.isClear((UserSessionImpl) userSession, QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SAVE_ANSWER_PROCESSOR.name()))
+            {
+                qv.persistAnswersProcessor(qPersistent);
+            }
+            qv.persistViewInObjectForm(qPersistent);
+            qPersistent.setQuestionarioHistoryDrive(qform.getQuestionarioHistoryDrive());
+        }
+        else
+            throw new NotAuthorizedException("Não pode alterar o formulário porque o questionário está num estado avançado");
+        return loadInit(questionarioCleared);
+    }
+    public QuestionarioImpl setAssignDetailsState(long id, UserSession userSession, QuestionarioImpl questionarioCleared) throws NotAuthorizedException {
+        if(questionarioCleared.isClear((UserSessionImpl) userSession,QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SET_STATE_ASSIGNATION_DETAILS.name()))
+        {
+            questionarioCleared.setStateClass(QuestionarioImpl.State.ASSIGNATION_DETAILS);
+        }
+        else
+            throw new NotAuthorizedException("Não alterar o questionário para este estado neste momento");
+        return loadInit(questionarioCleared);
+    }
+    /**
+     * Questionario comes already cleared from Filter
+     * @param questionarioId
+     * @param questionarioCleared
+     * @param userSession
+     * @return
+     */
+    public QuestionarioImpl loadQuestionario(long questionarioId,UserSession userSession,QuestionarioImpl questionarioCleared)
+    {
+        return loadInit(questionarioCleared);
+    }
+    /**
+     * just to load proxys
+     * @param questionarioCleared
+     * @return
+     */
+    private QuestionarioImpl loadInit(QuestionarioImpl questionarioCleared)
+    {
+        questionarioCleared.getDescription();//to load proxy just in case
+        if(questionarioCleared.getQuestionarioHistoryDrive() != null)
+            questionarioCleared.getQuestionarioHistoryDrive().getCodeName();
+        return questionarioCleared;
+    }
+    private void loadInit(List<QuestionarioImpl> questionarioCleared)
+    {
+        for(QuestionarioImpl q: questionarioCleared)
+        {
+            q.getDescription();//to load proxy just in case
+            if(q.getQuestionarioHistoryDrive() != null)
+                q.getQuestionarioHistoryDrive().getCodeName();
+        }
+    }
+    //return similar questionarios in same year, semestre and history category
+    public List<QuestionarioImpl> setAnoSemestre(String year, String semestre, long questionarioId, UserSession userSession,QuestionarioImpl questionarioCleared) throws NotAuthorizedException
+    {
+        if(questionarioCleared.isClear((UserSessionImpl) userSession,QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SET_ANO_SEMESTRE.name()))
+        {
+            questionarioCleared.setYear(year);
+            questionarioCleared.setSemestre(semestre);
+            List<QuestionarioImpl> similar = DaoFactory.getQuestionarioDaoImpl().findAnoSemestre(year, semestre, questionarioCleared.getQuestionarioHistoryDrive().getId());
+            loadInit(similar);
+            return similar;
+        }
+        else
+            throw new NotAuthorizedException("Não pode alterar o formulário porque o questionário está num estado avançado");
+    }
+    public void deleteQuestionario(long questionarioId, UserSession userSession,QuestionarioImpl questionarioCleared)
+    {
+        if(questionarioCleared.isClear((UserSessionImpl) userSession,QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_DELETE.name()))
+        {
+            DaoFactory.getQuestionarioDaoImpl().delete(questionarioCleared);
+        }
+    }
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/PageRepositoryFileImpl.java
 ,5 → 1,7
 package pt.estgp.estgweb.domain;
+import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 import java.io.Serializable;
 import java.util.List;
 ,4 → 23,8
     public Serializable getSerializable() {
         return getId();
     }
+    @Override
+    public void initClearances(UserSessionImpl u, boolean force) {
+        throw new NotImplementedException();
+    }
 }

/branches/v3/impl/src/java/pt/estgp/estgweb/domain/ClearanceRuled.java
7,4 → 7,5
{
public boolean isClearanceInitialized(UserSessionImpl u);
public boolean isClear(UserSessionImpl u, String OP);
public void initClearances(UserSessionImpl u,boolean force);
}

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/views/QuestionarioView.java
 ,9 → 50,12
         this.questionario = questionario;
     }
+    public void persistAnswersProcessor(Questionario q)
+    {
+        q.setiAnswersProcessor(questionario.getiAnswersProcessor());
+    }
     public void persistViewInObjectForm(Questionario q)
     {
-        q.setiAnswersProcessor(questionario.getiAnswersProcessor());
         q.setDescription(questionario.getDescription());
         q.setIntroHtml(questionario.getIntroHtml());
         Method[] methods = q.getClass().getMethods();

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/PageExternalUrlImpl.java
 ,5 → 1,7
 package pt.estgp.estgweb.domain;
+import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 import java.io.Serializable;
 import java.util.List;
 ,4 → 23,9
     public Serializable getSerializable() {
         return getId();
     }
+    @Override
+    public void initClearances(UserSessionImpl u, boolean force) {
+        throw new NotImplementedException();
+    }
 }

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/QuestionarioImpl.java
 ,6 → 1,8
 package pt.estgp.estgweb.domain;
 import org.apache.log4j.Logger;
+import pt.estgp.estgweb.Globals;
+import pt.estgp.estgweb.domain.utils.SimpleClearanceRuledSupport;
 import pt.estgp.estgweb.utils.ConfigProperties;
 import java.lang.reflect.InvocationTargetException;
 ,11 → 17,13
 /**
  * Created by jorgemachado on 09/03/16.
  */
-public class QuestionarioImpl extends Questionario
+public class QuestionarioImpl extends Questionario implements ClearanceRuled
 {
     private static final Logger logger = Logger.getLogger(QuestionarioImpl.class);
     public enum State
     {
 ,4 → 182,84
     {
         return State.parse(getState());
     }
+    public void setStateClass(State state) {
+        setState(state.name());
+    }
+    /**CLEARANCES SUPPORT**/
+    SimpleClearanceRuledSupport clearanceRuledSupport = null;
+    public SimpleClearanceRuledSupport getClearanceRuledSupport() {
+        return clearanceRuledSupport;
+    }
+    public void setClearanceRuledSupport(SimpleClearanceRuledSupport clearanceRuledSupport) {
+        this.clearanceRuledSupport = clearanceRuledSupport;
+    }
+    @Override
+    public boolean isClearanceInitialized(UserSessionImpl u) {
+        return clearanceRuledSupport == null ? false :
+                clearanceRuledSupport.isClearanceInitialized(u);
+    }
+    @Override
+    public boolean isClear(UserSessionImpl u, String OP) {
+        if(clearanceRuledSupport == null)
+            return false;
+        return clearanceRuledSupport.isClear(u, OP);
+    }
+    @Override
+    public void initClearances(UserSessionImpl usession, boolean force) {
+        SimpleClearanceRuledSupport s = new SimpleClearanceRuledSupport();
+        if((usession.getUser().isSuperuserOrAdmin() || usession.getUser().hasRole(Globals.QUESTIONARIOS_ADMIN)))
+        {
+            if(getStateEnum() == QuestionarioImpl.State.CREATED &&
+                    getQuestionarioHistoryDrive() != null &&
+                    getiAnswersProcessorClass() != null)
+            {
+                s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SAVE_FORM.name(),usession);
+                s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SET_STATE_ASSIGNATION_DETAILS.name(),usession);
+                s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_DELETE.name(),usession);
+                s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SAVE_ANSWER_PROCESSOR.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)
+            {
+                s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SAVE_FORM.name(),usession);
+                s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SET_ANO_SEMESTRE.name(),usession);
+            }
+        }
+        setClearanceRuledSupport(s);
+    }
+    public static enum QuestionarioClearancesOperation
+    {
+        QUESTIONARIO_SAVE_FORM,
+        QUESTIONARIO_SAVE_ANSWER_PROCESSOR,
+        QUESTIONARIO_SET_STATE_ASSIGNATION_DETAILS,
+        QUESTIONARIO_SET_ANO_SEMESTRE,
+        QUESTIONARIO_DELETE
+        ;
+        public static QuestionarioClearancesOperation parse(String clearance)
+        {
+            if(clearance == null)
+                return null;
+            for(QuestionarioClearancesOperation op: QuestionarioClearancesOperation.values())
+            {
+                if(op.name().equals(clearance))
+                    return op;
+            }
+            return null;
+        }
+    }
 }

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/CourseUnitImpl.java
 ,6 → 296,107
         return clearanceRuledSupport.isClear(u, OP);
     }
+    @Override
+    public void initClearances(UserSessionImpl usession,boolean force)
+    {
+        CourseUnitImpl c = this;
+        String activeYear = DaoFactory.getConfigurationDaoImpl().getCourseUnitEvaluationActiveYear();
+        List<String> activeDegrees = DaoFactory.getConfigurationDaoImpl().getCourseUnitEvaluationActiveDegrees();
+        List<Long> activeCourseIds = DaoFactory.getConfigurationDaoImpl().getCourseUnitEvaluationActiveCourseIds();
+        boolean isActiveYear = activeYear != null && c.getImportYear().equals(activeYear);
+        boolean isActiveDegree = activeDegrees!=null && activeDegrees.contains(c.getCourse().getDegree());
+        boolean isActiveCourseId = activeCourseIds!=null && activeCourseIds.contains(c.getCourse().getId());
+        boolean activePeriod = (isActiveYear && (isActiveCourseId || isActiveDegree));
+        boolean active = activePeriod || c.isEvaluationOpenByAdmin();
+        boolean isComplete = c.getCourseUnitEvaluation() != null && c.getCourseUnitEvaluation().isTeacherComplete() && !c.getCourseUnitEvaluation().isClosed();
+        boolean isClosed = c.getCourseUnitEvaluation() != null && c.getCourseUnitEvaluation().isClosed();
+        boolean isEdit = !isClosed && !isComplete;
+        SimpleClearanceRuledSupport s = new SimpleClearanceRuledSupport();
+        s.setDirty();
+        if(isEdit)
+            s.addClearance(CourseUnitClearancesOperation.EVALUATION_INFO_STATE_EDIT.name(),usession);
+        else if(isComplete)
+            s.addClearance(CourseUnitClearancesOperation.EVALUATION_INFO_STATE_COMPLETE.name(),usession);
+        else if(isClosed)
+            s.addClearance(CourseUnitClearancesOperation.EVALUATION_INFO_STATE_CLOSED.name(),usession);
+        if(activePeriod)
+        {
+            s.addClearance(CourseUnitClearancesOperation.EVALUATION_INFO_ACTIVE.name(),usession);
+            s.addClearance(CourseUnitClearancesOperation.EVALUATION_INFO_ACTIVE_REGULAR_PERIOD.name(),usession);
+        }
+        if(c.isEvaluationOpenByAdmin())
+        {
+            s.addClearance(CourseUnitClearancesOperation.EVALUATION_INFO_ACTIVE.name(),usession);
+            s.addClearance(CourseUnitClearancesOperation.EVALUATION_INFO_ACTIVE_SPECIAL_ADMIN.name(),usession);
+        }
+        if(usession.getUser() != null && usession.getUser().isSuperuserOrAdmin()
+                || usession.getUser().hasRole(Globals.SERVICES_PROGRAMS_ROLE))
+        {
+            s.addClearance(CourseUnitClearancesOperation.EVALUATION_ALL.name(),usession);
+        }
+        if(usession.getUser() != null && usession.getUser() instanceof Teacher)
+        {
+            boolean teacher = ((Teacher)(usession.getUser())).isTeacherOfCourseUnit(c.getId(),true);
+            boolean responsable = c.getResponsableTeacher()!=null && usession.getUser().getId() == c.getResponsableTeacher().getId();
+            if(teacher)
+                s.addClearance(CourseUnitClearancesOperation.EVALUATION_INFO_USER_TEACHER.name(), usession);
+            if(responsable)
+                s.addClearance(CourseUnitClearancesOperation.EVALUATION_INFO_USER_RESP_TEACHER.name(), usession);
+            if(teacher || responsable)
+            {
+                //s.addClearance(CourseUnitClearancesOperation.EVALUATION_INFO_USER_TEACHER.name(), usession);
+                s.addClearance(CourseUnitClearancesOperation.EVALUATION_EDITION.name(),usession);
+                if(active && isEdit)
+                {
+                    s.addClearance(CourseUnitClearancesOperation.EVALUATION_EDITSAVE.name(),usession);
+                    s.addClearance(CourseUnitClearancesOperation.EVALUATION_PERSIST_TEACHER_PART.name(),usession);
+                    s.addClearance(CourseUnitClearancesOperation.EVALUATION_TRANSITATE_TO_COMPLETE.name(),usession);
+                }
+            }
+        }
+        if(usession.getUser() != null && usession.getUser() instanceof Teacher
+                && (((usession.getUser())).hasRole(c.getCourse().getValidationRole())
+                ||
+                ((usession.getUser()) == c.getCourse().getCoordinator()))
+                )
+        {
+            s.addClearance(CourseUnitClearancesOperation.EVALUATION_INFO_USER_COMMISSION.name(), usession);
+            s.addClearance(CourseUnitClearancesOperation.EVALUATION_EDITION.name(), usession);
+            if(active && isEdit)
+            {
+                s.addClearance(CourseUnitClearancesOperation.EVALUATION_EDITSAVE.name(),usession);
+                s.addClearance(CourseUnitClearancesOperation.EVALUATION_PERSIST_TEACHER_PART.name(),usession);
+                s.addClearance(CourseUnitClearancesOperation.EVALUATION_PERSIST_COMISSION_PART.name(),usession);
+                s.addClearance(CourseUnitClearancesOperation.EVALUATION_TRANSITATE_TO_COMPLETE.name(),usession);
+                s.addClearance(CourseUnitClearancesOperation.EVALUATION_TRANSITATE_TO_CLOSE.name(),usession);
+            }
+            else if(active && isComplete)
+            {
+                s.addClearance(CourseUnitClearancesOperation.EVALUATION_EDITSAVE.name(),usession);
+                s.addClearance(CourseUnitClearancesOperation.EVALUATION_PERSIST_TEACHER_PART.name(),usession);
+                s.addClearance(CourseUnitClearancesOperation.EVALUATION_PERSIST_COMISSION_PART.name(),usession);
+                s.addClearance(CourseUnitClearancesOperation.EVALUATION_TRANSITATE_TO_CLOSE.name(),usession);
+                s.addClearance(CourseUnitClearancesOperation.EVALUATION_TRANSITATE_TO_EDIT.name(),usession);
+            }
+            else if(active && isClosed)
+            {
+                s.addClearance(CourseUnitClearancesOperation.EVALUATION_TRANSITATE_TO_EDIT.name(),usession);
+            }
+        }
+        c.setClearanceRuledSupport(s);
+    }
     public static enum CourseUnitClearancesOperation
     {
         EVALUATION_ALL, //SPECIAL OPERATION FOR DENY AND PERMIT REPLACE FULL CONTROL
 ,6 → 458,8
         tipologiaPersistent.setTeacher(DaoFactory.getTeacherDaoImpl().loadBySigesCode(Integer.parseInt(myTipo.getCdDocente())));
         tipologiaPersistent.setCdTipologia(myTipo.getCdTipologia());
         tipologiaPersistent.setOcorrencias(myTipo.getOcorrencias());
+        tipologiaPersistent.setMarkWarning(myTipo.isMarkWarning());
+        tipologiaPersistent.setUse(myTipo.isUse());
         tipologiaPersistent.setCourseUnitTurma(findTurma(myTipo.getCdTurma()));
         if(tipologiaPersistent.getCourseUnitTurma() == null || tipologiaPersistent.getTeacher() == null)
 ,7 → 491,26
         private Integer ocorrencias = 0;
         protected boolean extra;
         protected boolean horRef;
+        protected boolean use;   //campo auxiliar para marcar se vai ser ou não usada  nas afetacoes especificas
+        //por omissão apenas as que têm sumários
+        protected boolean markWarning; //camp
+        public boolean isUse() {
+            return use;
+        }
+        public void setUse(boolean use) {
+            this.use = use;
+        }
+        public boolean isMarkWarning() {
+            return markWarning;
+        }
+        public void setMarkWarning(boolean markWarning) {
+            this.markWarning = markWarning;
+        }
         public boolean isExtra() {
             return extra;
         }
 ,11 → 691,25
         }
     }
+    public static class MergedTipologias
+    {
+        ArrayList<Tipologia> tipologiasWithMarkedAndUsed = new ArrayList<Tipologia>();
+        public ArrayList<Tipologia> getTipologiasWithMarkedAndUsed() {
+            return tipologiasWithMarkedAndUsed;
+        }
+        public void setTipologiasWithMarkedAndUsed(ArrayList<Tipologia> tipologiasWithMarkedAndUsed) {
+            this.tipologiasWithMarkedAndUsed = tipologiasWithMarkedAndUsed;
+        }
+    }
     public static class Tipologias
     {
         ArrayList<Tipologia> tipologiasHorarioReferencia = new ArrayList<Tipologia>();
         ArrayList<Tipologia> tipologiasSumarios = new ArrayList<Tipologia>();
         ArrayList<Tipologia> tipologiasExtraAdicionadas = new ArrayList<Tipologia>();
+        ArrayList<Tipologia> tipologiasUsadas = new ArrayList<Tipologia>();
+        ArrayList<Tipologia> tipologiasMarcadas = new ArrayList<Tipologia>();
         public ArrayList<Tipologia> getTipologiasHorarioReferencia() {
             return tipologiasHorarioReferencia;
 ,12 → 735,22
             this.tipologiasExtraAdicionadas = tipologiasExtraAdicionadas;
         }
+        public ArrayList<Tipologia> getTipologiasUsadas() { return tipologiasUsadas; }
+        public void setTipologiasUsadas(ArrayList<Tipologia> tipologiasUsadas) { this.tipologiasUsadas = tipologiasUsadas; }
+        public ArrayList<Tipologia> getTipologiasMarcadas() { return tipologiasMarcadas; }
+        public void setTipologiasMarcadas(ArrayList<Tipologia> tipologiasMarcadas) { this.tipologiasMarcadas = tipologiasMarcadas; }
         private static Genson getGenson(){
             Genson genson = new Genson.Builder()
                     .exclude(Object.class)
                     .include("tipologiasExtraAdicionadas", Tipologias.class)
                     .include("tipologiasSumarios", Tipologias.class)
                     .include("tipologiasHorarioReferencia", Tipologias.class)
+                    .include("tipologiasUsadas", Tipologias.class)
+                    .include("tipologiasMarcadas", Tipologias.class)
                     .include("cdTipologia", Tipologia.class)
                     .include("cdDocente", Tipologia.class)
                     .include("cdTurma", Tipologia.class)
 ,6 → 760,24
             return genson;
         }
+        private static Genson getGensonMergedTipologiasComplete(){
+            Genson genson = new Genson.Builder()
+                    .exclude(Object.class)
+                    .include("tipologiasWithMarkedAndUsed", MergedTipologias.class)
+                    .include("cdTipologia", Tipologia.class)
+                    .include("cdDocente", Tipologia.class)
+                    .include("cdTurma", Tipologia.class)
+                    .include("dsTipologia",Tipologia.class)
+                    .include("ocorrencias", Tipologia.class)
+                    .include("horRef", Tipologia.class)
+                    .include("extra", Tipologia.class)
+                    .include("use", Tipologia.class)
+                    .include("markWarning", Tipologia.class)
+                    .create();
+            return genson;
+        }
         public String serialize() throws IOException, TransformationException
         {
             Genson genson = getGenson();
 ,9 → 807,37
             new TestCourseUnit().testTipologias();
         }
-        public List<Tipologia> obtainMergeTipologias()
+        public static String serializeMergedList(ArrayList<Tipologia> tipologias) throws IOException, TransformationException
         {
-            List<Tipologia> merge = new ArrayList<Tipologia>();
+            MergedTipologias mergedTipologias = new MergedTipologias();
+            mergedTipologias.setTipologiasWithMarkedAndUsed(tipologias);
+            Genson genson = getGensonMergedTipologiasComplete();
+            try {
+                return genson.serialize(mergedTipologias);
+            } catch (TransformationException e) {
+                throw e;
+            } catch (IOException e) {
+                throw e;
+            }
+        }
+        public static ArrayList<Tipologia> deserializeMergedTipologias(String serial) throws IOException, TransformationException
+        {
+            if(serial == null)
+                return null;
+            try {
+                MergedTipologias mergedTipologias = getGensonMergedTipologiasComplete().deserialize(serial, MergedTipologias.class);
+                if(mergedTipologias.getTipologiasWithMarkedAndUsed() == null)
+                    return new ArrayList<Tipologia>();
+                return mergedTipologias.getTipologiasWithMarkedAndUsed();
+            } catch (TransformationException e) {
+                throw e;
+            } catch (IOException e) {
+                throw e;
+            }
+        }
+        public ArrayList<Tipologia> obtainMergeTipologias()
+        {
+            ArrayList<Tipologia> merge = new ArrayList<Tipologia>();
             if(getTipologiasSumarios() != null)
                 merge.addAll(getTipologiasSumarios());
 ,6 → 859,8
                 }
             for(Tipologia tipo: merge)
             {
+                tipo.setMarkWarning(false);
+                tipo.setUse(false);
                 if(getTipologiasHorarioReferencia() != null && getTipologiasHorarioReferencia().contains(tipo))
                 {
                     tipo.horRef = true;
 ,6 → 871,31
                     tipo.extra = true;
                 }
             }
+            if(getTipologiasMarcadas() != null)
+                for(Tipologia t: getTipologiasMarcadas())
+                {
+                    for(Tipologia tMerge: merge)
+                    {
+                        if(tMerge.equals(t))
+                        {
+                            tMerge.setMarkWarning(true);
+                            break;
+                        }
+                    }
+                }
+            if(getTipologiasUsadas() != null)
+                for(Tipologia t: getTipologiasUsadas())
+                {
+                    for(Tipologia tMerge: merge)
+                    {
+                        if(tMerge.equals(t))
+                        {
+                            tMerge.setUse(true);
+                            break;
+                        }
+                    }
+                }
             return merge;
         }

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioDaoImpl.java
 ,7 → 1,16
 package pt.estgp.estgweb.domain.dao.impl;
+import jomm.dao.DaoException;
 import org.apache.log4j.Logger;
+import org.hibernate.Criteria;
+import org.hibernate.HibernateException;
+import org.hibernate.criterion.Order;
+import pt.estgp.estgweb.domain.QuestionarioImpl;
+import java.util.List;
+import static org.hibernate.criterion.Restrictions.eq;
 /**
  * @author Jorge Machado
  * @date 28/Fev/2008
 ,5 → 29,39
         return (QuestionarioDaoImpl) myInstance;
     }
+    public List<QuestionarioImpl> findSortedBy(int pageIndex, int sizeOfPage,String field)
+    {
+        try
+        {
+            Criteria criteria = createCriteria();
+            criteria.setFirstResult(pageIndex * sizeOfPage);
+            criteria.setMaxResults(sizeOfPage);
+            criteria.addOrder(Order.desc(field));
+            return criteria.list();
+        }
+        catch (HibernateException e)
+        {
+            throw new DaoException(e);
+        }
+    }
+    public List<QuestionarioImpl> findAnoSemestre(String year, String semestre,long historyDriveId )
+    {
+        try
+        {
+            Criteria criteria = createCriteria();
+            criteria.add(eq("year",year))
+                    .add(eq("semestre", semestre))
+                    .add(eq("questionarioHistoryDrive.id",historyDriveId));
+            return criteria.list();
+        }
+        catch (HibernateException e)
+        {
+            throw new DaoException(e);
+        }
+    }
 }

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/dao/impl/CourseDaoImpl.java
 ,11 → 169,31
                   .list();
       }
+    public List<Course> findCoursesWithUnitsIn(String importYear)
+    {
+        return findAllOrderByName(importYear,null,null,null);
+    }
+    public List<String> loadInstitutionCodes(String importYear)
+    {
+        return
+                createCriteria()
+                        .setProjection(Projections
+                                .distinct(Projections.projectionList()
+                                        .add(Projections.property("institutionCode"))))
+                        .add(Expression.isNotNull("institutionCode"))
+                        .list();
+    }
+    public List<Course> findCoursesWithUnitsIn(String importYear,String institutionCode)
+    {
+        return findAllOrderByName(importYear,null,null,institutionCode);
+    }
     public List<Course> findAllOrderByName(String importYear, String area, String type)
     {
         return findAllOrderByName(importYear,area,type,null);
     }
     public List<Course> findAllOrderByName(String importYear, String area, String type,String institutionCode)
     {

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/test/TestCourseUnit.java
 ,6 → 23,8
         ts.setTipologiasExtraAdicionadas(new ArrayList<Tipologia>());
         ts.setTipologiasSumarios(new ArrayList<Tipologia>());
         Tipologia t = new Tipologia();
         t.setCdTurma("TINF");
         t.setCdDocente("20128");
 ,6 → 32,7
         t.setDsTipologia("Teorica");
         t.setOcorrencias(2);
         ts.getTipologiasHorarioReferencia().add(t);
         t = new Tipologia();
 ,11 → 205,32
         ts.setTipologiasSumarios(new ArrayList<Tipologia>());
+        ts.setTipologiasMarcadas(new ArrayList<Tipologia>());
+        ts.setTipologiasUsadas(new ArrayList<Tipologia>());
+        Tipologia tUsada = new Tipologia();
+        tUsada.setCdTurma("TINF");
+        tUsada.setCdDocente("20128");
+        tUsada.setCdTipologia("T");
+        tUsada.setDsTipologia("Teorica");
+        ts.getTipologiasUsadas().add(tUsada);
+        Tipologia tMarcada = new Tipologia();
+        tMarcada.setCdTurma("TINF");
+        tMarcada.setCdDocente("20128");
+        tMarcada.setCdTipologia("T");
+        tMarcada.setDsTipologia("Teorica");
+        ts.getTipologiasMarcadas().add(tMarcada);
         Tipologia t = new Tipologia();
         t.setCdTurma("TINF");
         t.setCdDocente("20128");
         t.setCdTipologia("T");
         t.setOcorrencias(null);
+        t.setUse(false);//para confirmar que a marca
+        t.setMarkWarning(false);//para confirmar que a marca
+        Tipologia marcadaUsada = t;
         ts.getTipologiasHorarioReferencia().add(t);
         t = new Tipologia();
         t.setCdTurma("TINF");
 ,6 → 238,8
         t.setCdTipologia("PL");
         t.setOcorrencias(null);
         ts.getTipologiasHorarioReferencia().add(t);
+        t.setMarkWarning(true); //para verificar se as limpa
+        t.setUse(true); //para verificar se as limpa
         t = new Tipologia();
 ,6 → 253,9
         t.setCdDocente("20128");
         t.setCdTipologia("Sem");
         t.setOcorrencias(null);
+        t.setMarkWarning(true); //para verificar se as limpa
+        t.setUse(true); //para verificar se as limpa
         ts.getTipologiasExtraAdicionadas().add(t);
 ,12 → 267,18
         t.setCdDocente("20128");
         t.setCdTipologia("T");
         t.setOcorrencias(10);
+        t.setMarkWarning(true); //para verificar se as limpa
+        t.setUse(true); //para verificar se as limpa
         ts.getTipologiasSumarios().add(t);
         t = new Tipologia();
         t.setCdTurma("TINF");
         t.setCdDocente("20128");
         t.setCdTipologia("TP");
         t.setOcorrencias(20);
+        t.setMarkWarning(true); //para verificar se as limpa
+        t.setUse(true); //para verificar se as limpa
         ts.getTipologiasSumarios().add(t);
         boolean foundT = false;
 ,6 → 297,17
             for(Tipologia tipologia: merge)
             {
+                if(tipologia.equals(marcadaUsada))
+                {
+                    assertTrue(tipologia.isMarkWarning());
+                    assertTrue(tipologia.isUse());
+                }
+                else
+                {
+                    assertFalse(tipologia.isMarkWarning());
+                    assertFalse(tipologia.isUse());
+                }
                 if(tipologia.getCdTipologia().equals("T"))
                 {
                     assertTrue(tipologia.isHorRef());
 ,4 → 748,180
     }
+    public void testSerializeMerge()
+    {
+        Tipologias ts = new Tipologias();
+        ts.setTipologiasHorarioReferencia(new ArrayList<Tipologia>());
+        ts.setTipologiasExtraAdicionadas(new ArrayList<Tipologia>());
+        ts.setTipologiasSumarios(new ArrayList<Tipologia>());
+        ts.setTipologiasMarcadas(new ArrayList<Tipologia>());
+        ts.setTipologiasUsadas(new ArrayList<Tipologia>());
+        Tipologia tUsada = new Tipologia();
+        tUsada.setCdTurma("TINF");
+        tUsada.setCdDocente("20128");
+        tUsada.setCdTipologia("T");
+        tUsada.setDsTipologia("Teorica");
+        ts.getTipologiasUsadas().add(tUsada);
+        Tipologia tMarcada = new Tipologia();
+        tMarcada.setCdTurma("TINF");
+        tMarcada.setCdDocente("20128");
+        tMarcada.setCdTipologia("T");
+        tMarcada.setDsTipologia("Teorica");
+        ts.getTipologiasMarcadas().add(tMarcada);
+        Tipologia t = new Tipologia();
+        t.setCdTurma("TINF");
+        t.setCdDocente("20128");
+        t.setCdTipologia("T");
+        t.setOcorrencias(null);
+        t.setUse(false);//para confirmar que a marca
+        t.setMarkWarning(false);//para confirmar que a marca
+        Tipologia marcadaUsada = t;
+        ts.getTipologiasHorarioReferencia().add(t);
+        t = new Tipologia();
+        t.setCdTurma("TINF");
+        t.setCdDocente("20128");
+        t.setCdTipologia("PL");
+        t.setOcorrencias(null);
+        ts.getTipologiasHorarioReferencia().add(t);
+        t.setMarkWarning(true); //para verificar se as limpa
+        t.setUse(true); //para verificar se as limpa
+        t = new Tipologia();
+        t.setCdTurma("TINF2");
+        t.setCdDocente("20128");
+        t.setCdTipologia("OT");
+        t.setOcorrencias(null);
+        ts.getTipologiasExtraAdicionadas().add(t);
+        t = new Tipologia();
+        t.setCdTurma("TINF2");
+        t.setCdDocente("20128");
+        t.setCdTipologia("Sem");
+        t.setOcorrencias(null);
+        t.setMarkWarning(true); //para verificar se as limpa
+        t.setUse(true); //para verificar se as limpa
+        ts.getTipologiasExtraAdicionadas().add(t);
+        t = new Tipologia();
+        t.setCdTurma("TINF");
+        t.setCdDocente("20128");
+        t.setCdTipologia("T");
+        t.setOcorrencias(10);
+        t.setMarkWarning(true); //para verificar se as limpa
+        t.setUse(true); //para verificar se as limpa
+        ts.getTipologiasSumarios().add(t);
+        t = new Tipologia();
+        t.setCdTurma("TINF");
+        t.setCdDocente("20128");
+        t.setCdTipologia("TP");
+        t.setOcorrencias(20);
+        t.setMarkWarning(true); //para verificar se as limpa
+        t.setUse(true); //para verificar se as limpa
+        ts.getTipologiasSumarios().add(t);
+        boolean foundT = false;
+        boolean foundPL = false;
+        boolean foundOT = false;
+        boolean foundSem = false;
+        boolean foundTP = false;
+        String serial = null;
+        try {
+            serial = ts.serialize();
+            Tipologias tsTeste = Tipologias.deserialize(serial);
+            ArrayList<Tipologia> mergeBefore = tsTeste.obtainMergeTipologias();
+            String serialMerge = Tipologias.serializeMergedList(mergeBefore);
+            ArrayList<Tipologia> merge = Tipologias.deserializeMergedTipologias(serialMerge);
+            assertTrue(merge.size() == 5);
+            for(Tipologia tipologia: merge)
+            {
+                if(tipologia.equals(marcadaUsada))
+                {
+                    assertTrue(tipologia.isMarkWarning());
+                    assertTrue(tipologia.isUse());
+                }
+                else
+                {
+                    assertFalse(tipologia.isMarkWarning());
+                    assertFalse(tipologia.isUse());
+                }
+                if(tipologia.getCdTipologia().equals("T"))
+                {
+                    assertTrue(tipologia.isHorRef());
+                    assertTrue(tipologia.isSumario());
+                    assertFalse(tipologia.isExtra());
+                    assertTrue(tipologia.getOcorrencias() == 10);
+                    foundT = true;
+                }
+                if(tipologia.getCdTipologia().equals("PL"))
+                {
+                    assertTrue(tipologia.isHorRef());
+                    assertFalse(tipologia.isSumario());
+                    assertFalse(tipologia.isExtra());
+                    assertTrue(tipologia.getOcorrencias() == null || tipologia.getOcorrencias() == 0);
+                    foundPL = true;
+                }
+                if(tipologia.getCdTipologia().equals("OT"))
+                {
+                    assertFalse(tipologia.isHorRef());
+                    assertFalse(tipologia.isSumario());
+                    assertTrue(tipologia.isExtra());
+                    assertTrue(tipologia.getOcorrencias() == null || tipologia.getOcorrencias() == 0);
+                    foundOT = true;
+                }
+                if(tipologia.getCdTipologia().equals("Sem"))
+                {
+                    assertFalse(tipologia.isHorRef());
+                    assertFalse(tipologia.isSumario());
+                    assertTrue(tipologia.isExtra());
+                    assertTrue(tipologia.getOcorrencias() == null || tipologia.getOcorrencias() == 0);
+                    foundSem = true;
+                }
+                if(tipologia.getCdTipologia().equals("TP"))
+                {
+                    assertFalse(tipologia.isHorRef());
+                    assertTrue(tipologia.isSumario());
+                    assertFalse(tipologia.isExtra());
+                    assertTrue(tipologia.getOcorrencias() == 20);
+                    foundTP = true;
+                }
+            }
+            assertTrue(foundT);
+            assertTrue(foundPL);
+            assertTrue(foundOT);
+            assertTrue(foundSem);
+            assertTrue(foundTP);
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (TransformationException e) {
+            e.printStackTrace();
+        }
+    }
 }

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/PageContentImpl.java
 ,6 → 6,7
 import org.json.JSONArray;
 import org.json.JSONException;
 import pt.estgp.estgweb.services.pageContent.PageContentAccessPolicyAcl;
+import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 import java.io.IOException;
 import java.util.ArrayList;
 ,8 → 403,13
         return true;
     }
+    @Override
+    public void initClearances(UserSessionImpl u, boolean force) {
+        throw new NotImplementedException();
+    }
     public void setUserSessionClearences(Map<Acl.Operation, Boolean> userSessionClearences) {
         this.userSessionClearences = userSessionClearences;
     }

 /branches/v3/impl/src/java/pt/estgp/estgweb/filters/filters/QuestionarioClearancesFilter.java
 New file
 ,0 → 1,44
+package pt.estgp.estgweb.filters.filters;
+import org.apache.log4j.Logger;
+import pt.estgp.estgweb.Globals;
+import pt.estgp.estgweb.domain.QuestionarioImpl;
+import pt.estgp.estgweb.domain.UserSessionImpl;
+import pt.estgp.estgweb.domain.dao.DaoFactory;
+import pt.estgp.estgweb.filters.chains.LoadControlFilter;
+import pt.estgp.estgweb.utils.ReflectionBean;
+import pt.utl.ist.berserk.ServiceRequest;
+import pt.utl.ist.berserk.ServiceResponse;
+import pt.utl.ist.berserk.logic.filterManager.FilterParameters;
+import pt.utl.ist.berserk.logic.filterManager.exceptions.FilterException;
+/**
+ * @author Jorge Machado
+ * @date 4/Jun/2008
+ * @see pt.estgp.estgweb.filters.filters
+ */
+public class QuestionarioClearancesFilter extends LoadControlFilter
+{
+    private static final Logger logger = Logger.getLogger(QuestionarioClearancesFilter.class);
+    public static final String QUESTIONARIO_CLEARED_SERV_PARAM = "QUESTIONARIO_CLEARED_SERV_PARAM";
+    public void execute(ServiceRequest request, ServiceResponse response, FilterParameters filterParameters) throws FilterException, Exception
+    {
+        UserSessionImpl usession = (UserSessionImpl) request.getServiceParameters().getParameter(Globals.USER_SESSION_KEY);
+        Long id = (Long) ReflectionBean.lookup(request.getServiceParameters(), (String) filterParameters.parametersArray()[0]);
+        if(id <= 0)
+        {
+            //novo Questionario permissao a cargo do serviço de invocação do save
+            logger.warn("Nao era suposto estar aqui, estamos perante um questionario novo, returning");
+            return;
+        }
+        QuestionarioImpl q = (QuestionarioImpl) DaoFactory.getQuestionarioDaoImpl().get(id);
+        q.initClearances(usession,true);
+        request.getServiceParameters().addParameter(QUESTIONARIO_CLEARED_SERV_PARAM,q);
+    }
+}
 Property changes:
 Added: svn:executable
 + *

 /branches/v3/impl/src/java/pt/estgp/estgweb/filters/filters/CourseUnitEvaluationClearancesFilter.java
 ,19 → 3,14
 import org.apache.log4j.Logger;
 import pt.estgp.estgweb.Globals;
 import pt.estgp.estgweb.domain.CourseUnitImpl;
-import pt.estgp.estgweb.domain.CourseUnitImpl.CourseUnitClearancesOperation;
-import pt.estgp.estgweb.domain.Teacher;
 import pt.estgp.estgweb.domain.UserSessionImpl;
 import pt.estgp.estgweb.domain.dao.DaoFactory;
-import pt.estgp.estgweb.domain.utils.SimpleClearanceRuledSupport;
 import pt.estgp.estgweb.filters.chains.LoadControlFilter;
 import pt.utl.ist.berserk.ServiceRequest;
 import pt.utl.ist.berserk.ServiceResponse;
 import pt.utl.ist.berserk.logic.filterManager.FilterParameters;
 import pt.utl.ist.berserk.logic.filterManager.exceptions.FilterException;
-import java.util.List;
 /**
  * @author Jorge Machado
  * @date 4/Jun/2008
 ,101 → 28,8
         Long unitId = (Long) request.getServiceParameters().getParameter((String) filterParameters.parametersArray()[0]);
         CourseUnitImpl c = (CourseUnitImpl) DaoFactory.getCourseUnitDaoImpl().get(unitId);
-        String activeYear = DaoFactory.getConfigurationDaoImpl().getCourseUnitEvaluationActiveYear();
-        List<String> activeDegrees = DaoFactory.getConfigurationDaoImpl().getCourseUnitEvaluationActiveDegrees();
-        List<Long> activeCourseIds = DaoFactory.getConfigurationDaoImpl().getCourseUnitEvaluationActiveCourseIds();
+        c.initClearances(usession,true);
-        boolean isActiveYear = activeYear != null && c.getImportYear().equals(activeYear);
-        boolean isActiveDegree = activeDegrees!=null && activeDegrees.contains(c.getCourse().getDegree());
-        boolean isActiveCourseId = activeCourseIds!=null && activeCourseIds.contains(c.getCourse().getId());
-        boolean activePeriod = (isActiveYear && (isActiveCourseId || isActiveDegree));
-        boolean active = activePeriod || c.isEvaluationOpenByAdmin();
-        boolean isComplete = c.getCourseUnitEvaluation() != null && c.getCourseUnitEvaluation().isTeacherComplete() && !c.getCourseUnitEvaluation().isClosed();
-        boolean isClosed = c.getCourseUnitEvaluation() != null && c.getCourseUnitEvaluation().isClosed();
-        boolean isEdit = !isClosed && !isComplete;
-        SimpleClearanceRuledSupport s = new SimpleClearanceRuledSupport();
-        s.setDirty();
-        if(isEdit)
-            s.addClearance(CourseUnitClearancesOperation.EVALUATION_INFO_STATE_EDIT.name(),usession);
-        else if(isComplete)
-            s.addClearance(CourseUnitClearancesOperation.EVALUATION_INFO_STATE_COMPLETE.name(),usession);
-        else if(isClosed)
-            s.addClearance(CourseUnitClearancesOperation.EVALUATION_INFO_STATE_CLOSED.name(),usession);
-        if(activePeriod)
-        {
-            s.addClearance(CourseUnitClearancesOperation.EVALUATION_INFO_ACTIVE.name(),usession);
-            s.addClearance(CourseUnitClearancesOperation.EVALUATION_INFO_ACTIVE_REGULAR_PERIOD.name(),usession);
-        }
-        if(c.isEvaluationOpenByAdmin())
-        {
-            s.addClearance(CourseUnitClearancesOperation.EVALUATION_INFO_ACTIVE.name(),usession);
-            s.addClearance(CourseUnitClearancesOperation.EVALUATION_INFO_ACTIVE_SPECIAL_ADMIN.name(),usession);
-        }
-        if(usession.getUser() != null && usession.getUser().isSuperuserOrAdmin()
-                || usession.getUser().hasRole(Globals.SERVICES_PROGRAMS_ROLE))
-        {
-            s.addClearance(CourseUnitClearancesOperation.EVALUATION_ALL.name(),usession);
-        }
-        if(usession.getUser() != null && usession.getUser() instanceof Teacher)
-        {
-            boolean teacher = ((Teacher)(usession.getUser())).isTeacherOfCourseUnit(c.getId(),true);
-            boolean responsable = c.getResponsableTeacher()!=null && usession.getUser().getId() == c.getResponsableTeacher().getId();
-            if(teacher)
-                s.addClearance(CourseUnitClearancesOperation.EVALUATION_INFO_USER_TEACHER.name(), usession);
-            if(responsable)
-                s.addClearance(CourseUnitClearancesOperation.EVALUATION_INFO_USER_RESP_TEACHER.name(), usession);
-            if(teacher || responsable)
-            {
-                //s.addClearance(CourseUnitClearancesOperation.EVALUATION_INFO_USER_TEACHER.name(), usession);
-                s.addClearance(CourseUnitClearancesOperation.EVALUATION_EDITION.name(),usession);
-                if(active && isEdit)
-                {
-                    s.addClearance(CourseUnitClearancesOperation.EVALUATION_EDITSAVE.name(),usession);
-                    s.addClearance(CourseUnitClearancesOperation.EVALUATION_PERSIST_TEACHER_PART.name(),usession);
-                    s.addClearance(CourseUnitClearancesOperation.EVALUATION_TRANSITATE_TO_COMPLETE.name(),usession);
-                }
-            }
-        }
-        if(usession.getUser() != null && usession.getUser() instanceof Teacher
-                && (((usession.getUser())).hasRole(c.getCourse().getValidationRole())
-                ||
-                ((usession.getUser()) == c.getCourse().getCoordinator()))
-                )
-        {
-            s.addClearance(CourseUnitClearancesOperation.EVALUATION_INFO_USER_COMMISSION.name(), usession);
-            s.addClearance(CourseUnitClearancesOperation.EVALUATION_EDITION.name(), usession);
-            if(active && isEdit)
-            {
-                s.addClearance(CourseUnitClearancesOperation.EVALUATION_EDITSAVE.name(),usession);
-                s.addClearance(CourseUnitClearancesOperation.EVALUATION_PERSIST_TEACHER_PART.name(),usession);
-                s.addClearance(CourseUnitClearancesOperation.EVALUATION_PERSIST_COMISSION_PART.name(),usession);
-                s.addClearance(CourseUnitClearancesOperation.EVALUATION_TRANSITATE_TO_COMPLETE.name(),usession);
-                s.addClearance(CourseUnitClearancesOperation.EVALUATION_TRANSITATE_TO_CLOSE.name(),usession);
-            }
-            else if(active && isComplete)
-            {
-                s.addClearance(CourseUnitClearancesOperation.EVALUATION_EDITSAVE.name(),usession);
-                s.addClearance(CourseUnitClearancesOperation.EVALUATION_PERSIST_TEACHER_PART.name(),usession);
-                s.addClearance(CourseUnitClearancesOperation.EVALUATION_PERSIST_COMISSION_PART.name(),usession);
-                s.addClearance(CourseUnitClearancesOperation.EVALUATION_TRANSITATE_TO_CLOSE.name(),usession);
-                s.addClearance(CourseUnitClearancesOperation.EVALUATION_TRANSITATE_TO_EDIT.name(),usession);
-            }
-            else if(active && isClosed)
-            {
-                s.addClearance(CourseUnitClearancesOperation.EVALUATION_TRANSITATE_TO_EDIT.name(),usession);
-            }
-        }
-        c.setClearanceRuledSupport(s);
         request.getServiceParameters().addParameter(COURSEUNIT_EVALUATION_CLEARED_SERV_PARAM,c);
     }
 }

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/tags/InitClearancesTag.java
 New file
 ,0 → 1,54
+package pt.estgp.estgweb.web.tags;
+import org.apache.log4j.Logger;
+import org.apache.struts.util.RequestUtils;
+import pt.estgp.estgweb.domain.ClearanceRuled;
+import pt.estgp.estgweb.domain.UserSessionImpl;
+import pt.estgp.estgweb.web.UserSessionProxy;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
+public class InitClearancesTag extends TagSupport
+{
+    private static final Logger logger = Logger.getLogger(InitClearancesTag.class);
+    private String name;
+    private String property;
+    private boolean force;
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getProperty() {
+        return property;
+    }
+    public void setProperty(String property) {
+        this.property = property;
+    }
+    public boolean isForce() {
+        return force;
+    }
+    public void setForce(boolean force) {
+        this.force = force;
+    }
+    public int doStartTag() throws JspException
+    {
+        UserSessionImpl userSession = (UserSessionImpl) UserSessionProxy.loadUserSessionFromRequest((HttpServletRequest) pageContext.getRequest());
+        ClearanceRuled clearanceRuled = (ClearanceRuled) RequestUtils.lookup(pageContext, name, property, null);
+        clearanceRuled.initClearances(userSession,force);
+        return (EVAL_BODY_INCLUDE);
+    }
+}
 Property changes:
 Added: svn:executable
 + *

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/utils/RequestUtils.java
 ,6 → 2,7
 import org.apache.log4j.Logger;
 import pt.estgp.estgweb.Globals;
+import pt.estgp.estgweb.domain.UserSessionImpl;
 import pt.estgp.estgweb.web.UserSessionProxy;
 import pt.estgp.estgweb.web.exceptions.NoCookiesException;
 ,6 → 62,12
         return "unkown";
     }
+    public static String getRequester(UserSessionImpl userSession) throws NoCookiesException
+    {
+        //Dependencia com o filtro UserSession
+        return (String) userSession.getSerializable();
+    }
     public static boolean existRequester(HttpServletRequest request, HttpServletResponse response) throws NoCookiesException
     {
   /*    if (request.getCookies() == null || request.getCookies().length == 0)

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/form/questionarios/QuestionarioForm.java
 ,6 → 74,15
             addMessageWithKeys(errors,request,"errors.required","courseunit.semestre");
         }*/
+        if(getQuestionario().getQuestionarioHistoryDrive().getId() <= 0)
+        {
+            addMessageWithKeys(errors,request,"errors.required","questionario.historydrive");
+        }
+        if(getQuestionario().getiAnswersProcessor() == null || getQuestionario().getiAnswersProcessor().trim()
+                .length() == 0)
+        {
+            addMessageWithKeys(errors,request,"errors.required","questionario.answerprocessor");
+        }
         try {
             for(int i = 1; i <= 30; i++)
             {
 ,5 → 107,18
         return errors;
     }
+    public ActionErrors validateYearSemestre(ActionMapping mapping, HttpServletRequest request) {
+        ActionErrors errors = new ActionErrors();
+        if(getQuestionario().getYear() == null || getQuestionario().getYear().trim().length() == 0)
+        {
+            addMessageWithKeys(errors,request,"errors.required","course.importYear");
+        }
+        if(getQuestionario().getSemestre() == null || getQuestionario().getSemestre().trim().length() == 0)
+        {
+            addMessageWithKeys(errors,request,"errors.required","courseunit.semestre");
+        }
+        return errors;
+    }
 }

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/questionarios/QuestionarioYearSemestreController.java
 New file
 ,0 → 1,55
+package pt.estgp.estgweb.web.controllers.questionarios;
+import org.apache.struts.action.*;
+import pt.estgp.estgweb.domain.QuestionarioImpl;
+import pt.estgp.estgweb.web.form.questionarios.QuestionarioForm;
+import pt.estgp.estgweb.web.utils.RequestUtils;
+import pt.utl.ist.berserk.logic.serviceManager.IServiceManager;
+import pt.utl.ist.berserk.logic.serviceManager.ServiceManager;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+/**
+ * Created by jorgemachado on 21/03/16.
+ */
+public class QuestionarioYearSemestreController extends QuestionarioController
+{
+    public ActionForward setYearSemestre(ActionMapping mapping,
+                                        ActionForm form,
+                                        HttpServletRequest request,
+                                        HttpServletResponse response)
+            throws Throwable
+    {
+        QuestionarioForm frm = (QuestionarioForm) form;
+        ActionMessages errors = frm.validateYearSemestre(mapping,request);
+        if(!errors.isEmpty())
+        {
+            saveErrors(request,errors);
+            return mapping.findForward("admin");
+        }
+        IServiceManager sm = ServiceManager.getInstance();
+        String[] names = {"year","semestre","questionarioId"};
+        Object[] args = {frm.getQuestionario().getYear(),frm.getQuestionario().getSemestre(), frm.getQuestionario().getId()};
+        List<QuestionarioImpl> yearSemestreHistory = (List<QuestionarioImpl>) sm.execute(RequestUtils.getRequester(request, response),"setAnoSemestre",args,names);
+        request.setAttribute("SimilarQuestionariosFound",yearSemestreHistory);
+        for(QuestionarioImpl q: yearSemestreHistory)
+        {
+            if(q.getId() != frm.getQuestionario().getId())
+            {
+                addError(request, "warn.questionario.repeated.in.time", "" + q.getId());
+            }
+            else
+            {
+                addMessage(request,"questionario.year.semestre.ok");
+                //Colocando o questionario em tratamento atualizado no form
+                frm.setQuestionario(q);
+            }
+        }
+        return mapping.findForward("admin");
+    }
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/questionarios/QuestionarioController.java
 ,18 → 1,19
 package pt.estgp.estgweb.web.controllers.questionarios;
-import jomm.dao.impl.AbstractDao;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import pt.estgp.estgweb.domain.DomainObjectFactory;
-import pt.estgp.estgweb.domain.Questionario;
-import pt.estgp.estgweb.domain.QuestionarioHistoryDrive;
 import pt.estgp.estgweb.domain.QuestionarioImpl;
-import pt.estgp.estgweb.domain.dao.DaoFactory;
-import pt.estgp.estgweb.domain.views.QuestionarioView;
+import pt.estgp.estgweb.domain.UserSessionImpl;
+import pt.estgp.estgweb.domain.utils.SimpleClearanceRuledSupport;
+import pt.estgp.estgweb.web.UserSessionProxy;
 import pt.estgp.estgweb.web.controllers.ApplicationDispatchController;
 import pt.estgp.estgweb.web.form.questionarios.QuestionarioForm;
+import pt.estgp.estgweb.web.utils.RequestUtils;
+import pt.utl.ist.berserk.logic.serviceManager.IServiceManager;
+import pt.utl.ist.berserk.logic.serviceManager.ServiceManager;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 ,42 → 30,36
     private static final Logger logger = Logger.getLogger(QuestionarioController.class);
+    public ActionForward startNew(ActionMapping mapping,
+                              ActionForm form,
+                              HttpServletRequest request,
+                              HttpServletResponse response)
+            throws Throwable
+    {
+        QuestionarioForm frm = (QuestionarioForm) form;
+        frm.getQuestionario().setClearanceRuledSupport(new SimpleClearanceRuledSupport());
+        frm.getQuestionario().getClearanceRuledSupport().addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SAVE_FORM.name(), (UserSessionImpl) UserSessionProxy.loadUserSessionFromRequest(request));
+        frm.getQuestionario().getClearanceRuledSupport().addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SAVE_ANSWER_PROCESSOR.name(), (UserSessionImpl) UserSessionProxy.loadUserSessionFromRequest(request));
+        return mapping.findForward("newEdit");
+    }
     public ActionForward save(ActionMapping mapping,
                                      ActionForm form,
                                      HttpServletRequest request,
                                      HttpServletResponse response)
-            throws ServletException
+            throws Throwable
     {
         QuestionarioForm frm = (QuestionarioForm) form;
-        AbstractDao.getCurrentSession().beginTransaction();
+        IServiceManager sm = ServiceManager.getInstance();
+        String[] names = {"questionario"};
+        Object[] args = {frm.getQuestionario()};
-        if(frm.getQuestionario().getQuestionarioHistoryDrive().getId() > 0)
-        {
-            QuestionarioHistoryDrive hist = DaoFactory.getQuestionarioHistoryDriveDaoImpl().load(frm.getQuestionario().getQuestionarioHistoryDrive().getId());
-            frm.getQuestionario().setQuestionarioHistoryDrive(hist);
-        }
-        else
-        {
-            frm.getQuestionario().setQuestionarioHistoryDrive(null);
-        }
+        String service = frm.getQuestionario().getId() <= 0 ? "NewQuestionarioForm": "saveQuestionarioForm";
+        QuestionarioImpl affected = (QuestionarioImpl) sm.execute(RequestUtils.getRequester(request, response),service,args,names);
+        frm.setQuestionario(affected);
-        if(frm.getQuestionario().getId() <= 0)
-        {
-            DaoFactory.getQuestionarioDaoImpl().save(frm.getQuestionario());
-        }
-        else
-        {
-            Questionario qPersistent = DaoFactory.getQuestionarioDaoImpl().load(frm.getQuestionario().getId());
-            QuestionarioView qv = new QuestionarioView(frm.getQuestionario());
-            qv.persistViewInObjectForm(qPersistent);
-            qPersistent.setQuestionarioHistoryDrive(frm.getQuestionario().getQuestionarioHistoryDrive());
-        }
-        AbstractDao.getCurrentSession().getTransaction().commit();
         return mapping.findForward("list");
     }
 ,19 → 79,18
                                  ActionForm form,
                                  HttpServletRequest request,
                                  HttpServletResponse response)
-            throws ServletException
+            throws Throwable
     {
         QuestionarioForm frm = (QuestionarioForm) form;
-        AbstractDao.getCurrentSession().beginTransaction();
-        QuestionarioImpl q = (QuestionarioImpl) DaoFactory.getQuestionarioDaoImpl().get(frm.getQuestionario().getId());
+        IServiceManager sm = ServiceManager.getInstance();
+        String[] names = {"questionarioId"};
+        Object[] args = {frm.getQuestionario().getId()};
+        QuestionarioImpl q = (QuestionarioImpl) sm.execute(RequestUtils.getRequester(request, response),"loadQuestionarioAdmin",args,names);
         frm.setQuestionario(q);
-        if(q.getQuestionarioHistoryDrive() != null)
-        {
-            q.getQuestionarioHistoryDrive().getId(); //to load from Dao
-        }
-        AbstractDao.getCurrentSession().getTransaction().commit();
         if(q.getQuestionarioHistoryDrive() == null)
         {
 ,12 → 104,40
                                  ActionForm form,
                                  HttpServletRequest request,
                                  HttpServletResponse response)
-            throws ServletException
+            throws Throwable
     {
+        QuestionarioForm frm = (QuestionarioForm) form;
+        IServiceManager sm = ServiceManager.getInstance();
+        String[] names = {"questionarioId"};
+        Object[] args = {frm.getQuestionario().getId()};
+        QuestionarioImpl affected = (QuestionarioImpl) sm.execute(RequestUtils.getRequester(request, response),"SetQuestionarioAssignDetailsState",args,names);
+        frm.setQuestionario(affected);
+        return mapping.findForward("admin");
+    }
+    public ActionForward deleteQuestionario(ActionMapping mapping,
+                                        ActionForm form,
+                                        HttpServletRequest request,
+                                        HttpServletResponse response)
+            throws Throwable
+    {
         QuestionarioForm frm = (QuestionarioForm) form;
-        frm.setShowQuestionarioForm(true);
-        return mapping.findForward("newEdit");
+        IServiceManager sm = ServiceManager.getInstance();
+        String[] names = {"questionarioId"};
+        Object[] args = {frm.getQuestionario().getId()};
+        QuestionarioImpl affected = (QuestionarioImpl) sm.execute(RequestUtils.getRequester(request, response),"DeleteQuestionario",args,names);
+        frm.setQuestionario(affected);
+        return mapping.findForward("list");
     }

/branches/v3/impl/src/doc/estgweb.eap
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

 /branches/v3/impl/src/hbm/pt/estgp/estgweb/domain/OlapQuestionarios.hbm.xml
 ,117 → 13,126
         <property name="descricao" type="string"/>
     </class>
-    <class name="pt.estgp.estgweb.domain.OlapEntityQuestionarioPerguntaGrupo" table="olap_e_quest_pgrp">
+    <class name="pt.estgp.estgweb.domain.OlapEntityQuestionarioInstituicao" table="olap_e_quest_inst">
         <id name="id" type="long" unsaved-value="0">
             <generator class="native"/>
         </id>
+        <property name="codigo" type="long"/>
         <property name="nome" type="string"/>
     </class>
-    <class name="pt.estgp.estgweb.domain.OlapEntityQuestionarioAnswered" table="olap_e_quest_answer">
-        <id name="id" type="long" unsaved-value="0">
-            <generator class="native"/>
-        </id>
-        <property name="answered" type="boolean"/>
-    </class>
-    <class name="pt.estgp.estgweb.domain.OlapEntityQuestionarioAnswer" table="olap_e_quest_pgrp">
-        <id name="id" type="long" unsaved-value="0">
-            <generator class="native"/>
-        </id>
-        <property name="answerStr" type="string" index="answerStrIndex"/>
-        <property name="answerInt" type="integer" index="answerIntIndex"/>
-    </class>
     <class name="pt.estgp.estgweb.domain.OlapEntityQuestionarioAno" table="olap_e_quest_ano">
         <id name="id" type="long" unsaved-value="0">
             <generator class="native"/>
         </id>
-        <property name="ano" type="string"/>
+        <property name="ano" type="string" index="anoIndex"/>
     </class>
     <class name="pt.estgp.estgweb.domain.OlapEntityQuestionarioPeriodo" table="olap_e_quest_periodo">
         <id name="id" type="long" unsaved-value="0">
             <generator class="native"/>
         </id>
-        <property name="semestre" type="string"/>
+        <property name="semestre" type="string" index="semestreIndex"/>
     </class>
     <class name="pt.estgp.estgweb.domain.OlapEntityQuestionarioCursoDegree" table="olap_e_quest_curso_degree">
         <id name="id" type="long" unsaved-value="0">
             <generator class="native"/>
         </id>
-        <property name="degree" type="string"/>
+        <property name="degree" type="string" index="degreeIndex"/>
     </class>
     <class name="pt.estgp.estgweb.domain.OlapEntityQuestionarioCurso" table="olap_e_quest_curso">
         <id name="id" type="long" unsaved-value="0">
             <generator class="native"/>
         </id>
-        <property name="codigo" type="long"/>
+        <property name="codigo" type="long" index="codigoIndex"/>
         <property name="nome" type="string"/>
     </class>
     <class name="pt.estgp.estgweb.domain.OlapEntityQuestionarioUnidade" table="olap_e_quest_unit">
         <id name="id" type="long" unsaved-value="0">
             <generator class="native"/>
         </id>
-        <property name="codigo" type="long"/>
+        <property name="codigo" type="long" index="codigoIndex"/>
         <property name="nome" type="string"/>
     </class>
-    <class name="pt.estgp.estgweb.domain.OlapEntityQuestionarioInstituicao" table="olap_e_quest_inst">
-        <id name="id" type="long" unsaved-value="0">
-            <generator class="native"/>
-        </id>
-        <property name="codigo" type="long"/>
-        <property name="nome" type="string"/>
-    </class>
     <class name="pt.estgp.estgweb.domain.OlapEntityQuestionarioTurma" table="olap_e_quest_turma">
         <id name="id" type="long" unsaved-value="0">
             <generator class="native"/>
         </id>
-        <property name="codigo" type="string"/>
+        <property name="codigo" type="string" index="codigoIndex"/>
     </class>
     <class name="pt.estgp.estgweb.domain.OlapEntityQuestionarioDocente" table="olap_e_quest_docente">
         <id name="id" type="long" unsaved-value="0">
             <generator class="native"/>
         </id>
-        <property name="codigo" type="string"/>
+        <property name="codigo" type="long" index="codigoIndex"/>
         <property name="nome" type="string"/>
         <property name="bi" type="string"/>
         <property name="username" type="string"/>
+        <property name="email" type="string"/>
     </class>
     <class name="pt.estgp.estgweb.domain.OlapEntityQuestionarioTipologia" table="olap_e_quest_tipologia">
         <id name="id" type="long" unsaved-value="0">
             <generator class="native"/>
         </id>
-        <property name="codigo" type="string"/>
-        <property name="nome" type="string"/>
+        <property name="codigo" type="string" index="codigoIndex"/>
+        <property name="descricao" type="string"/>
     </class>
     <class name="pt.estgp.estgweb.domain.OlapStarQuestionario" table="olap_star_quest">
         <id name="id" type="long" unsaved-value="0">
             <generator class="native"/>
         </id>
-        <property name="pergunta" type="string"/>
-        <property name="resposta" type="int"/>
+        <property name="respondido" type="boolean" index="respondidoIndex"/>
+        <property name="dataInicio" type="timestamp"/>
+        <property name="dataFim" type="timestamp"/>
         <many-to-one name="tipologia" class="pt.estgp.estgweb.domain.OlapEntityQuestionarioTipologia" outer-join="false" lazy="proxy"/>
         <many-to-one name="docente" class="pt.estgp.estgweb.domain.OlapEntityQuestionarioDocente" outer-join="false" lazy="proxy"/>
         <many-to-one name="turma" class="pt.estgp.estgweb.domain.OlapEntityQuestionarioTurma" outer-join="false" lazy="proxy"/>
-        <many-to-one name="instituicao" class="pt.estgp.estgweb.domain.OlapEntityQuestionarioInstituicao" outer-join="false" lazy="proxy"/>
         <many-to-one name="unidade" class="pt.estgp.estgweb.domain.OlapEntityQuestionarioUnidade" outer-join="false" lazy="proxy"/>
         <many-to-one name="curso" class="pt.estgp.estgweb.domain.OlapEntityQuestionarioCurso" outer-join="false" lazy="proxy"/>
+        <many-to-one name="instituicao" class="pt.estgp.estgweb.domain.OlapEntityQuestionarioInstituicao" outer-join="false" lazy="proxy"/>
         <many-to-one name="cursoDegree" class="pt.estgp.estgweb.domain.OlapEntityQuestionarioCursoDegree" outer-join="false" lazy="proxy"/>
+        <many-to-one name="periodo" class="pt.estgp.estgweb.domain.OlapEntityQuestionarioPeriodo" outer-join="false" lazy="proxy"/>
         <many-to-one name="ano" class="pt.estgp.estgweb.domain.OlapEntityQuestionarioAno" outer-join="false" lazy="proxy"/>
-        <many-to-one name="periodo" class="pt.estgp.estgweb.domain.OlapEntityQuestionarioPeriodo" 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="perguntaAnswer" class="pt.estgp.estgweb.domain.OlapEntityQuestionarioAnswer" outer-join="false" lazy="proxy"/>
-        <!-- Um facto para o questionario respondido outro para o questionario nao respondido -->
-        <many-to-one name="perguntaAnswered" class="pt.estgp.estgweb.domain.OlapEntityQuestionarioAnswered" outer-join="false" lazy="proxy"/>
+        <!--Se quiser usar factos historicos preciso de uma dimensao onde estejam todas as respostas dos questionarios pedagogicos-->
+        <many-to-one name="timeLine" class="pt.estgp.estgweb.domain.OlapHistoryDimension" outer-join="false" lazy="proxy"/>
         <!--Assim e possivel Filtrar por questionario uso a dimensao questionario-->
         <many-to-one name="questionario" class="pt.estgp.estgweb.domain.Questionario" outer-join="false" lazy="proxy"/>
-        <!--Se quiser usar factos historicos preciso de uma dimensao onde estejam todas as respostas dos questionarios pedagogicos-->
-        <many-to-one name="timeLine" class="pt.estgp.estgweb.domain.OlapHistoryDimension" outer-join="false" lazy="proxy"/>
     </class>
+    <class name="pt.estgp.estgweb.domain.OlapStarQuestionarioAnswer" table="olap_star_quest_answer">
+        <id name="id" type="long" unsaved-value="0">
+            <generator class="native"/>
+        </id>
+        <property name="data" type="timestamp"/>
+        <property name="intResposta" type="int" index="intResponseIndex"/>
+        <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"/>
+    </class>
+    <class name="pt.estgp.estgweb.domain.OlapEntityQuestionarioPerguntaGrupo" table="olap_e_quest_pgrp">
+        <id name="id" type="long" unsaved-value="0">
+            <generator class="native"/>
+        </id>
+        <property name="nome" type="string"/>
+    </class>
+    <class name="pt.estgp.estgweb.domain.OlapEntityQuestionarioPergunta1_5" table="olap_e_quest_p1_5">
+        <id name="id" type="long" unsaved-value="0">
+            <generator class="native"/>
+        </id>
+        <property name="pergunta" type="string" index="perguntaIndex"/>
+    </class>
 </hibernate-mapping>

 /branches/v3/impl/src/web/admin/courses/courseComissions.jsp
 ,22 → 88,22
             <div class="panel-body">
                 <table class="tablesorter tablesorterfiltered">
                     <thead>
-                    <tr>
-                        <th>Codigo</th>
-                        <th>Tipo de Curso</th>
-                        <th>Curso</th>
-                        <baco:hasRole role="services,admin,all">
-                            <th>Activo</th>
-                            <th>Papel Comissão Curso</th>
-                            <th>Unidades <%=importYear%></th>
-                            <th>Unidades noutros anos</th>
-                        </baco:hasRole>
-                        <th>Comissão de Curso</th>
-                        <baco:hasRole role="services,admin,all">
-                            <th>Unidades</th>
-                            <th>Editar</th>
-                        </baco:hasRole>
-                    </tr>
+                        <tr>
+                            <th>Codigo</th>
+                            <th>Tipo de Curso</th>
+                            <th>Curso</th>
+                            <baco:hasRole role="services,admin,all">
+                                <th>Activo</th>
+                                <th>Papel Comissão Curso</th>
+                                <th>Unidades <%=importYear%></th>
+                                <th>Unidades noutros anos</th>
+                            </baco:hasRole>
+                            <th>Comissão de Curso</th>
+                            <baco:hasRole role="services,admin,all">
+                                <th>Unidades</th>
+                                <th>Editar</th>
+                            </baco:hasRole>
+                        </tr>
                     </thead>
                     <tbody>
                     <%

 /branches/v3/impl/src/web/admin/courseunits/courseUnitDeleteAdministration.jsp
 ,7 → 93,7
     <script>
         $(document).ready(function(){
             $('.deleteModal').on('show.bs.modal', function(e) {
-            $(this).find('.btn-ok').attr('href', $(e.relatedTarget).data('href'));
+                $(this).find('.btn-ok').attr('href', $(e.relatedTarget).data('href'));
             });
         });
     </script>

 /branches/v3/impl/src/web/admin/questionarios/questionarioStateASSIGNATION_DETAILS.jsp
 New file
 ,0 → 1,111
+<%@ page import="pt.estgp.estgweb.utils.DatesUtils" %>
+<%@ page import="java.util.List" %>
+<%@ 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" %>
+<%@ 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="Questionario" type="pt.estgp.estgweb.domain.QuestionarioImpl" scope="request"/>
+        <logic:empty name="Questionario" property="year">
+            <script>
+                $(document).ready(
+                        function(){
+                            $("#yearSemestreForm").show();
+                        }
+                );
+            </script>
+        </logic:empty>
+        <logic:notEmpty name="Questionario" property="year">
+            <div class="col-md-3 col-sm-3" id="yearSemestreInfo">
+                <div class="list-group">
+                    <div class="list-group-item">
+                        <bean:message key="survey.list.form.year"/>: ${Questionario.year}
+                    </div>
+                    <div class="list-group-item">
+                            Semestre: ${Questionario.semestre}
+                    </div>
+                </div>
+                <baco:clearOperation name="Questionario" op="QUESTIONARIO_SET_ANO_SEMESTRE">
+                    <button class="btn btn-default" type="button" onclick="$('#yearSemestreForm').show();$('#yearSemestreInfo').hide()">Modificar</button>
+                </baco:clearOperation>
+            </div>
+        </logic:notEmpty>
+        <baco:clearOperation name="Questionario" op="QUESTIONARIO_SET_ANO_SEMESTRE">
+            <div class="col-md-6" style="display: none" id="yearSemestreForm">
+                <div class="panel panel-default">
+                    <div class="panel-body">
+                        <html:form styleClass="form-horizontal" action="/admin/questionariosPaeYearSemestre">
+                            <%
+                                QuestionarioForm qFr = (QuestionarioForm) request.getAttribute("QuestionarioForm");
+                                if(qFr.getQuestionario().getId() <= 0)
+                                    qFr.setQuestionario(Questionario);
+                            %>
+                            <input type="hidden" name="dispatch" value="setYearSemestre"/>
+                            <html:hidden property="questionario.id"/>
+                            <div class="form-group">
+                                <label class="control-label col-sm-2" for="year"><bean:message key="survey.list.form.year"/></label>
+                                <div class="col-sm-10">
+                                    <%
+                                        List<String> years = DatesUtils.getImportYears(10);
+                                    %>
+                                    <html:select styleClass="form-control" styleId="year" property="questionario.year">
+                                        <html:option value="">Escolha Ano</html:option>
+                                        <%
+                                            for(String year:years)
+                                            {
+                                                request.setAttribute("year",year);
+                                        %>
+                                        <html:option value="${year}">${year}</html:option>
+                                        <%
+                                            }
+                                        %>
+                                    </html:select>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="control-label col-sm-2" for="semestre">Semestre:</label>
+                                <div class="col-sm-10">
+                                    <html:select styleClass="form-control" styleId="semestre" property="questionario.semestre">
+                                        <html:option value="">Escolha semestre</html:option>
+                                        <html:option value="A">Anual</html:option>
+                                        <html:option value="S1">Semestre 1</html:option>
+                                        <html:option value="S2">Semestre 2</html:option>
+                                        <html:option value="T1">Trimestre 1</html:option>
+                                        <html:option value="T2">Trimestre 2</html:option>
+                                        <html:option value="T3">Trimestre 3</html:option>
+                                        <html:option value="T4">Trimestre 4</html:option>
+                                    </html:select>
+                                </div>
+                            </div>
+                            <button class="btn btn-default" type="button" onclick="this.form.action = this.form.action + '#NOWTASK';this.form.submit();"><bean:message key="confirm"/></button>
+                        </html:form>
+                    </div>
+                </div>
+            </div>
+        </baco:clearOperation>
+        <logic:notEmpty name="Questionario" property="year">
+            <logic:notEmpty name="Questionario" property="semestre">
+                <div class="col-md-3 col-sm-3">
+                    <html:link styleClass="btn btn-warning" action="/admin/questionarioPedagogicoStartChooseCourses?questionarioId=${Questionario.id}">
+                        Iniciar selecção de Cursos
+                    </html:link>
+                </div>
+            </logic:notEmpty>
+        </logic:notEmpty>

 /branches/v3/impl/src/web/admin/questionarios/questionarioAdmin.jsp
 ,24 → 1,26
-<%@ taglib prefix="bean" uri="http://jakarta.apache.org/struts/tags-nested" %>
 <%@ page import="jomm.dao.impl.AbstractDao" %>
-<%@ page import="pt.estgp.estgweb.domain.QuestionarioHistoryDrive" %>
 <%@ page import="pt.estgp.estgweb.domain.QuestionarioImpl" %>
 <%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
-<%@ page import="pt.estgp.estgweb.utils.DatesUtils" %>
-<%@ page import="java.util.List" %>
-<%@ page import="pt.estgp.estgweb.domain.Questionario" %>
+<%@ page import="pt.utl.ist.berserk.logic.serviceManager.IServiceManager" %>
+<%@ page import="pt.utl.ist.berserk.logic.serviceManager.ServiceManager" %>
+<%@ page import="pt.estgp.estgweb.web.utils.RequestUtils" %>
+<%@ 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="text/html;charset=UTF-8" language="java" %>
 <%
     long questionarioId = Long.parseLong(request.getParameter("questionario.id"));
-    AbstractDao.getCurrentSession().beginTransaction();
-    QuestionarioImpl questionario = (QuestionarioImpl) DaoFactory.getQuestionarioDaoImpl().get(questionarioId);
-    request.setAttribute("Questionario",questionario);
-    List<QuestionarioHistoryDrive> historyDrives = DaoFactory.getQuestionarioHistoryDriveDaoImpl().getHistoryDrivesList();
-    request.setAttribute("historyDrives",historyDrives);
-    AbstractDao.getCurrentSession().getTransaction().commit();
+    IServiceManager sm = ServiceManager.getInstance();
+    String[] names = {"questionarioId"};
+    Object[] args = {questionarioId};
+    QuestionarioImpl questionario = (QuestionarioImpl) sm.execute(RequestUtils.getRequester(request, response),"loadQuestionarioAdmin",args,names);
+    request.setAttribute("Questionario", questionario);
 %>
 <div class="container-fluid">
     <div class="panel panel-default">
 ,6 → 31,8
         <div class="panel-body" id="diagrama" style="display: none">
+            <html:errors/>
+            <jomm:messages/>
             <div  class="panel panel-default">
                 <div class="panel-body">
                     <div class="row-centered">
 ,17 → 54,20
             </div>
         </div>
         <div class="panel-body">
-            <p><strong>Descrição:</strong> ${Questionario.description}</p>
-            <p><strong>Categoria Histórica:</strong> <span class="bg-info"> ${Questionario.questionarioHistoryDrive.description}</span></p>
-            <p><strong>Processador de Respostas:</strong> <span class="bg-primary">${Questionario.iAnswersProcessorClass.title}</span></p>
+            <div class="panel panel-default">
+                <div class="panel-heading">Dados Administrativos</div>
+                <div class="panel-body">
+                    <p><strong>Descrição:</strong> ${Questionario.description}</p>
+                    <p><strong>Categoria Histórica:</strong> <span class="bg-info"> ${Questionario.questionarioHistoryDrive.description}</span></p>
+                    <p><strong>Processador de Respostas:</strong> <span class="bg-primary">${Questionario.iAnswersProcessorClass.title}</span></p>
+                </div>
+            </div>
         </div>
         <div class="panel-body">
                 <div class="container">
-                    <div class="row">
+                    <div class="panel panel-success">
+                        <div class="panel-heading">Tarefas Executadas</div>
+                        <div class="panel-body">
                         <%
                             if( questionario.getStateEnum().getPosition() > QuestionarioImpl.State.CREATED.getPosition())
 ,7 → 76,7
                         <div class="alert alert-success col-md-2 col-sm-2">
                             <bean:message key="questionario.state.CREATED"/>
                         </div>
-                        <div class="col-md-1 col-sm-1 vcenter alert"><span class="glyphicon glyphicon-chevron-right"/></div>
+                        <div class="col-md-1 col-sm-1 vcenter alert hidden-xs"><span class="glyphicon glyphicon-chevron-right"/></div>
                         <%
                             }
                             if( questionario.getStateEnum().getPosition() > QuestionarioImpl.State.ASSIGNATION_DETAILS.getPosition())
 ,7 → 85,7
                         <div class="alert alert-success col-md-2 col-sm-2">
                             <bean:message key="questionario.state.ASSIGNATION_DETAILS"/>
                         </div>
-                        <div class="col-md-1 col-sm-1 vcenter alert"><span class="glyphicon glyphicon-chevron-right"/></div>
+                        <div class="col-md-1 col-sm-1 vcenter alert hidden-xs"><span class="glyphicon glyphicon-chevron-right"/></div>
                         <%
                             }
                             if( questionario.getStateEnum().getPosition() > QuestionarioImpl.State.ASSIGNING_ANSWERS_PROCESSEMENT.getPosition())
 ,7 → 94,7
                         <div class="alert alert-success col-md-2 col-sm-2">
                             <bean:message key="questionario.state.ASSIGNING_ANSWERS_PROCESSEMENT"/>
                         </div>
-                        <div class="col-md-1 col-sm-1 vcenter alert"><span class="glyphicon glyphicon-chevron-right"/></div>
+                        <div class="col-md-1 col-sm-1 vcenter alert hidden-xs"><span class="glyphicon glyphicon-chevron-right"/></div>
                         <%
                             }
                             if( questionario.getStateEnum().getPosition() > QuestionarioImpl.State.ASSIGNED_ANSWERS.getPosition())
 ,7 → 103,7
                         <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"><span class="glyphicon glyphicon-chevron-right"/></div>
+                        <div class="col-md-1 col-sm-1 vcenter alert hidden-xs"><span class="glyphicon glyphicon-chevron-right"/></div>
                         <%
                             }
                             if( questionario.getStateEnum().getPosition() > QuestionarioImpl.State.PROCESSING.getPosition())
 ,7 → 112,7
                         <div class="alert alert-success col-md-2 col-sm-2">
                             <bean:message key="questionario.state.PROCESSING"/>
                         </div>
-                        <div class="col-md-1 col-sm-1 vcenter alert"><span class="glyphicon glyphicon-chevron-right"/></div>
+                        <div class="col-md-1 col-sm-1 vcenter alert hidden-xs"><span class="glyphicon glyphicon-chevron-right"/></div>
                         <%
                             }
                             if( questionario.getStateEnum().getPosition() > QuestionarioImpl.State.PROCESSING_WITH_ANSWERS.getPosition())
 ,7 → 121,7
                         <div class="alert alert-success col-md-2 col-sm-2">
                             <bean:message key="questionario.state.PROCESSING_WITH_ANSWERS"/>
                         </div>
-                        <div class="col-md-1 col-sm-1 vcenter alert"><span class="glyphicon glyphicon-chevron-right"/></div>
+                        <div class="col-md-1 col-sm-1 vcenter alert hidden-xs"><span class="glyphicon glyphicon-chevron-right"/></div>
                         <%
                             }
                             if( questionario.getStateEnum().getPosition() > QuestionarioImpl.State.CLOSED.getPosition())
 ,7 → 130,7
                         <div class="alert alert-success col-md-2 col-sm-2">
                             <bean:message key="questionario.state.CLOSED"/>
                         </div>
-                        <div class="col-md-1 col-sm-1 vcenter alert"><span class="glyphicon glyphicon-chevron-right"/></div>
+                        <div class="col-md-1 col-sm-1 vcenter alert hidden-xs"><span class="glyphicon glyphicon-chevron-right"/></div>
                         <%
                             }
                             if( questionario.getStateEnum().getPosition() > QuestionarioImpl.State.PROCESSING_OLAP.getPosition())
 ,7 → 139,7
                         <div class="alert alert-success col-md-2 col-sm-2">
                             <bean:message key="questionario.state.PROCESSING_OLAP"/>
                         </div>
-                        <div class="col-md-1 col-sm-1 vcenter alert"><span class="glyphicon glyphicon-chevron-right"/></div>
+                        <div class="col-md-1 col-sm-1 vcenter alert hidden-xs"><span class="glyphicon glyphicon-chevron-right"/></div>
                         <%
                             }
                             if( questionario.getStateEnum().getPosition() > QuestionarioImpl.State.OLAP.getPosition())
 ,34 → 151,40
                         <%
                             }
                         %>
-                        <%
-                            String alert = "alert-info";
-                            if(questionario.getStateEnum() == QuestionarioImpl.State.STOPED_WITH_ANSWERS)
-                            {
-                                alert = "alert-danger";
-                            }
-                        %>
-                        <div class="alert <%=alert%> col-md-2 col-sm-2">
-                            <bean:message key="questionario.state.${Questionario.state}"/>
-                        </div>
+                    </div>
                 </div>
+                <%
+                    String alert = "alert-warning";
+                    if(questionario.getStateEnum() == QuestionarioImpl.State.STOPED_WITH_ANSWERS)
+                    {
+                        alert = "alert-danger";
+                    }
+                %>
-                <div class="panel panel-default">
+                <a name="NOWTASK"> </a>
+                <div class="panel panel-primary">
                     <div class="panel-heading">
                         Tarefas Disponiveis
+                        <label class="alert <%=alert%> alert-small">
+                            <bean:message key="questionario.state.${Questionario.state}"/>
+                        </label>
                     </div>
                     <div class="panel-body">
+                        <html:errors/>
+                        <jomm:messages/>
+                        <jsp:include page="questionarioState${Questionario.state}.jsp"/>
                     </div>
                 </div>
-                <div class="row">
-                    <div class="row-centered">
+                <div class="panel panel-default">
+                    <div class="panel-heading">Tarefas por realizar</div>
+                    <div class="panel-body">
                         <%
                             if( questionario.getStateEnum().getPosition() < QuestionarioImpl.State.CREATED.getPosition())
                             {
 ,7 → 192,7
                         <div class="alert alert-disabled col-md-2 col-sm-2">
                             <bean:message key="questionario.state.CREATED"/>
                         </div>
-                        <div class="col-md-1 col-sm-1 vcenter alert"><span class="glyphicon glyphicon-chevron-right"/></div>
+                        <div class="col-md-1 col-sm-1 vcenter alert hidden-xs"><span class="glyphicon glyphicon-chevron-right"/></div>
                         <%
                             }
                             if( questionario.getStateEnum().getPosition() < QuestionarioImpl.State.ASSIGNATION_DETAILS.getPosition())
 ,7 → 201,7
                         <div class="alert alert-disabled col-md-2 col-sm-2">
                             <bean:message key="questionario.state.ASSIGNATION_DETAILS"/>
                         </div>
-                        <div class="col-md-1 col-sm-1 vcenter alert"><span class="glyphicon glyphicon-chevron-right"/></div>
+                        <div class="col-md-1 col-sm-1 vcenter alert hidden-xs"><span class="glyphicon glyphicon-chevron-right"/></div>
                         <%
                             }
                             if( questionario.getStateEnum().getPosition() < QuestionarioImpl.State.ASSIGNING_ANSWERS_PROCESSEMENT.getPosition())
 ,7 → 210,7
                         <div class="alert alert-disabled col-md-2 col-sm-2">
                             <bean:message key="questionario.state.ASSIGNING_ANSWERS_PROCESSEMENT"/>
                         </div>
-                        <div class="col-md-1 col-sm-1 vcenter alert"><span class="glyphicon glyphicon-chevron-right"/></div>
+                        <div class="col-md-1 col-sm-1 vcenter alert hidden-xs"><span class="glyphicon glyphicon-chevron-right"/></div>
                         <%
                             }
                             if( questionario.getStateEnum().getPosition() < QuestionarioImpl.State.ASSIGNED_ANSWERS.getPosition())
 ,7 → 219,7
                         <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"><span class="glyphicon glyphicon-chevron-right"/></div>
+                        <div class="col-md-1 col-sm-1 vcenter alert hidden-xs"><span class="glyphicon glyphicon-chevron-right"/></div>
                         <%
                             }
                             if( questionario.getStateEnum().getPosition() < QuestionarioImpl.State.PROCESSING.getPosition())
 ,7 → 237,7
                         <div class="alert alert-disabled col-md-2 col-sm-2">
                             <bean:message key="questionario.state.PROCESSING_WITH_ANSWERS"/>
                         </div>
-                        <div class="col-md-1 col-sm-1 vcenter alert"><span class="glyphicon glyphicon-chevron-right"/></div>
+                        <div class="col-md-1 col-sm-1 vcenter alert hidden-xs"><span class="glyphicon glyphicon-chevron-right"/></div>
                         <%
                             }
                             if( questionario.getStateEnum().getPosition() < QuestionarioImpl.State.CLOSED.getPosition())
 ,7 → 246,7
                         <div class="alert alert-disabled col-md-2 col-sm-2">
                             <bean:message key="questionario.state.CLOSED"/>
                         </div>
-                        <div class="col-md-1 col-sm-1 vcenter alert"><span class="glyphicon glyphicon-chevron-right"/></div>
+                        <div class="col-md-1 col-sm-1 vcenter alert hidden-xs"><span class="glyphicon glyphicon-chevron-right"/></div>
                         <%
                             }
                             if( questionario.getStateEnum().getPosition() < QuestionarioImpl.State.PROCESSING_OLAP.getPosition())
 ,7 → 255,7
                         <div class="alert alert-disabled col-md-2 col-sm-2">
                             <bean:message key="questionario.state.PROCESSING_OLAP"/>
                         </div>
-                        <div class="col-md-1 col-sm-1 vcenter alert"><span class="glyphicon glyphicon-chevron-right"/></div>
+                        <div class="col-md-1 col-sm-1 vcenter alert hidden-xs"><span class="glyphicon glyphicon-chevron-right"/></div>
                         <%
                             }
                             if( questionario.getStateEnum().getPosition() < QuestionarioImpl.State.OLAP.getPosition())
 ,11 → 267,10
                         <%
                             }
                         %>
                     </div>
                 </div>
             </div>
+            <html:link styleClass="btn btn-success" action="/admin/listQuestionarios">Voltar</html:link>
         </div>
     </div>
 </div>

 /branches/v3/impl/src/web/admin/questionarios/questionarioStatePROCESSING_OLAP.jsp
 New file
 ,0 → 1,9
+<%@ 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" %>
+Estado  processando OLAP disponiveis

 /branches/v3/impl/src/web/admin/questionarios/questionarioStateOLAP.jsp
 New file
 ,0 → 1,9
+<%@ 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" %>
+Estado  Cubos OLAP terminados

 /branches/v3/impl/src/web/admin/questionarios/questionarioStateSTOPED_WITH_ANSWERS.jsp
 New file
 ,0 → 1,9
+<%@ 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" %>
+Estado  Parado para responder com Respostas

 /branches/v3/impl/src/web/admin/questionarios/questionariosList.jsp
 ,9 → 21,11
     <div class="panel panel-primary">
         <div class="panel-heading clearfix">
-            Questionários <html:link styleClass="btn btn-default btn-sm pull-right" action="/admin/newQuestionario">Criar Novo <span class="glyphicon glyphicon-plus"> </span></html:link>
+            Questionários <html:link styleClass="btn btn-default btn-sm pull-right" action="/admin/startNewQuestionario">Criar Novo <span class="glyphicon glyphicon-plus"> </span></html:link>
         </div>
         <div class="panel-body">
+            <html:errors/>
+            <jomm:messages/>
             <table class="tablesortersimple">
                 <thead>
                     <tr>
 ,39 → 36,70
                         <th>Formulário</th>
                         <th>Estado</th>
                         <th>Alterado a</th>
+                        <th>Apagar</th>
                     </tr>
                 </thead>
                 <tbody>
 <%
                 AbstractDao.getCurrentSession().beginTransaction();
-                List<Questionario> questionarios = DaoFactory.getQuestionarioDaoImpl().findByPage(0,10);
-                for(Questionario q: questionarios)
+                List<QuestionarioImpl> questionarios = DaoFactory.getQuestionarioDaoImpl().findSortedBy(0, 10, "id");
+                //As transacoes tem de estar fechadas para se chamar a tag initClearances
+                for(QuestionarioImpl q: questionarios)
                 {
                     request.setAttribute("q",q);
 %>
+                    <baco:initClearances name="q"/>
                     <tr>
                         <td>${q.id}</td>
                         <td>${q.year}</td>
                         <td>${q.semestre}</td>
-                        <td><html:link styleClass="btn btn-default" action="/admin/adminQuestionario?questionario.id=${q.id}">Admin</html:link></td>
                         <td>
+                            <html:link styleClass="btn btn-default" action="/admin/adminQuestionario?questionario.id=${q.id}">Admin</html:link></td>
+                        <td>
                             <%
-                                if(((QuestionarioImpl)q).getStateEnum().getPosition() < QuestionarioImpl.State.PROCESSING.getPosition())
+                                if(q.getStateEnum().getPosition() < QuestionarioImpl.State.PROCESSING.getPosition())
                                 {
                             %>
                             <html:link action="/admin/formQuestionariosPae?questionario.id=${q.id}" styleClass="btn btn-default">Editar</html:link>
                             <%
                                 }
+                                else if (q.getStateEnum().getPosition() < QuestionarioImpl.State.OLAP.getPosition())
+                                {
+                            %>
+                            <html:link action="/admin/formQuestionariosPae?questionario.id=${q.id}" styleClass="btn btn-warning">Trancado</html:link>
+                            <%
+                                }
                                 else
                                 {
                             %>
-                            <html:link action="/admin/formQuestionariosPae?questionario.id=${q.id}" styleClass="btn btn-warning">Em processamento</html:link>
+                            <html:link action="/admin/formQuestionariosPae?questionario.id=${q.id}" styleClass="btn btn-success">Terminado</html:link>
                             <%
                                 }
                             %>
                         </td>
-                        <td>${q.state}</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>
+                        <td>
+                            <baco:clearOperation name="q" op="QUESTIONARIO_DELETE">
+                                <button class="btn btn-danger" data-href="<%=request.getContextPath()%>/admin/deleteQuestionario.do?questionario.id=${q.id}" data-message="Tem a certeza que deseja eliminar o questionário ${q.id}?" data-toggle="modal" data-target="#confirm-ModalGeneric">
+                                    <span class="glyphicon glyphicon-remove small"> </span>
+                                </button>
+                            </baco:clearOperation>
+                        </td>
                     </tr>
 <%
                 }

 /branches/v3/impl/src/web/admin/questionarios/questionarioNewEdit.jsp
 ,10 → 1,9
 <%@ page import="jomm.dao.impl.AbstractDao" %>
+<%@ page import="pt.estgp.estgweb.domain.IAnswersProcessor" %>
 <%@ page import="pt.estgp.estgweb.domain.QuestionarioHistoryDrive" %>
+<%@ page import="pt.estgp.estgweb.domain.QuestionarioImpl" %>
 <%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
 <%@ page import="java.util.List" %>
-<%@ page import="pt.estgp.estgweb.utils.ConfigProperties" %>
-<%@ page import="pt.estgp.estgweb.domain.IAnswersProcessor" %>
-<%@ page import="pt.estgp.estgweb.domain.QuestionarioImpl" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
 <%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %>
 ,18 → 102,13
                     </div>
                     <div class="panel-body">
-                        <%
-                            if(QuestionarioForm.getQuestionario().getStateEnum().getPosition()
-                            >= QuestionarioImpl.State.PROCESSING.getPosition())
-                        {
-                        %>
-                        <div class="alert alert-warning">
-                            Formulário Trancado - Estado do Questionário ${QuestionarioForm.questionario.state}
-                        </div>
-                        <%
-                            }
-                        %>
+                        <baco:notClearOperation name="QuestionarioForm" property="questionario" op="QUESTIONARIO_SAVE_FORM">
+                            <div class="alert alert-warning">
+                                Formulário Trancado - Estado do Questionário ${QuestionarioForm.questionario.state}
+                            </div>
+                        </baco:notClearOperation>
                         <%
                             List<IAnswersProcessor> answersProcessors = QuestionarioImpl.getIAnswerProcessors();
                             request.setAttribute("answersProcessors",answersProcessors);
 ,46 → 121,34
                         <script>
                             $(document).ready( function()
                                 {
-                            <%
-                                if(QuestionarioForm.getQuestionario().getId() <= 0)
-                                {
-                                //por omissao tornamo-lo um pedagogico de alunos
-                            %>
+                                <logic:lessEqual value="0" name="QuestionarioForm" property="questionario.id">
                                     $("#answProc").val("pt.estgp.estgweb.services.questionarios.PedagogicoAlunosProcessor");
-                                    setHistoryDrive($("#answProc").val());
-                            <%
-                                }
-                                else if(QuestionarioForm.getQuestionario().getStateEnum().getPosition() > QuestionarioImpl.State.CREATED.getPosition())
-                                {
-                                //se for superior a criado nao permitimos modificacoes nestes selectores
-                            %>
+                                </logic:lessEqual>
+                                <baco:notClearOperation name="QuestionarioForm" property="questionario" op="QUESTIONARIO_SAVE_ANSWER_PROCESSOR">
                                     $("#histDrives").prop( "disabled", true );
+                                    $("#histDrivesHidden").prop( "disabled", false );
                                     $("#answProc").prop( "disabled", true );
-                            <%
-                                }
+                                    $("#answProcHidden").prop( "disabled", false );
+                                </baco:notClearOperation>
+                                //set history allays after answerproc defined
+                                setHistoryDrive($("#answProc").val());
-                                //deactivar todos os inputs caso esteja em processamento
-                                if(QuestionarioForm.getQuestionario().getStateEnum().getPosition()
-                                >= QuestionarioImpl.State.PROCESSING.getPosition())
-                                {
-                            %>
+                                <baco:notClearOperation name="QuestionarioForm" property="questionario" op="QUESTIONARIO_SAVE_FORM">
                                     $('#allInputs').find('input, textarea, button, select, #editor').attr('disabled','disabled');
-                            <%
+                                </baco:notClearOperation>
                                 }
-                            %>
-                                }
                             );
                             //Metodo para alterar a History dado o AnswerProcessor
                             //Usa o Answer Processor Contraint
                             function setHistoryDrive(answerProcessor)
                             {
-                                <%
-                                if(QuestionarioForm.getQuestionario().getStateEnum().getPosition() <= QuestionarioImpl.State.CREATED.getPosition())
-                                {
-                                %>
-                                    $("#histDrives").prop( "disabled", false );
+                                <baco:clearOperation name="QuestionarioForm" property="questionario" op="QUESTIONARIO_SAVE_ANSWER_PROCESSOR">
+                                    $("#histDrivesHidden").prop( "disabled", true );
+                                    $("#histDrives").removeAttr( "disabled");
                                     $("#histDrives").val("");
                                     <%
                                         for(IAnswersProcessor iAnswersProcessor: answersProcessors)
 ,7 → 163,9
                                     if(answerProcessor == '<%=iAnswersProcessor.getClass().getName()%>')
                                     {
                                         $("#histDrives").val('<%=hD.getId()%>');
-                                        $("#histDrives").prop( "disabled", true );
+                                        $("#histDrivesHidden").val('<%=hD.getId()%>');
+                                        $("#histDrives").prop("disabled",true);
+                                        $("#histDrivesHidden").prop( "disabled", false );
                                     }
                                     <%
                                                         break;
 ,28 → 174,23
                                             }
                                         }
                                     %>
-                                <%
-                                }
-                                %>
+                                </baco:clearOperation>
                             }
                         </script>
-                        <%
-                            if(QuestionarioForm.getQuestionario().getStateEnum().getPosition()
-                                    > QuestionarioImpl.State.CREATED.getPosition())
-                            {
-                        %>
-                       <div class="alert alert-info">
-                           Estado ${QuestionarioForm.questionario.state}
-                       </div>
-                        <p>Edição de tipo de questionário trancada</p>
-                        <%
-                            }
-                        %>
+                        <baco:notClearOperation name="QuestionarioForm" property="questionario" op="QUESTIONARIO_SAVE_ANSWER_PROCESSOR">
+                            <p>
+                                Estado: <label class="alert alert-warning alert-small">
+                                            <bean:message key="questionario.state.${QuestionarioForm.questionario.state}"/>
+                                        </label>
+                            </p>
+                            <div class="alert alert-danger alert-small">A alteração do processador de respostas está trancado devido ao estado em que o questionário se encontra</div>
+                        </baco:notClearOperation>
                         <div class="form-group">
                             <label class="control-label col-sm-2">Processador de Respostas</label>
                             <div class="col-sm-10">
+                                <html:hidden styleId="answProcHidden" styleClass="form-control" property="questionario.iAnswersProcessor" disabled="true"/>
                                 <html:select styleId="answProc" styleClass="form-control" property="questionario.iAnswersProcessor" onchange="setHistoryDrive($(this).val());">
                                     <option value=""></option>
                                     <html:optionsCollection name="answersProcessors" label="title" value="class.name"/>
 ,6 → 201,7
                         <div class="form-group">
                             <label class="control-label col-sm-2">Categoria Histórica de Análise de Dados</label>
                             <div class="col-sm-10">
+                                <html:hidden styleId="histDrivesHidden" styleClass="form-control" property="questionario.questionarioHistoryDrive.id" disabled="true"/>
                                 <html:select styleId="histDrives" styleClass="form-control" property="questionario.questionarioHistoryDrive.id">
                                     <option value=""></option>
                                     <html:optionsCollection name="historyDrives" label="codeName" value="id"/>
 ,19 → 253,12
                     <div class="col-sm-12">
                             <h3>Texto Introdutório do Questionário</h3>
-                            <%
-                            if(QuestionarioForm.getQuestionario().getStateEnum().getPosition()
-                                    >= QuestionarioImpl.State.PROCESSING.getPosition())
-                            {
-                            %>
+                            <baco:notClearOperation name="QuestionarioForm" property="questionario" op="QUESTIONARIO_SAVE_FORM">
                                 <div style="border:1px solid gray">
-                                    ${QuestionarioForm.questionario.introHtml}
+                                        ${QuestionarioForm.questionario.introHtml}
                                 </div>
-                            <%
-                            }
-                            else
-                            {
-                            %>
+                            </baco:notClearOperation>
+                            <baco:clearOperation name="QuestionarioForm" property="questionario" op="QUESTIONARIO_SAVE_FORM">
                                 <div class="btn-toolbar" data-role="editor-toolbar" data-target="#editor">
                                     <!-- <div class="btn-group">
                                          <a class="btn dropdown-toggle" data-toggle="dropdown" title="Font"><i class="aweicon-font"></i><b class="caret"></b></a>
 ,20 → 346,14
                                 </div>
                                 <div id="editor" class="dropable">
                                 </div>
-                            <%
-                            }
-                            %>
+                            </baco:clearOperation>
                     </div>
                 </div>
                 <html:hidden styleId="introHtml" property="questionario.introHtml"/>
                 <hr/>
                 <%
                     for(int i = 1; i <= 40; i ++)
 ,17 → 467,10
                 </div>
-                <%
-                    if(QuestionarioForm.getQuestionario().getStateEnum().getPosition()
-                            < QuestionarioImpl.State.PROCESSING.getPosition())
-                    {
-                %>
-                            <button type="button" class="btn btn-success" onclick="submitQuestionarioForm(form);"><bean:message key="confirm"/></button>
-                <%
-                    }
-                %>
-                <button type="button" class="btn btn-danger" onclick="window.history.back()"><bean:message key="cancel"/></button>
+                <baco:clearOperation name="QuestionarioForm" property="questionario" op="QUESTIONARIO_SAVE_FORM">
+                    <button type="button" class="btn btn-success" onclick="submitQuestionarioForm(form);"><bean:message key="confirm"/></button>
+                </baco:clearOperation>
+                <html:link action="/admin/listQuestionarios" styleClass="btn btn-danger"><bean:message key="cancel"/></html:link>
             </div>
         </div>

 /branches/v3/impl/src/web/admin/questionarios/questionarioStateASSIGNED_ANSWERS.jsp
 New file
 ,0 → 1,9
+<%@ 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" %>
+Estado  Respostas Atribuidas Tarefas disponiveis

 /branches/v3/impl/src/web/admin/questionarios/questionarioStateCREATED.jsp
 New file
 ,0 → 1,16
+<%@ 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="Questionario" type="pt.estgp.estgweb.domain.QuestionarioImpl" scope="request"/>
+<p>${Questionario.iAnswersProcessorClass.title}:</p>
+<p>
+    <html:link styleClass="btn btn-default" action="/admin/questionariosPaeStartAfectacoes?questionario.id=${Questionario.id}">
+        Iniciar Afectações Especificas <span class="glyphicon glyphicon-wrench"/>
+    </html:link>
+</p>

 /branches/v3/impl/src/web/admin/questionarios/questionarioStateCLOSED.jsp
 New file
 ,0 → 1,9
+<%@ 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" %>
+Estado  Fechado

 /branches/v3/impl/src/web/admin/questionarios/questionarioStatePROCESSING_WITH_ANSWERS.jsp
 New file
 ,0 → 1,9
+<%@ 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" %>
+Estado  Aberto para Responder com Respostas

 /branches/v3/impl/src/web/admin/questionarios/questionarioStateASSIGNING_ANSWERS_PROCESSEMENT.jsp
 New file
 ,0 → 1,9
+<%@ 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" %>
+Estado  Atribuindo Respostas  Tarefas disponiveis

 /branches/v3/impl/src/web/admin/questionarios/questionarioStatePROCESSING.jsp
 New file
 ,0 → 1,9
+<%@ 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" %>
+Estado  Aberto para Responder

 /branches/v3/impl/src/web/admin/questionarios/pedagogicoEstudante/pedagogicoEstudanteCoursesSelection.jsp
 New file
 ,0 → 1,112
+<%@ page import="jomm.dao.impl.AbstractDao" %>
+<%@ page import="pt.estgp.estgweb.domain.Course" %>
+<%@ 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.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" %>
+<%@ 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" %>
+<%
+    long questionarioId = Long.parseLong(request.getParameter("questionarioId"));
+    IServiceManager sm = ServiceManager.getInstance();
+    String[] names = {"questionarioId"};
+    Object[] args = {questionarioId};
+    QuestionarioImpl questionario = (QuestionarioImpl) sm.execute(RequestUtils.getRequester(request, response),"loadQuestionarioAdmin",args,names);
+    request.setAttribute("Questionario", questionario);
+    AbstractDao.getCurrentSession().beginTransaction();
+    List<String> institutionCodes = ConfigProperties.getListValues("questionario.instituition.");
+%>
+<div class="container-fluid">
+    <script>
+        function selectAll(code,source)
+        {
+            $('#institution' + code).find('.courseCheck').each(
+                    function()
+                    {
+                        this.checked = $(source).prop('checked');
+                    });
+        }
+    </script>
+<%
+    for(String institutionCode: institutionCodes)
+    {
+        String institutionName = ConfigProperties.getProperty("institution.code." + institutionCode);
+        List<Course> courses = DaoFactory.getCourseDaoImpl().findCoursesWithUnitsIn(questionario.getYear(),institutionCode);
+%>
+    <div class="panel panel-default" id="institution<%=institutionCode%>">
+        <div class="panel-heading">
+            Cursos da <%=institutionName%>
+        </div>
+        <div class="panel-body">
+            <table class="tablesorterfiltered">
+                <thead>
+                <tr>
+                    <th>Codigo</th>
+                    <th>Tipo de Curso</th>
+                    <th>Curso</th>
+                    <th>Papel Comissão Curso</th>
+                    <th>Unidades</th>
+                    <th class="filter-false" data-sorter="false">
+                        <input type="checkbox" onchange="selectAll('<%=institutionCode%>',this)">
+                    </th>
+                </tr>
+                </thead>
+                <tbody>
+                <%
+                    for(Course course: courses)
+                    {
+                        int unitsSize=DaoFactory.getCourseDaoImpl().countCoursesUnits(questionario.getYear(), course.getId());
+                        CourseView cv = new CourseView(course);
+                        request.setAttribute("CourseView",cv);
+                %>
+                        <tr>
+                            <td>${CourseView.code}</td>
+                            <td><bean:message key="course.${CourseView.degreeCleanCode}"/></td>
+                            <td>${CourseView.name}</td>
+                            <td>
+                                <logic:notEmpty name="CourseView" property="validationRole">
+                                    <bean:message key="user.role.${CourseView.validationRole}"/>
+                                </logic:notEmpty>
+                                <logic:empty name="CourseView" property="validationRole">
+                                    Papel não atribuido (Corrigir Situação)
+                                </logic:empty>
+                            </td>
+                            <td><%=unitsSize%></td>
+                            <td>
+                                <input class="courseCheck" type="checkbox" />
+                            </td>
+                        </tr>
+                <%
+                    }
+                %>
+                </tbody>
+            </table>
+        </div>
+    </div>
+<%
+    }
+%>
+</div>
+<%
+    AbstractDao.getCurrentSession().getTransaction().commit();
+%>

 /branches/v3/impl/src/web/admin/questionarios/pedagogicoEstudante/topnavQuestionarioPedagogicoCoursesAdmin.jsp
 New file
 ,0 → 1,13
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="jomm.web.utils.NavPlaceServer"%>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%
+    Long questionarioId = Long.parseLong(request.getParameter("questionarioId"));
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/user/startHome.do", "intranet.separator.home.back");
+    topNav.addNavPlace("/admin/listQuestionarios.do", "surveys");
+    topNav.addNavPlace("/admin/adminQuestionario.do?questionario.id=" + questionarioId, "survey.admin");
+    topNav.addNavPlace(null, "questionarios.choose.courses");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /branches/v3/impl/src/web/css/style.css
 ,6 → 26,11
 }
+.alert-small
+{
+    padding: 3px !important;
+    margin-bottom: 3px !important;
+}

 /branches/v3/impl/src/web/layout/headerTools.jsp
 ,3 → 51,34
     </div>
 </div>
+<script>
+    $(document).ready(function(){
+        $('.confirmModal').on('show.bs.modal', function(e) {
+            $(this).find('.btn-ok').attr('href', $(e.relatedTarget).data('href'));
+            $(this).find('.ConfirmMessageToUser').html($(e.relatedTarget).data('message'));
+        });
+    });
+</script>
+<div class="modal fade confirmModal" id="confirm-ModalGeneric" tabindex="-1" role="dialog" >
+    <div class="modal-dialog" data-width="450" style="display: block; width: 450px; margin-top: 50px;" aria-hidden="false">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">Tem a certeza que deseja efectuar a seguinte operação?</h4>
+            </div>
+            <div class="modal-body">
+                <p class="ConfirmMessageToUser">
+                </p>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Cancelar</button>
+                <a class="btn btn-danger btn-ok">Sim</a>
+            </div>
+        </div>
+    </div>
+</div>

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitDeliverable.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioTipologia.java
 ,5 → 1,5
 package pt.estgp.estgweb.domain;
-// Generated 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
+// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
 ,7 → 11,7
      private long id;
      private String codigo;
-     private String nome;
+     private String descricao;
     public OlapEntityQuestionarioTipologia() {
     }
 ,12 → 31,12
     public void setCodigo(String codigo) {
         this.codigo = codigo;
     }
-    public String getNome() {
-        return this.nome;
+    public String getDescricao() {
+        return this.descricao;
     }
-    public void setNome(String nome) {
-        this.nome = nome;
+    public void setDescricao(String descricao) {
+        this.descricao = descricao;
     }

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitBlog.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapStarQuestionarioAnswer.java
 New file
 ,0 → 1,72
+package pt.estgp.estgweb.domain;
+// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
+import java.util.Date;
+/**
+ * OlapStarQuestionarioAnswer generated by hbm2java
+ */
+public class OlapStarQuestionarioAnswer  implements java.io.Serializable {
+     private long id;
+     private Date data;
+     private int intResposta;
+     private OlapStarQuestionario starQuestionario;
+     private OlapEntityQuestionarioPerguntaGrupo perguntaGrupo;
+     private OlapEntityQuestionarioPergunta1_5 pergunta1_5;
+    public OlapStarQuestionarioAnswer() {
+    }
+    public long getId() {
+        return this.id;
+    }
+    public void setId(long id) {
+        this.id = id;
+    }
+    public Date getData() {
+        return this.data;
+    }
+    public void setData(Date data) {
+        this.data = data;
+    }
+    public int getIntResposta() {
+        return this.intResposta;
+    }
+    public void setIntResposta(int intResposta) {
+        this.intResposta = intResposta;
+    }
+    public OlapStarQuestionario getStarQuestionario() {
+        return this.starQuestionario;
+    }
+    public void setStarQuestionario(OlapStarQuestionario starQuestionario) {
+        this.starQuestionario = starQuestionario;
+    }
+    public OlapEntityQuestionarioPerguntaGrupo getPerguntaGrupo() {
+        return this.perguntaGrupo;
+    }
+    public void setPerguntaGrupo(OlapEntityQuestionarioPerguntaGrupo perguntaGrupo) {
+        this.perguntaGrupo = perguntaGrupo;
+    }
+    public OlapEntityQuestionarioPergunta1_5 getPergunta1_5() {
+        return this.pergunta1_5;
+    }
+    public void setPergunta1_5(OlapEntityQuestionarioPergunta1_5 pergunta1_5) {
+        this.pergunta1_5 = pergunta1_5;
+    }
+}

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SurveyStatsGraphic.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/GenericUser.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/JobParameter.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/ComunicationFolder.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/ConfigurationGradesStatusEpoca.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitTurma.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapStarQuestionario.java
 ,7 → 1,8
 package pt.estgp.estgweb.domain;
-// Generated 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
+// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
+import java.util.Date;
 /**
  * OlapStarQuestionario generated by hbm2java
 ,22 → 11,20
      private long id;
-     private String pergunta;
-     private int resposta;
+     private boolean respondido;
+     private Date dataInicio;
+     private Date dataFim;
      private OlapEntityQuestionarioTipologia tipologia;
      private OlapEntityQuestionarioDocente docente;
      private OlapEntityQuestionarioTurma turma;
-     private OlapEntityQuestionarioInstituicao instituicao;
      private OlapEntityQuestionarioUnidade unidade;
      private OlapEntityQuestionarioCurso curso;
+     private OlapEntityQuestionarioInstituicao instituicao;
      private OlapEntityQuestionarioCursoDegree cursoDegree;
-     private OlapEntityQuestionarioAno ano;
      private OlapEntityQuestionarioPeriodo periodo;
-     private OlapEntityQuestionarioPerguntaGrupo perguntaGrupo;
-     private OlapEntityQuestionarioAnswer perguntaAnswer;
-     private OlapEntityQuestionarioAnswered perguntaAnswered;
-     private Questionario questionario;
+     private OlapEntityQuestionarioAno ano;
      private OlapHistoryDimension timeLine;
+     private Questionario questionario;
     public OlapStarQuestionario() {
     }
 ,20 → 37,27
     public void setId(long id) {
         this.id = id;
     }
-    public String getPergunta() {
-        return this.pergunta;
+    public boolean isRespondido() {
+        return this.respondido;
     }
-    public void setPergunta(String pergunta) {
-        this.pergunta = pergunta;
+    public void setRespondido(boolean respondido) {
+        this.respondido = respondido;
     }
-    public int getResposta() {
-        return this.resposta;
+    public Date getDataInicio() {
+        return this.dataInicio;
     }
-    public void setResposta(int resposta) {
-        this.resposta = resposta;
+    public void setDataInicio(Date dataInicio) {
+        this.dataInicio = dataInicio;
     }
+    public Date getDataFim() {
+        return this.dataFim;
+    }
+    public void setDataFim(Date dataFim) {
+        this.dataFim = dataFim;
+    }
     public OlapEntityQuestionarioTipologia getTipologia() {
         return this.tipologia;
     }
 ,13 → 79,6
     public void setTurma(OlapEntityQuestionarioTurma turma) {
         this.turma = turma;
     }
-    public OlapEntityQuestionarioInstituicao getInstituicao() {
-        return this.instituicao;
-    }
-    public void setInstituicao(OlapEntityQuestionarioInstituicao instituicao) {
-        this.instituicao = instituicao;
-    }
     public OlapEntityQuestionarioUnidade getUnidade() {
         return this.unidade;
     }
 ,6 → 93,13
     public void setCurso(OlapEntityQuestionarioCurso curso) {
         this.curso = curso;
     }
+    public OlapEntityQuestionarioInstituicao getInstituicao() {
+        return this.instituicao;
+    }
+    public void setInstituicao(OlapEntityQuestionarioInstituicao instituicao) {
+        this.instituicao = instituicao;
+    }
     public OlapEntityQuestionarioCursoDegree getCursoDegree() {
         return this.cursoDegree;
     }
 ,13 → 107,6
     public void setCursoDegree(OlapEntityQuestionarioCursoDegree cursoDegree) {
         this.cursoDegree = cursoDegree;
     }
-    public OlapEntityQuestionarioAno getAno() {
-        return this.ano;
-    }
-    public void setAno(OlapEntityQuestionarioAno ano) {
-        this.ano = ano;
-    }
     public OlapEntityQuestionarioPeriodo getPeriodo() {
         return this.periodo;
     }
 ,27 → 114,20
     public void setPeriodo(OlapEntityQuestionarioPeriodo periodo) {
         this.periodo = periodo;
     }
-    public OlapEntityQuestionarioPerguntaGrupo getPerguntaGrupo() {
-        return this.perguntaGrupo;
+    public OlapEntityQuestionarioAno getAno() {
+        return this.ano;
     }
-    public void setPerguntaGrupo(OlapEntityQuestionarioPerguntaGrupo perguntaGrupo) {
-        this.perguntaGrupo = perguntaGrupo;
+    public void setAno(OlapEntityQuestionarioAno ano) {
+        this.ano = ano;
     }
-    public OlapEntityQuestionarioAnswer getPerguntaAnswer() {
-        return this.perguntaAnswer;
+    public OlapHistoryDimension getTimeLine() {
+        return this.timeLine;
     }
-    public void setPerguntaAnswer(OlapEntityQuestionarioAnswer perguntaAnswer) {
-        this.perguntaAnswer = perguntaAnswer;
+    public void setTimeLine(OlapHistoryDimension timeLine) {
+        this.timeLine = timeLine;
     }
-    public OlapEntityQuestionarioAnswered getPerguntaAnswered() {
-        return this.perguntaAnswered;
-    }
-    public void setPerguntaAnswered(OlapEntityQuestionarioAnswered perguntaAnswered) {
-        this.perguntaAnswered = perguntaAnswered;
-    }
     public Questionario getQuestionario() {
         return this.questionario;
     }
 ,13 → 135,6
     public void setQuestionario(Questionario questionario) {
         this.questionario = questionario;
     }
-    public OlapHistoryDimension getTimeLine() {
-        return this.timeLine;
-    }
-    public void setTimeLine(OlapHistoryDimension timeLine) {
-        this.timeLine = timeLine;
-    }

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BlogPost.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioPergunta1_5.java
 New file
 ,0 → 1,39
+package pt.estgp.estgweb.domain;
+// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
+/**
+ * OlapEntityQuestionarioPergunta1_5 generated by hbm2java
+ */
+public class OlapEntityQuestionarioPergunta1_5  implements java.io.Serializable {
+     private long id;
+     private String pergunta;
+    public OlapEntityQuestionarioPergunta1_5() {
+    }
+    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/UrlStatDayId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

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

/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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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
 New file
 ,0 → 1,39
+package pt.estgp.estgweb.domain.dao.impl;
+// Generated 21/Mar/2016 21:36:21 by Hibernate Tools 3.2.0.b9
+import org.apache.log4j.Logger;
+/**
+ * Home object for domain model class OlapStarQuestionarioAnswer.
+ * @author Jorge Machado - Hibernate Tools
+ */
+import jomm.dao.IDomainObjectDao;
+import jomm.dao.impl.AbstractDao;
+import pt.estgp.estgweb.domain.OlapStarQuestionarioAnswer;
+public class OlapStarQuestionarioAnswerDao extends AbstractDao<OlapStarQuestionarioAnswer> {
+//public class OlapStarQuestionarioAnswerDao extends AbstractDao implements IDomainObjectDao {
+    private static final Logger log = Logger.getLogger(OlapStarQuestionarioAnswerDao.class);
+    protected static OlapStarQuestionarioAnswerDao myInstance = null;
+    protected OlapStarQuestionarioAnswerDao(){
+        super();
+    }
+    public static OlapStarQuestionarioAnswerDao getInstance() {
+        if (myInstance == null)
+            myInstance = new OlapStarQuestionarioAnswerDao();
+        return myInstance;
+    }
+    protected Class getReferenceClass() {
+        return OlapStarQuestionarioAnswer.class;
+    }
+}

/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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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
 New file
 ,0 → 1,39
+package pt.estgp.estgweb.domain.dao.impl;
+// Generated 21/Mar/2016 21:36:21 by Hibernate Tools 3.2.0.b9
+import org.apache.log4j.Logger;
+/**
+ * Home object for domain model class OlapEntityQuestionarioCursoDegree.
+ * @author Jorge Machado - Hibernate Tools
+ */
+import jomm.dao.IDomainObjectDao;
+import jomm.dao.impl.AbstractDao;
+import pt.estgp.estgweb.domain.OlapEntityQuestionarioCursoDegree;
+public class OlapEntityQuestionarioCursoDegreeDao extends AbstractDao<OlapEntityQuestionarioCursoDegree> {
+//public class OlapEntityQuestionarioCursoDegreeDao extends AbstractDao implements IDomainObjectDao {
+    private static final Logger log = Logger.getLogger(OlapEntityQuestionarioCursoDegreeDao.class);
+    protected static OlapEntityQuestionarioCursoDegreeDao myInstance = null;
+    protected OlapEntityQuestionarioCursoDegreeDao(){
+        super();
+    }
+    public static OlapEntityQuestionarioCursoDegreeDao getInstance() {
+        if (myInstance == null)
+            myInstance = new OlapEntityQuestionarioCursoDegreeDao();
+        return myInstance;
+    }
+    protected Class getReferenceClass() {
+        return OlapEntityQuestionarioCursoDegree.class;
+    }
+}

/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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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
 New file
 ,0 → 1,39
+package pt.estgp.estgweb.domain.dao.impl;
+// Generated 21/Mar/2016 21:36:21 by Hibernate Tools 3.2.0.b9
+import org.apache.log4j.Logger;
+/**
+ * Home object for domain model class OlapEntityQuestionarioAno.
+ * @author Jorge Machado - Hibernate Tools
+ */
+import jomm.dao.IDomainObjectDao;
+import jomm.dao.impl.AbstractDao;
+import pt.estgp.estgweb.domain.OlapEntityQuestionarioAno;
+public class OlapEntityQuestionarioAnoDao extends AbstractDao<OlapEntityQuestionarioAno> {
+//public class OlapEntityQuestionarioAnoDao extends AbstractDao implements IDomainObjectDao {
+    private static final Logger log = Logger.getLogger(OlapEntityQuestionarioAnoDao.class);
+    protected static OlapEntityQuestionarioAnoDao myInstance = null;
+    protected OlapEntityQuestionarioAnoDao(){
+        super();
+    }
+    public static OlapEntityQuestionarioAnoDao getInstance() {
+        if (myInstance == null)
+            myInstance = new OlapEntityQuestionarioAnoDao();
+        return myInstance;
+    }
+    protected Class getReferenceClass() {
+        return OlapEntityQuestionarioAno.class;
+    }
+}

/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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 11:05:49 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:21 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/DigitalDeliveryTarget.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioDocente.java
 ,5 → 1,5
 package pt.estgp.estgweb.domain;
-// Generated 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
+// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
 ,10 → 10,11
      private long id;
-     private String codigo;
+     private long codigo;
      private String nome;
      private String bi;
      private String username;
+     private String email;
     public OlapEntityQuestionarioDocente() {
     }
 ,11 → 27,11
     public void setId(long id) {
         this.id = id;
     }
-    public String getCodigo() {
+    public long getCodigo() {
         return this.codigo;
     }
-    public void setCodigo(String codigo) {
+    public void setCodigo(long codigo) {
         this.codigo = codigo;
     }
     public String getNome() {
 ,6 → 55,13
     public void setUsername(String username) {
         this.username = username;
     }
+    public String getEmail() {
+        return this.email;
+    }
+    public void setEmail(String email) {
+        this.email = email;
+    }

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitAssignement.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnit.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SigesUser.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioCursoDegree.java
 New file
 ,0 → 1,39
+package pt.estgp.estgweb.domain;
+// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
+/**
+ * OlapEntityQuestionarioCursoDegree generated by hbm2java
+ */
+public class OlapEntityQuestionarioCursoDegree  implements java.io.Serializable {
+     private long id;
+     private String degree;
+    public OlapEntityQuestionarioCursoDegree() {
+    }
+    public long getId() {
+        return this.id;
+    }
+    public void setId(long id) {
+        this.id = id;
+    }
+    public String getDegree() {
+        return this.degree;
+    }
+    public void setDegree(String degree) {
+        this.degree = degree;
+    }
+}

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/MetaProcess.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioAno.java
 New file
 ,0 → 1,39
+package pt.estgp.estgweb.domain;
+// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
+/**
+ * OlapEntityQuestionarioAno generated by hbm2java
+ */
+public class OlapEntityQuestionarioAno  implements java.io.Serializable {
+     private long id;
+     private String ano;
+    public OlapEntityQuestionarioAno() {
+    }
+    public long getId() {
+        return this.id;
+    }
+    public void setId(long id) {
+        this.id = id;
+    }
+    public String getAno() {
+        return this.ano;
+    }
+    public void setAno(String ano) {
+        this.ano = ano;
+    }
+}

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SurveyStructuralNode.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 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 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/UrlStat.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 20/Mar/2016 18:07:17 by Hibernate Tools 3.2.0.b9
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9


import java.util.Date;

Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1325 → Rev 1326