diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index a38678a00b2f748042bb0d6c1cf60ee95cd8e1c1..362be285fd84127f9c3f0585f8a70e1e9636113f 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,3 @@
-#Tue Sep 03 11:19:03 BRT 2013
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/Programa.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/Programa.java
index c532a0894ae343141eafd60c1c1a8f4bbbd564da..70fba0cbc26042b77c4a51cffe172b36a8cc0eca 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/Programa.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/Programa.java
@@ -79,7 +79,8 @@ public class Programa {
@ManyToMany(cascade = CascadeType.ALL)
private Set<OrgaoExecutor> orgaosExecutores = new HashSet<OrgaoExecutor>();
- private String orcamento;
+ @Column(columnDefinition = "text")
+ private String parceiros;
@Enumerated(EnumType.STRING)
private TipoStatus status;
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 32eb4689c72667fd1772317f92cc225eba7c8ad4..7096686b4813a27d0100ca641b0dcf1a0b6c36c5 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
@@ -159,12 +159,12 @@ privileged aspect Programa_Roo_JavaBean {
this.orgaosExecutores = orgaosExecutores;
}
- public String Programa.getOrcamento() {
- return this.orcamento;
+ public String Programa.getParceiros() {
+ return this.parceiros;
}
- public void Programa.setOrcamento(String orcamento) {
- this.orcamento = orcamento;
+ public void Programa.setParceiros(String parceiros) {
+ this.parceiros = parceiros;
}
public TipoStatus Programa.getStatus() {
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Estado.java b/src/main/java/br/ufpr/c3sl/participatorio/Estado.java
deleted file mode 100644
index e004247134f0b0f12d25c95b85ded8149817fe1e..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Estado.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package br.ufpr.c3sl.participatorio;
-
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.tostring.RooToString;
-
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord
-public class Estado {
-
- private String nome;
-
- private String sigla;
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_Configurable.aj b/src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_Configurable.aj
deleted file mode 100644
index b1fcf4b102f8640f5769ca18b0be7da3a3d40bb5..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio;
-
-import br.ufpr.c3sl.participatorio.Estado;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect Estado_Roo_Configurable {
-
- declare @type: Estado: @Configurable;
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_JavaBean.aj b/src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_JavaBean.aj
deleted file mode 100644
index 7fa10c30c00dbc2a2bcbb04e9fb030dbc6f7be9e..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio;
-
-import br.ufpr.c3sl.participatorio.Estado;
-
-privileged aspect Estado_Roo_JavaBean {
-
- public String Estado.getNome() {
- return this.nome;
- }
-
- public void Estado.setNome(String nome) {
- this.nome = nome;
- }
-
- public String Estado.getSigla() {
- return this.sigla;
- }
-
- public void Estado.setSigla(String sigla) {
- this.sigla = sigla;
- }
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_Jpa_ActiveRecord.aj b/src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index a2be757dc394210f59c270235ff06011d40e4cee..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,77 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio;
-
-import br.ufpr.c3sl.participatorio.Estado;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect Estado_Roo_Jpa_ActiveRecord {
-
- @PersistenceContext
- transient EntityManager Estado.entityManager;
-
- public static final EntityManager Estado.entityManager() {
- EntityManager em = new Estado().entityManager;
- if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
- return em;
- }
-
- public static long Estado.countEstadoes() {
- return entityManager().createQuery("SELECT COUNT(o) FROM Estado o", Long.class).getSingleResult();
- }
-
- public static List<Estado> Estado.findAllEstadoes() {
- return entityManager().createQuery("SELECT o FROM Estado o", Estado.class).getResultList();
- }
-
- public static Estado Estado.findEstado(Long id) {
- if (id == null) return null;
- return entityManager().find(Estado.class, id);
- }
-
- public static List<Estado> Estado.findEstadoEntries(int firstResult, int maxResults) {
- return entityManager().createQuery("SELECT o FROM Estado o", Estado.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
- }
-
- @Transactional
- public void Estado.persist() {
- if (this.entityManager == null) this.entityManager = entityManager();
- this.entityManager.persist(this);
- }
-
- @Transactional
- public void Estado.remove() {
- if (this.entityManager == null) this.entityManager = entityManager();
- if (this.entityManager.contains(this)) {
- this.entityManager.remove(this);
- } else {
- Estado attached = Estado.findEstado(this.id);
- this.entityManager.remove(attached);
- }
- }
-
- @Transactional
- public void Estado.flush() {
- if (this.entityManager == null) this.entityManager = entityManager();
- this.entityManager.flush();
- }
-
- @Transactional
- public void Estado.clear() {
- if (this.entityManager == null) this.entityManager = entityManager();
- this.entityManager.clear();
- }
-
- @Transactional
- public Estado Estado.merge() {
- if (this.entityManager == null) this.entityManager = entityManager();
- Estado merged = this.entityManager.merge(this);
- this.entityManager.flush();
- return merged;
- }
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_Jpa_Entity.aj b/src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_Jpa_Entity.aj
deleted file mode 100644
index fc58a47c55e98023f58893edae669aff2fba989e..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio;
-
-import br.ufpr.c3sl.participatorio.Estado;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect Estado_Roo_Jpa_Entity {
-
- declare @type: Estado: @Entity;
-
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name = "id")
- private Long Estado.id;
-
- @Version
- @Column(name = "version")
- private Integer Estado.version;
-
- public Long Estado.getId() {
- return this.id;
- }
-
- public void Estado.setId(Long id) {
- this.id = id;
- }
-
- public Integer Estado.getVersion() {
- return this.version;
- }
-
- public void Estado.setVersion(Integer version) {
- this.version = version;
- }
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_ToString.aj b/src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_ToString.aj
deleted file mode 100644
index 5091e2754ec40614081b948202de22fded3c1e41..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio;
-
-import br.ufpr.c3sl.participatorio.Estado;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect Estado_Roo_ToString {
-
- public String Estado.toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
- }
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Ministerio.java b/src/main/java/br/ufpr/c3sl/participatorio/Ministerio.java
deleted file mode 100644
index 13b67b239cd21b1f20b0e10e2ff143419ed8800f..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Ministerio.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package br.ufpr.c3sl.participatorio;
-
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.tostring.RooToString;
-
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord
-public class Ministerio {
- private String nome;
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Ministerio_Roo_Configurable.aj b/src/main/java/br/ufpr/c3sl/participatorio/Ministerio_Roo_Configurable.aj
deleted file mode 100644
index 5f22e84beeeeb5bd7f6c9b3968c7e12dc9fda448..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Ministerio_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio;
-
-import br.ufpr.c3sl.participatorio.Ministerio;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect Ministerio_Roo_Configurable {
-
- declare @type: Ministerio: @Configurable;
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Ministerio_Roo_JavaBean.aj b/src/main/java/br/ufpr/c3sl/participatorio/Ministerio_Roo_JavaBean.aj
deleted file mode 100644
index 34958093df11f664e75336abfd8a4269e606b2ff..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Ministerio_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio;
-
-import br.ufpr.c3sl.participatorio.Ministerio;
-
-privileged aspect Ministerio_Roo_JavaBean {
-
- public String Ministerio.getNome() {
- return this.nome;
- }
-
- public void Ministerio.setNome(String nome) {
- this.nome = nome;
- }
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Ministerio_Roo_Jpa_ActiveRecord.aj b/src/main/java/br/ufpr/c3sl/participatorio/Ministerio_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 4bb2068fc731c50fcf5d9255c1f3f386a6e8dbe4..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Ministerio_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,77 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio;
-
-import br.ufpr.c3sl.participatorio.Ministerio;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect Ministerio_Roo_Jpa_ActiveRecord {
-
- @PersistenceContext
- transient EntityManager Ministerio.entityManager;
-
- public static final EntityManager Ministerio.entityManager() {
- EntityManager em = new Ministerio().entityManager;
- if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
- return em;
- }
-
- public static long Ministerio.countMinisterios() {
- return entityManager().createQuery("SELECT COUNT(o) FROM Ministerio o", Long.class).getSingleResult();
- }
-
- public static List<Ministerio> Ministerio.findAllMinisterios() {
- return entityManager().createQuery("SELECT o FROM Ministerio o", Ministerio.class).getResultList();
- }
-
- public static Ministerio Ministerio.findMinisterio(Long id) {
- if (id == null) return null;
- return entityManager().find(Ministerio.class, id);
- }
-
- public static List<Ministerio> Ministerio.findMinisterioEntries(int firstResult, int maxResults) {
- return entityManager().createQuery("SELECT o FROM Ministerio o", Ministerio.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
- }
-
- @Transactional
- public void Ministerio.persist() {
- if (this.entityManager == null) this.entityManager = entityManager();
- this.entityManager.persist(this);
- }
-
- @Transactional
- public void Ministerio.remove() {
- if (this.entityManager == null) this.entityManager = entityManager();
- if (this.entityManager.contains(this)) {
- this.entityManager.remove(this);
- } else {
- Ministerio attached = Ministerio.findMinisterio(this.id);
- this.entityManager.remove(attached);
- }
- }
-
- @Transactional
- public void Ministerio.flush() {
- if (this.entityManager == null) this.entityManager = entityManager();
- this.entityManager.flush();
- }
-
- @Transactional
- public void Ministerio.clear() {
- if (this.entityManager == null) this.entityManager = entityManager();
- this.entityManager.clear();
- }
-
- @Transactional
- public Ministerio Ministerio.merge() {
- if (this.entityManager == null) this.entityManager = entityManager();
- Ministerio merged = this.entityManager.merge(this);
- this.entityManager.flush();
- return merged;
- }
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Ministerio_Roo_Jpa_Entity.aj b/src/main/java/br/ufpr/c3sl/participatorio/Ministerio_Roo_Jpa_Entity.aj
deleted file mode 100644
index 35a82f495898edc6a5dff688a3f99d9f750b7b49..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Ministerio_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio;
-
-import br.ufpr.c3sl.participatorio.Ministerio;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect Ministerio_Roo_Jpa_Entity {
-
- declare @type: Ministerio: @Entity;
-
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name = "id")
- private Long Ministerio.id;
-
- @Version
- @Column(name = "version")
- private Integer Ministerio.version;
-
- public Long Ministerio.getId() {
- return this.id;
- }
-
- public void Ministerio.setId(Long id) {
- this.id = id;
- }
-
- public Integer Ministerio.getVersion() {
- return this.version;
- }
-
- public void Ministerio.setVersion(Integer version) {
- this.version = version;
- }
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Ministerio_Roo_ToString.aj b/src/main/java/br/ufpr/c3sl/participatorio/Ministerio_Roo_ToString.aj
deleted file mode 100644
index 4b447084f31ff029731d2bcb51073ba722d1f09a..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Ministerio_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio;
-
-import br.ufpr.c3sl.participatorio.Ministerio;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect Ministerio_Roo_ToString {
-
- public String Ministerio.toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
- }
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Projeto.java b/src/main/java/br/ufpr/c3sl/participatorio/Projeto.java
deleted file mode 100644
index 06f27adb2f5629b615ac3a8f9d0e8d121a6f33bd..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Projeto.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package br.ufpr.c3sl.participatorio;
-
-import java.util.ArrayList;
-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.participatorio.enums.TipoAcao;
-import br.ufpr.c3sl.participatorio.enums.TipoDemanda;
-import br.ufpr.c3sl.participatorio.enums.TipoDiasSemana;
-import br.ufpr.c3sl.participatorio.enums.TipoStatus;
-import br.ufpr.c3sl.participatorio.enums.TipoTemporalidade;
-
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord
-public class Projeto {
-
- @OneToOne
- private Projeto pai;
-
- @Column(columnDefinition="text")
- private String nome;
-
- //@Enumerated(EnumType.STRING)
- private ArrayList<TipoDemanda> demanda;
-
- @Enumerated(EnumType.STRING)
- private TipoAcao acao;
-
- @Column(columnDefinition="text")
- private String outroAcao;
-
- @OneToOne
- private Ministerio ministerio;
-
- @Column(columnDefinition="text")
- private String objetivo;
-
- // Endereço
- private String rua;
-
- private String numero;
-
- private String complemento;
-
- private String bairro;
-
- private String municipio;
-
- private String cep;
-
- @OneToOne
- private Estado uf;
-
- @Column(columnDefinition="text")
- private String responsavel;
-
- @Column(columnDefinition="text")
- private String telefones;
-
- private String email;
-
- @Column(columnDefinition="text")
- private String publicoAlvo;
-
- @Column(columnDefinition="text")
- private String formaAcesso;
-
- private String site;
-
-/* itens 12 e 13
- private String horarioFuncionamento;
- private String duracao;
-*/
-
- @Column(columnDefinition="text")
- private String comoFunciona;
-
- @Column(columnDefinition="text")
- private String noticias;
-
-/* horario + dias de funcionamento ??
- private String metodoFuncionamento;
-*/
- @Column(columnDefinition="text")
- private String horarioFuncionamento;
-
- //@Enumerated(EnumType.STRING)
- private ArrayList<TipoDiasSemana> diasFuncionamento;
-
-
- // campos internos
- @Column(columnDefinition="text")
- private String estrutura;
-
- @Column(columnDefinition="text")
- private String responsaveis;
-
- @Column(columnDefinition="text")
- private String telefoneMinisterio;
-
- @Column(columnDefinition="text")
- private String orcamento;
-
- @Column(columnDefinition="text")
- private String justificativa;
-
- @Column(columnDefinition="text")
- private String meta;
-
- @Enumerated(EnumType.STRING)
- private TipoTemporalidade temporalidade;
-
- private boolean possuiMonitoramento;
-
- @Column(columnDefinition="text")
- private String estadosMunicipioComPrograma;
-
- @Column(columnDefinition="text")
- private String publicoPrioritario;
-
- @Temporal(TemporalType.DATE)
- @DateTimeFormat(style="S-")
- private Date dataInicio;
-
- @Column(columnDefinition="text")
- private String mecanismos;
-
- @Column(columnDefinition="text")
- private String parcerias;
-
- private boolean legislacaoPropria;
-
- @Column(columnDefinition="text")
- private String descLegislacao;
-
- @Column(columnDefinition="text")
- private String obs;
-
- @Enumerated(EnumType.STRING)
- private TipoStatus estado;
-
- @OneToOne
- private Usuario usuario;
-
- public static List<Projeto> findAllProjetosCandidatos() {
- return entityManager().createNativeQuery("SELECT * FROM Projeto WHERE estado = 'Candidato'", Projeto.class).getResultList();
- }
-
- public static List<Projeto> findAllProjetosEfetivos() {
- return entityManager().createNativeQuery("SELECT * FROM Projeto WHERE estado = 'Efetivo'", Projeto.class).getResultList();
- }
-
- public static List<Projeto> findAllProjetosRejeitados() {
- return entityManager().createNativeQuery("SELECT * FROM Projeto WHERE estado = 'Rejeitado'", Projeto.class).getResultList();
- }
-
- public static List<Projeto> findMeusProjetos() {
- String login = SecurityContextHolder.getContext().getAuthentication().getName();
-
- return entityManager().createNativeQuery("SELECT * FROM Projeto p, Usuario u WHERE p.usuario = u.id and p.estado = 'Candidato' and u.login = '"+login+"'", Projeto.class).getResultList();
- }
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Projeto_Roo_Configurable.aj b/src/main/java/br/ufpr/c3sl/participatorio/Projeto_Roo_Configurable.aj
deleted file mode 100644
index e6f38be415baf8043746afaaadb88b316509d15c..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Projeto_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio;
-
-import br.ufpr.c3sl.participatorio.Projeto;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect Projeto_Roo_Configurable {
-
- declare @type: Projeto: @Configurable;
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Projeto_Roo_JavaBean.aj b/src/main/java/br/ufpr/c3sl/participatorio/Projeto_Roo_JavaBean.aj
deleted file mode 100644
index b53ba4e586226681da9813a94f6c888ee5206265..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Projeto_Roo_JavaBean.aj
+++ /dev/null
@@ -1,356 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio;
-
-import br.ufpr.c3sl.participatorio.Estado;
-import br.ufpr.c3sl.participatorio.Ministerio;
-import br.ufpr.c3sl.participatorio.Projeto;
-import br.ufpr.c3sl.participatorio.Usuario;
-import br.ufpr.c3sl.participatorio.enums.TipoAcao;
-import br.ufpr.c3sl.participatorio.enums.TipoDemanda;
-import br.ufpr.c3sl.participatorio.enums.TipoDiasSemana;
-import br.ufpr.c3sl.participatorio.enums.TipoStatus;
-import br.ufpr.c3sl.participatorio.enums.TipoTemporalidade;
-import java.util.ArrayList;
-import java.util.Date;
-
-privileged aspect Projeto_Roo_JavaBean {
-
- public Projeto Projeto.getPai() {
- return this.pai;
- }
-
- public void Projeto.setPai(Projeto pai) {
- this.pai = pai;
- }
-
- public String Projeto.getNome() {
- return this.nome;
- }
-
- public void Projeto.setNome(String nome) {
- this.nome = nome;
- }
-
- public ArrayList<TipoDemanda> Projeto.getDemanda() {
- return this.demanda;
- }
-
- public void Projeto.setDemanda(ArrayList<TipoDemanda> demanda) {
- this.demanda = demanda;
- }
-
- public TipoAcao Projeto.getAcao() {
- return this.acao;
- }
-
- public void Projeto.setAcao(TipoAcao acao) {
- this.acao = acao;
- }
-
- public String Projeto.getOutroAcao() {
- return this.outroAcao;
- }
-
- public void Projeto.setOutroAcao(String outroAcao) {
- this.outroAcao = outroAcao;
- }
-
- public Ministerio Projeto.getMinisterio() {
- return this.ministerio;
- }
-
- public void Projeto.setMinisterio(Ministerio ministerio) {
- this.ministerio = ministerio;
- }
-
- public String Projeto.getObjetivo() {
- return this.objetivo;
- }
-
- public void Projeto.setObjetivo(String objetivo) {
- this.objetivo = objetivo;
- }
-
- public String Projeto.getRua() {
- return this.rua;
- }
-
- public void Projeto.setRua(String rua) {
- this.rua = rua;
- }
-
- public String Projeto.getNumero() {
- return this.numero;
- }
-
- public void Projeto.setNumero(String numero) {
- this.numero = numero;
- }
-
- public String Projeto.getComplemento() {
- return this.complemento;
- }
-
- public void Projeto.setComplemento(String complemento) {
- this.complemento = complemento;
- }
-
- public String Projeto.getBairro() {
- return this.bairro;
- }
-
- public void Projeto.setBairro(String bairro) {
- this.bairro = bairro;
- }
-
- public String Projeto.getMunicipio() {
- return this.municipio;
- }
-
- public void Projeto.setMunicipio(String municipio) {
- this.municipio = municipio;
- }
-
- public String Projeto.getCep() {
- return this.cep;
- }
-
- public void Projeto.setCep(String cep) {
- this.cep = cep;
- }
-
- public Estado Projeto.getUf() {
- return this.uf;
- }
-
- public void Projeto.setUf(Estado uf) {
- this.uf = uf;
- }
-
- public String Projeto.getResponsavel() {
- return this.responsavel;
- }
-
- public void Projeto.setResponsavel(String responsavel) {
- this.responsavel = responsavel;
- }
-
- public String Projeto.getTelefones() {
- return this.telefones;
- }
-
- public void Projeto.setTelefones(String telefones) {
- this.telefones = telefones;
- }
-
- public String Projeto.getEmail() {
- return this.email;
- }
-
- public void Projeto.setEmail(String email) {
- this.email = email;
- }
-
- public String Projeto.getPublicoAlvo() {
- return this.publicoAlvo;
- }
-
- public void Projeto.setPublicoAlvo(String publicoAlvo) {
- this.publicoAlvo = publicoAlvo;
- }
-
- public String Projeto.getFormaAcesso() {
- return this.formaAcesso;
- }
-
- public void Projeto.setFormaAcesso(String formaAcesso) {
- this.formaAcesso = formaAcesso;
- }
-
- public String Projeto.getSite() {
- return this.site;
- }
-
- public void Projeto.setSite(String site) {
- this.site = site;
- }
-
- public String Projeto.getComoFunciona() {
- return this.comoFunciona;
- }
-
- public void Projeto.setComoFunciona(String comoFunciona) {
- this.comoFunciona = comoFunciona;
- }
-
- public String Projeto.getNoticias() {
- return this.noticias;
- }
-
- public void Projeto.setNoticias(String noticias) {
- this.noticias = noticias;
- }
-
- public String Projeto.getHorarioFuncionamento() {
- return this.horarioFuncionamento;
- }
-
- public void Projeto.setHorarioFuncionamento(String horarioFuncionamento) {
- this.horarioFuncionamento = horarioFuncionamento;
- }
-
- public ArrayList<TipoDiasSemana> Projeto.getDiasFuncionamento() {
- return this.diasFuncionamento;
- }
-
- public void Projeto.setDiasFuncionamento(ArrayList<TipoDiasSemana> diasFuncionamento) {
- this.diasFuncionamento = diasFuncionamento;
- }
-
- public String Projeto.getEstrutura() {
- return this.estrutura;
- }
-
- public void Projeto.setEstrutura(String estrutura) {
- this.estrutura = estrutura;
- }
-
- public String Projeto.getResponsaveis() {
- return this.responsaveis;
- }
-
- public void Projeto.setResponsaveis(String responsaveis) {
- this.responsaveis = responsaveis;
- }
-
- public String Projeto.getTelefoneMinisterio() {
- return this.telefoneMinisterio;
- }
-
- public void Projeto.setTelefoneMinisterio(String telefoneMinisterio) {
- this.telefoneMinisterio = telefoneMinisterio;
- }
-
- public String Projeto.getOrcamento() {
- return this.orcamento;
- }
-
- public void Projeto.setOrcamento(String orcamento) {
- this.orcamento = orcamento;
- }
-
- public String Projeto.getJustificativa() {
- return this.justificativa;
- }
-
- public void Projeto.setJustificativa(String justificativa) {
- this.justificativa = justificativa;
- }
-
- public String Projeto.getMeta() {
- return this.meta;
- }
-
- public void Projeto.setMeta(String meta) {
- this.meta = meta;
- }
-
- public TipoTemporalidade Projeto.getTemporalidade() {
- return this.temporalidade;
- }
-
- public void Projeto.setTemporalidade(TipoTemporalidade temporalidade) {
- this.temporalidade = temporalidade;
- }
-
- public boolean Projeto.isPossuiMonitoramento() {
- return this.possuiMonitoramento;
- }
-
- public void Projeto.setPossuiMonitoramento(boolean possuiMonitoramento) {
- this.possuiMonitoramento = possuiMonitoramento;
- }
-
- public String Projeto.getEstadosMunicipioComPrograma() {
- return this.estadosMunicipioComPrograma;
- }
-
- public void Projeto.setEstadosMunicipioComPrograma(String estadosMunicipioComPrograma) {
- this.estadosMunicipioComPrograma = estadosMunicipioComPrograma;
- }
-
- public String Projeto.getPublicoPrioritario() {
- return this.publicoPrioritario;
- }
-
- public void Projeto.setPublicoPrioritario(String publicoPrioritario) {
- this.publicoPrioritario = publicoPrioritario;
- }
-
- public Date Projeto.getDataInicio() {
- return this.dataInicio;
- }
-
- public void Projeto.setDataInicio(Date dataInicio) {
- this.dataInicio = dataInicio;
- }
-
- public String Projeto.getMecanismos() {
- return this.mecanismos;
- }
-
- public void Projeto.setMecanismos(String mecanismos) {
- this.mecanismos = mecanismos;
- }
-
- public String Projeto.getParcerias() {
- return this.parcerias;
- }
-
- public void Projeto.setParcerias(String parcerias) {
- this.parcerias = parcerias;
- }
-
- public boolean Projeto.isLegislacaoPropria() {
- return this.legislacaoPropria;
- }
-
- public void Projeto.setLegislacaoPropria(boolean legislacaoPropria) {
- this.legislacaoPropria = legislacaoPropria;
- }
-
- public String Projeto.getDescLegislacao() {
- return this.descLegislacao;
- }
-
- public void Projeto.setDescLegislacao(String descLegislacao) {
- this.descLegislacao = descLegislacao;
- }
-
- public String Projeto.getObs() {
- return this.obs;
- }
-
- public void Projeto.setObs(String obs) {
- this.obs = obs;
- }
-
- public TipoStatus Projeto.getEstado() {
- return this.estado;
- }
-
- public void Projeto.setEstado(TipoStatus estado) {
- this.estado = estado;
- }
-
- public Usuario Projeto.getUsuario() {
- return this.usuario;
- }
-
- public void Projeto.setUsuario(Usuario usuario) {
- this.usuario = usuario;
- }
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Projeto_Roo_Jpa_ActiveRecord.aj b/src/main/java/br/ufpr/c3sl/participatorio/Projeto_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 237c4bb676cad546f91ede964414a508130526e9..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Projeto_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,77 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio;
-
-import br.ufpr.c3sl.participatorio.Projeto;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect Projeto_Roo_Jpa_ActiveRecord {
-
- @PersistenceContext
- transient EntityManager Projeto.entityManager;
-
- public static final EntityManager Projeto.entityManager() {
- EntityManager em = new Projeto().entityManager;
- if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
- return em;
- }
-
- public static long Projeto.countProjetoes() {
- return entityManager().createQuery("SELECT COUNT(o) FROM Projeto o", Long.class).getSingleResult();
- }
-
- public static List<Projeto> Projeto.findAllProjetoes() {
- return entityManager().createQuery("SELECT o FROM Projeto o", Projeto.class).getResultList();
- }
-
- public static Projeto Projeto.findProjeto(Long id) {
- if (id == null) return null;
- return entityManager().find(Projeto.class, id);
- }
-
- public static List<Projeto> Projeto.findProjetoEntries(int firstResult, int maxResults) {
- return entityManager().createQuery("SELECT o FROM Projeto o", Projeto.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
- }
-
- @Transactional
- public void Projeto.persist() {
- if (this.entityManager == null) this.entityManager = entityManager();
- this.entityManager.persist(this);
- }
-
- @Transactional
- public void Projeto.remove() {
- if (this.entityManager == null) this.entityManager = entityManager();
- if (this.entityManager.contains(this)) {
- this.entityManager.remove(this);
- } else {
- Projeto attached = Projeto.findProjeto(this.id);
- this.entityManager.remove(attached);
- }
- }
-
- @Transactional
- public void Projeto.flush() {
- if (this.entityManager == null) this.entityManager = entityManager();
- this.entityManager.flush();
- }
-
- @Transactional
- public void Projeto.clear() {
- if (this.entityManager == null) this.entityManager = entityManager();
- this.entityManager.clear();
- }
-
- @Transactional
- public Projeto Projeto.merge() {
- if (this.entityManager == null) this.entityManager = entityManager();
- Projeto merged = this.entityManager.merge(this);
- this.entityManager.flush();
- return merged;
- }
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Projeto_Roo_Jpa_Entity.aj b/src/main/java/br/ufpr/c3sl/participatorio/Projeto_Roo_Jpa_Entity.aj
deleted file mode 100644
index c7168730deee5971ab26b13fbd70bd28a7017507..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Projeto_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio;
-
-import br.ufpr.c3sl.participatorio.Projeto;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect Projeto_Roo_Jpa_Entity {
-
- declare @type: Projeto: @Entity;
-
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name = "id")
- private Long Projeto.id;
-
- @Version
- @Column(name = "version")
- private Integer Projeto.version;
-
- public Long Projeto.getId() {
- return this.id;
- }
-
- public void Projeto.setId(Long id) {
- this.id = id;
- }
-
- public Integer Projeto.getVersion() {
- return this.version;
- }
-
- public void Projeto.setVersion(Integer version) {
- this.version = version;
- }
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Projeto_Roo_ToString.aj b/src/main/java/br/ufpr/c3sl/participatorio/Projeto_Roo_ToString.aj
deleted file mode 100644
index e287b0d5beea99519e60da33bbeb6b71d6885712..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Projeto_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio;
-
-import br.ufpr.c3sl.participatorio.Projeto;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect Projeto_Roo_ToString {
-
- public String Projeto.toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
- }
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Usuario.java b/src/main/java/br/ufpr/c3sl/participatorio/Usuario.java
deleted file mode 100644
index 06056d455f1f399e71ad670a8bd6873db65879b3..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Usuario.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package br.ufpr.c3sl.participatorio;
-
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.validation.constraints.NotNull;
-
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.tostring.RooToString;
-
-import br.ufpr.c3sl.participatorio.enums.TipoUsuario;
-
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord
-public class Usuario {
-
- private String login;
-
- @NotNull
- private String senha;
-
- @Enumerated(EnumType.STRING)
- private TipoUsuario permissao;
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Usuario_Roo_Configurable.aj b/src/main/java/br/ufpr/c3sl/participatorio/Usuario_Roo_Configurable.aj
deleted file mode 100644
index f9a46a4fa17bb6c858557ef5266758288387df4e..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Usuario_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio;
-
-import br.ufpr.c3sl.participatorio.Usuario;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect Usuario_Roo_Configurable {
-
- declare @type: Usuario: @Configurable;
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Usuario_Roo_JavaBean.aj b/src/main/java/br/ufpr/c3sl/participatorio/Usuario_Roo_JavaBean.aj
deleted file mode 100644
index 0e5f495ca0a57c985e94d14beb03f0461b5b06e0..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Usuario_Roo_JavaBean.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio;
-
-import br.ufpr.c3sl.participatorio.Usuario;
-import br.ufpr.c3sl.participatorio.enums.TipoUsuario;
-
-privileged aspect Usuario_Roo_JavaBean {
-
- public String Usuario.getLogin() {
- return this.login;
- }
-
- public void Usuario.setLogin(String login) {
- this.login = login;
- }
-
- public String Usuario.getSenha() {
- return this.senha;
- }
-
- public void Usuario.setSenha(String senha) {
- this.senha = senha;
- }
-
- public TipoUsuario Usuario.getPermissao() {
- return this.permissao;
- }
-
- public void Usuario.setPermissao(TipoUsuario permissao) {
- this.permissao = permissao;
- }
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Usuario_Roo_Jpa_ActiveRecord.aj b/src/main/java/br/ufpr/c3sl/participatorio/Usuario_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 1856c86d2d5cc3edf358673d015b3c27c6db0aa9..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Usuario_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,77 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio;
-
-import br.ufpr.c3sl.participatorio.Usuario;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect Usuario_Roo_Jpa_ActiveRecord {
-
- @PersistenceContext
- transient EntityManager Usuario.entityManager;
-
- public static final EntityManager Usuario.entityManager() {
- EntityManager em = new Usuario().entityManager;
- if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
- return em;
- }
-
- public static long Usuario.countUsuarios() {
- return entityManager().createQuery("SELECT COUNT(o) FROM Usuario o", Long.class).getSingleResult();
- }
-
- public static List<Usuario> Usuario.findAllUsuarios() {
- return entityManager().createQuery("SELECT o FROM Usuario o", Usuario.class).getResultList();
- }
-
- public static Usuario Usuario.findUsuario(Long id) {
- if (id == null) return null;
- return entityManager().find(Usuario.class, id);
- }
-
- public static List<Usuario> Usuario.findUsuarioEntries(int firstResult, int maxResults) {
- return entityManager().createQuery("SELECT o FROM Usuario o", Usuario.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
- }
-
- @Transactional
- public void Usuario.persist() {
- if (this.entityManager == null) this.entityManager = entityManager();
- this.entityManager.persist(this);
- }
-
- @Transactional
- public void Usuario.remove() {
- if (this.entityManager == null) this.entityManager = entityManager();
- if (this.entityManager.contains(this)) {
- this.entityManager.remove(this);
- } else {
- Usuario attached = Usuario.findUsuario(this.id);
- this.entityManager.remove(attached);
- }
- }
-
- @Transactional
- public void Usuario.flush() {
- if (this.entityManager == null) this.entityManager = entityManager();
- this.entityManager.flush();
- }
-
- @Transactional
- public void Usuario.clear() {
- if (this.entityManager == null) this.entityManager = entityManager();
- this.entityManager.clear();
- }
-
- @Transactional
- public Usuario Usuario.merge() {
- if (this.entityManager == null) this.entityManager = entityManager();
- Usuario merged = this.entityManager.merge(this);
- this.entityManager.flush();
- return merged;
- }
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Usuario_Roo_Jpa_Entity.aj b/src/main/java/br/ufpr/c3sl/participatorio/Usuario_Roo_Jpa_Entity.aj
deleted file mode 100644
index 2251bfd1c520e50d23b9970653b5eae927af8188..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Usuario_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio;
-
-import br.ufpr.c3sl.participatorio.Usuario;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect Usuario_Roo_Jpa_Entity {
-
- declare @type: Usuario: @Entity;
-
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name = "id")
- private Long Usuario.id;
-
- @Version
- @Column(name = "version")
- private Integer Usuario.version;
-
- public Long Usuario.getId() {
- return this.id;
- }
-
- public void Usuario.setId(Long id) {
- this.id = id;
- }
-
- public Integer Usuario.getVersion() {
- return this.version;
- }
-
- public void Usuario.setVersion(Integer version) {
- this.version = version;
- }
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Usuario_Roo_ToString.aj b/src/main/java/br/ufpr/c3sl/participatorio/Usuario_Roo_ToString.aj
deleted file mode 100644
index 4329d32cf2004fd2884066ec4e2a5e5cfaf91e93..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/Usuario_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio;
-
-import br.ufpr.c3sl.participatorio.Usuario;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect Usuario_Roo_ToString {
-
- public String Usuario.toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
- }
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/enums/TipoAcao.java b/src/main/java/br/ufpr/c3sl/participatorio/enums/TipoAcao.java
deleted file mode 100644
index fb747ccef5f95c0a2a90a080c60ea0afc4262cd4..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/enums/TipoAcao.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package br.ufpr.c3sl.participatorio.enums;
-
-
-public enum TipoAcao {
- Serviço,Programa,Projeto,Ação,Agenda,Plano,Outro;
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/enums/TipoDemanda.java b/src/main/java/br/ufpr/c3sl/participatorio/enums/TipoDemanda.java
deleted file mode 100644
index a2e820c6ab2c4c39b00e2c355ff6a2cff1207d76..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/enums/TipoDemanda.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package br.ufpr.c3sl.participatorio.enums;
-
-
-public enum TipoDemanda {
- Educação,Trabalho,Lazer,Esporte,Turismo,Ecologia_e_Meio_Ambiente,
- Cultura,Saúde,Participação_e_Voluntariado,Justiça,Onde_Ir,Seus_Direitos;
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/enums/TipoDiasSemana.java b/src/main/java/br/ufpr/c3sl/participatorio/enums/TipoDiasSemana.java
deleted file mode 100644
index 5d93449fe82a8ddfd4094f26a341fe1e0fc229b8..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/enums/TipoDiasSemana.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package br.ufpr.c3sl.participatorio.enums;
-
-
-public enum TipoDiasSemana {
- Domingo,Segunda,Terça,Quarta,Quinta,Sexta,Sábado;
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/enums/TipoProjeto.java b/src/main/java/br/ufpr/c3sl/participatorio/enums/TipoProjeto.java
deleted file mode 100644
index be5ec7a253b1e9afe49b6ab59834edd0056ed8e0..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/enums/TipoProjeto.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package br.ufpr.c3sl.participatorio.enums;
-
-
-public enum TipoProjeto {
- Nacional,Estadual,Municipal,Outro;
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/enums/TipoStatus.java b/src/main/java/br/ufpr/c3sl/participatorio/enums/TipoStatus.java
deleted file mode 100644
index f671788d1c325f97ff1f280a813a338d2d304a23..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/enums/TipoStatus.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package br.ufpr.c3sl.participatorio.enums;
-
-
-public enum TipoStatus {
- Efetivo,Candidato,Rejeitado;
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/enums/TipoTemporalidade.java b/src/main/java/br/ufpr/c3sl/participatorio/enums/TipoTemporalidade.java
deleted file mode 100644
index b596df97c456b4b251773665e3e3e8af14639522..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/enums/TipoTemporalidade.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package br.ufpr.c3sl.participatorio.enums;
-
-
-public enum TipoTemporalidade {
- Temporario,Permanente;
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/enums/TipoUsuario.java b/src/main/java/br/ufpr/c3sl/participatorio/enums/TipoUsuario.java
deleted file mode 100644
index 1c10610d91d87e2b4c2103f266a099242ae7bb1b..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/enums/TipoUsuario.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package br.ufpr.c3sl.participatorio.enums;
-
-
-public enum TipoUsuario {
- Administrador, Usuario;
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/web/ApplicationConversionServiceFactoryBean.java b/src/main/java/br/ufpr/c3sl/participatorio/web/ApplicationConversionServiceFactoryBean.java
deleted file mode 100644
index b38c58ec121ea10eaa6b394bc14d6f8cd5106c66..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/web/ApplicationConversionServiceFactoryBean.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package br.ufpr.c3sl.participatorio.web;
-
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.format.FormatterRegistry;
-import org.springframework.format.support.FormattingConversionServiceFactoryBean;
-import org.springframework.roo.addon.web.mvc.controller.converter.RooConversionService;
-
-import br.ufpr.c3sl.participatorio.Estado;
-import br.ufpr.c3sl.participatorio.Ministerio;
-import br.ufpr.c3sl.participatorio.Projeto;
-import br.ufpr.c3sl.participatorio.Usuario;
-
-/**
- * A central place to register application converters and formatters.
- */
-@RooConversionService
-public class ApplicationConversionServiceFactoryBean extends FormattingConversionServiceFactoryBean {
-
- @Override
- protected void installFormatters(FormatterRegistry registry) {
- super.installFormatters(registry);
- // Register application converters and formatters
- }
-
- public Converter<Ministerio, String> getMinisterioToStringConverter() {
- return new org.springframework.core.convert.converter.Converter<br.ufpr.c3sl.participatorio.Ministerio, java.lang.String>() {
- public String convert(Ministerio ministerio) {
- if (ministerio.getNome() == null)
- return new StringBuilder().append(' ').toString();
- return new StringBuilder().append(ministerio.getNome()).toString();
- }
- };
- }
-
- public Converter<Projeto, String> getProjetoToStringConverter() {
- return new org.springframework.core.convert.converter.Converter<br.ufpr.c3sl.participatorio.Projeto, java.lang.String>() {
- public String convert(Projeto projeto) {
- if (projeto.getNome() == null)
- return new StringBuilder().append(' ').toString();
- return new StringBuilder().append(projeto.getNome()).toString();
- }
- };
- }
-
- public Converter<Usuario, String> getUsuarioToStringConverter() {
- return new org.springframework.core.convert.converter.Converter<br.ufpr.c3sl.participatorio.Usuario, java.lang.String>() {
- public String convert(Usuario usuario) {
- return new StringBuilder().append(usuario.getLogin()).toString();
- }
- };
- }
-
- public Converter<Estado, String> getEstadoToStringConverter() {
- return new org.springframework.core.convert.converter.Converter<br.ufpr.c3sl.participatorio.Estado, java.lang.String>() {
- public String convert(Estado estado) {
- return new StringBuilder().append(estado.getNome()).append(" - ").append(estado.getSigla()).toString();
- }
- };
- }
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/web/ApplicationConversionServiceFactoryBean_Roo_ConversionService.aj b/src/main/java/br/ufpr/c3sl/participatorio/web/ApplicationConversionServiceFactoryBean_Roo_ConversionService.aj
deleted file mode 100644
index 049b2dc371b9bdadcecba0eef62b409780a5c097..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/web/ApplicationConversionServiceFactoryBean_Roo_ConversionService.aj
+++ /dev/null
@@ -1,103 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio.web;
-
-import br.ufpr.c3sl.participatorio.Estado;
-import br.ufpr.c3sl.participatorio.Ministerio;
-import br.ufpr.c3sl.participatorio.Projeto;
-import br.ufpr.c3sl.participatorio.Usuario;
-import br.ufpr.c3sl.participatorio.web.ApplicationConversionServiceFactoryBean;
-import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.format.FormatterRegistry;
-
-privileged aspect ApplicationConversionServiceFactoryBean_Roo_ConversionService {
-
- declare @type: ApplicationConversionServiceFactoryBean: @Configurable;
-
- public Converter<Long, Estado> ApplicationConversionServiceFactoryBean.getIdToEstadoConverter() {
- return new org.springframework.core.convert.converter.Converter<java.lang.Long, br.ufpr.c3sl.participatorio.Estado>() {
- public br.ufpr.c3sl.participatorio.Estado convert(java.lang.Long id) {
- return Estado.findEstado(id);
- }
- };
- }
-
- public Converter<String, Estado> ApplicationConversionServiceFactoryBean.getStringToEstadoConverter() {
- return new org.springframework.core.convert.converter.Converter<java.lang.String, br.ufpr.c3sl.participatorio.Estado>() {
- public br.ufpr.c3sl.participatorio.Estado convert(String id) {
- return getObject().convert(getObject().convert(id, Long.class), Estado.class);
- }
- };
- }
-
- public Converter<Long, Ministerio> ApplicationConversionServiceFactoryBean.getIdToMinisterioConverter() {
- return new org.springframework.core.convert.converter.Converter<java.lang.Long, br.ufpr.c3sl.participatorio.Ministerio>() {
- public br.ufpr.c3sl.participatorio.Ministerio convert(java.lang.Long id) {
- return Ministerio.findMinisterio(id);
- }
- };
- }
-
- public Converter<String, Ministerio> ApplicationConversionServiceFactoryBean.getStringToMinisterioConverter() {
- return new org.springframework.core.convert.converter.Converter<java.lang.String, br.ufpr.c3sl.participatorio.Ministerio>() {
- public br.ufpr.c3sl.participatorio.Ministerio convert(String id) {
- return getObject().convert(getObject().convert(id, Long.class), Ministerio.class);
- }
- };
- }
-
- public Converter<Long, Projeto> ApplicationConversionServiceFactoryBean.getIdToProjetoConverter() {
- return new org.springframework.core.convert.converter.Converter<java.lang.Long, br.ufpr.c3sl.participatorio.Projeto>() {
- public br.ufpr.c3sl.participatorio.Projeto convert(java.lang.Long id) {
- return Projeto.findProjeto(id);
- }
- };
- }
-
- public Converter<String, Projeto> ApplicationConversionServiceFactoryBean.getStringToProjetoConverter() {
- return new org.springframework.core.convert.converter.Converter<java.lang.String, br.ufpr.c3sl.participatorio.Projeto>() {
- public br.ufpr.c3sl.participatorio.Projeto convert(String id) {
- return getObject().convert(getObject().convert(id, Long.class), Projeto.class);
- }
- };
- }
-
- public Converter<Long, Usuario> ApplicationConversionServiceFactoryBean.getIdToUsuarioConverter() {
- return new org.springframework.core.convert.converter.Converter<java.lang.Long, br.ufpr.c3sl.participatorio.Usuario>() {
- public br.ufpr.c3sl.participatorio.Usuario convert(java.lang.Long id) {
- return Usuario.findUsuario(id);
- }
- };
- }
-
- public Converter<String, Usuario> ApplicationConversionServiceFactoryBean.getStringToUsuarioConverter() {
- return new org.springframework.core.convert.converter.Converter<java.lang.String, br.ufpr.c3sl.participatorio.Usuario>() {
- public br.ufpr.c3sl.participatorio.Usuario convert(String id) {
- return getObject().convert(getObject().convert(id, Long.class), Usuario.class);
- }
- };
- }
-
- public void ApplicationConversionServiceFactoryBean.installLabelConverters(FormatterRegistry registry) {
- registry.addConverter(getEstadoToStringConverter());
- registry.addConverter(getIdToEstadoConverter());
- registry.addConverter(getStringToEstadoConverter());
- registry.addConverter(getMinisterioToStringConverter());
- registry.addConverter(getIdToMinisterioConverter());
- registry.addConverter(getStringToMinisterioConverter());
- registry.addConverter(getProjetoToStringConverter());
- registry.addConverter(getIdToProjetoConverter());
- registry.addConverter(getStringToProjetoConverter());
- registry.addConverter(getUsuarioToStringConverter());
- registry.addConverter(getIdToUsuarioConverter());
- registry.addConverter(getStringToUsuarioConverter());
- }
-
- public void ApplicationConversionServiceFactoryBean.afterPropertiesSet() {
- super.afterPropertiesSet();
- installLabelConverters(getObject());
- }
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/web/EstadoController.java b/src/main/java/br/ufpr/c3sl/participatorio/web/EstadoController.java
deleted file mode 100644
index 0249da2a1455ab8cbab44943587d50f258cfd275..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/web/EstadoController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package br.ufpr.c3sl.participatorio.web;
-
-import br.ufpr.c3sl.participatorio.Estado;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/estados")
-@Controller
-@RooWebScaffold(path = "estados", formBackingObject = Estado.class)
-public class EstadoController {
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/web/EstadoController_Roo_Controller.aj b/src/main/java/br/ufpr/c3sl/participatorio/web/EstadoController_Roo_Controller.aj
deleted file mode 100644
index e6135a58bcb098f8cdad09043da54a096077c2bf..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/web/EstadoController_Roo_Controller.aj
+++ /dev/null
@@ -1,102 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio.web;
-
-import br.ufpr.c3sl.participatorio.Estado;
-import br.ufpr.c3sl.participatorio.web.EstadoController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-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());
- return "estados/create";
- }
-
- @RequestMapping(value = "/{id}", produces = "text/html")
- public String EstadoController.show(@PathVariable("id") Long id, Model uiModel) {
- uiModel.addAttribute("estado", Estado.findEstado(id));
- uiModel.addAttribute("itemId", id);
- return "estados/show";
- }
-
- @RequestMapping(produces = "text/html")
- public String EstadoController.list(@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("estadoes", Estado.findEstadoEntries(firstResult, sizeNo));
- float nrOfPages = (float) Estado.countEstadoes() / sizeNo;
- uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
- } else {
- uiModel.addAttribute("estadoes", Estado.findAllEstadoes());
- }
- return "estados/list";
- }
-
- @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.populateEditForm(Model uiModel, Estado estado) {
- uiModel.addAttribute("estado", estado);
- }
-
- String EstadoController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
- String enc = httpServletRequest.getCharacterEncoding();
- if (enc == null) {
- enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
- }
- try {
- pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
- } catch (UnsupportedEncodingException uee) {}
- return pathSegment;
- }
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/web/MinisterioController.java b/src/main/java/br/ufpr/c3sl/participatorio/web/MinisterioController.java
deleted file mode 100644
index 8542c1bdd17a9be1e63bb3e970ceb2ee927e9919..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/web/MinisterioController.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package br.ufpr.c3sl.participatorio.web;
-
-import br.ufpr.c3sl.participatorio.Ministerio;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-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("/ministerios")
-@Controller
-@RooWebScaffold(path = "ministerios", formBackingObject = Ministerio.class)
-public class MinisterioController {
-
- @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) {
- Ministerio ministerio = Ministerio.findMinisterio(id);
- ministerio.remove();
- //uiModel.asMap().clear();
- //uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
- //uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
- return "redirect:/ministerios";
- }
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/web/MinisterioController_Roo_Controller.aj b/src/main/java/br/ufpr/c3sl/participatorio/web/MinisterioController_Roo_Controller.aj
deleted file mode 100644
index e36601776a8cd61ee2b57ebdc4b99518bb5265a0..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/web/MinisterioController_Roo_Controller.aj
+++ /dev/null
@@ -1,92 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio.web;
-
-import br.ufpr.c3sl.participatorio.Ministerio;
-import br.ufpr.c3sl.participatorio.web.MinisterioController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-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 MinisterioController_Roo_Controller {
-
- @RequestMapping(method = RequestMethod.POST, produces = "text/html")
- public String MinisterioController.create(@Valid Ministerio ministerio, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
- if (bindingResult.hasErrors()) {
- populateEditForm(uiModel, ministerio);
- return "ministerios/create";
- }
- uiModel.asMap().clear();
- ministerio.persist();
- return "redirect:/ministerios/" + encodeUrlPathSegment(ministerio.getId().toString(), httpServletRequest);
- }
-
- @RequestMapping(params = "form", produces = "text/html")
- public String MinisterioController.createForm(Model uiModel) {
- populateEditForm(uiModel, new Ministerio());
- return "ministerios/create";
- }
-
- @RequestMapping(value = "/{id}", produces = "text/html")
- public String MinisterioController.show(@PathVariable("id") Long id, Model uiModel) {
- uiModel.addAttribute("ministerio", Ministerio.findMinisterio(id));
- uiModel.addAttribute("itemId", id);
- return "ministerios/show";
- }
-
- @RequestMapping(produces = "text/html")
- public String MinisterioController.list(@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("ministerios", Ministerio.findMinisterioEntries(firstResult, sizeNo));
- float nrOfPages = (float) Ministerio.countMinisterios() / sizeNo;
- uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
- } else {
- uiModel.addAttribute("ministerios", Ministerio.findAllMinisterios());
- }
- return "ministerios/list";
- }
-
- @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
- public String MinisterioController.update(@Valid Ministerio ministerio, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
- if (bindingResult.hasErrors()) {
- populateEditForm(uiModel, ministerio);
- return "ministerios/update";
- }
- uiModel.asMap().clear();
- ministerio.merge();
- return "redirect:/ministerios/" + encodeUrlPathSegment(ministerio.getId().toString(), httpServletRequest);
- }
-
- @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
- public String MinisterioController.updateForm(@PathVariable("id") Long id, Model uiModel) {
- populateEditForm(uiModel, Ministerio.findMinisterio(id));
- return "ministerios/update";
- }
-
- void MinisterioController.populateEditForm(Model uiModel, Ministerio ministerio) {
- uiModel.addAttribute("ministerio", ministerio);
- }
-
- String MinisterioController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
- String enc = httpServletRequest.getCharacterEncoding();
- if (enc == null) {
- enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
- }
- try {
- pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
- } catch (UnsupportedEncodingException uee) {}
- return pathSegment;
- }
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/web/ProjetoController.java b/src/main/java/br/ufpr/c3sl/participatorio/web/ProjetoController.java
deleted file mode 100644
index a6144211293cd7dcadd4493473722b845c9fa069..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/web/ProjetoController.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package br.ufpr.c3sl.participatorio.web;
-
-import java.util.Arrays;
-import java.util.List;
-
-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.participatorio.Estado;
-import br.ufpr.c3sl.participatorio.Ministerio;
-import br.ufpr.c3sl.participatorio.Projeto;
-import br.ufpr.c3sl.participatorio.Usuario;
-import br.ufpr.c3sl.participatorio.enums.TipoAcao;
-import br.ufpr.c3sl.participatorio.enums.TipoDemanda;
-import br.ufpr.c3sl.participatorio.enums.TipoDiasSemana;
-import br.ufpr.c3sl.participatorio.enums.TipoStatus;
-import br.ufpr.c3sl.participatorio.enums.TipoTemporalidade;
-
-@RequestMapping("/projetos")
-@Controller
-@RooWebScaffold(path = "projetos", formBackingObject = Projeto.class)
-public class ProjetoController {
-
- @RequestMapping(method = RequestMethod.POST, produces = "text/html")
- public String create(@Valid Projeto projeto, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
- if (bindingResult.hasErrors()) {
- populateEditForm(uiModel, projeto);
- return "projetos/create";
- }
-
- projeto.setEstado(TipoStatus.Candidato);
-
- Usuario u = (Usuario) Usuario.entityManager().createNativeQuery("select * from usuario where login='"+SecurityContextHolder.getContext().getAuthentication().getName()+"'", Usuario.class).getSingleResult();
- projeto.setUsuario(u);
-
- uiModel.asMap().clear();
- projeto.persist();
- return "redirect:/projetos/" + encodeUrlPathSegment(projeto.getId().toString(), httpServletRequest);
- }
-
- @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
- public String update(@Valid Projeto projeto, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
- Projeto p = (Projeto) Projeto.entityManager().createNativeQuery("select * from projeto where id = "+projeto.getId(), Projeto.class).getSingleResult();
-
- if (SecurityContextHolder.getContext().getAuthentication().getAuthorities().toArray()[0].toString().equals("Usuario")) {
- if (p.getEstado() == TipoStatus.Candidato) {
- if (!p.getUsuario().getLogin().equals(SecurityContextHolder.getContext().getAuthentication().getName()))
- bindingResult.addError(new ObjectError("", "Esse projeto não está associado a sua conta."));
- }
- else
- bindingResult.addError(new ObjectError("", "Projeto avaliado, você não tem permissão para modificar esse projeto."));
-
- projeto.setEstado(p.getEstado());
- }
-
- if (bindingResult.hasErrors()) {
- populateEditForm(uiModel, projeto);
- return "projetos/update";
- }
-
- projeto.setUsuario(p.getUsuario());
-
- uiModel.asMap().clear();
- projeto.merge();
- return "redirect:/projetos/" + encodeUrlPathSegment(projeto.getId().toString(), httpServletRequest);
- }
-
- @RequestMapping(value = "/{id}", produces = "text/html")
- public String show(@PathVariable("id") Long id, Model uiModel) {
- Projeto projeto = Projeto.findProjeto(id);
- addDateTimeFormatPatterns(uiModel);
- uiModel.addAttribute("projeto", projeto);
- uiModel.addAttribute("itemId", id);
- if (projeto.getEstado() == TipoStatus.Candidato) return "projetos/showcandidatos";
- return "projetos/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("projetos", Projeto.findProjetoEntries(firstResult, sizeNo));
- float nrOfPages = (float) Projeto.countProjetoes() / sizeNo;
- uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
- } else {
- uiModel.addAttribute("projetos", Projeto.findAllProjetosCandidatos());
- }
- addDateTimeFormatPatterns(uiModel);
- return "projetos/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("projetos", Projeto.findProjetoEntries(firstResult, sizeNo));
- float nrOfPages = (float) Projeto.countProjetoes() / sizeNo;
- uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
- } else {
- uiModel.addAttribute("projetos", Projeto.findAllProjetosEfetivos());
- }
- addDateTimeFormatPatterns(uiModel);
- return "projetos/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("projetos", Projeto.findProjetoEntries(firstResult, sizeNo));
- float nrOfPages = (float) Projeto.countProjetoes() / sizeNo;
- uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
- } else {
- uiModel.addAttribute("projetos", Projeto.findAllProjetosRejeitados());
- }
- addDateTimeFormatPatterns(uiModel);
- return "projetos/list";
- }
-
- @RequestMapping(value = "meusprojetos", produces = "text/html")
- public String listMeusProjetos(@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("projetos", Projeto.findProjetoEntries(firstResult, sizeNo));
- float nrOfPages = (float) Projeto.countProjetoes() / sizeNo;
- uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
- } else {
- uiModel.addAttribute("projetos", Projeto.findMeusProjetos());
- }
- addDateTimeFormatPatterns(uiModel);
- return "projetos/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) {
- Projeto projeto = Projeto.findProjeto(id);
- if (projeto.getEstado() == TipoStatus.Candidato) {
- if (status.equals("1")) projeto.setEstado(TipoStatus.Efetivo);
- if (status.equals("0")) projeto.setEstado(TipoStatus.Rejeitado);
- projeto.merge();
- }
- return "redirect:/projetos/" + encodeUrlPathSegment(projeto.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 = "";
-
- Projeto projeto = Projeto.findProjeto(id);
-
- if (projeto.getEstado() == TipoStatus.Candidato)
- str = "listCandidatos";
- else if (projeto.getEstado() == TipoStatus.Efetivo)
- str = "listEfetivos";
- else
- str = "listRejeitados";
-
- projeto.remove();
- //uiModel.asMap().clear();
- //uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
- //uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
- return "redirect:/projetos/"+str;
- }
-
- void populateEditForm(Model uiModel, Projeto projeto) {
- uiModel.addAttribute("projeto", projeto);
- addDateTimeFormatPatterns(uiModel);
-
- List<Ministerio> lm = Ministerio.findAllMinisterios();
- Ministerio m = new Ministerio();
- m.setId((long) 0);
- lm.add(0, m);
- uiModel.addAttribute("ministerios", lm);
-
- //List<Projeto> lp = Projeto.findAllProjetoes();
- List<Projeto> lp = Projeto.findAllProjetosEfetivos();
- Projeto p = new Projeto();
- p.setId((long) 0);
- lp.add(0, p);
- uiModel.addAttribute("projetos", lp);
-
- uiModel.addAttribute("estados", Estado.findAllEstadoes());
- uiModel.addAttribute("usuarios", Usuario.findAllUsuarios());
- uiModel.addAttribute("tipoacaos", Arrays.asList(TipoAcao.values()));
- uiModel.addAttribute("tipodemandas", Arrays.asList(TipoDemanda.values()));
- uiModel.addAttribute("tipodiassemanas", Arrays.asList(TipoDiasSemana.values()));
- uiModel.addAttribute("tipostatuses", Arrays.asList(TipoStatus.values()));
- uiModel.addAttribute("tipotemporalidades", Arrays.asList(TipoTemporalidade.values()));
- }
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/web/ProjetoController_Roo_Controller.aj b/src/main/java/br/ufpr/c3sl/participatorio/web/ProjetoController_Roo_Controller.aj
deleted file mode 100644
index 075374ecd092717d4d79beffeb101e9aef5cb37e..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/web/ProjetoController_Roo_Controller.aj
+++ /dev/null
@@ -1,63 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio.web;
-
-import br.ufpr.c3sl.participatorio.Projeto;
-import br.ufpr.c3sl.participatorio.web.ProjetoController;
-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;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ProjetoController_Roo_Controller {
-
- @RequestMapping(params = "form", produces = "text/html")
- public String ProjetoController.createForm(Model uiModel) {
- populateEditForm(uiModel, new Projeto());
- return "projetos/create";
- }
-
- @RequestMapping(produces = "text/html")
- public String ProjetoController.list(@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("projetoes", Projeto.findProjetoEntries(firstResult, sizeNo));
- float nrOfPages = (float) Projeto.countProjetoes() / sizeNo;
- uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
- } else {
- uiModel.addAttribute("projetoes", Projeto.findAllProjetoes());
- }
- addDateTimeFormatPatterns(uiModel);
- return "projetos/list";
- }
-
- @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
- public String ProjetoController.updateForm(@PathVariable("id") Long id, Model uiModel) {
- populateEditForm(uiModel, Projeto.findProjeto(id));
- return "projetos/update";
- }
-
- void ProjetoController.addDateTimeFormatPatterns(Model uiModel) {
- uiModel.addAttribute("projeto_datainicio_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
- }
-
- String ProjetoController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
- String enc = httpServletRequest.getCharacterEncoding();
- if (enc == null) {
- enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
- }
- try {
- pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
- } catch (UnsupportedEncodingException uee) {}
- return pathSegment;
- }
-
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/web/UsuarioController.java b/src/main/java/br/ufpr/c3sl/participatorio/web/UsuarioController.java
deleted file mode 100644
index 2cca400b013264f2aa0248f04a370c8fdbe21c90..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/web/UsuarioController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package br.ufpr.c3sl.participatorio.web;
-
-import java.util.Arrays;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.security.authentication.encoding.ShaPasswordEncoder;
-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.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.participatorio.Usuario;
-import br.ufpr.c3sl.participatorio.enums.TipoUsuario;
-
-@RequestMapping("/usuarios")
-@Controller
-@RooWebScaffold(path = "usuarios", formBackingObject = Usuario.class)
-public class UsuarioController {
-
- @RequestMapping(method = RequestMethod.POST, produces = "text/html")
- public String create(@Valid Usuario usuario, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
- if (bindingResult.hasErrors()) {
- populateEditForm(uiModel, usuario);
- return "usuarios/create";
- }
-
- ShaPasswordEncoder encoder = new ShaPasswordEncoder(256);
-
- usuario.setSenha(encoder.encodePassword(usuario.getSenha(), ""));
-
- uiModel.asMap().clear();
- usuario.persist();
- return "redirect:/usuarios/" + encodeUrlPathSegment(usuario.getId().toString(), httpServletRequest);
- }
-
- @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
- public String update(@Valid Usuario usuario, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
- if (bindingResult.hasErrors()) {
- populateEditForm(uiModel, usuario);
- return "usuarios/update";
- }
-
- ShaPasswordEncoder encoder = new ShaPasswordEncoder(256);
-
- usuario.setSenha(encoder.encodePassword(usuario.getSenha(), ""));
-
- uiModel.asMap().clear();
- usuario.merge();
- return "redirect:/usuarios/" + encodeUrlPathSegment(usuario.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) {
- Usuario usuario = Usuario.findUsuario(id);
- usuario.remove();
- //uiModel.asMap().clear();
- //uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
- //uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
- return "redirect:/usuarios";
- }
-
- void populateEditForm(Model uiModel, Usuario usuario) {
- uiModel.addAttribute("usuario", usuario);
- uiModel.addAttribute("tipousuarios", Arrays.asList(TipoUsuario.Usuario, TipoUsuario.Administrador/*TipoUsuario.values()*/));
- }
-
- @RequestMapping(value = "changepassword", method = RequestMethod.GET)
- public String chancePassword() {
- return "usuarios/changepassword";
- }
-
- @RequestMapping(value = "accepted", method = RequestMethod.GET)
- public String accepted() {
- return "usuarios/accepted";
- }
-
- @RequestMapping(value = "error", method = RequestMethod.GET)
- public String error() {
- return "usuarios/error";
- }
-
- @RequestMapping(value = "updatepassword", method = RequestMethod.GET)
- public String updatePassword(@RequestParam(value = "oldpassword", required = true) String opass,
- @RequestParam(value = "newpassword", required = true) String npass) {
- Usuario p = (Usuario) Usuario.entityManager().createNativeQuery("select * from usuario where login='"
- +SecurityContextHolder.getContext().getAuthentication().getName()+"'",
- Usuario.class).getSingleResult();
-
- ShaPasswordEncoder encoder = new ShaPasswordEncoder(256);
-
- if (!(p.getSenha().equals(encoder.encodePassword(opass, ""))))
- return "redirect:error";
-
- p.setSenha(encoder.encodePassword(npass, ""));
-
- p.merge();
- return "redirect:accepted";
- }
-}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/web/UsuarioController_Roo_Controller.aj b/src/main/java/br/ufpr/c3sl/participatorio/web/UsuarioController_Roo_Controller.aj
deleted file mode 100644
index 37e1839392c226852a6835199d50ee7021c079ca..0000000000000000000000000000000000000000
--- a/src/main/java/br/ufpr/c3sl/participatorio/web/UsuarioController_Roo_Controller.aj
+++ /dev/null
@@ -1,63 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package br.ufpr.c3sl.participatorio.web;
-
-import br.ufpr.c3sl.participatorio.Usuario;
-import br.ufpr.c3sl.participatorio.web.UsuarioController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect UsuarioController_Roo_Controller {
-
- @RequestMapping(params = "form", produces = "text/html")
- public String UsuarioController.createForm(Model uiModel) {
- populateEditForm(uiModel, new Usuario());
- return "usuarios/create";
- }
-
- @RequestMapping(value = "/{id}", produces = "text/html")
- public String UsuarioController.show(@PathVariable("id") Long id, Model uiModel) {
- uiModel.addAttribute("usuario", Usuario.findUsuario(id));
- uiModel.addAttribute("itemId", id);
- return "usuarios/show";
- }
-
- @RequestMapping(produces = "text/html")
- public String UsuarioController.list(@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("usuarios", Usuario.findUsuarioEntries(firstResult, sizeNo));
- float nrOfPages = (float) Usuario.countUsuarios() / sizeNo;
- uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
- } else {
- uiModel.addAttribute("usuarios", Usuario.findAllUsuarios());
- }
- return "usuarios/list";
- }
-
- @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
- public String UsuarioController.updateForm(@PathVariable("id") Long id, Model uiModel) {
- populateEditForm(uiModel, Usuario.findUsuario(id));
- return "usuarios/update";
- }
-
- String UsuarioController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
- String enc = httpServletRequest.getCharacterEncoding();
- if (enc == null) {
- enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
- }
- try {
- pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
- } catch (UnsupportedEncodingException uee) {}
- return pathSegment;
- }
-
-}
diff --git a/src/main/webapp/WEB-INF/i18n/application.properties b/src/main/webapp/WEB-INF/i18n/application.properties
index 74fb2df215fb7ec14f412a4bbae5ade97c095390..4271578e3f218b181294caf982b184103375787e 100644
--- a/src/main/webapp/WEB-INF/i18n/application.properties
+++ b/src/main/webapp/WEB-INF/i18n/application.properties
@@ -25,8 +25,8 @@ label_br_ufpr_c3sl_estacaojuventude_programa_nivel=Nível
label_br_ufpr_c3sl_estacaojuventude_programa_nomedivulgacao=Nome Divulgação
label_br_ufpr_c3sl_estacaojuventude_programa_nomeoficial=Nome Oficial
label_br_ufpr_c3sl_estacaojuventude_programa_objetivos=Objetivos
-label_br_ufpr_c3sl_estacaojuventude_programa_orcamento=Orçamento
label_br_ufpr_c3sl_estacaojuventude_programa_orgaosexecutores=Orgãos Executores
+label_br_ufpr_c3sl_estacaojuventude_programa_parceiros=Parceiros
label_br_ufpr_c3sl_estacaojuventude_programa_plural=Programas
label_br_ufpr_c3sl_estacaojuventude_programa_programavinculado=Programa Vinculado
label_br_ufpr_c3sl_estacaojuventude_programa_publicoalvo=Público Alvo
@@ -69,7 +69,7 @@ menu_item_estado_list_label=Estados
menu_item_estado_new_label=Estado
menu_item_usuario_list_label=Usuários
menu_item_usuario_new_label=Usuário
-menu_item_orgaoexecutor_list_label=Orgãos Executors
+menu_item_orgaoexecutor_list_label=Orgãos Executores
menu_item_orgaoexecutor_new_label=Orgão Executor
menu_item_programa_list_label=Programas
menu_item_programa_new_label=Programa
diff --git a/src/main/webapp/WEB-INF/i18n/messages.properties b/src/main/webapp/WEB-INF/i18n/messages.properties
index b9593ddbeb10a4af8c52af4929204cef6fa7f8b4..8c0e8ebf627d88ab9b343a73704c1b2bde447d56 100644
--- a/src/main/webapp/WEB-INF/i18n/messages.properties
+++ b/src/main/webapp/WEB-INF/i18n/messages.properties
@@ -13,7 +13,7 @@ global_theme_alt=Alt
global_theme_standard=Padrão
global_generic={0}
-my_projects=Meus Projetos
+my_projects=Meus Programas pendentes
#welcome page
welcome_titlepane=Bem-vindo ao {0}
diff --git a/src/main/webapp/WEB-INF/views/ministerios/create.jspx b/src/main/webapp/WEB-INF/views/ministerios/create.jspx
deleted file mode 100644
index 7ef9b0ef658677ce64264d53c19ac2d2f92f2571..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/ministerios/create.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" 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:spring="http://www.springframework.org/tags" version="2.0">
- <jsp:directive.page contentType="text/html;charset=UTF-8"/>
- <jsp:output omit-xml-declaration="yes"/>
- <form:create id="fc_br_ufpr_c3sl_participatorio_Ministerio" modelAttribute="ministerio" path="/ministerios" render="${empty dependencies}" z="zFAfmO+ojFRFW8rhlxTLRFVLj6s=">
- <field:input field="nome" id="c_br_ufpr_c3sl_participatorio_Ministerio_nome" z="yG0O6P0xDGYX41VMy1AV+XEGemo="/>
- </form:create>
- <form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_participatorio_Ministerio" render="${not empty dependencies}" z="B69MecuQMoIzCowcRx8qS4z7Yd4="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ministerios/list.jspx b/src/main/webapp/WEB-INF/views/ministerios/list.jspx
deleted file mode 100644
index fca28ee14b9207dfe15d30abf6a6328056caf39c..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/ministerios/list.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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_participatorio_Ministerio" items="${ministerios}" z="OZNBGYIzHd1qC9OQ+i13VQ8s3/M=">
- <table:table data="${ministerios}" id="l_br_ufpr_c3sl_participatorio_Ministerio" path="/ministerios" z="P1bAiKQ+BGFvNP1KqqMoRxIHoIY=">
- <table:column id="c_br_ufpr_c3sl_participatorio_Ministerio_nome" property="nome" z="xiFf6v1g/16N6c5s6GGRN8140NI="/>
- </table:table>
- </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ministerios/show.jspx b/src/main/webapp/WEB-INF/views/ministerios/show.jspx
deleted file mode 100644
index 49fec2be483dda1cecc8cd872935922461934c4c..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/ministerios/show.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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">
- <jsp:directive.page contentType="text/html;charset=UTF-8"/>
- <jsp:output omit-xml-declaration="yes"/>
- <page:show id="ps_br_ufpr_c3sl_participatorio_Ministerio" object="${ministerio}" path="/ministerios" z="/7b1hWstg5lLMuf7PmBH1LAFVxk=">
- <field:display field="nome" id="s_br_ufpr_c3sl_participatorio_Ministerio_nome" object="${ministerio}" z="QI1Poo7nRY0v4kuC7+Wsd/GG+Vw="/>
- </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ministerios/update.jspx b/src/main/webapp/WEB-INF/views/ministerios/update.jspx
deleted file mode 100644
index 0982cce44bcf84edf38f3a5e2b60c13fdaafd6d0..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/ministerios/update.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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">
- <jsp:directive.page contentType="text/html;charset=UTF-8"/>
- <jsp:output omit-xml-declaration="yes"/>
- <form:update id="fu_br_ufpr_c3sl_participatorio_Ministerio" modelAttribute="ministerio" path="/ministerios" versionField="Version" z="BuiK3CNmnibJH2SIOLeWBF1y0HY=">
- <field:input field="nome" id="c_br_ufpr_c3sl_participatorio_Ministerio_nome" z="yG0O6P0xDGYX41VMy1AV+XEGemo="/>
- </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ministerios/views.xml b/src/main/webapp/WEB-INF/views/ministerios/views.xml
deleted file mode 100644
index 1c4f3f463e9a9568c32a7761ebaf7b7536998232..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/ministerios/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
- <definition extends="default" name="ministerios/list">
- <put-attribute name="body" value="/WEB-INF/views/ministerios/list.jspx"/>
- </definition>
-<definition extends="default" name="ministerios/show">
- <put-attribute name="body" value="/WEB-INF/views/ministerios/show.jspx"/>
- </definition>
-<definition extends="default" name="ministerios/create">
- <put-attribute name="body" value="/WEB-INF/views/ministerios/create.jspx"/>
- </definition>
-<definition extends="default" name="ministerios/update">
- <put-attribute name="body" value="/WEB-INF/views/ministerios/update.jspx"/>
- </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/programas/create.jspx b/src/main/webapp/WEB-INF/views/programas/create.jspx
index 8cad6c445c20f4bbadc769e38b5c2dc030b5270f..3ae7b79a21cda6daf62cee6cdbf4a5f0beb73702 100644
--- a/src/main/webapp/WEB-INF/views/programas/create.jspx
+++ b/src/main/webapp/WEB-INF/views/programas/create.jspx
@@ -21,7 +21,7 @@
<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="orcamento" id="c_br_ufpr_c3sl_estacaojuventude_Programa_orcamento" z="+rBq28OHf2MKMvDQhHwVMySK/Hs="/>
+ <field:input field="parceiros" id="c_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" z="Jbi+j14QiuxyUynDmEoZrpR6n1Q="/>
<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"/>
</form:create>
diff --git a/src/main/webapp/WEB-INF/views/programas/myshow.jspx b/src/main/webapp/WEB-INF/views/programas/myshow.jspx
index 8cc53ee7af2b5c285b7b3f76711a3cf86dbb6d35..a46fc6065cd663d7bbcd4a21ac7c68dc0637b5f1 100644
--- a/src/main/webapp/WEB-INF/views/programas/myshow.jspx
+++ b/src/main/webapp/WEB-INF/views/programas/myshow.jspx
@@ -22,7 +22,7 @@
<field:display field="duracao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_duracao" object="${programa}" z="ocRn1EzQg9cdfdzq3ql8wylJ01w="/>
<field:display field="tematicas" id="s_br_ufpr_c3sl_estacaojuventude_Programa_tematicas" object="${programa}" z="MGW1ri2bdcseKFkrWylIlUuaaZ8="/>
<field:display field="orgaosExecutores" id="s_br_ufpr_c3sl_estacaojuventude_Programa_orgaosExecutores" object="${programa}" z="1gT8Ej5o6DpoZCoNVwb5k04qiEk="/>
- <field:display field="orcamento" id="s_br_ufpr_c3sl_estacaojuventude_Programa_orcamento" object="${programa}" z="YBAj45sQLZRo4Cnqd1222tJuEjc="/>
+ <field:display field="parceiros" id="s_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" object="${programa}" z="coSlUd/2gZZHVefaIRLXg0IR7SE="/>
<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="/>
</page:show>
diff --git a/src/main/webapp/WEB-INF/views/programas/show.jspx b/src/main/webapp/WEB-INF/views/programas/show.jspx
index 40788996c31404b94f3c5400b12ef5feeb90e4ba..868e62e37eb7dc8acf478dbffcfb6311a962daa0 100644
--- a/src/main/webapp/WEB-INF/views/programas/show.jspx
+++ b/src/main/webapp/WEB-INF/views/programas/show.jspx
@@ -1,56 +1,55 @@
<?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_Programa" object="${programa}" path="/programas" list="false" z="hK6UrZ7xi1XMlCpUNc/zO7ZZQB8=">
- <field:display field="nomeOficial" id="s_br_ufpr_c3sl_estacaojuventude_Programa_nomeOficial" object="${programa}" z="drsfDSkq5a28aM1cybU3838BZ8Y="/>
- <field:display field="nomeDivulgacao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_nomeDivulgacao" object="${programa}" z="M/KiLsyWt6MLHfo7ZSXH2qnA+zo="/>
- <field:display field="sigla" id="s_br_ufpr_c3sl_estacaojuventude_Programa_sigla" object="${programa}" z="CLcb5i6enXOA9Vbar4HMc2bUkdM="/>
- <field:display field="nivel" id="s_br_ufpr_c3sl_estacaojuventude_Programa_nivel" object="${programa}" z="6MaOY9f8s1OY+lsao9thBcdjubY="/>
- <field:display field="programaVinculado" id="s_br_ufpr_c3sl_estacaojuventude_Programa_programaVinculado" object="${programa}" z="HMeOdjgoodrO5DdJ6v4SicxoD4Y="/>
- <field:display field="leiCriacao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_leiCriacao" object="${programa}" z="hqxf412EtIACih6us6zecRqio4s="/>
- <field:display field="descricao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_descricao" object="${programa}" z="8/2OMkwlTH2FHyYX2YvPVoESFhI="/>
- <field:display field="objetivos" id="s_br_ufpr_c3sl_estacaojuventude_Programa_objetivos" object="${programa}" z="gajVPMyvmrQOGe6SzZ3tlo7Dun0="/>
- <field:display field="beneficios" id="s_br_ufpr_c3sl_estacaojuventude_Programa_beneficios" object="${programa}" z="V7BIu6K/1Q0YSdRXc9xF+XlTeV0="/>
- <field:display date="true" dateTimePattern="${programa_datainicio_date_format}" field="dataInicio" id="s_br_ufpr_c3sl_estacaojuventude_Programa_dataInicio" object="${programa}" z="lDyJ2qMrB0dhzJtbCqYYSvb8gLU="/>
- <field:display field="temporalidade" id="s_br_ufpr_c3sl_estacaojuventude_Programa_temporalidade" object="${programa}" z="1D+58eH2dO3vws33B/Ji9AZ6e7g="/>
- <field:display field="publicoAlvo" id="s_br_ufpr_c3sl_estacaojuventude_Programa_publicoAlvo" object="${programa}" z="TyE4s+cC0woIO3v7eNmTFr6Xp7s="/>
- <field:display field="idadeMinima" id="s_br_ufpr_c3sl_estacaojuventude_Programa_idadeMinima" object="${programa}" z="X9g8you72jXBmtCT8WsshwAewqY="/>
- <field:display field="idadeMaxima" id="s_br_ufpr_c3sl_estacaojuventude_Programa_idadeMaxima" object="${programa}" z="9faaDavwxJBpwCXNakUh6jtzGX0="/>
- <field:display field="criteriosAcesso" id="s_br_ufpr_c3sl_estacaojuventude_Programa_criteriosAcesso" object="${programa}" z="tDioxKIxZwlNKuKQVs4G12JvMSc="/>
- <field:display field="duracao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_duracao" object="${programa}" z="ocRn1EzQg9cdfdzq3ql8wylJ01w="/>
- <field:display field="tematicas" id="s_br_ufpr_c3sl_estacaojuventude_Programa_tematicas" object="${programa}" z="MGW1ri2bdcseKFkrWylIlUuaaZ8="/>
- <field:display field="orgaosExecutores" id="s_br_ufpr_c3sl_estacaojuventude_Programa_orgaosExecutores" object="${programa}" z="1gT8Ej5o6DpoZCoNVwb5k04qiEk="/>
- <field:display field="orcamento" id="s_br_ufpr_c3sl_estacaojuventude_Programa_orcamento" object="${programa}" z="YBAj45sQLZRo4Cnqd1222tJuEjc="/>
- <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="/>
- </page:show>
+ <page:show id="ps_br_ufpr_c3sl_estacaojuventude_Programa" list="false" object="${programa}" path="/programas" z="user-managed">
+ <field:display field="nomeOficial" id="s_br_ufpr_c3sl_estacaojuventude_Programa_nomeOficial" object="${programa}" z="drsfDSkq5a28aM1cybU3838BZ8Y="/>
+ <field:display field="nomeDivulgacao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_nomeDivulgacao" object="${programa}" z="M/KiLsyWt6MLHfo7ZSXH2qnA+zo="/>
+ <field:display field="sigla" id="s_br_ufpr_c3sl_estacaojuventude_Programa_sigla" object="${programa}" z="CLcb5i6enXOA9Vbar4HMc2bUkdM="/>
+ <field:display field="nivel" id="s_br_ufpr_c3sl_estacaojuventude_Programa_nivel" object="${programa}" z="6MaOY9f8s1OY+lsao9thBcdjubY="/>
+ <field:display field="programaVinculado" id="s_br_ufpr_c3sl_estacaojuventude_Programa_programaVinculado" object="${programa}" z="HMeOdjgoodrO5DdJ6v4SicxoD4Y="/>
+ <field:display field="leiCriacao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_leiCriacao" object="${programa}" z="hqxf412EtIACih6us6zecRqio4s="/>
+ <field:display field="descricao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_descricao" object="${programa}" z="8/2OMkwlTH2FHyYX2YvPVoESFhI="/>
+ <field:display field="objetivos" id="s_br_ufpr_c3sl_estacaojuventude_Programa_objetivos" object="${programa}" z="gajVPMyvmrQOGe6SzZ3tlo7Dun0="/>
+ <field:display field="beneficios" id="s_br_ufpr_c3sl_estacaojuventude_Programa_beneficios" object="${programa}" z="V7BIu6K/1Q0YSdRXc9xF+XlTeV0="/>
+ <field:display date="true" dateTimePattern="${programa_datainicio_date_format}" field="dataInicio" id="s_br_ufpr_c3sl_estacaojuventude_Programa_dataInicio" object="${programa}" z="lDyJ2qMrB0dhzJtbCqYYSvb8gLU="/>
+ <field:display field="temporalidade" id="s_br_ufpr_c3sl_estacaojuventude_Programa_temporalidade" object="${programa}" z="1D+58eH2dO3vws33B/Ji9AZ6e7g="/>
+ <field:display field="publicoAlvo" id="s_br_ufpr_c3sl_estacaojuventude_Programa_publicoAlvo" object="${programa}" z="TyE4s+cC0woIO3v7eNmTFr6Xp7s="/>
+ <field:display field="idadeMinima" id="s_br_ufpr_c3sl_estacaojuventude_Programa_idadeMinima" object="${programa}" z="X9g8you72jXBmtCT8WsshwAewqY="/>
+ <field:display field="idadeMaxima" id="s_br_ufpr_c3sl_estacaojuventude_Programa_idadeMaxima" object="${programa}" z="9faaDavwxJBpwCXNakUh6jtzGX0="/>
+ <field:display field="criteriosAcesso" id="s_br_ufpr_c3sl_estacaojuventude_Programa_criteriosAcesso" object="${programa}" z="tDioxKIxZwlNKuKQVs4G12JvMSc="/>
+ <field:display field="duracao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_duracao" object="${programa}" z="ocRn1EzQg9cdfdzq3ql8wylJ01w="/>
+ <field:display field="tematicas" id="s_br_ufpr_c3sl_estacaojuventude_Programa_tematicas" object="${programa}" z="MGW1ri2bdcseKFkrWylIlUuaaZ8="/>
+ <field:display field="orgaosExecutores" id="s_br_ufpr_c3sl_estacaojuventude_Programa_orgaosExecutores" object="${programa}" z="1gT8Ej5o6DpoZCoNVwb5k04qiEk="/>
+ <field:display field="parceiros" id="s_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" object="${programa}" z="coSlUd/2gZZHVefaIRLXg0IR7SE="/>
+ <field:display field="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="/>
+ </page:show>
</sec:authorize>
-
<sec:authorize ifAnyGranted="Usuario">
- <page:show id="ps_br_ufpr_c3sl_estacaojuventude_Programa" object="${programa}" path="/programas" delete="false" update="false" list="false" z="D0oL5mYFetkn/bZXW31CJL2EDUE=">
- <field:display field="nomeOficial" id="s_br_ufpr_c3sl_estacaojuventude_Programa_nomeOficial" object="${programa}" z="drsfDSkq5a28aM1cybU3838BZ8Y="/>
- <field:display field="nomeDivulgacao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_nomeDivulgacao" object="${programa}" z="M/KiLsyWt6MLHfo7ZSXH2qnA+zo="/>
- <field:display field="sigla" id="s_br_ufpr_c3sl_estacaojuventude_Programa_sigla" object="${programa}" z="CLcb5i6enXOA9Vbar4HMc2bUkdM="/>
- <field:display field="nivel" id="s_br_ufpr_c3sl_estacaojuventude_Programa_nivel" object="${programa}" z="6MaOY9f8s1OY+lsao9thBcdjubY="/>
- <field:display field="programaVinculado" id="s_br_ufpr_c3sl_estacaojuventude_Programa_programaVinculado" object="${programa}" z="HMeOdjgoodrO5DdJ6v4SicxoD4Y="/>
- <field:display field="leiCriacao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_leiCriacao" object="${programa}" z="hqxf412EtIACih6us6zecRqio4s="/>
- <field:display field="descricao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_descricao" object="${programa}" z="8/2OMkwlTH2FHyYX2YvPVoESFhI="/>
- <field:display field="objetivos" id="s_br_ufpr_c3sl_estacaojuventude_Programa_objetivos" object="${programa}" z="gajVPMyvmrQOGe6SzZ3tlo7Dun0="/>
- <field:display field="beneficios" id="s_br_ufpr_c3sl_estacaojuventude_Programa_beneficios" object="${programa}" z="V7BIu6K/1Q0YSdRXc9xF+XlTeV0="/>
- <field:display date="true" dateTimePattern="${programa_datainicio_date_format}" field="dataInicio" id="s_br_ufpr_c3sl_estacaojuventude_Programa_dataInicio" object="${programa}" z="lDyJ2qMrB0dhzJtbCqYYSvb8gLU="/>
- <field:display field="temporalidade" id="s_br_ufpr_c3sl_estacaojuventude_Programa_temporalidade" object="${programa}" z="1D+58eH2dO3vws33B/Ji9AZ6e7g="/>
- <field:display field="publicoAlvo" id="s_br_ufpr_c3sl_estacaojuventude_Programa_publicoAlvo" object="${programa}" z="TyE4s+cC0woIO3v7eNmTFr6Xp7s="/>
- <field:display field="idadeMinima" id="s_br_ufpr_c3sl_estacaojuventude_Programa_idadeMinima" object="${programa}" z="X9g8you72jXBmtCT8WsshwAewqY="/>
- <field:display field="idadeMaxima" id="s_br_ufpr_c3sl_estacaojuventude_Programa_idadeMaxima" object="${programa}" z="9faaDavwxJBpwCXNakUh6jtzGX0="/>
- <field:display field="criteriosAcesso" id="s_br_ufpr_c3sl_estacaojuventude_Programa_criteriosAcesso" object="${programa}" z="tDioxKIxZwlNKuKQVs4G12JvMSc="/>
- <field:display field="duracao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_duracao" object="${programa}" z="ocRn1EzQg9cdfdzq3ql8wylJ01w="/>
- <field:display field="tematicas" id="s_br_ufpr_c3sl_estacaojuventude_Programa_tematicas" object="${programa}" z="MGW1ri2bdcseKFkrWylIlUuaaZ8="/>
- <field:display field="orgaosExecutores" id="s_br_ufpr_c3sl_estacaojuventude_Programa_orgaosExecutores" object="${programa}" z="1gT8Ej5o6DpoZCoNVwb5k04qiEk="/>
- <field:display field="orcamento" id="s_br_ufpr_c3sl_estacaojuventude_Programa_orcamento" object="${programa}" z="YBAj45sQLZRo4Cnqd1222tJuEjc="/>
- <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="/>
- </page:show>
+ <page:show delete="false" id="ps_br_ufpr_c3sl_estacaojuventude_Programa" list="false" object="${programa}" path="/programas" update="false" z="user-managed">
+ <field:display field="nomeOficial" id="s_br_ufpr_c3sl_estacaojuventude_Programa_nomeOficial" object="${programa}" z="drsfDSkq5a28aM1cybU3838BZ8Y="/>
+ <field:display field="nomeDivulgacao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_nomeDivulgacao" object="${programa}" z="M/KiLsyWt6MLHfo7ZSXH2qnA+zo="/>
+ <field:display field="sigla" id="s_br_ufpr_c3sl_estacaojuventude_Programa_sigla" object="${programa}" z="CLcb5i6enXOA9Vbar4HMc2bUkdM="/>
+ <field:display field="nivel" id="s_br_ufpr_c3sl_estacaojuventude_Programa_nivel" object="${programa}" z="6MaOY9f8s1OY+lsao9thBcdjubY="/>
+ <field:display field="programaVinculado" id="s_br_ufpr_c3sl_estacaojuventude_Programa_programaVinculado" object="${programa}" z="HMeOdjgoodrO5DdJ6v4SicxoD4Y="/>
+ <field:display field="leiCriacao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_leiCriacao" object="${programa}" z="hqxf412EtIACih6us6zecRqio4s="/>
+ <field:display field="descricao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_descricao" object="${programa}" z="8/2OMkwlTH2FHyYX2YvPVoESFhI="/>
+ <field:display field="objetivos" id="s_br_ufpr_c3sl_estacaojuventude_Programa_objetivos" object="${programa}" z="gajVPMyvmrQOGe6SzZ3tlo7Dun0="/>
+ <field:display field="beneficios" id="s_br_ufpr_c3sl_estacaojuventude_Programa_beneficios" object="${programa}" z="V7BIu6K/1Q0YSdRXc9xF+XlTeV0="/>
+ <field:display date="true" dateTimePattern="${programa_datainicio_date_format}" field="dataInicio" id="s_br_ufpr_c3sl_estacaojuventude_Programa_dataInicio" object="${programa}" z="lDyJ2qMrB0dhzJtbCqYYSvb8gLU="/>
+ <field:display field="temporalidade" id="s_br_ufpr_c3sl_estacaojuventude_Programa_temporalidade" object="${programa}" z="1D+58eH2dO3vws33B/Ji9AZ6e7g="/>
+ <field:display field="publicoAlvo" id="s_br_ufpr_c3sl_estacaojuventude_Programa_publicoAlvo" object="${programa}" z="TyE4s+cC0woIO3v7eNmTFr6Xp7s="/>
+ <field:display field="idadeMinima" id="s_br_ufpr_c3sl_estacaojuventude_Programa_idadeMinima" object="${programa}" z="X9g8you72jXBmtCT8WsshwAewqY="/>
+ <field:display field="idadeMaxima" id="s_br_ufpr_c3sl_estacaojuventude_Programa_idadeMaxima" object="${programa}" z="9faaDavwxJBpwCXNakUh6jtzGX0="/>
+ <field:display field="criteriosAcesso" id="s_br_ufpr_c3sl_estacaojuventude_Programa_criteriosAcesso" object="${programa}" z="tDioxKIxZwlNKuKQVs4G12JvMSc="/>
+ <field:display field="duracao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_duracao" object="${programa}" z="ocRn1EzQg9cdfdzq3ql8wylJ01w="/>
+ <field:display field="tematicas" id="s_br_ufpr_c3sl_estacaojuventude_Programa_tematicas" object="${programa}" z="MGW1ri2bdcseKFkrWylIlUuaaZ8="/>
+ <field:display field="orgaosExecutores" id="s_br_ufpr_c3sl_estacaojuventude_Programa_orgaosExecutores" object="${programa}" z="1gT8Ej5o6DpoZCoNVwb5k04qiEk="/>
+ <field:display field="parceiros" id="s_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" object="${programa}" z="coSlUd/2gZZHVefaIRLXg0IR7SE="/>
+ <field:display field="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="/>
+ </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 056946341e5c4825ea1cc91f3cce9831e5c0c9ee..696220993e7b6412d198bd51eb4a72fab4ce94cd 100644
--- a/src/main/webapp/WEB-INF/views/programas/showcandidatos.jspx
+++ b/src/main/webapp/WEB-INF/views/programas/showcandidatos.jspx
@@ -28,7 +28,7 @@
<field:display field="duracao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_duracao" object="${programa}" z="ocRn1EzQg9cdfdzq3ql8wylJ01w="/>
<field:display field="tematicas" id="s_br_ufpr_c3sl_estacaojuventude_Programa_tematicas" object="${programa}" z="MGW1ri2bdcseKFkrWylIlUuaaZ8="/>
<field:display field="orgaosExecutores" id="s_br_ufpr_c3sl_estacaojuventude_Programa_orgaosExecutores" object="${programa}" z="1gT8Ej5o6DpoZCoNVwb5k04qiEk="/>
- <field:display field="orcamento" id="s_br_ufpr_c3sl_estacaojuventude_Programa_orcamento" object="${programa}" z="YBAj45sQLZRo4Cnqd1222tJuEjc="/>
+ <field:display field="parceiros" id="s_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" object="${programa}" z="coSlUd/2gZZHVefaIRLXg0IR7SE="/>
<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="/>
</page:show>
@@ -54,7 +54,7 @@
<field:display field="duracao" id="s_br_ufpr_c3sl_estacaojuventude_Programa_duracao" object="${programa}" z="ocRn1EzQg9cdfdzq3ql8wylJ01w="/>
<field:display field="tematicas" id="s_br_ufpr_c3sl_estacaojuventude_Programa_tematicas" object="${programa}" z="MGW1ri2bdcseKFkrWylIlUuaaZ8="/>
<field:display field="orgaosExecutores" id="s_br_ufpr_c3sl_estacaojuventude_Programa_orgaosExecutores" object="${programa}" z="1gT8Ej5o6DpoZCoNVwb5k04qiEk="/>
- <field:display field="orcamento" id="s_br_ufpr_c3sl_estacaojuventude_Programa_orcamento" object="${programa}" z="YBAj45sQLZRo4Cnqd1222tJuEjc="/>
+ <field:display field="parceiros" id="s_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" object="${programa}" z="coSlUd/2gZZHVefaIRLXg0IR7SE="/>
<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="/>
</page:show>
diff --git a/src/main/webapp/WEB-INF/views/programas/update.jspx b/src/main/webapp/WEB-INF/views/programas/update.jspx
index bf2b4f97a1ae5812a11378de32b0eb3589bcc1dc..a06f5bba1f5d0158371eedee9d8d82f05db3c41f 100644
--- a/src/main/webapp/WEB-INF/views/programas/update.jspx
+++ b/src/main/webapp/WEB-INF/views/programas/update.jspx
@@ -21,7 +21,7 @@
<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="orcamento" id="c_br_ufpr_c3sl_estacaojuventude_Programa_orcamento" z="+rBq28OHf2MKMvDQhHwVMySK/Hs="/>
+ <field:input field="parceiros" id="c_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" z="Jbi+j14QiuxyUynDmEoZrpR6n1Q="/>
<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>
diff --git a/src/main/webapp/WEB-INF/views/projetos/create.jspx b/src/main/webapp/WEB-INF/views/projetos/create.jspx
deleted file mode 100644
index 7ed178fca6f9635a17a502527ee5c9654c9d00ca..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/projetos/create.jspx
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" 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" xmlns:spring="http://www.springframework.org/tags" version="2.0">
- <jsp:directive.page contentType="text/html;charset=UTF-8"/>
- <jsp:output omit-xml-declaration="yes"/>
- <form:create id="fc_br_ufpr_c3sl_participatorio_Projeto" modelAttribute="projeto" path="/projetos" render="${empty dependencies}" z="LcDNxOLIimV3mQ7YNyGnsVXmDqQ=">
- <field:select field="pai" id="c_br_ufpr_c3sl_participatorio_Projeto_pai" itemValue="id" items="${projetos}" path="/projetos" z="user-managed"/>
- <field:input field="nome" id="c_br_ufpr_c3sl_participatorio_Projeto_nome" z="5egNGMKHSYOQCuslpB7cYfsCJns="/>
- <field:select field="demanda" id="c_br_ufpr_c3sl_participatorio_Projeto_demanda" items="${tipodemandas}" multiple="true" path="tipodemandas" z="user-managed"/>
- <field:select field="acao" id="c_br_ufpr_c3sl_participatorio_Projeto_acao" items="${tipoacaos}" path="tipoacaos" z="TknEprFT06hffWHIizWjHzzhBB8="/>
- <!-- <field:input field="outroAcao" id="c_br_ufpr_c3sl_participatorio_Projeto_outroAcao" z="gKzGjxAdyPnPD7zoeTc+ZPLtejY="/> -->
- <field:textarea field="outroAcao" id="c_br_ufpr_c3sl_participatorio_Projeto_outroAcao" z="user-managed"/>
- <field:select field="ministerio" id="c_br_ufpr_c3sl_participatorio_Projeto_ministerio" itemValue="id" items="${ministerios}" path="/ministerios" z="64Y1pviPhH0YUpX4/TLAcEiNf8A="/>
- <field:input field="objetivo" id="c_br_ufpr_c3sl_participatorio_Projeto_objetivo" z="7NQc7nBdNKGMsVO2gcJ58+nFc0E="/>
- <field:input field="rua" id="c_br_ufpr_c3sl_participatorio_Projeto_rua" z="NZ6M3HEDzpkKDIvxyk8iZYFchQA="/>
- <field:input field="numero" id="c_br_ufpr_c3sl_participatorio_Projeto_numero" z="xaLTEtm6Pc1D6VgioTdMcQXkq8s="/>
- <field:input field="complemento" id="c_br_ufpr_c3sl_participatorio_Projeto_complemento" z="N2Lya9vot39QnzhJ8pqU5d+vzB0="/>
- <field:input field="bairro" id="c_br_ufpr_c3sl_participatorio_Projeto_bairro" z="4IENKq7T4UaF0f/0uwCBcT3xtlI="/>
- <field:input field="municipio" id="c_br_ufpr_c3sl_participatorio_Projeto_municipio" z="IRx9hrCWxHAzvD0dA+1xxmH/V90="/>
- <field:input field="cep" id="c_br_ufpr_c3sl_participatorio_Projeto_cep" z="gVIPRkUIL6GZ45ZU0ehzfXTt4CU="/>
- <field:select field="uf" id="c_br_ufpr_c3sl_participatorio_Projeto_uf" itemValue="id" items="${estados}" path="/estados" z="user-managed"/>
- <field:input field="responsavel" id="c_br_ufpr_c3sl_participatorio_Projeto_responsavel" z="qHPooL9WJIOr9aiVpu272tRcYlg="/>
- <field:input field="telefones" id="c_br_ufpr_c3sl_participatorio_Projeto_telefones" z="XN9R1Y3TkGJDhJjNR7Ac+uUA10g="/>
- <field:input field="email" id="c_br_ufpr_c3sl_participatorio_Projeto_email" validationMessageCode="field_invalid_email" z="wec+yBsxP/CfoGtMjMYu8XOiz8E="/>
- <field:input field="publicoAlvo" id="c_br_ufpr_c3sl_participatorio_Projeto_publicoAlvo" z="rfW62fR8G11PyQwsAU15sdK6804="/>
- <field:input field="formaAcesso" id="c_br_ufpr_c3sl_participatorio_Projeto_formaAcesso" z="HY3pNe95ZaxAxVS55E5bDnn84FE="/>
- <field:input field="site" id="c_br_ufpr_c3sl_participatorio_Projeto_site" z="UtAhbsHkmV/py/BCglNJT4jnKNk="/>
- <!-- <field:input field="comoFunciona" id="c_br_ufpr_c3sl_participatorio_Projeto_comoFunciona" z="WQT9VOPh8Yng7sdWkKBfWrWJvzY="/> -->
- <field:textarea field="comoFunciona" id="c_br_ufpr_c3sl_participatorio_Projeto_comoFunciona" z="user-managed"/>
- <field:input field="noticias" id="c_br_ufpr_c3sl_participatorio_Projeto_noticias" z="QvhayaNYZLWbn4Kdz/1ukvJWaQw="/>
- <field:input field="horarioFuncionamento" id="c_br_ufpr_c3sl_participatorio_Projeto_horarioFuncionamento" z="/wgLwa6KbhG4wv0vWFn869KF4hg="/>
- <field:select field="diasFuncionamento" id="c_br_ufpr_c3sl_participatorio_Projeto_diasFuncionamento" items="${tipodiassemanas}" multiple="true" path="tipodiassemanas" z="user-managed"/>
- <field:input field="estrutura" id="c_br_ufpr_c3sl_participatorio_Projeto_estrutura" z="BMTcTzuUYCoKhXapXah2VN/qPuE="/>
- <field:input field="responsaveis" id="c_br_ufpr_c3sl_participatorio_Projeto_responsaveis" z="gmi09GGEpF9pDXN7/aviynR3tBs="/>
- <field:input field="telefoneMinisterio" id="c_br_ufpr_c3sl_participatorio_Projeto_telefoneMinisterio" z="UGH0aw3XZuQmgwr0sIS1O9KhHbQ="/>
- <field:input field="orcamento" id="c_br_ufpr_c3sl_participatorio_Projeto_orcamento" z="sJO2DC6kqSRPUz5DC5eA/bddxvc="/>
- <!-- <field:input field="justificativa" id="c_br_ufpr_c3sl_participatorio_Projeto_justificativa" z="bxuZxUlVF/K6r0D/vZ2gLJOYqus="/> -->
- <field:textarea field="justificativa" id="c_br_ufpr_c3sl_participatorio_Projeto_justificativa" z="user-managed"/>
- <!-- <field:input field="meta" id="c_br_ufpr_c3sl_participatorio_Projeto_meta" z="X67itR3Kt3CcPmnMLE3pk8gJnTQ="/> -->
- <field:textarea field="meta" id="c_br_ufpr_c3sl_participatorio_Projeto_meta" z="user-managed"/>
- <field:select field="temporalidade" id="c_br_ufpr_c3sl_participatorio_Projeto_temporalidade" items="${tipotemporalidades}" path="tipotemporalidades" z="DxeDx4ck5sWIKaomza63nyKiAeQ="/>
- <field:checkbox field="possuiMonitoramento" id="c_br_ufpr_c3sl_participatorio_Projeto_possuiMonitoramento" z="/JVVLQICEG8G6erZgd6P7rhoNqM="/>
- <field:input field="estadosMunicipioComPrograma" id="c_br_ufpr_c3sl_participatorio_Projeto_estadosMunicipioComPrograma" z="XOH+gInejGvAnV1UOGHZHSlh0kw="/>
- <field:input field="publicoPrioritario" id="c_br_ufpr_c3sl_participatorio_Projeto_publicoPrioritario" z="5WWljIGBWlxjw/qy3mLY2bEcewc="/>
- <field:datetime dateTimePattern="${projeto_datainicio_date_format}" field="dataInicio" id="c_br_ufpr_c3sl_participatorio_Projeto_dataInicio" z="B4b6arF1P2Q4KSgME04mPIWp7Zs="/>
- <field:input field="mecanismos" id="c_br_ufpr_c3sl_participatorio_Projeto_mecanismos" z="YCRKTWq1a3Fd0ZHbAwcxKS+vACY="/>
- <field:input field="parcerias" id="c_br_ufpr_c3sl_participatorio_Projeto_parcerias" z="x374RYBQGz62YCy6JRm7HDk6kFs="/>
- <field:checkbox field="legislacaoPropria" id="c_br_ufpr_c3sl_participatorio_Projeto_legislacaoPropria" z="0FyUiOC8dXYS2KQh9us8ZFSrfU0="/>
- <field:input field="descLegislacao" id="c_br_ufpr_c3sl_participatorio_Projeto_descLegislacao" z="Y9X3/A7OHfh+T5M4c7uRjtx2Uak="/>
- <field:input field="obs" id="c_br_ufpr_c3sl_participatorio_Projeto_obs" z="5b+Wjz0npE5n2wk2R6g1fJZD0VA="/>
- <field:select field="estado" id="c_br_ufpr_c3sl_participatorio_Projeto_estado" items="${tipostatuses}" path="tipostatuses" render="false" z="user-managed"/>
- <field:select field="usuario" id="c_br_ufpr_c3sl_participatorio_Projeto_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="user-managed"/>
- </form:create>
- <form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_participatorio_Projeto" render="${not empty dependencies}" z="nyMkb0MYQtlthVlj4JcyqCQYyRg="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/projetos/list.jspx b/src/main/webapp/WEB-INF/views/projetos/list.jspx
deleted file mode 100644
index 40300d2f46c49f3336af7351b3dcfd059696872e..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/projetos/list.jspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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: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"/>
- <sec:authorize ifAnyGranted="Administrador">
- <page:list id="pl_br_ufpr_c3sl_participatorio_Projeto" items="${projetos}" z="user-managed">
- <table:table data="${projetos}" id="l_br_ufpr_c3sl_participatorio_Projeto" path="/projetos" z="user-managed">
- <!-- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_pai" property="pai" z="JnX374OPNV+3oLlfOcMYu3wG024="/> -->
- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_nome" property="nome" z="djZOsc2/qBPTa0C3ffNAlDEgP0U="/>
- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_acao" property="acao" z="2hGM9LKsHjh5/zpeavaa+slBUkA="/>
- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_demanda" property="demanda" z="K99mnRN9vX7sE9XtHufPcJBkBdg="/>
- <!-- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_outroAcao" property="outroAcao" z="KDK14ptwJLWXh4xCooeqI+wBnJk="/> -->
- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_ministerio" property="ministerio" z="qYUkNm475DOx0s81JEz3ff7BQho="/>
- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_pai" property="pai" z="JnX374OPNV+3oLlfOcMYu3wG024="/>
- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_outroAcao" property="outroAcao" z="KDK14ptwJLWXh4xCooeqI+wBnJk="/>
- </table:table>
- </page:list>
- </sec:authorize>
- <sec:authorize ifAnyGranted="Usuario">
- <page:list id="pl_br_ufpr_c3sl_participatorio_Projeto" items="${projetos}" z="xI7fvnW1b0tKUMMJrSKIiv3ycH0=">
- <table:table data="${projetos}" delete="false" id="l_br_ufpr_c3sl_participatorio_Projeto" path="/projetos" update="false" z="kamtALNOBI9qFO/YY+1GYa1OhVw=">
- <!-- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_pai" property="pai" z="JnX374OPNV+3oLlfOcMYu3wG024="/> -->
- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_nome" property="nome" z="djZOsc2/qBPTa0C3ffNAlDEgP0U="/>
- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_acao" property="acao" z="2hGM9LKsHjh5/zpeavaa+slBUkA="/>
- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_demanda" property="demanda" z="K99mnRN9vX7sE9XtHufPcJBkBdg="/>
- <!-- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_outroAcao" property="outroAcao" z="KDK14ptwJLWXh4xCooeqI+wBnJk="/> -->
- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_ministerio" property="ministerio" z="qYUkNm475DOx0s81JEz3ff7BQho="/>
- </table:table>
- </page:list>
- </sec:authorize>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/projetos/mylist.jspx b/src/main/webapp/WEB-INF/views/projetos/mylist.jspx
deleted file mode 100644
index 5fc8424ebbf9dd33a5c9aab5d816f9b3503a0279..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/projetos/mylist.jspx
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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_participatorio_Projeto" items="${projetos}" z="xI7fvnW1b0tKUMMJrSKIiv3ycH0=">
- <table:table data="${projetos}" id="l_br_ufpr_c3sl_participatorio_Projeto" path="/projetos" z="kamtALNOBI9qFO/YY+1GYa1OhVw=">
-<!-- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_pai" property="pai" z="JnX374OPNV+3oLlfOcMYu3wG024="/> -->
- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_nome" property="nome" z="djZOsc2/qBPTa0C3ffNAlDEgP0U="/>
- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_acao" property="acao" z="2hGM9LKsHjh5/zpeavaa+slBUkA="/>
- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_demanda" property="demanda" z="K99mnRN9vX7sE9XtHufPcJBkBdg="/>
-<!-- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_outroAcao" property="outroAcao" z="KDK14ptwJLWXh4xCooeqI+wBnJk="/> -->
- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_ministerio" property="ministerio" z="qYUkNm475DOx0s81JEz3ff7BQho="/>
-
- </table:table>
- </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/projetos/show.jspx b/src/main/webapp/WEB-INF/views/projetos/show.jspx
deleted file mode 100644
index dce3d1b974e32c238370aacbeb4e12b36bddb8cd..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/projetos/show.jspx
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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">
- <jsp:directive.page contentType="text/html;charset=UTF-8"/>
- <jsp:output omit-xml-declaration="yes"/>
- <page:show id="ps_br_ufpr_c3sl_participatorio_Projeto" object="${projeto}" path="/projetos" z="iLu+x8PFTbvg+wrFSvmSi7xbK1M=">
- <field:display field="pai" id="s_br_ufpr_c3sl_participatorio_Projeto_pai" object="${projeto}" z="4n4Iw3sGl6fL8jHSE2fUat8qLN4="/>
- <field:display field="nome" id="s_br_ufpr_c3sl_participatorio_Projeto_nome" object="${projeto}" z="rsXBQmVxhOA6fpmBsaOOxZCOB5w="/>
- <field:display field="demanda" id="s_br_ufpr_c3sl_participatorio_Projeto_demanda" object="${projeto}" z="4hH5xcrgPv71j3pdYFSKwrXUrwY="/>
- <field:display field="acao" id="s_br_ufpr_c3sl_participatorio_Projeto_acao" object="${projeto}" z="8jgJ6LdiyoFYt6MyFWDV/UGMm2o="/>
- <field:display field="outroAcao" id="s_br_ufpr_c3sl_participatorio_Projeto_outroAcao" object="${projeto}" z="zVcl2n2r3xxTceF3vPcaYnWIYiY="/>
- <field:display field="ministerio" id="s_br_ufpr_c3sl_participatorio_Projeto_ministerio" object="${projeto}" z="Xf3IQ962bkf9Ezm92UBXGE2bWwc="/>
- <field:display field="objetivo" id="s_br_ufpr_c3sl_participatorio_Projeto_objetivo" object="${projeto}" z="OvVo10fuXWdSkQG0eG9B8g4HFRE="/>
- <field:display field="rua" id="s_br_ufpr_c3sl_participatorio_Projeto_rua" object="${projeto}" z="bblSx22OBZWuIl+gLXduDRjpIIo="/>
- <field:display field="numero" id="s_br_ufpr_c3sl_participatorio_Projeto_numero" object="${projeto}" z="M95uXy/hfhB5n7Y2KlB2nrIpTTo="/>
- <field:display field="complemento" id="s_br_ufpr_c3sl_participatorio_Projeto_complemento" object="${projeto}" z="u/OhcL1R2KO8bc3ZT6wk+WIlcJQ="/>
- <field:display field="bairro" id="s_br_ufpr_c3sl_participatorio_Projeto_bairro" object="${projeto}" z="3ZCePyHKnaz5YWxSPoF9ruIUGgM="/>
- <field:display field="municipio" id="s_br_ufpr_c3sl_participatorio_Projeto_municipio" object="${projeto}" z="DcdSDhxOxkqkd5V7r+QIjFPISPY="/>
- <field:display field="cep" id="s_br_ufpr_c3sl_participatorio_Projeto_cep" object="${projeto}" z="h2INizgFtGHENL1zTlGj8RzYASs="/>
- <field:display field="uf" id="s_br_ufpr_c3sl_participatorio_Projeto_uf" object="${projeto}" z="M5MExfxocGad8HBxU9Fb65FXsLU="/>
- <field:display field="responsavel" id="s_br_ufpr_c3sl_participatorio_Projeto_responsavel" object="${projeto}" z="69bymzXlQBFLm1MLDdyBWxNnT1Q="/>
- <field:display field="telefones" id="s_br_ufpr_c3sl_participatorio_Projeto_telefones" object="${projeto}" z="EHi6lsxuyNDv167TejS+qseIGbY="/>
- <field:display field="email" id="s_br_ufpr_c3sl_participatorio_Projeto_email" object="${projeto}" z="aGC3uOYrEG/v868j6HanVCKAG0I="/>
- <field:display field="publicoAlvo" id="s_br_ufpr_c3sl_participatorio_Projeto_publicoAlvo" object="${projeto}" z="f4D8z3yit2O9z1UgRnFWWHDyZ8I="/>
- <field:display field="formaAcesso" id="s_br_ufpr_c3sl_participatorio_Projeto_formaAcesso" object="${projeto}" z="ndyJFMwcaQLW7Uri/SNNoszuWmI="/>
- <field:display field="site" id="s_br_ufpr_c3sl_participatorio_Projeto_site" object="${projeto}" z="7w9AuurEp/01nbMH7hzlHbNWaqw="/>
- <field:display field="comoFunciona" id="s_br_ufpr_c3sl_participatorio_Projeto_comoFunciona" object="${projeto}" z="cS8QtgfO1QUSq5l/QWQ1U2bKQQo="/>
- <field:display field="noticias" id="s_br_ufpr_c3sl_participatorio_Projeto_noticias" object="${projeto}" z="nEHfcQlWOOOgyvriBFeCQAQxpNw="/>
- <field:display field="horarioFuncionamento" id="s_br_ufpr_c3sl_participatorio_Projeto_horarioFuncionamento" object="${projeto}" z="I41X3LZzuQydAhMwexe+wnM5SzQ="/>
- <field:display field="diasFuncionamento" id="s_br_ufpr_c3sl_participatorio_Projeto_diasFuncionamento" object="${projeto}" z="IPVS6qq+YWGueSJwyVFOIxU30uM="/>
- <field:display field="estrutura" id="s_br_ufpr_c3sl_participatorio_Projeto_estrutura" object="${projeto}" z="rkpe20h3HUIEJAX8Z/egSw2kqhU="/>
- <field:display field="responsaveis" id="s_br_ufpr_c3sl_participatorio_Projeto_responsaveis" object="${projeto}" z="Aala68TzEKIlGRJal9+v1icoBVc="/>
- <field:display field="telefoneMinisterio" id="s_br_ufpr_c3sl_participatorio_Projeto_telefoneMinisterio" object="${projeto}" z="kZ48wV4jcUxHdOkClF5ust9xrKY="/>
- <field:display field="orcamento" id="s_br_ufpr_c3sl_participatorio_Projeto_orcamento" object="${projeto}" z="T39I2SFBXuSFtuoGWD4YLIvNXEw="/>
- <field:display field="justificativa" id="s_br_ufpr_c3sl_participatorio_Projeto_justificativa" object="${projeto}" z="SQH4nA7skZjQ6CC8qt0m1pqMUtg="/>
- <field:display field="meta" id="s_br_ufpr_c3sl_participatorio_Projeto_meta" object="${projeto}" z="VzMChl+L7hz13lKe5aQBe6PVYug="/>
- <field:display field="temporalidade" id="s_br_ufpr_c3sl_participatorio_Projeto_temporalidade" object="${projeto}" z="c0vwiEWkdMXFYh46/H2SB9CvNp4="/>
- <field:display field="possuiMonitoramento" id="s_br_ufpr_c3sl_participatorio_Projeto_possuiMonitoramento" object="${projeto}" z="68BwSuL6hKNgh0DkIhlPGjfOy24="/>
- <field:display field="estadosMunicipioComPrograma" id="s_br_ufpr_c3sl_participatorio_Projeto_estadosMunicipioComPrograma" object="${projeto}" z="j+RNU5XRo7dJ7mYkopzGJDjRrAs="/>
- <field:display field="publicoPrioritario" id="s_br_ufpr_c3sl_participatorio_Projeto_publicoPrioritario" object="${projeto}" z="BqKXA/HJrVczNrbhFZgDtZYnYgw="/>
- <field:display date="true" dateTimePattern="${projeto_datainicio_date_format}" field="dataInicio" id="s_br_ufpr_c3sl_participatorio_Projeto_dataInicio" object="${projeto}" z="Hdta14bxSk6t2J59rKyH70bW9gk="/>
- <field:display field="mecanismos" id="s_br_ufpr_c3sl_participatorio_Projeto_mecanismos" object="${projeto}" z="rIkBzBq2mNO/WNbKWgjXCX6pa2Y="/>
- <field:display field="parcerias" id="s_br_ufpr_c3sl_participatorio_Projeto_parcerias" object="${projeto}" z="3+nq+7n1btRPfaFxvQx3XwMBwFY="/>
- <field:display field="legislacaoPropria" id="s_br_ufpr_c3sl_participatorio_Projeto_legislacaoPropria" object="${projeto}" z="wChuy6QkKZdbT7+Uv3xVw5syDtA="/>
- <field:display field="descLegislacao" id="s_br_ufpr_c3sl_participatorio_Projeto_descLegislacao" object="${projeto}" z="JL3fGOirqjzo/jfvrpOEsWfdtuE="/>
- <field:display field="obs" id="s_br_ufpr_c3sl_participatorio_Projeto_obs" object="${projeto}" z="+RB342ExVwf7Jpb2LEAVsNVT3tY="/>
- <field:display field="estado" id="s_br_ufpr_c3sl_participatorio_Projeto_estado" object="${projeto}" z="QQqAirebJjfsfFvZ2yTuji9gMYY="/>
- <field:display field="usuario" id="s_br_ufpr_c3sl_participatorio_Projeto_usuario" object="${projeto}" render="false" z="user-managed"/>
- </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/projetos/showcandidatos.jspx b/src/main/webapp/WEB-INF/views/projetos/showcandidatos.jspx
deleted file mode 100644
index ba0c835a5775c02bd9ef22f13fb115a3df29516a..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/projetos/showcandidatos.jspx
+++ /dev/null
@@ -1,57 +0,0 @@
-<?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" 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_participatorio_Projeto" object="${projeto}" path="/projetos" z="D0oL5mYFetkn/bZXW31CJL2EDUE=">
-
- <sec:authorize ifAnyGranted="Administrador">
- <form action="" method="POST">
- <button type="submit" name="status" value="1">Aprovar</button>
- <button type="submit" name="status" value="0">Rejeitar</button>
- </form>
- </sec:authorize>
-
- <field:display field="pai" id="s_br_ufpr_c3sl_participatorio_Projeto_pai" object="${projeto}" z="4n4Iw3sGl6fL8jHSE2fUat8qLN4="/>
- <field:display field="nome" id="s_br_ufpr_c3sl_participatorio_Projeto_nome" object="${projeto}" z="rsXBQmVxhOA6fpmBsaOOxZCOB5w="/>
- <field:display field="demanda" id="s_br_ufpr_c3sl_participatorio_Projeto_demanda" object="${projeto}" z="4hH5xcrgPv71j3pdYFSKwrXUrwY="/>
- <field:display field="acao" id="s_br_ufpr_c3sl_participatorio_Projeto_acao" object="${projeto}" z="8jgJ6LdiyoFYt6MyFWDV/UGMm2o="/>
- <field:display field="outroAcao" id="s_br_ufpr_c3sl_participatorio_Projeto_outroAcao" object="${projeto}" z="zVcl2n2r3xxTceF3vPcaYnWIYiY="/>
- <field:display field="ministerio" id="s_br_ufpr_c3sl_participatorio_Projeto_ministerio" object="${projeto}" z="Xf3IQ962bkf9Ezm92UBXGE2bWwc="/>
- <field:display field="objetivo" id="s_br_ufpr_c3sl_participatorio_Projeto_objetivo" object="${projeto}" z="OvVo10fuXWdSkQG0eG9B8g4HFRE="/>
- <field:display field="rua" id="s_br_ufpr_c3sl_participatorio_Projeto_rua" object="${projeto}" z="bblSx22OBZWuIl+gLXduDRjpIIo="/>
- <field:display field="numero" id="s_br_ufpr_c3sl_participatorio_Projeto_numero" object="${projeto}" z="M95uXy/hfhB5n7Y2KlB2nrIpTTo="/>
- <field:display field="complemento" id="s_br_ufpr_c3sl_participatorio_Projeto_complemento" object="${projeto}" z="u/OhcL1R2KO8bc3ZT6wk+WIlcJQ="/>
- <field:display field="bairro" id="s_br_ufpr_c3sl_participatorio_Projeto_bairro" object="${projeto}" z="3ZCePyHKnaz5YWxSPoF9ruIUGgM="/>
- <field:display field="municipio" id="s_br_ufpr_c3sl_participatorio_Projeto_municipio" object="${projeto}" z="DcdSDhxOxkqkd5V7r+QIjFPISPY="/>
- <field:display field="cep" id="s_br_ufpr_c3sl_participatorio_Projeto_cep" object="${projeto}" z="h2INizgFtGHENL1zTlGj8RzYASs="/>
- <field:display field="uf" id="s_br_ufpr_c3sl_participatorio_Projeto_uf" object="${projeto}" z="M5MExfxocGad8HBxU9Fb65FXsLU="/>
- <field:display field="responsavel" id="s_br_ufpr_c3sl_participatorio_Projeto_responsavel" object="${projeto}" z="69bymzXlQBFLm1MLDdyBWxNnT1Q="/>
- <field:display field="telefones" id="s_br_ufpr_c3sl_participatorio_Projeto_telefones" object="${projeto}" z="EHi6lsxuyNDv167TejS+qseIGbY="/>
- <field:display field="email" id="s_br_ufpr_c3sl_participatorio_Projeto_email" object="${projeto}" z="aGC3uOYrEG/v868j6HanVCKAG0I="/>
- <field:display field="publicoAlvo" id="s_br_ufpr_c3sl_participatorio_Projeto_publicoAlvo" object="${projeto}" z="f4D8z3yit2O9z1UgRnFWWHDyZ8I="/>
- <field:display field="formaAcesso" id="s_br_ufpr_c3sl_participatorio_Projeto_formaAcesso" object="${projeto}" z="ndyJFMwcaQLW7Uri/SNNoszuWmI="/>
- <field:display field="site" id="s_br_ufpr_c3sl_participatorio_Projeto_site" object="${projeto}" z="7w9AuurEp/01nbMH7hzlHbNWaqw="/>
- <field:display field="comoFunciona" id="s_br_ufpr_c3sl_participatorio_Projeto_comoFunciona" object="${projeto}" z="cS8QtgfO1QUSq5l/QWQ1U2bKQQo="/>
- <field:display field="noticias" id="s_br_ufpr_c3sl_participatorio_Projeto_noticias" object="${projeto}" z="nEHfcQlWOOOgyvriBFeCQAQxpNw="/>
- <field:display field="horarioFuncionamento" id="s_br_ufpr_c3sl_participatorio_Projeto_horarioFuncionamento" object="${projeto}" z="I41X3LZzuQydAhMwexe+wnM5SzQ="/>
- <field:display field="diasFuncionamento" id="s_br_ufpr_c3sl_participatorio_Projeto_diasFuncionamento" object="${projeto}" z="IPVS6qq+YWGueSJwyVFOIxU30uM="/>
- <field:display field="estrutura" id="s_br_ufpr_c3sl_participatorio_Projeto_estrutura" object="${projeto}" z="rkpe20h3HUIEJAX8Z/egSw2kqhU="/>
- <field:display field="responsaveis" id="s_br_ufpr_c3sl_participatorio_Projeto_responsaveis" object="${projeto}" z="Aala68TzEKIlGRJal9+v1icoBVc="/>
- <field:display field="telefoneMinisterio" id="s_br_ufpr_c3sl_participatorio_Projeto_telefoneMinisterio" object="${projeto}" z="kZ48wV4jcUxHdOkClF5ust9xrKY="/>
- <field:display field="orcamento" id="s_br_ufpr_c3sl_participatorio_Projeto_orcamento" object="${projeto}" z="T39I2SFBXuSFtuoGWD4YLIvNXEw="/>
- <field:display field="justificativa" id="s_br_ufpr_c3sl_participatorio_Projeto_justificativa" object="${projeto}" z="SQH4nA7skZjQ6CC8qt0m1pqMUtg="/>
- <field:display field="meta" id="s_br_ufpr_c3sl_participatorio_Projeto_meta" object="${projeto}" z="VzMChl+L7hz13lKe5aQBe6PVYug="/>
- <field:display field="temporalidade" id="s_br_ufpr_c3sl_participatorio_Projeto_temporalidade" object="${projeto}" z="c0vwiEWkdMXFYh46/H2SB9CvNp4="/>
- <field:display field="possuiMonitoramento" id="s_br_ufpr_c3sl_participatorio_Projeto_possuiMonitoramento" object="${projeto}" z="68BwSuL6hKNgh0DkIhlPGjfOy24="/>
- <field:display field="estadosMunicipioComPrograma" id="s_br_ufpr_c3sl_participatorio_Projeto_estadosMunicipioComPrograma" object="${projeto}" z="j+RNU5XRo7dJ7mYkopzGJDjRrAs="/>
- <field:display field="publicoPrioritario" id="s_br_ufpr_c3sl_participatorio_Projeto_publicoPrioritario" object="${projeto}" z="BqKXA/HJrVczNrbhFZgDtZYnYgw="/>
- <field:display date="true" dateTimePattern="${projeto_datainicio_date_format}" field="dataInicio" id="s_br_ufpr_c3sl_participatorio_Projeto_dataInicio" object="${projeto}" z="Hdta14bxSk6t2J59rKyH70bW9gk="/>
- <field:display field="mecanismos" id="s_br_ufpr_c3sl_participatorio_Projeto_mecanismos" object="${projeto}" z="rIkBzBq2mNO/WNbKWgjXCX6pa2Y="/>
- <field:display field="parcerias" id="s_br_ufpr_c3sl_participatorio_Projeto_parcerias" object="${projeto}" z="3+nq+7n1btRPfaFxvQx3XwMBwFY="/>
- <field:display field="legislacaoPropria" id="s_br_ufpr_c3sl_participatorio_Projeto_legislacaoPropria" object="${projeto}" z="wChuy6QkKZdbT7+Uv3xVw5syDtA="/>
- <field:display field="descLegislacao" id="s_br_ufpr_c3sl_participatorio_Projeto_descLegislacao" object="${projeto}" z="JL3fGOirqjzo/jfvrpOEsWfdtuE="/>
- <field:display field="obs" id="s_br_ufpr_c3sl_participatorio_Projeto_obs" object="${projeto}" z="+RB342ExVwf7Jpb2LEAVsNVT3tY="/>
- <field:display field="estado" id="s_br_ufpr_c3sl_participatorio_Projeto_estado" object="${projeto}" z="QQqAirebJjfsfFvZ2yTuji9gMYY="/>
- <field:display field="usuario" id="s_br_ufpr_c3sl_participatorio_Projeto_usuario" object="${projeto}" render="false" z="zYLKtpIbUdPWnBZ97hES9bx740A="/>
- </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/projetos/update.jspx b/src/main/webapp/WEB-INF/views/projetos/update.jspx
deleted file mode 100644
index 9f6d8e186fd74e49133823026287f5b14b84e8c0..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/projetos/update.jspx
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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" 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_participatorio_Projeto" modelAttribute="projeto" path="/projetos" versionField="Version" z="1gEn/bkHq9U+2e8X6W36Iph02fo=">
- <field:select field="pai" id="c_br_ufpr_c3sl_participatorio_Projeto_pai" itemValue="id" items="${projetos}" path="/projetos" z="user-managed"/>
- <field:input field="nome" id="c_br_ufpr_c3sl_participatorio_Projeto_nome" z="5egNGMKHSYOQCuslpB7cYfsCJns="/>
- <field:select field="demanda" id="c_br_ufpr_c3sl_participatorio_Projeto_demanda" items="${tipodemandas}" multiple="true" path="tipodemandas" z="user-managed"/>
- <field:select field="acao" id="c_br_ufpr_c3sl_participatorio_Projeto_acao" items="${tipoacaos}" path="tipoacaos" z="TknEprFT06hffWHIizWjHzzhBB8="/>
- <!-- <field:input field="outroAcao" id="c_br_ufpr_c3sl_participatorio_Projeto_outroAcao" z="gKzGjxAdyPnPD7zoeTc+ZPLtejY="/> -->
- <field:textarea field="outroAcao" id="c_br_ufpr_c3sl_participatorio_Projeto_outroAcao" z="user-managed"/>
- <field:select field="ministerio" id="c_br_ufpr_c3sl_participatorio_Projeto_ministerio" itemValue="id" items="${ministerios}" path="/ministerios" z="64Y1pviPhH0YUpX4/TLAcEiNf8A="/>
- <field:input field="objetivo" id="c_br_ufpr_c3sl_participatorio_Projeto_objetivo" z="7NQc7nBdNKGMsVO2gcJ58+nFc0E="/>
- <field:input field="rua" id="c_br_ufpr_c3sl_participatorio_Projeto_rua" z="NZ6M3HEDzpkKDIvxyk8iZYFchQA="/>
- <field:input field="numero" id="c_br_ufpr_c3sl_participatorio_Projeto_numero" z="xaLTEtm6Pc1D6VgioTdMcQXkq8s="/>
- <field:input field="complemento" id="c_br_ufpr_c3sl_participatorio_Projeto_complemento" z="N2Lya9vot39QnzhJ8pqU5d+vzB0="/>
- <field:input field="bairro" id="c_br_ufpr_c3sl_participatorio_Projeto_bairro" z="4IENKq7T4UaF0f/0uwCBcT3xtlI="/>
- <field:input field="municipio" id="c_br_ufpr_c3sl_participatorio_Projeto_municipio" z="IRx9hrCWxHAzvD0dA+1xxmH/V90="/>
- <field:input field="cep" id="c_br_ufpr_c3sl_participatorio_Projeto_cep" z="gVIPRkUIL6GZ45ZU0ehzfXTt4CU="/>
- <field:select field="uf" id="c_br_ufpr_c3sl_participatorio_Projeto_uf" itemValue="id" items="${estados}" path="/estados" z="user-managed"/>
- <field:input field="responsavel" id="c_br_ufpr_c3sl_participatorio_Projeto_responsavel" z="qHPooL9WJIOr9aiVpu272tRcYlg="/>
- <field:input field="telefones" id="c_br_ufpr_c3sl_participatorio_Projeto_telefones" z="XN9R1Y3TkGJDhJjNR7Ac+uUA10g="/>
- <field:input field="email" id="c_br_ufpr_c3sl_participatorio_Projeto_email" validationMessageCode="field_invalid_email" z="wec+yBsxP/CfoGtMjMYu8XOiz8E="/>
- <field:input field="publicoAlvo" id="c_br_ufpr_c3sl_participatorio_Projeto_publicoAlvo" z="rfW62fR8G11PyQwsAU15sdK6804="/>
- <field:input field="formaAcesso" id="c_br_ufpr_c3sl_participatorio_Projeto_formaAcesso" z="HY3pNe95ZaxAxVS55E5bDnn84FE="/>
- <field:input field="site" id="c_br_ufpr_c3sl_participatorio_Projeto_site" z="UtAhbsHkmV/py/BCglNJT4jnKNk="/>
- <!-- <field:input field="comoFunciona" id="c_br_ufpr_c3sl_participatorio_Projeto_comoFunciona" z="WQT9VOPh8Yng7sdWkKBfWrWJvzY="/> -->
- <field:textarea field="comoFunciona" id="c_br_ufpr_c3sl_participatorio_Projeto_comoFunciona" z="user-managed"/>
- <field:input field="noticias" id="c_br_ufpr_c3sl_participatorio_Projeto_noticias" z="QvhayaNYZLWbn4Kdz/1ukvJWaQw="/>
- <field:input field="horarioFuncionamento" id="c_br_ufpr_c3sl_participatorio_Projeto_horarioFuncionamento" z="/wgLwa6KbhG4wv0vWFn869KF4hg="/>
- <field:select field="diasFuncionamento" id="c_br_ufpr_c3sl_participatorio_Projeto_diasFuncionamento" items="${tipodiassemanas}" multiple="true" path="tipodiassemanas" z="user-managed"/>
- <field:input field="estrutura" id="c_br_ufpr_c3sl_participatorio_Projeto_estrutura" z="BMTcTzuUYCoKhXapXah2VN/qPuE="/>
- <field:input field="responsaveis" id="c_br_ufpr_c3sl_participatorio_Projeto_responsaveis" z="gmi09GGEpF9pDXN7/aviynR3tBs="/>
- <field:input field="telefoneMinisterio" id="c_br_ufpr_c3sl_participatorio_Projeto_telefoneMinisterio" z="UGH0aw3XZuQmgwr0sIS1O9KhHbQ="/>
- <field:input field="orcamento" id="c_br_ufpr_c3sl_participatorio_Projeto_orcamento" z="sJO2DC6kqSRPUz5DC5eA/bddxvc="/>
- <!-- <field:input field="justificativa" id="c_br_ufpr_c3sl_participatorio_Projeto_justificativa" z="bxuZxUlVF/K6r0D/vZ2gLJOYqus="/> -->
- <field:textarea field="justificativa" id="c_br_ufpr_c3sl_participatorio_Projeto_justificativa" z="user-managed"/>
- <!-- <field:input field="meta" id="c_br_ufpr_c3sl_participatorio_Projeto_meta" z="X67itR3Kt3CcPmnMLE3pk8gJnTQ="/> -->
- <field:textarea field="meta" id="c_br_ufpr_c3sl_participatorio_Projeto_meta" z="user-managed"/>
- <field:select field="temporalidade" id="c_br_ufpr_c3sl_participatorio_Projeto_temporalidade" items="${tipotemporalidades}" path="tipotemporalidades" z="DxeDx4ck5sWIKaomza63nyKiAeQ="/>
- <field:checkbox field="possuiMonitoramento" id="c_br_ufpr_c3sl_participatorio_Projeto_possuiMonitoramento" z="/JVVLQICEG8G6erZgd6P7rhoNqM="/>
- <field:input field="estadosMunicipioComPrograma" id="c_br_ufpr_c3sl_participatorio_Projeto_estadosMunicipioComPrograma" z="XOH+gInejGvAnV1UOGHZHSlh0kw="/>
- <field:input field="publicoPrioritario" id="c_br_ufpr_c3sl_participatorio_Projeto_publicoPrioritario" z="5WWljIGBWlxjw/qy3mLY2bEcewc="/>
- <field:datetime dateTimePattern="${projeto_datainicio_date_format}" field="dataInicio" id="c_br_ufpr_c3sl_participatorio_Projeto_dataInicio" z="B4b6arF1P2Q4KSgME04mPIWp7Zs="/>
- <field:input field="mecanismos" id="c_br_ufpr_c3sl_participatorio_Projeto_mecanismos" z="YCRKTWq1a3Fd0ZHbAwcxKS+vACY="/>
- <field:input field="parcerias" id="c_br_ufpr_c3sl_participatorio_Projeto_parcerias" z="x374RYBQGz62YCy6JRm7HDk6kFs="/>
- <field:checkbox field="legislacaoPropria" id="c_br_ufpr_c3sl_participatorio_Projeto_legislacaoPropria" z="0FyUiOC8dXYS2KQh9us8ZFSrfU0="/>
- <field:input field="descLegislacao" id="c_br_ufpr_c3sl_participatorio_Projeto_descLegislacao" z="Y9X3/A7OHfh+T5M4c7uRjtx2Uak="/>
- <field:input field="obs" id="c_br_ufpr_c3sl_participatorio_Projeto_obs" z="5b+Wjz0npE5n2wk2R6g1fJZD0VA="/>
- <field:select field="usuario" id="c_br_ufpr_c3sl_participatorio_Projeto_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="user-managed"/>
- <sec:authorize ifAnyGranted="Administrador">
- <field:select field="estado" id="c_br_ufpr_c3sl_participatorio_Projeto_estado" items="${tipostatuses}" path="tipostatuses" z="K+kNv0Ov3Ulu6LiKPBQ71hczlOA="/>
- </sec:authorize>
- </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/projetos/views.xml b/src/main/webapp/WEB-INF/views/projetos/views.xml
deleted file mode 100644
index 8f8f895be399337bab7d3c37c313533be45b3c70..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/views/projetos/views.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
- <definition extends="default" name="projetos/list">
- <put-attribute name="body" value="/WEB-INF/views/projetos/list.jspx"/>
- </definition>
-
- <definition extends="default" name="projetos/mylist">
- <put-attribute name="body" value="/WEB-INF/views/projetos/mylist.jspx"/>
- </definition>
-
-<definition extends="default" name="projetos/show">
- <put-attribute name="body" value="/WEB-INF/views/projetos/show.jspx"/>
- </definition>
-<definition extends="default" name="projetos/create">
- <put-attribute name="body" value="/WEB-INF/views/projetos/create.jspx"/>
- </definition>
-<definition extends="default" name="projetos/update">
- <put-attribute name="body" value="/WEB-INF/views/projetos/update.jspx"/>
- </definition>
-
- <definition extends="default" name="projetos/showcandidatos">
- <put-attribute name="body" value="/WEB-INF/views/projetos/showcandidatos.jspx"/>
- </definition>
-</tiles-definitions>