Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 960 → Rev 961

/impl/src/java/pt/estgp/estgweb/domain/dao/impl/CourseDaoImpl.java
15,7 → 15,7
 
import java.util.List;
 
import static org.hibernate.criterion.Restrictions.eq;
import static org.hibernate.criterion.Restrictions.*;
 
/**
* @author Jorge Machado
186,6 → 186,12
.list();
}
 
public List<Course> findAllNotIn(String importYear)
{
return createCriteria().add(not(eq("importYear", importYear)))
.list();
}
 
 
// Duarte Santos
/impl/src/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitDaoImpl.java
6,13 → 6,13
import org.hibernate.criterion.Criterion;
import org.hibernate.criterion.Order;
import org.hibernate.sql.JoinFragment;
import pt.estgp.estgweb.domain.CourseUnit;
import pt.estgp.estgweb.domain.CourseUnitImpl;
import pt.estgp.estgweb.domain.Teacher;
import pt.estgp.estgweb.domain.*;
import pt.estgp.estgweb.domain.dao.DaoFactory;
import pt.estgp.estgweb.domain.dao.DaoUtils;
import pt.estgp.estgweb.services.common.SearchTypeEnum;
import pt.estgp.estgweb.utils.DatesUtils;
 
import java.util.ArrayList;
import java.util.List;
 
import static org.hibernate.criterion.Restrictions.*;
429,4 → 429,71
q.setLong(0,unit);
return q.list();
}
 
public static class CourseMissingValidationProgram
{
public Course course;
public List<CourseUnit> courseUnits;
}
public List<CourseMissingValidationProgram> loadMissingProgramValidate(UserSession userSession)
{
List<CourseMissingValidationProgram> result = new ArrayList<CourseMissingValidationProgram>();
List<Course> courses = DaoFactory.getCourseDaoImpl().findAll(DatesUtils.getImportYear());
for(Course course: courses)
{
if(userSession.getUser().hasRole(course.getValidationRole()))
{
List<CourseUnit> courseUnits = loadMissingProgramValidateGivenCourse(course.getId());
if(courseUnits != null && courseUnits.size() > 0)
{
CourseMissingValidationProgram c = new CourseMissingValidationProgram();
c.course = course;
c.courseUnits = courseUnits;
result.add(c);
}
}
}
return result;
}
public static class CourseMissingValidationEvaluation
{
public Course course;
public List<CourseUnit> courseUnits;
}
 
public List<CourseMissingValidationEvaluation> loadMissingEvaluationValidate(UserSession userSession)
{
List<CourseMissingValidationEvaluation> result = new ArrayList<CourseMissingValidationEvaluation>();
List<Course> courses = DaoFactory.getCourseDaoImpl().findAll(DatesUtils.getImportYear());
for(Course course: courses)
{
if(userSession.getUser().hasRole(course.getValidationRole()))
{
List<CourseUnit> courseUnits = loadMissingEvaluationValidateGivenCourse(course.getId());
if(courseUnits != null && courseUnits.size() > 0)
{
CourseMissingValidationEvaluation c = new CourseMissingValidationEvaluation();
c.course = course;
c.courseUnits = courseUnits;
result.add(c);
}
}
}
return result;
}
 
/*
* Neste caso apenas se validam as do ano anterior*/
 
public List<CourseUnit> loadMissingEvaluationValidateGivenCourse(long courseId)
{
return createCriteria()
.createAlias("course", "c")
.createAlias("courseUnitEvaluation", "ce")
.add(eq("c.id", courseId))
.add(not(eq("importYear", DatesUtils.getImportYear())))
.add((and(isNotNull("evaluationStreamId"), not(eq("evaluationStreamId", "")))))
.add((eq("ce.closed", false)))
.list();
}
}
/impl/src/web/user/home/teacher.jsp
210,6 → 210,7
<jsp:include page="/user/home/todos.jsp"/>
</baco:isModuleOn>
<%
try{
HibernateUtils.getCurrentSession().beginTransaction();
List<CourseUnitDaoImpl.CourseMissingValidationProgram> result = DaoFactory.getCourseUnitDaoImpl().loadMissingProgramValidate(UserSession);
List<CourseUnitDaoImpl.CourseMissingValidationEvaluation> result2 = DaoFactory.getCourseUnitDaoImpl().loadMissingEvaluationValidate(UserSession);
218,34 → 219,35
%>
<div class="block">
<p>Tarefas das Comissões de Curso</p>
<ul>
 
 
 
<%
if(result.size()>0)
{
%>
<div class="block">
<p>Fichas curriculares por validar</p>
<ul>
<%
for(CourseUnitDaoImpl.CourseMissingValidationProgram mis:result)
{
%>
<li><a href="<%=request.getContextPath()%>//user/startLoadCoursesProgramsFromHome.do#<%=mis.course.getId()%>"><%=mis.course.getName()%> (<%=mis.courseUnits.size()%> %>)</a></li>
<%
}
%>
</ul>
</div>
<li>
<p>Fichas curriculares por validar</p>
<ul>
<%
for(CourseUnitDaoImpl.CourseMissingValidationProgram mis:result)
{
%>
<li><a href="<%=request.getContextPath()%>/user/startLoadCoursesProgramsFromHome.do#<%=mis.course.getId()%>"><%=mis.course.getName()%> (<%=mis.courseUnits.size()%>)</a></li>
<%
}
%>
</ul>
</li>
<%
}
%>
<%
if(result2.size()>0)
{
 
%>
<div class="block">
<li>
<p>Relatórios de avaliação por validar</p>
<ul>
<%
269,18 → 271,21
}
%>
</ul>
</div>
</li>
<%
 
}
%>
 
/user/startLoadCoursesProgramsFromHome.do#courseId
 
 
</ul>
</div>
<%
}
HibernateUtils.getCurrentSession().getTransaction().commit();
}catch(Throwable e)
{
System.out.println(e);
e.printStackTrace();
}
%>