| /branches/v3/impl/conf/log4j.properties |
|---|
| 19,6 → 19,14 |
| log4j.appender.hibernate=HibernateAppender |
| log4j.appender.hibernate.sessionServiceClass=HibernateHelper |
| log4j.appender.hibernate.loggingEventClass=LogEvent |
| #log4j.logger.org.hibernate=INFO, hb |
| #log4j.logger.org.hibernate.SQL=DEBUG |
| #log4j.logger.org.hibernate.type=TRACE |
| #log4j.logger.org.hibernate.hql.ast.AST=info |
| #log4j.logger.org.hibernate.tool.hbm2ddl=warn |
| #log4j.logger.org.hibernate.hql=debug |
| #log4j.logger.org.hibernate.cache=info |
| #log4j.logger.org.hibernate.jdbc=debug |
| # suppress warnings from the SessionImpl (like Narrowing proxy to class com.atlassian.confluence.pages.Page - this operation breaks ==) |
| log4j.logger.org.hibernate.engine.StatefulPersistenceContext.ProxyWarnLog=FATAL |
| /branches/v3/impl/src/java/pt/estgp/estgweb/services/questionarios/pedagogico/UpdateCoursesAndUnitsJobService.java |
|---|
| 281,6 → 281,8 |
| { |
| String msg; |
| QuestionarioPedagogicoCursoAfetoImpl cursoAfeto = null; |
| //todo fazer aqui um teste a ver se na lista de unidades found vem as unidades do curso afeto |
| //reativar o set e testar isso |
| List<QuestionarioPedagogicoCursoAfeto> cursosFound = DaoFactory.getQuestionarioPedagogicoCursoAfetoDaoImpl().find(q.getId(),c.getCode()); |
| if(cursosFound != null && cursosFound.size() > 1) |
| { |
| 307,6 → 309,7 |
| logger.info(msg); |
| cursoAfeto = DomainObjectFactory.createQuestionarioPedagogicoCursoAfeto(); |
| DaoFactory.getQuestionarioPedagogicoCursoAfetoDaoImpl().save(cursoAfeto); |
| cursoAfeto.setUnidadesAfetas(new HashSet<QuestionarioPedagogicoUnidadeCurricularAfeta>()); |
| } |
| cursoAfeto.resetStats(); |
| 317,10 → 320,10 |
| cursoAfeto.setNome(c.getName()); |
| cursoAfeto.setQuestionario(q); |
| cursoAfeto.setSemestre(q.getSemestre()); |
| cursoAfeto.setUnidadesAfetas(new HashSet<QuestionarioPedagogicoUnidadeCurricularAfeta>()); |
| List<String> newUnitCodesList = new ArrayList<String>(); |
| int countUnits = 0; |
| List<CourseUnitDaoImpl.CourseUnitResult> results = DaoFactory.getCourseUnitDaoImpl().loadCourseUnits(c.getId(), q.getSemestre(), q.getYear()); |
| /branches/v3/impl/src/java/pt/estgp/estgweb/domain/dao/impl/QuestionarioPedagogicoUnidadeCurricularAfetaDaoImpl.java |
|---|
| 1,11 → 1,10 |
| package pt.estgp.estgweb.domain.dao.impl; |
| import org.hibernate.Query; |
| import pt.estgp.estgweb.domain.QuestionarioPedagogicoUnidadeCurricularAfeta; |
| import java.util.List; |
| import static org.hibernate.criterion.Restrictions.eq; |
| /** |
| * Created by jorgemachado on 24/03/16. |
| */ |
| 20,11 → 19,22 |
| public List<QuestionarioPedagogicoUnidadeCurricularAfeta> find(long questionarioId, String cursoCode,String codeUnidade) |
| {//pt.estgp.estgweb.domain.dao.DaoFactory.getQuestionarioPedagogicoUnidadeCurricularAfetaDaoImpl().getCurrentSession().createCriteria(QuestionarioPedagogicoUnidadeCurricularAfeta.class).add(eq("cursoAfeto.id","1")).list() |
| //add(eq("cuA.questionario.id", new Long(20))).add(eq("codigoUnidade","209535")).add(eq("cuA.codigoCurso","9119")) |
| Query q = getCurrentSession().createQuery("select c from c in class " + QuestionarioPedagogicoUnidadeCurricularAfeta.class.getName() + " " + |
| " join c.cursoAfeto as curso " + |
| "where curso.questionario.id = :questionarioId and curso.codigoCurso = :codigoCurso" + |
| " and c.codigoUnidade = :codigoUnidade"); |
| q.setLong("questionarioId", questionarioId); |
| q.setString("codigoCurso", cursoCode); |
| q.setString("codigoUnidade",codeUnidade); |
| return q.list(); |
| /*DaoFactory.getCourseDaoImpl() |
| return createCriteria() |
| .createAlias("cursoAfeto","cuA") |
| .add(eq("cuA.questionario.id", questionarioId)) |
| .add(eq("codigoUnidade",codeUnidade)) |
| .add(eq("cuA.codigoCurso",cursoCode)) |
| .list(); |
| .list();*/ |
| } |
| } |
| /branches/v3/impl/src/hbm/pt/estgp/estgweb/domain/Questionarios.hbm.xml |
|---|
| 423,8 → 423,8 |
| <property name="obs" type="string"/> |
| <many-to-one name="questionario" class="pt.estgp.estgweb.domain.Questionario" lazy="proxy" outer-join="false"/> |
| <many-to-one name="course" class="pt.estgp.estgweb.domain.Course" lazy="proxy" outer-join="false"/> |
| <set name="unidadesAfetas" cascade="delete" lazy="true" order-by="id asc"> |
| <key column="cursoAfeto"/> |
| <set name="unidadesAfetas" lazy="true"> |
| <key column="curso_afeto"/> |
| <one-to-many class="pt.estgp.estgweb.domain.QuestionarioPedagogicoUnidadeCurricularAfeta" /> |
| </set> |
| <subclass name="pt.estgp.estgweb.domain.QuestionarioPedagogicoCursoAfetoImpl" discriminator-value="QuestionarioPedagogicoCursoAfetoImpl"/> |
| 458,7 → 458,7 |
| <property name="tipologiasJson" type="text"> |
| <column name="tipologias_json" sql-type="MEDIUMTEXT"/> |
| </property> |
| <many-to-one name="cursoAfeto" class="pt.estgp.estgweb.domain.QuestionarioPedagogicoCursoAfeto" lazy="proxy" outer-join="false"/> |
| <many-to-one name="cursoAfeto" class="pt.estgp.estgweb.domain.QuestionarioPedagogicoCursoAfeto" lazy="proxy" outer-join="false" column="curso_afeto"/> |
| <many-to-one name="courseUnit" class="pt.estgp.estgweb.domain.CourseUnit" lazy="proxy" outer-join="false"/> |
| <subclass name="pt.estgp.estgweb.domain.QuestionarioPedagogicoUnidadeCurricularAfetaImpl" discriminator-value="QuestionarioPedagogicoUnidadeCurricularAfetaImpl"/> |
| </class> |
| /branches/v3/impl/src/web/admin/configuration/taskLog.jsp |
|---|
| 91,6 → 91,14 |
| </script> |
| <script> |
| /****START PROGRESS BAR*******/ |
| $(document).ready(function(){ |
| updateStatus(); |
| }); |
| /****************************/ |
| var startStatus = ""; |
| function updateStatus() |
| { |