From 2dfecd59782ff3256e011e63fd0a9b42d82c04d3 Mon Sep 17 00:00:00 2001
From: "Israel B. Sant'Anna" <ibsa14@inf.ufpr.br>
Date: Thu, 14 Aug 2014 09:41:25 -0300
Subject: [PATCH] OcorrenciaMunicipal bugs fixed and letters color changed

Signed-off-by: Israel B. Sant'Anna <ibsa14@inf.ufpr.br>
---
 .../web/OcorrenciaMunicipalController.java    | 27 +++++++++++--------
 .../WEB-INF/tags/form/fields/select.tagx      |  6 ++---
 .../WEB-INF/tags/form/fields/table.tagx       |  4 +--
 .../views/ocorrenciamunicipais/create.jspx    |  7 ++++-
 .../selectmunicipios.jspx                     |  3 ++-
 .../views/ocorrenciamunicipais/update.jspx    |  6 ++---
 src/main/webapp/styles/standard.css           |  2 +-
 7 files changed, 31 insertions(+), 24 deletions(-)

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 9a38c49..0b7c250 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController.java
@@ -145,12 +145,6 @@ public class OcorrenciaMunicipalController {
 			ocorrenciaMunicipalGlobal = ocorrenciaMunicipal;
 		}
 		
-		if(uiModel.asMap().containsKey("Itinerante")){
-			System.out.println("contem: "+uiModel.asMap().get("Itinerante"));
-		}else{
-			System.out.println("nao contem");
-		}
-		
 		if (op == 0) {
 			uiModel.addAttribute("remover", false);
 			if (type.equals("orgaosExecutores")) {
@@ -222,6 +216,12 @@ public class OcorrenciaMunicipalController {
 		return "uncaughtException";
 	}
 	
+	@RequestMapping(value = "/{id}", params = "formUpdate", produces = "text/html")
+    public String updateForm(Model uiModel, @PathVariable("id") Long id) {
+		populateEditFormItinerante(uiModel, OcorrenciaMunicipal.findOcorrenciaMunicipal(id));
+        return "ocorrenciamunicipais/update";
+    }
+	
 	@RequestMapping(params = "formItinerante", produces = "text/html")
     public String createFormItinerante(Model uiModel) {
 		populateEditFormItinerante(uiModel, new OcorrenciaMunicipal());
@@ -305,7 +305,7 @@ public class OcorrenciaMunicipalController {
     public String update(@Valid OcorrenciaMunicipal ocorrenciaMunicipal, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
 		//Programa p = (Programa) Programa.entityManager().createNativeQuery("select * from programa where id = "+programa.getId(), Programa.class).getSingleResult();
 		OcorrenciaMunicipal o = OcorrenciaMunicipal.findOcorrenciaMunicipal(ocorrenciaMunicipal.getId());
-    	
+		
     	if (SecurityContextHolder.getContext().getAuthentication().getAuthorities().toArray()[0].toString().equals("Usuario")) {
     		if (o.getStatus() == TipoStatus.Candidato) {
     			if (!o.getUsuario().getLogin().equals(SecurityContextHolder.getContext().getAuthentication().getName()))
@@ -318,7 +318,7 @@ public class OcorrenciaMunicipalController {
     	}
 		
         if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, ocorrenciaMunicipal);
+            populateEditFormItinerante(uiModel, ocorrenciaMunicipal);
             return "ocorrenciamunicipais/update";
         }
         
@@ -406,6 +406,7 @@ public class OcorrenciaMunicipalController {
 	@RequestMapping(value = "/{id}", params = "status", method = RequestMethod.POST, produces = "text/html")
     public String updateStatus(@PathVariable("id") Long id, @RequestParam(value = "status", required = true) String status, HttpServletRequest httpServletRequest) {
         OcorrenciaMunicipal ocorrenciaMunicipal = OcorrenciaMunicipal.findOcorrenciaMunicipal(id);
+        
         if (ocorrenciaMunicipal.getStatus() == TipoStatus.Candidato) {
             if (status.equals("1")) ocorrenciaMunicipal.setStatus(TipoStatus.Efetivo);
             if (status.equals("0")) ocorrenciaMunicipal.setStatus(TipoStatus.Rejeitado);
@@ -468,7 +469,7 @@ public class OcorrenciaMunicipalController {
         uiModel.addAttribute("situacaos", Arrays.asList(" ", Situacao.Ativo, Situacao.Inativo));
     }
 	
-		void populateEditForm(Model uiModel, OcorrenciaMunicipal ocorrenciaMunicipal) {
+	void populateEditForm(Model uiModel, OcorrenciaMunicipal ocorrenciaMunicipal) {
         uiModel.addAttribute("ocorrenciaMunicipal", ocorrenciaMunicipal);
         uiModel.addAttribute("Itinerante", false);
         addDateTimeFormatPatterns(uiModel);
@@ -480,8 +481,12 @@ public class OcorrenciaMunicipalController {
         le.add(0, e);
         uiModel.addAttribute("estadoes", le);
         
-//        if (ocorrenciaMunicipal.getMunicipios() != null)
-//        	uiModel.addAttribute("municipios", ocorrenciaMunicipal.getMunicipios());
+        if (ocorrenciaMunicipal.getMunicipios() != null && !ocorrenciaMunicipal.getMunicipios().isEmpty()){
+        	long estadoId = ocorrenciaMunicipal.getMunicipios().iterator().next().getUf().getId();
+        	repopulateMunicipios(estadoId+"", uiModel);
+        	uiModel.addAttribute("estadoid", estadoId);
+        }
+        	
         
         if (ocorrenciaMunicipal.getOrgaosExecutores() != null)
         	uiModel.addAttribute("orgaoexecutores", ocorrenciaMunicipal.getOrgaosExecutores());
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 24e7f39..c5e3963 100644
--- a/src/main/webapp/WEB-INF/tags/form/fields/select.tagx
+++ b/src/main/webapp/WEB-INF/tags/form/fields/select.tagx
@@ -265,8 +265,7 @@
 		    			Spring.addDecoration(new Spring.AjaxEventDecoration({
 		    				elementId: "_${id}_add",
 		    				event: "onclick",
-		    				popup: true,
-		    				//params:{fragments: "body"}
+		    				popup: true
 		    			}));
 	            	</script>
 	            	
@@ -274,8 +273,7 @@
 		    			Spring.addDecoration(new Spring.AjaxEventDecoration({
 		    				elementId: "_${id}_remove",
 		    				event: "onclick",
-		    				popup: true,
-		    				//params:{fragments: "body"}
+		    				popup: true
 		    			}));
 	            	</script>
             		
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 17eab27..2296ff3 100644
--- a/src/main/webapp/WEB-INF/tags/form/fields/table.tagx
+++ b/src/main/webapp/WEB-INF/tags/form/fields/table.tagx
@@ -272,7 +272,7 @@
         for (var i=0; i &lt; 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+"?form";
+        		window.location.href=pathHeader+"${path}/"+radioElements[i].value+"?formUpdate";
         	}
     }
     
@@ -295,8 +295,6 @@
     	
     }
     
-	console.log("${Itinerante}");
-    
     function selectRedirect(){
     	var radioElements = document.getElementsByName("radioButton");
     	var selected ="";
diff --git a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx
index e6e2794..b74a0c9 100644
--- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx
+++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/create.jspx
@@ -26,7 +26,10 @@
     <form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" render="${not empty dependencies}" z="ame9911g+go04TVYVVTrRJK0UOs="/>
     
     <script type="text/javascript">
-
+    	if("${estadoid}"!=""){
+    		document.getElementById('_uf_id').value="${estadoid}";
+    	}
+    
     	Spring.addDecoration(new Spring.ElementDecoration({
 			elementId : '_uf_id',
 			widgetType : "dijit.form.FilteringSelect",
@@ -56,6 +59,8 @@
 					var PageElem = document.getElementById("_c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipios_id");
 					var RespElem = responseDoc.getElementById("_c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipios_id");
 					PageElem.innerHTML = RespElem.innerHTML;
+					
+					document.getElementById("_municipios_id").multiple = false;
 				}
 			}
 		}));
diff --git a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/selectmunicipios.jspx b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/selectmunicipios.jspx
index f55976f..6e43967 100644
--- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/selectmunicipios.jspx
+++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/selectmunicipios.jspx
@@ -3,6 +3,7 @@
     <jsp:directive.page contentType="text/html;charset=UTF-8"/>
     <jsp:output omit-xml-declaration="yes"/>
     <form:create id="fc_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" modelAttribute="ocorrenciaMunicipal" path="/ocorrenciamunicipais" render="${empty dependencies}" z="fo6q8lg/xzZrtO1TWfNK0cjMjdk=">
-        <field:select field="municipios" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipios" itemValue="id" items="${municipios}" multiple="false" path="/municipios" z="BD05YnRdtdU25XgKJrSAq3Mc+f4="/>
+        <field:select field="municipios" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipios" itemValue="id" items="${municipios}" path="/municipios" z="BD05YnRdtdU25XgKJrSAq3Mc+f4="/>
     </form:create>
+    <form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" render="${not empty dependencies}" z="ame9911g+go04TVYVVTrRJK0UOs="/>
 </div>
diff --git a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx
index 1e95dd1..ec43858 100644
--- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx
+++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx
@@ -11,7 +11,7 @@
             <field:input field="comoAcessar" hintValue="hint_como_acessar" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_comoAcessar" 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: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="/>
@@ -20,7 +20,7 @@
             <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"/>
-            <field:select field="municipios" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipios" itemValue="id" items="${municipios}" multiple="true" path="/municipios" z="BD05YnRdtdU25XgKJrSAq3Mc+f4="/>
+            <field:select field="municipios" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipios" itemValue="id" items="${municipios}" multiple="true" path="/ocorrenciamunicipais" z="BD05YnRdtdU25XgKJrSAq3Mc+f4="/>
             <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="/>
         </form:update>
@@ -34,7 +34,7 @@
             <field:input field="comoAcessar" hintValue="hint_como_acessar" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_comoAcessar" z="37Av0vUvTAzeQQX4WrRT2KMcj7w="/>
             <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: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="/>
diff --git a/src/main/webapp/styles/standard.css b/src/main/webapp/styles/standard.css
index 2da6b5c..a1f2769 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: #999;
+	color: white;
 }
 
 table {
-- 
GitLab