diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java
index 1da047c57666181bd48e72909fd8ab72d1004846..a1b89860cc86b2265ffc924f41f9593863aa4f14 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java
@@ -39,7 +39,7 @@ import br.ufpr.c3sl.estacaojuventude.enums.TipoStatus;
import br.ufpr.c3sl.estacaojuventude.enums.TipoTemporalidade;
@RequestMapping("/programas")
-@SessionAttributes( { "programa", "create" })
+@SessionAttributes( { "programa", "create", "Itinerante" })
@Controller
@RooWebScaffold(path = "programas", formBackingObject = Programa.class)
public class ProgramaController {
@@ -468,6 +468,13 @@ public class ProgramaController {
@RequestMapping(value = "pesquisa", method = RequestMethod.GET)
public String searchProgramas(@Valid Programa programa, Model uiModel) {
+ if(!uiModel.asMap().containsKey("Itinerante")){
+ uiModel.addAttribute("Itinerante", false);
+ }
+ if((Boolean)uiModel.asMap().get("Itinerante")){
+ uiModel.addAttribute("Itinerante", false);
+ }
+
if(!uiModel.asMap().containsKey("create")){
uiModel.addAttribute("create", false);
@@ -494,6 +501,14 @@ public class ProgramaController {
void populateEditForm(Model uiModel, Programa programa) {
uiModel.addAttribute("programa", programa);
+
+ if(!uiModel.asMap().containsKey("Itinerante")){
+ uiModel.addAttribute("Itinerante", false);
+ }
+ if((Boolean)uiModel.asMap().get("Itinerante")){
+ uiModel.addAttribute("Itinerante", false);
+ }
+
uiModel.addAttribute("create", true);
addDateTimeFormatPatterns(uiModel);
diff --git a/src/main/webapp/WEB-INF/tags/form/fields/table.tagx b/src/main/webapp/WEB-INF/tags/form/fields/table.tagx
index 74c83e81671da85b9aabf01efa2d6a72dbfd9af0..d9e7df126b3534e8927e4a2ed0804e4dbaeb8918 100644
--- a/src/main/webapp/WEB-INF/tags/form/fields/table.tagx
+++ b/src/main/webapp/WEB-INF/tags/form/fields/table.tagx
@@ -75,7 +75,7 @@
<c:set var="control" value="true" />
<c:forEach items="${data}" var="item">
<tr>
- <c:set var="itemId"><spring:eval expression="item[typeIdFieldName]"/></c:set>
+ <c:set var="itemId"><spring:eval expression="item.${typeIdFieldName}"/></c:set>
<td class="utilbox">
<c:choose>
@@ -99,6 +99,12 @@
<c:set var="columnMaxLength" value="${lengths[num.count-1]}" />
<c:set var="columnType" value="${types[num.count-1]}" />
<c:set var="columnDatePattern" value="${patterns[num.count-1]}" />
+ <c:set var="prop" value="${item}" />
+ <c:forTokens items="${column}" delims="." var="subprop">
+ <c:if test="${not empty prop}">
+ <c:set var="prop" value="${prop[subprop]}" />
+ </c:if>
+ </c:forTokens>
<td>
<c:choose>
<c:when test="${columnType eq 'date'}">
@@ -113,7 +119,7 @@
</c:when>
<c:otherwise>
<c:set var="colTxt">
- <spring:eval expression="item[column]" htmlEscape="false" />
+ <spring:eval expression="item.${column}" htmlEscape="false" />
</c:set>
</c:otherwise>
</c:choose>
diff --git a/src/main/webapp/WEB-INF/views/localizacoes/list.jspx b/src/main/webapp/WEB-INF/views/localizacoes/list.jspx
index 55062382f65815f3f84d87b91ccf2c1d4bcfcedb..afdb8bfcbeb5bad864d5e7a352041a250210432e 100644
--- a/src/main/webapp/WEB-INF/views/localizacoes/list.jspx
+++ b/src/main/webapp/WEB-INF/views/localizacoes/list.jspx
@@ -5,7 +5,7 @@
<sec:authorize ifAnyGranted="Administrador">
<page:list id="pl_br_ufpr_c3sl_estacaojuventude_Localizacao" items="${localizacoes}" z="user-managed">
<table:table data="${localizacoes}" id="l_br_ufpr_c3sl_estacaojuventude_Localizacao" path="/localizacoes" z="user-managed">
- <table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ocorrencia" label="Programa - Município" property="ocorrencia" z="user-managed"/>
+ <table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ocorrencia" label="Programa - Município" property="ocorrencia.programaVinculado" z="user-managed"/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_local" property="local" z="xSJytVXDQ3YxHNNm+4W+rn8r5o4="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_logradouro" property="logradouro" z="YFxKUL0PxRPG/YieskOYcbYs2Mg="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_bairro" property="bairro" z="PUf0Gi792lTsdmfZ0JhMPIciYt4="/>
@@ -17,7 +17,7 @@
<sec:authorize ifAnyGranted="Usuario">
<page:list id="pl_br_ufpr_c3sl_estacaojuventude_Localizacao" items="${localizacoes}" z="e3STKf8oW/0oqDr/KihOxpAlGBY=">
<table:table data="${localizacoes}" delete="false" id="l_br_ufpr_c3sl_estacaojuventude_Localizacao" path="/localizacoes" update="false" z="LCLLP2BD/iSyYc+oJVBSMRvXM+Q=">
- <table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ocorrencia" label="Programa - Município" property="ocorrencia" z="Zh52x+nH2S0PROzIt5iOOf1mGt0="/>
+ <table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ocorrencia" label="Programa - Município" property="ocorrencia.programaVinculado.nomeOficial" z="Zh52x+nH2S0PROzIt5iOOf1mGt0="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_local" property="local" z="xSJytVXDQ3YxHNNm+4W+rn8r5o4="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_logradouro" property="logradouro" z="YFxKUL0PxRPG/YieskOYcbYs2Mg="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_bairro" property="bairro" z="PUf0Gi792lTsdmfZ0JhMPIciYt4="/>
diff --git a/src/main/webapp/WEB-INF/views/municipios/list.jspx b/src/main/webapp/WEB-INF/views/municipios/list.jspx
index f679d856c379f93d019229c6ff2ab0d43c069be3..f6f0dc6cb689e09530b94204955a280669c0d4a9 100644
--- a/src/main/webapp/WEB-INF/views/municipios/list.jspx
+++ b/src/main/webapp/WEB-INF/views/municipios/list.jspx
@@ -5,7 +5,7 @@
<page:list id="pl_br_ufpr_c3sl_estacaojuventude_Municipio" items="${municipios}" z="2wVFBv6ce2XQIjmyowYmQqD1vzk=">
<table:table data="${municipios}" id="l_br_ufpr_c3sl_estacaojuventude_Municipio" path="/municipios" z="rhnEGLOhLdBOJ4EOinM66orIb30=">
<table:column id="c_br_ufpr_c3sl_estacaojuventude_Municipio_nome" property="nome" z="D1DwqXeK4loAV5KxmlUPbn3sr90="/>
- <table:column id="c_br_ufpr_c3sl_estacaojuventude_Municipio_uf" property="uf" z="DOWcMP8UAU35st+Rx0Ufg71zNxo="/>
+ <table:column id="c_br_ufpr_c3sl_estacaojuventude_Municipio_uf" property="uf.sigla" z="DOWcMP8UAU35st+Rx0Ufg71zNxo="/>
<table:column date="true" dateTimePattern="${municipio_ultimaalteracao_date_format}" id="c_br_ufpr_c3sl_estacaojuventude_Municipio_ultimaAlteracao" property="ultimaAlteracao" render="false" z="user-managed"/>
</table:table>
</page:list>
diff --git a/src/main/webapp/WEB-INF/views/municipios/select.jspx b/src/main/webapp/WEB-INF/views/municipios/select.jspx
index 1442a1ac69b87f0c6aeab85827e69159e68aa945..7fb8c852ade0772f6ed93e9234fd0b4ea14978ff 100644
--- a/src/main/webapp/WEB-INF/views/municipios/select.jspx
+++ b/src/main/webapp/WEB-INF/views/municipios/select.jspx
@@ -5,7 +5,7 @@
<page:list id="pl_br_ufpr_c3sl_estacaojuventude_Municipio" items="${municipios}" >
<table:table data="${municipios}" id="l_br_ufpr_c3sl_estacaojuventude_Municipio" path="/selecionar" pathShow="municipios" select="true" create="false" update="false" delete="false" >
<table:column id="c_br_ufpr_c3sl_estacaojuventude_Municipio_nome" property="nome" />
- <table:column id="c_br_ufpr_c3sl_estacaojuventude_Municipio_uf" property="uf" />
+ <table:column id="c_br_ufpr_c3sl_estacaojuventude_Municipio_uf" property="uf.sigla" />
</table:table>
</page:list>
</div>
\ No newline at end of file