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 7fffe84998369e88c9d2321625d4c336a48546e8..dfa218941e2899a2fb881b99291cd87b1ca8346e 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController.java
@@ -2,7 +2,10 @@ package br.ufpr.c3sl.estacaojuventude.web;
import java.util.Arrays;
import java.util.Calendar;
+import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
@@ -23,6 +26,7 @@ import br.ufpr.c3sl.estacaojuventude.Municipio;
import br.ufpr.c3sl.estacaojuventude.OcorrenciaMunicipal;
import br.ufpr.c3sl.estacaojuventude.OrgaoExecutor;
import br.ufpr.c3sl.estacaojuventude.Programa;
+import br.ufpr.c3sl.estacaojuventude.Tematica;
import br.ufpr.c3sl.estacaojuventude.Usuario;
import br.ufpr.c3sl.estacaojuventude.enums.Situacao;
import br.ufpr.c3sl.estacaojuventude.enums.TipoStatus;
@@ -31,6 +35,80 @@ import br.ufpr.c3sl.estacaojuventude.enums.TipoStatus;
@Controller
@RooWebScaffold(path = "ocorrenciamunicipais", formBackingObject = OcorrenciaMunicipal.class)
public class OcorrenciaMunicipalController {
+ OcorrenciaMunicipal ocorrenciaMunicipalGlobal;
+
+ private Set<OrgaoExecutor> copySetOrgaoExecutor(Set<OrgaoExecutor> old) {
+ Set<OrgaoExecutor> orgaosExecutoresNovo = new HashSet<OrgaoExecutor>();
+ Set<OrgaoExecutor> orgaosExecutores = old;
+
+ for (Iterator<OrgaoExecutor> o = orgaosExecutores.iterator(); o.hasNext();)
+ orgaosExecutoresNovo.add(OrgaoExecutor.findOrgaoExecutor(o.next().getId()));
+
+ return orgaosExecutoresNovo;
+ }
+
+ @RequestMapping(value = "/form/{id}", produces = "text/html")
+ public String addSelected(@PathVariable("id") Long id, Model uiModel, HttpServletRequest httpServletRequest) {
+ if (OrgaoExecutor.findOrgaoExecutor(id) != null) {
+ if (ocorrenciaMunicipalGlobal.getOrgaosExecutores() == null) {
+ Set<OrgaoExecutor> orgaosExecutores = new HashSet<OrgaoExecutor>();
+ orgaosExecutores.add(OrgaoExecutor.findOrgaoExecutor(id));
+
+ ocorrenciaMunicipalGlobal.setOrgaosExecutores(orgaosExecutores);
+ }
+ else {
+ Set<OrgaoExecutor> orgaosExecutoresNovo = copySetOrgaoExecutor(ocorrenciaMunicipalGlobal.getOrgaosExecutores());
+ if (orgaosExecutoresNovo.contains(OrgaoExecutor.findOrgaoExecutor(id)))
+ orgaosExecutoresNovo.remove(OrgaoExecutor.findOrgaoExecutor(id));
+ else
+ orgaosExecutoresNovo.add(OrgaoExecutor.findOrgaoExecutor(id));
+ ocorrenciaMunicipalGlobal.setOrgaosExecutores(orgaosExecutoresNovo);
+ }
+ }
+ if (ocorrenciaMunicipalGlobal.getOrgaosExecutores() != null) {
+ Set<OrgaoExecutor> orgaosExecutoresNovo = copySetOrgaoExecutor(ocorrenciaMunicipalGlobal.getOrgaosExecutores());
+ ocorrenciaMunicipalGlobal.setOrgaosExecutores(orgaosExecutoresNovo);
+ }
+ populateEditForm(uiModel, ocorrenciaMunicipalGlobal);
+ ocorrenciaMunicipalGlobal = null;
+ return "ocorrenciamunicipais/create";
+ }
+
+ @RequestMapping(value = "selecionar", method = RequestMethod.POST, produces = "text/html")
+ public String createSelectForm(@Valid OcorrenciaMunicipal ocorrenciaMunicipal, @RequestParam(value = "tipo", required = false) String type, @RequestParam(value = "op", required = false) Integer op, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
+ ocorrenciaMunicipalGlobal = ocorrenciaMunicipal;
+
+ if (op == 0) {
+ if (type.equals("orgaosExecutores")) {
+ if (ocorrenciaMunicipal.getOrgaosExecutores() == null)
+ uiModel.addAttribute("orgaoexecutors", OrgaoExecutor.findAllOrgaoExecutors());
+ else {
+ List<OrgaoExecutor> oe = OrgaoExecutor.findAllOrgaoExecutors();
+ oe.removeAll(ocorrenciaMunicipal.getOrgaosExecutores());
+ uiModel.addAttribute("orgaoexecutors", oe);
+ }
+ OrgaoExecutorController oec = new OrgaoExecutorController();
+ oec.addDateTimeFormatPatterns(uiModel);
+ return "orgaoexecutores/select";
+ }
+ }
+ else if (op == 1) {
+ if (type.equals("orgaosExecutores")) {
+ if (ocorrenciaMunicipal.getOrgaosExecutores() != null) {
+ uiModel.addAttribute("orgaoexecutors", ocorrenciaMunicipal.getOrgaosExecutores());
+ OrgaoExecutorController oec = new OrgaoExecutorController();
+ oec.addDateTimeFormatPatterns(uiModel);
+ return "orgaoexecutores/select";
+ }
+ else {
+ populateEditForm(uiModel, ocorrenciaMunicipalGlobal);
+ ocorrenciaMunicipalGlobal = null;
+ return "ocorrenciamunicipais/create";
+ }
+ }
+ }
+ return "uncaughtException";
+ }
@RequestMapping(method = RequestMethod.POST, produces = "text/html")
public String create(@Valid OcorrenciaMunicipal ocorrenciaMunicipal, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
@@ -197,7 +275,8 @@ public class OcorrenciaMunicipalController {
lm.add(0, m);
uiModel.addAttribute("municipios", lm);
- uiModel.addAttribute("orgaoexecutores", OrgaoExecutor.findAllOrgaoExecutors());
+ if (ocorrenciaMunicipal.getOrgaosExecutores() != null)
+ uiModel.addAttribute("orgaoexecutores", ocorrenciaMunicipal.getOrgaosExecutores());
List<Programa> lp = Programa.findAllProgramasEfetivos();
Programa p = new Programa();
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 a110b6afe91955fec5a7898c9633447ec232ee13..1b5beb7c62b14fd3a0a326253ebae89e5ae094cb 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java
@@ -2,8 +2,10 @@ package br.ufpr.c3sl.estacaojuventude.web;
import java.util.Arrays;
import java.util.Calendar;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
@@ -34,6 +36,135 @@ import br.ufpr.c3sl.estacaojuventude.enums.TipoTemporalidade;
@Controller
@RooWebScaffold(path = "programas", formBackingObject = Programa.class)
public class ProgramaController {
+ private Programa programaGlobal;
+
+ private Set<Tematica> copySetTematica(Set<Tematica> old) {
+ Set<Tematica> tematicasNova = new HashSet<Tematica>();
+ Set<Tematica> tematicas = old;
+
+ for (Iterator<Tematica> t = tematicas.iterator(); t.hasNext();)
+ tematicasNova.add(Tematica.findTematica(t.next().getId()));
+
+ return tematicasNova;
+ }
+
+ private Set<OrgaoExecutor> copySetOrgaoExecutor(Set<OrgaoExecutor> old) {
+ Set<OrgaoExecutor> orgaosExecutoresNovo = new HashSet<OrgaoExecutor>();
+ Set<OrgaoExecutor> orgaosExecutores = old;
+
+ for (Iterator<OrgaoExecutor> o = orgaosExecutores.iterator(); o.hasNext();)
+ orgaosExecutoresNovo.add(OrgaoExecutor.findOrgaoExecutor(o.next().getId()));
+
+ return orgaosExecutoresNovo;
+ }
+
+ @RequestMapping(value = "/form/{id}", produces = "text/html")
+ public String addSelected(@PathVariable("id") Long id, Model uiModel, HttpServletRequest httpServletRequest) {
+ if (Tematica.findTematica(id) != null) {
+ if (programaGlobal.getTematicas() == null) {
+ Set<Tematica> tematicas = new HashSet<Tematica>();
+ tematicas.add(Tematica.findTematica(id));
+
+ programaGlobal.setTematicas(tematicas);
+ }
+ else {
+ Set<Tematica> tematicasNova = copySetTematica(programaGlobal.getTematicas());
+ if (tematicasNova.contains(Tematica.findTematica(id)))
+ tematicasNova.remove(Tematica.findTematica(id));
+ else
+ tematicasNova.add(Tematica.findTematica(id));
+ programaGlobal.setTematicas(tematicasNova);
+ }
+ }
+ else if (OrgaoExecutor.findOrgaoExecutor(id) != null) {
+ if (programaGlobal.getOrgaosExecutores() == null) {
+ Set<OrgaoExecutor> orgaosExecutores = new HashSet<OrgaoExecutor>();
+ orgaosExecutores.add(OrgaoExecutor.findOrgaoExecutor(id));
+
+ programaGlobal.setOrgaosExecutores(orgaosExecutores);
+ }
+ else {
+ Set<OrgaoExecutor> orgaosExecutoresNovo = copySetOrgaoExecutor(programaGlobal.getOrgaosExecutores());
+ if (orgaosExecutoresNovo.contains(OrgaoExecutor.findOrgaoExecutor(id)))
+ orgaosExecutoresNovo.remove(OrgaoExecutor.findOrgaoExecutor(id));
+ else
+ orgaosExecutoresNovo.add(OrgaoExecutor.findOrgaoExecutor(id));
+ programaGlobal.setOrgaosExecutores(orgaosExecutoresNovo);
+ }
+ }
+ if (programaGlobal.getTematicas() != null) {
+ Set<Tematica> tematicasNova = copySetTematica(programaGlobal.getTematicas());
+ programaGlobal.setTematicas(tematicasNova);
+ }
+ if (programaGlobal.getOrgaosExecutores() != null) {
+ Set<OrgaoExecutor> orgaosExecutoresNovo = copySetOrgaoExecutor(programaGlobal.getOrgaosExecutores());
+ programaGlobal.setOrgaosExecutores(orgaosExecutoresNovo);
+ }
+ populateEditForm(uiModel, programaGlobal);
+ programaGlobal = null;
+ return "programas/create";
+ }
+
+ @RequestMapping(value = "selecionar", method = RequestMethod.POST, produces = "text/html")
+ public String createSelectForm(@Valid Programa programa, @RequestParam(value = "tipo", required = false) String type, @RequestParam(value = "op", required = false) Integer op, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
+ programaGlobal = programa;
+
+ if (op == 0) {
+ if (type.equals("tematicas")) {
+ if (programa.getTematicas() == null)
+ uiModel.addAttribute("tematicas", Tematica.findAllTematicas());
+ else {
+ List<Tematica> t = Tematica.findAllTematicas();
+ t.removeAll(programa.getTematicas());
+ uiModel.addAttribute("tematicas", t);
+ }
+ TematicaController tc = new TematicaController();
+ tc.addDateTimeFormatPatterns(uiModel);
+ return "tematicas/select";
+ }
+ else if (type.equals("orgaosExecutores")) {
+ if (programa.getOrgaosExecutores() == null)
+ uiModel.addAttribute("orgaoexecutors", OrgaoExecutor.findAllOrgaoExecutors());
+ else {
+ List<OrgaoExecutor> oe = OrgaoExecutor.findAllOrgaoExecutors();
+ oe.removeAll(programa.getOrgaosExecutores());
+ uiModel.addAttribute("orgaoexecutors", oe);
+ }
+ OrgaoExecutorController oec = new OrgaoExecutorController();
+ oec.addDateTimeFormatPatterns(uiModel);
+ return "orgaoexecutores/select";
+ }
+ }
+ else if (op == 1) {
+ if (type.equals("tematicas")) {
+ if (programa.getTematicas() != null) {
+ uiModel.addAttribute("tematicas", programa.getTematicas());
+ TematicaController tc = new TematicaController();
+ tc.addDateTimeFormatPatterns(uiModel);
+ return "tematicas/select";
+ }
+ else {
+ populateEditForm(uiModel, programaGlobal);
+ programaGlobal = null;
+ return "programas/create";
+ }
+ }
+ else if (type.equals("orgaosExecutores")) {
+ if (programa.getOrgaosExecutores() != null) {
+ uiModel.addAttribute("orgaoexecutors", programa.getOrgaosExecutores());
+ OrgaoExecutorController oec = new OrgaoExecutorController();
+ oec.addDateTimeFormatPatterns(uiModel);
+ return "orgaoexecutores/select";
+ }
+ else {
+ populateEditForm(uiModel, programaGlobal);
+ programaGlobal = null;
+ return "programas/create";
+ }
+ }
+ }
+ return "uncaughtException";
+ }
@RequestMapping(method = RequestMethod.POST, produces = "text/html")
public String create(@Valid Programa programa, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
@@ -205,8 +336,12 @@ public class ProgramaController {
uiModel.addAttribute("estados", Estado.findAllEstadoes());
uiModel.addAttribute("usuarios", Usuario.findAllUsuarios());
- uiModel.addAttribute("tematicas", Tematica.findAllTematicas());
- uiModel.addAttribute("orgaoexecutores", OrgaoExecutor.findAllOrgaoExecutors());
+
+ if (programa.getTematicas() != null)
+ uiModel.addAttribute("tematicas", programa.getTematicas());
+ if (programa.getOrgaosExecutores() != null)
+ uiModel.addAttribute("orgaoexecutores", programa.getOrgaosExecutores());
+
uiModel.addAttribute("tipostatuses", Arrays.asList(TipoStatus.values()));
uiModel.addAttribute("situacaos", Arrays.asList(" ", Situacao.Ativo, Situacao.Inativo));
//uiModel.addAttribute("tipotemporalidades", Arrays.asList(TipoTemporalidade.values()));
diff --git a/src/main/resources/log4j.xml b/src/main/resources/log4j.xml
index 48d084535bb62bbaf9451f5572f0acd7a50ae921..1e76fabc3d969532cf4023a1883047bae9e46ede 100644
--- a/src/main/resources/log4j.xml
+++ b/src/main/resources/log4j.xml
@@ -1,6 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+ <appender name="App" class="org.apache.log4j.DailyRollingFileAppender">
+ <param name="File" value="/var/lib/tomcat6/other_logs/app"/>
+ <param name="DatePattern" value="'.'yyyy-MM-dd'.txt'"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %m%n"/>
+ </layout>
+ <filter class="org.apache.log4j.varia.StringMatchFilter">
+ <param name="StringToMatch" value="Publishing event in WebApplicationContext for namespace 'participatorio-servlet': ServletRequestHandledEvent:" />
+ <param name="AcceptOnMatch" value="true" />
+ </filter>
+ <filter class="org.apache.log4j.varia.DenyAllFilter"/>
+ </appender>
+
+ <appender name="Id" class="org.apache.log4j.DailyRollingFileAppender">
+ <param name="File" value="/var/lib/tomcat6/other_logs/id"/>
+ <param name="DatePattern" value="'.'yyyy-MM-dd'.txt'"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %m%n"/>
+ </layout>
+ </appender>
+
+ <appender name="Login" class="org.apache.log4j.DailyRollingFileAppender">
+ <param name="File" value="/var/lib/tomcat6/other_logs/login"/>
+ <param name="DatePattern" value="'.'yyyy-MM-dd'.txt'"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %m%n"/>
+ </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.DenyAllFilter"/>
+ </appender>
+
<!-- <appender class="org.apache.log4j.RollingFileAppender" name="R"> -->
<!-- <param value="log/application.log" name="File"/> -->
<!-- <param value="1" name="MaxBackupIndex"/> -->
@@ -103,7 +138,20 @@
<!-- #</filter> -->
</appender>
-
+
+ <logger additivity="false" name="org.springframework.web.context.support.XmlWebApplicationContext">
+ <level value="trace"/>
+ <appender-ref ref="App"/>
+ </logger>
+ <logger additivity="false" name="org.hibernate.internal.util.EntityPrinter">
+ <level value="trace"/>
+ <appender-ref ref="Id"/>
+ </logger>
+ <logger additivity="false" name="org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter">
+ <level value="trace"/>
+ <appender-ref ref="Login"/>
+ </logger>
+
<logger name="org.hibernate.engine.query">
<level value="trace"/>
</logger>
diff --git a/src/main/webapp/WEB-INF/tags/form/create.tagx b/src/main/webapp/WEB-INF/tags/form/create.tagx
index 3fc999e88e2fef1998d716231bd3e58c4f7a4779..79740dd24f41a09d0e7f43b9c78e5d224d1ed56d 100644
--- a/src/main/webapp/WEB-INF/tags/form/create.tagx
+++ b/src/main/webapp/WEB-INF/tags/form/create.tagx
@@ -51,7 +51,7 @@
</c:if>
<jsp:doBody />
- <!-- <script type="text/javascript">
+ <!-- <script type="text/javascript">
dojo.require("dijit.form.Button");
dojo.require("dijit.Dialog");
@@ -70,7 +70,7 @@
}
</script>
<button id="buttonTwo" onclick="showDialogTwo();" type="button">Show me!</button> -->
-
+
<div class="submit" id="${fn:escapeXml(id)}_submit">
<spring:message code="button_save" var="save_button" htmlEscape="false" />
<script type="text/javascript">Spring.addDecoration(new Spring.ValidateAllDecoration({elementId:'proceed', event:'onclick'}));</script>
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 be13767a7c46437d1ee0ad0a244142462c965117..3ffbb5785049a210fd99a6bc13582d83aa52fe25 100644
--- a/src/main/webapp/WEB-INF/tags/form/fields/select.tagx
+++ b/src/main/webapp/WEB-INF/tags/form/fields/select.tagx
@@ -17,7 +17,6 @@
<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)." />
- <jsp:directive.attribute name="defaultmultiple" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Disable checked multiselect. (default false)" />
<jsp:directive.attribute name="widthcss" type="java.lang.String" required="false" rtexprvalue="true" description="Specify the width of the input. This will overwrite the default from the css file." />
@@ -50,7 +49,12 @@
</c:if>
<c:if test="${empty widthcss}">
- <c:set value="400px" var="widthcss" />
+ <c:if test="${multiple == false}">
+ <c:set value="400px" var="widthcss" />
+ </c:if>
+ <c:if test="${multiple == true}">
+ <c:set value="438px" var="widthcss" />
+ </c:if>
</c:if>
<c:set var="sec_field">
@@ -60,10 +64,19 @@
<c:set var="sec_itemLabel">
<spring:escapeBody htmlEscape="true" >${itemLabel}</spring:escapeBody>
</c:set>
+
+ <c:choose>
+ <c:when test="${empty hintValue}">
+ <spring:message argumentSeparator="," arguments="${label}, " code="field_simple_validation" var="sec_field_validation" htmlEscape="false" />
+ </c:when>
+ <c:otherwise>
+ <spring:message code="${hintValue}" var="sec_field_validation" htmlEscape="false" />
+ </c:otherwise>
+ </c:choose>
- <div id="_${fn:escapeXml(id)}_id" onmouseover="dijit.Tooltip.defaultPosition=['after']" style="width:calc(220px + ${widthcss})">
+ <div id="_${fn:escapeXml(id)}_id" onmouseover="dijit.Tooltip.defaultPosition=['after']" style="width:calc(220px + ${widthcss})" onclick="forceSelection('_${sec_field}_id', '${multiple}', '${disabled}');">
<c:choose>
- <c:when test="${not empty items}">
+ <c:when test="${not empty items or multiple == true}">
<label for="_${sec_field}_id">
<c:out value="${fn:escapeXml(label)}" />
<c:if test="${required}">
@@ -133,7 +146,7 @@
</c:choose>
</c:otherwise>
</c:choose>
- <br />
+ <!-- <br /> -->
<form:errors cssClass="errors" id="_${sec_field}_error_id" path="${sec_field}" />
</c:otherwise>
</c:choose>
@@ -199,22 +212,13 @@
</c:choose>
</c:otherwise>
</c:choose>
- <br />
+ <!-- <br /> -->
<form:errors cssClass="errors" id="_${sec_field}_error_id" path="${sec_field}" />
</c:otherwise>
</c:choose>
</c:otherwise>
</c:choose>
- <c:choose>
- <c:when test="${empty hintValue}">
- <spring:message argumentSeparator="," arguments="${label}, " code="field_simple_validation" var="sec_field_validation" htmlEscape="false" />
- </c:when>
- <c:otherwise>
- <spring:message code="${hintValue}" var="sec_field_validation" htmlEscape="false" />
- </c:otherwise>
- </c:choose>
-
<c:choose>
<c:when test="${comboboxform == true}">
@@ -233,6 +237,19 @@
<!-- disabled due to http://jira.springframework.org/browse/ROO-909 dijit.form.MultiSelect dojox.form.CheckedMultiSelect <c:otherwise> <script type="text/javascript">Spring.addDecoration(new Spring.ElementDecoration({elementId : '_${field}_id', widgetType: 'dojox.form.CheckedMultiSelect', widgetAttrs : {multiple: true}})); </script> </c:otherwise> -->
+ <c:when test="${multiple == true}">
+ <c:if test="${disabled == false}">
+ <spring:url value="/resources/images/add.png" var="add_image_url" />
+ <spring:url value="/resources/images/delete.png" var="remove_image_url" />
+ <c:set var="req" value="${pageContext.request}" />
+ <c:set var="url">${req.requestURL}</c:set>
+ <!-- <script type="text/javascript"> alert("${url}"); </script> -->
+ <c:set var="url">${fn:substring(url, 0, fn:length(url) - fn:length('/WEB-INF/layouts/default.jspx'))}</c:set>
+ <input id="_${id}_add" style="background:url(${add_image_url}) no-repeat; width:19px;" type="submit" value="adicionar" formaction="${url}${path}/selecionar?tipo=${field}&op=0" />
+ <input id="_${id}_remove" style="background:url(${remove_image_url}) no-repeat; width:19px;" type="submit" value="remover" formaction="${url}${path}/selecionar?tipo=${field}&op=1" />
+ </c:if>
+ </c:when>
+
<!-- adicionado para checkedmultiselect
<c:when test="${multiple == true}">
<script type="text/javascript">
@@ -274,8 +291,19 @@
connectId: ["_${fn:escapeXml(id)}_id"],
label: "${sec_field_validation}",
});
+
+ function forceSelection(id, multiple, disabled) {
+ if (multiple == "true") {
+ if (disabled == "false") {
+ var lisopt = dojo.byId(id).options;
+ for (var x = 0 ; x < lisopt.length ; x++)
+ lisopt[x].selected = true;
+ }
+ }
+ }
</script>
</div>
<br />
+ <br />
</c:if>
</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/form/fields/table.tagx b/src/main/webapp/WEB-INF/tags/form/fields/table.tagx
index 743f8a5dfd9a853e1200df6b12d3354d238ee5f0..489cb6a86896205819c57678f0131ea7d90b513a 100644
--- a/src/main/webapp/WEB-INF/tags/form/fields/table.tagx
+++ b/src/main/webapp/WEB-INF/tags/form/fields/table.tagx
@@ -11,6 +11,9 @@
<jsp:directive.attribute name="delete" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Include 'delete' link into table (default true)" />
<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="select" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Include link to select, used for the multiple select." />
+ <jsp:directive.attribute name="pathShow" type="java.lang.String" required="false" rtexprvalue="true" description="Specify the show button URL path. (used only with select)" />
<c:if test="${empty render or render}">
@@ -33,6 +36,10 @@
<c:if test="${empty delete}">
<c:set var="delete" value="true" />
</c:if>
+
+ <c:if test="${empty select}">
+ <c:set var="select" value="false" />
+ </c:if>
<spring:message var="typeName" code="menu_item_${fn:toLowerCase(fn:split(id,'_')[fn:length(fn:split(id,'_')) - 1])}_new_label" htmlEscape="false" />
<c:set var="lengths" value="${fn:split(columnMaxLengths, '✏')}" scope="request" />
@@ -142,6 +149,14 @@
</form:form>
</c:if>
+ <c:if test="${select}">
+ <spring:url value="/resources/images/add.png" var="add_image_url" />
+ <spring:message arguments="${typeName}" code="entity_update" var="update_label" htmlEscape="false" />
+ <a onclick="selectRedirect()" alt="${fn:escapeXml(update_label)}" title="Continuar">
+ <img alt="${fn:escapeXml(update_label)}" class="image" src="${add_image_url}" title="Continuar" />
+ </a>
+ </c:if>
+
</td>
<c:set var="control" value="false" />
</c:if>
@@ -218,8 +233,13 @@
for (var i=0; i < radioElements.length; i++)
if(radioElements[i].checked == true) {
- var pathHeader = window.location.href.substring(0,window.location.href.lastIndexOf("${path}"));
- window.location.href=pathHeader+"${path}/"+radioElements[i].value;
+ var pathHeader = window.location.href.substring(0,window.location.href.lastIndexOf("${path}"));
+ if ("${select}" == "false")
+ window.location.href=pathHeader+"${path}/"+radioElements[i].value;
+ else {
+ var str = "${pathShow}";
+ window.location.href="../"+str+"/"+radioElements[i].value;
+ }
}
}
@@ -243,6 +263,16 @@
return confirm('${delete_confirm_msg}');
}
}
+
+ function selectRedirect(){
+ var radioElements = document.getElementsByName("radioButton");
+
+ for (var i=0; i < radioElements.length; i++)
+ if(radioElements[i].checked == true) {
+ var pathHeader = window.location.href.substring(0,window.location.href.lastIndexOf("${path}"));
+ window.location.href=pathHeader+"/form/"+radioElements[i].value;
+ }
+ }
</script>
</c:if>
diff --git a/src/main/webapp/WEB-INF/views/localizacoes/create.jspx b/src/main/webapp/WEB-INF/views/localizacoes/create.jspx
index e708950a77a741fde52f4b3f6d7af86ab0b219c7..e9a7f2c43642a50334a8297cb30087c87da30fb5 100644
--- a/src/main/webapp/WEB-INF/views/localizacoes/create.jspx
+++ b/src/main/webapp/WEB-INF/views/localizacoes/create.jspx
@@ -7,17 +7,17 @@
<field:input field="local" hintValue="hint_local" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_local" z="user-managed"/>
<field:input field="logradouro" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_logradouro" z="R8VF4nPgbPp/k1CvGN5ciGIcG9o="/>
<field:input field="bairro" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_bairro" z="K2LLo5fbTkJS/fDtHvy8wH1k9zM="/>
- <field:input widthcss="65px" field="cep" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_cep" z="YGTDfkF4UpnxWZnl++b+vmIqr1E="/>
- <field:input widthcss="35px" field="horarioInicio" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioInicio" mask="##:##" max="5" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*:[0-9]*" z="user-managed"/>
- <field:input widthcss="35px" field="horarioFim" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioFim" mask="##:##" max="5" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*:[0-9]*" z="user-managed"/>
+ <field:input field="cep" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_cep" widthcss="65px" z="user-managed"/>
+ <field:input field="horarioInicio" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioInicio" mask="##:##" max="5" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*:[0-9]*" widthcss="35px" z="user-managed"/>
+ <field:input field="horarioFim" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioFim" mask="##:##" max="5" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*:[0-9]*" widthcss="35px" z="user-managed"/>
<field:input field="nomeReferencia" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_nomeReferencia" z="Xa47YY1HN/qBwALtrICTG729uCY="/>
- <field:input widthcss="85px" field="telefone" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_telefone" mask="(##)####-####" max="13" validationMessageCode="field_invalid_integer" validationRegex="[(][0-9]*[)][0-9]*-[0-9]*" z="user-managed"/>
+ <field:input field="telefone" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_telefone" mask="(##)####-####" max="13" validationMessageCode="field_invalid_integer" validationRegex="[(][0-9]*[)][0-9]*-[0-9]*" widthcss="85px" z="user-managed"/>
<field:input field="email" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_email" validationMessageCode="field_invalid_email" validationRegex="[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}" z="user-managed"/>
- <field:input widthcss="30px" field="quantidadeVagas" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_quantidadeVagas" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*" z="user-managed"/>
+ <field:input field="quantidadeVagas" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_quantidadeVagas" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*" widthcss="30px" z="user-managed"/>
<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:datetime dateTimePattern="${localizacao_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ultimaAlteracao" render="false" z="user-managed"/>
- <field:select widthcss="60px" field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_situacao" items="${situacaos}" path="situacaos" z="TmQUfFwMMNFrKULyHhvdA4EiGIo="/>
+ <field:select field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_situacao" items="${situacaos}" path="situacaos" widthcss="60px" z="user-managed"/>
<field:textarea field="observacao" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_observacao" 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/localizacoes/update.jspx b/src/main/webapp/WEB-INF/views/localizacoes/update.jspx
index e41e9def811ae31d376b549646da0b6542d2e66d..fba211d6c63e5d0cc93b0e70321c00de85439571 100644
--- a/src/main/webapp/WEB-INF/views/localizacoes/update.jspx
+++ b/src/main/webapp/WEB-INF/views/localizacoes/update.jspx
@@ -8,16 +8,16 @@
<field:input field="local" hintValue="hint_local" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_local" z="user-managed"/>
<field:input field="logradouro" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_logradouro" z="R8VF4nPgbPp/k1CvGN5ciGIcG9o="/>
<field:input field="bairro" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_bairro" z="K2LLo5fbTkJS/fDtHvy8wH1k9zM="/>
- <field:input widthcss="65px" field="cep" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_cep" z="YGTDfkF4UpnxWZnl++b+vmIqr1E="/>
- <field:input widthcss="35px" field="horarioInicio" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioInicio" mask="##:##" max="5" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*:[0-9]*" z="user-managed"/>
- <field:input widthcss="35px" field="horarioFim" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioFim" mask="##:##" max="5" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*:[0-9]*" z="user-managed"/>
+ <field:input field="cep" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_cep" widthcss="65px" z="user-managed"/>
+ <field:input field="horarioInicio" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioInicio" mask="##:##" max="5" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*:[0-9]*" widthcss="35px" z="user-managed"/>
+ <field:input field="horarioFim" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioFim" mask="##:##" max="5" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*:[0-9]*" widthcss="35px" z="user-managed"/>
<field:input field="nomeReferencia" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_nomeReferencia" z="Xa47YY1HN/qBwALtrICTG729uCY="/>
- <field:input widthcss="85px" field="telefone" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_telefone" mask="(##)####-####" max="13" validationMessageCode="field_invalid_integer" validationRegex="[(][0-9]*[)][0-9]*-[0-9]*" z="user-managed"/>
+ <field:input field="telefone" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_telefone" mask="(##)####-####" max="13" validationMessageCode="field_invalid_integer" validationRegex="[(][0-9]*[)][0-9]*-[0-9]*" widthcss="85px" z="user-managed"/>
<field:input field="email" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_email" validationMessageCode="field_invalid_email" validationRegex="[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}" z="user-managed"/>
- <field:input widthcss="30px" field="quantidadeVagas" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_quantidadeVagas" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*" z="user-managed"/>
+ <field:input field="quantidadeVagas" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_quantidadeVagas" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*" widthcss="30px" z="user-managed"/>
<field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_status" items="${tipostatuses}" path="tipostatuses" z="TEwrKKSHtWZlxHF78UJ71aVsuQs="/>
<field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_usuario" itemValue="id" items="${usuarios}" path="/usuarios" z="wmo7IEAN0Eh+oOhrkuA9jfhDQnw="/>
- <field:select widthcss="60px" field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_situacao" items="${situacaos}" path="situacaos" z="TmQUfFwMMNFrKULyHhvdA4EiGIo="/>
+ <field:select field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_situacao" items="${situacaos}" path="situacaos" widthcss="60px" z="user-managed"/>
<field:datetime dateTimePattern="${localizacao_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ultimaAlteracao" render="false" z="user-managed"/>
<field:textarea field="observacao" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_observacao" z="user-managed"/>
</form:update>
@@ -28,16 +28,16 @@
<field:input field="local" hintValue="hint_local" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_local" z="F+5PMRrsFY8daKJAKHiD++Q/zM0="/>
<field:input field="logradouro" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_logradouro" z="R8VF4nPgbPp/k1CvGN5ciGIcG9o="/>
<field:input field="bairro" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_bairro" z="K2LLo5fbTkJS/fDtHvy8wH1k9zM="/>
- <field:input widthcss="65px" field="cep" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_cep" z="YGTDfkF4UpnxWZnl++b+vmIqr1E="/>
- <field:input widthcss="35px" field="horarioInicio" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioInicio" mask="##:##" max="5" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*:[0-9]*" z="0Egfy+HjrWVXrGtXzQ/w4nb9YTA="/>
- <field:input widthcss="35px" field="horarioFim" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioFim" mask="##:##" max="5" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*:[0-9]*" z="xZvGYpfbHtzLW7dEgKoAV55BuJE="/>
+ <field:input field="cep" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_cep" widthcss="65px" z="YGTDfkF4UpnxWZnl++b+vmIqr1E="/>
+ <field:input field="horarioInicio" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioInicio" mask="##:##" max="5" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*:[0-9]*" widthcss="35px" z="0Egfy+HjrWVXrGtXzQ/w4nb9YTA="/>
+ <field:input field="horarioFim" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_horarioFim" mask="##:##" max="5" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*:[0-9]*" widthcss="35px" z="xZvGYpfbHtzLW7dEgKoAV55BuJE="/>
<field:input field="nomeReferencia" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_nomeReferencia" z="Xa47YY1HN/qBwALtrICTG729uCY="/>
- <field:input widthcss="85px" field="telefone" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_telefone" mask="(##)####-####" max="13" validationMessageCode="field_invalid_integer" validationRegex="[(][0-9]*[)][0-9]*-[0-9]*" z="ilHU4xzXIRkjlxIl1dQI1DEoICM="/>
+ <field:input field="telefone" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_telefone" mask="(##)####-####" max="13" validationMessageCode="field_invalid_integer" validationRegex="[(][0-9]*[)][0-9]*-[0-9]*" widthcss="85px" z="ilHU4xzXIRkjlxIl1dQI1DEoICM="/>
<field:input field="email" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_email" validationMessageCode="field_invalid_email" validationRegex="[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}" z="k189k964O3HRRnp3TNb0GDfmZts="/>
- <field:input widthcss="30px" field="quantidadeVagas" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_quantidadeVagas" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*" z="UmLVOAQqGSoB5tMvB5qExH6t+2U="/>
+ <field:input field="quantidadeVagas" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_quantidadeVagas" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*" widthcss="30px" z="UmLVOAQqGSoB5tMvB5qExH6t+2U="/>
<field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_status" items="${tipostatuses}" path="tipostatuses" render="false" z="TEwrKKSHtWZlxHF78UJ71aVsuQs="/>
<field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="wmo7IEAN0Eh+oOhrkuA9jfhDQnw="/>
- <field:select widthcss="60px" disabled="true" field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_situacao" items="${situacaos}" path="situacaos" z="TmQUfFwMMNFrKULyHhvdA4EiGIo="/>
+ <field:select disabled="true" field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_situacao" items="${situacaos}" path="situacaos" widthcss="60px" z="TmQUfFwMMNFrKULyHhvdA4EiGIo="/>
<field:datetime dateTimePattern="${localizacao_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ultimaAlteracao" render="false" z="pImNeT8/39/Wb1z+XFVm5NIkE8g="/>
<field:textarea field="observacao" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_observacao" z="r/snZeahy/A/oRhyMa0+SE1qVfU="/>
</form:update>
diff --git a/src/main/webapp/WEB-INF/views/municipios/create.jspx b/src/main/webapp/WEB-INF/views/municipios/create.jspx
index 72d5fe214339a2ff48a548a307e905a483cbc24a..7c6edb06a582598b9e1e399aea0519f27191e64d 100644
--- a/src/main/webapp/WEB-INF/views/municipios/create.jspx
+++ b/src/main/webapp/WEB-INF/views/municipios/create.jspx
@@ -3,9 +3,9 @@
<jsp:directive.page contentType="text/html;charset=UTF-8"/>
<jsp:output omit-xml-declaration="yes"/>
<form:create id="fc_br_ufpr_c3sl_estacaojuventude_Municipio" modelAttribute="municipio" path="/municipios" render="${empty dependencies}" z="38ISssqudMTSD9vTMbyC3gTOksQ=">
- <field:select field="nome" comboboxform="true" disableFormBinding="true" id="c_br_ufpr_c3sl_estacaojuventude_Municipio_nome" itemValue="id" items="${municipios}" path="/municipios" z="user-managed"/>
-<!-- <field:input field="nome" id="c_br_ufpr_c3sl_estacaojuventude_Municipio_nome" z="9CD68eDTj0MN11p89Mok7Gxph7s="/> -->
- <field:select widthcss="170px" field="uf" id="c_br_ufpr_c3sl_estacaojuventude_Municipio_uf" itemValue="id" items="${estadoes}" path="/estados" z="wqt+9tlb6etcws03aPTvjNKd23Y="/>
+ <field:select comboboxform="true" disableFormBinding="true" field="nome" id="c_br_ufpr_c3sl_estacaojuventude_Municipio_nome" itemValue="id" items="${municipios}" path="/municipios" z="user-managed"/>
+ <!-- <field:input field="nome" id="c_br_ufpr_c3sl_estacaojuventude_Municipio_nome" z="9CD68eDTj0MN11p89Mok7Gxph7s="/> -->
+ <field:select field="uf" id="c_br_ufpr_c3sl_estacaojuventude_Municipio_uf" itemValue="id" items="${estadoes}" path="/estados" widthcss="170px" z="user-managed"/>
<field:datetime dateTimePattern="${municipio_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Municipio_ultimaAlteracao" render="false" z="user-managed"/>
</form:create>
<form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_estacaojuventude_Municipio" render="${not empty dependencies}" z="mAGartg0k3x1a19/nsEdqxdvEgE="/>
diff --git a/src/main/webapp/WEB-INF/views/municipios/update.jspx b/src/main/webapp/WEB-INF/views/municipios/update.jspx
index d52933cf62d5d71e7fc57b3239bada1ddc85ee48..4fe1ddb0bbd048f4ad13dc532db8f25f61700496 100644
--- a/src/main/webapp/WEB-INF/views/municipios/update.jspx
+++ b/src/main/webapp/WEB-INF/views/municipios/update.jspx
@@ -4,7 +4,7 @@
<jsp:output omit-xml-declaration="yes"/>
<form:update id="fu_br_ufpr_c3sl_estacaojuventude_Municipio" modelAttribute="municipio" path="/municipios" versionField="Version" z="YvEHRCvNeN/FYWFrZdXkE+hKbPo=">
<field:input field="nome" id="c_br_ufpr_c3sl_estacaojuventude_Municipio_nome" z="9CD68eDTj0MN11p89Mok7Gxph7s="/>
- <field:select widthcss="170px" field="uf" id="c_br_ufpr_c3sl_estacaojuventude_Municipio_uf" itemValue="id" items="${estadoes}" path="/estados" z="wqt+9tlb6etcws03aPTvjNKd23Y="/>
+ <field:select field="uf" id="c_br_ufpr_c3sl_estacaojuventude_Municipio_uf" itemValue="id" items="${estadoes}" path="/estados" widthcss="170px" z="user-managed"/>
<field:datetime dateTimePattern="${municipio_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Municipio_ultimaAlteracao" render="false" z="user-managed"/>
</form:update>
</div>
diff --git a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx
index 0425f7c2d137455f5c1783fc19503d0c8e7e60e0..d6d2597a29bc83d3c00e5181478a7cb9d69347d8 100644
--- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx
+++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx
@@ -5,18 +5,18 @@
<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" hintValue="hint_orgaos_executores" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/orgaoexecutores" z="user-managed"/>
+ <field:select field="orgaosExecutores" hintValue="hint_orgaos_executores" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/ocorrenciamunicipais" z="user-managed"/>
<field:textarea field="beneficiosLocais" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" z="user-managed"/>
<!-- <field:input field="beneficiosLocais" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" z="4+gr9Eh5QnqAtYMJBTazSWU4OHY="/> -->
<field:input field="comoAcessar" hintValue="hint_como_acessar" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_comoAcessar" z="user-managed"/>
- <field:datetime widthcss="65px" dateTimePattern="${ocorrenciaMunicipal_inicioinscricoes_date_format}" field="inicioInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_inicioInscricoes" z="SnoxZpFJimS9Hgu2QRtYQhwrynM="/>
- <field:datetime widthcss="65px" dateTimePattern="${ocorrenciaMunicipal_fiminscricoes_date_format}" field="fimInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_fimInscricoes" z="zG2O+nEyxvpomiBDk1/UbBTttNs="/>
+ <field:datetime dateTimePattern="${ocorrenciaMunicipal_inicioinscricoes_date_format}" field="inicioInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_inicioInscricoes" widthcss="65px" z="user-managed"/>
+ <field:datetime dateTimePattern="${ocorrenciaMunicipal_fiminscricoes_date_format}" field="fimInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_fimInscricoes" widthcss="65px" z="user-managed"/>
<field:select field="localizacoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_localizacoes" itemValue="id" items="${localizacaos}" multiple="true" path="/localizacoes" render="false" z="user-managed"/>
- <field:input widthcss="30px" field="quantidadeVagas" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_quantidadeVagas" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*" z="user-managed"/>
+ <field:input field="quantidadeVagas" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_quantidadeVagas" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*" widthcss="30px" z="user-managed"/>
<field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_status" items="${tipostatuses}" path="tipostatuses" render="false" z="user-managed"/>
<field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="user-managed"/>
<field:datetime dateTimePattern="${ocorrenciaMunicipal_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_ultimaAlteracao" render="false" z="user-managed"/>
- <field:select widthcss="60px" field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_situacao" items="${situacaos}" path="situacaos" z="3kKRCsPIT4jGs1s9EuBQ4Z4w7kQ="/>
+ <field:select field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_situacao" items="${situacaos}" path="situacaos" widthcss="60px" z="user-managed"/>
<field:textarea field="observacao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_observacao" z="user-managed"/>
</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/ocorrenciamunicipais/update.jspx b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx
index 55add13789b7039f62674e855ce0f6983ac72ed3..0c756c72fd93ab08263df4aa6089ae07c3843c15 100644
--- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx
+++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx
@@ -6,17 +6,17 @@
<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" hintValue="hint_orgaos_executores" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/orgaoexecutores" z="user-managed"/>
+ <field:select field="orgaosExecutores" hintValue="hint_orgaos_executores" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/ocorrenciamunicipais" z="user-managed"/>
<field:textarea field="beneficiosLocais" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" z="user-managed"/>
<!-- <field:input field="beneficiosLocais" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" z="4+gr9Eh5QnqAtYMJBTazSWU4OHY="/> -->
<field:input field="comoAcessar" hintValue="hint_como_acessar" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_comoAcessar" z="user-managed"/>
- <field:datetime widthcss="65px" dateTimePattern="${ocorrenciaMunicipal_inicioinscricoes_date_format}" field="inicioInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_inicioInscricoes" z="user-managed"/>
- <field:datetime widthcss="65px" dateTimePattern="${ocorrenciaMunicipal_fiminscricoes_date_format}" field="fimInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_fimInscricoes" z="user-managed"/>
- <field:select defaultmultiple="true" 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 widthcss="30px" field="quantidadeVagas" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_quantidadeVagas" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*" z="user-managed"/>
+ <field:datetime dateTimePattern="${ocorrenciaMunicipal_inicioinscricoes_date_format}" field="inicioInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_inicioInscricoes" widthcss="65px" z="user-managed"/>
+ <field:datetime dateTimePattern="${ocorrenciaMunicipal_fiminscricoes_date_format}" field="fimInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_fimInscricoes" widthcss="65px" z="user-managed"/>
+ <field:select 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" validationRegex="[0-9]*" widthcss="30px" z="user-managed"/>
<field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_status" items="${tipostatuses}" path="tipostatuses" z="F0r/fUzTX6lkoHa0mAWk5JT7EF8="/>
<field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_usuario" itemValue="id" items="${usuarios}" path="/usuarios" z="Babmxc8XdBqVIn8xbkYKIAy+glA="/>
- <field:select widthcss="60px" field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_situacao" items="${situacaos}" path="situacaos" z="3kKRCsPIT4jGs1s9EuBQ4Z4w7kQ="/>
+ <field:select field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_situacao" items="${situacaos}" path="situacaos" widthcss="60px" z="user-managed"/>
<field:datetime dateTimePattern="${ocorrenciaMunicipal_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_ultimaAlteracao" render="false" z="user-managed"/>
<field:textarea field="observacao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_observacao" z="user-managed"/>
</form:update>
@@ -25,17 +25,17 @@
<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" hintValue="hint_orgaos_executores" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/orgaoexecutores" z="user-managed"/>
+ <field:select field="orgaosExecutores" hintValue="hint_orgaos_executores" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/ocorrenciamunicipais" z="user-managed"/>
<field:textarea field="beneficiosLocais" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" z="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:datetime widthcss="65px" dateTimePattern="${ocorrenciaMunicipal_inicioinscricoes_date_format}" field="inicioInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_inicioInscricoes" z="G0XGhemETMWseRmD4VKjlzifEJ8="/>
- <field:datetime widthcss="65px" dateTimePattern="${ocorrenciaMunicipal_fiminscricoes_date_format}" field="fimInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_fimInscricoes" z="fS41CZmEMANwCEqNQ+HlzbTnhE0="/>
- <field:select defaultmultiple="true" 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 widthcss="30px" field="quantidadeVagas" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_quantidadeVagas" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*" z="VVOME2kMr4+rxAFNbv5sTC6HvAw="/>
+ <field:datetime dateTimePattern="${ocorrenciaMunicipal_inicioinscricoes_date_format}" field="inicioInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_inicioInscricoes" widthcss="65px" z="G0XGhemETMWseRmD4VKjlzifEJ8="/>
+ <field:datetime dateTimePattern="${ocorrenciaMunicipal_fiminscricoes_date_format}" field="fimInscricoes" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_fimInscricoes" widthcss="65px" 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" validationRegex="[0-9]*" widthcss="30px" z="VVOME2kMr4+rxAFNbv5sTC6HvAw="/>
<field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_status" items="${tipostatuses}" path="tipostatuses" render="false" z="F0r/fUzTX6lkoHa0mAWk5JT7EF8="/>
<field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="Babmxc8XdBqVIn8xbkYKIAy+glA="/>
- <field:select widthcss="60px" disabled="true" field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_situacao" items="${situacaos}" path="situacaos" z="3kKRCsPIT4jGs1s9EuBQ4Z4w7kQ="/>
+ <field:select disabled="true" field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_situacao" items="${situacaos}" path="situacaos" widthcss="60px" z="3kKRCsPIT4jGs1s9EuBQ4Z4w7kQ="/>
<field:datetime dateTimePattern="${ocorrenciaMunicipal_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_ultimaAlteracao" render="false" z="OUpU0b2nUWoYaZanPl42QQFEIzE="/>
<field:textarea field="observacao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_observacao" z="uHfTR/Gl2nh2vC/fb7veorHuNIY="/>
</form:update>
diff --git a/src/main/webapp/WEB-INF/views/orgaoexecutores/create.jspx b/src/main/webapp/WEB-INF/views/orgaoexecutores/create.jspx
index cf107e8d1b0dce1f0c6f7d74d591420c943db0ac..d337c41cd01342448967b24745614b789b69812f 100644
--- a/src/main/webapp/WEB-INF/views/orgaoexecutores/create.jspx
+++ b/src/main/webapp/WEB-INF/views/orgaoexecutores/create.jspx
@@ -4,17 +4,17 @@
<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 widthcss="105px" field="sigla" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_sigla" mask="upperCase" z="user-managed"/>
+ <field:input field="sigla" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_sigla" mask="upperCase" widthcss="105px" z="user-managed"/>
<field:input field="site" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_site" validationMessageCode="field_invalid_url" validationRegex="(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?" z="user-managed"/>
<field:input field="endereco" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_endereco" z="tTcJ375UKIKQWJiq30XNmeti03c="/>
<field:input field="logradouro" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_logradouro" z="k/1XFT6R2/obR+osepiqSAJabF8="/>
<field:input field="bairro" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_bairro" z="C0AhYYllc9NQKj6P/OsWQ/cbgBs="/>
- <field:input widthcss="65px" field="cep" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_cep" z="ILuzChXwBHnMrHaIU+6ybP7k5Q8="/>
+ <field:input field="cep" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_cep" widthcss="65px" z="user-managed"/>
<field:select field="municipio" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_municipio" itemValue="id" items="${municipios}" path="/municipios" z="TsmVkI/NlGQHwdhUUjgjQ8bprz4="/>
<field:input field="contato" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_contato" z="N464inkZDRkVnlMA8hpmvvyzs7g="/>
<field:datetime dateTimePattern="${orgaoExecutor_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_ultimaAlteracao" render="false" z="user-managed"/>
<field:input field="emailContato" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_emailContato" validationMessageCode="field_invalid_email" validationRegex="[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}" z="user-managed"/>
- <field:input widthcss="85px" field="telefoneContato" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_telefoneContato" mask="(##)####-####" max="13" validationMessageCode="field_invalid_integer" validationRegex="[(][0-9]*[)][0-9]*-[0-9]*" z="user-managed"/>
+ <field:input field="telefoneContato" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_telefoneContato" mask="(##)####-####" max="13" validationMessageCode="field_invalid_integer" validationRegex="[(][0-9]*[)][0-9]*-[0-9]*" widthcss="85px" z="user-managed"/>
</form:create>
<form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor" render="${not empty dependencies}" z="AAjeOEHmudaMpa7oWwH71C1aVn0="/>
</div>
diff --git a/src/main/webapp/WEB-INF/views/orgaoexecutores/select.jspx b/src/main/webapp/WEB-INF/views/orgaoexecutores/select.jspx
new file mode 100644
index 0000000000000000000000000000000000000000..1d9d5ca7fc636a8ba7774801c791bb499d021473
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/orgaoexecutores/select.jspx
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
+ <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+ <jsp:output omit-xml-declaration="yes"/>
+ <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="/selecionar" pathShow="orgaoexecutores" select="true" create="false" update="false" delete="false" 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_logradouro" property="logradouro" z="6ITGeQZjLaUhB0Q1CkB8Zy5kiKI="/>
+ <table:column id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_bairro" property="bairro" z="yXzETeUJkCbswa2Y8knWAqvH2x8="/>
+ <table:column date="true" dateTimePattern="${orgaoExecutor_ultimaalteracao_date_format}" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_ultimaAlteracao" property="ultimaAlteracao" render="false" z="user-managed"/>
+ </table:table>
+ </page:list>
+</div>
diff --git a/src/main/webapp/WEB-INF/views/orgaoexecutores/update.jspx b/src/main/webapp/WEB-INF/views/orgaoexecutores/update.jspx
index b5d68d8ed27cd1154a83693e1292b88952661b64..37f5ab8f79adcfb7059f12647cf66b60a83daf75 100644
--- a/src/main/webapp/WEB-INF/views/orgaoexecutores/update.jspx
+++ b/src/main/webapp/WEB-INF/views/orgaoexecutores/update.jspx
@@ -4,16 +4,16 @@
<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 widthcss="105px" field="sigla" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_sigla" mask="upperCase" z="user-managed"/>
+ <field:input field="sigla" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_sigla" mask="upperCase" widthcss="105px" z="user-managed"/>
<field:input field="site" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_site" validationMessageCode="field_invalid_url" validationRegex="(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?" z="user-managed"/>
<field:input field="endereco" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_endereco" z="tTcJ375UKIKQWJiq30XNmeti03c="/>
<field:input field="logradouro" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_logradouro" z="k/1XFT6R2/obR+osepiqSAJabF8="/>
<field:input field="bairro" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_bairro" z="C0AhYYllc9NQKj6P/OsWQ/cbgBs="/>
- <field:input widthcss="65px" field="cep" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_cep" z="ILuzChXwBHnMrHaIU+6ybP7k5Q8="/>
+ <field:input field="cep" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_cep" widthcss="65px" z="user-managed"/>
<field:select field="municipio" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_municipio" itemValue="id" items="${municipios}" path="/municipios" z="TsmVkI/NlGQHwdhUUjgjQ8bprz4="/>
<field:input field="contato" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_contato" z="N464inkZDRkVnlMA8hpmvvyzs7g="/>
<field:input field="emailContato" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_emailContato" validationMessageCode="field_invalid_email" validationRegex="[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}" z="user-managed"/>
- <field:input widthcss="85px" field="telefoneContato" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_telefoneContato" mask="(##)####-####" max="13" validationMessageCode="field_invalid_integer" validationRegex="[(][0-9]*[)][0-9]*-[0-9]*" z="user-managed"/>
+ <field:input field="telefoneContato" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_telefoneContato" mask="(##)####-####" max="13" validationMessageCode="field_invalid_integer" validationRegex="[(][0-9]*[)][0-9]*-[0-9]*" widthcss="85px" z="user-managed"/>
<field:datetime dateTimePattern="${orgaoExecutor_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_ultimaAlteracao" render="false" z="user-managed"/>
</form:update>
</div>
diff --git a/src/main/webapp/WEB-INF/views/orgaoexecutores/views.xml b/src/main/webapp/WEB-INF/views/orgaoexecutores/views.xml
index bb4e5040705fbca3c73852644f8e0b9848ac6d96..bebd67eab6c37447a04ec86fef7c3d1ddeec2169 100644
--- a/src/main/webapp/WEB-INF/views/orgaoexecutores/views.xml
+++ b/src/main/webapp/WEB-INF/views/orgaoexecutores/views.xml
@@ -13,4 +13,8 @@
<definition extends="default" name="orgaoexecutores/update">
<put-attribute name="body" value="/WEB-INF/views/orgaoexecutores/update.jspx"/>
</definition>
+
+ <definition extends="default" name="orgaoexecutores/select">
+ <put-attribute name="body" value="/WEB-INF/views/orgaoexecutores/select.jspx"/>
+ </definition>
</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/programas/create.jspx b/src/main/webapp/WEB-INF/views/programas/create.jspx
index 33ccbd7649380b854c03072341d92d018481b311..0a18e6710e4cc502b09fded8c81726042e1d360b 100644
--- a/src/main/webapp/WEB-INF/views/programas/create.jspx
+++ b/src/main/webapp/WEB-INF/views/programas/create.jspx
@@ -5,8 +5,8 @@
<form:create id="fc_br_ufpr_c3sl_estacaojuventude_Programa" modelAttribute="programa" path="/programas" render="${empty dependencies}" z="4CwEj0Kjtq3ryFdtSYMf8VPjNc0=">
<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 widthcss="105px" field="sigla" id="c_br_ufpr_c3sl_estacaojuventude_Programa_sigla" z="kGLlUDsbNNGnqG06eMJbJB4OBXs="/>
- <field:select widthcss="80px" field="nivel" hintValue="hint_nivel" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nivel" items="${nivelprogramas}" path="nivelprogramas" z="user-managed"/>
+ <field:input field="sigla" id="c_br_ufpr_c3sl_estacaojuventude_Programa_sigla" widthcss="105px" z="user-managed"/>
+ <field:select field="nivel" hintValue="hint_nivel" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nivel" items="${nivelprogramas}" path="nivelprogramas" widthcss="80px" 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" 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"/>
@@ -15,22 +15,22 @@
<!-- <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 widthcss="65px" dateTimePattern="${programa_datainicio_date_format}" field="dataInicio" id="c_br_ufpr_c3sl_estacaojuventude_Programa_dataInicio" z="nNVy1J68TFQeiW5rl/NKv94LNCE="/>
- <field:select widthcss="90px" field="temporalidade" id="c_br_ufpr_c3sl_estacaojuventude_Programa_temporalidade" items="${tipotemporalidades}" path="tipotemporalidades" z="8t1yjG70Av2Hz4Mhz7K4xIkuvME="/>
+ <field:datetime dateTimePattern="${programa_datainicio_date_format}" field="dataInicio" id="c_br_ufpr_c3sl_estacaojuventude_Programa_dataInicio" widthcss="65px" z="user-managed"/>
+ <field:select field="temporalidade" id="c_br_ufpr_c3sl_estacaojuventude_Programa_temporalidade" items="${tipotemporalidades}" path="tipotemporalidades" widthcss="90px" z="user-managed"/>
<field:input field="publicoAlvo" id="c_br_ufpr_c3sl_estacaojuventude_Programa_publicoAlvo" z="nfjHOXYNbbbwrWZdf8B6WQNyvBU="/>
- <field:input widthcss="25px" field="idadeMinima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMinima" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*" z="user-managed"/>
- <field:input widthcss="25px" field="idadeMaxima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMaxima" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*" z="user-managed"/>
+ <field:input field="idadeMinima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMinima" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*" widthcss="25px" z="user-managed"/>
+ <field:input field="idadeMaxima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMaxima" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*" widthcss="25px" z="user-managed"/>
<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" 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:select field="tematicas" hintValue="hint_tematicas" id="c_br_ufpr_c3sl_estacaojuventude_Programa_tematicas" itemValue="id" items="${tematicas}" multiple="true" path="/programas" z="user-managed"/>
+ <field:select field="orgaosExecutores" id="c_br_ufpr_c3sl_estacaojuventude_Programa_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/programas" z="user-managed"/>
<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"/>
- <field:select widthcss="60px" field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_situacao" items="${situacaos}" path="situacaos" z="jCGDX8PAVbMAynepL96G296Jlxw="/>
+ <field:select field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_situacao" items="${situacaos}" path="situacaos" widthcss="60px" z="user-managed"/>
<field:datetime dateTimePattern="${programa_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_ultimaAlteracao" render="false" z="user-managed"/>
<field:textarea field="observacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_observacao" z="user-managed"/>
</form:create>
diff --git a/src/main/webapp/WEB-INF/views/programas/update.jspx b/src/main/webapp/WEB-INF/views/programas/update.jspx
index aa67726a88a07007d45881c4fda65962367b2fd9..08abc8e47f5d955ef3342e2cb2b6b5e0e9c4c6dd 100644
--- a/src/main/webapp/WEB-INF/views/programas/update.jspx
+++ b/src/main/webapp/WEB-INF/views/programas/update.jspx
@@ -6,8 +6,8 @@
<form:update id="fu_br_ufpr_c3sl_estacaojuventude_Programa" modelAttribute="programa" path="/programas" versionField="Version" z="BzUMrk0HIxfhgMsvGQoaUtv2sDc=">
<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 widthcss="105px" field="sigla" id="c_br_ufpr_c3sl_estacaojuventude_Programa_sigla" z="kGLlUDsbNNGnqG06eMJbJB4OBXs="/>
- <field:select widthcss="80px" field="nivel" hintValue="hint_nivel" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nivel" items="${nivelprogramas}" path="nivelprogramas" z="user-managed"/>
+ <field:input field="sigla" id="c_br_ufpr_c3sl_estacaojuventude_Programa_sigla" widthcss="105px" z="user-managed"/>
+ <field:select field="nivel" hintValue="hint_nivel" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nivel" items="${nivelprogramas}" path="nivelprogramas" widthcss="80px" 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" 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"/>
@@ -16,22 +16,22 @@
<!-- <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 widthcss="65px" dateTimePattern="${programa_datainicio_date_format}" field="dataInicio" id="c_br_ufpr_c3sl_estacaojuventude_Programa_dataInicio" z="nNVy1J68TFQeiW5rl/NKv94LNCE="/>
- <field:select widthcss="90px" field="temporalidade" id="c_br_ufpr_c3sl_estacaojuventude_Programa_temporalidade" items="${tipotemporalidades}" path="tipotemporalidades" z="8t1yjG70Av2Hz4Mhz7K4xIkuvME="/>
+ <field:datetime dateTimePattern="${programa_datainicio_date_format}" field="dataInicio" id="c_br_ufpr_c3sl_estacaojuventude_Programa_dataInicio" widthcss="65px" z="user-managed"/>
+ <field:select field="temporalidade" id="c_br_ufpr_c3sl_estacaojuventude_Programa_temporalidade" items="${tipotemporalidades}" path="tipotemporalidades" widthcss="90px" z="user-managed"/>
<field:input field="publicoAlvo" id="c_br_ufpr_c3sl_estacaojuventude_Programa_publicoAlvo" z="nfjHOXYNbbbwrWZdf8B6WQNyvBU="/>
- <field:input widthcss="25px" field="idadeMinima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMinima" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*" z="user-managed"/>
- <field:input widthcss="25px" field="idadeMaxima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMaxima" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*" z="user-managed"/>
+ <field:input field="idadeMinima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMinima" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*" widthcss="25px" z="user-managed"/>
+ <field:input field="idadeMaxima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMaxima" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*" widthcss="25px" z="user-managed"/>
<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 defaultmultiple="true" 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:select field="tematicas" hintValue="hint_tematicas" id="c_br_ufpr_c3sl_estacaojuventude_Programa_tematicas" itemValue="id" items="${tematicas}" multiple="true" path="/programas" z="user-managed"/>
+ <field:select field="orgaosExecutores" id="c_br_ufpr_c3sl_estacaojuventude_Programa_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/programas" z="user-managed"/>
<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 defaultmultiple="true" 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 widthcss="80px" field="status" id="c_br_ufpr_c3sl_estacaojuventude_Programa_status" items="${tipostatuses}" path="tipostatuses" z="TWynnY2LlkTLv9vJJ6PYF11yQk0="/>
+ <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" widthcss="80px" z="user-managed"/>
<field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_Programa_usuario" itemValue="id" items="${usuarios}" path="/usuarios" z="gyBHEGJXuWI8xAN+JR0Z6EVyhMY="/>
- <field:select widthcss="60px" field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_situacao" items="${situacaos}" path="situacaos" z="jCGDX8PAVbMAynepL96G296Jlxw="/>
+ <field:select field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_situacao" items="${situacaos}" path="situacaos" widthcss="60px" z="user-managed"/>
<field:datetime dateTimePattern="${programa_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_ultimaAlteracao" render="false" z="user-managed"/>
<field:textarea field="observacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_observacao" z="user-managed"/>
</form:update>
@@ -40,8 +40,8 @@
<form:update id="fu_br_ufpr_c3sl_estacaojuventude_Programa" modelAttribute="programa" path="/programas" versionField="Version" z="BzUMrk0HIxfhgMsvGQoaUtv2sDc=">
<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 widthcss="105px" field="sigla" id="c_br_ufpr_c3sl_estacaojuventude_Programa_sigla" z="kGLlUDsbNNGnqG06eMJbJB4OBXs="/>
- <field:select widthcss="80px" field="nivel" hintValue="hint_nivel" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nivel" items="${nivelprogramas}" path="nivelprogramas" z="4pOFZ4tGHsIhD/80BTEdnPGN92g="/>
+ <field:input field="sigla" id="c_br_ufpr_c3sl_estacaojuventude_Programa_sigla" widthcss="105px" z="kGLlUDsbNNGnqG06eMJbJB4OBXs="/>
+ <field:select field="nivel" hintValue="hint_nivel" id="c_br_ufpr_c3sl_estacaojuventude_Programa_nivel" items="${nivelprogramas}" path="nivelprogramas" widthcss="80px" 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" 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="/>
@@ -50,22 +50,22 @@
<!-- <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 widthcss="65px" dateTimePattern="${programa_datainicio_date_format}" field="dataInicio" id="c_br_ufpr_c3sl_estacaojuventude_Programa_dataInicio" z="nNVy1J68TFQeiW5rl/NKv94LNCE="/>
- <field:select widthcss="90px" field="temporalidade" id="c_br_ufpr_c3sl_estacaojuventude_Programa_temporalidade" items="${tipotemporalidades}" path="tipotemporalidades" z="8t1yjG70Av2Hz4Mhz7K4xIkuvME="/>
+ <field:datetime dateTimePattern="${programa_datainicio_date_format}" field="dataInicio" id="c_br_ufpr_c3sl_estacaojuventude_Programa_dataInicio" widthcss="65px" z="nNVy1J68TFQeiW5rl/NKv94LNCE="/>
+ <field:select field="temporalidade" id="c_br_ufpr_c3sl_estacaojuventude_Programa_temporalidade" items="${tipotemporalidades}" path="tipotemporalidades" widthcss="90px" z="8t1yjG70Av2Hz4Mhz7K4xIkuvME="/>
<field:input field="publicoAlvo" id="c_br_ufpr_c3sl_estacaojuventude_Programa_publicoAlvo" z="nfjHOXYNbbbwrWZdf8B6WQNyvBU="/>
- <field:input widthcss="25px" field="idadeMinima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMinima" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*" z="mkv8Bm7AvW/UKajattFE7vU0B9U="/>
- <field:input widthcss="25px" field="idadeMaxima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMaxima" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*" z="WIjBwA925e6JSn8yKl2LnnzmG9A="/>
+ <field:input field="idadeMinima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMinima" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*" widthcss="25px" z="mkv8Bm7AvW/UKajattFE7vU0B9U="/>
+ <field:input field="idadeMaxima" id="c_br_ufpr_c3sl_estacaojuventude_Programa_idadeMaxima" validationMessageCode="field_invalid_integer" validationRegex="[0-9]*" widthcss="25px" z="WIjBwA925e6JSn8yKl2LnnzmG9A="/>
<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 defaultmultiple="true" 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:select field="tematicas" hintValue="hint_tematicas" id="c_br_ufpr_c3sl_estacaojuventude_Programa_tematicas" itemValue="id" items="${tematicas}" multiple="true" path="/programas" z="user-managed"/>
+ <field:select field="orgaosExecutores" id="c_br_ufpr_c3sl_estacaojuventude_Programa_orgaosExecutores" itemValue="id" items="${orgaoexecutores}" multiple="true" path="/programas" z="user-managed"/>
<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 defaultmultiple="true" 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 widthcss="80px" field="status" id="c_br_ufpr_c3sl_estacaojuventude_Programa_status" items="${tipostatuses}" path="tipostatuses" render="false" z="TWynnY2LlkTLv9vJJ6PYF11yQk0="/>
+ <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" widthcss="80px" 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="/>
- <field:select widthcss="60px" disabled="true" field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_situacao" items="${situacaos}" path="situacaos" z="jCGDX8PAVbMAynepL96G296Jlxw="/>
+ <field:select disabled="true" field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_situacao" items="${situacaos}" path="situacaos" widthcss="60px" z="jCGDX8PAVbMAynepL96G296Jlxw="/>
<field:datetime dateTimePattern="${programa_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_ultimaAlteracao" render="false" z="e3c4w4glZu09OLB7kWuvESpucp4="/>
<field:textarea field="observacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_observacao" z="pwr4FRP1megERSCEyZJma2fystE="/>
</form:update>
diff --git a/src/main/webapp/WEB-INF/views/tematicas/select.jspx b/src/main/webapp/WEB-INF/views/tematicas/select.jspx
new file mode 100644
index 0000000000000000000000000000000000000000..a463e7fc9c1ed72637131346d0628448441df38c
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/tematicas/select.jspx
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
+ <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+ <jsp:output omit-xml-declaration="yes"/>
+ <page:list id="pl_br_ufpr_c3sl_estacaojuventude_Tematica" items="${tematicas}" z="MRTzJk6UBaZxzbzq09vvG3QhiKI=">
+ <table:table data="${tematicas}" id="l_br_ufpr_c3sl_estacaojuventude_Tematica" path="/selecionar" pathShow="tematicas" select="true" create="false" update="false" delete="false" z="5UTKhzGvJkHKGpz6cI1k1Hew3hU=">
+ <table:column id="c_br_ufpr_c3sl_estacaojuventude_Tematica_nome" property="nome" z="c++22l4tUCHvBf9JTVpdKI0bEJY="/>
+ <table:column date="true" dateTimePattern="${tematica_ultimaalteracao_date_format}" id="c_br_ufpr_c3sl_estacaojuventude_Tematica_ultimaAlteracao" property="ultimaAlteracao" render="false" z="user-managed"/>
+ </table:table>
+ </page:list>
+</div>
diff --git a/src/main/webapp/WEB-INF/views/tematicas/views.xml b/src/main/webapp/WEB-INF/views/tematicas/views.xml
index c67fde67a4d6faf02bd6d184b6634e0a36f5da79..9ba339ccdf16529d3e6e48800fc5a05f3beff2f7 100644
--- a/src/main/webapp/WEB-INF/views/tematicas/views.xml
+++ b/src/main/webapp/WEB-INF/views/tematicas/views.xml
@@ -13,4 +13,8 @@
<definition extends="default" name="tematicas/update">
<put-attribute name="body" value="/WEB-INF/views/tematicas/update.jspx"/>
</definition>
+
+ <definition extends="default" name="tematicas/select">
+ <put-attribute name="body" value="/WEB-INF/views/tematicas/select.jspx"/>
+ </definition>
</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/usuarios/create.jspx b/src/main/webapp/WEB-INF/views/usuarios/create.jspx
index 6e4c5ba4df948241846f0c99c04d2ef5b524d3cd..6ab469011b83150fa36d15b73a78a5980ac37430 100644
--- a/src/main/webapp/WEB-INF/views/usuarios/create.jspx
+++ b/src/main/webapp/WEB-INF/views/usuarios/create.jspx
@@ -4,9 +4,9 @@
<jsp:output omit-xml-declaration="yes"/>
<form:create id="fc_br_ufpr_c3sl_estacaojuventude_Usuario" modelAttribute="usuario" path="/usuarios" render="${empty dependencies}" z="K3lyZrkxOQob6ItWBoyP6LO4cdw=">
<field:input field="nome" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_nome" z="hMJcdadfvu2hwJwJKi5CKCoqpok="/>
- <field:input widthcss="200px" field="login" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_login" z="MCyjd6eDKgCQTL4oAbflJHm/exc="/>
- <field:input widthcss="200px" field="senha" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_senha" required="true" type="password" z="user-managed"/>
- <field:select widthcss="105px" field="permissao" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_permissao" items="${tipousuarios}" path="tipousuarios" z="UpNHcSyQuceS2GTSKBzw+t01YpU="/>
+ <field:input field="login" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_login" widthcss="200px" z="user-managed"/>
+ <field:input field="senha" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_senha" required="true" type="password" widthcss="200px" z="user-managed"/>
+ <field:select field="permissao" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_permissao" items="${tipousuarios}" path="tipousuarios" widthcss="105px" z="user-managed"/>
<field:datetime dateTimePattern="${usuario_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_ultimaAlteracao" render="false" z="user-managed"/>
</form:create>
<form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_estacaojuventude_Usuario" render="${not empty dependencies}" z="TcO0zHHk2z7G91j+FtFCFjHXv6w="/>
diff --git a/src/main/webapp/WEB-INF/views/usuarios/update.jspx b/src/main/webapp/WEB-INF/views/usuarios/update.jspx
index 4a3b59181c4db1e9c758c3bee4a7bfd301674bef..8cc6d722b05e06e0758f755d7d04b6016d51f295 100644
--- a/src/main/webapp/WEB-INF/views/usuarios/update.jspx
+++ b/src/main/webapp/WEB-INF/views/usuarios/update.jspx
@@ -4,9 +4,9 @@
<jsp:output omit-xml-declaration="yes"/>
<form:update id="fu_br_ufpr_c3sl_estacaojuventude_Usuario" modelAttribute="usuario" path="/usuarios" versionField="Version" z="Ysj1N9nW2rFIXzZ0G2/2VMeMGNk=">
<field:input field="nome" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_nome" z="hMJcdadfvu2hwJwJKi5CKCoqpok="/>
- <field:input widthcss="200px" field="login" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_login" z="MCyjd6eDKgCQTL4oAbflJHm/exc="/>
- <field:input widthcss="200px" field="senha" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_senha" required="true" type="password" z="user-managed"/>
- <field:select widthcss="105px" field="permissao" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_permissao" items="${tipousuarios}" path="tipousuarios" z="UpNHcSyQuceS2GTSKBzw+t01YpU="/>
+ <field:input field="login" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_login" widthcss="200px" z="user-managed"/>
+ <field:input field="senha" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_senha" required="true" type="password" widthcss="200px" z="user-managed"/>
+ <field:select field="permissao" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_permissao" items="${tipousuarios}" path="tipousuarios" widthcss="105px" z="user-managed"/>
<field:datetime dateTimePattern="${usuario_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Usuario_ultimaAlteracao" render="false" z="user-managed"/>
</form:update>
</div>
diff --git a/src/main/webapp/styles/standard.css b/src/main/webapp/styles/standard.css
index e15844b826fd233828efabf089726ff76e832d1a..411305c17256c4ef71f21576ff66cd254272f4b9 100644
--- a/src/main/webapp/styles/standard.css
+++ b/src/main/webapp/styles/standard.css
@@ -273,7 +273,7 @@ tr:nth-child(odd) {
}
tr:nth-child(even) {
background-color: #0F469D;
- color: #fff;
+ color: #999;
}
table {