WebSVN - bacoAlunos - Path Comparison - / Rev 124 and / Rev 129

Ignore whitespace Rev 124 → Rev 129

 /impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportStudentService.java
 ,8 → 2,23
 import org.apache.log4j.Logger;
 import pt.estgp.estgweb.services.expceptions.ServiceException;
+import pt.estgp.estgweb.Globals;
+import pt.estgp.estgweb.domain.Student;
+import pt.estgp.estgweb.domain.DomainObjectFactory;
+import pt.estgp.estgweb.domain.CourseUnit;
+import pt.estgp.estgweb.domain.dao.DaoFactory;
 import pt.utl.ist.berserk.logic.serviceManager.IService;
+import pt.ipportalegre.siges.web.services.SiGesWEB;
+import pt.ipportalegre.siges.web.services.ArrayOfDecimal;
+import pt.ipportalegre.siges.web.services.Aluno;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Set;
+import java.util.HashSet;
+import jomm.dao.impl.AbstractDao;
 /**
  * @author Jorge Machado
  * @date 11/May/2008
 ,11 → 31,78
     private static final Logger logger = Logger.getLogger(ImportStudentService.class);
     public void run() throws ServiceException {
+            //todo passar para um utilitario que cria automaticamente o ano lectivo
+        String year = "200708";
+        SiGesWEB service = new SiGesWEB();
+        ArrayOfDecimal codigosAlunos = service.getSiGesWEBSoap().getCodigosAlunosInscritosDaInstituicao(Globals.SIGES_INSTITUTION_CODE,year);
+        List<BigDecimal> codigos = codigosAlunos.getDecimal();
+        for(BigDecimal c: codigos)
+        {
+            Aluno d = service.getSiGesWEBSoap().getAlunoInscrito(c,Globals.SIGES_INSTITUTION_CODE,year);
+            Student t = DaoFactory.getStudentDaoImpl().loadBySigesCode(d.getCodigo().intValue());
+            if(t == null)
+            {
+                t = DomainObjectFactory.createStudentImpl();
+                DaoFactory.getStudentDaoImpl().save(t);
+            }
+            persist(d,t);
+        }
+    }
+    /**
+     * Nao esta testado
+     * jm
+     * @param d Aluno
+     * @param t Student
+     */
+    private void persist(Aluno d, Student t)
+    {
+        t.setName(d.getNome());
+        t.setEmail(d.getEmail());
+        t.setSigesCode(d.getCodigo().intValue());
+        t.setAddress(d.getMorada());
+        t.setZip(""+d.getCodigoPostal().intValue());
+        t.setBi(d.getNumeroBi());
+        t.setSex(d.getSexo());
+        t.setUserNameNetpa(d.getUsernameNetpa());
+        t.setBirthDate(d.getDataNascimento().toGregorianCalendar().getTime());
+        /*Desta forma as relacoes antigas sao ignoradas cria-se uma lista nova e atribui-se ao Teacher, o Hibernate faz resto e apaga as chaves estrangeiras antigas
+        if(d.getDisciplinas() == null || d.getDisciplinas().getDecimal() == null || d.getDisciplinas().getDecimal().size() == 0)
+            logger.warn("ATENTION TEACHER WITH ZERO UNITS: codigoFuncionario " + d.getCodigoFuncionario());
+        else
+        {
+            Set<CourseUnit> units = new HashSet<CourseUnit>();
+            for(BigDecimal unitCode: d.getDisciplinas().getDecimal())
+            {
+                List<CourseUnit> l = DaoFactory.getCourseUnitDaoImpl().loadBySigesCode("" + unitCode.intValue());
+                if(l != null)
+                    units.addAll(l);
+                else
+                    logger.warn("ATENTION SIGES COURSE UNIT NOT FOUND IN BACO STORAGE: curseUnit " + unitCode.intValue());
+            }
+            t.setSubscribedUnits();Units(units);
+        }
     }
+    /**
+     * Testar por aqui poi requer Super Role e assim e' autmatico
+     * @param args of main
+     * @throws ServiceException on error
+    public static void main(String[]args) throws ServiceException
+    {
+        AbstractDao.getCurrentSession().beginTransaction();
+        new ImportStudentService().run();
+        AbstractDao.getCurrentSession().getTransaction().commit();
+    }
+      */
+}
-}
+    }

 /impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportTeachersService.java
 ,9 → 71,9
             Set<CourseUnit> units = new HashSet<CourseUnit>();
             for(BigDecimal unitCode: d.getDisciplinas().getDecimal())
             {
-                CourseUnit c = DaoFactory.getCourseUnitDaoImpl().loadBySigesCode("" + unitCode.intValue());
-                if(c != null)
-                    units.add(c);
+                List<CourseUnit> l = DaoFactory.getCourseUnitDaoImpl().loadBySigesCode("" + unitCode.intValue());
+                if(l != null)
+                    units.addAll(l);
                 else
                     logger.warn("ATENTION SIGES COURSE UNIT NOT FOUND IN BACO STORAGE: curseUnit " + unitCode.intValue());
             }

 /impl/src/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitDaoImpl.java
 ,6 → 3,9
 import pt.estgp.estgweb.domain.CourseUnit;
 import static org.hibernate.criterion.Restrictions.*;
+import java.util.List;
+import java.util.Set;
 /**
  * @author Jorge Machado
  * @date 28/Fev/2008
 ,9 → 26,9
         return (CourseUnitDaoImpl) myInstance;
     }
-    public CourseUnit loadBySigesCode(String sigesCode)
+    public List<CourseUnit> loadBySigesCode(String sigesCode)
     {
-        return (CourseUnit) createCriteria().add(eq("code",sigesCode)).uniqueResult();
+        return  createCriteria().add(eq("code",sigesCode)).list();
     }
 }

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

 /impl/src/hbm/pt/estgp/estgweb/domain/CourseUnit.hbm.xml
 ,7 → 21,7
         <property name="courseYear" type="string" />
         <property name="institutionCode" type="string" />
         <property name="status" type="boolean" />
+        <many-to-one name="courseunit" class="pt.estgp.estgweb.domain.CourseUnit" lazy="false" outer-join="true"/>
         <subclass name="pt.estgp.estgweb.domain.CourseUnitImpl" discriminator-value="CourseUnitImpl"/>
     </class>
 </hibernate-mapping>

/impl/gen/java/pt/estgp/estgweb/domain/Course.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 16:00:41 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/CourseUnit.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 16:00:41 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/UrlStatMonth.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 16:00:41 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/UrlStatDayId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 16:00:41 by Hibernate Tools 3.2.0.b9

/impl/gen/java/pt/estgp/estgweb/domain/SessionObject.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 16:00:41 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/GenericUser.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 16:00:41 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/Teacher.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 16:00:41 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/User.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 16:00:41 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/UrlStatYear.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 16:00:41 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/UrlStatMonthId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 16:00:41 by Hibernate Tools 3.2.0.b9

/impl/gen/java/pt/estgp/estgweb/domain/UserSession.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 16:00:41 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/Image.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 16:00:41 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/GenericUserDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 15:20:17 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/TeacherDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 15:20:17 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UserDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 15:20:17 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatYearDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 15:20:17 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatMonthIdDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 15:20:17 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UserSessionDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 15:20:17 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ImageDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 15:20:17 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BlogDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 15:20:17 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/TesteDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 15:20:17 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/StudentDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 15:20:17 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SessionObjectIdDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 15:20:17 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BlogPostDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 15:20:17 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/AnnouncementDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 15:20:17 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUserAssociationDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 15:20:17 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/GroupDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 15:20:17 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatDayDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 15:20:17 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatYearIdDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 15:20:17 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 15:20:17 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 15:20:17 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 15:20:17 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatMonthDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 15:20:17 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatDayIdDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 15:20:17 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SessionObjectDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 15:20:17 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/Blog.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 16:00:41 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/Teste.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 16:00:41 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/Student.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 16:00:41 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/SessionObjectId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 16:00:41 by Hibernate Tools 3.2.0.b9

/impl/gen/java/pt/estgp/estgweb/domain/BlogPost.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 16:00:41 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/Announcement.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 16:00:41 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/UrlStatDay.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 16:00:41 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/Group.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 16:00:41 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/CourseUserAssociation.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 16:00:41 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/UrlStatYearId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 16:00:41 by Hibernate Tools 3.2.0.b9

/impl/gen/java/pt/estgp/estgweb/domain/UrlStat.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 16:00:41 by Hibernate Tools 3.2.0.b9


import java.util.Date;

Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 124 → Rev 129