Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1507 → Rev 1508

/branches/v3/impl/conf/berserk/sd.xml
122,7 → 122,18
<chain name="Logger"/>
</filterChains>
</service>
<service>
<name>LoadTeachersWithUnitsInLast3Years</name>
<implementationClass>pt.estgp.estgweb.services.users.LoadUsersService</implementationClass>
<description>Load user of some class</description>
<isTransactional>true</isTransactional>
<defaultMethod>LoadTeachersWithUnitsInLast3Years</defaultMethod>
<filterChains>
<chain name="Logger"/>
</filterChains>
</service>
 
 
<service>
<name>LoadTeachers</name>
<implementationClass>pt.estgp.estgweb.services.users.LoadUsersService</implementationClass>
/branches/v3/impl/src/java/pt/estgp/estgweb/services/users/LoadUsersService.java
66,7 → 66,16
return null;
return UserView.getViews(users);
}
public List<UserView> LoadTeachersWithUnitsInLast3Years(String area) throws ServiceException
{
List<User> users = DaoFactory.getTeacherDaoImpl().loadByAreaWithUnitsInLast3Years(area, DaoFactory.getConfigurationDaoImpl().getInterfaceImportYear());
if(users == null)
return null;
return UserView.getViews(users);
}
 
 
 
public List<UserView> load(String role) throws ServiceException
{
List<User> users = DaoFactory.getUserDaoImpl().loadRoleUsers(role);
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/dao/impl/TeacherDaoImpl.java
7,6 → 7,7
import org.hibernate.sql.JoinFragment;
import pt.estgp.estgweb.domain.Teacher;
import pt.estgp.estgweb.domain.User;
import pt.estgp.estgweb.utils.DatesUtils;
 
import java.util.List;
 
63,6 → 64,29
}
}
 
public List<User> loadByAreaWithUnitsInLast3Years(String area, String year)
{
try
{
 
String lastYear = DatesUtils.getPreviousImportYear(year);
String twoYearsAgo = DatesUtils.getPreviousImportYear(lastYear);
 
System.out.println(lastYear);
System.out.println(twoYearsAgo);
Criteria c = createCriteria();
c.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY);
if(area != null && area.trim().length()>0)
c.add(eq("mainArea",area));
c.createAlias("teachedUnits","t", JoinFragment.INNER_JOIN).add(or(eq("t.importYear",year),or(eq("t.importYear",lastYear),eq("t.importYear",twoYearsAgo))));
return c.addOrder(Order.asc("name")).list();
}
catch(GenericJDBCException e)
{
throw e;
}
}
 
public Teacher loadByBi(String bi)
{
return (Teacher) createCriteria().add(eq("bi",bi)).uniqueResult();
/branches/v3/impl/src/java/pt/estgp/estgweb/web/form/courseunits/CourseUnitEvaluationForm.java
74,7 → 74,8
+courseUnitEvaluationView.getCourseUnitEvaluation().getNumAlunosAprovEspecial();
if(!totalAprovadosCorrecto)
addMessage(errors,request,"error.evaluation.report.total.aprovados.epocas.wrong");
if(courseUnitEvaluationView.getCourseUnitEvaluation().getNumAlunosAprov1013() +courseUnitEvaluationView.getCourseUnitEvaluation().getNumAlunosAprov1416() + courseUnitEvaluationView.getCourseUnitEvaluation().getNumAlunosAprov1720() != 100 )
if(courseUnitEvaluationView.getCourseUnitEvaluation().getNumAlunosAprovTotal().intValue() != 0 &&
courseUnitEvaluationView.getCourseUnitEvaluation().getNumAlunosAprov1013() +courseUnitEvaluationView.getCourseUnitEvaluation().getNumAlunosAprov1416() + courseUnitEvaluationView.getCourseUnitEvaluation().getNumAlunosAprov1720() != 100 )
addMessage(errors,request,"error.evaluation.report.total.aprovados.grades");
 
try{
/branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/contacts/ContactsController.java
1,21 → 1,18
package pt.estgp.estgweb.web.controllers.contacts;
 
import org.apache.log4j.Logger;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import pt.estgp.estgweb.domain.views.UserView;
import pt.estgp.estgweb.web.controllers.ApplicationDispatchController;
import pt.estgp.estgweb.web.controllers.utils.UtilsController;
import pt.estgp.estgweb.web.utils.RequestUtils;
import pt.estgp.estgweb.domain.views.AnnouncementView;
import pt.estgp.estgweb.domain.views.UserView;
import pt.estgp.estgweb.Globals;
import pt.utl.ist.berserk.logic.serviceManager.IServiceManager;
import pt.utl.ist.berserk.logic.serviceManager.ServiceManager;
import org.apache.log4j.Logger;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionForm;
 
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletException;
import java.util.List;
 
/**
42,7 → 39,7
IServiceManager sm = ServiceManager.getInstance();
String[] names = new String[]{"area"};
Object[] args = new Object[]{area};
List<UserView> teachers = (List<UserView>) sm.execute(RequestUtils.getRequester(request, response), "LoadTeachersWithUnits", args, names);
List<UserView> teachers = (List<UserView>) sm.execute(RequestUtils.getRequester(request, response), "LoadTeachersWithUnitsInLast3Years", args, names);
request.setAttribute("teachers",teachers);
return mapping.findForward("contactTeachers");
}