diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/Estado.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/Estado.java
index af7122258a3354ba32d08537df0158842cb16a57..e80bbcb9a54669afc50a14753c7dbd73cb7ef74e 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/Estado.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/Estado.java
@@ -1,11 +1,15 @@
package br.ufpr.c3sl.estacaojuventude;
+import java.util.Date;
import java.util.HashSet;
import java.util.Set;
import javax.persistence.CascadeType;
import javax.persistence.ManyToMany;
+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;
@@ -21,4 +25,8 @@ public class Estado {
@ManyToMany(cascade = CascadeType.ALL, mappedBy = "uf")
private Set<Municipio> municipios = new HashSet<Municipio>();
+
+ @Temporal(TemporalType.DATE)
+ @DateTimeFormat(style = "S-")
+ private Date ultimaAlteracao;
}
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/Estado_Roo_JavaBean.aj b/src/main/java/br/ufpr/c3sl/estacaojuventude/Estado_Roo_JavaBean.aj
index 67fca8c320d1ca1d01ddb4add17d763daf3f9dd0..ffaae3517b675f732a73672e0ff9ce0b1d29d848 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/Estado_Roo_JavaBean.aj
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/Estado_Roo_JavaBean.aj
@@ -5,6 +5,7 @@ package br.ufpr.c3sl.estacaojuventude;
import br.ufpr.c3sl.estacaojuventude.Estado;
import br.ufpr.c3sl.estacaojuventude.Municipio;
+import java.util.Date;
import java.util.Set;
privileged aspect Estado_Roo_JavaBean {
@@ -33,4 +34,12 @@ privileged aspect Estado_Roo_JavaBean {
this.municipios = municipios;
}
+ public Date Estado.getUltimaAlteracao() {
+ return this.ultimaAlteracao;
+ }
+
+ public void Estado.setUltimaAlteracao(Date ultimaAlteracao) {
+ this.ultimaAlteracao = ultimaAlteracao;
+ }
+
}
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/Localizacao.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/Localizacao.java
index e53b880f1581375329a06773d68c6ace82305c9f..190ce24a2cc7234d68fd52fb6b136b472a77d2bd 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/Localizacao.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/Localizacao.java
@@ -1,11 +1,23 @@
package br.ufpr.c3sl.estacaojuventude;
+import java.util.Date;
+import java.util.List;
+
import javax.persistence.Column;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
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;
@RooJavaBean
@RooToString
@@ -30,4 +42,34 @@ public class Localizacao {
private String telefone;
private String email;
+
+ @Enumerated(EnumType.STRING)
+ private Situacao situacao;
+
+ @Enumerated(EnumType.STRING)
+ private TipoStatus status;
+
+ @OneToOne
+ private Usuario usuario;
+
+ @Temporal(TemporalType.DATE)
+ @DateTimeFormat(style = "S-")
+ private Date ultimaAlteracao;
+
+ public static List<Localizacao> findAllLocalizacoesCandidatos() {
+ return entityManager().createNativeQuery("SELECT * FROM Localizacao WHERE status = 'Candidato'", Localizacao.class).getResultList();
+ }
+
+ public static List<Localizacao> findAllLocalizacoesEfetivos() {
+ return entityManager().createNativeQuery("SELECT * FROM Localizacao WHERE status = 'Efetivo'", Localizacao.class).getResultList();
+ }
+
+ public static List<Localizacao> findAllLocalizacoesRejeitados() {
+ return entityManager().createNativeQuery("SELECT * FROM Localizacao WHERE status = 'Rejeitado'", Localizacao.class).getResultList();
+ }
+
+ public static List<Localizacao> findMinhasLocalizacoes() {
+ String login = SecurityContextHolder.getContext().getAuthentication().getName();
+ return entityManager().createNativeQuery("SELECT * FROM Localizacao p, Usuario u WHERE p.usuario = u.id and p.status = 'Candidato' and u.login = '" + login + "'", Localizacao.class).getResultList();
+ }
}
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/Localizacao_Roo_JavaBean.aj b/src/main/java/br/ufpr/c3sl/estacaojuventude/Localizacao_Roo_JavaBean.aj
index 18f64bc0463a0156e2e97a53e32e9784eaf50e8a..35ffbfbc22c437c9b60d952cf70b9cc6ed417aa0 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/Localizacao_Roo_JavaBean.aj
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/Localizacao_Roo_JavaBean.aj
@@ -5,6 +5,10 @@ package br.ufpr.c3sl.estacaojuventude;
import br.ufpr.c3sl.estacaojuventude.Localizacao;
import br.ufpr.c3sl.estacaojuventude.OcorrenciaMunicipal;
+import br.ufpr.c3sl.estacaojuventude.Usuario;
+import br.ufpr.c3sl.estacaojuventude.enums.Situacao;
+import br.ufpr.c3sl.estacaojuventude.enums.TipoStatus;
+import java.util.Date;
privileged aspect Localizacao_Roo_JavaBean {
@@ -72,4 +76,36 @@ privileged aspect Localizacao_Roo_JavaBean {
this.email = email;
}
+ public Situacao Localizacao.getSituacao() {
+ return this.situacao;
+ }
+
+ public void Localizacao.setSituacao(Situacao situacao) {
+ this.situacao = situacao;
+ }
+
+ public TipoStatus Localizacao.getStatus() {
+ return this.status;
+ }
+
+ public void Localizacao.setStatus(TipoStatus status) {
+ this.status = status;
+ }
+
+ public Usuario Localizacao.getUsuario() {
+ return this.usuario;
+ }
+
+ public void Localizacao.setUsuario(Usuario usuario) {
+ this.usuario = usuario;
+ }
+
+ public Date Localizacao.getUltimaAlteracao() {
+ return this.ultimaAlteracao;
+ }
+
+ public void Localizacao.setUltimaAlteracao(Date ultimaAlteracao) {
+ this.ultimaAlteracao = ultimaAlteracao;
+ }
+
}
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/Municipio.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/Municipio.java
index a2173068d1480888dd1db014903ab801ae59f420..656b67e41ee7dd788d6332de8854223e350d64fa 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/Municipio.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/Municipio.java
@@ -1,7 +1,12 @@
package br.ufpr.c3sl.estacaojuventude;
+import java.util.Date;
+
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;
@@ -15,4 +20,8 @@ public class Municipio {
@OneToOne
private Estado uf;
+
+ @Temporal(TemporalType.DATE)
+ @DateTimeFormat(style = "S-")
+ private Date ultimaAlteracao;
}
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/Municipio_Roo_JavaBean.aj b/src/main/java/br/ufpr/c3sl/estacaojuventude/Municipio_Roo_JavaBean.aj
index 51f3517c7169fed3c2746003ab0025064a452db7..fd9ebc2e555713ae28a8e22929a1208959d6f428 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/Municipio_Roo_JavaBean.aj
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/Municipio_Roo_JavaBean.aj
@@ -5,6 +5,7 @@ package br.ufpr.c3sl.estacaojuventude;
import br.ufpr.c3sl.estacaojuventude.Estado;
import br.ufpr.c3sl.estacaojuventude.Municipio;
+import java.util.Date;
privileged aspect Municipio_Roo_JavaBean {
@@ -24,4 +25,12 @@ privileged aspect Municipio_Roo_JavaBean {
this.uf = uf;
}
+ public Date Municipio.getUltimaAlteracao() {
+ return this.ultimaAlteracao;
+ }
+
+ public void Municipio.setUltimaAlteracao(Date ultimaAlteracao) {
+ this.ultimaAlteracao = ultimaAlteracao;
+ }
+
}
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/OcorrenciaMunicipal.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/OcorrenciaMunicipal.java
index 73a3719e99c9435947155eed9d63cf26147d21e9..7591aefb5a8b0e2310b5807c18011ee749d523f6 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/OcorrenciaMunicipal.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/OcorrenciaMunicipal.java
@@ -1,5 +1,6 @@
package br.ufpr.c3sl.estacaojuventude;
+import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -10,12 +11,16 @@ import javax.persistence.EnumType;
import javax.persistence.Enumerated;
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;
@RooJavaBean
@@ -47,11 +52,18 @@ public class OcorrenciaMunicipal {
@ManyToMany(cascade = CascadeType.ALL, mappedBy = "ocorrencia")
private Set<Localizacao> localizacoes = new HashSet<Localizacao>();
+ @Enumerated(EnumType.STRING)
+ private Situacao situacao;
+
@Enumerated(EnumType.STRING)
private TipoStatus status;
@OneToOne
private Usuario usuario;
+
+ @Temporal(TemporalType.DATE)
+ @DateTimeFormat(style = "S-")
+ private Date ultimaAlteracao;
public static List<Programa> findAllOcorrenciasCandidatos() {
return entityManager().createNativeQuery("SELECT * FROM Ocorrencia_Municipal WHERE status = 'Candidato'", OcorrenciaMunicipal.class).getResultList();
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 429da48f22614363416cc867c1d3cdac862c4d09..d72ed8372dfe6e0ed421c0860a8d1934ca49b333 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
@@ -9,7 +9,9 @@ import br.ufpr.c3sl.estacaojuventude.OcorrenciaMunicipal;
import br.ufpr.c3sl.estacaojuventude.OrgaoExecutor;
import br.ufpr.c3sl.estacaojuventude.Programa;
import br.ufpr.c3sl.estacaojuventude.Usuario;
+import br.ufpr.c3sl.estacaojuventude.enums.Situacao;
import br.ufpr.c3sl.estacaojuventude.enums.TipoStatus;
+import java.util.Date;
import java.util.Set;
privileged aspect OcorrenciaMunicipal_Roo_JavaBean {
@@ -86,6 +88,14 @@ privileged aspect OcorrenciaMunicipal_Roo_JavaBean {
this.localizacoes = localizacoes;
}
+ public Situacao OcorrenciaMunicipal.getSituacao() {
+ return this.situacao;
+ }
+
+ public void OcorrenciaMunicipal.setSituacao(Situacao situacao) {
+ this.situacao = situacao;
+ }
+
public TipoStatus OcorrenciaMunicipal.getStatus() {
return this.status;
}
@@ -102,4 +112,12 @@ privileged aspect OcorrenciaMunicipal_Roo_JavaBean {
this.usuario = usuario;
}
+ public Date OcorrenciaMunicipal.getUltimaAlteracao() {
+ return this.ultimaAlteracao;
+ }
+
+ public void OcorrenciaMunicipal.setUltimaAlteracao(Date ultimaAlteracao) {
+ this.ultimaAlteracao = ultimaAlteracao;
+ }
+
}
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/OrgaoExecutor.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/OrgaoExecutor.java
index f339b6b1cefc84c50dc724688221c9ec6eecbe93..cf9c5981f861e9ff3042750ddb16b7b076f8cb7a 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/OrgaoExecutor.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/OrgaoExecutor.java
@@ -1,7 +1,12 @@
package br.ufpr.c3sl.estacaojuventude;
+import java.util.Date;
+
import javax.persistence.Column;
+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;
@@ -19,5 +24,9 @@ public class OrgaoExecutor {
private String endereco;
private String contato;
+
+ @Temporal(TemporalType.DATE)
+ @DateTimeFormat(style = "S-")
+ private Date ultimaAlteracao;
}
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/OrgaoExecutor_Roo_JavaBean.aj b/src/main/java/br/ufpr/c3sl/estacaojuventude/OrgaoExecutor_Roo_JavaBean.aj
index 877798068ab30d3ab16dfb8395e977b1f737d779..810f1f23ac01c712dd938621cfdaf08e94780363 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/OrgaoExecutor_Roo_JavaBean.aj
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/OrgaoExecutor_Roo_JavaBean.aj
@@ -4,6 +4,7 @@
package br.ufpr.c3sl.estacaojuventude;
import br.ufpr.c3sl.estacaojuventude.OrgaoExecutor;
+import java.util.Date;
privileged aspect OrgaoExecutor_Roo_JavaBean {
@@ -39,4 +40,12 @@ privileged aspect OrgaoExecutor_Roo_JavaBean {
this.contato = contato;
}
+ public Date OrgaoExecutor.getUltimaAlteracao() {
+ return this.ultimaAlteracao;
+ }
+
+ public void OrgaoExecutor.setUltimaAlteracao(Date ultimaAlteracao) {
+ this.ultimaAlteracao = ultimaAlteracao;
+ }
+
}
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/Programa.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/Programa.java
index f8d761d2fe9a099fcde5d38d23b7ad5287b122a2..d631aba87a42bb9b0edea66f8ba8cb40926fc8a5 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/Programa.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/Programa.java
@@ -1,12 +1,15 @@
package br.ufpr.c3sl.estacaojuventude;
import br.ufpr.c3sl.estacaojuventude.enums.NivelPrograma;
+import br.ufpr.c3sl.estacaojuventude.enums.Situacao;
import br.ufpr.c3sl.estacaojuventude.enums.TipoStatus;
import br.ufpr.c3sl.estacaojuventude.enums.TipoTemporalidade;
+
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;
@@ -15,6 +18,7 @@ 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;
@@ -79,12 +83,19 @@ public class Programa {
@ManyToMany(cascade = CascadeType.ALL, mappedBy = "programaVinculado")
private Set<OcorrenciaMunicipal> ocorrencias = new HashSet<OcorrenciaMunicipal>();
+
+ @Enumerated(EnumType.STRING)
+ private Situacao situacao;
@Enumerated(EnumType.STRING)
private TipoStatus status;
@OneToOne
private Usuario usuario;
+
+ @Temporal(TemporalType.DATE)
+ @DateTimeFormat(style = "S-")
+ private Date ultimaAlteracao;
public static List<Programa> findAllProgramasCandidatos() {
return entityManager().createNativeQuery("SELECT * FROM Programa WHERE status = 'Candidato'", Programa.class).getResultList();
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/Programa_Roo_JavaBean.aj b/src/main/java/br/ufpr/c3sl/estacaojuventude/Programa_Roo_JavaBean.aj
index fd2104c798cc4151e2a28ee3244c2c8070f9050f..2293bd5a843a62d5d7f29f38d021f3c53d6e6161 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/Programa_Roo_JavaBean.aj
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/Programa_Roo_JavaBean.aj
@@ -9,6 +9,7 @@ import br.ufpr.c3sl.estacaojuventude.Programa;
import br.ufpr.c3sl.estacaojuventude.Tematica;
import br.ufpr.c3sl.estacaojuventude.Usuario;
import br.ufpr.c3sl.estacaojuventude.enums.NivelPrograma;
+import br.ufpr.c3sl.estacaojuventude.enums.Situacao;
import br.ufpr.c3sl.estacaojuventude.enums.TipoStatus;
import br.ufpr.c3sl.estacaojuventude.enums.TipoTemporalidade;
import java.util.Date;
@@ -176,6 +177,14 @@ privileged aspect Programa_Roo_JavaBean {
this.ocorrencias = ocorrencias;
}
+ public Situacao Programa.getSituacao() {
+ return this.situacao;
+ }
+
+ public void Programa.setSituacao(Situacao situacao) {
+ this.situacao = situacao;
+ }
+
public TipoStatus Programa.getStatus() {
return this.status;
}
@@ -192,4 +201,12 @@ privileged aspect Programa_Roo_JavaBean {
this.usuario = usuario;
}
+ public Date Programa.getUltimaAlteracao() {
+ return this.ultimaAlteracao;
+ }
+
+ public void Programa.setUltimaAlteracao(Date ultimaAlteracao) {
+ this.ultimaAlteracao = ultimaAlteracao;
+ }
+
}
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/Tematica.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/Tematica.java
index 82b4ec68ed1d5ba0d8d1e8b19ee3f539a74911fb..f4dc7214881d70da8a81c089b0fb601e773ab4ec 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/Tematica.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/Tematica.java
@@ -1,5 +1,11 @@
package br.ufpr.c3sl.estacaojuventude;
+import java.util.Date;
+
+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;
@@ -10,5 +16,9 @@ import org.springframework.roo.addon.tostring.RooToString;
public class Tematica {
private String nome;
+
+ @Temporal(TemporalType.DATE)
+ @DateTimeFormat(style = "S-")
+ private Date ultimaAlteracao;
}
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/Tematica_Roo_JavaBean.aj b/src/main/java/br/ufpr/c3sl/estacaojuventude/Tematica_Roo_JavaBean.aj
index c633dee43d44e77512f5e93eceb6b198309fbcd2..77b6bf18ee215141d6fa37464114cd32744e517d 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/Tematica_Roo_JavaBean.aj
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/Tematica_Roo_JavaBean.aj
@@ -4,6 +4,7 @@
package br.ufpr.c3sl.estacaojuventude;
import br.ufpr.c3sl.estacaojuventude.Tematica;
+import java.util.Date;
privileged aspect Tematica_Roo_JavaBean {
@@ -15,4 +16,12 @@ privileged aspect Tematica_Roo_JavaBean {
this.nome = nome;
}
+ public Date Tematica.getUltimaAlteracao() {
+ return this.ultimaAlteracao;
+ }
+
+ public void Tematica.setUltimaAlteracao(Date ultimaAlteracao) {
+ this.ultimaAlteracao = ultimaAlteracao;
+ }
+
}
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/Usuario.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/Usuario.java
index 043f436d23857213dd627e44eda3039806b9f6d5..aa7f4add4cd0167ae00f9f8f4550d5cd2f9f33d0 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/Usuario.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/Usuario.java
@@ -1,9 +1,14 @@
package br.ufpr.c3sl.estacaojuventude;
+import java.util.Date;
+
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
import javax.validation.constraints.NotNull;
+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;
@@ -15,6 +20,8 @@ import br.ufpr.c3sl.estacaojuventude.enums.TipoUsuario;
@RooJpaActiveRecord
public class Usuario {
+ private String nome;
+
private String login;
@NotNull
@@ -22,5 +29,9 @@ public class Usuario {
@Enumerated(EnumType.STRING)
private TipoUsuario permissao;
+
+ @Temporal(TemporalType.DATE)
+ @DateTimeFormat(style = "S-")
+ private Date ultimaAlteracao;
}
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/Usuario_Roo_JavaBean.aj b/src/main/java/br/ufpr/c3sl/estacaojuventude/Usuario_Roo_JavaBean.aj
index c561d7ed6389370946ef2ee7cd79fa4421ae4365..f590be98024ae099499b2b7bfed652c6810e1864 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/Usuario_Roo_JavaBean.aj
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/Usuario_Roo_JavaBean.aj
@@ -5,9 +5,18 @@ package br.ufpr.c3sl.estacaojuventude;
import br.ufpr.c3sl.estacaojuventude.Usuario;
import br.ufpr.c3sl.estacaojuventude.enums.TipoUsuario;
+import java.util.Date;
privileged aspect Usuario_Roo_JavaBean {
+ public String Usuario.getNome() {
+ return this.nome;
+ }
+
+ public void Usuario.setNome(String nome) {
+ this.nome = nome;
+ }
+
public String Usuario.getLogin() {
return this.login;
}
@@ -32,4 +41,12 @@ privileged aspect Usuario_Roo_JavaBean {
this.permissao = permissao;
}
+ public Date Usuario.getUltimaAlteracao() {
+ return this.ultimaAlteracao;
+ }
+
+ public void Usuario.setUltimaAlteracao(Date ultimaAlteracao) {
+ this.ultimaAlteracao = ultimaAlteracao;
+ }
+
}
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/enums/Situacao.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/enums/Situacao.java
new file mode 100644
index 0000000000000000000000000000000000000000..2752b5328b93dad390857297c05277d5c7013203
--- /dev/null
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/enums/Situacao.java
@@ -0,0 +1,5 @@
+package br.ufpr.c3sl.estacaojuventude.enums;
+
+public enum Situacao {
+ Ativo, Inativo
+}
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 57ad7b87433d2ada9317d9dfe3973fd1f7fa0d2c..1badb8b955be90b4aeafe1f07ca9f575788009f9 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ApplicationConversionServiceFactoryBean.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ApplicationConversionServiceFactoryBean.java
@@ -11,6 +11,7 @@ import br.ufpr.c3sl.estacaojuventude.Municipio;
import br.ufpr.c3sl.estacaojuventude.OcorrenciaMunicipal;
import br.ufpr.c3sl.estacaojuventude.OrgaoExecutor;
import br.ufpr.c3sl.estacaojuventude.Programa;
+import br.ufpr.c3sl.estacaojuventude.Tematica;
import br.ufpr.c3sl.estacaojuventude.Usuario;
/**
@@ -24,7 +25,7 @@ public class ApplicationConversionServiceFactoryBean extends FormattingConversio
super.installFormatters(registry);
// Register application converters and formatters
}
-
+
public Converter<Programa, String> getProgramaToStringConverter() {
return new org.springframework.core.convert.converter.Converter<br.ufpr.c3sl.estacaojuventude.Programa, java.lang.String>() {
@@ -83,4 +84,12 @@ public class ApplicationConversionServiceFactoryBean extends FormattingConversio
}
};
}
+
+ public Converter<Tematica, String> getTematicaToStringConverter() {
+ return new org.springframework.core.convert.converter.Converter<br.ufpr.c3sl.estacaojuventude.Tematica, java.lang.String>() {
+ public String convert(Tematica tematica) {
+ return new StringBuilder().append(tematica.getNome()).toString();
+ }
+ };
+ }
}
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 db2622bf54f8f631ba744d7ad4d2f4a5ec7b685b..e32ab4221659f7d7d1c2b361d163fb64bfd52848 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
@@ -116,14 +116,6 @@ privileged aspect ApplicationConversionServiceFactoryBean_Roo_ConversionService
};
}
- public Converter<Tematica, String> ApplicationConversionServiceFactoryBean.getTematicaToStringConverter() {
- return new org.springframework.core.convert.converter.Converter<br.ufpr.c3sl.estacaojuventude.Tematica, java.lang.String>() {
- public String convert(Tematica tematica) {
- return new StringBuilder().append(tematica.getNome()).toString();
- }
- };
- }
-
public Converter<Long, Tematica> ApplicationConversionServiceFactoryBean.getIdToTematicaConverter() {
return new org.springframework.core.convert.converter.Converter<java.lang.Long, br.ufpr.c3sl.estacaojuventude.Tematica>() {
public br.ufpr.c3sl.estacaojuventude.Tematica convert(java.lang.Long id) {
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/EstadoController.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/EstadoController.java
index 98742dc5542f241780e3b5af9c84af1d7879f5d6..38cf5fe73c0ff5c67b08b3eb36e5c2d8d6fe63b6 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/EstadoController.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/EstadoController.java
@@ -1,9 +1,17 @@
package br.ufpr.c3sl.estacaojuventude.web;
+import java.util.Calendar;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import br.ufpr.c3sl.estacaojuventude.Estado;
@@ -13,6 +21,36 @@ import br.ufpr.c3sl.estacaojuventude.Estado;
@RooWebScaffold(path = "estados", formBackingObject = Estado.class)
public class EstadoController {
+ @RequestMapping(method = RequestMethod.POST, produces = "text/html")
+ public String create(@Valid Estado estado, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
+ if (bindingResult.hasErrors()) {
+ populateEditForm(uiModel, estado);
+ return "estados/create";
+ }
+
+ Calendar calendar = Calendar.getInstance();
+ estado.setUltimaAlteracao(calendar.getTime());
+
+ uiModel.asMap().clear();
+ estado.persist();
+ return "redirect:/estados/" + encodeUrlPathSegment(estado.getId().toString(), httpServletRequest);
+ }
+
+ @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
+ public String update(@Valid Estado estado, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
+ if (bindingResult.hasErrors()) {
+ populateEditForm(uiModel, estado);
+ return "estados/update";
+ }
+
+ Calendar calendar = Calendar.getInstance();
+ estado.setUltimaAlteracao(calendar.getTime());
+
+ uiModel.asMap().clear();
+ estado.merge();
+ return "redirect:/estados/" + encodeUrlPathSegment(estado.getId().toString(), httpServletRequest);
+ }
+
@RequestMapping(produces = "text/html")
public String list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
if (page != null || size != null) {
@@ -26,4 +64,14 @@ public class EstadoController {
}
return "estados/list";
}
+
+ @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
+ public String delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
+ Estado estado = Estado.findEstado(id);
+ estado.remove();
+ uiModel.asMap().clear();
+ //uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
+ //uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
+ return "redirect:/estados";
+ }
}
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/EstadoController_Roo_Controller.aj b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/EstadoController_Roo_Controller.aj
index f418b445cac444891a2829949232b07c4e03c6fc..7dcfc6eb4b52886d927f36548ab447e859f65a35 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/EstadoController_Roo_Controller.aj
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/EstadoController_Roo_Controller.aj
@@ -8,29 +8,16 @@ import br.ufpr.c3sl.estacaojuventude.Municipio;
import br.ufpr.c3sl.estacaojuventude.web.EstadoController;
import java.io.UnsupportedEncodingException;
import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
+import org.joda.time.format.DateTimeFormat;
+import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.util.UriUtils;
import org.springframework.web.util.WebUtils;
privileged aspect EstadoController_Roo_Controller {
- @RequestMapping(method = RequestMethod.POST, produces = "text/html")
- public String EstadoController.create(@Valid Estado estado, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
- if (bindingResult.hasErrors()) {
- populateEditForm(uiModel, estado);
- return "estados/create";
- }
- uiModel.asMap().clear();
- estado.persist();
- return "redirect:/estados/" + encodeUrlPathSegment(estado.getId().toString(), httpServletRequest);
- }
-
@RequestMapping(params = "form", produces = "text/html")
public String EstadoController.createForm(Model uiModel) {
populateEditForm(uiModel, new Estado());
@@ -39,40 +26,25 @@ privileged aspect EstadoController_Roo_Controller {
@RequestMapping(value = "/{id}", produces = "text/html")
public String EstadoController.show(@PathVariable("id") Long id, Model uiModel) {
+ addDateTimeFormatPatterns(uiModel);
uiModel.addAttribute("estado", Estado.findEstado(id));
uiModel.addAttribute("itemId", id);
return "estados/show";
}
- @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
- public String EstadoController.update(@Valid Estado estado, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
- if (bindingResult.hasErrors()) {
- populateEditForm(uiModel, estado);
- return "estados/update";
- }
- uiModel.asMap().clear();
- estado.merge();
- return "redirect:/estados/" + encodeUrlPathSegment(estado.getId().toString(), httpServletRequest);
- }
-
@RequestMapping(value = "/{id}", params = "form", produces = "text/html")
public String EstadoController.updateForm(@PathVariable("id") Long id, Model uiModel) {
populateEditForm(uiModel, Estado.findEstado(id));
return "estados/update";
}
- @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
- public String EstadoController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
- Estado estado = Estado.findEstado(id);
- estado.remove();
- uiModel.asMap().clear();
- uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
- uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
- return "redirect:/estados";
+ void EstadoController.addDateTimeFormatPatterns(Model uiModel) {
+ uiModel.addAttribute("estado_ultimaalteracao_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
}
void EstadoController.populateEditForm(Model uiModel, Estado estado) {
uiModel.addAttribute("estado", estado);
+ addDateTimeFormatPatterns(uiModel);
uiModel.addAttribute("municipios", Municipio.findAllMunicipios());
}
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/LocalizacaoController.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/LocalizacaoController.java
index 26f30866bbbd63356eb1953d5cf267c4cb66c49b..22eadccb576418b87bca4c587c8124d807b1f77e 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/LocalizacaoController.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/LocalizacaoController.java
@@ -1,12 +1,193 @@
package br.ufpr.c3sl.estacaojuventude.web;
-import br.ufpr.c3sl.estacaojuventude.Localizacao;
+import java.util.Arrays;
+import java.util.Calendar;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import br.ufpr.c3sl.estacaojuventude.Localizacao;
+import br.ufpr.c3sl.estacaojuventude.OcorrenciaMunicipal;
+import br.ufpr.c3sl.estacaojuventude.Usuario;
+import br.ufpr.c3sl.estacaojuventude.enums.Situacao;
+import br.ufpr.c3sl.estacaojuventude.enums.TipoStatus;
@RequestMapping("/localizacoes")
@Controller
@RooWebScaffold(path = "localizacoes", formBackingObject = Localizacao.class)
public class LocalizacaoController {
+
+ @RequestMapping(method = RequestMethod.POST, produces = "text/html")
+ public String create(@Valid Localizacao localizacao, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
+ if (bindingResult.hasErrors()) {
+ populateEditForm(uiModel, localizacao);
+ return "localizacoes/create";
+ }
+
+ localizacao.setStatus(TipoStatus.Candidato);
+
+ Usuario u = (Usuario) Usuario.entityManager().createNativeQuery("select * from usuario where login='"+SecurityContextHolder.getContext().getAuthentication().getName()+"'", Usuario.class).getSingleResult();
+ localizacao.setUsuario(u);
+
+ Calendar calendar = Calendar.getInstance();
+ localizacao.setUltimaAlteracao(calendar.getTime());
+
+ uiModel.asMap().clear();
+ localizacao.persist();
+ return "redirect:/localizacoes/" + encodeUrlPathSegment(localizacao.getId().toString(), httpServletRequest);
+ }
+
+ @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
+ public String update(@Valid Localizacao localizacao , BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
+ //Localizacao p = (Localizacao) Localizacao.entityManager().createNativeQuery("select * from localizacao where id = "+localizacao.getId(), Localizacao.class).getSingleResult();
+ Localizacao l = Localizacao.findLocalizacao(localizacao.getId());
+
+
+ if (SecurityContextHolder.getContext().getAuthentication().getAuthorities().toArray()[0].toString().equals("Usuario")) {
+ if (l.getStatus() == TipoStatus.Candidato) {
+ if (!l.getUsuario().getLogin().equals(SecurityContextHolder.getContext().getAuthentication().getName()))
+ bindingResult.addError(new ObjectError("", "Essa localização não está associado a sua conta."));
+ }
+ else
+ bindingResult.addError(new ObjectError("", "Localização avaliada, você não tem permissão para modificar esse programa."));
+
+ localizacao.setStatus(l.getStatus());
+ }
+
+ if (bindingResult.hasErrors()) {
+ populateEditForm(uiModel, localizacao);
+ return "localizacoes/update";
+ }
+
+ localizacao.setUsuario(l.getUsuario());
+
+ Calendar calendar = Calendar.getInstance();
+ localizacao.setUltimaAlteracao(calendar.getTime());
+
+ uiModel.asMap().clear();
+ localizacao.merge();
+ return "redirect:/localizacoes/" + encodeUrlPathSegment(localizacao.getId().toString(), httpServletRequest);
+ }
+
+ @RequestMapping(value = "/{id}", produces = "text/html")
+ public String show(@PathVariable("id") Long id, Model uiModel) {
+ Localizacao localizacao = Localizacao.findLocalizacao(id);
+ uiModel.addAttribute("localizacao", localizacao);
+ uiModel.addAttribute("itemId", id);
+ if (localizacao.getStatus() == TipoStatus.Candidato)
+ if (SecurityContextHolder.getContext().getAuthentication().getAuthorities().toArray()[0].toString().equals("Usuario") && localizacao.getUsuario().getLogin().equals(SecurityContextHolder.getContext().getAuthentication().getName())) {
+ return "localizacoes/myshow";
+ }
+ else
+ return "localizacoes/showcandidatos";
+
+ return "localizacoes/show";
+ }
+
+ @RequestMapping(value = "listCandidatos", produces = "text/html")
+ public String listCandidatos(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
+ if (page != null || size != null) {
+ int sizeNo = size == null ? 10 : size.intValue();
+ final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
+ uiModel.addAttribute("localizacoes", Localizacao.findLocalizacaoEntries(firstResult, sizeNo));
+ float nrOfPages = (float) Localizacao.countLocalizacaos() / sizeNo;
+ uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
+ } else {
+ uiModel.addAttribute("localizacoes", Localizacao.findAllLocalizacoesCandidatos());
+ }
+ return "localizacoes/list";
+ }
+
+ @RequestMapping(value = "listEfetivos", produces = "text/html")
+ public String listEfetivos(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
+ if (page != null || size != null) {
+ int sizeNo = size == null ? 10 : size.intValue();
+ final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
+ uiModel.addAttribute("localizacoes", Localizacao.findLocalizacaoEntries(firstResult, sizeNo));
+ float nrOfPages = (float) Localizacao.countLocalizacaos() / sizeNo;
+ uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
+ } else {
+ uiModel.addAttribute("localizacoes", Localizacao.findAllLocalizacoesEfetivos());
+ }
+ return "localizacoes/list";
+ }
+
+ @RequestMapping(value = "listRejeitados", produces = "text/html")
+ public String listRejeitados(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
+ if (page != null || size != null) {
+ int sizeNo = size == null ? 10 : size.intValue();
+ final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
+ uiModel.addAttribute("localizacoes", Localizacao.findLocalizacaoEntries(firstResult, sizeNo));
+ float nrOfPages = (float) Localizacao.countLocalizacaos() / sizeNo;
+ uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
+ } else {
+ uiModel.addAttribute("localizacoes", Localizacao.findAllLocalizacoesRejeitados());
+ }
+ return "localizacoes/list";
+ }
+
+ @RequestMapping(value = "minhaslocalizacoes", produces = "text/html")
+ public String listMinhasLocalizacoes(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
+ if (page != null || size != null) {
+ int sizeNo = size == null ? 10 : size.intValue();
+ final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
+ uiModel.addAttribute("localizacoes", Localizacao.findLocalizacaoEntries(firstResult, sizeNo));
+ float nrOfPages = (float) Localizacao.countLocalizacaos() / sizeNo;
+ uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
+ } else {
+ uiModel.addAttribute("localizacoes", Localizacao.findMinhasLocalizacoes());
+ }
+ return "localizacoes/mylist";
+ }
+
+ @RequestMapping(value = "/{id}", params = "status", method = RequestMethod.POST, produces = "text/html")
+ public String updateStatus(@PathVariable("id") Long id, @RequestParam(value = "status", required = true) String status, HttpServletRequest httpServletRequest) {
+ Localizacao localizacao = Localizacao.findLocalizacao(id);
+ if (localizacao.getStatus() == TipoStatus.Candidato) {
+ if (status.equals("1")) localizacao.setStatus(TipoStatus.Efetivo);
+ if (status.equals("0")) localizacao.setStatus(TipoStatus.Rejeitado);
+ localizacao.merge();
+ }
+ return "redirect:/localizacoes/" + encodeUrlPathSegment(localizacao.getId().toString(), httpServletRequest);
+ }
+
+ @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
+ public String delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
+ String str = "";
+
+ Localizacao localizacao = Localizacao.findLocalizacao(id);
+
+ if (localizacao.getStatus() == TipoStatus.Candidato)
+ str = "listCandidatos";
+ else if (localizacao.getStatus() == TipoStatus.Efetivo)
+ str = "listEfetivos";
+ else
+ str = "listRejeitados";
+
+ localizacao.remove();
+ uiModel.asMap().clear();
+ //uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
+ //uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
+ return "redirect:/localizacoes/"+str;
+ }
+
+ void populateEditForm(Model uiModel, Localizacao localizacao) {
+ uiModel.addAttribute("localizacao", localizacao);
+ uiModel.addAttribute("ocorrenciamunicipais", OcorrenciaMunicipal.findAllOcorrenciaMunicipals());
+ uiModel.addAttribute("usuarios", Usuario.findAllUsuarios());
+ uiModel.addAttribute("tipostatuses", Arrays.asList(TipoStatus.values()));
+ uiModel.addAttribute("situacaos", Arrays.asList(Situacao.values()));
+ }
+
}
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/LocalizacaoController_Roo_Controller.aj b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/LocalizacaoController_Roo_Controller.aj
index b2e6022cf360e11e39754dafadd610a4caa82a95..b0c9883ed39e614b2f6566f8584a04937aed4189 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/LocalizacaoController_Roo_Controller.aj
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/LocalizacaoController_Roo_Controller.aj
@@ -4,46 +4,26 @@
package br.ufpr.c3sl.estacaojuventude.web;
import br.ufpr.c3sl.estacaojuventude.Localizacao;
-import br.ufpr.c3sl.estacaojuventude.OcorrenciaMunicipal;
import br.ufpr.c3sl.estacaojuventude.web.LocalizacaoController;
import java.io.UnsupportedEncodingException;
import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
+import org.joda.time.format.DateTimeFormat;
+import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.util.UriUtils;
import org.springframework.web.util.WebUtils;
privileged aspect LocalizacaoController_Roo_Controller {
- @RequestMapping(method = RequestMethod.POST, produces = "text/html")
- public String LocalizacaoController.create(@Valid Localizacao localizacao, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
- if (bindingResult.hasErrors()) {
- populateEditForm(uiModel, localizacao);
- return "localizacoes/create";
- }
- uiModel.asMap().clear();
- localizacao.persist();
- return "redirect:/localizacoes/" + encodeUrlPathSegment(localizacao.getId().toString(), httpServletRequest);
- }
-
@RequestMapping(params = "form", produces = "text/html")
public String LocalizacaoController.createForm(Model uiModel) {
populateEditForm(uiModel, new Localizacao());
return "localizacoes/create";
}
- @RequestMapping(value = "/{id}", produces = "text/html")
- public String LocalizacaoController.show(@PathVariable("id") Long id, Model uiModel) {
- uiModel.addAttribute("localizacao", Localizacao.findLocalizacao(id));
- uiModel.addAttribute("itemId", id);
- return "localizacoes/show";
- }
-
@RequestMapping(produces = "text/html")
public String LocalizacaoController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
if (page != null || size != null) {
@@ -55,39 +35,18 @@ privileged aspect LocalizacaoController_Roo_Controller {
} else {
uiModel.addAttribute("localizacaos", Localizacao.findAllLocalizacaos());
}
+ addDateTimeFormatPatterns(uiModel);
return "localizacoes/list";
}
- @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
- public String LocalizacaoController.update(@Valid Localizacao localizacao, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
- if (bindingResult.hasErrors()) {
- populateEditForm(uiModel, localizacao);
- return "localizacoes/update";
- }
- uiModel.asMap().clear();
- localizacao.merge();
- return "redirect:/localizacoes/" + encodeUrlPathSegment(localizacao.getId().toString(), httpServletRequest);
- }
-
@RequestMapping(value = "/{id}", params = "form", produces = "text/html")
public String LocalizacaoController.updateForm(@PathVariable("id") Long id, Model uiModel) {
populateEditForm(uiModel, Localizacao.findLocalizacao(id));
return "localizacoes/update";
}
- @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
- public String LocalizacaoController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
- Localizacao localizacao = Localizacao.findLocalizacao(id);
- localizacao.remove();
- uiModel.asMap().clear();
- uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
- uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
- return "redirect:/localizacoes";
- }
-
- void LocalizacaoController.populateEditForm(Model uiModel, Localizacao localizacao) {
- uiModel.addAttribute("localizacao", localizacao);
- uiModel.addAttribute("ocorrenciamunicipals", OcorrenciaMunicipal.findAllOcorrenciaMunicipals());
+ void LocalizacaoController.addDateTimeFormatPatterns(Model uiModel) {
+ uiModel.addAttribute("localizacao_ultimaalteracao_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
}
String LocalizacaoController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/MunicipioController.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/MunicipioController.java
index 9db929563583e8dee3ca4a650b96b82a1c5bec21..50ea79afaef134bc7c276c08743b851c9c8067d9 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/MunicipioController.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/MunicipioController.java
@@ -1,12 +1,64 @@
package br.ufpr.c3sl.estacaojuventude.web;
+import java.util.Calendar;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
import br.ufpr.c3sl.estacaojuventude.Municipio;
+
import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
@RequestMapping("/municipios")
@Controller
@RooWebScaffold(path = "municipios", formBackingObject = Municipio.class)
public class MunicipioController {
+
+ @RequestMapping(method = RequestMethod.POST, produces = "text/html")
+ public String create(@Valid Municipio municipio, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
+ if (bindingResult.hasErrors()) {
+ populateEditForm(uiModel, municipio);
+ return "municipios/create";
+ }
+
+ Calendar calendar = Calendar.getInstance();
+ municipio.setUltimaAlteracao(calendar.getTime());
+
+ uiModel.asMap().clear();
+ municipio.persist();
+ return "redirect:/municipios/" + encodeUrlPathSegment(municipio.getId().toString(), httpServletRequest);
+ }
+
+ @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
+ public String update(@Valid Municipio municipio, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
+ if (bindingResult.hasErrors()) {
+ populateEditForm(uiModel, municipio);
+ return "municipios/update";
+ }
+
+ Calendar calendar = Calendar.getInstance();
+ municipio.setUltimaAlteracao(calendar.getTime());
+
+ uiModel.asMap().clear();
+ municipio.merge();
+ return "redirect:/municipios/" + encodeUrlPathSegment(municipio.getId().toString(), httpServletRequest);
+ }
+
+ @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
+ public String delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
+ Municipio municipio = Municipio.findMunicipio(id);
+ municipio.remove();
+ uiModel.asMap().clear();
+ //uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
+ //uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
+ return "redirect:/municipios";
+ }
+
}
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/MunicipioController_Roo_Controller.aj b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/MunicipioController_Roo_Controller.aj
index ce2d3fc990c0758862048c6d3aae16d00d6825b0..a654d6e6d7d18961368ec970b6f0eb169083c0ef 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/MunicipioController_Roo_Controller.aj
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/MunicipioController_Roo_Controller.aj
@@ -8,29 +8,17 @@ import br.ufpr.c3sl.estacaojuventude.Municipio;
import br.ufpr.c3sl.estacaojuventude.web.MunicipioController;
import java.io.UnsupportedEncodingException;
import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
+import org.joda.time.format.DateTimeFormat;
+import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.util.UriUtils;
import org.springframework.web.util.WebUtils;
privileged aspect MunicipioController_Roo_Controller {
- @RequestMapping(method = RequestMethod.POST, produces = "text/html")
- public String MunicipioController.create(@Valid Municipio municipio, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
- if (bindingResult.hasErrors()) {
- populateEditForm(uiModel, municipio);
- return "municipios/create";
- }
- uiModel.asMap().clear();
- municipio.persist();
- return "redirect:/municipios/" + encodeUrlPathSegment(municipio.getId().toString(), httpServletRequest);
- }
-
@RequestMapping(params = "form", produces = "text/html")
public String MunicipioController.createForm(Model uiModel) {
populateEditForm(uiModel, new Municipio());
@@ -39,6 +27,7 @@ privileged aspect MunicipioController_Roo_Controller {
@RequestMapping(value = "/{id}", produces = "text/html")
public String MunicipioController.show(@PathVariable("id") Long id, Model uiModel) {
+ addDateTimeFormatPatterns(uiModel);
uiModel.addAttribute("municipio", Municipio.findMunicipio(id));
uiModel.addAttribute("itemId", id);
return "municipios/show";
@@ -55,38 +44,23 @@ privileged aspect MunicipioController_Roo_Controller {
} else {
uiModel.addAttribute("municipios", Municipio.findAllMunicipios());
}
+ addDateTimeFormatPatterns(uiModel);
return "municipios/list";
}
- @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
- public String MunicipioController.update(@Valid Municipio municipio, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
- if (bindingResult.hasErrors()) {
- populateEditForm(uiModel, municipio);
- return "municipios/update";
- }
- uiModel.asMap().clear();
- municipio.merge();
- return "redirect:/municipios/" + encodeUrlPathSegment(municipio.getId().toString(), httpServletRequest);
- }
-
@RequestMapping(value = "/{id}", params = "form", produces = "text/html")
public String MunicipioController.updateForm(@PathVariable("id") Long id, Model uiModel) {
populateEditForm(uiModel, Municipio.findMunicipio(id));
return "municipios/update";
}
- @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
- public String MunicipioController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
- Municipio municipio = Municipio.findMunicipio(id);
- municipio.remove();
- uiModel.asMap().clear();
- uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
- uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
- return "redirect:/municipios";
+ void MunicipioController.addDateTimeFormatPatterns(Model uiModel) {
+ uiModel.addAttribute("municipio_ultimaalteracao_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
}
void MunicipioController.populateEditForm(Model uiModel, Municipio municipio) {
uiModel.addAttribute("municipio", municipio);
+ addDateTimeFormatPatterns(uiModel);
uiModel.addAttribute("estadoes", Estado.findAllEstadoes());
}
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 9ddd973ddf7a6206caa6c8ee6a4e1f607cc7e9ed..039c37ca386531b72c6158807d2899d54f5b89dc 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController.java
@@ -1,6 +1,7 @@
package br.ufpr.c3sl.estacaojuventude.web;
import java.util.Arrays;
+import java.util.Calendar;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
@@ -22,6 +23,7 @@ import br.ufpr.c3sl.estacaojuventude.OcorrenciaMunicipal;
import br.ufpr.c3sl.estacaojuventude.OrgaoExecutor;
import br.ufpr.c3sl.estacaojuventude.Programa;
import br.ufpr.c3sl.estacaojuventude.Usuario;
+import br.ufpr.c3sl.estacaojuventude.enums.Situacao;
import br.ufpr.c3sl.estacaojuventude.enums.TipoStatus;
@RequestMapping("/ocorrenciamunicipais")
@@ -41,6 +43,9 @@ public class OcorrenciaMunicipalController {
Usuario u = (Usuario) Usuario.entityManager().createNativeQuery("select * from usuario where login='"+SecurityContextHolder.getContext().getAuthentication().getName()+"'", Usuario.class).getSingleResult();
ocorrenciaMunicipal.setUsuario(u);
+ Calendar calendar = Calendar.getInstance();
+ ocorrenciaMunicipal.setUltimaAlteracao(calendar.getTime());
+
uiModel.asMap().clear();
ocorrenciaMunicipal.persist();
return "redirect:/ocorrenciamunicipais/" + encodeUrlPathSegment(ocorrenciaMunicipal.getId().toString(), httpServletRequest);
@@ -69,6 +74,9 @@ public class OcorrenciaMunicipalController {
ocorrenciaMunicipal.setUsuario(o.getUsuario());
+ Calendar calendar = Calendar.getInstance();
+ ocorrenciaMunicipal.setUltimaAlteracao(calendar.getTime());
+
uiModel.asMap().clear();
ocorrenciaMunicipal.merge();
return "redirect:/ocorrenciamunicipais/" + encodeUrlPathSegment(ocorrenciaMunicipal.getId().toString(), httpServletRequest);
@@ -183,6 +191,7 @@ public class OcorrenciaMunicipalController {
uiModel.addAttribute("orgaoexecutores", OrgaoExecutor.findAllOrgaoExecutors());
uiModel.addAttribute("programas", Programa.findAllProgramasEfetivos());
uiModel.addAttribute("tipostatuses", Arrays.asList(TipoStatus.values()));
+ uiModel.addAttribute("situacaos", Arrays.asList(Situacao.values()));
uiModel.addAttribute("usuarios", Usuario.findAllUsuarios());
}
}
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController_Roo_Controller.aj b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController_Roo_Controller.aj
index e52bf24e95e930cc3b114fb1e9fb3fc84e916e14..e1a99db2918e58e90049ab72e3a083c1c00fa6f6 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController_Roo_Controller.aj
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController_Roo_Controller.aj
@@ -7,6 +7,8 @@ import br.ufpr.c3sl.estacaojuventude.OcorrenciaMunicipal;
import br.ufpr.c3sl.estacaojuventude.web.OcorrenciaMunicipalController;
import java.io.UnsupportedEncodingException;
import javax.servlet.http.HttpServletRequest;
+import org.joda.time.format.DateTimeFormat;
+import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -33,6 +35,7 @@ privileged aspect OcorrenciaMunicipalController_Roo_Controller {
} else {
uiModel.addAttribute("ocorrenciamunicipals", OcorrenciaMunicipal.findAllOcorrenciaMunicipals());
}
+ addDateTimeFormatPatterns(uiModel);
return "ocorrenciamunicipais/list";
}
@@ -42,6 +45,10 @@ privileged aspect OcorrenciaMunicipalController_Roo_Controller {
return "ocorrenciamunicipais/update";
}
+ void OcorrenciaMunicipalController.addDateTimeFormatPatterns(Model uiModel) {
+ uiModel.addAttribute("ocorrenciaMunicipal_ultimaalteracao_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
+ }
+
String OcorrenciaMunicipalController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
String enc = httpServletRequest.getCharacterEncoding();
if (enc == null) {
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OrgaoExecutorController.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OrgaoExecutorController.java
index deb5c74a5a7c0d0d8e96d45d63ea4336cb5298bb..81f17e7237dc2229521c68fa4d2996493aae750c 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OrgaoExecutorController.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OrgaoExecutorController.java
@@ -1,9 +1,16 @@
package br.ufpr.c3sl.estacaojuventude.web;
+import java.util.Calendar;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
import br.ufpr.c3sl.estacaojuventude.OrgaoExecutor;
+
import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -14,6 +21,36 @@ import org.springframework.web.bind.annotation.RequestParam;
@RooWebScaffold(path = "orgaoexecutores", formBackingObject = OrgaoExecutor.class)
public class OrgaoExecutorController {
+ @RequestMapping(method = RequestMethod.POST, produces = "text/html")
+ public String create(@Valid OrgaoExecutor orgaoExecutor, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
+ if (bindingResult.hasErrors()) {
+ populateEditForm(uiModel, orgaoExecutor);
+ return "orgaoexecutores/create";
+ }
+
+ Calendar calendar = Calendar.getInstance();
+ orgaoExecutor.setUltimaAlteracao(calendar.getTime());
+
+ uiModel.asMap().clear();
+ orgaoExecutor.persist();
+ return "redirect:/orgaoexecutores/" + encodeUrlPathSegment(orgaoExecutor.getId().toString(), httpServletRequest);
+ }
+
+ @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
+ public String update(@Valid OrgaoExecutor orgaoExecutor, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
+ if (bindingResult.hasErrors()) {
+ populateEditForm(uiModel, orgaoExecutor);
+ return "orgaoexecutores/update";
+ }
+
+ Calendar calendar = Calendar.getInstance();
+ orgaoExecutor.setUltimaAlteracao(calendar.getTime());
+
+ uiModel.asMap().clear();
+ orgaoExecutor.merge();
+ return "redirect:/orgaoexecutores/" + encodeUrlPathSegment(orgaoExecutor.getId().toString(), httpServletRequest);
+ }
+
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
public String delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
OrgaoExecutor orgaoExecutor = OrgaoExecutor.findOrgaoExecutor(id);
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OrgaoExecutorController_Roo_Controller.aj b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OrgaoExecutorController_Roo_Controller.aj
index 6b11fcdacafecd79a350bc934346f5f5f40c0817..7ed382804364ff52788a01052eb369e01c275678 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OrgaoExecutorController_Roo_Controller.aj
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OrgaoExecutorController_Roo_Controller.aj
@@ -7,29 +7,17 @@ import br.ufpr.c3sl.estacaojuventude.OrgaoExecutor;
import br.ufpr.c3sl.estacaojuventude.web.OrgaoExecutorController;
import java.io.UnsupportedEncodingException;
import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
+import org.joda.time.format.DateTimeFormat;
+import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.util.UriUtils;
import org.springframework.web.util.WebUtils;
privileged aspect OrgaoExecutorController_Roo_Controller {
- @RequestMapping(method = RequestMethod.POST, produces = "text/html")
- public String OrgaoExecutorController.create(@Valid OrgaoExecutor orgaoExecutor, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
- if (bindingResult.hasErrors()) {
- populateEditForm(uiModel, orgaoExecutor);
- return "orgaoexecutores/create";
- }
- uiModel.asMap().clear();
- orgaoExecutor.persist();
- return "redirect:/orgaoexecutores/" + encodeUrlPathSegment(orgaoExecutor.getId().toString(), httpServletRequest);
- }
-
@RequestMapping(params = "form", produces = "text/html")
public String OrgaoExecutorController.createForm(Model uiModel) {
populateEditForm(uiModel, new OrgaoExecutor());
@@ -38,6 +26,7 @@ privileged aspect OrgaoExecutorController_Roo_Controller {
@RequestMapping(value = "/{id}", produces = "text/html")
public String OrgaoExecutorController.show(@PathVariable("id") Long id, Model uiModel) {
+ addDateTimeFormatPatterns(uiModel);
uiModel.addAttribute("orgaoexecutor", OrgaoExecutor.findOrgaoExecutor(id));
uiModel.addAttribute("itemId", id);
return "orgaoexecutores/show";
@@ -54,28 +43,23 @@ privileged aspect OrgaoExecutorController_Roo_Controller {
} else {
uiModel.addAttribute("orgaoexecutors", OrgaoExecutor.findAllOrgaoExecutors());
}
+ addDateTimeFormatPatterns(uiModel);
return "orgaoexecutores/list";
}
- @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
- public String OrgaoExecutorController.update(@Valid OrgaoExecutor orgaoExecutor, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
- if (bindingResult.hasErrors()) {
- populateEditForm(uiModel, orgaoExecutor);
- return "orgaoexecutores/update";
- }
- uiModel.asMap().clear();
- orgaoExecutor.merge();
- return "redirect:/orgaoexecutores/" + encodeUrlPathSegment(orgaoExecutor.getId().toString(), httpServletRequest);
- }
-
@RequestMapping(value = "/{id}", params = "form", produces = "text/html")
public String OrgaoExecutorController.updateForm(@PathVariable("id") Long id, Model uiModel) {
populateEditForm(uiModel, OrgaoExecutor.findOrgaoExecutor(id));
return "orgaoexecutores/update";
}
+ void OrgaoExecutorController.addDateTimeFormatPatterns(Model uiModel) {
+ uiModel.addAttribute("orgaoExecutor_ultimaalteracao_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
+ }
+
void OrgaoExecutorController.populateEditForm(Model uiModel, OrgaoExecutor orgaoExecutor) {
uiModel.addAttribute("orgaoExecutor", orgaoExecutor);
+ addDateTimeFormatPatterns(uiModel);
}
String OrgaoExecutorController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
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 3f96d088581717ceac0cc3a13e974edc1e8ce075..365ed2fc5b436a82110fadde6870dafc3fd6a277 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java
@@ -1,6 +1,7 @@
package br.ufpr.c3sl.estacaojuventude.web;
import java.util.Arrays;
+import java.util.Calendar;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
@@ -24,6 +25,7 @@ import br.ufpr.c3sl.estacaojuventude.Programa;
import br.ufpr.c3sl.estacaojuventude.Tematica;
import br.ufpr.c3sl.estacaojuventude.Usuario;
import br.ufpr.c3sl.estacaojuventude.enums.NivelPrograma;
+import br.ufpr.c3sl.estacaojuventude.enums.Situacao;
import br.ufpr.c3sl.estacaojuventude.enums.TipoStatus;
import br.ufpr.c3sl.estacaojuventude.enums.TipoTemporalidade;
@@ -44,6 +46,9 @@ public class ProgramaController {
Usuario u = (Usuario) Usuario.entityManager().createNativeQuery("select * from usuario where login='"+SecurityContextHolder.getContext().getAuthentication().getName()+"'", Usuario.class).getSingleResult();
programa.setUsuario(u);
+ Calendar calendar = Calendar.getInstance();
+ programa.setUltimaAlteracao(calendar.getTime());
+
uiModel.asMap().clear();
programa.persist();
return "redirect:/programas/" + encodeUrlPathSegment(programa.getId().toString(), httpServletRequest);
@@ -71,6 +76,9 @@ public class ProgramaController {
programa.setUsuario(p.getUsuario());
+ Calendar calendar = Calendar.getInstance();
+ programa.setUltimaAlteracao(calendar.getTime());
+
uiModel.asMap().clear();
programa.merge();
return "redirect:/programas/" + encodeUrlPathSegment(programa.getId().toString(), httpServletRequest);
@@ -199,6 +207,7 @@ public class ProgramaController {
uiModel.addAttribute("tematicas", Tematica.findAllTematicas());
uiModel.addAttribute("orgaoexecutores", OrgaoExecutor.findAllOrgaoExecutors());
uiModel.addAttribute("tipostatuses", Arrays.asList(TipoStatus.values()));
+ uiModel.addAttribute("situacaos", Arrays.asList(Situacao.values()));
uiModel.addAttribute("tipotemporalidades", Arrays.asList(TipoTemporalidade.values()));
uiModel.addAttribute("nivelprogramas", Arrays.asList(NivelPrograma.values()));
uiModel.addAttribute("ocorrenciamunicipais", OcorrenciaMunicipal.findAllOcorrenciaMunicipals());
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController_Roo_Controller.aj b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController_Roo_Controller.aj
index d235d953c80d17ec8ca6cacad16c5e1d973d264b..26652d4e92a4e721327d8836b3a1b79cdaa2e8ae 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController_Roo_Controller.aj
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController_Roo_Controller.aj
@@ -47,6 +47,7 @@ privileged aspect ProgramaController_Roo_Controller {
void ProgramaController.addDateTimeFormatPatterns(Model uiModel) {
uiModel.addAttribute("programa_datainicio_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
+ uiModel.addAttribute("programa_ultimaalteracao_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
}
String ProgramaController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/TematicaController.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/TematicaController.java
index 430c257285c2f8f68aa7da3d5d4e93f02853354b..b0d1684024ae23075434f083f893e8db37955708 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/TematicaController.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/TematicaController.java
@@ -1,9 +1,16 @@
package br.ufpr.c3sl.estacaojuventude.web;
+import java.util.Calendar;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
import br.ufpr.c3sl.estacaojuventude.Tematica;
+
import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -14,6 +21,36 @@ import org.springframework.web.bind.annotation.RequestParam;
@RooWebScaffold(path = "tematicas", formBackingObject = Tematica.class)
public class TematicaController {
+ @RequestMapping(method = RequestMethod.POST, produces = "text/html")
+ public String create(@Valid Tematica tematica, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
+ if (bindingResult.hasErrors()) {
+ populateEditForm(uiModel, tematica);
+ return "tematicas/create";
+ }
+
+ Calendar calendar = Calendar.getInstance();
+ tematica.setUltimaAlteracao(calendar.getTime());
+
+ uiModel.asMap().clear();
+ tematica.persist();
+ return "redirect:/tematicas/" + encodeUrlPathSegment(tematica.getId().toString(), httpServletRequest);
+ }
+
+ @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
+ public String update(@Valid Tematica tematica, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
+ if (bindingResult.hasErrors()) {
+ populateEditForm(uiModel, tematica);
+ return "tematicas/update";
+ }
+
+ Calendar calendar = Calendar.getInstance();
+ tematica.setUltimaAlteracao(calendar.getTime());
+
+ uiModel.asMap().clear();
+ tematica.merge();
+ return "redirect:/tematicas/" + encodeUrlPathSegment(tematica.getId().toString(), httpServletRequest);
+ }
+
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
public String delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
Tematica tematica = Tematica.findTematica(id);
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/TematicaController_Roo_Controller.aj b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/TematicaController_Roo_Controller.aj
index 1b4fb0e0c93f15053c5309e0ac78992bf7741fa2..e2c83d1dfd306601072fcacbf3b0692a83b7cab1 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/TematicaController_Roo_Controller.aj
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/TematicaController_Roo_Controller.aj
@@ -7,29 +7,17 @@ import br.ufpr.c3sl.estacaojuventude.Tematica;
import br.ufpr.c3sl.estacaojuventude.web.TematicaController;
import java.io.UnsupportedEncodingException;
import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
+import org.joda.time.format.DateTimeFormat;
+import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.util.UriUtils;
import org.springframework.web.util.WebUtils;
privileged aspect TematicaController_Roo_Controller {
- @RequestMapping(method = RequestMethod.POST, produces = "text/html")
- public String TematicaController.create(@Valid Tematica tematica, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
- if (bindingResult.hasErrors()) {
- populateEditForm(uiModel, tematica);
- return "tematicas/create";
- }
- uiModel.asMap().clear();
- tematica.persist();
- return "redirect:/tematicas/" + encodeUrlPathSegment(tematica.getId().toString(), httpServletRequest);
- }
-
@RequestMapping(params = "form", produces = "text/html")
public String TematicaController.createForm(Model uiModel) {
populateEditForm(uiModel, new Tematica());
@@ -38,6 +26,7 @@ privileged aspect TematicaController_Roo_Controller {
@RequestMapping(value = "/{id}", produces = "text/html")
public String TematicaController.show(@PathVariable("id") Long id, Model uiModel) {
+ addDateTimeFormatPatterns(uiModel);
uiModel.addAttribute("tematica", Tematica.findTematica(id));
uiModel.addAttribute("itemId", id);
return "tematicas/show";
@@ -54,28 +43,23 @@ privileged aspect TematicaController_Roo_Controller {
} else {
uiModel.addAttribute("tematicas", Tematica.findAllTematicas());
}
+ addDateTimeFormatPatterns(uiModel);
return "tematicas/list";
}
- @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
- public String TematicaController.update(@Valid Tematica tematica, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
- if (bindingResult.hasErrors()) {
- populateEditForm(uiModel, tematica);
- return "tematicas/update";
- }
- uiModel.asMap().clear();
- tematica.merge();
- return "redirect:/tematicas/" + encodeUrlPathSegment(tematica.getId().toString(), httpServletRequest);
- }
-
@RequestMapping(value = "/{id}", params = "form", produces = "text/html")
public String TematicaController.updateForm(@PathVariable("id") Long id, Model uiModel) {
populateEditForm(uiModel, Tematica.findTematica(id));
return "tematicas/update";
}
+ void TematicaController.addDateTimeFormatPatterns(Model uiModel) {
+ uiModel.addAttribute("tematica_ultimaalteracao_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
+ }
+
void TematicaController.populateEditForm(Model uiModel, Tematica tematica) {
uiModel.addAttribute("tematica", tematica);
+ addDateTimeFormatPatterns(uiModel);
}
String TematicaController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/UsuarioController.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/UsuarioController.java
index 72c323e56ff12bb41abde78279615d07797ad22e..e782c775b5bb78d91682ce0abe2a035e598b437c 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/UsuarioController.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/UsuarioController.java
@@ -1,6 +1,7 @@
package br.ufpr.c3sl.estacaojuventude.web;
import java.util.Arrays;
+import java.util.Calendar;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
@@ -35,6 +36,9 @@ public class UsuarioController {
usuario.setSenha(encoder.encodePassword(usuario.getSenha(), ""));
+ Calendar calendar = Calendar.getInstance();
+ usuario.setUltimaAlteracao(calendar.getTime());
+
uiModel.asMap().clear();
usuario.persist();
return "redirect:/usuarios/" + encodeUrlPathSegment(usuario.getId().toString(), httpServletRequest);
@@ -51,6 +55,9 @@ public class UsuarioController {
usuario.setSenha(encoder.encodePassword(usuario.getSenha(), ""));
+ Calendar calendar = Calendar.getInstance();
+ usuario.setUltimaAlteracao(calendar.getTime());
+
uiModel.asMap().clear();
usuario.merge();
return "redirect:/usuarios/" + encodeUrlPathSegment(usuario.getId().toString(), httpServletRequest);
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/UsuarioController_Roo_Controller.aj b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/UsuarioController_Roo_Controller.aj
index 79517080a9422ce526f26fcdd1e5c8bef64fcb85..c9a205b777b03d6a06e89410b67765acd9bed1f4 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/UsuarioController_Roo_Controller.aj
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/UsuarioController_Roo_Controller.aj
@@ -7,6 +7,8 @@ import br.ufpr.c3sl.estacaojuventude.Usuario;
import br.ufpr.c3sl.estacaojuventude.web.UsuarioController;
import java.io.UnsupportedEncodingException;
import javax.servlet.http.HttpServletRequest;
+import org.joda.time.format.DateTimeFormat;
+import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,6 +26,7 @@ privileged aspect UsuarioController_Roo_Controller {
@RequestMapping(value = "/{id}", produces = "text/html")
public String UsuarioController.show(@PathVariable("id") Long id, Model uiModel) {
+ addDateTimeFormatPatterns(uiModel);
uiModel.addAttribute("usuario", Usuario.findUsuario(id));
uiModel.addAttribute("itemId", id);
return "usuarios/show";
@@ -40,6 +43,7 @@ privileged aspect UsuarioController_Roo_Controller {
} else {
uiModel.addAttribute("usuarios", Usuario.findAllUsuarios());
}
+ addDateTimeFormatPatterns(uiModel);
return "usuarios/list";
}
@@ -49,6 +53,10 @@ privileged aspect UsuarioController_Roo_Controller {
return "usuarios/update";
}
+ void UsuarioController.addDateTimeFormatPatterns(Model uiModel) {
+ uiModel.addAttribute("usuario_ultimaalteracao_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
+ }
+
String UsuarioController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
String enc = httpServletRequest.getCharacterEncoding();
if (enc == null) {
diff --git a/src/main/webapp/WEB-INF/i18n/application.properties b/src/main/webapp/WEB-INF/i18n/application.properties
index dc5375a159ef2229e10d612ad4277d1622dfb74e..29b2cb1278a5451f8591a06d93a6ea67feefd8e1 100644
--- a/src/main/webapp/WEB-INF/i18n/application.properties
+++ b/src/main/webapp/WEB-INF/i18n/application.properties
@@ -1,18 +1,22 @@
-#Updated at Tue Sep 03 11:11:06 BRT 2013
-#Tue Sep 03 11:11:06 BRT 2013
+#Updated at Wed Oct 16 13:28:49 BRT 2013
+#Wed Oct 16 13:28:49 BRT 2013
application_name=Banco de Dados Estação Juventude
label_br_ufpr_c3sl_estacaojuventude_localizacao=Localização
-label_br_ufpr_c3sl_estacaojuventude_localizacao_email=Email
+label_br_ufpr_c3sl_estacaojuventude_localizacao_email=E-mail
label_br_ufpr_c3sl_estacaojuventude_localizacao_endereco=Endereço
-label_br_ufpr_c3sl_estacaojuventude_localizacao_horariofuncionamento=Horário de Funcionamento
+label_br_ufpr_c3sl_estacaojuventude_localizacao_horariofuncionamento=Horário de Funcionamento do Local
label_br_ufpr_c3sl_estacaojuventude_localizacao_id=Id
label_br_ufpr_c3sl_estacaojuventude_localizacao_local=Local
-label_br_ufpr_c3sl_estacaojuventude_localizacao_nomereferencia=Nome Referência
+label_br_ufpr_c3sl_estacaojuventude_localizacao_nomereferencia=Nome da Pessoa de Referência no Local
label_br_ufpr_c3sl_estacaojuventude_localizacao_ocorrencia=Ocorrência
label_br_ufpr_c3sl_estacaojuventude_localizacao_plural=Localizações
-label_br_ufpr_c3sl_estacaojuventude_localizacao_quantidadevagas=Quantidade de Vagas
-label_br_ufpr_c3sl_estacaojuventude_localizacao_telefone=Telefone
+label_br_ufpr_c3sl_estacaojuventude_localizacao_quantidadevagas=Quantidade de Vagas no Local
+label_br_ufpr_c3sl_estacaojuventude_localizacao_telefone=Contato Telefônico
+label_br_ufpr_c3sl_estacaojuventude_localizacao_situacao=Situação
+label_br_ufpr_c3sl_estacaojuventude_localizacao_status=Status
+label_br_ufpr_c3sl_estacaojuventude_localizacao_ultimaalteracao=Última Alteração
+label_br_ufpr_c3sl_estacaojuventude_localizacao_usuario=Usuário
label_br_ufpr_c3sl_estacaojuventude_localizacao_version=Versão
label_br_ufpr_c3sl_estacaojuventude_municipio=Município
@@ -20,10 +24,11 @@ label_br_ufpr_c3sl_estacaojuventude_municipio_id=Id
label_br_ufpr_c3sl_estacaojuventude_municipio_nome=Nome
label_br_ufpr_c3sl_estacaojuventude_municipio_plural=Municípios
label_br_ufpr_c3sl_estacaojuventude_municipio_uf=Uf
+label_br_ufpr_c3sl_estacaojuventude_municipio_ultimaalteracao=Última Alteração
label_br_ufpr_c3sl_estacaojuventude_municipio_version=Versão
label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal=Ocorrência Municipal
-label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal_beneficioslocais=Benefícios Locais
+label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal_beneficioslocais=Benefícios Locais Agregados
label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal_comoacessar=Como Acessar
label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal_inicioinscricoes=Início das Inscrições
label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal_fiminscricoes=Fim das Inscrições
@@ -31,9 +36,11 @@ label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal_id=Id
label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal_localizacoes=Localizações
label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal_municipio=Município
label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal_programavinculado=Programa Vinculado
-label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal_orgaosexecutores=Orgãos Executores
+label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal_orgaosexecutores=Orgão Local Responsável pela Execução
label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal_plural=Ocorrências Municipais
-label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal_quantidadevagas=Quantidade de Vagas
+label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal_quantidadevagas=Quantidade de Vagas no Total para o Município
+label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal_situacao=Situação
+label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal_ultimaalteracao=Última Alteração
label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal_usuario=Usuário
label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal_status=Status
label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal_version=Versão
@@ -44,33 +51,36 @@ label_br_ufpr_c3sl_estacaojuventude_orgaoexecutor_endereco=Endereço
label_br_ufpr_c3sl_estacaojuventude_orgaoexecutor_id=Id
label_br_ufpr_c3sl_estacaojuventude_orgaoexecutor_nome=Nome
label_br_ufpr_c3sl_estacaojuventude_orgaoexecutor_plural=Orgãos Executores
+label_br_ufpr_c3sl_estacaojuventude_orgaoexecutor_ultimaalteracao=Última Alteração
label_br_ufpr_c3sl_estacaojuventude_orgaoexecutor_site=Site
label_br_ufpr_c3sl_estacaojuventude_orgaoexecutor_version=Versão
label_br_ufpr_c3sl_estacaojuventude_programa=Programa
-label_br_ufpr_c3sl_estacaojuventude_programa_beneficios=Benefícios
-label_br_ufpr_c3sl_estacaojuventude_programa_criteriosacesso=Critérios Acesso
-label_br_ufpr_c3sl_estacaojuventude_programa_datainicio=Data de Início
-label_br_ufpr_c3sl_estacaojuventude_programa_descricao=Descrição
-label_br_ufpr_c3sl_estacaojuventude_programa_duracao=Duração
+label_br_ufpr_c3sl_estacaojuventude_programa_beneficios=Benefícios Associados
+label_br_ufpr_c3sl_estacaojuventude_programa_criteriosacesso=Critérios para o Acesso
+label_br_ufpr_c3sl_estacaojuventude_programa_datainicio=Data de Início do Programa
+label_br_ufpr_c3sl_estacaojuventude_programa_descricao=Descrição do que é Ofertado ao Jovem
+label_br_ufpr_c3sl_estacaojuventude_programa_duracao=Duração da Atividade para o Jovem
label_br_ufpr_c3sl_estacaojuventude_programa_id=Id
label_br_ufpr_c3sl_estacaojuventude_programa_idademaxima=Idade Máxima
-label_br_ufpr_c3sl_estacaojuventude_programa_idademinima=Idade Minima
+label_br_ufpr_c3sl_estacaojuventude_programa_idademinima=Idade Mínima
label_br_ufpr_c3sl_estacaojuventude_programa_leicriacao=Lei de Criação
label_br_ufpr_c3sl_estacaojuventude_programa_nivel=Nível
label_br_ufpr_c3sl_estacaojuventude_programa_nomedivulgacao=Nome de Divulgação
-label_br_ufpr_c3sl_estacaojuventude_programa_nomeoficial=Nome Oficial
+label_br_ufpr_c3sl_estacaojuventude_programa_nomeoficial=Nome Oficial do Programa
label_br_ufpr_c3sl_estacaojuventude_programa_objetivos=Objetivos
label_br_ufpr_c3sl_estacaojuventude_programa_ocorrencias=Ocorrências
label_br_ufpr_c3sl_estacaojuventude_programa_orgaosexecutores=Orgãos Executores
-label_br_ufpr_c3sl_estacaojuventude_programa_parceiros=Parceiros
+label_br_ufpr_c3sl_estacaojuventude_programa_parceiros=Parceiros na Execução do Programa
label_br_ufpr_c3sl_estacaojuventude_programa_plural=Programas
-label_br_ufpr_c3sl_estacaojuventude_programa_programavinculado=Programa Vinculado
+label_br_ufpr_c3sl_estacaojuventude_programa_programavinculado=Programa Maior ao qual é Vinculado
label_br_ufpr_c3sl_estacaojuventude_programa_publicoalvo=Público Alvo
label_br_ufpr_c3sl_estacaojuventude_programa_sigla=Sigla
label_br_ufpr_c3sl_estacaojuventude_programa_tematicas=Temáticas
-label_br_ufpr_c3sl_estacaojuventude_programa_temporalidade=Temporalidade
+label_br_ufpr_c3sl_estacaojuventude_programa_temporalidade=Temporalidade do Programa
+label_br_ufpr_c3sl_estacaojuventude_programa_ultimaalteracao=Última Alteração
label_br_ufpr_c3sl_estacaojuventude_programa_usuario=Usuário
+label_br_ufpr_c3sl_estacaojuventude_programa_situacao=Situação
label_br_ufpr_c3sl_estacaojuventude_programa_status=Status
label_br_ufpr_c3sl_estacaojuventude_programa_version=Versão
@@ -78,6 +88,7 @@ label_br_ufpr_c3sl_estacaojuventude_tematica=Temática
label_br_ufpr_c3sl_estacaojuventude_tematica_id=Id
label_br_ufpr_c3sl_estacaojuventude_tematica_nome=Nome
label_br_ufpr_c3sl_estacaojuventude_tematica_plural=Temáticas
+label_br_ufpr_c3sl_estacaojuventude_tematica_ultimaalteracao=Última Alteração
label_br_ufpr_c3sl_estacaojuventude_tematica_version=Versão
label_br_ufpr_c3sl_estacaojuventude_estado=Estado
@@ -86,15 +97,18 @@ label_br_ufpr_c3sl_estacaojuventude_estado_municipios=Municípios
label_br_ufpr_c3sl_estacaojuventude_estado_nome=Nome
label_br_ufpr_c3sl_estacaojuventude_estado_plural=Estados
label_br_ufpr_c3sl_estacaojuventude_estado_sigla=Sigla
+label_br_ufpr_c3sl_estacaojuventude_estado_ultimaalteracao=Última Alteração
label_br_ufpr_c3sl_estacaojuventude_estado_version=Versão
label_br_ufpr_c3sl_estacaojuventude_usuario=Usuário
label_br_ufpr_c3sl_estacaojuventude_usuario_id=Id
+label_br_ufpr_c3sl_estacaojuventude_usuario_nome=Nome
label_br_ufpr_c3sl_estacaojuventude_usuario_login=Login
label_br_ufpr_c3sl_estacaojuventude_usuario_permissao=Permissão
label_br_ufpr_c3sl_estacaojuventude_usuario_plural=Usuários
label_br_ufpr_c3sl_estacaojuventude_usuario_senha=Senha
label_br_ufpr_c3sl_estacaojuventude_usuario_version=Versão
+label_br_ufpr_c3sl_estacaojuventude_usuario_ultimaalteracao=Última Alteração
label_br_ufpr_c3sl_estacaojuventude_usuario_oldpass=Senha Atual
label_br_ufpr_c3sl_estacaojuventude_usuario_newpass=Nova Senha
@@ -136,4 +150,4 @@ menu_item_programa_list_label=Programas
menu_item_programa_new_label=Programa
menu_item_tematica_list_label=Temáticas
-menu_item_tematica_new_label=Temática
\ No newline at end of file
+menu_item_tematica_new_label=Temática
diff --git a/src/main/webapp/WEB-INF/i18n/messages.properties b/src/main/webapp/WEB-INF/i18n/messages.properties
index 8f1e2501f9b9a762aa970022ba72d64b056964a3..82a098e8bd6d03e195ed413a6dab8cb772e01bbb 100644
--- a/src/main/webapp/WEB-INF/i18n/messages.properties
+++ b/src/main/webapp/WEB-INF/i18n/messages.properties
@@ -15,6 +15,7 @@ global_generic={0}
my_projects=Meus Programas pendentes
my_occurrences=Minhas Ocorrências pendentes
+my_locations=Minhas Localizações pendentes
#welcome page
welcome_titlepane=Bem-vindo ao {0}
diff --git a/src/main/webapp/WEB-INF/views/estados/create.jspx b/src/main/webapp/WEB-INF/views/estados/create.jspx
index f927737ddd15af7477768fcbed751164a0135f5a..9f83259731b24bcf0377d326b17d9127d63bc1e1 100644
--- a/src/main/webapp/WEB-INF/views/estados/create.jspx
+++ b/src/main/webapp/WEB-INF/views/estados/create.jspx
@@ -6,6 +6,7 @@
<field:input field="nome" id="c_br_ufpr_c3sl_estacaojuventude_Estado_nome" z="kIoq6F1PK1AezI2ozamOd4cblT4="/>
<field:input field="sigla" id="c_br_ufpr_c3sl_estacaojuventude_Estado_sigla" z="QKgJsPxT2TSjqowUe/LWpgmta5k="/>
<field:select field="municipios" id="c_br_ufpr_c3sl_estacaojuventude_Estado_municipios" itemValue="id" items="${municipios}" multiple="true" path="/municipios" z="qSQbotIYGpKXYM4bQL5qBDG34l4="/>
+ <field:datetime dateTimePattern="${estado_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Estado_ultimaAlteracao" render="false" z="user-managed"/>
</form:create>
<form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_estacaojuventude_Estado" render="${not empty dependencies}" z="U6rn6PODKImfZaUzsq6cbz2oCiw="/>
</div>
diff --git a/src/main/webapp/WEB-INF/views/estados/list.jspx b/src/main/webapp/WEB-INF/views/estados/list.jspx
index e091bfe0b78ec9f2630e1d3469727a00cade672e..5743107550499d738ac3cb427b086559bfcd802f 100644
--- a/src/main/webapp/WEB-INF/views/estados/list.jspx
+++ b/src/main/webapp/WEB-INF/views/estados/list.jspx
@@ -7,6 +7,7 @@
<table:column id="c_br_ufpr_c3sl_estacaojuventude_Estado_nome" property="nome" z="BF4GN2ukJDz2YCtd6ZSp3UQkRhU="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_Estado_sigla" property="sigla" z="mARXk7E1bxo0/aXfNpzrOtgR+tw="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_Estado_municipios" property="municipios" z="KRlbMNw0wtox9PxTviofmu23HsY="/>
+ <table:column date="true" dateTimePattern="${estado_ultimaalteracao_date_format}" id="c_br_ufpr_c3sl_estacaojuventude_Estado_ultimaAlteracao" property="ultimaAlteracao" render="false" z="user-managed"/>
</table:table>
</page:list>
</div>
diff --git a/src/main/webapp/WEB-INF/views/estados/show.jspx b/src/main/webapp/WEB-INF/views/estados/show.jspx
index 181e6a55ae9fc6c4c684ef213ba98c7713052a1d..094fd5399ce6936379f8ae76bf8726f9cfc39776 100644
--- a/src/main/webapp/WEB-INF/views/estados/show.jspx
+++ b/src/main/webapp/WEB-INF/views/estados/show.jspx
@@ -6,5 +6,6 @@
<field:display field="nome" id="s_br_ufpr_c3sl_estacaojuventude_Estado_nome" object="${estado}" z="iuy0dZ8CjfmDdHRiJQ+hFQ7PSbc="/>
<field:display field="sigla" id="s_br_ufpr_c3sl_estacaojuventude_Estado_sigla" object="${estado}" z="Ws/OpzA+/IL7I4enrnvYwLOcfvc="/>
<field:display field="municipios" id="s_br_ufpr_c3sl_estacaojuventude_Estado_municipios" object="${estado}" z="bCaa7btoKydzVN8C/YaLoNT8aeU="/>
+ <field:display date="true" dateTimePattern="${estado_ultimaalteracao_date_format}" field="ultimaAlteracao" id="s_br_ufpr_c3sl_estacaojuventude_Estado_ultimaAlteracao" object="${estado}" z="65SdU8zeniO8Svyx3OOpn6h3kCQ="/>
</page:show>
</div>
diff --git a/src/main/webapp/WEB-INF/views/estados/update.jspx b/src/main/webapp/WEB-INF/views/estados/update.jspx
index c53cc3483515e350ef5e33d9db4fd1fc28860263..ba9084e49aae30bac297505ff87a4e0e32088555 100644
--- a/src/main/webapp/WEB-INF/views/estados/update.jspx
+++ b/src/main/webapp/WEB-INF/views/estados/update.jspx
@@ -6,5 +6,6 @@
<field:input field="nome" id="c_br_ufpr_c3sl_estacaojuventude_Estado_nome" z="kIoq6F1PK1AezI2ozamOd4cblT4="/>
<field:input field="sigla" id="c_br_ufpr_c3sl_estacaojuventude_Estado_sigla" z="QKgJsPxT2TSjqowUe/LWpgmta5k="/>
<field:select field="municipios" id="c_br_ufpr_c3sl_estacaojuventude_Estado_municipios" itemValue="id" items="${municipios}" multiple="true" path="/municipios" z="qSQbotIYGpKXYM4bQL5qBDG34l4="/>
+ <field:datetime dateTimePattern="${estado_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Estado_ultimaAlteracao" render="false" z="user-managed"/>
</form:update>
</div>
diff --git a/src/main/webapp/WEB-INF/views/localizacoes/create.jspx b/src/main/webapp/WEB-INF/views/localizacoes/create.jspx
index 62c9e83cafd7b43f1a51fad2eef6ee01cc42aa4d..bd03327c290a29dd76365821da8dd1fd471ad134 100644
--- a/src/main/webapp/WEB-INF/views/localizacoes/create.jspx
+++ b/src/main/webapp/WEB-INF/views/localizacoes/create.jspx
@@ -3,7 +3,7 @@
<jsp:directive.page contentType="text/html;charset=UTF-8"/>
<jsp:output omit-xml-declaration="yes"/>
<form:create id="fc_br_ufpr_c3sl_estacaojuventude_Localizacao" modelAttribute="localizacao" path="/localizacoes" render="${empty dependencies}" z="roB49ZfPLXumP8eGL4QtNZnO5mw=">
- <field:select field="ocorrencia" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ocorrencia" itemValue="id" items="${ocorrenciamunicipals}" path="/ocorrenciamunicipais" z="x3nXHdBxIzZwt7vPWcNsVQA+2zM="/>
+ <field:select field="ocorrencia" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ocorrencia" itemValue="id" items="${ocorrenciamunicipais}" path="/ocorrenciamunicipais" z="user-managed"/>
<field:input field="local" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_local" z="F+5PMRrsFY8daKJAKHiD++Q/zM0="/>
<field:input field="endereco" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_endereco" z="GxkuN7uw8aGj5L19cLd6a2iaWJQ="/>
<field:input field="horarioFuncionamento" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioFuncionamento" z="7kNkZ2jgnZCzlVNzjlDsAc+6fFI="/>
@@ -11,6 +11,10 @@
<field:input field="telefone" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_telefone" z="ilHU4xzXIRkjlxIl1dQI1DEoICM="/>
<field:input field="email" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_email" validationMessageCode="field_invalid_email" z="k189k964O3HRRnp3TNb0GDfmZts="/>
<field:input field="quantidadeVagas" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_quantidadeVagas" validationMessageCode="field_invalid_integer" z="UmLVOAQqGSoB5tMvB5qExH6t+2U="/>
+ <field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_status" items="${tipostatuses}" path="tipostatuses" render="false" z="user-managed"/>
+ <field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="user-managed"/>
+ <field:select field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_situacao" items="${situacaos}" path="situacaos" render="false" z="user-managed"/>
+ <field:datetime dateTimePattern="${localizacao_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ultimaAlteracao" render="false" z="user-managed"/>
</form:create>
<form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_estacaojuventude_Localizacao" render="${not empty dependencies}" z="amxA8+e0EPwKgmIH7qv1LRMRRzA="/>
</div>
diff --git a/src/main/webapp/WEB-INF/views/localizacoes/list.jspx b/src/main/webapp/WEB-INF/views/localizacoes/list.jspx
index 71ef1ce6bf9bbf2f11cfe72e37ff1863d1111258..ac8c3ab0269d4726ba399e67bb79b476cdde9af3 100644
--- a/src/main/webapp/WEB-INF/views/localizacoes/list.jspx
+++ b/src/main/webapp/WEB-INF/views/localizacoes/list.jspx
@@ -1,15 +1,29 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
+<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:sec="http://www.springframework.org/security/tags" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
<jsp:directive.page contentType="text/html;charset=UTF-8"/>
<jsp:output omit-xml-declaration="yes"/>
- <page:list id="pl_br_ufpr_c3sl_estacaojuventude_Localizacao" items="${localizacaos}" z="e3STKf8oW/0oqDr/KihOxpAlGBY=">
- <table:table data="${localizacaos}" id="l_br_ufpr_c3sl_estacaojuventude_Localizacao" path="/localizacoes" z="LCLLP2BD/iSyYc+oJVBSMRvXM+Q=">
- <table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ocorrencia" property="ocorrencia" 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_endereco" property="endereco" z="yrJ1tAlCgO1+zcbuVBSF4tMH7jg="/>
- <table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioFuncionamento" property="horarioFuncionamento" z="GPr41iVapzEF8dbrfiVVgRh0lNk="/>
- <table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_nomeReferencia" property="nomeReferencia" z="nOuCOY3uytJfD7CZJjtMHgmyu9A="/>
- <table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_quantidadeVagas" property="quantidadeVagas" z="t3caoPpd7tdfr3Aaq9iW/ghJbzU="/>
- </table:table>
- </page:list>
+ <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" property="ocorrencia" 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_endereco" property="endereco" z="yrJ1tAlCgO1+zcbuVBSF4tMH7jg="/>
+ <table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioFuncionamento" property="horarioFuncionamento" z="GPr41iVapzEF8dbrfiVVgRh0lNk="/>
+ <table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_nomeReferencia" property="nomeReferencia" z="nOuCOY3uytJfD7CZJjtMHgmyu9A="/>
+ <table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_quantidadeVagas" property="quantidadeVagas" z="t3caoPpd7tdfr3Aaq9iW/ghJbzU="/>
+ </table:table>
+ </page:list>
+ </sec:authorize>
+ <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" property="ocorrencia" 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_endereco" property="endereco" z="yrJ1tAlCgO1+zcbuVBSF4tMH7jg="/>
+ <table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioFuncionamento" property="horarioFuncionamento" z="GPr41iVapzEF8dbrfiVVgRh0lNk="/>
+ <table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_nomeReferencia" property="nomeReferencia" z="nOuCOY3uytJfD7CZJjtMHgmyu9A="/>
+ <table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_quantidadeVagas" property="quantidadeVagas" z="t3caoPpd7tdfr3Aaq9iW/ghJbzU="/>
+ </table:table>
+ </page:list>
+ </sec:authorize>
</div>
diff --git a/src/main/webapp/WEB-INF/views/localizacoes/mylist.jspx b/src/main/webapp/WEB-INF/views/localizacoes/mylist.jspx
new file mode 100644
index 0000000000000000000000000000000000000000..8f4fecc252ca3bce4154623bc110edcb896e6733
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/localizacoes/mylist.jspx
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
+ <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+ <jsp:output omit-xml-declaration="yes"/>
+ <page:list id="pl_br_ufpr_c3sl_estacaojuventude_Localizacao" items="${localizacoes}" z="e3STKf8oW/0oqDr/KihOxpAlGBY=">
+ <table:table data="${localizacoes}" id="l_br_ufpr_c3sl_estacaojuventude_Localizacao" path="/localizacoes" z="LCLLP2BD/iSyYc+oJVBSMRvXM+Q=">
+ <table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ocorrencia" property="ocorrencia" 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_endereco" property="endereco" z="yrJ1tAlCgO1+zcbuVBSF4tMH7jg="/>
+ <table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioFuncionamento" property="horarioFuncionamento" z="GPr41iVapzEF8dbrfiVVgRh0lNk="/>
+ <table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_nomeReferencia" property="nomeReferencia" z="nOuCOY3uytJfD7CZJjtMHgmyu9A="/>
+ <table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_quantidadeVagas" property="quantidadeVagas" z="t3caoPpd7tdfr3Aaq9iW/ghJbzU="/>
+ </table:table>
+ </page:list>
+</div>
diff --git a/src/main/webapp/WEB-INF/views/localizacoes/myshow.jspx b/src/main/webapp/WEB-INF/views/localizacoes/myshow.jspx
new file mode 100644
index 0000000000000000000000000000000000000000..e129cd91dbbe5621078ca0a5cedd0ddb8623d9c4
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/localizacoes/myshow.jspx
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:sec="http://www.springframework.org/security/tags" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
+ <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+ <jsp:output omit-xml-declaration="yes"/>
+ <sec:authorize ifAnyGranted="Usuario">
+ <page:show list="false" id="ps_br_ufpr_c3sl_estacaojuventude_Localizacao" object="${localizacao}" path="/localizacoes" z="SmCY/3Js4YkCcgz4z9ilwbAYh6E=">
+ <field:display field="ocorrencia" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_ocorrencia" object="${localizacao}" z="A74yY8LUiz3tcppeNeInm/r2cwc="/>
+ <field:display field="local" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_local" object="${localizacao}" z="smMRCWWU8v/3hAj79+Y06yscmlg="/>
+ <field:display field="endereco" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_endereco" object="${localizacao}" z="ZwpJFP3GctblqyMERjeZ76xz0+c="/>
+ <field:display field="horarioFuncionamento" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioFuncionamento" object="${localizacao}" z="N/jgTmi2kirZpqRksIOqK3vwmps="/>
+ <field:display field="nomeReferencia" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_nomeReferencia" object="${localizacao}" z="GAoLQan1ZL0GDFgbdkgB+1QvU8g="/>
+ <field:display field="telefone" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_telefone" object="${localizacao}" z="chwqFuPX2dV5GMGUturi9QQHvnQ="/>
+ <field:display field="email" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_email" object="${localizacao}" z="lvSBNoJlQbfOTbpXxihX35KNEFg="/>
+ <field:display field="quantidadeVagas" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_quantidadeVagas" object="${localizacao}" z="VF4wruIAdFgRv9+FS3bK6pxuiew="/>
+ <field:display field="status" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_status" object="${localizacao}" z="HYtpqGn7MeGtekpTcMpWzMaxYdk="/>
+ <field:display field="usuario" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_usuario" object="${localizacao}" z="W/JS2Q5HFE4TEUeNkXd8fHqIVaQ="/>
+ <field:display field="situacao" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_situacao" object="${localizacao}" z="5j/k63FNCUASeN2qfCYJ16MfbpU="/>
+ <field:display date="true" dateTimePattern="${localizacao_ultimaalteracao_date_format}" field="ultimaAlteracao" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_ultimaAlteracao" object="${localizacao}" z="yldOi02mVml8xjiKKfqCOCpHM9c="/>
+ </page:show>
+ </sec:authorize>
+</div>
diff --git a/src/main/webapp/WEB-INF/views/localizacoes/show.jspx b/src/main/webapp/WEB-INF/views/localizacoes/show.jspx
index 7f2c72dcd1c55b7b5f7c813a76b737c441d8603d..e70984500c104c9106a5f635efd7a18351829d2b 100644
--- a/src/main/webapp/WEB-INF/views/localizacoes/show.jspx
+++ b/src/main/webapp/WEB-INF/views/localizacoes/show.jspx
@@ -1,15 +1,37 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
+<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:sec="http://www.springframework.org/security/tags" version="2.0">
<jsp:directive.page contentType="text/html;charset=UTF-8"/>
<jsp:output omit-xml-declaration="yes"/>
- <page:show id="ps_br_ufpr_c3sl_estacaojuventude_Localizacao" object="${localizacao}" path="/localizacoes" z="SmCY/3Js4YkCcgz4z9ilwbAYh6E=">
- <field:display field="ocorrencia" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_ocorrencia" object="${localizacao}" z="A74yY8LUiz3tcppeNeInm/r2cwc="/>
- <field:display field="local" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_local" object="${localizacao}" z="smMRCWWU8v/3hAj79+Y06yscmlg="/>
- <field:display field="endereco" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_endereco" object="${localizacao}" z="ZwpJFP3GctblqyMERjeZ76xz0+c="/>
- <field:display field="horarioFuncionamento" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioFuncionamento" object="${localizacao}" z="N/jgTmi2kirZpqRksIOqK3vwmps="/>
- <field:display field="nomeReferencia" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_nomeReferencia" object="${localizacao}" z="GAoLQan1ZL0GDFgbdkgB+1QvU8g="/>
- <field:display field="telefone" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_telefone" object="${localizacao}" z="chwqFuPX2dV5GMGUturi9QQHvnQ="/>
- <field:display field="email" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_email" object="${localizacao}" z="lvSBNoJlQbfOTbpXxihX35KNEFg="/>
- <field:display field="quantidadeVagas" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_quantidadeVagas" object="${localizacao}" z="VF4wruIAdFgRv9+FS3bK6pxuiew="/>
- </page:show>
+ <sec:authorize ifAnyGranted="Administrador">
+ <page:show id="ps_br_ufpr_c3sl_estacaojuventude_Localizacao" list="false" object="${localizacao}" path="/localizacoes" z="user-managed">
+ <field:display field="ocorrencia" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_ocorrencia" object="${localizacao}" z="A74yY8LUiz3tcppeNeInm/r2cwc="/>
+ <field:display field="local" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_local" object="${localizacao}" z="smMRCWWU8v/3hAj79+Y06yscmlg="/>
+ <field:display field="endereco" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_endereco" object="${localizacao}" z="ZwpJFP3GctblqyMERjeZ76xz0+c="/>
+ <field:display field="horarioFuncionamento" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioFuncionamento" object="${localizacao}" z="N/jgTmi2kirZpqRksIOqK3vwmps="/>
+ <field:display field="nomeReferencia" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_nomeReferencia" object="${localizacao}" z="GAoLQan1ZL0GDFgbdkgB+1QvU8g="/>
+ <field:display field="telefone" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_telefone" object="${localizacao}" z="chwqFuPX2dV5GMGUturi9QQHvnQ="/>
+ <field:display field="email" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_email" object="${localizacao}" z="lvSBNoJlQbfOTbpXxihX35KNEFg="/>
+ <field:display field="quantidadeVagas" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_quantidadeVagas" object="${localizacao}" z="VF4wruIAdFgRv9+FS3bK6pxuiew="/>
+ <field:display field="status" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_status" object="${localizacao}" z="HYtpqGn7MeGtekpTcMpWzMaxYdk="/>
+ <field:display field="usuario" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_usuario" object="${localizacao}" z="W/JS2Q5HFE4TEUeNkXd8fHqIVaQ="/>
+ <field:display field="situacao" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_situacao" object="${localizacao}" z="5j/k63FNCUASeN2qfCYJ16MfbpU="/>
+ <field:display date="true" dateTimePattern="${localizacao_ultimaalteracao_date_format}" field="ultimaAlteracao" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_ultimaAlteracao" object="${localizacao}" z="yldOi02mVml8xjiKKfqCOCpHM9c="/>
+ </page:show>
+ </sec:authorize>
+ <sec:authorize ifAnyGranted="Usuario">
+ <page:show delete="false" id="ps_br_ufpr_c3sl_estacaojuventude_Localizacao" list="false" object="${localizacao}" path="/localizacoes" update="false" z="SmCY/3Js4YkCcgz4z9ilwbAYh6E=">
+ <field:display field="ocorrencia" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_ocorrencia" object="${localizacao}" z="A74yY8LUiz3tcppeNeInm/r2cwc="/>
+ <field:display field="local" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_local" object="${localizacao}" z="smMRCWWU8v/3hAj79+Y06yscmlg="/>
+ <field:display field="endereco" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_endereco" object="${localizacao}" z="ZwpJFP3GctblqyMERjeZ76xz0+c="/>
+ <field:display field="horarioFuncionamento" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioFuncionamento" object="${localizacao}" z="N/jgTmi2kirZpqRksIOqK3vwmps="/>
+ <field:display field="nomeReferencia" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_nomeReferencia" object="${localizacao}" z="GAoLQan1ZL0GDFgbdkgB+1QvU8g="/>
+ <field:display field="telefone" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_telefone" object="${localizacao}" z="chwqFuPX2dV5GMGUturi9QQHvnQ="/>
+ <field:display field="email" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_email" object="${localizacao}" z="lvSBNoJlQbfOTbpXxihX35KNEFg="/>
+ <field:display field="quantidadeVagas" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_quantidadeVagas" object="${localizacao}" z="VF4wruIAdFgRv9+FS3bK6pxuiew="/>
+ <field:display field="status" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_status" object="${localizacao}" z="HYtpqGn7MeGtekpTcMpWzMaxYdk="/>
+ <field:display field="usuario" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_usuario" object="${localizacao}" z="W/JS2Q5HFE4TEUeNkXd8fHqIVaQ="/>
+ <field:display field="situacao" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_situacao" object="${localizacao}" z="5j/k63FNCUASeN2qfCYJ16MfbpU="/>
+ <field:display date="true" dateTimePattern="${localizacao_ultimaalteracao_date_format}" field="ultimaAlteracao" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_ultimaAlteracao" object="${localizacao}" z="yldOi02mVml8xjiKKfqCOCpHM9c="/>
+ </page:show>
+ </sec:authorize>
</div>
diff --git a/src/main/webapp/WEB-INF/views/localizacoes/showcandidatos.jspx b/src/main/webapp/WEB-INF/views/localizacoes/showcandidatos.jspx
new file mode 100644
index 0000000000000000000000000000000000000000..1dde82a0de424fe8a0ea733a20525de98a3d5b7c
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/localizacoes/showcandidatos.jspx
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:sec="http://www.springframework.org/security/tags" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
+ <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+ <jsp:output omit-xml-declaration="yes"/>
+ <sec:authorize ifAnyGranted="Administrador">
+ <page:show id="ps_br_ufpr_c3sl_estacaojuventude_Localizacao" object="${localizacao}" path="/localizacoes" list="false" z="SmCY/3Js4YkCcgz4z9ilwbAYh6E=">
+
+ <form action="" method="POST">
+ <button type="submit" name="status" value="1">Aprovar</button>
+ <button type="submit" name="status" value="0">Rejeitar</button>
+ </form>
+
+ <field:display field="ocorrencia" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_ocorrencia" object="${localizacao}" z="A74yY8LUiz3tcppeNeInm/r2cwc="/>
+ <field:display field="local" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_local" object="${localizacao}" z="smMRCWWU8v/3hAj79+Y06yscmlg="/>
+ <field:display field="endereco" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_endereco" object="${localizacao}" z="ZwpJFP3GctblqyMERjeZ76xz0+c="/>
+ <field:display field="horarioFuncionamento" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioFuncionamento" object="${localizacao}" z="N/jgTmi2kirZpqRksIOqK3vwmps="/>
+ <field:display field="nomeReferencia" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_nomeReferencia" object="${localizacao}" z="GAoLQan1ZL0GDFgbdkgB+1QvU8g="/>
+ <field:display field="telefone" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_telefone" object="${localizacao}" z="chwqFuPX2dV5GMGUturi9QQHvnQ="/>
+ <field:display field="email" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_email" object="${localizacao}" z="lvSBNoJlQbfOTbpXxihX35KNEFg="/>
+ <field:display field="quantidadeVagas" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_quantidadeVagas" object="${localizacao}" z="VF4wruIAdFgRv9+FS3bK6pxuiew="/>
+ <field:display field="status" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_status" object="${localizacao}" z="HYtpqGn7MeGtekpTcMpWzMaxYdk="/>
+ <field:display field="usuario" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_usuario" object="${localizacao}" z="W/JS2Q5HFE4TEUeNkXd8fHqIVaQ="/>
+ <field:display field="situacao" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_situacao" object="${localizacao}" z="5j/k63FNCUASeN2qfCYJ16MfbpU="/>
+ <field:display date="true" dateTimePattern="${localizacao_ultimaalteracao_date_format}" field="ultimaAlteracao" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_ultimaAlteracao" object="${localizacao}" z="yldOi02mVml8xjiKKfqCOCpHM9c="/>
+ </page:show>
+ </sec:authorize>
+
+ <sec:authorize ifAnyGranted="Usuario">
+ <page:show delete="false" list="false" update="false" id="ps_br_ufpr_c3sl_estacaojuventude_Localizacao" object="${localizacao}" path="/localizacoes" z="SmCY/3Js4YkCcgz4z9ilwbAYh6E=">
+ <field:display field="ocorrencia" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_ocorrencia" object="${localizacao}" z="A74yY8LUiz3tcppeNeInm/r2cwc="/>
+ <field:display field="local" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_local" object="${localizacao}" z="smMRCWWU8v/3hAj79+Y06yscmlg="/>
+ <field:display field="endereco" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_endereco" object="${localizacao}" z="ZwpJFP3GctblqyMERjeZ76xz0+c="/>
+ <field:display field="horarioFuncionamento" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioFuncionamento" object="${localizacao}" z="N/jgTmi2kirZpqRksIOqK3vwmps="/>
+ <field:display field="nomeReferencia" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_nomeReferencia" object="${localizacao}" z="GAoLQan1ZL0GDFgbdkgB+1QvU8g="/>
+ <field:display field="telefone" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_telefone" object="${localizacao}" z="chwqFuPX2dV5GMGUturi9QQHvnQ="/>
+ <field:display field="email" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_email" object="${localizacao}" z="lvSBNoJlQbfOTbpXxihX35KNEFg="/>
+ <field:display field="quantidadeVagas" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_quantidadeVagas" object="${localizacao}" z="VF4wruIAdFgRv9+FS3bK6pxuiew="/>
+ <field:display field="status" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_status" object="${localizacao}" z="HYtpqGn7MeGtekpTcMpWzMaxYdk="/>
+ <field:display field="usuario" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_usuario" object="${localizacao}" z="W/JS2Q5HFE4TEUeNkXd8fHqIVaQ="/>
+ <field:display field="situacao" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_situacao" object="${localizacao}" z="5j/k63FNCUASeN2qfCYJ16MfbpU="/>
+ <field:display date="true" dateTimePattern="${localizacao_ultimaalteracao_date_format}" field="ultimaAlteracao" id="s_br_ufpr_c3sl_estacaojuventude_Localizacao_ultimaAlteracao" object="${localizacao}" z="yldOi02mVml8xjiKKfqCOCpHM9c="/>
+ </page:show>
+ </sec:authorize>
+</div>
diff --git a/src/main/webapp/WEB-INF/views/localizacoes/update.jspx b/src/main/webapp/WEB-INF/views/localizacoes/update.jspx
index 8e1202d08cc6d3e4bca7e1fa1650fc1e8cbefc76..62bdbf92ffe97a70d61e7811152459edfb3aa404 100644
--- a/src/main/webapp/WEB-INF/views/localizacoes/update.jspx
+++ b/src/main/webapp/WEB-INF/views/localizacoes/update.jspx
@@ -1,15 +1,37 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
+<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:sec="http://www.springframework.org/security/tags" version="2.0">
<jsp:directive.page contentType="text/html;charset=UTF-8"/>
<jsp:output omit-xml-declaration="yes"/>
- <form:update id="fu_br_ufpr_c3sl_estacaojuventude_Localizacao" modelAttribute="localizacao" path="/localizacoes" versionField="Version" z="bZcSNtmk3o0e8coiCJIfWKXfAvE=">
- <field:select field="ocorrencia" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ocorrencia" itemValue="id" items="${ocorrenciamunicipals}" path="/ocorrenciamunicipais" z="x3nXHdBxIzZwt7vPWcNsVQA+2zM="/>
- <field:input field="local" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_local" z="F+5PMRrsFY8daKJAKHiD++Q/zM0="/>
- <field:input field="endereco" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_endereco" z="GxkuN7uw8aGj5L19cLd6a2iaWJQ="/>
- <field:input field="horarioFuncionamento" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioFuncionamento" z="7kNkZ2jgnZCzlVNzjlDsAc+6fFI="/>
- <field:input field="nomeReferencia" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_nomeReferencia" z="Xa47YY1HN/qBwALtrICTG729uCY="/>
- <field:input field="telefone" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_telefone" z="ilHU4xzXIRkjlxIl1dQI1DEoICM="/>
- <field:input field="email" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_email" validationMessageCode="field_invalid_email" z="k189k964O3HRRnp3TNb0GDfmZts="/>
- <field:input field="quantidadeVagas" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_quantidadeVagas" validationMessageCode="field_invalid_integer" z="UmLVOAQqGSoB5tMvB5qExH6t+2U="/>
- </form:update>
+ <sec:authorize ifAnyGranted="Administrador">
+ <form:update id="fu_br_ufpr_c3sl_estacaojuventude_Localizacao" modelAttribute="localizacao" path="/localizacoes" versionField="Version" z="bZcSNtmk3o0e8coiCJIfWKXfAvE=">
+ <field:select field="ocorrencia" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ocorrencia" itemValue="id" items="${ocorrenciamunicipais}" path="/ocorrenciamunicipais" z="user-managed"/>
+ <field:input field="local" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_local" z="F+5PMRrsFY8daKJAKHiD++Q/zM0="/>
+ <field:input field="endereco" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_endereco" z="GxkuN7uw8aGj5L19cLd6a2iaWJQ="/>
+ <field:input field="horarioFuncionamento" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioFuncionamento" z="7kNkZ2jgnZCzlVNzjlDsAc+6fFI="/>
+ <field:input field="nomeReferencia" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_nomeReferencia" z="Xa47YY1HN/qBwALtrICTG729uCY="/>
+ <field:input field="telefone" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_telefone" z="ilHU4xzXIRkjlxIl1dQI1DEoICM="/>
+ <field:input field="email" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_email" validationMessageCode="field_invalid_email" z="k189k964O3HRRnp3TNb0GDfmZts="/>
+ <field:input field="quantidadeVagas" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_quantidadeVagas" validationMessageCode="field_invalid_integer" z="UmLVOAQqGSoB5tMvB5qExH6t+2U="/>
+ <field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_status" items="${tipostatuses}" path="tipostatuses" z="TEwrKKSHtWZlxHF78UJ71aVsuQs="/>
+ <field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_usuario" itemValue="id" items="${usuarios}" path="/usuarios" z="wmo7IEAN0Eh+oOhrkuA9jfhDQnw="/>
+ <field:select field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_situacao" items="${situacaos}" path="situacaos" z="TmQUfFwMMNFrKULyHhvdA4EiGIo="/>
+ <field:datetime dateTimePattern="${localizacao_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ultimaAlteracao" render="false" z="user-managed"/>
+ </form:update>
+ </sec:authorize>
+ <sec:authorize ifAnyGranted="Usuario">
+ <form:update id="fu_br_ufpr_c3sl_estacaojuventude_Localizacao" modelAttribute="localizacao" path="/localizacoes" versionField="Version" z="bZcSNtmk3o0e8coiCJIfWKXfAvE=">
+ <field:select field="ocorrencia" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ocorrencia" itemValue="id" items="${ocorrenciamunicipais}" path="/ocorrenciamunicipais" z="x3nXHdBxIzZwt7vPWcNsVQA+2zM="/>
+ <field:input field="local" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_local" z="F+5PMRrsFY8daKJAKHiD++Q/zM0="/>
+ <field:input field="endereco" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_endereco" z="GxkuN7uw8aGj5L19cLd6a2iaWJQ="/>
+ <field:input field="horarioFuncionamento" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioFuncionamento" z="7kNkZ2jgnZCzlVNzjlDsAc+6fFI="/>
+ <field:input field="nomeReferencia" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_nomeReferencia" z="Xa47YY1HN/qBwALtrICTG729uCY="/>
+ <field:input field="telefone" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_telefone" z="ilHU4xzXIRkjlxIl1dQI1DEoICM="/>
+ <field:input field="email" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_email" validationMessageCode="field_invalid_email" z="k189k964O3HRRnp3TNb0GDfmZts="/>
+ <field:input field="quantidadeVagas" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_quantidadeVagas" validationMessageCode="field_invalid_integer" z="UmLVOAQqGSoB5tMvB5qExH6t+2U="/>
+ <field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_status" items="${tipostatuses}" path="tipostatuses" render="false" z="TEwrKKSHtWZlxHF78UJ71aVsuQs="/>
+ <field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="wmo7IEAN0Eh+oOhrkuA9jfhDQnw="/>
+ <field:select disabled="true" field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_situacao" items="${situacaos}" path="situacaos" z="TmQUfFwMMNFrKULyHhvdA4EiGIo="/>
+ <field:datetime dateTimePattern="${localizacao_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ultimaAlteracao" render="false" z="pImNeT8/39/Wb1z+XFVm5NIkE8g="/>
+ </form:update>
+ </sec:authorize>
</div>
diff --git a/src/main/webapp/WEB-INF/views/localizacoes/views.xml b/src/main/webapp/WEB-INF/views/localizacoes/views.xml
index 05f271f34160692a54280cf10203a82efc38d8b6..079538cb546c6005f68f9d1cc6e5425261870e68 100644
--- a/src/main/webapp/WEB-INF/views/localizacoes/views.xml
+++ b/src/main/webapp/WEB-INF/views/localizacoes/views.xml
@@ -13,4 +13,16 @@
<definition extends="default" name="localizacoes/update">
<put-attribute name="body" value="/WEB-INF/views/localizacoes/update.jspx"/>
</definition>
+
+ <definition extends="default" name="localizacoes/mylist">
+ <put-attribute name="body" value="/WEB-INF/views/localizacoes/mylist.jspx"/>
+ </definition>
+
+ <definition extends="default" name="localizacoes/showcandidatos">
+ <put-attribute name="body" value="/WEB-INF/views/localizacoes/showcandidatos.jspx"/>
+ </definition>
+
+ <definition extends="default" name="localizacoes/myshow">
+ <put-attribute name="body" value="/WEB-INF/views/localizacoes/myshow.jspx"/>
+ </definition>
</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/menu.jspx b/src/main/webapp/WEB-INF/views/menu.jspx
index 82a09d6fbfe11ad440176ce2e1e00202c6c68040..763be9de24a046aba884a0662a63bc761d83aa87 100644
--- a/src/main/webapp/WEB-INF/views/menu.jspx
+++ b/src/main/webapp/WEB-INF/views/menu.jspx
@@ -19,7 +19,10 @@
</menu:category>
<menu:category id="c_localizacao" z="nAUYRfY6H8ONqQJcdr1C2NWnvsw=">
<menu:item id="i_localizacao_new" messageCode="global_menu_new" url="/localizacoes?form" z="user-managed"/>
- <menu:item id="i_localizacao_list" messageCode="global_menu_list" url="/localizacoes" z="user-managed"/>
+ <menu:item id="i_localizacao_list" messageCode="my_locations" url="/localizacoes/minhaslocalizacoes" z="user-managed"/>
+ <menu:item id="i_localizacao_list" messageCode="global_menu_list_candidato" url="/localizacoes/listCandidatos" z="user-managed"/>
+ <menu:item id="i_localizacao_list" messageCode="global_menu_list_efetivo" url="/localizacoes/listEfetivos" z="user-managed"/>
+ <menu:item id="i_localizacao_list" messageCode="global_menu_list_rejeitado" url="/localizacoes/listRejeitados" z="user-managed"/>
</menu:category>
<sec:authorize ifAnyGranted="Administrador">
diff --git a/src/main/webapp/WEB-INF/views/municipios/create.jspx b/src/main/webapp/WEB-INF/views/municipios/create.jspx
index 3ff5ac2ebbd308b02ffe062db4203d9b3272a015..0152d5bb45062bd893afc0f6e1ca037b29f5215a 100644
--- a/src/main/webapp/WEB-INF/views/municipios/create.jspx
+++ b/src/main/webapp/WEB-INF/views/municipios/create.jspx
@@ -5,6 +5,7 @@
<form:create id="fc_br_ufpr_c3sl_estacaojuventude_Municipio" modelAttribute="municipio" path="/municipios" render="${empty dependencies}" z="38ISssqudMTSD9vTMbyC3gTOksQ=">
<field:input field="nome" id="c_br_ufpr_c3sl_estacaojuventude_Municipio_nome" z="9CD68eDTj0MN11p89Mok7Gxph7s="/>
<field:select field="uf" id="c_br_ufpr_c3sl_estacaojuventude_Municipio_uf" itemValue="id" items="${estadoes}" path="/estados" z="wqt+9tlb6etcws03aPTvjNKd23Y="/>
+ <field:datetime dateTimePattern="${municipio_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Municipio_ultimaAlteracao" render="false" z="user-managed"/>
</form:create>
<form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_estacaojuventude_Municipio" render="${not empty dependencies}" z="mAGartg0k3x1a19/nsEdqxdvEgE="/>
</div>
diff --git a/src/main/webapp/WEB-INF/views/municipios/list.jspx b/src/main/webapp/WEB-INF/views/municipios/list.jspx
index 82f7a4e14146a73f30a90bb65beb6638cbd48cd1..f679d856c379f93d019229c6ff2ab0d43c069be3 100644
--- a/src/main/webapp/WEB-INF/views/municipios/list.jspx
+++ b/src/main/webapp/WEB-INF/views/municipios/list.jspx
@@ -6,6 +6,7 @@
<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 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>
</div>
diff --git a/src/main/webapp/WEB-INF/views/municipios/show.jspx b/src/main/webapp/WEB-INF/views/municipios/show.jspx
index 2a974497b8a0ad5457b6548d537d225fb4658546..f58c76194c5695391eafbe6a2a942d0f71b33f09 100644
--- a/src/main/webapp/WEB-INF/views/municipios/show.jspx
+++ b/src/main/webapp/WEB-INF/views/municipios/show.jspx
@@ -5,5 +5,6 @@
<page:show id="ps_br_ufpr_c3sl_estacaojuventude_Municipio" object="${municipio}" path="/municipios" z="KPZi2bJxe5SQ0Z0PDtaBwu1pap8=">
<field:display field="nome" id="s_br_ufpr_c3sl_estacaojuventude_Municipio_nome" object="${municipio}" z="8BrOemQtrp6pmPvRZ+2ywnOA6aY="/>
<field:display field="uf" id="s_br_ufpr_c3sl_estacaojuventude_Municipio_uf" object="${municipio}" z="9e1IKhSgz/uosa63WbI/C2rPKD0="/>
+ <field:display date="true" dateTimePattern="${municipio_ultimaalteracao_date_format}" field="ultimaAlteracao" id="s_br_ufpr_c3sl_estacaojuventude_Municipio_ultimaAlteracao" object="${municipio}" z="9PcGVY2CX+UjM837M0EoEM46uEI="/>
</page:show>
</div>
diff --git a/src/main/webapp/WEB-INF/views/municipios/update.jspx b/src/main/webapp/WEB-INF/views/municipios/update.jspx
index 71a8c898a3df5d97fb22095cb776e86e0b34676c..c0dd3d4ebac63ec57a651217c57bf210f68e66ad 100644
--- a/src/main/webapp/WEB-INF/views/municipios/update.jspx
+++ b/src/main/webapp/WEB-INF/views/municipios/update.jspx
@@ -5,5 +5,6 @@
<form:update id="fu_br_ufpr_c3sl_estacaojuventude_Municipio" modelAttribute="municipio" path="/municipios" versionField="Version" z="YvEHRCvNeN/FYWFrZdXkE+hKbPo=">
<field:input field="nome" id="c_br_ufpr_c3sl_estacaojuventude_Municipio_nome" z="9CD68eDTj0MN11p89Mok7Gxph7s="/>
<field:select field="uf" id="c_br_ufpr_c3sl_estacaojuventude_Municipio_uf" itemValue="id" items="${estadoes}" path="/estados" z="wqt+9tlb6etcws03aPTvjNKd23Y="/>
+ <field:datetime dateTimePattern="${municipio_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Municipio_ultimaAlteracao" render="false" z="user-managed"/>
</form:update>
</div>
diff --git a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx
index b8f97f36ae321a705fd13f26942c39af192db473..e90062816b56adac496c7ad16931154b9b09bcbf 100644
--- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx
+++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx
@@ -14,6 +14,8 @@
<field:input field="quantidadeVagas" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_quantidadeVagas" validationMessageCode="field_invalid_integer" z="VVOME2kMr4+rxAFNbv5sTC6HvAw="/>
<field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_status" items="${tipostatuses}" path="tipostatuses" render="false" z="user-managed"/>
<field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="user-managed"/>
+ <field:select field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_situacao" items="${situacaos}" path="situacaos" render="false" 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"/>
</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 824f392fbe59cd485db351957d16c6c5e10ef0a7..6150cf2c38183c200cdc60f1f5cdc94f1508a3ce 100644
--- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/list.jspx
+++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/list.jspx
@@ -3,27 +3,27 @@
<jsp:directive.page contentType="text/html;charset=UTF-8"/>
<jsp:output omit-xml-declaration="yes"/>
<sec:authorize ifAnyGranted="Administrador">
- <page:list id="pl_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" items="${ocorrenciamunicipais}" z="/8eqEnisjTYrkLUxsp1MkQSOd70=">
- <table:table data="${ocorrenciamunicipais}" id="l_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" path="/ocorrenciamunicipais" 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="/>
- <table:column id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_quantidadeVagas" property="quantidadeVagas" z="A5QKJq5ohSUAYDsCLxtTCsvNzPg="/>
- </table:table>
- </page:list>
+ <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:table>
+ </page:list>
</sec:authorize>
<sec:authorize ifAnyGranted="Usuario">
- <page:list id="pl_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" items="${ocorrenciamunicipais}" z="/8eqEnisjTYrkLUxsp1MkQSOd70=">
- <table:table data="${ocorrenciamunicipais}" id="l_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" path="/ocorrenciamunicipais" delete="false" 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="/>
- <table:column id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_quantidadeVagas" property="quantidadeVagas" z="A5QKJq5ohSUAYDsCLxtTCsvNzPg="/>
- </table:table>
- </page:list>
+ <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="/>
+ <table:column id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_quantidadeVagas" property="quantidadeVagas" z="A5QKJq5ohSUAYDsCLxtTCsvNzPg="/>
+ </table:table>
+ </page:list>
</sec:authorize>
</div>
diff --git a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/myshow.jspx b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/myshow.jspx
index 221db6cd7bc116ed3bee19d7324dee39a075a91b..ef9c21253b123254a66049fd6575ef9961017a0a 100644
--- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/myshow.jspx
+++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/myshow.jspx
@@ -14,5 +14,7 @@
<field:display field="localizacoes" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_localizacoes" object="${ocorrenciamunicipal}" z="QTI2oWOeoAxOgt/XOBCiMtT7ucY="/>
<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="/>
+ <field:display date="true" dateTimePattern="${ocorrenciaMunicipal_ultimaalteracao_date_format}" field="ultimaAlteracao" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_ultimaAlteracao" object="${ocorrenciamunicipal}" z="nq1eVVhjtcPRtdJMtaVu4bV8xSA="/>
</page:show>
</div>
diff --git a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/show.jspx b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/show.jspx
index 04750f3da80df4db1bd21f7df30276cbf9cc0e0d..ad937f2a25b7fb4e5877bf85e8428cad7294e103 100644
--- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/show.jspx
+++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/show.jspx
@@ -1,36 +1,39 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:sec="http://www.springframework.org/security/tags" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
+<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:sec="http://www.springframework.org/security/tags" version="2.0">
<jsp:directive.page contentType="text/html;charset=UTF-8"/>
<jsp:output omit-xml-declaration="yes"/>
<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="/>
- <field:display field="inicioInscricoes" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_inicioInscricoes" object="${ocorrenciamunicipal}" z="8EyeHOiPhQYjTXn3Xf43tPKtvMU="/>
- <field:display 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="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="/>
- </page:show>
+ <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="/>
+ <field:display field="inicioInscricoes" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_inicioInscricoes" object="${ocorrenciamunicipal}" z="8EyeHOiPhQYjTXn3Xf43tPKtvMU="/>
+ <field:display 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="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="/>
+ <field:display date="true" dateTimePattern="${ocorrenciaMunicipal_ultimaalteracao_date_format}" field="ultimaAlteracao" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_ultimaAlteracao" object="${ocorrenciamunicipal}" z="nq1eVVhjtcPRtdJMtaVu4bV8xSA="/>
+ </page:show>
</sec:authorize>
-
<sec:authorize ifAnyGranted="Usuario">
- <page:show id="ps_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" object="${ocorrenciamunicipal}" path="/ocorrenciamunicipais" list="false" update="false" delete="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="/>
- <field:display field="inicioInscricoes" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_inicioInscricoes" object="${ocorrenciamunicipal}" z="8EyeHOiPhQYjTXn3Xf43tPKtvMU="/>
- <field:display 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="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="/>
- </page:show>
+ <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="/>
+ <field:display field="inicioInscricoes" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_inicioInscricoes" object="${ocorrenciamunicipal}" z="8EyeHOiPhQYjTXn3Xf43tPKtvMU="/>
+ <field:display 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="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="/>
+ <field:display date="true" dateTimePattern="${ocorrenciaMunicipal_ultimaalteracao_date_format}" field="ultimaAlteracao" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_ultimaAlteracao" object="${ocorrenciamunicipal}" z="nq1eVVhjtcPRtdJMtaVu4bV8xSA="/>
+ </page:show>
</sec:authorize>
</div>
diff --git a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/showcandidatos.jspx b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/showcandidatos.jspx
index 0f61c0352cdb51d441a5a80a7d8a513354048e8c..8cffe1cd04a5f379bfb55d3f550da3c65e925ec7 100644
--- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/showcandidatos.jspx
+++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/showcandidatos.jspx
@@ -21,6 +21,8 @@
<field:display field="localizacoes" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_localizacoes" object="${ocorrenciamunicipal}" z="QTI2oWOeoAxOgt/XOBCiMtT7ucY="/>
<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="/>
+ <field:display date="true" dateTimePattern="${ocorrenciaMunicipal_ultimaalteracao_date_format}" field="ultimaAlteracao" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_ultimaAlteracao" object="${ocorrenciamunicipal}" z="nq1eVVhjtcPRtdJMtaVu4bV8xSA="/>
</page:show>
</sec:authorize>
@@ -37,6 +39,8 @@
<field:display field="localizacoes" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_localizacoes" object="${ocorrenciamunicipal}" z="QTI2oWOeoAxOgt/XOBCiMtT7ucY="/>
<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="/>
+ <field:display date="true" dateTimePattern="${ocorrenciaMunicipal_ultimaalteracao_date_format}" field="ultimaAlteracao" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_ultimaAlteracao" object="${ocorrenciamunicipal}" z="nq1eVVhjtcPRtdJMtaVu4bV8xSA="/>
</page:show>
</sec:authorize>
</div>
diff --git a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx
index 9638009ca954cfefdf0e751bbe5e59b8736801dc..1cf6c036836ee55d8338aeae4a00ae261d999aae 100644
--- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx
+++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx
@@ -1,36 +1,39 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:sec="http://www.springframework.org/security/tags" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
+<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:sec="http://www.springframework.org/security/tags" version="2.0">
<jsp:directive.page contentType="text/html;charset=UTF-8"/>
<jsp:output omit-xml-declaration="yes"/>
<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" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/orgaoexecutores" z="user-managed"/>
- <field:input field="beneficiosLocais" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" z="4+gr9Eh5QnqAtYMJBTazSWU4OHY="/>
- <field:input field="comoAcessar" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_comoAcessar" z="37Av0vUvTAzeQQX4WrRT2KMcj7w="/>
- <field:input field="inicioInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_inicioInscricoes" z="G0XGhemETMWseRmD4VKjlzifEJ8="/>
- <field:input field="fimInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_fimInscricoes" z="fS41CZmEMANwCEqNQ+HlzbTnhE0="/>
- <field:select field="localizacoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_localizacoes" itemValue="id" items="${localizacaos}" multiple="true" path="/localizacoes" disabled="true" z="user-managed"/>
- <field:input field="quantidadeVagas" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_quantidadeVagas" validationMessageCode="field_invalid_integer" z="VVOME2kMr4+rxAFNbv5sTC6HvAw="/>
- <field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_status" items="${tipostatuses}" path="tipostatuses" z="F0r/fUzTX6lkoHa0mAWk5JT7EF8="/>
- <field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_usuario" itemValue="id" items="${usuarios}" path="/usuarios" z="Babmxc8XdBqVIn8xbkYKIAy+glA="/>
- </form:update>
+ <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" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/orgaoexecutores" z="user-managed"/>
+ <field:input field="beneficiosLocais" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" z="4+gr9Eh5QnqAtYMJBTazSWU4OHY="/>
+ <field:input field="comoAcessar" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_comoAcessar" z="37Av0vUvTAzeQQX4WrRT2KMcj7w="/>
+ <field:input field="inicioInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_inicioInscricoes" z="G0XGhemETMWseRmD4VKjlzifEJ8="/>
+ <field:input field="fimInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_fimInscricoes" z="fS41CZmEMANwCEqNQ+HlzbTnhE0="/>
+ <field:select disabled="true" field="localizacoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_localizacoes" itemValue="id" items="${localizacaos}" multiple="true" path="/localizacoes" z="user-managed"/>
+ <field:input field="quantidadeVagas" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_quantidadeVagas" validationMessageCode="field_invalid_integer" z="VVOME2kMr4+rxAFNbv5sTC6HvAw="/>
+ <field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_status" items="${tipostatuses}" path="tipostatuses" z="F0r/fUzTX6lkoHa0mAWk5JT7EF8="/>
+ <field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_usuario" itemValue="id" items="${usuarios}" path="/usuarios" z="Babmxc8XdBqVIn8xbkYKIAy+glA="/>
+ <field:select field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_situacao" items="${situacaos}" path="situacaos" z="3kKRCsPIT4jGs1s9EuBQ4Z4w7kQ="/>
+ <field:datetime dateTimePattern="${ocorrenciaMunicipal_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_ultimaAlteracao" render="false" z="user-managed"/>
+ </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" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/orgaoexecutores" z="user-managed"/>
- <field:input field="beneficiosLocais" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" z="4+gr9Eh5QnqAtYMJBTazSWU4OHY="/>
- <field:input field="comoAcessar" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_comoAcessar" z="37Av0vUvTAzeQQX4WrRT2KMcj7w="/>
- <field:input field="inicioInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_inicioInscricoes" z="G0XGhemETMWseRmD4VKjlzifEJ8="/>
- <field:input field="fimInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_fimInscricoes" z="fS41CZmEMANwCEqNQ+HlzbTnhE0="/>
- <field:select field="localizacoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_localizacoes" itemValue="id" items="${localizacaos}" multiple="true" path="/localizacoes" disabled="true" z="user-managed"/>
- <field:input field="quantidadeVagas" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_quantidadeVagas" validationMessageCode="field_invalid_integer" z="VVOME2kMr4+rxAFNbv5sTC6HvAw="/>
- <field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_status" items="${tipostatuses}" path="tipostatuses" render="false" z="F0r/fUzTX6lkoHa0mAWk5JT7EF8="/>
- <field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="Babmxc8XdBqVIn8xbkYKIAy+glA="/>
- </form:update>
+ <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" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/orgaoexecutores" z="user-managed"/>
+ <field:input field="beneficiosLocais" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" z="4+gr9Eh5QnqAtYMJBTazSWU4OHY="/>
+ <field:input field="comoAcessar" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_comoAcessar" z="37Av0vUvTAzeQQX4WrRT2KMcj7w="/>
+ <field:input field="inicioInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_inicioInscricoes" z="G0XGhemETMWseRmD4VKjlzifEJ8="/>
+ <field:input field="fimInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_fimInscricoes" z="fS41CZmEMANwCEqNQ+HlzbTnhE0="/>
+ <field:select disabled="true" field="localizacoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_localizacoes" itemValue="id" items="${localizacaos}" multiple="true" path="/localizacoes" z="user-managed"/>
+ <field:input field="quantidadeVagas" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_quantidadeVagas" validationMessageCode="field_invalid_integer" z="VVOME2kMr4+rxAFNbv5sTC6HvAw="/>
+ <field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_status" items="${tipostatuses}" path="tipostatuses" render="false" z="F0r/fUzTX6lkoHa0mAWk5JT7EF8="/>
+ <field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="Babmxc8XdBqVIn8xbkYKIAy+glA="/>
+ <field:select disabled="true" field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_situacao" items="${situacaos}" path="situacaos" z="3kKRCsPIT4jGs1s9EuBQ4Z4w7kQ="/>
+ <field:datetime dateTimePattern="${ocorrenciaMunicipal_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_ultimaAlteracao" render="false" z="OUpU0b2nUWoYaZanPl42QQFEIzE="/>
+ </form:update>
</sec:authorize>
</div>
diff --git a/src/main/webapp/WEB-INF/views/orgaoexecutores/create.jspx b/src/main/webapp/WEB-INF/views/orgaoexecutores/create.jspx
index 362a6e1511cb9ac8759b22acb4b5e41190cddb29..ea04f48c616fe73a5f0f53ca251f1c5866bdc1e8 100644
--- a/src/main/webapp/WEB-INF/views/orgaoexecutores/create.jspx
+++ b/src/main/webapp/WEB-INF/views/orgaoexecutores/create.jspx
@@ -7,6 +7,7 @@
<field:input field="site" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_site" z="Z3eEDQIEcWpYg/0VjOzkRbI8qY4="/>
<field:input field="endereco" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_endereco" z="tTcJ375UKIKQWJiq30XNmeti03c="/>
<field:input field="contato" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_contato" z="N464inkZDRkVnlMA8hpmvvyzs7g="/>
+ <field:datetime dateTimePattern="${orgaoExecutor_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_ultimaAlteracao" render="false" z="user-managed"/>
</form:create>
<form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor" render="${not empty dependencies}" z="AAjeOEHmudaMpa7oWwH71C1aVn0="/>
</div>
diff --git a/src/main/webapp/WEB-INF/views/orgaoexecutores/list.jspx b/src/main/webapp/WEB-INF/views/orgaoexecutores/list.jspx
index d5c460b3b65f7e039ad9ec3844bb8e898d8342b5..28e79e9dccac2b963ec18cf547a33226245dca2b 100644
--- a/src/main/webapp/WEB-INF/views/orgaoexecutores/list.jspx
+++ b/src/main/webapp/WEB-INF/views/orgaoexecutores/list.jspx
@@ -8,6 +8,7 @@
<table:column id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_site" property="site" z="fi4sWOmLlqPfWJlWyeBGNMBJSIY="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_endereco" property="endereco" z="xRg5mKxaqkl5+QrPEaMk1g4m7Pc="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_contato" property="contato" z="fhFWGnCq7v36yy6h1jubdX52Wrg="/>
+ <table:column date="true" dateTimePattern="${orgaoExecutor_ultimaalteracao_date_format}" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_ultimaAlteracao" property="ultimaAlteracao" render="false" z="user-managed"/>
</table:table>
</page:list>
</div>
diff --git a/src/main/webapp/WEB-INF/views/orgaoexecutores/show.jspx b/src/main/webapp/WEB-INF/views/orgaoexecutores/show.jspx
index d38d2107094bdcf9184339404355b5a769406ebe..2f5057cc32a0220672daf9f02e9869cd10684a4a 100644
--- a/src/main/webapp/WEB-INF/views/orgaoexecutores/show.jspx
+++ b/src/main/webapp/WEB-INF/views/orgaoexecutores/show.jspx
@@ -7,5 +7,6 @@
<field:display field="site" id="s_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_site" object="${orgaoexecutor}" z="4FcnQkNgOdYFVcaEAhndkCoAWfs="/>
<field:display field="endereco" id="s_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_endereco" object="${orgaoexecutor}" z="MwPjGFqfGBBLkg5rJV8rDQF5k6E="/>
<field:display field="contato" id="s_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_contato" object="${orgaoexecutor}" z="or2Q/KJknHAjkLyX8ERmbs3Rg1A="/>
+ <field:display date="true" dateTimePattern="${orgaoExecutor_ultimaalteracao_date_format}" field="ultimaAlteracao" id="s_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_ultimaAlteracao" object="${orgaoexecutor}" z="uLuqlPV+uL1b0l6YOrIAtz6d3Wk="/>
</page:show>
</div>
diff --git a/src/main/webapp/WEB-INF/views/orgaoexecutores/update.jspx b/src/main/webapp/WEB-INF/views/orgaoexecutores/update.jspx
index c0ded118c448f494be17c73ba148f127186af2bd..9ecba5c37dddeb4b52e4d0326e8178d16687f795 100644
--- a/src/main/webapp/WEB-INF/views/orgaoexecutores/update.jspx
+++ b/src/main/webapp/WEB-INF/views/orgaoexecutores/update.jspx
@@ -7,5 +7,6 @@
<field:input field="site" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_site" z="Z3eEDQIEcWpYg/0VjOzkRbI8qY4="/>
<field:input field="endereco" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_endereco" z="tTcJ375UKIKQWJiq30XNmeti03c="/>
<field:input field="contato" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_contato" z="N464inkZDRkVnlMA8hpmvvyzs7g="/>
+ <field:datetime dateTimePattern="${orgaoExecutor_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_ultimaAlteracao" render="false" z="user-managed"/>
</form:update>
</div>
diff --git a/src/main/webapp/WEB-INF/views/programas/create.jspx b/src/main/webapp/WEB-INF/views/programas/create.jspx
index c81150763e4f9e99f68b93276d4e1f7e42a63ec0..288d7f2d1b6540e7f20f8c9e22fca2898092ba00 100644
--- a/src/main/webapp/WEB-INF/views/programas/create.jspx
+++ b/src/main/webapp/WEB-INF/views/programas/create.jspx
@@ -25,6 +25,8 @@
<field:select field="ocorrencias" id="c_br_ufpr_c3sl_estacaojuventude_Programa_ocorrencias" itemValue="id" items="${ocorrenciamunicipais}" multiple="true" path="/ocorrenciamunicipais" render="false" z="user-managed"/>
<field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_Programa_status" items="${tipostatuses}" path="tipostatuses" render="false" z="user-managed"/>
<field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_Programa_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="user-managed"/>
+ <field:select field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_situacao" items="${situacaos}" path="situacaos" render="false" z="user-managed"/>
+ <field:datetime dateTimePattern="${programa_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_ultimaAlteracao" render="false" z="user-managed"/>
</form:create>
<form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_estacaojuventude_Programa" render="${not empty dependencies}" z="SGDKTfhxhuHYdZv+eepy6Aqnz/c="/>
</div>
diff --git a/src/main/webapp/WEB-INF/views/programas/myshow.jspx b/src/main/webapp/WEB-INF/views/programas/myshow.jspx
index 76412334cd6ee502de055e7439f53a8a76090bae..9e16e53cca5c4d6eaa1e936d6a191c7abb12b8bc 100644
--- a/src/main/webapp/WEB-INF/views/programas/myshow.jspx
+++ b/src/main/webapp/WEB-INF/views/programas/myshow.jspx
@@ -26,6 +26,8 @@
<field:display field="ocorrencias" id="s_br_ufpr_c3sl_estacaojuventude_Programa_ocorrencias" object="${programa}" z="ilsvE8WyebDaqtMvENxh6UAc8mc="/>
<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="/>
+ <field:display date="true" dateTimePattern="${programa_ultimaalteracao_date_format}" field="ultimaAlteracao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_ultimaAlteracao" object="${programa}" z="7sw1SS0tGOh+ZvZBEi//gv3PUG4="/>
</page:show>
</sec:authorize>
</div>
diff --git a/src/main/webapp/WEB-INF/views/programas/show.jspx b/src/main/webapp/WEB-INF/views/programas/show.jspx
index 076dd3dfb08714436d8d67cb6478a90e25808b8b..20e412aa07b8c1221ac222220f0d0e6fbb0e018d 100644
--- a/src/main/webapp/WEB-INF/views/programas/show.jspx
+++ b/src/main/webapp/WEB-INF/views/programas/show.jspx
@@ -26,6 +26,8 @@
<field:display field="ocorrencias" id="s_br_ufpr_c3sl_estacaojuventude_Programa_ocorrencias" object="${programa}" z="ilsvE8WyebDaqtMvENxh6UAc8mc="/>
<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="/>
+ <field:display date="true" dateTimePattern="${programa_ultimaalteracao_date_format}" field="ultimaAlteracao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_ultimaAlteracao" object="${programa}" z="7sw1SS0tGOh+ZvZBEi//gv3PUG4="/>
</page:show>
</sec:authorize>
<sec:authorize ifAnyGranted="Usuario">
@@ -52,6 +54,8 @@
<field:display field="ocorrencias" id="s_br_ufpr_c3sl_estacaojuventude_Programa_ocorrencias" object="${programa}" z="ilsvE8WyebDaqtMvENxh6UAc8mc="/>
<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="/>
+ <field:display date="true" dateTimePattern="${programa_ultimaalteracao_date_format}" field="ultimaAlteracao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_ultimaAlteracao" object="${programa}" z="7sw1SS0tGOh+ZvZBEi//gv3PUG4="/>
</page:show>
</sec:authorize>
</div>
diff --git a/src/main/webapp/WEB-INF/views/programas/showcandidatos.jspx b/src/main/webapp/WEB-INF/views/programas/showcandidatos.jspx
index 082bca965e2b912b5614e1288f70897ab2d40e6a..e298cf3409067785e7d81853aae2dbd582f0ac18 100644
--- a/src/main/webapp/WEB-INF/views/programas/showcandidatos.jspx
+++ b/src/main/webapp/WEB-INF/views/programas/showcandidatos.jspx
@@ -32,6 +32,8 @@
<field:display field="ocorrencias" id="s_br_ufpr_c3sl_estacaojuventude_Programa_ocorrencias" object="${programa}" z="ilsvE8WyebDaqtMvENxh6UAc8mc="/>
<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="/>
+ <field:display date="true" dateTimePattern="${programa_ultimaalteracao_date_format}" field="ultimaAlteracao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_ultimaAlteracao" object="${programa}" z="7sw1SS0tGOh+ZvZBEi//gv3PUG4="/>
</page:show>
</sec:authorize>
@@ -59,6 +61,8 @@
<field:display field="ocorrencias" id="s_br_ufpr_c3sl_estacaojuventude_Programa_ocorrencias" object="${programa}" z="ilsvE8WyebDaqtMvENxh6UAc8mc="/>
<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="/>
+ <field:display date="true" dateTimePattern="${programa_ultimaalteracao_date_format}" field="ultimaAlteracao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_ultimaAlteracao" object="${programa}" z="7sw1SS0tGOh+ZvZBEi//gv3PUG4="/>
</page:show>
</sec:authorize>
</div>
diff --git a/src/main/webapp/WEB-INF/views/programas/update.jspx b/src/main/webapp/WEB-INF/views/programas/update.jspx
index 6e224ed7ee4d0e896d1aba2e2190efffdc276184..57f6d8a8a6fb484892b6710bc33557e35a5ea8fc 100644
--- a/src/main/webapp/WEB-INF/views/programas/update.jspx
+++ b/src/main/webapp/WEB-INF/views/programas/update.jspx
@@ -1,58 +1,61 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:sec="http://www.springframework.org/security/tags" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
+<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:sec="http://www.springframework.org/security/tags" version="2.0">
<jsp:directive.page contentType="text/html;charset=UTF-8"/>
<jsp:output omit-xml-declaration="yes"/>
<sec:authorize ifAnyGranted="Administrador">
- <form:update id="fu_br_ufpr_c3sl_estacaojuventude_Programa" modelAttribute="programa" path="/programas" versionField="Version" z="BzUMrk0HIxfhgMsvGQoaUtv2sDc=">
- <field:input field="nomeOficial" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nomeOficial" z="bc3pz/2g/oVwZE1Aey76ZJhx0bM="/>
- <field:input field="nomeDivulgacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nomeDivulgacao" z="fDxR3dnr61JMbaTs4rcE9iFHkpU="/>
- <field:input field="sigla" id="c_br_ufpr_c3sl_estacaojuventude_Programa_sigla" z="kGLlUDsbNNGnqG06eMJbJB4OBXs="/>
- <field:select field="nivel" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nivel" items="${nivelprogramas}" path="nivelprogramas" z="4pOFZ4tGHsIhD/80BTEdnPGN92g="/>
- <field:select field="programaVinculado" id="c_br_ufpr_c3sl_estacaojuventude_Programa_programaVinculado" itemValue="id" items="${programas}" path="/programas" z="eOYwLQ5Izpu/YxZLnKEgD3nNJDc="/>
- <field:input field="leiCriacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_leiCriacao" z="AZrkYSbMNxVniZDEPO3UIZomuUc="/>
- <field:input field="descricao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_descricao" z="j8K3uhuqABUcYWZtDUVA1uw0H/U="/>
- <field:input field="objetivos" id="c_br_ufpr_c3sl_estacaojuventude_Programa_objetivos" z="/qg0ht0rwAM9BGySe//YuL0vAJE="/>
- <field:input field="beneficios" id="c_br_ufpr_c3sl_estacaojuventude_Programa_beneficios" z="4K86Z102Fj1BJX3DXRy1cvG+9Uc="/>
- <field:datetime dateTimePattern="${programa_datainicio_date_format}" field="dataInicio" id="c_br_ufpr_c3sl_estacaojuventude_Programa_dataInicio" z="nNVy1J68TFQeiW5rl/NKv94LNCE="/>
- <field:select field="temporalidade" id="c_br_ufpr_c3sl_estacaojuventude_Programa_temporalidade" items="${tipotemporalidades}" path="tipotemporalidades" z="8t1yjG70Av2Hz4Mhz7K4xIkuvME="/>
- <field:input field="publicoAlvo" id="c_br_ufpr_c3sl_estacaojuventude_Programa_publicoAlvo" z="nfjHOXYNbbbwrWZdf8B6WQNyvBU="/>
- <field:input field="idadeMinima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMinima" validationMessageCode="field_invalid_integer" z="mkv8Bm7AvW/UKajattFE7vU0B9U="/>
- <field:input field="idadeMaxima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMaxima" validationMessageCode="field_invalid_integer" z="WIjBwA925e6JSn8yKl2LnnzmG9A="/>
- <field:input field="criteriosAcesso" id="c_br_ufpr_c3sl_estacaojuventude_Programa_criteriosAcesso" z="46IIumERi7DTwwtpARnCfqhSkws="/>
- <field:input field="duracao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_duracao" z="a7AOY/Yrtw4PcGueyAvhXIGAQFU="/>
- <field:select field="tematicas" id="c_br_ufpr_c3sl_estacaojuventude_Programa_tematicas" itemValue="id" items="${tematicas}" multiple="true" path="/tematicas" z="dNw66nQiqTH3NQvcrusAZ3M3oX0="/>
- <field:select field="orgaosExecutores" id="c_br_ufpr_c3sl_estacaojuventude_Programa_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/orgaoexecutores" z="user-managed"/>
- <field:input field="parceiros" id="c_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" z="Jbi+j14QiuxyUynDmEoZrpR6n1Q="/>
- <field:select field="ocorrencias" id="c_br_ufpr_c3sl_estacaojuventude_Programa_ocorrencias" itemValue="id" items="${ocorrenciamunicipais}" multiple="true" disabled="true" path="/ocorrenciamunicipais" z="user-managed"/>
- <field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_Programa_status" items="${tipostatuses}" path="tipostatuses" z="TWynnY2LlkTLv9vJJ6PYF11yQk0="/>
- <field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_Programa_usuario" itemValue="id" items="${usuarios}" path="/usuarios" z="gyBHEGJXuWI8xAN+JR0Z6EVyhMY="/>
- </form:update>
+ <form:update id="fu_br_ufpr_c3sl_estacaojuventude_Programa" modelAttribute="programa" path="/programas" versionField="Version" z="BzUMrk0HIxfhgMsvGQoaUtv2sDc=">
+ <field:input field="nomeOficial" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nomeOficial" z="bc3pz/2g/oVwZE1Aey76ZJhx0bM="/>
+ <field:input field="nomeDivulgacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nomeDivulgacao" z="fDxR3dnr61JMbaTs4rcE9iFHkpU="/>
+ <field:input field="sigla" id="c_br_ufpr_c3sl_estacaojuventude_Programa_sigla" z="kGLlUDsbNNGnqG06eMJbJB4OBXs="/>
+ <field:select field="nivel" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nivel" items="${nivelprogramas}" path="nivelprogramas" z="4pOFZ4tGHsIhD/80BTEdnPGN92g="/>
+ <field:select field="programaVinculado" id="c_br_ufpr_c3sl_estacaojuventude_Programa_programaVinculado" itemValue="id" items="${programas}" path="/programas" z="eOYwLQ5Izpu/YxZLnKEgD3nNJDc="/>
+ <field:input field="leiCriacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_leiCriacao" z="AZrkYSbMNxVniZDEPO3UIZomuUc="/>
+ <field:input field="descricao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_descricao" z="j8K3uhuqABUcYWZtDUVA1uw0H/U="/>
+ <field:input field="objetivos" id="c_br_ufpr_c3sl_estacaojuventude_Programa_objetivos" z="/qg0ht0rwAM9BGySe//YuL0vAJE="/>
+ <field:input field="beneficios" id="c_br_ufpr_c3sl_estacaojuventude_Programa_beneficios" z="4K86Z102Fj1BJX3DXRy1cvG+9Uc="/>
+ <field:datetime dateTimePattern="${programa_datainicio_date_format}" field="dataInicio" id="c_br_ufpr_c3sl_estacaojuventude_Programa_dataInicio" z="nNVy1J68TFQeiW5rl/NKv94LNCE="/>
+ <field:select field="temporalidade" id="c_br_ufpr_c3sl_estacaojuventude_Programa_temporalidade" items="${tipotemporalidades}" path="tipotemporalidades" z="8t1yjG70Av2Hz4Mhz7K4xIkuvME="/>
+ <field:input field="publicoAlvo" id="c_br_ufpr_c3sl_estacaojuventude_Programa_publicoAlvo" z="nfjHOXYNbbbwrWZdf8B6WQNyvBU="/>
+ <field:input field="idadeMinima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMinima" validationMessageCode="field_invalid_integer" z="mkv8Bm7AvW/UKajattFE7vU0B9U="/>
+ <field:input field="idadeMaxima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMaxima" validationMessageCode="field_invalid_integer" z="WIjBwA925e6JSn8yKl2LnnzmG9A="/>
+ <field:input field="criteriosAcesso" id="c_br_ufpr_c3sl_estacaojuventude_Programa_criteriosAcesso" z="46IIumERi7DTwwtpARnCfqhSkws="/>
+ <field:input field="duracao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_duracao" z="a7AOY/Yrtw4PcGueyAvhXIGAQFU="/>
+ <field:select field="tematicas" id="c_br_ufpr_c3sl_estacaojuventude_Programa_tematicas" itemValue="id" items="${tematicas}" multiple="true" path="/tematicas" z="dNw66nQiqTH3NQvcrusAZ3M3oX0="/>
+ <field:select field="orgaosExecutores" id="c_br_ufpr_c3sl_estacaojuventude_Programa_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/orgaoexecutores" z="user-managed"/>
+ <field:input field="parceiros" id="c_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" z="Jbi+j14QiuxyUynDmEoZrpR6n1Q="/>
+ <field:select disabled="true" field="ocorrencias" id="c_br_ufpr_c3sl_estacaojuventude_Programa_ocorrencias" itemValue="id" items="${ocorrenciamunicipais}" multiple="true" path="/ocorrenciamunicipais" z="user-managed"/>
+ <field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_Programa_status" items="${tipostatuses}" path="tipostatuses" z="TWynnY2LlkTLv9vJJ6PYF11yQk0="/>
+ <field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_Programa_usuario" itemValue="id" items="${usuarios}" path="/usuarios" z="gyBHEGJXuWI8xAN+JR0Z6EVyhMY="/>
+ <field:select field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_situacao" items="${situacaos}" path="situacaos" z="jCGDX8PAVbMAynepL96G296Jlxw="/>
+ <field:datetime dateTimePattern="${programa_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_ultimaAlteracao" render="false" z="user-managed"/>
+ </form:update>
</sec:authorize>
-
<sec:authorize ifAnyGranted="Usuario">
- <form:update id="fu_br_ufpr_c3sl_estacaojuventude_Programa" modelAttribute="programa" path="/programas" versionField="Version" z="BzUMrk0HIxfhgMsvGQoaUtv2sDc=">
- <field:input field="nomeOficial" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nomeOficial" z="bc3pz/2g/oVwZE1Aey76ZJhx0bM="/>
- <field:input field="nomeDivulgacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nomeDivulgacao" z="fDxR3dnr61JMbaTs4rcE9iFHkpU="/>
- <field:input field="sigla" id="c_br_ufpr_c3sl_estacaojuventude_Programa_sigla" z="kGLlUDsbNNGnqG06eMJbJB4OBXs="/>
- <field:select field="nivel" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nivel" items="${nivelprogramas}" path="nivelprogramas" z="4pOFZ4tGHsIhD/80BTEdnPGN92g="/>
- <field:select field="programaVinculado" id="c_br_ufpr_c3sl_estacaojuventude_Programa_programaVinculado" itemValue="id" items="${programas}" path="/programas" z="eOYwLQ5Izpu/YxZLnKEgD3nNJDc="/>
- <field:input field="leiCriacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_leiCriacao" z="AZrkYSbMNxVniZDEPO3UIZomuUc="/>
- <field:input field="descricao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_descricao" z="j8K3uhuqABUcYWZtDUVA1uw0H/U="/>
- <field:input field="objetivos" id="c_br_ufpr_c3sl_estacaojuventude_Programa_objetivos" z="/qg0ht0rwAM9BGySe//YuL0vAJE="/>
- <field:input field="beneficios" id="c_br_ufpr_c3sl_estacaojuventude_Programa_beneficios" z="4K86Z102Fj1BJX3DXRy1cvG+9Uc="/>
- <field:datetime dateTimePattern="${programa_datainicio_date_format}" field="dataInicio" id="c_br_ufpr_c3sl_estacaojuventude_Programa_dataInicio" z="nNVy1J68TFQeiW5rl/NKv94LNCE="/>
- <field:select field="temporalidade" id="c_br_ufpr_c3sl_estacaojuventude_Programa_temporalidade" items="${tipotemporalidades}" path="tipotemporalidades" z="8t1yjG70Av2Hz4Mhz7K4xIkuvME="/>
- <field:input field="publicoAlvo" id="c_br_ufpr_c3sl_estacaojuventude_Programa_publicoAlvo" z="nfjHOXYNbbbwrWZdf8B6WQNyvBU="/>
- <field:input field="idadeMinima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMinima" validationMessageCode="field_invalid_integer" z="mkv8Bm7AvW/UKajattFE7vU0B9U="/>
- <field:input field="idadeMaxima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMaxima" validationMessageCode="field_invalid_integer" z="WIjBwA925e6JSn8yKl2LnnzmG9A="/>
- <field:input field="criteriosAcesso" id="c_br_ufpr_c3sl_estacaojuventude_Programa_criteriosAcesso" z="46IIumERi7DTwwtpARnCfqhSkws="/>
- <field:input field="duracao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_duracao" z="a7AOY/Yrtw4PcGueyAvhXIGAQFU="/>
- <field:select field="tematicas" id="c_br_ufpr_c3sl_estacaojuventude_Programa_tematicas" itemValue="id" items="${tematicas}" multiple="true" path="/tematicas" z="dNw66nQiqTH3NQvcrusAZ3M3oX0="/>
- <field:select field="orgaosExecutores" id="c_br_ufpr_c3sl_estacaojuventude_Programa_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/orgaoexecutores" z="user-managed"/>
- <field:input field="parceiros" id="c_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" z="Jbi+j14QiuxyUynDmEoZrpR6n1Q="/>
- <field:select field="ocorrencias" id="c_br_ufpr_c3sl_estacaojuventude_Programa_ocorrencias" itemValue="id" items="${ocorrenciamunicipais}" multiple="true" disabled="true" path="/ocorrenciamunicipais" render="false" z="user-managed"/>
- <field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_Programa_status" items="${tipostatuses}" path="tipostatuses" render="false" z="TWynnY2LlkTLv9vJJ6PYF11yQk0="/>
- <field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_Programa_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="gyBHEGJXuWI8xAN+JR0Z6EVyhMY="/>
- </form:update>
+ <form:update id="fu_br_ufpr_c3sl_estacaojuventude_Programa" modelAttribute="programa" path="/programas" versionField="Version" z="BzUMrk0HIxfhgMsvGQoaUtv2sDc=">
+ <field:input field="nomeOficial" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nomeOficial" z="bc3pz/2g/oVwZE1Aey76ZJhx0bM="/>
+ <field:input field="nomeDivulgacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nomeDivulgacao" z="fDxR3dnr61JMbaTs4rcE9iFHkpU="/>
+ <field:input field="sigla" id="c_br_ufpr_c3sl_estacaojuventude_Programa_sigla" z="kGLlUDsbNNGnqG06eMJbJB4OBXs="/>
+ <field:select field="nivel" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nivel" items="${nivelprogramas}" path="nivelprogramas" z="4pOFZ4tGHsIhD/80BTEdnPGN92g="/>
+ <field:select field="programaVinculado" id="c_br_ufpr_c3sl_estacaojuventude_Programa_programaVinculado" itemValue="id" items="${programas}" path="/programas" z="eOYwLQ5Izpu/YxZLnKEgD3nNJDc="/>
+ <field:input field="leiCriacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_leiCriacao" z="AZrkYSbMNxVniZDEPO3UIZomuUc="/>
+ <field:input field="descricao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_descricao" z="j8K3uhuqABUcYWZtDUVA1uw0H/U="/>
+ <field:input field="objetivos" id="c_br_ufpr_c3sl_estacaojuventude_Programa_objetivos" z="/qg0ht0rwAM9BGySe//YuL0vAJE="/>
+ <field:input field="beneficios" id="c_br_ufpr_c3sl_estacaojuventude_Programa_beneficios" z="4K86Z102Fj1BJX3DXRy1cvG+9Uc="/>
+ <field:datetime dateTimePattern="${programa_datainicio_date_format}" field="dataInicio" id="c_br_ufpr_c3sl_estacaojuventude_Programa_dataInicio" z="nNVy1J68TFQeiW5rl/NKv94LNCE="/>
+ <field:select field="temporalidade" id="c_br_ufpr_c3sl_estacaojuventude_Programa_temporalidade" items="${tipotemporalidades}" path="tipotemporalidades" z="8t1yjG70Av2Hz4Mhz7K4xIkuvME="/>
+ <field:input field="publicoAlvo" id="c_br_ufpr_c3sl_estacaojuventude_Programa_publicoAlvo" z="nfjHOXYNbbbwrWZdf8B6WQNyvBU="/>
+ <field:input field="idadeMinima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMinima" validationMessageCode="field_invalid_integer" z="mkv8Bm7AvW/UKajattFE7vU0B9U="/>
+ <field:input field="idadeMaxima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMaxima" validationMessageCode="field_invalid_integer" z="WIjBwA925e6JSn8yKl2LnnzmG9A="/>
+ <field:input field="criteriosAcesso" id="c_br_ufpr_c3sl_estacaojuventude_Programa_criteriosAcesso" z="46IIumERi7DTwwtpARnCfqhSkws="/>
+ <field:input field="duracao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_duracao" z="a7AOY/Yrtw4PcGueyAvhXIGAQFU="/>
+ <field:select field="tematicas" id="c_br_ufpr_c3sl_estacaojuventude_Programa_tematicas" itemValue="id" items="${tematicas}" multiple="true" path="/tematicas" z="dNw66nQiqTH3NQvcrusAZ3M3oX0="/>
+ <field:select field="orgaosExecutores" id="c_br_ufpr_c3sl_estacaojuventude_Programa_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/orgaoexecutores" z="user-managed"/>
+ <field:input field="parceiros" id="c_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" z="Jbi+j14QiuxyUynDmEoZrpR6n1Q="/>
+ <field:select disabled="true" field="ocorrencias" id="c_br_ufpr_c3sl_estacaojuventude_Programa_ocorrencias" itemValue="id" items="${ocorrenciamunicipais}" multiple="true" path="/ocorrenciamunicipais" render="false" z="user-managed"/>
+ <field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_Programa_status" items="${tipostatuses}" path="tipostatuses" render="false" z="TWynnY2LlkTLv9vJJ6PYF11yQk0="/>
+ <field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_Programa_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="gyBHEGJXuWI8xAN+JR0Z6EVyhMY="/>
+ <field:select disabled="true" field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_situacao" items="${situacaos}" path="situacaos" z="jCGDX8PAVbMAynepL96G296Jlxw="/>
+ <field:datetime dateTimePattern="${programa_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_ultimaAlteracao" render="false" z="e3c4w4glZu09OLB7kWuvESpucp4="/>
+ </form:update>
</sec:authorize>
</div>
diff --git a/src/main/webapp/WEB-INF/views/tematicas/create.jspx b/src/main/webapp/WEB-INF/views/tematicas/create.jspx
index ac6e5687e5f258639e27341682cd90094982e5cf..0403c5c11a9b72e83b5918bc29eea10eeae2fea1 100644
--- a/src/main/webapp/WEB-INF/views/tematicas/create.jspx
+++ b/src/main/webapp/WEB-INF/views/tematicas/create.jspx
@@ -4,6 +4,7 @@
<jsp:output omit-xml-declaration="yes"/>
<form:create id="fc_br_ufpr_c3sl_estacaojuventude_Tematica" modelAttribute="tematica" path="/tematicas" render="${empty dependencies}" z="HiZot7ZuRZnY7ep6KDpOTOYiSJc=">
<field:input field="nome" id="c_br_ufpr_c3sl_estacaojuventude_Tematica_nome" z="+eIYFUmy3glUsls8nlK64MU4CXQ="/>
+ <field:datetime dateTimePattern="${tematica_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Tematica_ultimaAlteracao" render="false" z="user-managed"/>
</form:create>
<form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_estacaojuventude_Tematica" render="${not empty dependencies}" z="TsSTmCtKQ1P4s3rcSijLiW2hOxU="/>
</div>
diff --git a/src/main/webapp/WEB-INF/views/tematicas/list.jspx b/src/main/webapp/WEB-INF/views/tematicas/list.jspx
index 425fd3ab136c5dbf3c507ea280456aaf8a32e55e..1d6835f29830f3d6f2c70c0314f50eea4fd9b43a 100644
--- a/src/main/webapp/WEB-INF/views/tematicas/list.jspx
+++ b/src/main/webapp/WEB-INF/views/tematicas/list.jspx
@@ -5,6 +5,7 @@
<page:list id="pl_br_ufpr_c3sl_estacaojuventude_Tematica" items="${tematicas}" z="MRTzJk6UBaZxzbzq09vvG3QhiKI=">
<table:table data="${tematicas}" id="l_br_ufpr_c3sl_estacaojuventude_Tematica" path="/tematicas" z="5UTKhzGvJkHKGpz6cI1k1Hew3hU=">
<table:column id="c_br_ufpr_c3sl_estacaojuventude_Tematica_nome" property="nome" z="c++22l4tUCHvBf9JTVpdKI0bEJY="/>
+ <table:column date="true" dateTimePattern="${tematica_ultimaalteracao_date_format}" id="c_br_ufpr_c3sl_estacaojuventude_Tematica_ultimaAlteracao" property="ultimaAlteracao" render="false" z="user-managed"/>
</table:table>
</page:list>
</div>
diff --git a/src/main/webapp/WEB-INF/views/tematicas/show.jspx b/src/main/webapp/WEB-INF/views/tematicas/show.jspx
index d40fb32d08f9cbc660751c9b984c824c1c9d579a..35242eb5f516413bee758d371fa4f46691ab4723 100644
--- a/src/main/webapp/WEB-INF/views/tematicas/show.jspx
+++ b/src/main/webapp/WEB-INF/views/tematicas/show.jspx
@@ -4,5 +4,6 @@
<jsp:output omit-xml-declaration="yes"/>
<page:show id="ps_br_ufpr_c3sl_estacaojuventude_Tematica" object="${tematica}" path="/tematicas" z="WC70JqvkJs62Jr7VQtMHYhLoSlU=">
<field:display field="nome" id="s_br_ufpr_c3sl_estacaojuventude_Tematica_nome" object="${tematica}" z="Q3RFfoWSaozUN0XwsuIdGzbL7C8="/>
+ <field:display date="true" dateTimePattern="${tematica_ultimaalteracao_date_format}" field="ultimaAlteracao" id="s_br_ufpr_c3sl_estacaojuventude_Tematica_ultimaAlteracao" object="${tematica}" z="otHmk/7aeSRVzDZ7yT3t0nm3e/0="/>
</page:show>
</div>
diff --git a/src/main/webapp/WEB-INF/views/tematicas/update.jspx b/src/main/webapp/WEB-INF/views/tematicas/update.jspx
index 658bad15128ac19f77ef4c27a3c37f0f4fc13e77..baf292116206af8ae84bede4ee93f4c38b1e0baf 100644
--- a/src/main/webapp/WEB-INF/views/tematicas/update.jspx
+++ b/src/main/webapp/WEB-INF/views/tematicas/update.jspx
@@ -4,5 +4,6 @@
<jsp:output omit-xml-declaration="yes"/>
<form:update id="fu_br_ufpr_c3sl_estacaojuventude_Tematica" modelAttribute="tematica" path="/tematicas" versionField="Version" z="q1lQXYGzHExmXx582NtGnKTBKL0=">
<field:input field="nome" id="c_br_ufpr_c3sl_estacaojuventude_Tematica_nome" z="+eIYFUmy3glUsls8nlK64MU4CXQ="/>
+ <field:datetime dateTimePattern="${tematica_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Tematica_ultimaAlteracao" render="false" z="user-managed"/>
</form:update>
</div>
diff --git a/src/main/webapp/WEB-INF/views/usuarios/create.jspx b/src/main/webapp/WEB-INF/views/usuarios/create.jspx
index baf7da2311123aa62612774c75a4db27a21a9ce6..c310e70dec23ed98f3eac6197eb240abbf5ed531 100644
--- a/src/main/webapp/WEB-INF/views/usuarios/create.jspx
+++ b/src/main/webapp/WEB-INF/views/usuarios/create.jspx
@@ -3,9 +3,11 @@
<jsp:directive.page contentType="text/html;charset=UTF-8"/>
<jsp:output omit-xml-declaration="yes"/>
<form:create id="fc_br_ufpr_c3sl_estacaojuventude_Usuario" modelAttribute="usuario" path="/usuarios" render="${empty dependencies}" z="K3lyZrkxOQob6ItWBoyP6LO4cdw=">
+ <field:input field="nome" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_nome" z="hMJcdadfvu2hwJwJKi5CKCoqpok="/>
<field:input field="login" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_login" z="MCyjd6eDKgCQTL4oAbflJHm/exc="/>
<field:input field="senha" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_senha" required="true" type="password" z="user-managed"/>
<field:select field="permissao" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_permissao" items="${tipousuarios}" path="tipousuarios" z="UpNHcSyQuceS2GTSKBzw+t01YpU="/>
+ <field:datetime dateTimePattern="${usuario_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_ultimaAlteracao" render="false" z="user-managed"/>
</form:create>
<form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_estacaojuventude_Usuario" render="${not empty dependencies}" z="TcO0zHHk2z7G91j+FtFCFjHXv6w="/>
</div>
diff --git a/src/main/webapp/WEB-INF/views/usuarios/list.jspx b/src/main/webapp/WEB-INF/views/usuarios/list.jspx
index adc89a9f106c5e763bbc29083200fe3b03be09e7..2ec91dca057577745928c4416104ee294b27cbf9 100644
--- a/src/main/webapp/WEB-INF/views/usuarios/list.jspx
+++ b/src/main/webapp/WEB-INF/views/usuarios/list.jspx
@@ -4,9 +4,11 @@
<jsp:output omit-xml-declaration="yes"/>
<page:list id="pl_br_ufpr_c3sl_estacaojuventude_Usuario" items="${usuarios}" z="6P79zfiIuMOBVFpAMyHQ8Icvli0=">
<table:table data="${usuarios}" id="l_br_ufpr_c3sl_estacaojuventude_Usuario" path="/usuarios" z="rOCHGfAb9V32mN2fWRcWFPLe/Gk=">
+ <table:column id="c_br_ufpr_c3sl_estacaojuventude_Usuario_nome" property="nome" z="1OP+a8/ec9Hv9rq+7ZcfKAAEhN4="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_Usuario_login" property="login" z="XRjN76XmSu3VcysvabQst6BSi/4="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_Usuario_senha" property="senha" render="false" z="user-managed"/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_Usuario_permissao" property="permissao" z="ROMfbrXicvJm9aMK5A8j0UEOg/0="/>
+ <table:column date="true" dateTimePattern="${usuario_ultimaalteracao_date_format}" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_ultimaAlteracao" property="ultimaAlteracao" render="false" z="user-managed"/>
</table:table>
</page:list>
</div>
diff --git a/src/main/webapp/WEB-INF/views/usuarios/show.jspx b/src/main/webapp/WEB-INF/views/usuarios/show.jspx
index 8733e25b30f09b3250cecf17a61d89aea3811165..622fec53dbf23cb144c55ab343aff79c59560f34 100644
--- a/src/main/webapp/WEB-INF/views/usuarios/show.jspx
+++ b/src/main/webapp/WEB-INF/views/usuarios/show.jspx
@@ -3,8 +3,10 @@
<jsp:directive.page contentType="text/html;charset=UTF-8"/>
<jsp:output omit-xml-declaration="yes"/>
<page:show id="ps_br_ufpr_c3sl_estacaojuventude_Usuario" object="${usuario}" path="/usuarios" z="VHkErGFa2Z/u8f28+97F4fDfxS0=">
+ <field:display field="nome" id="s_br_ufpr_c3sl_estacaojuventude_Usuario_nome" object="${usuario}" z="pRFtzSyxQ3CuFIBHIq6QumcFTJE="/>
<field:display field="login" id="s_br_ufpr_c3sl_estacaojuventude_Usuario_login" object="${usuario}" z="sD/1pd9YwR0SECWQGt8CUkaSl3A="/>
<field:display field="senha" id="s_br_ufpr_c3sl_estacaojuventude_Usuario_senha" object="${usuario}" render="false" z="user-managed"/>
<field:display field="permissao" id="s_br_ufpr_c3sl_estacaojuventude_Usuario_permissao" object="${usuario}" z="8pOQGDhnXMdCxhWNUggxim++/Ek="/>
+ <field:display date="true" dateTimePattern="${usuario_ultimaalteracao_date_format}" field="ultimaAlteracao" id="s_br_ufpr_c3sl_estacaojuventude_Usuario_ultimaAlteracao" object="${usuario}" z="PBQM3gPs+8ZM6VpE8aWQpfsUuzQ="/>
</page:show>
</div>
diff --git a/src/main/webapp/WEB-INF/views/usuarios/update.jspx b/src/main/webapp/WEB-INF/views/usuarios/update.jspx
index d3cc18b886f36e00d8bdd4863eb66b626e750d82..1f47003aac269c87eef965acf6dd4229bcbce663 100644
--- a/src/main/webapp/WEB-INF/views/usuarios/update.jspx
+++ b/src/main/webapp/WEB-INF/views/usuarios/update.jspx
@@ -3,8 +3,10 @@
<jsp:directive.page contentType="text/html;charset=UTF-8"/>
<jsp:output omit-xml-declaration="yes"/>
<form:update id="fu_br_ufpr_c3sl_estacaojuventude_Usuario" modelAttribute="usuario" path="/usuarios" versionField="Version" z="Ysj1N9nW2rFIXzZ0G2/2VMeMGNk=">
+ <field:input field="nome" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_nome" z="hMJcdadfvu2hwJwJKi5CKCoqpok="/>
<field:input field="login" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_login" z="MCyjd6eDKgCQTL4oAbflJHm/exc="/>
<field:input field="senha" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_senha" required="true" type="password" z="user-managed"/>
<field:select field="permissao" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_permissao" items="${tipousuarios}" path="tipousuarios" z="UpNHcSyQuceS2GTSKBzw+t01YpU="/>
+ <field:datetime dateTimePattern="${usuario_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_ultimaAlteracao" render="false" z="user-managed"/>
</form:update>
</div>