/branches/v3/impl/src/java/pt/estgp/estgweb/services/courseunits/courseunitsummaries.fo.xsl |
---|
196,7 → 196,7 |
</fo:table-cell> |
<fo:table-cell border-right="1px solid gray" border-bottom="1px solid gray" display-align="center" > |
<fo:block > |
<xsl:value-of select="//responsavel/@name"/> / <xsl:value-of select="//responsavel/@email"/> |
<xsl:value-of select="//responsavel/@name"/> / <xsl:value-of select="//responsavel/@email"/> (<xsl:value-of select="//responsavel/@code"/>) |
</fo:block > |
</fo:table-cell> |
</fo:table-row> |
209,7 → 209,7 |
</fo:table-cell> |
<fo:table-cell border-right="1px solid gray" border-bottom="1px solid gray" display-align="center" > |
<fo:block > |
<xsl:value-of select="./@name"/> / <xsl:value-of select="./@email"/> |
<xsl:value-of select="./@name"/> / <xsl:value-of select="./@email"/> (<xsl:value-of select="./@code"/>) |
</fo:block> |
</fo:table-cell> |
</fo:table-row> |
280,11 → 280,27 |
</fo:block> |
</fo:table-cell> |
</fo:table-row> |
<fo:table-row> |
<fo:table-cell border-bottom="0.5px solid gray"> |
<fo:block font-size="8pt"> |
Docente: <xsl:value-of select="./codigoDocente"/> |
</fo:block> |
</fo:table-cell> |
<fo:table-cell number-columns-spanned="4" border-bottom="0.5px solid gray"> |
<fo:block font-size="8pt"> |
Turma: <xsl:value-of select="./cdTurma"/> |
</fo:block> |
</fo:table-cell> |
</fo:table-row> |
<fo:table-row> |
<fo:table-cell border-bottom="0.5px solid gray"> |
<fo:block font-size="8pt"> |
Titulo |
</fo:block> |
</fo:table-cell> |
309,7 → 325,7 |
</fo:table-row> |
<fo:table-row height='20px'> |
<fo:table-cell number-columns-spanned="5" > |
<fo:table-cell number-columns-spanned="4" > |
<fo:block ></fo:block> |
</fo:table-cell> |
</fo:table-row> |
/branches/v3/impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportCourseService.java |
---|
259,6 → 259,9 |
* @return |
*/ |
public static boolean loadCourseYearTurmasPolicy(int codigoDoCurso,String year,DefaultLogMessages logMessages,ServiceJob service) { |
return loadCourseYearTurmasPolicy("" + codigoDoCurso,year,logMessages,service); |
} |
public static boolean loadCourseYearTurmasPolicy(String codigoDoCurso,String year,DefaultLogMessages logMessages,ServiceJob service) { |
Boolean turmasSeparated = courseYearTurmasPolicy.get(codigoDoCurso + "-" + year); |
if(turmasSeparated != null) |
/branches/v3/impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportSumariesJson.java |
---|
130,6 → 130,10 |
conn = ConnectionManager.openConnection(); |
} |
CourseUnit c = DaoFactory.getCourseUnitDaoImpl().load(cId); |
boolean separateTurmas = ImportCourseService.loadCourseYearTurmasPolicy(c.getCode(), year, logMessages, this); |
//c.getCourse().getCourseYears() |
nowCode = c.getCode(); |
logMessages.addMessage(new DefaultLogMessage("import.info","Importing Summaries to CourseUnit: " + c.getCode() + ": course: " + c.getCourse().getCode(),"", LogMessageTypeEnum.INFO)); |
logger.info("Importing Summaries to CourseUnit: " + c.getName() + " (" + c.getCode() + ") course " + c.getCourse().getName() + " (" + c.getCourse().getCode() + ")"); |
184,6 → 188,21 |
for(pt.estgp.estgweb.services.sigesimports.oracle.domain.Aula aula: arrayOfAulas) |
{ |
//Quando isto era feito as cadeiras não eram separadas em turmas agora como já são |
//vai-se ignorar sumarios de outras turmas |
if(separateTurmas) |
{ |
if(c.getCdTurma() != null && aula.getAula_codigoTurma()!=null |
&& c.getCdTurma().trim().length() > 0 |
&& aula.getAula_codigoTurma().trim().length() > 0 |
&& !aula.getAula_codigoTurma().equals(c.getCdTurma())) |
{ |
//Código de Turma diferente |
System.out.println("Ignoring summary code: " + aula.getAula_codigoTurma() + " for unit " + c.getName() + "/" + c.getCode() + " T:" + c.getCdTurma()); |
continue; |
} |
} |
//todo cdTurma Rollback aqui não retirar o sumário |
//Mas pensar em separar os sumários na página, podemos |
//separar tendo em conta quem entra, se for aluno só vê os |
220,9 → 239,11 |
s.setAlunosPresentes(aula.getSum_numeroPresencas().intValue()); |
s.setTitulo(aula.getSum_titulo()); |
s.setCodigoDocente(aula.getAula_codigoDocente()+ ""); |
s.setCdResponsavel(aula.getCodigoResponsavel()+ ""); |
s.setDescricao(aula.getSum_descricao()); |
s.setcEstado(""+aula.getSum_cdEstado().intValue()); |
s.setNumeroHoras("" + aula.getNumeroCelulas().intValue()); |
s.setCdTurma(aula.getAula_codigoTurma()); |
summaries.put(s.getJson()); |
courseUnitSummaries.add(s); |
if(s.getNumeroAula() > 0) |
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/CourseUnitSummaryImpl.java |
---|
20,7 → 20,29 |
private static final Logger logger = Logger.getLogger(CourseUnitSummaryImpl.class); |
String cdTurma; |
String cdResponsavel; |
public String getCdResponsavel() { |
return cdResponsavel; |
} |
public void setCdResponsavel(String cdResponsavel) { |
this.cdResponsavel = cdResponsavel; |
} |
public static Logger getLogger() { |
return logger; |
} |
public String getCdTurma() { |
return cdTurma; |
} |
public void setCdTurma(String cdTurma) { |
this.cdTurma = cdTurma; |
} |
public Serializable getSerializable() |
{ |
return getId(); |
67,6 → 89,7 |
jsonObject.put("nrAula", getNrAula()); |
jsonObject.put("codigoAula", getCodigoAula()); |
jsonObject.put("codigoDocente", getCodigoDocente()); |
jsonObject.put("codigoResponsavel", getCdResponsavel()); |
jsonObject.put("codigoSumario", getCodigoSumario()); |
jsonObject.put("codigoSalaAula", getCodigoSalaAula()); |
jsonObject.put("alunosPresentes", getAlunosPresentes()); |
75,6 → 98,7 |
jsonObject.put("descricao", getDescricao()); |
jsonObject.put("cEstado", getcEstado()); |
jsonObject.put("numeroHoras", getNumeroHoras()); |
jsonObject.put("cdTurma", getCdTurma()); |
return jsonObject; |
} |