From 7b0a1d65d111fc43044c636c9a5aaa50374e948f Mon Sep 17 00:00:00 2001
From: Fabiano Sluzarski <fs09@inf.ufpr.br>
Date: Wed, 26 Jun 2013 11:39:27 -0300
Subject: [PATCH] adicionado classe estado, ajustado tamanho de alguns campos,
adicionado campo UF em projeto
---
.settings/org.eclipse.core.resources.prefs | 2 +-
.../br/ufpr/c3sl/participatorio/Estado.java | 15 +++
.../participatorio/Estado_Roo_Configurable.aj | 13 +++
.../participatorio/Estado_Roo_JavaBean.aj | 26 +++++
.../Estado_Roo_Jpa_ActiveRecord.aj | 77 +++++++++++++
.../participatorio/Estado_Roo_Jpa_Entity.aj | 43 ++++++++
.../participatorio/Estado_Roo_ToString.aj | 16 +++
.../br/ufpr/c3sl/participatorio/Projeto.java | 3 +
.../participatorio/Projeto_Roo_JavaBean.aj | 9 ++
...plicationConversionServiceFactoryBean.java | 9 ++
...erviceFactoryBean_Roo_ConversionService.aj | 20 ++++
.../participatorio/web/EstadoController.java | 12 +++
.../web/EstadoController_Roo_Controller.aj | 102 ++++++++++++++++++
.../participatorio/web/ProjetoController.java | 5 +-
.../spring/applicationContext-security.xml | 3 +
.../WEB-INF/i18n/application.properties | 11 ++
.../webapp/WEB-INF/views/estados/create.jspx | 10 ++
.../webapp/WEB-INF/views/estados/list.jspx | 11 ++
.../webapp/WEB-INF/views/estados/show.jspx | 9 ++
.../webapp/WEB-INF/views/estados/update.jspx | 9 ++
.../webapp/WEB-INF/views/estados/views.xml | 16 +++
src/main/webapp/WEB-INF/views/menu.jspx | 6 +-
.../webapp/WEB-INF/views/projetos/create.jspx | 17 +--
.../webapp/WEB-INF/views/projetos/show.jspx | 1 +
.../views/projetos/showcandidatos.jspx | 1 +
.../webapp/WEB-INF/views/projetos/update.jspx | 17 +--
src/main/webapp/styles/standard.css | 5 +-
27 files changed, 447 insertions(+), 21 deletions(-)
create mode 100644 src/main/java/br/ufpr/c3sl/participatorio/Estado.java
create mode 100644 src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_Configurable.aj
create mode 100644 src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_JavaBean.aj
create mode 100644 src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_Jpa_ActiveRecord.aj
create mode 100644 src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_Jpa_Entity.aj
create mode 100644 src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_ToString.aj
create mode 100644 src/main/java/br/ufpr/c3sl/participatorio/web/EstadoController.java
create mode 100644 src/main/java/br/ufpr/c3sl/participatorio/web/EstadoController_Roo_Controller.aj
create mode 100644 src/main/webapp/WEB-INF/views/estados/create.jspx
create mode 100644 src/main/webapp/WEB-INF/views/estados/list.jspx
create mode 100644 src/main/webapp/WEB-INF/views/estados/show.jspx
create mode 100644 src/main/webapp/WEB-INF/views/estados/update.jspx
create mode 100644 src/main/webapp/WEB-INF/views/estados/views.xml
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 7eedaec..8847b22 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,4 @@
-#Wed Feb 06 10:54:03 BRST 2013
+#Wed Jun 26 11:20:05 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/participatorio/Estado.java b/src/main/java/br/ufpr/c3sl/participatorio/Estado.java
new file mode 100644
index 0000000..e004247
--- /dev/null
+++ b/src/main/java/br/ufpr/c3sl/participatorio/Estado.java
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 0000000..b1fcf4b
--- /dev/null
+++ b/src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_Configurable.aj
@@ -0,0 +1,13 @@
+// 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
new file mode 100644
index 0000000..7fa10c3
--- /dev/null
+++ b/src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_JavaBean.aj
@@ -0,0 +1,26 @@
+// 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
new file mode 100644
index 0000000..a2be757
--- /dev/null
+++ b/src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_Jpa_ActiveRecord.aj
@@ -0,0 +1,77 @@
+// 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
new file mode 100644
index 0000000..fc58a47
--- /dev/null
+++ b/src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_Jpa_Entity.aj
@@ -0,0 +1,43 @@
+// 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
new file mode 100644
index 0000000..5091e27
--- /dev/null
+++ b/src/main/java/br/ufpr/c3sl/participatorio/Estado_Roo_ToString.aj
@@ -0,0 +1,16 @@
+// 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/Projeto.java b/src/main/java/br/ufpr/c3sl/participatorio/Projeto.java
index ffeff75..06f27ad 100644
--- a/src/main/java/br/ufpr/c3sl/participatorio/Projeto.java
+++ b/src/main/java/br/ufpr/c3sl/participatorio/Projeto.java
@@ -61,6 +61,9 @@ public class Projeto {
private String municipio;
private String cep;
+
+ @OneToOne
+ private Estado uf;
@Column(columnDefinition="text")
private String responsavel;
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
index 0bf1b8b..b53ba4e 100644
--- a/src/main/java/br/ufpr/c3sl/participatorio/Projeto_Roo_JavaBean.aj
+++ b/src/main/java/br/ufpr/c3sl/participatorio/Projeto_Roo_JavaBean.aj
@@ -3,6 +3,7 @@
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;
@@ -120,6 +121,14 @@ privileged aspect Projeto_Roo_JavaBean {
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;
}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/web/ApplicationConversionServiceFactoryBean.java b/src/main/java/br/ufpr/c3sl/participatorio/web/ApplicationConversionServiceFactoryBean.java
index 6e76b2c..b38c58e 100644
--- a/src/main/java/br/ufpr/c3sl/participatorio/web/ApplicationConversionServiceFactoryBean.java
+++ b/src/main/java/br/ufpr/c3sl/participatorio/web/ApplicationConversionServiceFactoryBean.java
@@ -5,6 +5,7 @@ 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;
@@ -49,4 +50,12 @@ public class ApplicationConversionServiceFactoryBean extends FormattingConversio
};
}
+ 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
index 7095a34..049b2dc 100644
--- 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
@@ -3,6 +3,7 @@
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;
@@ -15,6 +16,22 @@ 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) {
@@ -64,6 +81,9 @@ privileged aspect ApplicationConversionServiceFactoryBean_Roo_ConversionService
}
public void ApplicationConversionServiceFactoryBean.installLabelConverters(FormatterRegistry registry) {
+ registry.addConverter(getEstadoToStringConverter());
+ registry.addConverter(getIdToEstadoConverter());
+ registry.addConverter(getStringToEstadoConverter());
registry.addConverter(getMinisterioToStringConverter());
registry.addConverter(getIdToMinisterioConverter());
registry.addConverter(getStringToMinisterioConverter());
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/web/EstadoController.java b/src/main/java/br/ufpr/c3sl/participatorio/web/EstadoController.java
new file mode 100644
index 0000000..0249da2
--- /dev/null
+++ b/src/main/java/br/ufpr/c3sl/participatorio/web/EstadoController.java
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000..cc034c1
--- /dev/null
+++ b/src/main/java/br/ufpr/c3sl/participatorio/web/EstadoController_Roo_Controller.aj
@@ -0,0 +1,102 @@
+// 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("estados", 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("estados", 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/ProjetoController.java b/src/main/java/br/ufpr/c3sl/participatorio/web/ProjetoController.java
index dbb832d..a614421 100644
--- a/src/main/java/br/ufpr/c3sl/participatorio/web/ProjetoController.java
+++ b/src/main/java/br/ufpr/c3sl/participatorio/web/ProjetoController.java
@@ -17,6 +17,7 @@ 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;
@@ -59,6 +60,8 @@ public class ProjetoController {
}
else
bindingResult.addError(new ObjectError("", "Projeto avaliado, você não tem permissão para modificar esse projeto."));
+
+ projeto.setEstado(p.getEstado());
}
if (bindingResult.hasErrors()) {
@@ -67,7 +70,6 @@ public class ProjetoController {
}
projeto.setUsuario(p.getUsuario());
- projeto.setEstado(p.getEstado());
uiModel.asMap().clear();
projeto.merge();
@@ -192,6 +194,7 @@ public class ProjetoController {
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()));
diff --git a/src/main/resources/META-INF/spring/applicationContext-security.xml b/src/main/resources/META-INF/spring/applicationContext-security.xml
index 5b6b27b..0dc15ba 100644
--- a/src/main/resources/META-INF/spring/applicationContext-security.xml
+++ b/src/main/resources/META-INF/spring/applicationContext-security.xml
@@ -20,6 +20,9 @@
<intercept-url pattern="/usuarios**" access="hasRole('Administrador')" />
<intercept-url pattern="/usuarios**" access="hasRole('Administrador')" method="POST" />
+ <intercept-url pattern="/estados**" access="hasRole('Administrador')"/>
+ <intercept-url pattern="/estados**" access="hasRole('Administrador')" method="POST" />
+
<!-- <intercept-url pattern="/projetoes/listEfetivos" access="permitAll" /> -->
<intercept-url pattern="/**" access="isAuthenticated()" />
diff --git a/src/main/webapp/WEB-INF/i18n/application.properties b/src/main/webapp/WEB-INF/i18n/application.properties
index 5a20f54..1393c95 100644
--- a/src/main/webapp/WEB-INF/i18n/application.properties
+++ b/src/main/webapp/WEB-INF/i18n/application.properties
@@ -2,6 +2,13 @@
#Wed Feb 06 10:50:26 BRST 2013
application_name=Banco de Dados Estação Juventude
+label_br_ufpr_c3sl_participatorio_estado=Estado
+label_br_ufpr_c3sl_participatorio_estado_id=Id
+label_br_ufpr_c3sl_participatorio_estado_nome=Nome
+label_br_ufpr_c3sl_participatorio_estado_plural=Estados
+label_br_ufpr_c3sl_participatorio_estado_sigla=Sigla
+label_br_ufpr_c3sl_participatorio_estado_version=Versão
+
label_br_ufpr_c3sl_participatorio_ministerio=Ministério
label_br_ufpr_c3sl_participatorio_ministerio_id=Id
label_br_ufpr_c3sl_participatorio_ministerio_nome=Nome do Ministério
@@ -56,6 +63,7 @@ label_br_ufpr_c3sl_participatorio_projeto_telefones=Telefones
# Temporalidade - ( ) Temporario ( ) Permanente
label_br_ufpr_c3sl_participatorio_projeto_temporalidade=*Temporalidade
+label_br_ufpr_c3sl_participatorio_projeto_uf=UF
label_br_ufpr_c3sl_participatorio_projeto_usuario=Usuário
label_br_ufpr_c3sl_participatorio_projeto_version=Versão
@@ -73,6 +81,9 @@ label_br_ufpr_c3sl_participatorio_usuario_newpass=Nova Senha
menu_category_ministerio_label=Ministério
menu_category_projeto_label=Projeto
menu_category_usuario_label=Usuário
+menu_category_estado_label=Estado
+menu_item_estado_list_label=Estados
+menu_item_estado_new_label=Estado
menu_item_ministerio_list_label=Ministérios
menu_item_ministerio_new_label=Ministério
menu_item_projeto_list_label=Projetos
diff --git a/src/main/webapp/WEB-INF/views/estados/create.jspx b/src/main/webapp/WEB-INF/views/estados/create.jspx
new file mode 100644
index 0000000..4bacba1
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/estados/create.jspx
@@ -0,0 +1,10 @@
+<?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_Estado" modelAttribute="estado" path="/estados" render="${empty dependencies}" z="user-managed">
+ <field:input field="nome" id="c_br_ufpr_c3sl_participatorio_Estado_nome" z="kXivqGNIKFoBdGFRzajK11wpc28="/>
+ <field:input field="sigla" id="c_br_ufpr_c3sl_participatorio_Estado_sigla" z="A/PQeqwgsj2lqzkh75BK0uvkjlc="/>
+ </form:create>
+ <form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_participatorio_Estado" render="${not empty dependencies}" z="YJdIek1Aj9DTQNYX7eRu+/BY5Nk="/>
+</div>
diff --git a/src/main/webapp/WEB-INF/views/estados/list.jspx b/src/main/webapp/WEB-INF/views/estados/list.jspx
new file mode 100644
index 0000000..54a0e14
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/estados/list.jspx
@@ -0,0 +1,11 @@
+<?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_Estado" items="${estados}" z="user-managed">
+ <table:table data="${estados}" id="l_br_ufpr_c3sl_participatorio_Estado" path="/estados" z="user-managed">
+ <table:column id="c_br_ufpr_c3sl_participatorio_Estado_nome" property="nome" z="zj47CZjvrixf9I1PFk9YK++Sc10="/>
+ <table:column id="c_br_ufpr_c3sl_participatorio_Estado_sigla" property="sigla" z="UNlntAzy0QHSxWoD6jtEx337FGs="/>
+ </table:table>
+ </page:list>
+</div>
diff --git a/src/main/webapp/WEB-INF/views/estados/show.jspx b/src/main/webapp/WEB-INF/views/estados/show.jspx
new file mode 100644
index 0000000..1e85dfc
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/estados/show.jspx
@@ -0,0 +1,9 @@
+<?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_Estado" object="${estado}" path="/estados" z="user-managed">
+ <field:display field="nome" id="s_br_ufpr_c3sl_participatorio_Estado_nome" object="${estado}" z="36R/GzDDADORoBioLZaMFjXMgdY="/>
+ <field:display field="sigla" id="s_br_ufpr_c3sl_participatorio_Estado_sigla" object="${estado}" z="XlQHhfVPFQnfcuadq01f6EnV6pw="/>
+ </page:show>
+</div>
diff --git a/src/main/webapp/WEB-INF/views/estados/update.jspx b/src/main/webapp/WEB-INF/views/estados/update.jspx
new file mode 100644
index 0000000..7b88d2c
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/estados/update.jspx
@@ -0,0 +1,9 @@
+<?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_Estado" modelAttribute="estado" path="/estados" versionField="Version" z="user-managed">
+ <field:input field="nome" id="c_br_ufpr_c3sl_participatorio_Estado_nome" z="kXivqGNIKFoBdGFRzajK11wpc28="/>
+ <field:input field="sigla" id="c_br_ufpr_c3sl_participatorio_Estado_sigla" z="A/PQeqwgsj2lqzkh75BK0uvkjlc="/>
+ </form:update>
+</div>
diff --git a/src/main/webapp/WEB-INF/views/estados/views.xml b/src/main/webapp/WEB-INF/views/estados/views.xml
new file mode 100644
index 0000000..0aa2a25
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/estados/views.xml
@@ -0,0 +1,16 @@
+<?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="estados/list">
+ <put-attribute name="body" value="/WEB-INF/views/estados/list.jspx"/>
+ </definition>
+<definition extends="default" name="estados/show">
+ <put-attribute name="body" value="/WEB-INF/views/estados/show.jspx"/>
+ </definition>
+<definition extends="default" name="estados/create">
+ <put-attribute name="body" value="/WEB-INF/views/estados/create.jspx"/>
+ </definition>
+<definition extends="default" name="estados/update">
+ <put-attribute name="body" value="/WEB-INF/views/estados/update.jspx"/>
+ </definition>
+</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/menu.jspx b/src/main/webapp/WEB-INF/views/menu.jspx
index 9a7a8ae..09cd091 100644
--- a/src/main/webapp/WEB-INF/views/menu.jspx
+++ b/src/main/webapp/WEB-INF/views/menu.jspx
@@ -5,7 +5,7 @@
<menu:menu id="_menu" z="nZaf43BjUg1iM0v70HJVEsXDopc=">
<menu:category id="c_projeto" z="l9PWsmyhBz6vdxQqJihZDnWRr4o=">
<menu:item id="i_projeto_new" messageCode="global_menu_new" url="/projetos?form" z="user-managed"/>
- <!-- <menu:item id="i_projeto_list" messageCode="global_menu_list" url="/projetoes?page=1&size=${empty param.size ? 10 : param.size}" z="x1vvsZFRYLoITzX2jIKG93Z4DWM="/> -->
+ <!-- <menu:item id="i_projeto_list" messageCode="global_menu_list" url="/projetos?page=1&size=${empty param.size ? 10 : param.size}" z="x1vvsZFRYLoITzX2jIKG93Z4DWM="/> -->
<menu:item id="i_projeto_list" messageCode="my_projects" url="/projetos/meusprojetos" z="user-managed"/>
<menu:item id="i_projeto_list" messageCode="global_menu_list_candidato" url="/projetos/listCandidatos" z="user-managed"/>
<menu:item id="i_projeto_list" messageCode="global_menu_list_efetivo" url="/projetos/listEfetivos" z="user-managed"/>
@@ -21,5 +21,9 @@
<menu:item id="i_usuario_list" messageCode="global_menu_list" url="/usuarios" z="user-managed"/>
</menu:category>
</sec:authorize>
+<!-- <menu:category id="c_estado" z="R0VnER9YYkIt+dO11st4rxP96qg="> -->
+<!-- <menu:item id="i_estado_new" messageCode="global_menu_new" url="/estados?form" z="user-managed"/> -->
+<!-- <menu:item id="i_estado_list" messageCode="global_menu_list" url="/estados" z="user-managed"/> -->
+<!-- </menu:category> -->
</menu:menu>
</div>
diff --git a/src/main/webapp/WEB-INF/views/projetos/create.jspx b/src/main/webapp/WEB-INF/views/projetos/create.jspx
index 14852fe..2cf94bd 100644
--- a/src/main/webapp/WEB-INF/views/projetos/create.jspx
+++ b/src/main/webapp/WEB-INF/views/projetos/create.jspx
@@ -5,7 +5,7 @@
<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}" path="tipodemandas" z="LZLJJHDisgTZb2HVM3SXZRFRKZo="/>
+ <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"/>
@@ -17,25 +17,26 @@
<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="FN3ukzxHlf2ptqgnf3iClzkIypg="/>
<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="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}" path="tipodiassemanas" z="+BjTvC5bM2N7YGK48eWFIePY8Ks="/>
+ <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: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="/>
diff --git a/src/main/webapp/WEB-INF/views/projetos/show.jspx b/src/main/webapp/WEB-INF/views/projetos/show.jspx
index 87644ed..dce3d1b 100644
--- a/src/main/webapp/WEB-INF/views/projetos/show.jspx
+++ b/src/main/webapp/WEB-INF/views/projetos/show.jspx
@@ -16,6 +16,7 @@
<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="/>
diff --git a/src/main/webapp/WEB-INF/views/projetos/showcandidatos.jspx b/src/main/webapp/WEB-INF/views/projetos/showcandidatos.jspx
index 4b68276..ba0c835 100644
--- a/src/main/webapp/WEB-INF/views/projetos/showcandidatos.jspx
+++ b/src/main/webapp/WEB-INF/views/projetos/showcandidatos.jspx
@@ -24,6 +24,7 @@
<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="/>
diff --git a/src/main/webapp/WEB-INF/views/projetos/update.jspx b/src/main/webapp/WEB-INF/views/projetos/update.jspx
index 2acfedb..7f06ab0 100644
--- a/src/main/webapp/WEB-INF/views/projetos/update.jspx
+++ b/src/main/webapp/WEB-INF/views/projetos/update.jspx
@@ -5,10 +5,10 @@
<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}" path="tipodemandas" z="LZLJJHDisgTZb2HVM3SXZRFRKZo="/>
+ <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: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="/>
@@ -17,25 +17,26 @@
<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="FN3ukzxHlf2ptqgnf3iClzkIypg="/>
<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: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}" path="tipodiassemanas" z="+BjTvC5bM2N7YGK48eWFIePY8Ks="/>
+ <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: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: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="/>
diff --git a/src/main/webapp/styles/standard.css b/src/main/webapp/styles/standard.css
index a91600c..e15844b 100644
--- a/src/main/webapp/styles/standard.css
+++ b/src/main/webapp/styles/standard.css
@@ -144,7 +144,7 @@ input, textarea, select {
}
select{
- width:183px;
+ width:403px;
line-height:17px;
color:#0F469D;
background-color:#FFF;/*#ABC8F0;*/
@@ -438,7 +438,8 @@ fieldset th {
min-height:5.5em !important;
max-height:22em !important;
overflow-y: auto !important;
- max-width: 400px;
+ max-width: 394px;
+ min-width: 394px;
}
.dijitTextBox {
--
GitLab