diff --git a/participatorio.war b/participatorio.war deleted file mode 100644 index ab3cb2b0172477c56648c16dc569e2476c9cd971..0000000000000000000000000000000000000000 Binary files a/participatorio.war and /dev/null differ 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 f17447c30d19564211f5028920e3d231f056ee72..6e76b2c9ecfbb330fa64e359d9460fdccd688c28 100644 --- a/src/main/java/br/ufpr/c3sl/participatorio/web/ApplicationConversionServiceFactoryBean.java +++ b/src/main/java/br/ufpr/c3sl/participatorio/web/ApplicationConversionServiceFactoryBean.java @@ -7,6 +7,7 @@ import org.springframework.roo.addon.web.mvc.controller.converter.RooConversionS 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. @@ -40,4 +41,12 @@ public class ApplicationConversionServiceFactoryBean extends FormattingConversio }; } + 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(); + } + }; + } + } 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 2fd19f0b1d9cd9e8d5321c141c1ccbb4b18db470..7095a34bd2db5ca401c301c174db525c2eb3dbbd 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 @@ -47,14 +47,6 @@ privileged aspect ApplicationConversionServiceFactoryBean_Roo_ConversionService }; } - public Converter<Usuario, String> ApplicationConversionServiceFactoryBean.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()).append(' ').append(usuario.getSenha()).toString(); - } - }; - } - 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) { 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 e390d011b2da337edc147651da3f8d081ce5570f..c71942b8bb750133bae75e6e99b65b19dacbda1d 100644 --- a/src/main/java/br/ufpr/c3sl/participatorio/web/ProjetoController.java +++ b/src/main/java/br/ufpr/c3sl/participatorio/web/ProjetoController.java @@ -27,16 +27,16 @@ import br.ufpr.c3sl.participatorio.enums.TipoStatus; import br.ufpr.c3sl.participatorio.enums.TipoTemporalidade; import br.ufpr.c3sl.participatorio.enums.TipoUsuario; -@RequestMapping("/projetoes") +@RequestMapping("/projetos") @Controller -@RooWebScaffold(path = "projetoes", formBackingObject = Projeto.class) +@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 "projetoes/create"; + return "projetos/create"; } projeto.setEstado(TipoStatus.Candidato); @@ -46,7 +46,7 @@ public class ProjetoController { uiModel.asMap().clear(); projeto.persist(); - return "redirect:/projetoes/" + encodeUrlPathSegment(projeto.getId().toString(), httpServletRequest); + return "redirect:/projetos/" + encodeUrlPathSegment(projeto.getId().toString(), httpServletRequest); } @RequestMapping(method = RequestMethod.PUT, produces = "text/html") @@ -58,14 +58,14 @@ public class ProjetoController { if (bindingResult.hasErrors()) { populateEditForm(uiModel, projeto); - return "projetoes/update"; + return "projetos/update"; } projeto.setUsuario(p.getUsuario()); uiModel.asMap().clear(); projeto.merge(); - return "redirect:/projetoes/" + encodeUrlPathSegment(projeto.getId().toString(), httpServletRequest); + return "redirect:/projetos/" + encodeUrlPathSegment(projeto.getId().toString(), httpServletRequest); } @RequestMapping(value = "/{id}", produces = "text/html") @@ -74,8 +74,8 @@ public class ProjetoController { addDateTimeFormatPatterns(uiModel); uiModel.addAttribute("projeto", projeto); uiModel.addAttribute("itemId", id); - if (projeto.getEstado() == TipoStatus.Candidato) return "projetoes/showcandidatos"; - return "projetoes/show"; + if (projeto.getEstado() == TipoStatus.Candidato) return "projetos/showcandidatos"; + return "projetos/show"; } @RequestMapping(value = "listCandidatos", produces = "text/html") @@ -83,14 +83,14 @@ public class ProjetoController { 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)); + 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("projetoes", Projeto.findAllProjetosCandidatos()); + uiModel.addAttribute("projetos", Projeto.findAllProjetosCandidatos()); } addDateTimeFormatPatterns(uiModel); - return "projetoes/list"; + return "projetos/list"; } @RequestMapping(value = "listEfetivos", produces = "text/html") @@ -98,14 +98,14 @@ public class ProjetoController { 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)); + 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("projetoes", Projeto.findAllProjetosEfetivos()); + uiModel.addAttribute("projetos", Projeto.findAllProjetosEfetivos()); } addDateTimeFormatPatterns(uiModel); - return "projetoes/list"; + return "projetos/list"; } @RequestMapping(value = "listRejeitados", produces = "text/html") @@ -113,14 +113,14 @@ public class ProjetoController { 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)); + 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("projetoes", Projeto.findAllProjetosRejeitados()); + uiModel.addAttribute("projetos", Projeto.findAllProjetosRejeitados()); } addDateTimeFormatPatterns(uiModel); - return "projetoes/list"; + return "projetos/list"; } @RequestMapping(value = "meusprojetos", produces = "text/html") @@ -128,14 +128,14 @@ public class ProjetoController { 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)); + 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("projetoes", Projeto.findMeusProjetos()); + uiModel.addAttribute("projetos", Projeto.findMeusProjetos()); } addDateTimeFormatPatterns(uiModel); - return "projetoes/mylist"; + return "projetos/mylist"; } @RequestMapping(value = "/{id}", params = "status", method = RequestMethod.POST, produces = "text/html") @@ -146,7 +146,27 @@ public class ProjetoController { if (status.equals("0")) projeto.setEstado(TipoStatus.Rejeitado); projeto.merge(); } - return "redirect:/projetoes/" + encodeUrlPathSegment(projeto.getId().toString(), httpServletRequest); + 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) { @@ -163,7 +183,7 @@ public class ProjetoController { Projeto p = new Projeto(); p.setId((long) 0); lp.add(0, p); - uiModel.addAttribute("projetoes", lp); + uiModel.addAttribute("projetos", lp); uiModel.addAttribute("usuarios", Usuario.findAllUsuarios()); uiModel.addAttribute("tipoacaos", Arrays.asList(TipoAcao.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 index 1ee657203e6c09af105fdf5e9fdef6d11e44f0bc..075374ecd092717d4d79beffeb101e9aef5cb37e 100644 --- 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 @@ -12,7 +12,6 @@ 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.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.util.UriUtils; import org.springframework.web.util.WebUtils; @@ -22,7 +21,7 @@ privileged aspect ProjetoController_Roo_Controller { @RequestMapping(params = "form", produces = "text/html") public String ProjetoController.createForm(Model uiModel) { populateEditForm(uiModel, new Projeto()); - return "projetoes/create"; + return "projetos/create"; } @RequestMapping(produces = "text/html") @@ -37,23 +36,13 @@ privileged aspect ProjetoController_Roo_Controller { uiModel.addAttribute("projetoes", Projeto.findAllProjetoes()); } addDateTimeFormatPatterns(uiModel); - return "projetoes/list"; + 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 "projetoes/update"; - } - - @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html") - public String ProjetoController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) { - Projeto projeto = Projeto.findProjeto(id); - projeto.remove(); - uiModel.asMap().clear(); - uiModel.addAttribute("page", (page == null) ? "1" : page.toString()); - uiModel.addAttribute("size", (size == null) ? "10" : size.toString()); - return "redirect:/projetoes"; + return "projetos/update"; } void ProjetoController.addDateTimeFormatPatterns(Model uiModel) { diff --git a/src/main/webapp/WEB-INF/i18n/application.properties b/src/main/webapp/WEB-INF/i18n/application.properties index 596b2fcd6c991d7633ba658364b300fd1ba35d77..f213008d18675d414fb5ea6424ace9b6f84974f2 100644 --- a/src/main/webapp/WEB-INF/i18n/application.properties +++ b/src/main/webapp/WEB-INF/i18n/application.properties @@ -1,6 +1,6 @@ #Updated at Wed Feb 06 10:50:26 BRST 2013 #Wed Feb 06 10:50:26 BRST 2013 -application_name=Participatório +application_name=Observatório label_br_ufpr_c3sl_participatorio_ministerio=Ministério label_br_ufpr_c3sl_participatorio_ministerio_id=Id diff --git a/src/main/webapp/WEB-INF/i18n/messages.properties b/src/main/webapp/WEB-INF/i18n/messages.properties index 9464850c1008653244831128a29c5c28dc5a7dec..f931665fc13f61eccb27f82dd52b74dce5c1c66b 100644 --- a/src/main/webapp/WEB-INF/i18n/messages.properties +++ b/src/main/webapp/WEB-INF/i18n/messages.properties @@ -18,7 +18,7 @@ my_projects=Meus Projetos #welcome page welcome_titlepane=Bem vindo ao {0} welcome_h3=Bem vindo ao {0} -welcome_text=Bem Vindo ao Participatório +welcome_text=Bem Vindo ao Observatório #entity labels entity_list_all=Listar {0} diff --git a/src/main/webapp/WEB-INF/tags/form/fields/display.tagx b/src/main/webapp/WEB-INF/tags/form/fields/display.tagx index a6e8f43c42e96b7ed1ec6de5192a5ae41efe04c8..879112685afb77b4ae4788efeb803eb46c54c784 100644 --- a/src/main/webapp/WEB-INF/tags/form/fields/display.tagx +++ b/src/main/webapp/WEB-INF/tags/form/fields/display.tagx @@ -39,6 +39,7 @@ </c:when> <c:otherwise> <spring:eval expression="object[field]" /> + <br /> </c:otherwise> </c:choose> </div> diff --git a/src/main/webapp/WEB-INF/tags/form/fields/table.tagx b/src/main/webapp/WEB-INF/tags/form/fields/table.tagx index 80962b33a9aadff90d62e21f5e7a3905202f9377..f249b6d40b1f876c22ff36cb7d33bbd21d6fc330 100644 --- a/src/main/webapp/WEB-INF/tags/form/fields/table.tagx +++ b/src/main/webapp/WEB-INF/tags/form/fields/table.tagx @@ -119,9 +119,9 @@ <form:form action="${delete_form_url}" method="DELETE"> <spring:message arguments="${typeName}" code="entity_delete" var="delete_label" htmlEscape="false" /> <c:set var="delete_confirm_msg"> - <spring:escapeBody javaScriptEscape="true"> - <spring:message code="entity_delete_confirm" /> - </spring:escapeBody> + <!-- <spring:escapeBody javaScriptEscape="true"> --> + <spring:message code="entity_delete_confirm" htmlEscape="false" /> + <!-- </spring:escapeBody> --> </c:set> <input alt="${fn:escapeXml(delete_label)}" class="image" src="${delete_image_url}" title="${fn:escapeXml(delete_label)}" type="image" value="${fn:escapeXml(delete_label)}" onclick="return confirm('${delete_confirm_msg}');" /> <c:if test="${not empty param.page}"> diff --git a/src/main/webapp/WEB-INF/tags/form/show.tagx b/src/main/webapp/WEB-INF/tags/form/show.tagx index 47cc06aa5e3219bdaadb60d45763a38e0c76e379..d7fe9155d24a10b031b45bdfdbe73d72383a6646 100644 --- a/src/main/webapp/WEB-INF/tags/form/show.tagx +++ b/src/main/webapp/WEB-INF/tags/form/show.tagx @@ -50,9 +50,9 @@ <form:form action="${delete_form_url}" method="DELETE"> <spring:message arguments="${typeName}" code="entity_delete" var="delete_label" htmlEscape="false" /> <c:set var="delete_confirm_msg"> - <spring:escapeBody javaScriptEscape="true"> - <spring:message code="entity_delete_confirm" /> - </spring:escapeBody> + <!-- <spring:escapeBody javaScriptEscape="true"> --> + <spring:message code="entity_delete_confirm" htmlEscape="false" /> + <!-- </spring:escapeBody> --> </c:set> <input alt="${fn:escapeXml(delete_label)}" class="image" src="${delete_image_url}" title="${fn:escapeXml(delete_label)}" type="image" value="${fn:escapeXml(delete_label)}" onclick="return confirm('${fn:escapeXml(delete_confirm_msg)}');" /> </form:form> diff --git a/src/main/webapp/WEB-INF/views/menu.jspx b/src/main/webapp/WEB-INF/views/menu.jspx index da09f071f537e562699243c508f32f09f3c0b4ba..9a7a8ae66938614ec42e6b69166ccab46f0f1a4b 100644 --- a/src/main/webapp/WEB-INF/views/menu.jspx +++ b/src/main/webapp/WEB-INF/views/menu.jspx @@ -3,15 +3,14 @@ <jsp:directive.page contentType="text/html;charset=UTF-8"/> <jsp:output omit-xml-declaration="yes"/> <menu:menu id="_menu" z="nZaf43BjUg1iM0v70HJVEsXDopc="> - <menu:category id="c_projeto" z="l9PWsmyhBz6vdxQqJihZDnWRr4o="> - <menu:item id="i_projeto_new" messageCode="global_menu_new" url="/projetoes?form" z="OY49hJ+taMk1k3ASiEFt4sGXCSU="/> + <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="my_projects" url="/projetoes/meusprojetos" z="user-managed"/> - <menu:item id="i_projeto_list" messageCode="global_menu_list_candidato" url="/projetoes/listCandidatos" z="user-managed"/> - <menu:item id="i_projeto_list" messageCode="global_menu_list_efetivo" url="/projetoes/listEfetivos" z="user-managed"/> - <menu:item id="i_projeto_list" messageCode="global_menu_list_rejeitado" url="/projetoes/listRejeitados" z="user-managed"/> - </menu:category> - + <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"/> + <menu:item id="i_projeto_list" messageCode="global_menu_list_rejeitado" url="/projetos/listRejeitados" z="user-managed"/> + </menu:category> <sec:authorize ifAnyGranted="Administrador"> <menu:category id="c_ministerio" z="bdCebF8Z2eynkkyAMp/B5OZGV9A="> <menu:item id="i_ministerio_new" messageCode="global_menu_new" url="/ministerios?form" z="6OpG3M2+Gvw8amn9aYg7/7zwAds="/> diff --git a/src/main/webapp/WEB-INF/views/projetoes/create.jspx b/src/main/webapp/WEB-INF/views/projetos/create.jspx similarity index 92% rename from src/main/webapp/WEB-INF/views/projetoes/create.jspx rename to src/main/webapp/WEB-INF/views/projetos/create.jspx index 50856cfd02abf32816be066bd45f14041f3ba3fc..35af20515c65b3a178bcd475f6bfd9482d713472 100644 --- a/src/main/webapp/WEB-INF/views/projetoes/create.jspx +++ b/src/main/webapp/WEB-INF/views/projetos/create.jspx @@ -2,10 +2,10 @@ <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_Projeto" modelAttribute="projeto" path="/projetoes" render="${empty dependencies}" z="uklzONF0yIPjbEJFSlLMffVUn7g="> - <field:select field="pai" id="c_br_ufpr_c3sl_participatorio_Projeto_pai" itemValue="id" items="${projetoes}" path="/projetoes" z="JkbtdV8KzNjMFgvmaNi11XbZ+Ss="/> - <field:input field="nome" id="c_br_ufpr_c3sl_participatorio_Projeto_nome" required="true" z="user-managed"/> - <field:select field="demanda" id="c_br_ufpr_c3sl_participatorio_Projeto_demanda" items="${tipodemandas}" multiple="true" path="tipodemandas" z="user-managed"/> + <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="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:select field="ministerio" id="c_br_ufpr_c3sl_participatorio_Projeto_ministerio" itemValue="id" items="${ministerios}" path="/ministerios" z="64Y1pviPhH0YUpX4/TLAcEiNf8A="/> @@ -25,7 +25,7 @@ <field:input field="comoFunciona" id="c_br_ufpr_c3sl_participatorio_Projeto_comoFunciona" z="WQT9VOPh8Yng7sdWkKBfWrWJvzY="/> <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:select field="diasFuncionamento" id="c_br_ufpr_c3sl_participatorio_Projeto_diasFuncionamento" items="${tipodiassemanas}" path="tipodiassemanas" z="+BjTvC5bM2N7YGK48eWFIePY8Ks="/> <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="/> @@ -42,8 +42,8 @@ <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"/> + <field:select field="estado" id="c_br_ufpr_c3sl_participatorio_Projeto_estado" items="${tipostatuses}" path="tipostatuses" z="K+kNv0Ov3Ulu6LiKPBQ71hczlOA="/> + <field:select field="usuario" id="c_br_ufpr_c3sl_participatorio_Projeto_usuario" itemValue="id" items="${usuarios}" path="/usuarios" z="4oZg5yvLrUjv5RaOV1LbaRAdauo="/> </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/projetoes/list.jspx b/src/main/webapp/WEB-INF/views/projetos/list.jspx similarity index 75% rename from src/main/webapp/WEB-INF/views/projetoes/list.jspx rename to src/main/webapp/WEB-INF/views/projetos/list.jspx index 493feb11ce441754b9f69a0621f82f23e72ebe22..142c8d74208ba1cfd1d58495ad1acfdc48b1719f 100644 --- a/src/main/webapp/WEB-INF/views/projetoes/list.jspx +++ b/src/main/webapp/WEB-INF/views/projetos/list.jspx @@ -3,20 +3,20 @@ <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="${projetoes}" z="xI7fvnW1b0tKUMMJrSKIiv3ycH0="> - <table:table data="${projetoes}" id="l_br_ufpr_c3sl_participatorio_Projeto" path="/projetoes" z="kamtALNOBI9qFO/YY+1GYa1OhVw="> + <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" render="false" z="user-managed"/> - <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_outroAcao" property="outroAcao" render="false" z="user-managed"/> </table:table> </page:list> </sec:authorize> <sec:authorize ifAnyGranted="Usuario"> - <page:list id="pl_br_ufpr_c3sl_participatorio_Projeto" items="${projetoes}" z="xI7fvnW1b0tKUMMJrSKIiv3ycH0="> - <table:table data="${projetoes}" delete="false" id="l_br_ufpr_c3sl_participatorio_Projeto" path="/projetoes" update="false" z="kamtALNOBI9qFO/YY+1GYa1OhVw="> + <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="/> diff --git a/src/main/webapp/WEB-INF/views/projetoes/mylist.jspx b/src/main/webapp/WEB-INF/views/projetos/mylist.jspx similarity index 86% rename from src/main/webapp/WEB-INF/views/projetoes/mylist.jspx rename to src/main/webapp/WEB-INF/views/projetos/mylist.jspx index 917565fbe3ba4732b4af636ffb342abdfae5e528..5fc8424ebbf9dd33a5c9aab5d816f9b3503a0279 100644 --- a/src/main/webapp/WEB-INF/views/projetoes/mylist.jspx +++ b/src/main/webapp/WEB-INF/views/projetos/mylist.jspx @@ -2,8 +2,8 @@ <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="${projetoes}" z="xI7fvnW1b0tKUMMJrSKIiv3ycH0="> - <table:table data="${projetoes}" id="l_br_ufpr_c3sl_participatorio_Projeto" path="/projetoes" z="kamtALNOBI9qFO/YY+1GYa1OhVw="> + <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="/> diff --git a/src/main/webapp/WEB-INF/views/projetoes/show.jspx b/src/main/webapp/WEB-INF/views/projetos/show.jspx similarity index 97% rename from src/main/webapp/WEB-INF/views/projetoes/show.jspx rename to src/main/webapp/WEB-INF/views/projetos/show.jspx index eb0e5cb1c66ba860adb713ba98b75f6787e1aeeb..d0e118c6a1c49c49708e7df219af86f2b5cc096e 100644 --- a/src/main/webapp/WEB-INF/views/projetoes/show.jspx +++ b/src/main/webapp/WEB-INF/views/projetos/show.jspx @@ -2,7 +2,7 @@ <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="/projetoes" z="D0oL5mYFetkn/bZXW31CJL2EDUE="> + <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="/> @@ -43,6 +43,6 @@ <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"/> + <field:display field="usuario" id="s_br_ufpr_c3sl_participatorio_Projeto_usuario" object="${projeto}" z="zYLKtpIbUdPWnBZ97hES9bx740A="/> </page:show> </div> diff --git a/src/main/webapp/WEB-INF/views/projetoes/showcandidatos.jspx b/src/main/webapp/WEB-INF/views/projetos/showcandidatos.jspx similarity index 99% rename from src/main/webapp/WEB-INF/views/projetoes/showcandidatos.jspx rename to src/main/webapp/WEB-INF/views/projetos/showcandidatos.jspx index 1a8b2856b25c13dda3162f8b53fa51b136893fb1..4b682764470fac1b5a1ac9501fb5cc2d300c18c9 100644 --- a/src/main/webapp/WEB-INF/views/projetoes/showcandidatos.jspx +++ b/src/main/webapp/WEB-INF/views/projetos/showcandidatos.jspx @@ -2,7 +2,7 @@ <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="/projetoes" z="D0oL5mYFetkn/bZXW31CJL2EDUE="> + <page:show id="ps_br_ufpr_c3sl_participatorio_Projeto" object="${projeto}" path="/projetos" z="D0oL5mYFetkn/bZXW31CJL2EDUE="> <sec:authorize ifAnyGranted="Administrador"> <form action="" method="POST"> diff --git a/src/main/webapp/WEB-INF/views/projetoes/update.jspx b/src/main/webapp/WEB-INF/views/projetos/update.jspx similarity index 92% rename from src/main/webapp/WEB-INF/views/projetoes/update.jspx rename to src/main/webapp/WEB-INF/views/projetos/update.jspx index 9e3dbec7f83482f81067bdfac7e44cd2ad6d77c2..1152807285022db3beed5158fb2bc22bcfdeaa01 100644 --- a/src/main/webapp/WEB-INF/views/projetoes/update.jspx +++ b/src/main/webapp/WEB-INF/views/projetos/update.jspx @@ -2,10 +2,10 @@ <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_Projeto" modelAttribute="projeto" path="/projetoes" versionField="Version" z="5Ih+lV0KpGE1fSZecQ2VR8b5JFQ="> - <field:select field="pai" id="c_br_ufpr_c3sl_participatorio_Projeto_pai" itemValue="id" items="${projetoes}" path="/projetoes" z="JkbtdV8KzNjMFgvmaNi11XbZ+Ss="/> - <field:input field="nome" id="c_br_ufpr_c3sl_participatorio_Projeto_nome" required="true" z="user-managed"/> - <field:select field="demanda" id="c_br_ufpr_c3sl_participatorio_Projeto_demanda" items="${tipodemandas}" multiple="true" path="tipodemandas" z="user-managed"/> + <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="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:select field="ministerio" id="c_br_ufpr_c3sl_participatorio_Projeto_ministerio" itemValue="id" items="${ministerios}" path="/ministerios" z="64Y1pviPhH0YUpX4/TLAcEiNf8A="/> @@ -25,7 +25,7 @@ <field:input field="comoFunciona" id="c_br_ufpr_c3sl_participatorio_Projeto_comoFunciona" z="WQT9VOPh8Yng7sdWkKBfWrWJvzY="/> <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:select field="diasFuncionamento" id="c_br_ufpr_c3sl_participatorio_Projeto_diasFuncionamento" items="${tipodiassemanas}" path="tipodiassemanas" z="+BjTvC5bM2N7YGK48eWFIePY8Ks="/> <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="/> @@ -43,6 +43,6 @@ <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" z="K+kNv0Ov3Ulu6LiKPBQ71hczlOA="/> - <field:select field="usuario" id="c_br_ufpr_c3sl_participatorio_Projeto_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="user-managed"/> + <field:select field="usuario" id="c_br_ufpr_c3sl_participatorio_Projeto_usuario" itemValue="id" items="${usuarios}" path="/usuarios" z="4oZg5yvLrUjv5RaOV1LbaRAdauo="/> </form:update> </div> diff --git a/src/main/webapp/WEB-INF/views/projetoes/views.xml b/src/main/webapp/WEB-INF/views/projetos/views.xml similarity index 62% rename from src/main/webapp/WEB-INF/views/projetoes/views.xml rename to src/main/webapp/WEB-INF/views/projetos/views.xml index 7fb6ae35847aa1e71572be8903d9df86f0b7c403..8f8f895be399337bab7d3c37c313533be45b3c70 100644 --- a/src/main/webapp/WEB-INF/views/projetoes/views.xml +++ b/src/main/webapp/WEB-INF/views/projetos/views.xml @@ -1,25 +1,25 @@ <?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="projetoes/list"> - <put-attribute name="body" value="/WEB-INF/views/projetoes/list.jspx"/> + <definition extends="default" name="projetos/list"> + <put-attribute name="body" value="/WEB-INF/views/projetos/list.jspx"/> </definition> - <definition extends="default" name="projetoes/mylist"> - <put-attribute name="body" value="/WEB-INF/views/projetoes/mylist.jspx"/> + <definition extends="default" name="projetos/mylist"> + <put-attribute name="body" value="/WEB-INF/views/projetos/mylist.jspx"/> </definition> -<definition extends="default" name="projetoes/show"> - <put-attribute name="body" value="/WEB-INF/views/projetoes/show.jspx"/> +<definition extends="default" name="projetos/show"> + <put-attribute name="body" value="/WEB-INF/views/projetos/show.jspx"/> </definition> -<definition extends="default" name="projetoes/create"> - <put-attribute name="body" value="/WEB-INF/views/projetoes/create.jspx"/> +<definition extends="default" name="projetos/create"> + <put-attribute name="body" value="/WEB-INF/views/projetos/create.jspx"/> </definition> -<definition extends="default" name="projetoes/update"> - <put-attribute name="body" value="/WEB-INF/views/projetoes/update.jspx"/> +<definition extends="default" name="projetos/update"> + <put-attribute name="body" value="/WEB-INF/views/projetos/update.jspx"/> </definition> - <definition extends="default" name="projetoes/showcandidatos"> - <put-attribute name="body" value="/WEB-INF/views/projetoes/showcandidatos.jspx"/> + <definition extends="default" name="projetos/showcandidatos"> + <put-attribute name="body" value="/WEB-INF/views/projetos/showcandidatos.jspx"/> </definition> </tiles-definitions>