Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1250 → Rev 1253

/impl/importRoutines.xml
52,7 → 52,9
 
<!-- JOB RUNNER -->
<target name="jobs">
<java classname="pt.estgp.estgweb.services.jobs.JobDeamon" classpath="${build.dir.classes}" classpathref="pathToToolsLib"/>
<java classname="pt.estgp.estgweb.services.jobs.JobDeamon" classpath="${build.dir.classes}" classpathref="pathToToolsLib" fork="true">
<jvmarg value="-Djava.security.egd=file:/dev/urandom"/>
</java>
</target>
 
 
/impl/src/java/pt/estgp/estgweb/services/sigesimports/oracle/dao/DocenteDao.java
42,16 → 42,11
Connection conn = getCurrentConnection();
 
//NOVO DESDE A ALTERACAO DO SIGES
 
System.out.println("Loading Funcionario");
PreparedStatement catCMD = conn.prepareStatement("SELECT * FROM CSP.T_FUNCIONARIOS INNER JOIN SIGES.T_INDIVIDUO on SIGES.T_INDIVIDUO.ID_INDIVIDUO = CSP.T_FUNCIONARIOS.ID_INDIVIDUO where " + getIdColumn() + "=" + codigo);
ResultSet aReader = catCMD.executeQuery();
if (aReader.next()) {
System.out.println("Loaded");
Docente c = load(aReader);
System.out.println("Loading disciplinas");
c.disciplinas = loadDisciplinasDosDocentes(codigo, codigoInstituicao, ano);
System.out.println("Loaded");
catCMD.close();
aReader.close();
conn.close();
/impl/src/java/pt/estgp/estgweb/services/sigesimports/oracle/domain/Disciplina.java
105,4 → 105,22
public Integer getCdTipologia() {
return cdTipologia;
}
 
@Override
public String toString() {
return "Disciplina{" +
"codigo=" + codigo +
", cdLectivo='" + cdLectivo + '\'' +
", codigoCurso=" + codigoCurso +
", cdDuracao='" + cdDuracao + '\'' +
", codigoInstituicao=" + codigoInstituicao +
", cdTurma='" + cdTurma + '\'' +
", nome='" + nome + '\'' +
", nomeCurso='" + nomeCurso + '\'' +
", grauCurso='" + grauCurso + '\'' +
", cdTipoDisciplina=" + cdTipoDisciplina +
", codigoFuncaoDocente=" + codigoFuncaoDocente +
", cdTipologia=" + cdTipologia +
'}';
}
}
/impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportTeachersService.java
112,11 → 112,13
}
 
 
logger.info("Starting import Funcionario Importado: SIGES:" + c);
logger.info("Starting import Funcionario: SIGES:" + c);
//Docente d = service.getSiGesWEBSoap().getDocente(c, new BigDecimal(DaoFactory.getConfigurationDaoImpl().getSigesInstitutionCode()), year);
Docente d = DocenteDao.getInstance().load(c, DaoFactory.getConfigurationDaoImpl().getSigesInstitutionCode(), year);
logger.info("Codigo Funcionario Importado: SIGES(" + d.getCodigoFuncionario().intValue() + ") email IPP SIGES: " + d.getEmail());
serviceLogInfo("Codigo Funcionario Importado: SIGES(" + d.getCodigoFuncionario().intValue() + ") email IPP SIGES: " + d.getEmail());
logger.info("SIGES IMPORTED INFO: " + docenteToString(d));
serviceLogInfo("SIGES IMPORTED INFO: " + docenteToString(d));
Teacher t = DaoFactory.getTeacherDaoImpl().loadBySigesCode(d.getCodigoFuncionario().intValue());
boolean newUser = false;
if (t == null)