diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController.java index 7bf05c05ad266f99e01fe39cb61f7be997e5285c..7cf97738854a8f3e75feb0bf35e618bab65de894 100644 --- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController.java +++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController.java @@ -88,7 +88,6 @@ public class OcorrenciaMunicipalController { @RequestMapping(value = "/form/{ids}", method = {RequestMethod.POST,RequestMethod.PUT}, produces = "text/html") public String treatSelected(@Valid OcorrenciaMunicipal ocorrenciaMunicipal, @PathVariable("ids") String ids, Model uiModel, HttpServletRequest httpServletRequest) { - ocorrenciaMunicipalGlobal = ocorrenciaMunicipal; refreshRelations(); for(String idString : ids.split("\\+")){ @@ -215,6 +214,12 @@ public class OcorrenciaMunicipalController { return "uncaughtException"; } + @RequestMapping(params = "formItinerante", produces = "text/html") + public String createFormItinerante(Model uiModel) { + populateEditForm(uiModel, new OcorrenciaMunicipal()); + return "ocorrenciamunicipais/createitinerante"; + } + @RequestMapping(method = RequestMethod.POST, produces = "text/html") public String create(@Valid OcorrenciaMunicipal ocorrenciaMunicipal, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) { if (bindingResult.hasErrors()) { diff --git a/src/main/webapp/WEB-INF/views/menu.jspx b/src/main/webapp/WEB-INF/views/menu.jspx index d30900396682876a819c250ebae4f6057f852950..fd342230542fdf4d3d5973a7b3a8a1759a943985 100644 --- a/src/main/webapp/WEB-INF/views/menu.jspx +++ b/src/main/webapp/WEB-INF/views/menu.jspx @@ -13,6 +13,7 @@ </menu:category> <menu:category id="c_ocorrenciamunicipal" z="NVk8x1ulTq/1N0/zyXMION5KAQA="> <menu:item id="i_ocorrenciamunicipal_new" messageCode="global_menu_new" url="/ocorrenciamunicipais?form" z="user-managed"/> + <menu:item id="i_ocorrenciamunicipal_new" messageCode="global_menu_new" url="/ocorrenciamunicipais?formItinerante" z="user-managed"/> <menu:item id="i_ocorrenciamunicipal_list" messageCode="my_occurrences" url="/ocorrenciamunicipais/minhasocorrencias" z="user-managed"/> <menu:item id="i_ocorrenciamunicipal_list" messageCode="global_menu_list_candidato" url="/ocorrenciamunicipais/listCandidatos" z="user-managed"/> <menu:item id="i_ocorrenciamunicipal_list" messageCode="global_menu_list_efetivo" url="/ocorrenciamunicipais/listEfetivos" z="user-managed"/> diff --git a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/createitinerante.jspx b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/createitinerante.jspx new file mode 100644 index 0000000000000000000000000000000000000000..236f6747f1f04f54fa5ec2553bc2c80b63d6f5b2 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/createitinerante.jspx @@ -0,0 +1,26 @@ +<?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_estacaojuventude_OcorrenciaMunicipal" modelAttribute="ocorrenciaMunicipal" path="/ocorrenciamunicipais" render="${empty dependencies}" z="fo6q8lg/xzZrtO1TWfNK0cjMjdk="> + <field:select field="programaVinculado" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_programaVinculado" itemValue="id" items="${programas}" path="/programas" z="6peHWMq5LFS5h3Dz8xNLNeBW9Rc="/> + <field:select field="orgaosExecutores" hintValue="hint_orgaos_executores" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/ocorrenciamunicipais" z="user-managed"/> + <field:textarea field="beneficiosLocais" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" z="user-managed"/> + <!-- <field:input field="beneficiosLocais" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" z="4+gr9Eh5QnqAtYMJBTazSWU4OHY="/> --> + <field:input field="comoAcessar" hintValue="hint_como_acessar" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_comoAcessar" z="user-managed"/> + <field:datetime dateTimePattern="${ocorrenciaMunicipal_inicioinscricoes_date_format}" field="inicioInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_inicioInscricoes" widthcss="65px" z="user-managed"/> + <field:datetime dateTimePattern="${ocorrenciaMunicipal_fiminscricoes_date_format}" field="fimInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_fimInscricoes" widthcss="65px" z="user-managed"/> + <field:select field="localizacoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_localizacoes" itemValue="id" items="${localizacaos}" multiple="true" path="/localizacoes" render="false" z="user-managed"/> + <field:input field="quantidadeVagas" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_quantidadeVagas" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*" widthcss="30px" z="user-managed"/> + <field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_status" items="${tipostatuses}" path="tipostatuses" render="false" z="user-managed"/> + <field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="user-managed"/> + <field:datetime dateTimePattern="${ocorrenciaMunicipal_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_ultimaAlteracao" render="false" z="user-managed"/> + <field:select field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_situacao" items="${situacaos}" path="situacaos" widthcss="60px" z="user-managed"/> + <field:textarea field="observacao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_observacao" z="user-managed"/> + + <field:select field="municipios" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipios" itemValue="id" items="${municipios}" multiple="true" path="/ocorrenciamunicipais" z="BD05YnRdtdU25XgKJrSAq3Mc+f4="/> + + </form:create> + <form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" render="${not empty dependencies}" z="ame9911g+go04TVYVVTrRJK0UOs="/> + +</div> diff --git a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/views.xml b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/views.xml index a3fa17d440c151841a76c1700db6c743bbc846c1..873f9e32798fb9ed677d94f4cd750ed02d2283c1 100644 --- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/views.xml +++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/views.xml @@ -10,6 +10,9 @@ <definition extends="default" name="ocorrenciamunicipais/create"> <put-attribute name="body" value="/WEB-INF/views/ocorrenciamunicipais/create.jspx"/> </definition> + <definition extends="default" name="ocorrenciamunicipais/createitinerante"> + <put-attribute name="body" value="/WEB-INF/views/ocorrenciamunicipais/createitinerante.jspx"/> + </definition> <definition extends="default" name="ocorrenciamunicipais/update"> <put-attribute name="body" value="/WEB-INF/views/ocorrenciamunicipais/update.jspx"/> </definition>