pratiche tipo C

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java

@@ -27,8 +27,10 @@ import it.tref.liferay.portos.bo.shared.util.GenericUtils;
 import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants;
 import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil;
 import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil;
+import it.tref.liferay.portos.bo.shared.util.Constants;
 import it.tref.liferay.portos.bo.util.AsseverazioniUtil;
 
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -1886,14 +1888,20 @@ public class ValidazionePraticaUtil {
 		DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId);
 		long intPraticaId = dettPratica.getIntPraticaId();
 		IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
+		String tipoProcedura = intPratica.getTipoProcedura();
 
 		List<String> notCompleted = new ArrayList<>();
-
-		List<String> tipologiaAllegati = DocumentiPraticaUtil.getDocObbligatoriDomanda();
-		if (Validator.isNotNull(intPratica.getOldIntPraticaId())) {
-			tipologiaAllegati.addAll(DocumentiPraticaUtil.getDocObbligatoriDomandaPortos1());
+		
+		List<String> tipologiaAllegati = null;
+		if(Constants.PROCEDURA_C.equals(tipoProcedura)){
+			tipologiaAllegati = DocumentiPraticaUtil.getDocObbligatoriDomandaPraticaTipoC();
+		}else{
+			tipologiaAllegati = DocumentiPraticaUtil.getDocObbligatoriDomanda();
+			if (Validator.isNotNull(intPratica.getOldIntPraticaId())) {
+				tipologiaAllegati.addAll(DocumentiPraticaUtil.getDocObbligatoriDomandaPortos1());
+			}
 		}
-
+		
 		List<String> tipologiaSoggettiApp = TipoSoggettoUtil.getAllSubjects();
 		List<String> tipologiaSoggetti = new ArrayList<String>();
 		// if(dettPratica.isLavoriPubblici()){

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java

@@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchAllegatoManualeException;
 import it.tref.liferay.portos.bo.model.AllegatoManuale;
 import it.tref.liferay.portos.bo.model.impl.AllegatoManualeImpl;
 import it.tref.liferay.portos.bo.model.impl.AllegatoManualeModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.AllegatoManualePersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java

@@ -46,7 +46,6 @@ import it.tref.liferay.portos.bo.NoSuchAsseverazioneException;
 import it.tref.liferay.portos.bo.model.Asseverazione;
 import it.tref.liferay.portos.bo.model.impl.AsseverazioneImpl;
 import it.tref.liferay.portos.bo.model.impl.AsseverazioneModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.AsseverazionePersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java

@@ -46,7 +46,6 @@ import it.tref.liferay.portos.bo.NoSuchAvvisoException;
 import it.tref.liferay.portos.bo.model.Avviso;
 import it.tref.liferay.portos.bo.model.impl.AvvisoImpl;
 import it.tref.liferay.portos.bo.model.impl.AvvisoModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.AvvisoPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java

@@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchCollaudoException;
 import it.tref.liferay.portos.bo.model.Collaudo;
 import it.tref.liferay.portos.bo.model.impl.CollaudoImpl;
 import it.tref.liferay.portos.bo.model.impl.CollaudoModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.CollaudoPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java

@@ -46,7 +46,6 @@ import it.tref.liferay.portos.bo.NoSuchComuneException;
 import it.tref.liferay.portos.bo.model.Comune;
 import it.tref.liferay.portos.bo.model.impl.ComuneImpl;
 import it.tref.liferay.portos.bo.model.impl.ComuneModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.ComunePersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java

@@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchComunicazioneException;
 import it.tref.liferay.portos.bo.model.Comunicazione;
 import it.tref.liferay.portos.bo.model.impl.ComunicazioneImpl;
 import it.tref.liferay.portos.bo.model.impl.ComunicazioneModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.ComunicazionePersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java

@@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchConfigurazioneException;
 import it.tref.liferay.portos.bo.model.Configurazione;
 import it.tref.liferay.portos.bo.model.impl.ConfigurazioneImpl;
 import it.tref.liferay.portos.bo.model.impl.ConfigurazioneModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.ConfigurazionePersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java

@@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchControlloPraticaException;
 import it.tref.liferay.portos.bo.model.ControlloPratica;
 import it.tref.liferay.portos.bo.model.impl.ControlloPraticaImpl;
 import it.tref.liferay.portos.bo.model.impl.ControlloPraticaModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.ControlloPraticaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java

@@ -46,7 +46,6 @@ import it.tref.liferay.portos.bo.NoSuchDelegaException;
 import it.tref.liferay.portos.bo.model.Delega;
 import it.tref.liferay.portos.bo.model.impl.DelegaImpl;
 import it.tref.liferay.portos.bo.model.impl.DelegaModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.DelegaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java

@@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchDettPraticaException;
 import it.tref.liferay.portos.bo.model.DettPratica;
 import it.tref.liferay.portos.bo.model.impl.DettPraticaImpl;
 import it.tref.liferay.portos.bo.model.impl.DettPraticaModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.DettPraticaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java

@@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchDocAggiuntivaException;
 import it.tref.liferay.portos.bo.model.DocAggiuntiva;
 import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaImpl;
 import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.DocAggiuntivaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java

@@ -46,7 +46,6 @@ import it.tref.liferay.portos.bo.NoSuchDocPraticaException;
 import it.tref.liferay.portos.bo.model.DocPratica;
 import it.tref.liferay.portos.bo.model.impl.DocPraticaImpl;
 import it.tref.liferay.portos.bo.model.impl.DocPraticaModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.DocPraticaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java

@@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchFineLavoriException;
 import it.tref.liferay.portos.bo.model.FineLavori;
 import it.tref.liferay.portos.bo.model.impl.FineLavoriImpl;
 import it.tref.liferay.portos.bo.model.impl.FineLavoriModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.FineLavoriPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java

@@ -42,7 +42,6 @@ import it.tref.liferay.portos.bo.NoSuchHistoryWorkflowActionException;
 import it.tref.liferay.portos.bo.model.HistoryWorkflowAction;
 import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionImpl;
 import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.HistoryWorkflowActionPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IUVPersistenceImpl.java

@@ -46,7 +46,6 @@ import it.tref.liferay.portos.bo.NoSuchIUVException;
 import it.tref.liferay.portos.bo.model.IUV;
 import it.tref.liferay.portos.bo.model.impl.IUVImpl;
 import it.tref.liferay.portos.bo.model.impl.IUVModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.IUVPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/InfoFascicoloPersistenceImpl.java

@@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchInfoFascicoloException;
 import it.tref.liferay.portos.bo.model.InfoFascicolo;
 import it.tref.liferay.portos.bo.model.impl.InfoFascicoloImpl;
 import it.tref.liferay.portos.bo.model.impl.InfoFascicoloModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.InfoFascicoloPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java

@@ -48,7 +48,6 @@ import it.tref.liferay.portos.bo.NoSuchIntPraticaException;
 import it.tref.liferay.portos.bo.model.IntPratica;
 import it.tref.liferay.portos.bo.model.impl.IntPraticaImpl;
 import it.tref.liferay.portos.bo.model.impl.IntPraticaModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.IntPraticaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java

@@ -46,7 +46,6 @@ import it.tref.liferay.portos.bo.NoSuchPagamentoException;
 import it.tref.liferay.portos.bo.model.Pagamento;
 import it.tref.liferay.portos.bo.model.impl.PagamentoImpl;
 import it.tref.liferay.portos.bo.model.impl.PagamentoModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.PagamentoPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java

@@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchParereGeologoException;
 import it.tref.liferay.portos.bo.model.ParereGeologo;
 import it.tref.liferay.portos.bo.model.impl.ParereGeologoImpl;
 import it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.ParereGeologoPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java

@@ -43,7 +43,6 @@ import it.tref.liferay.portos.bo.NoSuchProvinciaException;
 import it.tref.liferay.portos.bo.model.Provincia;
 import it.tref.liferay.portos.bo.model.impl.ProvinciaImpl;
 import it.tref.liferay.portos.bo.model.impl.ProvinciaModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.ProvinciaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java

@@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchSoggettoException;
 import it.tref.liferay.portos.bo.model.Soggetto;
 import it.tref.liferay.portos.bo.model.impl.SoggettoImpl;
 import it.tref.liferay.portos.bo.model.impl.SoggettoModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.SoggettoPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java

@@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchSorteggioException;
 import it.tref.liferay.portos.bo.model.Sorteggio;
 import it.tref.liferay.portos.bo.model.impl.SorteggioImpl;
 import it.tref.liferay.portos.bo.model.impl.SorteggioModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.SorteggioPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java

@@ -42,7 +42,6 @@ import it.tref.liferay.portos.bo.NoSuchStoricoSoggettoPraticaException;
 import it.tref.liferay.portos.bo.model.StoricoSoggettoPratica;
 import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaImpl;
 import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.StoricoSoggettoPraticaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java

@@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchTempisticaException;
 import it.tref.liferay.portos.bo.model.Tempistica;
 import it.tref.liferay.portos.bo.model.impl.TempisticaImpl;
 import it.tref.liferay.portos.bo.model.impl.TempisticaModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.TempisticaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java

@@ -44,7 +44,6 @@ import it.tref.liferay.portos.bo.NoSuchTerritorioException;
 import it.tref.liferay.portos.bo.model.Territorio;
 import it.tref.liferay.portos.bo.model.impl.TerritorioImpl;
 import it.tref.liferay.portos.bo.model.impl.TerritorioModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.TerritorioPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/UtentePortosPersistenceImpl.java

@@ -43,7 +43,6 @@ import it.tref.liferay.portos.bo.NoSuchUtentePortosException;
 import it.tref.liferay.portos.bo.model.UtentePortos;
 import it.tref.liferay.portos.bo.model.impl.UtentePortosImpl;
 import it.tref.liferay.portos.bo.model.impl.UtentePortosModelImpl;
-import it.tref.liferay.portos.bo.service.persistence.UtentePortosPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_bo
-    build.number=2279
-    build.date=1590675408364
+    build.number=2287
+    build.date=1590761053582
     build.auto.upgrade=true
 
 ##

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_modal_fascicolo.jsp

@@ -214,7 +214,7 @@
 				$('#<portlet:namespace />tipo_procedura_<%= Constants.PROCEDURA_B1 %>').prop('disabled', 'disabled').prop('checked', false).parent().css('display', 'none');
 			else
 				$('#<portlet:namespace />tipo_procedura_<%= Constants.PROCEDURA_B %>').prop('disabled', 'disabled').prop('checked', false).parent().css('display', 'none');
-$('#<portlet:namespace />tipo_procedura_<%= Constants.PROCEDURA_C %>').prop('disabled', 'disabled').prop('checked', false);
+			$('#<portlet:namespace />tipo_procedura_<%= Constants.PROCEDURA_C %>').prop('disabled', 'disabled').prop('checked', false);
 		}
 	});
 		

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo.jsp

@@ -32,6 +32,7 @@
 	IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
 	DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId);
 	
+	
 	if(dettPratica==null){
 		dettPratica = DettPraticaServiceUtil.getLastEditableByIntPratica(intPraticaId);
 		if(dettPratica==null){
@@ -168,12 +169,15 @@
 </div>
 <%
 	List<String> sections = Arrays.asList(SezioniUtil.SEZIONE_DETTAGLI_PRINCIPALI, SezioniUtil.SEZIONE_ANAGRAFE_SOGGETTI, SezioniUtil.SEZIONE_DESCRIZIONE_EDIFICIO, SezioniUtil.SEZIONE_GEOLOGICA, SezioniUtil.SEZIONE_ALLEGATI);
+	
 	List<String> tipologiaAllegati = DocumentiPraticaUtil.getDocObbligatori();
 	if(Validator.isNotNull(intPratica.getOldIntPraticaId())){
-	  tipologiaAllegati.addAll(DocumentiPraticaUtil.getDocDomandaPortos1());
+  		tipologiaAllegati.addAll(DocumentiPraticaUtil.getDocDomandaPortos1());
 	}
+
 	List<String> tipologiaSoggetti = Arrays.asList(TipoSoggettoUtil.COMMITTENTE, TipoSoggettoUtil.DITTA, TipoSoggettoUtil.PROGETTISTA, TipoSoggettoUtil.DIRETTORE_LAVORI, TipoSoggettoUtil.GEOLOGO, TipoSoggettoUtil.COLLAUDATORE);
 %>
+
 <div class="container-fluid clearfix compilazione-domanda" id="<portlet:namespace/>_section-completed">
 	<div class="col-xs-12  col-sm-12 col-md-12 col-lg-12 asseverazioni tab-error">
 		<div class="row asseverazioni-header">

liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/DocumentiPraticaUtil.java

@@ -163,6 +163,17 @@ public class DocumentiPraticaUtil {
     return doc;
   }
 
+  public static List<String> getDocObbligatoriDomandaPraticaTipoC() {
+	    List<String> docObbligatori = new ArrayList<String>();
+	    docObbligatori.add(TIPOLOGIA_ALLEGATO_A00);
+	    docObbligatori.add(TIPOLOGIA_ALLEGATO_A02);
+	    docObbligatori.add(TIPOLOGIA_ALLEGATO_A03);
+	    docObbligatori.add(TIPOLOGIA_ALLEGATO_A04);
+	    docObbligatori.add(TIPOLOGIA_ALLEGATO_DELEGA);
+	    return docObbligatori;
+
+  }
+  
   public static List<String> getDocObbligatoriDomanda() {
     List<String> docObbligatori = new ArrayList<String>();
     docObbligatori.add(TIPOLOGIA_ALLEGATO_A00);