Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1148 → Rev 1152

/impl/conf/WEB-INF/struts/tiles-intranet.xml
8,6 → 8,7
<tiles-definitions>
 
<definition name="base.separators" extends="base.definition" path="/layout/layoutintranet.jsp">
<put name="separator" value="1" type="string"/>
<put name="header" value="/layout/headerIntranet.jsp"/>
<put name="navigationTop" value="/layout/topnavempty.jsp"/>
<put name="left" value="/layout/topnavempty.jsp"/>
/impl/src/web/admin/courses/listFilesInqueritoPedagogicoJson.jsp
File deleted
\ No newline at end of file
/impl/src/web/admin/courses/coursePedagogicContents.jsp
24,14 → 24,15
<%
 
String importYear = request.getParameter("importYear");
 
AbstractDao.getCurrentSession().beginTransaction();
 
if(importYear == null)
importYear = DaoFactory.getConfigurationDaoImpl().getInterfaceImportYear();
 
AbstractDao.getCurrentSession().beginTransaction();
Criteria c = AbstractDao.getCurrentSession().createCriteria(CourseUnit.class);
c.setProjection(Projections.property("id"));
c.createAlias("course","co")
.add(Restrictions.eq("co.importYear",importYear))
.add(Restrictions.eq("importYear",importYear))
//.add(Restrictions.eq("status",true))
.addOrder(Order.asc("co.name"))
156,7 → 157,7
$("#filesUnit" + unitId).html("Aguarde por favor");
$.ajax({
dataType: "json",
url: "<%=request.getContextPath()%>/admin/courses/listFilesInqueritoPedagogicoJson.jsp?courseUnitId=" + unitId,
url: "<%=request.getContextPath()%>/user/courses/listFilesInqueritoPedagogicoJson.jsp?courseUnitId=" + unitId,
async: true,
success: function(data) {
if(data.files == null || data.files.length == 0)
/impl/src/web/user/courses/listFilesInqueritoPedagogicoJson.jsp
New file
0,0 → 1,32
<%@ page import="jomm.dao.impl.AbstractDao"%><%@ page import="org.apache.commons.net.ftp.FTPClient"%><%@ page import="org.apache.commons.net.ftp.FTPFile"%><%@ page import="org.json.JSONArray"%><%@ page import="org.json.JSONObject"%><%@ page import="pt.estgp.estgweb.Globals"%><%@ page import="pt.estgp.estgweb.domain.CourseUnitImpl"%><%@ page import="pt.estgp.estgweb.domain.dao.DaoFactory"%><%@ page import="pt.estgp.estgweb.web.FtpServer"%><%@ page import="java.io.PrintWriter"%><%@ page contentType="application/json;charset=UTF-8" language="java" %>
<%
String courseUnitId = request.getParameter("courseUnitId");
AbstractDao.getCurrentSession().beginTransaction();
CourseUnitImpl cu = (CourseUnitImpl) DaoFactory.getCourseUnitDaoImpl().load(new Long(courseUnitId));
 
FtpServer ftpServer = FtpServer.getFtpServerForCurrentUser(Globals.FTP_IONLINE_URL,request);
FTPClient ftpClient = ftpServer.getClient();
ftpClient.changeWorkingDirectory("/");
boolean existDirectory = ftpClient.changeWorkingDirectory(cu.getInqueritosPedagogicosPathIntranet());
 
JSONObject json = new JSONObject();
JSONArray filesJson = new JSONArray();
 
if(existDirectory)
{
FTPFile[] files = existDirectory? ftpClient.listFiles(): null;
if(files != null)
for(FTPFile f : files)
{
JSONObject fileJson = new JSONObject();
fileJson.put("name",f.getName());
fileJson.put("completePath",cu.getInqueritosPedagogicosPathIntranet() + "/" + f.getName());
 
filesJson.put(fileJson);
}
}
json.put("files",filesJson);
ftpClient.logout();
AbstractDao.getCurrentSession().getTransaction().commit();
out.print(json.toString());
%>
/impl/src/web/user/home/user.jsp
25,6 → 25,7
<div class="panel-body">
<!--<p><bean:message key="intranet.home.curricular"/></p>-->
<ul>
<li><html:link action="/user/coursePedagogicContents"><bean:message key="course.pedagogic.contents.admin"/> </html:link></li>
<li><html:link action="/user/startLoadCoursesProgramsFromHome"><bean:message key="courseunit.indexes"/> (Novo Estilo) </html:link></li>
<baco:hasRole role="admin,all,services,administrativeCouncil,courseCoordinator,courseDirector,scientificCouncil,pedagogicCouncil">
<li><html:link action="/user/startSelectCourseFromServiceZone"><bean:message key="course.select"/></html:link></li>