Mattia Gosetto 3 anni fa
parent
commit
4ff4a6c148
  1. 2
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml
  2. 2
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPratica.java
  3. 19
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaClp.java
  4. 5
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaWrapper.java
  5. 43
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoClp.java
  6. 15
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoModel.java
  7. 10
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoSoap.java
  8. 27
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ParereGeologoWrapper.java
  9. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalService.java
  10. 5
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceClp.java
  11. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceUtil.java
  12. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceWrapper.java
  13. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoService.java
  14. 5
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceClp.java
  15. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceUtil.java
  16. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoServiceWrapper.java
  17. 8
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DocumentiPraticaUtil.java
  18. 24
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java
  19. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql
  20. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml
  21. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml
  22. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml
  23. 19
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java
  24. 4
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java
  25. 20
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoCacheModel.java
  26. 49
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoModelImpl.java
  27. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java
  28. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneAttivitaPortlet.java
  29. 5
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoLocalServiceClpInvoker.java
  30. 5
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoServiceClpInvoker.java
  31. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/ParereGeologoServiceSoap.java
  32. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java
  33. 4
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoServiceImpl.java
  34. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java
  35. 4
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
  36. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_seleziona_geologo.jsp
  37. 4
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/css/main.css
  38. 59
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp
  39. 4
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/edit_soggetto.jsp

2
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml

@ -108,6 +108,7 @@
<column name="dtRichista" type="Date" /> <column name="dtRichista" type="Date" />
<column name="dtCompilazione" type="Date" /> <column name="dtCompilazione" type="Date" />
<column name="status" type="int" /> <column name="status" type="int" />
<column name="noteRichiedente" type="String" />
<finder return-type="Collection" name="IntPraticaId"> <finder return-type="Collection" name="IntPraticaId">
<finder-column name="intPraticaId" /> <finder-column name="intPraticaId" />
@ -211,6 +212,7 @@
<column name="dettPraticaIdRimozione" type="long" /> <column name="dettPraticaIdRimozione" type="long" />
<column name="dtDataRimozione" type="Date" /> <column name="dtDataRimozione" type="Date" />
<finder return-type="DocPratica" name="DlFileEntry"> <finder return-type="DocPratica" name="DlFileEntry">
<finder-column name="dlFileEntryId" /> <finder-column name="dlFileEntryId" />
</finder> </finder>

2
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. * 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<java.lang.String, java.lang.String> getTipologieSoggetto();
public java.lang.String getTitle(java.util.Locale locale); public java.lang.String getTitle(java.util.Locale locale);
public java.lang.String getTitle(); public java.lang.String getTitle();

19
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<DettPratica>
} }
} }
@Override
public java.util.Map<java.lang.String, java.lang.String> getTipologieSoggetto() {
try {
String methodName = "getTipologieSoggetto";
Class<?>[] parameterTypes = new Class<?>[] { };
Object[] parameterValues = new Object[] { };
java.util.Map<java.lang.String, java.lang.String> returnObj = (java.util.Map<java.lang.String, java.lang.String>)invokeOnRemoteModel(methodName,
parameterTypes, parameterValues);
return returnObj;
}
catch (Exception e) {
throw new UnsupportedOperationException(e);
}
}
@Override @Override
public java.lang.String getMiddleDescription() { public java.lang.String getMiddleDescription() {
try { try {

5
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(); _dettPratica.persist();
} }
@Override
public java.util.Map<java.lang.String, java.lang.String> getTipologieSoggetto() {
return _dettPratica.getTipologieSoggetto();
}
@Override @Override
public java.lang.String getTitle(java.util.Locale locale) { public java.lang.String getTitle(java.util.Locale locale) {
return _dettPratica.getTitle(locale); return _dettPratica.getTitle(locale);

43
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<ParereGeologo>
attributes.put("dtRichista", getDtRichista()); attributes.put("dtRichista", getDtRichista());
attributes.put("dtCompilazione", getDtCompilazione()); attributes.put("dtCompilazione", getDtCompilazione());
attributes.put("status", getStatus()); attributes.put("status", getStatus());
attributes.put("noteRichiedente", getNoteRichiedente());
return attributes; return attributes;
} }
@ -193,6 +194,12 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
if (status != null) { if (status != null) {
setStatus(status); setStatus(status);
} }
String noteRichiedente = (String)attributes.get("noteRichiedente");
if (noteRichiedente != null) {
setNoteRichiedente(noteRichiedente);
}
} }
@Override @Override
@ -584,6 +591,30 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
} }
} }
@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 @Override
public StagedModelType getStagedModelType() { public StagedModelType getStagedModelType() {
return new StagedModelType(PortalUtil.getClassNameId( return new StagedModelType(PortalUtil.getClassNameId(
@ -676,6 +707,7 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
clone.setDtRichista(getDtRichista()); clone.setDtRichista(getDtRichista());
clone.setDtCompilazione(getDtCompilazione()); clone.setDtCompilazione(getDtCompilazione());
clone.setStatus(getStatus()); clone.setStatus(getStatus());
clone.setNoteRichiedente(getNoteRichiedente());
return clone; return clone;
} }
@ -728,7 +760,7 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
@Override @Override
public String toString() { public String toString() {
StringBundler sb = new StringBundler(33); StringBundler sb = new StringBundler(35);
sb.append("{uuid="); sb.append("{uuid=");
sb.append(getUuid()); sb.append(getUuid());
@ -762,6 +794,8 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
sb.append(getDtCompilazione()); sb.append(getDtCompilazione());
sb.append(", status="); sb.append(", status=");
sb.append(getStatus()); sb.append(getStatus());
sb.append(", noteRichiedente=");
sb.append(getNoteRichiedente());
sb.append("}"); sb.append("}");
return sb.toString(); return sb.toString();
@ -769,7 +803,7 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
@Override @Override
public String toXmlString() { public String toXmlString() {
StringBundler sb = new StringBundler(52); StringBundler sb = new StringBundler(55);
sb.append("<model><model-name>"); sb.append("<model><model-name>");
sb.append("it.tref.liferay.portos.bo.model.ParereGeologo"); sb.append("it.tref.liferay.portos.bo.model.ParereGeologo");
@ -839,6 +873,10 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
"<column><column-name>status</column-name><column-value><![CDATA["); "<column><column-name>status</column-name><column-value><![CDATA[");
sb.append(getStatus()); sb.append(getStatus());
sb.append("]]></column-value></column>"); sb.append("]]></column-value></column>");
sb.append(
"<column><column-name>noteRichiedente</column-name><column-value><![CDATA[");
sb.append(getNoteRichiedente());
sb.append("]]></column-value></column>");
sb.append("</model>"); sb.append("</model>");
@ -863,6 +901,7 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
private Date _dtRichista; private Date _dtRichista;
private Date _dtCompilazione; private Date _dtCompilazione;
private int _status; private int _status;
private String _noteRichiedente;
private BaseModel<?> _parereGeologoRemoteModel; private BaseModel<?> _parereGeologoRemoteModel;
private Class<?> _clpSerializerClass = it.tref.liferay.portos.bo.service.ClpSerializer.class; private Class<?> _clpSerializerClass = it.tref.liferay.portos.bo.service.ClpSerializer.class;
} }

15
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<ParereGeologo>,
*/ */
public void setStatus(int status); 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 @Override
public boolean isNew(); public boolean isNew();

10
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.setDtRichista(model.getDtRichista());
soapModel.setDtCompilazione(model.getDtCompilazione()); soapModel.setDtCompilazione(model.getDtCompilazione());
soapModel.setStatus(model.getStatus()); soapModel.setStatus(model.getStatus());
soapModel.setNoteRichiedente(model.getNoteRichiedente());
return soapModel; return soapModel;
} }
@ -227,6 +228,14 @@ public class ParereGeologoSoap implements Serializable {
_status = status; _status = status;
} }
public String getNoteRichiedente() {
return _noteRichiedente;
}
public void setNoteRichiedente(String noteRichiedente) {
_noteRichiedente = noteRichiedente;
}
private String _uuid; private String _uuid;
private long _parereGeologoId; private long _parereGeologoId;
private long _companyId; private long _companyId;
@ -243,4 +252,5 @@ public class ParereGeologoSoap implements Serializable {
private Date _dtRichista; private Date _dtRichista;
private Date _dtCompilazione; private Date _dtCompilazione;
private int _status; private int _status;
private String _noteRichiedente;
} }

27
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("dtRichista", getDtRichista());
attributes.put("dtCompilazione", getDtCompilazione()); attributes.put("dtCompilazione", getDtCompilazione());
attributes.put("status", getStatus()); attributes.put("status", getStatus());
attributes.put("noteRichiedente", getNoteRichiedente());
return attributes; return attributes;
} }
@ -168,6 +169,12 @@ public class ParereGeologoWrapper implements ParereGeologo,
if (status != null) { if (status != null) {
setStatus(status); 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); _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 @Override
public boolean isNew() { public boolean isNew() {
return _parereGeologo.isNew(); return _parereGeologo.isNew();

1
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( public it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo(
long geologoUserId, long intPraticaId, long dettPraticaId, long geologoUserId, long intPraticaId, long dettPraticaId,
java.lang.String noteRichiedente,
com.liferay.portal.service.ServiceContext serviceContext) com.liferay.portal.service.ServiceContext serviceContext)
throws com.liferay.portal.kernel.exception.PortalException, throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException; com.liferay.portal.kernel.exception.SystemException;

5
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"; _methodName23 = "addParereGeologo";
_methodParameterTypes23 = new String[] { _methodParameterTypes23 = new String[] {
"long", "long", "long", "long", "long", "long", "java.lang.String",
"com.liferay.portal.service.ServiceContext" "com.liferay.portal.service.ServiceContext"
}; };
@ -891,6 +891,7 @@ public class ParereGeologoLocalServiceClp implements ParereGeologoLocalService {
@Override @Override
public it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo( public it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo(
long geologoUserId, long intPraticaId, long dettPraticaId, long geologoUserId, long intPraticaId, long dettPraticaId,
java.lang.String noteRichiedente,
com.liferay.portal.service.ServiceContext serviceContext) com.liferay.portal.service.ServiceContext serviceContext)
throws com.liferay.portal.kernel.exception.PortalException, throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException { com.liferay.portal.kernel.exception.SystemException {
@ -906,6 +907,8 @@ public class ParereGeologoLocalServiceClp implements ParereGeologoLocalService {
dettPraticaId, dettPraticaId,
ClpSerializer.translateInput(noteRichiedente),
ClpSerializer.translateInput(serviceContext) ClpSerializer.translateInput(serviceContext)
}); });
} }

3
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( public static it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo(
long geologoUserId, long intPraticaId, long dettPraticaId, long geologoUserId, long intPraticaId, long dettPraticaId,
java.lang.String noteRichiedente,
com.liferay.portal.service.ServiceContext serviceContext) com.liferay.portal.service.ServiceContext serviceContext)
throws com.liferay.portal.kernel.exception.PortalException, throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException { com.liferay.portal.kernel.exception.SystemException {
return getService() return getService()
.addParereGeologo(geologoUserId, intPraticaId, .addParereGeologo(geologoUserId, intPraticaId,
dettPraticaId, serviceContext); dettPraticaId, noteRichiedente, serviceContext);
} }
public static it.tref.liferay.portos.bo.model.ParereGeologo updateParereGeologo( public static it.tref.liferay.portos.bo.model.ParereGeologo updateParereGeologo(

3
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 @Override
public it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo( public it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo(
long geologoUserId, long intPraticaId, long dettPraticaId, long geologoUserId, long intPraticaId, long dettPraticaId,
java.lang.String noteRichiedente,
com.liferay.portal.service.ServiceContext serviceContext) com.liferay.portal.service.ServiceContext serviceContext)
throws com.liferay.portal.kernel.exception.PortalException, throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException { com.liferay.portal.kernel.exception.SystemException {
return _parereGeologoLocalService.addParereGeologo(geologoUserId, return _parereGeologoLocalService.addParereGeologo(geologoUserId,
intPraticaId, dettPraticaId, serviceContext); intPraticaId, dettPraticaId, noteRichiedente, serviceContext);
} }
@Override @Override

1
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( public it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo(
long geologoUserId, long intPraticaId, long dettPraticaId, long geologoUserId, long intPraticaId, long dettPraticaId,
java.lang.String noteRichiedente,
com.liferay.portal.service.ServiceContext serviceContext) com.liferay.portal.service.ServiceContext serviceContext)
throws com.liferay.portal.kernel.exception.PortalException, throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException; com.liferay.portal.kernel.exception.SystemException;

5
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"; _methodName3 = "addParereGeologo";
_methodParameterTypes3 = new String[] { _methodParameterTypes3 = new String[] {
"long", "long", "long", "long", "long", "long", "java.lang.String",
"com.liferay.portal.service.ServiceContext" "com.liferay.portal.service.ServiceContext"
}; };
@ -130,6 +130,7 @@ public class ParereGeologoServiceClp implements ParereGeologoService {
@Override @Override
public it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo( public it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo(
long geologoUserId, long intPraticaId, long dettPraticaId, long geologoUserId, long intPraticaId, long dettPraticaId,
java.lang.String noteRichiedente,
com.liferay.portal.service.ServiceContext serviceContext) com.liferay.portal.service.ServiceContext serviceContext)
throws com.liferay.portal.kernel.exception.PortalException, throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException { com.liferay.portal.kernel.exception.SystemException {
@ -145,6 +146,8 @@ public class ParereGeologoServiceClp implements ParereGeologoService {
dettPraticaId, dettPraticaId,
ClpSerializer.translateInput(noteRichiedente),
ClpSerializer.translateInput(serviceContext) ClpSerializer.translateInput(serviceContext)
}); });
} }

3
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( public static it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo(
long geologoUserId, long intPraticaId, long dettPraticaId, long geologoUserId, long intPraticaId, long dettPraticaId,
java.lang.String noteRichiedente,
com.liferay.portal.service.ServiceContext serviceContext) com.liferay.portal.service.ServiceContext serviceContext)
throws com.liferay.portal.kernel.exception.PortalException, throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException { com.liferay.portal.kernel.exception.SystemException {
return getService() return getService()
.addParereGeologo(geologoUserId, intPraticaId, .addParereGeologo(geologoUserId, intPraticaId,
dettPraticaId, serviceContext); dettPraticaId, noteRichiedente, serviceContext);
} }
public static it.tref.liferay.portos.bo.model.ParereGeologo updateParereGeologo( public static it.tref.liferay.portos.bo.model.ParereGeologo updateParereGeologo(

3
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 @Override
public it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo( public it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo(
long geologoUserId, long intPraticaId, long dettPraticaId, long geologoUserId, long intPraticaId, long dettPraticaId,
java.lang.String noteRichiedente,
com.liferay.portal.service.ServiceContext serviceContext) com.liferay.portal.service.ServiceContext serviceContext)
throws com.liferay.portal.kernel.exception.PortalException, throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException { com.liferay.portal.kernel.exception.SystemException {
return _parereGeologoService.addParereGeologo(geologoUserId, return _parereGeologoService.addParereGeologo(geologoUserId,
intPraticaId, dettPraticaId, serviceContext); intPraticaId, dettPraticaId, noteRichiedente, serviceContext);
} }
@Override @Override

8
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()) { /*if (dettPratica.getNormLavoriInProprio()) {
docObbligatori.add(TIPOLOGIA_ALLEGATO_A29); 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); docObbligatori.add(TIPOLOGIA_ALLEGATO_A10);
} }
if (richiestoA24(dettPratica)) { if (richiestoA24(dettPratica)) {

24
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) { if (direttoreLavoriNotRequired) {
soggettiRichiesti.remove(TipoSoggettoUtil.DIRETTORE_LAVORI); 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) { if (collaudatoreNotRequired) {
soggettiRichiesti.remove(TipoSoggettoUtil.COLLAUDATORE); 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) { if (dittaNotRequired) {
soggettiRichiesti.remove(TipoSoggettoUtil.DITTA); 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) { for (String soggetto : soggettiRichiesti) {
notCompleted.add("gc-soggetto-" + soggetto + "-principale-not-present"); notCompleted.add("gc-soggetto-" + soggetto + "-principale-not-present");
} }

3
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, fileEntryId LONG,
dtRichista DATE null, dtRichista DATE null,
dtCompilazione DATE null, dtCompilazione DATE null,
status INTEGER status INTEGER,
noteRichiedente STRING null
); );
create table portos_bo_Provincia ( create table portos_bo_Provincia (

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml

@ -664,6 +664,7 @@
<property name="dtRichista" type="org.hibernate.type.TimestampType" /> <property name="dtRichista" type="org.hibernate.type.TimestampType" />
<property name="dtCompilazione" type="org.hibernate.type.TimestampType" /> <property name="dtCompilazione" type="org.hibernate.type.TimestampType" />
<property name="status" type="com.liferay.portal.dao.orm.hibernate.IntegerType" /> <property name="status" type="com.liferay.portal.dao.orm.hibernate.IntegerType" />
<property name="noteRichiedente" type="com.liferay.portal.dao.orm.hibernate.StringType" />
</class> </class>
<class name="it.tref.liferay.portos.bo.model.impl.ProvinciaImpl" table="portos_bo_Provincia"> <class name="it.tref.liferay.portos.bo.model.impl.ProvinciaImpl" table="portos_bo_Provincia">
<cache usage="read-write" /> <cache usage="read-write" />

3
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml

@ -715,6 +715,9 @@
<field name="dtRichista" type="Date" /> <field name="dtRichista" type="Date" />
<field name="dtCompilazione" type="Date" /> <field name="dtCompilazione" type="Date" />
<field name="status" type="int" /> <field name="status" type="int" />
<field name="noteRichiedente" type="String">
<hint name="max-length">4000</hint>
</field>
</model> </model>
<model name="it.tref.liferay.portos.bo.model.Provincia"> <model name="it.tref.liferay.portos.bo.model.Provincia">
<field name="provinciaId" type="long" /> <field name="provinciaId" type="long" />

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml

@ -857,6 +857,7 @@
<temporal>TIMESTAMP</temporal> <temporal>TIMESTAMP</temporal>
</basic> </basic>
<basic name="status" /> <basic name="status" />
<basic name="noteRichiedente" />
<transient name="geologoUserUuid" /> <transient name="geologoUserUuid" />
<transient name="modelAttributes" /> <transient name="modelAttributes" />
<transient name="primaryKey" /> <transient name="primaryKey" />

19
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; package it.tref.liferay.portos.bo.model.impl;
import it.tref.liferay.portos.bo.model.IntPratica; 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.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 it.tref.liferay.portos.bo.util.AzioniPraticheUtil;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.LinkedHashMap;
import java.util.Locale; import java.util.Locale;
import java.util.Map;
import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.exception.SystemException;
@ -53,6 +58,20 @@ public class DettPraticaImpl extends DettPraticaBaseImpl {
public DettPraticaImpl() { public DettPraticaImpl() {
} }
public Map<String, String> getTipologieSoggetto(){
Map<String, String> 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 @Override
public String getTitle(Locale locale) { public String getTitle(Locale locale) {

4
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: case Constants.PROCEDURA_Q7:
return Constants.LIEVE_ENTITA; return Constants.LIEVE_ENTITA;
case Constants.PROCEDURA_P8: //case Constants.PROCEDURA_P8:
case Constants.PROCEDURA_P9: case Constants.PROCEDURA_P9:
case Constants.PROCEDURA_Q8: //case Constants.PROCEDURA_Q8:
case Constants.PROCEDURA_Q9: case Constants.PROCEDURA_Q9:
return Constants.SANATORIE; return Constants.SANATORIE;

20
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<ParereGeologo>,
Externalizable { Externalizable {
@Override @Override
public String toString() { public String toString() {
StringBundler sb = new StringBundler(33); StringBundler sb = new StringBundler(35);
sb.append("{uuid="); sb.append("{uuid=");
sb.append(uuid); sb.append(uuid);
@ -72,6 +72,8 @@ public class ParereGeologoCacheModel implements CacheModel<ParereGeologo>,
sb.append(dtCompilazione); sb.append(dtCompilazione);
sb.append(", status="); sb.append(", status=");
sb.append(status); sb.append(status);
sb.append(", noteRichiedente=");
sb.append(noteRichiedente);
sb.append("}"); sb.append("}");
return sb.toString(); return sb.toString();
@ -143,6 +145,13 @@ public class ParereGeologoCacheModel implements CacheModel<ParereGeologo>,
parereGeologoImpl.setStatus(status); parereGeologoImpl.setStatus(status);
if (noteRichiedente == null) {
parereGeologoImpl.setNoteRichiedente(StringPool.BLANK);
}
else {
parereGeologoImpl.setNoteRichiedente(noteRichiedente);
}
parereGeologoImpl.resetOriginalValues(); parereGeologoImpl.resetOriginalValues();
return parereGeologoImpl; return parereGeologoImpl;
@ -166,6 +175,7 @@ public class ParereGeologoCacheModel implements CacheModel<ParereGeologo>,
dtRichista = objectInput.readLong(); dtRichista = objectInput.readLong();
dtCompilazione = objectInput.readLong(); dtCompilazione = objectInput.readLong();
status = objectInput.readInt(); status = objectInput.readInt();
noteRichiedente = objectInput.readUTF();
} }
@Override @Override
@ -207,6 +217,13 @@ public class ParereGeologoCacheModel implements CacheModel<ParereGeologo>,
objectOutput.writeLong(dtRichista); objectOutput.writeLong(dtRichista);
objectOutput.writeLong(dtCompilazione); objectOutput.writeLong(dtCompilazione);
objectOutput.writeInt(status); objectOutput.writeInt(status);
if (noteRichiedente == null) {
objectOutput.writeUTF(StringPool.BLANK);
}
else {
objectOutput.writeUTF(noteRichiedente);
}
} }
public String uuid; public String uuid;
@ -225,4 +242,5 @@ public class ParereGeologoCacheModel implements CacheModel<ParereGeologo>,
public long dtRichista; public long dtRichista;
public long dtCompilazione; public long dtCompilazione;
public int status; public int status;
public String noteRichiedente;
} }

49
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<ParereGeologo>
{ "fileEntryId", Types.BIGINT }, { "fileEntryId", Types.BIGINT },
{ "dtRichista", Types.TIMESTAMP }, { "dtRichista", Types.TIMESTAMP },
{ "dtCompilazione", 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 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_JPQL = " ORDER BY parereGeologo.parereGeologoId ASC";
public static final String ORDER_BY_SQL = " ORDER BY portos_bo_ParereGeo.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<ParereGeologo>
model.setDtRichista(soapModel.getDtRichista()); model.setDtRichista(soapModel.getDtRichista());
model.setDtCompilazione(soapModel.getDtCompilazione()); model.setDtCompilazione(soapModel.getDtCompilazione());
model.setStatus(soapModel.getStatus()); model.setStatus(soapModel.getStatus());
model.setNoteRichiedente(soapModel.getNoteRichiedente());
return model; return model;
} }
@ -217,6 +219,7 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
attributes.put("dtRichista", getDtRichista()); attributes.put("dtRichista", getDtRichista());
attributes.put("dtCompilazione", getDtCompilazione()); attributes.put("dtCompilazione", getDtCompilazione());
attributes.put("status", getStatus()); attributes.put("status", getStatus());
attributes.put("noteRichiedente", getNoteRichiedente());
return attributes; return attributes;
} }
@ -318,6 +321,12 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
if (status != null) { if (status != null) {
setStatus(status); setStatus(status);
} }
String noteRichiedente = (String)attributes.get("noteRichiedente");
if (noteRichiedente != null) {
setNoteRichiedente(noteRichiedente);
}
} }
@JSON @JSON
@ -598,6 +607,22 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
_status = status; _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 @Override
public StagedModelType getStagedModelType() { public StagedModelType getStagedModelType() {
return new StagedModelType(PortalUtil.getClassNameId( return new StagedModelType(PortalUtil.getClassNameId(
@ -651,6 +676,7 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
parereGeologoImpl.setDtRichista(getDtRichista()); parereGeologoImpl.setDtRichista(getDtRichista());
parereGeologoImpl.setDtCompilazione(getDtCompilazione()); parereGeologoImpl.setDtCompilazione(getDtCompilazione());
parereGeologoImpl.setStatus(getStatus()); parereGeologoImpl.setStatus(getStatus());
parereGeologoImpl.setNoteRichiedente(getNoteRichiedente());
parereGeologoImpl.resetOriginalValues(); parereGeologoImpl.resetOriginalValues();
@ -808,12 +834,20 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
parereGeologoCacheModel.status = getStatus(); parereGeologoCacheModel.status = getStatus();
parereGeologoCacheModel.noteRichiedente = getNoteRichiedente();
String noteRichiedente = parereGeologoCacheModel.noteRichiedente;
if ((noteRichiedente != null) && (noteRichiedente.length() == 0)) {
parereGeologoCacheModel.noteRichiedente = null;
}
return parereGeologoCacheModel; return parereGeologoCacheModel;
} }
@Override @Override
public String toString() { public String toString() {
StringBundler sb = new StringBundler(33); StringBundler sb = new StringBundler(35);
sb.append("{uuid="); sb.append("{uuid=");
sb.append(getUuid()); sb.append(getUuid());
@ -847,6 +881,8 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
sb.append(getDtCompilazione()); sb.append(getDtCompilazione());
sb.append(", status="); sb.append(", status=");
sb.append(getStatus()); sb.append(getStatus());
sb.append(", noteRichiedente=");
sb.append(getNoteRichiedente());
sb.append("}"); sb.append("}");
return sb.toString(); return sb.toString();
@ -854,7 +890,7 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
@Override @Override
public String toXmlString() { public String toXmlString() {
StringBundler sb = new StringBundler(52); StringBundler sb = new StringBundler(55);
sb.append("<model><model-name>"); sb.append("<model><model-name>");
sb.append("it.tref.liferay.portos.bo.model.ParereGeologo"); sb.append("it.tref.liferay.portos.bo.model.ParereGeologo");
@ -924,6 +960,10 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
"<column><column-name>status</column-name><column-value><![CDATA["); "<column><column-name>status</column-name><column-value><![CDATA[");
sb.append(getStatus()); sb.append(getStatus());
sb.append("]]></column-value></column>"); sb.append("]]></column-value></column>");
sb.append(
"<column><column-name>noteRichiedente</column-name><column-value><![CDATA[");
sb.append(getNoteRichiedente());
sb.append("]]></column-value></column>");
sb.append("</model>"); sb.append("</model>");
@ -962,6 +1002,7 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
private Date _dtRichista; private Date _dtRichista;
private Date _dtCompilazione; private Date _dtCompilazione;
private int _status; private int _status;
private String _noteRichiedente;
private long _columnBitmask; private long _columnBitmask;
private ParereGeologo _escapedModel; private ParereGeologo _escapedModel;
} }

3
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 geologoId = ParamUtil.getLong(actionRequest, "geologoId");
long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId"); long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId");
long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId"); long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId");
String noteRichiedente = ParamUtil.getString(actionRequest, "noteRichiedente");
try { try {
ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest);
serviceContext.setCreateDate(new Date()); serviceContext.setCreateDate(new Date());
serviceContext.setModifiedDate(new Date()); serviceContext.setModifiedDate(new Date());
ParereGeologoServiceUtil.addParereGeologo(geologoId, intPraticaId, dettPraticaId, serviceContext); ParereGeologoServiceUtil.addParereGeologo(geologoId, intPraticaId, dettPraticaId, noteRichiedente, serviceContext);
} catch (PortalException | SystemException e) { } catch (PortalException | SystemException e) {
_log.error("error-workflow-sospeso", e); _log.error("error-workflow-sospeso", e);
SessionErrors.add(actionRequest, "error-aggiunta-richiesta-parere"); SessionErrors.add(actionRequest, "error-aggiunta-richiesta-parere");

3
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 geologoId = ParamUtil.getLong(actionRequest, "geologoId");
long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId"); long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId");
long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId"); long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId");
String noteRichiedente = ParamUtil.getString(actionRequest, "noteRichiedente");
try { try {
ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest);
serviceContext.setCreateDate(new Date()); serviceContext.setCreateDate(new Date());
serviceContext.setModifiedDate(new Date()); serviceContext.setModifiedDate(new Date());
ParereGeologo parereGeologo = ParereGeologoServiceUtil.addParereGeologo(geologoId, intPraticaId, ParereGeologo parereGeologo = ParereGeologoServiceUtil.addParereGeologo(geologoId, intPraticaId,
dettPraticaId, serviceContext); dettPraticaId, noteRichiedente, serviceContext);
// ADT: aggiunta notifica geologo // ADT: aggiunta notifica geologo
MailUtil.invioNotificaGeologo(parereGeologo, serviceContext); MailUtil.invioNotificaGeologo(parereGeologo, serviceContext);
} catch (PortalException | SystemException e) { } catch (PortalException | SystemException e) {

5
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"; _methodName178 = "addParereGeologo";
_methodParameterTypes178 = new String[] { _methodParameterTypes178 = new String[] {
"long", "long", "long", "long", "long", "long", "java.lang.String",
"com.liferay.portal.service.ServiceContext" "com.liferay.portal.service.ServiceContext"
}; };
@ -353,7 +353,8 @@ public class ParereGeologoLocalServiceClpInvoker {
return ParereGeologoLocalServiceUtil.addParereGeologo(((Long)arguments[0]).longValue(), return ParereGeologoLocalServiceUtil.addParereGeologo(((Long)arguments[0]).longValue(),
((Long)arguments[1]).longValue(), ((Long)arguments[1]).longValue(),
((Long)arguments[2]).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) && if (_methodName179.equals(name) &&

5
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"; _methodName158 = "addParereGeologo";
_methodParameterTypes158 = new String[] { _methodParameterTypes158 = new String[] {
"long", "long", "long", "long", "long", "long", "java.lang.String",
"com.liferay.portal.service.ServiceContext" "com.liferay.portal.service.ServiceContext"
}; };
@ -96,7 +96,8 @@ public class ParereGeologoServiceClpInvoker {
return ParereGeologoServiceUtil.addParereGeologo(((Long)arguments[0]).longValue(), return ParereGeologoServiceUtil.addParereGeologo(((Long)arguments[0]).longValue(),
((Long)arguments[1]).longValue(), ((Long)arguments[1]).longValue(),
((Long)arguments[2]).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) && if (_methodName159.equals(name) &&

3
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 class ParereGeologoServiceSoap {
public static it.tref.liferay.portos.bo.model.ParereGeologoSoap addParereGeologo( public static it.tref.liferay.portos.bo.model.ParereGeologoSoap addParereGeologo(
long geologoUserId, long intPraticaId, long dettPraticaId, long geologoUserId, long intPraticaId, long dettPraticaId,
java.lang.String noteRichiedente,
com.liferay.portal.service.ServiceContext serviceContext) com.liferay.portal.service.ServiceContext serviceContext)
throws RemoteException { throws RemoteException {
try { try {
it.tref.liferay.portos.bo.model.ParereGeologo returnValue = ParereGeologoServiceUtil.addParereGeologo(geologoUserId, 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); return it.tref.liferay.portos.bo.model.ParereGeologoSoap.toSoapModel(returnValue);
} }

3
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 @Override
public ParereGeologo addParereGeologo(long geologoUserId, long intPraticaId, long dettPraticaId, 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()); long parereGeologoId = counterLocalService.increment(ParereGeologo.class.getName());
ParereGeologo parereGeologo = parereGeologoPersistence.create(parereGeologoId); ParereGeologo parereGeologo = parereGeologoPersistence.create(parereGeologoId);
@ -87,6 +87,7 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase
parereGeologo.setDettPraticaId(dettPraticaId); parereGeologo.setDettPraticaId(dettPraticaId);
parereGeologo.setGeologoUserId(geologoUserId); parereGeologo.setGeologoUserId(geologoUserId);
parereGeologo.setDtRichista(new Date()); parereGeologo.setDtRichista(new Date());
parereGeologo.setNoteRichiedente(noteRichiedente);
return parereGeologoPersistence.update(parereGeologo); return parereGeologoPersistence.update(parereGeologo);
} }

4
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 @Override
public ParereGeologo addParereGeologo(long geologoUserId, long intPraticaId, long dettPraticaId, 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); IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
IntPraticaPermission.check(getPermissionChecker(), territorio.getGroupId(), ActionKeys.RICHIEDI_PARERE_GEOLOGO); 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 @Override

1
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<ParereGeol
parereGeologoImpl.setDtRichista(parereGeologo.getDtRichista()); parereGeologoImpl.setDtRichista(parereGeologo.getDtRichista());
parereGeologoImpl.setDtCompilazione(parereGeologo.getDtCompilazione()); parereGeologoImpl.setDtCompilazione(parereGeologo.getDtCompilazione());
parereGeologoImpl.setStatus(parereGeologo.getStatus()); parereGeologoImpl.setStatus(parereGeologo.getStatus());
parereGeologoImpl.setNoteRichiedente(parereGeologo.getNoteRichiedente());
return parereGeologoImpl; return parereGeologoImpl;
} }

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

@ -13,8 +13,8 @@
## ##
build.namespace=portos_bo build.namespace=portos_bo
build.number=3236 build.number=3247
build.date=1627573954688 build.date=1627641893090
build.auto.upgrade=true build.auto.upgrade=true
## ##

3
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_seleziona_geologo.jsp

@ -47,6 +47,9 @@ for (ParereGeologo parereGeologo : pareriGeologo) {
} }
%> %>
</aui:select> </aui:select>
<br />
<aui:input name="noteRichiedente" label="Note" type="textarea" />
</div> </div>
<liferay-util:include page="/html/common/submit_window.jsp" servletContext="<%= application %>"> <liferay-util:include page="/html/common/submit_window.jsp" servletContext="<%= application %>">
<liferay-util:param name="formName" value="<%= formNameSelezionaGeologo %>" /> <liferay-util:param name="formName" value="<%= formNameSelezionaGeologo %>" />

4
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/css/main.css

@ -48,3 +48,7 @@ label{
font-weight: bold; font-weight: bold;
margin-bottom: 8px; margin-bottom: 8px;
} }
.hideSection {
display:none !important;
}

59
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()); && TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equals(dettPratica.getTipoIntegrazione());
boolean isDisabled = disabledInput && !enabledByIntegrazione; boolean isDisabled = disabledInput && !enabledByIntegrazione;
boolean isNewVariante = ParamUtil.getBoolean(request, "isNewVariante"); boolean isNewVariante = ParamUtil.getBoolean(request, "isNewVariante");
boolean disableViarch = !dettPratica.getLavoriPubblici() && !dettPratica.getIntervFinPub();
String urlIframeMappe = MappeUtil.getUrlFe(request, dettPratica, comune, (disabledInput || isGeoEditable)); 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" : "");
%> %>
<liferay-util:include page="/html/fascicolofe/navigator/header.jsp" servletContext="<%= application %>"> <liferay-util:include page="/html/fascicolofe/navigator/header.jsp" servletContext="<%= application %>">
<liferay-util:param name="disabledInput" value="<%= String.valueOf(disabledInput) %>" /> <liferay-util:param name="disabledInput" value="<%= String.valueOf(disabledInput) %>" />
@ -61,7 +69,7 @@ String urlIframeMappe = MappeUtil.getUrlFe(request, dettPratica, comune, (disabl
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="dett-principali"> <liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="dett-principali">
<div class="container-fluid"> <div class="container-fluid">
<div class="col-sm-12 col-md-12"> <div class="col-sm-12 col-md-12">
<div class="module-group group_dati_catastali"> <div class="module-group group_dati_catastali <%= hide1 %> <%= hide8 %> <%= hide10 %>">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" <liferay-ui:panel extended="false" defaultState="open" collapsible="false"
title="Normativa"> title="Normativa">
<div class="row"> <div class="row">
@ -97,6 +105,7 @@ String urlIframeMappe = MappeUtil.getUrlFe(request, dettPratica, comune, (disabl
</div> </div>
</div> </div>
</c:if> </c:if>
<div class="<%= hide9 %>">
<c:if test="<%= (intPratica.getTipoRichiesta() == Constants.LIEVE_ENTITA) %>"> <c:if test="<%= (intPratica.getTipoRichiesta() == Constants.LIEVE_ENTITA) %>">
<aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" type="text" name="interventoVoceP7" style="display:inline-block;width:80px;" label="intervento-voce-p7" /> <aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" type="text" name="interventoVoceP7" style="display:inline-block;width:80px;" label="intervento-voce-p7" />
</c:if> </c:if>
@ -117,14 +126,14 @@ String urlIframeMappe = MappeUtil.getUrlFe(request, dettPratica, comune, (disabl
<aui:input type="textarea" name="intervFinPubDesc" disabled="<%=!dettPratica.getIntervFinPub() || disabledInput %>" label=""></aui:input> <aui:input type="textarea" name="intervFinPubDesc" disabled="<%=!dettPratica.getIntervFinPub() || disabledInput %>" label=""></aui:input>
</div> </div>
</div> </div>
<div class="row row-padding-custom altro_check"> <div class="row row-padding-custom altro_check excludeOther <%= hide3 %>" data-cont="viarch">
<div class="col-md-12 col-lg-12"> <div class="col-md-12 col-lg-12">
<h4><%= LanguageUtil.get(pageContext, "interv-no-viarch") %></h4> <h4><%= LanguageUtil.get(pageContext, "interv-no-viarch") %></h4>
</div> </div>
<div class="col-md-12 col-lg-12" style="margin-left:20px;"> <div class="col-md-12 col-lg-12" style="margin-left:20px;">
<aui:input disabled="<%= disabledInput %>" name="intervInAreaDiInteresse" label="interv-in-area-di-interesse"/> <aui:input disabled="<%= disabledInput || disableViarch %>" name="intervInAreaDiInteresse" label="interv-in-area-di-interesse"/>
<aui:input disabled="<%= disabledInput %>" name="intervNonModificante" label="interv-non-modificante"/> <aui:input disabled="<%= disabledInput || disableViarch%>" name="intervNonModificante" label="interv-non-modificante"/>
<aui:input disabled="<%= disabledInput %>" name="intervNonAssoggettabile" label="interv-non-assoggettabile"/> <aui:input disabled="<%= disabledInput || disableViarch %>" name="intervNonAssoggettabile" label="interv-non-assoggettabile"/>
</div> </div>
</div> </div>
<div class="row row-padding-custom "> <div class="row row-padding-custom ">
@ -146,7 +155,7 @@ String urlIframeMappe = MappeUtil.getUrlFe(request, dettPratica, comune, (disabl
label="estremi-prat-com"/> label="estremi-prat-com"/>
</div> </div>
</div> </div>
<div class="excludeOther" data-cont="impresa">
<div class="row row-padding-custom "> <div class="row row-padding-custom ">
<div class="col-xs-12"> <div class="col-xs-12">
<aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>" <aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>"
@ -154,6 +163,7 @@ String urlIframeMappe = MappeUtil.getUrlFe(request, dettPratica, comune, (disabl
label="norm-lavori-in-proprio"/> label="norm-lavori-in-proprio"/>
</div> </div>
</div> </div>
<div class="row row-padding-custom "> <div class="row row-padding-custom ">
<div class="col-xs-12"> <div class="col-xs-12">
<aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>" <aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>"
@ -161,6 +171,8 @@ String urlIframeMappe = MappeUtil.getUrlFe(request, dettPratica, comune, (disabl
label="nomina-impresa"/> label="nomina-impresa"/>
</div> </div>
</div> </div>
</div>
<div class="excludeOther" data-cont="direttore_lavori">
<div class="row row-padding-custom "> <div class="row row-padding-custom ">
<div class="col-xs-12"> <div class="col-xs-12">
<aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>" <aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>"
@ -168,6 +180,8 @@ String urlIframeMappe = MappeUtil.getUrlFe(request, dettPratica, comune, (disabl
label="norm-lavori-no-direttore"/> label="norm-lavori-no-direttore"/>
</div> </div>
</div> </div>
<div class="row row-padding-custom "> <div class="row row-padding-custom ">
<div class="col-xs-12"> <div class="col-xs-12">
<aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>" <aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>"
@ -175,6 +189,8 @@ String urlIframeMappe = MappeUtil.getUrlFe(request, dettPratica, comune, (disabl
label="nomina-direttore-lavori"/> label="nomina-direttore-lavori"/>
</div> </div>
</div> </div>
</div>
<div class="excludeOther" data-cont="collaudo">
<div class="row row-padding-custom "> <div class="row row-padding-custom ">
<div class="col-xs-12"> <div class="col-xs-12">
<aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="noCollaudo" <aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="noCollaudo"
@ -182,6 +198,7 @@ String urlIframeMappe = MappeUtil.getUrlFe(request, dettPratica, comune, (disabl
</div> </div>
</div> </div>
<div class="row row-padding-custom "> <div class="row row-padding-custom ">
<div class="col-xs-12"> <div class="col-xs-12">
<aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="collaudoStatico" <aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="collaudoStatico"
@ -196,9 +213,7 @@ String urlIframeMappe = MappeUtil.getUrlFe(request, dettPratica, comune, (disabl
label="nomina-collaudatore"/> label="nomina-collaudatore"/>
</div> </div>
</div> </div>
</div>
<div class="row row-padding-custom" style="display:none;"> <div class="row row-padding-custom" style="display:none;">
<div class="col-xs-1 col-sm-1 col-md-1 col-lg-1"> <div class="col-xs-1 col-sm-1 col-md-1 col-lg-1">
@ -229,6 +244,7 @@ String urlIframeMappe = MappeUtil.getUrlFe(request, dettPratica, comune, (disabl
</div> </div>
</div> </div>
</div> </div>
</div>
</liferay-ui:panel> </liferay-ui:panel>
</div> </div>
</div> </div>
@ -296,7 +312,7 @@ function messageListener(event) {
<aui:row> <aui:row>
<div class="col-xs-12 col-md-6"> <div class="col-xs-12 col-md-6">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row <%= hide10 %>">
<div class="col-xs-12"> <div class="col-xs-12">
<aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>" name="descLongIntervento" <aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>" name="descLongIntervento"
label="desc-long-intervento"/> label="desc-long-intervento"/>
@ -328,7 +344,7 @@ function messageListener(event) {
disabled="<%= true %>" onClick="localize(true)" value="Localizza"/> disabled="<%= true %>" onClick="localize(true)" value="Localizza"/>
</div> </div>
</div> </div>
<div class="row"> <div class="row <%= hide1 %>">
<% <%
String[] geolocalization = BeanParamUtil.getString(dettPratica, request, "localizzazioneGeografica","").split(Pattern.quote("|")); String[] geolocalization = BeanParamUtil.getString(dettPratica, request, "localizzazioneGeografica","").split(Pattern.quote("|"));
%> %>
@ -352,7 +368,7 @@ function messageListener(event) {
</div> </div>
<div class="col-xs-12 col-md-6"> <div class="col-xs-12 col-md-6">
<div class="container-fluid"> <div class="container-fluid">
<div class="row" style="margin-bottom:20px;"> <div class="row <%= hide1 %>" style="margin-bottom:20px;">
<div class="col-xs-12"> <div class="col-xs-12">
<aui:input disabled="<%= isDisabled %>" type="text" name="estremiCatastali" id="input_estremiCatastali" <aui:input disabled="<%= isDisabled %>" type="text" name="estremiCatastali" id="input_estremiCatastali"
label="estremi-catastali"/> label="estremi-catastali"/>
@ -405,8 +421,8 @@ function messageListener(event) {
</div> </div>
</div>--> </div>-->
<div class="col-sm-12 col-md-12"> <div class="col-sm-12 col-md-12 ">
<div class="module-group group_dati_catastali"> <div class="module-group group_dati_catastali <%= hide1 %> <%= hide10 %>">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" <liferay-ui:panel extended="false" defaultState="open" collapsible="false"
title="destinazione" id="destinazioneinazione"> title="destinazione" id="destinazioneinazione">
<div class="container-fluid"> <div class="container-fluid">
@ -534,7 +550,7 @@ function messageListener(event) {
</div> </div>
</div> </div>
<div class="col-sm-12 col-md-12"> <div class="col-sm-12 col-md-12">
<div class="module-group group_dp_sc_nr"> <div class="module-group group_dp_sc_nr <%= hide1 %> <%= hide10 %>">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" <liferay-ui:panel extended="false" defaultState="open" collapsible="false"
title="dp-sc-ti" id="sistemi_costruttivi"> title="dp-sc-ti" id="sistemi_costruttivi">
<div class="container-fluid" style="padding: 0;"> <div class="container-fluid" style="padding: 0;">
@ -553,7 +569,7 @@ function messageListener(event) {
<li> <li>
<aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="tcManutOrdStraord" label="tc-manut-ord-straord" id="tc-manut-ord-straord"/> <aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="tcManutOrdStraord" label="tc-manut-ord-straord" id="tc-manut-ord-straord"/>
</li> </li>
<li> <li class="<%= hide8 %> <%= hide9 %>">
<aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="tcNoOpereEscavazione" label="tc-no-opere-escavazione" id="tc-no-opere-escavazione"/> <aui:input disabled="<%= disabledInput && !enabledByIntegrazione %>" name="tcNoOpereEscavazione" label="tc-no-opere-escavazione" id="tc-no-opere-escavazione"/>
</li> </li>
</ul> </ul>
@ -575,7 +591,7 @@ function messageListener(event) {
</div> </div>
</div> </div>
<div class="col-sm-12 col-md-12"> <div class="col-sm-12 col-md-12">
<div class="module-group group_dati_catastali de__tipologia-costruttiva"> <div class="module-group group_dati_catastali de__tipologia-costruttiva <%= hide1 %> <%= hide10 %>">
<liferay-ui:panel extended="false" defaultState="open" collapsible="false" <liferay-ui:panel extended="false" defaultState="open" collapsible="false"
title="dp-sc-tc"> title="dp-sc-tc">
<div class="container-fluid desc_edificio-tipologia"> <div class="container-fluid desc_edificio-tipologia">
@ -854,14 +870,23 @@ $('#<portlet:namespace/>lavoriPubbliciCheckbox, #<portlet:namespace/>intervFinPu
$.each(toDisable, function(index, val) { $.each(toDisable, function(index, val) {
$('#<portlet:namespace/>'+val+'Checkbox').attr('disabled', true).prop('disabled', true).prop('checked', false); $('#<portlet:namespace/>'+val+'Checkbox').attr('disabled', true).prop('disabled', true).prop('checked', false);
}); });
$('.excludeOther[data-cont="viarch"] input[type="checkbox"]').removeAttr('disabled');
$('.excludeOther[data-cont="viarch"] input[type="checkbox"]').prop('disabled', false);
} else { } else {
$.each(toDisable, function(index, val) { $.each(toDisable, function(index, val) {
$('#<portlet:namespace/>'+val+'Checkbox').removeAttr('disabled'); $('#<portlet:namespace/>'+val+'Checkbox').removeAttr('disabled');
$('#<portlet:namespace/>'+val+'Checkbox').prop('disabled', false); $('#<portlet:namespace/>'+val+'Checkbox').prop('disabled', false);
}); });
$('.excludeOther[data-cont="viarch"] input[type="checkbox"]').attr('disabled', true).prop('disabled', true).prop('checked', false);
} }
}); });
$('.excludeOther input[type="checkbox"]').change(function (e) {
var cont = $(this).parents('.excludeOther').data('cont');
$('.excludeOther[data-cont="'+cont+'"] input[type="checkbox"]').not(this).prop('checked', false).removeAttr('checked');
});
$('#<portlet:namespace/>intervFinPubCheckbox').change(function () { $('#<portlet:namespace/>intervFinPubCheckbox').change(function () {
var _this = $(this); var _this = $(this);
if (_this.is(":checked")) { if (_this.is(":checked")) {

4
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/edit_soggetto.jsp

@ -208,7 +208,7 @@ boolean inBO = ParamUtil.getBoolean(request, "inBO");
<aui:select disabled="true" name="tipologiaSoggetto"> <aui:select disabled="true" name="tipologiaSoggetto">
<aui:option value="00" selected="<%= soggetto == null %>">Tipologia</aui:option> <aui:option value="00" selected="<%= soggetto == null %>">Tipologia</aui:option>
<% <%
for (String tipo : SoggettoLocalServiceUtil.getTipologieSoggetti().keySet()) { for (String tipo : dettPratica.getTipologieSoggetto().keySet()) {
%> %>
<aui:option label='<%= "gc-soggetto-" + tipo %>' value="<%= tipo %>" <aui:option label='<%= "gc-soggetto-" + tipo %>' value="<%= tipo %>"
selected="<%= soggetto != null && soggetto.getTipologiaSoggetto() selected="<%= soggetto != null && soggetto.getTipologiaSoggetto()
@ -227,7 +227,7 @@ boolean inBO = ParamUtil.getBoolean(request, "inBO");
name="tipologiaSoggetto"> name="tipologiaSoggetto">
<aui:option value="00" selected="<%= soggetto == null %>">Tipologia</aui:option> <aui:option value="00" selected="<%= soggetto == null %>">Tipologia</aui:option>
<% <%
for (String tipo : SoggettoLocalServiceUtil.getTipologieSoggetti().keySet()) { for (String tipo : dettPratica.getTipologieSoggetto().keySet()) {
%> %>
<c:if test="<%= AzioniPraticheUtil.canAddSoggetto(intPraticaId, tipo) %>"> <c:if test="<%= AzioniPraticheUtil.canAddSoggetto(intPraticaId, tipo) %>">
<aui:option label='<%= "gc-soggetto-" + tipo %>' value="<%= tipo %>" <aui:option label='<%= "gc-soggetto-" + tipo %>' value="<%= tipo %>"

Caricamento…
Annulla
Salva