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

campos select em branco (ajustes necessarios)

parent d625b062
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 61 additions and 48 deletions
src/main/java/br/ufpr/c3sl/participatorio/web/ApplicationConversionServiceFactoryBean.java
+ 25
− 0
View file @ a70f5f73
package br.ufpr.c3sl.participatorio.web;
import org.springframework.core.convert.converter.Converter;
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.Ministerio;
import br.ufpr.c3sl.participatorio.Projeto;
/**
* A central place to register application converters and formatters.
*/
......@@ -15,4 +19,25 @@ public class ApplicationConversionServiceFactoryBean extends FormattingConversio
super.installFormatters(registry);
// Register application converters and formatters
}
public Converter<Ministerio, String> getMinisterioToStringConverter() {
return new org.springframework.core.convert.converter.Converter<br.ufpr.c3sl.participatorio.Ministerio, java.lang.String>() {
public String convert(Ministerio ministerio) {
if (ministerio.getNome() == null)
return new StringBuilder().append(' ').toString();
return new StringBuilder().append(ministerio.getNome()).toString();
}
};
}
public Converter<Projeto, String> getProjetoToStringConverter() {
return new org.springframework.core.convert.converter.Converter<br.ufpr.c3sl.participatorio.Projeto, java.lang.String>() {
public String convert(Projeto projeto) {
if (projeto.getNome() == null)
return new StringBuilder().append(' ').toString();
return new StringBuilder().append(projeto.getNome()).toString();
}
};
}
}
src/main/java/br/ufpr/c3sl/participatorio/web/ApplicationConversionServiceFactoryBean_Roo_ConversionService.aj
+ 0
− 16
View file @ a70f5f73
......@@ -15,14 +15,6 @@ privileged aspect ApplicationConversionServiceFactoryBean_Roo_ConversionService
declare @type: ApplicationConversionServiceFactoryBean: @Configurable;
public Converter<Ministerio, String> ApplicationConversionServiceFactoryBean.getMinisterioToStringConverter() {
return new org.springframework.core.convert.converter.Converter<br.ufpr.c3sl.participatorio.Ministerio, java.lang.String>() {
public String convert(Ministerio ministerio) {
return new StringBuilder().append(ministerio.getNome()).toString();
}
};
}
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) {
......@@ -39,14 +31,6 @@ privileged aspect ApplicationConversionServiceFactoryBean_Roo_ConversionService
};
}
public Converter<Projeto, String> ApplicationConversionServiceFactoryBean.getProjetoToStringConverter() {
return new org.springframework.core.convert.converter.Converter<br.ufpr.c3sl.participatorio.Projeto, java.lang.String>() {
public String convert(Projeto projeto) {
return new StringBuilder().append(projeto.getNome()).append(' ').append(projeto.getOutroAcao()).append(' ').append(projeto.getObjetivo()).append(' ').append(projeto.getRua()).toString();
}
};
}
public Converter<Long, Projeto> ApplicationConversionServiceFactoryBean.getIdToProjetoConverter() {
return new org.springframework.core.convert.converter.Converter<java.lang.Long, br.ufpr.c3sl.participatorio.Projeto>() {
public br.ufpr.c3sl.participatorio.Projeto convert(java.lang.Long id) {
......
src/main/java/br/ufpr/c3sl/participatorio/web/ProjetoController.java
+ 28
− 0
View file @ a70f5f73
package br.ufpr.c3sl.participatorio.web;
import java.util.Arrays;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
......@@ -14,9 +17,14 @@ 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.Ministerio;
import br.ufpr.c3sl.participatorio.Projeto;
import br.ufpr.c3sl.participatorio.Usuario;
import br.ufpr.c3sl.participatorio.enums.TipoAcao;
import br.ufpr.c3sl.participatorio.enums.TipoDemanda;
import br.ufpr.c3sl.participatorio.enums.TipoDiasSemana;
import br.ufpr.c3sl.participatorio.enums.TipoStatus;
import br.ufpr.c3sl.participatorio.enums.TipoTemporalidade;
import br.ufpr.c3sl.participatorio.enums.TipoUsuario;
@RequestMapping("/projetoes")
......@@ -140,4 +148,24 @@ public class ProjetoController {
}
return "redirect:/projetoes/" + encodeUrlPathSegment(projeto.getId().toString(), httpServletRequest);
}
void populateEditForm(Model uiModel, Projeto projeto) {
uiModel.addAttribute("projeto", projeto);
addDateTimeFormatPatterns(uiModel);
List<Ministerio> lm = Ministerio.findAllMinisterios();
lm.add(0, new Ministerio());
uiModel.addAttribute("ministerios", lm);
List<Projeto> lp = Projeto.findAllProjetoes();
lp.add(0, new Projeto());
uiModel.addAttribute("projetoes", lp);
uiModel.addAttribute("usuarios", Usuario.findAllUsuarios());
uiModel.addAttribute("tipoacaos", Arrays.asList(TipoAcao.values()));
uiModel.addAttribute("tipodemandas", Arrays.asList(TipoDemanda.values()));
uiModel.addAttribute("tipodiassemanas", Arrays.asList(TipoDiasSemana.values()));
uiModel.addAttribute("tipostatuses", Arrays.asList(TipoStatus.values()));
uiModel.addAttribute("tipotemporalidades", Arrays.asList(TipoTemporalidade.values()));
}
}
src/main/java/br/ufpr/c3sl/participatorio/web/ProjetoController_Roo_Controller.aj
+ 0
− 21
View file @ a70f5f73
......@@ -3,17 +3,9 @@
package br.ufpr.c3sl.participatorio.web;
import br.ufpr.c3sl.participatorio.Ministerio;
import br.ufpr.c3sl.participatorio.Projeto;
import br.ufpr.c3sl.participatorio.Usuario;
import br.ufpr.c3sl.participatorio.enums.TipoAcao;
import br.ufpr.c3sl.participatorio.enums.TipoDemanda;
import br.ufpr.c3sl.participatorio.enums.TipoDiasSemana;
import br.ufpr.c3sl.participatorio.enums.TipoStatus;
import br.ufpr.c3sl.participatorio.enums.TipoTemporalidade;
import br.ufpr.c3sl.participatorio.web.ProjetoController;
import java.io.UnsupportedEncodingException;
import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
import org.joda.time.format.DateTimeFormat;
import org.springframework.context.i18n.LocaleContextHolder;
......@@ -68,19 +60,6 @@ privileged aspect ProjetoController_Roo_Controller {
uiModel.addAttribute("projeto_datainicio_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
}
void ProjetoController.populateEditForm(Model uiModel, Projeto projeto) {
uiModel.addAttribute("projeto", projeto);
addDateTimeFormatPatterns(uiModel);
uiModel.addAttribute("ministerios", Ministerio.findAllMinisterios());
uiModel.addAttribute("projetoes", Projeto.findAllProjetoes());
uiModel.addAttribute("usuarios", Usuario.findAllUsuarios());
uiModel.addAttribute("tipoacaos", Arrays.asList(TipoAcao.values()));
uiModel.addAttribute("tipodemandas", Arrays.asList(TipoDemanda.values()));
uiModel.addAttribute("tipodiassemanas", Arrays.asList(TipoDiasSemana.values()));
uiModel.addAttribute("tipostatuses", Arrays.asList(TipoStatus.values()));
uiModel.addAttribute("tipotemporalidades", Arrays.asList(TipoTemporalidade.values()));
}
String ProjetoController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
String enc = httpServletRequest.getCharacterEncoding();
if (enc == null) {
......
src/main/webapp/WEB-INF/views/menu.jspx
+ 8
− 11
View file @ a70f5f73
......@@ -7,21 +7,18 @@
<menu:item id="i_projeto_new" messageCode="global_menu_new" url="/projetoes?form" z="OY49hJ+taMk1k3ASiEFt4sGXCSU="/>
<!-- <menu:item id="i_projeto_list" messageCode="global_menu_list" url="/projetoes?page=1&amp;size=${empty param.size ? 10 : param.size}" z="x1vvsZFRYLoITzX2jIKG93Z4DWM="/> -->
<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="x1vvsZFRYLoITzX2jIKG93Z4DWM="/>
<menu:item id="i_projeto_list" messageCode="global_menu_list_rejeitado" url="/projetoes/listRejeitados" z="x1vvsZFRYLoITzX2jIKG93Z4DWM="/>
<menu:item id="i_projeto_list" messageCode="my_projects" url="/projetoes/meusprojetos" z="x1vvsZFRYLoITzX2jIKG93Z4DWM="/>
<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:item id="i_projeto_list" messageCode="my_projects" url="/projetoes/meusprojetos" 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="/>
<menu:item id="i_ministerio_list" messageCode="global_menu_list" url="/ministerios?page=1&amp;size=${empty param.size ? 10 : param.size}" z="3dj4WmtVHkR+jV7Vbj/veXWsVQ8="/>
<menu:item id="i_ministerio_list" messageCode="global_menu_list" url="/ministerios" z="user-managed"/>
</menu:category>
<menu:category id="c_usuario" z="g6oG0656PcsmmvUYeBtpgiQROck=">
<menu:item id="i_usuario_new" messageCode="global_menu_new" url="/usuarios?form" z="RG1gCsiZQjg1HLDzXbHKht6yDkw="/>
<menu:item id="i_usuario_list" messageCode="global_menu_list" url="/usuarios?page=1&amp;size=${empty param.size ? 10 : param.size}" z="P7ZIPrcTTBR41JYD0QldbYgsZrM="/>
<menu:item id="i_usuario_list" messageCode="global_menu_list" url="/usuarios" z="user-managed"/>
</menu:category>
</sec:authorize>
</menu:menu>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment