Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1262 → Rev 1267

/impl/conf/language/MessageResources.properties
148,8 → 148,9
user.role.studentsID=Alunos de Informação e Documentação
user.role.studentsFSIR=Alunos de Fontes de Informação e Serviço de Referência
user.role.sendMailMessages=Enviar Mensagens de Correio Electronico
user.role.pedagogicCouncilSecretariat=Secretaria do Conselho Pedagógico
user.role.directionSecretariat=Secretaria do da Direcção
user.role.pedagogicCouncilSecretariat=Secretariado do Conselho Pedagógico
user.role.directionSecretariat=Secretariado da Direcção
user.role.studentsSecretariat=Secretaria de Alunos
 
user.role.admin,teacher=Admin e Professor
user.role.assessementsTester=Testador de Provas de Avaliação
/impl/conf/app.properties
220,6 → 220,7
 
user.role.1611=pedagogicCouncilSecretariat
user.role.1612=directionSecretariat
user.role.1613=studentsSecretariat
 
user.role.18=erasmusCouncil
user.role.19=courseCoordinator
/impl/conf/template/email/message_en.txt
1,11 → 1,4
# 0 from role;
# 1 subject
# 2 text
# 3 nome user
# 4 target
# 5 emailFrom
 
 
<html>
<head>
<title>{1}</title>
/impl/conf/template/email/message_pt.txt
1,27 → 1,22
# 0 from role;
# 1 subject
# 2 text
# 3 nome user
# 4 target
# 5 emailFrom
 
 

<html>
<head>
<title>{1}</title>
</head>
<body>
<p>Caros {4}</p>
 
<p>Mensagem de: {0}</p>
<p>Assunto: {1}</p>
 
<p><i>Mensagem de:</i> {0}</p>
<p><i>Assunto:</i> <b><u>{1}</u></b></p>
 
<p>Caros {4}</p>
 
{2}
 
 
<p>Cumprimentos, {0}</p>
<p>Se pretender responder responda para o email: {5}</p>
<p>Cumprimentos</p>
<p>{0}</p>
<p>Se pretender responder, use o email: {5}</p>
 
---------------------------------------------
<p>Escola Superior de Tecnologia e Gestão</p>
/impl/src/java/pt/estgp/estgweb/services/sigesimports/oracle/dao/AulaDao.java
113,12 → 113,13
}
 
 
public ArrayList<Aula> loadAulas(Integer codigoInstituicao, String anolectivo, String codigoUnidade, String semestre, String codigoCurso) throws SQLException {
public ArrayList<Aula> loadAulas(Integer codigoInstituicao, String anolectivo, String codigoUnidade, String semestre, String codigoCurso, Connection conn) throws SQLException {
Integer limiteSalaInferior = codigoInstituicao * 1000;
Integer limiteSalaSuperior = (codigoInstituicao + 1) * 1000;
 
boolean closeConnection = conn == null;
ArrayList<Aula> aulas = new ArrayList<Aula>();
Connection conn = getCurrentConnection();
if(conn == null)
conn = getCurrentConnection();
String query;
query = "SELECT "
+ "CSH.T_OCUPACOES.DT_OCUPACAO AS DT_OCUPACAO,"
203,7 → 204,8
//close the reader
aReader.close();
catCMD.close();
conn.close();
if(closeConnection)
conn.close();
return aulas;
}
 
/impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportSumariesJson.java
26,6 → 26,7
import pt.estgp.estgweb.services.logresults.impl.DefaultLogMessage;
import pt.estgp.estgweb.services.logresults.impl.DefaultLogMessages;
import pt.estgp.estgweb.services.sigesimports.oracle.dao.AulaDao;
import pt.estgp.estgweb.services.sigesimports.oracle.dao.connection.ConnectionManager;
import pt.estgp.estgweb.utils.Dom4jUtil;
import pt.estgp.estgweb.web.FtpServer;
import pt.ipportalegre.siges.web.services.SiGesWEB;
39,6 → 40,7
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.URL;
import java.sql.Connection;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
104,8 → 106,12
//List<Long> cUs = DaoFactory.getCourseUnitDaoImpl().loadIds(year,DatesUtils.getSemestre());
List<Long> cUs = DaoFactory.getCourseUnitDaoImpl().loadIds(year,semestre);
String nowCode = "";
Connection conn = ConnectionManager.openConnection();
boolean connError = false;
for(Long cId: cUs)
{
if(connError)
break;
nowCode = "" + cId;
countUnits++;
try
130,8 → 136,10
//comentario de teste
try
{
 
//arrayOfAulas = service.getSiGesWEBSoap().getAulas(new BigDecimal(DaoFactory.getConfigurationDaoImpl().getSigesInstitutionCode()), year,c.getCode(),semestre,c.getCourse().getCode());
arrayOfAulas = AulaDao.getInstance().loadAulas(DaoFactory.getConfigurationDaoImpl().getSigesInstitutionCode(),year,c.getCode(),semestre,c.getCourse().getCode());
arrayOfAulas = AulaDao.getInstance().loadAulas(DaoFactory.getConfigurationDaoImpl().getSigesInstitutionCode(),year,c.getCode(),semestre,c.getCourse().getCode(),conn);
 
break;
}
catch(Throwable t)
140,11 → 148,12
{
logger.error("Giving up of courseUnit:" + cId + " ( " + c.getName() + " ) ",t);
serviceLogError("Giving up of courseUnit:" + cId + " ( " + c.getName() + " ) ",t);
connError = true;
break;
}
 
 
logger.error("WebService Fail, trying " + tries + " times sleeping a while");
logger.error("WebService Fail, trying " + tries + " times sleeping a while",t);
serviceLogError("WebService Fail, trying " + tries + " times sleeping a while " + t.toString());
serviceLogError("WebService Fail, trying " + tries + " times sleeping a while " + t.getCause());
Thread.sleep(5000);
261,6 → 270,7
serviceLogError(e.toString(),e);
}
}
conn.close();
 
setProgress(100);
serviceLogError("Finish commiting");