Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1692 → Rev 1693

/branches/v3/impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportCourseService.java
38,6 → 38,8
 
private CoursesService coursesService = new CoursesService();
 
int departmentsAleatorios = 0;
int departmentsNaoEncontrados = 0;
int newUnits = 0;
int newCourses = 0;
int unitsRepeated = 0;
132,6 → 134,28
serviceLogInfo("New Course Found: (" + d.getCodigoCurso() + ") " + d.getNomeCurso());
// DaoFactory.getCourseDaoImpl().save(c);
}
if(c.getCourseDepartment() == null)
{
String msg = "Tentando encontrar um departamento, vai associar um qualquer departamento da escola do curso";
serviceLogWarn(msg);
logger.warn(msg);
List<CourseDepartment> departments = DaoFactory.getCourseDepartmentDaoImpl().findActives(d.getCodigoInstituicao().intValue() + "");
if(departments!= null && departments.size() > 0)
{
//usa-se a area que é a assumida pela CourseView para persistir o Departamento do Curso no serviço de submitCourse
c.setArea(departments.get(0).getSigla());
departmentsAleatorios++;
sendNotificationAdmin("ATENCAO UM CURSO NOVO NO SISTEMA NECESSITA DE CONFIRMACAO DE DEPARTAMENTO : " + d.getNomeCurso() + " : " + d.getCodigoCurso(),"NECESSITA DE CONFIRMACAO DE DEPARTAMENTO : " + d.getNomeCurso() + " : " + d.getCodigoCurso() + " foi atribuido ao departamento: " + departments.get(0).getName() + " da " + departments.get(0).getCourseSchool().getName());
}
else
{
departmentsNaoEncontrados++;
msg = "Não foram encontrados quaisquer departamentos para a escola com ID = " + institutionCode;
serviceLogWarn(msg);
logger.warn(msg);
sendNotificationAdmin("ATENCAO UM CURSO NOVO NAO FOI ENCOTRADA ESCOLA COM O CODIGO OBTIDO : " + d.getNomeCurso() + " : " + d.getCodigoCurso(),"NECESSITA DE CONFIRMACAO DE DEPARTAMENTO : " + d.getNomeCurso() + " : " + d.getCodigoCurso() + " codigo de instituicao nao encontrado: " + d.getCodigoInstituicao());
}
}
c.setName(d.getNomeCurso());
if(d.getGrauCurso() == null || d.getGrauCurso().trim().length() == 0)
d.setGrauCurso("unknown");
140,7 → 164,7
c.setDegree(grauBaco);
c.setCode("" + d.getCodigoCurso().intValue());
c.setImportYear(year);
c.setInstitutionalCode("" + d.getCodigoInstituicao().intValue());
 
coursesService.submitCourse(c,null,null,0,null,null);
}
 
159,6 → 183,10
 
serviceLogInfo("######################################");
serviceLogInfo("######################################");
if(departmentsAleatorios > 0)
serviceLogInfo("#!!!!!!!!!!!!!Departamentos atribuidos aleatoriamente : " + departmentsAleatorios);
if(departmentsNaoEncontrados > 0)
serviceLogInfo("#!!!!!!!!!!!!!Departamentos nao encontrados : " + departmentsNaoEncontrados);
serviceLogInfo("#Courses Imported:" + cursosMap.size());
serviceLogInfo("#Units Imported S1:" + disciplinasMapS1.size());
serviceLogInfo("#Units Imported S2:" + disciplinasMapS2.size());
183,6 → 211,10
 
logger.info("######################################");
logger.info("######################################");
if(departmentsAleatorios > 0)
logger.info("#!!!!!!!!!!!!!Departamentos atribuidos aleatoriamente : " + departmentsAleatorios);
if(departmentsNaoEncontrados > 0)
logger.info("#!!!!!!!!!!!!!Departamentos nao encontrados : " + departmentsNaoEncontrados);
logger.info("#Courses Imported:" + cursosMap.size());
logger.info("#Units Imported S1:" + disciplinasMapS1.size());
logger.info("#Units Imported S2:" + disciplinasMapS2.size());
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/dao/impl/CourseDepartmentDaoImpl.java
42,4 → 42,6
add(eq("active", true)).add(eq("sc.institutionalCode",institutionalCode)).list();
}
 
 
 
}
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/views/CourseView.java
221,12 → 221,17
}
c.setCode(code);
// c.setArea(area);
CourseDepartment department = DaoFactory.getCourseDepartmentDaoImpl().findBySigla(area);
if(department != null)
 
if(area != null && area.trim().length() > 0)
{
c.setDepartment(department);
//if(department != null)
//c.setInstitutionalCode(department.getCourseSchool().getInstitutionalCode());
//caso contrario nao meche no departamento
CourseDepartment department = DaoFactory.getCourseDepartmentDaoImpl().findBySigla(area);
if(department != null)
{
c.setDepartment(department);
//if(department != null)
//c.setInstitutionalCode(department.getCourseSchool().getInstitutionalCode());
}
}
 
c.setDegree(degree);
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/views/serviceviews/CourseViewServ.java
66,13 → 66,7
courseView.setDescription(description);
}
 
public String getInstitutionalCode() {
return courseView.getInstitutionalCode();
}
 
public void setInstitutionalCode(String institutionalCode) {
courseView.setInstitutionalCode(institutionalCode);
}
 
public long getId() {
return courseView.getId();