Skip to content
Snippets Groups Projects
Commit b327b587 authored by Bruno Nocera Zanette's avatar Bruno Nocera Zanette
Browse files

Merge branch 'master' of gitlab.c3sl.ufpr.br:participatorio/cadastroweb

parents b27d5488 9255e39c
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java
+ 16
− 1
View file @ b327b587
......@@ -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);
......
src/main/webapp/WEB-INF/tags/form/fields/table.tagx
+ 8
− 2
View file @ b327b587
......@@ -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>
......
src/main/webapp/WEB-INF/views/localizacoes/list.jspx
+ 2
− 2
View file @ b327b587
......@@ -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="/>
......
src/main/webapp/WEB-INF/views/municipios/list.jspx
+ 1
− 1
View file @ b327b587
......@@ -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>
......
src/main/webapp/WEB-INF/views/municipios/select.jspx
+ 1
− 1
View file @ b327b587
......@@ -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
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment