WebSVN - bacoAlunos - Path Comparison - /branches Rev 1504 and /branches Rev 1505

Ignore whitespace Rev 1504 → Rev 1505

 /branches/v3/impl/importRoutines.xml
 ,4 → 125,8
     <target name="loadSummariesAtsi">
         <java classname="pt.estgp.estgweb.services.sigesimports.LoadSumariesToPDF" classpath="${build.dir.classes}" classpathref="pathToToolsLib"/>
     </target>
+    <target name="updateCourseDepartments">
+        <java classname="pt.estgp.estgweb.services.courses.UpdateDepartmentsTask" classpath="${build.dir.classes}" classpathref="pathToToolsLib"/>
+    </target>
 </project>

 /branches/v3/impl/conf/language/MessageResources.properties
 ,6 → 1067,7
 course.studies.plan=Plano de Estudos
 course.studies.plan.users=Plano de Estudos
 course.studies.plan.not.available=Não disponivel
+course.studies.plan.saved=Plano de Estudos Salvo com Sucesso
 course.courseunit.program.objectives.todo={0} Unidades em Falta (Ficha)
 course.externalSite=Site Externo
 #course.studies.plan=Plano de Estudos
 ,6 → 1151,9
 course.list=Listagem de Cursos
 course.course.units=Listagem de Unidades Curriculares
+course.admin.studyplans=Administração de Planos de Estudo
+course.studies.plan.added=Plano de estudos adicionado, por favor edite para completar
+course.admin.studyplans.edit=Edição de Plano de Estudos
 ################################################################################
 #
 # COURSE UNITS MESSAGE RESOURCES

 /branches/v3/impl/conf/WEB-INF/struts/struts-courses.xml
 ,6 → 8,7
     <form-beans>
         <form-bean type="pt.estgp.estgweb.web.form.courses.CourseForm" name="CourseForm"/>
+        <form-bean type="pt.estgp.estgweb.web.form.courses.CourseStudiesPlansAdminForm" name="CourseStudiesPlansAdminForm"/>
     </form-beans>
     <global-exceptions>
 ,7 → 101,21
+        <!--Studies Plans-->
+        <action path="/user/adminStudyPlans" forward="page.admin.course.studyplans"/>
+        <action path="/user/adminStudyPlansEdit" forward="page.admin.course.studyplans.edit"/>
+        <action path="/user/courseControllerStudiesPlan"
+                type="pt.estgp.estgweb.web.controllers.courses.CoursesController"
+                name="CourseStudiesPlansAdminForm"
+                scope="request"
+                parameter="dispatch"
+                validate="false"
+                input="page.welcome">
+            <forward name="loadstudyplans" path="page.admin.course.studyplans"/>
+            <forward name="adminStudyPlans" path="page.admin.course.studyplans"/>
+        </action>
     </action-mappings>
 </struts-config>

 /branches/v3/impl/conf/WEB-INF/struts/tiles-courses.xml
 ,4 → 113,20
         <put name="body" value="/user/contacts/listCourseComissionStudents.jsp"/>
     </definition>
+    <!--Studies Plans-->
+    <definition name="page.admin.course.studyplans" extends="base.separators.semleft">
+        <put name="title" value="Administração de Planos de Estudos"/>
+        <put name="topnav" value="/user/courses/topnavPlansAdminFromCourseEdit.jsp"/>
+        <put name="body" value="/user/courses/studiesPlansAdministration.jsp"/>
+    </definition>
+    <definition name="page.admin.course.studyplans.edit" extends="base.separators.semleft">
+        <put name="title" value="Edição de Planos de Estudos"/>
+        <put name="topnav" value="/user/courses/topnavPlanEditFromCourseEdit.jsp"/>
+        <put name="body" value="/user/courses/studiesPlansAdministrationEdit.jsp"/>
+    </definition>
 </tiles-definitions>

 /branches/v3/impl/conf/berserk/sd.xml
 ,7 → 1468,54
             <chain name="Logger"/>
         </filterChains>
     </service>
     <service>
+        <name>LoadCourseByCodeAndStudiesPlans</name>
+        <implementationClass>pt.estgp.estgweb.services.courses.CoursesService</implementationClass>
+        <description>Load course by String code</description>
+        <isTransactional>true</isTransactional>
+        <defaultMethod>loadCourseByCodeAndStudiesPlans</defaultMethod>
+        <filterChains>
+            <chain name="Logger"/>
+        </filterChains>
+    </service>
+    <service>
+        <name>LoadCourseAndStudiesPlans</name>
+        <implementationClass>pt.estgp.estgweb.services.courses.CoursesService</implementationClass>
+        <description>Load course by String code</description>
+        <isTransactional>true</isTransactional>
+        <defaultMethod>loadCourseAndStudiesPlans</defaultMethod>
+        <filterChains>
+            <chain name="Logger"/>
+        </filterChains>
+    </service>
+    <service>
+        <name>AddNewStudiesPlan</name>
+        <implementationClass>pt.estgp.estgweb.services.courses.CoursesService</implementationClass>
+        <description>Load course by String code</description>
+        <isTransactional>true</isTransactional>
+        <defaultMethod>addNewStudiesPlan</defaultMethod>
+        <filterChains>
+            <chain name="Logger"/>
+            <chain name="Session"/>
+            <chain name="Admins"/>
+        </filterChains>
+    </service>
+    <service>
+        <name>SavePlanoEstudos</name>
+        <implementationClass>pt.estgp.estgweb.services.courses.CoursesService</implementationClass>
+        <description>Load course by String code</description>
+        <isTransactional>true</isTransactional>
+        <defaultMethod>savePlanoEstudosEditado</defaultMethod>
+        <filterChains>
+            <chain name="Logger"/>
+            <chain name="Session"/>
+            <chain name="Admins"/>
+        </filterChains>
+    </service>
+    <service>
         <name>SubmitCourse</name>
         <implementationClass>pt.estgp.estgweb.services.courses.CoursesService</implementationClass>
         <description>Create or Update a new course</description>

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/courses/CoursesService.java
 ,10 → 29,7
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
+import java.io.*;
 import java.net.URL;
 import java.util.*;
 ,48 → 54,61
     RepositoryService repositoryService = new RepositoryService();
-    public CourseView loadCourse(long id, boolean initUnits) throws ServiceException
+    /**
+     * Servico e subservico para termos acesso as variaveis de controlo
+     * @param id
+     * @param initUnits
+     * @return
+     * @throws ServiceException
+     */
+    public CourseView loadCourse(long id, boolean initUnits)
+            throws ServiceException
     {
+        return loadCourse(id,initUnits,false);
+    }
+    public CourseView loadCourseAndStudiesPlans(long id, boolean initUnits)
+            throws ServiceException
+    {
+        return loadCourse(id,initUnits,true);
+    }
+    private CourseView loadCourse(long id, boolean initUnits,boolean loadStudiesPlans) throws ServiceException
+    {
         Course c = DaoFactory.getCourseDaoImpl().get(id);
         if(c != null)
         {
-            CourseView cV = new CourseView(c,initUnits);
-            if(c.getStudiesPlan() != null)
-            {
-                RepositoryFileImpl repositoryFile = repositoryService.loadView(c.getStudiesPlan());
-                cV.setStudiesPlan(repositoryFile);
-            }
-            return cV;
+            return getCourseView(initUnits, c,loadStudiesPlans);
         }
         return null;
     }
-    public List<String> loadImportYears(UserSession userSession) throws ServiceException
+    /**
+     * Servico e subservico para termos acesso as variaveis de controlo
+     * @param code
+     * @param initUnits
+     * @return
+     * @throws ServiceException
+     */
+    public CourseView loadCourseByCode(String code, boolean initUnits) throws ServiceException
     {
-        List<String> importYears = DaoFactory.getCourseDaoImpl().loadImportYears();
-        List<String> imStrings = new ArrayList<String>();
-        for(String importYear: importYears)
-        {
-            imStrings.add(importYear);
-        }
-        return imStrings;
+        return loadCourseByCode(code,initUnits,false);
     }
+    public CourseView loadCourseByCodeAndStudiesPlans(String code, boolean initUnits) throws ServiceException
+    {
+        return loadCourseByCode(code,initUnits,true);
+    }
-    public CourseView loadCourseByCode(String code, boolean initUnits) throws ServiceException
+    private CourseView loadCourseByCode(String code, boolean initUnits,boolean loadStudiesPlans) throws ServiceException
     {
         try{
             Course c = DaoFactory.getCourseDaoImpl().findCourseByCode(code);
             if(c != null)
             {
-                CourseView cV = new CourseView(c,initUnits);
-                if(c.getStudiesPlan() != null)
-                {
-                    RepositoryFileImpl repositoryFile = repositoryService.loadView(c.getStudiesPlan());
-                    cV.setStudiesPlan(repositoryFile);
-                }
-                return cV;
+                return getCourseView(initUnits, c, loadStudiesPlans);
             }
         }
         catch(Throwable e)
 ,6 → 119,47
         return null;
     }
+    /**
+     * Carrega efetivamente o curso nos servicos load e load by code
+     * @param initUnits
+     * @param c
+     * @return
+     */
+    private CourseView getCourseView(boolean initUnits, Course c,boolean loadStudiesPlans) {
+        CourseView cV = new CourseView(c,initUnits);
+            /*
+            * todo Parte antig antigo XML do plano de estudos para remover futuramente*/
+        if(c.getStudiesPlan() != null)
+        {
+            RepositoryFileImpl repositoryFile = repositoryService.loadView(c.getStudiesPlan());
+            cV.setStudiesPlan(repositoryFile);
+        }
+        if(loadStudiesPlans && c.getStudiesPlans() != null && c.getStudiesPlans().size() > 0)
+        {
+            for(CourseStudiesPlan sp : c.getStudiesPlans())
+            {
+                sp.getVersion();
+                cV.getCourseStudiesPlans().add(sp);
+            }
+        }
+        return cV;
+    }
+    public List<String> loadImportYears(UserSession userSession) throws ServiceException
+    {
+        List<String> importYears = DaoFactory.getCourseDaoImpl().loadImportYears();
+        List<String> imStrings = new ArrayList<String>();
+        for(String importYear: importYears)
+        {
+            imStrings.add(importYear);
+        }
+        return imStrings;
+    }
     public CourseView submitCourse(CourseView courseView,
                                    InputStream stream,
                                    String name,
 ,6 → 182,7
         String htmlTrasformationResult = null;
+        //Stream que pode vir do upload da UIde Admin de Cursos
         htmlTrasformationResult = uploadStudiesPlan(stream, name, size, contentType, userSession, c,false,null);
         courseView.persistViewInObject(c);
         CourseView cv = loadCourse(c.getId(),false);
 ,6 → 198,7
     private String uploadStudiesPlan(InputStream stream, String name, int size, String contentType, UserSession userSession, Course c,boolean forceUrlFichas, String systemUrl) throws JAXBException, TransformationException {
         String htmlTrasformationResult = null;
+        //APENAS NO CASO DO AMDIN FAZER UPLOAD DE UM XML
         if(stream != null && size > 0)
         {
             String extension = FilesUtils.getExtension(name);
 ,11 → 213,14
             }
             htmlTrasformationResult = generateHtmlCache(userSession, c);
             //####New#### Generating XML with JaxB
-            generateXmlJaxbStudiesPlanVersion(userSession, c,forceUrlFichas,systemUrl);
+            //ISTO SO É CHAMADO NO CASO DE SE FAZER UPLOAD DE UM NOVO PLANO PELO MECANISMO ANTIGO
+            generateXmlJaxbStudiesPlanVersionFromRepositoryOldPlanStream(userSession, c, forceUrlFichas, systemUrl);
         }
         return htmlTrasformationResult;
     }
     private void generateCourseJson(Course cAux) throws IOException, TransformationException {
         CourseImpl c = (CourseImpl) DaoFactory.getCourseDaoImpl().narrow(cAux);
 ,11 → 287,12
      * @return
      * @throws JAXBException if XML is not weel formed
      */
-    private void generateXmlJaxbStudiesPlanVersion(UserSession userSession, Course c,boolean forceFichaCurricularUrlSet,String systemUrl) throws JAXBException, TransformationException
+    private void generateXmlJaxbStudiesPlanVersionFromRepositoryOldPlanStream(UserSession userSession, Course c, boolean forceFichaCurricularUrlSet, String systemUrlForUnitPrograms) throws JAXBException, TransformationException
     {
         CourseStudiesPlan courseStudiesPlan;
         if(c.getStudiesPlan() == null || c.getStudiesPlan().trim().length() == 0)
         {
+            //ESTE É O STREAM DO PLANO DE UPLOAD
             logger.warn("Course does not have studies plan XML file stream to use in update");
             return;
         }
 ,16 → 336,21
             //Just in case lets update SigesCode
             Curso curso = (Curso) unmarshaller.unmarshal(stream);
             curso.setSiges(c.getCode());
+            curso.setNome(c.getName());
+            curso.setDep(c.getArea());
+            //##NOVO PARA GERAR LINK SE NAO EXISTIR
+            generateAutoUrlFichasCurriculares(curso,systemUrlForUnitPrograms,forceFichaCurricularUrlSet);
             Marshaller marshaller = jc.createMarshaller();
             marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
             StringWriter sw = new StringWriter();
             marshaller.marshal(curso, sw);
             //SETTING XML in COURSE STUDIES PLAN
             courseStudiesPlan.setXml(sw.toString());
-            //##NOVO PARA GERAR LINK SE NAO EXISTIR
-            generateAutoUrlFichasCurriculares(curso,systemUrl,forceFichaCurricularUrlSet);
-            String json = getGensonCursoXmlObj().serialize(curso);
+            String json = getGensonPlanoEstudos().serialize(curso);
             //SETTING JSON in COURSE STUDIES PLAN
             courseStudiesPlan.setJson(json);
 ,6 → 374,8
         }
     }
     private void generateAutoUrlFichasCurriculares(Curso curso,String systemUrl,boolean force)
     {
         for(Curso.Semestre s :curso.getSemestre())
 ,15 → 403,19
             if(!url.endsWith("/"))
                 url = url + "/";
+            //Nao fornece o ano pois o servico irá assumir o ultimo
             unidadeType.setUrlFichaCurricular(url + "startLoadCourseUnitProgramSiges.do?unitCode=" + unidadeType.getSiges() + "&courseCode=" + curso.getSiges() + "&semestre=" + semestre.getId());
             unidadeType.setUrlUnidadeCurricular(url + "startLoadCourseUnitSiges.do?unitCode=" + unidadeType.getSiges() + "&courseCode=" + curso.getSiges() + "&semestre=" + semestre.getId());
         }
     }
-    private static Genson getGensonCursoXmlObj(){
+    private static Genson getGensonPlanoEstudos(){
         Genson genson = new Genson.Builder()
                 .exclude("class")
+                .exclude("siges")
+                .exclude("nome")
+                .exclude("dep")
                 .create();
         return genson;
     }
 ,12 → 453,22
                 .exclude(GenericUserImpl.class)
 */
                 .exclude("id", Course.class)
-                .exclude("status",Course.class)
+                .exclude("status", Course.class)
                 .include("degreeForJsonApi", CourseImpl.class)
                 .include("schoolForJsonApi", CourseImpl.class)
                 .include("statusForJsonApi", CourseImpl.class)
                 .include("name", Course.class)
+                .include("nameEn", Course.class)
+                .include("nameEs", Course.class)
+                .include("nameFr", Course.class)
+                .include("department", Course.class)
+                .exclude("active", CourseDepartment.class)
+                .include("sigla", CourseDepartment.class)
+                .include("name", CourseDepartment.class)
+                .include("nameEn", CourseDepartment.class)
+                .include("nameEs", CourseDepartment.class)
+                .include("nameFr", CourseDepartment.class)
                 .include("code", Course.class)
                 .include("validationRole", Course.class)
 ,8 → 597,13
     /**
      *
-     * * @SERVICE@
+     * * Serviço invocado para obter o JSON de um curso
+     * O JSON tem dois campos o courseInfo e o plano de estudos colocados separadamente
      *
+     * Atenção o plano de estudos usado é o ultimo considerando o seu ID
+     *  Nota: O plano de Estudos é uma classe persistente que tem apenas versão e descrição
+     *  deverá ter como campo o XML e o JSON já gerados do plano de estudos que comporta
+     *
      * @param code
      * @return
      * @throws JSONException
 ,20 → 628,35
         {
             JSONObject courseObj = new JSONObject(course.getJson());
             coursesResponse.put("courseInfo",courseObj);
+            //Este caso apenas se dá se o plano nunca tiver sido editado ou sincronizado
+            //Nesse caso o sistema irá tentar obtê-lo da stream do repositorio
             if(course.getStudiesPlans() == null || course.getStudiesPlans().size() == 0)
             {
-                logger.info("status JSON NOT EXIST FOR STUDIES PLAN IN THIS COURSE, will generate");
+                logger.info("status JSON NOT EXIST FOR STUDIES PLAN IN THIS COURSE, will try generate from studies plan OLD Stream");
                 UserSession userSession = DomainObjectFactory.createUserSessionImpl();
                 userSession.setUser(DaoFactory.getUserDaoImpl().load(new Long(1)));
-                new CoursesService().generateXmlJaxbStudiesPlanVersion(userSession, course, false, null);
+                new CoursesService().generateXmlJaxbStudiesPlanVersionFromRepositoryOldPlanStream(userSession, course, false, null);
             }
-            if(course.getStudiesPlans() != null)
+            if(course.getStudiesPlans() != null )
             {
                 CourseStudiesPlan studiesPlan = course.getStudiesPlans().iterator().next();
-                JSONObject studiesPlanObj = new JSONObject(studiesPlan.getJson());
-                studiesPlanObj.put("version",studiesPlan.getVersion());
+                JSONObject studiesPlanObj;
+                if(studiesPlan.getJson() != null)
+                {
+                    studiesPlanObj = new JSONObject(studiesPlan.getJson());
+                    studiesPlanObj.put("version",studiesPlan.getVersion());
+                    coursesResponse.put("courseStudiesPlan",studiesPlanObj);
+                }
+                else
+                {
+                    studiesPlanObj = new JSONObject();
+                    studiesPlanObj.put("fault","Zero contents for this version");
+                    studiesPlanObj.put("version",studiesPlan.getVersion());
+                    coursesResponse.put("courseStudiesPlan",studiesPlanObj);
+                }
                 coursesResponse.put("courseStudiesPlan",studiesPlanObj);
             }
             else
             {
 ,7 → 665,7
         }
         else
         {
-            coursesResponse.put("status","JSON NOT EXIST FOR COURSE");
+            coursesResponse.put("status","JSON NOT EXIST FOR COURSE, PLEASE OPEN AND SAVE COURSE IN ADMINISTRATION");
         }
         return coursesResponse;
     }
 ,7 → 687,7
             UserSession userSession = DomainObjectFactory.createUserSessionImpl();
             userSession.setUser(DaoFactory.getUserDaoImpl().load(new Long(1)));
             try {
-                generateXmlJaxbStudiesPlanVersion(userSession, course, false, null);
+                generateXmlJaxbStudiesPlanVersionFromRepositoryOldPlanStream(userSession, course, false, null);
             } catch (JAXBException e) {
                 logger.error(e,e);
                 return "<error>" + e.toString() + ". see log for details</error>";
 ,11 → 745,13
                     log.append("<info>" + msg+"</info>");
                     logger.info(msg);
+                    //#############UPDATING Course Comission Members
+                    updateCourseComissionMembers(systemUrl, code, c);
                     //#############UPDATING STUDIES PLAN
                     updateStudiesPlanFromRemoteSystem(systemUrl, setActive, log, course, code, c);
-                    //#############UPDATING Course Comission Members
-                    updateCourseComissionMembers(systemUrl, code, c);
                 }
             }
             catch(Throwable e)
 ,6 → 764,47
     }
+    private void updateStudiesPlanFromRemoteSystem(String systemUrl, boolean setActive, StringBuilder log, JSONObject course, String code, Course c) throws IOException, JSONException, TransformationException, JAXBException {
+        String msg;
+        InputStream stream = new URL(systemUrl + "/wsjson/api?service=getStudiesPlanXml&code=" + code + "&renew=true").openStream();
+        String studiesPlan = StreamsUtils.readString(stream);
+        int len = studiesPlan.length();
+        if(studiesPlan == null || studiesPlan.trim().length() == 0 || studiesPlan.contains("<error>"))
+        {
+            msg = "Course " + code + " " + course.getString("name") + " dont has studies plan";
+            log.append("<warn>" + msg+"</warn>");
+            logger.warn(msg);
+        }
+        else
+        {
+            msg = "Found studies plan for "  + code + " " + course.getString("name") + " will update ";
+            log.append("<info>" + msg+"</info>");
+            logger.info(msg);
+            if(setActive)
+            {
+                msg = "Setting course to active";
+                log.append("<info>" + msg+"</info>");
+                logger.info(msg);
+                c.setStatus(true);
+            }
+            //System.out.println(studiesPlan);
+            msg = "GENERATING COURSE JSON ....";
+            log.append("<info>" + msg+"</info>");
+            logger.info(msg);
+            new CoursesService().generateCourseJson(c);
+            msg="GENERATING COURSE STUDIES PLAN JSON ....";
+            log.append("<info>" + msg+"</info>");
+            logger.info(msg);
+            stream.close();
+            stream = new URL(systemUrl + "/wsjson/api?service=getStudiesPlanXml&code=" + code).openStream();
+            UserSession userSession = DomainObjectFactory.createUserSessionImpl();
+            userSession.setUser(DaoFactory.getUserDaoImpl().load(new Long(1)));
+            new CoursesService().uploadStudiesPlan(stream, "curso_" + code + ".xml", len,"appication/xml", userSession,c,true,systemUrl);
+        }
+    }
     /**
      * Update courseComission Members
      * @param systemUrl
 ,45 → 882,119
         return DaoFactory.getTeacherDaoImpl().loadBySigesCode(code);
     }
-    private void updateStudiesPlanFromRemoteSystem(String systemUrl, boolean setActive, StringBuilder log, JSONObject course, String code, Course c) throws IOException, JSONException, TransformationException, JAXBException {
-        String msg;
-        InputStream stream = new URL(systemUrl + "/wsjson/api?service=getStudiesPlanXml&code=" + code + "&renew=true").openStream();
-        String studiesPlan = StreamsUtils.readString(stream);
-        int len = studiesPlan.length();
-        if(studiesPlan == null || studiesPlan.trim().length() == 0 || studiesPlan.contains("<error>"))
+    /*
+     * Studies Plans Administration Services
+     *
+     */
+    public void addNewStudiesPlan(long courseId,CourseStudiesPlan studiesPlan,UserSession session)
+    {
+        Course c = DaoFactory.getCourseDaoImpl().load(courseId);
+        studiesPlan.setCourse(c);
+        c.getStudiesPlans().add(studiesPlan);
+        DaoFactory.getCourseStudiesPlanDaoImpl().save(studiesPlan);
+    }
+    public void cloneVersionFrom(long sourcePlanId, long targetPlanId, long courseId, UserSession session)
+    {
+        Course course = DaoFactory.getCourseDaoImpl().load(courseId);
+        CourseStudiesPlan source = null;
+        CourseStudiesPlan target = null;
+        for(CourseStudiesPlan plan: course.getStudiesPlans())
         {
-            msg = "Course " + code + " " + course.getString("name") + " dont has studies plan";
-            log.append("<warn>" + msg+"</warn>");
-            logger.warn(msg);
+            if(plan.getId() == sourcePlanId)
+                source = plan;
+            else if(plan.getId() == targetPlanId)
+                target = plan;
         }
-        else
-        {
-            msg = "Found studies plan for "  + code + " " + course.getString("name") + " will update ";
-            log.append("<info>" + msg+"</info>");
-            logger.info(msg);
-            if(setActive)
+        target.setXml(source.getXml());
+        target.setJson(source.getJson());
+    }
+    public Curso loadCursoPlanoFromXml(String xml)
+    {
+        try {
+            if(xml != null)
             {
-                msg = "Setting course to active";
-                log.append("<info>" + msg+"</info>");
-                logger.info(msg);
-                c.setStatus(true);
+                JAXBContext jc = JAXBContext.newInstance(Curso.class);
+                Unmarshaller unmarshaller = jc.createUnmarshaller();
+                Curso curso = (Curso) unmarshaller.unmarshal(new StringReader(xml));
+                return curso;
             }
-            //System.out.println(studiesPlan);
-            msg = "GENERATING COURSE JSON ....";
-            log.append("<info>" + msg+"</info>");
-            logger.info(msg);
-            new CoursesService().generateCourseJson(c);
+            return null;
+        } catch (JAXBException e) {
+            logger.error(e,e);
+            return null;
+        }
+    }
-            msg="GENERATING COURSE STUDIES PLAN JSON ....";
-            log.append("<info>" + msg+"</info>");
-            logger.info(msg);
-            stream.close();
-            stream = new URL(systemUrl + "/wsjson/api?service=getStudiesPlanXml&code=" + code).openStream();
-            UserSession userSession = DomainObjectFactory.createUserSessionImpl();
-            userSession.setUser(DaoFactory.getUserDaoImpl().load(new Long(1)));
-            new CoursesService().uploadStudiesPlan(stream, "curso_" + code + ".xml", len,"appication/xml", userSession,c,true,systemUrl);
+    /**
+     * Persist the edited studies plan
+     * Updates studiesPlanVersion
+     * Updates studiesPlanVersionDescription
+     * Updates PlanoEstudos XML and JSON
+     *
+     * @param courseId
+     * @param coursePlanId
+     * @param planoEditado
+     * @param courseStudiesPlanEditado
+     * @return
+     */
+    public Course savePlanoEstudosEditado(long courseId, long coursePlanId, Curso planoEditado, CourseStudiesPlan courseStudiesPlanEditado,UserSession session)
+    {
+        try {
+            Course course = DaoFactory.getCourseDaoImpl().load(courseId);
+            for(CourseStudiesPlan courseStudiesPlanPersistente: course.getStudiesPlans())
+            {
+                if(courseStudiesPlanPersistente.getId() == coursePlanId)
+                {
+                    courseStudiesPlanPersistente.setVersion(courseStudiesPlanEditado.getVersion());
+                    courseStudiesPlanPersistente.setVersionDescription(courseStudiesPlanEditado.getVersionDescription());
+                    //Garante-se mas depois não vai para o JSON
+                    planoEditado.setSiges(course.getCode());//GARANTIR QUE O CODIGO SIGEST ESTA CORRECTO
+                    planoEditado.setNome(course.getName());
+                    planoEditado.setDep(course.getArea());
+                    //planoEditado.setDepDesc("");
+                    //planoEditado.setDepDescEn("");
+                    //planoEditado.setDepDescEs("");
+                    //planoEditado.setDepDescFr("");
+                    JAXBContext jc = JAXBContext.newInstance(Curso.class);
+                    Marshaller marshaller = jc.createMarshaller();
+                    marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
+                    StringWriter xml = new StringWriter();
+                    marshaller.marshal(planoEditado,xml);
+                    courseStudiesPlanPersistente.setXml(xml.toString());
+                    String json = getGensonPlanoEstudos().serialize(planoEditado);
+                    //SETTING JSON in COURSE STUDIES PLAN
+                    courseStudiesPlanPersistente.setJson(json);
+                    break;
+                }
+            }
+            return course;
+        } catch (JAXBException e) {
+            logger.error(e,e);
+            return null;
+        } catch (TransformationException e) {
+            logger.error(e,e);
+            return null;
+        } catch (IOException e) {
+            logger.error(e,e);
+            return null;
         }
     }
+    public List<CourseDepartment> loadDepartments()
+    {
+        List<CourseDepartment> departments = DaoFactory.getCourseDepartmentDaoImpl().findAll();
+        for(CourseDepartment dep: departments)
+            dep.getName();
+        return departments;
+    }
 }

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/courses/UpdateDepartmentsTask.java
 New file
 ,0 → 1,170
+package pt.estgp.estgweb.services.courses;
+import jomm.dao.impl.AbstractDao;
+import pt.estgp.estgweb.domain.CourseDepartment;
+import pt.estgp.estgweb.domain.DomainObjectFactory;
+import pt.estgp.estgweb.domain.dao.DaoFactory;
+import pt.estgp.estgweb.domain.dao.impl.CourseDepartmentDaoImpl;
+import pt.estgp.estgweb.utils.ConfigProperties;
+/**
+ * Created by jorgemachado on 15/09/16.
+ *
+ * to be called from ANT tasks
+ *
+ *
+ * UPDATE DO MYSQL PARA OS DEPARTAMENTOS
+ *
+ * 1 - FAZER O UPDATE HIBERNATE SQL - Ira criar a tabela de departamentos
+ * As chaves estrangeiras não poderão ser criadas porque existem falhas de linkagem
+ * 2 - Correr esta tarefa - Irá criar os departamentos  ant -f inportRoutines.xml updateCourseDepartments
+ * 3 - Correr novamente o update hibernate sql e a chave será atualizada
+ */
+public class UpdateDepartmentsTask
+{
+    public static void main(String [] args)
+    {
+        AbstractDao.getCurrentSession().beginTransaction();
+        new UpdateDepartmentsTask().updateDepartmentsDefault();
+        AbstractDao.getCurrentSession().getTransaction().commit();
+    }
+    /**
+     * Check default departments if they already exist in database
+     * ESECS
+     *  a) Comunicação, Artes e Tecnologias;  CAT
+     *  b) Educação e Formação;               EF
+     *  c) Intervenção e Desenvolvimento Social. IDS
+     *
+     * ESTG
+     *  a) Tecnologias e Design     TD
+     *  b) Ciências Empresariais, Sociais e Humanas”. CESH
+     *
+     * ESAE
+     *  a) Agricultura e Recursos Naturais   ARN
+     *  b) Ciência e Tecnologia Animal       CTA
+     *
+     * ESSP
+     *
+     *   a) Ciências e Tecnologias da Saúde
+     *
+     * Properties
+     * institution.code.prefix.inverse.ESTG=1
+     institution.code.prefix.inverse.ESAE=2
+     institution.code.prefix.inverse.ESECS=3
+     institution.code.prefix.inverse.ESS=4
+     */
+    public void updateDepartmentsDefault()
+    {
+        CourseDepartmentDaoImpl dao = DaoFactory.getCourseDepartmentDaoImpl();
+        /*
+        * ESECS
+        * */
+        String sigla = "cat";
+        String nome = "Comunicação, Artes e Tecnologias";
+        String nomeEn = "Comunication Arts and Technology";
+        String nomeEs = "Comunicación, Artes y Tecnologías";
+        String nomeFr = "Communication, Arts et Technologies";
+        String institutionalCode = ConfigProperties.getProperty("institution.code.prefix.inverse.ESECS");
+        createDepartment(dao, sigla, nome, nomeEn, nomeEs, nomeFr, institutionalCode);
+        sigla = "ef";
+        nome = "Educação e Formação";
+        nomeEn = "Education and training";
+        nomeEs = "Educación y formación";
+        nomeFr = "Éducation et formation";
+        institutionalCode = ConfigProperties.getProperty("institution.code.prefix.inverse.ESECS");
+        createDepartment(dao, sigla, nome, nomeEn, nomeEs, nomeFr, institutionalCode);
+        sigla = "ids";
+        nome = "Intervenção e Desenvolvimento Social";
+        nomeEn = "Intervention and Social Development";
+        nomeEs = "Intervención y Desarrollo Social";
+        nomeFr = "Intervention et du Développement social";
+        institutionalCode = ConfigProperties.getProperty("institution.code.prefix.inverse.ESECS");
+        createDepartment(dao, sigla, nome, nomeEn, nomeEs, nomeFr, institutionalCode);
+        /**
+         * ESTG
+         */
+        sigla = "td";
+        nome = "Tecnologias e Design";
+        nomeEn = "Technology and Design";
+        nomeEs = "Tecnología y Diseño";
+        nomeFr = "Technologie et Design";
+        institutionalCode = ConfigProperties.getProperty("institution.code.prefix.inverse.ESTG");
+        createDepartment(dao, sigla, nome, nomeEn, nomeEs, nomeFr, institutionalCode);
+        sigla = "cesh";
+        nome = "Ciências Empresariais, Sociais e Humanas";
+        nomeEn = "Business Sciences, Social and Human";
+        nomeEs = "Ciencias empresariales, Social y Humano";
+        nomeFr = "Entreprise Sciences, Sciences sociales et humaines";
+        institutionalCode = ConfigProperties.getProperty("institution.code.prefix.inverse.ESTG");
+        createDepartment(dao, sigla, nome, nomeEn, nomeEs, nomeFr, institutionalCode);
+        /**
+         * ESAE
+         */
+        sigla = "arn";
+        nome = "Agricultura e Recursos Naturais";
+        nomeEn = "Agriculture and Natural Resources";
+        nomeEs = "Agricultura y Recursos Naturales";
+        nomeFr = "Agriculture et ressources naturelles";
+        institutionalCode = ConfigProperties.getProperty("institution.code.prefix.inverse.ESAE");
+        createDepartment(dao, sigla, nome, nomeEn, nomeEs, nomeFr, institutionalCode);
+        sigla = "cta";
+        nome = "Ciência e Tecnologia Animal";
+        nomeEn = "Animal Science and Technology";
+        nomeEs = "Ciencia y Tecnología Animal";
+        nomeFr = "Animal Science et technologie";
+        institutionalCode = ConfigProperties.getProperty("institution.code.prefix.inverse.ESAE");
+        createDepartment(dao, sigla, nome, nomeEn, nomeEs, nomeFr, institutionalCode);
+        /**
+         * ESSP
+         */
+        sigla = "cts";
+        nome = "Ciências e Tecnologias da Saúde";
+        nomeEn = "Science and Health Technologies";
+        nomeEs = "Ciencia y Salud Tecnologías";
+        nomeFr = "Sciences et technologies de la santé";
+        institutionalCode = ConfigProperties.getProperty("institution.code.prefix.inverse.ESS");
+        createDepartment(dao, sigla, nome, nomeEn, nomeEs, nomeFr, institutionalCode);
+    }
+    private void createDepartment(CourseDepartmentDaoImpl dao, String sigla, String nome, String nomeEn, String nomeEs, String nomeFr, String institutionalCode) {
+        CourseDepartment courseDepartment = dao.findBySigla(sigla);
+        if(courseDepartment == null)
+        {
+            courseDepartment = DomainObjectFactory.createCourseDepartmentImpl();
+            courseDepartment.setSigla(sigla);
+            courseDepartment.setInstitutionalCode(institutionalCode);
+            courseDepartment.setName(nome);
+            courseDepartment.setNameEn(nomeEn);
+            courseDepartment.setNameEs(nomeEs);
+            courseDepartment.setNameFr(nomeFr);
+            dao.save(courseDepartment);
+        }
+    }
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/courses/xsd/PerfilImpl.java
 New file
 ,0 → 1,18
+package pt.estgp.estgweb.services.courses.xsd;
+import pt.estgp.estgweb.utils.DynamicArrayList;
+import java.util.List;
+/**
+ * Created by jorgemachado on 15/09/16.
+ */
+public class PerfilImpl extends Curso.Semestre.Perfil {
+    public List<UnidadeType> getUnidade() {
+        if (unidade == null) {
+            unidade = new DynamicArrayList<UnidadeType>(UnidadeImpl.class);
+        }
+        return this.unidade;
+    }
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/courses/xsd/SemestreImpl.java
 New file
 ,0 → 1,26
+package pt.estgp.estgweb.services.courses.xsd;
+import pt.estgp.estgweb.utils.DynamicArrayList;
+import java.util.List;
+/**
+ * Created by jorgemachado on 15/09/16.
+ */
+public class SemestreImpl extends Curso.Semestre
+{
+    public List<UnidadeType> getUnidade() {
+        if (unidade == null) {
+            unidade = new DynamicArrayList<UnidadeType>(UnidadeImpl.class);
+        }
+        return this.unidade;
+    }
+    public List<Curso.Semestre.Perfil> getPerfil() {
+        if (perfil == null) {
+            perfil = new DynamicArrayList<Perfil>(PerfilImpl.class);
+        }
+        return this.perfil;
+    }
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/courses/xsd/UnidadeImpl.java
 New file
 ,0 → 1,13
+package pt.estgp.estgweb.services.courses.xsd;
+/**
+ * Created by jorgemachado on 15/09/16.
+ */
+public class UnidadeImpl extends UnidadeType {
+    public UnidadeType.HorasContacto getHorasContacto() {
+        if(horasContacto == null)
+            horasContacto = new HorasContacto();
+        return horasContacto;
+    }
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/courses/xsd/CursoImpl.java
 New file
 ,0 → 1,21
+package pt.estgp.estgweb.services.courses.xsd;
+import pt.estgp.estgweb.utils.DynamicArrayList;
+import java.util.List;
+/**
+ * Created by jorgemachado on 15/09/16.
+ */
+public class CursoImpl extends Curso
+{
+    public List<Semestre> getSemestre() {
+        if (semestre == null) {
+            semestre = new DynamicArrayList<Semestre>(SemestreImpl.class);
+        }
+        return this.semestre;
+    }
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/EventGenericImpl.java
 New file
 ,0 → 1,25
+package pt.estgp.estgweb.domain;
+import java.io.Serializable;
+import java.util.List;
+/**
+ * Created by jorgemachado on 05/09/16.
+ */
+public class EventGenericImpl extends EventGeneric {
+    @Override
+    public List<String> getOwnerRoles() {
+        return null;
+    }
+    @Override
+    public String getChoosedOwnerRole() {
+        return null;
+    }
+    @Override
+    public Serializable getSerializable() {
+        return null;
+    }
+}

/branches/v3/impl/src/java/pt/estgp/estgweb/domain/EventFormacoesImpl.java
New file
0,0 → 1,7
package pt.estgp.estgweb.domain;

/**
* Created by jorgemachado on 07/09/16.
*/
public class EventFormacoesImpl extends EventFormacoes {
}

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/EventClassImpl.java
 New file
 ,0 → 1,29
+package pt.estgp.estgweb.domain;
+import java.io.Serializable;
+import java.util.List;
+/**
+ * Created by jorgemachado on 05/09/16.
+ */
+public class EventClassImpl extends EventClass {
+    @Override
+    public GenericUser getOwner() {
+        return null;
+    }
+    @Override
+    public List<String> getOwnerRoles() {
+        return null;
+    }
+    @Override
+    public String getChoosedOwnerRole() {
+        return null;
+    }
+    @Override
+    public Serializable getSerializable() {
+        return null;
+    }
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/views/CourseView.java
 ,8 → 90,16
     private List<CourseYearView> courseYearViews = new DynamicArrayList<CourseYearView>(CourseYearView.class);
+    private List<CourseStudiesPlan> courseStudiesPlans = new DynamicArrayList<CourseStudiesPlan>(CourseStudiesPlan.class);
+    public List<CourseStudiesPlan> getCourseStudiesPlans() {
+        return courseStudiesPlans;
+    }
+    public void setCourseStudiesPlans(List<CourseStudiesPlan> courseStudiesPlans) {
+        this.courseStudiesPlans = courseStudiesPlans;
+    }
     private Course course;
     public boolean isStatus() {
 ,7 → 195,11
             }
         }
         c.setCode(code);
-        c.setArea(area);
+//        c.setArea(area);
+        CourseDepartment department = DaoFactory.getCourseDepartmentDaoImpl().findBySigla(area);
+        if(department != null)
+            c.setDepartment(department);
         c.setDegree(degree);
         c.setDescription(description);
         c.setImportYear(importYear);

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/DomainObjectFactory.java
 ,4 → 427,8
     public static CourseStudiesPlanImpl createCourseStudiesPlanImpl() {
         return new CourseStudiesPlanImpl();
     }
+    public static CourseDepartmentImpl createCourseDepartmentImpl() {
+        return new CourseDepartmentImpl();
+    }
 }

/branches/v3/impl/src/java/pt/estgp/estgweb/domain/EventUserImpl.java
New file
0,0 → 1,7
package pt.estgp.estgweb.domain;

/**
* Created by jorgemachado on 12/09/16.
*/
public class EventUserImpl extends EventUser {
}

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/dao/impl/CourseDepartmentDaoImpl.java
 New file
 ,0 → 1,41
+package pt.estgp.estgweb.domain.dao.impl;
+import org.hibernate.criterion.Order;
+import pt.estgp.estgweb.domain.CourseDepartment;
+import java.util.List;
+import static org.hibernate.criterion.Restrictions.eq;
+/**
+ * Created by jorgemachado on 15/09/16.
+ */
+public class CourseDepartmentDaoImpl extends CourseDepartmentDao
+{
+    public static CourseDepartmentDaoImpl getInstance() {
+        if (myInstance == null)
+            myInstance = new CourseDepartmentDaoImpl();
+        return (CourseDepartmentDaoImpl) myInstance;
+    }
+    public CourseDepartment findBySigla(String sigla)
+    {
+        try{
+            return (CourseDepartment) createCriteria().add(eq("sigla",sigla)).uniqueResult();
+        }catch(Exception e)
+        {}
+        return null;
+    }
+    public List<CourseDepartment> findActives()
+    {
+        return createCriteria().add(eq("active", true)).addOrder(Order.asc("institutionalCode")).addOrder(Order.asc("sigla")).list();
+    }
+    public List<CourseDepartment> findActives(String institutionalCode)
+    {
+        return createCriteria().add(eq("active", true)).add(eq("institutionalCode",institutionalCode)).list();
+    }
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/dao/DaoFactory.java
 ,6 → 11,8
 public class DaoFactory
 {
+    private static CourseDepartmentDaoImpl courseDepartmentDaoImpl;
     public static JobDaoImpl getJobDaoImpl()
     {
         return JobDaoImpl.getInstance();
 ,4 → 421,7
         return CourseStudiesPlanDaoImpl.getInstance();
     }
+    public static CourseDepartmentDaoImpl getCourseDepartmentDaoImpl() {
+        return CourseDepartmentDaoImpl.getInstance();
+    }
 }

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/EventGenericRecordImpl.java
 New file
 ,0 → 1,29
+package pt.estgp.estgweb.domain;
+import java.io.Serializable;
+import java.util.List;
+/**
+ * Created by jorgemachado on 05/09/16.
+ */
+public class EventGenericRecordImpl extends EventGenericRecord {
+    @Override
+    public GenericUser getOwner() {
+        return null;
+    }
+    @Override
+    public List<String> getOwnerRoles() {
+        return null;
+    }
+    @Override
+    public String getChoosedOwnerRole() {
+        return null;
+    }
+    @Override
+    public Serializable getSerializable() {
+        return null;
+    }
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/CourseDepartmentImpl.java
 New file
 ,0 → 1,20
+package pt.estgp.estgweb.domain;
+import pt.estgp.estgweb.utils.ConfigProperties;
+import java.io.Serializable;
+/**
+ * Created by jorgemachado on 14/09/16.
+ */
+public class CourseDepartmentImpl extends CourseDepartment {
+    @Override
+    public Serializable getSerializable() {
+        return getSigla();
+    }
+    public String getSchoolFromInstitutionalCode()
+    {
+        return ConfigProperties.getProperty("institution.code.prefix." + getInstitutionalCode());
+    }
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/form/courses/CourseStudiesPlansAdminForm.java
 New file
 ,0 → 1,64
+package pt.estgp.estgweb.web.form.courses;
+import pt.estgp.estgweb.domain.CourseStudiesPlanImpl;
+import pt.estgp.estgweb.domain.DomainObjectFactory;
+import pt.estgp.estgweb.services.courses.xsd.Curso;
+import pt.estgp.estgweb.services.courses.xsd.CursoImpl;
+import pt.estgp.estgweb.web.form.ApplicationForm;
+/**
+ * @author Jorge Machado
+ * @date 25/Jun/2008
+ * @see pt.estgp.estgweb.web.form.courses
+ */
+public class CourseStudiesPlansAdminForm extends ApplicationForm
+{
+    //Wrapper do Plano de estudos em edicao com versao e descricao de versao
+    private CourseStudiesPlanImpl courseStudiesPlan = DomainObjectFactory.createCourseStudiesPlanImpl();
+    //Plano de Estudos deserializado de XML para classe correspondente ao xsd em src/planoestudos.xsd
+    private Curso planoEstudos = new CursoImpl();
+    //curso em edição
+    private long courseId = 0;
+    //flag para indicar se o plano em edição é o ultimo plano criado
+    private boolean versaoVigor = false;
+    public CourseStudiesPlansAdminForm()
+    {
+    }
+    public CourseStudiesPlanImpl getCourseStudiesPlan() {
+        return courseStudiesPlan;
+    }
+    public void setCourseStudiesPlan(CourseStudiesPlanImpl courseStudiesPlan) {
+        this.courseStudiesPlan = courseStudiesPlan;
+    }
+    public long getCourseId() {
+        return courseId;
+    }
+    public void setCourseId(long courseId) {
+        this.courseId = courseId;
+    }
+    public boolean isVersaoVigor() {
+        return versaoVigor;
+    }
+    public void setVersaoVigor(boolean versaoVigor) {
+        this.versaoVigor = versaoVigor;
+    }
+    public Curso getPlanoEstudos() {
+        return planoEstudos;
+    }
+    public void setPlanoEstudos(Curso planoEstudos) {
+        this.planoEstudos = planoEstudos;
+    }
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/courses/CoursesController.java
 ,6 → 12,7
 import pt.estgp.estgweb.web.controllers.courseunits.CourseUnitsController;
 import pt.estgp.estgweb.web.exceptions.NoCookiesException;
 import pt.estgp.estgweb.web.form.courses.CourseForm;
+import pt.estgp.estgweb.web.form.courses.CourseStudiesPlansAdminForm;
 import pt.estgp.estgweb.web.utils.RequestUtils;
 import pt.utl.ist.berserk.logic.filterManager.exceptions.FilterRetrieveException;
 import pt.utl.ist.berserk.logic.filterManager.exceptions.IncompatibleFilterException;
 ,10 → 52,21
         cF.setCourseView(cV);
         return mapping.findForward("submit");
     }
+    private void loadOnlyCourseAndPlans(CourseForm cF, HttpServletRequest request, HttpServletResponse response)
+            throws Throwable, InvalidFilterException, ServiceManagerException, InvalidFilterExpressionException, IncompatibleFilterException, FilterRetrieveException, NoCookiesException
+    {
+        load(cF,request,response,false,true);
+    }
     private void load(CourseForm cF, HttpServletRequest request, HttpServletResponse response)
             throws Throwable, InvalidFilterException, ServiceManagerException, InvalidFilterExpressionException, IncompatibleFilterException, FilterRetrieveException, NoCookiesException
     {
+        load(cF,request,response,true,true);
+    }
+    private void load(CourseForm cF, HttpServletRequest request, HttpServletResponse response,boolean loadUnits,boolean loadStudiesPlans)
+            throws Throwable, InvalidFilterException, ServiceManagerException, InvalidFilterExpressionException, IncompatibleFilterException, FilterRetrieveException, NoCookiesException
+    {
         String code = cF.getCourseView().getCode();
         long id = cF.getCourseView().getId();
 ,13 → 76,19
         String serviceName;
         if(code != null)
         {
-            args = new Object[]{code,true};
-            serviceName = "LoadCourseByCode";
+            args = new Object[]{code,loadUnits};
+            if(loadStudiesPlans)
+                serviceName = "LoadCourseByCodeAndStudiesPlans";
+            else
+                serviceName = "LoadCourseByCode";
         }
         else
         {
-            args = new Object[]{id,true};
-            serviceName = "LoadCourse";
+            args = new Object[]{id,loadUnits};
+            if(loadStudiesPlans)
+                serviceName = "LoadCourseAndStudiesPlans";
+            else
+                serviceName = "LoadCourse";
         }
         CourseView cV = (CourseView) sm.execute(RequestUtils.getRequester(request, response), serviceName, args, names);
         request.setAttribute("CourseView",cV);
 ,7 → 98,8
     private void loadForPublic(CourseForm cF, HttpServletRequest request, HttpServletResponse response)
             throws Throwable, InvalidFilterException, ServiceManagerException, InvalidFilterExpressionException, IncompatibleFilterException, FilterRetrieveException, NoCookiesException
     {
-        String code = cF.getCourseView().getCode();
+        load(cF,request,response,false,false);
+       /* String code = cF.getCourseView().getCode();
         long id = cF.getCourseView().getId();
         IServiceManager sm = ServiceManager.getInstance();
 ,7 → 118,7
         }
         CourseView cV = (CourseView) sm.execute(RequestUtils.getRequester(request, response), serviceName, args, names);
         request.setAttribute("CourseView",cV);
-        cF.setCourseView(cV);
+        cF.setCourseView(cV);*/
     }
     public ActionForward loadPlan(ActionMapping mapping,
 ,6 → 254,32
         }
     }
+    public ActionForward editAdmin(ActionMapping mapping,
+                              ActionForm form,
+                              HttpServletRequest request,
+                              HttpServletResponse response)
+            throws ServletException
+    {
+        try
+        {
+            loadOnlyCourseAndPlans((CourseForm) form, request, response);
+            return mapping.findForward("submit");
+        }
+        catch (FilterChainFailedException e)
+        {
+            return mapping.findForward("error401");
+        }
+        catch (NotFoundException e)
+        {
+            return mapping.findForward("error404");
+        }
+        catch (Throwable e)
+        {
+            logger.error(e, e);
+            return mapping.findForward("error500");
+        }
+    }
     public ActionForward submit(ActionMapping mapping,
                                 ActionForm form,
                                 HttpServletRequest request,
 ,4 → 452,86
             return mapping.findForward("error500");
         }
     }
+    /**
+     * StudiesPlans Controller Functions
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws ServletException
+     */
+    public ActionForward addNewVersion(ActionMapping mapping,
+                                       ActionForm form,
+                                       HttpServletRequest request,
+                                       HttpServletResponse response)
+            throws ServletException
+    {
+        try
+        {
+            CourseStudiesPlansAdminForm frm = (CourseStudiesPlansAdminForm) form;
+            long courseId = frm.getCourseId();
+            IServiceManager sm = ServiceManager.getInstance();
+            String[] names = new String[]{};
+            Object[] args = new Object[]{courseId,frm.getCourseStudiesPlan()};
+            sm.execute(RequestUtils.getRequester(request, response), "AddNewStudiesPlan", args, names);
+            addMessage(request, "course.studies.plan.added");
+            return mapping.findForward("loadstudyplans");
+        }
+        catch (FilterChainFailedException e)
+        {
+            return mapping.findForward("error401");
+        }
+        catch (NotFoundException e)
+        {
+            return mapping.findForward("error404");
+        }
+        catch (Throwable e)
+        {
+            logger.error(e, e);
+            return mapping.findForward("error500");
+        }
+    }
+    public ActionForward savePlano(ActionMapping mapping,
+                                       ActionForm form,
+                                       HttpServletRequest request,
+                                       HttpServletResponse response)
+            throws ServletException
+    {
+        try
+        {
+            CourseStudiesPlansAdminForm frm = (CourseStudiesPlansAdminForm) form;
+            long courseId = frm.getCourseId();
+            IServiceManager sm = ServiceManager.getInstance();
+            String[] names = new String[]{};
+            Object[] args = new Object[]{courseId,frm.getCourseStudiesPlan().getId(),frm.getPlanoEstudos(),frm.getCourseStudiesPlan()};
+            sm.execute(RequestUtils.getRequester(request, response), "SavePlanoEstudos", args, names);
+            addMessage(request, "course.studies.plan.saved");
+            request.setAttribute("courseId",courseId);
+            return mapping.findForward("adminStudyPlans");
+        }
+        catch (FilterChainFailedException e)
+        {
+            return mapping.findForward("error401");
+        }
+        catch (NotFoundException e)
+        {
+            return mapping.findForward("error404");
+        }
+        catch (Throwable e)
+        {
+            logger.error(e, e);
+            return mapping.findForward("error500");
+        }
+    }
 }

 /branches/v3/impl/src/updates/version/release-09-2016-planos-Estudos
 New file
 ,0 → 1,12
+Tarefas a executar para fazer update
+- Ver a tarefa disponivel no importRoutines.xml
+   pt.estgp.estgweb.services.courses.UpdateDepartmentsTask
+- Correr a sincronização de planos para arranjar o XML do JaxB com os URLS das unidades e dos PDF's
+   http://pae.ipportalegre.pt/wsjson/api?service=syncSystemPlans&systemUrl=http://www.estgp.pt&setActive=true

 /branches/v3/impl/src/hbm/pt/estgp/estgweb/domain/Course.hbm.xml
 ,6 → 14,9
         <timestamp source="db"   name="updateDate" unsaved-value="null"/>
         <property name="saveDate" type="timestamp"/>
         <property name="name" type="string"/>
+        <property name="nameEn" type="string"/>
+        <property name="nameEs" type="string"/>
+        <property name="nameFr" type="string"/>
         <property name="description" type="text"/>
         <property name="code" type="string"/>
         <property name="importYear" type="string" index="importYearIndex"/>
 ,11 → 31,14
         <!--legacy-->
         <property name="studiesPlan" type="string" index="studiesPlanIndex"/>
         <property name="validationRole" type="string" index="validationRoleIndex"/>
-        <property name="area" type="string" index="areaIndex"/>
+        <property name="area" type="string" index="areaIndex" insert="false" update="false"/>
         <property name="userGroupStudents" type="string"/>
         <property name="json" type="text">
             <column name="json" sql-type="MEDIUMTEXT"/>
         </property>
+        <many-to-one name="department" class="pt.estgp.estgweb.domain.CourseDepartment" outer-join="true" lazy="false">
+            <column name="area" length="20" sql-type="VARCHAR"/>
+        </many-to-one>
         <many-to-one name="courseContents" class="pt.estgp.estgweb.domain.PageSection" lazy="proxy" outer-join="false">
             <column name="courseContents"/>
         </many-to-one>
 ,5 → 101,25
         <subclass name="pt.estgp.estgweb.domain.CourseStudiesPlanImpl" discriminator-value="CourseYearImpl"/>
     </class>
+    <class name="pt.estgp.estgweb.domain.CourseDepartment" table="course_department" abstract="true">
+        <meta attribute="extends">pt.estgp.estgweb.domain.DomainSerializableObject</meta>
+        <meta attribute="scope-class">public abstract</meta>
+        <id name="sigla" type="string" length="20">
+            <generator class="assigned"/>
+        </id>
+        <discriminator column="discrimitator"/>
+        <timestamp source="db"   name="updateDate" unsaved-value="null"/>
+        <property name="saveDate" type="timestamp"/>
+        <property name="institutionalCode" type="string"/>
+        <property name="active" type="boolean">
+            <column name="active" default="true"/>
+        </property>
+        <property name="name" type="string"/>
+        <property name="nameEn" type="string"/>
+        <property name="nameEs" type="string"/>
+        <property name="nameFr" type="string"/>
+        <subclass name="pt.estgp.estgweb.domain.CourseDepartmentImpl" discriminator-value="CourseDepartmentImpl"/>
+    </class>
 </hibernate-mapping>

 /branches/v3/impl/src/hbm/pt/estgp/estgweb/domain/Events.hbm.xml
 New file
 ,0 → 1,192
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping
+        PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+    <class name="pt.estgp.estgweb.domain.EventClass" table="event_class" abstract="true">
+        <meta attribute="extends">pt.estgp.estgweb.domain.OwnedDomainObject</meta>
+        <meta attribute="scope-class">public abstract</meta>
+        <id name="id" type="long">
+            <generator class="native"/>
+        </id>
+        <discriminator column="discrimitator"/>
+        <timestamp source="db" name="updateDate" unsaved-value="null"/>
+        <property name="saveDate" type="timestamp"/>
+        <property name="name" type="string"/>
+        <property name="description" type="string">
+            <column name="description" sql-type="TEXT"/>
+        </property>
+        <property name="managers_role" type="string"/>
+        <subclass name="pt.estgp.estgweb.domain.EventClassImpl" discriminator-value="EventClassImpl"/>
+    </class>
+    <class name="pt.estgp.estgweb.domain.EventGeneric" table="event_generic" abstract="true">
+        <meta attribute="extends">pt.estgp.estgweb.domain.OwnedDomainObject</meta>
+        <meta attribute="scope-class">public abstract</meta>
+        <id name="id" type="long">
+            <generator class="native"/>
+        </id>
+        <discriminator column="discrimitator"/>
+        <timestamp source="db" name="updateDate" unsaved-value="null"/>
+        <property name="saveDate" type="timestamp"/>
+        <property name="ativo" type="boolean"/><!--Flag Geral de Finalizacao, Tem de desativar das API's-->
+        <property name="dataAberturaFormulario" type="timestamp"/>
+        <property name="dataFechoFormulario" type="timestamp"/> <!-- Tem de desativar das API's -->
+        <property name="dataPublicacao" type="timestamp"/><!--Usado para API's-->
+        <!--Metadata-->
+        <property name="title" type="string"/>
+        <property name="description" type="string">
+            <column name="description" sql-type="TEXT"/>
+        </property>
+        <property name="observacoes" type="string">
+            <column name="observacoes" sql-type="TEXT"/>
+        </property>
+        <property name="locais" type="string"/>
+        <property name="dataInicio" type="timestamp"/>
+        <property name="flyerRepositoryStream" type="string"/>
+        <property name="category" type="string"/>
+        <property name="sub_category" type="string"/>
+        <property name="preInformation" type="string">
+            <column name="preInformation" sql-type="TEXT"/>
+        </property>
+        <property name="afterRegisterInformation" type="string">
+            <column name="afterRegisterInformation" sql-type="TEXT"/>
+        </property>
+        <property name="registeredUsersOnly" type="boolean"/>
+        <!-- Campos Ativos no Registo -->
+        <!--Contactos Info Pessoal-->
+        <!--<property name="nome" type="boolean"/> já assumido para registo-->
+        <!--<property name="mail" type="boolean"/> já assumido para registo-->
+        <property name="sexo" type="boolean"/>
+        <property name="morada" type="boolean"/> <!--Implica ADDRESS, ZIP, CIDADE-->
+        <property name="dataNascimento" type="boolean"/>
+        <property name="nif" type="boolean"/>
+        <property name="bi" type="boolean"/>
+        <property name="telefone1" type="boolean"/>
+        <property name="telefone2" type="boolean"/>
+        <property name="empresa" type="boolean"/>
+        <property name="pais" type="boolean"/>
+        <property name="escolaridade" type="boolean"/>
+        <property name="profissao" type="boolean"/>
+        <!--Pagamentos
+            <property name="custoInscricao" type="boolean"/>
+            <property name="custoAtas" type="boolean"/>
+        -->
+        <many-to-one name="owner" class="pt.estgp.estgweb.domain.User" lazy="proxy" outer-join="false"/>
+        <subclass name="pt.estgp.estgweb.domain.EventGenericImpl" discriminator-value="EventGenericImpl">
+            <subclass name="pt.estgp.estgweb.domain.EventFormacoes">
+                <meta attribute="extends">pt.estgp.estgweb.domain.EventGenericImpl</meta>
+                <meta attribute="scope-class">public abstract</meta>
+                <property name="referencia" type="string"/><!--(Ex: AF201516#02)-->
+                <property name="unidadeOrganica" type="string"/><!--(ESTG, ESEP, ...)-->
+                <property name="localDeRealizacao" type="string"/><!--(Sala, Laboratório, ...)-->
+                <property name="dominio" type="string"/> <!--(Gestão, Informática, Marketing, ...)-->
+                <property name="destinatarios" type="string"/>
+                <property name="numeroVagas" type="integer"/>
+                <property name="duracaoHoras" type="integer"/>
+                <property name="ects" type="integer"/>
+                <property name="dataRealizacao" type="integer"/>
+                <property name="diasDuracao" type="integer"/>
+                <property name="custoFormacao" type="double"/> <!--(moeda Euros)-->
+                <property name="precoFormando" type="double"/> <!--(moeda Euros)-->
+                <property name="percentagemMinimaLucro" type="double"/> <!--(%)-->
+                <property name="conteudos" type="string">
+                    <column name="conteudos" sql-type="MEDIUMTEXT"/>
+                </property>
+                <property name="status" type="string"/><!--(Em construção, Ativa, Concluída)
+                TAGS de ENUMERADO: Iniciada / Ativa / Anulada / Concluida
+                -->
+                <property name="formadores" type="string"/>
+                <subclass name="pt.estgp.estgweb.domain.EventFormacoesImpl" discriminator-value="EventFormacoesImpl"/>
+            </subclass>
+        </subclass>
+    </class>
+    <class name="pt.estgp.estgweb.domain.EventUser" table="event_user" abstract="true">
+        <meta attribute="extends">pt.estgp.estgweb.domain.DomainObject</meta>
+        <meta attribute="scope-class">public abstract</meta>
+        <id name="id" type="long">
+            <generator class="native"/>
+        </id>
+        <discriminator column="discrimitator"/>
+        <timestamp source="db" name="updateDate" unsaved-value="null"/>
+        <property name="saveDate" type="timestamp"/>
+        <property name="email" type="string"/>
+        <property name="password" type="string"/> <!-- MD5 um user afeta a password sempre que se inscreve mas o email é a ponte para todos os seus registos -->
+        <many-to-one name="registeredUserAssociated" class="pt.estgp.estgweb.domain.User" lazy="proxy" outer-join="false"/>
+        <subclass name="pt.estgp.estgweb.domain.EventUserImpl" discriminator-value="EventUserImpl"/>
+    </class>
+    <class name="pt.estgp.estgweb.domain.EventGenericRecord" table="event_generic_record" abstract="true">
+        <meta attribute="extends">pt.estgp.estgweb.domain.OwnedDomainObject</meta>
+        <meta attribute="scope-class">public abstract</meta>
+        <id name="id" type="long">
+            <generator class="native"/>
+        </id>
+        <discriminator column="discrimitator"/>
+        <timestamp source="db" name="updateDate" unsaved-value="null"/> <!-- devem apagados registos sem confirmacao de email após 48 horas -->
+        <property name="saveDate" type="timestamp"/>
+        <property name="password" type="string"/> <!-- MD5 um user afeta a password sempre que se inscreve mas o email é a ponte para todos os seus registos -->
+        <!-- Campos de Registo -->
+        <!--Contactos Info Pessoal-->
+        <!--Obrigatorios-->
+        <property name="mail" type="string"/>
+        <property name="nome" type="string"/>
+        <!--opcionais-->
+        <property name="sexo" type="string"/>
+        <property name="morada" type="string"/>
+        <property name="zip" type="string"/>
+        <property name="cidade" type="string"/>
+        <property name="dataNascimento" type="string"/>
+        <property name="nif" type="string"/>
+        <property name="bi" type="string"/>
+        <property name="telefone1" type="string"/>
+        <property name="telefone2" type="string"/>
+        <property name="empresa" type="string"/>
+        <property name="pais" type="string"/>
+        <property name="escolaridade" type="string"/> <!--12 ano, Bacharelato, Licenciatura, Mestrado, Doutoramento, Outro-->
+        <property name="profissao" type="string"/>
+        <!--Controlo-->
+        <property name="emailConfirmado" type="boolean"/><!--fica verdadeiro apenas apos verificacao do email-->
+        <property name="confirmado" type="boolean"/>
+        <property name="observacoes" type="string">
+            <column name="observacoes" sql-type="TEXT"/>
+        </property>
+        <property name="pago" type="boolean"/>
+        <property name="transacaoInfo" type="string">
+            <column name="transacaoInfo" sql-type="TEXT"/>
+        </property>
+        <many-to-one name="eventUserAssociated" class="pt.estgp.estgweb.domain.EventUser" lazy="proxy" outer-join="false"/>
+        <subclass name="pt.estgp.estgweb.domain.EventGenericRecordImpl" discriminator-value="EventGenericRecordImpl"/>
+    </class>
+</hibernate-mapping>

 /branches/v3/impl/src/web/admin/courses/course.jsp
 ,6 → 3,9
 <%@ page import="pt.estgp.estgweb.Globals" %>
 <%@ page import="java.util.ArrayList" %>
 <%@ page import="pt.estgp.estgweb.web.filters.UserRoleProxy" %>
+<%@ page import="jomm.dao.impl.AbstractDao" %>
+<%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
+<%@ page import="pt.estgp.estgweb.domain.CourseDepartment" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
 ,11 → 53,21
         </th>
         <td>
+            <%
+                AbstractDao.getCurrentSession().beginTransaction();
+                List<CourseDepartment> departments = DaoFactory.getCourseDepartmentDaoImpl().findActives();
+               request.setAttribute("departaments",departments);
+            %>
             <html:select property="courseView.area">
-                <logic:iterate id="area" name="CourseForm" property="areas">
-                    <html:option value="${area}" key="area.${area}"/>
+                <html:option value="">Nenhum</html:option>
+                <logic:iterate id="area" name="departaments" type="pt.estgp.estgweb.domain.CourseDepartmentImpl">
+                    <html:option value="${area.sigla}">${area.schoolFromInstitutionalCode} - ${area.name}</html:option>
                 </logic:iterate>
             </html:select>
+            <%
+                AbstractDao.getCurrentSession().getTransaction().commit();
+            %>
         </td>
     </tr>
     <tr>
 ,7 → 156,14
             <bean:message key="course.institutionalCode"/>
         </th>
         <td>
-            <html:text property="courseView.institutionalCode"/>
+            <!--Dependente do app.properties-->
+            <html:select property="courseView.institutionalCode">
+                <html:option value="1"><%=ConfigProperties.getProperty("institution.code.prefix.1")%></html:option>
+                <html:option value="2"><%=ConfigProperties.getProperty("institution.code.prefix.2")%></html:option>
+                <html:option value="3"><%=ConfigProperties.getProperty("institution.code.prefix.3")%></html:option>
+                <html:option value="4"><%=ConfigProperties.getProperty("institution.code.prefix.4")%></html:option>
+            </html:select>
         </td>
     </tr>
 ,6 → 279,39
             </logic:notPresent>
         </td>
     </tr>
+    <tr>
+        <th>
+            <bean:message key="course.studies.plan"/> (Versão nova PAE)
+            <a class="btn btn-default" href="<%=request.getContextPath()%>/user/adminStudyPlans.do?courseId=<%=CourseView.getId()%>">Gerir Planos</a>
+        </th>
+        <td>
+            <logic:present name="CourseView" property="courseStudiesPlans">
+                <table class="tablesorterfiltered">
+                    <thead>
+                    <tr>
+                        <th>Versão</th>
+                        <th>Data Produção</th>
+                        <th>Ultima alteração</th>
+                        <th>Descrição</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <logic:iterate id="studyPlan" name="CourseView" property="courseStudiesPlans" type="pt.estgp.estgweb.domain.CourseStudiesPlan">
+                        <tr>
+                            <td>${studyPlan.version}</td>
+                            <td>${studyPlan.saveDate}</td>
+                            <td>${studyPlan.updateDate}</td>
+                            <td>${studyPlan.versionDescription}</td>
+                        </tr>
+                    </logic:iterate>
+                    </tbody>
+                </table>
+            </logic:present>
+        </td>
+    </tr>
     <tr class="buttons">
         <td colspan="2">
             <input type="button"

 /branches/v3/impl/src/web/user/courses/studiesPlansAdministration.jsp
 New file
 ,0 → 1,129
+<%@ page import="jomm.dao.impl.AbstractDao" %>
+<%@ page import="pt.estgp.estgweb.domain.Course" %>
+<%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
+<%@ 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/jomm.tld" prefix="jomm"%>
+<%
+    //todo temos de ter aqui o id do curso para o carregar aqui mesmo
+    //se queremos barras de navegação então temos de ter ser acedidos de um
+    //controlador que carregue o necerrário à barra ou então assumimos que
+    //o curso id esta sempre disponivel nas barras possiveis de chamar
+    Long courseId;
+    if(request.getParameter("courseId") != null)
+    {
+        courseId = Long.parseLong(request.getParameter("courseId"));
+        request.setAttribute("courseId",courseId);
+    }
+    else
+        courseId = (Long) request.getAttribute("courseId");
+    //provavelmente era mais facil ter um Form Nested com toda a informação, ou então faz-se isso numa pagina propria para editar o plano em questão
+    AbstractDao.getCurrentSession().beginTransaction();
+    Course course = DaoFactory.getCourseDaoImpl().load(courseId);
+%>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            Lista de Planos de Estudos no curso de <%=course.getName()%> (<%=course.getCode()%>)
+            <button data-toggle="modal" data-target="#modalNovaVersaoDePlano" title="Adicionar Versão do Plano de Estudos" class="btn btn-success pull-right"><span class="glyphicon glyphicon-plus"></span></button>
+        </div>
+        <div class="panel-body">
+            <html:errors/>
+            <jomm:messages/>
+            <table class="tablesorterfiltered">
+                <thead>
+                <tr>
+                    <th>Versão</th>
+                    <th>Data Produção</th>
+                    <th>Ultima alteração</th>
+                    <th>Descrição</th>
+                    <th></th>
+                </tr>
+                </thead>
+                <tbody>
+                <%
+                    request.setAttribute("studyPlans",course.getStudiesPlans());
+                    boolean primeiro = true;
+                %>
+                <logic:iterate id="studyPlan" name="studyPlans" type="pt.estgp.estgweb.domain.CourseStudiesPlan">
+                    <tr>
+                        <td>${studyPlan.version} <%=primeiro?"*":""%> </td>
+                        <td>${studyPlan.saveDate}</td>
+                        <td>${studyPlan.updateDate}</td>
+                        <td>${studyPlan.versionDescription}</td>
+                        <td><a href="<%=request.getContextPath()%>/user/adminStudyPlansEdit.do?courseId=${courseId}&studyPlanId=${studyPlan.id}" class="btn btn-warning"><span class="glyphicon glyphicon-pencil"></span></a> </td>
+                    </tr>
+                    <%
+                        primeiro=false;
+                    %>
+                </logic:iterate>
+                </tbody>
+            </table>
+            <p>* Último plano registado, este é o plano em vigor, o número de versão é apenas indicativo para administradores.</p>
+        </div>
+    </div>
+<%
+    AbstractDao.getCurrentSession().getTransaction().commit();
+%>
+<div class="modal fade" id="modalNovaVersaoDePlano" 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">
+                Nova versão do Plano de Estudos
+                <button type="button" class="btn btn-danger btn-xs pull-right" data-dismiss="modal"><span class="glyphicon glyphicon-remove small"></span></button>
+            </div>
+            <div class="modal-body">
+                    <div class="panel panel-default">
+                        <div class="panel-body">
+                            <html:form styleClass="form-horizontal" action="/user/courseControllerStudiesPlan">
+                                <input type="hidden" name="dispatch" value="addNewVersion"/>
+                                <html:hidden property="courseId" value="${courseId}"/>
+                                <div class="form-group">
+                                    <label class="control-label col-sm-2">Versão</label>
+                                    <div class="col-sm-10">
+                                        <html:text styleClass="form-control" property="courseStudiesPlan.version" size="3"/>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="control-label col-sm-2">Descrição</label>
+                                    <div class="col-sm-10">
+                                        <html:text styleClass="form-control" property="courseStudiesPlan.versionDescription"/>
+                                    </div>
+                                </div>
+                                <button type="button" class="btn btn-danger" data-dismiss="modal">Cancelar</button>
+                                <html:submit styleClass="btn btn-success" >Salvar</html:submit>
+                            </html:form>
+                        </div>
+                    </div>
+            </div>
+        </div>
+    </div>
+</div>

 /branches/v3/impl/src/web/user/courses/topnavPlansAdminFromCourseEdit.jsp
 New file
 ,0 → 1,18
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="jomm.web.utils.NavPlaceServer"%>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%
+    String courseId = request.getParameter("courseId");
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/user/startServiceZone.do", "intranet.separator.service.zone.back");
+    topNav.addNavPlace("/user/startSelectCourseFromServiceZone.do", "course.select");
+    topNav.addNavPlace("/user/courseControllerFromServiceZone.do?dispatch=editAdmin&courseView.id=" + courseId, "course.submit.edit");
+    topNav.addNavPlace(null, "course.admin.studyplans");
+%>
+<jsp:include page="/layout/topnav.jsp"/>
 Property changes:
 Added: svn:executable
 + *

 /branches/v3/impl/src/web/user/courses/studiesPlansAdministrationEdit.jsp
 New file
 ,0 → 1,343
+<%@ page import="jomm.dao.impl.AbstractDao" %>
+<%@ page import="pt.estgp.estgweb.domain.Course" %>
+<%@ page import="pt.estgp.estgweb.domain.CourseStudiesPlan" %>
+<%@ page import="pt.estgp.estgweb.domain.CourseStudiesPlanImpl" %>
+<%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
+<%@ page import="pt.estgp.estgweb.web.form.courses.CourseStudiesPlansAdminForm" %>
+<%@ page import="pt.estgp.estgweb.services.courses.CoursesService" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
+<%@ 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/jomm.tld" prefix="jomm"%>
+<%
+    //todo temos de ter aqui o id do curso para o carregar aqui mesmo
+    //se queremos barras de navegação então temos de ter ser acedidos de um
+    //controlador que carregue o necerrário à barra ou então assumimos que
+    //o curso id esta sempre disponivel nas barras possiveis de chamar
+    AbstractDao.getCurrentSession().beginTransaction();
+    CourseStudiesPlanImpl planoEdicao;
+    boolean ultimaVersao = true;
+    Long courseId;
+    Long studyPlanId;
+    String versaoPlano = "Não Encontrada";
+    Course course;
+    if(request.getAttribute("CourseStudiesPlansAdminForm") != null)
+    {
+        CourseStudiesPlansAdminForm frm = (CourseStudiesPlansAdminForm) request.getAttribute("CourseStudiesPlansAdminForm");
+        courseId = frm.getCourseId();
+        studyPlanId = frm.getCourseStudiesPlan().getId();
+        ultimaVersao = frm.isVersaoVigor();
+        course = DaoFactory.getCourseDaoImpl().load(courseId);
+        planoEdicao = frm.getCourseStudiesPlan();
+    }
+    else
+    {
+        courseId = Long.parseLong(request.getParameter("courseId"));
+        studyPlanId = Long.parseLong(request.getParameter("studyPlanId"));
+        request.setAttribute("courseId",courseId);
+        request.setAttribute("studyPlanId",studyPlanId);
+        course = DaoFactory.getCourseDaoImpl().load(courseId);
+        planoEdicao = null;
+        for(CourseStudiesPlan plan:course.getStudiesPlans())
+        {
+            if(plan.getId() == studyPlanId)
+            {
+                versaoPlano = plan.getVersion() + "";
+                planoEdicao = (CourseStudiesPlanImpl) DaoFactory.getCourseStudiesPlanDaoImpl().narrow(plan);
+                break;
+            }
+            ultimaVersao = false;
+        }
+        //provavelmente era mais facil ter um Form Nested com toda a informação, ou então faz-se isso numa pagina propria para editar o plano em questão
+    }
+    request.setAttribute("courseId",courseId);
+    request.setAttribute("studyPlanId",studyPlanId);
+    request.setAttribute("course",course);
+    /*
+    if(planoEdicao != null)
+    {
+    }
+    */
+%>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            Edição do plano de estudos. Versão <%=versaoPlano%> <%=ultimaVersao? "(<u>é a versão em vigor</u>)":""%> do curso de <%=course.getName()%> (<%=course.getCode()%>)
+            <button data-toggle="modal" data-target="#modalNovaVersaoDePlano" title="Adicionar Versão do Plano de Estudos" class="btn btn-success pull-right"><span class="glyphicon glyphicon-plus"></span></button>
+        </div>
+        <div class="panel-body">
+            <html:errors/>
+            <jomm:messages/>
+            <div class="panel panel-default">
+                <div class="panel-heading">Dados do Curso</div>
+                <div class="panel-body">
+                    <div class="col-sm-12">Código do Curso <label class="text-info">${course.code}</label></div>
+                    <div class="col-sm-12">
+                        <table class="tablesorter-blue">
+                            <thead>
+                                <tr>
+                                    <th>Língua</th>
+                                    <th>Nome do Curso</th>
+                                    <th>Departamento</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr>
+                                    <td>PT</td>
+                                    <td>${course.name}</td>
+                                    <td>
+                                    <%if(course.getDepartment() != null){%>${course.department.name}<%}%>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>EN</td>
+                                    <td>${course.nameEn}</td>
+                                    <td>
+                                        <%if(course.getDepartment() != null){%>${course.department.nameEn}<%}%>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>ES</td>
+                                    <td>${course.nameEs}</td>
+                                    <td>
+                                        <%if(course.getDepartment() != null){%>${course.department.nameEs}<%}%>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>FR</td>
+                                    <td>${course.nameFr}</td>
+                                    <td>
+                                        <%if(course.getDepartment() != null){%>${course.department.nameFr}<%}%>
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                   </div>
+                </div>
+            </div>
+            <div class="panel panel-default">
+                <div class="panel-heading">Plano de Estudos</div>
+                <div class="panel-body">
+                        <html:form action="/user/courseControllerStudiesPlan" styleClass="form-horizontal">
+                            <%
+                                CourseStudiesPlansAdminForm courseStudiesPlansAdminForm = (CourseStudiesPlansAdminForm) request.getAttribute("CourseStudiesPlansAdminForm");
+                                if(courseStudiesPlansAdminForm.getCourseStudiesPlan().getId() <= 0)
+                                {
+                                    courseStudiesPlansAdminForm.setCourseStudiesPlan(planoEdicao);
+                                    courseStudiesPlansAdminForm.setCourseId(courseId);
+                                    courseStudiesPlansAdminForm.setVersaoVigor(ultimaVersao);
+                                    courseStudiesPlansAdminForm.setPlanoEstudos(new CoursesService().loadCursoPlanoFromXml(planoEdicao.getXml()));
+                                }
+                            %>
+                            <input type="hidden" name="dispatch" value="savePlano"/>
+                            <html:hidden property="courseId"/>
+                            <html:hidden property="versaoVigor"/>
+                            <html:hidden property="courseStudiesPlan.id"/>
+                            <div class="form-group">
+                                <label class="control-label col-sm-2">Versão</label>
+                                <div class="col-sm-10">
+                                    <html:text styleClass="form-control" property="courseStudiesPlan.version" size="3"/>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="control-label col-sm-2">Descrição</label>
+                                <div class="col-sm-10">
+                                    <html:text styleClass="form-control" property="courseStudiesPlan.versionDescription"/>
+                                </div>
+                            </div>
+                            <nested:notEmpty  property="planoEstudos">
+                                <html:hidden property="planoEstudos.siges"/>
+                                <html:hidden property="planoEstudos.nome"/>
+                                <html:hidden property="planoEstudos.dep"/>
+                                <nested:iterate id="semestre" property="planoEstudos.semestre" type="pt.estgp.estgweb.services.courses.xsd.Curso.Semestre">
+                                    <div class="panel panel-default">
+                                        <div class="panel-heading">
+                                            <nested:text property="id"/>
+                                        </div>
+                                        <div class="panel-body">
+                                            <button class="btn btn-default" data-toggle="collapse" type="button" data-target=".langs">Ver Campos Multingua</button>
+                                            <nested:iterate id="perfil" property="perfil" type="pt.estgp.estgweb.services.courses.xsd.Curso.Semestre.Perfil">
+                                                <div class="panel panel-default">
+                                                    <div class="panel-heading">
+                                                        PERFIL <nested:text styleClass="form-control" property="nome"/>
+                                                    </div>
+                                                    <div class="panel-body">
+                                                        <table class="tablesorterfiltered">
+                                                            <thead>
+                                                            <tr>
+                                                                <th>SIGES</th>
+                                                                <th>Nome</th>
+                                                                <th>Total</th>
+                                                                <th>T</th>
+                                                                <th>TP</th>
+                                                                <th>P</th>
+                                                                <th>PL</th>
+                                                                <th>PD</th>
+                                                                <th>OT</th>
+                                                                <th>E</th>
+                                                                <th>S</th>
+                                                                <th>TC</th>
+                                                                <th>O</th>
+                                                                <th>ECTS</th>
+                                                                <th>URL UNIDADE</th>
+                                                                <th>FICHA URL</th>
+                                                            </tr>
+                                                            </thead>
+                                                            <tbody>
+                                                            <nested:iterate id="unidade" property="unidade" type="pt.estgp.estgweb.services.courses.xsd.UnidadeType">
+                                                                <tr>
+                                                                    <td><nested:text styleClass="form-control" property="siges"/></td>
+                                                                    <td>
+                                                                        <div>
+                                                                            <div class="col-sm-1">(PT)</div>
+                                                                            <div class="col-sm-11"><nested:text style="width:300px" styleClass="form-control" property="nome"/></div>
+                                                                            <div class="langs collapse" >
+                                                                                <div class="col-sm-1">(EN)</div>
+                                                                                <div class="col-sm-11"><nested:text style="width:300px" styleClass="form-control" property="nomeEn"/></div>
+                                                                                <div class="col-sm-1">(ES)</div>
+                                                                                <div class="col-sm-11"><nested:text style="width:300px" styleClass="form-control" property="nomeEs"/></div>
+                                                                                <div class="col-sm-1">(FR)</div>
+                                                                                <div class="col-sm-11"><nested:text style="width:300px" styleClass="form-control" property="nomeFr"/></div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </td>
+                                                                    <td><nested:text styleClass="form-control" property="totalHoras"/></td>
+                                                                    <td><nested:text styleClass="form-control" property="horasContacto.t"/></td>
+                                                                    <td><nested:text styleClass="form-control" property="horasContacto.TP"/></td>
+                                                                    <td><nested:text styleClass="form-control" property="horasContacto.p"/></td>
+                                                                    <td><nested:text styleClass="form-control" property="horasContacto.PL"/></td>
+                                                                    <td><nested:text styleClass="form-control" property="horasContacto.PD"/></td>
+                                                                    <td><nested:text styleClass="form-control" property="horasContacto.OT"/></td>
+                                                                    <td><nested:text styleClass="form-control" property="horasContacto.e"/></td>
+                                                                    <td><nested:text styleClass="form-control" property="horasContacto.s"/></td>
+                                                                    <td><nested:text styleClass="form-control" property="horasContacto.TC"/></td>
+                                                                    <td><nested:text styleClass="form-control" property="horasContacto.o"/></td>
+                                                                    <td><nested:text styleClass="form-control" property="ECTS"/></td>
+                                                                    <td><nested:text styleClass="form-control" style="width:600px" property="urlUnidadeCurricular"/></td>
+                                                                    <td><nested:text styleClass="form-control" style="width:600px" property="urlFichaCurricular"/></td>
+                                                                </tr>
+                                                            </nested:iterate>
+                                                            </tbody>
+                                                        </table>
+                                                    </div>
+                                                </div>
+                                            </nested:iterate>
+                                            <nested:notEmpty property="unidade">
+                                                <table class="tablesorterfiltered">
+                                                <thead>
+                                                    <tr>
+                                                        <th>SIGES</th>
+                                                        <th>Nome</th>
+                                                        <th>Total</th>
+                                                        <th>T</th>
+                                                        <th>TP</th>
+                                                        <th>P</th>
+                                                        <th>PL</th>
+                                                        <th>PD</th>
+                                                        <th>OT</th>
+                                                        <th>E</th>
+                                                        <th>S</th>
+                                                        <th>TC</th>
+                                                        <th>O</th>
+                                                        <th>ECTS</th>
+                                                        <th>URL UNIDADE</th>
+                                                        <th>FICHA URL</th>
+                                                    </tr>
+                                                </thead>
+                                                <tbody>
+                                                    <nested:iterate id="unidade" property="unidade" type="pt.estgp.estgweb.services.courses.xsd.UnidadeType">
+                                                        <tr>
+                                                            <td><nested:text styleClass="form-control" property="siges"/></td>
+                                                            <td>
+                                                                <div>
+                                                                    <div class="col-sm-1">(PT)</div>
+                                                                    <div class="col-sm-11"><nested:text style="width:300px" styleClass="form-control" property="nome"/></div>
+                                                                    <div class="langs collapse" >
+                                                                        <div class="col-sm-1">(EN)</div>
+                                                                        <div class="col-sm-11"><nested:text style="width:300px" styleClass="form-control" property="nomeEn"/></div>
+                                                                        <div class="col-sm-1">(ES)</div>
+                                                                        <div class="col-sm-11"><nested:text style="width:300px" styleClass="form-control" property="nomeEs"/></div>
+                                                                        <div class="col-sm-1">(FR)</div>
+                                                                        <div class="col-sm-11"><nested:text style="width:300px" styleClass="form-control" property="nomeFr"/></div>
+                                                                    </div>
+                                                                </div>
+                                                            </td>
+                                                            <td><nested:text styleClass="form-control" property="totalHoras"/></td>
+                                                            <td><nested:text styleClass="form-control" property="horasContacto.t"/></td>
+                                                            <td><nested:text styleClass="form-control" property="horasContacto.TP"/></td>
+                                                            <td><nested:text styleClass="form-control" property="horasContacto.p"/></td>
+                                                            <td><nested:text styleClass="form-control" property="horasContacto.PL"/></td>
+                                                            <td><nested:text styleClass="form-control" property="horasContacto.PD"/></td>
+                                                            <td><nested:text styleClass="form-control" property="horasContacto.OT"/></td>
+                                                            <td><nested:text styleClass="form-control" property="horasContacto.e"/></td>
+                                                            <td><nested:text styleClass="form-control" property="horasContacto.s"/></td>
+                                                            <td><nested:text styleClass="form-control" property="horasContacto.TC"/></td>
+                                                            <td><nested:text styleClass="form-control" property="horasContacto.o"/></td>
+                                                            <td><nested:text styleClass="form-control" property="ECTS"/></td>
+                                                            <td><nested:text styleClass="form-control" style="width:600px" property="urlUnidadeCurricular"/></td>
+                                                            <td><nested:text styleClass="form-control" style="width:600px" property="urlFichaCurricular"/></td>
+                                                        </tr>
+                                                    </nested:iterate>
+                                                </tbody>
+                                            </table>
+                                            </nested:notEmpty>
+                                        </div>
+                                    </div>
+                                </nested:iterate>
+                            </nested:notEmpty>
+                            <button type="button" class="btn btn-danger" data-dismiss="modal">Cancelar</button>
+                            <html:submit styleClass="btn btn-success" >Salvar</html:submit>
+                        </html:form>
+                </div>
+            </div>
+        </div>
+    </div>
+<%
+    AbstractDao.getCurrentSession().getTransaction().commit();
+%>

 /branches/v3/impl/src/web/user/courses/selectCourse.jsp
 ,7 → 66,7
                             </logic:notPresent>
                         </td>
                         <td>
-                            <a class="btn btn-warning" href="<%=request.getContextPath()%>/user/courseControllerFromServiceZone.do?dispatch=edit&courseView.id=${course.id}">
+                            <a class="btn btn-warning" href="<%=request.getContextPath()%>/user/courseControllerFromServiceZone.do?dispatch=editAdmin&courseView.id=${course.id}">
                                 <span class="glyphicon glyphicon-pencil"></span>
                             </a>
                         </td>

 /branches/v3/impl/src/web/user/courses/topnavPlanEditFromCourseEdit.jsp
 New file
 ,0 → 1,19
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="jomm.web.utils.NavPlaceServer"%>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%
+    String courseId = request.getParameter("courseId");
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/user/startServiceZone.do", "intranet.separator.service.zone.back");
+    topNav.addNavPlace("/user/startSelectCourseFromServiceZone.do", "course.select");
+    topNav.addNavPlace("/user/courseControllerFromServiceZone.do?dispatch=editAdmin&courseView.id=" + courseId, "course.submit.edit");
+    topNav.addNavPlace("/user/adminStudyPlans.do?courseId="+courseId, "course.admin.studyplans");
+    topNav.addNavPlace(null, "course.admin.studyplans.edit");
+%>
+<jsp:include page="/layout/topnav.jsp"/>
 Property changes:
 Added: svn:executable
 + *

 /branches/v3/impl/src/xsd/planoestudos.xsd
 ,6 → 58,9
             <xsd:element name="urlFichaCurricular" type="xsd:string" minOccurs="0" maxOccurs="1"/>
             <xsd:element name="urlUnidadeCurricular" type="xsd:string" minOccurs="0" maxOccurs="1"/>
                         <xsd:element name="nome" type="xsd:string"/>
+            <xsd:element name="nomeEn" type="xsd:string"/>
+            <xsd:element name="nomeEs" type="xsd:string"/>
+            <xsd:element name="nomeFr" type="xsd:string"/>
                         <xsd:element name="dep" type="xsd:string"/>
                         <xsd:element name="totalHoras" type="xsd:int"/>
                         <xsd:element name="horasContacto">

 /branches/v3/impl/gen/java/pt/estgp/estgweb/services/courses/xsd/package-info.java
 ,7 → 2,7
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-558
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
 // Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2016.07.29 at 04:29:45 PM WEST
+// Generated on: 2016.09.15 at 12:21:29 PM WEST
 //
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.estgp.pt/xsd/planoestudos/1.0/", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)

 /branches/v3/impl/gen/java/pt/estgp/estgweb/services/courses/xsd/Curso.java
 ,20 → 2,15
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-558
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
 // Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2016.07.29 at 04:29:45 PM WEST
+// Generated on: 2016.09.15 at 12:21:29 PM WEST
 //
 package pt.estgp.estgweb.services.courses.xsd;
+import javax.xml.bind.annotation.*;
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 /**

 /branches/v3/impl/gen/java/pt/estgp/estgweb/services/courses/xsd/UnidadeType.java
 ,7 → 2,7
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-558
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
 // Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2016.07.29 at 04:29:45 PM WEST
+// Generated on: 2016.09.15 at 12:21:29 PM WEST
 //
 ,6 → 28,9
  *         &lt;element name="urlFichaCurricular" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         &lt;element name="urlUnidadeCurricular" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         &lt;element name="nome" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="nomeEn" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="nomeEs" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="nomeFr" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         &lt;element name="dep" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         &lt;element name="totalHoras" type="{http://www.w3.org/2001/XMLSchema}int"/>
  *         &lt;element name="horasContacto">
 ,6 → 69,9
     "urlFichaCurricular",
     "urlUnidadeCurricular",
     "nome",
+    "nomeEn",
+    "nomeEs",
+    "nomeFr",
     "dep",
     "totalHoras",
     "horasContacto",
 ,6 → 85,12
     @XmlElement(required = true)
     protected String nome;
     @XmlElement(required = true)
+    protected String nomeEn;
+    @XmlElement(required = true)
+    protected String nomeEs;
+    @XmlElement(required = true)
+    protected String nomeFr;
+    @XmlElement(required = true)
     protected String dep;
     protected int totalHoras;
     @XmlElement(required = true)
 ,6 → 175,78
     }
     /**
+     * Gets the value of the nomeEn property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getNomeEn() {
+        return nomeEn;
+    }
+    /**
+     * Sets the value of the nomeEn property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setNomeEn(String value) {
+        this.nomeEn = value;
+    }
+    /**
+     * Gets the value of the nomeEs property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getNomeEs() {
+        return nomeEs;
+    }
+    /**
+     * Sets the value of the nomeEs property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setNomeEs(String value) {
+        this.nomeEs = value;
+    }
+    /**
+     * Gets the value of the nomeFr property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getNomeFr() {
+        return nomeFr;
+    }
+    /**
+     * Sets the value of the nomeFr property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setNomeFr(String value) {
+        this.nomeFr = value;
+    }
+    /**
      * Gets the value of the dep property.
      *
      * @return

 /branches/v3/impl/gen/java/pt/estgp/estgweb/services/courses/xsd/ObjectFactory.java
 ,7 → 2,7
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-558
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
 // Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2016.07.29 at 04:29:45 PM WEST
+// Generated on: 2016.09.15 at 12:21:29 PM WEST
 //
 ,6 → 37,14
     }
     /**
+     * Create an instance of {@link Curso.Semestre.Perfil }
+     *
+     */
+    public Curso.Semestre.Perfil createCursoSemestrePerfil() {
+        return new Curso.Semestre.Perfil();
+    }
+    /**
      * Create an instance of {@link Curso.Semestre }
      *
      */
 ,11 → 53,11
     }
     /**
-     * Create an instance of {@link Curso.Semestre.Perfil }
+     * Create an instance of {@link UnidadeType.HorasContacto }
      *
      */
-    public Curso.Semestre.Perfil createCursoSemestrePerfil() {
-        return new Curso.Semestre.Perfil();
+    public UnidadeType.HorasContacto createUnidadeTypeHorasContacto() {
+        return new UnidadeType.HorasContacto();
     }
     /**
 ,12 → 76,4
         return new UnidadeType();
     }
-    /**
-     * Create an instance of {@link UnidadeType.HorasContacto }
-     *
-     */
-    public UnidadeType.HorasContacto createUnidadeTypeHorasContacto() {
-        return new UnidadeType.HorasContacto();
-    }
 }

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioPedagogicoCursoAfeto.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Pagina.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9


import java.util.ArrayList;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitDeliverable.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioResposta.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/PageContent.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Configuration.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/JobParameter.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/GenericUser.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/EventGeneric.java
 New file
 ,0 → 1,264
+package pt.estgp.estgweb.domain;
+// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9
+import java.util.Date;
+/**
+ * EventGeneric generated by hbm2java
+ */
+public abstract class EventGeneric extends pt.estgp.estgweb.domain.OwnedDomainObject implements java.io.Serializable {
+     private long id;
+     private Date updateDate;
+     private Date saveDate;
+     private boolean ativo;
+     private Date dataAberturaFormulario;
+     private Date dataFechoFormulario;
+     private Date dataPublicacao;
+     private String title;
+     private String description;
+     private String observacoes;
+     private String locais;
+     private Date dataInicio;
+     private String flyerRepositoryStream;
+     private String category;
+     private String sub_category;
+     private String preInformation;
+     private String afterRegisterInformation;
+     private boolean registeredUsersOnly;
+     private boolean sexo;
+     private boolean morada;
+     private boolean dataNascimento;
+     private boolean nif;
+     private boolean bi;
+     private boolean telefone1;
+     private boolean telefone2;
+     private boolean empresa;
+     private boolean pais;
+     private boolean escolaridade;
+     private boolean profissao;
+     private User owner;
+    public EventGeneric() {
+    }
+    public long getId() {
+        return this.id;
+    }
+    public void setId(long id) {
+        this.id = id;
+    }
+    public Date getUpdateDate() {
+        return this.updateDate;
+    }
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+    public Date getSaveDate() {
+        return this.saveDate;
+    }
+    public void setSaveDate(Date saveDate) {
+        this.saveDate = saveDate;
+    }
+    public boolean isAtivo() {
+        return this.ativo;
+    }
+    public void setAtivo(boolean ativo) {
+        this.ativo = ativo;
+    }
+    public Date getDataAberturaFormulario() {
+        return this.dataAberturaFormulario;
+    }
+    public void setDataAberturaFormulario(Date dataAberturaFormulario) {
+        this.dataAberturaFormulario = dataAberturaFormulario;
+    }
+    public Date getDataFechoFormulario() {
+        return this.dataFechoFormulario;
+    }
+    public void setDataFechoFormulario(Date dataFechoFormulario) {
+        this.dataFechoFormulario = dataFechoFormulario;
+    }
+    public Date getDataPublicacao() {
+        return this.dataPublicacao;
+    }
+    public void setDataPublicacao(Date dataPublicacao) {
+        this.dataPublicacao = dataPublicacao;
+    }
+    public String getTitle() {
+        return this.title;
+    }
+    public void setTitle(String title) {
+        this.title = title;
+    }
+    public String getDescription() {
+        return this.description;
+    }
+    public void setDescription(String description) {
+        this.description = description;
+    }
+    public String getObservacoes() {
+        return this.observacoes;
+    }
+    public void setObservacoes(String observacoes) {
+        this.observacoes = observacoes;
+    }
+    public String getLocais() {
+        return this.locais;
+    }
+    public void setLocais(String locais) {
+        this.locais = locais;
+    }
+    public Date getDataInicio() {
+        return this.dataInicio;
+    }
+    public void setDataInicio(Date dataInicio) {
+        this.dataInicio = dataInicio;
+    }
+    public String getFlyerRepositoryStream() {
+        return this.flyerRepositoryStream;
+    }
+    public void setFlyerRepositoryStream(String flyerRepositoryStream) {
+        this.flyerRepositoryStream = flyerRepositoryStream;
+    }
+    public String getCategory() {
+        return this.category;
+    }
+    public void setCategory(String category) {
+        this.category = category;
+    }
+    public String getSub_category() {
+        return this.sub_category;
+    }
+    public void setSub_category(String sub_category) {
+        this.sub_category = sub_category;
+    }
+    public String getPreInformation() {
+        return this.preInformation;
+    }
+    public void setPreInformation(String preInformation) {
+        this.preInformation = preInformation;
+    }
+    public String getAfterRegisterInformation() {
+        return this.afterRegisterInformation;
+    }
+    public void setAfterRegisterInformation(String afterRegisterInformation) {
+        this.afterRegisterInformation = afterRegisterInformation;
+    }
+    public boolean isRegisteredUsersOnly() {
+        return this.registeredUsersOnly;
+    }
+    public void setRegisteredUsersOnly(boolean registeredUsersOnly) {
+        this.registeredUsersOnly = registeredUsersOnly;
+    }
+    public boolean isSexo() {
+        return this.sexo;
+    }
+    public void setSexo(boolean sexo) {
+        this.sexo = sexo;
+    }
+    public boolean isMorada() {
+        return this.morada;
+    }
+    public void setMorada(boolean morada) {
+        this.morada = morada;
+    }
+    public boolean isDataNascimento() {
+        return this.dataNascimento;
+    }
+    public void setDataNascimento(boolean dataNascimento) {
+        this.dataNascimento = dataNascimento;
+    }
+    public boolean isNif() {
+        return this.nif;
+    }
+    public void setNif(boolean nif) {
+        this.nif = nif;
+    }
+    public boolean isBi() {
+        return this.bi;
+    }
+    public void setBi(boolean bi) {
+        this.bi = bi;
+    }
+    public boolean isTelefone1() {
+        return this.telefone1;
+    }
+    public void setTelefone1(boolean telefone1) {
+        this.telefone1 = telefone1;
+    }
+    public boolean isTelefone2() {
+        return this.telefone2;
+    }
+    public void setTelefone2(boolean telefone2) {
+        this.telefone2 = telefone2;
+    }
+    public boolean isEmpresa() {
+        return this.empresa;
+    }
+    public void setEmpresa(boolean empresa) {
+        this.empresa = empresa;
+    }
+    public boolean isPais() {
+        return this.pais;
+    }
+    public void setPais(boolean pais) {
+        this.pais = pais;
+    }
+    public boolean isEscolaridade() {
+        return this.escolaridade;
+    }
+    public void setEscolaridade(boolean escolaridade) {
+        this.escolaridade = escolaridade;
+    }
+    public boolean isProfissao() {
+        return this.profissao;
+    }
+    public void setProfissao(boolean profissao) {
+        this.profissao = profissao;
+    }
+    public User getOwner() {
+        return this.owner;
+    }
+    public void setOwner(User owner) {
+        this.owner = owner;
+    }
+}

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/EventFormacoes.java
 New file
 ,0 → 1,151
+package pt.estgp.estgweb.domain;
+// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9
+/**
+ * EventFormacoes generated by hbm2java
+ */
+public abstract class EventFormacoes extends pt.estgp.estgweb.domain.EventGenericImpl implements java.io.Serializable {
+     private String referencia;
+     private String unidadeOrganica;
+     private String localDeRealizacao;
+     private String dominio;
+     private String destinatarios;
+     private Integer numeroVagas;
+     private Integer duracaoHoras;
+     private Integer ects;
+     private Integer dataRealizacao;
+     private Integer diasDuracao;
+     private double custoFormacao;
+     private double precoFormando;
+     private double percentagemMinimaLucro;
+     private String conteudos;
+     private String status;
+     private String formadores;
+    public EventFormacoes() {
+    }
+    public String getReferencia() {
+        return this.referencia;
+    }
+    public void setReferencia(String referencia) {
+        this.referencia = referencia;
+    }
+    public String getUnidadeOrganica() {
+        return this.unidadeOrganica;
+    }
+    public void setUnidadeOrganica(String unidadeOrganica) {
+        this.unidadeOrganica = unidadeOrganica;
+    }
+    public String getLocalDeRealizacao() {
+        return this.localDeRealizacao;
+    }
+    public void setLocalDeRealizacao(String localDeRealizacao) {
+        this.localDeRealizacao = localDeRealizacao;
+    }
+    public String getDominio() {
+        return this.dominio;
+    }
+    public void setDominio(String dominio) {
+        this.dominio = dominio;
+    }
+    public String getDestinatarios() {
+        return this.destinatarios;
+    }
+    public void setDestinatarios(String destinatarios) {
+        this.destinatarios = destinatarios;
+    }
+    public Integer getNumeroVagas() {
+        return this.numeroVagas;
+    }
+    public void setNumeroVagas(Integer numeroVagas) {
+        this.numeroVagas = numeroVagas;
+    }
+    public Integer getDuracaoHoras() {
+        return this.duracaoHoras;
+    }
+    public void setDuracaoHoras(Integer duracaoHoras) {
+        this.duracaoHoras = duracaoHoras;
+    }
+    public Integer getEcts() {
+        return this.ects;
+    }
+    public void setEcts(Integer ects) {
+        this.ects = ects;
+    }
+    public Integer getDataRealizacao() {
+        return this.dataRealizacao;
+    }
+    public void setDataRealizacao(Integer dataRealizacao) {
+        this.dataRealizacao = dataRealizacao;
+    }
+    public Integer getDiasDuracao() {
+        return this.diasDuracao;
+    }
+    public void setDiasDuracao(Integer diasDuracao) {
+        this.diasDuracao = diasDuracao;
+    }
+    public double getCustoFormacao() {
+        return this.custoFormacao;
+    }
+    public void setCustoFormacao(double custoFormacao) {
+        this.custoFormacao = custoFormacao;
+    }
+    public double getPrecoFormando() {
+        return this.precoFormando;
+    }
+    public void setPrecoFormando(double precoFormando) {
+        this.precoFormando = precoFormando;
+    }
+    public double getPercentagemMinimaLucro() {
+        return this.percentagemMinimaLucro;
+    }
+    public void setPercentagemMinimaLucro(double percentagemMinimaLucro) {
+        this.percentagemMinimaLucro = percentagemMinimaLucro;
+    }
+    public String getConteudos() {
+        return this.conteudos;
+    }
+    public void setConteudos(String conteudos) {
+        this.conteudos = conteudos;
+    }
+    public String getStatus() {
+        return this.status;
+    }
+    public void setStatus(String status) {
+        this.status = status;
+    }
+    public String getFormadores() {
+        return this.formadores;
+    }
+    public void setFormadores(String formadores) {
+        this.formadores = formadores;
+    }
+}

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/ComunicationFolder.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/PageExternalObject.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/EventClass.java
 New file
 ,0 → 1,72
+package pt.estgp.estgweb.domain;
+// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9
+import java.util.Date;
+/**
+ * EventClass generated by hbm2java
+ */
+public abstract class EventClass extends pt.estgp.estgweb.domain.OwnedDomainObject implements java.io.Serializable {
+     private long id;
+     private Date updateDate;
+     private Date saveDate;
+     private String name;
+     private String description;
+     private String managers_role;
+    public EventClass() {
+    }
+    public long getId() {
+        return this.id;
+    }
+    public void setId(long id) {
+        this.id = id;
+    }
+    public Date getUpdateDate() {
+        return this.updateDate;
+    }
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+    public Date getSaveDate() {
+        return this.saveDate;
+    }
+    public void setSaveDate(Date saveDate) {
+        this.saveDate = saveDate;
+    }
+    public String getName() {
+        return this.name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getDescription() {
+        return this.description;
+    }
+    public void setDescription(String description) {
+        this.description = description;
+    }
+    public String getManagers_role() {
+        return this.managers_role;
+    }
+    public void setManagers_role(String managers_role) {
+        this.managers_role = managers_role;
+    }
+}

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioInstituicao.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitTurma.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/ConfigurationGradesStatusEpoca.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioPedagogicoUnidadeCurricularAfeta.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Course.java
 ,5 → 1,5
 package pt.estgp.estgweb.domain;
-// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
+// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9
 import java.util.Date;
 ,6 → 16,9
      private Date updateDate;
      private Date saveDate;
      private String name;
+     private String nameEn;
+     private String nameEs;
+     private String nameFr;
      private String description;
      private String code;
      private String importYear;
 ,6 → 33,7
      private String area;
      private String userGroupStudents;
      private String json;
+     private CourseDepartment department;
      private PageSection courseContents;
      private Teacher director;
      private Teacher coordinator;
 ,6 → 74,27
     public void setName(String name) {
         this.name = name;
     }
+    public String getNameEn() {
+        return this.nameEn;
+    }
+    public void setNameEn(String nameEn) {
+        this.nameEn = nameEn;
+    }
+    public String getNameEs() {
+        return this.nameEs;
+    }
+    public void setNameEs(String nameEs) {
+        this.nameEs = nameEs;
+    }
+    public String getNameFr() {
+        return this.nameFr;
+    }
+    public void setNameFr(String nameFr) {
+        this.nameFr = nameFr;
+    }
     public String getDescription() {
         return this.description;
     }
 ,6 → 193,13
     public void setJson(String json) {
         this.json = json;
     }
+    public CourseDepartment getDepartment() {
+        return this.department;
+    }
+    public void setDepartment(CourseDepartment department) {
+        this.department = department;
+    }
     public PageSection getCourseContents() {
         return this.courseContents;
     }

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/PageExternalUrl.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/AssessmentResponse.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SurveyQuestionItem.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/UrlStatMonth.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/UrlStatDayId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseStudiesPlan.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Page.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioPedagogicoAlunoRequisitado.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/EventUser.java
 New file
 ,0 → 1,72
+package pt.estgp.estgweb.domain;
+// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9
+import java.util.Date;
+/**
+ * EventUser generated by hbm2java
+ */
+public abstract class EventUser extends pt.estgp.estgweb.domain.DomainObject implements java.io.Serializable {
+     private long id;
+     private Date updateDate;
+     private Date saveDate;
+     private String email;
+     private String password;
+     private User registeredUserAssociated;
+    public EventUser() {
+    }
+    public long getId() {
+        return this.id;
+    }
+    public void setId(long id) {
+        this.id = id;
+    }
+    public Date getUpdateDate() {
+        return this.updateDate;
+    }
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+    public Date getSaveDate() {
+        return this.saveDate;
+    }
+    public void setSaveDate(Date saveDate) {
+        this.saveDate = saveDate;
+    }
+    public String getEmail() {
+        return this.email;
+    }
+    public void setEmail(String email) {
+        this.email = email;
+    }
+    public String getPassword() {
+        return this.password;
+    }
+    public void setPassword(String password) {
+        this.password = password;
+    }
+    public User getRegisteredUserAssociated() {
+        return this.registeredUserAssociated;
+    }
+    public void setRegisteredUserAssociated(User registeredUserAssociated) {
+        this.registeredUserAssociated = registeredUserAssociated;
+    }
+}

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Image.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

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

/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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapEntityQuestionarioPerguntaNumeroDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioRespostaRequisitadaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapEntityQuestionarioCursoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapStarQuestionarioAnswerDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ConfigurationGradesStatusEpocaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

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

/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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapEntityQuestionarioCursoDegreeDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ComunicationFolderDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioPedagogicoCursoAfetoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/PaginaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioRespostaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioPedagogicoAlunoRequisitadoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

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

/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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseStudiesPlanDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

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

/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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

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

/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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

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

/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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapEntityQuestionarioAnoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/AnnouncementDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioPedagogicoUnidadeCurricularAfetaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SeccaoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioPedagogicoTipologiaRequisitadaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 28/Jul/2016 9:13:19 by Hibernate Tools 3.2.0.b9
// Generated 14/Set/2016 16:41:13 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioPerguntaNumero.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/DigitalDeliveryTarget.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioRespostaRequisitada.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnit.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioPedagogicoTipologiaRequisitada.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SigesUser.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/EventGenericRecord.java
 New file
 ,0 → 1,224
+package pt.estgp.estgweb.domain;
+// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9
+import java.util.Date;
+/**
+ * EventGenericRecord generated by hbm2java
+ */
+public abstract class EventGenericRecord extends pt.estgp.estgweb.domain.OwnedDomainObject implements java.io.Serializable {
+     private long id;
+     private Date updateDate;
+     private Date saveDate;
+     private String password;
+     private String mail;
+     private String nome;
+     private String sexo;
+     private String morada;
+     private String zip;
+     private String cidade;
+     private String dataNascimento;
+     private String nif;
+     private String bi;
+     private String telefone1;
+     private String telefone2;
+     private String empresa;
+     private String pais;
+     private String escolaridade;
+     private String profissao;
+     private boolean emailConfirmado;
+     private boolean confirmado;
+     private String observacoes;
+     private boolean pago;
+     private String transacaoInfo;
+     private EventUser eventUserAssociated;
+    public EventGenericRecord() {
+    }
+    public long getId() {
+        return this.id;
+    }
+    public void setId(long id) {
+        this.id = id;
+    }
+    public Date getUpdateDate() {
+        return this.updateDate;
+    }
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+    public Date getSaveDate() {
+        return this.saveDate;
+    }
+    public void setSaveDate(Date saveDate) {
+        this.saveDate = saveDate;
+    }
+    public String getPassword() {
+        return this.password;
+    }
+    public void setPassword(String password) {
+        this.password = password;
+    }
+    public String getMail() {
+        return this.mail;
+    }
+    public void setMail(String mail) {
+        this.mail = mail;
+    }
+    public String getNome() {
+        return this.nome;
+    }
+    public void setNome(String nome) {
+        this.nome = nome;
+    }
+    public String getSexo() {
+        return this.sexo;
+    }
+    public void setSexo(String sexo) {
+        this.sexo = sexo;
+    }
+    public String getMorada() {
+        return this.morada;
+    }
+    public void setMorada(String morada) {
+        this.morada = morada;
+    }
+    public String getZip() {
+        return this.zip;
+    }
+    public void setZip(String zip) {
+        this.zip = zip;
+    }
+    public String getCidade() {
+        return this.cidade;
+    }
+    public void setCidade(String cidade) {
+        this.cidade = cidade;
+    }
+    public String getDataNascimento() {
+        return this.dataNascimento;
+    }
+    public void setDataNascimento(String dataNascimento) {
+        this.dataNascimento = dataNascimento;
+    }
+    public String getNif() {
+        return this.nif;
+    }
+    public void setNif(String nif) {
+        this.nif = nif;
+    }
+    public String getBi() {
+        return this.bi;
+    }
+    public void setBi(String bi) {
+        this.bi = bi;
+    }
+    public String getTelefone1() {
+        return this.telefone1;
+    }
+    public void setTelefone1(String telefone1) {
+        this.telefone1 = telefone1;
+    }
+    public String getTelefone2() {
+        return this.telefone2;
+    }
+    public void setTelefone2(String telefone2) {
+        this.telefone2 = telefone2;
+    }
+    public String getEmpresa() {
+        return this.empresa;
+    }
+    public void setEmpresa(String empresa) {
+        this.empresa = empresa;
+    }
+    public String getPais() {
+        return this.pais;
+    }
+    public void setPais(String pais) {
+        this.pais = pais;
+    }
+    public String getEscolaridade() {
+        return this.escolaridade;
+    }
+    public void setEscolaridade(String escolaridade) {
+        this.escolaridade = escolaridade;
+    }
+    public String getProfissao() {
+        return this.profissao;
+    }
+    public void setProfissao(String profissao) {
+        this.profissao = profissao;
+    }
+    public boolean isEmailConfirmado() {
+        return this.emailConfirmado;
+    }
+    public void setEmailConfirmado(boolean emailConfirmado) {
+        this.emailConfirmado = emailConfirmado;
+    }
+    public boolean isConfirmado() {
+        return this.confirmado;
+    }
+    public void setConfirmado(boolean confirmado) {
+        this.confirmado = confirmado;
+    }
+    public String getObservacoes() {
+        return this.observacoes;
+    }
+    public void setObservacoes(String observacoes) {
+        this.observacoes = observacoes;
+    }
+    public boolean isPago() {
+        return this.pago;
+    }
+    public void setPago(boolean pago) {
+        this.pago = pago;
+    }
+    public String getTransacaoInfo() {
+        return this.transacaoInfo;
+    }
+    public void setTransacaoInfo(String transacaoInfo) {
+        this.transacaoInfo = transacaoInfo;
+    }
+    public EventUser getEventUserAssociated() {
+        return this.eventUserAssociated;
+    }
+    public void setEventUserAssociated(EventUser eventUserAssociated) {
+        this.eventUserAssociated = eventUserAssociated;
+    }
+}

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/AssessmentQuestion.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseDepartment.java
 New file
 ,0 → 1,100
+package pt.estgp.estgweb.domain;
+// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9
+import java.util.Date;
+/**
+ * CourseDepartment generated by hbm2java
+ */
+public abstract class CourseDepartment extends pt.estgp.estgweb.domain.DomainSerializableObject implements java.io.Serializable {
+     private String sigla;
+     private Date updateDate;
+     private Date saveDate;
+     private String institutionalCode;
+     private boolean active;
+     private String name;
+     private String nameEn;
+     private String nameEs;
+     private String nameFr;
+    public CourseDepartment() {
+    }
+    public CourseDepartment(String sigla) {
+        this.sigla = sigla;
+    }
+    public String getSigla() {
+        return this.sigla;
+    }
+    public void setSigla(String sigla) {
+        this.sigla = sigla;
+    }
+    public Date getUpdateDate() {
+        return this.updateDate;
+    }
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+    public Date getSaveDate() {
+        return this.saveDate;
+    }
+    public void setSaveDate(Date saveDate) {
+        this.saveDate = saveDate;
+    }
+    public String getInstitutionalCode() {
+        return this.institutionalCode;
+    }
+    public void setInstitutionalCode(String institutionalCode) {
+        this.institutionalCode = institutionalCode;
+    }
+    public boolean isActive() {
+        return this.active;
+    }
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+    public String getName() {
+        return this.name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getNameEn() {
+        return this.nameEn;
+    }
+    public void setNameEn(String nameEn) {
+        this.nameEn = nameEn;
+    }
+    public String getNameEs() {
+        return this.nameEs;
+    }
+    public void setNameEs(String nameEs) {
+        this.nameEs = nameEs;
+    }
+    public String getNameFr() {
+        return this.nameFr;
+    }
+    public void setNameFr(String nameFr) {
+        this.nameFr = nameFr;
+    }
+}

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/MetaProcess.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 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 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Seccao.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/UrlStat.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Jul/2016 9:11:38 by Hibernate Tools 3.2.0.b9
// Generated 15/Set/2016 12:26:17 by Hibernate Tools 3.2.0.b9


import java.util.Date;

Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1504 → Rev 1505