/impl/importRoutines.xml |
---|
62,8 → 62,23 |
<!-- PONTUAIS --> |
<target name="grades"> |
<java classname="pt.estgp.estgweb.services.sigesimports.ImportGradesService" classpath="${build.dir.classes}" classpathref="pathToToolsLib"> |
<arg value="201415"/> |
<arg value="200809"/> |
</java> |
<java classname="pt.estgp.estgweb.services.sigesimports.ImportGradesService" classpath="${build.dir.classes}" classpathref="pathToToolsLib"> |
<arg value="200910"/> |
</java> |
<java classname="pt.estgp.estgweb.services.sigesimports.ImportGradesService" classpath="${build.dir.classes}" classpathref="pathToToolsLib"> |
<arg value="201011"/> |
</java> |
<java classname="pt.estgp.estgweb.services.sigesimports.ImportGradesService" classpath="${build.dir.classes}" classpathref="pathToToolsLib"> |
<arg value="201112"/> |
</java> |
<java classname="pt.estgp.estgweb.services.sigesimports.ImportGradesService" classpath="${build.dir.classes}" classpathref="pathToToolsLib"> |
<arg value="201213"/> |
</java> |
<java classname="pt.estgp.estgweb.services.sigesimports.ImportGradesService" classpath="${build.dir.classes}" classpathref="pathToToolsLib"> |
<arg value="201314"/> |
</java> |
</target> |
<target name="setAreas"> |
/impl/src/java/pt/estgp/estgweb/services/courseunits/LoadSubscribedUnitsCurrentYearService.java |
---|
5,6 → 5,7 |
import pt.estgp.estgweb.domain.dao.DaoFactory; |
import pt.utl.ist.berserk.logic.serviceManager.IService; |
import java.util.ArrayList; |
import java.util.List; |
/** |
18,6 → 19,7 |
{ |
Student t = DaoFactory.getStudentDaoImpl().load(studentId); |
List<CourseUnit> units = DaoFactory.getCourseUnitDaoImpl().loadSubscribedImportYearUnits(studentId, DaoFactory.getConfigurationDaoImpl().getInterfaceImportYear()); |
units = new ArrayList<CourseUnit>(units); |
for(CourseUnit c: units) |
{ |
c.getName(); |
30,6 → 32,7 |
{ |
Student t = DaoFactory.getStudentDaoImpl().load(studentId); |
List<CourseUnit> units = DaoFactory.getCourseUnitDaoImpl().loadSubscribedImportYearUnits(studentId, year); |
units = new ArrayList<CourseUnit>(units); |
for(CourseUnit c: units) |
{ |
c.getName(); |
/impl/src/java/pt/estgp/estgweb/domain/StudentImpl.java |
---|
190,10 → 190,10 |
Object[] args = new Object[]{getId(),year}; |
cuYear = (List<CourseUnit>) sm.execute(null, "LoadSubscribedUnitsGivenYear", args, names); |
for(CourseUnit c: cuYear) |
{ |
cuYear.add(c); |
} |
if(cuYear != null) |
subscribedUnitsYear.put(year,cuYear); |
else |
subscribedUnitsYear.put(year,new ArrayList<CourseUnit>()); |
} |
catch (Throwable e) |
{ |
/impl/src/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitDaoImpl.java |
---|
80,16 → 80,19 |
public List<CourseUnit> loadSubscribedImportYearUnits(long studentId, String importYear) |
{ |
return createCriteria().add(eq("importYear", importYear)) |
return createCriteria() |
.createAlias("students", "st") |
.add(eq("st.id", studentId)).addOrder(Order.asc("name")).list(); |
.add(eq("st.id", studentId)) |
.add(eq("importYear", importYear)) |
.addOrder(Order.asc("name")) |
.list(); |
} |
public List<CourseUnit> loadSubscribedImportYearSemestreUnits(long studentId, String importYear, String semestre) |
{ |
Criteria c =createCriteria() |
.add(eq("importYear", importYear)) |
.createAlias("students", "st") |
.add(eq("st.id", studentId)); |
.createAlias("students", "st") |
.add(eq("st.id", studentId)) |
.add(eq("importYear", importYear)); |
if(semestre != null) |
c.add(eq("semestre", semestre)); |
return c.addOrder(Order.asc("name")).list(); |