Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1554 → Rev 1557

/branches/v3/impl/conf/berserk/sd.xml
1107,6 → 1107,18
</service>
 
<service>
<name>LoadCourseUnitsBySigesCodesSemestreLastYearProgram</name>
<implementationClass>pt.estgp.estgweb.services.courseunits.LoadCourseUnitsBySigesCodesService</implementationClass>
<description>Load a unique unit by sigescode, semestre and course code</description>
<isTransactional>true</isTransactional>
<defaultMethod>loadLastYearProgram</defaultMethod>
<filterChains>
<chain name="Logger"/>
<chain name="Session"/>
</filterChains>
</service>
 
<service>
<name>LoadCourseUnitWorks</name>
<implementationClass>pt.estgp.estgweb.services.courseunits.CourseUnitWorkService</implementationClass>
<description>Load course unit works</description>
/branches/v3/impl/src/java/pt/estgp/estgweb/services/courseunits/LoadCourseUnitsBySigesCodesService.java
65,4 → 65,24
return null;
return new CourseUnitView(courseUnit);
}
 
public CourseUnitView loadLastYearProgram(String code, String courseCode, String semestre, UserSession userSession) throws ServiceException {
 
if(semestre.equals("S3"))
semestre = "S1";
else if(semestre.equals("S4"))
semestre = "S2";
else if(semestre.equals("S5"))
semestre = "S1";
else if(semestre.equals("S6"))
semestre = "S2";
else if(semestre.startsWith("A"))
semestre = "A";
 
CourseUnit courseUnit = DaoFactory.getCourseUnitDaoImpl().loadBySigesCodeUniqueLastYearProgram(code, courseCode,semestre);
 
if(courseUnit == null)
return null;
return new CourseUnitView(courseUnit);
}
}
/branches/v3/impl/src/java/pt/estgp/estgweb/services/questionarios/utils/ChartBuilderUtil.java
186,7 → 186,7
 
String pathGraficoRespostas = Globals.TMP_DIR + File.separator + "graficoRespostas" + pathTmp + ".png";
//String pathGraficoRespostas = "/Volumes/Home/jorgemachado/Desktop/graficoRespostas.png";
ChartUtilities.saveChartAsPNG(new File(pathGraficoRespostas), chart, 550, 400, info);
ChartUtilities.saveChartAsPNG(new File(pathGraficoRespostas), chart, 550, 450, info);
QuestionariosReport.RespostasChart respostasChart = new QuestionariosReport.RespostasChart();
respostasChart.setTempFile(pathGraficoRespostas);
respostasChart.setPergunta(pergunta);
/branches/v3/impl/src/java/pt/estgp/estgweb/services/questionarios/QuestionariosReport.java
84,6 → 84,10
public RespostasAgregadasCharts respostasAgregadasUnidadesCharts = new RespostasAgregadasCharts();
public DataTable respostasUnidadesTable;
 
public RespostasAgregadasCharts respostasAgregadasUnidadesChartsGt2Secs = new RespostasAgregadasCharts();
public DataTable respostasUnidadesTableGt2Secs;
 
 
public int docentesNosCursos;
public int docentesNasEscolas;
 
91,7 → 95,22
public int unidadesNasEscolas;
 
 
public RespostasAgregadasCharts getRespostasAgregadasUnidadesChartsGt2Secs() {
return respostasAgregadasUnidadesChartsGt2Secs;
}
 
public void setRespostasAgregadasUnidadesChartsGt2Secs(RespostasAgregadasCharts respostasAgregadasUnidadesChartsGt2Secs) {
this.respostasAgregadasUnidadesChartsGt2Secs = respostasAgregadasUnidadesChartsGt2Secs;
}
 
public DataTable getRespostasUnidadesTableGt2Secs() {
return respostasUnidadesTableGt2Secs;
}
 
public void setRespostasUnidadesTableGt2Secs(DataTable respostasUnidadesTableGt2Secs) {
this.respostasUnidadesTableGt2Secs = respostasUnidadesTableGt2Secs;
}
 
public int getUnidadesNosCursos() {
return unidadesNosCursos;
}
525,6 → 544,11
respostasAgregadasChartsGt2Secs.addChart(chart);
}
 
public void addRespostasAgregadasUnidadesChartGt2Secs(RespostasChart chart)
{
respostasAgregadasUnidadesChartsGt2Secs.addChart(chart);
}
 
public void addRespostasAgregadasUnidadesChart(RespostasChart chart)
{
respostasAgregadasUnidadesCharts.addChart(chart);
/branches/v3/impl/src/java/pt/estgp/estgweb/services/questionarios/pedagogico/docenteReport.fo.xsl
198,31 → 198,138
</fo:flow>
</xsl:template>
 
 
 
 
 
<xsl:template name="seccao">
<xsl:param name="text"/>
<xsl:param name="marginTop">5px</xsl:param>
<fo:block
font-size="16px"
font-weight="bold"
padding="4px"
margin-top="{$marginTop}"
text-align="left"
background-color="#FFEAAE">
<xsl:value-of select="$text"/>
<xsl:param name="marginTop">0</xsl:param>
<xsl:param name="icon"></xsl:param>
<xsl:call-template name="seccaoGen">
<xsl:with-param name="text" select="$text"/>
<xsl:with-param name="marginTop" select="$marginTop"/>
<xsl:with-param name="icon" select="$icon"/>
<xsl:with-param name="backcolor">#FFEAAE</xsl:with-param>
</xsl:call-template>
</xsl:template>
 
<xsl:template name="seccaoGreen">
<xsl:param name="text"/>
<xsl:param name="marginTop">0</xsl:param>
<xsl:param name="icon"></xsl:param>
<xsl:call-template name="seccaoGen">
<xsl:with-param name="text" select="$text"/>
<xsl:with-param name="marginTop" select="$marginTop"/>
<xsl:with-param name="icon" select="$icon"/>
<xsl:with-param name="backcolor">#DDFCB1</xsl:with-param>
</xsl:call-template>
</xsl:template>
 
<xsl:template name="seccaoBlue">
<xsl:param name="text"/>
<xsl:param name="marginTop">0</xsl:param>
<xsl:param name="icon"></xsl:param>
<xsl:call-template name="seccaoGen">
<xsl:with-param name="text" select="$text"/>
<xsl:with-param name="marginTop" select="$marginTop"/>
<xsl:with-param name="icon" select="$icon"/>
<xsl:with-param name="backcolor">#B2E6FE</xsl:with-param>
</xsl:call-template>
</xsl:template>
 
 
 
<!-- GENERIC SECCION -->
<xsl:template name="seccaoGen">
<xsl:param name="text"/>
<xsl:param name="marginTop">0</xsl:param>
<xsl:param name="icon"></xsl:param>
<xsl:param name="backcolor">#B2E6FE</xsl:param>
<fo:block padding="0" padding-left="0" margin="0">
<fo:table width="100%" table-layout="fixed" border="0" margin="0" padding="0">
<fo:table-column column-width="90%"/>
<fo:table-column column-width="10%"/>
<fo:table-body>
<fo:table-row >
<fo:table-cell
padding="2px"
background-color="{$backcolor}"
display-align="center">
<fo:block
font-size="12px"
font-weight="bold"
margin-top="{$marginTop}"
text-align="left"
>
<xsl:value-of select="$text"/>
</fo:block>
</fo:table-cell>
<fo:table-cell display-align="center" text-align="right" padding-right="5px">
<fo:block>
<xsl:if test="$icon">
 
<fo:external-graphic height="auto" width="auto"
content-height="20">
<!--<xsl:attribute name="src">url('http://www.ipportalegre.pt/imagens/Logos/ESTG/Logotipo%20ESTG.jpg')</xsl:attribute>-->
<xsl:attribute name="src">url('<xsl:value-of select="$site"/>/imgs/questionarios/<xsl:value-of select="$icon"/>')
</xsl:attribute>
</fo:external-graphic>
 
</xsl:if>
</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
</fo:block>
</xsl:template>
 
 
 
 
<xsl:template name="subSeccao">
<xsl:param name="text"/>
<xsl:param name="marginTop">15px</xsl:param>
<fo:block font-size="13px"
<xsl:param name="marginTop">8px</xsl:param>
<xsl:call-template name="subSeccaoGen">
<xsl:with-param name="text" select="$text"/>
<xsl:with-param name="marginTop" select="$marginTop"/>
<xsl:with-param name="backcolor">#D6D9BC</xsl:with-param>
</xsl:call-template>
</xsl:template>
 
<xsl:template name="subSeccaoGreen">
<xsl:param name="text"/>
<xsl:param name="marginTop">8px</xsl:param>
<xsl:call-template name="subSeccaoGen">
<xsl:with-param name="text" select="$text"/>
<xsl:with-param name="marginTop" select="$marginTop"/>
<xsl:with-param name="backcolor">#D0FCCD</xsl:with-param>
</xsl:call-template>
</xsl:template>
<xsl:template name="subSeccaoBlue">
<xsl:param name="text"/>
<xsl:param name="marginTop">8px</xsl:param>
<xsl:call-template name="subSeccaoGen">
<xsl:with-param name="text" select="$text"/>
<xsl:with-param name="marginTop" select="$marginTop"/>
<xsl:with-param name="backcolor">#CFF6FE</xsl:with-param>
</xsl:call-template>
</xsl:template>
 
<xsl:template name="subSeccaoGen">
<xsl:param name="text"/>
<xsl:param name="marginTop">8px</xsl:param>
<xsl:param name="backcolor"></xsl:param>
<fo:block font-size="10px"
padding-top="3px"
padding-bottom="3px"
padding-left="5px"
margin-left="10px"
margin-top="{$marginTop}"
margin-bottom="20px"
text-align="left"
background-color="#D6D9BC">
background-color="{$backcolor}">
<xsl:value-of select="$text"/>
</fo:block>
</xsl:template>
250,17 → 357,19
</fo:static-content>
 
<fo:flow flow-name="body">
<fo:block-container padding="0" margin="0" id="capParticipacao" page-break-before="always">
<fo:block-container padding="0" margin="0" border="0" id="capParticipacao" page-break-before="always">
<xsl:call-template name="seccao">
<xsl:with-param name="text">1 - Participação</xsl:with-param>
<xsl:with-param name="marginTop">0</xsl:with-param>
</xsl:call-template>
</fo:block-container>
 
 
<xsl:call-template name="subSeccao">
<xsl:with-param name="text">Taxa Global de Participação aos Questionários do Docente</xsl:with-param>
</xsl:call-template>
 
 
<fo:block-container font-size="18" text-align="center" font-weight="bold">
<xsl:call-template name="barraPercentil">
<xsl:with-param name="valor" select="//questionariosReqRespondidosPercentagem"/>
467,24 → 576,35
 
 
<fo:block-container padding="0" margin="0" id="capQuestoes" page-break-before="always">
<xsl:call-template name="seccao">
<xsl:call-template name="seccaoBlue">
<xsl:with-param name="text">3 - Análise das Questões sobre o Docente</xsl:with-param>
<xsl:with-param name="marginTop">0</xsl:with-param>
<xsl:with-param name="icon">teacherIcon.png</xsl:with-param>
</xsl:call-template>
</fo:block-container>
 
<xsl:call-template name="subSeccao">
<fo:block-container padding="0" margin="0">
<xsl:call-template name="subSeccaoBlue">
<xsl:with-param name="text">3.1 - Gráficos de respostas agregadas de todas as unidades do docente</xsl:with-param>
<xsl:with-param name="marginTop">2px</xsl:with-param>
</xsl:call-template>
</fo:block-container>
 
<xsl:apply-templates select="//respostasAgregadasCharts/respostasChartsRow" mode="graficosPerguntas"/>
 
<fo:block-container padding="0" margin="0" page-break-before="always">
<xsl:call-template name="subSeccao">
<xsl:with-param name="text">3.2 - Tabela de respostas agregadas de todas as unidades do docente</xsl:with-param>
<fo:block-container padding="0" margin="0" page-break-before="always">
<xsl:call-template name="seccaoBlue">
<xsl:with-param name="text">3 - Análise das Questões sobre o Docente</xsl:with-param>
<xsl:with-param name="marginTop">0</xsl:with-param>
<xsl:with-param name="icon">teacherIcon.png</xsl:with-param>
</xsl:call-template>
</fo:block-container>
 
<xsl:call-template name="subSeccaoBlue">
<xsl:with-param name="text">3.2 - Tabela de respostas agregadas de todas as unidades do docente</xsl:with-param>
<xsl:with-param name="marginTop">2px</xsl:with-param>
</xsl:call-template>
 
<fo:block text-align="center" margin="0" font-size="10" font-weight="normal" >
<xsl:apply-templates select="//respostasTable" mode="DataTable">
<xsl:with-param name="firstColPercentSize">40%</xsl:with-param>
497,14 → 617,14
Docentes avaliados nas escolas onde o docente leciona: <xsl:value-of select="//docentesNasEscolas"/>
</fo:block>
 
<fo:block-container margin-top="5px" margin-bottom="5px">
<fo:block-container margin-top="20px" margin-bottom="5px">
<xsl:apply-templates select="//mediasGrupoDocente" mode="mediasGrupo">
<xsl:with-param name="objetoAvaliacao">do docente</xsl:with-param>
</xsl:apply-templates>
</fo:block-container>
 
<!--Considerando Respostas Superiores a 2 segindos-->
<fo:block-container background-color="#aaaaaa" padding="5px" margin="0" margin-top="10px">
<fo:block-container background-color="#aaaaaa" padding="5px" margin="0" margin-top="20px">
<fo:block-container padding="0" margin="0">
<xsl:call-template name="subSubSeccao">
<xsl:with-param name="text">Considerando apenas respostas de tempo superior a 2 segundos (Estes dados são apenas para efeitos de comparação)</xsl:with-param>
526,26 → 646,35
<!-- RESPOSTAS AGREGADAS DAS UNIDADES CURRICULARES -->
 
<fo:block-container padding="0" margin="0" id="capQuestoesUnidades" page-break-before="always">
<xsl:call-template name="seccao">
<xsl:call-template name="seccaoGreen">
<xsl:with-param name="text">4 - Análise das questões relativas ao grupo unidade para as unidades do docente</xsl:with-param>
<xsl:with-param name="marginTop">0</xsl:with-param>
<xsl:with-param name="icon">cadeiraConteudos.png</xsl:with-param>
</xsl:call-template>
</fo:block-container>
 
<xsl:call-template name="subSeccao">
<xsl:call-template name="subSeccaoGreen">
<xsl:with-param name="text">4.1 - Gráficos de respostas agregadas de todas as unidades</xsl:with-param>
<xsl:with-param name="marginTop">2px</xsl:with-param>
</xsl:call-template>
 
<xsl:apply-templates select="//respostasAgregadasUnidadesCharts/respostasChartsRow" mode="graficosPerguntas"/>
 
 
<fo:block-container padding="0" margin="0" page-break-before="always">
<xsl:call-template name="subSeccao">
<xsl:with-param name="text">4.2 - Tabela de respostas agregadas de todas as unidades do docente</xsl:with-param>
<xsl:call-template name="seccaoGreen">
<xsl:with-param name="text">4 - Análise das questões relativas ao grupo unidade para as unidades do docente</xsl:with-param>
<xsl:with-param name="marginTop">0</xsl:with-param>
<xsl:with-param name="icon">cadeiraConteudos.png</xsl:with-param>
</xsl:call-template>
</fo:block-container>
 
<xsl:call-template name="subSeccaoGreen">
<xsl:with-param name="text">4.2 - Tabela de respostas agregadas de todas as unidades do docente</xsl:with-param>
<xsl:with-param name="marginTop">2px</xsl:with-param>
</xsl:call-template>
 
 
<fo:block text-align="center" margin="0" font-size="10" font-weight="normal" >
<xsl:apply-templates select="//respostasUnidadesTable" mode="DataTable">
<xsl:with-param name="firstColPercentSize">40%</xsl:with-param>
559,12 → 688,27
Unidades avaliadas nas escolas onde o docente leciona: <xsl:value-of select="//unidadesNasEscolas"/>
</fo:block>
 
<fo:block-container margin-top="5px" margin-bottom="5px">
<fo:block-container margin-top="20px" margin-bottom="5px">
<xsl:apply-templates select="//mediasGrupoUnidades" mode="mediasGrupo">
<xsl:with-param name="objetoAvaliacao">das unidades</xsl:with-param>
</xsl:apply-templates>
</fo:block-container>
 
<!--Considerando Respostas Superiores a 2 segindos-->
<fo:block-container background-color="#aaaaaa" padding="5px" margin="0" margin-top="20px">
<fo:block-container padding="0" margin="0">
<xsl:call-template name="subSubSeccao">
<xsl:with-param name="text">Considerando apenas respostas de tempo superior a 2 segundos (Estes dados são apenas para efeitos de comparação)</xsl:with-param>
</xsl:call-template>
</fo:block-container>
 
<fo:block text-align="center" margin-left="10px" font-size="10" font-weight="normal" margin-right="10px">
<xsl:apply-templates select="//respostasUnidadesTableGt2Secs" mode="DataTable">
<xsl:with-param name="firstColPercentSize">40%</xsl:with-param>
</xsl:apply-templates>
</fo:block>
</fo:block-container>
 
</fo:flow>
</xsl:template>
 
/branches/v3/impl/src/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitDaoImpl.java
366,13 → 366,35
return null;
}
 
public CourseUnit loadBySigesCodeUniqueMostRecentProgram(String sigesCode, String courseCode, String semestre)
{
List<CourseUnit> cus;
Criteria cr = createCriteria()
.add(eq("code", sigesCode))
.add(eq("courseCode", courseCode));
if(semestre != null)
cr.add(eq("semestre", semestre));
cr.add(and(isNotNull("programStreamId"),not(eq("programStreamId",""))));
cr.addOrder(Order.desc("importYear")).setMaxResults(1);
cus = cr.list();
if(cus.size() > 0)
return cus.get(0);
logger.warn("Accessing unit not existent with siges code " + sigesCode + " course code: " + courseCode + " semestre: " + semestre);
return null;
}
 
 
public CourseUnit loadBySigesCodeUniqueLastYear(String sigesCode, String courseCode, String semestre)
{
return loadBySigesCodeUniqueMostRecent(sigesCode,courseCode,semestre);
}
 
public CourseUnit loadBySigesCodeUniqueLastYearProgram(String sigesCode, String courseCode, String semestre)
{
return loadBySigesCodeUniqueMostRecentProgram(sigesCode,courseCode,semestre);
}
 
 
public List<CourseUnit> loadBySigesCodeUnique(String sigesCode, String courseCode, String year)
{
return createCriteria()
/branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/courseunits/CourseUnitsController.java
264,7 → 264,7
IServiceManager sm = ServiceManager.getInstance();
String[] names = new String[]{};
Object[] args = new Object[]{unitCode,courseCode,semestre};
CourseUnitView cUV = (CourseUnitView) sm.execute(RequestUtils.getRequester(request, response), "LoadCourseUnitsBySigesCodesSemestreLastYear", args, names);
CourseUnitView cUV = (CourseUnitView) sm.execute(RequestUtils.getRequester(request, response), "LoadCourseUnitsBySigesCodesSemestreLastYearProgram", args, names);
return loadCourseUnitAndForward(cUF,cUV.getId() ,true,false, mapping, request, response);
 
}
296,7 → 296,7
IServiceManager sm = ServiceManager.getInstance();
String[] names = new String[]{};
Object[] args = new Object[]{unitCode,courseCode,semestre};
CourseUnitView cUV = (CourseUnitView) sm.execute(RequestUtils.getRequester(request, response), "LoadCourseUnitsBySigesCodesSemestreLastYear", args, names);
CourseUnitView cUV = (CourseUnitView) sm.execute(RequestUtils.getRequester(request, response), "LoadCourseUnitsBySigesCodesSemestreLastYearProgram", args, names);
 
ActionRedirect forward = new ActionRedirect();
forward.setPath("/repositoryStream/" + cUV.getProgramStreamId());
/branches/v3/impl/src/web/imgs/questionarios/cadeiraConteudos.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream
/branches/v3/impl/src/web/imgs/questionarios/cadeiraCadeira.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream
/branches/v3/impl/src/web/imgs/questionarios/cadeiraIcon.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream
/branches/v3/impl/src/web/imgs/questionarios/teacherIcon.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream
/branches/v3/impl/src/web/imgs/questionarios/class.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream
/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportFileGroupAno.java
New file
0,0 → 1,31
package pt.estgp.estgweb.domain;
// Generated 9/Nov/2016 11:46:52 by Hibernate Tools 3.2.0.b9
 
 
 
/**
* QuestionarioReportFileGroupAno generated by hbm2java
*/
public abstract class QuestionarioReportFileGroupAno extends pt.estgp.estgweb.domain.QuestionarioReportFileGroupImpl implements java.io.Serializable {
 
 
private String importYear;
 
public QuestionarioReportFileGroupAno() {
}
 
public String getImportYear() {
return this.importYear;
}
public void setImportYear(String importYear) {
this.importYear = importYear;
}
 
 
 
 
}