From ae14765a651affcb1a20cced1152012c38de5f45 Mon Sep 17 00:00:00 2001
From: Bruno Nocera Zanette <brunonzanette@gmail.com>
Date: Thu, 25 Sep 2014 15:29:57 -0300
Subject: [PATCH] Modify ShowCandidatos fields to be shown as tables
Modify ShowCandidatos fields to be shown as tables
---
.../ocorrenciamunicipais/showcandidatos.jspx | 60 +++++++++++++-
.../views/programas/showcandidatos.jspx | 80 ++++++++++++++++++-
2 files changed, 136 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/showcandidatos.jspx b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/showcandidatos.jspx
index dd782ae..8e68bf1 100644
--- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/showcandidatos.jspx
+++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/showcandidatos.jspx
@@ -18,7 +18,35 @@
<field:display date="true" dateTimePattern="${ocorrenciaMunicipal_inicioinscricoes_date_format}" field="inicioInscricoes" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_inicioInscricoes" object="${ocorrenciamunicipal}" z="8EyeHOiPhQYjTXn3Xf43tPKtvMU="/>
<field:display date="true" dateTimePattern="${ocorrenciaMunicipal_fiminscricoes_date_format}" field="fimInscricoes" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_fimInscricoes" object="${ocorrenciamunicipal}" z="PbI7ZEO58GGugm/xe65r6lSBhlg="/>
<field:display field="quantidadeVagas" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_quantidadeVagas" object="${ocorrenciamunicipal}" z="rKwiRIW4ZAunEkbuKIBgGgRJnBA="/>
- <field:display field="localizacoes" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_localizacoes" object="${ocorrenciamunicipal}" z="QTI2oWOeoAxOgt/XOBCiMtT7ucY="/>
+
+ <!-- --><field:display field="localizacoes" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_localizacoes" object="${ocorrenciamunicipal}" z="QTI2oWOeoAxOgt/XOBCiMtT7ucY="/>
+
+ <div id="_s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_localizacoes_id">
+ <label for="_localizacoes_id">Localizações :</label>
+ <div id="_s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_localizacoes_localizacoes_id" class="box">
+ <table style="width:80%">
+ <tr>
+ <th>Local</th>
+ <th>Logradouro</th>
+ <th>CEP</th>
+ <th>Telefone</th>
+ <th>Email</th>
+ </tr>
+ <c:forEach xmlns:c="http://java.sun.com/jsp/jstl/core" var="localizacao" items="${ocorrenciamunicipal.localizacoes}">
+ <tr>
+ <td>${localizacao.local}</td>
+ <td>${localizacao.logradouro}</td>
+ <td>${localizacao.cep}</td>
+ <td>${localizacao.telefone}</td>
+ <td>${localizacao.email}</td>
+ </tr>
+ </c:forEach>
+ </table>
+ <jsp:text><br></br></jsp:text>
+ </div>
+ </div>
+ <jsp:text><br></br></jsp:text>
+
<field:display field="status" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_status" object="${ocorrenciamunicipal}" z="uaidViwOg8H5LndeKD6v5Sr7fWE="/>
<field:display field="usuario" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_usuario" object="${ocorrenciamunicipal}" z="sRWyf4nltFtpbLyHh0Bw2DvfGaw="/>
<field:display field="situacao" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_situacao" object="${ocorrenciamunicipal}" z="p/+rYbSA8I8RhTMbk2lKwZjOTcA="/>
@@ -37,7 +65,35 @@
<field:display date="true" dateTimePattern="${ocorrenciaMunicipal_inicioinscricoes_date_format}" field="inicioInscricoes" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_inicioInscricoes" object="${ocorrenciamunicipal}" z="8EyeHOiPhQYjTXn3Xf43tPKtvMU="/>
<field:display date="true" dateTimePattern="${ocorrenciaMunicipal_fiminscricoes_date_format}" field="fimInscricoes" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_fimInscricoes" object="${ocorrenciamunicipal}" z="PbI7ZEO58GGugm/xe65r6lSBhlg="/>
<field:display field="quantidadeVagas" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_quantidadeVagas" object="${ocorrenciamunicipal}" z="rKwiRIW4ZAunEkbuKIBgGgRJnBA="/>
- <field:display field="localizacoes" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_localizacoes" object="${ocorrenciamunicipal}" z="QTI2oWOeoAxOgt/XOBCiMtT7ucY="/>
+
+ <!-- --><field:display field="localizacoes" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_localizacoes" object="${ocorrenciamunicipal}" z="QTI2oWOeoAxOgt/XOBCiMtT7ucY="/>
+
+ <div id="_s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_localizacoes_id">
+ <label for="_localizacoes_id">Localizações :</label>
+ <div id="_s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_localizacoes_localizacoes_id" class="box">
+ <table style="width:80%">
+ <tr>
+ <th>Local</th>
+ <th>Logradouro</th>
+ <th>CEP</th>
+ <th>Telefone</th>
+ <th>Email</th>
+ </tr>
+ <c:forEach xmlns:c="http://java.sun.com/jsp/jstl/core" var="localizacao" items="${ocorrenciamunicipal.localizacoes}">
+ <tr>
+ <td>${localizacao.local}</td>
+ <td>${localizacao.logradouro}</td>
+ <td>${localizacao.cep}</td>
+ <td>${localizacao.telefone}</td>
+ <td>${localizacao.email}</td>
+ </tr>
+ </c:forEach>
+ </table>
+ <jsp:text><br></br></jsp:text>
+ </div>
+ </div>
+ <jsp:text><br></br></jsp:text>
+
<field:display field="status" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_status" object="${ocorrenciamunicipal}" z="uaidViwOg8H5LndeKD6v5Sr7fWE="/>
<field:display field="usuario" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_usuario" object="${ocorrenciamunicipal}" z="sRWyf4nltFtpbLyHh0Bw2DvfGaw="/>
<field:display field="situacao" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_situacao" object="${ocorrenciamunicipal}" z="p/+rYbSA8I8RhTMbk2lKwZjOTcA="/>
diff --git a/src/main/webapp/WEB-INF/views/programas/showcandidatos.jspx b/src/main/webapp/WEB-INF/views/programas/showcandidatos.jspx
index c8be513..d559e79 100644
--- a/src/main/webapp/WEB-INF/views/programas/showcandidatos.jspx
+++ b/src/main/webapp/WEB-INF/views/programas/showcandidatos.jspx
@@ -29,7 +29,45 @@
<field:display field="tematicas" id="s_br_ufpr_c3sl_estacaojuventude_Programa_tematicas" object="${programa}" z="MGW1ri2bdcseKFkrWylIlUuaaZ8="/>
<field:display field="orgaosExecutores" id="s_br_ufpr_c3sl_estacaojuventude_Programa_orgaosExecutores" object="${programa}" z="1gT8Ej5o6DpoZCoNVwb5k04qiEk="/>
<field:display field="parceiros" id="s_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" object="${programa}" z="coSlUd/2gZZHVefaIRLXg0IR7SE="/>
- <field:display field="ocorrencias" id="s_br_ufpr_c3sl_estacaojuventude_Programa_ocorrencias" object="${programa}" z="ilsvE8WyebDaqtMvENxh6UAc8mc="/>
+
+ <!-- <field:display field="ocorrencias" id="s_br_ufpr_c3sl_estacaojuventude_Programa_ocorrencias" object="${programa}" z="ilsvE8WyebDaqtMvENxh6UAc8mc="/> -->
+
+ <div id="_s_br_ufpr_c3sl_estacaojuventude_Programa_ocorrencias_id">
+ <label for="_ocorrencias_id">Ocorrências :</label>
+ <div id="_s_br_ufpr_c3sl_estacaojuventude_Programa_ocorrencias_ocorrencias_id" class="box">
+ <table style="width:80%">
+ <tr>
+ <th>Orgão Local Responsável pela Execução</th>
+ <th>BenefÃcios Locais Agregados</th>
+ <th>Como Acessar</th>
+ <th>Quantidade de Vagas no Total para o MunicÃpio</th>
+ <th>MunicÃpios</th>
+ </tr>
+ <c:forEach xmlns:c="http://java.sun.com/jsp/jstl/core" var="ocorrencia" items="${programa.ocorrencias}">
+ <tr>
+ <td>
+ <c:forEach xmlns:c="http://java.sun.com/jsp/jstl/core" varStatus="loop" var="orgaoExecutor" items="${ocorrencia.orgaosExecutores}" >
+ <jsp:text>${orgaoExecutor.nome}</jsp:text>
+ <c:if test="${!loop.last}">, </c:if>
+ </c:forEach>
+ </td>
+ <td>${ocorrencia.beneficiosLocais}</td>
+ <td>${ocorrencia.comoAcessar}</td>
+ <td>${ocorrencia.quantidadeVagas}</td>
+ <td>
+ <c:forEach xmlns:c="http://java.sun.com/jsp/jstl/core" varStatus="loop" var="municipio" items="${ocorrencia.municipios}">
+ <jsp:text>${municipio.nome}</jsp:text>
+ <c:if test="${!loop.last}">, </c:if>
+ </c:forEach>
+ </td>
+ </tr>
+ </c:forEach>
+ </table>
+ <jsp:text><br></br></jsp:text>
+ </div>
+ </div>
+ <jsp:text><br></br></jsp:text>
+
<field:display field="status" id="s_br_ufpr_c3sl_estacaojuventude_Programa_status" object="${programa}" z="Ex1h1KKyzbozMQkH4LTE8dt9nIs="/>
<field:display field="usuario" id="s_br_ufpr_c3sl_estacaojuventude_Programa_usuario" object="${programa}" z="jm24JcaO4Fl9jBPiK2EQ/5+MJ0s="/>
<field:display field="situacao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_situacao" object="${programa}" z="D19ptiNLpaU9ZLGXHVpHYSHXkW0="/>
@@ -59,7 +97,45 @@
<field:display field="tematicas" id="s_br_ufpr_c3sl_estacaojuventude_Programa_tematicas" object="${programa}" z="MGW1ri2bdcseKFkrWylIlUuaaZ8="/>
<field:display field="orgaosExecutores" id="s_br_ufpr_c3sl_estacaojuventude_Programa_orgaosExecutores" object="${programa}" z="1gT8Ej5o6DpoZCoNVwb5k04qiEk="/>
<field:display field="parceiros" id="s_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" object="${programa}" z="coSlUd/2gZZHVefaIRLXg0IR7SE="/>
- <field:display field="ocorrencias" id="s_br_ufpr_c3sl_estacaojuventude_Programa_ocorrencias" object="${programa}" z="ilsvE8WyebDaqtMvENxh6UAc8mc="/>
+
+ <!-- <field:display field="ocorrencias" id="s_br_ufpr_c3sl_estacaojuventude_Programa_ocorrencias" object="${programa}" z="ilsvE8WyebDaqtMvENxh6UAc8mc="/> -->
+
+ <div id="_s_br_ufpr_c3sl_estacaojuventude_Programa_ocorrencias_id">
+ <label for="_ocorrencias_id">Ocorrências :</label>
+ <div id="_s_br_ufpr_c3sl_estacaojuventude_Programa_ocorrencias_ocorrencias_id" class="box">
+ <table style="width:80%">
+ <tr>
+ <th>Orgão Local Responsável pela Execução</th>
+ <th>BenefÃcios Locais Agregados</th>
+ <th>Como Acessar</th>
+ <th>Quantidade de Vagas no Total para o MunicÃpio</th>
+ <th>MunicÃpios</th>
+ </tr>
+ <c:forEach xmlns:c="http://java.sun.com/jsp/jstl/core" var="ocorrencia" items="${programa.ocorrencias}">
+ <tr>
+ <td>
+ <c:forEach xmlns:c="http://java.sun.com/jsp/jstl/core" varStatus="loop" var="orgaoExecutor" items="${ocorrencia.orgaosExecutores}" >
+ <jsp:text>${orgaoExecutor.nome}</jsp:text>
+ <c:if test="${!loop.last}">, </c:if>
+ </c:forEach>
+ </td>
+ <td>${ocorrencia.beneficiosLocais}</td>
+ <td>${ocorrencia.comoAcessar}</td>
+ <td>${ocorrencia.quantidadeVagas}</td>
+ <td>
+ <c:forEach xmlns:c="http://java.sun.com/jsp/jstl/core" varStatus="loop" var="municipio" items="${ocorrencia.municipios}">
+ <jsp:text>${municipio.nome}</jsp:text>
+ <c:if test="${!loop.last}">, </c:if>
+ </c:forEach>
+ </td>
+ </tr>
+ </c:forEach>
+ </table>
+ <jsp:text><br></br></jsp:text>
+ </div>
+ </div>
+ <jsp:text><br></br></jsp:text>
+
<field:display field="status" id="s_br_ufpr_c3sl_estacaojuventude_Programa_status" object="${programa}" z="Ex1h1KKyzbozMQkH4LTE8dt9nIs="/>
<field:display field="usuario" id="s_br_ufpr_c3sl_estacaojuventude_Programa_usuario" object="${programa}" z="jm24JcaO4Fl9jBPiK2EQ/5+MJ0s="/>
<field:display field="situacao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_situacao" object="${programa}" z="D19ptiNLpaU9ZLGXHVpHYSHXkW0="/>
--
GitLab