Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 749 → Rev 750

/impl/src/java/pt/estgp/estgweb/services/courseunits/SaveCourseUnitProgram.java
75,9 → 75,9
}
if(usession.getUser() instanceof Teacher
&& (((usession.getUser())).hasRole(c.getCourse().getValidationRole())
||
((usession.getUser()) == c.getCourse().getCoordinator()))
)
||
((usession.getUser()) == c.getCourse().getCoordinator()))
)
{
cupv.persistViewInObjectCoordinator(program);
}
91,7 → 91,7
 
public void createPdf(CourseUnit cu, List<String> errors) throws IOException, TransformerException, FOPException {
 
((CourseUnitProgramImpl)cu.getCourseUnitProgram()).consistNullValues();
((CourseUnitProgramImpl)cu.getCourseUnitProgram()).consistNullValues();
Document responseDoc = DocumentHelper.createDocument();
Namespace namespace = new Namespace("uc", "http://baco.estgp.pt/schemas/courseunits/program/");
responseDoc.setXMLEncoding("ISO-8859-1");
130,7 → 130,18
responsavel.setText(cu.getResponsableTeacher().getName());
 
Element responsavelEmail = curriculum.addElement(new QName("responsavelEmail",namespace));
responsavelEmail.setText(cu.getResponsableTeacher().getEmail());
if(cu.getResponsableTeacher().getEmail()==null)
{
logger.warn("Teacher don't has email: " + cu.getResponsableTeacher().getSigesCode() + " - " + cu.getResponsableTeacher().getName());
try {
Thread.sleep(3000);
} catch (InterruptedException e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
responsavelEmail.setText("");
}
else
responsavelEmail.setText(cu.getResponsableTeacher().getEmail());
}
 
 
147,7 → 158,20
Element outroDocente1 = curriculum.addElement(new QName("outroDocente" + docenteNumber,namespace));
outroDocente1.setText(t.getName());
Element docenteEmail1 = curriculum.addElement(new QName("docenteEmail" + docenteNumber,namespace));
docenteEmail1.setText(t.getEmail());
 
if(t.getEmail()==null)
{
logger.warn("Teacher don't has email: " + t.getSigesCode() + " - " + t.getName());
try {
Thread.sleep(3000);
} catch (InterruptedException e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
docenteEmail1.setText("");
}
else
docenteEmail1.setText(t.getEmail());
}
 
 
/impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportCourseService.java
2,6 → 2,7
 
import jomm.dao.impl.AbstractDao;
import org.apache.log4j.Logger;
import org.hibernate.NonUniqueResultException;
import pt.estgp.estgweb.Globals;
import pt.estgp.estgweb.utils.DatesUtils;
import pt.estgp.estgweb.utils.ConfigProperties;
148,7 → 149,14
for (Map.Entry<String, Disciplina> entry : set)
{
Disciplina d = entry.getValue();
CourseUnit c = DaoFactory.getCourseUnitDaoImpl().loadBySigesCodeUnique("" + d.getCodigo(), "" + d.getCodigoCurso(), semestre, year);
CourseUnit c;
try{
c = DaoFactory.getCourseUnitDaoImpl().loadBySigesCodeUnique("" + d.getCodigo(), "" + d.getCodigoCurso(), semestre, year);
}catch(NonUniqueResultException e)
{
logger.fatal("Unidade Repetida: (" + d.getCodigo() + ") curso: " + d.getCodigoCurso() + " " + semestre + " " + year);
throw e;
}
if (c == null)
{
c = DomainObjectFactory.createCourseUnitImpl();
/impl/src/java/pt/estgp/estgweb/domain/CourseUnitProgramImpl.java
224,11 → 224,12
 
 
static boolean valiPrograms = false;
public static void main(String[] args) throws IOException, MalformedURLException, DocumentException, SQLException, TransformerException, FOPException {
static int contaProgramas = 0;
public static void main(String[] args) throws IOException, DocumentException, SQLException, TransformerException, FOPException {
 
 
 
String file = "D:\\Jorge\\Documents\\estg\\projectos\\Fichas Curriculares Baco\\FICHASFINAIS\\TVAPE - revisto.11jan13.xml";
String file = "D:\\Jorge\\Documents\\estg\\projectos\\Fichas Curriculares Baco\\FICHAS_CORRIGIDAS";
if(args.length > 0)
file = args[0];
if(args.length > 1)
243,7 → 244,11
{
f2 = f3;
if(f3.getName().endsWith("xml"))
{
contaProgramas++;
System.out.println("TOTAL Programas: " + contaProgramas);
importFile(f3);
}
}
}
else