/impl/conf/directories/style1.xsl |
---|
457,18 → 457,18 |
<xsl:attribute name="src"> |
<xsl:choose> |
<xsl:when test="contains(@extension, 'rtf')"><xsl:value-of select="$contextPath"/>/imgs/mime/doc.gif</xsl:when> |
<xsl:when test="contains(@extension, 'doc')"><xsl:value-of select="$contextPath"/>/imgs/mime/doc.gif</xsl:when> |
<xsl:when test="contains(@extension, 'docx')"><xsl:value-of select="$contextPath"/>/imgs/mime/doc.gif</xsl:when> |
<xsl:when test="contains(@extension, 'doc')"><xsl:value-of select="$contextPath"/>/imgs/mime/doc.gif</xsl:when> |
<xsl:when test="contains(@extension, 'docx')"><xsl:value-of select="$contextPath"/>/imgs/mime/doc.gif</xsl:when> |
<xsl:when test="contains(@extension, 'pdf')"><xsl:value-of select="$contextPath"/>/imgs/mime/pdf.gif</xsl:when> |
<xsl:when test="contains(@extension, 'ppt')"><xsl:value-of select="$contextPath"/>/imgs/mime/ppt.gif</xsl:when> |
<xsl:when test="contains(@extension, 'zip')"><xsl:value-of select="$contextPath"/>/imgs/mime/zip.gif</xsl:when> |
<xsl:when test="contains(@extension, 'gz')"><xsl:value-of select="$contextPath"/>/imgs/mime/zip.gif</xsl:when> |
<xsl:when test="contains(@extension, 'tgz')"><xsl:value-of select="$contextPath"/>/imgs/mime/zip.gif</xsl:when> |
<xsl:when test="contains(@extension, 'rar')"><xsl:value-of select="$contextPath"/>/imgs/mime/rar.gif</xsl:when> |
<xsl:when test="contains(@extension, 'html')"><xsl:value-of select="$contextPath"/>/imgs/mime/html.gif</xsl:when> |
<xsl:when test="contains(@extension, 'html')"><xsl:value-of select="$contextPath"/>/imgs/mime/html.gif</xsl:when> |
<xsl:when test="contains(@extension, 'xls')"><xsl:value-of select="$contextPath"/>/imgs/mime/xls.gif</xsl:when> |
<xsl:when test="contains(@extension, 'xlsx')"><xsl:value-of select="$contextPath"/>/imgs/mime/xls.gif</xsl:when> |
<xsl:when test="contains(@extension, 'zip')"><xsl:value-of select="$contextPath"/>/imgs/mime/zip.gif</xsl:when> |
<xsl:when test="contains(@extension, 'gz')"><xsl:value-of select="$contextPath"/>/imgs/mime/zip.gif</xsl:when> |
<xsl:when test="contains(@extension, 'tgz')"><xsl:value-of select="$contextPath"/>/imgs/mime/zip.gif</xsl:when> |
<xsl:when test="contains(@extension, 'rar')"><xsl:value-of select="$contextPath"/>/imgs/mime/rar.gif</xsl:when> |
<xsl:when test="contains(@extension, 'html')"><xsl:value-of select="$contextPath"/>/imgs/mime/html.gif</xsl:when> |
<xsl:when test="contains(@extension, 'html')"><xsl:value-of select="$contextPath"/>/imgs/mime/html.gif</xsl:when> |
<xsl:when test="contains(@extension, 'xls')"><xsl:value-of select="$contextPath"/>/imgs/mime/xls.gif</xsl:when> |
<xsl:when test="contains(@extension, 'xlsx')"><xsl:value-of select="$contextPath"/>/imgs/mime/xls.gif</xsl:when> |
<xsl:when test="contains(@extension, 'txt')"><xsl:value-of select="$contextPath"/>/imgs/mime/txt.gif</xsl:when> |
<xsl:otherwise><xsl:value-of select="$contextPath"/>/imgs/mime/unknown.gif</xsl:otherwise> |
</xsl:choose> |
/impl/conf/berserk/sd.xml |
---|
78,6 → 78,16 |
<chain name="Logger"/> |
</filterChains> |
</service> |
<service> |
<name>LoadTeachersWithUnits</name> |
<implementationClass>pt.estgp.estgweb.services.users.LoadUsersService</implementationClass> |
<description>Load user of some class</description> |
<isTransactional>true</isTransactional> |
<defaultMethod>loadTeachersWithUnits</defaultMethod> |
<filterChains> |
<chain name="Logger"/> |
</filterChains> |
</service> |
<!--URL Statistics--> |
/impl/src/java/pt/estgp/estgweb/services/users/LoadUsersService.java |
---|
4,12 → 4,14 |
import pt.estgp.estgweb.domain.User; |
import pt.estgp.estgweb.domain.UserSession; |
import pt.estgp.estgweb.domain.UserImpl; |
import pt.estgp.estgweb.domain.Teacher; |
import pt.estgp.estgweb.domain.views.UserView; |
import pt.estgp.estgweb.domain.dao.DaoFactory; |
import pt.estgp.estgweb.services.expceptions.ServiceException; |
import pt.estgp.estgweb.services.expceptions.FieldException; |
import pt.estgp.estgweb.services.expceptions.AlreadyExistsException; |
import pt.estgp.estgweb.services.common.CommonServicesManager; |
import pt.estgp.estgweb.utils.DatesUtils; |
import org.apache.log4j.Logger; |
import org.hibernate.criterion.Order; |
65,6 → 67,14 |
return UserView.getViews(users); |
} |
public List<UserView> loadTeachersWithUnits(String area) throws ServiceException |
{ |
List<User> users = DaoFactory.getTeacherDaoImpl().loadByAreaWithUnitsInYear(area, DatesUtils.getImportYear()); |
if(users == null) |
return null; |
return UserView.getViews(users); |
} |
public List<UserView> load(String role) throws ServiceException |
{ |
List<User> users = DaoFactory.getUserDaoImpl().loadRoleUsers(role); |
/impl/src/java/pt/estgp/estgweb/domain/dao/impl/TeacherDaoImpl.java |
---|
3,7 → 3,10 |
import pt.estgp.estgweb.domain.*; |
import static org.hibernate.criterion.Restrictions.*; |
import org.hibernate.criterion.Order; |
import org.hibernate.criterion.Projections; |
import org.hibernate.exception.GenericJDBCException; |
import org.hibernate.Criteria; |
import org.hibernate.sql.JoinFragment; |
import java.util.List; |
40,6 → 43,23 |
} |
} |
public List<User> loadByAreaWithUnitsInYear(String area, String year) |
{ |
try |
{ |
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(eq("t.importYear",year)); |
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(); |
/impl/src/java/pt/estgp/estgweb/web/DirWebProxy.java |
---|
232,6 → 232,7 |
} |
else |
{ |
addAttribute(iFileElem, "extension", iFile.getExtension()); |
addAttribute(iFileElem, "ftpDirectory", "false"); |
addAttribute(iFileElem, "absolute", "true"); |
addAttribute(iFileElem, "url", iFile.getCompleteUrl()); |
271,6 → 272,7 |
} |
else |
{ |
addAttribute(iFileElem, "extension", iFile.getExtension()); |
addAttribute(iFileElem, "ftpDirectory", "false"); |
addAttribute(iFileElem, "absolute", "true"); |
addAttribute(iFileElem, "url", iFile.getCompleteUrl()); |
/impl/src/java/pt/estgp/estgweb/web/controllers/contacts/ContactsController.java |
---|
40,9 → 40,9 |
String area = request.getParameter("area"); |
request.setAttribute("area",area); |
IServiceManager sm = ServiceManager.getInstance(); |
String[] names = new String[]{"role","area"}; |
Object[] args = new Object[]{Globals.TEACHER_ROLE,area}; |
List<UserView> teachers = (List<UserView>) sm.execute(RequestUtils.getRequester(request, response), "LoadRoleAreaUsers", args, names); |
String[] names = new String[]{"area"}; |
Object[] args = new Object[]{area}; |
List<UserView> teachers = (List<UserView>) sm.execute(RequestUtils.getRequester(request, response), "LoadTeachersWithUnits", args, names); |
request.setAttribute("teachers",teachers); |
return mapping.findForward("contactTeachers"); |
} |
/impl/src/java/pt/estgp/estgweb/web/filters/UserSessionFilter.java |
---|
3,8 → 3,14 |
import org.apache.log4j.Logger; |
import pt.estgp.estgweb.Globals; |
import pt.estgp.estgweb.domain.UserSessionImpl; |
import pt.estgp.estgweb.domain.UserSession; |
import pt.estgp.estgweb.web.UserSessionProxy; |
import pt.estgp.estgweb.web.utils.RequestUtils; |
import pt.estgp.estgweb.web.exceptions.NoCookiesException; |
import pt.utl.ist.berserk.logic.serviceManager.IServiceManager; |
import pt.utl.ist.berserk.logic.serviceManager.ServiceManager; |
import pt.utl.ist.berserk.logic.serviceManager.exceptions.ServiceManagerException; |
import pt.utl.ist.berserk.logic.filterManager.exceptions.*; |
import javax.servlet.*; |
import javax.servlet.http.HttpServletRequest; |
34,7 → 40,16 |
public void init(FilterConfig config) |
{ |
try |
{ |
IServiceManager sm = ServiceManager.getInstance(); |
Object[] args = new Object[]{"system"}; |
sm.execute("system","LoadUserSession",args); |
} |
catch (Throwable e) |
{ |
logger.fatal("INIT FILTER SESSION FILTER CALLING FIRST SERVICE TO OPEN CONNECTIONS IN HIBERNATE" + e,e); |
} |
} |
/** |
48,7 → 63,7 |
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) |
throws IOException, ServletException |
{ |
HttpServletRequest hrequest = (HttpServletRequest) request; |
String relativePath = hrequest.getServletPath(); |
if (relativePath == null) |
/impl/src/web/user/contacts/listTeachers.jsp |
---|
37,6 → 37,8 |
<form action="<%=request.getContextPath()%>/user/listTeachers.do"> |
<input type="hidden" name="dispatch" value="listTeachersAZ"/> |
<div id="contentIntranet"> |
<h1><bean:message key="portal.contactos.docentes"/></h1> |
<div class="seccao"> |
<table class="dataTable"> |
<tr> |