From 072d004ac9080414f59d4daa95e9b3f4d19b431d Mon Sep 17 00:00:00 2001
From: Dalmon Ian Martins de Oliveira <dimo13.c3sl.ufpr.br>
Date: Fri, 14 Feb 2014 11:47:13 -0200
Subject: [PATCH] =?UTF-8?q?Campo=20situa=C3=A7=C3=A3o=20possui=20campo=20e?=
=?UTF-8?q?m=20branco?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ufpr/c3sl/estacaojuventude/web/LocalizacaoController.java | 2 +-
.../estacaojuventude/web/OcorrenciaMunicipalController.java | 2 +-
.../br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java | 2 +-
src/main/webapp/WEB-INF/views/localizacoes/create.jspx | 2 +-
src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx | 2 +-
src/main/webapp/WEB-INF/views/programas/create.jspx | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
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 5a17796..27b177a 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 1260c82..1ac26a0 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 083964b..a110b6a 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 7e0252e..11091ae 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 428589a..0efe64e 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 31bcd44..d9f53e4 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="/>
--
GitLab