Merge remote-tracking branch 'origin/develop-6.x'

UDA-EJIE · Nov 25, 2024 · 70058a9 · 70058a9
2 parents a8e61de + a7552fd
commit 70058a9
Show file tree

Hide file tree

Showing 78 changed files with 8,036 additions and 3,077 deletions.
diff --git a/x21aAppWar/.settings/org.eclipse.wst.common.project.facet.core.xml b/x21aAppWar/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -4,9 +4,9 @@
   <fixed facet="java"/>
   <fixed facet="wst.jsdt.web"/>
   <fixed facet="jst.web"/>
-  <installed facet="jst.web" version="2.5"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="java.apt" version="5.0"/>
   <installed facet="java" version="11"/>
   <installed facet="wls.web" version="14.1.1.0"/>
+  <installed facet="jst.web" version="3.1"/>
 </faceted-project>
diff --git a/x21aAppWar/WebContent/WEB-INF/spring/mvc-config.xml b/x21aAppWar/WebContent/WEB-INF/spring/mvc-config.xml
@@ -123,8 +123,5 @@
         		<value>udaAuthenticationProvider</value>
         	</list>
         </property>
-    </bean> 
-
-	<!-- Audit  -->
-	<bean id="auditController" class="com.ejie.x38.audit.AuditController" />
+    </bean>
 </beans>
diff --git a/x21aAppWar/WebContent/WEB-INF/views/patrones/select/selectMultiselect.jsp b/x21aAppWar/WebContent/WEB-INF/views/patrones/select/selectMultiselect.jsp
@@ -66,3 +66,44 @@
 		</div>
 	</div>
 </div>
+<div class="container-fluid">
+	<div class="form-row">
+		<fieldset id="local" class="col-sm mr-sm-5">
+			<legend>Local</legend>
+			<div class="form-groupMaterial">
+				<select id="selectAbuelo"></select>
+				<label for="selectAbuelo">Provincia</label>
+			</div>
+
+			<div class="form-groupMaterial">
+				<select id="multiselectPadre"></select>
+				<label for="multiselectPadre">Comarca Multiple</label>
+			</div>
+
+			<div class="form-groupMaterial">
+				<select id="selectHijo"></select>
+				<label for="selectHijo">Localidad</label>
+			</div>
+		</fieldset>
+
+		<fieldset id="remote" class="col-sm mr-sm-5">
+			<legend>Remoto</legend>
+			<form:form id="selectRemoto_form" modelAttribute="provinciaComarcaLocalidadDTO" action="${remoto}" method="GET">
+				<div class="form-groupMaterial">
+					<form:select id="selectAbueloRemoto" path="codeProvincia" />
+					<label for="selectAbueloRemoto">Provincia</label>
+				</div>
+
+				<div class="form-groupMaterial">
+					<form:select id="multiselectPadreRemoto" path="codeComarca" />
+					<label for="selectPadreRemoto">Comarca Multiple</label>
+				</div>
+
+				<div class="form-groupMaterial">
+					<form:select id="selectHijoRemoto" path="codeLocalidad" />
+					<label for="selectHijoRemoto">Localidad</label>
+				</div>
+			</form:form>
+		</fieldset>
+	</div>
+</div>
diff --git a/x21aAppWar/WebContent/WEB-INF/views/patrones/upload/includes/uploadForm.jsp b/x21aAppWar/WebContent/WEB-INF/views/patrones/upload/includes/uploadForm.jsp
@@ -1,62 +1,52 @@
 
 <%@include file="/WEB-INF/includeTemplate.inc"%>
 
-
 <div id="fileupload_form">
-	<!-- <form action="../upload/form" id="uploadForm" enctype="multipart/form-data" method="POST"> -->
-	<form:form id="uploadForm" action="../upload/form" enctype="multipart/form-data" method="POST" modelAttribute="alumno">
-		<fieldset style="border:1px solid #DADADA;" id="fieldset_formulario">
+	<form:form action="../upload/form" id="uploadForm" enctype="multipart/form-data" method="POST" modelAttribute="alumno">
+		<fieldset style="border: 1px solid #DADADA;" id="fieldset_formulario">
 			<div id="feedback_fileupload_form"></div>
 			<div class="row">
 				<div class="col-md-3">
 					<div class="form-group">
-						<label id="label_nombre"  for="nombre" >Nombre :</label>
-						<form:input path="nombre" id="nombre"/>
+						<label id="label_nombre" for="nombre">Nombre :</label>
+						<form:input path="nombre" id="nombre" />
 					</div>
 				</div>
 				<div class="col-md-3">
 					<div class="form-group">
-						<label id="label_apellido1"  for="apellido1" >Apellido 1:</label>
-						<form:input path="apellido1" id="apellido1"/>
+						<label id="label_apellido1" for="apellido1">Apellido 1:</label>
+						<form:input path="apellido1" id="apellido1" />
 					</div>
 				</div>
 				<div class="col-md-3">
 					<div class="form-group">
-						<label id="label_apellido2"  for="apellido2" >Apellido 2:</label>
-						<form:input path="apellido2" id="apellido2"/>
-					</div>
-				</div>
-				<div class="col-md-3">
-					<div class="form-group">
-						<label id="label_ejie"  for="ejie" >EJIE:</label>
-						<form:checkbox path="ejie" id="ejie" value="1"/>
+						<label id="label_apellido2" for="apellido2">Apellido 2:</label>
+						<form:input path="apellido2" id="apellido2" />
 					</div>
 				</div>
 			</div>
-
 			<div class="row">
-				<div class="col-md-12">
-					Archivos adjuntos:
-				</div>
+				<div class="col-md-12">Archivos adjuntos:</div>
 			</div>
 			<div class="row">
 				<div class="col-md-12 ">
-			        <div class="rup-upload">
-				        <span class="btn btn-success fileinput-button">
-						      <i class="mdi mdi-plus"></i>
-						      <span><spring:message code="upload.button.addFiles"/></span>
-						      <input id="file_form" type="file" name="file"  />
+					<div class="rup-upload">
+						<span class="btn btn-success fileinput-button">
+							<i class="mdi mdi-plus"></i>
+							<span>
+								<spring:message code="upload.button.addFiles" />
+							</span>
+							<input id="file_form" type="file" name="foto" />
 						</span>
-
-					    <div class="fileupload-content">
-					        <div class="files list-group"></div>
-					        <div id="fileupload-progressbar" class="fileupload-progressbar"></div>
-					    </div>
-				    </div>
-			    </div>
-			  </div>
-			  <div class="row">
-			 	 <div class="col-md-12"  >
+						<div class="fileupload-content">
+							<div class="files list-group"></div>
+							<div id="fileupload-progressbar" class="fileupload-progressbar"></div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="row">
+				<div class="col-md-12">
 					<button id="sendButton" type="submit">Enviar formulario</button>
 				</div>
 			</div>

diff --git a/x21aAppWar/WebContent/WEB-INF/views/welcome.jsp b/x21aAppWar/WebContent/WEB-INF/views/welcome.jsp
@@ -22,7 +22,7 @@
 		<div class="col-12">
 			<h1>
 				<img alt="El contenido estático no está correctamente desplegado."
-					src="${staticsUrl}/rup/css/images/uda_logo.png" /> v6.0.0
+					src="${staticsUrl}/rup/css/images/uda_logo.png" /> v6.1.0
 				<small>(Portal demostrativo)</small>
 			</h1>
 			<hr>

diff --git a/x21aAppWar/src/com/ejie/x21a/config/JacksonConfig.java b/x21aAppWar/src/com/ejie/x21a/config/JacksonConfig.java
@@ -21,6 +21,7 @@
 import com.ejie.x21a.model.Comarca;
 import com.ejie.x21a.model.Departamento;
 import com.ejie.x21a.model.DepartamentoProvincia;
+import com.ejie.x21a.model.DivisionTerritorialDto;
 import com.ejie.x21a.model.FormComarcas;
 import com.ejie.x21a.model.IberdokFile;
 import com.ejie.x21a.model.Localidad;
@@ -110,6 +111,7 @@ public UdaModule udaModule() {
 		serializers.put(Buzones.class, customSerializer());
 		serializers.put(IberdokFile.class, customSerializer());
 		serializers.put(LogModel.class, customSerializer());
+		serializers.put(DivisionTerritorialDto.class, customSerializer());
 
 		udaModule.setSerializers(serializers);
 		//udaModule.setSerializationInclusions(serializationInclusions());

diff --git a/x21aAppWar/src/com/ejie/x21a/control/PatronesController.java b/x21aAppWar/src/com/ejie/x21a/control/PatronesController.java
@@ -24,6 +24,7 @@
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
@@ -362,7 +363,8 @@ public String getSelectEnlazadoSimple(Model model) {
     	model.addAttribute("comarcaLocalidadDTO", new ComarcaLocalidadDTO());
 
 		// Provincias
-		model.addAttribute("comboProvincia", provinciasGenerator());
+    	List<Provincia> listaProvincias = provinciasGenerator();
+		model.addAttribute("comboProvincia", listaProvincias);
 
 		// Comarcas
 		model.addAttribute("comboComarca", comarcasGeneratorSelect());
@@ -1243,6 +1245,24 @@ List<Localidad> getEnlazadoLocalidad(
         return localidadService.findAll(localidad, null);
     }
 
+    @GetMapping(value = "comboEnlazadoSimple/remoteEnlazadoLocalidadMultiple")
+    public @ResponseBody
+    List<Localidad> getEnlazadoLocalidadMultiple(
+            @RequestParam(value = "codeComarca", required = false) List<BigDecimal> listaComarcas) {
+    	List<Localidad> listaLocalidades = new ArrayList<Localidad>();
+    	for (BigDecimal key : listaComarcas) {
+	        //Convertir parÃ¡metros en entidad para bÃºsqueda
+	        Comarca comarca = new Comarca();
+	        comarca.setCode(key);
+	        Localidad localidad = new Localidad();
+	        localidad.setComarca(comarca);
+
+	        List<Localidad> lista = localidadService.findAll(localidad, null);
+	        listaLocalidades.addAll(lista);
+    	}
+        return listaLocalidades;
+    }
+
     @GetMapping(value = "comboEnlazadoSimple/remoteGroupEnlazadoComarcaLocalidad")
     public @ResponseBody
     List<HashMap<String, List<DivisionTerritorialDto>>> getEnlazadoComarcaLocalidad(

diff --git a/x21aAppWar/src/com/ejie/x21a/control/UploadController.java b/x21aAppWar/src/com/ejie/x21a/control/UploadController.java
@@ -129,16 +129,15 @@ protected void initBinder(HttpServletRequest request, ServletRequestDataBinder b
 			@RequestParam(value = "nombre", required = false) String nombre,
 			@RequestParam(value = "apellido1", required = false) String apellido1,
 			@RequestParam(value = "apellido2", required = false) String apellido2,
-			@RequestParam(value = "foto", required = false) MultipartFile file) {
-
-		if (!file.isEmpty()) {
-			uploadService.saveToDisk(file, appConfiguration.getProperty("fileUpload.path"));
-			UploadController.logger.info("[POST - addForm] : Fichero guardado.");
-		}
+			@RequestParam(value = "foto", required = false) MultipartFile foto) {
 
 		List<Map<String, Object>> filesMetaInfo = new ArrayList<Map<String, Object>>();
 
-		filesMetaInfo.add(this.getFileReturnMap(file));
+		if (foto != null && !foto.isEmpty()) {
+			uploadService.saveToDisk(foto, appConfiguration.getProperty("fileUpload.path"));
+			filesMetaInfo.add(this.getFileReturnMap(foto));
+			UploadController.logger.info("[POST - addForm] : Fichero guardado.");
+		}
 
 		return filesMetaInfo;
 	}

diff --git a/x21aConfig/x21a.properties b/x21aConfig/x21a.properties
@@ -3,6 +3,10 @@ xlnets.inPortal=FALSE
 xlnets.path=https://xlnets.servicios.des.ejgv.euskalsarea.eus/n38a/N38LoginInicioServlet
 isEjie=true
 
+# Redirection on auth error
+xhr.redirectOnError=true
+xhr.unauthorizedPage=referer
+
 #Cookie
 cookie.rootPath=true
 cookie.secure=true
@@ -33,21 +37,3 @@ repository.file.path=c:/datos/x21a/jackrabbit
 
 #IberDok!
 iberdokFolder=c:/datos/x21a/iberdok
-
-# ========================================================
-# PARAMETROS BIG DATA
-# ========================================================
-
-momo.servicio=uda
-momo.app=x38
-momo.securityTokenId=PIB-3123456786-0
-
-momo.w43taEndpointUri=data.extra.integracion.jakina.ejiedes.net
-momo.w43taEndpointPort=80
-momo.develomentMode=false
-
-momo.doMomo.salidaEstandar=true
-momo.doMomo.incidencias=true
-momo.doMomo.udaTrazas=true
-momo.doMomo.aplicTrazas=true
-momo.doMomo.auditoriaAccesos=true
diff --git a/x21aEAR/pom.xml b/x21aEAR/pom.xml
@@ -5,17 +5,17 @@
 	<groupId>com.ejie.x21a</groupId>
 	<artifactId>x21aEAR</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.0-RELEASE</version>
+	<version>6.1.0-RELEASE</version>
 	<name>x21aEAR</name>
 	<url>http://www.ejie.eus</url>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<org.springframework.version>5.3.31</org.springframework.version>
-		<org.springframework.security.version>5.8.8</org.springframework.security.version>
+		<org.springframework.version>5.3.39</org.springframework.version>
+		<org.springframework.security.version>5.8.15</org.springframework.security.version>
 		<org.logback.version>1.2.11</org.logback.version>
 		<org.slf4j.version>1.7.30</org.slf4j.version>
-		<com.ejie.x38.version>6.0.0-RELEASE</com.ejie.x38.version>
+		<com.ejie.x38.version>6.1.0-RELEASE</com.ejie.x38.version>
 		<org.apache.tiles.version>3.0.8</org.apache.tiles.version>
 		<org.jackson.version>2.12.7.1</org.jackson.version>
 	</properties>
@@ -111,7 +111,7 @@
 		<dependency>
 			<groupId>commons-fileupload</groupId>
 			<artifactId>commons-fileupload</artifactId>
-			<version>1.4</version>
+			<version>1.5</version>
 		</dependency>
 
 		<!-- XALAN -->
@@ -500,11 +500,6 @@
 			<artifactId>hadoop-core-without-webhdfs</artifactId>
 			<version>1.0.3</version>
 		</dependency>
-		<dependency>
-			<groupId>com.ejie</groupId>
-			<artifactId>w43ta</artifactId>
-			<version>2.4</version>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.avro</groupId>
 			<artifactId>avro</artifactId>

diff --git a/x21aStatics/.settings/org.eclipse.wst.common.project.facet.core.xml b/x21aStatics/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -4,8 +4,8 @@
   <fixed facet="java"/>
   <fixed facet="wst.jsdt.web"/>
   <fixed facet="jst.web"/>
-  <installed facet="jst.web" version="2.5"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="java" version="11"/>
   <installed facet="wls.web" version="14.1.1.0"/>
+  <installed facet="jst.web" version="3.1"/>
 </faceted-project>
diff --git a/x21aStatics/WebContent/rup/css/externals/jasmine/jasmine.css b/x21aStatics/WebContent/rup/css/externals/jasmine/jasmine.css
@@ -295,4 +295,7 @@ body {
 }
 .jasmine_html-reporter .jasmine-debug-log table, .jasmine_html-reporter .jasmine-debug-log th, .jasmine_html-reporter .jasmine-debug-log td {
   border: 1px solid #ddd;
+}
+.jasmine_html-reporter .jasmine-debug-log .jasmine-debug-log-msg {
+  white-space: pre;
 }