Skip to content
Snippets Groups Projects
Commit 7b0a1d65 authored by Fabiano Sluzarski's avatar Fabiano Sluzarski
Browse files

adicionado classe estado, ajustado tamanho de alguns campos, adicionado campo UF em projeto

parent cc57eed5
No related branches found
No related tags found
No related merge requests found
Showing
with 403 additions and 2 deletions
#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
......
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;
}
// 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;
}
// 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;
}
}
// 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;
}
}
// 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;
}
}
// 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);
}
}
......@@ -62,6 +62,9 @@ public class Projeto {
private String cep;
@OneToOne
private Estado uf;
@Column(columnDefinition="text")
private String responsavel;
......
......@@ -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;
}
......
......@@ -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();
}
};
}
}
......@@ -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());
......
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 {
}
// 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;
}
}
......@@ -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()));
......
......@@ -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()" />
......
......@@ -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
......
<?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>
<?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>
<?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>
<?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>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment