From 4ff4a6c148dc8d92b44d72725120b44854e5d8c7 Mon Sep 17 00:00:00 2001 From: Mattia Gosetto Date: Fri, 30 Jul 2021 12:55:21 +0200 Subject: [PATCH] edit --- .../docroot/WEB-INF/service.xml | 2 + .../liferay/portos/bo/model/DettPratica.java | 2 + .../portos/bo/model/DettPraticaClp.java | 19 ++ .../portos/bo/model/DettPraticaWrapper.java | 5 + .../portos/bo/model/ParereGeologoClp.java | 43 ++- .../portos/bo/model/ParereGeologoModel.java | 15 + .../portos/bo/model/ParereGeologoSoap.java | 10 + .../portos/bo/model/ParereGeologoWrapper.java | 27 ++ .../bo/service/ParereGeologoLocalService.java | 1 + .../service/ParereGeologoLocalServiceClp.java | 5 +- .../ParereGeologoLocalServiceUtil.java | 3 +- .../ParereGeologoLocalServiceWrapper.java | 3 +- .../bo/service/ParereGeologoService.java | 1 + .../bo/service/ParereGeologoServiceClp.java | 5 +- .../bo/service/ParereGeologoServiceUtil.java | 3 +- .../service/ParereGeologoServiceWrapper.java | 3 +- .../portos/bo/util/DocumentiPraticaUtil.java | 8 +- .../bo/util/ValidazionePraticaUtil.java | 24 ++ .../docroot/WEB-INF/sql/tables.sql | 3 +- .../WEB-INF/src/META-INF/portlet-hbm.xml | 1 + .../src/META-INF/portlet-model-hints.xml | 3 + .../WEB-INF/src/META-INF/portlet-orm.xml | 1 + .../portos/bo/model/impl/DettPraticaImpl.java | 19 ++ .../portos/bo/model/impl/IntPraticaImpl.java | 4 +- .../model/impl/ParereGeologoCacheModel.java | 20 +- .../bo/model/impl/ParereGeologoModelImpl.java | 49 ++- .../portos/bo/portlet/FascicoloPortlet.java | 3 +- .../bo/portlet/GestioneAttivitaPortlet.java | 3 +- .../ParereGeologoLocalServiceClpInvoker.java | 5 +- .../base/ParereGeologoServiceClpInvoker.java | 5 +- .../http/ParereGeologoServiceSoap.java | 3 +- .../impl/ParereGeologoLocalServiceImpl.java | 3 +- .../impl/ParereGeologoServiceImpl.java | 4 +- .../ParereGeologoPersistenceImpl.java | 1 + .../docroot/WEB-INF/src/service.properties | 4 +- .../actions/action_seleziona_geologo.jsp | 3 + .../portos-fe-portlet/docroot/css/main.css | 4 + .../domanda/page_dettagli_principali.jsp | 285 ++++++++++-------- .../html/soggettipratica/edit_soggetto.jsp | 4 +- 39 files changed, 445 insertions(+), 161 deletions(-) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml index 00a87b6e..4aec78db 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml @@ -108,6 +108,7 @@ + @@ -210,6 +211,7 @@ + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPratica.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPratica.java index a62a8d60..9c5c84ec 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPratica.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPratica.java @@ -31,6 +31,8 @@ public interface DettPratica extends DettPraticaModel, PersistedModel { * * Never modify this interface directly. Add methods to {@link it.tref.liferay.portos.bo.model.impl.DettPraticaImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface. */ + public java.util.Map getTipologieSoggetto(); + public java.lang.String getTitle(java.util.Locale locale); public java.lang.String getTitle(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaClp.java index 80a5197b..d6a29a18 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaClp.java @@ -8460,6 +8460,25 @@ public class DettPraticaClp extends BaseModelImpl } } + @Override + public java.util.Map getTipologieSoggetto() { + try { + String methodName = "getTipologieSoggetto"; + + Class[] parameterTypes = new Class[] { }; + + Object[] parameterValues = new Object[] { }; + + java.util.Map returnObj = (java.util.Map)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + @Override public java.lang.String getMiddleDescription() { try { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaWrapper.java index 08bbf2cf..6483a9cb 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaWrapper.java @@ -8229,6 +8229,11 @@ public class DettPraticaWrapper implements DettPratica, _dettPratica.persist(); } + @Override + public java.util.Map getTipologieSoggetto() { + return _dettPratica.getTipologieSoggetto(); + } + @Override public java.lang.String getTitle(java.util.Locale locale) { return _dettPratica.getTitle(locale); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoClp.java index 708a98de..22715fb4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoClp.java @@ -92,6 +92,7 @@ public class ParereGeologoClp extends BaseModelImpl attributes.put("dtRichista", getDtRichista()); attributes.put("dtCompilazione", getDtCompilazione()); attributes.put("status", getStatus()); + attributes.put("noteRichiedente", getNoteRichiedente()); return attributes; } @@ -193,6 +194,12 @@ public class ParereGeologoClp extends BaseModelImpl if (status != null) { setStatus(status); } + + String noteRichiedente = (String)attributes.get("noteRichiedente"); + + if (noteRichiedente != null) { + setNoteRichiedente(noteRichiedente); + } } @Override @@ -584,6 +591,30 @@ public class ParereGeologoClp extends BaseModelImpl } } + @Override + public String getNoteRichiedente() { + return _noteRichiedente; + } + + @Override + public void setNoteRichiedente(String noteRichiedente) { + _noteRichiedente = noteRichiedente; + + if (_parereGeologoRemoteModel != null) { + try { + Class clazz = _parereGeologoRemoteModel.getClass(); + + Method method = clazz.getMethod("setNoteRichiedente", + String.class); + + method.invoke(_parereGeologoRemoteModel, noteRichiedente); + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + } + @Override public StagedModelType getStagedModelType() { return new StagedModelType(PortalUtil.getClassNameId( @@ -676,6 +707,7 @@ public class ParereGeologoClp extends BaseModelImpl clone.setDtRichista(getDtRichista()); clone.setDtCompilazione(getDtCompilazione()); clone.setStatus(getStatus()); + clone.setNoteRichiedente(getNoteRichiedente()); return clone; } @@ -728,7 +760,7 @@ public class ParereGeologoClp extends BaseModelImpl @Override public String toString() { - StringBundler sb = new StringBundler(33); + StringBundler sb = new StringBundler(35); sb.append("{uuid="); sb.append(getUuid()); @@ -762,6 +794,8 @@ public class ParereGeologoClp extends BaseModelImpl sb.append(getDtCompilazione()); sb.append(", status="); sb.append(getStatus()); + sb.append(", noteRichiedente="); + sb.append(getNoteRichiedente()); sb.append("}"); return sb.toString(); @@ -769,7 +803,7 @@ public class ParereGeologoClp extends BaseModelImpl @Override public String toXmlString() { - StringBundler sb = new StringBundler(52); + StringBundler sb = new StringBundler(55); sb.append(""); sb.append("it.tref.liferay.portos.bo.model.ParereGeologo"); @@ -839,6 +873,10 @@ public class ParereGeologoClp extends BaseModelImpl "status"); + sb.append( + "noteRichiedente"); sb.append(""); @@ -863,6 +901,7 @@ public class ParereGeologoClp extends BaseModelImpl private Date _dtRichista; private Date _dtCompilazione; private int _status; + private String _noteRichiedente; private BaseModel _parereGeologoRemoteModel; private Class _clpSerializerClass = it.tref.liferay.portos.bo.service.ClpSerializer.class; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoModel.java index 52c9a426..bbcf8c95 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoModel.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoModel.java @@ -335,6 +335,21 @@ public interface ParereGeologoModel extends BaseModel, */ public void setStatus(int status); + /** + * Returns the note richiedente of this parere geologo. + * + * @return the note richiedente of this parere geologo + */ + @AutoEscape + public String getNoteRichiedente(); + + /** + * Sets the note richiedente of this parere geologo. + * + * @param noteRichiedente the note richiedente of this parere geologo + */ + public void setNoteRichiedente(String noteRichiedente); + @Override public boolean isNew(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoSoap.java index b35197e9..0c8e7613 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoSoap.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoSoap.java @@ -47,6 +47,7 @@ public class ParereGeologoSoap implements Serializable { soapModel.setDtRichista(model.getDtRichista()); soapModel.setDtCompilazione(model.getDtCompilazione()); soapModel.setStatus(model.getStatus()); + soapModel.setNoteRichiedente(model.getNoteRichiedente()); return soapModel; } @@ -227,6 +228,14 @@ public class ParereGeologoSoap implements Serializable { _status = status; } + public String getNoteRichiedente() { + return _noteRichiedente; + } + + public void setNoteRichiedente(String noteRichiedente) { + _noteRichiedente = noteRichiedente; + } + private String _uuid; private long _parereGeologoId; private long _companyId; @@ -243,4 +252,5 @@ public class ParereGeologoSoap implements Serializable { private Date _dtRichista; private Date _dtCompilazione; private int _status; + private String _noteRichiedente; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoWrapper.java index b50d5d6a..e86a14e1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoWrapper.java @@ -67,6 +67,7 @@ public class ParereGeologoWrapper implements ParereGeologo, attributes.put("dtRichista", getDtRichista()); attributes.put("dtCompilazione", getDtCompilazione()); attributes.put("status", getStatus()); + attributes.put("noteRichiedente", getNoteRichiedente()); return attributes; } @@ -168,6 +169,12 @@ public class ParereGeologoWrapper implements ParereGeologo, if (status != null) { setStatus(status); } + + String noteRichiedente = (String)attributes.get("noteRichiedente"); + + if (noteRichiedente != null) { + setNoteRichiedente(noteRichiedente); + } } /** @@ -554,6 +561,26 @@ public class ParereGeologoWrapper implements ParereGeologo, _parereGeologo.setStatus(status); } + /** + * Returns the note richiedente of this parere geologo. + * + * @return the note richiedente of this parere geologo + */ + @Override + public java.lang.String getNoteRichiedente() { + return _parereGeologo.getNoteRichiedente(); + } + + /** + * Sets the note richiedente of this parere geologo. + * + * @param noteRichiedente the note richiedente of this parere geologo + */ + @Override + public void setNoteRichiedente(java.lang.String noteRichiedente) { + _parereGeologo.setNoteRichiedente(noteRichiedente); + } + @Override public boolean isNew() { return _parereGeologo.isNew(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalService.java index 77b3d7a7..336b645f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalService.java @@ -312,6 +312,7 @@ public interface ParereGeologoLocalService extends BaseLocalService, public it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo( long geologoUserId, long intPraticaId, long dettPraticaId, + java.lang.String noteRichiedente, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceClp.java index cf0ca5aa..3bb94da9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceClp.java @@ -134,7 +134,7 @@ public class ParereGeologoLocalServiceClp implements ParereGeologoLocalService { _methodName23 = "addParereGeologo"; _methodParameterTypes23 = new String[] { - "long", "long", "long", + "long", "long", "long", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; @@ -891,6 +891,7 @@ public class ParereGeologoLocalServiceClp implements ParereGeologoLocalService { @Override public it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo( long geologoUserId, long intPraticaId, long dettPraticaId, + java.lang.String noteRichiedente, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { @@ -906,6 +907,8 @@ public class ParereGeologoLocalServiceClp implements ParereGeologoLocalService { dettPraticaId, + ClpSerializer.translateInput(noteRichiedente), + ClpSerializer.translateInput(serviceContext) }); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceUtil.java index cf404f6d..20ca5d61 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceUtil.java @@ -337,12 +337,13 @@ public class ParereGeologoLocalServiceUtil { public static it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo( long geologoUserId, long intPraticaId, long dettPraticaId, + java.lang.String noteRichiedente, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { return getService() .addParereGeologo(geologoUserId, intPraticaId, - dettPraticaId, serviceContext); + dettPraticaId, noteRichiedente, serviceContext); } public static it.tref.liferay.portos.bo.model.ParereGeologo updateParereGeologo( diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceWrapper.java index d78970b4..c4ff3a09 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceWrapper.java @@ -359,11 +359,12 @@ public class ParereGeologoLocalServiceWrapper @Override public it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo( long geologoUserId, long intPraticaId, long dettPraticaId, + java.lang.String noteRichiedente, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { return _parereGeologoLocalService.addParereGeologo(geologoUserId, - intPraticaId, dettPraticaId, serviceContext); + intPraticaId, dettPraticaId, noteRichiedente, serviceContext); } @Override diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoService.java index b0997fb2..273856b0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoService.java @@ -66,6 +66,7 @@ public interface ParereGeologoService extends BaseService, InvokableService { public it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo( long geologoUserId, long intPraticaId, long dettPraticaId, + java.lang.String noteRichiedente, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceClp.java index c9d4e272..ddc7bd53 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceClp.java @@ -35,7 +35,7 @@ public class ParereGeologoServiceClp implements ParereGeologoService { _methodName3 = "addParereGeologo"; _methodParameterTypes3 = new String[] { - "long", "long", "long", + "long", "long", "long", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; @@ -130,6 +130,7 @@ public class ParereGeologoServiceClp implements ParereGeologoService { @Override public it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo( long geologoUserId, long intPraticaId, long dettPraticaId, + java.lang.String noteRichiedente, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { @@ -145,6 +146,8 @@ public class ParereGeologoServiceClp implements ParereGeologoService { dettPraticaId, + ClpSerializer.translateInput(noteRichiedente), + ClpSerializer.translateInput(serviceContext) }); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceUtil.java index 44e390fd..a8510b2c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceUtil.java @@ -65,12 +65,13 @@ public class ParereGeologoServiceUtil { public static it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo( long geologoUserId, long intPraticaId, long dettPraticaId, + java.lang.String noteRichiedente, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { return getService() .addParereGeologo(geologoUserId, intPraticaId, - dettPraticaId, serviceContext); + dettPraticaId, noteRichiedente, serviceContext); } public static it.tref.liferay.portos.bo.model.ParereGeologo updateParereGeologo( diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceWrapper.java index 708e71ee..469b68da 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceWrapper.java @@ -61,11 +61,12 @@ public class ParereGeologoServiceWrapper implements ParereGeologoService, @Override public it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo( long geologoUserId, long intPraticaId, long dettPraticaId, + java.lang.String noteRichiedente, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { return _parereGeologoService.addParereGeologo(geologoUserId, - intPraticaId, dettPraticaId, serviceContext); + intPraticaId, dettPraticaId, noteRichiedente, serviceContext); } @Override diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DocumentiPraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DocumentiPraticaUtil.java index 3bb2455e..92d3bae5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DocumentiPraticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DocumentiPraticaUtil.java @@ -265,7 +265,13 @@ public class DocumentiPraticaUtil { /*if (dettPratica.getNormLavoriInProprio()) { docObbligatori.add(TIPOLOGIA_ALLEGATO_A29); }*/ - if (!dettPratica.getTcNoOpereEscavazione()) { + if (!dettPratica.getTcNoOpereEscavazione() && + (!intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q8) || + !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P8) || + !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q9) || + !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P9) || + !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) || + !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P10))) { docObbligatori.add(TIPOLOGIA_ALLEGATO_A10); } if (richiestoA24(dettPratica)) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java index 5b139df4..f8b64d10 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java @@ -595,13 +595,37 @@ public class ValidazionePraticaUtil { } if (direttoreLavoriNotRequired) { soggettiRichiesti.remove(TipoSoggettoUtil.DIRETTORE_LAVORI); + if(Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleDirettoreLavori())) + notCompleted.add("Rimuovere "+LanguageUtil.get(LocaleUtil.getDefault(), "gc-soggetto-"+TipoSoggettoUtil.DIRETTORE_LAVORI)+" da soggetti censiti"); + } if (collaudatoreNotRequired) { soggettiRichiesti.remove(TipoSoggettoUtil.COLLAUDATORE); + if(Validator.isNotNull(dettPratica.getCodiceFiscaleDelegatoCollaudo()) || + Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleCollaudatore())) + notCompleted.add("Rimuovere "+LanguageUtil.get(LocaleUtil.getDefault(), "gc-soggetto-"+TipoSoggettoUtil.COLLAUDATORE)+" da soggetti censiti"); } if (dittaNotRequired) { soggettiRichiesti.remove(TipoSoggettoUtil.DITTA); + if(Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleDitta())) + notCompleted.add("Rimuovere "+LanguageUtil.get(LocaleUtil.getDefault(), "gc-soggetto-"+TipoSoggettoUtil.DITTA)+" da soggetti censiti"); } + + if(Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleCollaudatore())){ + String codFiscaleCollaudatore = dettPratica.getCodiceFiscalePrincipaleCollaudatore(); + if(Validator.isNotNull(dettPratica.getCodiceFiscaleDelegatoCollaudo())) + codFiscaleCollaudatore = dettPratica.getCodiceFiscaleDelegatoCollaudo(); + if(Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleProgettista()) && + (codFiscaleCollaudatore.equals(dettPratica.getCodiceFiscalePrincipaleProgettista())) + ) + notCompleted.add("Il collaudatore non può essere il progettista"); + + if(Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleDirettoreLavori()) && + (codFiscaleCollaudatore.equals(dettPratica.getCodiceFiscalePrincipaleDirettoreLavori())) + ) + notCompleted.add("Il collaudatore non può essere il direttore lavori"); + } + for (String soggetto : soggettiRichiesti) { notCompleted.add("gc-soggetto-" + soggetto + "-principale-not-present"); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql index 925b805a..45579192 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql @@ -631,7 +631,8 @@ create table portos_bo_ParereGeo ( fileEntryId LONG, dtRichista DATE null, dtCompilazione DATE null, - status INTEGER + status INTEGER, + noteRichiedente STRING null ); create table portos_bo_Provincia ( diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml index 65863014..c540549b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml @@ -664,6 +664,7 @@ + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml index 5f26baa1..6a0df152 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml @@ -715,6 +715,9 @@ + + 4000 + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml index 18a0be49..bcdaa21d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml @@ -857,6 +857,7 @@ TIMESTAMP + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java index 0915d89c..409a775c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java @@ -13,11 +13,16 @@ package it.tref.liferay.portos.bo.model.impl; import it.tref.liferay.portos.bo.model.IntPratica; +import it.tref.liferay.portos.bo.model.Soggetto; import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; +import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil; +import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; import it.tref.liferay.portos.bo.util.AzioniPraticheUtil; import java.text.SimpleDateFormat; +import java.util.LinkedHashMap; import java.util.Locale; +import java.util.Map; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; @@ -52,6 +57,20 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { public DettPraticaImpl() { } + + public Map getTipologieSoggetto(){ + Map soggetti = SoggettoLocalServiceUtil.getTipologieSoggetti(); + if(getNoCollaudo() || getNominaCollaudatore()) + soggetti.remove(TipoSoggettoUtil.COLLAUDATORE); + + if(getNormLavoriNoDirettore() || getNominaDirettoreLavori()) + soggetti.remove(TipoSoggettoUtil.DIRETTORE_LAVORI); + + if(getNormLavoriInProprio() || getNominaImpresa()) + soggetti.remove(TipoSoggettoUtil.DITTA); + + return soggetti; + } @Override public String getTitle(Locale locale) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java index 5cf0c8f3..c980bebf 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java @@ -140,9 +140,9 @@ public class IntPraticaImpl extends IntPraticaBaseImpl { case Constants.PROCEDURA_Q7: return Constants.LIEVE_ENTITA; - case Constants.PROCEDURA_P8: + //case Constants.PROCEDURA_P8: case Constants.PROCEDURA_P9: - case Constants.PROCEDURA_Q8: + //case Constants.PROCEDURA_Q8: case Constants.PROCEDURA_Q9: return Constants.SANATORIE; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoCacheModel.java index e1816618..4cda4c8c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoCacheModel.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoCacheModel.java @@ -38,7 +38,7 @@ public class ParereGeologoCacheModel implements CacheModel, Externalizable { @Override public String toString() { - StringBundler sb = new StringBundler(33); + StringBundler sb = new StringBundler(35); sb.append("{uuid="); sb.append(uuid); @@ -72,6 +72,8 @@ public class ParereGeologoCacheModel implements CacheModel, sb.append(dtCompilazione); sb.append(", status="); sb.append(status); + sb.append(", noteRichiedente="); + sb.append(noteRichiedente); sb.append("}"); return sb.toString(); @@ -143,6 +145,13 @@ public class ParereGeologoCacheModel implements CacheModel, parereGeologoImpl.setStatus(status); + if (noteRichiedente == null) { + parereGeologoImpl.setNoteRichiedente(StringPool.BLANK); + } + else { + parereGeologoImpl.setNoteRichiedente(noteRichiedente); + } + parereGeologoImpl.resetOriginalValues(); return parereGeologoImpl; @@ -166,6 +175,7 @@ public class ParereGeologoCacheModel implements CacheModel, dtRichista = objectInput.readLong(); dtCompilazione = objectInput.readLong(); status = objectInput.readInt(); + noteRichiedente = objectInput.readUTF(); } @Override @@ -207,6 +217,13 @@ public class ParereGeologoCacheModel implements CacheModel, objectOutput.writeLong(dtRichista); objectOutput.writeLong(dtCompilazione); objectOutput.writeInt(status); + + if (noteRichiedente == null) { + objectOutput.writeUTF(StringPool.BLANK); + } + else { + objectOutput.writeUTF(noteRichiedente); + } } public String uuid; @@ -225,4 +242,5 @@ public class ParereGeologoCacheModel implements CacheModel, public long dtRichista; public long dtCompilazione; public int status; + public String noteRichiedente; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoModelImpl.java index af4ffe72..d010ee93 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoModelImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoModelImpl.java @@ -82,9 +82,10 @@ public class ParereGeologoModelImpl extends BaseModelImpl { "fileEntryId", Types.BIGINT }, { "dtRichista", Types.TIMESTAMP }, { "dtCompilazione", Types.TIMESTAMP }, - { "status", Types.INTEGER } + { "status", Types.INTEGER }, + { "noteRichiedente", Types.VARCHAR } }; - public static final String TABLE_SQL_CREATE = "create table portos_bo_ParereGeo (uuid_ VARCHAR(75) null,parereGeologoId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,geologoUserId LONG,parere STRING null,intPraticaId LONG,dettPraticaId LONG,fileEntryId LONG,dtRichista DATE null,dtCompilazione DATE null,status INTEGER)"; + public static final String TABLE_SQL_CREATE = "create table portos_bo_ParereGeo (uuid_ VARCHAR(75) null,parereGeologoId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,geologoUserId LONG,parere STRING null,intPraticaId LONG,dettPraticaId LONG,fileEntryId LONG,dtRichista DATE null,dtCompilazione DATE null,status INTEGER,noteRichiedente STRING null)"; public static final String TABLE_SQL_DROP = "drop table portos_bo_ParereGeo"; public static final String ORDER_BY_JPQL = " ORDER BY parereGeologo.parereGeologoId ASC"; public static final String ORDER_BY_SQL = " ORDER BY portos_bo_ParereGeo.parereGeologoId ASC"; @@ -137,6 +138,7 @@ public class ParereGeologoModelImpl extends BaseModelImpl model.setDtRichista(soapModel.getDtRichista()); model.setDtCompilazione(soapModel.getDtCompilazione()); model.setStatus(soapModel.getStatus()); + model.setNoteRichiedente(soapModel.getNoteRichiedente()); return model; } @@ -217,6 +219,7 @@ public class ParereGeologoModelImpl extends BaseModelImpl attributes.put("dtRichista", getDtRichista()); attributes.put("dtCompilazione", getDtCompilazione()); attributes.put("status", getStatus()); + attributes.put("noteRichiedente", getNoteRichiedente()); return attributes; } @@ -318,6 +321,12 @@ public class ParereGeologoModelImpl extends BaseModelImpl if (status != null) { setStatus(status); } + + String noteRichiedente = (String)attributes.get("noteRichiedente"); + + if (noteRichiedente != null) { + setNoteRichiedente(noteRichiedente); + } } @JSON @@ -598,6 +607,22 @@ public class ParereGeologoModelImpl extends BaseModelImpl _status = status; } + @JSON + @Override + public String getNoteRichiedente() { + if (_noteRichiedente == null) { + return StringPool.BLANK; + } + else { + return _noteRichiedente; + } + } + + @Override + public void setNoteRichiedente(String noteRichiedente) { + _noteRichiedente = noteRichiedente; + } + @Override public StagedModelType getStagedModelType() { return new StagedModelType(PortalUtil.getClassNameId( @@ -651,6 +676,7 @@ public class ParereGeologoModelImpl extends BaseModelImpl parereGeologoImpl.setDtRichista(getDtRichista()); parereGeologoImpl.setDtCompilazione(getDtCompilazione()); parereGeologoImpl.setStatus(getStatus()); + parereGeologoImpl.setNoteRichiedente(getNoteRichiedente()); parereGeologoImpl.resetOriginalValues(); @@ -808,12 +834,20 @@ public class ParereGeologoModelImpl extends BaseModelImpl parereGeologoCacheModel.status = getStatus(); + parereGeologoCacheModel.noteRichiedente = getNoteRichiedente(); + + String noteRichiedente = parereGeologoCacheModel.noteRichiedente; + + if ((noteRichiedente != null) && (noteRichiedente.length() == 0)) { + parereGeologoCacheModel.noteRichiedente = null; + } + return parereGeologoCacheModel; } @Override public String toString() { - StringBundler sb = new StringBundler(33); + StringBundler sb = new StringBundler(35); sb.append("{uuid="); sb.append(getUuid()); @@ -847,6 +881,8 @@ public class ParereGeologoModelImpl extends BaseModelImpl sb.append(getDtCompilazione()); sb.append(", status="); sb.append(getStatus()); + sb.append(", noteRichiedente="); + sb.append(getNoteRichiedente()); sb.append("}"); return sb.toString(); @@ -854,7 +890,7 @@ public class ParereGeologoModelImpl extends BaseModelImpl @Override public String toXmlString() { - StringBundler sb = new StringBundler(52); + StringBundler sb = new StringBundler(55); sb.append(""); sb.append("it.tref.liferay.portos.bo.model.ParereGeologo"); @@ -924,6 +960,10 @@ public class ParereGeologoModelImpl extends BaseModelImpl "status"); + sb.append( + "noteRichiedente"); sb.append(""); @@ -962,6 +1002,7 @@ public class ParereGeologoModelImpl extends BaseModelImpl private Date _dtRichista; private Date _dtCompilazione; private int _status; + private String _noteRichiedente; private long _columnBitmask; private ParereGeologo _escapedModel; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java index 01d29659..7625a915 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java @@ -198,11 +198,12 @@ public class FascicoloPortlet extends MVCPortlet { long geologoId = ParamUtil.getLong(actionRequest, "geologoId"); long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId"); long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId"); + String noteRichiedente = ParamUtil.getString(actionRequest, "noteRichiedente"); try { ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); serviceContext.setCreateDate(new Date()); serviceContext.setModifiedDate(new Date()); - ParereGeologoServiceUtil.addParereGeologo(geologoId, intPraticaId, dettPraticaId, serviceContext); + ParereGeologoServiceUtil.addParereGeologo(geologoId, intPraticaId, dettPraticaId, noteRichiedente, serviceContext); } catch (PortalException | SystemException e) { _log.error("error-workflow-sospeso", e); SessionErrors.add(actionRequest, "error-aggiunta-richiesta-parere"); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneAttivitaPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneAttivitaPortlet.java index d7aed0c8..d7371d3d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneAttivitaPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneAttivitaPortlet.java @@ -219,12 +219,13 @@ public class GestioneAttivitaPortlet extends MVCPortlet { long geologoId = ParamUtil.getLong(actionRequest, "geologoId"); long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId"); long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId"); + String noteRichiedente = ParamUtil.getString(actionRequest, "noteRichiedente"); try { ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); serviceContext.setCreateDate(new Date()); serviceContext.setModifiedDate(new Date()); ParereGeologo parereGeologo = ParereGeologoServiceUtil.addParereGeologo(geologoId, intPraticaId, - dettPraticaId, serviceContext); + dettPraticaId, noteRichiedente, serviceContext); // ADT: aggiunta notifica geologo MailUtil.invioNotificaGeologo(parereGeologo, serviceContext); } catch (PortalException | SystemException e) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoLocalServiceClpInvoker.java index d3c3ef58..698172a5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoLocalServiceClpInvoker.java @@ -133,7 +133,7 @@ public class ParereGeologoLocalServiceClpInvoker { _methodName178 = "addParereGeologo"; _methodParameterTypes178 = new String[] { - "long", "long", "long", + "long", "long", "long", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; @@ -353,7 +353,8 @@ public class ParereGeologoLocalServiceClpInvoker { return ParereGeologoLocalServiceUtil.addParereGeologo(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Long)arguments[2]).longValue(), - (com.liferay.portal.service.ServiceContext)arguments[3]); + (java.lang.String)arguments[3], + (com.liferay.portal.service.ServiceContext)arguments[4]); } if (_methodName179.equals(name) && diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoServiceClpInvoker.java index 1ab7e2f1..9241cc5c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoServiceClpInvoker.java @@ -35,7 +35,7 @@ public class ParereGeologoServiceClpInvoker { _methodName158 = "addParereGeologo"; _methodParameterTypes158 = new String[] { - "long", "long", "long", + "long", "long", "long", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; @@ -96,7 +96,8 @@ public class ParereGeologoServiceClpInvoker { return ParereGeologoServiceUtil.addParereGeologo(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Long)arguments[2]).longValue(), - (com.liferay.portal.service.ServiceContext)arguments[3]); + (java.lang.String)arguments[3], + (com.liferay.portal.service.ServiceContext)arguments[4]); } if (_methodName159.equals(name) && diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ParereGeologoServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ParereGeologoServiceSoap.java index f31ec5a7..acb3f3be 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ParereGeologoServiceSoap.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ParereGeologoServiceSoap.java @@ -64,11 +64,12 @@ import java.rmi.RemoteException; public class ParereGeologoServiceSoap { public static it.tref.liferay.portos.bo.model.ParereGeologoSoap addParereGeologo( long geologoUserId, long intPraticaId, long dettPraticaId, + java.lang.String noteRichiedente, com.liferay.portal.service.ServiceContext serviceContext) throws RemoteException { try { it.tref.liferay.portos.bo.model.ParereGeologo returnValue = ParereGeologoServiceUtil.addParereGeologo(geologoUserId, - intPraticaId, dettPraticaId, serviceContext); + intPraticaId, dettPraticaId, noteRichiedente, serviceContext); return it.tref.liferay.portos.bo.model.ParereGeologoSoap.toSoapModel(returnValue); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java index 7ec2bd85..1fa94930 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java @@ -72,7 +72,7 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase @Override public ParereGeologo addParereGeologo(long geologoUserId, long intPraticaId, long dettPraticaId, - ServiceContext serviceContext) throws SystemException, PortalException { + String noteRichiedente, ServiceContext serviceContext) throws SystemException, PortalException { long parereGeologoId = counterLocalService.increment(ParereGeologo.class.getName()); ParereGeologo parereGeologo = parereGeologoPersistence.create(parereGeologoId); @@ -87,6 +87,7 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase parereGeologo.setDettPraticaId(dettPraticaId); parereGeologo.setGeologoUserId(geologoUserId); parereGeologo.setDtRichista(new Date()); + parereGeologo.setNoteRichiedente(noteRichiedente); return parereGeologoPersistence.update(parereGeologo); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoServiceImpl.java index 8cd48f3b..a855b546 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoServiceImpl.java @@ -51,12 +51,12 @@ public class ParereGeologoServiceImpl extends ParereGeologoServiceBaseImpl { @Override public ParereGeologo addParereGeologo(long geologoUserId, long intPraticaId, long dettPraticaId, - ServiceContext serviceContext) throws SystemException, PortalException { + String noteRichiedente, ServiceContext serviceContext) throws SystemException, PortalException { IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); IntPraticaPermission.check(getPermissionChecker(), territorio.getGroupId(), ActionKeys.RICHIEDI_PARERE_GEOLOGO); - return parereGeologoLocalService.addParereGeologo(geologoUserId, intPraticaId, dettPraticaId, serviceContext); + return parereGeologoLocalService.addParereGeologo(geologoUserId, intPraticaId, dettPraticaId, noteRichiedente, serviceContext); } @Override diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java index c6ce3907..9a0ac9b3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java @@ -4587,6 +4587,7 @@ public class ParereGeologoPersistenceImpl extends BasePersistenceImpl +
+ + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/css/main.css b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/css/main.css index f321e80c..043dbbff 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/css/main.css +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/css/main.css @@ -47,4 +47,8 @@ label{ font-size: 18px; font-weight: bold; margin-bottom: 8px; +} + +.hideSection { + display:none !important; } \ 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 1c9683ab..936a2eeb 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 @@ -44,8 +44,16 @@ boolean enabledByIntegrazione = DelegheUtil.hasDelegaCompilazioneDomanda(user.ge && TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equals(dettPratica.getTipoIntegrazione()); boolean isDisabled = disabledInput && !enabledByIntegrazione; boolean isNewVariante = ParamUtil.getBoolean(request, "isNewVariante"); +boolean disableViarch = !dettPratica.getLavoriPubblici() && !dettPratica.getIntervFinPub(); + String urlIframeMappe = MappeUtil.getUrlFe(request, dettPratica, comune, (disabledInput || isGeoEditable)); +String hide1 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q1) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P1) ? "hideSection" : ""); +String hide3 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q3) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P3) ? "hideSection" : ""); +String hide8 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q8) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P8) ? "hideSection" : ""); +String hide9 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q9) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P9) ? "hideSection" : ""); +String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P10) ? "hideSection" : ""); + %> @@ -61,7 +69,7 @@ String urlIframeMappe = MappeUtil.getUrlFe(request, dettPratica, comune, (disabl
-
+
@@ -97,135 +105,143 @@ String urlIframeMappe = MappeUtil.getUrlFe(request, dettPratica, comune, (disabl
- - - -
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
-

<%= LanguageUtil.get(pageContext, "interv-no-viarch") %>

-
-
- - - +
+ + + +
+
+ +
+
+
+
+ +
-
-
-
- -
-
-
-
- -
-
- -
-
- +
+
+ +
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
- - - - -