diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/LocalizacaoController.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/LocalizacaoController.java index 5a177963e4d0534cd6ef1e919489e172ebcaeb77..27b177a7d9ba82365d10c55c22f6e7007403fc85 100644 --- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/LocalizacaoController.java +++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/LocalizacaoController.java @@ -194,7 +194,7 @@ public class LocalizacaoController { uiModel.addAttribute("usuarios", Usuario.findAllUsuarios()); uiModel.addAttribute("tipostatuses", Arrays.asList(TipoStatus.values())); - uiModel.addAttribute("situacaos", Arrays.asList(Situacao.values())); + uiModel.addAttribute("situacaos", Arrays.asList(" ", Situacao.Ativo, Situacao.Inativo)); } } 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 1260c8236ee51fd1af306a193020526b13d24122..1ac26a0ef0084f793e84a0e0f6e493c08428e00e 100644 --- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController.java +++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController.java @@ -206,6 +206,6 @@ public class OcorrenciaMunicipalController { uiModel.addAttribute("tipostatuses", Arrays.asList(TipoStatus.values())); uiModel.addAttribute("situacaos", Arrays.asList(Situacao.values())); - uiModel.addAttribute("usuarios", Usuario.findAllUsuarios()); + uiModel.addAttribute("situacaos", Arrays.asList(" ", Situacao.Ativo, Situacao.Inativo)); } } diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java index 083964b012eff18f6d519f1dd763825c43507a7b..a110b6afe91955fec5a7898c9633447ec232ee13 100644 --- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java +++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java @@ -208,7 +208,7 @@ public class ProgramaController { uiModel.addAttribute("tematicas", Tematica.findAllTematicas()); uiModel.addAttribute("orgaoexecutores", OrgaoExecutor.findAllOrgaoExecutors()); uiModel.addAttribute("tipostatuses", Arrays.asList(TipoStatus.values())); - uiModel.addAttribute("situacaos", Arrays.asList(Situacao.values())); + uiModel.addAttribute("situacaos", Arrays.asList(" ", Situacao.Ativo, Situacao.Inativo)); //uiModel.addAttribute("tipotemporalidades", Arrays.asList(TipoTemporalidade.values())); uiModel.addAttribute("tipotemporalidades", Arrays.asList(" ",TipoTemporalidade.Eventual,TipoTemporalidade.Permanente,TipoTemporalidade.Temporario)); //uiModel.addAttribute("nivelprogramas", Arrays.asList(NivelPrograma.values())); diff --git a/src/main/webapp/WEB-INF/views/localizacoes/create.jspx b/src/main/webapp/WEB-INF/views/localizacoes/create.jspx index 7e0252e12e5fa9b32a0d36c307991a404705cd4a..11091ae40b3cc37c45f1ff3f3f40f53939cfb437 100644 --- a/src/main/webapp/WEB-INF/views/localizacoes/create.jspx +++ b/src/main/webapp/WEB-INF/views/localizacoes/create.jspx @@ -13,7 +13,7 @@ <field:input field="quantidadeVagas" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_quantidadeVagas" validationMessageCode="field_invalid_integer" z="UmLVOAQqGSoB5tMvB5qExH6t+2U="/> <field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_status" items="${tipostatuses}" path="tipostatuses" render="false" z="user-managed"/> <field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="user-managed"/> - <field:select field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_situacao" items="${situacaos}" path="situacaos" render="false" z="user-managed"/> + <field:select field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_situacao" items="${situacaos}" path="situacaos" z="jCGDX8PAVbMAynepL96G296Jlxw="/> <field:datetime dateTimePattern="${localizacao_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ultimaAlteracao" render="false" z="user-managed"/> </form:create> <form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_estacaojuventude_Localizacao" render="${not empty dependencies}" z="amxA8+e0EPwKgmIH7qv1LRMRRzA="/> diff --git a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx index 428589a67d78251e8f1acda2213dc2433cbe7d64..0efe64e0d9b7e57bf7c4fd2e8132dc3f1e0bc996 100644 --- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx +++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx @@ -15,7 +15,7 @@ <field:input field="quantidadeVagas" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_quantidadeVagas" validationMessageCode="field_invalid_integer" z="VVOME2kMr4+rxAFNbv5sTC6HvAw="/> <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:select field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_situacao" items="${situacaos}" path="situacaos" render="false" z="user-managed"/> + <field:select field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_situacao" items="${situacaos}" path="situacaos" z="jCGDX8PAVbMAynepL96G296Jlxw="/> <field:datetime dateTimePattern="${ocorrenciaMunicipal_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_ultimaAlteracao" render="false" z="user-managed"/> </form:create> <form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" render="${not empty dependencies}" z="ame9911g+go04TVYVVTrRJK0UOs="/> diff --git a/src/main/webapp/WEB-INF/views/programas/create.jspx b/src/main/webapp/WEB-INF/views/programas/create.jspx index 31bcd4454dd3147741a13a7861a30a4c8be75fd1..d9f53e42e4f433b9b3f05e831d35abb374b7a872 100644 --- a/src/main/webapp/WEB-INF/views/programas/create.jspx +++ b/src/main/webapp/WEB-INF/views/programas/create.jspx @@ -30,7 +30,7 @@ <field:select field="ocorrencias" id="c_br_ufpr_c3sl_estacaojuventude_Programa_ocorrencias" itemValue="id" items="${ocorrenciamunicipais}" multiple="true" path="/ocorrenciamunicipais" render="false" z="user-managed"/> <field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_Programa_status" items="${tipostatuses}" path="tipostatuses" render="false" z="user-managed"/> <field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_Programa_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="user-managed"/> - <field:select field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_situacao" items="${situacaos}" path="situacaos" render="false" z="user-managed"/> + <field:select field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_situacao" items="${situacaos}" path="situacaos" z="jCGDX8PAVbMAynepL96G296Jlxw="/> <field:datetime dateTimePattern="${programa_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_ultimaAlteracao" render="false" z="user-managed"/> </form:create> <form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_estacaojuventude_Programa" render="${not empty dependencies}" z="SGDKTfhxhuHYdZv+eepy6Aqnz/c="/>