diff --git a/.gitignore b/.gitignore index 9fd17aecb1cdd655a85b2f39dfac930e84d9d2c2..4beea4f4ab63cb39dfd496f1df669e8ccd759e51 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /target/ /src/main/resources/META-INF/spring/database.properties /log.roo +/src/main/resources/commented_log4j.xml diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/Estado.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/Estado.java index e80bbcb9a54669afc50a14753c7dbd73cb7ef74e..c83a5c59eabd1b4558f5ed768e4ea4e2b4350c4b 100644 --- a/src/main/java/br/ufpr/c3sl/estacaojuventude/Estado.java +++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/Estado.java @@ -2,6 +2,7 @@ package br.ufpr.c3sl.estacaojuventude; import java.util.Date; import java.util.HashSet; +import java.util.List; import java.util.Set; import javax.persistence.CascadeType; @@ -29,4 +30,8 @@ public class Estado { @Temporal(TemporalType.DATE) @DateTimeFormat(style = "S-") private Date ultimaAlteracao; + + public static List<Estado> findAllEstadoes() { + return entityManager().createQuery("SELECT o FROM Estado o ORDER BY nome", Estado.class).getResultList(); + } } diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/Estado_Roo_Jpa_ActiveRecord.aj b/src/main/java/br/ufpr/c3sl/estacaojuventude/Estado_Roo_Jpa_ActiveRecord.aj index 5b8792b8471363d2f49e72d1a2668e857cf26f1c..6d34ab33a83fe0280864b4c294773eb03961ae2e 100644 --- a/src/main/java/br/ufpr/c3sl/estacaojuventude/Estado_Roo_Jpa_ActiveRecord.aj +++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/Estado_Roo_Jpa_ActiveRecord.aj @@ -24,10 +24,6 @@ privileged aspect Estado_Roo_Jpa_ActiveRecord { return entityManager().createQuery("SELECT COUNT(o) FROM Estado o", Long.class).getSingleResult(); } - public static List<Estado> Estado.findAllEstadoes() { - return entityManager().createQuery("SELECT o FROM Estado o", Estado.class).getResultList(); - } - public static Estado Estado.findEstado(Long id) { if (id == null) return null; return entityManager().find(Estado.class, id); diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/OrgaoExecutor.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/OrgaoExecutor.java index cf9c5981f861e9ff3042750ddb16b7b076f8cb7a..1d8a4dce96b7de8806b8b9eb39fc86b6eac642b1 100644 --- a/src/main/java/br/ufpr/c3sl/estacaojuventude/OrgaoExecutor.java +++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/OrgaoExecutor.java @@ -18,6 +18,8 @@ public class OrgaoExecutor { private String nome; + private String sigla; + private String site; @Column(columnDefinition = "text") diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/OrgaoExecutor_Roo_JavaBean.aj b/src/main/java/br/ufpr/c3sl/estacaojuventude/OrgaoExecutor_Roo_JavaBean.aj index 810f1f23ac01c712dd938621cfdaf08e94780363..5675671e7578c2f1bed470bf59db9d03fc1d7db6 100644 --- a/src/main/java/br/ufpr/c3sl/estacaojuventude/OrgaoExecutor_Roo_JavaBean.aj +++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/OrgaoExecutor_Roo_JavaBean.aj @@ -16,6 +16,14 @@ privileged aspect OrgaoExecutor_Roo_JavaBean { this.nome = nome; } + public String OrgaoExecutor.getSigla() { + return this.sigla; + } + + public void OrgaoExecutor.setSigla(String sigla) { + this.sigla = sigla; + } + public String OrgaoExecutor.getSite() { return this.site; } diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/Programa.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/Programa.java index d631aba87a42bb9b0edea66f8ba8cb40926fc8a5..960db033b949f09a128de0cf2361a0d6035c9708 100644 --- a/src/main/java/br/ufpr/c3sl/estacaojuventude/Programa.java +++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/Programa.java @@ -70,6 +70,7 @@ public class Programa { @Column(columnDefinition = "text") private String criteriosAcesso; + @Column(columnDefinition = "text") private String duracao; @ManyToMany(cascade = CascadeType.ALL) @@ -98,15 +99,15 @@ public class Programa { private Date ultimaAlteracao; public static List<Programa> findAllProgramasCandidatos() { - return entityManager().createNativeQuery("SELECT * FROM Programa WHERE status = 'Candidato'", Programa.class).getResultList(); + return entityManager().createNativeQuery("SELECT * FROM Programa WHERE status = 'Candidato' ORDER BY nome_oficial", Programa.class).getResultList(); } public static List<Programa> findAllProgramasEfetivos() { - return entityManager().createNativeQuery("SELECT * FROM Programa WHERE status = 'Efetivo'", Programa.class).getResultList(); + return entityManager().createNativeQuery("SELECT * FROM Programa WHERE status = 'Efetivo' ORDER BY nome_oficial", Programa.class).getResultList(); } public static List<Programa> findAllProgramasRejeitados() { - return entityManager().createNativeQuery("SELECT * FROM Programa WHERE status = 'Rejeitado'", Programa.class).getResultList(); + return entityManager().createNativeQuery("SELECT * FROM Programa WHERE status = 'Rejeitado' ORDER BY nome_oficial", Programa.class).getResultList(); } public static List<Programa> findMeusProgramas() { diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ApplicationConversionServiceFactoryBean.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ApplicationConversionServiceFactoryBean.java index 1badb8b955be90b4aeafe1f07ca9f575788009f9..78d1a76bea8b80fb27d52bc4c6e8d9705d2cac04 100644 --- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ApplicationConversionServiceFactoryBean.java +++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ApplicationConversionServiceFactoryBean.java @@ -32,7 +32,7 @@ public class ApplicationConversionServiceFactoryBean extends FormattingConversio public String convert(Programa programa) { if (programa.getNomeDivulgacao() == null) return new StringBuilder().append(' ').toString(); - return new StringBuilder().append(programa.getNomeDivulgacao()).toString(); + return new StringBuilder().append(programa.getNomeOficial()).toString(); } }; } @@ -40,7 +40,9 @@ public class ApplicationConversionServiceFactoryBean extends FormattingConversio public Converter<OrgaoExecutor, String> getOrgaoExecutorToStringConverter() { return new org.springframework.core.convert.converter.Converter<br.ufpr.c3sl.estacaojuventude.OrgaoExecutor, java.lang.String>() { public String convert(OrgaoExecutor orgaoExecutor) { - return new StringBuilder().append(orgaoExecutor.getNome()).toString(); + if (orgaoExecutor.getSigla() == null) + return new StringBuilder().append("").append(" - ").append(orgaoExecutor.getNome()).toString(); + return new StringBuilder().append(orgaoExecutor.getSigla()).append(" - ").append(orgaoExecutor.getNome()).toString(); } }; } @@ -56,7 +58,7 @@ public class ApplicationConversionServiceFactoryBean extends FormattingConversio public Converter<Estado, String> getEstadoToStringConverter() { return new org.springframework.core.convert.converter.Converter<br.ufpr.c3sl.estacaojuventude.Estado, java.lang.String>() { public String convert(Estado estado) { - return new StringBuilder().append(estado.getNome()).append(" - ").append(estado.getSigla()).toString(); + return new StringBuilder().append(estado.getNome()).toString(); } }; } @@ -72,7 +74,7 @@ public class ApplicationConversionServiceFactoryBean extends FormattingConversio public Converter<Localizacao, String> getLocalizacaoToStringConverter() { return new org.springframework.core.convert.converter.Converter<br.ufpr.c3sl.estacaojuventude.Localizacao, java.lang.String>() { public String convert(Localizacao localizacao) { - return new StringBuilder().append(localizacao.getOcorrencia().getProgramaVinculado().getNomeDivulgacao()).append(" - ").append(localizacao.getOcorrencia().getMunicipio().getNome()).append(" - ").append(localizacao.getLocal()).toString(); + return new StringBuilder().append(localizacao.getOcorrencia().getProgramaVinculado().getNomeOficial()).append(" - ").append(localizacao.getOcorrencia().getMunicipio().getNome()).append(" - ").append(localizacao.getLocal()).toString(); } }; } @@ -80,7 +82,7 @@ public class ApplicationConversionServiceFactoryBean extends FormattingConversio public Converter<OcorrenciaMunicipal, String> getOcorrenciaMunicipalToStringConverter() { return new org.springframework.core.convert.converter.Converter<br.ufpr.c3sl.estacaojuventude.OcorrenciaMunicipal, java.lang.String>() { public String convert(OcorrenciaMunicipal ocorrenciaMunicipal) { - return new StringBuilder().append(ocorrenciaMunicipal.getProgramaVinculado().getNomeDivulgacao()).append(" - ").append(ocorrenciaMunicipal.getMunicipio().getNome()).toString(); + return new StringBuilder().append(ocorrenciaMunicipal.getProgramaVinculado().getNomeOficial()).append(" - ").append(ocorrenciaMunicipal.getMunicipio().getNome()).toString(); } }; } diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/EstadoController.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/EstadoController.java index 38cf5fe73c0ff5c67b08b3eb36e5c2d8d6fe63b6..485930cbc019c776af576c46a34165b536e22679 100644 --- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/EstadoController.java +++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/EstadoController.java @@ -1,6 +1,7 @@ package br.ufpr.c3sl.estacaojuventude.web; import java.util.Calendar; +import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; @@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import br.ufpr.c3sl.estacaojuventude.Estado; +import br.ufpr.c3sl.estacaojuventude.Municipio; @RequestMapping("/estados") @Controller @@ -74,4 +76,15 @@ public class EstadoController { //uiModel.addAttribute("size", (size == null) ? "10" : size.toString()); return "redirect:/estados"; } + + void populateEditForm(Model uiModel, Estado estado) { + uiModel.addAttribute("estado", estado); + addDateTimeFormatPatterns(uiModel); + uiModel.addAttribute("municipios", Municipio.findAllMunicipios()); + List<Estado> le = Estado.findAllEstadoes(); + Estado e = new Estado(); + e.setNome(""); + le.add(0, e); + uiModel.addAttribute("estados", le); + } } diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/EstadoController_Roo_Controller.aj b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/EstadoController_Roo_Controller.aj index 7dcfc6eb4b52886d927f36548ab447e859f65a35..d8b1db976e09a570c033e731ba0f23076c5f04c4 100644 --- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/EstadoController_Roo_Controller.aj +++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/EstadoController_Roo_Controller.aj @@ -4,7 +4,6 @@ package br.ufpr.c3sl.estacaojuventude.web; import br.ufpr.c3sl.estacaojuventude.Estado; -import br.ufpr.c3sl.estacaojuventude.Municipio; import br.ufpr.c3sl.estacaojuventude.web.EstadoController; import java.io.UnsupportedEncodingException; import javax.servlet.http.HttpServletRequest; @@ -42,12 +41,6 @@ privileged aspect EstadoController_Roo_Controller { uiModel.addAttribute("estado_ultimaalteracao_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale())); } - void EstadoController.populateEditForm(Model uiModel, Estado estado) { - uiModel.addAttribute("estado", estado); - addDateTimeFormatPatterns(uiModel); - uiModel.addAttribute("municipios", Municipio.findAllMunicipios()); - } - String EstadoController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) { String enc = httpServletRequest.getCharacterEncoding(); if (enc == null) { 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 365ed2fc5b436a82110fadde6870dafc3fd6a277..b87c2aab3af1f19625649db9ad0918f193bd737d 100644 --- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java +++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java @@ -2,6 +2,7 @@ package br.ufpr.c3sl.estacaojuventude.web; import java.util.Arrays; import java.util.Calendar; +import java.util.Iterator; import java.util.List; import javax.servlet.http.HttpServletRequest; @@ -208,8 +209,10 @@ public class ProgramaController { uiModel.addAttribute("orgaoexecutores", OrgaoExecutor.findAllOrgaoExecutors()); uiModel.addAttribute("tipostatuses", Arrays.asList(TipoStatus.values())); uiModel.addAttribute("situacaos", Arrays.asList(Situacao.values())); - uiModel.addAttribute("tipotemporalidades", Arrays.asList(TipoTemporalidade.values())); - uiModel.addAttribute("nivelprogramas", Arrays.asList(NivelPrograma.values())); + //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())); + uiModel.addAttribute("nivelprogramas", Arrays.asList("",NivelPrograma.Estadual,NivelPrograma.Municipal,NivelPrograma.Nacional)); uiModel.addAttribute("ocorrenciamunicipais", OcorrenciaMunicipal.findAllOcorrenciaMunicipals()); } diff --git a/src/main/resources/META-INF/spring/applicationContext.xml b/src/main/resources/META-INF/spring/applicationContext.xml index d0db7506c2e7ecfcc8604b2ee7d6c4ea34f38a16..13e46e2d7ab0937e835ac073524d5b77755b7caa 100644 --- a/src/main/resources/META-INF/spring/applicationContext.xml +++ b/src/main/resources/META-INF/spring/applicationContext.xml @@ -43,7 +43,7 @@ The most commonly used annotation is @Autowired, which instructs Spring to dependency inject an object into your class. --> - <context:component-scan base-package="br.ufpr.c3sl.participatorio"> + <context:component-scan base-package="br.ufpr.c3sl.estacaojuventude"> <context:exclude-filter expression=".*_Roo_.*" type="regex"/> <context:exclude-filter expression="org.springframework.stereotype.Controller" type="annotation"/> </context:component-scan> diff --git a/src/main/resources/log4j.xml b/src/main/resources/log4j.xml index b1c06e0032cbd37c37497368d6333db542489604..48d084535bb62bbaf9451f5572f0acd7a50ae921 100644 --- a/src/main/resources/log4j.xml +++ b/src/main/resources/log4j.xml @@ -2,9 +2,9 @@ <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> <!-- <appender class="org.apache.log4j.RollingFileAppender" name="R"> --> -<!-- <param value="application.log" name="File"/> --> +<!-- <param value="log/application.log" name="File"/> --> <!-- <param value="1" name="MaxBackupIndex"/> --> -<!-- <param value="100KB" name="MaxFileSize"/> --> +<!-- #<param value="100KB" name="MaxFileSize"/> --> <!-- <layout class="org.apache.log4j.PatternLayout"> --> <!-- <param value="%d [%t] %-5p %c - %m%n" name="ConversionPattern"/> --> @@ -49,47 +49,47 @@ <!-- </appender> --> -<!-- <appender class="org.apache.log4j.ConsoleAppender" name="stdout"> --> -<!-- <layout class="org.apache.log4j.PatternLayout"> --> -<!-- <param value="%d [%t] %-5p %c - %m%n" name="ConversionPattern"/> --> -<!-- </layout> --> + <appender class="org.apache.log4j.ConsoleAppender" name="stdout"> + <layout class="org.apache.log4j.PatternLayout"> + <param value="%d [%t] %-5p %c - %m%n" name="ConversionPattern"/> + </layout> -<!-- <filter class="org.apache.log4j.varia.StringMatchFilter"> --> -<!-- <param name="StringToMatch" value="Authentication success." /> --> -<!-- <param name="AcceptOnMatch" value="true" /> --> -<!-- </filter> --> + <filter class="org.apache.log4j.varia.StringMatchFilter"> + <param name="StringToMatch" value="Authentication success." /> + <param name="AcceptOnMatch" value="true" /> + </filter> -<!-- <filter class="org.apache.log4j.varia.StringMatchFilter"> --> -<!-- <param name="StringToMatch" value="Logging out user" /> --> -<!-- <param name="AcceptOnMatch" value="true" /> --> -<!-- </filter> --> + <filter class="org.apache.log4j.varia.StringMatchFilter"> + <param name="StringToMatch" value="Logging out user" /> + <param name="AcceptOnMatch" value="true" /> + </filter> -<!-- <filter class="org.apache.log4j.varia.StringMatchFilter"> --> -<!-- <param name="StringToMatch" value="Closing prepared statement [insert into" /> --> -<!-- <param name="AcceptOnMatch" value="true" /> --> -<!-- </filter> --> + <filter class="org.apache.log4j.varia.StringMatchFilter"> + <param name="StringToMatch" value="Closing prepared statement [insert into" /> + <param name="AcceptOnMatch" value="true" /> + </filter> -<!-- <filter class="org.apache.log4j.varia.StringMatchFilter"> --> -<!-- <param name="StringToMatch" value="Closing prepared statement [update" /> --> -<!-- <param name="AcceptOnMatch" value="true" /> --> -<!-- </filter> --> + <filter class="org.apache.log4j.varia.StringMatchFilter"> + <param name="StringToMatch" value="Closing prepared statement [update" /> + <param name="AcceptOnMatch" value="true" /> + </filter> -<!-- <filter class="org.apache.log4j.varia.StringMatchFilter"> --> -<!-- <param name="StringToMatch" value="Closing prepared statement [delete from" /> --> -<!-- <param name="AcceptOnMatch" value="true" /> --> -<!-- </filter> --> + <filter class="org.apache.log4j.varia.StringMatchFilter"> + <param name="StringToMatch" value="Closing prepared statement [delete from" /> + <param name="AcceptOnMatch" value="true" /> + </filter> -<!-- <filter class="org.apache.log4j.varia.StringMatchFilter"> --> -<!-- <param name="StringToMatch" value="Publishing event in" /> --> -<!-- <param name="AcceptOnMatch" value="true" /> --> -<!-- </filter> --> + <filter class="org.apache.log4j.varia.StringMatchFilter"> + <param name="StringToMatch" value="Publishing event in" /> + <param name="AcceptOnMatch" value="true" /> + </filter> -<!-- <filter class="org.apache.log4j.varia.StringMatchFilter"> --> -<!-- <param name="StringToMatch" value="Previously Authenticated:" /> --> -<!-- <param name="AcceptOnMatch" value="true" /> --> -<!-- </filter> --> + <filter class="org.apache.log4j.varia.StringMatchFilter"> + <param name="StringToMatch" value="Previously Authenticated:" /> + <param name="AcceptOnMatch" value="true" /> + </filter> -<!-- <filter class="org.apache.log4j.varia.DenyAllFilter"/> --> + <filter class="org.apache.log4j.varia.DenyAllFilter"/> <!-- #clear excess when looking manually --> <!-- #<filter class="org.apache.log4j.varia.StringMatchFilter"> --> @@ -102,42 +102,42 @@ <!-- #<param name="AcceptOnMatch" value="false" /> --> <!-- #</filter> --> -<!-- </appender> --> + </appender> -<!-- <logger name="org.hibernate.engine.query"> --> -<!-- <level value="trace"/> --> -<!-- </logger> --> -<!-- <logger additivity="false" name="org.hibernate.hql.ast.AST"> --> -<!-- <level value="debug"/> --> -<!-- <appender-ref ref="R"/> --> -<!-- </logger> --> -<!-- <logger name="org.hibernate.jdbc"> --> -<!-- <level value="debug"/> --> -<!-- </logger> --> -<!-- <logger additivity="false" name="org.hibernate.SQL"> --> -<!-- <level value="debug"/> --> -<!-- <appender-ref ref="R"/> --> -<!-- </logger> --> -<!-- <logger additivity="false" name="org.hibernate.type"> --> -<!-- <level value="trace"/> --> -<!-- <appender-ref ref="R"/> --> -<!-- </logger> --> + <logger name="org.hibernate.engine.query"> + <level value="trace"/> + </logger> + <logger additivity="false" name="org.hibernate.hql.ast.AST"> + <level value="debug"/> + <appender-ref ref="stdout"/> + </logger> + <logger name="org.hibernate.jdbc"> + <level value="debug"/> + </logger> + <logger additivity="false" name="org.hibernate.SQL"> + <level value="debug"/> + <appender-ref ref="stdout"/> + </logger> + <logger additivity="false" name="org.hibernate.type"> + <level value="trace"/> + <appender-ref ref="stdout"/> + </logger> -<!-- <root> --> -<!-- <level value="trace"/> --> -<!-- <appender-ref ref="R"/> --> -<!-- </root> --> - - <appender class="org.apache.log4j.ConsoleAppender" name="stdout"> - <layout class="org.apache.log4j.PatternLayout"> - <param value="%d [%t] %-5p %c - %m%n" name="ConversionPattern"/> - </layout> - </appender> <root> - <level value="error"/> + <level value="trace"/> <appender-ref ref="stdout"/> </root> +<!-- <appender class="org.apache.log4j.ConsoleAppender" name="stdout"> --> +<!-- <layout class="org.apache.log4j.PatternLayout"> --> +<!-- <param value="%d [%t] %-5p %c - %m%n" name="ConversionPattern"/> --> +<!-- </layout> --> +<!-- </appender> --> +<!-- <root> --> +<!-- <level value="error"/> --> +<!-- <appender-ref ref="stdout"/> --> +<!-- </root> --> + </log4j:configuration> diff --git a/src/main/webapp/WEB-INF/i18n/application.properties b/src/main/webapp/WEB-INF/i18n/application.properties index 29b2cb1278a5451f8591a06d93a6ea67feefd8e1..4b33080d311f6b2fd71edaf7014cc267cf7107a0 100644 --- a/src/main/webapp/WEB-INF/i18n/application.properties +++ b/src/main/webapp/WEB-INF/i18n/application.properties @@ -1,7 +1,7 @@ #Updated at Wed Oct 16 13:28:49 BRT 2013 #Wed Oct 16 13:28:49 BRT 2013 application_name=Banco de Dados Estação Juventude - + label_br_ufpr_c3sl_estacaojuventude_localizacao=Localização label_br_ufpr_c3sl_estacaojuventude_localizacao_email=E-mail label_br_ufpr_c3sl_estacaojuventude_localizacao_endereco=Endereço @@ -44,7 +44,7 @@ label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal_ultimaalteracao=Última label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal_usuario=Usuário label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal_status=Status label_br_ufpr_c3sl_estacaojuventude_ocorrenciamunicipal_version=Versão - + label_br_ufpr_c3sl_estacaojuventude_orgaoexecutor=Orgão Executor label_br_ufpr_c3sl_estacaojuventude_orgaoexecutor_contato=Contato label_br_ufpr_c3sl_estacaojuventude_orgaoexecutor_endereco=Endereço @@ -52,6 +52,7 @@ label_br_ufpr_c3sl_estacaojuventude_orgaoexecutor_id=Id label_br_ufpr_c3sl_estacaojuventude_orgaoexecutor_nome=Nome label_br_ufpr_c3sl_estacaojuventude_orgaoexecutor_plural=Orgãos Executores label_br_ufpr_c3sl_estacaojuventude_orgaoexecutor_ultimaalteracao=Última Alteração +label_br_ufpr_c3sl_estacaojuventude_orgaoexecutor_sigla=Sigla label_br_ufpr_c3sl_estacaojuventude_orgaoexecutor_site=Site label_br_ufpr_c3sl_estacaojuventude_orgaoexecutor_version=Versão @@ -99,7 +100,7 @@ label_br_ufpr_c3sl_estacaojuventude_estado_plural=Estados label_br_ufpr_c3sl_estacaojuventude_estado_sigla=Sigla label_br_ufpr_c3sl_estacaojuventude_estado_ultimaalteracao=Última Alteração label_br_ufpr_c3sl_estacaojuventude_estado_version=Versão - + label_br_ufpr_c3sl_estacaojuventude_usuario=Usuário label_br_ufpr_c3sl_estacaojuventude_usuario_id=Id label_br_ufpr_c3sl_estacaojuventude_usuario_nome=Nome @@ -111,19 +112,19 @@ label_br_ufpr_c3sl_estacaojuventude_usuario_version=Versão label_br_ufpr_c3sl_estacaojuventude_usuario_ultimaalteracao=Última Alteração label_br_ufpr_c3sl_estacaojuventude_usuario_oldpass=Senha Atual label_br_ufpr_c3sl_estacaojuventude_usuario_newpass=Nova Senha - + menu_category_usuario_label=Usuário - + menu_category_estado_label=Estado - + menu_category_localizacao_label=Localização - + menu_category_municipio_label=Município - + menu_category_ocorrenciamunicipal_label=Ocorrência Municipal - + menu_category_orgaoexecutor_label=Orgão Executor - + menu_category_programa_label=Programa menu_category_tematica_label=Temática @@ -139,15 +140,15 @@ menu_item_municipio_new_label=Município menu_item_ocorrenciamunicipal_list_label=Ocorrências Municipais menu_item_ocorrenciamunicipal_new_label=Ocorrência Municipal - + menu_item_usuario_list_label=Usuários menu_item_usuario_new_label=Usuário - + menu_item_orgaoexecutor_list_label=Orgãos Executores menu_item_orgaoexecutor_new_label=Orgão Executor - + menu_item_programa_list_label=Programas menu_item_programa_new_label=Programa - + menu_item_tematica_list_label=Temáticas menu_item_tematica_new_label=Temática diff --git a/src/main/webapp/WEB-INF/i18n/messages.properties b/src/main/webapp/WEB-INF/i18n/messages.properties index 82a098e8bd6d03e195ed413a6dab8cb772e01bbb..d0272d84a3f0ac7a28a9100933912de459d343ab 100644 --- a/src/main/webapp/WEB-INF/i18n/messages.properties +++ b/src/main/webapp/WEB-INF/i18n/messages.properties @@ -12,6 +12,7 @@ global_theme=Tema global_theme_alt=Alt global_theme_standard=Padrão global_generic={0} +global_warning=Atenção aos dados repetidos (de acordo com os valores existentes) my_projects=Meus Programas pendentes my_occurrences=Minhas Ocorrências pendentes @@ -65,6 +66,20 @@ list_last=Ultima página list_page=Página {0} de {1} list_size=Resultados listados por página: + +#hint lables +#bloco 1 +hint_nivel=Esfera +hint_lei_criacao=Citar caso exista lei específica +hint_beneficios=Citar benefícios como bolsas, auxílio transporte, certificados, alimentação e etc. +hint_tematicas=Área das políticas públicas +#bloco 2 +hint_orgaos_executores=Assinalar mais de um se necessário, iniciando pelo principal executor +hint_como_acessar=Indicar procedimento para o jovem solicitar ingresso +hint_periodo_incricoes=Se os períodos forem variáveis deve indicar o atual ou próximo +#bloco 3 +hint_local=Descrever o tipo de equipamento público onde o programa está localizado + #selenium selenium_menu_test_suite=Ambiente de Testes diff --git a/src/main/webapp/WEB-INF/tags/form/fields/input.tagx b/src/main/webapp/WEB-INF/tags/form/fields/input.tagx index aff5ea18159a05a5b204cfcfbdc2b6538e7bf05c..b675439783da8fa05fd49bc6f460288d3147dd9d 100644 --- a/src/main/webapp/WEB-INF/tags/form/fields/input.tagx +++ b/src/main/webapp/WEB-INF/tags/form/fields/input.tagx @@ -19,6 +19,8 @@ <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" /> <jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)" /> + <jsp:directive.attribute name="hintValue" type="java.lang.String" required="false" rtexprvalue="true" description="Specify the code for a diferent hint to be displayed." /> + <c:if test="${empty render or render}"> <c:if test="${empty type}"> @@ -83,7 +85,14 @@ <spring:message argumentSeparator="," arguments="${label},(${field_required})" code="field_simple_validation" var="field_validation" htmlEscape="false" /> </c:when> <c:otherwise> - <spring:message argumentSeparator="," arguments="${label}, " code="field_simple_validation" var="field_validation" htmlEscape="false" /> + <c:choose> + <c:when test="${empty hintValue}"> + <spring:message argumentSeparator="," arguments="${label}, " code="field_simple_validation" var="field_validation" htmlEscape="false" /> + </c:when> + <c:otherwise> + <spring:message code="${hintValue}" var="field_validation" htmlEscape="false" /> + </c:otherwise> + </c:choose> </c:otherwise> </c:choose> <c:set var="sec_field_validation"> diff --git a/src/main/webapp/WEB-INF/tags/form/fields/select.tagx b/src/main/webapp/WEB-INF/tags/form/fields/select.tagx index e454985b20d1521885e2e113fa3db6a207d12be0..108d7a804b70c85f151ce7da6021a21974037ee4 100644 --- a/src/main/webapp/WEB-INF/tags/form/fields/select.tagx +++ b/src/main/webapp/WEB-INF/tags/form/fields/select.tagx @@ -14,8 +14,18 @@ <jsp:directive.attribute name="disableFormBinding" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Set to true to disable Spring form binding" /> <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" /> <jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)" /> + + <jsp:directive.attribute name="hintValue" type="java.lang.String" required="false" rtexprvalue="true" description="Specify the code for a diferent hint to be displayed." /> + <jsp:directive.attribute name="comboboxform" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicates if the select can serve as well as an input and it has a warning message for repeated values. (default false)." /> + <c:if test="${empty render or render}"> + + <c:if test="${empty comboboxform}"> + <c:set value="false" var="comboboxform" /> + </c:if> + + <spring:message code="global_warning" var="warning" htmlEscape="false" /> <c:if test="${empty disabled}"> <c:set value="false" var="disabled" /> @@ -182,9 +192,30 @@ </c:choose> </c:otherwise> </c:choose> + + <c:choose> + <c:when test="${empty hintValue}"> + <spring:message argumentSeparator="," arguments="${label}, " code="field_simple_validation" var="field_validation" htmlEscape="false" /> + </c:when> + <c:otherwise> + <spring:message code="${hintValue}" var="field_validation" htmlEscape="false" /> + </c:otherwise> + </c:choose> + <c:choose> + + <c:when test="${comboboxform == true}"> + <script type="text/javascript">Spring.addDecoration(new Spring.ElementDecoration({elementId : '_${sec_field}_id', + widgetType: 'dijit.form.ComboBox', widgetAttrs : {hasDownArrow : false, + validate: function(/*Boolean*/ isFocused){ + this.displayMessage("${fn:escapeXml(warning)}"); + return true; + } + }})); </script> + </c:when> + <c:when test="${multiple == false}"> - <script type="text/javascript">Spring.addDecoration(new Spring.ElementDecoration({elementId : '_${sec_field}_id', widgetType: 'dijit.form.FilteringSelect', widgetAttrs : {hasDownArrow : true}})); </script> + <script type="text/javascript">Spring.addDecoration(new Spring.ElementDecoration({elementId : '_${sec_field}_id', widgetType: 'dijit.form.FilteringSelect', widgetAttrs : {promptMessage: '${sec_field_validation}', hasDownArrow : ${hasDownArrow}}})); </script> </c:when> <!-- disabled due to http://jira.springframework.org/browse/ROO-909 <c:otherwise> <script type="text/javascript">Spring.addDecoration(new Spring.ElementDecoration({elementId : '_${field}_id', widgetType: 'dijit.form.MultiSelect', widgetAttrs : {}})); </script> </c:otherwise> --> </c:choose> diff --git a/src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx b/src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx index 1b5ba2384f2044d9cb2cac048052f5e48e4a9dd4..c950714eb0a8826e60d0cd659e2b4ab0ab8fe337 100644 --- a/src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx +++ b/src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx @@ -11,6 +11,8 @@ <jsp:directive.attribute name="validationMessage" type="java.lang.String" required="false" rtexprvalue="true" description="Specify the message to be displayed if the regular expression validation fails" /> <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" /> <jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)" /> + + <jsp:directive.attribute name="hintValue" type="java.lang.String" required="false" rtexprvalue="true" description="Specify the code for a diferent hint to be displayed." /> <c:if test="${empty render or render}"> @@ -29,6 +31,15 @@ <c:set var="sec_field"> <spring:escapeBody javaScriptEscape="true" >${field}</spring:escapeBody> </c:set> + + <c:choose> + <c:when test="${empty hintValue}"> + <spring:message argumentSeparator="," arguments="${label}, " code="field_simple_validation" var="field_validation" htmlEscape="false" /> + </c:when> + <c:otherwise> + <spring:message code="${hintValue}" var="field_validation" htmlEscape="false" /> + </c:otherwise> + </c:choose> <script type="text/javascript">dojo.require("dijit.form.SimpleTextarea");</script> <div id="_${fn:escapeXml(id)}_id"> @@ -39,7 +50,7 @@ <form:textarea id="_${sec_field}_id" path="${sec_field}" disabled="${disabled}" /> <br /> <form:errors cssClass="errors" id="_${sec_field}_error_id" path="${sec_field}" /> - <script type="text/javascript">Spring.addDecoration(new Spring.ElementDecoration({elementId : '_${sec_field}_id', widgetType : 'dijit.form.SimpleTextarea', widgetAttrs : {disabled : ${disabled}}})); </script> + <script type="text/javascript">Spring.addDecoration(new Spring.ElementDecoration({elementId : '_${sec_field}_id', widgetType : 'dijit.form.SimpleTextarea', widgetAttrs : {promptMessage: '${sec_field_validation}', disabled : ${disabled}}})); </script> </div> <br /> diff --git a/src/main/webapp/WEB-INF/views/estados/create.jspx b/src/main/webapp/WEB-INF/views/estados/create.jspx index 9f83259731b24bcf0377d326b17d9127d63bc1e1..089da3f834fd9e4d0bb30fbbdb30ae40b5e2223d 100644 --- a/src/main/webapp/WEB-INF/views/estados/create.jspx +++ b/src/main/webapp/WEB-INF/views/estados/create.jspx @@ -3,7 +3,8 @@ <jsp:directive.page contentType="text/html;charset=UTF-8"/> <jsp:output omit-xml-declaration="yes"/> <form:create id="fc_br_ufpr_c3sl_estacaojuventude_Estado" modelAttribute="estado" path="/estados" render="${empty dependencies}" z="qskhIUlkZvcNoqdyPOHXGL9te8M="> - <field:input field="nome" id="c_br_ufpr_c3sl_estacaojuventude_Estado_nome" z="kIoq6F1PK1AezI2ozamOd4cblT4="/> + <field:select field="nome" comboboxform="true" disableFormBinding="true" id="c_br_ufpr_c3sl_estacaojuventude_Estado_nome" itemValue="id" items="${estados}" path="/estados" z="user-managed"/> +<!-- <field:input field="nome" id="c_br_ufpr_c3sl_estacaojuventude_Estado_nome" z="kIoq6F1PK1AezI2ozamOd4cblT4="/> --> <field:input field="sigla" id="c_br_ufpr_c3sl_estacaojuventude_Estado_sigla" z="QKgJsPxT2TSjqowUe/LWpgmta5k="/> <field:select field="municipios" id="c_br_ufpr_c3sl_estacaojuventude_Estado_municipios" itemValue="id" items="${municipios}" multiple="true" path="/municipios" z="qSQbotIYGpKXYM4bQL5qBDG34l4="/> <field:datetime dateTimePattern="${estado_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Estado_ultimaAlteracao" render="false" z="user-managed"/> diff --git a/src/main/webapp/WEB-INF/views/localizacoes/create.jspx b/src/main/webapp/WEB-INF/views/localizacoes/create.jspx index bd03327c290a29dd76365821da8dd1fd471ad134..7e0252e12e5fa9b32a0d36c307991a404705cd4a 100644 --- a/src/main/webapp/WEB-INF/views/localizacoes/create.jspx +++ b/src/main/webapp/WEB-INF/views/localizacoes/create.jspx @@ -4,7 +4,7 @@ <jsp:output omit-xml-declaration="yes"/> <form:create id="fc_br_ufpr_c3sl_estacaojuventude_Localizacao" modelAttribute="localizacao" path="/localizacoes" render="${empty dependencies}" z="roB49ZfPLXumP8eGL4QtNZnO5mw="> <field:select field="ocorrencia" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ocorrencia" itemValue="id" items="${ocorrenciamunicipais}" path="/ocorrenciamunicipais" z="user-managed"/> - <field:input field="local" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_local" z="F+5PMRrsFY8daKJAKHiD++Q/zM0="/> + <field:input field="local" hintValue="hint_local" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_local" z="user-managed"/> <field:input field="endereco" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_endereco" z="GxkuN7uw8aGj5L19cLd6a2iaWJQ="/> <field:input field="horarioFuncionamento" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioFuncionamento" z="7kNkZ2jgnZCzlVNzjlDsAc+6fFI="/> <field:input field="nomeReferencia" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_nomeReferencia" z="Xa47YY1HN/qBwALtrICTG729uCY="/> diff --git a/src/main/webapp/WEB-INF/views/localizacoes/update.jspx b/src/main/webapp/WEB-INF/views/localizacoes/update.jspx index 62bdbf92ffe97a70d61e7811152459edfb3aa404..1568a5b37b2828cf94d5693d047fa36e5405db45 100644 --- a/src/main/webapp/WEB-INF/views/localizacoes/update.jspx +++ b/src/main/webapp/WEB-INF/views/localizacoes/update.jspx @@ -5,7 +5,7 @@ <sec:authorize ifAnyGranted="Administrador"> <form:update id="fu_br_ufpr_c3sl_estacaojuventude_Localizacao" modelAttribute="localizacao" path="/localizacoes" versionField="Version" z="bZcSNtmk3o0e8coiCJIfWKXfAvE="> <field:select field="ocorrencia" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ocorrencia" itemValue="id" items="${ocorrenciamunicipais}" path="/ocorrenciamunicipais" z="user-managed"/> - <field:input field="local" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_local" z="F+5PMRrsFY8daKJAKHiD++Q/zM0="/> + <field:input field="local" hintValue="hint_local" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_local" z="user-managed"/> <field:input field="endereco" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_endereco" z="GxkuN7uw8aGj5L19cLd6a2iaWJQ="/> <field:input field="horarioFuncionamento" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioFuncionamento" z="7kNkZ2jgnZCzlVNzjlDsAc+6fFI="/> <field:input field="nomeReferencia" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_nomeReferencia" z="Xa47YY1HN/qBwALtrICTG729uCY="/> @@ -21,7 +21,7 @@ <sec:authorize ifAnyGranted="Usuario"> <form:update id="fu_br_ufpr_c3sl_estacaojuventude_Localizacao" modelAttribute="localizacao" path="/localizacoes" versionField="Version" z="bZcSNtmk3o0e8coiCJIfWKXfAvE="> <field:select field="ocorrencia" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ocorrencia" itemValue="id" items="${ocorrenciamunicipais}" path="/ocorrenciamunicipais" z="x3nXHdBxIzZwt7vPWcNsVQA+2zM="/> - <field:input field="local" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_local" z="F+5PMRrsFY8daKJAKHiD++Q/zM0="/> + <field:input field="local" hintValue="hint_local" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_local" z="F+5PMRrsFY8daKJAKHiD++Q/zM0="/> <field:input field="endereco" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_endereco" z="GxkuN7uw8aGj5L19cLd6a2iaWJQ="/> <field:input field="horarioFuncionamento" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioFuncionamento" z="7kNkZ2jgnZCzlVNzjlDsAc+6fFI="/> <field:input field="nomeReferencia" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_nomeReferencia" z="Xa47YY1HN/qBwALtrICTG729uCY="/> diff --git a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx index e90062816b56adac496c7ad16931154b9b09bcbf..ed3c6368d112fa49ba1f423458ba231619166554 100644 --- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx +++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx @@ -5,11 +5,12 @@ <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="municipio" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipio" itemValue="id" items="${municipios}" path="/municipios" z="NxsdqY2KIR81ibrmaLuEwZFQ0QM="/> - <field:select field="orgaosExecutores" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/orgaoexecutores" z="user-managed"/> - <field:input field="beneficiosLocais" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" z="4+gr9Eh5QnqAtYMJBTazSWU4OHY="/> - <field:input field="comoAcessar" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_comoAcessar" z="37Av0vUvTAzeQQX4WrRT2KMcj7w="/> - <field:input field="inicioInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_inicioInscricoes" z="G0XGhemETMWseRmD4VKjlzifEJ8="/> - <field:input field="fimInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_fimInscricoes" z="fS41CZmEMANwCEqNQ+HlzbTnhE0="/> + <field:select field="orgaosExecutores" hintValue="hint_orgaos_executores" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/orgaoexecutores" z="user-managed"/> + <field:textarea field="beneficiosLocais" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" z="4+gr9Eh5QnqAtYMJBTazSWU4OHY="/> +<!-- <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:input field="inicioInscricoes" hintValue="hint_periodo_incricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_inicioInscricoes" z="user-managed"/> + <field:input field="fimInscricoes" hintValue="hint_periodo_incricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_fimInscricoes" 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" z="VVOME2kMr4+rxAFNbv5sTC6HvAw="/> <field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_status" items="${tipostatuses}" path="tipostatuses" render="false" z="user-managed"/> diff --git a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx index 1cf6c036836ee55d8338aeae4a00ae261d999aae..1193086338802667c22a177dd4129900f3f88a26 100644 --- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx +++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx @@ -6,11 +6,12 @@ <form:update id="fu_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" modelAttribute="ocorrenciaMunicipal" path="/ocorrenciamunicipais" versionField="Version" z="nMo5OaMVW8SlDiU52IsDoc4ZZZ8="> <field:select field="programaVinculado" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_programaVinculado" itemValue="id" items="${programas}" path="/programas" z="6peHWMq5LFS5h3Dz8xNLNeBW9Rc="/> <field:select field="municipio" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipio" itemValue="id" items="${municipios}" path="/municipios" z="NxsdqY2KIR81ibrmaLuEwZFQ0QM="/> - <field:select field="orgaosExecutores" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/orgaoexecutores" z="user-managed"/> - <field:input field="beneficiosLocais" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" z="4+gr9Eh5QnqAtYMJBTazSWU4OHY="/> - <field:input field="comoAcessar" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_comoAcessar" z="37Av0vUvTAzeQQX4WrRT2KMcj7w="/> - <field:input field="inicioInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_inicioInscricoes" z="G0XGhemETMWseRmD4VKjlzifEJ8="/> - <field:input field="fimInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_fimInscricoes" z="fS41CZmEMANwCEqNQ+HlzbTnhE0="/> + <field:select field="orgaosExecutores" hintValue="hint_orgaos_executores" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/orgaoexecutores" z="user-managed"/> + <field:textarea field="beneficiosLocais" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" z="4+gr9Eh5QnqAtYMJBTazSWU4OHY="/> +<!-- <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:input field="inicioInscricoes" hintValue="hint_periodo_incricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_inicioInscricoes" z="user-managed"/> + <field:input field="fimInscricoes" hintValue="hint_periodo_incricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_fimInscricoes" z="user-managed"/> <field:select disabled="true" field="localizacoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_localizacoes" itemValue="id" items="${localizacaos}" multiple="true" path="/localizacoes" z="user-managed"/> <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" z="F0r/fUzTX6lkoHa0mAWk5JT7EF8="/> @@ -23,11 +24,12 @@ <form:update id="fu_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" modelAttribute="ocorrenciaMunicipal" path="/ocorrenciamunicipais" versionField="Version" z="nMo5OaMVW8SlDiU52IsDoc4ZZZ8="> <field:select field="programaVinculado" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_programaVinculado" itemValue="id" items="${programas}" path="/programas" z="6peHWMq5LFS5h3Dz8xNLNeBW9Rc="/> <field:select field="municipio" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipio" itemValue="id" items="${municipios}" path="/municipios" z="NxsdqY2KIR81ibrmaLuEwZFQ0QM="/> - <field:select field="orgaosExecutores" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/orgaoexecutores" z="user-managed"/> - <field:input field="beneficiosLocais" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" z="4+gr9Eh5QnqAtYMJBTazSWU4OHY="/> - <field:input field="comoAcessar" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_comoAcessar" z="37Av0vUvTAzeQQX4WrRT2KMcj7w="/> - <field:input field="inicioInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_inicioInscricoes" z="G0XGhemETMWseRmD4VKjlzifEJ8="/> - <field:input field="fimInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_fimInscricoes" z="fS41CZmEMANwCEqNQ+HlzbTnhE0="/> + <field:select field="orgaosExecutores" hintValue="hint_orgaos_executores" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/orgaoexecutores" z="user-managed"/> + <field:textarea field="beneficiosLocais" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" z="4+gr9Eh5QnqAtYMJBTazSWU4OHY="/> +<!-- <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="37Av0vUvTAzeQQX4WrRT2KMcj7w="/> + <field:input field="inicioInscricoes" hintValue="hint_periodo_incricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_inicioInscricoes" z="G0XGhemETMWseRmD4VKjlzifEJ8="/> + <field:input field="fimInscricoes" hintValue="hint_periodo_incricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_fimInscricoes" z="fS41CZmEMANwCEqNQ+HlzbTnhE0="/> <field:select disabled="true" field="localizacoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_localizacoes" itemValue="id" items="${localizacaos}" multiple="true" path="/localizacoes" z="user-managed"/> <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="F0r/fUzTX6lkoHa0mAWk5JT7EF8="/> diff --git a/src/main/webapp/WEB-INF/views/orgaoexecutores/create.jspx b/src/main/webapp/WEB-INF/views/orgaoexecutores/create.jspx index ea04f48c616fe73a5f0f53ca251f1c5866bdc1e8..6bd6d7e6b28f44ebbcb384dec9d661b2d59e030c 100644 --- a/src/main/webapp/WEB-INF/views/orgaoexecutores/create.jspx +++ b/src/main/webapp/WEB-INF/views/orgaoexecutores/create.jspx @@ -4,6 +4,7 @@ <jsp:output omit-xml-declaration="yes"/> <form:create id="fc_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor" modelAttribute="orgaoExecutor" path="/orgaoexecutores" render="${empty dependencies}" z="ySSBiOgc68ijzLxGB8mEHSqYtyU="> <field:input field="nome" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_nome" z="JSU8dOb3wOb6yJZPU+35CzdY2oQ="/> + <field:input field="sigla" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_sigla" z="1HUcubyIs8CXWYqEdOLK4uhf7n4="/> <field:input field="site" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_site" z="Z3eEDQIEcWpYg/0VjOzkRbI8qY4="/> <field:input field="endereco" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_endereco" z="tTcJ375UKIKQWJiq30XNmeti03c="/> <field:input field="contato" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_contato" z="N464inkZDRkVnlMA8hpmvvyzs7g="/> diff --git a/src/main/webapp/WEB-INF/views/orgaoexecutores/list.jspx b/src/main/webapp/WEB-INF/views/orgaoexecutores/list.jspx index 28e79e9dccac2b963ec18cf547a33226245dca2b..14f0e5dc04815f7c315b536939f4db3a850d2da1 100644 --- a/src/main/webapp/WEB-INF/views/orgaoexecutores/list.jspx +++ b/src/main/webapp/WEB-INF/views/orgaoexecutores/list.jspx @@ -5,6 +5,7 @@ <page:list id="pl_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor" items="${orgaoexecutors}" z="Z75Wq7FKUsUQ4WyEoWMeHCLz8kc="> <table:table data="${orgaoexecutors}" id="l_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor" path="/orgaoexecutores" z="77kvkW0OLjM9ozefcO8lyVZcE7k="> <table:column id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_nome" property="nome" z="Nb1HHrIB4nT34G5ENgbZ4P1B7Yc="/> + <table:column id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_sigla" property="sigla" z="OdynEuYFIhbss8UVfHuegrmoXbg="/> <table:column id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_site" property="site" z="fi4sWOmLlqPfWJlWyeBGNMBJSIY="/> <table:column id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_endereco" property="endereco" z="xRg5mKxaqkl5+QrPEaMk1g4m7Pc="/> <table:column id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_contato" property="contato" z="fhFWGnCq7v36yy6h1jubdX52Wrg="/> diff --git a/src/main/webapp/WEB-INF/views/orgaoexecutores/show.jspx b/src/main/webapp/WEB-INF/views/orgaoexecutores/show.jspx index 2f5057cc32a0220672daf9f02e9869cd10684a4a..28fb640b89dc3b417638bde8e59becb3b902fe84 100644 --- a/src/main/webapp/WEB-INF/views/orgaoexecutores/show.jspx +++ b/src/main/webapp/WEB-INF/views/orgaoexecutores/show.jspx @@ -4,6 +4,7 @@ <jsp:output omit-xml-declaration="yes"/> <page:show id="ps_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor" object="${orgaoexecutor}" path="/orgaoexecutores" z="8YSmiQ97k98GSWLsSg66GsMY1yw="> <field:display field="nome" id="s_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_nome" object="${orgaoexecutor}" z="nbIJaHfqA02HG9xptwL7V00szyI="/> + <field:display field="sigla" id="s_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_sigla" object="${orgaoexecutor}" z="WcQ/AhJir00DZ39IRlwUvQc79Gg="/> <field:display field="site" id="s_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_site" object="${orgaoexecutor}" z="4FcnQkNgOdYFVcaEAhndkCoAWfs="/> <field:display field="endereco" id="s_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_endereco" object="${orgaoexecutor}" z="MwPjGFqfGBBLkg5rJV8rDQF5k6E="/> <field:display field="contato" id="s_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_contato" object="${orgaoexecutor}" z="or2Q/KJknHAjkLyX8ERmbs3Rg1A="/> diff --git a/src/main/webapp/WEB-INF/views/orgaoexecutores/update.jspx b/src/main/webapp/WEB-INF/views/orgaoexecutores/update.jspx index 9ecba5c37dddeb4b52e4d0326e8178d16687f795..af90881f7d79c782318b7e7ccddd0ed004f14ac0 100644 --- a/src/main/webapp/WEB-INF/views/orgaoexecutores/update.jspx +++ b/src/main/webapp/WEB-INF/views/orgaoexecutores/update.jspx @@ -4,6 +4,7 @@ <jsp:output omit-xml-declaration="yes"/> <form:update id="fu_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor" modelAttribute="orgaoExecutor" path="/orgaoexecutores" versionField="Version" z="qhAPqI2XG7T0uM9aqy7UKyzZ7Bc="> <field:input field="nome" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_nome" z="JSU8dOb3wOb6yJZPU+35CzdY2oQ="/> + <field:input field="sigla" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_sigla" z="1HUcubyIs8CXWYqEdOLK4uhf7n4="/> <field:input field="site" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_site" z="Z3eEDQIEcWpYg/0VjOzkRbI8qY4="/> <field:input field="endereco" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_endereco" z="tTcJ375UKIKQWJiq30XNmeti03c="/> <field:input field="contato" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_contato" z="N464inkZDRkVnlMA8hpmvvyzs7g="/> diff --git a/src/main/webapp/WEB-INF/views/programas/create.jspx b/src/main/webapp/WEB-INF/views/programas/create.jspx index 288d7f2d1b6540e7f20f8c9e22fca2898092ba00..31bcd4454dd3147741a13a7861a30a4c8be75fd1 100644 --- a/src/main/webapp/WEB-INF/views/programas/create.jspx +++ b/src/main/webapp/WEB-INF/views/programas/create.jspx @@ -6,22 +6,27 @@ <field:input field="nomeOficial" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nomeOficial" z="bc3pz/2g/oVwZE1Aey76ZJhx0bM="/> <field:input field="nomeDivulgacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nomeDivulgacao" z="fDxR3dnr61JMbaTs4rcE9iFHkpU="/> <field:input field="sigla" id="c_br_ufpr_c3sl_estacaojuventude_Programa_sigla" z="kGLlUDsbNNGnqG06eMJbJB4OBXs="/> - <field:select field="nivel" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nivel" items="${nivelprogramas}" path="nivelprogramas" z="4pOFZ4tGHsIhD/80BTEdnPGN92g="/> + <field:select field="nivel" hintValue="hint_nivel" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nivel" items="${nivelprogramas}" path="nivelprogramas" z="user-managed"/> <field:select field="programaVinculado" id="c_br_ufpr_c3sl_estacaojuventude_Programa_programaVinculado" itemValue="id" items="${programas}" path="/programas" z="eOYwLQ5Izpu/YxZLnKEgD3nNJDc="/> - <field:input field="leiCriacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_leiCriacao" z="AZrkYSbMNxVniZDEPO3UIZomuUc="/> - <field:input field="descricao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_descricao" z="j8K3uhuqABUcYWZtDUVA1uw0H/U="/> - <field:input field="objetivos" id="c_br_ufpr_c3sl_estacaojuventude_Programa_objetivos" z="/qg0ht0rwAM9BGySe//YuL0vAJE="/> - <field:input field="beneficios" id="c_br_ufpr_c3sl_estacaojuventude_Programa_beneficios" z="4K86Z102Fj1BJX3DXRy1cvG+9Uc="/> + <field:input field="leiCriacao" hintValue="hint_lei_criacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_leiCriacao" z="user-managed"/> + <field:textarea field="descricao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_descricao" z="user-managed"/> + <!-- <field:input field="descricao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_descricao" z="j8K3uhuqABUcYWZtDUVA1uw0H/U="/> --> + <field:textarea field="objetivos" id="c_br_ufpr_c3sl_estacaojuventude_Programa_objetivos" z="user-managed"/> + <!-- <field:input field="objetivos" id="c_br_ufpr_c3sl_estacaojuventude_Programa_objetivos" z="/qg0ht0rwAM9BGySe//YuL0vAJE="/> --> + <field:textarea field="beneficios" hintValue="hint_beneficios" id="c_br_ufpr_c3sl_estacaojuventude_Programa_beneficios" z="user-managed"/> + <!-- <field:input field="beneficios" hintValue="hint_beneficios" id="c_br_ufpr_c3sl_estacaojuventude_Programa_beneficios" z="user-managed"/> --> <field:datetime dateTimePattern="${programa_datainicio_date_format}" field="dataInicio" id="c_br_ufpr_c3sl_estacaojuventude_Programa_dataInicio" z="nNVy1J68TFQeiW5rl/NKv94LNCE="/> <field:select field="temporalidade" id="c_br_ufpr_c3sl_estacaojuventude_Programa_temporalidade" items="${tipotemporalidades}" path="tipotemporalidades" z="8t1yjG70Av2Hz4Mhz7K4xIkuvME="/> <field:input field="publicoAlvo" id="c_br_ufpr_c3sl_estacaojuventude_Programa_publicoAlvo" z="nfjHOXYNbbbwrWZdf8B6WQNyvBU="/> <field:input field="idadeMinima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMinima" validationMessageCode="field_invalid_integer" z="mkv8Bm7AvW/UKajattFE7vU0B9U="/> <field:input field="idadeMaxima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMaxima" validationMessageCode="field_invalid_integer" z="WIjBwA925e6JSn8yKl2LnnzmG9A="/> - <field:input field="criteriosAcesso" id="c_br_ufpr_c3sl_estacaojuventude_Programa_criteriosAcesso" z="46IIumERi7DTwwtpARnCfqhSkws="/> + <field:textarea field="criteriosAcesso" id="c_br_ufpr_c3sl_estacaojuventude_Programa_criteriosAcesso" z="user-managed"/> + <!-- <field:input field="criteriosAcesso" id="c_br_ufpr_c3sl_estacaojuventude_Programa_criteriosAcesso" z="46IIumERi7DTwwtpARnCfqhSkws="/> --> <field:input field="duracao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_duracao" z="a7AOY/Yrtw4PcGueyAvhXIGAQFU="/> - <field:select field="tematicas" id="c_br_ufpr_c3sl_estacaojuventude_Programa_tematicas" itemValue="id" items="${tematicas}" multiple="true" path="/tematicas" z="dNw66nQiqTH3NQvcrusAZ3M3oX0="/> + <field:select field="tematicas" hintValue="hint_tematicas" id="c_br_ufpr_c3sl_estacaojuventude_Programa_tematicas" itemValue="id" items="${tematicas}" multiple="true" path="/tematicas" z="user-managed"/> <field:select field="orgaosExecutores" id="c_br_ufpr_c3sl_estacaojuventude_Programa_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/orgaoexecutores" z="user-managed"/> - <field:input field="parceiros" id="c_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" z="Jbi+j14QiuxyUynDmEoZrpR6n1Q="/> + <field:textarea field="parceiros" id="c_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" z="user-managed"/> + <!-- <field:input field="parceiros" id="c_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" z="Jbi+j14QiuxyUynDmEoZrpR6n1Q="/> --> <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"/> diff --git a/src/main/webapp/WEB-INF/views/programas/update.jspx b/src/main/webapp/WEB-INF/views/programas/update.jspx index 57f6d8a8a6fb484892b6710bc33557e35a5ea8fc..2881b4ec628570cd14bff1ac38dcb4fd9b73c18b 100644 --- a/src/main/webapp/WEB-INF/views/programas/update.jspx +++ b/src/main/webapp/WEB-INF/views/programas/update.jspx @@ -7,22 +7,27 @@ <field:input field="nomeOficial" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nomeOficial" z="bc3pz/2g/oVwZE1Aey76ZJhx0bM="/> <field:input field="nomeDivulgacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nomeDivulgacao" z="fDxR3dnr61JMbaTs4rcE9iFHkpU="/> <field:input field="sigla" id="c_br_ufpr_c3sl_estacaojuventude_Programa_sigla" z="kGLlUDsbNNGnqG06eMJbJB4OBXs="/> - <field:select field="nivel" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nivel" items="${nivelprogramas}" path="nivelprogramas" z="4pOFZ4tGHsIhD/80BTEdnPGN92g="/> + <field:select field="nivel" hintValue="hint_nivel" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nivel" items="${nivelprogramas}" path="nivelprogramas" z="user-managed"/> <field:select field="programaVinculado" id="c_br_ufpr_c3sl_estacaojuventude_Programa_programaVinculado" itemValue="id" items="${programas}" path="/programas" z="eOYwLQ5Izpu/YxZLnKEgD3nNJDc="/> - <field:input field="leiCriacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_leiCriacao" z="AZrkYSbMNxVniZDEPO3UIZomuUc="/> - <field:input field="descricao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_descricao" z="j8K3uhuqABUcYWZtDUVA1uw0H/U="/> - <field:input field="objetivos" id="c_br_ufpr_c3sl_estacaojuventude_Programa_objetivos" z="/qg0ht0rwAM9BGySe//YuL0vAJE="/> - <field:input field="beneficios" id="c_br_ufpr_c3sl_estacaojuventude_Programa_beneficios" z="4K86Z102Fj1BJX3DXRy1cvG+9Uc="/> + <field:input field="leiCriacao" hintValue="hint_lei_criacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_leiCriacao" z="user-managed"/> + <field:textarea field="descricao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_descricao" z="user-managed"/> + <!-- <field:input field="descricao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_descricao" z="j8K3uhuqABUcYWZtDUVA1uw0H/U="/> --> + <field:textarea field="objetivos" id="c_br_ufpr_c3sl_estacaojuventude_Programa_objetivos" z="user-managed"/> + <!-- <field:input field="objetivos" id="c_br_ufpr_c3sl_estacaojuventude_Programa_objetivos" z="/qg0ht0rwAM9BGySe//YuL0vAJE="/> --> + <field:textarea field="beneficios" hintValue="hint_beneficios" id="c_br_ufpr_c3sl_estacaojuventude_Programa_beneficios" z="user-managed"/> + <!-- <field:input field="beneficios" hintValue="hint_beneficios" id="c_br_ufpr_c3sl_estacaojuventude_Programa_beneficios" z="user-managed"/> --> <field:datetime dateTimePattern="${programa_datainicio_date_format}" field="dataInicio" id="c_br_ufpr_c3sl_estacaojuventude_Programa_dataInicio" z="nNVy1J68TFQeiW5rl/NKv94LNCE="/> <field:select field="temporalidade" id="c_br_ufpr_c3sl_estacaojuventude_Programa_temporalidade" items="${tipotemporalidades}" path="tipotemporalidades" z="8t1yjG70Av2Hz4Mhz7K4xIkuvME="/> <field:input field="publicoAlvo" id="c_br_ufpr_c3sl_estacaojuventude_Programa_publicoAlvo" z="nfjHOXYNbbbwrWZdf8B6WQNyvBU="/> <field:input field="idadeMinima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMinima" validationMessageCode="field_invalid_integer" z="mkv8Bm7AvW/UKajattFE7vU0B9U="/> <field:input field="idadeMaxima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMaxima" validationMessageCode="field_invalid_integer" z="WIjBwA925e6JSn8yKl2LnnzmG9A="/> - <field:input field="criteriosAcesso" id="c_br_ufpr_c3sl_estacaojuventude_Programa_criteriosAcesso" z="46IIumERi7DTwwtpARnCfqhSkws="/> + <field:textarea field="criteriosAcesso" id="c_br_ufpr_c3sl_estacaojuventude_Programa_criteriosAcesso" z="user-managed"/> + <!-- <field:input field="criteriosAcesso" id="c_br_ufpr_c3sl_estacaojuventude_Programa_criteriosAcesso" z="46IIumERi7DTwwtpARnCfqhSkws="/> --> <field:input field="duracao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_duracao" z="a7AOY/Yrtw4PcGueyAvhXIGAQFU="/> - <field:select field="tematicas" id="c_br_ufpr_c3sl_estacaojuventude_Programa_tematicas" itemValue="id" items="${tematicas}" multiple="true" path="/tematicas" z="dNw66nQiqTH3NQvcrusAZ3M3oX0="/> + <field:select field="tematicas" hintValue="hint_tematicas" id="c_br_ufpr_c3sl_estacaojuventude_Programa_tematicas" itemValue="id" items="${tematicas}" multiple="true" path="/tematicas" z="user-managed"/> <field:select field="orgaosExecutores" id="c_br_ufpr_c3sl_estacaojuventude_Programa_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/orgaoexecutores" z="user-managed"/> - <field:input field="parceiros" id="c_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" z="Jbi+j14QiuxyUynDmEoZrpR6n1Q="/> + <field:textarea field="parceiros" id="c_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" z="user-managed"/> + <!-- <field:input field="parceiros" id="c_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" z="Jbi+j14QiuxyUynDmEoZrpR6n1Q="/> --> <field:select disabled="true" field="ocorrencias" id="c_br_ufpr_c3sl_estacaojuventude_Programa_ocorrencias" itemValue="id" items="${ocorrenciamunicipais}" multiple="true" path="/ocorrenciamunicipais" z="user-managed"/> <field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_Programa_status" items="${tipostatuses}" path="tipostatuses" z="TWynnY2LlkTLv9vJJ6PYF11yQk0="/> <field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_Programa_usuario" itemValue="id" items="${usuarios}" path="/usuarios" z="gyBHEGJXuWI8xAN+JR0Z6EVyhMY="/> @@ -35,22 +40,27 @@ <field:input field="nomeOficial" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nomeOficial" z="bc3pz/2g/oVwZE1Aey76ZJhx0bM="/> <field:input field="nomeDivulgacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nomeDivulgacao" z="fDxR3dnr61JMbaTs4rcE9iFHkpU="/> <field:input field="sigla" id="c_br_ufpr_c3sl_estacaojuventude_Programa_sigla" z="kGLlUDsbNNGnqG06eMJbJB4OBXs="/> - <field:select field="nivel" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nivel" items="${nivelprogramas}" path="nivelprogramas" z="4pOFZ4tGHsIhD/80BTEdnPGN92g="/> + <field:select field="nivel" hintValue="hint_nivel" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nivel" items="${nivelprogramas}" path="nivelprogramas" z="4pOFZ4tGHsIhD/80BTEdnPGN92g="/> <field:select field="programaVinculado" id="c_br_ufpr_c3sl_estacaojuventude_Programa_programaVinculado" itemValue="id" items="${programas}" path="/programas" z="eOYwLQ5Izpu/YxZLnKEgD3nNJDc="/> - <field:input field="leiCriacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_leiCriacao" z="AZrkYSbMNxVniZDEPO3UIZomuUc="/> - <field:input field="descricao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_descricao" z="j8K3uhuqABUcYWZtDUVA1uw0H/U="/> - <field:input field="objetivos" id="c_br_ufpr_c3sl_estacaojuventude_Programa_objetivos" z="/qg0ht0rwAM9BGySe//YuL0vAJE="/> - <field:input field="beneficios" id="c_br_ufpr_c3sl_estacaojuventude_Programa_beneficios" z="4K86Z102Fj1BJX3DXRy1cvG+9Uc="/> + <field:input field="leiCriacao" hintValue="hint_lei_criacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_leiCriacao" z="AZrkYSbMNxVniZDEPO3UIZomuUc="/> + <field:textarea field="descricao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_descricao" z="j8K3uhuqABUcYWZtDUVA1uw0H/U="/> + <!-- <field:input field="descricao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_descricao" z="j8K3uhuqABUcYWZtDUVA1uw0H/U="/> --> + <field:textarea field="objetivos" id="c_br_ufpr_c3sl_estacaojuventude_Programa_objetivos" z="/qg0ht0rwAM9BGySe//YuL0vAJE="/> + <!-- <field:input field="objetivos" id="c_br_ufpr_c3sl_estacaojuventude_Programa_objetivos" z="/qg0ht0rwAM9BGySe//YuL0vAJE="/> --> + <field:textarea field="beneficios" hintValue="hint_beneficios" id="c_br_ufpr_c3sl_estacaojuventude_Programa_beneficios" z="user-managed"/> + <!-- <field:input field="beneficios" hintValue="hint_beneficios" id="c_br_ufpr_c3sl_estacaojuventude_Programa_beneficios" z="4K86Z102Fj1BJX3DXRy1cvG+9Uc="/> --> <field:datetime dateTimePattern="${programa_datainicio_date_format}" field="dataInicio" id="c_br_ufpr_c3sl_estacaojuventude_Programa_dataInicio" z="nNVy1J68TFQeiW5rl/NKv94LNCE="/> <field:select field="temporalidade" id="c_br_ufpr_c3sl_estacaojuventude_Programa_temporalidade" items="${tipotemporalidades}" path="tipotemporalidades" z="8t1yjG70Av2Hz4Mhz7K4xIkuvME="/> <field:input field="publicoAlvo" id="c_br_ufpr_c3sl_estacaojuventude_Programa_publicoAlvo" z="nfjHOXYNbbbwrWZdf8B6WQNyvBU="/> <field:input field="idadeMinima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMinima" validationMessageCode="field_invalid_integer" z="mkv8Bm7AvW/UKajattFE7vU0B9U="/> <field:input field="idadeMaxima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMaxima" validationMessageCode="field_invalid_integer" z="WIjBwA925e6JSn8yKl2LnnzmG9A="/> - <field:input field="criteriosAcesso" id="c_br_ufpr_c3sl_estacaojuventude_Programa_criteriosAcesso" z="46IIumERi7DTwwtpARnCfqhSkws="/> + <field:textarea field="criteriosAcesso" id="c_br_ufpr_c3sl_estacaojuventude_Programa_criteriosAcesso" z="46IIumERi7DTwwtpARnCfqhSkws="/> + <!-- <field:input field="criteriosAcesso" id="c_br_ufpr_c3sl_estacaojuventude_Programa_criteriosAcesso" z="46IIumERi7DTwwtpARnCfqhSkws="/> --> <field:input field="duracao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_duracao" z="a7AOY/Yrtw4PcGueyAvhXIGAQFU="/> - <field:select field="tematicas" id="c_br_ufpr_c3sl_estacaojuventude_Programa_tematicas" itemValue="id" items="${tematicas}" multiple="true" path="/tematicas" z="dNw66nQiqTH3NQvcrusAZ3M3oX0="/> + <field:select field="tematicas" hintValue="hint_tematicas" id="c_br_ufpr_c3sl_estacaojuventude_Programa_tematicas" itemValue="id" items="${tematicas}" multiple="true" path="/tematicas" z="dNw66nQiqTH3NQvcrusAZ3M3oX0="/> <field:select field="orgaosExecutores" id="c_br_ufpr_c3sl_estacaojuventude_Programa_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/orgaoexecutores" z="user-managed"/> - <field:input field="parceiros" id="c_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" z="Jbi+j14QiuxyUynDmEoZrpR6n1Q="/> + <field:textarea field="parceiros" id="c_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" z="Jbi+j14QiuxyUynDmEoZrpR6n1Q="/> + <!-- <field:input field="parceiros" id="c_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" z="Jbi+j14QiuxyUynDmEoZrpR6n1Q="/> --> <field:select disabled="true" 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="TWynnY2LlkTLv9vJJ6PYF11yQk0="/> <field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_Programa_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="gyBHEGJXuWI8xAN+JR0Z6EVyhMY="/> diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index fdde65abb8b0cd6c929411a660c6b3a609ba2252..affb5370255f1f75b9169241c817b85b9041bfdf 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -91,7 +91,7 @@ </servlet-mapping> <session-config> - <session-timeout>10</session-timeout> + <session-timeout>45</session-timeout> </session-config> <error-page>