/impl/importRoutines.xml |
---|
55,6 → 55,7 |
<java classname="pt.estgp.estgweb.services.jobs.JobDeamon" classpath="${build.dir.classes}" classpathref="pathToToolsLib" fork="true"> |
<jvmarg value="-Djava.security.egd=file:/dev/urandom"/> |
</java> |
</target> |
/impl/src/java/pt/estgp/estgweb/services/sigesimports/oracle/dao/DocenteDao.java |
---|
42,16 → 42,11 |
Connection conn = getCurrentConnection(); |
//NOVO DESDE A ALTERACAO DO SIGES |
System.out.println("Loading Funcionario"); |
PreparedStatement catCMD = conn.prepareStatement("SELECT * FROM CSP.T_FUNCIONARIOS INNER JOIN SIGES.T_INDIVIDUO on SIGES.T_INDIVIDUO.ID_INDIVIDUO = CSP.T_FUNCIONARIOS.ID_INDIVIDUO where " + getIdColumn() + "=" + codigo); |
ResultSet aReader = catCMD.executeQuery(); |
if (aReader.next()) { |
System.out.println("Loaded"); |
Docente c = load(aReader); |
System.out.println("Loading disciplinas"); |
c.disciplinas = loadDisciplinasDosDocentes(codigo, codigoInstituicao, ano); |
System.out.println("Loaded"); |
catCMD.close(); |
aReader.close(); |
conn.close(); |
/impl/src/java/pt/estgp/estgweb/services/sigesimports/oracle/domain/Disciplina.java |
---|
105,4 → 105,22 |
public Integer getCdTipologia() { |
return cdTipologia; |
} |
@Override |
public String toString() { |
return "Disciplina{" + |
"codigo=" + codigo + |
", cdLectivo='" + cdLectivo + '\'' + |
", codigoCurso=" + codigoCurso + |
", cdDuracao='" + cdDuracao + '\'' + |
", codigoInstituicao=" + codigoInstituicao + |
", cdTurma='" + cdTurma + '\'' + |
", nome='" + nome + '\'' + |
", nomeCurso='" + nomeCurso + '\'' + |
", grauCurso='" + grauCurso + '\'' + |
", cdTipoDisciplina=" + cdTipoDisciplina + |
", codigoFuncaoDocente=" + codigoFuncaoDocente + |
", cdTipologia=" + cdTipologia + |
'}'; |
} |
} |
/impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportTeachersService.java |
---|
112,11 → 112,13 |
} |
logger.info("Starting import Funcionario Importado: SIGES:" + c); |
logger.info("Starting import Funcionario: SIGES:" + c); |
//Docente d = service.getSiGesWEBSoap().getDocente(c, new BigDecimal(DaoFactory.getConfigurationDaoImpl().getSigesInstitutionCode()), year); |
Docente d = DocenteDao.getInstance().load(c, DaoFactory.getConfigurationDaoImpl().getSigesInstitutionCode(), year); |
logger.info("Codigo Funcionario Importado: SIGES(" + d.getCodigoFuncionario().intValue() + ") email IPP SIGES: " + d.getEmail()); |
serviceLogInfo("Codigo Funcionario Importado: SIGES(" + d.getCodigoFuncionario().intValue() + ") email IPP SIGES: " + d.getEmail()); |
logger.info("SIGES IMPORTED INFO: " + docenteToString(d)); |
serviceLogInfo("SIGES IMPORTED INFO: " + docenteToString(d)); |
Teacher t = DaoFactory.getTeacherDaoImpl().loadBySigesCode(d.getCodigoFuncionario().intValue()); |
boolean newUser = false; |
if (t == null) |
/impl/src/web/user/home/student.jsp |
---|
53,6 → 53,7 |
</li> |
</ul> |
</logic:notMatch> |
<jsp:include page="todosAfazer.jsp"/> |
<table class="columnTable" width="100%"> |
<tbody> |
<tr> |
/impl/src/web/user/home/teacher.jsp |
---|
29,6 → 29,7 |
</li> |
</ul> |
</logic:notMatch> |
<jsp:include page="todosAfazer.jsp"/> |
<table class="columnTable" width="100%"> |
<tbody> |
<tr> |
121,9 → 122,10 |
%> |
</div> |
</baco:isModuleOn> |
<%-- |
<baco:isModuleOn module="todos"> |
<jsp:include page="/user/home/todos.jsp"/> |
</baco:isModuleOn> |
</baco:isModuleOn>--%> |
<baco:isModuleOn module="courseunits"> |
<jsp:include page="/user/home/courseUnitsAnnouncements.jsp"/> |
</baco:isModuleOn> |
/impl/src/web/user/home/todosAfazer.jsp |
---|
New file |
0,0 → 1,100 |
<%@ page import="pt.estgp.estgweb.services.common.IToDoCat" %> |
<%@ page import="java.util.List" %> |
<%@ page import="pt.utl.ist.berserk.logic.serviceManager.IServiceManager" %> |
<%@ page import="pt.utl.ist.berserk.logic.serviceManager.ServiceManager" %> |
<%@ page import="pt.estgp.estgweb.web.utils.RequestUtils" %> |
<%@ page import="jomm.utils.MessageResources" %> |
<%@ page import="pt.estgp.estgweb.services.common.IToDo" %> |
<%@ page import="pt.estgp.estgweb.services.common.ModuleEnum" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> |
<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> |
<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %> |
<%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %> |
<%-- |
Created by IntelliJ IDEA. |
User: Jorge |
Date: 2/Jun/2008 |
Time: 16:01:47 |
To change this template use File | Settings | File Templates. |
--%> |
<%@ page contentType="text/html;charset=UTF-8" language="java" %> |
<% |
IServiceManager sm = ServiceManager.getInstance(); |
String[] names = new String[]{}; |
Object[] args = new Object[]{}; |
List<IToDoCat> todos = (List<IToDoCat>) sm.execute(RequestUtils.getRequester(request, response), "CommonServicesGetAllTodosCat", args, names); |
%> |
<% |
for (IToDoCat toDoCat : todos) |
{ |
if (toDoCat.getDescription().equals(ModuleEnum.TodoAnnouncements.getMessageKey())) |
{ |
%> |
<div class="row"> |
<div class="col-md-12 col-sm-12 col-xs-12"> |
<div class="panel panel-primary"> |
<div class="panel-heading"><bean:message key="intranet.todo"/></div> |
<div class="panel-body"> |
<div class="list-group"> |
<div class="list-group-item active"> |
<%=MessageResources.getMessage(request, toDoCat.getDescription())%> (<%=toDoCat.getTotalToDo()%>) |
</div> |
<% |
for (IToDo todo : toDoCat.getAllToDos()) |
{ |
%> |
<div class="list-group-item"> |
<% |
if (todo.getUrl() != null) |
{ |
%> |
<a href="<%=request.getContextPath() + todo.getUrl()%>"> |
<% |
if(todo.getCatArg0() == null && todo.getCatKey() != null) |
{ |
out.print(MessageResources.getMessage(request,todo.getCatKey()) + ":"); |
} |
else if(todo.getCatArg0() != null && todo.getCatKey() != null) |
{ |
out.print(MessageResources.getMessage(request,todo.getCatKey(),todo.getCatArg0()) + ":"); |
} |
%> |
<%=todo.getLabelInsideCat(request)%> |
</a> |
<img src="<%=request.getContextPath()%>/imgs/preencher.gif" width="35px"/> |
<% |
} |
else |
{ |
%> |
<%=todo.getLabelInsideCat(request)%> |
<% |
} |
%> |
</div> |
<% |
} |
%> |
</div> |
</div> |
</div> |
</div> |
</div> |
<% |
} |
} |
%> |