Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 370 → Rev 371

/impl/src/java/pt/estgp/estgweb/utils/DatesUtils.java
63,6 → 63,31
}
}
 
public static enum SemestreModerate
{
S1,
S2,
S1S2
}
 
public static SemestreModerate getSemestreModerate()
{
MyCalendar mc = new MyCalendar();
int month = mc.getMonth();
if(month > 8 && month <=12)
{
return SemestreModerate.S1;
}
else if(month >= 1 && month <=3)
{
return SemestreModerate.S1S2;
}
else
{
return SemestreModerate.S2;
}
}
 
public static String getImportYearIntranet()
{
MyCalendar mc = new MyCalendar();
/impl/src/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitDaoImpl.java
47,40 → 47,40
 
public List<CourseUnit> loadByCourse(long course, String importYear)
{
return createCriteria().add(eq("importYear",importYear)).add(eq("course.id", course)).list();
return createCriteria().add(eq("importYear", importYear)).add(eq("course.id", course)).list();
}
 
public List<CourseUnit> load( String importYear, String semestre)
public List<CourseUnit> load(String importYear, String semestre)
{
return createCriteria().add(eq("importYear",importYear)).add(eq("semestre", semestre)).list();
return createCriteria().add(eq("importYear", importYear)).add(eq("semestre", semestre)).list();
}
 
public List<Long> loadIds( String importYear, String semestre)
public List<Long> loadIds(String importYear, String semestre)
{
Query q= createQuery("select c.id from c in class " + CourseUnit.class.getName() + " where c.importYear = ? and c.semestre = ?");
q.setString(0,importYear);
q.setString(1,semestre);
Query q = createQuery("select c.id from c in class " + CourseUnit.class.getName() + " where c.importYear = ? and c.semestre = ?");
q.setString(0, importYear);
q.setString(1, semestre);
return q.list();
}
 
public List<CourseUnit> loadSubscribedImportYearUnits(long studentId, String importYear)
{
return createCriteria().add(eq("importYear",importYear))
.createAlias("students","st")
return createCriteria().add(eq("importYear", importYear))
.createAlias("students", "st")
.add(eq("st.id", studentId)).addOrder(Order.asc("name")).list();
}
 
public List<CourseUnit> loadSubscribedOtherImportYearUnits(long studentId, String importYear)
{
return createCriteria().add(not(eq("importYear",importYear)))
.createAlias("students","st")
return createCriteria().add(not(eq("importYear", importYear)))
.createAlias("students", "st")
.add(eq("st.id", studentId)).addOrder(Order.asc("name")).list();
}
 
public List<CourseUnitImpl> loadTeachedImportYearUnits(long teacherId, String importYear)
{
return createCriteria().add(eq("importYear",importYear))
.createAlias("teachers","st")
return createCriteria().add(eq("importYear", importYear))
.createAlias("teachers", "st")
.add(eq("st.id", teacherId)).addOrder(Order.asc("importYear")).addOrder(Order.asc("name")).list();
}
 
96,27 → 96,27
 
public CourseUnit loadBySigesCodeUniqueSubscribed(String sigesCode, String year, String courseCode, long studentId, String semestre)
{
List<CourseUnit> cus = createCriteria()
List<CourseUnit> cus = createCriteria()
.add(eq("code", sigesCode))
.add(eq("importYear", year))
.add(eq("courseCode", courseCode))
.add(eq("semestre", semestre))
.createAlias("students","st")
.add(eq("st.id",studentId))
.createAlias("students", "st")
.add(eq("st.id", studentId))
.list();
if(cus.size() > 1)
if (cus.size() > 1)
{
CourseUnit cu1 = cus.get(0);
CourseUnit cu2 = cus.get(1);
if(cus.size() > 2)
if (cus.size() > 2)
{
logger.error("CourseUnit in more than two places in a course:" + cu1.getCode());
}
else
{
if(cu1.getSemestre().equals("S1"))
if (cu1.getSemestre().equals("S1"))
{
if(cu2.getSemestre().equals("S1"))
if (cu2.getSemestre().equals("S1"))
logger.error("CourseUnit in more than two places in a semestre:" + cu1.getCode());
else
{
125,7 → 125,7
}
else
{
if(cu2.getSemestre().equals("S2"))
if (cu2.getSemestre().equals("S2"))
logger.error("CourseUnit in more than two places in a semestre:" + cu1.getCode());
else
{
134,7 → 134,7
}
}
}
else if(cus.size() == 1)
else if (cus.size() == 1)
return cus.get(0);
 
return null;
154,7 → 154,7
 
public int countCourseUnits(String query, SearchTypeEnum searchType)
{
Criterion c = DaoUtils.createSearchQuery(query,searchType,"objectives","name");
Criterion c = DaoUtils.createSearchQuery(query, searchType, "objectives", "name");
return createCriteria().add(c).list().size();
}
 
171,7 → 171,7
 
public int countCourseUnitsActualYear(String query, SearchTypeEnum searchType)
{
Criterion c = DaoUtils.createSearchQuery(query,searchType,"objectives","name");
Criterion c = DaoUtils.createSearchQuery(query, searchType, "objectives", "name");
return createCriteria()
.add(c)
.add(eq("importYear", DatesUtils.getImportYear()))
195,10 → 195,10
//todo falta a projeccao do teacher id
return createCriteria()
.add(eq("importYear", DatesUtils.getImportYear()))
.add((or(isNull("objectives"),eq("objectives",""))))
.add((or(isNull("objectives"), eq("objectives", ""))))
.createAlias("teachers", "th")
.add(eq("semestre",DatesUtils.getSemestre()))
.add(eq("th.id",teacherId))
.add(eq("semestre", DatesUtils.getSemestre()))
.add(eq("th.id", teacherId))
.list();
}
 
207,22 → 207,30
//todo falta a projeccao do teacher id
return createCriteria()
.add(eq("importYear", DatesUtils.getImportYear()))
.add((or(isNull("programStreamId"),eq("programStreamId",""))))
.add((or(isNull("programStreamId"), eq("programStreamId", ""))))
.createAlias("teachers", "th")
.add(eq("semestre",DatesUtils.getSemestre()))
.add(eq("th.id",teacherId))
.add(eq("semestre", DatesUtils.getSemestre()))
.add(eq("th.id", teacherId))
.list();
}
 
public List<CourseUnit> loadMissingObjectivesOrPrograms(long teacherId)
{
//todo falta a projeccao do teacher id
return createCriteria()
Criteria c = createCriteria()
.add(eq("importYear", DatesUtils.getImportYear()))
.add(or(or(isNull("objectives"),eq("objectives","")),or(isNull("programStreamId"),eq("programStreamId",""))))
.add(eq("semestre",DatesUtils.getSemestre()))
.createAlias("teachers", "th")
.add(eq("th.id",teacherId))
.add(or(or(isNull("objectives"), eq("objectives", "")), or(isNull("programStreamId"), eq("programStreamId", ""))));
 
DatesUtils.SemestreModerate semestreModerate = DatesUtils.getSemestreModerate();
if (semestreModerate == DatesUtils.SemestreModerate.S1)
c.add(eq("semestre", "S1"));
else if (semestreModerate == DatesUtils.SemestreModerate.S2)
c.add(eq("semestre", "S2"));
else
c.add(or(eq("semestre", "S1"), eq("semestre", "S2")));
 
return c.createAlias("teachers", "th")
.add(eq("th.id", teacherId))
.list();
}
 
231,10 → 239,10
{
return createCriteria()
.createAlias("course", "c")
.add(eq("c.id",courseId))
.add(eq("c.id", courseId))
.add(eq("importYear", DatesUtils.getImportYear()))
.add(eq("semestre",DatesUtils.getSemestre()))
.add((or(isNull("objectives"),eq("objectives",""))))
.add(eq("semestre", DatesUtils.getSemestre()))
.add((or(isNull("objectives"), eq("objectives", ""))))
.list();
}
 
242,10 → 250,10
{
return createCriteria()
.createAlias("course", "c")
.add(eq("c.id",courseId))
.add(eq("c.id", courseId))
.add(eq("importYear", DatesUtils.getImportYear()))
.add(eq("semestre",DatesUtils.getSemestre()))
.add((or(isNull("programStreamId"),eq("programStreamId",""))))
.add(eq("semestre", DatesUtils.getSemestre()))
.add((or(isNull("programStreamId"), eq("programStreamId", ""))))
.list();
}
 
253,10 → 261,10
{
return createCriteria()
.createAlias("course", "c")
.add(eq("c.id",courseId))
.add(eq("c.id", courseId))
.add(eq("importYear", DatesUtils.getImportYear()))
.add(eq("semestre",DatesUtils.getSemestre()))
.add((or(or(isNull("objectives"),eq("objectives","")),or(isNull("programStreamId"),eq("programStreamId","")))))
.add(eq("semestre", DatesUtils.getSemestre()))
.add((or(or(isNull("objectives"), eq("objectives", "")), or(isNull("programStreamId"), eq("programStreamId", "")))))
.list();
}
 
266,11 → 274,4
}
 
 
 
 
 
 
 
 
 
}