diff --git a/pom.xml b/pom.xml
index b660e17e6fb14134611976588cde7e2c72f90d2c..82e9ca3db819f95e6784fe91a9546b0e60bbd5a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
<aspectj.version>1.7.0</aspectj.version>
<java.version>6</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <roo.version>1.2.3.RELEASE</roo.version>
+ <roo.version>1.2.4.RELEASE</roo.version>
<slf4j.version>1.7.2</slf4j.version>
<spring.version>3.2.0.RELEASE</spring.version>
<spring-security.version>3.1.0.RELEASE</spring-security.version>
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/OcorrenciaMunicipal.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/OcorrenciaMunicipal.java
index 4d15a6efa6c8ea11df65f8837765efc3865a495f..90ac4dd3bffe1ec888222be2c8f2e7b07e0ec7a5 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/OcorrenciaMunicipal.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/OcorrenciaMunicipal.java
@@ -1,10 +1,8 @@
package br.ufpr.c3sl.estacaojuventude;
-
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.EnumType;
@@ -13,13 +11,11 @@ import javax.persistence.ManyToMany;
import javax.persistence.OneToOne;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
-
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.roo.addon.javabean.RooJavaBean;
import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
import org.springframework.roo.addon.tostring.RooToString;
import org.springframework.security.core.context.SecurityContextHolder;
-
import br.ufpr.c3sl.estacaojuventude.enums.Situacao;
import br.ufpr.c3sl.estacaojuventude.enums.TipoStatus;
@@ -28,46 +24,46 @@ import br.ufpr.c3sl.estacaojuventude.enums.TipoStatus;
@RooJpaActiveRecord
public class OcorrenciaMunicipal {
- @OneToOne
- private Programa programaVinculado;
-
- @OneToOne
- private Municipio municipio;
+ @OneToOne
+ private Programa programaVinculado;
- @ManyToMany(cascade = CascadeType.ALL)
- private Set<OrgaoExecutor> orgaosExecutores = new HashSet<OrgaoExecutor>();
+ @ManyToMany(cascade = CascadeType.ALL)
+ private Set<Municipio> municipios = new HashSet<Municipio>();
+
+ @ManyToMany(cascade = CascadeType.ALL)
+ private Set<OrgaoExecutor> orgaosExecutores = new HashSet<OrgaoExecutor>();
- private Integer quantidadeVagas;
+ private Integer quantidadeVagas;
- @Column(columnDefinition = "text")
- private String beneficiosLocais;
+ @Column(columnDefinition = "text")
+ private String beneficiosLocais;
- @Column(columnDefinition = "text")
- private String comoAcessar;
+ @Column(columnDefinition = "text")
+ private String comoAcessar;
- @Temporal(TemporalType.DATE)
+ @Temporal(TemporalType.DATE)
@DateTimeFormat(style = "S-")
- private Date inicioInscricoes;
+ private Date inicioInscricoes;
- @Temporal(TemporalType.DATE)
+ @Temporal(TemporalType.DATE)
@DateTimeFormat(style = "S-")
- private Date fimInscricoes;
-
- @ManyToMany(cascade = CascadeType.ALL, mappedBy = "ocorrencia")
- private Set<Localizacao> localizacoes = new HashSet<Localizacao>();
-
- @Column(columnDefinition = "text")
+ private Date fimInscricoes;
+
+ @ManyToMany(cascade = CascadeType.ALL, mappedBy = "ocorrencia")
+ private Set<Localizacao> localizacoes = new HashSet<Localizacao>();
+
+ @Column(columnDefinition = "text")
private String observacao;
-
- @Enumerated(EnumType.STRING)
+
+ @Enumerated(EnumType.STRING)
private Situacao situacao;
-
- @Enumerated(EnumType.STRING)
+
+ @Enumerated(EnumType.STRING)
private TipoStatus status;
@OneToOne
private Usuario usuario;
-
+
@Temporal(TemporalType.DATE)
@DateTimeFormat(style = "S-")
private Date ultimaAlteracao;
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/OcorrenciaMunicipal_Roo_JavaBean.aj b/src/main/java/br/ufpr/c3sl/estacaojuventude/OcorrenciaMunicipal_Roo_JavaBean.aj
index e031b38ab39528646ca28d896116bb17ef92f423..3cf563edd885670f0eda3b1e206c0541118b1e6b 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/OcorrenciaMunicipal_Roo_JavaBean.aj
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/OcorrenciaMunicipal_Roo_JavaBean.aj
@@ -24,12 +24,12 @@ privileged aspect OcorrenciaMunicipal_Roo_JavaBean {
this.programaVinculado = programaVinculado;
}
- public Municipio OcorrenciaMunicipal.getMunicipio() {
- return this.municipio;
+ public Set<Municipio> OcorrenciaMunicipal.getMunicipios() {
+ return this.municipios;
}
- public void OcorrenciaMunicipal.setMunicipio(Municipio municipio) {
- this.municipio = municipio;
+ public void OcorrenciaMunicipal.setMunicipios(Set<Municipio> municipios) {
+ this.municipios = municipios;
}
public Set<OrgaoExecutor> OcorrenciaMunicipal.getOrgaosExecutores() {
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ApplicationConversionServiceFactoryBean.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ApplicationConversionServiceFactoryBean.java
index 770c5edfb7d7f7d6b2e4daef89d06e94fbf5b0f0..f056a839b94983861f7bdd50e56de9229b6ecbfd 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ApplicationConversionServiceFactoryBean.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ApplicationConversionServiceFactoryBean.java
@@ -73,23 +73,23 @@ public class ApplicationConversionServiceFactoryBean extends FormattingConversio
};
}
- public Converter<Localizacao, String> getLocalizacaoToStringConverter() {
- return new org.springframework.core.convert.converter.Converter<br.ufpr.c3sl.estacaojuventude.Localizacao, java.lang.String>() {
- public String convert(Localizacao localizacao) {
- return new StringBuilder().append(localizacao.getOcorrencia().getProgramaVinculado().getNomeOficial()).append(" - ").append(localizacao.getOcorrencia().getMunicipio().getNome()).toString();
- }
- };
- }
-
- public Converter<OcorrenciaMunicipal, String> getOcorrenciaMunicipalToStringConverter() {
- return new org.springframework.core.convert.converter.Converter<br.ufpr.c3sl.estacaojuventude.OcorrenciaMunicipal, java.lang.String>() {
- public String convert(OcorrenciaMunicipal ocorrenciaMunicipal) {
- if (ocorrenciaMunicipal.getProgramaVinculado() == null || ocorrenciaMunicipal.getMunicipio() == null)
- return new StringBuilder().append("").toString();
- return new StringBuilder().append(ocorrenciaMunicipal.getProgramaVinculado().getNomeOficial()).append(" - ").append(ocorrenciaMunicipal.getMunicipio().getNome()).toString();
- }
- };
- }
+// public Converter<Localizacao, String> getLocalizacaoToStringConverter() {
+// return new org.springframework.core.convert.converter.Converter<br.ufpr.c3sl.estacaojuventude.Localizacao, java.lang.String>() {
+// public String convert(Localizacao localizacao) {
+// return new StringBuilder().append(localizacao.getOcorrencia().getProgramaVinculado().getNomeOficial()).append(" - ").append(localizacao.getOcorrencia().getMunicipios().getNome()).toString();
+// }
+// };
+// }
+//
+// public Converter<OcorrenciaMunicipal, String> getOcorrenciaMunicipalToStringConverter() {
+// return new org.springframework.core.convert.converter.Converter<br.ufpr.c3sl.estacaojuventude.OcorrenciaMunicipal, java.lang.String>() {
+// public String convert(OcorrenciaMunicipal ocorrenciaMunicipal) {
+// if (ocorrenciaMunicipal.getProgramaVinculado() == null || ocorrenciaMunicipal.getMunicipios() == null)
+// return new StringBuilder().append("").toString();
+// return new StringBuilder().append(ocorrenciaMunicipal.getProgramaVinculado().getNomeOficial()).append(" - ").append(ocorrenciaMunicipal.getMunicipios().getNome()).toString();
+// }
+// };
+// }
public Converter<Tematica, String> getTematicaToStringConverter() {
return new org.springframework.core.convert.converter.Converter<br.ufpr.c3sl.estacaojuventude.Tematica, java.lang.String>() {
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ApplicationConversionServiceFactoryBean_Roo_ConversionService.aj b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ApplicationConversionServiceFactoryBean_Roo_ConversionService.aj
index e32ab4221659f7d7d1c2b361d163fb64bfd52848..79bb1bd5b322a98c8363e842235dd06896393ac8 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ApplicationConversionServiceFactoryBean_Roo_ConversionService.aj
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ApplicationConversionServiceFactoryBean_Roo_ConversionService.aj
@@ -36,6 +36,14 @@ privileged aspect ApplicationConversionServiceFactoryBean_Roo_ConversionService
};
}
+ public Converter<Localizacao, String> ApplicationConversionServiceFactoryBean.getLocalizacaoToStringConverter() {
+ return new org.springframework.core.convert.converter.Converter<br.ufpr.c3sl.estacaojuventude.Localizacao, java.lang.String>() {
+ public String convert(Localizacao localizacao) {
+ return new StringBuilder().append(localizacao.getLocal()).append(' ').append(localizacao.getLogradouro()).append(' ').append(localizacao.getBairro()).append(' ').append(localizacao.getCep()).toString();
+ }
+ };
+ }
+
public Converter<Long, Localizacao> ApplicationConversionServiceFactoryBean.getIdToLocalizacaoConverter() {
return new org.springframework.core.convert.converter.Converter<java.lang.Long, br.ufpr.c3sl.estacaojuventude.Localizacao>() {
public br.ufpr.c3sl.estacaojuventude.Localizacao convert(java.lang.Long id) {
@@ -68,6 +76,14 @@ privileged aspect ApplicationConversionServiceFactoryBean_Roo_ConversionService
};
}
+ public Converter<OcorrenciaMunicipal, String> ApplicationConversionServiceFactoryBean.getOcorrenciaMunicipalToStringConverter() {
+ return new org.springframework.core.convert.converter.Converter<br.ufpr.c3sl.estacaojuventude.OcorrenciaMunicipal, java.lang.String>() {
+ public String convert(OcorrenciaMunicipal ocorrenciaMunicipal) {
+ return new StringBuilder().append(ocorrenciaMunicipal.getQuantidadeVagas()).append(' ').append(ocorrenciaMunicipal.getBeneficiosLocais()).append(' ').append(ocorrenciaMunicipal.getComoAcessar()).append(' ').append(ocorrenciaMunicipal.getInicioInscricoes()).toString();
+ }
+ };
+ }
+
public Converter<Long, OcorrenciaMunicipal> ApplicationConversionServiceFactoryBean.getIdToOcorrenciaMunicipalConverter() {
return new org.springframework.core.convert.converter.Converter<java.lang.Long, br.ufpr.c3sl.estacaojuventude.OcorrenciaMunicipal>() {
public br.ufpr.c3sl.estacaojuventude.OcorrenciaMunicipal convert(java.lang.Long id) {
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController.java
index 305e6edd688482b7289f8f2be0d1739b42398298..c395555370b95d3765ba3eef2001b90cb5b267b9 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController.java
@@ -41,8 +41,13 @@ public class OcorrenciaMunicipalController {
if (ocorrenciaMunicipalGlobal.getProgramaVinculado() != null)
ocorrenciaMunicipalGlobal.setProgramaVinculado(Programa.findPrograma(ocorrenciaMunicipalGlobal.getProgramaVinculado().getId()));
- if (ocorrenciaMunicipalGlobal.getMunicipio() != null)
- ocorrenciaMunicipalGlobal.setMunicipio(Municipio.findMunicipio(ocorrenciaMunicipalGlobal.getMunicipio().getId()));
+ if (ocorrenciaMunicipalGlobal.getOrgaosExecutores() != null) {
+ Set<Municipio> municipiosNovo = new HashSet<Municipio>();
+ Set<Municipio> municipios = ocorrenciaMunicipalGlobal.getMunicipios();
+ for (Iterator<Municipio> o = municipios.iterator(); o.hasNext();)
+ municipiosNovo.add(Municipio.findMunicipio(o.next().getId()));
+ ocorrenciaMunicipalGlobal.setMunicipios(municipiosNovo);
+ }
if (ocorrenciaMunicipalGlobal.getOrgaosExecutores() != null) {
Set<OrgaoExecutor> orgaosExecutoresNovo = new HashSet<OrgaoExecutor>();
diff --git a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx
index d6d2597a29bc83d3c00e5181478a7cb9d69347d8..049e2eab150d84741b786b4ac0321314c43204de 100644
--- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx
+++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx
@@ -4,7 +4,6 @@
<jsp:output omit-xml-declaration="yes"/>
<form:create id="fc_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" modelAttribute="ocorrenciaMunicipal" path="/ocorrenciamunicipais" render="${empty dependencies}" z="fo6q8lg/xzZrtO1TWfNK0cjMjdk=">
<field:select field="programaVinculado" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_programaVinculado" itemValue="id" items="${programas}" path="/programas" z="6peHWMq5LFS5h3Dz8xNLNeBW9Rc="/>
- <field:select field="municipio" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipio" itemValue="id" items="${municipios}" path="/municipios" z="NxsdqY2KIR81ibrmaLuEwZFQ0QM="/>
<field:select field="orgaosExecutores" hintValue="hint_orgaos_executores" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/ocorrenciamunicipais" z="user-managed"/>
<field:textarea field="beneficiosLocais" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" z="user-managed"/>
<!-- <field:input field="beneficiosLocais" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" z="4+gr9Eh5QnqAtYMJBTazSWU4OHY="/> -->
@@ -18,6 +17,7 @@
<field:datetime dateTimePattern="${ocorrenciaMunicipal_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_ultimaAlteracao" render="false" z="user-managed"/>
<field:select field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_situacao" items="${situacaos}" path="situacaos" widthcss="60px" z="user-managed"/>
<field:textarea field="observacao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_observacao" z="user-managed"/>
+ <field:select field="municipios" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipios" itemValue="id" items="${municipios}" multiple="true" path="/municipios" z="BD05YnRdtdU25XgKJrSAq3Mc+f4="/>
</form:create>
<form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" render="${not empty dependencies}" z="ame9911g+go04TVYVVTrRJK0UOs="/>
</div>
diff --git a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/list.jspx b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/list.jspx
index 6150cf2c38183c200cdc60f1f5cdc94f1508a3ce..c8eb09a8f711ee927461a2a5b962f7ef65f8af94 100644
--- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/list.jspx
+++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/list.jspx
@@ -6,11 +6,11 @@
<page:list id="pl_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" items="${ocorrenciamunicipais}" z="user-managed">
<table:table data="${ocorrenciamunicipais}" id="l_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" path="/ocorrenciamunicipais" z="user-managed">
<table:column id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_programaVinculado" property="programaVinculado" z="Tm+iykUft/VEdMGXSaVnnBzsJE0="/>
- <table:column id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipio" property="municipio" z="cQGkxw226ouNjy7A6uvXxHYtxr4="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" property="orgaosExecutores" z="vvHN30vTN2locaAdFWuvUjsGCL4="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" property="beneficiosLocais" z="hKB6zObru6eu8Gzg4JBnb9dJD5o="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_comoAcessar" property="comoAcessar" z="m0b/EHguMPNIm1Zmv6odJ9EE8Uw="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_quantidadeVagas" property="quantidadeVagas" z="A5QKJq5ohSUAYDsCLxtTCsvNzPg="/>
+ <table:column id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipios" property="municipios" z="DERNAWtmDvTdC2FaJpomtT367rk="/>
</table:table>
</page:list>
</sec:authorize>
@@ -18,7 +18,6 @@
<page:list id="pl_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" items="${ocorrenciamunicipais}" z="/8eqEnisjTYrkLUxsp1MkQSOd70=">
<table:table data="${ocorrenciamunicipais}" delete="false" id="l_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" path="/ocorrenciamunicipais" update="false" z="nx4hXF5YDAHxgnvLIUmDxMQLGYM=">
<table:column id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_programaVinculado" property="programaVinculado" z="Tm+iykUft/VEdMGXSaVnnBzsJE0="/>
- <table:column id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipio" property="municipio" z="cQGkxw226ouNjy7A6uvXxHYtxr4="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" property="orgaosExecutores" z="vvHN30vTN2locaAdFWuvUjsGCL4="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" property="beneficiosLocais" z="hKB6zObru6eu8Gzg4JBnb9dJD5o="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_comoAcessar" property="comoAcessar" z="m0b/EHguMPNIm1Zmv6odJ9EE8Uw="/>
diff --git a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/show.jspx b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/show.jspx
index 9ca8e2d2514f1fdde7522682224acaaf6e4b0f53..f9b525da8e87efbc2517fc5a3164f91c6422a5fb 100644
--- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/show.jspx
+++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/show.jspx
@@ -5,7 +5,6 @@
<sec:authorize ifAnyGranted="Administrador">
<page:show id="ps_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" object="${ocorrenciamunicipal}" path="/ocorrenciamunicipais" z="WHPSs3ZdcAYSs9In0j1we/+ggfA=">
<field:display field="programaVinculado" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_programaVinculado" object="${ocorrenciamunicipal}" z="ClfjWWF7bqxVvh1iaAUUlR/bSzU="/>
- <field:display field="municipio" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipio" object="${ocorrenciamunicipal}" z="3GnqSLiyHDjCiiuRGpGGczgguns="/>
<field:display field="orgaosExecutores" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" object="${ocorrenciamunicipal}" z="1xYJwVmetGkSz0P1On1Besffdps="/>
<field:display field="beneficiosLocais" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" object="${ocorrenciamunicipal}" z="ygvEccTRGhbXXLHbIO1Rj7zwFYE="/>
<field:display field="comoAcessar" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_comoAcessar" object="${ocorrenciamunicipal}" z="xLwQzw4LFz+zSUcRQfcSYTkflPw="/>
@@ -18,12 +17,12 @@
<field:display field="situacao" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_situacao" object="${ocorrenciamunicipal}" z="p/+rYbSA8I8RhTMbk2lKwZjOTcA="/>
<field:display date="true" dateTimePattern="${ocorrenciaMunicipal_ultimaalteracao_date_format}" field="ultimaAlteracao" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_ultimaAlteracao" object="${ocorrenciamunicipal}" z="nq1eVVhjtcPRtdJMtaVu4bV8xSA="/>
<field:display field="observacao" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_observacao" object="${ocorrenciamunicipal}" z="I5e0Ar503LQLwKFW097qhvnQB+U="/>
+ <field:display field="municipios" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipios" object="${ocorrenciamunicipal}" z="Mygv4SDXXyqvvAG/aYY1rW6OIok="/>
</page:show>
</sec:authorize>
<sec:authorize ifAnyGranted="Usuario">
<page:show delete="false" id="ps_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" list="false" object="${ocorrenciamunicipal}" path="/ocorrenciamunicipais" update="false" z="WHPSs3ZdcAYSs9In0j1we/+ggfA=">
<field:display field="programaVinculado" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_programaVinculado" object="${ocorrenciamunicipal}" z="ClfjWWF7bqxVvh1iaAUUlR/bSzU="/>
- <field:display field="municipio" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipio" object="${ocorrenciamunicipal}" z="3GnqSLiyHDjCiiuRGpGGczgguns="/>
<field:display field="orgaosExecutores" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" object="${ocorrenciamunicipal}" z="1xYJwVmetGkSz0P1On1Besffdps="/>
<field:display field="beneficiosLocais" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" object="${ocorrenciamunicipal}" z="ygvEccTRGhbXXLHbIO1Rj7zwFYE="/>
<field:display field="comoAcessar" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_comoAcessar" object="${ocorrenciamunicipal}" z="xLwQzw4LFz+zSUcRQfcSYTkflPw="/>
diff --git a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx
index 0c756c72fd93ab08263df4aa6089ae07c3843c15..a64eef24d63681fddb239be1b41cfc084459af00 100644
--- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx
+++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx
@@ -5,7 +5,6 @@
<sec:authorize ifAnyGranted="Administrador">
<form:update id="fu_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" modelAttribute="ocorrenciaMunicipal" path="/ocorrenciamunicipais" versionField="Version" z="nMo5OaMVW8SlDiU52IsDoc4ZZZ8=">
<field:select field="programaVinculado" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_programaVinculado" itemValue="id" items="${programas}" path="/programas" z="6peHWMq5LFS5h3Dz8xNLNeBW9Rc="/>
- <field:select field="municipio" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipio" itemValue="id" items="${municipios}" path="/municipios" z="NxsdqY2KIR81ibrmaLuEwZFQ0QM="/>
<field:select field="orgaosExecutores" hintValue="hint_orgaos_executores" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/ocorrenciamunicipais" z="user-managed"/>
<field:textarea field="beneficiosLocais" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" z="user-managed"/>
<!-- <field:input field="beneficiosLocais" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" z="4+gr9Eh5QnqAtYMJBTazSWU4OHY="/> -->
@@ -19,12 +18,12 @@
<field:select field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_situacao" items="${situacaos}" path="situacaos" widthcss="60px" z="user-managed"/>
<field:datetime dateTimePattern="${ocorrenciaMunicipal_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_ultimaAlteracao" render="false" z="user-managed"/>
<field:textarea field="observacao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_observacao" z="user-managed"/>
+ <field:select field="municipios" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipios" itemValue="id" items="${municipios}" multiple="true" path="/municipios" z="BD05YnRdtdU25XgKJrSAq3Mc+f4="/>
</form:update>
</sec:authorize>
<sec:authorize ifAnyGranted="Usuario">
<form:update id="fu_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" modelAttribute="ocorrenciaMunicipal" path="/ocorrenciamunicipais" versionField="Version" z="nMo5OaMVW8SlDiU52IsDoc4ZZZ8=">
<field:select field="programaVinculado" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_programaVinculado" itemValue="id" items="${programas}" path="/programas" z="6peHWMq5LFS5h3Dz8xNLNeBW9Rc="/>
- <field:select field="municipio" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipio" itemValue="id" items="${municipios}" path="/municipios" z="NxsdqY2KIR81ibrmaLuEwZFQ0QM="/>
<field:select field="orgaosExecutores" hintValue="hint_orgaos_executores" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/ocorrenciamunicipais" z="user-managed"/>
<field:textarea field="beneficiosLocais" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" z="4+gr9Eh5QnqAtYMJBTazSWU4OHY="/>
<!-- <field:input field="beneficiosLocais" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" z="4+gr9Eh5QnqAtYMJBTazSWU4OHY="/> -->