WebSVN - bacoAlunos - Path Comparison - /branches Rev 1326 and /branches Rev 1327

Ignore whitespace Rev 1326 → Rev 1327

 /branches/v3/impl/local-exampleNotInUse.properties
 ,3 → 38,11
 tomcat.context.path=/baco
 tomcat.war.file=baco.war
+#EMAIL SERVER SMTP GOOGLE
+email.password=DUMMY_PASSWORD_GMAIL
+##Em testes colocar a true
+test.control.var=true
+oracle.siges.username=dummyChangeInLocal
+oracle.siges.password=dummyChangeInLocal

 /branches/v3/impl/conf/language/MessageResources.properties
 ,7 → 578,9
 targetService.pt.estgp.estgweb.services.sigesimports.ImportCourseService=Importação de Cursos
 targetService.pt.estgp.estgweb.services.sigesimports.SincronizeLastYearCourseUnitProgramsService=Clonagem de Fichas Curriculares
 targetService.pt.estgp.estgweb.services.sigesimports.GenerateCourseUnitProgramsService=Gerar PDF's Fichas Curriculares
+targetService.pt.estgp.estgweb.services.questionarios.pedagogico.UpdateCoursesAndUnitsJobService=Selecção de Cursos Questionários
 weekday.Mon=Segundas
 weekday.Tue=Terças
 weekday.Wed=Quartas
 ,6 → 1544,10
 task.param.JOB_generateAllPdfs_KEY=Gerar PDFS a Todos
 task.param.JOB_validade_KEY=Validar Clonados
 task.param.JOB_institution_KEY=Instituição
+#questionario
+task.param.JOB_questionario_courseList_KEY=Lista de Cursos
+task.param.JOB_questionario_id_KEY=Questionário ID
 ################################################################################
 #
 # Manage Identifiers  MESSAGE RESOURCES
 ,9 → 1774,11
 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.no.courses.selected=Não seleccionou quaisquer cursos
 questionario.year.semestre.ok=Ano e Semestre alterados com sucesso
-questionarios.choose.courses=Selecção de Cursos
+questionarios.choose.courses=Selecção de Cursos para o Periodo {0} de {1}
+questionarios.courses.start=Atribuição de Cursos Iniciada
 ################################################################################
 #
 ,7 → 1880,7
 questionario.historydrive=Categoria Histórica
 questionario.answerprocessor=Processador de Respostas
 # SERVICE ZONE
-survey.admin=Administração de Questionário
+survey.admin=Administração do Questionário {0}
 surveys=Questionários
 survey.newEdit.survey=Formulário do Questionário
 survey.create.survey=Criar Questionário

 /branches/v3/impl/conf/WEB-INF/struts/struts-pae-questionarios.xml
 ,6 → 76,18
         <!--%%%%%%%%%%%%%%%%  Pedagogico Alunos Modulo  %%%%%%%%%%%%%%%%%%%-->
         <action path="/admin/questionarioPedagogicoStartChooseCourses" forward="page.pae.questionario.courses.selection"/>
+        <action path="/admin/questionariosPaeSelectCourses"
+                type="pt.estgp.estgweb.web.controllers.questionarios.QuestionarioCourseSelectionController"
+                name="QuestionarioForm"
+                scope="request"
+                parameter="dispatch"
+                validate="false"
+                input="page.pae.questionario.courses.selection">
+            <forward name="coursesSelection" path="page.pae.questionario.courses.selection"/>
+            <forward name="admin" path="page.pae.questionario.admin"/>
+        </action>
         <!--%%%%%%%%%%%%%%%%  Pedagogico Alunos Modulo  %%%%%%%%%%%%%%%%%%%-->

 /branches/v3/impl/conf/app.properties
 ,7 → 34,7
 email.user.sufix=@estgp.pt
 email.user.count=10
 email.user=bacodev@estgp.pt
-email.password=Agreyq54p7870#!
+email.password=@email.password@
 email.from=bacodev@estgp.pt
 email.templates.dir=@email.templates.dir@
 #email.server.security=

 /branches/v3/impl/conf/berserk/sd.xml
 ,6 → 2572,22
             <chain name="QuestionarioClearancesPre"/>
         </filterChains>
     </service>
-    DeleteQuestionario
+    <service>
+        <name>RunJobSelectCourses</name>
+        <implementationClass>pt.estgp.estgweb.services.questionarios.pedagogico.UpdateCoursesAndUnitsJobService</implementationClass>
+        <description></description>
+        <isTransactional>true</isTransactional>
+        <defaultMethod>runJobSelectCourses</defaultMethod>
+        <filterChains>
+            <chain name="Logger"/>
+            <chain name="Session"/>
+            <chain name="AuthenticatedUsers"/>
+            <chain name="QuestionarioClearancesPre"/>
+        </filterChains>
+    </service>
 </serviceDefinitions>

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/jobs/ServiceJob.java
 ,6 → 30,9
     public static final String JOB_generateAllPdfs_KEY = "JOB_generateAllPdfs_KEY";
     public static final String JOB_validate_KEY = "JOB_validade_KEY";
     public static final String JOB_institution_KEY = "JOB_institution_KEY";
+    public static final String JOB_questionario_courseList_KEY = "JOB_questionario_courseList_KEY";
+    public static final String JOB_questionario_id_KEY = "JOB_questionario_id_KEY";
     /*Log for service run*/
     protected final Logger serviceLog = Logger.getLogger(ServiceJob.class);

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/jobs/JobDeamon.java
 ,29 → 107,7
             if(isRunnableNow(schedule, last))
             {
-                logger.info("Schedulling one job " + schedule.getTargetService() + " to run");
-                JobServiceTaskImpl jobServiceTask = DomainObjectFactory.createJobServiceTaskImpl();
-                jobServiceTask.setStartDate(new Date());
-                jobServiceTask.setTargetService(schedule.getTargetService());
-                jobServiceTask.setCreatedBy(schedule.getCreatedBy());
-                jobServiceTask.setExecuted(false);
-                jobServiceTask.setDescription("Service:" + schedule.getDescription());
-                jobServiceTask.setServiceDescription(schedule.getDescription());
-                jobServiceTask.setSaveDate(new Date());
-                jobServiceTask.setStatusEnum(JobServiceTaskImpl.JobStatus.PENDING);
-                jobServiceTask.setRequestStop(false);
-                jobServiceTask.setOwner(schedule.getCreatedBy());
-                jobServiceTask.setJobHandler(new SerializableNullJobHandler());
-                jobServiceTask.setProgress(0);
-                DaoFactory.getJobServiceTaskDaoImpl().save(jobServiceTask);
-                schedule.setLastJobServiceTask(jobServiceTask);
-                try {
-                    String filePath = Class.forName(schedule.getTargetService()).getSimpleName() + "-" + DatesUtils.getFormatedFileSystem(new Date());
-                    jobServiceTask.setLogFilePath( filePath + ".log");
-                } catch (ClassNotFoundException e) {
-                    logger.fatal(e,e);
-                    continue;
-                }
                 Set<JobServiceTaskParameter> paramsJob = new HashSet<JobServiceTaskParameter>();
                 for(JobServiceTaskSchedulerParameter param : schedule.getServiceTaskSchedulerParameters())
                 {
 ,11 → 116,21
                     paramJob.setDescription(param.getDescription());
                     paramJob.setObject(param.getObject());
                     paramsJob.add(paramJob);
-                    paramJob.setJobServiceTask(jobServiceTask);
-                    DaoFactory.getJobServiceTaskParameterDaoImpl().save(paramJob);
                 }
-                jobServiceTask.setServiceTaskParameters(paramsJob);
+                try {
+                    JobServiceTaskImpl jobServiceTask = createServiceJob(
+                            Class.forName(schedule.getTargetService()),
+                            schedule.getCreatedBy(),
+                            paramsJob,
+                            "Service:" + schedule.getDescription()
+                            );
+                    schedule.setLastJobServiceTask(jobServiceTask);
+                } catch (ClassNotFoundException e) {
+                    logger.fatal(e,e);
+                    continue;
+                }
                 //DaoFactory.getJobServiceTaskDaoImpl().saveOrUpdate(jobServiceTask);
                 //a last schedule date e a hora a que foi marcado para correr a ultima vez
 ,6 → 145,36
         }
     }
+    public static JobServiceTaskImpl createServiceJob(Class targetService, User owner, Set<JobServiceTaskParameter> paramsJob, String description)
+    {
+        logger.info("Schedulling one job " + targetService + " to run");
+        JobServiceTaskImpl jobServiceTask = DomainObjectFactory.createJobServiceTaskImpl();
+        jobServiceTask.setStartDate(new Date());
+        jobServiceTask.setTargetService(targetService.getName());
+        jobServiceTask.setCreatedBy(owner);
+        jobServiceTask.setExecuted(false);
+        jobServiceTask.setDescription(description);
+        jobServiceTask.setServiceDescription(description);
+        jobServiceTask.setSaveDate(new Date());
+        jobServiceTask.setStatusEnum(JobServiceTaskImpl.JobStatus.PENDING);
+        jobServiceTask.setRequestStop(false);
+        jobServiceTask.setOwner(owner);
+        jobServiceTask.setJobHandler(new SerializableNullJobHandler());
+        jobServiceTask.setProgress(0);
+        DaoFactory.getJobServiceTaskDaoImpl().save(jobServiceTask);
+        String filePath = targetService.getSimpleName() + "-" + DatesUtils.getFormatedFileSystem(new Date());
+        jobServiceTask.setLogFilePath( filePath + ".log");
+        for(JobServiceTaskParameter param: paramsJob)
+        {
+            param.setJobServiceTask(jobServiceTask);
+            DaoFactory.getJobServiceTaskParameterDaoImpl().save(param);
+        }
+        jobServiceTask.setServiceTaskParameters(paramsJob);
+        return jobServiceTask;
+    }
     private boolean isRunnableNow(JobServiceTaskScheduler schedule,Date lastDate)
     {
         if(!schedule.isActive())

/branches/v3/impl/src/java/pt/estgp/estgweb/services/users/UserRoleConfigService.java
142,6 → 142,7
"user.role.worker=Funcionário\n" +
"user.role.invited=Convidado\n" +
"user.role.services=Serviços\n" +
"questionarios.admin=Administração de Questionários\n" +
"user.role.servicesPrograms=Gestão de Programas Curriculares\n" +
"user.role.administrativeCouncil=Membro da Direcção\n" +
"user.role.administrativeCouncil.director=Director\n" +

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/questionarios/pedagogico/UpdateCoursesAndUnitsJobService.java
 New file
 ,0 → 1,61
+package pt.estgp.estgweb.services.questionarios.pedagogico;
+import org.json.JSONArray;
+import pt.estgp.estgweb.domain.*;
+import pt.estgp.estgweb.services.jobs.JobDeamon;
+import pt.estgp.estgweb.services.jobs.ServiceJob;
+import pt.estgp.estgweb.services.logresults.ILogMessages;
+import pt.estgp.estgweb.services.logresults.impl.DefaultLogMessages;
+import pt.estgp.estgweb.web.exceptions.NotAuthorizedException;
+import pt.utl.ist.berserk.logic.serviceManager.IService;
+import java.util.HashSet;
+import java.util.Set;
+/**
+ * Created by jorgemachado on 22/03/16.
+ */
+public class UpdateCoursesAndUnitsJobService extends ServiceJob implements IService
+{
+   //todo falta validar as clearances
+    //todo falta meter a tarefa no Questionario
+    public QuestionarioImpl runJobSelectCourses(long questionarioId,String[] coursesList,UserSession session,QuestionarioImpl questionarioCleared) throws NotAuthorizedException {
+        if(!questionarioCleared.isClear((UserSessionImpl) session,QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SCHEDULLE_SELECT_COURSES.name()))
+        {
+            throw new NotAuthorizedException("Nao tem autorização para agendar atribuições de cursos");
+        }
+        JSONArray jsonArray = new JSONArray();
+        for(String sele: coursesList)
+        {
+            jsonArray.put(new Long(sele));
+        }
+        Set<JobServiceTaskParameter> paramsJob = new HashSet<JobServiceTaskParameter>();
+        JobServiceTaskParameterImpl paramJobL = DomainObjectFactory.createJobServiceTaskParameterImpl();
+        paramJobL.setName(ServiceJob.JOB_questionario_courseList_KEY);
+        paramJobL.setDescription("lista de cursos a associar");
+        paramJobL.setObject(jsonArray.toString());
+        paramsJob.add(paramJobL);
+        JobServiceTaskParameterImpl paramJob = DomainObjectFactory.createJobServiceTaskParameterImpl();
+        paramJob.setName(ServiceJob.JOB_questionario_id_KEY);
+        paramJob.setDescription("ID do questionário");
+        paramJob.setObject("" + questionarioId);
+        paramsJob.add(paramJob);
+        JobServiceTask job = JobDeamon.createServiceJob(UpdateCoursesAndUnitsJobService.class, session.getUser(), paramsJob,
+                "Service: Atribuição de Cursos e Unidades a um questionário Pedagógico");
+        questionarioCleared.setCourseSelectionTaskId(job.getId());
+        return questionarioCleared;
+    }
+    @Override
+    protected ILogMessages runJobServiceTask() throws Throwable {
+        System.out.println("RUNNING DEMO");
+        return new DefaultLogMessages();
+    }
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/entity/EntityServiceJson.java
 New file
 ,0 → 1,34
+package pt.estgp.estgweb.services.entity;
+import com.owlike.genson.Genson;
+import com.owlike.genson.TransformationException;
+import pt.estgp.estgweb.domain.CourseUnit;
+import pt.estgp.estgweb.domain.dao.DaoFactory;
+import pt.utl.ist.berserk.logic.serviceManager.IService;
+import java.io.IOException;
+import java.io.Serializable;
+/**
+ * Created by jorgemachado on 22/03/16.
+ */
+public class EntityServiceJson implements IService
+{
+    static Genson courseUnitGenson = new Genson.Builder()
+            .exclude(Object.class)
+            .include("id", CourseUnit.class)
+            .include("semestre", CourseUnit.class)
+            .include("name", CourseUnit.class)
+            .include("code", CourseUnit.class)
+            .include("courseName", CourseUnit.class)
+            .include("courseYear",CourseUnit.class)
+            .include("importYear", CourseUnit.class)
+            .include("institutionCode", CourseUnit.class)
+            .create();
+    public String courseUnit(Serializable s) throws IOException, TransformationException {
+        CourseUnit cu = DaoFactory.getCourseUnitDaoImpl().get(s);
+        return courseUnitGenson.serialize(cu);
+    }
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/QuestionarioImpl.java
 ,6 → 2,7
 import org.apache.log4j.Logger;
 import pt.estgp.estgweb.Globals;
+import pt.estgp.estgweb.domain.dao.DaoFactory;
 import pt.estgp.estgweb.domain.utils.SimpleClearanceRuledSupport;
 import pt.estgp.estgweb.utils.ConfigProperties;
 ,6 → 221,8
         if((usession.getUser().isSuperuserOrAdmin() || usession.getUser().hasRole(Globals.QUESTIONARIOS_ADMIN)))
         {
+            s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SEE_FORM.name(),usession);
+            s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SEE_ADMIN.name(),usession);
             if(getStateEnum() == QuestionarioImpl.State.CREATED &&
                     getQuestionarioHistoryDrive() != null &&
                     getiAnswersProcessorClass() != null)
 ,7 → 237,25
             {
                 s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SAVE_FORM.name(),usession);
                 s.addClearance(QuestionarioImpl.QuestionarioClearancesOperation.QUESTIONARIO_SET_ANO_SEMESTRE.name(),usession);
+                s.addClearance(QuestionarioClearancesOperation.QUESTIONARIO_SCHEDULLE_SEE_SELECT_COURSES.name(),usession);
+                if(getCourseSelectionTaskId() <= 0)
+                    s.addClearance(QuestionarioClearancesOperation.QUESTIONARIO_SCHEDULLE_SELECT_COURSES.name(),usession);
+                else
+                {
+                    JobServiceTask task = DaoFactory.getJobServiceTaskDaoImpl().load(getCourseSelectionTaskId());
+                    if(task.isExecuted() || (task.getSaveDate() != null &&
+                            System.currentTimeMillis()-task.getSaveDate().getTime()>1800000)) //half hour blocked
+                    {
+                        task.setExecuted(true);
+                        s.addClearance(QuestionarioClearancesOperation.QUESTIONARIO_SCHEDULLE_SELECT_COURSES.name(),usession);
+                    }
+                }
             }
+            if(getStateEnum() == State.ASSIGNING_ANSWERS_PROCESSEMENT)
+            {
+            }
         }
         setClearanceRuledSupport(s);
     }
 ,11 → 264,16
     {
         QUESTIONARIO_SAVE_FORM,
+        QUESTIONARIO_SEE_FORM,
+        QUESTIONARIO_SEE_ADMIN,
         QUESTIONARIO_SAVE_ANSWER_PROCESSOR,
         QUESTIONARIO_SET_STATE_ASSIGNATION_DETAILS,
         QUESTIONARIO_SET_ANO_SEMESTRE,
-        QUESTIONARIO_DELETE
+        QUESTIONARIO_DELETE,
+        /*Pedagogico Cursos*/
+        QUESTIONARIO_SCHEDULLE_SELECT_COURSES,
+        QUESTIONARIO_SCHEDULLE_SEE_SELECT_COURSES
         ;
         public static QuestionarioClearancesOperation parse(String clearance)

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitTurmaDaoImpl.java
 ,5 → 1,11
 package pt.estgp.estgweb.domain.dao.impl;
+import org.hibernate.criterion.Projections;
+import java.util.List;
+import static org.hibernate.criterion.Restrictions.eq;
 /**
  * @author Jorge Machado
  * @date 28/Fev/2008
 ,4 → 20,55
             myInstance = new CourseUnitTurmaDaoImpl();
         return (CourseUnitTurmaDaoImpl) myInstance;
     }
+    /**
+     * Return pairs [String,Integer,Integer]
+     *              turma,countUnits,students
+     * @param courseId
+     * @param importYear
+     * @return
+     */
+    public List<Object[]> loadByCourse(long courseId, String importYear) {
+        List o =  createCriteria()
+                .setProjection(Projections.projectionList()
+                        .add(Projections.groupProperty("turma"))
+                        .add(Projections.countDistinct("courseUnit.id"))
+                        .add(Projections.countDistinct("student.id")))
+                .createAlias("courseUnit", "courseUnit")
+                .createAlias("students", "student")
+                .add(eq("courseUnit.importYear", importYear))
+                .add(eq("courseUnit.course.id", courseId))
+                .list();
+        return o;
+    }
+    /**
+     * Turma
+     * Ano
+     * CourseUnitName
+     * code
+     * CourseCode
+     * CourseName
+     * Students
+     * @param courseUnitId
+     * @return
+     */
+    public List<Object[]> loadByCourseUnit(long courseUnitId) {
+        List o = createCriteria()
+                .setProjection(Projections.projectionList()
+                        .add(Projections.groupProperty("turma"))
+                        .add(Projections.property("courseUnit.importYear"))
+                        .add(Projections.property("courseUnit.name"))
+                        .add(Projections.property("courseUnit.courseName"))
+                        .add(Projections.property("courseUnit.courseCode"))
+                        .add(Projections.countDistinct("student.id"))
+                        .add(Projections.property("courseUnit.course.id")))
+                .createAlias("courseUnit", "courseUnit")
+                .createAlias("students", "student")
+                .add(eq("courseUnit.id", courseUnitId))
+                .list();
+        return o;
+    }
 }

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/dao/impl/CourseDaoImpl.java
 ,13 → 2,11
 import org.hibernate.Criteria;
 import org.hibernate.Query;
-import org.hibernate.criterion.Criterion;
-import org.hibernate.criterion.Expression;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Projections;
+import org.hibernate.criterion.*;
 import pt.estgp.estgweb.domain.Course;
 import pt.estgp.estgweb.domain.CourseImpl;
 import pt.estgp.estgweb.domain.CourseUnit;
+import pt.estgp.estgweb.domain.CourseUnitTurma;
 import pt.estgp.estgweb.domain.dao.DaoFactory;
 import pt.estgp.estgweb.domain.dao.DaoUtils;
 import pt.estgp.estgweb.services.common.SearchTypeEnum;
 ,13 → 53,31
     public int countCoursesUnits(String importYear,long courseId)
     {
-        return createCriteria()
+  /*      return createCriteria()
                 .createAlias("courseUnits", "c")
                 .setProjection(Projections.property("c.id"))
                 .add(eq("c.importYear", importYear))
                 .add(eq("id", courseId))
                 .list().size();
-    }
+*/
+        return (Integer) createCriteria(CourseUnit.class)
+                .setProjection(Projections.rowCount())
+                .add(eq("importYear",importYear))
+                .add(eq("course.id",courseId))
+                .uniqueResult();
+    }
+    public int countCoursesUnitsTurmas(String importYear,long courseId)
+    {
+        return (Integer) createCriteria(CourseUnitTurma.class)
+                .setProjection(Projections.countDistinct("turma"))
+                .createAlias("courseUnit", "courseUnit")
+                .add(eq("courseUnit.importYear",importYear))
+                .add(eq("courseUnit.course.id",courseId))
+                .uniqueResult();
+    }
     public int countCoursesUnitsNot(String importYear,long courseId)
     {
         return createCriteria()
 ,6 → 200,10
                         .add(Expression.isNotNull("institutionCode"))
                         .list();
     }
+    public List<Course> findCoursesWithUnitsIn(String importYear,String institutionCode, String semestre)
+    {
+        return findAllOrderByName(importYear,null,null,institutionCode,semestre);
+    }
     public List<Course> findCoursesWithUnitsIn(String importYear,String institutionCode)
     {
         return findAllOrderByName(importYear,null,null,institutionCode);
 ,6 → 216,10
     public List<Course> findAllOrderByName(String importYear, String area, String type,String institutionCode)
     {
+        return findAllOrderByName(importYear,area,type,institutionCode,null);
+    }
+    public List<Course> findAllOrderByName(String importYear, String area, String type,String institutionCode, String semestre)
+    {
         String query = "select distinct c from c in class Course join c.courseUnits cu where ";
         String logic = " ";
 ,6 → 243,11
             query += logic + "c.degree = :degree ";
             logic = " and ";
         }
+        if (semestre != null && semestre.length() > 0)
+        {
+            query += logic + "cu.semestre = :semestre ";
+            logic = " and ";
+        }
         query += " order by c.name asc";
         Query q = getCurrentSession().createQuery(query);
 ,6 → 267,10
         {
             q.setString("degree",type);
         }
+        if (semestre != null && semestre.length() > 0)
+        {
+            q.setString("semestre",semestre);
+        }
        /* c.setProjection(Projections.projectionList()
                             .add(Projections.distinct(Projections.id())));*/
         return q.list();

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitDaoImpl.java
 ,6 → 52,17
         return createCriteria().add(eq("importYear", importYear)).add(eq("course.id", course)).list();
     }
+    public List<CourseUnit> loadByCourseTurma(long courseId, String importYear, String turma) {
+        List o =  createCriteria()
+                .setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY)
+                .createAlias("turmas", "turma")
+                .add(eq("importYear",importYear))
+                .add(eq("course.id", courseId))
+                .add(eq("turma.turma", turma))
+                .list();
+        return o;
+    }
     public List<CourseUnit> load(String importYear, String semestre)
     {
         return createCriteria().add(eq("importYear", importYear)).add(eq("semestre", semestre)).list();

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/form/questionarios/QuestionarioForm.java
 ,7 → 27,16
     private boolean showQuestionarioForm = false;
+    private String[] coursesSelectedIds;
+    public String[] getCoursesSelectedIds() {
+        return coursesSelectedIds;
+    }
+    public void setCoursesSelectedIds(String[] coursesSelectedIds) {
+        this.coursesSelectedIds = coursesSelectedIds;
+    }
     public boolean isShowQuestionarioForm() {
         return showQuestionarioForm;
     }

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/questionarios/QuestionarioCourseSelectionController.java
 New file
 ,0 → 1,54
+package pt.estgp.estgweb.web.controllers.questionarios;
+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.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;
+/**
+ * Created by jorgemachado on 21/03/16.
+ */
+public class QuestionarioCourseSelectionController extends QuestionarioController
+{
+    private static final Logger logger = Logger.getLogger(QuestionarioCourseSelectionController.class);
+    public ActionForward selectCourses(ActionMapping mapping,
+                                        ActionForm form,
+                                        HttpServletRequest request,
+                                        HttpServletResponse response)
+            throws Throwable
+    {
+        QuestionarioForm frm = (QuestionarioForm) form;
+        if(frm.getCoursesSelectedIds() == null)
+        {
+            addError(request,"questionario.no.courses.selected");
+            return mapping.findForward("coursesSelection");
+        }
+        IServiceManager sm = ServiceManager.getInstance();
+        String[] names = {"questionarioId","selectedCourses"};
+        Object[] args = {frm.getQuestionario().getId(),frm.getCoursesSelectedIds()};
+        QuestionarioImpl q = (QuestionarioImpl) sm.execute(RequestUtils.getRequester(request, response),"RunJobSelectCourses",args,names);
+        frm.setQuestionario(q);
+        addMessage(request,"questionarios.courses.start");
+        return mapping.findForward("admin");
+    }
+}

/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/Questionarios.hbm.xml
 ,7 → 183,14
         <property name="state" type="string">
             <column name="state" default="'CREATED'"/>
         </property>
+        <property name="substate" type="string"/>
+        <!--Modulo de Pedagogico-->
+        <property name="courseSelectionTaskId" type="long">
+            <column name="course_selection_task_id" default="0"/>
+        </property>
+        <!--Modulo de Pedagogico-->
         <many-to-one name="questionarioHistoryDrive" class="pt.estgp.estgweb.domain.QuestionarioHistoryDrive" lazy="proxy" outer-join="false"/>
         <subclass name="pt.estgp.estgweb.domain.QuestionarioImpl" discriminator-value="QuestionarioImpl"/>

 /branches/v3/impl/src/web/admin/questionarios/questionariosList.jsp
 ,28 → 55,32
                         <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>
+                            <baco:clearOperation name="q" op="QUESTIONARIO_SEE_ADMIN">
+                                <html:link styleClass="btn btn-default" action="/admin/adminQuestionario?questionario.id=${q.id}">Admin</html:link></td>
+                            </baco:clearOperation>
                         <td>
-                            <%
-                                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-success">Terminado</html:link>
-                            <%
-                                }
-                            %>
+                            <baco:clearOperation name="q" op="QUESTIONARIO_SEE_FORM">
+                                <%
+                                    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-success">Terminado</html:link>
+                                <%
+                                    }
+                                %>
+                            </baco:clearOperation>
                         </td>
                         <td>
                             <logic:equal name="q" property="state" value="OLAP">

 /branches/v3/impl/src/web/admin/questionarios/pedagogicoEstudante/pedagogicoEstudanteCoursesSelection.jsp
 ,6 → 1,4
 <%@ 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" %>
 ,6 → 6,8
 <%@ page import="pt.utl.ist.berserk.logic.serviceManager.IServiceManager" %>
 <%@ page import="pt.utl.ist.berserk.logic.serviceManager.ServiceManager" %>
 <%@ page import="java.util.List" %>
+<%@ page import="pt.estgp.estgweb.web.form.configuration.SchedulleTasksForm" %>
+<%@ page import="pt.estgp.estgweb.domain.*" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
 <%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %>
 ,6 → 22,7
     String[] names = {"questionarioId"};
     Object[] args = {questionarioId};
     QuestionarioImpl questionario = (QuestionarioImpl) sm.execute(RequestUtils.getRequester(request, response),"loadQuestionarioAdmin",args,names);
     request.setAttribute("Questionario", questionario);
 ,6 → 32,7
     List<String> institutionCodes = ConfigProperties.getListValues("questionario.instituition.");
 %>
+<html:form action="/admin/questionariosPaeSelectCourses">
 <div class="container-fluid">
     <script>
         function selectAll(code,source)
 ,19 → 44,79
                     });
         }
     </script>
+<div class="panel panel-primary">
+    <div class="panel-heading">
+        Selecção de Cursos para o Questionário ${Questionario.id} - Periodo: ${Questionario.semestre} de ${Questionario.year}
+    </div>
+    <div class="panel-body">
+        <html:errors/>
+        <jomm:messages/>
+        <ul class="nav nav-tabs">
+            <%
+                for(String institutionCode: institutionCodes)
+                {
+                    String institutionName = ConfigProperties.getProperty("institution.code." + institutionCode);
+            %>
+                <li id="institutionsSeparators<%=institutionCode%>"><a href="javascript:showInstitutionCode('<%=institutionCode%>')"><%=institutionName%></a></li>
+            <%
+                }
+            %>
+            <li id="institutionsSeparatorsGerarFinal"><a href="javascript:showInstitutionCode('GerarFinal')"><strong><u>Confirmar</u></strong></a></li>
+        </ul>
+        <script>
+            $(document).ready(
+                    function(){
+                        showInstitutionCode('<%=institutionCodes.get(0)%>');
+                    }
+            );
+            function showInstitutionCode(institutionCode)
+            {
+                <%
+                for(String institutionCode: institutionCodes)
+                {
+                %>
+                    if(institutionCode == '<%=institutionCode%>')
+                    {
+                        $("#institution<%=institutionCode%>").show();
+                        $("#institutionsSeparators<%=institutionCode%>").addClass("active");
+                    }
+                    else
+                    {
+                        $("#institution<%=institutionCode%>").hide();
+                        $("#institutionsSeparators<%=institutionCode%>").removeClass("active");
+                    }
+                <%
+                }
+                %>
+                if(institutionCode == 'GerarFinal')
+                {
+                    $("#institutionGerarFinal").show();
+                    $("#institutionsSeparatorsGerarFinal").addClass("active");
+                }
+                else
+                {
+                    $("#institutionGerarFinal").hide();
+                    $("#institutionsSeparatorsGerarFinal").removeClass("active");
+                }
+            }
+        </script>
 <%
     for(String institutionCode: institutionCodes)
     {
         String institutionName = ConfigProperties.getProperty("institution.code." + institutionCode);
-        List<Course> courses = DaoFactory.getCourseDaoImpl().findCoursesWithUnitsIn(questionario.getYear(),institutionCode);
+        List<Course> courses = DaoFactory.getCourseDaoImpl().findCoursesWithUnitsIn(questionario.getYear(),institutionCode,questionario.getSemestre());
 %>
-    <div class="panel panel-default" id="institution<%=institutionCode%>">
-        <div class="panel-heading">
+        <div class="panel panel-default" id="institution<%=institutionCode%>">
+            <div class="panel-heading">
             Cursos da <%=institutionName%>
         </div>
-        <div class="panel-body">
-            <table class="tablesorterfiltered">
+            <div class="panel-body">
+                <table class="tablesorterfiltered">
                 <thead>
                 <tr>
                     <th>Codigo</th>
 ,6 → 124,7
                     <th>Curso</th>
                     <th>Papel Comissão Curso</th>
                     <th>Unidades</th>
+                    <th>Turmas</th>
                     <th class="filter-false" data-sorter="false">
                         <input type="checkbox" onchange="selectAll('<%=institutionCode%>',this)">
                     </th>
 ,6 → 135,7
                     for(Course course: courses)
                     {
                         int unitsSize=DaoFactory.getCourseDaoImpl().countCoursesUnits(questionario.getYear(), course.getId());
+                        int turmasSize = DaoFactory.getCourseDaoImpl().countCoursesUnitsTurmas(questionario.getYear(), course.getId());
                         CourseView cv = new CourseView(course);
                         request.setAttribute("CourseView",cv);
                 %>
 ,26 → 151,93
                                     Papel não atribuido (Corrigir Situação)
                                 </logic:empty>
                             </td>
-                            <td><%=unitsSize%></td>
                             <td>
-                                <input class="courseCheck" type="checkbox" />
+                                <a href="#" data-href="<%=request.getContextPath()%>/admin/questionarios/pedagogicoEstudante/listCourseUnits.jsp?importYear=${CourseView.importYear}&courseId=${CourseView.id}" data-title="Unidades do Curso de ${CourseView.name} (${CourseView.code})" data-toggle="modal" data-target="#modalAjaxRequest">
+                                    <%=unitsSize%>
+                                </a>
                             </td>
+                            <td>
+                                <a href="#" data-href="<%=request.getContextPath()%>/admin/questionarios/pedagogicoEstudante/listCourseUnitsTurmas.jsp?importYear=${CourseView.importYear}&courseId=${CourseView.id}" data-title="Turmas do Curso de ${CourseView.name} (${CourseView.code})" data-toggle="modal" data-target="#modalAjaxRequest">
+                                    <%=turmasSize%>
+                                </a>
+                            </td>
+                            <td>
+                                <html:multibox property="coursesSelectedIds" value="${CourseView.id}" styleClass="courseCheck"/>
+                            </td>
                         </tr>
                 <%
                     }
                 %>
                 </tbody>
             </table>
+            </div>
         </div>
-    </div>
 <%
     }
 %>
+        <div class="panel panel-default" id="institutionGerarFinal">
+            <div class="panel-heading">
+                Atribuição de Cursos e Unidades ao Questionário
+            </div>
+            <div class="panel-body">
+                <baco:clearOperation name="Questionario" op="QUESTIONARIO_SCHEDULLE_SELECT_COURSES">
+                        <div class="alert alert-warning">Esta operação vai associar todos os cursos seleccionados e respectivas unidades curriculares
+                            ao questionário ${Questionario.id} criado para o periodo ${Questionario.semestre} de ${Questionario.year}</div>
+                        <div class="alert alert-info alert-small">Esta operação poderá ser revertida ou então repetida para atualizar os cursos alvo do questionário</div>
+                        <div class="alert alert-info alert-small">Esta operação poderá demorar alguns instantes</div>
+                        <html:hidden property="questionario.id" value="${Questionario.id}"/>
+                        <input type="hidden" name="questionarioId" value="${Questionario.id}"/>
+                        <input type="hidden" name="dispatch" value="selectCourses"/>
+                        <button class="btn btn-warning btn-lg" type="button" onclick="this.form.submit()">Associar Cursos e Unidades Curriculares</button>
+                </baco:clearOperation>
+                <baco:notClearOperation name="Questionario" op="QUESTIONARIO_SCHEDULLE_SELECT_COURSES">
+                    <baco:notClearOperation name="Questionario" op="QUESTIONARIO_SCHEDULLE_SEE_SELECT_COURSES">
+                        <div class="alert alert-warning">Não têm autorização para ver esta secção</div>
+                    </baco:notClearOperation>
+                </baco:notClearOperation>
+                <baco:clearOperation name="Questionario" op="QUESTIONARIO_SCHEDULLE_SEE_SELECT_COURSES">
+                    <div class="alert alert-warning">O sistema agendou a atribuição de cursos e unidades ao questionário ${Questionario.id} criado para o periodo ${Questionario.semestre} de ${Questionario.year}. Veja o progresso em baixo, caso não termine no final de 30 minutos esta tarefa ficará de novo disponivel</div>
+                    <%
+                        if(questionario.getCourseSelectionTaskId() > 0)
+                        {
+                            JobServiceTask job = DaoFactory.getJobServiceTaskDaoImpl().load(questionario.getCourseSelectionTaskId());
+                            SchedulleTasksForm schedulleTasksForm = new SchedulleTasksForm();
+                            schedulleTasksForm.setJobServiceTask((JobServiceTaskImpl) job);
+                            schedulleTasksForm.setId(job.getId());
+                            request.setAttribute("SchedulleTasksForm",schedulleTasksForm);
+                    %>
+                    <div>
+                        <jsp:include page="/admin/configuration/taskLog.jsp"/>
+                    </div>
+                    <%
+                    }
+                    else
+                    {
+                    %>
+                    <div class="alert alert-danger">O sistema não conseguiu encontrar a tarefa de atribuição nas tarefas agendadas, por favor verifique em todos os logs de tarefas <html:link action="/user/configurationJobTasks">Aqui</html:link> </div>
+                    <%
+                        }
+                    %>
+                    <div>
+                    </div>
+                </baco:clearOperation>
+            </div>
+        </div>
+        </div>
+    </div>
 </div>
 <%
     AbstractDao.getCurrentSession().getTransaction().commit();
 %>
+</html:form>

 /branches/v3/impl/src/web/admin/questionarios/pedagogicoEstudante/topnavQuestionarioPedagogicoCoursesAdmin.jsp
 ,12 → 2,22
 <%@page pageEncoding="UTF-8"%>
 <%@page import="jomm.web.utils.NavPlaceServer"%>
 <%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.domain.QuestionarioImpl" %>
+<%@ 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" %>
 <%
     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);
     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");
+    topNav.addNavPlace("/admin/adminQuestionario.do?questionario.id=" + questionarioId, "survey.admin",""+questionario.getId());
+    topNav.addNavPlace(null, "questionarios.choose.courses",questionario.getSemestre(),questionario.getYear());
 %>
 <jsp:include page="/layout/topnav.jsp"/>

 /branches/v3/impl/src/web/admin/questionarios/pedagogicoEstudante/listCunitTurmas.jsp
 New file
 ,0 → 1,69
+<%@ page import="jomm.dao.impl.AbstractDao" %>
+<%@ page import="pt.estgp.estgweb.domain.CourseUnitTurma" %>
+<%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
+<%@ page import="java.util.List" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
+<%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
+<%
+    Long courseUnitId = Long.parseLong(request.getParameter("courseUnitId"));
+    AbstractDao.getCurrentSession().beginTransaction();
+    List<Object[]> turmas = DaoFactory.getCourseUnitTurmaDaoImpl().loadByCourseUnit(courseUnitId);
+        /**
+         *  .add(Projections.groupProperty("turma"))
+         .add(Projections.groupProperty("courseUnit.importYear"))
+         .add(Projections.groupProperty("courseUnit.name"))
+         .add(Projections.groupProperty("courseUnit.courseName"))
+         .add(Projections.groupProperty("courseUnit.courseCode"))
+         .add(Projections.countDistinct("student.id"))
+         .add(Projections.countDistinct("courseUnit.course.id")))
+         */
+%>
+<table class="tablesorterfiltered">
+    <thead>
+        <tr>
+            <th>Turma</th>
+            <th>Ano</th>
+            <th>Students</th>
+        </tr>
+    </thead>
+    <tbody>
+        <%
+            for(Object[] cturma : turmas)
+            {
+                String turma = (String) cturma[0];
+                String importYear = (String) cturma[1];
+                String unidade = (String) cturma[2];
+                String courseName = (String) cturma[3];
+                String courseCode = (String) cturma[4];
+                Integer students = (Integer) cturma[5];
+                Long courseId = (Long) cturma[6];
+        %>
+            <tr>
+                <td>
+                    <a href="#" class="reloadAjaxRequestModal" data-href="<%=request.getContextPath()%>/admin/questionarios/pedagogicoEstudante/listTurmasCourseUnits.jsp?importYear=<%=importYear%>&courseId=<%=courseId%>&turma=<%=turma%>" data-title="Unidades com a turma <%=turma%> do Curso de <%=courseName%> (<%=courseCode%>)">
+                        <%=turma%>
+                    </a>
+                </td>
+                <td><%=importYear%></td>
+                <td><%=students%></td>
+            </tr>
+        <%
+            }
+        %>
+    </tbody>
+</table>
+<%
+    AbstractDao.getCurrentSession().getTransaction().commit();
+%>

 /branches/v3/impl/src/web/admin/questionarios/pedagogicoEstudante/listCourseUnitsTurmas.jsp
 New file
 ,0 → 1,58
+<%@ page import="jomm.dao.impl.AbstractDao" %>
+<%@ page import="pt.estgp.estgweb.domain.Course" %>
+<%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
+<%@ page import="java.util.List" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
+<%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
+<%
+    long courseId = Long.parseLong(request.getParameter("courseId"));
+    String importYear = request.getParameter("importYear");
+    String courseUnitId = request.getParameter("courseUnitId");
+    AbstractDao.getCurrentSession().beginTransaction();
+    List<Object[]> courseUnitTurmas = DaoFactory.getCourseUnitTurmaDaoImpl().loadByCourse(courseId, importYear);
+    Course course = DaoFactory.getCourseDaoImpl().load(courseId);
+%>
+<table class="tablesorterfiltered">
+    <thead>
+        <tr>
+            <th>Ano</th>
+            <th>Turma</th>
+            <th>Unidades</th>
+            <th>Estudantes</th>
+        </tr>
+    </thead>
+    <tbody>
+        <%
+            for(Object[] pair : courseUnitTurmas)
+            {
+                String turma = (String) pair[0];
+                Integer count = (Integer) pair[1];
+                Integer students = (Integer) pair[2];
+        %>
+            <tr>
+                <td><%=importYear%></td>
+                <td><%=turma%></td>
+                <td>
+                    <a href="#" class="reloadAjaxRequestModal" data-href="<%=request.getContextPath()%>/admin/questionarios/pedagogicoEstudante/listTurmasCourseUnits.jsp?importYear=<%=importYear%>&courseId=<%=courseId%>&turma=<%=turma%>" data-title="Unidades com a turma <%=turma%> do Curso de <%=course.getName()%> (<%=course.getCode()%>)">
+                        <%=count%>
+                    </a>
+                </td>
+                <td><%=students%></td>
+            </tr>
+        <%
+            }
+        %>
+    </tbody>
+</table>
+<%
+    AbstractDao.getCurrentSession().getTransaction().commit();
+%>

 /branches/v3/impl/src/web/admin/questionarios/pedagogicoEstudante/listTurmasCourseUnits.jsp
 New file
 ,0 → 1,59
+<%@ page import="jomm.dao.impl.AbstractDao" %>
+<%@ page import="pt.estgp.estgweb.domain.CourseUnit" %>
+<%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
+<%@ page import="java.util.List" %>
+<%@ page import="pt.estgp.estgweb.domain.CourseUnitTurma" %>
+<%@ 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 courseId = Long.parseLong(request.getParameter("courseId"));
+    String importYear = request.getParameter("importYear");
+    String turma = request.getParameter("turma");
+    AbstractDao.getCurrentSession().beginTransaction();
+    List<CourseUnit> courseUnits = DaoFactory.getCourseUnitDaoImpl().loadByCourseTurma(courseId, importYear,turma);
+    request.setAttribute("courseUnits",courseUnits);
+%>
+<table class="tablesorterfiltered">
+    <thead>
+    <tr>
+        <th>Codigo</th>
+        <th>Nome</th>
+        <th>Semestre</th>
+        <th>Curso</th>
+        <th>Codigo Curso</th>
+        <th>Turmas</th>
+    </tr>
+    </thead>
+    <tbody>
+    <logic:iterate id="courseUnit" name="courseUnits" type="pt.estgp.estgweb.domain.CourseUnit">
+        <tr>
+            <td>${courseUnit.code}</td>
+            <td>
+                <a target="_blank" href="<%=request.getContextPath()%>/user/startLoadCourseUnitFromHome.do?id=${courseUnit.id}">${courseUnit.name}</a>
+            </td>
+            <td>${courseUnit.semestre}</td>
+            <td>
+                <a class="reloadAjaxRequestModal" href="#" data-href="<%=request.getContextPath()%>/admin/questionarios/pedagogicoEstudante/listCourseUnitsTurmas.jsp?importYear=${courseUnit.importYear}&courseId=<%=courseId%>" data-title="Turmas do Curso de ${courseUnit.courseName} (${courseUnit.courseCode})">
+                        ${courseUnit.courseName}
+                </a>
+            </td>
+            <td>${courseUnit.courseCode}</td>
+            <td>
+                <a class="reloadAjaxRequestModal" href="#" data-href="<%=request.getContextPath()%>/admin/questionarios/pedagogicoEstudante/listCunitTurmas.jsp?courseUnitId=${courseUnit.id}" data-title="Turmas da Unidade ${courseUnit.name} (${courseUnit.code}) do curso de ${courseUnit.courseName} (${courseUnit.courseCode})">
+                   <%=courseUnit.getTurmas().size()%>
+                </a>
+            </td>
+        </tr>
+    </logic:iterate>
+    </tbody>
+</table>
+<%
+    AbstractDao.getCurrentSession().getTransaction().commit();
+%>

 /branches/v3/impl/src/web/admin/questionarios/pedagogicoEstudante/listCourseUnits.jsp
 New file
 ,0 → 1,51
+<%@ page import="jomm.dao.impl.AbstractDao" %>
+<%@ page import="pt.estgp.estgweb.domain.CourseUnit" %>
+<%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
+<%@ page import="java.util.List" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
+<%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
+<%
+    long courseId = Long.parseLong(request.getParameter("courseId"));
+    String importYear = request.getParameter("importYear");
+    AbstractDao.getCurrentSession().beginTransaction();
+    List<CourseUnit> courseUnits = DaoFactory.getCourseUnitDaoImpl().loadByCourse(courseId,importYear);
+    request.setAttribute("courseUnits",courseUnits);
+%>
+<table class="tablesorterfiltered">
+    <thead>
+        <tr>
+            <th>Codigo</th>
+            <th>Nome</th>
+            <th class="filter-name filter-select">Semestre</th>
+            <th>Curso</th>
+            <th>Codigo Curso</th>
+            <th>Turmas</th>
+        </tr>
+    </thead>
+    <tbody>
+        <logic:iterate id="courseUnit" name="courseUnits" type="pt.estgp.estgweb.domain.CourseUnit">
+            <tr>
+                <td>${courseUnit.code}</td>
+                <td><a target="_blank" href="<%=request.getContextPath()%>/user/startLoadCourseUnitFromHome.do?id=${courseUnit.id}">${courseUnit.name}</a></td>
+                <td>${courseUnit.semestre}</td>
+                <td>${courseUnit.courseName}</td>
+                <td>${courseUnit.courseCode}</td>
+                <td>
+                    <a class="reloadAjaxRequestModal" href="#" data-href="<%=request.getContextPath()%>/admin/questionarios/pedagogicoEstudante/listCunitTurmas.jsp?courseUnitId=${courseUnit.id}" data-title="Turmas da Unidade ${courseUnit.name} (${courseUnit.code}) do curso de ${courseUnit.courseName} (${courseUnit.courseCode})">
+                        <%=courseUnit.getTurmas().size()%>
+                    </a>
+                 </td>
+            </tr>
+        </logic:iterate>
+    </tbody>
+</table>
+<%
+    AbstractDao.getCurrentSession().getTransaction().commit();
+%>

/branches/v3/impl/src/web/admin/configuration/taskLog.jsp
14,7 → 14,6
<jomm:messages/>
<html:errors/>

<!--<jsp:include page="/layout/scriptsBootstrapSoft.jsp"/>-->


<script>

 /branches/v3/impl/src/web/css/style.css
 ,7 → 32,13
     margin-bottom: 3px !important;
 }
+.nav-tabs li a
+{
+    text-decoration: none !important;
+    color: black !important;
+}

 /branches/v3/impl/src/web/layout/themes/scripts-default.jsp
 ,10 → 186,15
     );
-    function evaluateTableSorters(){
-        if($("#myTable"))
+    function evaluateTableSorters()
+    {
+        evaluateTableSortersInside("");
+    }
+    function evaluateTableSortersInside(insideDiv)
+    {
+        if($(insideDiv + " #myTable"))
         {
-            $("#myTable").tablesorter({
+            $(insideDiv + " #myTable").tablesorter({
                         theme: 'blue',
 ,9 → 336,9
             );
         }
-        if($("#myTable2"))
+        if($(insideDiv + " #myTable2"))
         {
-            $("#myTable2").tablesorter({
+            $(insideDiv + " #myTable2").tablesorter({
                         theme: 'blue',
                         sortMultiSortKey: 'altKey',
                         //sortList: [[0,0]],
 ,9 → 367,9
             );
         }
-        if($(".tablesortersimple"))
+        if($(insideDiv + " .tablesortersimple"))
         {
-            $(".tablesortersimple").tablesorter({
+            $(insideDiv + " .tablesortersimple").tablesorter({
                         theme: 'blue',
                         sortMultiSortKey: 'altKey',
                         //sortList: [[0,0]],
 ,9 → 429,9
          }
          );
          }*/
-        if($(".tablesorterfiltered"))
+        if($(insideDiv + " .tablesorterfiltered"))
         {
-            $(".tablesorterfiltered").tablesorter({
+            $(insideDiv + " .tablesorterfiltered").tablesorter({
                         theme: 'blue',
 ,7 → 472,7
         // External search
         // buttons set up like this:
         // <button type="button" data-filter-column="4" data-filter-text="2?%">Saved Search</button>
-        $('button[data-filter-column]').click(function(){
+        $(insideDiv + 'button[data-filter-column]').click(function(){
             /*** first method *** data-filter-column="1" data-filter-text="!son"
              add search value to Discount column (zero based index) input */
             var filters = [],
 ,12 → 482,12
             filters[col] = txt;
             // using "table.hasFilters" here to make sure we aren't targeting a sticky header
-            if($('#myTable'))
-                $.tablesorter.setFilters( $('#myTable'), filters, true ); // new v2.9
-            if($('#myTable2'))
-                $.tablesorter.setFilters( $('#myTable2'), filters, true ); // new v2.9
-            if($('.tablesorterfiltered'))
-                $.tablesorter.setFilters( $('.tablesorterfiltered'), filters, true ); // new v2.9
+            if($(insideDiv + ' #myTable'))
+                $.tablesorter.setFilters( $(insideDiv + ' #myTable'), filters, true ); // new v2.9
+            if($(insideDiv + ' #myTable2'))
+                $.tablesorter.setFilters( $(insideDiv + ' #myTable2'), filters, true ); // new v2.9
+            if($(insideDiv + ' .tablesorterfiltered'))
+                $.tablesorter.setFilters( $(insideDiv + ' .tablesorterfiltered'), filters, true ); // new v2.9
             /*
              if($('.tablesorterfiltered'))

 /branches/v3/impl/src/web/layout/headerTools.jsp
 ,3 → 82,48
         </div>
     </div>
 </div>
+<script>
+    $(document).ready(function(){
+        $('#modalAjaxRequest').on('show.bs.modal', function(e)
+        {
+            reloadAjaxRequestModal($(e.relatedTarget));
+        });
+    });
+    function reloadAjaxRequestModal(target)
+    {
+        $("#modalAjaxRequest .modal-title .title-wrap").html($(target).data('title'));
+        $("#modalAjaxRequest .contentAjaxRequest").html('Pro favor aguarde ... <img src="<%=request.getContextPath()%>/imgs/wait.gif"/>');
+        $.post($(target).data('href'), function(data) {
+            $("#modalAjaxRequest .contentAjaxRequest").html(data);
+            evaluateTableSortersInside("#modalAjaxRequest");
+            $('#modalAjaxRequest .reloadAjaxRequestModal').on("click",
+                    function(e){
+                        reloadAjaxRequestModal(e.currentTarget);
+                    }
+            );
+        });
+    }
+</script>
+<div class="modal fade" id="modalAjaxRequest" role="dialog" >
+    <div class="modal-dialog" data-width="960" style="display: block; width: 960px; margin-top: 50px;" aria-hidden="false">
+        <!-- Modal content-->
+        <div class="modal-content">
+            <div class="modal-header">
+                <h3 class="modal-title">
+                    <label class="title-wrap"></label>
+                    <button type="button" class="btn btn-danger btn-xs pull-right" data-dismiss="modal"><span class="glyphicon glyphicon-remove small"></span></button>
+                </h3>
+            </div>
+            <div class="modal-body">
+                <div class="contentAjaxRequest">
+                </div>
+                <button type="button" class="btn btn-danger" data-dismiss="modal"><bean:message key="cancel"/></button>
+            </div>
+        </div>
+    </div>
+</div>

 /branches/v3/impl/src/web/user/home/userPae.jsp
 ,7 → 11,7
 <div class="row">
     <div class="col-md-6 col-sm-12 col-xs-12">
-        <baco:hasRole role="admin,all,services">
+        <baco:hasRole role="admin,all,services,questionarios.admin">
             <div class="panel panel-primary">
                 <div class="panel-heading">Ferramentas Académicas (MODO BACO)</div>
                 <div class="panel-body">
 ,7 → 26,7
         </baco:hasRole>
     </div>
     <div class="col-md-6 col-sm-12 col-xs-12">
-        <baco:hasRole role="admin,all,services">
+        <baco:hasRole role="admin,all,services,questionarios.admin">
             <div class="panel panel-primary">
                 <div class="panel-heading">Questionários Pedagógicos</div>
                 <div class="panel-body">

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


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioTipologia.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
// Generated 22/Mar/2016 16:37:29 by Hibernate Tools 3.2.0.b9

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


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapStarQuestionarioAnswer.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
// Generated 22/Mar/2016 16:37:29 by Hibernate Tools 3.2.0.b9


import java.util.Date;

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

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapStarQuestionario.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
// Generated 22/Mar/2016 16:37:29 by Hibernate Tools 3.2.0.b9


import java.util.Date;

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

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioPergunta1_5.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
// Generated 22/Mar/2016 16:37:29 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/UrlStatDayId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
// Generated 22/Mar/2016 16:37:29 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 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
// Generated 22/Mar/2016 16:37:29 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 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
// Generated 22/Mar/2016 16:37:29 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 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
// Generated 22/Mar/2016 16:37:29 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 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
// Generated 22/Mar/2016 16:37:29 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 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
// Generated 22/Mar/2016 16:37:29 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Questionario.java
 ,5 → 1,5
 package pt.estgp.estgweb.domain;
-// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
+// Generated 22/Mar/2016 16:37:29 by Hibernate Tools 3.2.0.b9
 import java.util.Date;
 ,6 → 140,8
      private String group9Code;
      private String group10Code;
      private String state;
+     private String substate;
+     private long courseSelectionTaskId;
      private QuestionarioHistoryDrive questionarioHistoryDrive;
     public Questionario() {
 ,6 → 1058,20
     public void setState(String state) {
         this.state = state;
     }
+    public String getSubstate() {
+        return this.substate;
+    }
+    public void setSubstate(String substate) {
+        this.substate = substate;
+    }
+    public long getCourseSelectionTaskId() {
+        return this.courseSelectionTaskId;
+    }
+    public void setCourseSelectionTaskId(long courseSelectionTaskId) {
+        this.courseSelectionTaskId = courseSelectionTaskId;
+    }
     public QuestionarioHistoryDrive getQuestionarioHistoryDrive() {
         return this.questionarioHistoryDrive;
     }

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapHistoryDimension.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
// Generated 22/Mar/2016 16:37:29 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Teste.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
// Generated 22/Mar/2016 16:37:29 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 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
// Generated 22/Mar/2016 16:37:29 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 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
// Generated 22/Mar/2016 16:37:29 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 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
// Generated 22/Mar/2016 16:37:29 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 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
// Generated 22/Mar/2016 16:37:29 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 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
// Generated 22/Mar/2016 16:37:29 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 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
// Generated 22/Mar/2016 16:37:29 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 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
// Generated 22/Mar/2016 16:37:29 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 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
// Generated 22/Mar/2016 16:37:29 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioDocente.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
// Generated 22/Mar/2016 16:37:29 by Hibernate Tools 3.2.0.b9

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


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioCursoDegree.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
// Generated 22/Mar/2016 16:37:29 by Hibernate Tools 3.2.0.b9

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


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioAno.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 21/Mar/2016 21:36:05 by Hibernate Tools 3.2.0.b9
// Generated 22/Mar/2016 16:37:29 by Hibernate Tools 3.2.0.b9

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


import java.util.Date;

 /branches/v3/impl/build.properties
 ,6 → 155,9
 email.templates.dir.build=${build.dir.classes}${email.templates.dir}
 email.templates.dir.conf=${conf.dir}${email.templates.dir}
+#EMAIL SERVER SMTP GOOGLE
+email.password=DUMMY_PASSWORD_GMAIL
 #email templates
 sms.templates.dir=/template/sms
 sms.templates.dir.build=${build.dir.classes}${sms.templates.dir}

 /branches/v3/impl/build.xml
 ,6 → 465,9
             <replacefilter token="@oracle.siges.password@" value="${oracle.siges.password}"/>
             <!--System instance type specifications-->
+            <replacefilter token="@email.password@" value="${email.password}"/>
+            <replacefilter token="@test.control.var@" value="${test.control.var}"/>
             <replacefilter token="@system.theme@" value="${system.theme}"/>
             <replacefilter token="@authentication.policy.service@" value="${authentication.policy.service}"/>
             <replacefilter token="@authentication.policy.username.msg.key@" value="${authentication.policy.username.msg.key}"/>

Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1326 → Rev 1327