WebSVN - bacoAlunos - Path Comparison - / Rev 1925 and / Rev 1928

Ignore whitespace Rev 1925 → Rev 1928

 /branches/grupo3/impl/conf/berserk/sd.xml
 ,7 → 4087,8
         <name>LoadCourseReportDoc</name>
         <implementationClass>pt.estgp.estgweb.services.courses.CourseReportServices</implementationClass>
         <description>
-            @reportCourseDocument documento course report em json
+            @year Ano do relatorio
+            @courseCode codigo do curso
         </description>
         <isTransactional>true</isTransactional>
         <defaultMethod>loadCourseReportDoc</defaultMethod>

 /branches/grupo3/impl/src/java/pt/estgp/estgweb/services/courses/CourseReportServices.java
 ,31 → 490,42
         CourseReportDocument reportDocument =  CourseReportDocument.fromJson(reportDocumentJson);
         Course course = DaoFactory.getCourseDaoImpl().findCourseByCode(reportDocument.getCourseCode());
-        CourseYear courseYr = DaoFactory.getCourseYearDaoImpl().findCourseYear2(reportDocument.getCourseCode(), reportDocument.getYear());
+        List<CourseYear> courseYr = DaoFactory.getCourseYearDaoImpl().findCourseYear(reportDocument.getCourseCode(), reportDocument.getYear());
-        if(courseYr == null){
-            courseYr = DomainObjectFactory.createCourseYearImpl();
-            courseYr.setCourse(course);
-            course.getCourseYears().add(courseYr);
-            courseYr.setImportYear(reportDocument.getYear());
-            DaoFactory.getCourseYearDaoImpl().save(courseYr);
+        if(courseYr.isEmpty()){
+            courseYr.add(DomainObjectFactory.createCourseYearImpl());
+            courseYr.get(0).setCourse(course);
+            course.getCourseYears().add(courseYr.get(0));
+            courseYr.get(0).setImportYear(reportDocument.getYear());
+            DaoFactory.getCourseYearDaoImpl().save(courseYr.get(0));
         }
-        courseYr.setReportSave(reportDocumentJson);
+        courseYr.get(0).setCourseReportDocument(reportDocumentJson);
         return reportDocument.toJson();
     }
     /* Ler o relatorio */
     public String loadCourseReportDoc(UserSession session, String year, String courseCode) throws IOException {
-        CourseYear courseYr = DaoFactory.getCourseYearDaoImpl().findCourseYear2(courseCode, year);
+        List<CourseYear> courseYr = DaoFactory.getCourseYearDaoImpl().findCourseYear(courseCode, year);
         String courseReport = null;
-        if(courseYr != null){
-            courseReport =  courseYr.getReportSave();
+        if(!courseYr.isEmpty()){
+            courseReport =  courseYr.get(0).getCourseReportDocument();
         }
+        if(courseReport == null){
+            CourseReportDocument report = null;
+            try{
+                report = new CourseReportServices().createNewCourseReportDocument(courseCode, year);
+                courseReport = report.toJson();
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+        }
         return courseReport;
     }

 /branches/grupo3/impl/src/java/pt/estgp/estgweb/domain/dao/impl/CourseYearDaoImpl.java
 ,15 → 27,4
         return cYs;
     }
-    /**/
-    public CourseYear findCourseYear2(String code, String importYear)
-    {
-        List<CourseYear> cYs = createCriteria()
-                .createAlias("course","c")
-                .add(eq("importYear", importYear))
-                .add(eq("c.code",code)).list();
-        if(cYs.isEmpty())
-            return null;
-        return cYs.get(0);
-    }
 }

/branches/grupo3/impl/src/java/pt/estgp/estgweb/web/controllers/configuration/ConfigurationsController.java
170,6 → 170,7

configuration.setOpenInfoIntranet(f.getConfiguration().getOpenInfoIntranet());
configuration.setInterfaceImportYear(f.getConfiguration().getInterfaceImportYear());
configuration.setCourseReportImportYear(f.getConfiguration().getCourseReportImportYear());
configuration.setCursosFicticios(f.getConfiguration().getCursosFicticios());

configuration.setCourseUnitEvaluationActiveYear(f.getConfiguration().getCourseUnitEvaluationActiveYear());

 /branches/grupo3/impl/src/hbm/pt/estgp/estgweb/domain/Course.hbm.xml
 ,9 → 79,10
         <property name="separatedTurmas" type="boolean">
             <column name="separatedTurmas" default="false"/>
         </property>
         <!-- 13/12/2017-->
-        <property name="reportSave" type="text">
-            <column name="reportSave" sql-type="LONGTEXT"/>
+        <property name="courseReportDocument" type="text">
+            <column name="courseReportDocument" sql-type="LONGTEXT"/>
         </property>
         <many-to-one name="course" class="pt.estgp.estgweb.domain.Course" outer-join="true" lazy="false" column="course_id"/>

 /branches/grupo3/impl/src/hbm/pt/estgp/estgweb/domain/Configuration.hbm.xml
 ,6 → 14,10
         <timestamp source="db"   name="updateDate" unsaved-value="null"/>
         <property name="saveDate" type="timestamp"/>
         <property name="interfaceImportYear" type="string"/>
+        <!-- -->
+        <property name="courseReportImportYear" type="string">
+            <column name="courseReportImportYear" default="201718"/>
+        </property>
         <!-- IMPORTS CONFIGS -->
         <property name="importsDefaultImportYear" type="string"/>

 /branches/grupo3/impl/src/web/user/courses/courseReportEdit.jsp
 ,6 → 7,7
 <%@ page import="pt.estgp.estgweb.services.courses.CourseReportServices" %>
 <%@ page import="pt.estgp.estgweb.services.courses.coursereport.documentmodel.CourseReportDocument" %>
 <%@ page import="org.json.JSONException" %>
 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
 <%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
 ,8 → 104,8
     try {
         courseReport = new CourseReportServices().createNewCourseReportDocument(courseCode, year);
     } catch (Throwable e) {
-        System.out.println(e);
-        e.printStackTrace();
+    System.out.println(e);
+    e.printStackTrace();
     }
     String courseReportJson = courseReport.toJson();
     request.setAttribute("courseDocumentJson",courseReportJson);
 ,10 → 319,10
                     $scope.saveCourseReportDoc = function()
                     {
                         widgetCallWithActionParameters(
-                            "<%=request.getContextPath()%>/user/json/repository.do",
+                            "<%=request.getContextPath()%>/user/courseReport.do",
                             "saveCourseReportDoc",
                             {
-                                "report" : BacoJS.stringifyOrdered($scope.report)
+                                "courseReportDocument" : BacoJS.stringifyOrdered($scope.report)
                             },
                             "#courseReportApp",
                             function(json)

/branches/grupo3/impl/src/web/user/home/teacher.jsp
157,6 → 157,7
AbstractDao.getCurrentSession().beginTransaction();
TeacherImpl tLoggedIn = (TeacherImpl) DaoFactory.getTeacherDaoImpl().get(UserSession.getUser().getId());
boolean hasCommisionsOrCoordinations = tLoggedIn.hasCoordinationsOrBelongToCourseCommissions();

AbstractDao.getCurrentSession().getTransaction().commit();
if( hasCommisionsOrCoordinations )
{

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/Pagina.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.ArrayList;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitDeliverable.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioPedagogicoCursoAfeto.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioPergunta.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentTaskActorInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/SurveyStatsGraphic.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/GenericUser.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/EventGeneric.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportFileGroupDocentesAno.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentTaskInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentGatewayExclusiveDecisionHolderInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnActorSelector.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitProgram.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/ConfigurationSeparator.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportFileGroupCursosAno.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/Announcement.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentEventEndMessageInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnActorPoolThreadInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/Survey.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/RecordThesis.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/AssessmentQuestionPossibleAnswer.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/RepositoryDocumentInterface.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/PageSection.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.ArrayList;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/SurveyQuestionCandidateAnswer.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnActorPoolInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/SruSourceCollection.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/OlapStarFactQuestionarioAnswer.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/EventClass.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/RecordJob.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/ConfigurationGradesStatusEpoca.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/Teacher.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/PageRepositoryFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import pt.estgp.estgweb.domain.typesgenservices.repositorydocuments.RepositoryFileProxy;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitSummary.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentGatewayInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/Record.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnRoleSelector.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnTaskFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportDocenteFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

 /branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/CourseYear.java
 ,5 → 1,5
 package pt.estgp.estgweb.domain;
-// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
+// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9
 import java.util.Date;
 ,7 → 15,7
      private Date saveDate;
      private String importYear;
      private boolean separatedTurmas;
-     private String reportSave;
+     private String courseReportDocument;
      private Course course;
     public CourseYear() {
 ,12 → 57,12
     public void setSeparatedTurmas(boolean separatedTurmas) {
         this.separatedTurmas = separatedTurmas;
     }
-    public String getReportSave() {
-        return this.reportSave;
+    public String getCourseReportDocument() {
+        return this.courseReportDocument;
     }
-    public void setReportSave(String reportSave) {
-        this.reportSave = reportSave;
+    public void setCourseReportDocument(String courseReportDocument) {
+        this.courseReportDocument = courseReportDocument;
     }
     public Course getCourse() {
         return this.course;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableDomainObject.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/Blog.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentTaskActor.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import pt.estgp.estgweb.domain.typesgen.Todos;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/Assessment.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/RepositoryFileVersion.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/UserRoleConfig.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/SessionObjectId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentTask.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import pt.estgp.estgweb.domain.typesgen.Todos;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/RepositoryDocumentCollection.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioPedagogicoUnidadeCurricularAfeta.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentGatewayExclusiveDecisionHolder.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableBoolean.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/SurveyQuestionItem.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/UrlStatMonth.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/Page.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/CourseStudiesPlan.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioPedagogicoAlunoRequisitado.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/Process.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/AppUser.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnActorPool.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.ArrayList;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/PageText.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/Questionario.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioPerguntaEsforco.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/AppUserDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnActorPoolDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapHistoryDimensionDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnFlowComponentTaskDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/RepositoryDocumentCollectionDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnFlowComponentInstanceDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SurveyDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnVariableBooleanDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitBlogDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnFlowComponentTaskActorInstanceDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitTurmaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnFlowComponentEventDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/JobServiceTaskDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/RepositoryDocumentDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/RepositoryDocumentFileDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UserDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatYearDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/DigitalDeliveryCategoryDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnFlowComponentGatewayExclusiveDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapEntityQuestionarioPerguntaEsforcoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ComunicationFolderDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/RepositoryFileVersionDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/AssessmentDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnVariableInstanceDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioReportFileGroupCursosAnoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ConfigurationSeparatorDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitProgramDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BlogPostDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatDayDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnUserSelectorDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnFlowComponentGatewayExclusiveDecisionHolderDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioHistoryDriveDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitAssignementDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/PageContentDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ConfigurationDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatDayIdDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/GenericUserDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SurveyResponseDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioPedagogicoAlunoRequisitadoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/JobServiceTaskSchedulerParameterDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioReportDocenteFileDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UserSessionDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnFlowConnectorInstanceDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapEntityQuestionarioUnidadeDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SurveyQuestionDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioReportFileGroupAnoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioReportCursoFileDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapStarFactQuestionarioCursoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/AssessmentResponseDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SurveyQuestionAnswerDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnFlowComponentDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitBlogPostDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SessionObjectDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/TeacherDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioReportFileAnoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/AssessmentQuestionDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/EventGenericDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioReportFileGroupDocentesAnoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/RepositoryFileDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnFlowComponentTaskActorDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BlogDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/TesteDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnActorSelectorDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnFlowComponentEventEndMessagesDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioPedagogicoUnidadeCurricularAfetaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ConfigurationDirectoryDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUserAssociationDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/AssessmentQuestionAnswerDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/RecordThesisDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/AssessmentQuestionPossibleAnswerDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ManagedIdentifierDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapEntityQuestionarioPerguntaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnVariableDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ReminderDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/RecordEventOrganizationDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SruSourceCollectionDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapStarFactQuestionarioAnswerDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioPedagogicoTipologiaRequisitadaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/RecordDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnFlowComponentGatewayInstanceDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitSummaryDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/RecordOtherDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnVariableLongDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseDepartmentDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UserRoleConfigDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapStarFactQuestionarioAnswerEsforcoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitEvaluationDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SruSourceDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SurveyStructuralNodeDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioRespostaRequisitadaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnFlowConnectorDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnActorSelectorCondicionadoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/PageSectionDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/PageExternalUrlDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/RecordProjectDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapEntityQuestionarioCursoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/RecordJobDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ConfigurationGradesStatusEpocaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitAnnouncementDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ManagedIdentifierCollectionDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioReportFileDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ProcessDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/JobServiceTaskParameterDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnVariableIntegerDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnProcessInstanceDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/EventFormacoesDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnVariableDomainObjectDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseYearDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ImageDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnFlowComponentEventEndInstanceDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapStarFactQuestionarioDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnVariableFloatDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitQuestionDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapEntityQuestionarioUserDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioReportFileGroupDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnActorPoolThreadInstanceDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioPedagogicoCursoAfetoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitDeliverableDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/PaginaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioRespostaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapEntityQuestionarioTipologiaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnActorPoolInstanceDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ConfigurationGradesEpocaAvaliacaoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnAbstractActorSelectorDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/JobDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/JobParameterDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/PageRepositoryFileDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnFlowComponentTaskInstanceDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ProcessEventFileDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ProcessEventDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapStarFactQuestionarioUnidadeDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/PageTextDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnFlowComponentGatewayDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnVariableStringDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapEntityQuestionarioDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnFlowComponentEventInstanceDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/RepositoryDocumentInterfaceDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SurveyQuestionItemDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatMonthDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnFlowComponentGatewayExclusiveInstanceDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/RecordPaperDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/EventClassDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SigesUserDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SurveyStatsGraphicDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/PageDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseStudiesPlanDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/JobServiceTaskSchedulerDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/EventGenericRecordDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnRoleSelectorDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnTaskFileDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/EventUserDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/DigitalDeliveryDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatMonthIdDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnFlowComponentGatewayExclusiveDecisionHolderInstanceDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/MetaProcessDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/StudentDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SessionObjectIdDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/DigitalDeliveryTargetDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnActorSelectorWithDomainObjectLoaderDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnFlowComponentEventEndMessageInstanceDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/AnnouncementDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnProcessDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnVariableJsonArrayDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/GroupDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/AssessmentQuestionItemDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnVariableJsonDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatYearIdDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnVariableDoubleDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ConfigurationGradesDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SeccaoDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/OlapStarFactQuestionarioTipologiaDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnFlowComponentEventEndDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BpmnFlowObjectInstanceDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitProgramPart2Dao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SurveyQuestionCandidateAnswerDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitGradeDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/PageExternalObjectDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseSchoolDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 13/dez/2017 22:45:26 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:03:16 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/SurveyQuestion.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioUnidade.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/OlapStarFactQuestionario.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentEventEndMessages.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import pt.estgp.estgweb.domain.typesgen.TargetActorType;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableString.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentGateway.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/UrlStatYearId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableJson.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/AssessmentQuestionItem.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/Group.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnit.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/SurveyQuestionAnswer.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/ConfigurationGradesEpocaAvaliacao.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioPedagogicoTipologiaRequisitada.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/SigesUser.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitAnnouncement.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/ManagedIdentifierCollection.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/AssessmentQuestion.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/UrlStatYear.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/DigitalDeliveryCategory.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/RecordOther.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/UrlStatMonthId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/DigitalDelivery.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/UserSession.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitEvaluation.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportCursoFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportFileGroup.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/AssessmentQuestionAnswer.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentEventInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnActorSelectorCondicionado.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitProgramPart2.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/OlapStarFactQuestionarioCurso.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioResposta.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioTipologia.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitBlog.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/Reminder.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/RecordEventOrganization.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/RecordPaper.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentGatewayExclusiveInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

 /branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/Configuration.java
 ,5 → 1,5
 package pt.estgp.estgweb.domain;
-// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
+// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9
 import java.util.Date;
 ,6 → 14,7
      private Date updateDate;
      private Date saveDate;
      private String interfaceImportYear;
+     private String courseReportImportYear;
      private String importsDefaultImportYear;
      private String sigesWebServicesWsdl;
      private Integer sigesInstitutionCode;
 ,6 → 58,13
     public void setInterfaceImportYear(String interfaceImportYear) {
         this.interfaceImportYear = interfaceImportYear;
     }
+    public String getCourseReportImportYear() {
+        return this.courseReportImportYear;
+    }
+    public void setCourseReportImportYear(String courseReportImportYear) {
+        this.courseReportImportYear = courseReportImportYear;
+    }
     public String getImportsDefaultImportYear() {
         return this.importsDefaultImportYear;
     }

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/PageContent.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/SessionObject.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.io.Serializable;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitBlogPost.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/JobParameter.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableInteger.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnProcessInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/EventFormacoes.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/ComunicationFolder.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/Student.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableFloat.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitQuestion.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionario.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/UrlStatDay.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnUserSelector.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/OlapStarFactQuestionarioTipologia.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariable.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import pt.estgp.estgweb.domain.typesgen.VariableType;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/RecordProject.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/PageExternalObject.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponent.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentEvent.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitTurma.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/SurveyResponse.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/RepositoryFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/ProcessEventFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/ProcessEvent.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/OlapStarFactQuestionarioUnidade.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentGatewayExclusive.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableLong.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowConnectorInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentEventEndInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BlogPost.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/SruSource.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnProcess.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.ArrayList;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableJsonArray.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/ManagedIdentifier.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/Course.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/PageExternalUrl.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitGrade.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/AssessmentResponse.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/UrlStatDayId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportFileAno.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/JobServiceTask.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/RepositoryDocument.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/RepositoryDocumentFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/User.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/EventUser.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/Image.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/OlapHistoryDimension.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/Teste.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/OlapStarFactQuestionarioAnswerEsforco.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/DigitalDeliveryTarget.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnActorSelectorWithDomainObjectLoader.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportFileGroupAno.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioUser.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/CourseUserAssociation.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/ConfigurationDirectory.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioHistoryDrive.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitAssignement.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowConnector.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioRespostaRequisitada.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentEventEnd.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowObjectInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioCurso.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/CourseSchool.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/Job.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.io.Serializable;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnAbstractActorSelector.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/JobServiceTaskScheduler.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/EventGenericRecord.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/JobServiceTaskSchedulerParameter.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/JobServiceTaskParameter.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/CourseDepartment.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/MetaProcess.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/SurveyStructuralNode.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableDouble.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/ConfigurationGrades.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/Seccao.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo3/impl/gen/java/pt/estgp/estgweb/domain/UrlStat.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 13/dez/2017 22:45:36 by Hibernate Tools 3.2.0.b9
// Generated 1/jan/2018 17:00:11 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /branches/grupo5/impl/conf/WEB-INF/struts/struts-courses.xml
 ,6 → 166,14
         <action path="/user/loadCourseReportTools" forward="page.course.report.tools.load"/>
         <action path="/user/editCourseReport" forward="page.course.report.edit"/>
+        <action path="/user/courseReport"
+                type="pt.estgp.estgweb.web.controllers.courses.CoursesServicesController"
+                name="WidgetModelForm"
+                scope="request"
+                parameter="dispatch"
+                validate="true"
+                input="page.widget.json.fail.validations">
+        </action>

 /branches/grupo5/impl/conf/berserk/sd.xml
 ,6 → 4028,7
     <!-- SERVICOS DE GERACAO DE RELATORIO DE CURSO -->
     <service>
         <name>CourseReportGenerateGlobalLearningResultsChartImg</name>
         <implementationClass>pt.estgp.estgweb.services.courses.CourseReportServices</implementationClass>
 ,4 → 4048,25
     </service>
+    <!-- SERVICOS GUARDAR COURSE REPORT DOCUMENT -->
+    <service>
+        <name>SaveCourseReportDocument</name>
+        <implementationClass>pt.estgp.estgweb.services.courses.CourseReportServices</implementationClass>
+        <description>
+            @reportCourseDocument documento course report em json
+            Serviço de suporte para gerar um grafico
+            Guarda o documento relatório de cursos
+            Devolve uma classe RepositoryFile4JsonView serializada em JSON
+        </description>
+        <isTransactional>true</isTransactional>
+        <defaultMethod>saveCourseReportDocument</defaultMethod>
+        <filterChains>
+            <chain name="Logger"/>
+            <chain name="Session"/>
+        </filterChains>
+    </service>
 </serviceDefinitions>

 /branches/grupo5/impl/src/java/pt/estgp/estgweb/utils/Globals.java
 ,7 → 181,7
     public static final List<String> DEPARTAMENTOS = ConfigProperties.getListValues("departamento");
     /*SIGES WEB SERVICES*/
-    //NAO Ã‰ URGENTE PARA ACTUALIZACOES VAMOS DEIXAR CARREGAR DA BD E NAS ACTUALIZAÃ‡OES MUDA AQUI
+    //NAO É URGENTE PARA ACTUALIZACOES VAMOS DEIXAR CARREGAR DA BD E NAS ACTUALIZAÇOES MUDA AQUI
     //public static BigDecimal NATIONAL_INSTITUTION_CODE = new BigDecimal(DaoFactory.getConfigurationDaoImpl().getNationalInstitutionCodeCreateTransaction());
     // DONT USE NOW IN CONFIGURATION DAO public static final BigDecimal SIGES_INSTITUTION_CODE = new BigDecimal(ConfigProperties.getIntProperty("siges.institution.code"));
     // DONT USE ANY MORE NOW IS IN CONFIGURATION DAOpublic static final String SIGES_WEBSERVICE_WSDL = ConfigProperties.getProperty("ws.siges.wsdl");
 ,4 → 534,4
     public static final int SIGES_SUMARIO_FALTOU_CODIGO = ConfigProperties.getIntProperty("siges.summaries.faltou.code");
     public static final int SIGES_SUMARIO_CANCELADO_CODIGO = ConfigProperties.getIntProperty("siges.summaries.cancelado.code");
     public static final int SIGES_SUMARIO_PRELANCADO_CODIGO = ConfigProperties.getIntProperty("siges.summaries.prelancado.code");
-}
+}

 /branches/grupo5/impl/src/java/pt/estgp/estgweb/services/courses/CourseReportServices.java
 ,8 → 77,8
         //THIS IS THE BASE FOR THE REMAIN SERVICE CALLS
         List<DocumentSection> courseUnitSections = updateCleanCourseUnitSections(courseCode, year, reportCourseDocument);
-        //A tabela de resultados globais nÃ£o vai ser utilizada
-        //PARA CORRER ESTE SERVICO A PARTIR DA INTERFACE Ã‰ PRECISO
+        //A tabela de resultados globais não vai ser utilizada
+        //PARA CORRER ESTE SERVICO A PARTIR DA INTERFACE É PRECISO
         //PERCEBER QUE DEPENDE DO SERVICO DE UPDATE DAS SECOES DAS COURSEUNITS
         UnitsLearningResultsTable unitsLearningResultsTable = updateCleanLearningResultsFromCourseUnitsSections(reportCourseDocument);
 ,7 → 87,7
         UnitsDtpTable unitsDtpTable = updateDtpStatsTable4Course(reportCourseDocument, courseCode, year);
-        //Atualiza as tabelas dos QuesitonÃ¡rios pedagogicos
+        //Atualiza as tabelas dos Quesitonários pedagogicos
         SurveysResultsSection surveysResultsSection = updateSurveysDataTables(courseCode, year, reportCourseDocument);
 ,7 → 111,7
     }
     /**
-     * Este serviÃ§o atualiza a tabela de resultados de aprendizagem com base nas courseunitssections
+     * Este serviço atualiza a tabela de resultados de aprendizagem com base nas courseunitssections
      * @param reportCourseDocument
      * @return UnitsLearningResultsTable
      */
 ,7 → 298,7
     /**
      * Gera uma tabela de estatisticas dos DTP recorrendo ao servico WS de
-     * load de tabelas DTP, caso o serviÃ§o nao devolva unidades sÃ£o criadas novas
+     * load de tabelas DTP, caso o serviço nao devolva unidades são criadas novas
      * com os valores a falso.
      *
      * @param courseCode
 ,7 → 381,7
         }
-        List<DocumentSection> subSections = new ArrayList<DocumentSection>();
+        ArrayList<DocumentSection> subSections = new ArrayList<DocumentSection>();
         unitReportsSection.setSections(subSections);
         for(CourseUnit cu :units)
         {
 ,8 → 421,10
         LearningGlobalAnalysisSection learningGlobalAnalysisSection = (LearningGlobalAnalysisSection) learningResultsSection.findSection(LearningGlobalAnalysisSection.class);
         GlobalLearningResultsChartImg chartImg = (GlobalLearningResultsChartImg) learningGlobalAnalysisSection.findDocComponent(GlobalLearningResultsChartImg.class);
         UnitsLearningResultsTable table = (UnitsLearningResultsTable) learningResultsSection.findDocComponent(UnitsLearningResultsTable.class);
         FileUploaded fileUploaded = chartImg.generateChart2tmp(table,reportDocument);
         RepositoryService repositoryService = new RepositoryService();
 ,15 → 519,33
         }
     }
+    public String saveCourseReportDocument (String reportDocumentJson, UserSession session) throws IOException
+    {
+        CourseReportDocument courseReportDocument = CourseReportDocument.fromJson(reportDocumentJson);
+        Course course = DaoFactory.getCourseDaoImpl().findCourseByCode(courseReportDocument.getCourseCode());
+        List<CourseYear> courseYear = DaoFactory.getCourseYearDaoImpl().findCourseYear(courseReportDocument.getCourseCode(), courseReportDocument.getYear());
+        if(courseYear.isEmpty())
+        {
+            courseYear.add(DomainObjectFactory.createCourseYearImpl());
+            courseYear.get(0).setCourse(course);
+            course.getCourseYears().add(courseYear.get(0));
+            courseYear.get(0).setImportYear(courseReportDocument.getYear());
+            DaoFactory.getCourseYearDaoImpl().save(courseYear.get(0));
+        }
+        courseYear.get(0).setCourseReportDocument(reportDocumentJson);
+        return courseReportDocument.toJson();
+    }
     /**
      *
-     * Para um determinado curso e ano o serviÃ§o faz uma listagem de todas as suas unidades curriculares
-     * e lista a sua informaÃ§Ã£o bÃ¡sica juntamente com o relatÃ³rio de avaliaÃ§Ã£o disponivel
-     * O serviÃ§o adiciona ainda o Ano de cada unidade por inspeÃ§Ã£o do Plano de Estudos
-     * caso a unidade nÃ£o seja encontrada no Plano de estudos o ano irÃ¡ ser preenchido com -1
+     * Para um determinado curso e ano o serviço faz uma listagem de todas as suas unidades curriculares
+     * e lista a sua informação básica juntamente com o relatório de avaliação disponivel
+     * O serviço adiciona ainda o Ano de cada unidade por inspeção do Plano de Estudos
+     * caso a unidade não seja encontrada no Plano de estudos o ano irá ser preenchido com -1
      *
      * @param courseCode codigo Siges na base de dados
      * @param year  201617, 201718
 ,7 → 614,7
      * @param courseCode codigo Siges na base de dados
      * @param unitCode
      * @return Json com o ano do plano exemplo: { year : 1 }
-     * ou -1 se nÃ£o for encontrado
+     * ou -1 se não for encontrado
      */
     public String loadPlanYearForCourseUnitCode(String courseCode,String unitCode,String period) throws JSONException, IOException {
 ,4 → 700,4
-}
+}

 /branches/grupo5/impl/src/java/pt/estgp/estgweb/services/courses/CoursesService.java
 ,7 → 220,7
             }
             htmlTrasformationResult = generateHtmlCache(userSession, c);
             //####New#### Generating XML with JaxB
-            //ISTO SO Ã‰ CHAMADO NO CASO DE SE FAZER UPLOAD DE UM NOVO PLANO PELO MECANISMO ANTIGO
+            //ISTO SO É CHAMADO NO CASO DE SE FAZER UPLOAD DE UM NOVO PLANO PELO MECANISMO ANTIGO
             generateXmlJaxbStudiesPlanVersionFromRepositoryOldPlanStream(userSession, c, forceUrlFichas, systemUrl);
         }
         return htmlTrasformationResult;
 ,7 → 288,7
     /**
      * ##NEW METHOD###
      * Gera o XML normalizado para o JAXB a partir do XML importado do XML do plano XML quese usou no upload
-     * para garantir que estÃ¡ bem formado
+     * para garantir que está bem formado
      * @param userSession
      * @param c
      * @return
 ,7 → 299,7
         CourseStudiesPlan courseStudiesPlan;
         if(c.getStudiesPlan() == null || c.getStudiesPlan().trim().length() == 0)
         {
-            //ESTE Ã‰ O STREAM DO PLANO DE UPLOAD
+            //ESTE É O STREAM DO PLANO DE UPLOAD
             logger.warn("Course does not have studies plan XML file stream to use in update");
             return;
         }
 ,7 → 309,7
             logger.info("Generating first study plan");
             courseStudiesPlan = DomainObjectFactory.createCourseStudiesPlanImpl();
             courseStudiesPlan.setVersion(1);
-            courseStudiesPlan.setVersionDescription("Auto gerado durante a importaÃ§Ã£o de um XML com o plano de estudos a " + new Date().toString());
+            courseStudiesPlan.setVersionDescription("Auto gerado durante a importação de um XML com o plano de estudos a " + new Date().toString());
             courseStudiesPlan.setCourse(c);
             if(c.getStudiesPlans() == null)
                 c.setStudiesPlans(new HashSet<CourseStudiesPlan>());
 ,8 → 378,8
     /**
-     * Apenas Ã© chamado quando se tenta injectar um programa a partir de um upload que foi feito
-     * pelo user ou pela sincronizaÃ§Ã£o remota
+     * Apenas é chamado quando se tenta injectar um programa a partir de um upload que foi feito
+     * pelo user ou pela sincronização remota
      * @param curso
      * @param systemUrl
      * @param force
 ,7 → 411,7
             if(!url.endsWith("/"))
                 url = url + "/";
-            //Nao fornece o ano pois o servico irÃ¡ assumir o ultimo
+            //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());
         }
 ,12 → 601,12
     /**
      *
-     * * ServiÃ§o invocado para obter o JSON de um curso
+     * * 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
+     * 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
      *
      * //TODO REVER
      * @param code
 ,8 → 634,8
         {
             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
+            //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 try generate from studies plan OLD Stream");
 ,7 → 1009,7
                             }
                         }
                     }
-                    //Garante-se mas depois nÃ£o vai para o JSON
+                    //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());
 ,7 → 1182,7
         String roleValidation = "courseValidateProgram" + normalizedName;
         String oldValidationRole = c.getValidationRole();
-        String nomeRole = "ComissÃ£o de Curso de " + c.getName();
+        String nomeRole = "Comissão de Curso de " + c.getName();
         try{
             ReplaceRoleResult result = new  UserRoleConfigService().createNewNormalizedRoleService(oldValidationRole,nomeRole,roleValidation,userSession);
             c.setValidationRole(roleValidation);
 ,7 → 1264,7
     /**
      * Cria um conjunto de roles novos para um determinado departamento
-     * chama o serviÃ§o tier1 UserRoleConfigService.createNewNormalizedRoleService
+     * chama o serviço tier1 UserRoleConfigService.createNewNormalizedRoleService
      * @param session
      * @return
      * @throws IOException
 ,7 → 1280,7
             throw new RuntimeException("Erro o Departamento " + courseDepartmentPersistent.getSigla() +" + nao tem nome");
-        String nomeRole = "Departamento DirecÃ§Ã£o - " + courseDepartmentPersistent.getName();
+        String nomeRole = "Departamento Direcção - " + courseDepartmentPersistent.getName();
         String oldRole = courseDepartmentPersistent.getBoardRole();
         String newRoleStr = "department.board." + normalizedName;
         try
 ,7 → 1367,7
     /*
     public static void main(String[] args) throws JAXBException, IOException {
-        String json = "{\"anoPlanoSiges\":null,\"codigoPlanoSiges\":null,\"dep\":null,\"descPlanoSiges\":null,\"nome\":null,\"semestre\":[{\"id\":\"S1\",\"notas\":null,\"perfil\":[],\"semestreDesc\":\"Semestre 1\",\"semestreDescEn\":\"Semester 1\",\"semestreDescEs\":\"Semestre 1\",\"semestreDescFr\":\"Semestre 1\",\"semestreId\":null,\"unidade\":[{\"dep\":\"\",\"ects\":\"\",\"nome\":\"PortuguÃªs â€” LÃngua e Literatura\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"150\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:12\",\"horasContacto\":{\"tP\":\"60\",\"oT\":\"15\"},\"eCTS\":\"6\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"Geografia\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"125\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:16\",\"horasContacto\":{\"tP\":\"45\",\"oT\":\"15\"},\"eCTS\":\"5\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"HistÃ³ria\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"125\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:20\",\"horasContacto\":{\"tP\":\"45\",\"oT\":\"15\"},\"eCTS\":\"5\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"LinguÃstica e AnÃ¡lise do Discurso\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"150\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:24\",\"horasContacto\":{\"tP\":\"60\",\"oT\":\"15\"},\"eCTS\":\"6\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"MatemÃ¡tica no 1.o Ciclo do Ensino BÃ¡sico\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"125\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:28\",\"horasContacto\":{\"tP\":\"45\",\"oT\":\"15\"},\"eCTS\":\"5\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"EducaÃ§Ã£o para a SaÃºde\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"75\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:32\",\"horasContacto\":{\"tP\":\"30\",\"oT\":\"7\"},\"eCTS\":\"3\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"MÃºsica, EmoÃ§Ã£o e Criatividade\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"75\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:36\",\"horasContacto\":{\"tP\":\"30\",\"oT\":\"7\"},\"eCTS\":\"3\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"EducaÃ§Ã£o para a Cidadania\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"75\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:40\",\"horasContacto\":{\"tP\":\"30\",\"oT\":\"7\"},\"eCTS\":\"3\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"Descobrir a MatemÃ¡tica\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"75\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:44\",\"horasContacto\":{\"tP\":\"30\",\"oT\":\"7\"},\"eCTS\":\"3\"}],\"type\":\"semestre\",\"$$hashKey\":\"object:6\"},{\"id\":\"S2\",\"notas\":null,\"perfil\":[],\"semestreDesc\":\"Semestre 1\",\"semestreDescEn\":\"Semester 1\",\"semestreDescEs\":\"Semestre 1\",\"semestreDescFr\":\"Semestre 1\",\"semestreId\":null,\"unidade\":[{\"dep\":\"\",\"ects\":\"\",\"nome\":\"DidÃ¡tica do PortuguÃªs no 1Âº Ciclo do Ensino BÃ¡sico\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"150\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:54\",\"eCTS\":\"6\",\"horasContacto\":{\"tP\":\"60\",\"oT\":\"15\"}},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"DidÃ¡tica do Estudo do Meio no 1Âº Ciclo do Ensino BÃ¡sico\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"150\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:58\",\"eCTS\":\"6\",\"horasContacto\":{\"tP\":\"60\",\"oT\":\"15\"}},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"DidÃ¡tica da MatemÃ¡tica no 1Âº Ciclo do Ensino BÃ¡sico\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"150\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:62\",\"eCTS\":\"6\",\"horasContacto\":{\"tP\":\"60\",\"oT\":\"15\"}},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"DidÃ¡tica das ExpressÃµes no 1Âº Ciclo do Ensino BÃ¡sico\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"150\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:66\",\"eCTS\":\"6\",\"horasContacto\":{\"tP\":\"60\",\"oT\":\"15\"}},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"Psicologia da EducaÃ§Ã£o\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"75\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:70\",\"eCTS\":\"3\",\"horasContacto\":{\"tP\":\"30\",\"oT\":\"7\"}},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"InvestigaÃ§Ã£o em EducaÃ§Ã£o\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"75\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:74\",\"eCTS\":\"3\",\"horasContacto\":{\"tP\":\"30\",\"oT\":\"7\"}}],\"type\":\"semestre\",\"$$hashKey\":\"object:48\"},{\"id\":\"S3\",\"notas\":null,\"perfil\":[],\"semestreDesc\":\"Semestre 1\",\"semestreDescEn\":\"Semester 1\",\"semestreDescEs\":\"Semestre 1\",\"semestreDescFr\":\"Semestre 1\",\"semestreId\":null,\"unidade\":[{\"dep\":\"\",\"ects\":\"\",\"nome\":\"PrÃ¡tica de Ensino Supervisionada no 1Âº Ciclo do Ensino BÃ¡sico\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"500\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:90\",\"eCTS\":\"20\",\"horasContacto\":{\"s\":\"30\",\"e\":\"270\",\"oT\":\"45\"}},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"SeminÃ¡rio de InvestigaÃ§Ã£o I\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"50\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:98\",\"eCTS\":\"2\",\"horasContacto\":{\"s\":\"20\",\"oT\":\"10\"}},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"DidÃ¡tica da HistÃ³ria e Geografia de Portugal no 2Âº Ciclo do  Ensino BÃ¡sico\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"100\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:94\",\"eCTS\":\"4\",\"horasContacto\":{\"tP\":\"35\",\"oT\":\"15\"}},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"DidÃ¡tica do PortuguÃªs no 2Âº Ciclo do Ensino BÃ¡sico\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"100\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:102\",\"eCTS\":\"4\",\"horasContacto\":{\"oT\":\"15\",\"tP\":\"35\"}}],\"type\":\"semestre\",\"$$hashKey\":\"object:78\"},{\"id\":\"S4\",\"notas\":null,\"perfil\":[],\"semestreDesc\":\"Semestre 1\",\"semestreDescEn\":\"Semester 1\",\"semestreDescEs\":\"Semestre 1\",\"semestreDescFr\":\"Semestre 1\",\"semestreId\":null,\"unidade\":[{\"dep\":\"\",\"ects\":\"\",\"nome\":\"\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":0,\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:106\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":0,\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:110\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":0,\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:114\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":0,\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:118\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":0,\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:122\"}],\"type\":\"semestre\",\"$$hashKey\":\"object:84\"}],\"siges\":null}";
+        String json = "{\"anoPlanoSiges\":null,\"codigoPlanoSiges\":null,\"dep\":null,\"descPlanoSiges\":null,\"nome\":null,\"semestre\":[{\"id\":\"S1\",\"notas\":null,\"perfil\":[],\"semestreDesc\":\"Semestre 1\",\"semestreDescEn\":\"Semester 1\",\"semestreDescEs\":\"Semestre 1\",\"semestreDescFr\":\"Semestre 1\",\"semestreId\":null,\"unidade\":[{\"dep\":\"\",\"ects\":\"\",\"nome\":\"Português — Língua e Literatura\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"150\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:12\",\"horasContacto\":{\"tP\":\"60\",\"oT\":\"15\"},\"eCTS\":\"6\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"Geografia\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"125\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:16\",\"horasContacto\":{\"tP\":\"45\",\"oT\":\"15\"},\"eCTS\":\"5\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"História\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"125\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:20\",\"horasContacto\":{\"tP\":\"45\",\"oT\":\"15\"},\"eCTS\":\"5\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"Linguística e Análise do Discurso\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"150\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:24\",\"horasContacto\":{\"tP\":\"60\",\"oT\":\"15\"},\"eCTS\":\"6\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"Matemática no 1.o Ciclo do Ensino Básico\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"125\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:28\",\"horasContacto\":{\"tP\":\"45\",\"oT\":\"15\"},\"eCTS\":\"5\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"Educação para a Saúde\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"75\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:32\",\"horasContacto\":{\"tP\":\"30\",\"oT\":\"7\"},\"eCTS\":\"3\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"Música, Emoção e Criatividade\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"75\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:36\",\"horasContacto\":{\"tP\":\"30\",\"oT\":\"7\"},\"eCTS\":\"3\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"Educação para a Cidadania\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"75\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:40\",\"horasContacto\":{\"tP\":\"30\",\"oT\":\"7\"},\"eCTS\":\"3\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"Descobrir a Matemática\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"75\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:44\",\"horasContacto\":{\"tP\":\"30\",\"oT\":\"7\"},\"eCTS\":\"3\"}],\"type\":\"semestre\",\"$$hashKey\":\"object:6\"},{\"id\":\"S2\",\"notas\":null,\"perfil\":[],\"semestreDesc\":\"Semestre 1\",\"semestreDescEn\":\"Semester 1\",\"semestreDescEs\":\"Semestre 1\",\"semestreDescFr\":\"Semestre 1\",\"semestreId\":null,\"unidade\":[{\"dep\":\"\",\"ects\":\"\",\"nome\":\"Didática do Português no 1º Ciclo do Ensino Básico\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"150\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:54\",\"eCTS\":\"6\",\"horasContacto\":{\"tP\":\"60\",\"oT\":\"15\"}},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"Didática do Estudo do Meio no 1º Ciclo do Ensino Básico\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"150\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:58\",\"eCTS\":\"6\",\"horasContacto\":{\"tP\":\"60\",\"oT\":\"15\"}},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"Didática da Matemática no 1º Ciclo do Ensino Básico\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"150\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:62\",\"eCTS\":\"6\",\"horasContacto\":{\"tP\":\"60\",\"oT\":\"15\"}},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"Didática das Expressões no 1º Ciclo do Ensino Básico\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"150\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:66\",\"eCTS\":\"6\",\"horasContacto\":{\"tP\":\"60\",\"oT\":\"15\"}},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"Psicologia da Educação\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"75\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:70\",\"eCTS\":\"3\",\"horasContacto\":{\"tP\":\"30\",\"oT\":\"7\"}},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"Investigação em Educação\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"75\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:74\",\"eCTS\":\"3\",\"horasContacto\":{\"tP\":\"30\",\"oT\":\"7\"}}],\"type\":\"semestre\",\"$$hashKey\":\"object:48\"},{\"id\":\"S3\",\"notas\":null,\"perfil\":[],\"semestreDesc\":\"Semestre 1\",\"semestreDescEn\":\"Semester 1\",\"semestreDescEs\":\"Semestre 1\",\"semestreDescFr\":\"Semestre 1\",\"semestreId\":null,\"unidade\":[{\"dep\":\"\",\"ects\":\"\",\"nome\":\"Prática de Ensino Supervisionada no 1º Ciclo do Ensino Básico\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"500\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:90\",\"eCTS\":\"20\",\"horasContacto\":{\"s\":\"30\",\"e\":\"270\",\"oT\":\"45\"}},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"Seminário de Investigação I\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"50\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:98\",\"eCTS\":\"2\",\"horasContacto\":{\"s\":\"20\",\"oT\":\"10\"}},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"Didática da História e Geografia de Portugal no 2º Ciclo do  Ensino Básico\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"100\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:94\",\"eCTS\":\"4\",\"horasContacto\":{\"tP\":\"35\",\"oT\":\"15\"}},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"Didática do Português no 2º Ciclo do Ensino Básico\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":\"100\",\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:102\",\"eCTS\":\"4\",\"horasContacto\":{\"oT\":\"15\",\"tP\":\"35\"}}],\"type\":\"semestre\",\"$$hashKey\":\"object:78\"},{\"id\":\"S4\",\"notas\":null,\"perfil\":[],\"semestreDesc\":\"Semestre 1\",\"semestreDescEn\":\"Semester 1\",\"semestreDescEs\":\"Semestre 1\",\"semestreDescFr\":\"Semestre 1\",\"semestreId\":null,\"unidade\":[{\"dep\":\"\",\"ects\":\"\",\"nome\":\"\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":0,\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:106\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":0,\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:110\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":0,\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:114\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":0,\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:118\"},{\"dep\":\"\",\"ects\":\"\",\"nome\":\"\",\"nomeEn\":null,\"nomeEs\":null,\"nomeFr\":null,\"obs\":\"\",\"removed\":null,\"siges\":null,\"totalHoras\":0,\"urlFichaCurricular\":\"\",\"urlUnidadeCurricular\":\"\",\"type\":\"unidade\",\"$$hashKey\":\"object:122\"}],\"type\":\"semestre\",\"$$hashKey\":\"object:84\"}],\"siges\":null}";
         CursoImpl c = CursoImpl.loadFromJson(json);
         JAXBContext jc = JAXBContext.newInstance(Curso.class);

 /branches/grupo5/impl/src/java/pt/estgp/estgweb/services/courses/coursereport/documentmodel/learningresults/components/GlobalLearningResultsChartImg.java
 ,10 → 2,16
 import jomm.utils.BytesUtils;
 import jomm.utils.MimeTypeGuesser;
+import org.apache.log4j.Category;
 import org.jfree.chart.ChartFactory;
+import org.jfree.chart.ChartFrame;
 import org.jfree.chart.JFreeChart;
+import org.jfree.chart.axis.ValueAxis;
+import org.jfree.chart.plot.CategoryPlot;
 import org.jfree.chart.plot.PiePlot;
+import org.jfree.chart.plot.PlotOrientation;
 import org.jfree.chart.plot.RingPlot;
+import org.jfree.data.category.DefaultCategoryDataset;
 import org.jfree.data.general.DefaultPieDataset;
 import pt.estgp.estgweb.services.courses.coursereport.documentmodel.CourseReportDocument;
 import pt.estgp.estgweb.utils.Globals;
 ,6 → 24,7
 import java.io.FileOutputStream;
 import java.io.IOException;
 /**
  * Created by jorgemachado on 31/10/17.
  */
 ,31 → 47,36
         String tempName = BytesUtils.generateHexKey() + ".png";
-        DefaultPieDataset data = new DefaultPieDataset();
+        DefaultCategoryDataset data = new DefaultCategoryDataset();
         if(reprovados > 0)
-            data.setValue("Reprovados " + reprovadosPercent + "%", new Double(reprovados));
+            data.setValue(new Double(reprovados), "Reprovados " + reprovadosPercent + "%","Reprovados " + reprovadosPercent + "%" );
         if(aprovados > 0)
-            data.setValue("Aprovados " + aprovadosPercent  + "%", new Double(aprovados));
+            data.setValue(new Double(aprovados),"Aprovados " + aprovadosPercent  + "%","Aprovados " + aprovadosPercent  + "%");
         if(semElementos > 0)
-            data.setValue("Sem Elementos "  + semElementosPercent  + "%", new Double(semElementos));
-        JFreeChart chart = ChartFactory.createRingChart(null, data, false, true, false);
+            data.setValue(new Double(semElementos),"Sem Elementos "  + semElementosPercent  + "%", "Sem Elementos "  + semElementosPercent  + "%");
+        //Grafico Barras
+        JFreeChart chart = ChartFactory.createBarChart(null, null,null,data, PlotOrientation.VERTICAL, true,true,false);
         chart.setBackgroundPaint(new Color(255,255,255));
-        PiePlot plot = (RingPlot) chart.getPlot();
-        plot.setLabelBackgroundPaint(new Color(255, 249, 235));
-        plot.setLabelPaint(new Color(88, 88, 90));
+        CategoryPlot plot = chart.getCategoryPlot();
+        plot.setRangeGridlinePaint(Color.black);
         //plot.setDrawingSupplier(new ChartBuilderUtil.ChartDrawingSupplier());
+        /*
         plot.setSectionPaint(0, new Color(255, 0, 0));
         plot.setSectionPaint(1, new Color(15, 218, 10));
         plot.setSectionPaint(2, new Color(200, 200, 200));
         plot.setBackgroundPaint(new Color(255, 255, 255));
         plot.setOutlineVisible(false);
         plot.setLabelFont(new Font(
                 "Helvetica", Font.PLAIN, 30));
+        */
+        plot.getDomainAxis().setTickLabelFont(new Font("Helvetica", Font.PLAIN, 30));
         BufferedImage image = chart.createBufferedImage( 300*4, 200*4);
         String pathGraficoTiposAlunos = Globals.TMP_DIR + java.io.File.separator + tempName;
 ,16 → 103,28
         String tempName = BytesUtils.generateHexKey() + ".png";
-        DefaultPieDataset data = new DefaultPieDataset();
+        DefaultCategoryDataset data = new DefaultCategoryDataset();
         if(reprovados > 0)
-            data.setValue("Reprovados " + reprovadosPercent + "%", new Double(reprovados));
+            data.setValue(new Double(reprovados), "Reprovados " + reprovadosPercent + "%","Reprovados2 " + reprovadosPercent + "%" );
         if(aprovados > 0)
-            data.setValue("Aprovados " + aprovadosPercent  + "%", new Double(aprovados));
+            data.setValue(new Double(aprovados),"Aprovados " + aprovadosPercent  + "%","Aprovados2 " + aprovadosPercent  + "%");
         if(semElementos > 0)
-            data.setValue("Sem Elementos "  + semElementosPercent  + "%", new Double(semElementos));
-        JFreeChart chart = ChartFactory.createRingChart(null, data, false, true, false);
+            data.setValue(new Double(semElementos),"Sem Elementos "  + semElementosPercent  + "%", "Sem Elementos2 "  + semElementosPercent  + "%");
+        //Grafico Barras
+        JFreeChart chart = ChartFactory.createBarChart(null, null,null,data, PlotOrientation.VERTICAL, true,true,false);
         chart.setBackgroundPaint(new Color(255,255,255));
-        PiePlot plot = (RingPlot) chart.getPlot();
+        CategoryPlot plot = chart.getCategoryPlot();
+        plot.setRangeGridlinePaint(Color.black);
+        ChartFrame chatFrm = new ChartFrame("APROVADOS",chart,true);
+        chatFrm.setVisible(true);
+        chatFrm.setSize(500,400);
+        /*
         plot.setLabelBackgroundPaint(new Color(255, 249, 235));
         plot.setLabelPaint(new Color(88, 88, 90));
         //plot.setDrawingSupplier(new ChartBuilderUtil.ChartDrawingSupplier());
 ,8 → 139,8
         plot.setLabelFont(new Font(
                 "Helvetica", Font.PLAIN, 30));
+        */
         BufferedImage image = chart.createBufferedImage( 300*4, 200*4);
         String pathGraficoTiposAlunos = Globals.TMP_DIR + java.io.File.separator + tempName;
         java.io.File output = new java.io.File(pathGraficoTiposAlunos);

 /branches/grupo5/impl/src/java/pt/estgp/estgweb/services/courses/coursereport/documentmodel/CourseReportDocument.java
 ,10 → 2,12
 import com.owlike.genson.Genson;
 import com.owlike.genson.GensonBuilder;
+import jomm.dao.impl.AbstractDao;
 import org.apache.log4j.Logger;
 import org.json.JSONException;
 import org.json.JSONObject;
 import pt.estgp.estgweb.domain.Course;
+import pt.estgp.estgweb.domain.dao.DaoFactory;
 import pt.estgp.estgweb.domain.utils.JsonView;
 import pt.estgp.estgweb.utils.documentBuilder.Document;
 import pt.estgp.estgweb.utils.documentBuilder.DocumentSection;
 ,9 → 67,10
         //1 - Introducao
         IntroSection introSection = new IntroSection();
         introSection.init();
         getSections().add(introSection);
-        //2 - Mapa Sintese dos RelatÃ³rios dos ResponsÃ¡veis das UC's
+        //2 - Mapa Sintese dos Relatórios dos Responsáveis das UC's
         ReportsUcSummarySection reportsUcSummarySection = new ReportsUcSummarySection();
         reportsUcSummarySection.init();
         getSections().add(reportsUcSummarySection);
 ,12 → 80,12
         learningResultsSection.init();
         getSections().add(learningResultsSection);
-        //4 - InquÃ©ritos
+        //4 - Inquéritos
         SurveysSection surveysSection = new SurveysSection();
         surveysSection.init();
         getSections().add(surveysSection);
-        //5 - ConclusÃµes
+        //5 - Conclusões
         ConclusionsSection conclusionsSection = new ConclusionsSection();
         conclusionsSection.init();
         getSections().add(conclusionsSection);
 ,6 → 161,25
         return gensonGenericLoad.serialize(this);
     }
+    public static void main(String[] args)
+    {
+        CourseReportDocument d = new CourseReportDocument();
+        AbstractDao.getCurrentSession().beginTransaction();
-}
+        List<Course> cursos = DaoFactory.getCourseDaoImpl().findAll();
+        d.init(cursos.get(0),"201718");
+        String json = d.toJson();
+        System.out.println(json);
+        CourseReportDocument d2 = CourseReportDocument.fromJson(json);
+        System.out.println(d2.toJson());
+        AbstractDao.getCurrentSession().getTransaction().commit();
+    }
+}

 /branches/grupo5/impl/src/java/pt/estgp/estgweb/services/users/UserRoleConfigService.java
 ,7 → 56,7
     /**
-     * ServiÃ§o Tear 1 para substituiÃ§Ã£o de Roles ou criaÃ§Ã£o de Novos
+     * Serviço Tear 1 para substituição de Roles ou criação de Novos
      * @param oldRole
      * @param nomeRole
      * @param newRoleStr
 ,13 → 91,13
             if(result.roleKeyAlreadyExist)
             {
-                logger.error("Tentado CRIAR um Role que jÃ¡ existe e nÃ£o Ã© Administrador nem Super user");
-                throw new AccessDeniedException("Tentado CRIAR um Role que jÃ¡ existe e nÃ£o Ã© Administrador nem Super user");
+                logger.error("Tentado CRIAR um Role que já existe e não é Administrador nem Super user");
+                throw new AccessDeniedException("Tentado CRIAR um Role que já existe e não é Administrador nem Super user");
             }
         } catch (AccessDeniedException e) {
-            logger.error("Tentado alterar um Role e nÃ£o Ã© Administrador nem Super user");
+            logger.error("Tentado alterar um Role e não é Administrador nem Super user");
             throw e;
         }
 ,7 → 160,7
                 }
                 else
                 {
-                    throw new AccessDeniedException("Nao pode alterar o cÃ³digo do papel porque nÃ£o Ã© administrador");
+                    throw new AccessDeniedException("Nao pode alterar o código do papel porque não é administrador");
                 }
             }
             else
 ,9 → 196,9
     /**
-     * ServiÃ§o de nÃvel SUPORTE
-     * Usado pelo update de Roles e Pela normalizaÃ§Ã£o de Roles de ComissÃµes de Curso
-     * Substitui a presenÃ§a de um ROLE por um NOVO
+     * Serviço de nível SUPORTE
+     * Usado pelo update de Roles e Pela normalização de Roles de Comissões de Curso
+     * Substitui a presença de um ROLE por um NOVO
      *
      *
      * @param oldRole if null does not find old users for replace
 ,100 → 423,100
     private static final String INIT_ROLES = "user.role.all=Todos\n" +
             "user.role.admin=Administrador\n" +
             "user.role.student=Estudante\n" +
-            "user.role.comissao.avaliacao.desempenho.docente=ComissÃ£o de AvaliaÃ§Ã£o de Desempenho Docente\n" +
+            "user.role.comissao.avaliacao.desempenho.docente=Comissão de Avaliação de Desempenho Docente\n" +
             "user.role.erasmusStudent=Estudante de Erasmus\n" +
             "user.role.teacher=Professor\n" +
-            "user.role.teacher.eg=Professor da Ãrea de Engenharia\n" +
-            "user.role.teacher.dg=Professor da Ãrea de Design\n" +
-            "user.role.teacher.ce=Professor da Ãrea de Ciencias Empresariais\n" +
-            "user.role.teacher.ch=Professor da Ãrea de Ciencias Humanas\n" +
+            "user.role.teacher.eg=Professor da Área de Engenharia\n" +
+            "user.role.teacher.dg=Professor da Área de Design\n" +
+            "user.role.teacher.ce=Professor da Área de Ciencias Empresariais\n" +
+            "user.role.teacher.ch=Professor da Área de Ciencias Humanas\n" +
             "user.role.teacher.td=Professor do DTD\n" +
             "user.role.teacher.cesh=Professor do DCESH\n" +
-            "user.role.student.eg=Aluno da Ãrea de Engenharia\n" +
-            "user.role.student.dg=Aluno da Ãrea de Design\n" +
-            "user.role.student.ce=Aluno da Ãrea de Ciencias Empresariais\n" +
-            "user.role.student.ch=Aluno da Ãrea de Ciencias Humanas\n" +
+            "user.role.student.eg=Aluno da Área de Engenharia\n" +
+            "user.role.student.dg=Aluno da Área de Design\n" +
+            "user.role.student.ce=Aluno da Área de Ciencias Empresariais\n" +
+            "user.role.student.ch=Aluno da Área de Ciencias Humanas\n" +
             "user.role.student.td=Aluno do DTD\n" +
             "user.role.student.cesh=Aluno do DCESH\n" +
-            "user.role.ci=Centro InformÃ¡tico\n" +
-            "user.role.worker=FuncionÃ¡rio\n" +
+            "user.role.ci=Centro Informático\n" +
+            "user.role.worker=Funcionário\n" +
             "user.role.invited=Convidado\n" +
-            "user.role.services=ServiÃ§os\n" +
-            "user.role.questionarios.tipologias.admin=Questionarios - VerificaÃ§Ã£o de Tipologias\n" +
-            "user.role.questionarios.atribuicoes.admin=Questionarios - AtribuiÃ§Ãµes de Cursos\n" +
-            "user.role.questionarios.atribuicoes.check_teachers=Questionarios - VerificaÃ§Ã£o de Professores\n" +
-            "user.role.questionarios.admin=QuestionÃ¡rios - Super Administrador\n" +
-            "user.role.questionarios.gerais=QuestionÃ¡rios - PermissÃµes BÃ¡sicas (necessÃ¡rio)\n" +
-            "user.role.servicesPrograms=GestÃ£o de Programas Curriculares\n" +
-            "user.role.servicesStudiesPlans=GestÃ£o de Planos de Estudos\n" +
-            "user.role.servicesCoursesManagement=GestÃ£o de Cursos\n" +
-            "user.role.servicesRolesManagement=GestÃ£o de Papeis Institucionais\n" +
-            "user.role.event_class_manager=GestÃ£o de Classes de Eventos\n" +
-            "user.role.event_manager_nfc=GestÃ£o de Eventos do Nucleo de Formacao Continua\n" +
-            "user.role.administrativeCouncil=Membro da DirecÃ§Ã£o\n" +
+            "user.role.services=Serviços\n" +
+            "user.role.questionarios.tipologias.admin=Questionarios - Verificação de Tipologias\n" +
+            "user.role.questionarios.atribuicoes.admin=Questionarios - Atribuições de Cursos\n" +
+            "user.role.questionarios.atribuicoes.check_teachers=Questionarios - Verificação de Professores\n" +
+            "user.role.questionarios.admin=Questionários - Super Administrador\n" +
+            "user.role.questionarios.gerais=Questionários - Permissões Básicas (necessário)\n" +
+            "user.role.servicesPrograms=Gestão de Programas Curriculares\n" +
+            "user.role.servicesStudiesPlans=Gestão de Planos de Estudos\n" +
+            "user.role.servicesCoursesManagement=Gestão de Cursos\n" +
+            "user.role.servicesRolesManagement=Gestão de Papeis Institucionais\n" +
+            "user.role.event_class_manager=Gestão de Classes de Eventos\n" +
+            "user.role.event_manager_nfc=Gestão de Eventos do Nucleo de Formacao Continua\n" +
+            "user.role.administrativeCouncil=Membro da Direcção\n" +
             "user.role.administrativeCouncil.director=Director\n" +
             "user.role.administrativeCouncil.vice=Vice Director\n" +
-            "user.role.schoolSecretary=SecretÃ¡rio da Escola\n" +
-            "user.role.administrativeCouncilSecretariat=Secretaria da DirecÃ§Ã£o\n" +
+            "user.role.schoolSecretary=Secretário da Escola\n" +
+            "user.role.administrativeCouncilSecretariat=Secretaria da Direcção\n" +
             "user.role.teachersSecretariat=Secretaria de Pessoal Docente\n" +
             "user.role.dtd.president=Presidente do DTD\n" +
             "user.role.cesh.president=Presidente do DCESH\n" +
             "user.role.dtd.presidency=Membro da Presidencia do DTD\n" +
             "user.role.cesh.presidency=Membro da Presidencia do DCESH\n" +
-            "user.role.scientificCouncil.president=CTC Presidente (NÃ£o utilizado)\n" +
+            "user.role.scientificCouncil.president=CTC Presidente (Não utilizado)\n" +
             "user.role.representativeCouncil.president=Presidente do Conselho de Representantes\n" +
-            "user.role.pedagogicCouncil.president=Presidente do Conselho PedagÃ³gico\n" +
+            "user.role.pedagogicCouncil.president=Presidente do Conselho Pedagógico\n" +
             "user.role.representativeCouncil=Conselho de Representantes\n" +
-            "user.role.scientificCouncil=CTC Membro (NÃ£o utilizado)\n" +
+            "user.role.scientificCouncil=CTC Membro (Não utilizado)\n" +
             "user.role.erasmusCouncil=Conselho Erasmus\n" +
-            "user.role.pedagogicCouncil=Conselho PedagÃ³gico\n" +
+            "user.role.pedagogicCouncil=Conselho Pedagógico\n" +
             "user.role.courseCoordinator=Coordenadores\n" +
             "user.role.futureStudent=Futuros Alunos\n" +
             "user.role.oldStudent=Antigos Alunos\n" +
-            "user.role.studentAssociation=AssociaÃ§Ã£o de Estudantes\n" +
-            "user.role.computerCenter=Centro InformÃ¡tico\n" +
+            "user.role.studentAssociation=Associação de Estudantes\n" +
+            "user.role.computerCenter=Centro Informático\n" +
             "user.role.courseDirector=Presidente de Departamento\n" +
-            "user.role.identifiersManager=Utilizador de GestÃ£o de Identificadores\n" +
-            "user.role.identifiersCollectionCreator=Administrador de ColecÃ§Ãµes de Identificadores\n" +
-            "user.role.studentsID=Alunos de InformaÃ§Ã£o e DocumentaÃ§Ã£o\n" +
-            "user.role.studentsFSIR=Alunos de Fontes de InformaÃ§Ã£o e ServiÃ§o de ReferÃªncia\n" +
+            "user.role.identifiersManager=Utilizador de Gestão de Identificadores\n" +
+            "user.role.identifiersCollectionCreator=Administrador de Colecções de Identificadores\n" +
+            "user.role.studentsID=Alunos de Informação e Documentação\n" +
+            "user.role.studentsFSIR=Alunos de Fontes de Informação e Serviço de Referência\n" +
             "user.role.sendMailMessages=Enviar Mensagens de Correio Electronico\n" +
-            "user.role.pedagogicCouncilSecretariat=Secretariado do Conselho PedagÃ³gico\n" +
-            "user.role.directionSecretariat=Secretariado da DirecÃ§Ã£o\n" +
+            "user.role.pedagogicCouncilSecretariat=Secretariado do Conselho Pedagógico\n" +
+            "user.role.directionSecretariat=Secretariado da Direcção\n" +
             "user.role.studentsSecretariat=Secretaria de Alunos\n" +
-            "user.role.assessementsTester=Testador de Provas de AvaliaÃ§Ã£o\n" +
+            "user.role.assessementsTester=Testador de Provas de Avaliação\n" +
             "user.role.processes.admin=Inspector de Processos" +
-            "user.role.validate.ei=ComissÃ£o de Curso de Engenharia InformÃ¡tica\n" +
-            "user.role.courseValidateProgramGPME=ComissÃ£o de Curso de GestÃ£o de PME\n" +
-            "user.role.courseValidateProgramCET_TD=ComissÃ£o de Curso de CETS de TD\n" +
-            "user.role.courseValidateProgramEI=ComissÃ£o de Curso de EI\n" +
-            "user.role.courseValidateProgramEC=ComissÃ£o de Curso de EC\n" +
-            "user.role.courseValidateProgramBioEng=ComissÃ£o de Curso de BioEng\n" +
-            "user.role.courseValidateProgramEGI=ComissÃ£o de Curso de EGI\n" +
-            "user.role.courseValidateProgramEERA=ComissÃ£o de Curso de EERA\n" +
-            "user.role.courseValidateProgramDC=ComissÃ£o de Curso de DC\n" +
-            "user.role.courseValidateProgramDA=ComissÃ£o de Curso de DA\n" +
-            "user.role.courseValidateProgramTVAPE=ComissÃ£o de Curso de TVAPE\n" +
-            "user.role.courseValidateProgramMI=ComissÃ£o de Curso de MI\n" +
-            "user.role.courseValidateProgramEGPMEestranho=ComissÃ£o de Curso de EPGME\n" +
-            "user.role.courseValidatePrograms=ValidaÃ§Ã£o de Programas\n" +
-            "user.role.courseValidateProgramCET_CESH=ComissÃ£o de Curso de CETS de CESH\n" +
-            "user.role.courseValidateProgramAPM=ComissÃ£o de Curso de APM\n" +
-            "user.role.courseValidateProgramAA=ComissÃ£o de Curso de AA\n" +
-            "user.role.courseValidateProgramG=ComissÃ£o de Curso de G\n" +
-            "user.role.courseValidateProgramID=ComissÃ£o de Curso de ID\n" +
-            "user.role.courseValidateProgramRPS=ComissÃ£o de Curso de RPS\n" +
-            "user.role.courseValidateProgramTGI=ComissÃ£o de Curso de TGI\n" +
-            "user.role.courseValidateProgramRU=ComissÃ£o de Curso de RU\n" +
-            "user.role.courseValidateProgramCF=ComissÃ£o de Curso de Contabilidade e FinanÃ§as\n" +
+            "user.role.validate.ei=Comissão de Curso de Engenharia Informática\n" +
+            "user.role.courseValidateProgramGPME=Comissão de Curso de Gestão de PME\n" +
+            "user.role.courseValidateProgramCET_TD=Comissão de Curso de CETS de TD\n" +
+            "user.role.courseValidateProgramEI=Comissão de Curso de EI\n" +
+            "user.role.courseValidateProgramEC=Comissão de Curso de EC\n" +
+            "user.role.courseValidateProgramBioEng=Comissão de Curso de BioEng\n" +
+            "user.role.courseValidateProgramEGI=Comissão de Curso de EGI\n" +
+            "user.role.courseValidateProgramEERA=Comissão de Curso de EERA\n" +
+            "user.role.courseValidateProgramDC=Comissão de Curso de DC\n" +
+            "user.role.courseValidateProgramDA=Comissão de Curso de DA\n" +
+            "user.role.courseValidateProgramTVAPE=Comissão de Curso de TVAPE\n" +
+            "user.role.courseValidateProgramMI=Comissão de Curso de MI\n" +
+            "user.role.courseValidateProgramEGPMEestranho=Comissão de Curso de EPGME\n" +
+            "user.role.courseValidatePrograms=Validação de Programas\n" +
+            "user.role.courseValidateProgramCET_CESH=Comissão de Curso de CETS de CESH\n" +
+            "user.role.courseValidateProgramAPM=Comissão de Curso de APM\n" +
+            "user.role.courseValidateProgramAA=Comissão de Curso de AA\n" +
+            "user.role.courseValidateProgramG=Comissão de Curso de G\n" +
+            "user.role.courseValidateProgramID=Comissão de Curso de ID\n" +
+            "user.role.courseValidateProgramRPS=Comissão de Curso de RPS\n" +
+            "user.role.courseValidateProgramTGI=Comissão de Curso de TGI\n" +
+            "user.role.courseValidateProgramRU=Comissão de Curso de RU\n" +
+            "user.role.courseValidateProgramCF=Comissão de Curso de Contabilidade e Finanças\n" +
             "user.role.courseValidateProgramNONE=Nenhuma\n" +
-            "user.role.courseValidateProgramTPB=ComissÃ£o de Curso de Tecnologias de ProduÃ§Ã£o de BiocombustÃveis\n"+
-            "user.role.board.institution=Board de DirecÃ§Ã£o do Instituto Politecnico\n"+
-            "user.role.repositoryDocs=AdministraÃ§Ã£o do RepositÃ³rio Digital\n"+
-            "user.role.repositoryDeposit=Depositante do RepositÃ³rio Digital\n"+
+            "user.role.courseValidateProgramTPB=Comissão de Curso de Tecnologias de Produção de Biocombustíveis\n"+
+            "user.role.board.institution=Board de Direcção do Instituto Politecnico\n"+
+            "user.role.repositoryDocs=Administração do Repositório Digital\n"+
+            "user.role.repositoryDeposit=Depositante do Repositório Digital\n"+
 ,22 → 527,22
             //ESTG
             "user.role.school.president.estg=Escola Director da ESTG\n"+
-            "user.role.school.board.estg=Escola Board de DirecÃ§Ã£o da ESTG\n"+
+            "user.role.school.board.estg=Escola Board de Direcção da ESTG\n"+
             "user.role.school.secretariado.estg=Escola Secretariado da ESTG\n"+
             //CTC
             "user.role.scientificCouncil.president.estg=CTC ESTG Presidente\n" +
             "user.role.scientificCouncil.board.estg=CTC ESTG Membro\n" +
             "user.role.scientificCouncil.secretariado.estg=CTC ESTG Secretariado\n" +
             //Pedagogico
-            "user.role.pedagogicCouncil.president.estg=PedagÃ³gico ESTG Presidente\n" +
-            "user.role.pedagogicCouncil.board.estg=PedagÃ³gico ESTG Membro\n" +
-            "user.role.pedagogicCouncil.secretariado.estg=PedagÃ³gico ESTG Secretariado\n" +
+            "user.role.pedagogicCouncil.president.estg=Pedagógico ESTG Presidente\n" +
+            "user.role.pedagogicCouncil.board.estg=Pedagógico ESTG Membro\n" +
+            "user.role.pedagogicCouncil.secretariado.estg=Pedagógico ESTG Secretariado\n" +
             //MEMBROS ESCOLAS
-            "user.role.worker.estg=FuncionÃ¡rio ESTG\n" +
-            "user.role.worker.esae=FuncionÃ¡rio ESAE\n" +
-            "user.role.worker.esecs=FuncionÃ¡rio ESECS\n" +
-            "user.role.worker.ess=FuncionÃ¡rio ESS\n" +
+            "user.role.worker.estg=Funcionário ESTG\n" +
+            "user.role.worker.esae=Funcionário ESAE\n" +
+            "user.role.worker.esecs=Funcionário ESECS\n" +
+            "user.role.worker.ess=Funcionário ESS\n" +
             "user.role.teacher.estg=Docentes ESTG\n" +
             "user.role.teacher.esae=Docentes ESAE\n" +
 ,77 → 557,77
             //ESAE
             "user.role.school.president.asae=Escola Director da ESAE\n"+
-            "user.role.school.board.esae=Escola Board de DirecÃ§Ã£o da ESAE\n"+
+            "user.role.school.board.esae=Escola Board de Direcção da ESAE\n"+
             "user.role.school.secretariado.esae=Escola Secretariado da ESAE\n"+
             //CTC
             "user.role.scientificCouncil.president.esae=CTC ESAE Presidente\n" +
             "user.role.scientificCouncil.board.esae=CTC ESAE Membro\n" +
             "user.role.scientificCouncil.secretariado.esae=CTC ESAE Secretariado\n" +
             //Pedagogico
-            "user.role.pedagogicCouncil.president.esae=PedagÃ³gico ESAE Presidente\n" +
-            "user.role.pedagogicCouncil.board.esae=PedagÃ³gico ESAE Membro\n" +
-            "user.role.pedagogicCouncil.secretariado.esae=PedagÃ³gico ESAE Secretariado\n" +
+            "user.role.pedagogicCouncil.president.esae=Pedagógico ESAE Presidente\n" +
+            "user.role.pedagogicCouncil.board.esae=Pedagógico ESAE Membro\n" +
+            "user.role.pedagogicCouncil.secretariado.esae=Pedagógico ESAE Secretariado\n" +
             //ESECS
             "user.role.school.president.esecs=Escola Director da ESECS\n"+
-            "user.role.school.board.esecs=Escola Board de DirecÃ§Ã£o da ESECS\n"+
+            "user.role.school.board.esecs=Escola Board de Direcção da ESECS\n"+
             "user.role.school.secretariado.esecs=Escola Secretariado da ESECS\n"+
             //CTC
             "user.role.scientificCouncil.president.esecs=CTC ESECS Presidente\n" +
             "user.role.scientificCouncil.board.esecs=CTC ESECS Membro\n" +
             "user.role.scientificCouncil.secretariado.esecs=CTC ESECS Secretariado\n" +
             //Pedagogico
-            "user.role.pedagogicCouncil.president.esecs=PedagÃ³gico ESECS Presidente\n" +
-            "user.role.pedagogicCouncil.board.esecs=PedagÃ³gico ESECS Membro\n" +
-            "user.role.pedagogicCouncil.secretariado.esecs=PedagÃ³gico ESECS Secretariado\n" +
+            "user.role.pedagogicCouncil.president.esecs=Pedagógico ESECS Presidente\n" +
+            "user.role.pedagogicCouncil.board.esecs=Pedagógico ESECS Membro\n" +
+            "user.role.pedagogicCouncil.secretariado.esecs=Pedagógico ESECS Secretariado\n" +
             //ESS
             "user.role.school.president.ess=Escola Director da ESS\n"+
-            "user.role.school.board.ess=Escola Board de DirecÃ§Ã£o da ESS\n"+
+            "user.role.school.board.ess=Escola Board de Direcção da ESS\n"+
             "user.role.school.secretariado.ess=Escola Secretariado da ESS\n"+
             //CTC
             "user.role.scientificCouncil.president.ess=CTC ESS Presidente\n" +
             "user.role.scientificCouncil.board.ess=CTC ESS Membro\n" +
             "user.role.scientificCouncil.secretariado.ess=CTC ESS Secretariado\n" +
             //Pedagogico
-            "user.role.pedagogicCouncil.president.ess=PedagÃ³gico ESS Presidente\n" +
-            "user.role.pedagogicCouncil.board.ess=PedagÃ³gico ESS Membro\n" +
-            "user.role.pedagogicCouncil.secretariado.ess=PedagÃ³gico ESS Secretariado\n" +
+            "user.role.pedagogicCouncil.president.ess=Pedagógico ESS Presidente\n" +
+            "user.role.pedagogicCouncil.board.ess=Pedagógico ESS Membro\n" +
+            "user.role.pedagogicCouncil.secretariado.ess=Pedagógico ESS Secretariado\n" +
             //ESCOLAS ANTIGOS NAO USAR
-            "user.role.board.school.estg=Board de DirecÃ§Ã£o da ESTG\n"+
-            "user.role.board.school.esae=Board de DirecÃ§Ã£o da ESAE\n"+
-            "user.role.board.school.esecs=Board de DirecÃ§Ã£o da ESECS\n"+
-            "user.role.board.school.ess=Board de DirecÃ§Ã£o da ESS\n"+
+            "user.role.board.school.estg=Board de Direcção da ESTG\n"+
+            "user.role.board.school.esae=Board de Direcção da ESAE\n"+
+            "user.role.board.school.esecs=Board de Direcção da ESECS\n"+
+            "user.role.board.school.ess=Board de Direcção da ESS\n"+
             //ESAE
-            "user.role.department.board.agric.recurs.nat=Departamento DireÃ§Ã£o - Agricultura e Recursos Naturais\n" +
-            "user.role.department.board.cienc.tecnol.ani=Departamento DireÃ§Ã£o - CiÃªncia e Tecnologia Animal\n" +
+            "user.role.department.board.agric.recurs.nat=Departamento Direção - Agricultura e Recursos Naturais\n" +
+            "user.role.department.board.cienc.tecnol.ani=Departamento Direção - Ciência e Tecnologia Animal\n" +
             "user.role.department.diretor.agric.recurs.nat=Departamento Diretor - Agricultura e Recursos Naturais\n" +
-            "user.role.department.diretor.cienc.tecnol.ani=Departamento Diretor - CiÃªncia e Tecnologia Animal\n" +
+            "user.role.department.diretor.cienc.tecnol.ani=Departamento Diretor - Ciência e Tecnologia Animal\n" +
             //ESECS
-            "user.role.department.board.comun.artes.tecn=Departamento DireÃ§Ã£o - ComunicaÃ§Ã£o, Artes e Tecnologias\n" +
-            "user.role.department.board.educac.formac=Departamento DireÃ§Ã£o - EducaÃ§Ã£o e FormaÃ§Ã£o\n" +
-            "user.role.department.board.inter.des.soc=Departamento DireÃ§Ã£o - IntervenÃ§Ã£o e Desenvolvimento Social\n" +
-            "user.role.department.diretor.comun.artes.tecn=Departamento Diretor - ComunicaÃ§Ã£o, Artes e Tecnologias\n" +
-            "user.role.department.diretor.educac.formac=Departamento Diretor - EducaÃ§Ã£o e FormaÃ§Ã£o\n" +
-            "user.role.department.diretor.inter.des.soc=Departamento Diretor - IntervenÃ§Ã£o e Desenvolvimento Social\n" +
+            "user.role.department.board.comun.artes.tecn=Departamento Direção - Comunicação, Artes e Tecnologias\n" +
+            "user.role.department.board.educac.formac=Departamento Direção - Educação e Formação\n" +
+            "user.role.department.board.inter.des.soc=Departamento Direção - Intervenção e Desenvolvimento Social\n" +
+            "user.role.department.diretor.comun.artes.tecn=Departamento Diretor - Comunicação, Artes e Tecnologias\n" +
+            "user.role.department.diretor.educac.formac=Departamento Diretor - Educação e Formação\n" +
+            "user.role.department.diretor.inter.des.soc=Departamento Diretor - Intervenção e Desenvolvimento Social\n" +
             //ESS
-            "user.role.department.board.cienc.tec.saude=Departamento DireÃ§Ã£o - CiÃªncias e Tecnologias da SaÃºde\n" +
-            "user.role.department.diretor.cienc.tec.saude=Departamento Diretor - CiÃªncias e Tecnologias da SaÃºde\n" +
+            "user.role.department.board.cienc.tec.saude=Departamento Direção - Ciências e Tecnologias da Saúde\n" +
+            "user.role.department.diretor.cienc.tec.saude=Departamento Diretor - Ciências e Tecnologias da Saúde\n" +
             //ESTG
-            "user.role.department.board.cienc.empre.sh=Departamento DireÃ§Ã£o - CiÃªncias Empresariais, Sociais e Humanas\n" +
-            "user.role.department.board.tecnolo.design=Departamento DireÃ§Ã£o - Tecnologias e Design\n" +
-            "user.role.department.diretor.cienc.empre.sh=Departamento Diretor - CiÃªncias Empresariais, Sociais e Humanas\n" +
+            "user.role.department.board.cienc.empre.sh=Departamento Direção - Ciências Empresariais, Sociais e Humanas\n" +
+            "user.role.department.board.tecnolo.design=Departamento Direção - Tecnologias e Design\n" +
+            "user.role.department.diretor.cienc.empre.sh=Departamento Diretor - Ciências Empresariais, Sociais e Humanas\n" +
             "user.role.department.diretor.tecnolo.design=Departamento Diretor - Tecnologias e Design\n"
             ;
 ,3 → 635,4
 }

 /branches/grupo5/impl/src/java/pt/estgp/estgweb/web/controllers/courses/CoursesServicesController.java
 New file
 ,0 → 1,79
+package pt.estgp.estgweb.web.controllers.courses;
+import org.apache.struts.action.ActionForm;
+import org.json.JSONObject;
+import pt.estgp.estgweb.web.controllers.utils.AbstractWidgetAjaxController;
+import pt.estgp.estgweb.web.utils.RequestUtils;
+import pt.utl.ist.berserk.logic.serviceManager.IServiceManager;
+import pt.utl.ist.berserk.logic.serviceManager.ServiceManager;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+/**
+ * Created by jorgemachado on 06/01/17.
+ */
+public class CoursesServicesController extends AbstractWidgetAjaxController
+{
+    /**
+     * See also CoursesServicesWidgetController for WS-API services
+     */
+    /**
+     *
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws Throwable
+     */
+    public JSONObject generateGlobalLearningResultsChartImg(ActionForm form,HttpServletRequest request, HttpServletResponse response) throws Throwable {
+        String courseReportDocument = request.getParameter("courseReportDocument");
+        IServiceManager sm = ServiceManager.getInstance();
+        String json = (String) sm.execute(RequestUtils.getRequester(request, response),
+                "CourseReportGenerateGlobalLearningResultsChartImg",
+                new Object[]{courseReportDocument});
+        return new JSONObject(json);
+    }
+    public JSONObject generateGlobalLearningResultsChartYearImg(ActionForm form,HttpServletRequest request, HttpServletResponse response) throws Throwable {
+        String courseReportDocument = request.getParameter("courseReportDocument");
+        IServiceManager sm = ServiceManager.getInstance();
+        String json = (String) sm.execute(RequestUtils.getRequester(request, response),
+                "CourseReportGenerateGlobalLearningResultsChartYearImg",
+                new Object[]{courseReportDocument});
+        return new JSONObject(json);
+    }
+    public JSONObject SaveCourseReportDocument(ActionForm form,HttpServletRequest request, HttpServletResponse response) throws Throwable {
+        String courseReportDocument = request.getParameter("courseReportDocument");
+        IServiceManager sm = ServiceManager.getInstance();
+        String json = (String) sm.execute(RequestUtils.getRequester(request, response),
+                "SaveCourseReportDocument",
+                new Object[]{courseReportDocument});
+        return new JSONObject(json);
+    }
+    /* AA 7/12/2017 */
+    public JSONObject saveCourseReportDoc(ActionForm form,HttpServletRequest request, HttpServletResponse response) throws Throwable {
+        String courseReportDocument = request.getParameter("courseReportDocument");
+        IServiceManager sm = ServiceManager.getInstance();
+        String json = (String) sm.execute(RequestUtils.getRequester(request, response),
+                "SaveCourseReportDoc",
+                new Object[]{courseReportDocument});
+        return new JSONObject(json);
+    }
+}

 /branches/grupo5/impl/src/java/pt/estgp/estgweb/web/controllers/widgetmodel/CoursesServicesWidgetController.java
 ,7 → 125,7
         service2.put("parameter1","code = siges code");
         service2.put("parameter2","period = \"S1,S2\"");
         service2.put("parameter3","year = \"201617,201718,...\"");
-        service2.put("return","uma tabela em JSON com toda a informaÃ§Ã£o de reusltados do pedagogico nesse ano");
+        service2.put("return","uma tabela em JSON com toda a informação de reusltados do pedagogico nesse ano");
         JSONObject service3 = new JSONObject();
         service3.put("service","/wsjson/api/app/ws-units-dtp-stats");
 ,7 → 133,7
         service3.put("parameter1","code = siges code");
         service3.put("parameter2","period = \"S1,S2\"");
         service3.put("parameter3","year = \"201617,201718,...\"");
-        service3.put("return","uma tabela em JSON com toda a informaÃ§Ã£o de estatistica do preenchimento das pastas DTP");
+        service3.put("return","uma tabela em JSON com toda a informação de estatistica do preenchimento das pastas DTP");
         JSONArray services = new JSONArray();
 ,4 → 162,4
         System.out.println(json);
     }
     */
-}
+}

 /branches/grupo5/impl/src/hbm/pt/estgp/estgweb/domain/Course.hbm.xml
 ,6 → 79,10
         <property name="separatedTurmas" type="boolean">
             <column name="separatedTurmas" default="false"/>
         </property>
+        <property name="CourseReportDocument" type="text">
+            <column name="CourseReportDocument" sql-type="LONGTEXT"/>
+        </property>
         <many-to-one name="course" class="pt.estgp.estgweb.domain.Course" outer-join="true" lazy="false" column="course_id"/>
         <subclass name="pt.estgp.estgweb.domain.CourseYearImpl" discriminator-value="CourseYearImpl"/>
     </class>

 /branches/grupo5/impl/src/web/admin/courses/departments.jsp
 ,229 → 42,229
 <div class="container-fluid">
-    <div id="departmentsModule"
-         ng-app="departmentsModule"
-         ng-controller="departmentsModuleController">
+<div id="departmentsModule"
+     ng-app="departmentsModule"
+     ng-controller="departmentsModuleController">
-        <script>
-            //DECLARACAO DA APLICACAO LOCAL EM ANGULAR
-            var departmentsModule = angular.module('departmentsModule', []);
-            GLOBAL_BacoAngularAppDependencies.push('departmentsModule');
+<script>
+    //DECLARACAO DA APLICACAO LOCAL EM ANGULAR
+    var departmentsModule = angular.module('departmentsModule', []);
+    GLOBAL_BacoAngularAppDependencies.push('departmentsModule');
-            departmentsModule.controller('departmentsModuleController', function($scope) {
-                $scope.departments = ${jsonArrayDepartments};
-                $scope.schools = ${jsonArraySchools};
-                $scope.setDirty = function(department)
-                {
-                    department.dirty = "true";
-                }
-                $scope.save = function(department)
-                {
-                    var d = JSON.stringify(department);
+    departmentsModule.controller('departmentsModuleController', function($scope) {
+        $scope.departments = ${jsonArrayDepartments};
+        $scope.schools = ${jsonArraySchools};
+        $scope.setDirty = function(department)
+        {
+            department.dirty = "true";
+        }
+        $scope.save = function(department)
+        {
+            var d = JSON.stringify(department);
-                    widgetCallWithActionParameters(
-                        "<%=request.getContextPath()%>/admin/adminDepartment.do",
-                        "updateCourseDepartment",
-                        {
-                            "courseDepartmentJson" : d
-                        },
-                        ".form-horizontal",
-                        function(departmentJson)
-                        {
-                            department.dirty = "false";
-                            $scope.$apply();
-                        }
+            widgetCallWithActionParameters(
+                    "<%=request.getContextPath()%>/admin/adminDepartment.do",
+                    "updateCourseDepartment",
+                    {
+                        "courseDepartmentJson" : d
+                    },
+                    ".form-horizontal",
+                    function(departmentJson)
+                    {
+                        department.dirty = "false";
+                        $scope.$apply();
+                    }
-                    );
-                }
+            );
+        }
-                $scope.createRoles = function(department)
-                {
-                    var d = JSON.stringify(department);
+        $scope.createRoles = function(department)
+        {
+            var d = JSON.stringify(department);
-                    widgetCallWithActionParameters(
-                        "<%=request.getContextPath()%>/admin/adminDepartment.do",
-                        "createRolesForDeparment",
-                        {
-                            "courseDepartmentJson" : d
-                        },
-                        ".form-horizontal",
-                        function(departmentJson)
-                        {
-                            window.location.reload();
-                        }
+            widgetCallWithActionParameters(
+                    "<%=request.getContextPath()%>/admin/adminDepartment.do",
+                    "createRolesForDeparment",
+                    {
+                        "courseDepartmentJson" : d
+                    },
+                    ".form-horizontal",
+                    function(departmentJson)
+                    {
+                        window.location.reload();
+                    }
-                    );
-                }
-                $scope.removeDepartment = function(department,$index)
-                {
+            );
+        }
+        $scope.removeDepartment = function(department,$index)
+        {
-                    var d = JSON.stringify(department);
-                    widgetCallWithActionParameters(
-                        "<%=request.getContextPath()%>/admin/adminDepartment.do",
-                        "removeCourseDepartment",
-                        {
-                            "courseDepartmentJson" : d
-                        },
-                        ".form-horizontal",
-                        function(departmentJson)
-                        {
-                            $scope.departments.splice($index,1);
-                            $scope.$apply();
-                        }
+            var d = JSON.stringify(department);
+            widgetCallWithActionParameters(
+                    "<%=request.getContextPath()%>/admin/adminDepartment.do",
+                    "removeCourseDepartment",
+                    {
+                        "courseDepartmentJson" : d
+                    },
+                    ".form-horizontal",
+                    function(departmentJson)
+                    {
+                        $scope.departments.splice($index,1);
+                        $scope.$apply();
+                    }
-                    );
-                }
-                $scope.newDepartment = function()
-                {
+            );
+        }
+        $scope.newDepartment = function()
+        {
-                    widgetCallWithActionParameters(
-                        "<%=request.getContextPath()%>/admin/adminDepartment.do",
-                        "newCourseDepartment",{},
-                        ".form-horizontal",
-                        function(departmentJson)
-                        {
-                            departmentJson.dirty = "true";
-                            $scope.departments.push(departmentJson);
-                            $scope.$apply();
-                        }
+            widgetCallWithActionParameters(
+                    "<%=request.getContextPath()%>/admin/adminDepartment.do",
+                    "newCourseDepartment",{},
+                    ".form-horizontal",
+                    function(departmentJson)
+                    {
+                        departmentJson.dirty = "true";
+                        $scope.departments.push(departmentJson);
+                        $scope.$apply();
+                    }
-                    );
-                }
+            );
+        }
-            });
-        </script>
+    });
+</script>
-        <p><label class="label-info">Papeis dos Departamentos:</label> Os papeis de departamento sÃ£o escolhidos da lista de papeis do sistema considerando-se todos os papeis com os prefixos:</p>
-        <ul>
-            <li>department.board: para membros da direcÃ§Ã£o</li>
-            <li>department.diretor: para diretores direcÃ§Ã£o</li>
-        </ul>
-        <p>Caso seja necessÃ¡rio um novo papel deverÃ¡ administrar os papeis institucionais dirija-se <html:link action="/user/configurationUserRoles">Aqui</html:link></p>
-        <button class="btn btn-default" data-toggle="collapse" data-target=".languageNames">Mostrar Campos Multinliguisticos</button>
+<p><label class="label-info">Papeis dos Departamentos:</label> Os papeis de departamento são escolhidos da lista de papeis do sistema considerando-se todos os papeis com os prefixos:</p>
+<ul>
+    <li>department.board: para membros da direcção</li>
+    <li>department.diretor: para diretores direcção</li>
+</ul>
+<p>Caso seja necessário um novo papel deverá administrar os papeis institucionais dirija-se <html:link action="/user/configurationUserRoles">Aqui</html:link></p>
+<button class="btn btn-default" data-toggle="collapse" data-target=".languageNames">Mostrar Campos Multinliguisticos</button>
-        <button class="btn btn-success pull-right" ng-click="newDepartment()"><span class="glyphicon glyphicon-plus"/></button>
-        <div class="form-horizontal">
-            <div class="web-messages"></div>
-            <table class="tablesorter-blue">
-                <thead>
-                <tr>
-                    <th>Identificador</th>
-                    <th>Trocar Para Identificador * </th>
-                    <th>Ativo</th>
-                    <th>InstituiÃ§Ã£o</th>
-                    <th style="width: 30%">Nome</th>
-                    <th>Papel para Membro da Direcao</th>
-                    <th>Papel para Director</th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr ng-class="{dirty: d.dirty=='true'}" ng-repeat="d in departments | orderBy:name:false">
-                    <td>
-                        <div class="row">
-                            <div class="col-md-8">
-                                <input readonly="true" class="form-control" type="text" ng-model="d.sigla" ng-keyup="setDirty(d)">
-                            </div>
-                            <div class="col-md-2">*</div>
-                        </div>
+<button class="btn btn-success pull-right" ng-click="newDepartment()"><span class="glyphicon glyphicon-plus"/></button>
+<div class="form-horizontal">
+    <div class="web-messages"></div>
+    <table class="tablesorter-blue">
+        <thead>
+        <tr>
+            <th>Identificador</th>
+            <th>Trocar Para Identificador * </th>
+            <th>Ativo</th>
+            <th>Instituição</th>
+            <th style="width: 30%">Nome</th>
+            <th>Papel para Membro da Direcao</th>
+            <th>Papel para Director</th>
+            <th></th>
+            <th></th>
+            <th></th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr ng-class="{dirty: d.dirty=='true'}" ng-repeat="d in departments | orderBy:name:false">
+            <td>
+                <div class="row">
+                    <div class="col-md-8">
+                        <input readonly="true" class="form-control" type="text" ng-model="d.sigla" ng-keyup="setDirty(d)">
+                    </div>
+                    <div class="col-md-2">*</div>
+                </div>
-                    </td>
-                    <td>
-                        <div class="row">
-                            <div class="col-md-8">
-                                <input class="form-control" type="text" ng-model="d.siglaNova" ng-keyup="setDirty(d)">
-                            </div>
-                            <div class="col-md-2">*</div>
-                        </div>
-                    </td>
-                    <td>
-                        <select class="chosenOff form-control" ng-model="d.active" ng-change="setDirty(d)">
-                            <option ng-value="true" ng-selected="d.active == true">Ativo</option>
-                            <option ng-value="false" ng-selected="d.active == false">Inativo</option>
-                        </select>
-                    </td>
-                    <td>
-                        <select class="chosenOff form-control" ng-model="d.courseSchool.id" ng-change="setDirty(d)" ng-options="s.id as s.name for s in schools">
-                        </select>
-                    </td>
-                    <td>
-                        <input class="form-control" type="text" ng-model="d.name" ng-keyup="setDirty(d)">
-                        <div class="languageNames collapse">
-                            EN:<input class="form-control" type="text" ng-model="d.nameEn" ng-keyup="setDirty(d)">
-                            ES:<input class="form-control" type="text" ng-model="d.nameEs" ng-keyup="setDirty(d)">
-                            FR:<input class="form-control" type="text" ng-model="d.nameFr" ng-keyup="setDirty(d)">
-                        </div>
-                    </td>
+            </td>
+            <td>
+                <div class="row">
+                    <div class="col-md-8">
+                        <input class="form-control" type="text" ng-model="d.siglaNova" ng-keyup="setDirty(d)">
+                    </div>
+                    <div class="col-md-2">*</div>
+                </div>
+            </td>
+            <td>
+                <select class="chosenOff form-control" ng-model="d.active" ng-change="setDirty(d)">
+                    <option ng-value="true" ng-selected="d.active == true">Ativo</option>
+                    <option ng-value="false" ng-selected="d.active == false">Inativo</option>
+                </select>
+            </td>
+            <td>
+                <select class="chosenOff form-control" ng-model="d.courseSchool.id" ng-change="setDirty(d)" ng-options="s.id as s.name for s in schools">
+                </select>
+            </td>
+            <td>
+                <input class="form-control" type="text" ng-model="d.name" ng-keyup="setDirty(d)">
+                <div class="languageNames collapse">
+                    EN:<input class="form-control" type="text" ng-model="d.nameEn" ng-keyup="setDirty(d)">
+                    ES:<input class="form-control" type="text" ng-model="d.nameEs" ng-keyup="setDirty(d)">
+                    FR:<input class="form-control" type="text" ng-model="d.nameFr" ng-keyup="setDirty(d)">
+                </div>
+            </td>
-                    <td style="font-size: 0.7em !important">
-                        <select class="chosenOff form-control" ng-model="d.boardRole" ng-change="setDirty(d)">
-                            <option value="">Escolha</option>
-                            <logic:iterate id="role" name="rolesBoardDepartamento">
-                                <option value="${role}"><bean:message key="user.role.${role}"/></option>
-                            </logic:iterate>
-                        </select>
-                    </td>
-                    <td style="font-size: 0.7em !important">
-                        <select class="chosenOff form-control" ng-model="d.directorRole" ng-change="setDirty(d)">
-                            <option value="">Escolha</option>
-                            <logic:iterate id="role" name="rolesDiretorDepartamento">
-                                <option value="${role}"><bean:message key="user.role.${role}"/></option>
-                            </logic:iterate>
-                        </select>
-                    </td>
-                    <td>
-                        <button type="button" class="btn btn-success btn-xs" ng-click="save(d)">
-                            <span class="glyphicon glyphicon-ok"/>
-                        </button>
-                    </td>
-                    <td>
-                        <bacoTags:confirm  msg="Tem a certeza que deseja remover o departamento {{d.name}}" targetFunction="angular.element($('#departmentsModule')).scope().removeDepartment({{d}},{{$index}});angular.element($('#departmentsModule')).scope().$apply();" btnClass="btn btn-danger btn-xs" icon="glyphicon glyphicon-remove"/>
-                    </td>
-                    <td>
-                        <button ng-if="!d.directorRole && !d.boardRole" data-toggle="tooltip" data-title="Criar Roles para este departamento" type="button" class="btn btn-success btn-xs" ng-click="createRoles(d)">
-                            <span class="glyphicon glyphicon-user"/>
-                        </button>
-                    </td>
+            <td style="font-size: 0.7em !important">
+                <select class="chosenOff form-control" ng-model="d.boardRole" ng-change="setDirty(d)">
+                    <option value="">Escolha</option>
+                    <logic:iterate id="role" name="rolesBoardDepartamento">
+                        <option value="${role}"><bean:message key="user.role.${role}"/></option>
+                    </logic:iterate>
+                </select>
+            </td>
+            <td style="font-size: 0.7em !important">
+                <select class="chosenOff form-control" ng-model="d.directorRole" ng-change="setDirty(d)">
+                    <option value="">Escolha</option>
+                    <logic:iterate id="role" name="rolesDiretorDepartamento">
+                        <option value="${role}"><bean:message key="user.role.${role}"/></option>
+                    </logic:iterate>
+                </select>
+            </td>
+            <td>
+                <button type="button" class="btn btn-success btn-xs" ng-click="save(d)">
+                    <span class="glyphicon glyphicon-ok"/>
+                </button>
+            </td>
+            <td>
+                <bacoTags:confirm  msg="Tem a certeza que deseja remover o departamento {{d.name}}" targetFunction="angular.element($('#departmentsModule')).scope().removeDepartment({{d}},{{$index}});angular.element($('#departmentsModule')).scope().$apply();" btnClass="btn btn-danger btn-xs" icon="glyphicon glyphicon-remove"/>
+            </td>
+            <td>
+                <button ng-if="!d.directorRole && !d.boardRole" data-toggle="tooltip" data-title="Criar Roles para este departamento" type="button" class="btn btn-success btn-xs" ng-click="createRoles(d)">
+                    <span class="glyphicon glyphicon-user"/>
+                </button>
+            </td>
-                </tr>
-                </tbody>
-            </table>
-            <h2 class="label label-warning">* - A sigla Ã© o identificador do departamento, altere a sigla apenas se perceber as suas implicaÃ§Ãµes. Existem Classes no sistema que dependem da sigla do departamento, a sigla tem de ser unica</h2>
-            <h2 class="label label-warning">* - A sigla apenas pode ser alterada se nÃ£o houver docentes nem cursos a apontar para o departamento que pretende alterar</h2>
-            <%--
-            <model:id name="department" property="id"/>
-            <model:field name="department" property="name"/>
-            <model:field name="department" property="nameEn"/>
-            <model:field name="department" property="nameEs"/>
-            <model:field name="department" property="nameFr"/>
-            <model:remove name="department"/>
-        --%>
-        </div>
+        </tr>
+        </tbody>
+    </table>
+    <h2 class="label label-warning">* - A sigla é o identificador do departamento, altere a sigla apenas se perceber as suas implicações. Existem Classes no sistema que dependem da sigla do departamento, a sigla tem de ser unica</h2>
+    <h2 class="label label-warning">* - A sigla apenas pode ser alterada se não houver docentes nem cursos a apontar para o departamento que pretende alterar</h2>
+    <%--
+    <model:id name="department" property="id"/>
+    <model:field name="department" property="name"/>
+    <model:field name="department" property="nameEn"/>
+    <model:field name="department" property="nameEs"/>
+    <model:field name="department" property="nameFr"/>
+    <model:remove name="department"/>
+--%>
+</div>
-        <!--<pre>
-            {{departments | json}}
-        </pre>-->
-        <%-- DEBUG
-        <pre>
-            {{departments | json}}
-        </pre>
-        <pre>
-            {{schools | json}}
-        </pre>
-        --%>
-    </div>
+<!--<pre>
+    {{departments | json}}
+</pre>-->
+<%-- DEBUG
+<pre>
+    {{departments | json}}
+</pre>
+<pre>
+    {{schools | json}}
+</pre>
+--%>
+</div>
 </div>
-<p>* AtenÃ§Ã£o o identificador Ã© a base dos papeis, deverÃ¡ trocar tambÃ©m as chaves dos papeis na administraÃ§Ã£o de papeis institucionais, procurando pelos papeis respectivos e alterando a sua chave para a nova sigla ou criando novos papeis</p>
+<p>* Atenção o identificador é a base dos papeis, deverá trocar também as chaves dos papeis na administração de papeis institucionais, procurando pelos papeis respectivos e alterando a sua chave para a nova sigla ou criando novos papeis</p>
 <%

 /branches/grupo5/impl/src/web/user/courses/courseReportEdit.jsp
 ,12 → 95,13
 <%
     String courseCode = request.getParameter("courseCode");
+    String year = request.getParameter("year");
     AbstractDao.getCurrentSession().beginTransaction();
     CourseImpl courseImpl = DaoFactory.getCourseDaoImpl().findCourseByCode(courseCode);
     request.setAttribute("course",courseImpl);
     CourseReportDocument courseReport = null;
     try {
-        courseReport = new CourseReportServices().createNewCourseReportDocument("44", "201617");
+        courseReport = new CourseReportServices().createNewCourseReportDocument(courseCode, year);
     } catch (Throwable e) {
         System.out.println(e);
         e.printStackTrace();
 ,218 → 115,233
 <div class="container-fluid">
-    <style>
-        .separatorSection
-        {
-            border: 1px solid #ddd;
-        }
-    </style>
+<style>
+    .separatorSection
+    {
+        border: 1px solid #ddd;
+    }
+</style>
-    <!-- Apresentacao da Unidade -->
+<!-- Apresentacao da Unidade -->
-    <div class="panel panel-default">
-        <div class="panel-heading">
-             Relatório Anual do curso: ${course.name}
-        </div>
-        <div class="panel-body">
+<div class="panel panel-default">
+<div class="panel-heading">
+    Relatório Anual do curso: ${course.name}
+</div>
+<div class="panel-body">
-            <p><b class="label-info">Tipo de Curso:</b> <bean:message key="course.${course.degree}"/></p>
-            <p><b class="label-info">Ano Lectivo:</b> ${course.importYear}</p>
-            <p><b class="label-info">Departamento:</b> ${course.department.name}</p>
-            <p><b class="label-info">Escola:</b> ${course.department.courseSchool.name}</p>
+<p><b class="label-info">Tipo de Curso:</b> <bean:message key="course.${course.degree}"/></p>
+<p><b class="label-info">Ano Lectivo:</b> ${course.importYear}</p>
+<p><b class="label-info">Departamento:</b> ${course.department.name}</p>
+<p><b class="label-info">Escola:</b> ${course.department.courseSchool.name}</p>
-            <script>
+<script>
-                //Especifico da aplicacao
-                var courseReportApp = angular.module('courseReportApp', []);
-                GLOBAL_BacoAngularAppDependencies.push('courseReportApp');
+    //Especifico da aplicacao
+    var courseReportApp = angular.module('courseReportApp', ['ui.tree']);
+    GLOBAL_BacoAngularAppDependencies.push('courseReportApp');
-                courseReportApp.directive('resizable', function () {
-                    return {
-                        restrict: 'A',
-                        scope: {
-                            callback: '&onResize'
-                        },
-                        link: function postLink(scope, elem, attrs) {
-                            elem.resizable();
-                            elem.on('resize', function (evt, ui, comp) {
-                                scope.$apply(function() {
-                                    if (scope.callback) {
-                                        scope.callback({$evt: evt, $ui: ui, $comp: comp });
-                                    }
-                                })
-                            });
+    courseReportApp.directive('resizable', function () {
+        return {
+            restrict: 'A',
+            scope: {
+                callback: '&onResize'
+            },
+            link: function postLink(scope, elem, attrs) {
+                elem.resizable();
+                elem.on('resize', function (evt, ui, comp) {
+                    scope.$apply(function() {
+                        if (scope.callback) {
+                            scope.callback({$evt: evt, $ui: ui, $comp: comp });
                         }
-                    };
+                    })
                 });
+            }
+        };
+    });
-                courseReportApp.controller('courseReportAppController', function($scope)
-                {
+    courseReportApp.controller('courseReportAppController', function($scope)
+    {
-                    $scope.docAppSelector = "#courseReportApp";
-                    $scope.report = <%=courseReportJson%>
+        $scope.docAppSelector = "#courseReportApp";
+        $scope.report = <%=courseReportJson%>
-                    $scope.resize = function(evt,ui,comp) {
-                        //console.log (evt,ui);
-                        comp.width = ui.size.width;
-                        comp.height = ui.size.height;
-                    }
+                $scope.resize = function(evt,ui,comp) {
+                    //console.log (evt,ui);
+                    comp.width = ui.size.width;
+                    comp.height = ui.size.height;
+                }
-                    /**
-                     * @classe class to match
-                     * @superClasses array of strings
-                     * */
-                    $scope.contains = function(obj,classe)
-                    {
-                        if(obj['@class'] && obj['@class'] == classe)
-                            return true;
-                        if(obj.allSuperClasses)
-                        {
-                            for(var i in obj.allSuperClasses)
-                            {
-                                if(classe == obj.allSuperClasses[i])
-                                    return true;
-                            }
-                        }
-                        return false;
-                    }
+        /**
+         * @classe class to match
+         * @superClasses array of strings
+         * */
+        $scope.contains = function(obj,classe)
+        {
+            if(obj['@class'] && obj['@class'] == classe)
+                return true;
+            if(obj.allSuperClasses)
+            {
+                for(var i in obj.allSuperClasses)
+                {
+                    if(classe == obj.allSuperClasses[i])
+                        return true;
+                }
+            }
+            return false;
+        }
-                    $scope.showSep = function(section)
-                    {
-                        $(".separatorSectionNav").each(function()
-                        {
-                            angular.element($(this)).scope().section.active = false;
-                        });
-                        section.active = true;
+        $scope.showSep = function(section,subSection)
+        {
+            var s;
+            for(s in section.sections)
+            {
+                section.sections[s].active = false;
+            }
+            /*$(".separatorSectionNav").each(function()
+             {
+             angular.element($(this)).scope().section.active = false;
+             });*/
+            subSection.active = true;
+        }
-                    }
-                    $scope.class2id = function(obj)
+        /**
+         * Este metodo devolve o template mais profundo na hierarquia de classes
+         * permitindo emular o override, quanto mais especifica for a classe
+         * e caso exista template é esse o template devolvido
+         * procura um script com o id da classe e se nao existir
+         * vai subindo nas super classes
+         * @param obj
+         * @returns {*}
+         */
+        $scope.class2id = function(obj)
+        {
+            var objClassId = obj["@class"].replaceAll(".","_");
+            if($("script#" + objClassId).length > 0)
+            {
+                return objClassId;
+            }
+            if(obj.allSuperClasses)
+            {
+                var s;
+                for(s in obj.allSuperClasses)
+                {
+                    var superClass = obj.allSuperClasses[s];
+                    var superClassId = superClass.replaceAll(".","_");
+                    if($("script#" + superClassId).length > 0)
                     {
-                        return obj["@class"].replaceAll(".","_");
+                        return superClassId;
                     }
+                }
+            }
+            return obj["@class"].replaceAll(".","_");
+        }
-                    $scope.addText = function(parentCustomPane)
-                    {
-                        $scope.addSimpleDocComponent(parentCustomPane,"pt.estgp.estgweb.utils.documentBuilder.TextComponent")
-                    }
+        $scope.addText = function(parentCustomPane)
+        {
+            $scope.addSimpleDocComponent(parentCustomPane,"pt.estgp.estgweb.utils.documentBuilder.TextComponent")
+        }
-                    $scope.addImage = function(parentCustomPane)
-                    {
-                        $scope.addSimpleDocComponent(parentCustomPane,"pt.estgp.estgweb.utils.documentBuilder.ImageComponent")
-                    }
+        $scope.addImage = function(parentCustomPane)
+        {
+            $scope.addSimpleDocComponent(parentCustomPane,"pt.estgp.estgweb.utils.documentBuilder.ImageComponent")
+        }
-                    $scope.addSimpleDocComponent = function(parentCustomPane,classComponent)
+        $scope.addSimpleDocComponent = function(parentCustomPane,classComponent)
+        {
+            if(!parentCustomPane.components)
+            {
+                parentCustomPane.components = [];
+            }
+            parentCustomPane.components.push(
                     {
-                        if(!parentCustomPane.components)
-                        {
-                            parentCustomPane.components = [];
-                        }
-                        parentCustomPane.components.push(
-                                {
-                                    "@class" : classComponent
-                                }
-                        );
+                        "@class" : classComponent
                     }
-                    $scope.removeComponent = function(index,array)
-                    {
-                        array.splice(index,1);
+            );
+        }
+        $scope.removeComponent = function(index,array)
+        {
+            array.splice(index,1);
+        }
+        $scope.callbackUploadedFiles = function(filesUploadResult,token,targetElement)
+        {
+            var modelObject = BacoAngularUtils.getAngularElementModel(targetElement);
-                    }
-                    $scope.callbackUploadedFiles = function(filesUploadResult,token,targetElement)
-                    {
-                        var modelObject = BacoAngularUtils.getAngularElementModel(targetElement);
-                        modelObject.filesUploadResult = filesUploadResult;
-                        if(modelObject.image && modelObject.image.identifier)
+            if(modelObject.image && modelObject.image.identifier)
+            {
+                widgetCallWithActionParameters(
+                        "<%=request.getContextPath()%>/user/json/repository.do",
+                        "replaceRepositoryFileFromTempPrivateDomain",
                         {
-                            widgetCallWithActionParameters(
-                                    "<%=request.getContextPath()%>/user/json/repository.do",
-                                    "replaceRepositoryFileFromTempPrivateDomain",
-                                    {
-                                        "identifier" : modelObject.image.identifier,
-                                        "fileUploaded" : BacoJS.stringifyOrdered(filesUploadResult.uploadedFiles[0])
-                                    },
-                                    "#courseReportApp",
-                                    function(repositoryFile4JsonView)
-                                    {
-                                        modelObject.image = repositoryFile4JsonView;
-                                        modelObject.imageUrl = "<%=request.getContextPath()%>/repositoryStream/" + modelObject.image.identifier + "?" + new Date().getTime();
-                                        delete modelObject.filesUploadResult;
-                                        angular.element($("#courseReportApp")).scope().$apply();
-                                    },
-                                    function(){}
-                            );
-                        }
-                        else
+                            "identifier" : modelObject.image.identifier,
+                            "fileUploaded" : BacoJS.stringifyOrdered(filesUploadResult.uploadedFiles[0])
+                        },
+                        "#courseReportApp",
+                        function(repositoryFile4JsonView)
                         {
-                            widgetCallWithActionParameters(
-                                    "<%=request.getContextPath()%>/user/json/repository.do",
-                                    "saveRepositoryFileFromTempPrivateDomain",
-                                    {
-                                        "fileUploaded" : BacoJS.stringifyOrdered(filesUploadResult.uploadedFiles[0])
-                                    },
-                                    "#courseReportApp",
-                                    function(repositoryFile4JsonView)
-                                    {
-                                        modelObject.image = repositoryFile4JsonView;
-                                        modelObject.imageUrl = "<%=request.getContextPath()%>/repositoryStream/" + modelObject.image.identifier + "?" + new Date().getTime();
-                                        delete modelObject.filesUploadResult;
-                                        angular.element($("#courseReportApp")).scope().$apply();
-                                    },
-                                    function(){}
-                            );
-                        }
-                    }
+                            modelObject.image = repositoryFile4JsonView;
+                            //image URL is generated on reimport just to avoid caching
+                            modelObject.imageUrl = "<%=request.getContextPath()%>/repositoryStream/" + modelObject.image.identifier + "?" + new Date().getTime();
+                            angular.element($("#courseReportApp")).scope().$apply();
+                        },
+                        function(){}
+                );
+            }
+            else
+            {
+                widgetCallWithActionParameters(
+                        "<%=request.getContextPath()%>/user/json/repository.do",
+                        "saveRepositoryFileFromTempPrivateDomain",
+                        {
+                            "fileUploaded" : BacoJS.stringifyOrdered(filesUploadResult.uploadedFiles[0])
+                        },
+                        "#courseReportApp",
+                        function(repositoryFile4JsonView)
+                        {
+                            modelObject.image = repositoryFile4JsonView;
+                            modelObject.imageUrl = "<%=request.getContextPath()%>/repositoryStream/" + modelObject.image.identifier + "?" + new Date().getTime();
+                            angular.element($("#courseReportApp")).scope().$apply();
+                        },
+                        function(){}
+                );
+            }
+        }
-                });
-            </script>
-            <!--TEMPLATES FOR DOCUMENT BUILDER-->
-            <jsp:include page="../utils/documentsBuilder.jsp"/>
-            <div class="form-vertical">
-                <div id="courseReportApp" ng-app="courseReportApp" ng-controller="courseReportAppController">
+    });
+</script>
+<!--TEMPLATES FOR DOCUMENT BUILDER-->
+<jsp:include page="../utils/documentsBuilder.jsp"/>
+<jsp:include page="coursereport/templates.jsp"/>
-                    <ul class="nav nav-tabs">
-                        <li ng-model="section" class="separatorSectionNav" ng-class="{ active: section.active}" ng-repeat="section in report.sections">
-                            <a ng-click="showSep(section)">{{section.title}}</a>
-                        </li>
-                    </ul>
+<div class="form-vertical">
+    <div id="courseReportApp" ng-app="courseReportApp" ng-controller="courseReportAppController">
+        <div ng-init="section=report;" ng-include="'pt_estgp_estgweb_utils_documentBuilder_DocumentSection'">
+        </div>
-                    <!--DocumentSection-->
-                    <div ng-model="section" ng-class="{ hidden: !section.active}" ng-repeat="section in report.sections" class="separatorSection clearfix">
+        <!-- <pre class="code">{{ report | json }}</pre>-->
-                       <div ng-repeat="comp in section.components" ng-include="class2id(comp)">
-                        </div>
+    </div><!--App-->
+</div> <!--form-->
-                    </div>
-                    <!--/DocumentSection-->
+</div><!--Panel Body-->
-<%--
-                    <pre class="code">{{ report | json }}</pre>
---%>
+</div><!--Panel-->
-                </div><!--App-->
-            </div> <!--form-->
-        </div><!--Panel Body-->
-    </div><!--Panel-->
 </div><!--container-fluid-->
 <%

/branches/grupo5/impl/build.xml
67,6 → 67,7
<mkdir dir="${log.dir}"/>
<mkdir dir="${data.dir}"/>
<mkdir dir="${build.dir}"/>
<mkdir dir="${tmp.dir}"/>
<mkdir dir="${build.dir.classes}"/>
<mkdir dir="${build.dir.war}"/>
<mkdir dir="${build.dir.ws}"/>

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/Pagina.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.ArrayList;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitDeliverable.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioPedagogicoCursoAfeto.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioPergunta.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentTaskActorInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/SurveyStatsGraphic.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/GenericUser.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/EventGeneric.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportFileGroupDocentesAno.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentTaskInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentGatewayExclusiveDecisionHolderInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnActorSelector.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitProgram.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/ConfigurationSeparator.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportFileGroupCursosAno.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/Announcement.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentEventEndMessageInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnActorPoolThreadInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/Survey.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/RecordThesis.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/AssessmentQuestionPossibleAnswer.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/RepositoryDocumentInterface.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/PageSection.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.ArrayList;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/SurveyQuestionCandidateAnswer.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnActorPoolInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/SruSourceCollection.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/OlapStarFactQuestionarioAnswer.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/EventClass.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/RecordJob.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/ConfigurationGradesStatusEpoca.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/Teacher.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/PageRepositoryFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import pt.estgp.estgweb.domain.typesgenservices.repositorydocuments.RepositoryFileProxy;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitSummary.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentGatewayInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/Record.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnRoleSelector.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnTaskFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportDocenteFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

 /branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/CourseYear.java
 ,5 → 1,5
 package pt.estgp.estgweb.domain;
-// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
+// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9
 import java.util.Date;
 ,6 → 15,7
      private Date saveDate;
      private String importYear;
      private boolean separatedTurmas;
+     private String CourseReportDocument;
      private Course course;
     public CourseYear() {
 ,6 → 57,13
     public void setSeparatedTurmas(boolean separatedTurmas) {
         this.separatedTurmas = separatedTurmas;
     }
+    public String getCourseReportDocument() {
+        return this.CourseReportDocument;
+    }
+    public void setCourseReportDocument(String CourseReportDocument) {
+        this.CourseReportDocument = CourseReportDocument;
+    }
     public Course getCourse() {
         return this.course;
     }

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableDomainObject.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/Blog.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentTaskActor.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import pt.estgp.estgweb.domain.typesgen.Todos;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/Assessment.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/RepositoryFileVersion.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/UserRoleConfig.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/SessionObjectId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentTask.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import pt.estgp.estgweb.domain.typesgen.Todos;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/RepositoryDocumentCollection.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioPedagogicoUnidadeCurricularAfeta.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentGatewayExclusiveDecisionHolder.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableBoolean.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/SurveyQuestionItem.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/UrlStatMonth.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/Page.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/CourseStudiesPlan.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioPedagogicoAlunoRequisitado.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/Process.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/AppUser.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnActorPool.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.ArrayList;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/PageText.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/Questionario.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioPerguntaEsforco.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/SurveyQuestion.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioUnidade.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/OlapStarFactQuestionario.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentEventEndMessages.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import pt.estgp.estgweb.domain.typesgen.TargetActorType;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableString.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentGateway.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/UrlStatYearId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableJson.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/AssessmentQuestionItem.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/Group.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/CourseUnit.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/SurveyQuestionAnswer.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/ConfigurationGradesEpocaAvaliacao.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioPedagogicoTipologiaRequisitada.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/SigesUser.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitAnnouncement.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/ManagedIdentifierCollection.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/AssessmentQuestion.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/UrlStatYear.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/DigitalDeliveryCategory.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/RecordOther.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/UrlStatMonthId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/DigitalDelivery.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/UserSession.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitEvaluation.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportCursoFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportFileGroup.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/AssessmentQuestionAnswer.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentEventInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnActorSelectorCondicionado.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitProgramPart2.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/OlapStarFactQuestionarioCurso.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioResposta.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioTipologia.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitBlog.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/Reminder.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/RecordEventOrganization.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/RecordPaper.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentGatewayExclusiveInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/Configuration.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/PageContent.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/SessionObject.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.io.Serializable;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitBlogPost.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/JobParameter.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableInteger.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnProcessInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/EventFormacoes.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/ComunicationFolder.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/Student.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableFloat.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitQuestion.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionario.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/UrlStatDay.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnUserSelector.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/OlapStarFactQuestionarioTipologia.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariable.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import pt.estgp.estgweb.domain.typesgen.VariableType;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/RecordProject.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/PageExternalObject.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponent.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentEvent.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitTurma.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/SurveyResponse.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/RepositoryFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/ProcessEventFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/ProcessEvent.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/OlapStarFactQuestionarioUnidade.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentGatewayExclusive.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableLong.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowConnectorInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentEventEndInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BlogPost.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/SruSource.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnProcess.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.ArrayList;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableJsonArray.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/ManagedIdentifier.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/Course.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/PageExternalUrl.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitGrade.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/AssessmentResponse.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/UrlStatDayId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportFileAno.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/JobServiceTask.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/RepositoryDocument.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/RepositoryDocumentFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/User.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/EventUser.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/Image.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/OlapHistoryDimension.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/Teste.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/OlapStarFactQuestionarioAnswerEsforco.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/DigitalDeliveryTarget.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnActorSelectorWithDomainObjectLoader.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportFileGroupAno.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioUser.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/CourseUserAssociation.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/ConfigurationDirectory.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioHistoryDrive.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitAssignement.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowConnector.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioRespostaRequisitada.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentEventEnd.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowObjectInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioCurso.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/CourseSchool.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/Job.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.io.Serializable;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnAbstractActorSelector.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/JobServiceTaskScheduler.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/EventGenericRecord.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/JobServiceTaskSchedulerParameter.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/JobServiceTaskParameter.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/CourseDepartment.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/MetaProcess.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/SurveyStructuralNode.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableDouble.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/ConfigurationGrades.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/Seccao.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/grupo5/impl/gen/java/pt/estgp/estgweb/domain/UrlStat.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 4/nov/2017 19:35:42 by Hibernate Tools 3.2.0.b9
// Generated 11/jan/2018 10:36:39 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /branches/grupo2/impl/src/java/pt/estgp/estgweb/utils/documentBuilder/DocumentSection.java
 ,7 → 53,7
     public DocComponent findDocComponent(Class compClass, String internalCode)
     {
-        if(getComponents() != null)
+        if(getComponents() != null && internalCode != null)
             for(DocComponent comp: getComponents())
             {
                 if(comp.getClass().equals(compClass) && comp.getInternalCode().equals(internalCode))

 /branches/grupo2/impl/src/java/pt/estgp/estgweb/services/courses/CourseReportServices.java
 ,7 → 543,7
         if (courseReportJson == null) {
             try {
-                CourseReportDocument courseReport = new CourseReportServices().createNewCourseReportDocument(courseCode, year);
+                CourseReportDocument courseReport = createNewCourseReportDocument(courseCode, year);
                 courseReportJson = courseReport.toJson();
                 saveCourseReportDocument(courseReportJson, session);
             } catch (Throwable e) {

 /branches/grupo2/impl/src/java/pt/estgp/estgweb/services/courses/coursereport/documentmodel/learningresults/components/LearningResultsChartSem.java
 ,7 → 102,7
         renderer.setSeriesPaint(0, new Color(237,127,32));
         renderer.setSeriesPaint(1, new Color(255,198,0));
         renderer.setSeriesPaint(2, new Color(122,173,38));
-        renderer.setMaximumBarWidth(0.2);
+        renderer.setMaximumBarWidth(0.1);
         renderer.setBaseItemLabelGenerator(new StandardCategoryItemLabelGenerator("{2}", new DecimalFormat("#.##'%'")));
         renderer.setBaseItemLabelsVisible(true);
 ,7 → 113,7
         legend.setFrame(BlockBorder.NONE);
-        BufferedImage image = chart.createBufferedImage( 300*4, 200*4);
+        BufferedImage image = chart.createBufferedImage( 300*4, 400*4);
         String pathGraficoTiposAlunos = Globals.TMP_DIR + java.io.File.separator + tempName;
         java.io.File output = new java.io.File(pathGraficoTiposAlunos);
         ImageIO.write(image, "png", new FileOutputStream(output));

/branches/grupo2/impl/src/java/pt/estgp/estgweb/filters/filters/IsFromCourseCommission.java
2,14 → 2,11

import org.apache.log4j.Logger;
import pt.estgp.estgweb.domain.CourseImpl;
import pt.estgp.estgweb.domain.CourseUnit;
import pt.estgp.estgweb.domain.UserImpl;
import pt.estgp.estgweb.domain.UserSession;
import pt.estgp.estgweb.domain.dao.DaoFactory;
import pt.estgp.estgweb.filters.chains.LoadControlFilter;
import pt.estgp.estgweb.filters.exceptions.AccessDeniedOperationException;
import pt.estgp.estgweb.filters.exceptions.NeedAuthenticationException;
import pt.estgp.estgweb.filters.filters.utils.LoadObjectFromParameters;
import pt.estgp.estgweb.utils.Globals;
import pt.utl.ist.berserk.ServiceRequest;
import pt.utl.ist.berserk.ServiceResponse;
33,7 → 30,6
if(userSession.getUser().isSuperuser())
return;

//CourseImpl course = (CourseImpl) LoadObjectFromParameters.loadObjectFromClassName((String) filterParameters.getParameter(1),filterParameters,request.getServiceParameters());
String courseCode = (String) request.getServiceParameters().getParameter((String) filterParameters.getParameter(0));
CourseImpl course = DaoFactory.getCourseDaoImpl().findCourseByCode(courseCode);

 /branches/grupo2/impl/src/web/user/courses/coursereport/templates.jsp
 ,12 → 647,12
             },
             templateUrl: function(elem,attrs) {
-                return "globallearningresultschartimg";
+                return "chartcomponenttemplate";
             }
         }
     });
 </script>
-<script type="text/ng-template" id="globallearningresultschartimg">
+<script type="text/ng-template" id="chartcomponenttemplate">
     <div class="imageComponent component">
         <div class="componentBody">
 ,43 → 719,13
             },
             templateUrl: function(elem,attrs) {
-                return "globallearningresultschartimg";
+                return "chartcomponenttemplate";
             }
         }
     });
 </script>
-<script type="text/ng-template" id="globallearninglesultschartyearimg">
-    <div class="imageComponent component">
-        <div class="componentBody">
-            <div class="form-group clearfix">
-                <label class="col-md-2 control-label">Legenda</label>
-                <div class="col-md-10">
-                    <input type="text" class="form-control" rows="10" ng-model="comp.title">
-                </div>
-            </div>
-            <div class="form-group clearfix">
-                <div class="col-md-2 control-label">
-                    <button class="btn btn-default" ng-click="generateChart(comp)">Refrescar/Gerar Gráfico</button>
-                </div>
-                <div class="col-md-10">
-                    <label ng-if="comp.image.identifier"> Limites do PDF </label>
-                    <div ng-if="comp.image.identifier" style="text-align: center; width: 595px; border: 1px solid black; padding: 45px">
-                        <center>
-                            <div style="width: 200px;height: 200px; max-width: 500px; max-height: 750px" resizable on-resize="resize($evt, $ui, comp)">
-                                <img ng-if="comp.imageUrl" style="width: 100%;height: 100%"  ng-src="{{comp.imageUrl}}">
-                                <img ng-if="!comp.imageUrl" style="width: 100%;height: 100%"  ng-src="{{'<%=request.getContextPath()%>/repositoryStream/' + comp.image.identifier}}">
-                            </div>
-                            (Se desejar altere o tamanho da imagem arrastando no canto inferior direito)
-                        </center>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</script>
 <script type="text/ng-template" id="pt_estgp_estgweb_services_courses_coursereport_documentmodel_learningresults_components_LearningResultsChartSem">
     <learningresultschartsem>
     </learningresultschartsem>
 ,38 → 762,8
             },
             templateUrl: function(elem,attrs) {
-                return "learningresultschartsem";
+                return "chartcomponenttemplate";
             }
         }
     });
 </script>
-<script type="text/ng-template" id="learningresultschartsem">
-    <div class="imageComponent component">
-        <div class="componentBody">
-            <div class="form-group clearfix">
-                <label class="col-md-2 control-label">Legenda</label>
-                <div class="col-md-10">
-                    <input type="text" class="form-control" rows="10" ng-model="comp.title">
-                </div>
-            </div>
-            <div class="form-group clearfix">
-                <div class="col-md-2 control-label">
-                    <button class="btn btn-default" ng-click="generateChart(comp)">Refrescar/Gerar Gráfico</button>
-                </div>
-                <div class="col-md-10">
-                    <label ng-if="comp.image.identifier"> Limites do PDF </label>
-                    <div ng-if="comp.image.identifier" style="text-align: center; width: 595px; border: 1px solid black; padding: 45px">
-                        <center>
-                            <div style="width: 200px;height: 200px; max-width: 500px; max-height: 750px" resizable on-resize="resize($evt, $ui, comp)">
-                                <img ng-if="comp.imageUrl" style="width: 100%;height: 100%"  ng-src="{{comp.imageUrl}}">
-                                <img ng-if="!comp.imageUrl" style="width: 100%;height: 100%"  ng-src="{{'<%=request.getContextPath()%>/repositoryStream/' + comp.image.identifier}}">
-                            </div>
-                            (Se desejar altere o tamanho da imagem arrastando no canto inferior direito)
-                        </center>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</script>

 /branches/grupo2/impl/src/web/user/courses/courseReportEdit.jsp
 ,10 → 1,4
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ page import="jomm.dao.impl.AbstractDao" %>
-<%@ page import="pt.estgp.estgweb.domain.CourseImpl" %>
-<%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
-<%@ page import="pt.utl.ist.berserk.logic.serviceManager.IServiceManager" %>
-<%@ page import="pt.utl.ist.berserk.logic.serviceManager.ServiceManager" %>
-<%@ page import="pt.estgp.estgweb.web.utils.RequestUtils" %>
 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
 <%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
 ,344 → 7,5
 <%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
 <%@ taglib prefix="t" tagdir="/WEB-INF/tags" %>
-<%-- http://localhost:8080/baco/user/editCourseReport.do?courseCode=44&year=201617 --%>
-<link rel="stylesheet" href="<%=request.getContextPath()%>/js/jquery-ui-1.12.1/jquery-ui.css">
-<script src="<%=request.getContextPath()%>/js/jquery-ui-1.12.1/jquery-ui.min.js"></script>
-<link rel="stylesheet" href="<%=request.getContextPath()%>/css/flora-commons/flora.resizable.css">
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jspdf/1.3.2/jspdf.min.js"></script>
-<script>
-    function demoFromHTML() {
-        var pdf = new jsPDF('p', 'pt', 'letter');
-        // source can be HTML-formatted string, or a reference
-        // to an actual DOM element from which the text will be scraped.
-        source = $('#courseReportApp')[0];
-        // we support special element handlers. Register them with jQuery-style
-        // ID selector for either ID or node name. ("#iAmID", "div", "span" etc.)
-        // There is no support for any other type of selectors
-        // (class, of compound) at this time.
-        specialElementHandlers = {
-            // element with id of "bypass" - jQuery style selector
-            '#bypassme': function (element, renderer) {
-                // true = "handled elsewhere, bypass text extraction"
-                return true
-            }
-        };
-        margins = {
-            top: 80,
-            bottom: 60,
-            left: 40,
-            width: 522
-        };
-        // all coords and widths are in jsPDF instance's declared units
-        // 'inches' in this case
-        pdf.fromHTML(
-                source, // HTML string or DOM elem ref.
-                margins.left, // x coord
-                margins.top, { // y coord
-                    'width': margins.width, // max width of content on PDF
-                    'elementHandlers': specialElementHandlers
-                },
-                function (dispose) {
-                    // dispose: object with X, Y of the last line add to the PDF
-                    //          this allow the insertion of new lines after html
-                    //var pdfDocument =  pdf.save('Test.pdf');
-                    var pdfDocument = pdf.output();
-                    var boundary = '---------------------------';
-                    boundary += Math.floor(Math.random()*32768);
-                    boundary += Math.floor(Math.random()*32768);
-                    boundary += Math.floor(Math.random()*32768);
-                    var body = '';
-                    body += '--' + boundary + '\r\n' +
-                            'Content-Disposition: form-data; name="filesInputId-UPLOAD[]"; filename="20170530_210340.pdf"' + '\r\n';
-                    body += 'Content-Type: application/pdf';
-                    body += '\r\n\r\n';
-                    body += pdfDocument;
-                    body += '\r\n'
-                    body += '--' + boundary + '--';
-                    $.ajax({
-                        type: "POST",
-                        cache: false,
-                        url: "<%=request.getContextPath()%>/filesUpload",
-                        data: body ,
-                        processData: false,
-                        contentType : 'multipart/form-data; boundary=' + boundary,
-                        success: function (data) {
-                            alert('success');
-                            return false;
-                        }
-                    });
-                }, margins
-        );
-    }
-</script>
-<script>ping()</script>
-<jsp:useBean id="courseReportJson" type="java.lang.String" scope="request"/>
-<jsp:useBean id="course" type="pt.estgp.estgweb.domain.CourseImpl" scope="request"/>
-<%
-    //AbstractDao.getCurrentSession().beginTransaction();
-%>
-<%--<a href="javascript:demoFromHTML()" class="button">Run Code</a>--%>
-<div class="container-fluid">
-<style>
-    .separatorSection
-    {
-        border: 1px solid #ddd;
-    }
-</style>
-<!-- Apresentacao da Unidade -->
-<div class="panel panel-default">
-<div class="panel-heading">
-    Relatório Anual do curso: ${course.name}
-</div>
-<div class="panel-body">
-<p><b class="label-info">Tipo de Curso:</b> <bean:message key="course.${course.degree}"/></p>
-<p><b class="label-info">Ano Lectivo:</b> ${course.importYear}</p>
-<p><b class="label-info">Departamento:</b> ${course.department.name}</p>
-<p><b class="label-info">Escola:</b> ${course.department.courseSchool.name}</p>
-<script>
-    //Especifico da aplicacao
-    var courseReportApp = angular.module('courseReportApp', ['ui.tree']);
-    GLOBAL_BacoAngularAppDependencies.push('courseReportApp');
-    courseReportApp.directive('resizable', function () {
-        return {
-            restrict: 'A',
-            scope: {
-                callback: '&onResize'
-            },
-            link: function postLink(scope, elem, attrs) {
-                elem.resizable();
-                elem.on('resize', function (evt, ui, comp) {
-                    scope.$apply(function() {
-                        if (scope.callback) {
-                            scope.callback({$evt: evt, $ui: ui, $comp: comp });
-                        }
-                    })
-                });
-            }
-        };
-    });
-    courseReportApp.controller('courseReportAppController', function($scope)
-    {
-        $scope.docAppSelector = "#courseReportApp";
-        $scope.report = ${courseReportJson}
-                $scope.resize = function(evt,ui,comp) {
-                    //console.log (evt,ui);
-                    comp.width = ui.size.width;
-                    comp.height = ui.size.height;
-                }
-        /**
-         * @classe class to match
-         * @superClasses array of strings
-         * */
-        $scope.contains = function(obj,classe)
-        {
-            if(obj['@class'] && obj['@class'] == classe)
-                return true;
-            if(obj.allSuperClasses)
-            {
-                for(var i in obj.allSuperClasses)
-                {
-                    if(classe == obj.allSuperClasses[i])
-                        return true;
-                }
-            }
-            return false;
-        }
-        $scope.showSep = function(section,subSection)
-        {
-            var s;
-            for(s in section.sections)
-            {
-                section.sections[s].active = false;
-            }
-            /*$(".separatorSectionNav").each(function()
-             {
-             angular.element($(this)).scope().section.active = false;
-             });*/
-            subSection.active = true;
-        }
-        /**
-         * Este metodo devolve o template mais profundo na hierarquia de classes
-         * permitindo emular o override, quanto mais especifica for a classe
-         * e caso exista template é esse o template devolvido
-         * procura um script com o id da classe e se nao existir
-         * vai subindo nas super classes
-         * @param obj
-         * @returns {*}
-         */
-        $scope.class2id = function(obj)
-        {
-            var objClassId = obj["@class"].replaceAll(".","_");
-            if($("script#" + objClassId).length > 0)
-            {
-                return objClassId;
-            }
-            if(obj.allSuperClasses)
-            {
-                var s;
-                for(s in obj.allSuperClasses)
-                {
-                    var superClass = obj.allSuperClasses[s];
-                    var superClassId = superClass.replaceAll(".","_");
-                    if($("script#" + superClassId).length > 0)
-                    {
-                        return superClassId;
-                    }
-                }
-            }
-            return obj["@class"].replaceAll(".","_");
-        }
-        $scope.addText = function(parentCustomPane)
-        {
-            $scope.addSimpleDocComponent(parentCustomPane,"pt.estgp.estgweb.utils.documentBuilder.TextComponent")
-        }
-        $scope.addImage = function(parentCustomPane)
-        {
-            $scope.addSimpleDocComponent(parentCustomPane,"pt.estgp.estgweb.utils.documentBuilder.ImageComponent")
-        }
-        $scope.addSimpleDocComponent = function(parentCustomPane,classComponent)
-        {
-            if(!parentCustomPane.components)
-            {
-                parentCustomPane.components = [];
-            }
-            parentCustomPane.components.push(
-                    {
-                        "@class" : classComponent
-                    }
-            );
-        }
-        $scope.removeComponent = function(index,array)
-        {
-            array.splice(index,1);
-        }
-        $scope.callbackUploadedFiles = function(filesUploadResult,token,targetElement)
-        {
-            var modelObject = BacoAngularUtils.getAngularElementModel(targetElement);
-            if(modelObject.image && modelObject.image.identifier)
-            {
-                widgetCallWithActionParameters(
-                        "<%=request.getContextPath()%>/user/json/repository.do",
-                        "replaceRepositoryFileFromTempPrivateDomain",
-                        {
-                            "identifier" : modelObject.image.identifier,
-                            "fileUploaded" : BacoJS.stringifyOrdered(filesUploadResult.uploadedFiles[0])
-                        },
-                        "#courseReportApp",
-                        function(repositoryFile4JsonView)
-                        {
-                            modelObject.image = repositoryFile4JsonView;
-                            //image URL is generated on reimport just to avoid caching
-                            modelObject.imageUrl = "<%=request.getContextPath()%>/repositoryStream/" + modelObject.image.identifier + "?" + new Date().getTime();
-                            angular.element($("#courseReportApp")).scope().$apply();
-                        },
-                        function(){}
-                );
-            }
-            else
-            {
-                widgetCallWithActionParameters(
-                        "<%=request.getContextPath()%>/user/json/repository.do",
-                        "saveRepositoryFileFromTempPrivateDomain",
-                        {
-                            "fileUploaded" : BacoJS.stringifyOrdered(filesUploadResult.uploadedFiles[0])
-                        },
-                        "#courseReportApp",
-                        function(repositoryFile4JsonView)
-                        {
-                            modelObject.image = repositoryFile4JsonView;
-                            modelObject.imageUrl = "<%=request.getContextPath()%>/repositoryStream/" + modelObject.image.identifier + "?" + new Date().getTime();
-                            angular.element($("#courseReportApp")).scope().$apply();
-                        },
-                        function(){}
-                );
-            }
-        }
-        $scope.saveCourseReportDocument = function () {
-            widgetCallWithActionParameters(
-                "<%=request.getContextPath()%>/user/courseReport.do",
-                "saveCourseReportDocument",
-                {
-                    "courseReportDocument" : BacoJS.stringifyOrdered($scope.report)
-                },
-                "#courseReportApp",
-                function(data)
-                {
-                    alert(BacoJS.stringifyOrdered(data));
-                },
-                function(){}
-            );
-        }
-    });
-</script>
-<!--TEMPLATES FOR DOCUMENT BUILDER-->
-<jsp:include page="../utils/documentsBuilder.jsp"/>
+<jsp:include page="../utils/reportEdit.jsp"/>
 <jsp:include page="coursereport/templates.jsp"/>
-<div class="form-vertical">
-    <div id="courseReportApp" ng-app="courseReportApp" ng-controller="courseReportAppController">
-        <div class="web-messages"></div>
-        <button class="btn btn-success" ng-click="saveCourseReportDocument()">Gravar</button>
-        <div ng-init="section=report;" ng-include="'pt_estgp_estgweb_utils_documentBuilder_DocumentSection'">
-        </div>
-        <!--<pre class="code">{{ report | json }}</pre>-->
-    </div><!--App-->
-</div> <!--form-->
-</div><!--Panel Body-->
-</div><!--Panel-->
-</div><!--container-fluid-->
-<%
-    //AbstractDao.getCurrentSession().getTransaction().commit();
-%>

 /branches/grupo2/impl/src/web/user/utils/reportEdit.jsp
 New file
 ,0 → 1,357
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page import="jomm.dao.impl.AbstractDao" %>
+<%@ page import="pt.estgp.estgweb.domain.CourseImpl" %>
+<%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory" %>
+<%@ page import="pt.utl.ist.berserk.logic.serviceManager.IServiceManager" %>
+<%@ page import="pt.utl.ist.berserk.logic.serviceManager.ServiceManager" %>
+<%@ page import="pt.estgp.estgweb.web.utils.RequestUtils" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %>
+<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
+<%@ taglib prefix="t" tagdir="/WEB-INF/tags" %>
+<%-- http://localhost:8080/baco/user/editCourseReport.do?courseCode=44&year=201617 --%>
+<link rel="stylesheet" href="<%=request.getContextPath()%>/js/jquery-ui-1.12.1/jquery-ui.css">
+<script src="<%=request.getContextPath()%>/js/jquery-ui-1.12.1/jquery-ui.min.js"></script>
+<link rel="stylesheet" href="<%=request.getContextPath()%>/css/flora-commons/flora.resizable.css">
+<!--<script src="https://cdnjs.cloudflare.com/ajax/libs/jspdf/1.3.2/jspdf.min.js"></script>-->
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jspdf/1.3.5/jspdf.debug.js"></script>
+<script>
+    function demoFromHTML() {
+        var pdf = new jsPDF('p', 'pt', 'letter');
+        // source can be HTML-formatted string, or a reference
+        // to an actual DOM element from which the text will be scraped.
+        source = $('#courseReportApp')[0];
+        // we support special element handlers. Register them with jQuery-style
+        // ID selector for either ID or node name. ("#iAmID", "div", "span" etc.)
+        // There is no support for any other type of selectors
+        // (class, of compound) at this time.
+        specialElementHandlers = {
+            // element with id of "bypass" - jQuery style selector
+            '#bypassme': function (element, renderer) {
+                // true = "handled elsewhere, bypass text extraction"
+                return true
+            }
+        };
+        margins = {
+            top: 80,
+            bottom: 60,
+            left: 40,
+            width: 522
+        };
+        // all coords and widths are in jsPDF instance's declared units
+        // 'inches' in this case
+        pdf.fromHTML(
+            source, // HTML string or DOM elem ref.
+            margins.left, // x coord
+            margins.top, { // y coord
+                'width': margins.width, // max width of content on PDF
+                'elementHandlers': specialElementHandlers
+            },
+            function (dispose) {
+                // dispose: object with X, Y of the last line add to the PDF
+                //          this allow the insertion of new lines after html
+                var pdfDocument =  pdf.save('Test.pdf');
+                /*var pdfDocument = pdf.output();
+                var boundary = '---------------------------';
+                boundary += Math.floor(Math.random()*32768);
+                boundary += Math.floor(Math.random()*32768);
+                boundary += Math.floor(Math.random()*32768);
+                var body = '';
+                body += '--' + boundary + '\r\n' +
+                    'Content-Disposition: form-data; name="filesInputId-UPLOAD[]"; filename="20170530_210340.pdf"' + '\r\n';
+                body += 'Content-Type: application/pdf';
+                body += '\r\n\r\n';
+                body += pdfDocument;
+                body += '\r\n'
+                body += '--' + boundary + '--';
+                $.ajax({
+                    type: "POST",
+                    cache: false,
+                    url: "<%=request.getContextPath()%>/filesUpload",
+                    data: body ,
+                    processData: false,
+                    contentType : 'multipart/form-data; boundary=' + boundary,
+                    success: function (data) {
+                        alert('success');
+                        return false;
+                    }
+                });*/
+            }, margins
+        );
+    }
+</script>
+<script>ping()</script>
+<jsp:useBean id="courseReportJson" type="java.lang.String" scope="request"/>
+<jsp:useBean id="course" type="pt.estgp.estgweb.domain.CourseImpl" scope="request"/>
+<%
+    //AbstractDao.getCurrentSession().beginTransaction();
+%>
+<%--<a href="javascript:demoFromHTML()" class="button">Run Code</a>--%>
+<div class="container-fluid">
+    <style>
+        .separatorSection
+        {
+            border: 1px solid #ddd;
+        }
+    </style>
+    <!-- Apresentacao da Unidade -->
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            Relatório Anual do curso: ${course.name}
+        </div>
+        <div class="panel-body">
+            <p><b class="label-info">Tipo de Curso:</b> <bean:message key="course.${course.degree}"/></p>
+            <p><b class="label-info">Ano Lectivo:</b> ${course.importYear}</p>
+            <p><b class="label-info">Departamento:</b> ${course.department.name}</p>
+            <p><b class="label-info">Escola:</b> ${course.department.courseSchool.name}</p>
+            <script>
+                //Especifico da aplicacao
+                var courseReportApp = angular.module('courseReportApp', ['ui.tree']);
+                GLOBAL_BacoAngularAppDependencies.push('courseReportApp');
+                courseReportApp.directive('resizable', function () {
+                    return {
+                        restrict: 'A',
+                        scope: {
+                            callback: '&onResize'
+                        },
+                        link: function postLink(scope, elem, attrs) {
+                            elem.resizable();
+                            elem.on('resize', function (evt, ui, comp) {
+                                scope.$apply(function() {
+                                    if (scope.callback) {
+                                        scope.callback({$evt: evt, $ui: ui, $comp: comp });
+                                    }
+                                })
+                            });
+                        }
+                    };
+                });
+                courseReportApp.controller('courseReportAppController', function($scope)
+                {
+                    $scope.docAppSelector = "#courseReportApp";
+                    $scope.report = ${courseReportJson}
+                        $scope.resize = function(evt,ui,comp) {
+                            //console.log (evt,ui);
+                            comp.width = ui.size.width;
+                            comp.height = ui.size.height;
+                        }
+                    /**
+                     * @classe class to match
+                     * @superClasses array of strings
+                     * */
+                    $scope.contains = function(obj,classe)
+                    {
+                        if(obj['@class'] && obj['@class'] == classe)
+                            return true;
+                        if(obj.allSuperClasses)
+                        {
+                            for(var i in obj.allSuperClasses)
+                            {
+                                if(classe == obj.allSuperClasses[i])
+                                    return true;
+                            }
+                        }
+                        return false;
+                    }
+                    $scope.showSep = function(section,subSection)
+                    {
+                        var s;
+                        for(s in section.sections)
+                        {
+                            section.sections[s].active = false;
+                        }
+                        /*$(".separatorSectionNav").each(function()
+                         {
+                         angular.element($(this)).scope().section.active = false;
+                         });*/
+                        subSection.active = true;
+                    }
+                    /**
+                     * Este metodo devolve o template mais profundo na hierarquia de classes
+                     * permitindo emular o override, quanto mais especifica for a classe
+                     * e caso exista template é esse o template devolvido
+                     * procura um script com o id da classe e se nao existir
+                     * vai subindo nas super classes
+                     * @param obj
+                     * @returns {*}
+                     */
+                    $scope.class2id = function(obj)
+                    {
+                        var objClassId = obj["@class"].replaceAll(".","_");
+                        if($("script#" + objClassId).length > 0)
+                        {
+                            return objClassId;
+                        }
+                        if(obj.allSuperClasses)
+                        {
+                            var s;
+                            for(s in obj.allSuperClasses)
+                            {
+                                var superClass = obj.allSuperClasses[s];
+                                var superClassId = superClass.replaceAll(".","_");
+                                if($("script#" + superClassId).length > 0)
+                                {
+                                    return superClassId;
+                                }
+                            }
+                        }
+                        return obj["@class"].replaceAll(".","_");
+                    }
+                    $scope.addText = function(parentCustomPane)
+                    {
+                        $scope.addSimpleDocComponent(parentCustomPane,"pt.estgp.estgweb.utils.documentBuilder.TextComponent")
+                    }
+                    $scope.addImage = function(parentCustomPane)
+                    {
+                        $scope.addSimpleDocComponent(parentCustomPane,"pt.estgp.estgweb.utils.documentBuilder.ImageComponent")
+                    }
+                    $scope.addSimpleDocComponent = function(parentCustomPane,classComponent)
+                    {
+                        if(!parentCustomPane.components)
+                        {
+                            parentCustomPane.components = [];
+                        }
+                        parentCustomPane.components.push(
+                            {
+                                "@class" : classComponent
+                            }
+                        );
+                    }
+                    $scope.removeComponent = function(index,array)
+                    {
+                        array.splice(index,1);
+                    }
+                    $scope.callbackUploadedFiles = function(filesUploadResult,token,targetElement)
+                    {
+                        var modelObject = BacoAngularUtils.getAngularElementModel(targetElement);
+                        if(modelObject.image && modelObject.image.identifier)
+                        {
+                            widgetCallWithActionParameters(
+                                "<%=request.getContextPath()%>/user/json/repository.do",
+                                "replaceRepositoryFileFromTempPrivateDomain",
+                                {
+                                    "identifier" : modelObject.image.identifier,
+                                    "fileUploaded" : BacoJS.stringifyOrdered(filesUploadResult.uploadedFiles[0])
+                                },
+                                "#courseReportApp",
+                                function(repositoryFile4JsonView)
+                                {
+                                    modelObject.image = repositoryFile4JsonView;
+                                    //image URL is generated on reimport just to avoid caching
+                                    modelObject.imageUrl = "<%=request.getContextPath()%>/repositoryStream/" + modelObject.image.identifier + "?" + new Date().getTime();
+                                    angular.element($("#courseReportApp")).scope().$apply();
+                                },
+                                function(){}
+                            );
+                        }
+                        else
+                        {
+                            widgetCallWithActionParameters(
+                                "<%=request.getContextPath()%>/user/json/repository.do",
+                                "saveRepositoryFileFromTempPrivateDomain",
+                                {
+                                    "fileUploaded" : BacoJS.stringifyOrdered(filesUploadResult.uploadedFiles[0])
+                                },
+                                "#courseReportApp",
+                                function(repositoryFile4JsonView)
+                                {
+                                    modelObject.image = repositoryFile4JsonView;
+                                    modelObject.imageUrl = "<%=request.getContextPath()%>/repositoryStream/" + modelObject.image.identifier + "?" + new Date().getTime();
+                                    angular.element($("#courseReportApp")).scope().$apply();
+                                },
+                                function(){}
+                            );
+                        }
+                    }
+                    $scope.saveCourseReportDocument = function () {
+                        widgetCallWithActionParameters(
+                            "<%=request.getContextPath()%>/user/courseReport.do",
+                            "saveCourseReportDocument",
+                            {
+                                "courseReportDocument" : BacoJS.stringifyOrdered($scope.report)
+                            },
+                            "#courseReportApp",
+                            function(data)
+                            {
+                                alert(BacoJS.stringifyOrdered(data));
+                            },
+                            function(){}
+                        );
+                    }
+                });
+            </script>
+            <!--TEMPLATES FOR DOCUMENT BUILDER-->
+            <jsp:include page="documentsBuilder.jsp"/>
+            <div class="form-vertical">
+                <div id="courseReportApp" ng-app="courseReportApp" ng-controller="courseReportAppController">
+                    <div class="web-messages"></div>
+                    <button class="btn btn-success" ng-click="saveCourseReportDocument()">Gravar</button>
+                    <button class="btn btn-success" onclick="demoFromHTML()">PDF</button>
+                    <div ng-init="section=report;" ng-include="'pt_estgp_estgweb_utils_documentBuilder_DocumentSection'">
+                    </div>
+                    <!--<pre class="code">{{ report | json }}</pre>-->
+                </div><!--App-->
+            </div> <!--form-->
+        </div><!--Panel Body-->
+    </div><!--Panel-->
+</div><!--container-fluid-->
+<%
+    //AbstractDao.getCurrentSession().getTransaction().commit();
+%>

Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1925 → Rev 1928