| 34,6 → 34,7 |
|---|
| <% |
| String importYear = request.getParameter("importYear"); |
| |
| String nowInterfaceImportYear = DaoFactory.getConfigurationDaoImpl().getInterfaceImportYear(); |
| |
| if(importYear == null || importYear.length()==0) |
| { |
| 86,7 → 87,7 |
|---|
| <thead> |
| <tr> |
| <th>Codigo</th> |
| <th>Grau</th> |
| <th>Tipo de Curso</th> |
| <th>Curso</th> |
| <baco:hasRole role="services,admin,all"> |
| <th>Papel Comissão Curso</th> |
| 109,7 → 110,9 |
|---|
| int unitsSize=DaoFactory.getCourseDaoImpl().countCoursesUnits(importYear,c.getId()); |
| int unitsSizeOthers=DaoFactory.getCourseDaoImpl().countCoursesUnitsNot(importYear, c.getId()); |
| int totalUnits = unitsSize + unitsSizeOthers; |
| if(totalUnits > 0 || userSession.getUser().isAdmin() || userSession.getUser().hasRole("services")) |
| //So da verdadeiro se estivermos neste ano e ele estiver inativo |
| boolean notActiveAndActualThisYear = nowInterfaceImportYear.equals(importYear) && !cv.isStatus(); |
| if((totalUnits > 0 && !notActiveAndActualThisYear) || userSession.getUser().isAdmin() || userSession.getUser().hasRole("services")) |
| { |
| %> |
| |