Agregado tipoautorizacion en permisos y autorizaciones

base/bpm/bpmlib/src/main/java/com/fp/bpmlib/task/client/HumanTaskClient.java

@@ -450,7 +450,7 @@ public class HumanTaskClient {
         List<Object[]> lresp = new ArrayList<>();
         lestatus.add(Status.Reserved);
         lestatus.add(Status.InProgress);
-        List<TaskSummary> list = taskService.getTasksOwnedByStatus(pUserId, lestatus, "en-UK");
+        List<TaskSummary> list = new ArrayList<>();
         try {
             list = taskService.getTasksOwnedByStatus(pUserId, lestatus, "en-UK");
             for (TaskSummary obj : list) {

base/bpm/bpmlib/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:35 ECT 2022
+#Tue Nov 15 12:56:23 ECT 2022
 version=2.1
 groupId=com.fp.base.bpm
 artifactId=bpmlib

base/bpm/simple/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:28 ECT 2022
+#Tue Nov 15 12:56:17 ECT 2022
 version=2.1
 groupId=com.fp.base.bpm
 artifactId=simple

base/business/armas/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:57 ECT 2022
+#Tue Nov 15 12:56:45 ECT 2022
 version=2.1
 groupId=com.fp.base.business
 artifactId=armas

base/business/general/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:50 ECT 2022
+#Tue Nov 15 12:56:37 ECT 2022
 version=2.1
 groupId=com.fp.base.business
 artifactId=general

base/business/log/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:52 ECT 2022
+#Tue Nov 15 12:56:40 ECT 2022
 version=2.1
 groupId=com.fp.base.business
 artifactId=log

base/business/person/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:47 ECT 2022
+#Tue Nov 15 12:56:34 ECT 2022
 version=2.1
 groupId=com.fp.base.business
 artifactId=person

base/business/report/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:51 ECT 2022
+#Tue Nov 15 12:56:39 ECT 2022
 version=2.1
 groupId=com.fp.base.business
 artifactId=report

base/business/viaticos/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:54 ECT 2022
+#Tue Nov 15 12:56:42 ECT 2022
 version=2.1
 groupId=com.fp.base.business
 artifactId=viaticos

base/core/alfresco-client/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:44 ECT 2022
+#Tue Nov 15 12:56:31 ECT 2022
 version=2.1
 groupId=com.fp.base.core
 artifactId=alfresco-client

base/core/bpm/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:30 ECT 2022
+#Tue Nov 15 12:56:19 ECT 2022
 version=2.1
 groupId=com.fp.base.core
 artifactId=bpm

base/core/firmas/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:43 ECT 2022
+#Tue Nov 15 12:56:30 ECT 2022
 version=2.1
 groupId=com.fp.base.core
 artifactId=firmas

base/dto/common/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:14 ECT 2022
+#Tue Nov 15 12:56:04 ECT 2022
 version=2.1
 groupId=com.fp.base.dto
 artifactId=common

base/dto/dto/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:12 ECT 2022
+#Tue Nov 15 12:56:02 ECT 2022
 version=2.1
 groupId=com.fp.base.dto
 artifactId=dto

base/facade/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:59 ECT 2022
+#Tue Nov 15 12:56:47 ECT 2022
 version=2.1
 groupId=com.fp.base
 artifactId=facade

base/facadeclient/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:58 ECT 2022
+#Tue Nov 15 12:56:46 ECT 2022
 version=2.1
 groupId=com.fp.base
 artifactId=facadeclient

base/persistence/commondb/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:23 ECT 2022
+#Tue Nov 15 12:56:13 ECT 2022
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=commondb

base/persistence/parmas/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:42 ECT 2022
+#Tue Nov 15 12:56:29 ECT 2022
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=parmas

base/persistence/pbpm/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:16 ECT 2022
+#Tue Nov 15 12:56:06 ECT 2022
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=pbpm

base/persistence/pcustomer/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:26 ECT 2022
+#Tue Nov 15 12:56:15 ECT 2022
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=pcustomer

base/persistence/pfirmas/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:39 ECT 2022
+#Tue Nov 15 12:56:26 ECT 2022
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=pfirmas

base/persistence/pgeneral/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:21 ECT 2022
+#Tue Nov 15 12:56:11 ECT 2022
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=pgeneral

base/persistence/plog/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:36 ECT 2022
+#Tue Nov 15 12:56:24 ECT 2022
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=plog

base/persistence/pviaticos/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:38 ECT 2022
+#Tue Nov 15 12:56:25 ECT 2022
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=pviaticos

base/persistence/util/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:27 ECT 2022
+#Tue Nov 15 12:56:16 ECT 2022
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=util

base/sessionbeans/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:45 ECT 2022
+#Tue Nov 15 12:56:32 ECT 2022
 version=2.1
 groupId=com.fp.base
 artifactId=sessionbeans

clients/comaco/ear/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:30:00 ECT 2022
+#Tue Nov 15 12:56:47 ECT 2022
 version=2.1
 groupId=com.fp.clients.maia
 artifactId=maiaear

clients/comaco/environment-eap6/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 11 16:29:59 ECT 2022
+#Tue Nov 15 12:56:47 ECT 2022
 version=2.1
 groupId=com.fp.clients.maia
 artifactId=environment-eap6

frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/PermisosAutorizacionesController.java

@@ -16,13 +16,17 @@ import org.primefaces.event.SelectEvent;
 import com.fp.dto.Request;
 import com.fp.dto.Response;
 import com.fp.dto.query.DtoQuery;
+import com.fp.dto.query.Filter;
 import com.fp.dto.query.SubQuery;
 import com.fp.frontend.controller.AbstractController;
 import com.fp.frontend.controller.alfresco.AlfrescoController;
+import com.fp.frontend.controller.pgeneral.gene.CatalogDetailController;
 import com.fp.frontend.enums.EnumLovOption;
 import com.fp.frontend.helper.MessageHelper;
+import com.fp.persistence.parmas.param.TarmTramite;
 import com.fp.persistence.parmas.soli.TarmDocumentoHabilitante;
 import com.fp.persistence.pcustomer.gene.TcustPersonDetail;
+import com.fp.persistence.pgeneral.gene.TgeneCatalogDetail;
 
 /**
  * Controlador para listar los documentos habilitantes del sistema
@@ -38,7 +42,10 @@ public class PermisosAutorizacionesController extends AbstractController<TarmDoc
     private AlfrescoController alfrescoController;
 
     private TcustPersonDetail tcustPersonDetail;
+    private List<TgeneCatalogDetail> lautorizacion;
 
+    private String autorizacion;
+    
     public PermisosAutorizacionesController() throws Exception {
         super(TarmDocumentoHabilitante.class);
     }
@@ -53,42 +60,59 @@ public class PermisosAutorizacionesController extends AbstractController<TarmDoc
         this.beanalias = "PERMISOSAUTORIZACIONES";
         this.recperpage = 15;
         this.lrecord = new ArrayList<>();
+        this.lautorizacion = CatalogDetailController.find("TIPOAUTORIZACION");
     }
 
-    @SuppressWarnings("unchecked")
-    @Override
-    protected void querydatabase() {
-        try {
-            if (!this.getMfilters().containsKey("personcode") || this.getMfilters().get("personcode") == null) {
-                MessageHelper.setMessageError("SELECCIONE UNA IDENTIFICACI\u00d3N");
-                return;
-            }
-            DtoQuery dto = super.getDtoQuery(Boolean.TRUE);
-            HashMap<String, DtoQuery> mtables = new HashMap<String, DtoQuery>();
+    private DtoQuery getDtoQuery () throws Exception{
+    
+        DtoQuery dto = super.getDtoQuery(true);
             SubQuery subqueryCategoriaCodigo = new SubQuery("TgeneCatalogDetail", "description", "description", "i.pk.catalog = (select a.tipotramite from TarmTramite a where a.pk=t.ctramite)"
                     + "and i.pk.catalogcode=(select a.tipotramitecodigo from TarmTramite a where a.pk=t.ctramite)");
             dto.addSubQuery(subqueryCategoriaCodigo);
-
+            SubQuery subquerytipoAutorizacion = new SubQuery("TgeneCatalogDetail", "pk.catalog", "autorizacion", "i.pk.catalog = (select a.tipoautorizacion from TarmTramite a where a.pk=t.ctramite)"
+                    + "and i.pk.catalogcode=(select a.tipoautorizacioncodigo from TarmTramite a where a.pk=t.ctramite)");
+            dto.addSubQuery(subquerytipoAutorizacion);
             SubQuery subqueryipoAutorizacion = new SubQuery("TgeneCatalogDetail", "description", "descriptionTipoAut", "i.pk.catalog = (select a.tipoautorizacion from TarmTramite a where a.pk=t.ctramite)"
                     + "and i.pk.catalogcode=(select a.tipoautorizacioncodigo from TarmTramite a where a.pk=t.ctramite)");
             dto.addSubQuery(subqueryipoAutorizacion);
-
+            
             SubQuery subqueryTipocodigo = new SubQuery("TgeneCatalogDetail", "description", "descriptiontram", "i.pk.catalog = (select a.categoria from TarmTramite a where a.pk=t.ctramite)"
                     + "and i.pk.catalogcode=(select a.categoriacodigo from TarmTramite a where a.pk=t.ctramite)");
             dto.addSubQuery(subqueryTipocodigo);
             SubQuery subqueryUsocodigo = new SubQuery("TgeneCatalogDetail", "description", "descriptionact", "i.pk.catalog = (select a.usoactividad from TarmTramite a where a.pk=t.ctramite)"
                     + "and i.pk.catalogcode=(select a.usoactividadcodigo from TarmTramite a where a.pk=t.ctramite)");
+            
             dto.addSubQuery(subqueryUsocodigo);
-            SubQuery subqueryEstadoDoc = new SubQuery("TgeneCatalogDetail", "description", "estadodocumento", "i.pk.catalog =    t.estado"
+            
+            SubQuery subqueryEstadoDoc = new SubQuery("TgeneCatalogDetail", "description", "estadodocumento", "i.pk.catalog = t.estado"
                     + " and i.pk.catalogcode= t.estadocode");
             dto.addSubQuery(subqueryEstadoDoc);
+            return dto;
+    }
+    
+    @SuppressWarnings("unchecked")
+    @Override
+    public void querydatabase() {
+        try {
+            HashMap<String, DtoQuery> mtables = new HashMap<String, DtoQuery>();
 
+            DtoQuery dto = getDtoQuery();
+            if (!this.getMfilters().containsKey("personcode") || this.getMfilters().get("personcode") == null) {
+                MessageHelper.setMessageError("SELECCIONE UNA IDENTIFICACI\u00d3N");
+                return;
+            }            
+            if(autorizacion != null && !autorizacion.equals("TODOS")){
+                String sub = String.format("(select tra.pk from TarmTramite tra where tra.pk = t.ctramite and tra.tipoautorizacion = '%s' and tra.tipoautorizacioncodigo = 'TIPOAUTORIZACION')", autorizacion);
+                Filter filter = new Filter();
+                filter.setSql(String.format("t.ctramite=%s", sub));
+                dto.addFiltro(filter);
+            }
+            
             dto.setOrderby("t.fechaemision desc");
-
             mtables.put(beanalias, dto); // permite adicionar mas de una tabla.
             Request request = callerhelper.getRequest();
             request.setQueryTables(mtables);
-
+            
             Response resp = callerhelper.executeQuery(request);
 
             if (resp.getResponseCode().compareTo(Response.RESPONSE_OK) != 0) {
@@ -102,11 +126,14 @@ public class PermisosAutorizacionesController extends AbstractController<TarmDoc
             MessageHelper.setMessageError(e);
         }
     }
-
+    
+ 
+  
+    
     @Override
     public void save() {
     }
-
+ 
     public static void openLov() {
         Map<String, Object> options = new HashMap<String, Object>();
         // hint: ver EnumLovOption para las opciones del modal
@@ -129,15 +156,38 @@ public class PermisosAutorizacionesController extends AbstractController<TarmDoc
         this.getMfilters().put("personcode", tcustPersonDetail.getPk().getPersoncode().toString());
         this.query();
     }
-
+    /**
+     * Al momento de seleccionar persona con select
+     * Filtramos los tramites por tipo de autorizacion en un filtro or
+     */
+    public void onSelectOption() throws Exception{
+        this.query();
+    }
     public TcustPersonDetail getTcustPersonDetail() {
         return tcustPersonDetail;
     }
-
+    
     public void setTcustPersonDetail(TcustPersonDetail tcustPersonDetail) {
         this.tcustPersonDetail = tcustPersonDetail;
     }
 
+    public String getAutorizacion() {
+        return autorizacion;
+    }
+
+    public void setAutorizacion(String autorizacion) {
+        this.autorizacion = autorizacion;
+    }
+
+    public List<TgeneCatalogDetail> getLautorizacion() {
+        return lautorizacion;
+    }
+
+    public void setLautorizacion(List<TgeneCatalogDetail> lautorizacion) {
+        this.lautorizacion = lautorizacion;
+    }
+    
+    
     public AlfrescoController getAlfrescoController() {
         return alfrescoController;
     }

frontend/src/main/resources/general_es.properties

@@ -297,7 +297,7 @@ lbl_seleccionar=Seleccionar
 lbl_subir=Subir
 lbl_cancelar=Cancelar
 lbl_correo_electronico=Correo Electr\u00f3nico
-
+lbl_tipo_autorizacion=Tipo Autorizaci\u00f3n
 #Etuqueta YES/NO
 lbl_yes=SI
 lbl_no=NO

frontend/src/main/webapp/pages/general/permisosAutorizaciones.xhtml

@@ -2,7 +2,6 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:c="http://java.sun.com/jstl/core"
 	xmlns:ui="http://java.sun.com/jsf/facelets"
 	xmlns:p="http://primefaces.org/ui"
 	xmlns:pe="http://primefaces.org/ui/extensions"
@@ -18,7 +17,7 @@
       							 saveUpdate=""
       							 focusContainer=":formTable:filters" />      							 
             	
-                <p:panelGrid id="filters" columns="9" styleClass="m-filters">
+                <p:panelGrid id="filters" columns="5" styleClass="m-filters">
                 	<f:facet name="header">  
 			            <h:outputText value="#{msg_general.lbl_filters}" /> 
 			        </f:facet>
@@ -26,12 +25,23 @@
                     <p:inputText id="fpkmod" value="#{permisosAutorizacionesController.tcustPersonDetail.identification}" style="width: 140px;"  disabled="true" />                   
                     
                     <p:outputLabel for="fname" value="#{msg_general.lbl_name}:" />
-                    <p:inputText id="fname" value="#{permisosAutorizacionesController.tcustPersonDetail.name}" style="width: 360px;" disabled="true" />	
                     
-			        
-			        <p:commandButton id="lovCatalog" icon="ui-icon-link" actionListener="#{permisosAutorizacionesController.openLov()}" process="@this" styleClass="m-lov-button">
+                    <p:inputText id="fname" value="#{permisosAutorizacionesController.tcustPersonDetail.name}" style="width: 360px;" disabled="true" />	
+                    <p:commandButton id="lovCatalog" icon="ui-icon-link" actionListener="#{permisosAutorizacionesController.openLov()}" process="@this" styleClass="m-lov-button">
 			            <p:ajax event="dialogReturn" listener="#{permisosAutorizacionesController.onReturnPersonLov}" update="filters,data-content" />
 			        </p:commandButton>
+                    <p:outputLabel for="fautorizacion" value="#{msg_general.lbl_tipo_autorizacion}:" />
+
+                    <p:selectOneMenu id="fautorizacion" value="#{permisosAutorizacionesController.autorizacion}"
+                                     style="width:190px" required="false" >
+                                                    <p:ajax update="filters,data-content" event="change" listener="#{permisosAutorizacionesController.onSelectOption}" process="filters"/> 
+
+                                                         <f:selectItem itemLabel="TODOS" itemValue="TODOS" noSelectionOption="true" />
+                                                         <f:selectItems value="#{permisosAutorizacionesController.lautorizacion}" var="aut" itemLabel="#{aut.description}" itemValue="#{aut.pk.catalog}"/>
+						</p:selectOneMenu>
+                    
+                    
+			        
                 </p:panelGrid>
                             
                 <h:panelGrid columns="7" id="controls" styleClass="m-controls">

frontend/target/classes/general_es.properties

@@ -297,7 +297,7 @@ lbl_seleccionar=Seleccionar
 lbl_subir=Subir
 lbl_cancelar=Cancelar
 lbl_correo_electronico=Correo Electr\u00f3nico
-
+lbl_tipo_autorizacion=Tipo Autorizaci\u00f3n
 #Etuqueta YES/NO
 lbl_yes=SI
 lbl_no=NO

frontend/target/maia/WEB-INF/classes/general_es.properties

@@ -297,7 +297,7 @@ lbl_seleccionar=Seleccionar
 lbl_subir=Subir
 lbl_cancelar=Cancelar
 lbl_correo_electronico=Correo Electr\u00f3nico
-
+lbl_tipo_autorizacion=Tipo Autorizaci\u00f3n
 #Etuqueta YES/NO
 lbl_yes=SI
 lbl_no=NO