diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java index d5eef0e8..0875ccd6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java @@ -178,6 +178,7 @@ public class AvvisoUtil { allTipoDocumentoFileTemplateProps.put("DPB", "conf.geniocivile.avviso.template.id.deposito.B"); allTipoDocumentoFileTemplateProps.put("DPB1", "conf.geniocivile.avviso.template.id.deposito.B1"); allTipoDocumentoFileTemplateProps.put("DPB2", "conf.geniocivile.avviso.template.id.deposito.B2"); + allTipoDocumentoFileTemplateProps.put("DPVNS", "conf.geniocivile.avviso.template.id.deposito.VNS"); allTipoDocumentoFileTemplateProps.put("DPC", "conf.geniocivile.avviso.template.id.deposito.C"); allTipoDocumentoFileTemplateProps.put("DPPS", "conf.geniocivile.avviso.template.id.deposito.PS"); allTipoDocumentoFileTemplateProps.put("DPS", "conf.geniocivile.avviso.template.id.deposito.S"); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties index 2d2f532c..b92cead7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties @@ -175,13 +175,14 @@ conf.geniocivile.avviso.template.id.integrazionerifiutata = Template Avviso Inte conf.geniocivile.avviso.template.id.doc_annullamento = Template File Annullamento Fascicolo conf.geniocivile.avviso.template.id.doc_pagamento = Template File Allegato MDB conf.geniocivile.avviso.template.id.domanda_pdf = Template Domanda -conf.geniocivile.avviso.template.id.deposito.A = Template ricevuta deposito mod. A -conf.geniocivile.avviso.template.id.deposito.B = Template ricevuta deposito mod. B -conf.geniocivile.avviso.template.id.deposito.B1 = Template ricevuta deposito mod. B1 -conf.geniocivile.avviso.template.id.deposito.C = Template ricevuta deposito mod. C -conf.geniocivile.avviso.template.id.deposito.B2 = Template ricevuta deposito mod. B2 -conf.geniocivile.avviso.template.id.deposito.PS = Template Avvisio Avvio di procedimento dopo sorteggio -conf.geniocivile.avviso.template.id.deposito.S = Template avviso di sorteggio +conf.geniocivile.avviso.template.id.deposito.A = Template Ricevuta Deposito mod. A +conf.geniocivile.avviso.template.id.deposito.B = Template Ricevuta Deposito mod. B +conf.geniocivile.avviso.template.id.deposito.B1 = Template Ricevuta Deposito mod. B1 +conf.geniocivile.avviso.template.id.deposito.C = Template Ricevuta Deposito mod. C +conf.geniocivile.avviso.template.id.deposito.B2 = Template Ricevuta Deposito mod. B2 +conf.geniocivile.avviso.template.id.deposito.VNS = Template Ricevuta Variante Non Sostanziale +conf.geniocivile.avviso.template.id.deposito.PS = Template Avvisio Avvio di procedimento dopo Sorteggio +conf.geniocivile.avviso.template.id.deposito.S = Template Avviso di Sorteggio #Configurazione Allegati conf.geniocivile.attachment.folder.id = Folder Allegati diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java index bafc0218..525cb0df 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java @@ -211,7 +211,7 @@ public class SismicaUtil { private static List riparaAssegnazioniAlRuolo(long companyId, long userId) { List esito = new ArrayList<>(); - esito.add("Controllo assegnazioni al ruolo"); + esito.add("Controllo assegnazioni al ruolo"); int start = 0; List tasks = null; @@ -290,7 +290,7 @@ public class SismicaUtil { private static List riparaNonValidate(long companyId) { List esito = new ArrayList<>(); - esito.add("
Controllo pratiche B1 non validate"); + esito.add("Controllo pratiche B1 non validate"); int dow; Date data; @@ -307,7 +307,6 @@ public class SismicaUtil { List pratiche = null; int start = 0; - String lista = ""; do { try { pratiche = IntPraticaLocalServiceUtil.getIntPraticas(start, start + SLICE); @@ -320,9 +319,9 @@ public class SismicaUtil { && Validator.isNull(pratica.getDtSorteggio()) && pratica.getStatoPratica().equalsIgnoreCase(StatoPraticaConstants.VIDIMATA) && (numeroAvvisi < 2) && (pratica.getDtPratica().compareTo(data) <= 0)) { - lista += "
  • Pratica " + pratica.getNumeroProgetto() + " (" + esito.add(" Pratica " + pratica.getNumeroProgetto() + " (" + pratica.getIntPraticaId() + ") - " + pratica.getUserName() + ", " - + numeroAvvisi + " avvisi
    • "; + + numeroAvvisi + " avvisi"); DettPratica dettPratica = DettPraticaLocalServiceUtil .getLastCompletedByIntPratica(pratica.getIntPraticaId()); @@ -365,14 +364,12 @@ public class SismicaUtil { esito.add("Errore durante l'elaborazione: " + e.getMessage()); } } while (pratiche.size() > 0); - if (lista.length() > 0) - esito.add("
      " + lista + "
    "); return esito; } private static List riparaConformita(long companyId) { List esito = new ArrayList<>(); - esito.add("
    Riparazione avvisi di conformità"); + esito.add("Riparazione avvisi di conformità"); List pratiche = null; int start = 0; @@ -492,7 +489,7 @@ public class SismicaUtil { private static List riparaContextWorkflow(long companyId) { List esito = new ArrayList<>(); - esito.add("
    Riparazione context workflow"); + esito.add("Riparazione context workflow"); int start = 0; List tasks = null; @@ -562,7 +559,7 @@ public class SismicaUtil { private static List creaWorkflowMancanti(long companyId) { List esito = new ArrayList<>(); - esito.add("
    Creazione workflow mancanti"); + esito.add("Creazione workflow mancanti"); List tokens = new ArrayList<>(); try { @@ -649,7 +646,7 @@ public class SismicaUtil { private static List riparaDocumenti(long companyId) throws SystemException, PortalException { List esito = new ArrayList(); - esito.add("
    Riparazione generazione documenti"); + esito.add("Riparazione generazione documenti"); initTemplate(companyId); List intPratiche = null; int index = 0; @@ -667,9 +664,7 @@ public class SismicaUtil { return esito; } - private static List initTemplate(long companyId) throws SystemException, PortalException { - List esito = new ArrayList<>(); - + private static void initTemplate(long companyId) throws SystemException, PortalException { templateById = new LinkedHashMap<>(); templateByKey = new LinkedHashMap<>(); templateIdByKey = new LinkedHashMap<>(); @@ -684,7 +679,6 @@ public class SismicaUtil { templateIdByKey.put(template.getKey(), fileEntryId); } } - return esito; } private static List verificaAvvisi(IntPratica intPratica) { @@ -760,8 +754,7 @@ public class SismicaUtil { case StatoPraticaConstants.VIDIMATA: if (avviso.getTipoAvviso().equals(AvvisoUtil.TIPO_AVVISO_DIRETTO)) { esito.addAll(addStoricoAvvisi(intPratica, avvisi)); - esito.add("Invio " + template + " (" - + controlli.size() + " controlli)"); + esito.add("Invio " + template + " (" + controlli.size() + " controlli)"); try { if (Validator.isNull(controllo)) { controllo = aggiungiControlloPratica(intPratica); @@ -775,16 +768,14 @@ public class SismicaUtil { DettPratica.class.getName(), controllo.getControlloPraticaId(), serviceContext); } catch (Exception e) { - esito.add("Errore durante l'invio: " - + e.getMessage() + ""); + esito.add("Errore durante l'invio: " + e.getMessage()); } } break; default: if (avviso.getTipoAvviso().equals(AvvisoUtil.TIPO_AVVISO_DIRETTO)) { esito.addAll(addStoricoAvvisi(intPratica, avvisi)); - esito.add("Procederei all'invio di avviso " - + template + ""); + esito.add("Procederei all'invio di avviso " + template); } break; } @@ -795,12 +786,6 @@ public class SismicaUtil { return esito; } - private static ControlloPratica aggiungiControlloPratica(long intPraticaId) throws PortalException, - SystemException { - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - return aggiungiControlloPratica(intPratica); - } - private static ControlloPratica aggiungiControlloPratica(IntPratica intPratica) throws PortalException, SystemException { DettPratica dettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/KaleoInstanceTokenModelListener.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/KaleoInstanceTokenModelListener.java index b9351478..6510341e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/KaleoInstanceTokenModelListener.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/KaleoInstanceTokenModelListener.java @@ -29,164 +29,174 @@ import com.liferay.portal.workflow.kaleo.service.KaleoTaskInstanceTokenLocalServ public class KaleoInstanceTokenModelListener extends BaseModelListener { - private static final Log _log = LogFactoryUtil.getLog(KaleoInstanceTokenModelListener.class); + private static final Log _log = LogFactoryUtil.getLog(KaleoInstanceTokenModelListener.class); - @Override - public void onAfterUpdate(KaleoInstanceToken model) throws ModelListenerException { + @Override + public void onAfterUpdate(KaleoInstanceToken model) throws ModelListenerException { - try { + try { - if (model.getClassName().equals(ControlloPratica.class.getName())) { + if (model.getClassName().equals(ControlloPratica.class.getName())) { - Indexer indexer = IndexerRegistryUtil.getIndexer(ControlloPratica.class); - indexer.reindex(ControlloPratica.class.getName(), model.getClassPK()); + Indexer indexer = IndexerRegistryUtil.getIndexer(ControlloPratica.class); + indexer.reindex(ControlloPratica.class.getName(), model.getClassPK()); - if (_log.isDebugEnabled()) { - _log.debug("KaleoInstanceTokenModelListener - Chiamato Reindex ControlloPraticaId : " + model.getClassPK()); - } - } + if (_log.isDebugEnabled()) { + _log.debug("KaleoInstanceTokenModelListener - Chiamato Reindex ControlloPraticaId : " + + model.getClassPK()); + } + } - } catch (SearchException e) { - _log.error(e, e); - } + } catch (SearchException e) { + _log.error(e, e); + } + + super.onAfterUpdate(model); + } - super.onAfterUpdate(model); - } + @Override + public void onAfterAddAssociation(Object classPK, String associationClassName, Object associationClassPK) + throws ModelListenerException { - @Override - public void onAfterAddAssociation(Object classPK, String associationClassName, Object associationClassPK) - throws ModelListenerException { + // TODO Auto-generated method stub + super.onAfterAddAssociation(classPK, associationClassName, associationClassPK); + } - // TODO Auto-generated method stub - super.onAfterAddAssociation(classPK, associationClassName, associationClassPK); - } + @Override + public void onAfterCreate(KaleoInstanceToken model) throws ModelListenerException { + ControlloPratica cp; + try { + cp = ControlloPraticaLocalServiceUtil.getControlloPratica(model.getClassPK()); + this.gestioneWFVarianti(cp, model); + } catch (PortalException | SystemException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } - @Override - public void onAfterCreate(KaleoInstanceToken model) throws ModelListenerException { - ControlloPratica cp; - try { - cp = ControlloPraticaLocalServiceUtil.getControlloPratica(model.getClassPK()); - this.gestioneWFVarianti(cp, model); - } catch (PortalException | SystemException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + // TODO Auto-generated method stub + super.onAfterCreate(model); } - - - // TODO Auto-generated method stub - super.onAfterCreate(model); - } - - private void gestioneWFVarianti(ControlloPratica cp,KaleoInstanceToken model) { - try { - DettPratica dettPratica=DettPraticaLocalServiceUtil.getDettPratica(cp.getDettPraticaId()); - if(dettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.VARIANTE)){ - _log.info("gestioneWFVarianti - avviato workflow per variante dettPraticaId="+cp.getDettPraticaId()+" -ControlloPraticaId="+cp.getControlloPraticaId()); - IntPratica intPratica= IntPraticaLocalServiceUtil.fetchIntPratica(cp.getIntPraticaId()); - long statusByuserId=intPratica.getStatusByUserId(); - _log.info("gestioneWFVarianti -statusByuserId="+statusByuserId+" per int pratica="+intPratica.getIntPraticaId()); - if (statusByuserId==0){ - _log.info("gestioneWFVarianti - KO - statusByuserId="+statusByuserId); - return; - }else{ - _log.info("gestioneWFVarianti - statusByuserId determinato ="+statusByuserId); - } - - long kaleoTaskInstanceTokenID=CounterLocalServiceUtil.increment("com.liferay.counter.model.Counter"); - _log.info("kaleoTaskInstanceTokenID="+kaleoTaskInstanceTokenID); - KaleoTaskInstanceToken x = KaleoTaskInstanceTokenLocalServiceUtil.createKaleoTaskInstanceToken(kaleoTaskInstanceTokenID); - x.setKaleoTaskId(21642); - x.setKaleoTaskName("Esito"); - x.setCompleted(false); - x.setGroupId(cp.getGroupId()); - x.setClassName("it.tref.liferay.portos.bo.model.ControlloPratica"); - x.setClassPK(model.getKaleoInstance().getClassPK()); - x.setCompanyId(model.getKaleoInstance().getCompanyId()); - x.setUserId(model.getKaleoInstance().getUserId()); - x.setUserName(model.getKaleoInstance().getUserName()); - x.setCreateDate(new Date()); - x.setKaleoInstanceId(model.getKaleoInstance().getKaleoInstanceId()); - x.setKaleoDefinitionId(model.getKaleoInstance().getKaleoDefinitionId()); - x.setKaleoInstanceTokenId(model.getKaleoInstanceTokenId()); - x.setWorkflowContext(model.getKaleoInstance().getWorkflowContext()); - x=KaleoTaskInstanceTokenLocalServiceUtil.updateKaleoTaskInstanceToken(x); - _log.info("gestioneWFVarianti - KaleoTaskInstanceToken di tipo ESITO creato - KaleoTaskInstanceTokenId = "+x.getKaleoTaskInstanceTokenId()); - _log.info("gestioneWFVarianti - correttamente eseguito - ControlloPraticaId = "+cp.getControlloPraticaId()); - ///////////////////////////////////////////////////////////////////// + + private void gestioneWFVarianti(ControlloPratica cp, KaleoInstanceToken model) { + try { + DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(cp.getDettPraticaId()); + if (dettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.VARIANTE) + && dettPratica.getVarianteSostanziale()) { + _log.info("gestioneWFVarianti - avviato workflow per variante dettPraticaId=" + + cp.getDettPraticaId() + " -ControlloPraticaId=" + cp.getControlloPraticaId()); + IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(cp.getIntPraticaId()); + long statusByuserId = intPratica.getStatusByUserId(); + _log.info("gestioneWFVarianti -statusByuserId=" + statusByuserId + " per int pratica=" + + intPratica.getIntPraticaId()); + if (statusByuserId == 0) { + _log.info("gestioneWFVarianti - KO - statusByuserId=" + statusByuserId); + return; + } else { + _log.info("gestioneWFVarianti - statusByuserId determinato =" + statusByuserId); + } + + long kaleoTaskInstanceTokenID = CounterLocalServiceUtil + .increment("com.liferay.counter.model.Counter"); + _log.info("kaleoTaskInstanceTokenID=" + kaleoTaskInstanceTokenID); + KaleoTaskInstanceToken x = KaleoTaskInstanceTokenLocalServiceUtil + .createKaleoTaskInstanceToken(kaleoTaskInstanceTokenID); + x.setKaleoTaskId(21642); + x.setKaleoTaskName("Esito"); + x.setCompleted(false); + x.setGroupId(cp.getGroupId()); + x.setClassName("it.tref.liferay.portos.bo.model.ControlloPratica"); + x.setClassPK(model.getKaleoInstance().getClassPK()); + x.setCompanyId(model.getKaleoInstance().getCompanyId()); + x.setUserId(model.getKaleoInstance().getUserId()); + x.setUserName(model.getKaleoInstance().getUserName()); + x.setCreateDate(new Date()); + x.setKaleoInstanceId(model.getKaleoInstance().getKaleoInstanceId()); + x.setKaleoDefinitionId(model.getKaleoInstance().getKaleoDefinitionId()); + x.setKaleoInstanceTokenId(model.getKaleoInstanceTokenId()); + x.setWorkflowContext(model.getKaleoInstance().getWorkflowContext()); + x = KaleoTaskInstanceTokenLocalServiceUtil.updateKaleoTaskInstanceToken(x); + _log.info("gestioneWFVarianti - KaleoTaskInstanceToken di tipo ESITO creato - KaleoTaskInstanceTokenId = " + + x.getKaleoTaskInstanceTokenId()); + _log.info("gestioneWFVarianti - correttamente eseguito - ControlloPraticaId = " + + cp.getControlloPraticaId()); + // /////////////////////////////////////////////////////////////////// + } + + } catch (Exception e) { + _log.error( + "gestioneWFVarianti - Errore in gestioneWFVarianti - dettaPratiacaId=" + + cp.getDettPraticaId(), e); + // throw e; } - - } catch (Exception e) { - _log.error("gestioneWFVarianti - Errore in gestioneWFVarianti - dettaPratiacaId="+cp.getDettPraticaId(),e); - //throw e; + } - - } - @Override - public void onAfterRemove(KaleoInstanceToken model) throws ModelListenerException { + @Override + public void onAfterRemove(KaleoInstanceToken model) throws ModelListenerException { - try { + try { - if (model.getClassName().equals(ControlloPratica.class.getName())) { + if (model.getClassName().equals(ControlloPratica.class.getName())) { - Indexer indexer = IndexerRegistryUtil.getIndexer(ControlloPratica.class); - indexer.reindex(ControlloPratica.class.getName(), model.getClassPK()); + Indexer indexer = IndexerRegistryUtil.getIndexer(ControlloPratica.class); + indexer.reindex(ControlloPratica.class.getName(), model.getClassPK()); - if (_log.isDebugEnabled()) { - _log.debug("KaleoInstanceTokenModelListener - Chiamato Reindex ControlloPraticaId : " + model.getClassPK()); - } - } + if (_log.isDebugEnabled()) { + _log.debug("KaleoInstanceTokenModelListener - Chiamato Reindex ControlloPraticaId : " + + model.getClassPK()); + } + } - } catch (SearchException e) { - _log.error(e, e); - } + } catch (SearchException e) { + _log.error(e, e); + } - super.onAfterRemove(model); - } + super.onAfterRemove(model); + } - @Override - public void onAfterRemoveAssociation(Object classPK, String associationClassName, Object associationClassPK) - throws ModelListenerException { + @Override + public void onAfterRemoveAssociation(Object classPK, String associationClassName, + Object associationClassPK) throws ModelListenerException { - // TODO Auto-generated method stub - super.onAfterRemoveAssociation(classPK, associationClassName, associationClassPK); - } + // TODO Auto-generated method stub + super.onAfterRemoveAssociation(classPK, associationClassName, associationClassPK); + } - @Override - public void onBeforeAddAssociation(Object classPK, String associationClassName, Object associationClassPK) - throws ModelListenerException { + @Override + public void onBeforeAddAssociation(Object classPK, String associationClassName, Object associationClassPK) + throws ModelListenerException { - // TODO Auto-generated method stub - super.onBeforeAddAssociation(classPK, associationClassName, associationClassPK); - } + // TODO Auto-generated method stub + super.onBeforeAddAssociation(classPK, associationClassName, associationClassPK); + } - @Override - public void onBeforeCreate(KaleoInstanceToken model) throws ModelListenerException { + @Override + public void onBeforeCreate(KaleoInstanceToken model) throws ModelListenerException { - // TODO Auto-generated method stub - super.onBeforeCreate(model); - } + // TODO Auto-generated method stub + super.onBeforeCreate(model); + } - @Override - public void onBeforeRemove(KaleoInstanceToken model) throws ModelListenerException { + @Override + public void onBeforeRemove(KaleoInstanceToken model) throws ModelListenerException { - // TODO Auto-generated method stub - super.onBeforeRemove(model); - } + // TODO Auto-generated method stub + super.onBeforeRemove(model); + } - @Override - public void onBeforeRemoveAssociation(Object classPK, String associationClassName, Object associationClassPK) - throws ModelListenerException { + @Override + public void onBeforeRemoveAssociation(Object classPK, String associationClassName, + Object associationClassPK) throws ModelListenerException { - // TODO Auto-generated method stub - super.onBeforeRemoveAssociation(classPK, associationClassName, associationClassPK); - } + // TODO Auto-generated method stub + super.onBeforeRemoveAssociation(classPK, associationClassName, associationClassPK); + } - @Override - public void onBeforeUpdate(KaleoInstanceToken model) throws ModelListenerException { + @Override + public void onBeforeUpdate(KaleoInstanceToken model) throws ModelListenerException { - // TODO Auto-generated method stub - super.onBeforeUpdate(model); - } + // TODO Auto-generated method stub + super.onBeforeUpdate(model); + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java index d9835fca..b1403529 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java @@ -426,7 +426,12 @@ public class SchedulerPratiche implements MessageListener { AvvisoUtil.TIPO_AVVISO_DIRETTO, StringPool.BLANK, 0l); } else if (TipoIntegrazioneUtil.VARIANTE.equals(tipoIntegrazione)) { // avviso pilotato per varianti - String stato = StatoPraticaConstants.VIDIMATA; + String stato = null; + if (dettPratica.getVarianteSostanziale()) { + stato = StatoPraticaConstants.VIDIMATA; + } else { + stato = intPratica.getStatoPratica(); + } AvvisoLocalServiceUtil.createStandardAvvisoPratica(dettPratica.getIntPraticaId(), stato, dettPratica.getDettPraticaId(), DettPratica.class.getName(), serviceContext, AvvisoUtil.TIPO_AVVISO_DIRETTO, StringPool.BLANK, 0l); @@ -453,11 +458,15 @@ public class SchedulerPratiche implements MessageListener { } // Avvio Workflow - if (!dettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO)) { - // ADT: bug id=7 gestione workflow + if (!dettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO) + && !(dettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.VARIANTE) && !dettPratica + .getVarianteSostanziale())) { + ControlloPratica cp = avvioWorkflow(dettPratica, dettPratica.getUserId(), serviceContext); if (cp != null) ControlloPraticaLocalServiceUtil.gestioneWFVarianti(cp); + } else { + _log.info("Workflow non avviato"); } dettPratica = DettPraticaLocalServiceUtil.updateDettPraticaGestita(dettPratica.getDettPraticaId(), diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java index 61412421..e14d6257 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java @@ -13,7 +13,6 @@ package it.tref.liferay.portos.bo.service.impl; import it.tref.liferay.portos.bo.model.Asseverazione; -import it.tref.liferay.portos.bo.model.Delega; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.Soggetto; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java index 6e500aa8..91586ef6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java @@ -13,12 +13,14 @@ package it.tref.liferay.portos.bo.service.impl; import it.tref.liferay.portos.bo.model.Avviso; +import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil; import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.AvvisoLocalServiceBaseImpl; import it.tref.liferay.portos.bo.shared.util.Constants; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; +import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; import it.tref.liferay.portos.bo.util.AvvisoUtil; import it.tref.liferay.portos.bo.util.AzioniPraticheUtil; import it.tref.liferay.portos.bo.util.PraticaUtil; @@ -118,12 +120,8 @@ public class AvvisoLocalServiceImpl extends AvvisoLocalServiceBaseImpl { String propertiesTemplate = null; String tipoProcedura = intPratica.getTipoProcedura(); switch (statoPratica) { - case StatoPraticaConstants.VIDIMATA: - if (null == tipoProcedura) - tipoProcedura = Constants.PROCEDURA_A; - propertiesTemplate = AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get( - "DP" + tipoProcedura); - break; + // case StatoPraticaConstants.INTEGRAZIONE: + // break; case StatoPraticaConstants.SOTTOPOSTA_A_PARERE: if (Validator.isNull(tipoProcedura) || tipoProcedura.equalsIgnoreCase(Constants.PROCEDURA_A)) { propertiesTemplate = AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get(statoPratica); @@ -131,6 +129,12 @@ public class AvvisoLocalServiceImpl extends AvvisoLocalServiceBaseImpl { propertiesTemplate = AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get("DPPS"); } break; + case StatoPraticaConstants.VIDIMATA: + if (null == tipoProcedura) + tipoProcedura = Constants.PROCEDURA_A; + propertiesTemplate = AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get( + "DP" + tipoProcedura); + break; default: propertiesTemplate = AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get(statoPratica); } @@ -150,14 +154,22 @@ public class AvvisoLocalServiceImpl extends AvvisoLocalServiceBaseImpl { PortalException { IntPratica intPratica = intPraticaLocalService.getIntPratica(intPraticaId); - String propertiesTemplate = AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get( - PraticaUtil.getStatoPraticaCode(stato, intPratica)); - // String propertiesTemplate = - // AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get(stato); + + boolean varianteNonSostanziale = false; + if (className.equals(DettPratica.class.getName())) { + DettPratica dettPratica = dettPraticaLocalService.getDettPratica(classPk); + varianteNonSostanziale = dettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.VARIANTE) + && !dettPratica.getVarianteSostanziale(); + } + String statoPraticaCode = varianteNonSostanziale ? "DPVNS" : PraticaUtil.getStatoPraticaCode(stato, + intPratica); + String propertiesTemplate = AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get(statoPraticaCode); + long fileEntryIdTemplate = configurazioneLocalService.findByC_ChiaveLong( serviceContext.getCompanyId(), propertiesTemplate); - _log.info("debugAvviso: " + propertiesTemplate); + _log.info("debugAvviso: " + propertiesTemplate + " (" + statoPraticaCode + ")" + + (varianteNonSostanziale ? " non sostanziale" : "")); return addAvviso(intPraticaId, StringPool.BLANK, new Date(), tipoAvviso, stato, fileEntryIdTemplate, classPk, className, userCodiceFiscalePrimaFirma, jsonParameters, controlloPraticaId, serviceContext); @@ -168,17 +180,8 @@ public class AvvisoLocalServiceImpl extends AvvisoLocalServiceBaseImpl { String userCodiceFiscalePrimaFirma, long controlloPraticaId) throws SystemException, PortalException { - IntPratica intPratica = intPraticaLocalService.getIntPratica(intPraticaId); - String propertiesTemplate = AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get( - PraticaUtil.getStatoPraticaCode(stato, intPratica)); - // String propertiesTemplate = - // AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get(stato); - long fileEntryIdTemplate = configurazioneLocalService.findByC_ChiaveLong( - serviceContext.getCompanyId(), propertiesTemplate); - - _log.info("debugAvviso: " + propertiesTemplate); - return addAvviso(intPraticaId, StringPool.BLANK, new Date(), tipoAvviso, stato, fileEntryIdTemplate, - classPk, className, userCodiceFiscalePrimaFirma, null, controlloPraticaId, serviceContext); + return createStandardAvvisoPratica(intPraticaId, stato, null, classPk, className, serviceContext, + tipoAvviso, userCodiceFiscalePrimaFirma, controlloPraticaId); } public Avviso addAvviso(long intPraticaId, String descLong, Date dtAvviso, String tipoAvviso, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java index 4856de2f..de59a8b8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java @@ -17,7 +17,6 @@ import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.model.ControlloPratica; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.IntPratica; -import it.tref.liferay.portos.bo.model.Tempistica; import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil; import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; @@ -39,12 +38,8 @@ import it.tref.liferay.portos.kaleo.service.FormLogLocalServiceUtil; import java.io.Serializable; import java.util.Date; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.concurrent.TimeUnit; - -import com.liferay.counter.service.CounterLocalServiceUtil; import com.liferay.portal.kernel.bean.PortletBeanLocatorUtil; import com.liferay.portal.kernel.dao.orm.DynamicQuery; import com.liferay.portal.kernel.dao.orm.DynamicQueryFactoryUtil; @@ -73,17 +68,12 @@ import com.liferay.portal.model.ResourceConstants; import com.liferay.portal.model.Role; import com.liferay.portal.model.User; import com.liferay.portal.model.UserGroupRole; -import com.liferay.portal.model.WorkflowInstanceLink; import com.liferay.portal.service.RoleLocalServiceUtil; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserGroupRoleLocalServiceUtil; import com.liferay.portal.service.UserLocalServiceUtil; -import com.liferay.portal.service.WorkflowInstanceLinkLocalServiceUtil; import com.liferay.portal.workflow.kaleo.model.KaleoInstance; -import com.liferay.portal.workflow.kaleo.model.KaleoInstanceToken; -import com.liferay.portal.workflow.kaleo.model.KaleoTaskInstanceToken; import com.liferay.portal.workflow.kaleo.service.KaleoInstanceLocalServiceUtil; -import com.liferay.portal.workflow.kaleo.service.KaleoTaskInstanceTokenLocalServiceUtil; import com.liferay.portlet.asset.NoSuchEntryException; import com.liferay.portlet.asset.model.AssetEntry; import com.liferay.portlet.asset.model.AssetLinkConstants; @@ -769,11 +759,12 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi .getOrderByComparatorFactory().create("portos_bo_Avviso", "createDate", true)); Date start = null; Date end = null; - _log.info("Pratica " + pratica.getNumeroProgetto()); + + _log.debug("Pratica " + pratica.getNumeroProgetto()); for (Avviso avviso : avvisi) { if (!avviso.isAnnullato()) { String tipo = avviso.getTipoDocumento().toUpperCase(); - _log.info("Avviso " + avviso.getTipoDocumento() + " " + avviso.getDtAvviso() + " " + _log.debug("Avviso " + avviso.getTipoDocumento() + " " + avviso.getDtAvviso() + " " + avviso.getCreateDate()); if (tipo.equals(StatoPraticaConstants.INTEGRAZIONE)) { start = avviso.getCreateDate(); @@ -782,26 +773,26 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi apertura = avviso.getDtAvviso(); chiusura = null; stop = 0; - _log.info("Reset apertura al " + apertura); + _log.debug("Reset apertura al " + apertura); } - _log.info("IN start = " + start + ", pratica " + pratica.getNumeroProgetto()); + _log.debug("IN start = " + start + ", pratica " + pratica.getNumeroProgetto()); } else if (tipo.equals(StatoPraticaConstants.VIDIMATA)) { if (Validator.isNull(chiusura)) { end = avviso.getCreateDate(); - _log.info(tipo + " end = " + end + ", pratica " + pratica.getNumeroProgetto()); + _log.debug(tipo + " end = " + end + ", pratica " + pratica.getNumeroProgetto()); } else { apertura = avviso.getDtAvviso(); chiusura = start = end = null; stop = 0; - _log.info("Reset apertura al " + apertura); + _log.debug("Reset apertura al " + apertura); } } else if (tipo.equals(StatoPraticaConstants.INTEGRAZIONE_ACCETTATA)) { end = avviso.getCreateDate(); - _log.info(tipo + " end = " + end + ", pratica " + pratica.getNumeroProgetto()); + _log.debug(tipo + " end = " + end + ", pratica " + pratica.getNumeroProgetto()); } else if (tipo.equals(StatoPraticaConstants.AUTORIZZATA) || tipo.equals(StatoPraticaConstants.NON_AUTORIZZATA)) { chiusura = avviso.getCreateDate(); - _log.info("Chiusura al " + chiusura); + _log.debug("Chiusura al " + chiusura); } } if (Validator.isNotNull(start) && Validator.isNotNull(end)) { @@ -809,7 +800,7 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi if (Validator.isNotNull(diff)) { stop += diff; } - _log.info("Differenza: " + diff + ", pratica " + pratica.getNumeroProgetto()); + _log.debug("Differenza: " + diff + ", pratica " + pratica.getNumeroProgetto()); start = end = null; } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java index 6adc3457..87f8e9f7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java @@ -2186,8 +2186,9 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl public void updateAsset(DettPratica dettPratica, long[] categoryIds, boolean visible) throws SystemException, PortalException { - List tagNames = new ArrayList(); - IntPratica intPratica = intPraticaLocalService.getIntPratica(dettPratica.getIntPraticaId()); + // List tagNames = new ArrayList(); + // IntPratica intPratica = + // intPraticaLocalService.getIntPratica(dettPratica.getIntPraticaId()); // TODO gestire la nuova logica di asset // aggiunta tag tipologia pratica // if (dettPratica.getIntegrazione() != 0L) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties index 01a499d5..feb2a283 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties +++ b/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=2315 - build.date=1591805875908 + build.number=2329 + build.date=1592572451837 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp index 9749bc45..4546c28e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp @@ -401,13 +401,15 @@ String uso = ""; String title = ""; - String pref = label.substring(0, 1); - if (!(pref.equals("1") || pref.equals("2"))) { - title = label.substring(0, label.length()-1); - uso = title.substring(title.length()-1); - out.print(LanguageUtil.get(pageContext, "destinazione-uso-"+uso)+":"); - out.newLine(); - out.print(LanguageUtil.get(pageContext, "destinazione-"+title)+":"); + if (!label.equals("")) { + String pref = label.substring(0, 1); + if (!(pref.equals("1") || pref.equals("2"))) { + title = label.substring(0, label.length()-1); + uso = title.substring(title.length()-1); + out.print(LanguageUtil.get(pageContext, "destinazione-uso-"+uso)+":"); + out.newLine(); + out.print(LanguageUtil.get(pageContext, "destinazione-"+title)+":"); + } } %> <%=LanguageUtil.get(pageContext, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/sorteggio/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/sorteggio/view.jsp index f7062847..4be59c31 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/sorteggio/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/sorteggio/view.jsp @@ -286,18 +286,19 @@ boolean isPublicLayout = layout.isPublicLayout(); > - Sorteggio non valido ed annullato per doppia esecuzione\" - : \"\")%>" /> + Sorteggio non valido ed annullato per doppia esecuzione\" + : \"\")%>" /> - - + " /> <% String tecnicoSorteggio = StringPool.BLANK; @@ -373,11 +374,14 @@ boolean isPublicLayout = layout.isPublicLayout(); buttonURL.setParameter("anno", annoSorteggio); buttonURL.setParameter("mese", meseSorteggio); buttonURL.setParameter("settimana", settimanaSorteggio); + + if (annoSorteggio.equals("2020") && settimanaSorteggio.equals("24")) { + settimanaSorteggio = "22-23-24"; + } %> - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/servlet/SorgentiServlet.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/servlet/SorgentiServlet.java new file mode 100644 index 00000000..144f419c --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/servlet/SorgentiServlet.java @@ -0,0 +1,27 @@ +package it.mwg.sismica.fe.servlet; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.kernel.util.Validator; + +public class SorgentiServlet extends HttpServlet { + private static final long serialVersionUID = 5549374841236285035L; + private static final Log _log = LogFactoryUtil.getLog(SorgentiServlet.class); + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, + IOException { + String pathInfo = request.getPathInfo(); + _log.info(pathInfo); + if (Validator.isNull(pathInfo) || pathInfo.equals("/")) { + request.getRequestDispatcher("/html/sorgenti/form.jsp").forward(request, response); + } + } +} diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/web.xml b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/web.xml index 1aa8cdb8..d6eb336f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/web.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/web.xml @@ -1,3 +1,14 @@ - + + + SorgentiServlet + it.mwg.sismica.fe.servlet.SorgentiServlet + + + + SorgentiServlet + /sorgenti-sismica/* + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp index 602192c7..cd7b8a51 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp @@ -33,6 +33,7 @@ Soggetto soggettoDelegato = DelegheUtil.getPersonaDelegaCompilazioneDomanda(dettPratica.getDettPraticaId()); request.setAttribute("bean.dettPratica",dettPratica); + boolean proceduraA = Validator.isNull(intPratica.getTipoProcedura()) || intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_A); boolean proceduraC = intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_C); boolean disabledInput = !DelegheUtil.hasDelegaCompilazioneDomanda(user.getUserId(),dettPratica.getDettPraticaId()) @@ -481,47 +482,47 @@

    <%= LanguageUtil.get(pageContext, "destinazione-A") %>

     

    <%= LanguageUtil.get(pageContext, "destinazione-A1") %>

    - - -

     

    <%= LanguageUtil.get(pageContext, "destinazione-A2") %>

     

    - - - -

     

    <%= LanguageUtil.get(pageContext, "destinazione-A3") %>

     

    -

     

    <%= LanguageUtil.get(pageContext, "destinazione-A4") %>

     

    - - - - - -

     

    <%= LanguageUtil.get(pageContext, "destinazione-A5") %>

     

    -

     

    @@ -530,56 +531,56 @@

    <%= LanguageUtil.get(pageContext, "destinazione-B") %>

     

    <%= LanguageUtil.get(pageContext, "destinazione-B1") %>

    - - -

     

    <%= LanguageUtil.get(pageContext, "destinazione-B2") %>

     

    - - - - - - - - - -

     

    <%= LanguageUtil.get(pageContext, "destinazione-B3") %>

     

    - -

     

    <%= LanguageUtil.get(pageContext, "destinazione-B4") %>

     

    - - -

     

    <%= LanguageUtil.get(pageContext, "destinazione-B5") %>

     

    -

     

    diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/footer.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/footer.jsp new file mode 100644 index 00000000..b89edb36 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/footer.jsp @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/form.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/form.jsp new file mode 100644 index 00000000..c8627181 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/form.jsp @@ -0,0 +1,32 @@ +<%@ include file="/html/sorgenti/header.jsp"%> +
    +
    +

    Sorgenti del portale Sismica Sicilia

    +
    Compila il form sottostante e riceverai per email il collegamento per scaricare + i sorgenti del portale Sismica.
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + +
    Nome
    Cognome
    E-mail
    +
    +
    +
    +<%@ include file="/html/sorgenti/footer.jsp"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/header.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/header.jsp new file mode 100644 index 00000000..7104dd13 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/header.jsp @@ -0,0 +1,18 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> + + + +Sorgenti del portale Sismica Sicilia + + + + + +
    +
    +
    + Regione Siciliana +
    +
    +
    \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/META-INF/MANIFEST.MF b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/META-INF/MANIFEST.MF deleted file mode 100644 index 254272e1..00000000 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/aui/_carousel.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/aui/_carousel.scss index 22eaddb9..954b93c8 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/aui/_carousel.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/aui/_carousel.scss @@ -132,27 +132,3 @@ background-color: #fff; } } - -// Caption for text below images -// ----------------------------- - -.carousel-caption { - position: absolute; - left: 0; - right: 0; - bottom: 0; - padding: 15px; - background: $grayDark; - background: rgba(0,0,0,.75); -} -.carousel-caption h4, -.carousel-caption p { - color: $white; - line-height: $baseLineHeight; -} -.carousel-caption h4 { - margin: 0 0 5px; -} -.carousel-caption p { - margin-bottom: 0; -} diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/aui/_responsive-767px-max.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/aui/_responsive-767px-max.scss index 54bf3b7c..382f8db4 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/aui/_responsive-767px-max.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/aui/_responsive-767px-max.scss @@ -185,9 +185,4 @@ margin: -10px; } - // Carousel - .carousel-caption { - position: static; - } - } diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/aui/bs3/bootstrap/_carousel.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/aui/bs3/bootstrap/_carousel.scss index 753d881f..079f9cb9 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/aui/bs3/bootstrap/_carousel.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/aui/bs3/bootstrap/_carousel.scss @@ -212,26 +212,6 @@ } } -// Optional captions -// ----------------------------- -// Hidden by default for smaller viewports -.carousel-caption { - position: absolute; - left: 15%; - right: 15%; - bottom: 20px; - z-index: 10; - padding-top: 20px; - padding-bottom: 20px; - color: $carousel-caption-color; - text-align: center; - text-shadow: $carousel-text-shadow; - & .btn { - text-shadow: none; // No shadow for button elements in carousel-caption - } -} - - // Scale up controls for tablets and up @media screen and (min-width: $screen-sm-min) { @@ -256,13 +236,6 @@ } } - // Show and left align the captions - .carousel-caption { - left: 20%; - right: 20%; - padding-bottom: 30px; - } - // Move up the indicators .carousel-indicators { bottom: 20px; diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/single-article.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/single-article.scss index cc170cfd..91e309d8 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/single-article.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/single-article.scss @@ -86,23 +86,3 @@ color: $text-news; } } - -.taglib-social-bookmarks { - background: none; - margin: 0 auto; - width: 100%; - - - @media (min-width: $mobile) { - width: 750px; - } - - @media (min-width: $tablet) { - width: 970px; - } - - @media (min-width: $desktop) { - width: 1170px; - } - -} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/main.css b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/main.css index 27367882..502d436e 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/main.css +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/main.css @@ -15,3 +15,7 @@ @import url(font-awesome.min.css); @import url(component/index.css); + +.journal-content-article .item { + background: none !important; +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/aui/_carousel.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/aui/_carousel.scss index 22eaddb9..954b93c8 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/aui/_carousel.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/aui/_carousel.scss @@ -132,27 +132,3 @@ background-color: #fff; } } - -// Caption for text below images -// ----------------------------- - -.carousel-caption { - position: absolute; - left: 0; - right: 0; - bottom: 0; - padding: 15px; - background: $grayDark; - background: rgba(0,0,0,.75); -} -.carousel-caption h4, -.carousel-caption p { - color: $white; - line-height: $baseLineHeight; -} -.carousel-caption h4 { - margin: 0 0 5px; -} -.carousel-caption p { - margin-bottom: 0; -} diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/aui/_responsive-767px-max.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/aui/_responsive-767px-max.scss index 54bf3b7c..382f8db4 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/aui/_responsive-767px-max.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/aui/_responsive-767px-max.scss @@ -185,9 +185,4 @@ margin: -10px; } - // Carousel - .carousel-caption { - position: static; - } - } diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/aui/bs3/bootstrap/_carousel.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/aui/bs3/bootstrap/_carousel.scss index 753d881f..079f9cb9 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/aui/bs3/bootstrap/_carousel.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/aui/bs3/bootstrap/_carousel.scss @@ -212,26 +212,6 @@ } } -// Optional captions -// ----------------------------- -// Hidden by default for smaller viewports -.carousel-caption { - position: absolute; - left: 15%; - right: 15%; - bottom: 20px; - z-index: 10; - padding-top: 20px; - padding-bottom: 20px; - color: $carousel-caption-color; - text-align: center; - text-shadow: $carousel-text-shadow; - & .btn { - text-shadow: none; // No shadow for button elements in carousel-caption - } -} - - // Scale up controls for tablets and up @media screen and (min-width: $screen-sm-min) { @@ -256,13 +236,6 @@ } } - // Show and left align the captions - .carousel-caption { - left: 20%; - right: 20%; - padding-bottom: 30px; - } - // Move up the indicators .carousel-indicators { bottom: 20px; diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/single-article.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/single-article.scss index cc170cfd..91e309d8 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/single-article.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/single-article.scss @@ -86,23 +86,3 @@ color: $text-news; } } - -.taglib-social-bookmarks { - background: none; - margin: 0 auto; - width: 100%; - - - @media (min-width: $mobile) { - width: 750px; - } - - @media (min-width: $tablet) { - width: 970px; - } - - @media (min-width: $desktop) { - width: 1170px; - } - -} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/main.css b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/main.css index 27367882..502d436e 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/main.css +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/main.css @@ -15,3 +15,7 @@ @import url(font-awesome.min.css); @import url(component/index.css); + +.journal-content-article .item { + background: none !important; +} \ No newline at end of file