Cambio branch

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

@@ -95,12 +95,15 @@
 	<entity name="ParereGeologo" local-service="true" remote-service="true" uuid="true" table="portos_bo_ParereGeo">
 		<column name="parereGeologoId" type="long" primary="true" />
 		<column name="companyId" type="long" />
+		<column name="unitaOperativa" type="int" />
 		<column name="userId" type="long" />
 		<column name="userName" type="String" />
 		<column name="createDate" type="Date" />
 		<column name="modifiedDate" type="Date" />
 		<column name="groupId" type="long" />
 		<column name="geologoUserId" type="long" />
+		<column name="assegnatoreUserId" type="long" />
+		<column name="dtAssegnazione" type="Date" />
 		<column name="parere" type="String" />
 		<column name="intPraticaId" type="long" />
 		<column name="dettPraticaId" type="long" />
@@ -112,7 +115,10 @@
 		<column name="dtAnnullamento" type="Date" />
 		<column name="userIdAnnullamento" type="long" />
 		<column name="noteAnnullamento" type="String" />
-		
+		<column name="approvatoreUserId" type="long" />
+		<column name="dtApprovazione" type="Date" />
+		<column name="noteApprovatore" type="String" />
+
 		<order>
 			<order-column name="createDate" order-by="asc" />
 		</order>
@@ -120,7 +126,7 @@
 		<finder return-type="Collection" name="IntPraticaId">
 			<finder-column name="intPraticaId" />
 		</finder>
-		
+
 		<finder return-type="Collection" name="IntPraticaId_DtCompilazione_DtAnnullamento">
 			<finder-column name="intPraticaId" />
 			<finder-column name="dtCompilazione" />
@@ -137,6 +143,24 @@
 			<finder-column name="companyId" />
 			<finder-column name="groupId" />
 		</finder>
+		
+		<finder return-type="Collection" name="Group_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento">
+			<finder-column name="groupId" arrayable-operator="IN" />
+			<finder-column name="unitaOperativa" arrayable-operator="IN" />
+			<finder-column name="geologoUserId" />
+			<finder-column name="assegnatoreUserId" arrayable-operator="IN" />
+			<finder-column name="dtCompilazione" />
+			<finder-column name="dtAnnullamento" />
+		</finder>
+		
+		<finder return-type="Collection" name="Group_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione">
+			<finder-column name="groupId" arrayable-operator="IN" />
+			<finder-column name="unitaOperativa" arrayable-operator="IN" />
+			<finder-column name="assegnatoreUserId" arrayable-operator="IN" />
+			<finder-column name="dtCompilazione" comparator="!=" />
+			<finder-column name="dtAnnullamento" comparator="!=" />
+			<finder-column name="dtApprovazione" />
+		</finder>
 
 		<reference package-path="com.liferay.portlet.documentlibrary" entity="DLApp" />
 	</entity>

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

@@ -162,6 +162,10 @@ public interface IntPratica extends IntPraticaModel, PersistedModel {
 	public java.util.List<it.tref.liferay.portos.bo.model.Soggetto> getGeologi()
 		throws com.liferay.portal.kernel.exception.SystemException;
 
+	public java.util.Map<java.lang.String, com.liferay.portal.model.User> getGeologiPerParere()
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException;
+
 	public boolean hasAnnullaDelega(long userId)
 		throws com.liferay.portal.kernel.exception.PortalException,
 			com.liferay.portal.kernel.exception.SystemException;

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

@@ -1938,6 +1938,26 @@ public class IntPraticaClp extends BaseModelImpl<IntPratica>
 		}
 	}
 
+	@Override
+	public java.util.Map<java.lang.String, com.liferay.portal.model.User> getGeologiPerParere() {
+		try {
+			String methodName = "getGeologiPerParere";
+
+			Class<?>[] parameterTypes = new Class<?>[] {  };
+
+			Object[] parameterValues = new Object[] {  };
+
+			java.util.Map<java.lang.String, com.liferay.portal.model.User> returnObj =
+				(java.util.Map<java.lang.String, com.liferay.portal.model.User>)invokeOnRemoteModel(methodName,
+					parameterTypes, parameterValues);
+
+			return returnObj;
+		}
+		catch (Exception e) {
+			throw new UnsupportedOperationException(e);
+		}
+	}
+
 	@Override
 	public boolean canAddSoggetto(java.lang.String tipoSoggetto) {
 		try {

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

@@ -1490,6 +1490,13 @@ public class IntPraticaWrapper implements IntPratica, ModelWrapper<IntPratica> {
 		return _intPratica.getGeologi();
 	}
 
+	@Override
+	public java.util.Map<java.lang.String, com.liferay.portal.model.User> getGeologiPerParere()
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		return _intPratica.getGeologiPerParere();
+	}
+
 	@Override
 	public boolean hasAnnullaDelega(long userId)
 		throws com.liferay.portal.kernel.exception.PortalException,

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

@@ -31,4 +31,10 @@ public interface ParereGeologo extends ParereGeologoModel, PersistedModel {
 	 *
 	 * Never modify this interface directly. Add methods to {@link it.tref.liferay.portos.bo.model.impl.ParereGeologoImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
 	 */
+	public java.util.Set<com.liferay.portal.model.User> getIstruttori()
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException;
+
+	public void invioNotifica(
+		com.liferay.portal.service.ServiceContext serviceContext);
 }

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

@@ -80,12 +80,15 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
 		attributes.put("uuid", getUuid());
 		attributes.put("parereGeologoId", getParereGeologoId());
 		attributes.put("companyId", getCompanyId());
+		attributes.put("unitaOperativa", getUnitaOperativa());
 		attributes.put("userId", getUserId());
 		attributes.put("userName", getUserName());
 		attributes.put("createDate", getCreateDate());
 		attributes.put("modifiedDate", getModifiedDate());
 		attributes.put("groupId", getGroupId());
 		attributes.put("geologoUserId", getGeologoUserId());
+		attributes.put("assegnatoreUserId", getAssegnatoreUserId());
+		attributes.put("dtAssegnazione", getDtAssegnazione());
 		attributes.put("parere", getParere());
 		attributes.put("intPraticaId", getIntPraticaId());
 		attributes.put("dettPraticaId", getDettPraticaId());
@@ -97,6 +100,9 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
 		attributes.put("dtAnnullamento", getDtAnnullamento());
 		attributes.put("userIdAnnullamento", getUserIdAnnullamento());
 		attributes.put("noteAnnullamento", getNoteAnnullamento());
+		attributes.put("approvatoreUserId", getApprovatoreUserId());
+		attributes.put("dtApprovazione", getDtApprovazione());
+		attributes.put("noteApprovatore", getNoteApprovatore());
 
 		return attributes;
 	}
@@ -121,6 +127,12 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
 			setCompanyId(companyId);
 		}
 
+		Integer unitaOperativa = (Integer)attributes.get("unitaOperativa");
+
+		if (unitaOperativa != null) {
+			setUnitaOperativa(unitaOperativa);
+		}
+
 		Long userId = (Long)attributes.get("userId");
 
 		if (userId != null) {
@@ -157,6 +169,18 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
 			setGeologoUserId(geologoUserId);
 		}
 
+		Long assegnatoreUserId = (Long)attributes.get("assegnatoreUserId");
+
+		if (assegnatoreUserId != null) {
+			setAssegnatoreUserId(assegnatoreUserId);
+		}
+
+		Date dtAssegnazione = (Date)attributes.get("dtAssegnazione");
+
+		if (dtAssegnazione != null) {
+			setDtAssegnazione(dtAssegnazione);
+		}
+
 		String parere = (String)attributes.get("parere");
 
 		if (parere != null) {
@@ -222,6 +246,24 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
 		if (noteAnnullamento != null) {
 			setNoteAnnullamento(noteAnnullamento);
 		}
+
+		Long approvatoreUserId = (Long)attributes.get("approvatoreUserId");
+
+		if (approvatoreUserId != null) {
+			setApprovatoreUserId(approvatoreUserId);
+		}
+
+		Date dtApprovazione = (Date)attributes.get("dtApprovazione");
+
+		if (dtApprovazione != null) {
+			setDtApprovazione(dtApprovazione);
+		}
+
+		String noteApprovatore = (String)attributes.get("noteApprovatore");
+
+		if (noteApprovatore != null) {
+			setNoteApprovatore(noteApprovatore);
+		}
 	}
 
 	@Override
@@ -293,6 +335,29 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
 		}
 	}
 
+	@Override
+	public int getUnitaOperativa() {
+		return _unitaOperativa;
+	}
+
+	@Override
+	public void setUnitaOperativa(int unitaOperativa) {
+		_unitaOperativa = unitaOperativa;
+
+		if (_parereGeologoRemoteModel != null) {
+			try {
+				Class<?> clazz = _parereGeologoRemoteModel.getClass();
+
+				Method method = clazz.getMethod("setUnitaOperativa", int.class);
+
+				method.invoke(_parereGeologoRemoteModel, unitaOperativa);
+			}
+			catch (Exception e) {
+				throw new UnsupportedOperationException(e);
+			}
+		}
+	}
+
 	@Override
 	public long getUserId() {
 		return _userId;
@@ -452,6 +517,64 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
 		_geologoUserUuid = geologoUserUuid;
 	}
 
+	@Override
+	public long getAssegnatoreUserId() {
+		return _assegnatoreUserId;
+	}
+
+	@Override
+	public void setAssegnatoreUserId(long assegnatoreUserId) {
+		_assegnatoreUserId = assegnatoreUserId;
+
+		if (_parereGeologoRemoteModel != null) {
+			try {
+				Class<?> clazz = _parereGeologoRemoteModel.getClass();
+
+				Method method = clazz.getMethod("setAssegnatoreUserId",
+						long.class);
+
+				method.invoke(_parereGeologoRemoteModel, assegnatoreUserId);
+			}
+			catch (Exception e) {
+				throw new UnsupportedOperationException(e);
+			}
+		}
+	}
+
+	@Override
+	public String getAssegnatoreUserUuid() throws SystemException {
+		return PortalUtil.getUserValue(getAssegnatoreUserId(), "uuid",
+			_assegnatoreUserUuid);
+	}
+
+	@Override
+	public void setAssegnatoreUserUuid(String assegnatoreUserUuid) {
+		_assegnatoreUserUuid = assegnatoreUserUuid;
+	}
+
+	@Override
+	public Date getDtAssegnazione() {
+		return _dtAssegnazione;
+	}
+
+	@Override
+	public void setDtAssegnazione(Date dtAssegnazione) {
+		_dtAssegnazione = dtAssegnazione;
+
+		if (_parereGeologoRemoteModel != null) {
+			try {
+				Class<?> clazz = _parereGeologoRemoteModel.getClass();
+
+				Method method = clazz.getMethod("setDtAssegnazione", Date.class);
+
+				method.invoke(_parereGeologoRemoteModel, dtAssegnazione);
+			}
+			catch (Exception e) {
+				throw new UnsupportedOperationException(e);
+			}
+		}
+	}
+
 	@Override
 	public String getParere() {
 		return _parere;
@@ -708,6 +831,126 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
 		}
 	}
 
+	@Override
+	public long getApprovatoreUserId() {
+		return _approvatoreUserId;
+	}
+
+	@Override
+	public void setApprovatoreUserId(long approvatoreUserId) {
+		_approvatoreUserId = approvatoreUserId;
+
+		if (_parereGeologoRemoteModel != null) {
+			try {
+				Class<?> clazz = _parereGeologoRemoteModel.getClass();
+
+				Method method = clazz.getMethod("setApprovatoreUserId",
+						long.class);
+
+				method.invoke(_parereGeologoRemoteModel, approvatoreUserId);
+			}
+			catch (Exception e) {
+				throw new UnsupportedOperationException(e);
+			}
+		}
+	}
+
+	@Override
+	public String getApprovatoreUserUuid() throws SystemException {
+		return PortalUtil.getUserValue(getApprovatoreUserId(), "uuid",
+			_approvatoreUserUuid);
+	}
+
+	@Override
+	public void setApprovatoreUserUuid(String approvatoreUserUuid) {
+		_approvatoreUserUuid = approvatoreUserUuid;
+	}
+
+	@Override
+	public Date getDtApprovazione() {
+		return _dtApprovazione;
+	}
+
+	@Override
+	public void setDtApprovazione(Date dtApprovazione) {
+		_dtApprovazione = dtApprovazione;
+
+		if (_parereGeologoRemoteModel != null) {
+			try {
+				Class<?> clazz = _parereGeologoRemoteModel.getClass();
+
+				Method method = clazz.getMethod("setDtApprovazione", Date.class);
+
+				method.invoke(_parereGeologoRemoteModel, dtApprovazione);
+			}
+			catch (Exception e) {
+				throw new UnsupportedOperationException(e);
+			}
+		}
+	}
+
+	@Override
+	public String getNoteApprovatore() {
+		return _noteApprovatore;
+	}
+
+	@Override
+	public void setNoteApprovatore(String noteApprovatore) {
+		_noteApprovatore = noteApprovatore;
+
+		if (_parereGeologoRemoteModel != null) {
+			try {
+				Class<?> clazz = _parereGeologoRemoteModel.getClass();
+
+				Method method = clazz.getMethod("setNoteApprovatore",
+						String.class);
+
+				method.invoke(_parereGeologoRemoteModel, noteApprovatore);
+			}
+			catch (Exception e) {
+				throw new UnsupportedOperationException(e);
+			}
+		}
+	}
+
+	@Override
+	public void invioNotifica(
+		com.liferay.portal.service.ServiceContext serviceContext) {
+		try {
+			String methodName = "invioNotifica";
+
+			Class<?>[] parameterTypes = new Class<?>[] {
+					com.liferay.portal.service.ServiceContext.class
+				};
+
+			Object[] parameterValues = new Object[] { serviceContext };
+
+			invokeOnRemoteModel(methodName, parameterTypes, parameterValues);
+		}
+		catch (Exception e) {
+			throw new UnsupportedOperationException(e);
+		}
+	}
+
+	@Override
+	public java.util.Set<com.liferay.portal.model.User> getIstruttori() {
+		try {
+			String methodName = "getIstruttori";
+
+			Class<?>[] parameterTypes = new Class<?>[] {  };
+
+			Object[] parameterValues = new Object[] {  };
+
+			java.util.Set<com.liferay.portal.model.User> returnObj = (java.util.Set<com.liferay.portal.model.User>)invokeOnRemoteModel(methodName,
+					parameterTypes, parameterValues);
+
+			return returnObj;
+		}
+		catch (Exception e) {
+			throw new UnsupportedOperationException(e);
+		}
+	}
+
 	@Override
 	public StagedModelType getStagedModelType() {
 		return new StagedModelType(PortalUtil.getClassNameId(
@@ -787,12 +1030,15 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
 		clone.setUuid(getUuid());
 		clone.setParereGeologoId(getParereGeologoId());
 		clone.setCompanyId(getCompanyId());
+		clone.setUnitaOperativa(getUnitaOperativa());
 		clone.setUserId(getUserId());
 		clone.setUserName(getUserName());
 		clone.setCreateDate(getCreateDate());
 		clone.setModifiedDate(getModifiedDate());
 		clone.setGroupId(getGroupId());
 		clone.setGeologoUserId(getGeologoUserId());
+		clone.setAssegnatoreUserId(getAssegnatoreUserId());
+		clone.setDtAssegnazione(getDtAssegnazione());
 		clone.setParere(getParere());
 		clone.setIntPraticaId(getIntPraticaId());
 		clone.setDettPraticaId(getDettPraticaId());
@@ -804,6 +1050,9 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
 		clone.setDtAnnullamento(getDtAnnullamento());
 		clone.setUserIdAnnullamento(getUserIdAnnullamento());
 		clone.setNoteAnnullamento(getNoteAnnullamento());
+		clone.setApprovatoreUserId(getApprovatoreUserId());
+		clone.setDtApprovazione(getDtApprovazione());
+		clone.setNoteApprovatore(getNoteApprovatore());
 
 		return clone;
 	}
@@ -855,7 +1104,7 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
 
 	@Override
 	public String toString() {
-		StringBundler sb = new StringBundler(41);
+		StringBundler sb = new StringBundler(53);
 
 		sb.append("{uuid=");
 		sb.append(getUuid());
@@ -863,6 +1112,8 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
 		sb.append(getParereGeologoId());
 		sb.append(", companyId=");
 		sb.append(getCompanyId());
+		sb.append(", unitaOperativa=");
+		sb.append(getUnitaOperativa());
 		sb.append(", userId=");
 		sb.append(getUserId());
 		sb.append(", userName=");
@@ -875,6 +1126,10 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
 		sb.append(getGroupId());
 		sb.append(", geologoUserId=");
 		sb.append(getGeologoUserId());
+		sb.append(", assegnatoreUserId=");
+		sb.append(getAssegnatoreUserId());
+		sb.append(", dtAssegnazione=");
+		sb.append(getDtAssegnazione());
 		sb.append(", parere=");
 		sb.append(getParere());
 		sb.append(", intPraticaId=");
@@ -897,6 +1152,12 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
 		sb.append(getUserIdAnnullamento());
 		sb.append(", noteAnnullamento=");
 		sb.append(getNoteAnnullamento());
+		sb.append(", approvatoreUserId=");
+		sb.append(getApprovatoreUserId());
+		sb.append(", dtApprovazione=");
+		sb.append(getDtApprovazione());
+		sb.append(", noteApprovatore=");
+		sb.append(getNoteApprovatore());
 		sb.append("}");
 
 		return sb.toString();
@@ -904,7 +1165,7 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
 
 	@Override
 	public String toXmlString() {
-		StringBundler sb = new StringBundler(64);
+		StringBundler sb = new StringBundler(82);
 
 		sb.append("<model><model-name>");
 		sb.append("it.tref.liferay.portos.bo.model.ParereGeologo");
@@ -922,6 +1183,10 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
 			"<column><column-name>companyId</column-name><column-value><![CDATA[");
 		sb.append(getCompanyId());
 		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>unitaOperativa</column-name><column-value><![CDATA[");
+		sb.append(getUnitaOperativa());
+		sb.append("]]></column-value></column>");
 		sb.append(
 			"<column><column-name>userId</column-name><column-value><![CDATA[");
 		sb.append(getUserId());
@@ -946,6 +1211,14 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
 			"<column><column-name>geologoUserId</column-name><column-value><![CDATA[");
 		sb.append(getGeologoUserId());
 		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>assegnatoreUserId</column-name><column-value><![CDATA[");
+		sb.append(getAssegnatoreUserId());
+		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>dtAssegnazione</column-name><column-value><![CDATA[");
+		sb.append(getDtAssegnazione());
+		sb.append("]]></column-value></column>");
 		sb.append(
 			"<column><column-name>parere</column-name><column-value><![CDATA[");
 		sb.append(getParere());
@@ -990,6 +1263,18 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
 			"<column><column-name>noteAnnullamento</column-name><column-value><![CDATA[");
 		sb.append(getNoteAnnullamento());
 		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>approvatoreUserId</column-name><column-value><![CDATA[");
+		sb.append(getApprovatoreUserId());
+		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>dtApprovazione</column-name><column-value><![CDATA[");
+		sb.append(getDtApprovazione());
+		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>noteApprovatore</column-name><column-value><![CDATA[");
+		sb.append(getNoteApprovatore());
+		sb.append("]]></column-value></column>");
 
 		sb.append("</model>");
 
@@ -999,6 +1284,7 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
 	private String _uuid;
 	private long _parereGeologoId;
 	private long _companyId;
+	private int _unitaOperativa;
 	private long _userId;
 	private String _userUuid;
 	private String _userName;
@@ -1007,6 +1293,9 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
 	private long _groupId;
 	private long _geologoUserId;
 	private String _geologoUserUuid;
+	private long _assegnatoreUserId;
+	private String _assegnatoreUserUuid;
+	private Date _dtAssegnazione;
 	private String _parere;
 	private long _intPraticaId;
 	private long _dettPraticaId;
@@ -1018,6 +1307,10 @@ public class ParereGeologoClp extends BaseModelImpl<ParereGeologo>
 	private Date _dtAnnullamento;
 	private long _userIdAnnullamento;
 	private String _noteAnnullamento;
+	private long _approvatoreUserId;
+	private String _approvatoreUserUuid;
+	private Date _dtApprovazione;
+	private String _noteApprovatore;
 	private BaseModel<?> _parereGeologoRemoteModel;
 	private Class<?> _clpSerializerClass = it.tref.liferay.portos.bo.service.ClpSerializer.class;
 }

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

@@ -109,6 +109,20 @@ public interface ParereGeologoModel extends BaseModel<ParereGeologo>,
 	@Override
 	public void setCompanyId(long companyId);
 
+	/**
+	 * Returns the unita operativa of this parere geologo.
+	 *
+	 * @return the unita operativa of this parere geologo
+	 */
+	public int getUnitaOperativa();
+
+	/**
+	 * Sets the unita operativa of this parere geologo.
+	 *
+	 * @param unitaOperativa the unita operativa of this parere geologo
+	 */
+	public void setUnitaOperativa(int unitaOperativa);
+
 	/**
 	 * Returns the user ID of this parere geologo.
 	 *
@@ -236,6 +250,49 @@ public interface ParereGeologoModel extends BaseModel<ParereGeologo>,
 	 */
 	public void setGeologoUserUuid(String geologoUserUuid);
 
+	/**
+	 * Returns the assegnatore user ID of this parere geologo.
+	 *
+	 * @return the assegnatore user ID of this parere geologo
+	 */
+	public long getAssegnatoreUserId();
+
+	/**
+	 * Sets the assegnatore user ID of this parere geologo.
+	 *
+	 * @param assegnatoreUserId the assegnatore user ID of this parere geologo
+	 */
+	public void setAssegnatoreUserId(long assegnatoreUserId);
+
+	/**
+	 * Returns the assegnatore user uuid of this parere geologo.
+	 *
+	 * @return the assegnatore user uuid of this parere geologo
+	 * @throws SystemException if a system exception occurred
+	 */
+	public String getAssegnatoreUserUuid() throws SystemException;
+
+	/**
+	 * Sets the assegnatore user uuid of this parere geologo.
+	 *
+	 * @param assegnatoreUserUuid the assegnatore user uuid of this parere geologo
+	 */
+	public void setAssegnatoreUserUuid(String assegnatoreUserUuid);
+
+	/**
+	 * Returns the dt assegnazione of this parere geologo.
+	 *
+	 * @return the dt assegnazione of this parere geologo
+	 */
+	public Date getDtAssegnazione();
+
+	/**
+	 * Sets the dt assegnazione of this parere geologo.
+	 *
+	 * @param dtAssegnazione the dt assegnazione of this parere geologo
+	 */
+	public void setDtAssegnazione(Date dtAssegnazione);
+
 	/**
 	 * Returns the parere of this parere geologo.
 	 *
@@ -393,6 +450,64 @@ public interface ParereGeologoModel extends BaseModel<ParereGeologo>,
 	 */
 	public void setNoteAnnullamento(String noteAnnullamento);
 
+	/**
+	 * Returns the approvatore user ID of this parere geologo.
+	 *
+	 * @return the approvatore user ID of this parere geologo
+	 */
+	public long getApprovatoreUserId();
+
+	/**
+	 * Sets the approvatore user ID of this parere geologo.
+	 *
+	 * @param approvatoreUserId the approvatore user ID of this parere geologo
+	 */
+	public void setApprovatoreUserId(long approvatoreUserId);
+
+	/**
+	 * Returns the approvatore user uuid of this parere geologo.
+	 *
+	 * @return the approvatore user uuid of this parere geologo
+	 * @throws SystemException if a system exception occurred
+	 */
+	public String getApprovatoreUserUuid() throws SystemException;
+
+	/**
+	 * Sets the approvatore user uuid of this parere geologo.
+	 *
+	 * @param approvatoreUserUuid the approvatore user uuid of this parere geologo
+	 */
+	public void setApprovatoreUserUuid(String approvatoreUserUuid);
+
+	/**
+	 * Returns the dt approvazione of this parere geologo.
+	 *
+	 * @return the dt approvazione of this parere geologo
+	 */
+	public Date getDtApprovazione();
+
+	/**
+	 * Sets the dt approvazione of this parere geologo.
+	 *
+	 * @param dtApprovazione the dt approvazione of this parere geologo
+	 */
+	public void setDtApprovazione(Date dtApprovazione);
+
+	/**
+	 * Returns the note approvatore of this parere geologo.
+	 *
+	 * @return the note approvatore of this parere geologo
+	 */
+	@AutoEscape
+	public String getNoteApprovatore();
+
+	/**
+	 * Sets the note approvatore of this parere geologo.
+	 *
+	 * @param noteApprovatore the note approvatore of this parere geologo
+	 */
+	public void setNoteApprovatore(String noteApprovatore);
+
 	@Override
 	public boolean isNew();
 

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

@@ -34,12 +34,15 @@ public class ParereGeologoSoap implements Serializable {
 		soapModel.setUuid(model.getUuid());
 		soapModel.setParereGeologoId(model.getParereGeologoId());
 		soapModel.setCompanyId(model.getCompanyId());
+		soapModel.setUnitaOperativa(model.getUnitaOperativa());
 		soapModel.setUserId(model.getUserId());
 		soapModel.setUserName(model.getUserName());
 		soapModel.setCreateDate(model.getCreateDate());
 		soapModel.setModifiedDate(model.getModifiedDate());
 		soapModel.setGroupId(model.getGroupId());
 		soapModel.setGeologoUserId(model.getGeologoUserId());
+		soapModel.setAssegnatoreUserId(model.getAssegnatoreUserId());
+		soapModel.setDtAssegnazione(model.getDtAssegnazione());
 		soapModel.setParere(model.getParere());
 		soapModel.setIntPraticaId(model.getIntPraticaId());
 		soapModel.setDettPraticaId(model.getDettPraticaId());
@@ -51,6 +54,9 @@ public class ParereGeologoSoap implements Serializable {
 		soapModel.setDtAnnullamento(model.getDtAnnullamento());
 		soapModel.setUserIdAnnullamento(model.getUserIdAnnullamento());
 		soapModel.setNoteAnnullamento(model.getNoteAnnullamento());
+		soapModel.setApprovatoreUserId(model.getApprovatoreUserId());
+		soapModel.setDtApprovazione(model.getDtApprovazione());
+		soapModel.setNoteApprovatore(model.getNoteApprovatore());
 
 		return soapModel;
 	}
@@ -127,6 +133,14 @@ public class ParereGeologoSoap implements Serializable {
 		_companyId = companyId;
 	}
 
+	public int getUnitaOperativa() {
+		return _unitaOperativa;
+	}
+
+	public void setUnitaOperativa(int unitaOperativa) {
+		_unitaOperativa = unitaOperativa;
+	}
+
 	public long getUserId() {
 		return _userId;
 	}
@@ -175,6 +189,22 @@ public class ParereGeologoSoap implements Serializable {
 		_geologoUserId = geologoUserId;
 	}
 
+	public long getAssegnatoreUserId() {
+		return _assegnatoreUserId;
+	}
+
+	public void setAssegnatoreUserId(long assegnatoreUserId) {
+		_assegnatoreUserId = assegnatoreUserId;
+	}
+
+	public Date getDtAssegnazione() {
+		return _dtAssegnazione;
+	}
+
+	public void setDtAssegnazione(Date dtAssegnazione) {
+		_dtAssegnazione = dtAssegnazione;
+	}
+
 	public String getParere() {
 		return _parere;
 	}
@@ -263,15 +293,42 @@ public class ParereGeologoSoap implements Serializable {
 		_noteAnnullamento = noteAnnullamento;
 	}
 
+	public long getApprovatoreUserId() {
+		return _approvatoreUserId;
+	}
+
+	public void setApprovatoreUserId(long approvatoreUserId) {
+		_approvatoreUserId = approvatoreUserId;
+	}
+
+	public Date getDtApprovazione() {
+		return _dtApprovazione;
+	}
+
+	public void setDtApprovazione(Date dtApprovazione) {
+		_dtApprovazione = dtApprovazione;
+	}
+
+	public String getNoteApprovatore() {
+		return _noteApprovatore;
+	}
+
+	public void setNoteApprovatore(String noteApprovatore) {
+		_noteApprovatore = noteApprovatore;
+	}
+
 	private String _uuid;
 	private long _parereGeologoId;
 	private long _companyId;
+	private int _unitaOperativa;
 	private long _userId;
 	private String _userName;
 	private Date _createDate;
 	private Date _modifiedDate;
 	private long _groupId;
 	private long _geologoUserId;
+	private long _assegnatoreUserId;
+	private Date _dtAssegnazione;
 	private String _parere;
 	private long _intPraticaId;
 	private long _dettPraticaId;
@@ -283,4 +340,7 @@ public class ParereGeologoSoap implements Serializable {
 	private Date _dtAnnullamento;
 	private long _userIdAnnullamento;
 	private String _noteAnnullamento;
+	private long _approvatoreUserId;
+	private Date _dtApprovazione;
+	private String _noteApprovatore;
 }

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

@@ -54,12 +54,15 @@ public class ParereGeologoWrapper implements ParereGeologo,
 		attributes.put("uuid", getUuid());
 		attributes.put("parereGeologoId", getParereGeologoId());
 		attributes.put("companyId", getCompanyId());
+		attributes.put("unitaOperativa", getUnitaOperativa());
 		attributes.put("userId", getUserId());
 		attributes.put("userName", getUserName());
 		attributes.put("createDate", getCreateDate());
 		attributes.put("modifiedDate", getModifiedDate());
 		attributes.put("groupId", getGroupId());
 		attributes.put("geologoUserId", getGeologoUserId());
+		attributes.put("assegnatoreUserId", getAssegnatoreUserId());
+		attributes.put("dtAssegnazione", getDtAssegnazione());
 		attributes.put("parere", getParere());
 		attributes.put("intPraticaId", getIntPraticaId());
 		attributes.put("dettPraticaId", getDettPraticaId());
@@ -71,6 +74,9 @@ public class ParereGeologoWrapper implements ParereGeologo,
 		attributes.put("dtAnnullamento", getDtAnnullamento());
 		attributes.put("userIdAnnullamento", getUserIdAnnullamento());
 		attributes.put("noteAnnullamento", getNoteAnnullamento());
+		attributes.put("approvatoreUserId", getApprovatoreUserId());
+		attributes.put("dtApprovazione", getDtApprovazione());
+		attributes.put("noteApprovatore", getNoteApprovatore());
 
 		return attributes;
 	}
@@ -95,6 +101,12 @@ public class ParereGeologoWrapper implements ParereGeologo,
 			setCompanyId(companyId);
 		}
 
+		Integer unitaOperativa = (Integer)attributes.get("unitaOperativa");
+
+		if (unitaOperativa != null) {
+			setUnitaOperativa(unitaOperativa);
+		}
+
 		Long userId = (Long)attributes.get("userId");
 
 		if (userId != null) {
@@ -131,6 +143,18 @@ public class ParereGeologoWrapper implements ParereGeologo,
 			setGeologoUserId(geologoUserId);
 		}
 
+		Long assegnatoreUserId = (Long)attributes.get("assegnatoreUserId");
+
+		if (assegnatoreUserId != null) {
+			setAssegnatoreUserId(assegnatoreUserId);
+		}
+
+		Date dtAssegnazione = (Date)attributes.get("dtAssegnazione");
+
+		if (dtAssegnazione != null) {
+			setDtAssegnazione(dtAssegnazione);
+		}
+
 		String parere = (String)attributes.get("parere");
 
 		if (parere != null) {
@@ -196,6 +220,24 @@ public class ParereGeologoWrapper implements ParereGeologo,
 		if (noteAnnullamento != null) {
 			setNoteAnnullamento(noteAnnullamento);
 		}
+
+		Long approvatoreUserId = (Long)attributes.get("approvatoreUserId");
+
+		if (approvatoreUserId != null) {
+			setApprovatoreUserId(approvatoreUserId);
+		}
+
+		Date dtApprovazione = (Date)attributes.get("dtApprovazione");
+
+		if (dtApprovazione != null) {
+			setDtApprovazione(dtApprovazione);
+		}
+
+		String noteApprovatore = (String)attributes.get("noteApprovatore");
+
+		if (noteApprovatore != null) {
+			setNoteApprovatore(noteApprovatore);
+		}
 	}
 
 	/**
@@ -278,6 +320,26 @@ public class ParereGeologoWrapper implements ParereGeologo,
 		_parereGeologo.setCompanyId(companyId);
 	}
 
+	/**
+	* Returns the unita operativa of this parere geologo.
+	*
+	* @return the unita operativa of this parere geologo
+	*/
+	@Override
+	public int getUnitaOperativa() {
+		return _parereGeologo.getUnitaOperativa();
+	}
+
+	/**
+	* Sets the unita operativa of this parere geologo.
+	*
+	* @param unitaOperativa the unita operativa of this parere geologo
+	*/
+	@Override
+	public void setUnitaOperativa(int unitaOperativa) {
+		_parereGeologo.setUnitaOperativa(unitaOperativa);
+	}
+
 	/**
 	* Returns the user ID of this parere geologo.
 	*
@@ -442,6 +504,68 @@ public class ParereGeologoWrapper implements ParereGeologo,
 		_parereGeologo.setGeologoUserUuid(geologoUserUuid);
 	}
 
+	/**
+	* Returns the assegnatore user ID of this parere geologo.
+	*
+	* @return the assegnatore user ID of this parere geologo
+	*/
+	@Override
+	public long getAssegnatoreUserId() {
+		return _parereGeologo.getAssegnatoreUserId();
+	}
+
+	/**
+	* Sets the assegnatore user ID of this parere geologo.
+	*
+	* @param assegnatoreUserId the assegnatore user ID of this parere geologo
+	*/
+	@Override
+	public void setAssegnatoreUserId(long assegnatoreUserId) {
+		_parereGeologo.setAssegnatoreUserId(assegnatoreUserId);
+	}
+
+	/**
+	* Returns the assegnatore user uuid of this parere geologo.
+	*
+	* @return the assegnatore user uuid of this parere geologo
+	* @throws SystemException if a system exception occurred
+	*/
+	@Override
+	public java.lang.String getAssegnatoreUserUuid()
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return _parereGeologo.getAssegnatoreUserUuid();
+	}
+
+	/**
+	* Sets the assegnatore user uuid of this parere geologo.
+	*
+	* @param assegnatoreUserUuid the assegnatore user uuid of this parere geologo
+	*/
+	@Override
+	public void setAssegnatoreUserUuid(java.lang.String assegnatoreUserUuid) {
+		_parereGeologo.setAssegnatoreUserUuid(assegnatoreUserUuid);
+	}
+
+	/**
+	* Returns the dt assegnazione of this parere geologo.
+	*
+	* @return the dt assegnazione of this parere geologo
+	*/
+	@Override
+	public java.util.Date getDtAssegnazione() {
+		return _parereGeologo.getDtAssegnazione();
+	}
+
+	/**
+	* Sets the dt assegnazione of this parere geologo.
+	*
+	* @param dtAssegnazione the dt assegnazione of this parere geologo
+	*/
+	@Override
+	public void setDtAssegnazione(java.util.Date dtAssegnazione) {
+		_parereGeologo.setDtAssegnazione(dtAssegnazione);
+	}
+
 	/**
 	* Returns the parere of this parere geologo.
 	*
@@ -662,6 +786,88 @@ public class ParereGeologoWrapper implements ParereGeologo,
 		_parereGeologo.setNoteAnnullamento(noteAnnullamento);
 	}
 
+	/**
+	* Returns the approvatore user ID of this parere geologo.
+	*
+	* @return the approvatore user ID of this parere geologo
+	*/
+	@Override
+	public long getApprovatoreUserId() {
+		return _parereGeologo.getApprovatoreUserId();
+	}
+
+	/**
+	* Sets the approvatore user ID of this parere geologo.
+	*
+	* @param approvatoreUserId the approvatore user ID of this parere geologo
+	*/
+	@Override
+	public void setApprovatoreUserId(long approvatoreUserId) {
+		_parereGeologo.setApprovatoreUserId(approvatoreUserId);
+	}
+
+	/**
+	* Returns the approvatore user uuid of this parere geologo.
+	*
+	* @return the approvatore user uuid of this parere geologo
+	* @throws SystemException if a system exception occurred
+	*/
+	@Override
+	public java.lang.String getApprovatoreUserUuid()
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return _parereGeologo.getApprovatoreUserUuid();
+	}
+
+	/**
+	* Sets the approvatore user uuid of this parere geologo.
+	*
+	* @param approvatoreUserUuid the approvatore user uuid of this parere geologo
+	*/
+	@Override
+	public void setApprovatoreUserUuid(java.lang.String approvatoreUserUuid) {
+		_parereGeologo.setApprovatoreUserUuid(approvatoreUserUuid);
+	}
+
+	/**
+	* Returns the dt approvazione of this parere geologo.
+	*
+	* @return the dt approvazione of this parere geologo
+	*/
+	@Override
+	public java.util.Date getDtApprovazione() {
+		return _parereGeologo.getDtApprovazione();
+	}
+
+	/**
+	* Sets the dt approvazione of this parere geologo.
+	*
+	* @param dtApprovazione the dt approvazione of this parere geologo
+	*/
+	@Override
+	public void setDtApprovazione(java.util.Date dtApprovazione) {
+		_parereGeologo.setDtApprovazione(dtApprovazione);
+	}
+
+	/**
+	* Returns the note approvatore of this parere geologo.
+	*
+	* @return the note approvatore of this parere geologo
+	*/
+	@Override
+	public java.lang.String getNoteApprovatore() {
+		return _parereGeologo.getNoteApprovatore();
+	}
+
+	/**
+	* Sets the note approvatore of this parere geologo.
+	*
+	* @param noteApprovatore the note approvatore of this parere geologo
+	*/
+	@Override
+	public void setNoteApprovatore(java.lang.String noteApprovatore) {
+		_parereGeologo.setNoteApprovatore(noteApprovatore);
+	}
+
 	@Override
 	public boolean isNew() {
 		return _parereGeologo.isNew();
@@ -767,6 +973,19 @@ public class ParereGeologoWrapper implements ParereGeologo,
 		_parereGeologo.persist();
 	}
 
+	@Override
+	public java.util.Set<com.liferay.portal.model.User> getIstruttori()
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		return _parereGeologo.getIstruttori();
+	}
+
+	@Override
+	public void invioNotifica(
+		com.liferay.portal.service.ServiceContext serviceContext) {
+		_parereGeologo.invioNotifica(serviceContext);
+	}
+
 	@Override
 	public boolean equals(Object obj) {
 		if (this == obj) {

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

@@ -311,7 +311,7 @@ public interface ParereGeologoLocalService extends BaseLocalService,
 		throws java.lang.Throwable;
 
 	public it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo(
-		long geologoUserId, long intPraticaId, long dettPraticaId,
+		int unitaOperativa, long userId, long intPraticaId, long dettPraticaId,
 		java.lang.String noteRichiedente,
 		com.liferay.portal.service.ServiceContext serviceContext)
 		throws com.liferay.portal.kernel.exception.PortalException,
@@ -342,6 +342,20 @@ public interface ParereGeologoLocalService extends BaseLocalService,
 	public int countByIntPraticaInCorso(long intPraticaId)
 		throws com.liferay.portal.kernel.exception.SystemException;
 
+	public java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByUserDaApprovare(
+		com.liferay.portal.model.User user, int start, int end)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	public int countByUserDaApprovare(com.liferay.portal.model.User user)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	public java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByUserDaAssegnare(
+		com.liferay.portal.model.User user, int start, int end)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	public int countByUserDaAssegnare(com.liferay.portal.model.User user)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
 	public int countByGeologoIdInCorso(long geologoUserId)
 		throws com.liferay.portal.kernel.exception.SystemException;
 

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", "java.lang.String",
+				"int", "long", "long", "long", "java.lang.String",
 				"com.liferay.portal.service.ServiceContext"
 			};
 
@@ -167,29 +167,49 @@ public class ParereGeologoLocalServiceClp implements ParereGeologoLocalService {
 
 		_methodParameterTypes29 = new String[] { "long" };
 
-		_methodName30 = "countByGeologoIdInCorso";
+		_methodName30 = "findByUserDaApprovare";
 
-		_methodParameterTypes30 = new String[] { "long" };
+		_methodParameterTypes30 = new String[] {
+				"com.liferay.portal.model.User", "int", "int"
+			};
 
-		_methodName31 = "findByGeologoIdInCorso";
+		_methodName31 = "countByUserDaApprovare";
 
-		_methodParameterTypes31 = new String[] { "long", "int", "int" };
+		_methodParameterTypes31 = new String[] { "com.liferay.portal.model.User" };
 
-		_methodName32 = "findByCompanyIdGroupId";
+		_methodName32 = "findByUserDaAssegnare";
 
-		_methodParameterTypes32 = new String[] { "long", "long" };
+		_methodParameterTypes32 = new String[] {
+				"com.liferay.portal.model.User", "int", "int"
+			};
 
-		_methodName33 = "findWithParereByGeologoId";
+		_methodName33 = "countByUserDaAssegnare";
 
-		_methodParameterTypes33 = new String[] { "long", "int", "int" };
+		_methodParameterTypes33 = new String[] { "com.liferay.portal.model.User" };
 
-		_methodName34 = "countFindWithParereByGeologoId";
+		_methodName34 = "countByGeologoIdInCorso";
 
 		_methodParameterTypes34 = new String[] { "long" };
 
-		_methodName35 = "getCarichiLavoro";
+		_methodName35 = "findByGeologoIdInCorso";
+
+		_methodParameterTypes35 = new String[] { "long", "int", "int" };
+
+		_methodName36 = "findByCompanyIdGroupId";
+
+		_methodParameterTypes36 = new String[] { "long", "long" };
+
+		_methodName37 = "findWithParereByGeologoId";
+
+		_methodParameterTypes37 = new String[] { "long", "int", "int" };
+
+		_methodName38 = "countFindWithParereByGeologoId";
+
+		_methodParameterTypes38 = new String[] { "long" };
 
-		_methodParameterTypes35 = new String[] { "long", "int" };
+		_methodName39 = "getCarichiLavoro";
+
+		_methodParameterTypes39 = new String[] { "long", "int" };
 	}
 
 	@Override
@@ -874,7 +894,7 @@ public class ParereGeologoLocalServiceClp implements ParereGeologoLocalService {
 
 	@Override
 	public it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo(
-		long geologoUserId, long intPraticaId, long dettPraticaId,
+		int unitaOperativa, long userId, long intPraticaId, long dettPraticaId,
 		java.lang.String noteRichiedente,
 		com.liferay.portal.service.ServiceContext serviceContext)
 		throws com.liferay.portal.kernel.exception.PortalException,
@@ -885,7 +905,9 @@ public class ParereGeologoLocalServiceClp implements ParereGeologoLocalService {
 			returnObj = _invokableLocalService.invokeMethod(_methodName23,
 					_methodParameterTypes23,
 					new Object[] {
-						geologoUserId,
+						unitaOperativa,
+						
+					userId,
 						
 					intPraticaId,
 						
@@ -1113,13 +1135,131 @@ public class ParereGeologoLocalServiceClp implements ParereGeologoLocalService {
 	}
 
 	@Override
-	public int countByGeologoIdInCorso(long geologoUserId)
+	public java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByUserDaApprovare(
+		com.liferay.portal.model.User user, int start, int end)
 		throws com.liferay.portal.kernel.exception.SystemException {
 		Object returnObj = null;
 
 		try {
 			returnObj = _invokableLocalService.invokeMethod(_methodName30,
-					_methodParameterTypes30, new Object[] { geologoUserId });
+					_methodParameterTypes30,
+					new Object[] { ClpSerializer.translateInput(user), start, end });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
+				throw (com.liferay.portal.kernel.exception.SystemException)t;
+			}
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return (java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo>)ClpSerializer.translateOutput(returnObj);
+	}
+
+	@Override
+	public int countByUserDaApprovare(com.liferay.portal.model.User user)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName31,
+					_methodParameterTypes31,
+					new Object[] { ClpSerializer.translateInput(user) });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
+				throw (com.liferay.portal.kernel.exception.SystemException)t;
+			}
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return ((Integer)returnObj).intValue();
+	}
+
+	@Override
+	public java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByUserDaAssegnare(
+		com.liferay.portal.model.User user, int start, int end)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName32,
+					_methodParameterTypes32,
+					new Object[] { ClpSerializer.translateInput(user), start, end });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
+				throw (com.liferay.portal.kernel.exception.SystemException)t;
+			}
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return (java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo>)ClpSerializer.translateOutput(returnObj);
+	}
+
+	@Override
+	public int countByUserDaAssegnare(com.liferay.portal.model.User user)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName33,
+					_methodParameterTypes33,
+					new Object[] { ClpSerializer.translateInput(user) });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
+				throw (com.liferay.portal.kernel.exception.SystemException)t;
+			}
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return ((Integer)returnObj).intValue();
+	}
+
+	@Override
+	public int countByGeologoIdInCorso(long geologoUserId)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName34,
+					_methodParameterTypes34, new Object[] { geologoUserId });
 		}
 		catch (Throwable t) {
 			t = ClpSerializer.translateThrowable(t);
@@ -1147,8 +1287,8 @@ public class ParereGeologoLocalServiceClp implements ParereGeologoLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName31,
-					_methodParameterTypes31,
+			returnObj = _invokableLocalService.invokeMethod(_methodName35,
+					_methodParameterTypes35,
 					new Object[] { geologoUserId, start, end });
 		}
 		catch (Throwable t) {
@@ -1177,8 +1317,8 @@ public class ParereGeologoLocalServiceClp implements ParereGeologoLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName32,
-					_methodParameterTypes32, new Object[] { companyId, groupId });
+			returnObj = _invokableLocalService.invokeMethod(_methodName36,
+					_methodParameterTypes36, new Object[] { companyId, groupId });
 		}
 		catch (Throwable t) {
 			t = ClpSerializer.translateThrowable(t);
@@ -1206,8 +1346,8 @@ public class ParereGeologoLocalServiceClp implements ParereGeologoLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName33,
-					_methodParameterTypes33,
+			returnObj = _invokableLocalService.invokeMethod(_methodName37,
+					_methodParameterTypes37,
 					new Object[] { geologoUserId, start, end });
 		}
 		catch (Throwable t) {
@@ -1235,8 +1375,8 @@ public class ParereGeologoLocalServiceClp implements ParereGeologoLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName34,
-					_methodParameterTypes34, new Object[] { geologoUserId });
+			returnObj = _invokableLocalService.invokeMethod(_methodName38,
+					_methodParameterTypes38, new Object[] { geologoUserId });
 		}
 		catch (Throwable t) {
 			t = ClpSerializer.translateThrowable(t);
@@ -1265,8 +1405,8 @@ public class ParereGeologoLocalServiceClp implements ParereGeologoLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName35,
-					_methodParameterTypes35,
+			returnObj = _invokableLocalService.invokeMethod(_methodName39,
+					_methodParameterTypes39,
 					new Object[] { controlloPraticaId, giorni });
 		}
 		catch (Throwable t) {
@@ -1363,4 +1503,12 @@ public class ParereGeologoLocalServiceClp implements ParereGeologoLocalService {
 	private String[] _methodParameterTypes34;
 	private String _methodName35;
 	private String[] _methodParameterTypes35;
+	private String _methodName36;
+	private String[] _methodParameterTypes36;
+	private String _methodName37;
+	private String[] _methodParameterTypes37;
+	private String _methodName38;
+	private String[] _methodParameterTypes38;
+	private String _methodName39;
+	private String[] _methodParameterTypes39;
 }

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

@@ -336,13 +336,13 @@ public class ParereGeologoLocalServiceUtil {
 	}
 
 	public static it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo(
-		long geologoUserId, long intPraticaId, long dettPraticaId,
+		int unitaOperativa, long userId, 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,
+				   .addParereGeologo(unitaOperativa, userId, intPraticaId,
 			dettPraticaId, noteRichiedente, serviceContext);
 	}
 
@@ -385,6 +385,28 @@ public class ParereGeologoLocalServiceUtil {
 		return getService().countByIntPraticaInCorso(intPraticaId);
 	}
 
+	public static java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByUserDaApprovare(
+		com.liferay.portal.model.User user, int start, int end)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getService().findByUserDaApprovare(user, start, end);
+	}
+
+	public static int countByUserDaApprovare(com.liferay.portal.model.User user)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getService().countByUserDaApprovare(user);
+	}
+
+	public static java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByUserDaAssegnare(
+		com.liferay.portal.model.User user, int start, int end)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getService().findByUserDaAssegnare(user, start, end);
+	}
+
+	public static int countByUserDaAssegnare(com.liferay.portal.model.User user)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getService().countByUserDaAssegnare(user);
+	}
+
 	public static int countByGeologoIdInCorso(long geologoUserId)
 		throws com.liferay.portal.kernel.exception.SystemException {
 		return getService().countByGeologoIdInCorso(geologoUserId);

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

@@ -358,13 +358,13 @@ public class ParereGeologoLocalServiceWrapper
 
 	@Override
 	public it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo(
-		long geologoUserId, long intPraticaId, long dettPraticaId,
+		int unitaOperativa, long userId, 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, noteRichiedente, serviceContext);
+		return _parereGeologoLocalService.addParereGeologo(unitaOperativa,
+			userId, intPraticaId, dettPraticaId, noteRichiedente, serviceContext);
 	}
 
 	@Override
@@ -413,6 +413,32 @@ public class ParereGeologoLocalServiceWrapper
 		return _parereGeologoLocalService.countByIntPraticaInCorso(intPraticaId);
 	}
 
+	@Override
+	public java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByUserDaApprovare(
+		com.liferay.portal.model.User user, int start, int end)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return _parereGeologoLocalService.findByUserDaApprovare(user, start, end);
+	}
+
+	@Override
+	public int countByUserDaApprovare(com.liferay.portal.model.User user)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return _parereGeologoLocalService.countByUserDaApprovare(user);
+	}
+
+	@Override
+	public java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByUserDaAssegnare(
+		com.liferay.portal.model.User user, int start, int end)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return _parereGeologoLocalService.findByUserDaAssegnare(user, start, end);
+	}
+
+	@Override
+	public int countByUserDaAssegnare(com.liferay.portal.model.User user)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return _parereGeologoLocalService.countByUserDaAssegnare(user);
+	}
+
 	@Override
 	public int countByGeologoIdInCorso(long geologoUserId)
 		throws com.liferay.portal.kernel.exception.SystemException {

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

@@ -65,7 +65,7 @@ public interface ParereGeologoService extends BaseService, InvokableService {
 		throws java.lang.Throwable;
 
 	public it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo(
-		long geologoUserId, long intPraticaId, long dettPraticaId,
+		int unitaOperativa, long userId, long intPraticaId, long dettPraticaId,
 		java.lang.String noteRichiedente,
 		com.liferay.portal.service.ServiceContext serviceContext)
 		throws com.liferay.portal.kernel.exception.PortalException,

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", "java.lang.String",
+				"int", "long", "long", "long", "java.lang.String",
 				"com.liferay.portal.service.ServiceContext"
 			};
 
@@ -113,7 +113,7 @@ public class ParereGeologoServiceClp implements ParereGeologoService {
 
 	@Override
 	public it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo(
-		long geologoUserId, long intPraticaId, long dettPraticaId,
+		int unitaOperativa, long userId, long intPraticaId, long dettPraticaId,
 		java.lang.String noteRichiedente,
 		com.liferay.portal.service.ServiceContext serviceContext)
 		throws com.liferay.portal.kernel.exception.PortalException,
@@ -124,7 +124,9 @@ public class ParereGeologoServiceClp implements ParereGeologoService {
 			returnObj = _invokableService.invokeMethod(_methodName3,
 					_methodParameterTypes3,
 					new Object[] {
-						geologoUserId,
+						unitaOperativa,
+						
+					userId,
 						
 					intPraticaId,
 						

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

@@ -64,13 +64,13 @@ public class ParereGeologoServiceUtil {
 	}
 
 	public static it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo(
-		long geologoUserId, long intPraticaId, long dettPraticaId,
+		int unitaOperativa, long userId, 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,
+				   .addParereGeologo(unitaOperativa, userId, intPraticaId,
 			dettPraticaId, noteRichiedente, serviceContext);
 	}
 

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

@@ -60,12 +60,12 @@ public class ParereGeologoServiceWrapper implements ParereGeologoService,
 
 	@Override
 	public it.tref.liferay.portos.bo.model.ParereGeologo addParereGeologo(
-		long geologoUserId, long intPraticaId, long dettPraticaId,
+		int unitaOperativa, long userId, 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,
+		return _parereGeologoService.addParereGeologo(unitaOperativa, userId,
 			intPraticaId, dettPraticaId, noteRichiedente, serviceContext);
 	}
 

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

@@ -1012,6 +1012,606 @@ public interface ParereGeologoPersistence extends BasePersistence<ParereGeologo>
 	public int countByC_GroupId(long companyId, long groupId)
 		throws com.liferay.portal.kernel.exception.SystemException;
 
+	/**
+	* Returns all the parere geologos where groupId = &#63; and unitaOperativa = &#63; and geologoUserId = &#63; and assegnatoreUserId = &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @return the matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(
+		long groupId, int unitaOperativa, long geologoUserId,
+		long assegnatoreUserId, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns a range of all the parere geologos where groupId = &#63; and unitaOperativa = &#63; and geologoUserId = &#63; and assegnatoreUserId = &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param start the lower bound of the range of parere geologos
+	* @param end the upper bound of the range of parere geologos (not inclusive)
+	* @return the range of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(
+		long groupId, int unitaOperativa, long geologoUserId,
+		long assegnatoreUserId, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento, int start, int end)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns an ordered range of all the parere geologos where groupId = &#63; and unitaOperativa = &#63; and geologoUserId = &#63; and assegnatoreUserId = &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param start the lower bound of the range of parere geologos
+	* @param end the upper bound of the range of parere geologos (not inclusive)
+	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	* @return the ordered range of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(
+		long groupId, int unitaOperativa, long geologoUserId,
+		long assegnatoreUserId, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento, int start, int end,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns the first parere geologo in the ordered set where groupId = &#63; and unitaOperativa = &#63; and geologoUserId = &#63; and assegnatoreUserId = &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the first matching parere geologo
+	* @throws it.tref.liferay.portos.bo.NoSuchParereGeologoException if a matching parere geologo could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public it.tref.liferay.portos.bo.model.ParereGeologo findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento_First(
+		long groupId, int unitaOperativa, long geologoUserId,
+		long assegnatoreUserId, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.tref.liferay.portos.bo.NoSuchParereGeologoException;
+
+	/**
+	* Returns the first parere geologo in the ordered set where groupId = &#63; and unitaOperativa = &#63; and geologoUserId = &#63; and assegnatoreUserId = &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the first matching parere geologo, or <code>null</code> if a matching parere geologo could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public it.tref.liferay.portos.bo.model.ParereGeologo fetchByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento_First(
+		long groupId, int unitaOperativa, long geologoUserId,
+		long assegnatoreUserId, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns the last parere geologo in the ordered set where groupId = &#63; and unitaOperativa = &#63; and geologoUserId = &#63; and assegnatoreUserId = &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the last matching parere geologo
+	* @throws it.tref.liferay.portos.bo.NoSuchParereGeologoException if a matching parere geologo could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public it.tref.liferay.portos.bo.model.ParereGeologo findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento_Last(
+		long groupId, int unitaOperativa, long geologoUserId,
+		long assegnatoreUserId, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.tref.liferay.portos.bo.NoSuchParereGeologoException;
+
+	/**
+	* Returns the last parere geologo in the ordered set where groupId = &#63; and unitaOperativa = &#63; and geologoUserId = &#63; and assegnatoreUserId = &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the last matching parere geologo, or <code>null</code> if a matching parere geologo could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public it.tref.liferay.portos.bo.model.ParereGeologo fetchByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento_Last(
+		long groupId, int unitaOperativa, long geologoUserId,
+		long assegnatoreUserId, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns the parere geologos before and after the current parere geologo in the ordered set where groupId = &#63; and unitaOperativa = &#63; and geologoUserId = &#63; and assegnatoreUserId = &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* @param parereGeologoId the primary key of the current parere geologo
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the previous, current, and next parere geologo
+	* @throws it.tref.liferay.portos.bo.NoSuchParereGeologoException if a parere geologo with the primary key could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public it.tref.liferay.portos.bo.model.ParereGeologo[] findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento_PrevAndNext(
+		long parereGeologoId, long groupId, int unitaOperativa,
+		long geologoUserId, long assegnatoreUserId,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.tref.liferay.portos.bo.NoSuchParereGeologoException;
+
+	/**
+	* Returns all the parere geologos where groupId = any &#63; and unitaOperativa = any &#63; and geologoUserId = &#63; and assegnatoreUserId = any &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param groupIds the group IDs
+	* @param unitaOperativas the unita operativas
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserIds the assegnatore user IDs
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @return the matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(
+		long[] groupIds, int[] unitaOperativas, long geologoUserId,
+		long[] assegnatoreUserIds, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns a range of all the parere geologos where groupId = any &#63; and unitaOperativa = any &#63; and geologoUserId = &#63; and assegnatoreUserId = any &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param groupIds the group IDs
+	* @param unitaOperativas the unita operativas
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserIds the assegnatore user IDs
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param start the lower bound of the range of parere geologos
+	* @param end the upper bound of the range of parere geologos (not inclusive)
+	* @return the range of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(
+		long[] groupIds, int[] unitaOperativas, long geologoUserId,
+		long[] assegnatoreUserIds, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento, int start, int end)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns an ordered range of all the parere geologos where groupId = any &#63; and unitaOperativa = any &#63; and geologoUserId = &#63; and assegnatoreUserId = any &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param groupIds the group IDs
+	* @param unitaOperativas the unita operativas
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserIds the assegnatore user IDs
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param start the lower bound of the range of parere geologos
+	* @param end the upper bound of the range of parere geologos (not inclusive)
+	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	* @return the ordered range of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(
+		long[] groupIds, int[] unitaOperativas, long geologoUserId,
+		long[] assegnatoreUserIds, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento, int start, int end,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Removes all the parere geologos where groupId = &#63; and unitaOperativa = &#63; and geologoUserId = &#63; and assegnatoreUserId = &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63; from the database.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @throws SystemException if a system exception occurred
+	*/
+	public void removeByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(
+		long groupId, int unitaOperativa, long geologoUserId,
+		long assegnatoreUserId, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns the number of parere geologos where groupId = &#63; and unitaOperativa = &#63; and geologoUserId = &#63; and assegnatoreUserId = &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @return the number of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public int countByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(
+		long groupId, int unitaOperativa, long geologoUserId,
+		long assegnatoreUserId, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns the number of parere geologos where groupId = any &#63; and unitaOperativa = any &#63; and geologoUserId = &#63; and assegnatoreUserId = any &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* @param groupIds the group IDs
+	* @param unitaOperativas the unita operativas
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserIds the assegnatore user IDs
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @return the number of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public int countByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(
+		long[] groupIds, int[] unitaOperativas, long geologoUserId,
+		long[] assegnatoreUserIds, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns all the parere geologos where groupId = &#63; and unitaOperativa = &#63; and assegnatoreUserId = &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @return the matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(
+		long groupId, int unitaOperativa, long assegnatoreUserId,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns a range of all the parere geologos where groupId = &#63; and unitaOperativa = &#63; and assegnatoreUserId = &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @param start the lower bound of the range of parere geologos
+	* @param end the upper bound of the range of parere geologos (not inclusive)
+	* @return the range of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(
+		long groupId, int unitaOperativa, long assegnatoreUserId,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione, int start, int end)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns an ordered range of all the parere geologos where groupId = &#63; and unitaOperativa = &#63; and assegnatoreUserId = &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @param start the lower bound of the range of parere geologos
+	* @param end the upper bound of the range of parere geologos (not inclusive)
+	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	* @return the ordered range of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(
+		long groupId, int unitaOperativa, long assegnatoreUserId,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione, int start, int end,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns the first parere geologo in the ordered set where groupId = &#63; and unitaOperativa = &#63; and assegnatoreUserId = &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the first matching parere geologo
+	* @throws it.tref.liferay.portos.bo.NoSuchParereGeologoException if a matching parere geologo could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public it.tref.liferay.portos.bo.model.ParereGeologo findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione_First(
+		long groupId, int unitaOperativa, long assegnatoreUserId,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.tref.liferay.portos.bo.NoSuchParereGeologoException;
+
+	/**
+	* Returns the first parere geologo in the ordered set where groupId = &#63; and unitaOperativa = &#63; and assegnatoreUserId = &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the first matching parere geologo, or <code>null</code> if a matching parere geologo could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public it.tref.liferay.portos.bo.model.ParereGeologo fetchByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione_First(
+		long groupId, int unitaOperativa, long assegnatoreUserId,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns the last parere geologo in the ordered set where groupId = &#63; and unitaOperativa = &#63; and assegnatoreUserId = &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the last matching parere geologo
+	* @throws it.tref.liferay.portos.bo.NoSuchParereGeologoException if a matching parere geologo could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public it.tref.liferay.portos.bo.model.ParereGeologo findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione_Last(
+		long groupId, int unitaOperativa, long assegnatoreUserId,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.tref.liferay.portos.bo.NoSuchParereGeologoException;
+
+	/**
+	* Returns the last parere geologo in the ordered set where groupId = &#63; and unitaOperativa = &#63; and assegnatoreUserId = &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the last matching parere geologo, or <code>null</code> if a matching parere geologo could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public it.tref.liferay.portos.bo.model.ParereGeologo fetchByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione_Last(
+		long groupId, int unitaOperativa, long assegnatoreUserId,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns the parere geologos before and after the current parere geologo in the ordered set where groupId = &#63; and unitaOperativa = &#63; and assegnatoreUserId = &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* @param parereGeologoId the primary key of the current parere geologo
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the previous, current, and next parere geologo
+	* @throws it.tref.liferay.portos.bo.NoSuchParereGeologoException if a parere geologo with the primary key could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public it.tref.liferay.portos.bo.model.ParereGeologo[] findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione_PrevAndNext(
+		long parereGeologoId, long groupId, int unitaOperativa,
+		long assegnatoreUserId, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento, java.util.Date dtApprovazione,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.tref.liferay.portos.bo.NoSuchParereGeologoException;
+
+	/**
+	* Returns all the parere geologos where groupId = any &#63; and unitaOperativa = any &#63; and assegnatoreUserId = any &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param groupIds the group IDs
+	* @param unitaOperativas the unita operativas
+	* @param assegnatoreUserIds the assegnatore user IDs
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @return the matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(
+		long[] groupIds, int[] unitaOperativas, long[] assegnatoreUserIds,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns a range of all the parere geologos where groupId = any &#63; and unitaOperativa = any &#63; and assegnatoreUserId = any &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param groupIds the group IDs
+	* @param unitaOperativas the unita operativas
+	* @param assegnatoreUserIds the assegnatore user IDs
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @param start the lower bound of the range of parere geologos
+	* @param end the upper bound of the range of parere geologos (not inclusive)
+	* @return the range of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(
+		long[] groupIds, int[] unitaOperativas, long[] assegnatoreUserIds,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione, int start, int end)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns an ordered range of all the parere geologos where groupId = any &#63; and unitaOperativa = any &#63; and assegnatoreUserId = any &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param groupIds the group IDs
+	* @param unitaOperativas the unita operativas
+	* @param assegnatoreUserIds the assegnatore user IDs
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @param start the lower bound of the range of parere geologos
+	* @param end the upper bound of the range of parere geologos (not inclusive)
+	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	* @return the ordered range of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(
+		long[] groupIds, int[] unitaOperativas, long[] assegnatoreUserIds,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione, int start, int end,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Removes all the parere geologos where groupId = &#63; and unitaOperativa = &#63; and assegnatoreUserId = &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63; from the database.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @throws SystemException if a system exception occurred
+	*/
+	public void removeByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(
+		long groupId, int unitaOperativa, long assegnatoreUserId,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns the number of parere geologos where groupId = &#63; and unitaOperativa = &#63; and assegnatoreUserId = &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @return the number of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public int countByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(
+		long groupId, int unitaOperativa, long assegnatoreUserId,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns the number of parere geologos where groupId = any &#63; and unitaOperativa = any &#63; and assegnatoreUserId = any &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* @param groupIds the group IDs
+	* @param unitaOperativas the unita operativas
+	* @param assegnatoreUserIds the assegnatore user IDs
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @return the number of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public int countByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(
+		long[] groupIds, int[] unitaOperativas, long[] assegnatoreUserIds,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
 	/**
 	* Caches the parere geologo in the entity cache if it is enabled.
 	*

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

@@ -1280,6 +1280,746 @@ public class ParereGeologoUtil {
 		return getPersistence().countByC_GroupId(companyId, groupId);
 	}
 
+	/**
+	* Returns all the parere geologos where groupId = ? and unitaOperativa = ? and geologoUserId = ? and assegnatoreUserId = ? and dtCompilazione = ? and dtAnnullamento = ?.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @return the matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public static java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(
+		long groupId, int unitaOperativa, long geologoUserId,
+		long assegnatoreUserId, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(groupId,
+			unitaOperativa, geologoUserId, assegnatoreUserId, dtCompilazione,
+			dtAnnullamento);
+	}
+
+	/**
+	* Returns a range of all the parere geologos where groupId = &#63; and unitaOperativa = &#63; and geologoUserId = &#63; and assegnatoreUserId = &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param start the lower bound of the range of parere geologos
+	* @param end the upper bound of the range of parere geologos (not inclusive)
+	* @return the range of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public static java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(
+		long groupId, int unitaOperativa, long geologoUserId,
+		long assegnatoreUserId, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento, int start, int end)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(groupId,
+			unitaOperativa, geologoUserId, assegnatoreUserId, dtCompilazione,
+			dtAnnullamento, start, end);
+	}
+
+	/**
+	* Returns an ordered range of all the parere geologos where groupId = &#63; and unitaOperativa = &#63; and geologoUserId = &#63; and assegnatoreUserId = &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param start the lower bound of the range of parere geologos
+	* @param end the upper bound of the range of parere geologos (not inclusive)
+	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	* @return the ordered range of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public static java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(
+		long groupId, int unitaOperativa, long geologoUserId,
+		long assegnatoreUserId, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento, int start, int end,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(groupId,
+			unitaOperativa, geologoUserId, assegnatoreUserId, dtCompilazione,
+			dtAnnullamento, start, end, orderByComparator);
+	}
+
+	/**
+	* Returns the first parere geologo in the ordered set where groupId = &#63; and unitaOperativa = &#63; and geologoUserId = &#63; and assegnatoreUserId = &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the first matching parere geologo
+	* @throws it.tref.liferay.portos.bo.NoSuchParereGeologoException if a matching parere geologo could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.tref.liferay.portos.bo.model.ParereGeologo findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento_First(
+		long groupId, int unitaOperativa, long geologoUserId,
+		long assegnatoreUserId, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.tref.liferay.portos.bo.NoSuchParereGeologoException {
+		return getPersistence()
+				   .findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento_First(groupId,
+			unitaOperativa, geologoUserId, assegnatoreUserId, dtCompilazione,
+			dtAnnullamento, orderByComparator);
+	}
+
+	/**
+	* Returns the first parere geologo in the ordered set where groupId = &#63; and unitaOperativa = &#63; and geologoUserId = &#63; and assegnatoreUserId = &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the first matching parere geologo, or <code>null</code> if a matching parere geologo could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.tref.liferay.portos.bo.model.ParereGeologo fetchByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento_First(
+		long groupId, int unitaOperativa, long geologoUserId,
+		long assegnatoreUserId, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .fetchByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento_First(groupId,
+			unitaOperativa, geologoUserId, assegnatoreUserId, dtCompilazione,
+			dtAnnullamento, orderByComparator);
+	}
+
+	/**
+	* Returns the last parere geologo in the ordered set where groupId = &#63; and unitaOperativa = &#63; and geologoUserId = &#63; and assegnatoreUserId = &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the last matching parere geologo
+	* @throws it.tref.liferay.portos.bo.NoSuchParereGeologoException if a matching parere geologo could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.tref.liferay.portos.bo.model.ParereGeologo findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento_Last(
+		long groupId, int unitaOperativa, long geologoUserId,
+		long assegnatoreUserId, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.tref.liferay.portos.bo.NoSuchParereGeologoException {
+		return getPersistence()
+				   .findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento_Last(groupId,
+			unitaOperativa, geologoUserId, assegnatoreUserId, dtCompilazione,
+			dtAnnullamento, orderByComparator);
+	}
+
+	/**
+	* Returns the last parere geologo in the ordered set where groupId = &#63; and unitaOperativa = &#63; and geologoUserId = &#63; and assegnatoreUserId = &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the last matching parere geologo, or <code>null</code> if a matching parere geologo could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.tref.liferay.portos.bo.model.ParereGeologo fetchByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento_Last(
+		long groupId, int unitaOperativa, long geologoUserId,
+		long assegnatoreUserId, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .fetchByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento_Last(groupId,
+			unitaOperativa, geologoUserId, assegnatoreUserId, dtCompilazione,
+			dtAnnullamento, orderByComparator);
+	}
+
+	/**
+	* Returns the parere geologos before and after the current parere geologo in the ordered set where groupId = &#63; and unitaOperativa = &#63; and geologoUserId = &#63; and assegnatoreUserId = &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* @param parereGeologoId the primary key of the current parere geologo
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the previous, current, and next parere geologo
+	* @throws it.tref.liferay.portos.bo.NoSuchParereGeologoException if a parere geologo with the primary key could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.tref.liferay.portos.bo.model.ParereGeologo[] findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento_PrevAndNext(
+		long parereGeologoId, long groupId, int unitaOperativa,
+		long geologoUserId, long assegnatoreUserId,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.tref.liferay.portos.bo.NoSuchParereGeologoException {
+		return getPersistence()
+				   .findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento_PrevAndNext(parereGeologoId,
+			groupId, unitaOperativa, geologoUserId, assegnatoreUserId,
+			dtCompilazione, dtAnnullamento, orderByComparator);
+	}
+
+	/**
+	* Returns all the parere geologos where groupId = any &#63; and unitaOperativa = any &#63; and geologoUserId = &#63; and assegnatoreUserId = any &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param groupIds the group IDs
+	* @param unitaOperativas the unita operativas
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserIds the assegnatore user IDs
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @return the matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public static java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(
+		long[] groupIds, int[] unitaOperativas, long geologoUserId,
+		long[] assegnatoreUserIds, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(groupIds,
+			unitaOperativas, geologoUserId, assegnatoreUserIds, dtCompilazione,
+			dtAnnullamento);
+	}
+
+	/**
+	* Returns a range of all the parere geologos where groupId = any &#63; and unitaOperativa = any &#63; and geologoUserId = &#63; and assegnatoreUserId = any &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param groupIds the group IDs
+	* @param unitaOperativas the unita operativas
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserIds the assegnatore user IDs
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param start the lower bound of the range of parere geologos
+	* @param end the upper bound of the range of parere geologos (not inclusive)
+	* @return the range of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public static java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(
+		long[] groupIds, int[] unitaOperativas, long geologoUserId,
+		long[] assegnatoreUserIds, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento, int start, int end)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(groupIds,
+			unitaOperativas, geologoUserId, assegnatoreUserIds, dtCompilazione,
+			dtAnnullamento, start, end);
+	}
+
+	/**
+	* Returns an ordered range of all the parere geologos where groupId = any &#63; and unitaOperativa = any &#63; and geologoUserId = &#63; and assegnatoreUserId = any &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param groupIds the group IDs
+	* @param unitaOperativas the unita operativas
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserIds the assegnatore user IDs
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param start the lower bound of the range of parere geologos
+	* @param end the upper bound of the range of parere geologos (not inclusive)
+	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	* @return the ordered range of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public static java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(
+		long[] groupIds, int[] unitaOperativas, long geologoUserId,
+		long[] assegnatoreUserIds, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento, int start, int end,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(groupIds,
+			unitaOperativas, geologoUserId, assegnatoreUserIds, dtCompilazione,
+			dtAnnullamento, start, end, orderByComparator);
+	}
+
+	/**
+	* Removes all the parere geologos where groupId = &#63; and unitaOperativa = &#63; and geologoUserId = &#63; and assegnatoreUserId = &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63; from the database.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @throws SystemException if a system exception occurred
+	*/
+	public static void removeByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(
+		long groupId, int unitaOperativa, long geologoUserId,
+		long assegnatoreUserId, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		getPersistence()
+			.removeByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(groupId,
+			unitaOperativa, geologoUserId, assegnatoreUserId, dtCompilazione,
+			dtAnnullamento);
+	}
+
+	/**
+	* Returns the number of parere geologos where groupId = &#63; and unitaOperativa = &#63; and geologoUserId = &#63; and assegnatoreUserId = &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @return the number of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public static int countByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(
+		long groupId, int unitaOperativa, long geologoUserId,
+		long assegnatoreUserId, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .countByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(groupId,
+			unitaOperativa, geologoUserId, assegnatoreUserId, dtCompilazione,
+			dtAnnullamento);
+	}
+
+	/**
+	* Returns the number of parere geologos where groupId = any &#63; and unitaOperativa = any &#63; and geologoUserId = &#63; and assegnatoreUserId = any &#63; and dtCompilazione = &#63; and dtAnnullamento = &#63;.
+	*
+	* @param groupIds the group IDs
+	* @param unitaOperativas the unita operativas
+	* @param geologoUserId the geologo user ID
+	* @param assegnatoreUserIds the assegnatore user IDs
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @return the number of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public static int countByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(
+		long[] groupIds, int[] unitaOperativas, long geologoUserId,
+		long[] assegnatoreUserIds, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .countByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(groupIds,
+			unitaOperativas, geologoUserId, assegnatoreUserIds, dtCompilazione,
+			dtAnnullamento);
+	}
+
+	/**
+	* Returns all the parere geologos where groupId = &#63; and unitaOperativa = &#63; and assegnatoreUserId = &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @return the matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public static java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(
+		long groupId, int unitaOperativa, long assegnatoreUserId,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(groupId,
+			unitaOperativa, assegnatoreUserId, dtCompilazione, dtAnnullamento,
+			dtApprovazione);
+	}
+
+	/**
+	* Returns a range of all the parere geologos where groupId = &#63; and unitaOperativa = &#63; and assegnatoreUserId = &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @param start the lower bound of the range of parere geologos
+	* @param end the upper bound of the range of parere geologos (not inclusive)
+	* @return the range of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public static java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(
+		long groupId, int unitaOperativa, long assegnatoreUserId,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione, int start, int end)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(groupId,
+			unitaOperativa, assegnatoreUserId, dtCompilazione, dtAnnullamento,
+			dtApprovazione, start, end);
+	}
+
+	/**
+	* Returns an ordered range of all the parere geologos where groupId = &#63; and unitaOperativa = &#63; and assegnatoreUserId = &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @param start the lower bound of the range of parere geologos
+	* @param end the upper bound of the range of parere geologos (not inclusive)
+	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	* @return the ordered range of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public static java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(
+		long groupId, int unitaOperativa, long assegnatoreUserId,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione, int start, int end,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(groupId,
+			unitaOperativa, assegnatoreUserId, dtCompilazione, dtAnnullamento,
+			dtApprovazione, start, end, orderByComparator);
+	}
+
+	/**
+	* Returns the first parere geologo in the ordered set where groupId = &#63; and unitaOperativa = &#63; and assegnatoreUserId = &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the first matching parere geologo
+	* @throws it.tref.liferay.portos.bo.NoSuchParereGeologoException if a matching parere geologo could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.tref.liferay.portos.bo.model.ParereGeologo findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione_First(
+		long groupId, int unitaOperativa, long assegnatoreUserId,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.tref.liferay.portos.bo.NoSuchParereGeologoException {
+		return getPersistence()
+				   .findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione_First(groupId,
+			unitaOperativa, assegnatoreUserId, dtCompilazione, dtAnnullamento,
+			dtApprovazione, orderByComparator);
+	}
+
+	/**
+	* Returns the first parere geologo in the ordered set where groupId = &#63; and unitaOperativa = &#63; and assegnatoreUserId = &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the first matching parere geologo, or <code>null</code> if a matching parere geologo could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.tref.liferay.portos.bo.model.ParereGeologo fetchByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione_First(
+		long groupId, int unitaOperativa, long assegnatoreUserId,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .fetchByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione_First(groupId,
+			unitaOperativa, assegnatoreUserId, dtCompilazione, dtAnnullamento,
+			dtApprovazione, orderByComparator);
+	}
+
+	/**
+	* Returns the last parere geologo in the ordered set where groupId = &#63; and unitaOperativa = &#63; and assegnatoreUserId = &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the last matching parere geologo
+	* @throws it.tref.liferay.portos.bo.NoSuchParereGeologoException if a matching parere geologo could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.tref.liferay.portos.bo.model.ParereGeologo findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione_Last(
+		long groupId, int unitaOperativa, long assegnatoreUserId,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.tref.liferay.portos.bo.NoSuchParereGeologoException {
+		return getPersistence()
+				   .findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione_Last(groupId,
+			unitaOperativa, assegnatoreUserId, dtCompilazione, dtAnnullamento,
+			dtApprovazione, orderByComparator);
+	}
+
+	/**
+	* Returns the last parere geologo in the ordered set where groupId = &#63; and unitaOperativa = &#63; and assegnatoreUserId = &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the last matching parere geologo, or <code>null</code> if a matching parere geologo could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.tref.liferay.portos.bo.model.ParereGeologo fetchByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione_Last(
+		long groupId, int unitaOperativa, long assegnatoreUserId,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .fetchByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione_Last(groupId,
+			unitaOperativa, assegnatoreUserId, dtCompilazione, dtAnnullamento,
+			dtApprovazione, orderByComparator);
+	}
+
+	/**
+	* Returns the parere geologos before and after the current parere geologo in the ordered set where groupId = &#63; and unitaOperativa = &#63; and assegnatoreUserId = &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* @param parereGeologoId the primary key of the current parere geologo
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the previous, current, and next parere geologo
+	* @throws it.tref.liferay.portos.bo.NoSuchParereGeologoException if a parere geologo with the primary key could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.tref.liferay.portos.bo.model.ParereGeologo[] findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione_PrevAndNext(
+		long parereGeologoId, long groupId, int unitaOperativa,
+		long assegnatoreUserId, java.util.Date dtCompilazione,
+		java.util.Date dtAnnullamento, java.util.Date dtApprovazione,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.tref.liferay.portos.bo.NoSuchParereGeologoException {
+		return getPersistence()
+				   .findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione_PrevAndNext(parereGeologoId,
+			groupId, unitaOperativa, assegnatoreUserId, dtCompilazione,
+			dtAnnullamento, dtApprovazione, orderByComparator);
+	}
+
+	/**
+	* Returns all the parere geologos where groupId = any &#63; and unitaOperativa = any &#63; and assegnatoreUserId = any &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param groupIds the group IDs
+	* @param unitaOperativas the unita operativas
+	* @param assegnatoreUserIds the assegnatore user IDs
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @return the matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public static java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(
+		long[] groupIds, int[] unitaOperativas, long[] assegnatoreUserIds,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(groupIds,
+			unitaOperativas, assegnatoreUserIds, dtCompilazione,
+			dtAnnullamento, dtApprovazione);
+	}
+
+	/**
+	* Returns a range of all the parere geologos where groupId = any &#63; and unitaOperativa = any &#63; and assegnatoreUserId = any &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param groupIds the group IDs
+	* @param unitaOperativas the unita operativas
+	* @param assegnatoreUserIds the assegnatore user IDs
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @param start the lower bound of the range of parere geologos
+	* @param end the upper bound of the range of parere geologos (not inclusive)
+	* @return the range of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public static java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(
+		long[] groupIds, int[] unitaOperativas, long[] assegnatoreUserIds,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione, int start, int end)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(groupIds,
+			unitaOperativas, assegnatoreUserIds, dtCompilazione,
+			dtAnnullamento, dtApprovazione, start, end);
+	}
+
+	/**
+	* Returns an ordered range of all the parere geologos where groupId = any &#63; and unitaOperativa = any &#63; and assegnatoreUserId = any &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param groupIds the group IDs
+	* @param unitaOperativas the unita operativas
+	* @param assegnatoreUserIds the assegnatore user IDs
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @param start the lower bound of the range of parere geologos
+	* @param end the upper bound of the range of parere geologos (not inclusive)
+	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	* @return the ordered range of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public static java.util.List<it.tref.liferay.portos.bo.model.ParereGeologo> findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(
+		long[] groupIds, int[] unitaOperativas, long[] assegnatoreUserIds,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione, int start, int end,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(groupIds,
+			unitaOperativas, assegnatoreUserIds, dtCompilazione,
+			dtAnnullamento, dtApprovazione, start, end, orderByComparator);
+	}
+
+	/**
+	* Removes all the parere geologos where groupId = &#63; and unitaOperativa = &#63; and assegnatoreUserId = &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63; from the database.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @throws SystemException if a system exception occurred
+	*/
+	public static void removeByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(
+		long groupId, int unitaOperativa, long assegnatoreUserId,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		getPersistence()
+			.removeByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(groupId,
+			unitaOperativa, assegnatoreUserId, dtCompilazione, dtAnnullamento,
+			dtApprovazione);
+	}
+
+	/**
+	* Returns the number of parere geologos where groupId = &#63; and unitaOperativa = &#63; and assegnatoreUserId = &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* @param groupId the group ID
+	* @param unitaOperativa the unita operativa
+	* @param assegnatoreUserId the assegnatore user ID
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @return the number of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public static int countByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(
+		long groupId, int unitaOperativa, long assegnatoreUserId,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .countByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(groupId,
+			unitaOperativa, assegnatoreUserId, dtCompilazione, dtAnnullamento,
+			dtApprovazione);
+	}
+
+	/**
+	* Returns the number of parere geologos where groupId = any &#63; and unitaOperativa = any &#63; and assegnatoreUserId = any &#63; and dtCompilazione &ne; &#63; and dtAnnullamento &ne; &#63; and dtApprovazione = &#63;.
+	*
+	* @param groupIds the group IDs
+	* @param unitaOperativas the unita operativas
+	* @param assegnatoreUserIds the assegnatore user IDs
+	* @param dtCompilazione the dt compilazione
+	* @param dtAnnullamento the dt annullamento
+	* @param dtApprovazione the dt approvazione
+	* @return the number of matching parere geologos
+	* @throws SystemException if a system exception occurred
+	*/
+	public static int countByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(
+		long[] groupIds, int[] unitaOperativas, long[] assegnatoreUserIds,
+		java.util.Date dtCompilazione, java.util.Date dtAnnullamento,
+		java.util.Date dtApprovazione)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .countByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(groupIds,
+			unitaOperativas, assegnatoreUserIds, dtCompilazione,
+			dtAnnullamento, dtApprovazione);
+	}
+
 	/**
 	* Caches the parere geologo in the entity cache if it is enabled.
 	*

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/indexes.properties

@@ -157,7 +157,13 @@ IX_8815F580=portos_bo_Pagamento.Uuid
 IX_C25B9EA8=portos_bo_Pagamento.Uuid_C
 
 IX_2E6B85CA=portos_bo_ParereGeo.C_GroupId
+IX_81AC7104=portos_bo_ParereGeo.G_GroupId_GeologoUserId_DtCompilazione_DtAnnullamento
 IX_5D9EAD5E=portos_bo_ParereGeo.GeologoUserId_DtCompilazione_DtAnnullamento
+IX_81AC7104=portos_bo_ParereGeo.GroupId_GeologoUserId_DtCompilazione_DtAnnullamento
+IX_B4CF0B7E=portos_bo_ParereGeo.Group_Geologo_Assegnatore_DtCompilazione_DtAnnullamento
+IX_94C87F94=portos_bo_ParereGeo.Group_UnitaOperativa_Assegnatore_DtCompilazione_DtAnnullamento_DtApprovazione
+IX_94C87F94=portos_bo_ParereGeo.Group_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione
+IX_3A6B6848=portos_bo_ParereGeo.Group_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento
 IX_EFB6D6FA=portos_bo_ParereGeo.IntPraticaId
 IX_66765F8E=portos_bo_ParereGeo.IntPraticaId_DtCompilazione_DtAnnullamento
 IX_635441BE=portos_bo_ParereGeo.UUID_G

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/indexes.sql

@@ -154,6 +154,10 @@ create unique index IX_D00BAF2A on portos_bo_Pagamento (uuid_, groupId);
 
 create index IX_2E6B85CA on portos_bo_ParereGeo (companyId, groupId);
 create index IX_5D9EAD5E on portos_bo_ParereGeo (geologoUserId, dtCompilazione, dtAnnullamento);
+create index IX_B4CF0B7E on portos_bo_ParereGeo (groupId, geologoUserId, assegnatoreUserId, dtCompilazione, dtAnnullamento);
+create index IX_81AC7104 on portos_bo_ParereGeo (groupId, geologoUserId, dtCompilazione, dtAnnullamento);
+create index IX_94C87F94 on portos_bo_ParereGeo (groupId, unitaOperativa, assegnatoreUserId, dtCompilazione, dtAnnullamento, dtApprovazione);
+create index IX_3A6B6848 on portos_bo_ParereGeo (groupId, unitaOperativa, geologoUserId, assegnatoreUserId, dtCompilazione, dtAnnullamento);
 create index IX_EFB6D6FA on portos_bo_ParereGeo (intPraticaId);
 create index IX_66765F8E on portos_bo_ParereGeo (intPraticaId, dtCompilazione, dtAnnullamento);
 create index IX_24A66C6C on portos_bo_ParereGeo (uuid_);

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql

@@ -573,12 +573,15 @@ create table portos_bo_ParereGeo (
 	uuid_ VARCHAR(75) null,
 	parereGeologoId LONG not null primary key,
 	companyId LONG,
+	unitaOperativa INTEGER,
 	userId LONG,
 	userName VARCHAR(75) null,
 	createDate DATE null,
 	modifiedDate DATE null,
 	groupId LONG,
 	geologoUserId LONG,
+	assegnatoreUserId LONG,
+	dtAssegnazione DATE null,
 	parere STRING null,
 	intPraticaId LONG,
 	dettPraticaId LONG,
@@ -589,7 +592,10 @@ create table portos_bo_ParereGeo (
 	noteRichiedente STRING null,
 	dtAnnullamento DATE null,
 	userIdAnnullamento LONG,
-	noteAnnullamento STRING null
+	noteAnnullamento STRING null,
+	approvatoreUserId LONG,
+	dtApprovazione DATE null,
+	noteApprovatore STRING null
 );
 
 create table portos_bo_Provincia (

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

@@ -632,12 +632,15 @@
 		</id>
 		<property name="uuid" type="com.liferay.portal.dao.orm.hibernate.StringType" column="uuid_" />
 		<property name="companyId" type="com.liferay.portal.dao.orm.hibernate.LongType" />
+		<property name="unitaOperativa" type="com.liferay.portal.dao.orm.hibernate.IntegerType" />
 		<property name="userId" type="com.liferay.portal.dao.orm.hibernate.LongType" />
 		<property name="userName" type="com.liferay.portal.dao.orm.hibernate.StringType" />
 		<property name="createDate" type="org.hibernate.type.TimestampType" />
 		<property name="modifiedDate" type="org.hibernate.type.TimestampType" />
 		<property name="groupId" type="com.liferay.portal.dao.orm.hibernate.LongType" />
 		<property name="geologoUserId" type="com.liferay.portal.dao.orm.hibernate.LongType" />
+		<property name="assegnatoreUserId" type="com.liferay.portal.dao.orm.hibernate.LongType" />
+		<property name="dtAssegnazione" type="org.hibernate.type.TimestampType" />
 		<property name="parere" type="com.liferay.portal.dao.orm.hibernate.StringType" />
 		<property name="intPraticaId" type="com.liferay.portal.dao.orm.hibernate.LongType" />
 		<property name="dettPraticaId" type="com.liferay.portal.dao.orm.hibernate.LongType" />
@@ -649,6 +652,9 @@
 		<property name="dtAnnullamento" type="org.hibernate.type.TimestampType" />
 		<property name="userIdAnnullamento" type="com.liferay.portal.dao.orm.hibernate.LongType" />
 		<property name="noteAnnullamento" type="com.liferay.portal.dao.orm.hibernate.StringType" />
+		<property name="approvatoreUserId" type="com.liferay.portal.dao.orm.hibernate.LongType" />
+		<property name="dtApprovazione" type="org.hibernate.type.TimestampType" />
+		<property name="noteApprovatore" type="com.liferay.portal.dao.orm.hibernate.StringType" />
 	</class>
 	<class name="it.tref.liferay.portos.bo.model.impl.ProvinciaImpl" table="portos_bo_Provincia">
 		<cache usage="read-write" />

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

@@ -678,12 +678,15 @@
 		<field name="uuid" type="String" />
 		<field name="parereGeologoId" type="long" />
 		<field name="companyId" type="long" />
+		<field name="unitaOperativa" type="int" />
 		<field name="userId" type="long" />
 		<field name="userName" type="String" />
 		<field name="createDate" type="Date" />
 		<field name="modifiedDate" type="Date" />
 		<field name="groupId" type="long" />
 		<field name="geologoUserId" type="long" />
+		<field name="assegnatoreUserId" type="long" />
+		<field name="dtAssegnazione" type="Date" />
 		<field name="parere" type="String">
 			<hint name="max-length">4000</hint>
 		</field>
@@ -701,6 +704,11 @@
 		<field name="noteAnnullamento" type="String">
 			<hint name="max-length">4000</hint>
 		</field>
+		<field name="approvatoreUserId" type="long" />
+		<field name="dtApprovazione" type="Date" />
+		<field name="noteApprovatore" type="String">
+			<hint name="max-length">4000</hint>
+		</field>
 	</model>
 	<model name="it.tref.liferay.portos.bo.model.Provincia">
 		<field name="provinciaId" type="long" />

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

@@ -816,6 +816,7 @@
 				<column name="UUID_" />
 			</basic>
 			<basic name="companyId" />
+			<basic name="unitaOperativa" />
 			<basic name="userId" />
 			<basic name="userName" />
 			<basic name="createDate">
@@ -826,6 +827,10 @@
 			</basic>
 			<basic name="groupId" />
 			<basic name="geologoUserId" />
+			<basic name="assegnatoreUserId" />
+			<basic name="dtAssegnazione">
+				<temporal>TIMESTAMP</temporal>
+			</basic>
 			<basic name="parere" />
 			<basic name="intPraticaId" />
 			<basic name="dettPraticaId" />
@@ -843,6 +848,13 @@
 			</basic>
 			<basic name="userIdAnnullamento" />
 			<basic name="noteAnnullamento" />
+			<basic name="approvatoreUserId" />
+			<basic name="dtApprovazione">
+				<temporal>TIMESTAMP</temporal>
+			</basic>
+			<basic name="noteApprovatore" />
+			<transient name="approvatoreUserUuid" />
+			<transient name="assegnatoreUserUuid" />
 			<transient name="geologoUserUuid" />
 			<transient name="modelAttributes" />
 			<transient name="primaryKey" />

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

@@ -331,3 +331,5 @@ label-integrazione-13 = Variante
 ricerca-posizione = Ricerca per posizione
 ricerca-indirizzo = Ricerca per indirizzo
 ricerca-progetto = Ricerca per progetto
+
+note-richiedente = Note del richiedente

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/search/ControlloPraticaAdvancedSearch.java

@@ -1,7 +1,7 @@
 package it.mwg.sismica.bo.search;
 
 import it.mwg.sismica.bo.shared.util.PortosIndexField;
-import it.mwg.sismica.bo.shared.util.UnitaOperativeUtil;
+import it.mwg.sismica.bo.shared.util.UserUtil;
 import it.mwg.sismica.bo.shared.util.WorkflowConstants;
 import it.tref.liferay.portos.bo.model.ControlloPratica;
 import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil;
@@ -14,6 +14,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
+import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -195,7 +196,7 @@ public class ControlloPraticaAdvancedSearch {
 					booleanQuery.add(singleGroupIdQuery, BooleanClauseOccur.MUST);
 				}
 			}
-			List<Integer> uos = UnitaOperativeUtil.getUnitaOperative(user);
+			Set<Integer> uos = UserUtil.getUnitaOperative(user);
 			if ((uos.size() > 0) && !uos.contains(0)) {
 				BooleanQuery uoQuery = BooleanQueryFactoryUtil.create(searchContext);
 				for (int uo : uos) {

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/startup/DatabaseUpdateAction.java

@@ -0,0 +1,66 @@
+package it.mwg.sismica.bo.startup;
+
+import it.tref.liferay.portos.bo.model.ParereGeologo;
+import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil;
+import it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil;
+
+import java.util.List;
+
+import com.liferay.portal.kernel.events.ActionException;
+import com.liferay.portal.kernel.events.SimpleAction;
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.model.Role;
+import com.liferay.portal.model.RoleConstants;
+import com.liferay.portal.model.User;
+import com.liferay.portal.service.RoleLocalServiceUtil;
+import com.liferay.portal.service.ServiceContext;
+import com.liferay.portal.service.UserLocalServiceUtil;
+
+public class DatabaseUpdateAction extends SimpleAction {
+
+	private static final String CHIAVE_VERSIONE = DatabaseUpdateAction.class.getName() + ".versione";
+
+	private static final Log _log = LogFactoryUtil.getLog(DatabaseUpdateAction.class);
+
+	@Override
+	public void run(String[] ids) throws ActionException {
+
+		for (String id : ids) {
+			long companyId = Long.parseLong(id);
+			try {
+				long versione = ConfigurazioneLocalServiceUtil.findByC_ChiaveLong(companyId, CHIAVE_VERSIONE);
+				if (versione < 2) {
+					parereGeologov2(companyId);
+					// versione = 2;
+				}
+				ServiceContext serviceContext = new ServiceContext();
+				Role adminRole = RoleLocalServiceUtil.getRole(companyId, RoleConstants.ADMINISTRATOR);
+				User adminUser = UserLocalServiceUtil.getRoleUsers(adminRole.getRoleId(), 0, 1).get(0);
+				serviceContext.setCompanyId(companyId);
+				serviceContext.setScopeGroupId(-1L);
+				serviceContext.setUserId(adminUser.getUserId());
+				ConfigurazioneLocalServiceUtil.storeConfig(CHIAVE_VERSIONE, String.valueOf(versione), serviceContext);
+			} catch (PortalException | SystemException e) {
+				_log.error(e, e);
+			}
+		}
+	}
+
+	private static void parereGeologov2(long companyId) throws SystemException {
+
+		final int SLICE = 100;
+		List<ParereGeologo> pareri;
+		int start = 0;
+		do {
+			pareri = ParereGeologoLocalServiceUtil.getParereGeologos(start, start + SLICE);
+			if (pareri.size() > 0) {
+				for (ParereGeologo parere : pareri) {
+
+				}
+			}
+		} while (pareri.size() > 0);
+	}
+}

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/ManutenzioneDatabase.java

@@ -4,7 +4,7 @@
 package it.mwg.sismica.bo.util;
 
 import it.mwg.sismica.bo.shared.util.AvvisoUtil;
-import it.mwg.sismica.bo.shared.util.UnitaOperativeUtil;
+import it.mwg.sismica.bo.shared.util.UserUtil;
 import it.tref.liferay.portos.bo.model.AllegatoManuale;
 import it.tref.liferay.portos.bo.model.Asseverazione;
 import it.tref.liferay.portos.bo.model.Avviso;
@@ -159,6 +159,8 @@ public class ManutenzioneDatabase {
 
 		List<String> esito = new ArrayList<>();
 		long companyId = serviceContext.getCompanyId();
+		if (mode.contains("!Pareri!")) {
+		}
 		if (mode.contains("!Scavi!")) {
 			esito.addAll(SismicaUtil.migraScavi());
 		}
@@ -251,7 +253,7 @@ public class ManutenzioneDatabase {
 								try {
 									User user = UserLocalServiceUtil.getUser(userId);
 									if (Validator.isNotNull(user)) {
-										List<Integer> uos = UnitaOperativeUtil.getUnitaOperative(user);
+										Set<Integer> uos = UserUtil.getUnitaOperative(user);
 										for (int uo : uos) {
 											if (uo > destinazione) {
 												destinazione = uo;

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java

@@ -17,6 +17,7 @@ import static java.lang.Math.sin;
 import static java.lang.Math.sqrt;
 import it.mwg.sismica.bo.shared.util.AsseverazioniUtil;
 import it.mwg.sismica.bo.shared.util.AzioniPraticheUtil;
+import it.mwg.sismica.bo.shared.util.UserUtil;
 import it.tref.liferay.portos.bo.model.Collaudo;
 import it.tref.liferay.portos.bo.model.Comune;
 import it.tref.liferay.portos.bo.model.DettPratica;
@@ -47,6 +48,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
+import java.util.TreeMap;
 
 import org.apache.commons.lang.StringUtils;
 
@@ -61,8 +64,12 @@ import com.liferay.portal.kernel.util.LocaleUtil;
 import com.liferay.portal.kernel.util.StringPool;
 import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import com.liferay.portal.model.Role;
 import com.liferay.portal.model.User;
+import com.liferay.portal.model.UserGroupRole;
+import com.liferay.portal.service.RoleLocalServiceUtil;
 import com.liferay.portal.service.ServiceContext;
+import com.liferay.portal.service.UserGroupRoleLocalServiceUtil;
 import com.liferay.portal.service.UserLocalServiceUtil;
 
 /**
@@ -512,6 +519,28 @@ public class IntPraticaImpl extends IntPraticaBaseImpl {
 		return geologi;
 	}
 
+	@Override
+	public Map<String, User> getGeologiPerParere() throws PortalException, SystemException {
+
+		Role role = RoleLocalServiceUtil.getRole(getCompanyId(), Constants.ROLE_NAME_GEOLOGO);
+		Map<String, User> geologi = new TreeMap<>();
+		for (UserGroupRole ugr : UserGroupRoleLocalServiceUtil.getUserGroupRolesByGroup(getGroupId())) {
+			User user = ugr.getUser();
+			if ((user.getRoles().contains(role) || UserUtil.getUnitaOperative(user).contains(
+					getUnitaOperativa()))
+					&& (user.getUserId() != getStatusByUserId())) {
+				for (int unitaOperativa : UserUtil.getUnitaOperative(user)) {
+					if (unitaOperativa != 0) {
+						geologi.put(String.format("%03d", unitaOperativa), null);
+						geologi.put(String.format("%03d", unitaOperativa) + user.getLastName().toUpperCase()
+								+ user.getFirstName().toLowerCase(), user);
+					}
+				}
+			}
+		}
+		return geologi;
+	}
+
 	private List<String> getSignaturePerSubject(List<String> signatures, String tipoSoggetto, long docPraticaClassPk)
 			throws SystemException {
 
@@ -556,6 +585,7 @@ public class IntPraticaImpl extends IntPraticaBaseImpl {
 				|| StatoPraticaConstants.PERIZIA_SANZIONE.equals(stato);
 	}
 
+	@Override
 	public void invioMailNotifica(long dettPraticaId, long classPk, String className, String[] to, String[] cc,
 			String[] ccn, String templateName, JSONObject templateVariables, List<FileAttachment> allegati,
 			ServiceContext serviceContext) throws PortalException, SystemException {

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 {
 	@Override
 	public String toString() {
-		StringBundler sb = new StringBundler(41);
+		StringBundler sb = new StringBundler(53);
 
 		sb.append("{uuid=");
 		sb.append(uuid);
@@ -46,6 +46,8 @@ public class ParereGeologoCacheModel implements CacheModel<ParereGeologo>,
 		sb.append(parereGeologoId);
 		sb.append(", companyId=");
 		sb.append(companyId);
+		sb.append(", unitaOperativa=");
+		sb.append(unitaOperativa);
 		sb.append(", userId=");
 		sb.append(userId);
 		sb.append(", userName=");
@@ -58,6 +60,10 @@ public class ParereGeologoCacheModel implements CacheModel<ParereGeologo>,
 		sb.append(groupId);
 		sb.append(", geologoUserId=");
 		sb.append(geologoUserId);
+		sb.append(", assegnatoreUserId=");
+		sb.append(assegnatoreUserId);
+		sb.append(", dtAssegnazione=");
+		sb.append(dtAssegnazione);
 		sb.append(", parere=");
 		sb.append(parere);
 		sb.append(", intPraticaId=");
@@ -80,6 +86,12 @@ public class ParereGeologoCacheModel implements CacheModel<ParereGeologo>,
 		sb.append(userIdAnnullamento);
 		sb.append(", noteAnnullamento=");
 		sb.append(noteAnnullamento);
+		sb.append(", approvatoreUserId=");
+		sb.append(approvatoreUserId);
+		sb.append(", dtApprovazione=");
+		sb.append(dtApprovazione);
+		sb.append(", noteApprovatore=");
+		sb.append(noteApprovatore);
 		sb.append("}");
 
 		return sb.toString();
@@ -98,6 +110,7 @@ public class ParereGeologoCacheModel implements CacheModel<ParereGeologo>,
 
 		parereGeologoImpl.setParereGeologoId(parereGeologoId);
 		parereGeologoImpl.setCompanyId(companyId);
+		parereGeologoImpl.setUnitaOperativa(unitaOperativa);
 		parereGeologoImpl.setUserId(userId);
 
 		if (userName == null) {
@@ -123,6 +136,14 @@ public class ParereGeologoCacheModel implements CacheModel<ParereGeologo>,
 
 		parereGeologoImpl.setGroupId(groupId);
 		parereGeologoImpl.setGeologoUserId(geologoUserId);
+		parereGeologoImpl.setAssegnatoreUserId(assegnatoreUserId);
+
+		if (dtAssegnazione == Long.MIN_VALUE) {
+			parereGeologoImpl.setDtAssegnazione(null);
+		}
+		else {
+			parereGeologoImpl.setDtAssegnazione(new Date(dtAssegnazione));
+		}
 
 		if (parere == null) {
 			parereGeologoImpl.setParere(StringPool.BLANK);
@@ -174,6 +195,22 @@ public class ParereGeologoCacheModel implements CacheModel<ParereGeologo>,
 			parereGeologoImpl.setNoteAnnullamento(noteAnnullamento);
 		}
 
+		parereGeologoImpl.setApprovatoreUserId(approvatoreUserId);
+
+		if (dtApprovazione == Long.MIN_VALUE) {
+			parereGeologoImpl.setDtApprovazione(null);
+		}
+		else {
+			parereGeologoImpl.setDtApprovazione(new Date(dtApprovazione));
+		}
+
+		if (noteApprovatore == null) {
+			parereGeologoImpl.setNoteApprovatore(StringPool.BLANK);
+		}
+		else {
+			parereGeologoImpl.setNoteApprovatore(noteApprovatore);
+		}
+
 		parereGeologoImpl.resetOriginalValues();
 
 		return parereGeologoImpl;
@@ -184,12 +221,15 @@ public class ParereGeologoCacheModel implements CacheModel<ParereGeologo>,
 		uuid = objectInput.readUTF();
 		parereGeologoId = objectInput.readLong();
 		companyId = objectInput.readLong();
+		unitaOperativa = objectInput.readInt();
 		userId = objectInput.readLong();
 		userName = objectInput.readUTF();
 		createDate = objectInput.readLong();
 		modifiedDate = objectInput.readLong();
 		groupId = objectInput.readLong();
 		geologoUserId = objectInput.readLong();
+		assegnatoreUserId = objectInput.readLong();
+		dtAssegnazione = objectInput.readLong();
 		parere = objectInput.readUTF();
 		intPraticaId = objectInput.readLong();
 		dettPraticaId = objectInput.readLong();
@@ -201,6 +241,9 @@ public class ParereGeologoCacheModel implements CacheModel<ParereGeologo>,
 		dtAnnullamento = objectInput.readLong();
 		userIdAnnullamento = objectInput.readLong();
 		noteAnnullamento = objectInput.readUTF();
+		approvatoreUserId = objectInput.readLong();
+		dtApprovazione = objectInput.readLong();
+		noteApprovatore = objectInput.readUTF();
 	}
 
 	@Override
@@ -215,6 +258,7 @@ public class ParereGeologoCacheModel implements CacheModel<ParereGeologo>,
 
 		objectOutput.writeLong(parereGeologoId);
 		objectOutput.writeLong(companyId);
+		objectOutput.writeInt(unitaOperativa);
 		objectOutput.writeLong(userId);
 
 		if (userName == null) {
@@ -228,6 +272,8 @@ public class ParereGeologoCacheModel implements CacheModel<ParereGeologo>,
 		objectOutput.writeLong(modifiedDate);
 		objectOutput.writeLong(groupId);
 		objectOutput.writeLong(geologoUserId);
+		objectOutput.writeLong(assegnatoreUserId);
+		objectOutput.writeLong(dtAssegnazione);
 
 		if (parere == null) {
 			objectOutput.writeUTF(StringPool.BLANK);
@@ -259,17 +305,30 @@ public class ParereGeologoCacheModel implements CacheModel<ParereGeologo>,
 		else {
 			objectOutput.writeUTF(noteAnnullamento);
 		}
+
+		objectOutput.writeLong(approvatoreUserId);
+		objectOutput.writeLong(dtApprovazione);
+
+		if (noteApprovatore == null) {
+			objectOutput.writeUTF(StringPool.BLANK);
+		}
+		else {
+			objectOutput.writeUTF(noteApprovatore);
+		}
 	}
 
 	public String uuid;
 	public long parereGeologoId;
 	public long companyId;
+	public int unitaOperativa;
 	public long userId;
 	public String userName;
 	public long createDate;
 	public long modifiedDate;
 	public long groupId;
 	public long geologoUserId;
+	public long assegnatoreUserId;
+	public long dtAssegnazione;
 	public String parere;
 	public long intPraticaId;
 	public long dettPraticaId;
@@ -281,4 +340,7 @@ public class ParereGeologoCacheModel implements CacheModel<ParereGeologo>,
 	public long dtAnnullamento;
 	public long userIdAnnullamento;
 	public String noteAnnullamento;
+	public long approvatoreUserId;
+	public long dtApprovazione;
+	public String noteApprovatore;
 }

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoImpl.java

@@ -8,6 +8,48 @@
 
 package it.tref.liferay.portos.bo.model.impl;
 
+import it.mwg.sismica.bo.shared.util.Generics;
+import it.mwg.sismica.bo.shared.util.UnitaOperativeUtil;
+import it.mwg.sismica.bo.shared.util.UserUtil;
+import it.tref.liferay.portos.bo.model.Comune;
+import it.tref.liferay.portos.bo.model.IntPratica;
+import it.tref.liferay.portos.bo.model.ParereGeologo;
+import it.tref.liferay.portos.bo.model.Provincia;
+import it.tref.liferay.portos.bo.model.Territorio;
+import it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil;
+import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
+import it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil;
+import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil;
+import it.tref.liferay.portos.bo.shared.util.Constants;
+import it.tref.liferay.portos.mailmanager.shared.messaging.util.MailManagerUtil;
+
+import java.util.Date;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.json.JSONFactoryUtil;
+import com.liferay.portal.kernel.json.JSONObject;
+import com.liferay.portal.kernel.language.LanguageUtil;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.util.FastDateFormatFactoryUtil;
+import com.liferay.portal.kernel.util.LocaleUtil;
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.model.Role;
+import com.liferay.portal.model.User;
+import com.liferay.portal.model.UserGroupRole;
+import com.liferay.portal.service.RoleLocalServiceUtil;
+import com.liferay.portal.service.ServiceContext;
+import com.liferay.portal.service.UserGroupRoleLocalServiceUtil;
+import com.liferay.portal.service.UserLocalServiceUtil;
+
 /**
  * The extended model implementation for the ParereGeologo service. Represents a row in the
  * "portos_bo_ParereGeologo" database table, with each column mapped to a property of this class.
@@ -24,5 +66,101 @@ public class ParereGeologoImpl extends ParereGeologoBaseImpl {
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a parere geologo model instance
 	 * should use the {@link it.tref.liferay.portos.bo.model.ParereGeologo} interface instead.
 	 */
+
+	private static final Log _log = LogFactoryUtil.getLog(ParereGeologoImpl.class);
+
 	public ParereGeologoImpl() {}
+
+	@Override
+	public Set<User> getIstruttori() throws PortalException, SystemException {
+
+		Role role = RoleLocalServiceUtil.getRole(getCompanyId(), Constants.ROLE_NAME_ISTRUTTORE);
+		List<UserGroupRole> userGroupRoles = UserGroupRoleLocalServiceUtil.getUserGroupRolesByGroupAndRole(
+				getGroupId(), role.getRoleId());
+		Map<String, User> ret = new TreeMap<>();
+		for (UserGroupRole userGroupRole : userGroupRoles) {
+			User user = userGroupRole.getUser();
+			if (UserUtil.getUnitaOperative(user).contains(getUnitaOperativa())) {
+				ret.put(user.getLastName().toUpperCase() + user.getFirstName().toLowerCase(), user);
+			}
+		}
+		return new LinkedHashSet<>(ret.values());
+	}
+
+	@Override
+	public void invioNotifica(ServiceContext serviceContext) {
+
+		try {
+			IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(getIntPraticaId());
+			String tipoOggetto;
+			String receiver;
+			String[] to;
+			if (Validator.isNotNull(getDtApprovazione())) {
+				// notifica parere espresso a istruttore
+				User istruttore = intPratica.recuperaTecnicoIstruttore();
+				User geologo = UserLocalServiceUtil.getUser(getGeologoUserId());
+				to = new String[] { istruttore.getEmailAddress() };
+				tipoOggetto = "Parere endoprocedimentale espresso da " + Generics.capitalizeFull(geologo.getFullName());
+				receiver = Generics.capitalizeFull(istruttore.getFullName());
+			} else if (Validator.isNotNull(getDtCompilazione())) {
+				// notifica parere da approvare
+				User approvatore = UserLocalServiceUtil.getUser(getAssegnatoreUserId());
+				User geologo = UserLocalServiceUtil.getUser(getGeologoUserId());
+				to = new String[] { approvatore.getEmailAddress() };
+				tipoOggetto = "Parere endoprocedimentale da approvare, espresso da "
+						+ Generics.capitalizeFull(geologo.getFullName());
+				receiver = Generics.capitalizeFull(approvatore.getFullName());
+			} else if (Validator.isNotNull(getDtAssegnazione())) {
+				// notifica parere da esprimere
+				User geologo = UserLocalServiceUtil.getUser(getGeologoUserId());
+				to = new String[] { geologo.getEmailAddress() };
+				tipoOggetto = "Parere endoprocedimentale da esprimere, richiesto da "
+						+ Generics.capitalizeFull(getUserName());
+				receiver = Generics.capitalizeFull(geologo.getFullName());
+			} else if (getAssegnatoreUserId() == 0) {
+				// notifica parere da assegnare a tutta l'unità operativa
+				Set<String> emails = new HashSet<>();
+				for (User user : UnitaOperativeUtil.getGeologi(getCompanyId(), getGroupId(), getUnitaOperativa())) {
+					emails.add(user.getEmailAddress());
+				}
+				to = emails.toArray(new String[emails.size()]);
+				tipoOggetto = "Parere endoprocedimentale da assegnare, richiesto da "
+						+ Generics.capitalizeFull(getUserName());
+				receiver = "Unità operativa " + getUnitaOperativa();
+			} else {
+				// notifica parere da assegnare al singolo operatore
+				User assegnatore = UserLocalServiceUtil.getUser(getAssegnatoreUserId());
+				to = new String[] { assegnatore.getEmailAddress() };
+				tipoOggetto = "Richiesta Parere da assegnare";
+				receiver = Generics.capitalizeFull(assegnatore.getFullName());
+			}
+			String[] cc = new String[0];
+			String[] ccn = new String[0];
+			String tipoPratica = StringPool.BLANK;
+			if (intPratica.isDeposito()) {
+				tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-01");
+			} else if (intPratica.isAutorizzazione()) {
+				tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-02");
+			}
+			Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
+			Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId());
+			Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(),
+					territorio.getCodiceProvincia());
+			JSONObject templateVariables = JSONFactoryUtil.createJSONObject();
+			templateVariables.put("receiver", receiver);
+			templateVariables.put("tipoPratica", tipoPratica);
+			templateVariables.put("tipoOggetto", tipoOggetto);
+			templateVariables.put("dataInvio", FastDateFormatFactoryUtil.getSimpleDateFormat("dd/MM/yyyy HH:mm")
+					.format(getDtCompilazione() != null ? getDtCompilazione() : new Date()));
+			templateVariables.put("praticaNum", intPratica.getNumeroProgetto());
+			templateVariables.put("provincia", provincia.getProvincia());
+			templateVariables.put("comune", comune.getDenominazione());
+			String className = ParereGeologo.class.getName();
+			long classPk = getParereGeologoId();
+			MailManagerUtil.sendMailByTemplatName(className, classPk, "NOTIFICA-GEOLOGO", to, cc, ccn,
+					templateVariables, null, serviceContext);
+		} catch (PortalException | SystemException e) {
+			_log.error("Errore invio mail al geologo - ParereGeologoId=" + getParereGeologoId(), e);
+		}
+	}
 }

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ParereGeologoModelImpl.java

@@ -71,12 +71,15 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 			{ "uuid_", Types.VARCHAR },
 			{ "parereGeologoId", Types.BIGINT },
 			{ "companyId", Types.BIGINT },
+			{ "unitaOperativa", Types.INTEGER },
 			{ "userId", Types.BIGINT },
 			{ "userName", Types.VARCHAR },
 			{ "createDate", Types.TIMESTAMP },
 			{ "modifiedDate", Types.TIMESTAMP },
 			{ "groupId", Types.BIGINT },
 			{ "geologoUserId", Types.BIGINT },
+			{ "assegnatoreUserId", Types.BIGINT },
+			{ "dtAssegnazione", Types.TIMESTAMP },
 			{ "parere", Types.VARCHAR },
 			{ "intPraticaId", Types.BIGINT },
 			{ "dettPraticaId", Types.BIGINT },
@@ -87,9 +90,12 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 			{ "noteRichiedente", Types.VARCHAR },
 			{ "dtAnnullamento", Types.TIMESTAMP },
 			{ "userIdAnnullamento", Types.BIGINT },
-			{ "noteAnnullamento", Types.VARCHAR }
+			{ "noteAnnullamento", Types.VARCHAR },
+			{ "approvatoreUserId", Types.BIGINT },
+			{ "dtApprovazione", Types.TIMESTAMP },
+			{ "noteApprovatore", 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,noteRichiedente STRING null,dtAnnullamento DATE null,userIdAnnullamento LONG,noteAnnullamento STRING null)";
+	public static final String TABLE_SQL_CREATE = "create table portos_bo_ParereGeo (uuid_ VARCHAR(75) null,parereGeologoId LONG not null primary key,companyId LONG,unitaOperativa INTEGER,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,geologoUserId LONG,assegnatoreUserId LONG,dtAssegnazione DATE null,parere STRING null,intPraticaId LONG,dettPraticaId LONG,fileEntryId LONG,dtRichista DATE null,dtCompilazione DATE null,status INTEGER,noteRichiedente STRING null,dtAnnullamento DATE null,userIdAnnullamento LONG,noteAnnullamento STRING null,approvatoreUserId LONG,dtApprovazione DATE null,noteApprovatore STRING null)";
 	public static final String TABLE_SQL_DROP = "drop table portos_bo_ParereGeo";
 	public static final String ORDER_BY_JPQL = " ORDER BY parereGeologo.createDate ASC";
 	public static final String ORDER_BY_SQL = " ORDER BY portos_bo_ParereGeo.createDate ASC";
@@ -105,14 +111,17 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 	public static final boolean COLUMN_BITMASK_ENABLED = GetterUtil.getBoolean(com.liferay.util.service.ServiceProps.get(
 				"value.object.column.bitmask.enabled.it.tref.liferay.portos.bo.model.ParereGeologo"),
 			true);
-	public static long COMPANYID_COLUMN_BITMASK = 1L;
-	public static long DTANNULLAMENTO_COLUMN_BITMASK = 2L;
-	public static long DTCOMPILAZIONE_COLUMN_BITMASK = 4L;
-	public static long GEOLOGOUSERID_COLUMN_BITMASK = 8L;
-	public static long GROUPID_COLUMN_BITMASK = 16L;
-	public static long INTPRATICAID_COLUMN_BITMASK = 32L;
-	public static long UUID_COLUMN_BITMASK = 64L;
-	public static long CREATEDATE_COLUMN_BITMASK = 128L;
+	public static long ASSEGNATOREUSERID_COLUMN_BITMASK = 1L;
+	public static long COMPANYID_COLUMN_BITMASK = 2L;
+	public static long DTANNULLAMENTO_COLUMN_BITMASK = 4L;
+	public static long DTAPPROVAZIONE_COLUMN_BITMASK = 8L;
+	public static long DTCOMPILAZIONE_COLUMN_BITMASK = 16L;
+	public static long GEOLOGOUSERID_COLUMN_BITMASK = 32L;
+	public static long GROUPID_COLUMN_BITMASK = 64L;
+	public static long INTPRATICAID_COLUMN_BITMASK = 128L;
+	public static long UNITAOPERATIVA_COLUMN_BITMASK = 256L;
+	public static long UUID_COLUMN_BITMASK = 512L;
+	public static long CREATEDATE_COLUMN_BITMASK = 1024L;
 
 	/**
 	 * Converts the soap model instance into a normal model instance.
@@ -130,12 +139,15 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 		model.setUuid(soapModel.getUuid());
 		model.setParereGeologoId(soapModel.getParereGeologoId());
 		model.setCompanyId(soapModel.getCompanyId());
+		model.setUnitaOperativa(soapModel.getUnitaOperativa());
 		model.setUserId(soapModel.getUserId());
 		model.setUserName(soapModel.getUserName());
 		model.setCreateDate(soapModel.getCreateDate());
 		model.setModifiedDate(soapModel.getModifiedDate());
 		model.setGroupId(soapModel.getGroupId());
 		model.setGeologoUserId(soapModel.getGeologoUserId());
+		model.setAssegnatoreUserId(soapModel.getAssegnatoreUserId());
+		model.setDtAssegnazione(soapModel.getDtAssegnazione());
 		model.setParere(soapModel.getParere());
 		model.setIntPraticaId(soapModel.getIntPraticaId());
 		model.setDettPraticaId(soapModel.getDettPraticaId());
@@ -147,6 +159,9 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 		model.setDtAnnullamento(soapModel.getDtAnnullamento());
 		model.setUserIdAnnullamento(soapModel.getUserIdAnnullamento());
 		model.setNoteAnnullamento(soapModel.getNoteAnnullamento());
+		model.setApprovatoreUserId(soapModel.getApprovatoreUserId());
+		model.setDtApprovazione(soapModel.getDtApprovazione());
+		model.setNoteApprovatore(soapModel.getNoteApprovatore());
 
 		return model;
 	}
@@ -214,12 +229,15 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 		attributes.put("uuid", getUuid());
 		attributes.put("parereGeologoId", getParereGeologoId());
 		attributes.put("companyId", getCompanyId());
+		attributes.put("unitaOperativa", getUnitaOperativa());
 		attributes.put("userId", getUserId());
 		attributes.put("userName", getUserName());
 		attributes.put("createDate", getCreateDate());
 		attributes.put("modifiedDate", getModifiedDate());
 		attributes.put("groupId", getGroupId());
 		attributes.put("geologoUserId", getGeologoUserId());
+		attributes.put("assegnatoreUserId", getAssegnatoreUserId());
+		attributes.put("dtAssegnazione", getDtAssegnazione());
 		attributes.put("parere", getParere());
 		attributes.put("intPraticaId", getIntPraticaId());
 		attributes.put("dettPraticaId", getDettPraticaId());
@@ -231,6 +249,9 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 		attributes.put("dtAnnullamento", getDtAnnullamento());
 		attributes.put("userIdAnnullamento", getUserIdAnnullamento());
 		attributes.put("noteAnnullamento", getNoteAnnullamento());
+		attributes.put("approvatoreUserId", getApprovatoreUserId());
+		attributes.put("dtApprovazione", getDtApprovazione());
+		attributes.put("noteApprovatore", getNoteApprovatore());
 
 		return attributes;
 	}
@@ -255,6 +276,12 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 			setCompanyId(companyId);
 		}
 
+		Integer unitaOperativa = (Integer)attributes.get("unitaOperativa");
+
+		if (unitaOperativa != null) {
+			setUnitaOperativa(unitaOperativa);
+		}
+
 		Long userId = (Long)attributes.get("userId");
 
 		if (userId != null) {
@@ -291,6 +318,18 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 			setGeologoUserId(geologoUserId);
 		}
 
+		Long assegnatoreUserId = (Long)attributes.get("assegnatoreUserId");
+
+		if (assegnatoreUserId != null) {
+			setAssegnatoreUserId(assegnatoreUserId);
+		}
+
+		Date dtAssegnazione = (Date)attributes.get("dtAssegnazione");
+
+		if (dtAssegnazione != null) {
+			setDtAssegnazione(dtAssegnazione);
+		}
+
 		String parere = (String)attributes.get("parere");
 
 		if (parere != null) {
@@ -356,6 +395,24 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 		if (noteAnnullamento != null) {
 			setNoteAnnullamento(noteAnnullamento);
 		}
+
+		Long approvatoreUserId = (Long)attributes.get("approvatoreUserId");
+
+		if (approvatoreUserId != null) {
+			setApprovatoreUserId(approvatoreUserId);
+		}
+
+		Date dtApprovazione = (Date)attributes.get("dtApprovazione");
+
+		if (dtApprovazione != null) {
+			setDtApprovazione(dtApprovazione);
+		}
+
+		String noteApprovatore = (String)attributes.get("noteApprovatore");
+
+		if (noteApprovatore != null) {
+			setNoteApprovatore(noteApprovatore);
+		}
 	}
 
 	@JSON
@@ -416,6 +473,29 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 		return _originalCompanyId;
 	}
 
+	@JSON
+	@Override
+	public int getUnitaOperativa() {
+		return _unitaOperativa;
+	}
+
+	@Override
+	public void setUnitaOperativa(int unitaOperativa) {
+		_columnBitmask |= UNITAOPERATIVA_COLUMN_BITMASK;
+
+		if (!_setOriginalUnitaOperativa) {
+			_setOriginalUnitaOperativa = true;
+
+			_originalUnitaOperativa = _unitaOperativa;
+		}
+
+		_unitaOperativa = unitaOperativa;
+	}
+
+	public int getOriginalUnitaOperativa() {
+		return _originalUnitaOperativa;
+	}
+
 	@JSON
 	@Override
 	public long getUserId() {
@@ -534,6 +614,51 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 		return _originalGeologoUserId;
 	}
 
+	@JSON
+	@Override
+	public long getAssegnatoreUserId() {
+		return _assegnatoreUserId;
+	}
+
+	@Override
+	public void setAssegnatoreUserId(long assegnatoreUserId) {
+		_columnBitmask |= ASSEGNATOREUSERID_COLUMN_BITMASK;
+
+		if (!_setOriginalAssegnatoreUserId) {
+			_setOriginalAssegnatoreUserId = true;
+
+			_originalAssegnatoreUserId = _assegnatoreUserId;
+		}
+
+		_assegnatoreUserId = assegnatoreUserId;
+	}
+
+	@Override
+	public String getAssegnatoreUserUuid() throws SystemException {
+		return PortalUtil.getUserValue(getAssegnatoreUserId(), "uuid",
+			_assegnatoreUserUuid);
+	}
+
+	@Override
+	public void setAssegnatoreUserUuid(String assegnatoreUserUuid) {
+		_assegnatoreUserUuid = assegnatoreUserUuid;
+	}
+
+	public long getOriginalAssegnatoreUserId() {
+		return _originalAssegnatoreUserId;
+	}
+
+	@JSON
+	@Override
+	public Date getDtAssegnazione() {
+		return _dtAssegnazione;
+	}
+
+	@Override
+	public void setDtAssegnazione(Date dtAssegnazione) {
+		_dtAssegnazione = dtAssegnazione;
+	}
+
 	@JSON
 	@Override
 	public String getParere() {
@@ -702,6 +827,65 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 		_noteAnnullamento = noteAnnullamento;
 	}
 
+	@JSON
+	@Override
+	public long getApprovatoreUserId() {
+		return _approvatoreUserId;
+	}
+
+	@Override
+	public void setApprovatoreUserId(long approvatoreUserId) {
+		_approvatoreUserId = approvatoreUserId;
+	}
+
+	@Override
+	public String getApprovatoreUserUuid() throws SystemException {
+		return PortalUtil.getUserValue(getApprovatoreUserId(), "uuid",
+			_approvatoreUserUuid);
+	}
+
+	@Override
+	public void setApprovatoreUserUuid(String approvatoreUserUuid) {
+		_approvatoreUserUuid = approvatoreUserUuid;
+	}
+
+	@JSON
+	@Override
+	public Date getDtApprovazione() {
+		return _dtApprovazione;
+	}
+
+	@Override
+	public void setDtApprovazione(Date dtApprovazione) {
+		_columnBitmask |= DTAPPROVAZIONE_COLUMN_BITMASK;
+
+		if (_originalDtApprovazione == null) {
+			_originalDtApprovazione = _dtApprovazione;
+		}
+
+		_dtApprovazione = dtApprovazione;
+	}
+
+	public Date getOriginalDtApprovazione() {
+		return _originalDtApprovazione;
+	}
+
+	@JSON
+	@Override
+	public String getNoteApprovatore() {
+		if (_noteApprovatore == null) {
+			return StringPool.BLANK;
+		}
+		else {
+			return _noteApprovatore;
+		}
+	}
+
+	@Override
+	public void setNoteApprovatore(String noteApprovatore) {
+		_noteApprovatore = noteApprovatore;
+	}
+
 	@Override
 	public StagedModelType getStagedModelType() {
 		return new StagedModelType(PortalUtil.getClassNameId(
@@ -742,12 +926,15 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 		parereGeologoImpl.setUuid(getUuid());
 		parereGeologoImpl.setParereGeologoId(getParereGeologoId());
 		parereGeologoImpl.setCompanyId(getCompanyId());
+		parereGeologoImpl.setUnitaOperativa(getUnitaOperativa());
 		parereGeologoImpl.setUserId(getUserId());
 		parereGeologoImpl.setUserName(getUserName());
 		parereGeologoImpl.setCreateDate(getCreateDate());
 		parereGeologoImpl.setModifiedDate(getModifiedDate());
 		parereGeologoImpl.setGroupId(getGroupId());
 		parereGeologoImpl.setGeologoUserId(getGeologoUserId());
+		parereGeologoImpl.setAssegnatoreUserId(getAssegnatoreUserId());
+		parereGeologoImpl.setDtAssegnazione(getDtAssegnazione());
 		parereGeologoImpl.setParere(getParere());
 		parereGeologoImpl.setIntPraticaId(getIntPraticaId());
 		parereGeologoImpl.setDettPraticaId(getDettPraticaId());
@@ -759,6 +946,9 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 		parereGeologoImpl.setDtAnnullamento(getDtAnnullamento());
 		parereGeologoImpl.setUserIdAnnullamento(getUserIdAnnullamento());
 		parereGeologoImpl.setNoteAnnullamento(getNoteAnnullamento());
+		parereGeologoImpl.setApprovatoreUserId(getApprovatoreUserId());
+		parereGeologoImpl.setDtApprovazione(getDtApprovazione());
+		parereGeologoImpl.setNoteApprovatore(getNoteApprovatore());
 
 		parereGeologoImpl.resetOriginalValues();
 
@@ -816,6 +1006,10 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 
 		parereGeologoModelImpl._setOriginalCompanyId = false;
 
+		parereGeologoModelImpl._originalUnitaOperativa = parereGeologoModelImpl._unitaOperativa;
+
+		parereGeologoModelImpl._setOriginalUnitaOperativa = false;
+
 		parereGeologoModelImpl._originalGroupId = parereGeologoModelImpl._groupId;
 
 		parereGeologoModelImpl._setOriginalGroupId = false;
@@ -824,6 +1018,10 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 
 		parereGeologoModelImpl._setOriginalGeologoUserId = false;
 
+		parereGeologoModelImpl._originalAssegnatoreUserId = parereGeologoModelImpl._assegnatoreUserId;
+
+		parereGeologoModelImpl._setOriginalAssegnatoreUserId = false;
+
 		parereGeologoModelImpl._originalIntPraticaId = parereGeologoModelImpl._intPraticaId;
 
 		parereGeologoModelImpl._setOriginalIntPraticaId = false;
@@ -832,6 +1030,8 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 
 		parereGeologoModelImpl._originalDtAnnullamento = parereGeologoModelImpl._dtAnnullamento;
 
+		parereGeologoModelImpl._originalDtApprovazione = parereGeologoModelImpl._dtApprovazione;
+
 		parereGeologoModelImpl._columnBitmask = 0;
 	}
 
@@ -851,6 +1051,8 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 
 		parereGeologoCacheModel.companyId = getCompanyId();
 
+		parereGeologoCacheModel.unitaOperativa = getUnitaOperativa();
+
 		parereGeologoCacheModel.userId = getUserId();
 
 		parereGeologoCacheModel.userName = getUserName();
@@ -883,6 +1085,17 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 
 		parereGeologoCacheModel.geologoUserId = getGeologoUserId();
 
+		parereGeologoCacheModel.assegnatoreUserId = getAssegnatoreUserId();
+
+		Date dtAssegnazione = getDtAssegnazione();
+
+		if (dtAssegnazione != null) {
+			parereGeologoCacheModel.dtAssegnazione = dtAssegnazione.getTime();
+		}
+		else {
+			parereGeologoCacheModel.dtAssegnazione = Long.MIN_VALUE;
+		}
+
 		parereGeologoCacheModel.parere = getParere();
 
 		String parere = parereGeologoCacheModel.parere;
@@ -944,12 +1157,31 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 			parereGeologoCacheModel.noteAnnullamento = null;
 		}
 
+		parereGeologoCacheModel.approvatoreUserId = getApprovatoreUserId();
+
+		Date dtApprovazione = getDtApprovazione();
+
+		if (dtApprovazione != null) {
+			parereGeologoCacheModel.dtApprovazione = dtApprovazione.getTime();
+		}
+		else {
+			parereGeologoCacheModel.dtApprovazione = Long.MIN_VALUE;
+		}
+
+		parereGeologoCacheModel.noteApprovatore = getNoteApprovatore();
+
+		String noteApprovatore = parereGeologoCacheModel.noteApprovatore;
+
+		if ((noteApprovatore != null) && (noteApprovatore.length() == 0)) {
+			parereGeologoCacheModel.noteApprovatore = null;
+		}
+
 		return parereGeologoCacheModel;
 	}
 
 	@Override
 	public String toString() {
-		StringBundler sb = new StringBundler(41);
+		StringBundler sb = new StringBundler(53);
 
 		sb.append("{uuid=");
 		sb.append(getUuid());
@@ -957,6 +1189,8 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 		sb.append(getParereGeologoId());
 		sb.append(", companyId=");
 		sb.append(getCompanyId());
+		sb.append(", unitaOperativa=");
+		sb.append(getUnitaOperativa());
 		sb.append(", userId=");
 		sb.append(getUserId());
 		sb.append(", userName=");
@@ -969,6 +1203,10 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 		sb.append(getGroupId());
 		sb.append(", geologoUserId=");
 		sb.append(getGeologoUserId());
+		sb.append(", assegnatoreUserId=");
+		sb.append(getAssegnatoreUserId());
+		sb.append(", dtAssegnazione=");
+		sb.append(getDtAssegnazione());
 		sb.append(", parere=");
 		sb.append(getParere());
 		sb.append(", intPraticaId=");
@@ -991,6 +1229,12 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 		sb.append(getUserIdAnnullamento());
 		sb.append(", noteAnnullamento=");
 		sb.append(getNoteAnnullamento());
+		sb.append(", approvatoreUserId=");
+		sb.append(getApprovatoreUserId());
+		sb.append(", dtApprovazione=");
+		sb.append(getDtApprovazione());
+		sb.append(", noteApprovatore=");
+		sb.append(getNoteApprovatore());
 		sb.append("}");
 
 		return sb.toString();
@@ -998,7 +1242,7 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 
 	@Override
 	public String toXmlString() {
-		StringBundler sb = new StringBundler(64);
+		StringBundler sb = new StringBundler(82);
 
 		sb.append("<model><model-name>");
 		sb.append("it.tref.liferay.portos.bo.model.ParereGeologo");
@@ -1016,6 +1260,10 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 			"<column><column-name>companyId</column-name><column-value><![CDATA[");
 		sb.append(getCompanyId());
 		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>unitaOperativa</column-name><column-value><![CDATA[");
+		sb.append(getUnitaOperativa());
+		sb.append("]]></column-value></column>");
 		sb.append(
 			"<column><column-name>userId</column-name><column-value><![CDATA[");
 		sb.append(getUserId());
@@ -1040,6 +1288,14 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 			"<column><column-name>geologoUserId</column-name><column-value><![CDATA[");
 		sb.append(getGeologoUserId());
 		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>assegnatoreUserId</column-name><column-value><![CDATA[");
+		sb.append(getAssegnatoreUserId());
+		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>dtAssegnazione</column-name><column-value><![CDATA[");
+		sb.append(getDtAssegnazione());
+		sb.append("]]></column-value></column>");
 		sb.append(
 			"<column><column-name>parere</column-name><column-value><![CDATA[");
 		sb.append(getParere());
@@ -1084,6 +1340,18 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 			"<column><column-name>noteAnnullamento</column-name><column-value><![CDATA[");
 		sb.append(getNoteAnnullamento());
 		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>approvatoreUserId</column-name><column-value><![CDATA[");
+		sb.append(getApprovatoreUserId());
+		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>dtApprovazione</column-name><column-value><![CDATA[");
+		sb.append(getDtApprovazione());
+		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>noteApprovatore</column-name><column-value><![CDATA[");
+		sb.append(getNoteApprovatore());
+		sb.append("]]></column-value></column>");
 
 		sb.append("</model>");
 
@@ -1100,6 +1368,9 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 	private long _companyId;
 	private long _originalCompanyId;
 	private boolean _setOriginalCompanyId;
+	private int _unitaOperativa;
+	private int _originalUnitaOperativa;
+	private boolean _setOriginalUnitaOperativa;
 	private long _userId;
 	private String _userUuid;
 	private String _userName;
@@ -1112,6 +1383,11 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 	private String _geologoUserUuid;
 	private long _originalGeologoUserId;
 	private boolean _setOriginalGeologoUserId;
+	private long _assegnatoreUserId;
+	private String _assegnatoreUserUuid;
+	private long _originalAssegnatoreUserId;
+	private boolean _setOriginalAssegnatoreUserId;
+	private Date _dtAssegnazione;
 	private String _parere;
 	private long _intPraticaId;
 	private long _originalIntPraticaId;
@@ -1127,6 +1403,11 @@ public class ParereGeologoModelImpl extends BaseModelImpl<ParereGeologo>
 	private Date _originalDtAnnullamento;
 	private long _userIdAnnullamento;
 	private String _noteAnnullamento;
+	private long _approvatoreUserId;
+	private String _approvatoreUserUuid;
+	private Date _dtApprovazione;
+	private Date _originalDtApprovazione;
+	private String _noteApprovatore;
 	private long _columnBitmask;
 	private ParereGeologo _escapedModel;
 }

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

@@ -2,7 +2,7 @@ package it.tref.liferay.portos.bo.portlet;
 
 import it.mwg.sismica.bo.search.IntPraticaAdvancedSearch;
 import it.mwg.sismica.bo.shared.util.DocumentiPraticaUtil;
-import it.mwg.sismica.bo.shared.util.UnitaOperativeUtil;
+import it.mwg.sismica.bo.shared.util.UserUtil;
 import it.tref.liferay.portos.bo.model.Comune;
 import it.tref.liferay.portos.bo.model.DettPratica;
 import it.tref.liferay.portos.bo.model.DocPratica;
@@ -19,7 +19,6 @@ import it.tref.liferay.portos.bo.service.HistoryWorkflowActionLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.IntPraticaServiceUtil;
 import it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil;
-import it.tref.liferay.portos.bo.service.ParereGeologoServiceUtil;
 import it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil;
@@ -41,6 +40,7 @@ import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
@@ -110,37 +110,37 @@ public class FascicoloPortlet extends MVCPortlet {
 		super.render(request, response);
 	}
 
-	public void toggleWorkflow(ActionRequest actionRequest, ActionResponse actionResponse) {
+	public void toggleWorkflow(ActionRequest request, ActionResponse response) {
 
-		ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY);
+		ThemeDisplay themeDisplay = (ThemeDisplay) request.getAttribute(WebKeys.THEME_DISPLAY);
 		User user = themeDisplay.getUser();
-		boolean attivare = ParamUtil.getBoolean(actionRequest, "avviare");
-		boolean sospendere = ParamUtil.getBoolean(actionRequest, "sospendere");
-		long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", 0L);
-		String stato_pratica = ParamUtil.getString(actionRequest, "seleziona_stato");
+		boolean attivare = ParamUtil.getBoolean(request, "avviare");
+		boolean sospendere = ParamUtil.getBoolean(request, "sospendere");
+		long intPraticaId = ParamUtil.getLong(request, "intPraticaId", 0L);
+		String stato_pratica = ParamUtil.getString(request, "seleziona_stato");
 		try {
 			IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
 			Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
 			DettPratica dettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPraticaId);
-			ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest);
+			ServiceContext serviceContext = ServiceContextFactory.getInstance(request);
 			if (attivare && !sospendere) {
 				WorkflowUtil.attivaWorkflow(intPraticaId, territorio.getGroupId(), serviceContext.getUserId(),
 						dettPratica.getDettPraticaId(), serviceContext, true);
 				addRowHistoryWorkflowAction(intPraticaId, dettPratica.getDettPraticaId(), themeDisplay.getCompanyId(),
 						intPratica.getGroupId(), user, true);
-				SessionMessages.add(actionRequest, "success-workflow-ripreso");
+				SessionMessages.add(request, "success-workflow-ripreso");
 			} else if (!attivare && sospendere) {
 				WorkflowUtil.attivaWorkflow(intPraticaId, territorio.getGroupId(), serviceContext.getUserId(),
 						dettPratica.getDettPraticaId(), serviceContext, false);
 				addRowHistoryWorkflowAction(intPraticaId, dettPratica.getDettPraticaId(), themeDisplay.getCompanyId(),
 						intPratica.getGroupId(), user, false);
-				SessionMessages.add(actionRequest, "success-workflow-sospeso");
+				SessionMessages.add(request, "success-workflow-sospeso");
 			} else {
-				SessionErrors.add(actionRequest, "error-workflow-stato-incosistente");
+				SessionErrors.add(request, "error-workflow-stato-incosistente");
 			}
-			String redirectURL = ParamUtil.getString(actionRequest, "redirect");
+			String redirectURL = ParamUtil.getString(request, "redirect");
 			if (Validator.isNotNull(redirectURL)) {
-				actionResponse.sendRedirect(redirectURL);
+				response.sendRedirect(redirectURL);
 			}
 			if (!attivare) {
 				intPratica.setStatoPratica(stato_pratica);
@@ -152,7 +152,7 @@ public class FascicoloPortlet extends MVCPortlet {
 			IntPraticaLocalServiceUtil.reIndexFasciolo(intPraticaId, intPratica.getCompanyId());
 		} catch (Exception e) {
 			_log.error("error-workflow-sospeso", e);
-			SessionErrors.add(actionRequest, attivare ? "error-workflow-sospeso" : "error-workflow-ripreso");
+			SessionErrors.add(request, attivare ? "error-workflow-sospeso" : "error-workflow-ripreso");
 		}
 	}
 
@@ -173,155 +173,130 @@ public class FascicoloPortlet extends MVCPortlet {
 		HistoryWorkflowActionLocalServiceUtil.updateHistoryWorkflowAction(historyWorkflowAction);
 	}
 
-	public void toggleSospensione(ActionRequest actionRequest, ActionResponse actionResponse) {
+	public void toggleSospensione(ActionRequest request, ActionResponse response) {
 
-		long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", 0L);
-		boolean sospesa = ParamUtil.getBoolean(actionRequest, "sospesa");
+		long intPraticaId = ParamUtil.getLong(request, "intPraticaId", 0L);
+		boolean sospesa = ParamUtil.getBoolean(request, "sospesa");
 		try {
 			IntPraticaServiceUtil.sospendiPratica(intPraticaId, sospesa);
-			SessionMessages.add(actionRequest, sospesa ? "success-sospesa" : "success-ripresa");
+			SessionMessages.add(request, sospesa ? "success-sospesa" : "success-ripresa");
 		} catch (PortalException | SystemException e) {
 			_log.error("error-workflow-sospeso", e);
-			SessionErrors.add(actionRequest, sospesa ? "error-sospesa" : "error-ripresa");
+			SessionErrors.add(request, sospesa ? "error-sospesa" : "error-ripresa");
 		}
 	}
 
-	public void cambiaStato(ActionRequest actionRequest, ActionResponse actionResponse) {
+	public void cambiaStato(ActionRequest request, ActionResponse response) {
 
-		long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", 0L);
-		String statoPratica = ParamUtil.getString(actionRequest, "nuovoStatoPratica");
+		long intPraticaId = ParamUtil.getLong(request, "intPraticaId", 0L);
+		String statoPratica = ParamUtil.getString(request, "nuovoStatoPratica");
 		_log.info("cambiaSospendiRiprendi: INTPRATICAID" + intPraticaId);
 		try {
 			_log.info("cambiaSospendiRiprendi: INTPRATICAID" + intPraticaId + " NUOVO STATO: " + statoPratica);
 			IntPraticaServiceUtil.updateStatoPratica(intPraticaId, statoPratica);
-			SessionMessages.add(actionRequest, "success-cambio-stato");
+			SessionMessages.add(request, "success-cambio-stato");
 		} catch (PortalException | SystemException e) {
 			_log.error("error-workflow-sospeso", e);
-			SessionErrors.add(actionRequest, "error-cambio-stato");
+			SessionErrors.add(request, "error-cambio-stato");
 		}
 	}
 
-	public void aggiungiRichiestaParere(ActionRequest actionRequest, ActionResponse actionResponse) {
+	public void cambiaTitolare(ActionRequest request, ActionResponse response) {
 
-		long geologoId = ParamUtil.getLong(actionRequest, "geologoId");
-		long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId");
-		long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId");
-		String noteRichiedente = ParamUtil.getString(actionRequest, "noteRichiedente");
+		String nuovoSoggettoCF = ParamUtil.getString(request, "nuovoSoggettoCF");
+		long intPraticaId = ParamUtil.getLong(request, "intPraticaId", 0L);
+		long companyId = ParamUtil.getLong(request, "companyId");
 		try {
-			ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest);
-			serviceContext.setCreateDate(new Date());
-			serviceContext.setModifiedDate(new Date());
-			ParereGeologoServiceUtil.addParereGeologo(geologoId, intPraticaId, dettPraticaId, noteRichiedente,
-					serviceContext);
-		} catch (PortalException | SystemException e) {
-			_log.error("error-workflow-sospeso", e);
-			SessionErrors.add(actionRequest, "error-aggiunta-richiesta-parere");
-		}
-	}
-
-	public void cambiaTitolare(ActionRequest actionRequest, ActionResponse actionResponse) {
-
-		String nuovoSoggettoCF = ParamUtil.getString(actionRequest, "nuovoSoggettoCF");
-		long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", 0L);
-		long companyId = ParamUtil.getLong(actionRequest, "companyId");
-		try {
-			ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest);
+			ServiceContext serviceContext = ServiceContextFactory.getInstance(request);
 			User user = UserLocalServiceUtil.fetchUserByScreenName(companyId, nuovoSoggettoCF);
 			if (Validator.isNotNull(user)) {
 				IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
 				if (!intPratica.praticaInProgress()) {
 					_log.info("cambiaTitolare: cfNuovoTitolare " + nuovoSoggettoCF + " intpratica" + intPraticaId);
 					IntPraticaServiceUtil.cambiaTitolare(intPraticaId, user.getUserId(), serviceContext);
-					SessionMessages.add(actionRequest, "success-cambio-titolare");
+					SessionMessages.add(request, "success-cambio-titolare");
 				} else {
-					SessionErrors.add(actionRequest, "error-cambio-titolare-pratica-in-progress");
+					SessionErrors.add(request, "error-cambio-titolare-pratica-in-progress");
 				}
 			} else {
 				_log.error("[FASCICOLO ACTION - CAMBIO TITOLARE] Nessun utente trovato con company " + companyId
 						+ " e codice fiscale " + nuovoSoggettoCF);
-				SessionErrors.add(actionRequest, "error-cambio-titolare-no-such-user");
+				SessionErrors.add(request, "error-cambio-titolare-no-such-user");
 			}
 		} catch (PortalException | SystemException e) {
 			_log.error("error-cambio-titolare", e);
-			SessionErrors.add(actionRequest, "error-cambio-titolare");
+			SessionErrors.add(request, "error-cambio-titolare");
 		}
 	}
 
-	public void searchURL(ActionRequest actionRequest, ActionResponse actionResponse) {
-
-		String numeroProgetto = actionRequest.getParameter("numeroProgetto");
-		String statoPratica = actionRequest.getParameter("statoPratica");
-		String committente = actionRequest.getParameter("committente");
-		String tecnicoIstruttore = actionRequest.getParameter("tecnicoIstruttore");
-		String titolareDigitale = actionRequest.getParameter("titolareDigitale");
-		String soggettiInterconnessi = actionRequest.getParameter("soggettiInterconnessi");
-		String dataRichiestaInizio = actionRequest.getParameter("dataRichiestaInizio");
-		String dataRichiestaFine = actionRequest.getParameter("dataRichiestaFine");
-		String provincia = actionRequest.getParameter("provincia");
-		String comune = actionRequest.getParameter("comune");
-		String tipoIntervento = actionRequest.getParameter("tipoIntervento");
-		String tipoProcedura = ParamUtil.getString(actionRequest, "tipoProcedura");
-		String unitaOperativa = ParamUtil.getString(actionRequest, "unitaOperativa");
-		String geologi = ParamUtil.getString(actionRequest, "geologi");
-		String parereGeologo = ParamUtil.getString(actionRequest, "parereGeologo");
-		String istruttore = ParamUtil.getString(actionRequest, "istruttore");
-
+	public void searchURL(ActionRequest request, ActionResponse response) {
+
+		String numeroProgetto = request.getParameter("numeroProgetto");
+		String statoPratica = request.getParameter("statoPratica");
+		String committente = request.getParameter("committente");
+		String tecnicoIstruttore = request.getParameter("tecnicoIstruttore");
+		String titolareDigitale = request.getParameter("titolareDigitale");
+		String soggettiInterconnessi = request.getParameter("soggettiInterconnessi");
+		String dataRichiestaInizio = request.getParameter("dataRichiestaInizio");
+		String dataRichiestaFine = request.getParameter("dataRichiestaFine");
+		String provincia = request.getParameter("provincia");
+		String comune = request.getParameter("comune");
+		String tipoIntervento = request.getParameter("tipoIntervento");
+		String tipoProcedura = ParamUtil.getString(request, "tipoProcedura");
+		String unitaOperativa = ParamUtil.getString(request, "unitaOperativa");
+		String geologi = ParamUtil.getString(request, "geologi");
+		String parereGeologo = ParamUtil.getString(request, "parereGeologo");
+		String istruttore = ParamUtil.getString(request, "istruttore");
 		if (Validator.isNotNull(dataRichiestaInizio)) {
 			String[] dataRichiestaInizioSplitted = dataRichiestaInizio.split(StringPool.FORWARD_SLASH);
-			actionResponse.setRenderParameter("dataRichiestaInizioDay", dataRichiestaInizioSplitted[0]);
+			response.setRenderParameter("dataRichiestaInizioDay", dataRichiestaInizioSplitted[0]);
 			int month = Integer.valueOf(dataRichiestaInizioSplitted[1]) - 1;
-			actionResponse.setRenderParameter("dataRichiestaInizioMonth", String.valueOf(month));
-			actionResponse.setRenderParameter("dataRichiestaInizioYear", dataRichiestaInizioSplitted[2]);
+			response.setRenderParameter("dataRichiestaInizioMonth", String.valueOf(month));
+			response.setRenderParameter("dataRichiestaInizioYear", dataRichiestaInizioSplitted[2]);
 		}
 		if (Validator.isNotNull(dataRichiestaFine)) {
 			String[] dataRichiestaFineSplitted = dataRichiestaFine.split(StringPool.FORWARD_SLASH);
-			actionResponse.setRenderParameter("dataRichiestaFineDay", dataRichiestaFineSplitted[0]);
+			response.setRenderParameter("dataRichiestaFineDay", dataRichiestaFineSplitted[0]);
 			int month = Integer.valueOf(dataRichiestaFineSplitted[1]) - 1;
-			actionResponse.setRenderParameter("dataRichiestaFineMonth", String.valueOf(month));
-			actionResponse.setRenderParameter("dataRichiestaFineYear", dataRichiestaFineSplitted[2]);
+			response.setRenderParameter("dataRichiestaFineMonth", String.valueOf(month));
+			response.setRenderParameter("dataRichiestaFineYear", dataRichiestaFineSplitted[2]);
 		}
-		String ufficio = actionRequest.getParameter("ufficio");
-		String ordinaPer = actionRequest.getParameter("ordinaPer");
-		String ordinaTipo = actionRequest.getParameter("ordinaTipo");
+		String ufficio = request.getParameter("ufficio");
+		String ordinaPer = request.getParameter("ordinaPer");
+		String ordinaTipo = request.getParameter("ordinaTipo");
 		if (Validator.isNotNull(tipoIntervento)) {
-			actionResponse.setRenderParameter("tipoIntervento", tipoIntervento);
+			response.setRenderParameter("tipoIntervento", tipoIntervento);
 		}
-		actionResponse.setRenderParameter("numeroProgetto", numeroProgetto);
-		// actionResponse.setRenderParameter("praticaAperta", praticaAperta);
-		// actionResponse.setRenderParameter("descIntervento", descInterventoSearch);
-		// actionResponse.setRenderParameter("protocollo", protocollo);
-		// actionResponse.setRenderParameter("tipoPratica", tipoPratica);
-		actionResponse.setRenderParameter("statoPratica", statoPratica);
-		actionResponse.setRenderParameter("committente", committente);
+		response.setRenderParameter("numeroProgetto", numeroProgetto);
+		response.setRenderParameter("statoPratica", statoPratica);
+		response.setRenderParameter("committente", committente);
 		if (Validator.isNotNull(provincia)) {
-			actionResponse.setRenderParameter("provincia", provincia);
+			response.setRenderParameter("provincia", provincia);
 		}
 		if (Validator.isNotNull(comune)) {
-			actionResponse.setRenderParameter("comune", comune);
+			response.setRenderParameter("comune", comune);
 		}
-		// actionResponse.setRenderParameter("indirizzo", indirizzo);
 		if (Validator.isNull(tecnicoIstruttore)) {
-			actionResponse.setRenderParameter("tecnicoIstruttore", StringPool.BLANK);
+			response.setRenderParameter("tecnicoIstruttore", StringPool.BLANK);
 		} else {
-			actionResponse.setRenderParameter("tecnicoIstruttore", tecnicoIstruttore);
+			response.setRenderParameter("tecnicoIstruttore", tecnicoIstruttore);
 		}
-		actionResponse.setRenderParameter("titolareDigitale", titolareDigitale);
-		actionResponse.setRenderParameter("soggettiInterconnessi", soggettiInterconnessi);
-		actionResponse.setRenderParameter("dataRichiestaInizio", dataRichiestaInizio);
-		actionResponse.setRenderParameter("dataRichiestaFine", dataRichiestaFine);
+		response.setRenderParameter("titolareDigitale", titolareDigitale);
+		response.setRenderParameter("soggettiInterconnessi", soggettiInterconnessi);
+		response.setRenderParameter("dataRichiestaInizio", dataRichiestaInizio);
+		response.setRenderParameter("dataRichiestaFine", dataRichiestaFine);
 		if (Validator.isNull(ufficio)) {
-			actionResponse.setRenderParameter("ufficio", "-1");
+			response.setRenderParameter("ufficio", "-1");
 		} else {
-			actionResponse.setRenderParameter("ufficio", ufficio);
+			response.setRenderParameter("ufficio", ufficio);
 		}
-		actionResponse.setRenderParameter("ordinaPer", ordinaPer);
-		actionResponse.setRenderParameter("ordinaTipo", ordinaTipo);
-
-		actionResponse.setRenderParameter("tipoProcedura", tipoProcedura);
-		actionResponse.setRenderParameter("unitaOperativa", unitaOperativa);
-		actionResponse.setRenderParameter("geologi", geologi);
-		actionResponse.setRenderParameter("parereGeologo", parereGeologo);
-		actionResponse.setRenderParameter("istruttore", istruttore);
+		response.setRenderParameter("ordinaPer", ordinaPer);
+		response.setRenderParameter("ordinaTipo", ordinaTipo);
+		response.setRenderParameter("tipoProcedura", tipoProcedura);
+		response.setRenderParameter("unitaOperativa", unitaOperativa);
+		response.setRenderParameter("geologi", geologi);
+		response.setRenderParameter("parereGeologo", parereGeologo);
+		response.setRenderParameter("istruttore", istruttore);
 	}
 
 	@Override
@@ -399,14 +374,12 @@ public class FascicoloPortlet extends MVCPortlet {
 				writeJSON(resourceRequest, resourceResponse, jsonArray);
 			} else if ("unitaOperative".equals(id)) {
 				JSONArray jsonArray = JSONFactoryUtil.createJSONArray();
-
 				for (int i = 1; i < 11; i++) {
 					JSONObject jsonObject = JSONFactoryUtil.createJSONObject();
 					jsonObject.put("uoId", i);
 					jsonObject.put("descLong", i);
 					jsonArray.put(jsonObject);
 				}
-
 				writeJSON(resourceRequest, resourceResponse, jsonArray);
 			} else if ("comuni".equals(id)) {
 				String provinciaId = ParamUtil.getString(resourceRequest, "provinciaId");
@@ -446,7 +419,7 @@ public class FascicoloPortlet extends MVCPortlet {
 								org.getGroupId(), role.getRoleId());
 						for (UserGroupRole userGroupRole : istruttori) {
 							User istruttore = userGroupRole.getUser();
-							List<Integer> unitaOperativeIstruttore = UnitaOperativeUtil.getUnitaOperative(istruttore);
+							Set<Integer> unitaOperativeIstruttore = UserUtil.getUnitaOperative(istruttore);
 							if (unitaOperativeIstruttore.contains(uoId)) {
 								if (tecniciIstruttori.isEmpty()) {
 									tecniciIstruttori.add(userGroupRole);
@@ -647,24 +620,24 @@ public class FascicoloPortlet extends MVCPortlet {
 		return sb.toString();
 	}
 
-	public void setBollettinoImposta(ActionRequest actionRequest, ActionResponse actionResponse)
-			throws PortalException, SystemException {
+	public void setBollettinoImposta(ActionRequest request, ActionResponse response) throws PortalException,
+			SystemException {
 
 		try {
-			long idPagamento = ParamUtil.getLong(actionRequest, "idPagamento");
-			String numeroBollettino = ParamUtil.getString(actionRequest, "numeroBollettino");
+			long idPagamento = ParamUtil.getLong(request, "idPagamento");
+			String numeroBollettino = ParamUtil.getString(request, "numeroBollettino");
 			Pagamento pagamento = PagamentoLocalServiceUtil.fetchPagamento(idPagamento);
 			if (Validator.isNotNull(pagamento)) {
 				pagamento.setNumeroBollettino(numeroBollettino);
 				PagamentoLocalServiceUtil.updatePagamento(pagamento);
 			}
 			// PortalUtil.copyRequestParameters(actionRequest, actionResponse);
-			String redirectURL = ParamUtil.getString(actionRequest, "redirect");
+			String redirectURL = ParamUtil.getString(request, "redirect");
 			if (Validator.isNotNull(redirectURL)) {
-				actionResponse.sendRedirect(redirectURL);
+				response.sendRedirect(redirectURL);
 			}
 		} catch (Exception e) {
-			PortalUtil.copyRequestParameters(actionRequest, actionResponse);
+			PortalUtil.copyRequestParameters(request, response);
 			_log.error("Error", e);
 			throw new SystemException(e);
 		}

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

@@ -1,7 +1,7 @@
 package it.tref.liferay.portos.bo.portlet;
 
 import it.mwg.sismica.bo.search.IntPraticaAdvancedSearch;
-import it.mwg.sismica.bo.shared.util.UnitaOperativeUtil;
+import it.mwg.sismica.bo.shared.util.UserUtil;
 import it.tref.liferay.portos.bo.model.Comune;
 import it.tref.liferay.portos.bo.model.DettPratica;
 import it.tref.liferay.portos.bo.model.FineLavori;
@@ -29,6 +29,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
@@ -358,7 +359,7 @@ public class GestioneAttivitaIstruttorePortlet extends MVCPortlet {
 								org.getGroupId(), role.getRoleId());
 						for (UserGroupRole userGroupRole : istruttori) {
 							User istruttore = userGroupRole.getUser();
-							List<Integer> unitaOperativeIstruttore = UnitaOperativeUtil.getUnitaOperative(istruttore);
+							Set<Integer> unitaOperativeIstruttore = UserUtil.getUnitaOperative(istruttore);
 							if (unitaOperativeIstruttore.contains(uoId)) {
 								if (tecniciIstruttori.isEmpty()) {
 									tecniciIstruttori.add(userGroupRole);

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

@@ -2,7 +2,7 @@ package it.tref.liferay.portos.bo.portlet;
 
 import it.mwg.sismica.bo.search.ControlloPraticaAdvancedSearch;
 import it.mwg.sismica.bo.shared.util.AvvisoUtil;
-import it.mwg.sismica.bo.shared.util.UnitaOperativeUtil;
+import it.mwg.sismica.bo.shared.util.UserUtil;
 import it.tref.liferay.portos.bo.model.Comune;
 import it.tref.liferay.portos.bo.model.ControlloPratica;
 import it.tref.liferay.portos.bo.model.IntPratica;
@@ -22,7 +22,6 @@ import it.tref.liferay.portos.bo.shared.bean.IstruttoreBean;
 import it.tref.liferay.portos.bo.shared.util.ActionKeys;
 import it.tref.liferay.portos.bo.shared.util.Constants;
 import it.tref.liferay.portos.bo.util.WorkflowUtil;
-import it.tref.liferay.portos.mailmanager.shared.messaging.util.MailManagerUtil;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
@@ -32,6 +31,7 @@ import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import javax.portlet.ActionRequest;
@@ -42,6 +42,8 @@ import javax.portlet.ResourceResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.StringUtils;
+
 import com.liferay.portal.kernel.dao.orm.QueryUtil;
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
@@ -57,9 +59,7 @@ import com.liferay.portal.kernel.servlet.ServletResponseUtil;
 import com.liferay.portal.kernel.servlet.SessionErrors;
 import com.liferay.portal.kernel.util.CSVUtil;
 import com.liferay.portal.kernel.util.ContentTypes;
-import com.liferay.portal.kernel.util.FastDateFormatFactoryUtil;
 import com.liferay.portal.kernel.util.GetterUtil;
-import com.liferay.portal.kernel.util.LocaleUtil;
 import com.liferay.portal.kernel.util.ParamUtil;
 import com.liferay.portal.kernel.util.StringPool;
 import com.liferay.portal.kernel.util.Validator;
@@ -89,76 +89,76 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 
 	private static final Log _log = LogFactoryUtil.getLog(GestioneAttivitaPortlet.class);
 
-	public void search2URL(ActionRequest actionRequest, ActionResponse actionResponse) {
-
-		String tabs1 = ParamUtil.getString(actionRequest, "tabs1");
-		String numeroProgetto = ParamUtil.getString(actionRequest, "numeroProgetto");
-		String protocollo = ParamUtil.getString(actionRequest, "protocollo");
-		String tipoPratica = ParamUtil.getString(actionRequest, "tipoPratica");
-		String statoPratica = ParamUtil.getString(actionRequest, "statoPratica");
-		String committente = ParamUtil.getString(actionRequest, "committente");
-		String soggettiInterconnessi = ParamUtil.getString(actionRequest, "soggettiInterconnessi");
-		String istruttore = ParamUtil.getString(actionRequest, "istruttore");
-		String dataRichiestaInizio = ParamUtil.getString(actionRequest, "dataRichiestaInizio");
-		String dataRichiestaFine = ParamUtil.getString(actionRequest, "dataRichiestaFine");
-		String ufficio = ParamUtil.getString(actionRequest, "ufficio");
-		String ordinaPer = ParamUtil.getString(actionRequest, "ordinaPer");
-		String ordinaTipo = ParamUtil.getString(actionRequest, "ordinaTipo");
-		String comune = ParamUtil.getString(actionRequest, "comune");
-		String tipoAttivita = ParamUtil.getString(actionRequest, "tipoAttivita");
-		String tipoProcedura = ParamUtil.getString(actionRequest, "tipoProcedura");
-		String unitaOperativa = ParamUtil.getString(actionRequest, "unitaOperativa");
-		String provincia = ParamUtil.getString(actionRequest, "provincia");
-		String geologi = ParamUtil.getString(actionRequest, "geologi");
-		String parereGeologo = ParamUtil.getString(actionRequest, "parereGeologo");
-		actionResponse.setRenderParameter("tabs1", tabs1);
-		actionResponse.setRenderParameter("numeroProgetto", numeroProgetto);
-		actionResponse.setRenderParameter("protocollo", protocollo);
+	public void search2URL(ActionRequest request, ActionResponse response) {
+
+		String tabs1 = ParamUtil.getString(request, "tabs1");
+		String numeroProgetto = ParamUtil.getString(request, "numeroProgetto");
+		String protocollo = ParamUtil.getString(request, "protocollo");
+		String tipoPratica = ParamUtil.getString(request, "tipoPratica");
+		String statoPratica = ParamUtil.getString(request, "statoPratica");
+		String committente = ParamUtil.getString(request, "committente");
+		String soggettiInterconnessi = ParamUtil.getString(request, "soggettiInterconnessi");
+		String istruttore = ParamUtil.getString(request, "istruttore");
+		String dataRichiestaInizio = ParamUtil.getString(request, "dataRichiestaInizio");
+		String dataRichiestaFine = ParamUtil.getString(request, "dataRichiestaFine");
+		String ufficio = ParamUtil.getString(request, "ufficio");
+		String ordinaPer = ParamUtil.getString(request, "ordinaPer");
+		String ordinaTipo = ParamUtil.getString(request, "ordinaTipo");
+		String comune = ParamUtil.getString(request, "comune");
+		String tipoAttivita = ParamUtil.getString(request, "tipoAttivita");
+		String tipoProcedura = ParamUtil.getString(request, "tipoProcedura");
+		String unitaOperativa = ParamUtil.getString(request, "unitaOperativa");
+		String provincia = ParamUtil.getString(request, "provincia");
+		String geologi = ParamUtil.getString(request, "geologi");
+		String parereGeologo = ParamUtil.getString(request, "parereGeologo");
+		response.setRenderParameter("tabs1", tabs1);
+		response.setRenderParameter("numeroProgetto", numeroProgetto);
+		response.setRenderParameter("protocollo", protocollo);
 		// ADT - BUG-11 Aggiunta filtro ricerca
 		if (Validator.isNotNull(tipoPratica)) {
 			if (AvvisoUtil.TIPO_REPORT_CONTROLLO_OBBLIGATORIO.equalsIgnoreCase(tipoPratica)) {
 				tipoPratica = Constants.TIPO_PRATICA_DEPOSITO;
-				actionResponse.setRenderParameter("controlloObbligatorio", StringPool.TRUE);
+				response.setRenderParameter("controlloObbligatorio", StringPool.TRUE);
 			}
-			actionResponse.setRenderParameter("tipoPratica", tipoPratica);
+			response.setRenderParameter("tipoPratica", tipoPratica);
 		}
-		actionResponse.setRenderParameter("statoPratica", statoPratica);
-		actionResponse.setRenderParameter("committente", committente);
-		actionResponse.setRenderParameter("soggettiInterconnessi", soggettiInterconnessi);
-		actionResponse.setRenderParameter("istruttore", istruttore);
-		actionResponse.setRenderParameter("dataRichiestaInizio", dataRichiestaInizio);
-		actionResponse.setRenderParameter("dataRichiestaFine", dataRichiestaFine);
+		response.setRenderParameter("statoPratica", statoPratica);
+		response.setRenderParameter("committente", committente);
+		response.setRenderParameter("soggettiInterconnessi", soggettiInterconnessi);
+		response.setRenderParameter("istruttore", istruttore);
+		response.setRenderParameter("dataRichiestaInizio", dataRichiestaInizio);
+		response.setRenderParameter("dataRichiestaFine", dataRichiestaFine);
 		if (Validator.isNotNull(dataRichiestaInizio)) {
 			String[] dataRichiestaInizioSplitted = dataRichiestaInizio.split(StringPool.FORWARD_SLASH);
-			actionResponse.setRenderParameter("dataRichiestaInizioDay", dataRichiestaInizioSplitted[0]);
+			response.setRenderParameter("dataRichiestaInizioDay", dataRichiestaInizioSplitted[0]);
 			int month = Integer.valueOf(dataRichiestaInizioSplitted[1]) - 1;
-			actionResponse.setRenderParameter("dataRichiestaInizioMonth", String.valueOf(month));
-			actionResponse.setRenderParameter("dataRichiestaInizioYear", dataRichiestaInizioSplitted[2]);
+			response.setRenderParameter("dataRichiestaInizioMonth", String.valueOf(month));
+			response.setRenderParameter("dataRichiestaInizioYear", dataRichiestaInizioSplitted[2]);
 		}
 		if (Validator.isNotNull(dataRichiestaFine)) {
 			String[] dataRichiestaFineSplitted = dataRichiestaFine.split(StringPool.FORWARD_SLASH);
-			actionResponse.setRenderParameter("dataRichiestaFineDay", dataRichiestaFineSplitted[0]);
+			response.setRenderParameter("dataRichiestaFineDay", dataRichiestaFineSplitted[0]);
 			int month = Integer.valueOf(dataRichiestaFineSplitted[1]) - 1;
-			actionResponse.setRenderParameter("dataRichiestaFineMonth", String.valueOf(month));
-			actionResponse.setRenderParameter("dataRichiestaFineYear", dataRichiestaFineSplitted[2]);
+			response.setRenderParameter("dataRichiestaFineMonth", String.valueOf(month));
+			response.setRenderParameter("dataRichiestaFineYear", dataRichiestaFineSplitted[2]);
 		}
-		actionResponse.setRenderParameter("ufficio", ufficio);
-		actionResponse.setRenderParameter("ordinaPer", ordinaPer);
-		actionResponse.setRenderParameter("ordinaTipo", ordinaTipo);
-		actionResponse.setRenderParameter("comune", comune);
-		actionResponse.setRenderParameter("tipoAttivita", tipoAttivita);
-		actionResponse.setRenderParameter("tipoProcedura", tipoProcedura);
-		actionResponse.setRenderParameter("unitaOperativa", unitaOperativa);
-		actionResponse.setRenderParameter("provincia", provincia);
-		actionResponse.setRenderParameter("geologi", geologi);
-		actionResponse.setRenderParameter("parereGeologo", parereGeologo);
+		response.setRenderParameter("ufficio", ufficio);
+		response.setRenderParameter("ordinaPer", ordinaPer);
+		response.setRenderParameter("ordinaTipo", ordinaTipo);
+		response.setRenderParameter("comune", comune);
+		response.setRenderParameter("tipoAttivita", tipoAttivita);
+		response.setRenderParameter("tipoProcedura", tipoProcedura);
+		response.setRenderParameter("unitaOperativa", unitaOperativa);
+		response.setRenderParameter("provincia", provincia);
+		response.setRenderParameter("geologi", geologi);
+		response.setRenderParameter("parereGeologo", parereGeologo);
 	}
 
-	public void cambioIstruttore(ActionRequest actionRequest, ActionResponse actionResponse) {
+	public void cambioIstruttore(ActionRequest request, ActionResponse response) {
 
-		long controlloPraticaId = ParamUtil.getLong(actionRequest, "controlloPraticaId");
-		long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId");
-		long istruttoreId = ParamUtil.getLong(actionRequest, "istruttoreId");
+		long controlloPraticaId = ParamUtil.getLong(request, "controlloPraticaId");
+		long intPraticaId = ParamUtil.getLong(request, "intPraticaId");
+		long istruttoreId = ParamUtil.getLong(request, "istruttoreId");
 		try {
 			IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(intPraticaId);
 			if (Validator.isNotNull(intPratica.getStatusByUserId()) && intPratica.getStatusByUserId() != istruttoreId) {
@@ -168,16 +168,16 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 			}
 		} catch (PortalException | SystemException e) {
 			_log.error("error-cambio-istruttore", e);
-			SessionErrors.add(actionRequest, "error-cambio-istruttore");
+			SessionErrors.add(request, "error-cambio-istruttore");
 		}
 	}
 
-	public void riassegnaAlRuolo(ActionRequest actionRequest, ActionResponse actionResponse) {
+	public void riassegnaAlRuolo(ActionRequest request, ActionResponse response) {
 
-		long controlloPraticaId = ParamUtil.getLong(actionRequest, "controlloPraticaId");
-		long workflowTaskId = ParamUtil.getLong(actionRequest, "workflowTaskId");
+		long controlloPraticaId = ParamUtil.getLong(request, "controlloPraticaId");
+		long workflowTaskId = ParamUtil.getLong(request, "workflowTaskId");
 		try {
-			ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest);
+			ServiceContext serviceContext = ServiceContextFactory.getInstance(request);
 			ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil
 					.getControlloPratica(controlloPraticaId);
 			IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(controlloPratica.getIntPraticaId());
@@ -212,7 +212,7 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 			}
 		} catch (PortalException | SystemException e) {
 			_log.error("error-cambio-istruttore", e);
-			SessionErrors.add(actionRequest, "error-assegnazione-ruolo");
+			SessionErrors.add(request, "error-assegnazione-ruolo");
 		}
 	}
 
@@ -238,76 +238,39 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 		}
 	}
 
-	public void aggiungiRichiestaParere(ActionRequest actionRequest, ActionResponse actionResponse) {
-
-		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, noteRichiedente, serviceContext);
-			// ADT: aggiunta notifica geologo
-			invioNotificaGeologo(parereGeologo, serviceContext);
-		} catch (PortalException | SystemException e) {
-			_log.error(e, e);
-			SessionErrors.add(actionRequest, "error-aggiunta-richiesta-parere");
-		}
-	}
-
-	private static void invioNotificaGeologo(ParereGeologo parereGeologo, ServiceContext serviceContext) {
-
-		_log.info("start invioNotificaGeologo parereGeologo=" + parereGeologo.getParereGeologoId());
-		try {
-			User geologo = UserLocalServiceUtil.getUser(parereGeologo.getGeologoUserId());
-			IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(parereGeologo.getIntPraticaId());
-			_log.info("email geologo = " + geologo.getEmailAddress());
-			String[] to = { geologo.getEmailAddress() };
-			String[] cc = new String[0];
-			String[] ccn = new String[0];
-			String tipoPratica = StringPool.BLANK;
-			if (intPratica.isDeposito()) {
-				tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-01");
-			} else if (intPratica.isAutorizzazione()) {
-				tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-02");
+	public void aggiungiRichiestaParere(ActionRequest request, ActionResponse response) {
+
+		String destinatario = ParamUtil.getString(request, "destinatario");
+		String[] valori = StringUtils.split(destinatario, '|');
+		if (valori.length > 1) {
+			int unitaOperativa = Integer.parseInt(valori[0]);
+			long userId = Long.parseLong(valori[1]);
+			long intPraticaId = ParamUtil.getLong(request, "intPraticaId");
+			long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId");
+			String noteRichiedente = ParamUtil.getString(request, "noteRichiedente");
+			try {
+				Date now = new Date();
+				ServiceContext serviceContext = ServiceContextFactory.getInstance(request);
+				serviceContext.setCreateDate(now);
+				serviceContext.setModifiedDate(now);
+				ParereGeologo parereGeologo = ParereGeologoServiceUtil.addParereGeologo(unitaOperativa, userId,
+						intPraticaId, dettPraticaId, noteRichiedente, serviceContext);
+				// ADT: aggiunta notifica geologo
+				parereGeologo.invioNotifica(serviceContext);
+			} catch (PortalException | SystemException e) {
+				_log.error(e, e);
+				SessionErrors.add(request, "error-aggiunta-richiesta-parere");
 			}
-			Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
-			Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId());
-			Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(),
-					territorio.getCodiceProvincia());
-			JSONObject templateVariables = JSONFactoryUtil.createJSONObject();
-			templateVariables.put("receiver", geologo.getFullName());
-			templateVariables.put("tipoPratica", tipoPratica);
-			templateVariables.put("tipoOggetto", "Richiesta Parere");
-			templateVariables
-					.put("dataInvio",
-							FastDateFormatFactoryUtil.getSimpleDateFormat("dd/MM/yyyy HH:mm").format(
-									parereGeologo.getDtCompilazione() != null ? parereGeologo.getDtCompilazione()
-											: new Date()));
-			templateVariables.put("praticaNum", intPratica.getNumeroProgetto());
-			templateVariables.put("provincia", provincia.getProvincia());
-			templateVariables.put("comune", comune.getDenominazione());
-			String className = ParereGeologo.class.getName();
-			long classPk = parereGeologo.getParereGeologoId();
-			MailManagerUtil.sendMailByTemplatName(className, classPk, "NOTIFICA-GEOLOGO", to, cc, ccn,
-					templateVariables, null, serviceContext);
-		} catch (Exception e) {
-			_log.error(
-					"invioNotificaGeologo - Errore invio mail al geologo - ParereGeologoId="
-							+ parereGeologo.getParereGeologoId(), e);
 		}
 	}
 
-	public void aggiungiDettPraticheAlControllo(ActionRequest actionRequest, ActionResponse actionResponse)
-			throws PortalException, SystemException {
+	public void aggiungiDettPraticheAlControllo(ActionRequest request, ActionResponse response) throws PortalException,
+			SystemException {
 
-		ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest);
-		long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId");
-		long controlloPraticaId = ParamUtil.getLong(actionRequest, "controlloPraticaId");
-		long lastDettPraticaId = ParamUtil.getLong(actionRequest, "lastDettPraticaId");
+		ServiceContext serviceContext = ServiceContextFactory.getInstance(request);
+		long intPraticaId = ParamUtil.getLong(request, "intPraticaId");
+		long controlloPraticaId = ParamUtil.getLong(request, "controlloPraticaId");
+		long lastDettPraticaId = ParamUtil.getLong(request, "lastDettPraticaId");
 		ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.getControlloPratica(controlloPraticaId);
 		IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
 		if (lastDettPraticaId != controlloPratica.getDettPraticaId()
@@ -315,37 +278,32 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 			ControlloPraticaLocalServiceUtil.addPraticheAlControlloVarianti(controlloPraticaId, lastDettPraticaId,
 					serviceContext);
 		} else {
-			SessionErrors.add(actionRequest, "error-aggiunta-pratiche-al-controllo");
+			SessionErrors.add(request, "error-aggiunta-pratiche-al-controllo");
 		}
 	}
 
 	@Override
-	public void serveResource(ResourceRequest resourceRequest, ResourceResponse resourceResponse) throws IOException,
-			PortletException {
-
-		ThemeDisplay themeDisplay = (ThemeDisplay) resourceRequest.getAttribute(WebKeys.THEME_DISPLAY);
+	public void serveResource(ResourceRequest request, ResourceResponse response) throws IOException, PortletException {
 
+		ThemeDisplay themeDisplay = (ThemeDisplay) request.getAttribute(WebKeys.THEME_DISPLAY);
 		Locale locale = themeDisplay.getLocale();
 		User user = themeDisplay.getUser();
-		String cmd = ParamUtil.getString(resourceRequest, Constants.CMD);
-		String id = resourceRequest.getResourceID();
+		String cmd = ParamUtil.getString(request, Constants.CMD);
+		String id = request.getResourceID();
 		String csv = StringPool.BLANK;
-		HttpServletRequest request = PortalUtil.getHttpServletRequest(resourceRequest);
-		HttpServletResponse response = PortalUtil.getHttpServletResponse(resourceResponse);
+		HttpServletRequest httpRequest = PortalUtil.getHttpServletRequest(request);
+		HttpServletResponse httpResponse = PortalUtil.getHttpServletResponse(response);
 		if (cmd.equals("dirigente")) {
-			csv = exportToCSV(locale, resourceRequest, true, user);
+			csv = exportToCSV(locale, request, true, user);
 		} else if (cmd.equals("po")) {
-			csv = exportToCSV(locale, resourceRequest, false, user);
+			csv = exportToCSV(locale, request, false, user);
 		} else if (cmd.equals("exportRicercaMieAttivita") || cmd.equals("exportRicercaMieiRuoli")
 				|| cmd.equals("exportRicercaAltreAttivita") || cmd.equals("exportRicercaAttivitaConcluse")) {
-			csv = exportSearch(locale, resourceRequest, user, cmd);
+			csv = exportSearch(locale, request, user, cmd);
 		}
-		// ADT BUG BO ID= 1 SEZIONE ATTIVITÀ
-
 		try {
 			if ("comuniForUfficio".equals(id)) {
-
-				String ufficio = ParamUtil.getString(resourceRequest, "ufficioId");
+				String ufficio = ParamUtil.getString(request, "ufficioId");
 				JSONArray jsonArray = JSONFactoryUtil.createJSONArray();
 				List<Comune> comuni;
 				if (Validator.isNotNull(ufficio) && !ufficio.equals("0")) {
@@ -361,7 +319,7 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 
 								jsonArray.put(jsonObject);
 							}
-							writeJSON(resourceRequest, resourceResponse, jsonArray);
+							writeJSON(request, response, jsonArray);
 						} else {
 							comuni = ComuneLocalServiceUtil.getComuniForOrganizationByUserId(user.getUserId());
 							for (Comune comune : comuni) {
@@ -370,7 +328,7 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 								jsonObject.put("descLong", comune.getDenominazione());
 								jsonArray.put(jsonObject);
 							}
-							writeJSON(resourceRequest, resourceResponse, jsonArray);
+							writeJSON(request, response, jsonArray);
 						}
 					} catch (Exception e) {
 						e.printStackTrace();
@@ -387,20 +345,18 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 					jsonObject.put("descLong", provincia.getSigla() + " - " + provincia.getProvincia());
 					jsonArray.put(jsonObject);
 				}
-				writeJSON(resourceRequest, resourceResponse, jsonArray);
+				writeJSON(request, response, jsonArray);
 			} else if ("unitaOperative".equals(id)) {
 				JSONArray jsonArray = JSONFactoryUtil.createJSONArray();
-
 				for (int i = 1; i < 11; i++) {
 					JSONObject jsonObject = JSONFactoryUtil.createJSONObject();
 					jsonObject.put("uoId", i);
 					jsonObject.put("descLong", i);
 					jsonArray.put(jsonObject);
 				}
-
-				writeJSON(resourceRequest, resourceResponse, jsonArray);
+				writeJSON(request, response, jsonArray);
 			} else if ("comuni".equals(id)) {
-				String provinciaId = ParamUtil.getString(resourceRequest, "provinciaId");
+				String provinciaId = ParamUtil.getString(request, "provinciaId");
 				JSONArray jsonArray = JSONFactoryUtil.createJSONArray();
 				if (Validator.isNotNull(provinciaId) && !provinciaId.equals("0")) {
 					List<Long> comuniIds = TerritorioLocalServiceUtil.getActiveComuniByCodiceProvincia(provinciaId);
@@ -422,22 +378,21 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 						jsonArray.put(jsonObject);
 					}
 				}
-				writeJSON(resourceRequest, resourceResponse, jsonArray);
+				writeJSON(request, response, jsonArray);
 			} else if ("istruttore".equals(id)) {
-				Integer uoId = ParamUtil.getInteger(resourceRequest, "uoId");
+				Integer uoId = ParamUtil.getInteger(request, "uoId");
 				JSONArray jsonArray = JSONFactoryUtil.createJSONArray();
 				if (Validator.isNotNull(uoId) && !uoId.equals("-1")) {
 					List<Organization> organizationList = OrganizationLocalServiceUtil.getUserOrganizations(user
 							.getUserId());
 					List<UserGroupRole> tecniciIstruttori = new ArrayList<UserGroupRole>();
-
 					for (Organization org : organizationList) {
 						Role role = RoleLocalServiceUtil.getRole(org.getCompanyId(), Constants.ROLE_NAME_ISTRUTTORE);
 						List<UserGroupRole> istruttori = UserGroupRoleLocalServiceUtil.getUserGroupRolesByGroupAndRole(
 								org.getGroupId(), role.getRoleId());
 						for (UserGroupRole userGroupRole : istruttori) {
 							User istruttore = userGroupRole.getUser();
-							List<Integer> unitaOperativeIstruttore = UnitaOperativeUtil.getUnitaOperative(istruttore);
+							Set<Integer> unitaOperativeIstruttore = UserUtil.getUnitaOperative(istruttore);
 							if (unitaOperativeIstruttore.contains(uoId)) {
 								if (tecniciIstruttori.isEmpty()) {
 									tecniciIstruttori.add(userGroupRole);
@@ -456,7 +411,6 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 							}
 						}
 					}
-
 					List<IstruttoreBean> tecniciIstruttoriSorted = new ArrayList<IstruttoreBean>();
 					for (UserGroupRole tecnico : tecniciIstruttori) {
 						IstruttoreBean istruttore = new IstruttoreBean();
@@ -464,9 +418,7 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 						istruttore.setDenominazione(tecnico.getUser().getFullName());
 						tecniciIstruttoriSorted.add(istruttore);
 					}
-
 					Collections.sort(tecniciIstruttoriSorted);
-
 					for (IstruttoreBean istruttore : tecniciIstruttoriSorted) {
 						JSONObject jsonObject = JSONFactoryUtil.createJSONObject();
 						jsonObject.put("istruttoreId", istruttore.getIdIstruttore());
@@ -474,19 +426,15 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 						jsonArray.put(jsonObject);
 					}
 				}
-
-				writeJSON(resourceRequest, resourceResponse, jsonArray);
-
+				writeJSON(request, response, jsonArray);
 			} else if ("geologo".equals(id)) {
 				JSONArray jsonArray = JSONFactoryUtil.createJSONArray();
 				List<Organization> organizationList = OrganizationLocalServiceUtil.getUserOrganizations(user
 						.getUserId());
 				List<User> geologi = new ArrayList<User>();
-
 				for (Organization org : organizationList) {
 					Role role = RoleLocalServiceUtil.getRole(org.getCompanyId(), "portos_geologo");
 					List<User> geologiUsers = UserLocalServiceUtil.getRoleUsers(role.getRoleId());
-
 					for (User userGroupRole : geologiUsers) {
 						if (geologi.isEmpty()) {
 							geologi.add(userGroupRole);
@@ -504,23 +452,19 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 						}
 					}
 				}
-
 				for (User geo : geologi) {
 					JSONObject jsonObject = JSONFactoryUtil.createJSONObject();
 					jsonObject.put("geologoId", geo.getUserId());
 					jsonObject.put("descLong", geo.getFullName());
 					jsonArray.put(jsonObject);
 				}
-
-				writeJSON(resourceRequest, resourceResponse, jsonArray);
-
+				writeJSON(request, response, jsonArray);
 			}
 		} catch (Exception e) {
 			_log.error(e, e);
 			throw new IOException(e);
 		}
-
-		ServletResponseUtil.sendFile(request, response, "export_pratiche.csv", csv.getBytes(StringPool.UTF8),
+		ServletResponseUtil.sendFile(httpRequest, httpResponse, "export_pratiche.csv", csv.getBytes(StringPool.UTF8),
 				ContentTypes.TEXT_CSV_UTF8);
 	}
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerInvioDocumento.java

@@ -34,8 +34,10 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -255,14 +257,15 @@ public class SchedulerInvioDocumento implements MessageListener {
 		Soggetto committentePrincipale = SoggettoLocalServiceUtil.getValidByIntPratica_CodiceFiscale_TipologiaSoggetto(
 				intPraticaId, dettPratica.getCodiceFiscalePrincipaleCommittente(), TipoSoggettoUtil.COMMITTENTE);
 		if (null == committentePrincipale) {
-			_log.error("inviaMailNotifica: il committente principale non esiste, intPraticaId = " + intPraticaId);
+			_log.error("Il committente principale non esiste, intPraticaId = " + intPraticaId);
 		} else {
 			soggetti.remove(committentePrincipale);
 		}
-		String[] to = new String[soggetti.size()];
-		for (int i = 0; i < to.length; i++) {
-			to[i] = soggetti.get(i).getEmail();
+		Set<String> sTo = new HashSet<>();
+		for (Soggetto soggetto : soggetti) {
+			sTo.add(soggetto.getEmail());
 		}
+		String[] to = sTo.toArray(new String[sTo.size()]);
 		String[] cc = new String[0];
 		String[] ccn = new String[0];
 		String tipoPratica = StringPool.BLANK;

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 {
 		_methodName170 = "addParereGeologo";
 
 		_methodParameterTypes170 = new String[] {
-				"long", "long", "long", "java.lang.String",
+				"int", "long", "long", "long", "java.lang.String",
 				"com.liferay.portal.service.ServiceContext"
 			};
 
@@ -182,29 +182,49 @@ public class ParereGeologoLocalServiceClpInvoker {
 
 		_methodParameterTypes179 = new String[] { "long" };
 
-		_methodName180 = "countByGeologoIdInCorso";
+		_methodName180 = "findByUserDaApprovare";
 
-		_methodParameterTypes180 = new String[] { "long" };
+		_methodParameterTypes180 = new String[] {
+				"com.liferay.portal.model.User", "int", "int"
+			};
 
-		_methodName181 = "findByGeologoIdInCorso";
+		_methodName181 = "countByUserDaApprovare";
 
-		_methodParameterTypes181 = new String[] { "long", "int", "int" };
+		_methodParameterTypes181 = new String[] { "com.liferay.portal.model.User" };
 
-		_methodName182 = "findByCompanyIdGroupId";
+		_methodName182 = "findByUserDaAssegnare";
 
-		_methodParameterTypes182 = new String[] { "long", "long" };
+		_methodParameterTypes182 = new String[] {
+				"com.liferay.portal.model.User", "int", "int"
+			};
 
-		_methodName183 = "findWithParereByGeologoId";
+		_methodName183 = "countByUserDaAssegnare";
 
-		_methodParameterTypes183 = new String[] { "long", "int", "int" };
+		_methodParameterTypes183 = new String[] { "com.liferay.portal.model.User" };
 
-		_methodName184 = "countFindWithParereByGeologoId";
+		_methodName184 = "countByGeologoIdInCorso";
 
 		_methodParameterTypes184 = new String[] { "long" };
 
-		_methodName185 = "getCarichiLavoro";
+		_methodName185 = "findByGeologoIdInCorso";
+
+		_methodParameterTypes185 = new String[] { "long", "int", "int" };
+
+		_methodName186 = "findByCompanyIdGroupId";
+
+		_methodParameterTypes186 = new String[] { "long", "long" };
+
+		_methodName187 = "findWithParereByGeologoId";
 
-		_methodParameterTypes185 = new String[] { "long", "int" };
+		_methodParameterTypes187 = new String[] { "long", "int", "int" };
+
+		_methodName188 = "countFindWithParereByGeologoId";
+
+		_methodParameterTypes188 = new String[] { "long" };
+
+		_methodName189 = "getCarichiLavoro";
+
+		_methodParameterTypes189 = new String[] { "long", "int" };
 	}
 
 	public Object invokeMethod(String name, String[] parameterTypes,
@@ -334,11 +354,12 @@ public class ParereGeologoLocalServiceClpInvoker {
 
 		if (_methodName170.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes170, parameterTypes)) {
-			return ParereGeologoLocalServiceUtil.addParereGeologo(((Long)arguments[0]).longValue(),
+			return ParereGeologoLocalServiceUtil.addParereGeologo(((Integer)arguments[0]).intValue(),
 				((Long)arguments[1]).longValue(),
 				((Long)arguments[2]).longValue(),
-				(java.lang.String)arguments[3],
-				(com.liferay.portal.service.ServiceContext)arguments[4]);
+				((Long)arguments[3]).longValue(),
+				(java.lang.String)arguments[4],
+				(com.liferay.portal.service.ServiceContext)arguments[5]);
 		}
 
 		if (_methodName171.equals(name) &&
@@ -395,36 +416,60 @@ public class ParereGeologoLocalServiceClpInvoker {
 
 		if (_methodName180.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes180, parameterTypes)) {
-			return ParereGeologoLocalServiceUtil.countByGeologoIdInCorso(((Long)arguments[0]).longValue());
+			return ParereGeologoLocalServiceUtil.findByUserDaApprovare((com.liferay.portal.model.User)arguments[0],
+				((Integer)arguments[1]).intValue(),
+				((Integer)arguments[2]).intValue());
 		}
 
 		if (_methodName181.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes181, parameterTypes)) {
+			return ParereGeologoLocalServiceUtil.countByUserDaApprovare((com.liferay.portal.model.User)arguments[0]);
+		}
+
+		if (_methodName182.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes182, parameterTypes)) {
+			return ParereGeologoLocalServiceUtil.findByUserDaAssegnare((com.liferay.portal.model.User)arguments[0],
+				((Integer)arguments[1]).intValue(),
+				((Integer)arguments[2]).intValue());
+		}
+
+		if (_methodName183.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes183, parameterTypes)) {
+			return ParereGeologoLocalServiceUtil.countByUserDaAssegnare((com.liferay.portal.model.User)arguments[0]);
+		}
+
+		if (_methodName184.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes184, parameterTypes)) {
+			return ParereGeologoLocalServiceUtil.countByGeologoIdInCorso(((Long)arguments[0]).longValue());
+		}
+
+		if (_methodName185.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes185, parameterTypes)) {
 			return ParereGeologoLocalServiceUtil.findByGeologoIdInCorso(((Long)arguments[0]).longValue(),
 				((Integer)arguments[1]).intValue(),
 				((Integer)arguments[2]).intValue());
 		}
 
-		if (_methodName182.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes182, parameterTypes)) {
+		if (_methodName186.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes186, parameterTypes)) {
 			return ParereGeologoLocalServiceUtil.findByCompanyIdGroupId(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue());
 		}
 
-		if (_methodName183.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes183, parameterTypes)) {
+		if (_methodName187.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes187, parameterTypes)) {
 			return ParereGeologoLocalServiceUtil.findWithParereByGeologoId(((Long)arguments[0]).longValue(),
 				((Integer)arguments[1]).intValue(),
 				((Integer)arguments[2]).intValue());
 		}
 
-		if (_methodName184.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes184, parameterTypes)) {
+		if (_methodName188.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes188, parameterTypes)) {
 			return ParereGeologoLocalServiceUtil.countFindWithParereByGeologoId(((Long)arguments[0]).longValue());
 		}
 
-		if (_methodName185.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes185, parameterTypes)) {
+		if (_methodName189.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes189, parameterTypes)) {
 			return ParereGeologoLocalServiceUtil.getCarichiLavoro(((Long)arguments[0]).longValue(),
 				((Integer)arguments[1]).intValue());
 		}
@@ -508,4 +553,12 @@ public class ParereGeologoLocalServiceClpInvoker {
 	private String[] _methodParameterTypes184;
 	private String _methodName185;
 	private String[] _methodParameterTypes185;
+	private String _methodName186;
+	private String[] _methodParameterTypes186;
+	private String _methodName187;
+	private String[] _methodParameterTypes187;
+	private String _methodName188;
+	private String[] _methodParameterTypes188;
+	private String _methodName189;
+	private String[] _methodParameterTypes189;
 }

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 {
 		_methodName150 = "addParereGeologo";
 
 		_methodParameterTypes150 = new String[] {
-				"long", "long", "long", "java.lang.String",
+				"int", "long", "long", "long", "java.lang.String",
 				"com.liferay.portal.service.ServiceContext"
 			};
 
@@ -77,11 +77,12 @@ public class ParereGeologoServiceClpInvoker {
 
 		if (_methodName150.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes150, parameterTypes)) {
-			return ParereGeologoServiceUtil.addParereGeologo(((Long)arguments[0]).longValue(),
+			return ParereGeologoServiceUtil.addParereGeologo(((Integer)arguments[0]).intValue(),
 				((Long)arguments[1]).longValue(),
 				((Long)arguments[2]).longValue(),
-				(java.lang.String)arguments[3],
-				(com.liferay.portal.service.ServiceContext)arguments[4]);
+				((Long)arguments[3]).longValue(),
+				(java.lang.String)arguments[4],
+				(com.liferay.portal.service.ServiceContext)arguments[5]);
 		}
 
 		if (_methodName151.equals(name) &&

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

@@ -63,13 +63,14 @@ import java.rmi.RemoteException;
  */
 public class ParereGeologoServiceSoap {
 	public static it.tref.liferay.portos.bo.model.ParereGeologoSoap addParereGeologo(
-		long geologoUserId, long intPraticaId, long dettPraticaId,
+		int unitaOperativa, long userId, 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, noteRichiedente, serviceContext);
+			it.tref.liferay.portos.bo.model.ParereGeologo returnValue = ParereGeologoServiceUtil.addParereGeologo(unitaOperativa,
+					userId, intPraticaId, dettPraticaId, noteRichiedente,
+					serviceContext);
 
 			return it.tref.liferay.portos.bo.model.ParereGeologoSoap.toSoapModel(returnValue);
 		}

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

@@ -71,6 +71,7 @@ public class ConfigurazioneLocalServiceImpl extends ConfigurazioneLocalServiceBa
 			throws SystemException, PortalException {
 
 		synchronized (Configurazione.class) {
+			Date now = new Date();
 			Configurazione configurazione = null;
 			try {
 				configurazione = configurazionePersistence.findByC_Chiave(serviceContext.getCompanyId(), chiave);
@@ -79,12 +80,13 @@ public class ConfigurazioneLocalServiceImpl extends ConfigurazioneLocalServiceBa
 				configurazione = createConfigurazione(counterLocalService.increment(Configurazione.class.getName()));
 				configurazione.setChiave(chiave);
 				configurazione.setCompanyId(serviceContext.getCompanyId());
-				configurazione.setCreateDate(new Date());
+				configurazione.setCreateDate(now);
 				configurazione.setGroupId(serviceContext.getScopeGroupId());
 				configurazione.setUserId(serviceContext.getUserId());
 				configurazione.setUserName(userLocalService.getUser(serviceContext.getUserId()).getFullName());
 			}
 			configurazione.setValore(valore);
+			configurazione.setModifiedDate(now);
 			return updateConfigurazione(configurazione);
 		}
 	}

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

@@ -12,6 +12,7 @@ import it.mwg.sismica.bo.shared.bean.CarichiLavoroBean;
 import it.mwg.sismica.bo.shared.util.AvvisoUtil;
 import it.mwg.sismica.bo.shared.util.Generics;
 import it.mwg.sismica.bo.shared.util.UnitaOperativeUtil;
+import it.mwg.sismica.bo.shared.util.UserUtil;
 import it.mwg.sismica.bo.util.CarichiLavoroUtil;
 import it.mwg.sismica.bo.util.SismicaUtil;
 import it.tref.liferay.portos.bo.model.Avviso;
@@ -38,7 +39,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
-import java.util.TreeSet;
 
 import org.apache.commons.lang.StringUtils;
 
@@ -422,19 +422,12 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi
 		ControlloPratica controlloPratica = getControlloPratica(controlloPraticaId);
 		int unitaOperativa = intPraticaLocalService.getIntPratica(controlloPratica.getIntPraticaId())
 				.getUnitaOperativa();
-		long roleId = RoleLocalServiceUtil.getRole(controlloPratica.getCompanyId(), Constants.ROLE_NAME_ISTRUTTORE)
-				.getRoleId();
-		List<UserGroupRole> userGroupRoles = UserGroupRoleLocalServiceUtil.getUserGroupRolesByGroupAndRole(
-				controlloPratica.getGroupId(), roleId);
 		List<JSONObject> istruttori = new ArrayList<>();
 		if (unitaOperativa == 0) {
-			Set<Integer> unitaOperative = new TreeSet<>();
-			for (UserGroupRole userGroupRole : userGroupRoles) {
-				User user = userGroupRole.getUser();
-				unitaOperative.addAll(UnitaOperativeUtil.getUnitaOperative(user));
-			}
+			Set<Integer> unitaOperative = UnitaOperativeUtil.getUnitaOperative(controlloPratica.getCompanyId(),
+					controlloPratica.getGroupId(), Constants.ROLE_NAME_ISTRUTTORE);
 			for (Integer uo : unitaOperative) {
-				if (0 != uo) {
+				if (uo != 0) {
 					JSONObject unita = JSONFactoryUtil.createJSONObject();
 					unita.put("label", " > Unità operativa " + uo);
 					unita.put("value", "--UO--" + uo);
@@ -444,9 +437,13 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi
 			}
 		}
 		Map<String, JSONObject> ordinati = new TreeMap<>();
+		long roleId = RoleLocalServiceUtil.getRole(controlloPratica.getCompanyId(), Constants.ROLE_NAME_ISTRUTTORE)
+				.getRoleId();
+		List<UserGroupRole> userGroupRoles = UserGroupRoleLocalServiceUtil.getUserGroupRolesByGroupAndRole(
+				controlloPratica.getGroupId(), roleId);
 		for (UserGroupRole userGroupRole : userGroupRoles) {
 			User user = userGroupRole.getUser();
-			List<Integer> uo = UnitaOperativeUtil.getUnitaOperative(user);
+			Set<Integer> uo = UserUtil.getUnitaOperative(user);
 			if ((unitaOperativa == 0) || uo.contains(unitaOperativa)) {
 				JSONObject istruttore = JSONFactoryUtil.createJSONObject();
 				istruttore.put(

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

@@ -11,7 +11,7 @@ package it.tref.liferay.portos.bo.service.impl;
 import it.mwg.sismica.bo.search.IntPraticaAdvancedSearch;
 import it.mwg.sismica.bo.shared.util.AvvisoUtil;
 import it.mwg.sismica.bo.shared.util.DocumentiPraticaUtil;
-import it.mwg.sismica.bo.shared.util.UnitaOperativeUtil;
+import it.mwg.sismica.bo.shared.util.UserUtil;
 import it.mwg.sismica.bo.shared.util.WorkflowConstants;
 import it.tref.liferay.portos.bo.NoSuchIntPraticaException;
 import it.tref.liferay.portos.bo.model.AllegatoManuale;
@@ -821,14 +821,16 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl {
 		}
 		Date now = new Date();
 		try {
-			for (Avviso avviso : avvisoLocalService.findByIntPratica_Inviato(intPraticaId, AvvisoUtil.DOCUMENTO_NON_INVIATO, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
-				if(!avviso.isRifiutato() && avviso.getTipoAvviso().equalsIgnoreCase(AvvisoUtil.TIPO_AVVISO_FIRMA)){
+			for (Avviso avviso : avvisoLocalService.findByIntPratica_Inviato(intPraticaId,
+					AvvisoUtil.DOCUMENTO_NON_INVIATO, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
+				if (!avviso.isRifiutato() && avviso.getTipoAvviso().equalsIgnoreCase(AvvisoUtil.TIPO_AVVISO_FIRMA)) {
 					avviso.setAnnullato(true);
 					avviso.persist();
 				}
 			}
 		} catch (Exception e) {
-			_log.error("Errore in annullamento pratica - Impossibile annulare gli avvisi (intpraticaid="+intPraticaId+")");
+			_log.error("Errore in annullamento pratica - Impossibile annulare gli avvisi (intpraticaid=" + intPraticaId
+					+ ")");
 		}
 		intPratica.setModifiedDate(now);
 		intPratica.setStatoPratica(StatoPraticaConstants.ANNULLATA);
@@ -879,12 +881,12 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl {
 	public void cambiaIstruttore(long intPraticaId, long controlloPraticaId, long istruttoreId) throws PortalException,
 			SystemException {
 
-		List<Integer> uo = UnitaOperativeUtil.getUnitaOperative(userLocalService.getUser(istruttoreId));
 		ControlloPratica controlloPratica = controlloPraticaLocalService.getControlloPratica(controlloPraticaId);
 		IntPratica intPratica = getIntPratica(intPraticaId);
 		intPratica.setStatusByUserId(istruttoreId);
 		intPratica.setStatusDate(new Date());
-		intPratica.setUnitaOperativa(uo.get(uo.size() - 1));
+		User istruttore = userLocalService.getUser(istruttoreId);
+		intPratica.setUnitaOperativa(UserUtil.getUnitaOperative(istruttore).last());
 		intPratica = updateIntPratica(intPratica);
 		DettPratica dettPratica = dettPraticaLocalService.getLastCompletedByIntPratica(intPraticaId);
 		User user = PermissionThreadLocal.getPermissionChecker().getUser();

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

@@ -9,6 +9,7 @@
 package it.tref.liferay.portos.bo.service.impl;
 
 import it.mwg.sismica.bo.shared.bean.CarichiLavoroBean;
+import it.mwg.sismica.bo.shared.util.UserUtil;
 import it.mwg.sismica.bo.util.CarichiLavoroUtil;
 import it.tref.liferay.portos.bo.model.ControlloPratica;
 import it.tref.liferay.portos.bo.model.IntPratica;
@@ -30,6 +31,8 @@ import com.liferay.portal.kernel.dao.orm.OrderFactoryUtil;
 import com.liferay.portal.kernel.dao.orm.RestrictionsFactoryUtil;
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.repository.model.FileEntry;
 import com.liferay.portal.kernel.repository.model.Folder;
 import com.liferay.portal.kernel.util.MimeTypesUtil;
@@ -62,23 +65,39 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase
 	 * it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil} to access the parere geologo local service.
 	 */
 
+	private static final Log _log = LogFactoryUtil.getLog(ParereGeologoLocalServiceImpl.class);
+
 	@Override
-	public ParereGeologo addParereGeologo(long geologoUserId, long intPraticaId, long dettPraticaId,
+	public ParereGeologo addParereGeologo(int unitaOperativa, long userId, long intPraticaId, long dettPraticaId,
 			String noteRichiedente, ServiceContext serviceContext) throws SystemException, PortalException {
 
-		long parereGeologoId = counterLocalService.increment(ParereGeologo.class.getName());
-		ParereGeologo parereGeologo = parereGeologoPersistence.create(parereGeologoId);
+		long geologoUserId = 0;
+		long assegnatoreUserId = 0;
+		if (unitaOperativa < 0) {
+			unitaOperativa = intPraticaLocalService.getIntPratica(intPraticaId).getUnitaOperativa();
+			assegnatoreUserId = serviceContext.getUserId();
+			geologoUserId = userId;
+		} else {
+			assegnatoreUserId = userId;
+		}
+		ParereGeologo parereGeologo = parereGeologoPersistence.create(counterLocalService.increment(ParereGeologo.class
+				.getName()));
 		parereGeologo.setCompanyId(serviceContext.getCompanyId());
 		User user = userLocalService.getUser(serviceContext.getUserId());
 		parereGeologo.setUserId(user.getUserId());
-		parereGeologo.setUserName(user.getScreenName());
+		parereGeologo.setUserName(user.getFullName());
 		parereGeologo.setCreateDate(serviceContext.getCreateDate());
 		parereGeologo.setModifiedDate(serviceContext.getModifiedDate());
-		parereGeologo.setGroupId(serviceContext.getScopeGroupId());
+		parereGeologo.setGroupId(intPraticaLocalService.getIntPratica(intPraticaId).getGroupId());
 		parereGeologo.setIntPraticaId(intPraticaId);
 		parereGeologo.setDettPraticaId(dettPraticaId);
+		parereGeologo.setUnitaOperativa(unitaOperativa);
 		parereGeologo.setGeologoUserId(geologoUserId);
-		parereGeologo.setDtRichista(new Date());
+		parereGeologo.setAssegnatoreUserId(assegnatoreUserId);
+		if (geologoUserId != 0) {
+			parereGeologo.setDtAssegnazione(serviceContext.getModifiedDate());
+		}
+		parereGeologo.setDtRichista(serviceContext.getCreateDate());
 		parereGeologo.setNoteRichiedente(noteRichiedente);
 		return parereGeologoPersistence.update(parereGeologo);
 	}
@@ -118,7 +137,6 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase
 						now.getTime() + StringPool.UNDERLINE + fileName, mimeType, title, description, changeLog,
 						content, serviceContext);
 				fileEntryId = fileEntry.getFileEntryId();
-
 				parereGeologo.setFileEntryId(fileEntryId);
 			}
 			return updateParereGeologo(parereGeologo);
@@ -187,6 +205,42 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase
 		return parereGeologoPersistence.countByIntPraticaId_DtCompilazione_DtAnnullamento(intPraticaId, null, null);
 	}
 
+	@Override
+	public List<ParereGeologo> findByUserDaApprovare(User user, int start, int end) throws SystemException {
+
+		return parereGeologoPersistence
+				.findByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(
+						UserUtil.getGroupIds(user), UserUtil.getUnitaOperativeArray(user),
+						new long[] { 0L, user.getUserId() }, null, null, null, start, end,
+						OrderByComparatorFactoryUtil.create(ParereGeologoImpl.TABLE_NAME, "dtCompilazione", false));
+	}
+
+	@Override
+	public int countByUserDaApprovare(User user) throws SystemException {
+
+		return parereGeologoPersistence
+				.countByGroup_UnitaOperativa_Assegnatore_NotDtCompilazione_NotDtAnnullamento_DtApprovazione(
+						UserUtil.getGroupIds(user), UserUtil.getUnitaOperativeArray(user),
+						new long[] { 0L, user.getUserId() }, null, null, null);
+	}
+
+	@Override
+	public List<ParereGeologo> findByUserDaAssegnare(User user, int start, int end) throws SystemException {
+
+		return parereGeologoPersistence.findByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(
+				UserUtil.getGroupIds(user), UserUtil.getUnitaOperativeArray(user), 0L,
+				new long[] { 0L, user.getUserId() }, null, null, start, end,
+				OrderByComparatorFactoryUtil.create(ParereGeologoImpl.TABLE_NAME, "dtRichista", false));
+	}
+
+	@Override
+	public int countByUserDaAssegnare(User user) throws SystemException {
+
+		return parereGeologoPersistence.countByGroup_UnitaOperativa_Geologo_Assegnatore_DtCompilazione_DtAnnullamento(
+				UserUtil.getGroupIds(user), UserUtil.getUnitaOperativeArray(user), 0L,
+				new long[] { 0L, user.getUserId() }, null, null);
+	}
+
 	@Override
 	public int countByGeologoIdInCorso(long geologoUserId) throws SystemException {
 

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

@@ -42,14 +42,14 @@ public class ParereGeologoServiceImpl extends ParereGeologoServiceBaseImpl {
 	 */
 
 	@Override
-	public ParereGeologo addParereGeologo(long geologoUserId, long intPraticaId, long dettPraticaId,
+	public ParereGeologo addParereGeologo(int unitaOperativa, long userId, long intPraticaId, long dettPraticaId,
 			String noteRichiedente, ServiceContext serviceContext) throws SystemException, PortalException {
 
 		IntPratica intPratica = intPraticaLocalService.getIntPratica(intPraticaId);
 		Territorio territorio = territorioLocalService.getTerritorio(intPratica.getTerritorioId());
 		IntPraticaPermission.check(getPermissionChecker(), territorio.getGroupId(), ActionKeys.RICHIEDI_PARERE_GEOLOGO);
-		return parereGeologoLocalService.addParereGeologo(geologoUserId, intPraticaId, dettPraticaId, noteRichiedente,
-				serviceContext);
+		return parereGeologoLocalService.addParereGeologo(unitaOperativa, userId, intPraticaId, dettPraticaId,
+				noteRichiedente, serviceContext);
 	}
 
 	@Override

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

@@ -1,4 +1,5 @@
 application.startup.events=\
+	it.mwg.sismica.bo.startup.DatabaseUpdateAction,\
 	it.tref.liferay.portos.bo.startup.RoleUpdateAction,\
 	it.tref.liferay.portos.bo.startup.KaleoListenereStartupAction,\
 	it.tref.liferay.portos.bo.startup.CompanyExpandoStartupAction

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

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_bo
-    build.number=3468
-    build.date=1634740817864
+    build.number=3510
+    build.date=1635413295815
     build.auto.upgrade=true
 
 ##

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp

@@ -1,3 +1,4 @@
+<%@page import="it.mwg.sismica.bo.shared.util.Generics"%>
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants"%>
 <%@page import="it.tref.liferay.portos.bo.shared.util.Constants"%>
@@ -62,7 +63,7 @@ List<ParereGeologo> pareri = ParereGeologoLocalServiceUtil.findByIntPraticaId(in
 		<liferay-ui:icon url="<%= carichiDiLavoroGeologo %>" useDialog="true" message="visualizza-carichi-di-lavoro"
 				linkCssClass="btn btn-rounded" iconCssClass="icon-bar-chart" />
 		<p class="text_attivita">
-			<strong>Parere Endoprocedimentale: </strong>
+			<strong>Pareri endoprocedimentali:</strong>
 		</p>
 	</div>
 	<ul class="list-geo">
@@ -70,35 +71,65 @@ List<ParereGeologo> pareri = ParereGeologoLocalServiceUtil.findByIntPraticaId(in
 	if (pareri.isEmpty()) {
 		out.print("nessun parere richiesto");
 	} else {
-		SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
 		for (ParereGeologo parere : pareri) {
-			User geologo = UserLocalServiceUtil.getUser(parere.getGeologoUserId());
+			StringBuilder fullName = new StringBuilder();
+			if (parere.getUnitaOperativa() != 0) {
+				fullName.append("U.O. ").append(parere.getUnitaOperativa());
+			}
+			if (parere.getGeologoUserId() != 0) {
+				if (fullName.length() > 0) {
+					fullName.append(" - ");
+				}
+				fullName.append(UserLocalServiceUtil.getUser(parere.getGeologoUserId()).getFullName());
+			}
 			User richiedente = UserLocalServiceUtil.getUser(parere.getUserId());
+			User assegnatore = parere.getAssegnatoreUserId() == 0 ? null
+					: UserLocalServiceUtil.getUser(parere.getAssegnatoreUserId());
+			User geologo = parere.getGeologoUserId() == 0 ? null
+					: UserLocalServiceUtil.getUser(parere.getGeologoUserId());
+			User annullante = parere.getUserIdAnnullamento() == 0 ? null
+					: UserLocalServiceUtil.getUser(parere.getUserIdAnnullamento());
 	%>
 		<li>
 			<c:choose>
 				<c:when test="<%= Validator.isNotNull(parere.getDtAnnullamento()) %>">
-					<i class="fa icon-remove text-error"></i>
+					<i class="fa icon-remove text-error" title="Richiesta annullata"></i>
 				</c:when>
 				<c:when test="<%= Validator.isNotNull(parere.getDtCompilazione()) %>">
-					<i class="fa icon-ok text-success"></i>
+					<i class="fa icon-ok text-success" title="Parere espresso"></i>
 				</c:when>
 				<c:otherwise>
-					<i class="fa icon-time text-info"></i>
+					<i class="fa icon-time text-info" title="Parere non espresso"></i>
 				</c:otherwise>
 			</c:choose>
-			<strong><%= geologo.getFullName() %></strong>,
-			richiesto da <strong><%= richiedente.getFullName() %></strong>
-			<c:if test="<%= Validator.isNotNull(parere.getDtRichista()) %>">
-				in data <strong><%= sdf.format(parere.getDtRichista()) %></strong>
-			</c:if>
 			<c:if test="<%= Validator.isNotNull(parere.getNoteRichiedente()) %>">
-				con le seguenti <strong>note</strong>: <%= parere.getNoteRichiedente() %>
+				Note del richiedente: <%= parere.getNoteRichiedente() %><br />
+			</c:if>
+			<c:if test="<%= richiedente.getUserId() != parere.getAssegnatoreUserId() %>">
+				Richiesto da <strong><%= Generics.capitalizeFull(richiedente.getFullName()) %></strong>
+				<c:if test="<%= parere.getUnitaOperativa() != 0 %>">
+					a <%= assegnatore == null ? "tutti gli assegnatori"
+							: "<strong>" + Generics.capitalizeFull(assegnatore.getFullName()) + "</strong>" %>
+					di U.O. <%= parere.getUnitaOperativa() %>
+				</c:if>
+				<c:if test="<%= Validator.isNotNull(parere.getDtRichista()) %>">
+					in data <%= dateFormatDateTime.format(parere.getDtRichista()) %>
+				</c:if>
+				<br />
+			</c:if>
+			<c:if test="<%= assegnatore != null && geologo != null %>">
+				Assegnato da <strong><%= Generics.capitalizeFull(assegnatore.getFullName()) %></strong>
+				a <strong><%= Generics.capitalizeFull(geologo.getFullName()) %></strong>
+				<c:if test="<%= Validator.isNotNull(parere.getDtAssegnazione()) %>">
+					in data <%= dateFormatDateTime.format(parere.getDtAssegnazione()) %>
+				</c:if>
+				<br />
 			</c:if>
-			<br/>
 			<c:if test="<%= Validator.isNotNull(parere.getDtCompilazione()) %>">
-				Parere espresso in data <strong><%= sdf.format(parere.getDtCompilazione()) %></strong>:
-				<%= parere.getParere() %>
+				Espresso da <strong><%= Generics.capitalizeFull(geologo.getFullName()) %></strong>
+				in data <%= dateFormatDateTime.format(parere.getDtCompilazione()) %>
+				<br />
+				<strong>Parere:</strong> <%= parere.getParere() %>
 				<c:if test="<%= Validator.isNotNull(parere.getFileEntryId()) %>">
 					<%
 					FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(parere.getFileEntryId());
@@ -110,15 +141,9 @@ List<ParereGeologo> pareri = ParereGeologoLocalServiceUtil.findByIntPraticaId(in
 							cssClass="download_container" />
 				</c:if>
 			</c:if>
-			<c:if test="<%= Validator.isNull(parere.getDtCompilazione()) %>">
-				Parere non espresso
-			</c:if>
-			<c:if test="<%= Validator.isNotNull(parere.getDtAnnullamento()) %>">
-				<%
-				User annullante = UserLocalServiceUtil.getUser(parere.getUserIdAnnullamento());
-				%>
-				<br/>Richiesta annullata da <strong><%= annullante.getFullName() %></strong>
-				in data <strong><%= sdf.format(parere.getDtAnnullamento()) %></strong>
+			<c:if test="<%= annullante != null %>">
+				<br/>Annullato da <strong><%= Generics.capitalizeFull(annullante.getFullName()) %></strong>
+				in data <%= dateFormatDateTime.format(parere.getDtAnnullamento()) %>
 				con motivazioni: <%= parere.getNoteAnnullamento() %>
 			</c:if>
 		</li>

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/action_button.jsp

@@ -40,7 +40,7 @@ long lastDettPraticaId = DettPraticaLocalServiceUtil.getLastCompletedByIntPratic
 		intPratica.getIntPraticaId()).getDettPraticaId();
 String randomId = StringUtil.randomId();
 String buttonIdCambioIstruttore = "buttonIdCambioIstruttore_" + randomId;
-String buttonIdSelezionaGeologo = "buttonIdSelezionaGeologo_" + randomId;
+String buttonIdRichiediParere = "buttonIdRichiediParere_" + randomId;
 String buttonIdAnnullaRicGeologo = "buttonIdAnnullaRicGeologo_" + randomId;
 String buttonIdAggiungiDettPraticheAlControllo = "buttonIdAggiungiDettPraticheAlControllo_" + randomId;
 Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
@@ -123,17 +123,17 @@ long territorioGroupId = territorio.getGroupId();
 					<c:if test="<%= listaTask.get(0).getName().equalsIgnoreCase(
 									WorkflowConstants.WORKFLOW_TASKNAME_ASSEGNAZIONE)
 							|| listaTask.get(0).getName().equalsIgnoreCase(WorkflowConstants.WORKFLOW_TASKNAME_ESITO) %>">
-						<liferay-util:include page="/html/gestioneattivita/actions/action_seleziona_geologo.jsp"
-								servletContext="<%= application %>" >
+						<liferay-util:include servletContext="<%= application %>"
+								page="/html/gestioneattivita/actions/action_aggiungi_richiesta_parere.jsp">
 							<liferay-util:param name="intPraticaId"
 								value="<%= String.valueOf(intPratica.getIntPraticaId()) %>" />
 							<liferay-util:param name="dettPraticaId"
 									value="<%= String.valueOf(controlloPratica.getDettPraticaId()) %>" />
-							<liferay-util:param name="buttonIdSelezionaGeologo" value="<%= buttonIdSelezionaGeologo %>" />
+							<liferay-util:param name="buttonIdRichiediParere" value="<%= buttonIdRichiediParere %>" />
 						</liferay-util:include>
 						<div title='<%= LanguageUtil.get(pageContext, "fascicolo-action-seleziona-geologo") %>'
 								class="tooltip-info">
-							<liferay-ui:icon id="<%= buttonIdSelezionaGeologo %>" linkCssClass="btn btn-action"
+							<liferay-ui:icon id="<%= buttonIdRichiediParere %>" linkCssClass="btn btn-action"
 									iconCssClass="fa fa-globe" message="" url="#" />
 						</div>
 					</c:if>

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

@@ -0,0 +1,67 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@page import="com.liferay.portal.kernel.util.ListUtil"%>
+<%@page import="com.liferay.portal.model.User"%>
+<%@page import="com.liferay.portal.service.OrganizationLocalServiceUtil"%>
+<%@page import="com.liferay.portal.service.UserLocalServiceUtil"%>
+<%@page import="it.mwg.sismica.bo.shared.util.Generics"%>
+<%@page import="it.tref.liferay.portos.bo.util.Constants"%>
+<%@page import="java.util.Map"%>
+<%@include file="/html/gestioneattivita/init.jsp"%>
+<%
+long intPraticaId = ParamUtil.getLong(request, "intPraticaId");
+IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
+long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId");
+String buttonIdRichiediParere = ParamUtil.getString(request, "buttonIdRichiediParere");
+String randomId = StringUtil.randomId();
+String formNameRichiediParere = "formNameRichiediParere_" + randomId;
+String divIdRichiediParere = "divIdRichiediParere_" + randomId;
+Map<String, User> lista = intPratica.getGeologiPerParere();
+%>
+<liferay-portlet:actionURL name="aggiungiRichiestaParere" var="aggiungiRichiestaParereURL">
+	<liferay-util:param name="intPraticaId" value="<%= String.valueOf(intPraticaId) %>" />
+	<liferay-util:param name="dettPraticaId" value="<%= String.valueOf(dettPraticaId) %>" />
+	<liferay-util:param name="redirect" value="<%= currentURL %>" />
+</liferay-portlet:actionURL>
+<aui:form name="<%= formNameRichiediParere %>" method="post" action="<%= aggiungiRichiestaParereURL %>">
+	<div id='<%= renderResponse.getNamespace() + divIdRichiediParere %>' class="hide">
+		<aui:select name="destinatario" label="" required="true">
+			<aui:option label="Seleziona destinatario" value="" />
+			<%
+			for (String chiave : lista.keySet()) {
+				User geologo = lista.get(chiave);
+				int unitaOperativa = Integer.valueOf(chiave.substring(0, 3));
+				String label;
+				String value;
+				String style = StringPool.BLANK;
+				if (Validator.isNull(geologo)) {
+					label = "U.O. " + unitaOperativa + ": tutti gli assegnatori"; 
+					value = unitaOperativa + "|0";
+					style = "font-weight:bold";
+				} else {
+					label = Generics.capitalizeFull(geologo.getFullName()) + " - "
+							+ geologo.getScreenName().toLowerCase();
+					if (unitaOperativa == intPratica.getUnitaOperativa()) {
+						value = "-1|" + String.valueOf(geologo.getUserId());
+					} else {
+						value = unitaOperativa + StringPool.PIPE + String.valueOf(geologo.getUserId());
+					}
+				}
+			%>
+				<aui:option style="<%= style %>" label='<%= label %>' value="<%= value %>" />
+			<%
+			}
+			%>
+		</aui:select>
+		<br />
+		<aui:input name="noteRichiedente" type="textarea" />
+	</div>
+	<liferay-util:include page="/html/common/submit_window.jsp" servletContext="<%= application %>">
+		<liferay-util:param name="formName" value="<%= formNameRichiediParere %>" />
+		<liferay-util:param name="titolo" value="Richiedi parere endoprocedimentale" />
+		<liferay-util:param name="buttonId" value="<%= buttonIdRichiediParere %>" />
+		<liferay-util:param name="buttonConferma" value="CONFERMA" />
+		<liferay-util:param name="contentDiv" value="<%= divIdRichiediParere %>" />
+		<liferay-util:param name="width" value="500" />
+		<liferay-util:param name="buttonBar" value="true" />
+	</liferay-util:include>
+</aui:form>

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

@@ -1,9 +1,7 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@page import="com.liferay.portal.kernel.util.ListUtil"%>
 <%@page import="com.liferay.portal.model.User"%>
 <%@page import="com.liferay.portal.service.OrganizationLocalServiceUtil"%>
 <%@page import="com.liferay.portal.service.UserLocalServiceUtil"%>
-<%@page import="java.util.ArrayList"%>
 <%@include file="/html/gestioneattivita/init.jsp"%>
 <%
 long intPraticaId = ParamUtil.getLong(request, "intPraticaId");
@@ -23,18 +21,21 @@ List<ParereGeologo> pareri = ParereGeologoLocalServiceUtil.findByIntPraticaIdInC
 <aui:form name="<%= formNameAnnullaRicGeologo %>" method="post" action="<%= annullaRichiestaParereGeologoUrl %>" >
 	<div id='<%= renderResponse.getNamespace() + divIdAnnullaRicGeologo %>' class="hide" >
 		<aui:select name="parereGeologoId" label="<%=StringPool.BLANK %>" required="true">
-			<aui:option label="Seleziona funzionario" value="" />
+			<aui:option label="Seleziona parere" value="" />
 			<%
 			for (ParereGeologo parere : pareri) {
 				if (Validator.isNull(parere.getDtCompilazione())) {
-					User geologo = UserLocalServiceUtil.getUser(parere.getGeologoUserId());
-					List<Organization> listaOrganizzazioni = OrganizationLocalServiceUtil.getUserOrganizations(geologo
-							.getUserId());
-					StringBuilder sb = new StringBuilder();
-					sb.append(geologo.getFullName()).append(" - ")
-							.append(ListUtil.toString(listaOrganizzazioni, "name", StringPool.COMMA_AND_SPACE));
+					String fullName;
+					if (parere.getGeologoUserId() != 0) {
+						User geologo = UserLocalServiceUtil.getUser(parere.getGeologoUserId());
+						List<Organization> listaOrganizzazioni = OrganizationLocalServiceUtil
+								.getUserOrganizations(geologo.getUserId());
+						fullName = geologo.getFullName();
+					} else {
+						fullName = "U.O. " + parere.getUnitaOperativa();
+					}
 			%>
-					<aui:option label="<%= sb.toString() %>" value="<%= parere.getParereGeologoId() %>" />
+					<aui:option label="<%= fullName %>" value="<%= parere.getParereGeologoId() %>" />
 			<%
 				}
 			}

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

@@ -1,12 +1,14 @@
-<%@page import="org.apache.commons.collections4.CollectionUtils"%>
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="com.liferay.portal.model.User"%>
 <%@page import="com.liferay.portal.model.UserGroupRole"%>
 <%@page import="com.liferay.portal.service.UserLocalServiceUtil"%>
-<%@page import="it.mwg.sismica.bo.shared.util.UnitaOperativeUtil"%>
+<%@page import="it.mwg.sismica.bo.shared.util.Generics"%>
+<%@page import="it.mwg.sismica.bo.shared.util.UserUtil"%>
 <%@page import="it.tref.liferay.portos.bo.shared.util.Constants"%>
 <%@page import="java.util.Map"%>
+<%@page import="java.util.Set"%>
 <%@page import="java.util.TreeMap"%>
+<%@page import="org.apache.commons.collections4.CollectionUtils"%>
 <%@page import="org.apache.commons.lang.StringUtils"%>
 <%@include file="/html/gestioneattivita/init.jsp"%>
 <%
@@ -22,12 +24,12 @@ User istruttoreAttuale = UserLocalServiceUtil.getUser(intPratica.getStatusByUser
 Role role = RoleLocalServiceUtil.getRole(company.getCompanyId(), Constants.ROLE_NAME_ISTRUTTORE);
 List<UserGroupRole> userGroupRoles = UserGroupRoleLocalServiceUtil
 		.getUserGroupRolesByGroupAndRole(controlloPratica.getGroupId(), role.getRoleId());
-List<Integer> uoUser = UnitaOperativeUtil.getUnitaOperative(user);
+Set<Integer> uoUser = UserUtil.getUnitaOperative(user);
 Map<String, User> istruttori = new TreeMap<String, User>();
 for (UserGroupRole userGroupRole: userGroupRoles) {
 	if (userGroupRole.getUserId() != istruttoreAttuale.getUserId()) {
 		User istruttore = UserLocalServiceUtil.getUser(userGroupRole.getUserId());
-		List<Integer> uoIstruttore = UnitaOperativeUtil.getUnitaOperative(istruttore);
+		Set<Integer> uoIstruttore = UserUtil.getUnitaOperative(istruttore);
 		if (CollectionUtils.containsAny(uoUser, uoIstruttore) || uoUser.contains(0)) {
 			istruttori.put((istruttore.getLastName() + StringPool.SPACE + istruttore.getFirstName()).toUpperCase(),
 					istruttore);
@@ -48,10 +50,10 @@ for (UserGroupRole userGroupRole: userGroupRoles) {
 		<aui:select name="istruttoreId" label="" showEmptyOption="true" required="true">
 			<%
 			for (User istruttore : istruttori.values()) {
-				List<Integer> uoIstruttore = UnitaOperativeUtil.getUnitaOperative(istruttore);
-				String nominativo = istruttore.getFullName() + " (u.o. "
+				Set<Integer> uoIstruttore = UserUtil.getUnitaOperative(istruttore);
+				String nominativo = Generics.capitalizeFull(istruttore.getFullName()) + " (u.o. "
 						+ StringUtils.join(uoIstruttore, StringPool.COMMA_AND_SPACE) + ") - "
-						+ istruttore.getScreenName();
+						+ istruttore.getScreenName().toLowerCase();
 			%>
 				<aui:option label="<%= nominativo %>" value="<%= istruttore.getUserId() %>" />
 			<%

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

@@ -43,11 +43,11 @@ for (ParereGeologo parere : pareri) {
 			%>
 		</aui:select>
 		<br />
-		<aui:input name="noteRichiedente" label="Note" type="textarea" />
+		<aui:input name="noteRichiedente" type="textarea" />
 	</div>
 	<liferay-util:include page="/html/common/submit_window.jsp" servletContext="<%= application %>">
-		<liferay-util:param name="formName" value="<%= formNameSelezionaGeologo %>" />
-		<liferay-util:param name="titolo" value="Seleziona parere endoprocedimentale" />
+		<liferay-util:param name="formName" value="fascicolo-action-seleziona-geologo" />
+		<liferay-util:param name="titolo" value="Richiedi parere endoprocedimentale" />
 		<liferay-util:param name="buttonId" value="<%= buttonIdSelezionaGeologo %>" />
 		<liferay-util:param name="buttonConferma" value="CONFERMA" />
 		<liferay-util:param name="contentDiv" value="<%= divIdSelezionaGeologo %>" />

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/view_columns.jspf

@@ -186,22 +186,47 @@ DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntP
 	<c:if test='<%= "Tab_MieiTask".equals(currentTab) %>'>
 		<liferay-ui:search-container-column-text name="pareri-endoprocedimentali">
 			<%
-			if (ParereGeologoLocalServiceUtil.countByIntPraticaId(intPratica.getIntPraticaId()) > 0) { 
+			List<ParereGeologo> tutti = ParereGeologoLocalServiceUtil
+					.findByIntPraticaId(intPratica.getIntPraticaId(), QueryUtil.ALL_POS, QueryUtil.ALL_POS);
+			if (tutti.size() > 0) { 
 				List<ParereGeologo> inCorso = ParereGeologoLocalServiceUtil.findByIntPraticaIdInCorso(
 						intPratica.getIntPraticaId(), QueryUtil.ALL_POS, QueryUtil.ALL_POS);
 				if (inCorso.size() > 0) {
 					out.print("In attesa di:<ul style=\"list-style:disc inside\">");
 					for (ParereGeologo parere : inCorso) {
+						String fullName;
+						if (parere.getGeologoUserId() != 0) {
+							fullName = UserLocalServiceUtil.fetchUser(parere.getGeologoUserId()).getFullName();
+						} else {
+							fullName = "U.O. " + parere.getUnitaOperativa();
+						}
 			%>
 						<li>
 							<%= dateFormatDate.format(parere.getCreateDate()) %>:
-							<%= UserLocalServiceUtil.fetchUser(parere.getGeologoUserId()).getFullName() %>
+							<%= fullName %>
 						</li>
 			<%
 					}
 					out.print("</ul>");
-				} else {
-					out.print("<i class=\"fa icon-ok text-success\"></i> Pareri già espressi");
+				}
+				int espressi = 0;
+				int annullati = 0;
+				for (ParereGeologo parere : tutti) {
+					if (Validator.isNotNull(parere.getDtAnnullamento())) {
+						annullati++;
+					} else if (Validator.isNotNull(parere.getDtCompilazione())) {
+						espressi++;
+					}
+				}
+				if (espressi == 1) {
+					out.print("<i class=\"fa icon-ok text-success\"></i> 1 parere già espresso");
+				} else if (espressi > 1) {
+					out.print("<i class=\"fa icon-ok text-success\"></i> " + espressi + " pareri già espressi");
+				}
+				if (annullati == 1) {
+					out.print("<i class=\"fa icon-remove text-error\"></i> 1 richiesta annullata");
+				} else if (annullati > 1) {
+					out.print("<i class=\"fa icon-remove text-error\"></i> " + annullati + " richieste annullate");
 				}
 			}
 			%>

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_actions.jsp

@@ -1,8 +1,9 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@page import="it.mwg.sismica.bo.shared.util.UnitaOperativeUtil"%>
+<%@page import="it.mwg.sismica.bo.shared.util.UserUtil"%>
 <%@page import="it.tref.liferay.portos.bo.shared.util.FascicoloURLUtil"%>
 <%@page import="it.tref.liferay.portos.bo.util.GestioneFirmeUtil"%>
 <%@page import="it.tref.liferay.portos.bo.util.PraticaUtil"%>
+<%@page import="java.util.Set"%>
 <%@include file="/html/gestionefirme/init.jsp"%>
 <%
 SearchContainer searchContainer = (SearchContainer) request.getAttribute("liferay-ui:search:searchContainer");
@@ -12,7 +13,7 @@ redirect = searchContainer.getIteratorURL().toString();
 ResultRow row = (ResultRow) request.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW);
 avviso = (Avviso) row.getObject();
 IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(avviso.getIntPraticaId());
-List<Integer> unitaOperativeUtente = UnitaOperativeUtil.getUnitaOperative(user);
+Set<Integer> unitaOperativeUtente = UserUtil.getUnitaOperative(user);
 boolean inUnitaOperativa = unitaOperativeUtente.contains(intPratica.getUnitaOperativa()) ||
 		unitaOperativeUtente.contains(0);
 %>

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/organigramma/view.jsp

@@ -4,7 +4,7 @@
 <%@page import="com.liferay.portal.service.OrganizationLocalServiceUtil"%>
 <%@page import="com.liferay.portal.service.UserGroupRoleLocalServiceUtil"%>
 <%@page import="com.liferay.portal.service.UserLocalServiceUtil"%>
-<%@page import="it.mwg.sismica.bo.shared.util.UnitaOperativeUtil"%>
+<%@page import="it.mwg.sismica.bo.shared.util.UserUtil"%>
 <%@page import="java.util.Iterator"%>
 <%@page import="javax.portlet.PortletURL"%>
 <%@page import="org.apache.commons.lang.StringUtils"%>
@@ -47,7 +47,7 @@ if (organizationId != 0) {
 		<liferay-ui:search-container-column-text property="screenName" name="Nome utente" />
 		<liferay-ui:search-container-column-text property="firstName" name="Nome" />
 		<liferay-ui:search-container-column-text property="lastName" name="Cognome" />
-		<liferay-ui:search-container-column-text name="Unità Operative" value="<%= StringUtils.join(UnitaOperativeUtil
+		<liferay-ui:search-container-column-text name="Unità Operative" value="<%= StringUtils.join(UserUtil
 				.getUnitaOperative(orgUser), StringPool.COMMA_AND_SPACE) %>" />
 		<liferay-ui:search-container-column-text name="roles">
 			<%

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/content/Language.properties

@@ -2,6 +2,7 @@ asseverazioni-attive-domanda-non-modificabile = Asseverazioni attive - Domanda n
 domanda-non-modificabile = Domanda non modificabile
 fascicolo-action-open-pratica = Apri pratica
 fascicolo-action-parere-geologo = Esprimi parere
+fascicolo-action-assegna-parere = Assegna il parere
 pagamento-attivo-domanda-non-modificabile = Pagamento in corso - Domanda non modificabile
 
 add-fascicolo = Aggiungi progetto

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/ParereGeologoPortlet.java

@@ -20,6 +20,7 @@ import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
 
 import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.exception.SystemException;
 import com.liferay.portal.kernel.json.JSONFactoryUtil;
 import com.liferay.portal.kernel.json.JSONObject;
 import com.liferay.portal.kernel.language.LanguageUtil;
@@ -44,50 +45,58 @@ public class ParereGeologoPortlet extends MVCPortlet {
 
 	private static Log _log = LogFactoryUtil.getLog(ParereGeologoPortlet.class);
 
-	public void aggiornaParere(ActionRequest actionRequest, ActionResponse actionResponse) {
+	public void aggiornaParere(ActionRequest request, ActionResponse response) {
 
-		String parere = ParamUtil.getString(actionRequest, "parere");
-		long intPraticaId = ParamUtil.getLong(actionRequest, "intPratica");
-		long parereGeologoId = ParamUtil.getLong(actionRequest, "parereGeologoId");
-		UploadPortletRequest uploadRequest = PortalUtil.getUploadPortletRequest(actionRequest);
+		String parere = ParamUtil.getString(request, "parere");
+		long intPraticaId = ParamUtil.getLong(request, "intPratica");
+		long parereGeologoId = ParamUtil.getLong(request, "parereGeologoId");
+		UploadPortletRequest uploadRequest = PortalUtil.getUploadPortletRequest(request);
 		ServiceContext serviceContext;
 		try {
 			ParereGeologo parereGeologo = ParereGeologoLocalServiceUtil.getParereGeologo(parereGeologoId);
-			// TODO parere andrà rimosso se andrà implementata la modifica
-			if (Validator.isNotNull(parereGeologo.getParere())) {
-				SessionErrors.add(actionRequest, "error-update-parere-geologo");
-				return;
-			}
-			serviceContext = ServiceContextFactory.getInstance(actionRequest);
+			serviceContext = ServiceContextFactory.getInstance(request);
 			byte[] content = null;
 			String fileName = uploadRequest.getFileName("docFile");
 			File file = uploadRequest.getFile("docFile");
 			if (Validator.isNotNull(fileName) && file != null) {
 				// lunghezza fissata a 200
 				if (fileName.length() > 200) {
-					SessionErrors.add(actionRequest, "error.geniocivilebo.pareregeologo.allegato.length.valid");
+					SessionErrors.add(request, "error.geniocivilebo.pareregeologo.allegato.length.valid");
 				}
 			}
-			if (!SessionErrors.isEmpty(actionRequest)) {
-				PortalUtil.copyRequestParameters(actionRequest, actionResponse);
+			if (!SessionErrors.isEmpty(request)) {
+				PortalUtil.copyRequestParameters(request, response);
 			} else {
 				if (Validator.isNotNull(intPraticaId)) {
 					content = FileUtil.getBytes(file);
 				}
 			}
-			_log.info("Aggiorna il parere per la intPratica " + intPraticaId + " il parere è: \n" + parere);
-			if (Validator.isNull(parereGeologo.getParere())) {
-				ParereGeologoServiceUtil
-						.updateParereGeologo(parereGeologoId, parere, content, fileName, serviceContext);
-				// ADT: INVIO NOTIFICA PARERE ALL ISTRUTTORE
-				invioNotificaIstruttoreByGeologo(parereGeologo, serviceContext);
-			} else {
-				throw new PortalException("parere già espresso");
-			}
-			SessionMessages.add(actionRequest, "success-update-parere-geologo");
+			ParereGeologoServiceUtil.updateParereGeologo(parereGeologoId, parere, content, fileName, serviceContext);
+			parereGeologo.invioNotifica(serviceContext);
+			SessionMessages.add(request, "success-update-parere-geologo");
 		} catch (Exception e) {
 			_log.error(e, e);
-			SessionErrors.add(actionRequest, "error-update-parere-geologo");
+			SessionErrors.add(request, "error-update-parere-geologo");
+		}
+	}
+
+	public void assegnaParere(ActionRequest request, ActionResponse response) {
+
+		long parereGeologoId = ParamUtil.getLong(request, "parereGeologoId");
+		long geologoUserId = ParamUtil.getLong(request, "geologoUserId");
+		Date now = new Date();
+		try {
+			ServiceContext serviceContext = ServiceContextFactory.getInstance(request);
+			ParereGeologo parereGeologo = ParereGeologoLocalServiceUtil.getParereGeologo(parereGeologoId);
+			parereGeologo.setGeologoUserId(geologoUserId);
+			parereGeologo.setAssegnatoreUserId(serviceContext.getUserId());
+			parereGeologo.setDtAssegnazione(now);
+			parereGeologo.setModifiedDate(now);
+			ParereGeologoLocalServiceUtil.updateParereGeologo(parereGeologo);
+			parereGeologo.invioNotifica(serviceContext);
+		} catch (PortalException | SystemException e) {
+			_log.error(e, e);
+			SessionErrors.add(request, "error-update-parere-geologo");
 		}
 	}
 

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

@@ -41,13 +41,14 @@ String dialogId = ParamUtil.getString(request, "dialogId");
 								<div class="row">
 									<div class="col-xs-12 container-checkbox-edit-allegato">
 										<%
-										Soggetto titolareDigitale = SoggettoLocalServiceUtil
-												.getValidByIntPratica_CodiceFiscale(intPraticaId, user.getScreenName())
-														.get(0);
+										List<Soggetto> titolari = SoggettoLocalServiceUtil
+												.getValidByIntPratica_CodiceFiscale(intPraticaId,
+														user.getScreenName());
+										String nome = titolari.isEmpty() ? user.getFullName()
+												: titolari.get(0).getDescrizioneCompleta();
 										%>
 										<aui:input type="checkbox" name="applicaFirma" label='<%= LanguageUtil.format(
-												pageContext, "label.firma-annullamento", titolareDigitale
-														.getDescrizioneCompleta()) %>' />
+												pageContext, "label.firma-annullamento", nome) %>' />
 									</div>
 								</div>
 								<aui:button-row>

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

@@ -1,106 +1,88 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@page import="it.tref.liferay.portos.bo.service.IntPraticaServiceUtil"%>
-<%@page import="it.tref.liferay.portos.bo.model.IntPratica"%>
-<%@ include file="/html/fascicolofe/init.jsp" %>
-
+<%@include file="/html/fascicolofe/init.jsp"%>
 <%
-	String toolbarItem = ParamUtil.getString(request, "toolbarItem", "view-riepilogo");
-	String backURL = ParamUtil.getString(request, "backURL");
-	String jspActionPage = ParamUtil.getString(request, "jspActionPage","/html/fascicolofe/fascicolo_action.jsp");
-	
-	long intPraticaId = ParamUtil.getLong(request, "intPraticaId", 0l);
-	IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(intPraticaId);
-	String intPraticaTitle = Validator.isNotNull(intPratica) ? intPratica.getTitle(locale,false) : "Dettagli Fascicolo - protocollo n°XXX - Progetto n°YYY";
-	
+String toolbarItem = ParamUtil.getString(request, "toolbarItem", "view-riepilogo");
+String backURL = ParamUtil.getString(request, "backURL");
+String jspActionPage = ParamUtil.getString(request, "jspActionPage", "/html/fascicolofe/fascicolo_action.jsp");
+long intPraticaId = ParamUtil.getLong(request, "intPraticaId", 0);
+IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(intPraticaId);
+String intPraticaTitle = Validator.isNull(intPratica) ? "Dettagli Fascicolo - protocollo n° XXX - Progetto n° YYY"
+		: intPratica.getTitle(locale, false);
 %>
-
-	<liferay-portlet:renderURL var="viewProgettiURL" />
-	
-	<liferay-ui:header 
-	    title="<%=intPraticaTitle%>"
-	    localizeTitle="false"
-	    backURL="<%= Validator.isNotNull(backURL) ? backURL : viewProgettiURL %>"
-	/>
-
+<liferay-portlet:renderURL var="viewProgettiURL" />
+<liferay-ui:header  title="<%= intPraticaTitle %>" localizeTitle="false"
+		backURL="<%= Validator.isNotNull(backURL) ? backURL : viewProgettiURL %>" />
 <aui:nav cssClass="nav-tabs">
-		
 	<portlet:renderURL var="viewRiepilogoURL">
 		<portlet:param name="toolbarItem" value= "view-riepilogo" />
-		<portlet:param name="mvcPath" value="/html/fascicolofe/view_fascicolo.jsp"></portlet:param>
-		<portlet:param name="intPraticaId" value="<%=String.valueOf(intPraticaId)%>" />
-		<portlet:param name="backURL" value="<%=backURL %>"></portlet:param>
+		<portlet:param name="mvcPath" value="/html/fascicolofe/view_fascicolo.jsp" />
+		<portlet:param name="intPraticaId" value="<%= String.valueOf(intPraticaId) %>" />
+		<portlet:param name="backURL" value="<%= backURL %>" />
 	</portlet:renderURL>
-
-	<aui:nav-item href="<%= viewRiepilogoURL %>" label="view-riepilogo" 
-		selected='<%= toolbarItem.equals("view-riepilogo") %>' />
-
+	<aui:nav-item href="<%= viewRiepilogoURL %>" label="view-riepilogo"
+			selected='<%= toolbarItem.equals("view-riepilogo") %>' />
 	<portlet:renderURL var="viewStoricoURL">
 		<portlet:param name="toolbarItem" value="view-storico" />
-		<portlet:param name="mvcPath" value="/html/fascicolofe/view_fascicolo.jsp"></portlet:param>
-		<portlet:param name="intPraticaId" value="<%=String.valueOf(intPraticaId)%>" />
-		<portlet:param name="backURL" value="<%=backURL %>"></portlet:param>
+		<portlet:param name="mvcPath" value="/html/fascicolofe/view_fascicolo.jsp" />
+		<portlet:param name="intPraticaId" value="<%= String.valueOf(intPraticaId) %>" />
+		<portlet:param name="backURL" value="<%= backURL %>" />
 	</portlet:renderURL>
-
-	<aui:nav-item href="<%= viewStoricoURL %>" label="view-storico" 
-		selected='<%= toolbarItem.equals("view-storico") %>' />
-	
+	<aui:nav-item href="<%= viewStoricoURL %>" label="view-storico"
+			selected='<%= toolbarItem.equals("view-storico") %>' />
 	<portlet:renderURL var="viewDettagliURL">
 		<portlet:param name="toolbarItem" value= "view-dettagli" />
-		<portlet:param name="mvcPath" value="/html/fascicolofe/view_fascicolo.jsp"></portlet:param>
-		<portlet:param name="intPraticaId" value="<%=String.valueOf(intPraticaId)%>" />
-		<portlet:param name="backURL" value="<%=backURL %>"></portlet:param>
+		<portlet:param name="mvcPath" value="/html/fascicolofe/view_fascicolo.jsp" />
+		<portlet:param name="intPraticaId" value="<%= String.valueOf(intPraticaId) %>" />
+		<portlet:param name="backURL" value="<%= backURL %>" />
 	</portlet:renderURL>
-
-	<aui:nav-item href="<%= viewDettagliURL %>" label="view-dettagli" 
-		selected='<%= toolbarItem.equals("view-dettagli") %>' />
-
+	<aui:nav-item href="<%= viewDettagliURL %>" label="view-dettagli"
+			selected='<%= toolbarItem.equals("view-dettagli") %>' />
 	<portlet:renderURL var="viewComunicazioniURL">
 		<portlet:param name="toolbarItem" value= "view-comunicazioni" />
-		<portlet:param name="mvcPath" value="/html/fascicolofe/view_fascicolo.jsp"></portlet:param>
-		<portlet:param name="intPraticaId" value="<%=String.valueOf(intPraticaId)%>" />
-		<portlet:param name="backURL" value="<%=backURL %>"></portlet:param>
+		<portlet:param name="mvcPath" value="/html/fascicolofe/view_fascicolo.jsp" />
+		<portlet:param name="intPraticaId" value="<%= String.valueOf(intPraticaId) %>" />
+		<portlet:param name="backURL" value="<%= backURL %>" />
 	</portlet:renderURL>
-
-	<aui:nav-item href="<%= viewComunicazioniURL %>" label="view-comunicazioni" 
-		selected='<%= toolbarItem.equals("view-comunicazioni") %>' />
-		
+	<aui:nav-item href="<%= viewComunicazioniURL %>" label="view-comunicazioni"
+			selected='<%= toolbarItem.equals("view-comunicazioni") %>' />
 	<portlet:renderURL var="viewDocAggiuntivaURL">
 		<portlet:param name="toolbarItem" value= "view-docaggiuntiva" />
-		<portlet:param name="mvcPath" value="/html/fascicolofe/view_fascicolo.jsp"></portlet:param>
-		<portlet:param name="intPraticaId" value="<%=String.valueOf(intPraticaId)%>" />
-		<portlet:param name="backURL" value="<%=backURL %>"></portlet:param>
+		<portlet:param name="mvcPath" value="/html/fascicolofe/view_fascicolo.jsp" />
+		<portlet:param name="intPraticaId" value="<%= String.valueOf(intPraticaId) %>" />
+		<portlet:param name="backURL" value="<%= backURL %>" />
 	</portlet:renderURL>
-
-	<aui:nav-item href="<%= viewDocAggiuntivaURL %>" label="view-docaggiuntiva" 
-		selected='<%= toolbarItem.equals("view-docaggiuntiva") %>' />
-		
+	<aui:nav-item href="<%= viewDocAggiuntivaURL %>" label="view-docaggiuntiva"
+			selected='<%= toolbarItem.equals("view-docaggiuntiva") %>' />
 </aui:nav>
 <br>
 <c:choose>
 	<c:when test='<%= toolbarItem.equals("view-riepilogo") %>'>
-		<liferay-util:include page="/html/fascicolofe/view_fascicolo_riepilogo.jsp" servletContext="<%= application %>">
-			<liferay-util:param name="jspActionPage" value="<%=jspActionPage %>"></liferay-util:param>
-			<liferay-util:param name="intPraticaId" value="<%=String.valueOf(intPraticaId)%>" />
+		<liferay-util:include page="/html/fascicolofe/view_fascicolo_riepilogo.jsp"
+				servletContext="<%= application %>">
+			<liferay-util:param name="jspActionPage" value="<%= jspActionPage %>" />
+			<liferay-util:param name="intPraticaId" value="<%= String.valueOf(intPraticaId) %>" />
 		</liferay-util:include>
 	</c:when>
 	<c:when test='<%= toolbarItem.equals("view-storico") %>'>
 		<liferay-util:include page="/html/fascicolofe/view_fascicolo_storico.jsp" servletContext="<%= application %>">
-			<liferay-util:param name="intPraticaId" value="<%=String.valueOf(intPraticaId)%>" />
+			<liferay-util:param name="intPraticaId" value="<%= String.valueOf(intPraticaId) %>" />
 		</liferay-util:include>
 	</c:when>
 	<c:when test='<%= toolbarItem.equals("view-dettagli") %>'>
 		<liferay-util:include page="/html/fascicolofe/view_fascicolo_dettagli.jsp" servletContext="<%= application %>">
-			<liferay-util:param name="intPraticaId" value="<%=String.valueOf(intPraticaId)%>" />
+			<liferay-util:param name="intPraticaId" value="<%= String.valueOf(intPraticaId) %>" />
 		</liferay-util:include>
 	</c:when>
 	<c:when test='<%= toolbarItem.equals("view-comunicazioni") %>'>
-		<liferay-util:include page="/html/fascicolofe/view_fascicolo_comunicazioni.jsp" servletContext="<%= application %>">
-			<liferay-util:param name="intPraticaId" value="<%=String.valueOf(intPraticaId)%>" />
+		<liferay-util:include page="/html/fascicolofe/view_fascicolo_comunicazioni.jsp"
+				servletContext="<%= application %>">
+			<liferay-util:param name="intPraticaId" value="<%= String.valueOf(intPraticaId) %>" />
 		</liferay-util:include>
 	</c:when>
 	<c:when test='<%= toolbarItem.equals("view-docaggiuntiva") %>'>
-		<liferay-util:include page="/html/fascicolofe/view_fascicolo_docaggiuntiva.jsp" servletContext="<%= application %>">
-			<liferay-util:param name="intPraticaId" value="<%=String.valueOf(intPraticaId)%>" />
+		<liferay-util:include page="/html/fascicolofe/view_fascicolo_docaggiuntiva.jsp"
+				servletContext="<%= application %>">
+			<liferay-util:param name="intPraticaId" value="<%= String.valueOf(intPraticaId) %>" />
 		</liferay-util:include>
 	</c:when>
-</c:choose>
+</c:choose>

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/actions.jsp

@@ -1,12 +1,11 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@page import="com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil"%>
+<%@page import="com.liferay.portal.kernel.dao.search.SearchContainer"%>
 <%@page import="com.liferay.portal.kernel.repository.model.FileEntry"%>
+<%@page import="com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil"%>
 <%@page import="com.liferay.portlet.documentlibrary.util.DLUtil"%>
-<%@page import="it.tref.liferay.portos.bo.shared.util.FascicoloURLUtil"%>
-<%@page import="com.liferay.portal.kernel.dao.search.SearchContainer"%>
-<%@page import="it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil"%>
 <%@page import="it.tref.liferay.portos.bo.model.ParereGeologo"%>
-<%@page import="com.liferay.portal.kernel.util.StringUtil"%>
+<%@page import="it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil"%>
+<%@page import="it.tref.liferay.portos.bo.shared.util.FascicoloURLUtil"%>
 <%@ include file="/html/pareregeologo/init.jsp" %>
 <%
 SearchContainer searchContainer = (SearchContainer) request.getAttribute("liferay-ui:search:searchContainer");
@@ -23,6 +22,7 @@ if (searchContainer != null) {
 	parereGeologo = ParereGeologoLocalServiceUtil.getParereGeologo(parereGeologoId);
 }
 String buttonIdAddParere = "buttonIdAddParere_" + parereGeologo.getParereGeologoId();
+String buttonIdAssegnaParere = "buttonIdAssegnaParere_" + parereGeologo.getParereGeologoId();
 %>
 <liferay-ui:icon-menu icon="" showWhenSingleIcon="true" showExpanded="true" cssClass="menu_button_activity">
 	<div title='<%= LanguageUtil.get(pageContext,"fascicolo-action-open-pratica") %>' class="tooltip-info">
@@ -30,13 +30,19 @@ String buttonIdAddParere = "buttonIdAddParere_" + parereGeologo.getParereGeologo
 				url="<%= FascicoloURLUtil.getFascicoloViewURL(parereGeologo.getCompanyId(),
 						parereGeologo.getIntPraticaId()) %>" />
 	</div>
-	<c:if test="<%= Validator.isNull(parereGeologo.getParere()) %>">
+	<c:if test="<%= Validator.isNull(parereGeologo.getParere()) && tabs1.equalsIgnoreCase(tabs[0]) %>">
 		<div title='<%= LanguageUtil.get(pageContext,"fascicolo-action-parere-geologo") %>' class="tooltip-info">
-			<liferay-ui:icon linkCssClass="btn btn-action" id="<%=buttonIdAddParere%>" iconCssClass="fa fa-pencil"
+			<liferay-ui:icon linkCssClass="btn btn-action" id="<%= buttonIdAddParere %>" iconCssClass="fa fa-pencil"
 					message="" url="#" />
 		</div>
 	</c:if>
-	<c:if test="<%= Validator.isNotNull( parereGeologo.getFileEntryId()) %>">
+	<c:if test="<%= (tabs.length > 2) && tabs1.equalsIgnoreCase(tabs[2]) %>">
+		<div title='<%= LanguageUtil.get(pageContext,"fascicolo-action-assegna-parere") %>' class="tooltip-info">
+			<liferay-ui:icon linkCssClass="btn btn-action" id="<%= buttonIdAssegnaParere %>"
+					iconCssClass="fa fa-user-circle" message="" url="#" />
+		</div>
+	</c:if>
+	<c:if test="<%= Validator.isNotNull(parereGeologo.getFileEntryId()) %>">
 		<%
 		FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(parereGeologo.getFileEntryId());
 		String downloadUrl = DLUtil.getPreviewURL(fileEntry, fileEntry.getLatestFileVersion(), themeDisplay,
@@ -48,20 +54,28 @@ String buttonIdAddParere = "buttonIdAddParere_" + parereGeologo.getParereGeologo
 		</div>
 	</c:if>
 </liferay-ui:icon-menu>
-<liferay-util:include page="/html/pareregeologo/actions/add_parere.jsp" servletContext="<%= application %>" >
-	<liferay-util:param name="buttonIdAddParere" value="<%= buttonIdAddParere %>" />
-	<liferay-util:param name="parereGeologoId" value="<%= String.valueOf(parereGeologo.getParereGeologoId()) %>" />
-	<liferay-util:param name="intPratica" value="<%= String.valueOf(parereGeologo.getIntPraticaId())%>" />
-	<liferay-util:param name="noteRichiedente" value="<%= parereGeologo.getNoteRichiedente() %>" />
-</liferay-util:include>
-<script type="text/javascript">
+<c:if test="<%= tabs1.equalsIgnoreCase(tabs[0]) %>">
+	<liferay-util:include page="/html/pareregeologo/actions/add_parere.jsp" servletContext="<%= application %>" >
+		<liferay-util:param name="buttonIdAddParere" value="<%= buttonIdAddParere %>" />
+		<liferay-util:param name="parereGeologoId" value="<%= String.valueOf(parereGeologo.getParereGeologoId()) %>" />
+		<liferay-util:param name="intPratica" value="<%= String.valueOf(parereGeologo.getIntPraticaId()) %>" />
+		<liferay-util:param name="noteRichiedente" value="<%= parereGeologo.getNoteRichiedente() %>" />
+	</liferay-util:include>
+</c:if>
+<c:if test="<%= (tabs.length > 2) && tabs1.equalsIgnoreCase(tabs[2]) %>">
+	<liferay-util:include page="/html/pareregeologo/actions/assegna_parere.jsp" servletContext="<%= application %>" >
+		<liferay-util:param name="buttonIdAssegnaParere" value="<%= buttonIdAssegnaParere %>" />
+		<liferay-util:param name="parereGeologoId" value="<%= String.valueOf(parereGeologo.getParereGeologoId()) %>" />
+	</liferay-util:include>
+</c:if>
+<script>
 YUI().use('aui-tooltip', function(Y) {
 	new Y.TooltipDelegate({
 		trigger: '.tooltip-info',
-		 position: 'top',
-		 cssClass: 'tooltip-help',
-		 html: true,
-		 opacity: 1,
+		position: 'top',
+		cssClass: 'tooltip-help',
+		html: true,
+		opacity: 1,
 	});
 });
 </script>

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/actions/add_parere.jsp

@@ -10,11 +10,11 @@ String formAggiornaParere = "formAggiornaParere_" + parereGeologoId;
 String divIdAggiornaParere = "divIdAggiornaParere_" + parereGeologoId;
 %>
 <liferay-portlet:actionURL name="aggiornaParere" var="aggiornaParereUrl">
-	<portlet:param name="intPraticaId" value="<%=String.valueOf(intPraticaId)%>" />
-	<portlet:param name="parereGeologoId" value="<%=String.valueOf(parereGeologoId)%>" />
-	<portlet:param name="redirect" value="<%=currentURL%>" />
+	<portlet:param name="intPraticaId" value="<%= String.valueOf(intPraticaId) %>" />
+	<portlet:param name="parereGeologoId" value="<%= String.valueOf(parereGeologoId) %>" />
+	<portlet:param name="redirect" value="<%= currentURL %>" />
 </liferay-portlet:actionURL>
-<aui:form name="<%=formAggiornaParere %>" enctype="multipart/form-data" method="post"
+<aui:form name="<%= formAggiornaParere %>" enctype="multipart/form-data" method="post"
 		action="<%= aggiornaParereUrl %>" >
 	<div id='<%= renderResponse.getNamespace() + divIdAggiornaParere %>' class="hide" >
 		<%
@@ -23,7 +23,7 @@ String divIdAggiornaParere = "divIdAggiornaParere_" + parereGeologoId;
 			<strong>Note del richiedente: </strong><span><%= HtmlUtil.escape(noteRichiedente) %></span><br/><br/>
 		<%
 		}
-		%>	
+		%>
 		<aui:input name="parere" type="textarea" id="my-aui-textarea">
 			<aui:validator name="required" />
 		</aui:input>
@@ -33,7 +33,8 @@ String divIdAggiornaParere = "divIdAggiornaParere_" + parereGeologoId;
 	</div>
 	<liferay-util:include page="/html/common/submit_window.jsp" servletContext="<%= application %>" >
 		<liferay-util:param name="formName" value="<%= formAggiornaParere %>" />
-		<liferay-util:param name="titolo" value="Inserisci Parere" />
+		<liferay-util:param name="titolo"
+				value='<%= LanguageUtil.get(pageContext,"fascicolo-action-parere-geologo") %>' />
 		<liferay-util:param name="buttonId" value="<%= buttonIdAddParere %>" />
 		<liferay-util:param name="buttonConferma" value="CONFERMA" />
 		<liferay-util:param name="contentDiv" value="<%= divIdAggiornaParere %>" />

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/actions/assegna_parere.jsp

@@ -0,0 +1,50 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@page import="com.liferay.portal.kernel.util.HtmlUtil"%>
+<%@page import="com.liferay.portal.model.User"%>
+<%@page import="it.mwg.sismica.bo.shared.util.Generics"%>
+<%@page import="it.tref.liferay.portos.bo.model.ParereGeologo"%>
+<%@page import="it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil"%>
+<%@include file="/html/pareregeologo/init.jsp"%>
+<%
+long parereGeologoId = ParamUtil.getLong(request, "parereGeologoId");
+ParereGeologo parereGeologo = ParereGeologoLocalServiceUtil.getParereGeologo(parereGeologoId);
+String buttonIdAssegnaParere = ParamUtil.getString(request, "buttonIdAssegnaParere");
+String formAssegnaParere = "formAssegnaParere_" + parereGeologoId;
+String divIdAssegnaParere = "divIdAssegnaParere_" + parereGeologoId;
+%>
+<liferay-portlet:actionURL name="assegnaParere" var="assegnaParereUrl">
+	<portlet:param name="parereGeologoId" value="<%= String.valueOf(parereGeologoId) %>" />
+	<portlet:param name="redirect" value="<%= currentURL %>" />
+</liferay-portlet:actionURL>
+<aui:form name="<%= formAssegnaParere %>" enctype="multipart/form-data" method="post"
+		action="<%= assegnaParereUrl %>" >
+	<div id='<%= renderResponse.getNamespace() + divIdAssegnaParere %>' class="hide" >
+		<c:if test="<%= Validator.isNotNull(parereGeologo.getNoteRichiedente()) %>">
+			<strong>Note del richiedente: </strong><span>
+				<%= HtmlUtil.escape(parereGeologo.getNoteRichiedente()) %>
+			</span><br /><br />
+		</c:if>
+		<aui:select name="geologoUserId" label="" required="true">
+			<aui:option label="Seleziona istruttore" value="" />
+			<%
+			for (User istruttore : parereGeologo.getIstruttori()) {
+			%>
+				<aui:option value="<%= istruttore.getUserId() %>"
+						selected="<%= user.getUserId() == istruttore.getUserId() %>"
+						label='<%= Generics.capitalizeFull(istruttore.getFullName()) + " - "
+								+ istruttore.getScreenName().toLowerCase()  %>' />
+			<%
+			}
+			%>
+		</aui:select>
+	</div>
+	<liferay-util:include page="/html/common/submit_window.jsp" servletContext="<%= application %>" >
+		<liferay-util:param name="formName" value="<%= formAssegnaParere %>" />
+		<liferay-util:param name="titolo" value="Assegna a istruttore" />
+		<liferay-util:param name="buttonId" value="<%= buttonIdAssegnaParere %>" />
+		<liferay-util:param name="buttonConferma" value="CONFERMA" />
+		<liferay-util:param name="contentDiv" value="<%= divIdAssegnaParere %>" />
+		<liferay-util:param name="width" value="500" />
+		<liferay-util:param name="buttonBar" value="true" />
+	</liferay-util:include>
+</aui:form>

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/init.jsp

@@ -1,13 +1,16 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ include file="/html/init.jsp" %>
-
-<%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%>
-<%@page import="it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil"%>
-<%@ page import="it.tref.liferay.portos.bo.model.ParereGeologo" %>
-<%@page import="java.util.ArrayList"%>
-
+<%@page import="com.liferay.portal.model.Role"%>
+<%@page import="com.liferay.portal.service.RoleLocalServiceUtil"%>
+<%@page import="it.mwg.sismica.bo.shared.util.UserUtil"%>
+<%@page import="it.tref.liferay.portos.bo.shared.util.Constants"%>
+<%@include file="/html/init.jsp"%>
 <%
-String tabNames = "Pareri da fornire,Pareri forniti";
-
-String tabs1 = ParamUtil.getString(request, "tabs1", StringUtil.split(tabNames)[0]);
-%>
+String tabNames;
+if (UserUtil.isGeologo(user)) {
+	tabNames = "Pareri da fornire,Pareri forniti,Pareri da assegnare,Pareri da approvare";
+} else {
+	tabNames = "Pareri da fornire,Pareri forniti";
+}
+String tabs[] = StringUtil.split(tabNames);
+String tabs1 = ParamUtil.getString(request, "tabs1", tabs[0]);
+%>

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/parericompletati.jsp

@@ -2,10 +2,12 @@
 <%@page import="com.liferay.portal.kernel.util.HtmlUtil"%>
 <%@page import="com.liferay.portal.service.UserLocalServiceUtil"%>
 <%@page import="it.tref.liferay.portos.bo.model.IntPratica"%>
-<%@page import="java.util.Collections"%>
+<%@page import="it.tref.liferay.portos.bo.model.ParereGeologo"%>
+<%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%>
+<%@page import="it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil"%>
 <%@ include file="/html/pareregeologo/init.jsp" %>
 <liferay-portlet:renderURL varImpl="searchURL">
-	<liferay-portlet:param name="tabs1" value="<%=StringUtil.split(tabNames)[1]%>" />
+	<liferay-portlet:param name="tabs1" value="<%= tabs[1] %>" />
 </liferay-portlet:renderURL>
 <liferay-ui:search-container emptyResultsMessage="no-entries-were-found" iteratorURL="<%= searchURL %>" >
 	<%
@@ -18,22 +20,18 @@
 		<%
 		IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(parere.getIntPraticaId());
 		%>
-		<liferay-ui:search-container-column-text  name="progetto">
-			<%= intPratica.getTitle(true) %>
-		</liferay-ui:search-container-column-text>
-		<liferay-ui:search-container-column-text  name="Data di creazione">
-			<%= dateFormatDateTime.format(parere.getCreateDate()) %>
-		</liferay-ui:search-container-column-text>
-		<liferay-ui:search-container-column-text  name="Richiedente">
-			<%= UserLocalServiceUtil.getUser(parere.getUserId()).getFullName() %>
-		</liferay-ui:search-container-column-text>
-		<liferay-ui:search-container-column-text  name="Localizzazione">
-			<%= intPratica.getIndirizzo() %>
-		</liferay-ui:search-container-column-text>
-		<liferay-ui:search-container-column-text  name="Note del richiedente">
-			<%= HtmlUtil.escape(parere.getNoteRichiedente()) %>
-		</liferay-ui:search-container-column-text>
-		<liferay-ui:search-container-column-text  name="Parere" property="parere" />
+		<liferay-ui:search-container-column-text name="progetto" value="<%= intPratica.getTitle(true) %>" />
+		<liferay-ui:search-container-column-text name="Data di creazione"
+				value="<%= dateFormatDateTime.format(parere.getCreateDate()) %>" />
+		<liferay-ui:search-container-column-text name="Richiedente"
+				value="<%= UserLocalServiceUtil.getUser(parere.getUserId()).getFullName() %>" />
+		<liferay-ui:search-container-column-text name="Note del richiedente"
+				value="<%= HtmlUtil.escape(parere.getNoteRichiedente()) %>" />
+		<liferay-ui:search-container-column-text name="Localizzazione" value="<%= intPratica.getIndirizzo() %>" />
+		<liferay-ui:search-container-column-text name="U.O." cssClass="text-center"
+				value="<%= parere.getUnitaOperativa() == 0 ? StringPool.BLANK
+						: String.valueOf(parere.getUnitaOperativa()) %>" />
+		<liferay-ui:search-container-column-text name="Parere" property="parere" />
 		<liferay-ui:search-container-column-jsp path="/html/pareregeologo/actions.jsp" align="right" />
 	</liferay-ui:search-container-row>
 	<liferay-ui:search-iterator paginate="true" />

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/pareridaapprovare.jsp

@@ -0,0 +1,58 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@page import="com.liferay.portal.kernel.util.HtmlUtil"%>
+<%@page import="com.liferay.portal.service.UserLocalServiceUtil"%>
+<%@page import="it.mwg.sismica.bo.shared.util.Generics"%>
+<%@page import="it.mwg.sismica.bo.shared.util.UserUtil"%>
+<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%>
+<%@page import="it.tref.liferay.portos.bo.model.IntPratica"%>
+<%@page import="it.tref.liferay.portos.bo.model.ParereGeologo"%>
+<%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil"%>
+<%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%>
+<%@page import="it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil"%>
+<%@include file="/html/pareregeologo/init.jsp"%>
+<style>
+.width-40 { 
+	width:40%;
+}
+.width-15 {
+	width:15%;
+}
+</style>
+<liferay-portlet:renderURL varImpl="searchURL">
+	<liferay-portlet:param name="tabs1" value="<%= tabs[2] %>" />
+</liferay-portlet:renderURL>
+<liferay-ui:search-container delta="20" emptyResultsMessage="no-entries-were-found" iteratorURL="<%= searchURL %>" >
+	<%
+	List<ParereGeologo> lista = ParereGeologoLocalServiceUtil.findByUserDaApprovare(user, searchContainer.getStart(),
+			searchContainer.getEnd());
+	int totale = ParereGeologoLocalServiceUtil.countByUserDaApprovare(user);
+	searchContainer.setTotal(totale);
+	pageContext.setAttribute("results", lista);
+	pageContext.setAttribute("total", totale);
+	%>
+	<liferay-ui:search-container-results results="<%= lista %>" />
+	<liferay-ui:search-container-row className="it.tref.liferay.portos.bo.model.ParereGeologo" modelVar="parere">
+		<%
+		DettPratica dettPratica = DettPraticaLocalServiceUtil.fetchDettPratica(parere.getDettPraticaId());
+		IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(parere.getIntPraticaId());
+		%>
+		<liferay-ui:search-container-column-text name="progetto" value="<%= dettPratica.getMiddleDescription() %>" />
+		<liferay-ui:search-container-column-text name="Data di creazione"
+				value="<%= dateFormatDateTime.format(parere.getCreateDate()) %>" />
+		<liferay-ui:search-container-column-text name="Richiedente"
+				value="<%= UserLocalServiceUtil.getUser(parere.getUserId()).getFullName() %>" />
+		<liferay-ui:search-container-column-text name="Note del richiedente"
+				value="<%= HtmlUtil.escape(parere.getNoteRichiedente()) %>" />
+		<liferay-ui:search-container-column-text name="U.O." cssClass="text-center"
+				value="<%= parere.getUnitaOperativa() == 0 ? StringPool.BLANK
+						: String.valueOf(parere.getUnitaOperativa()) %>" />
+		<liferay-ui:search-container-column-text name="Assegnatore"
+				value='<%= parere.getAssegnatoreUserId() == 0
+						? "U.O. " + parere.getUnitaOperativa() + " - tutti gli assegnatori"
+						: Generics.capitalizeFull(UserLocalServiceUtil.getUser(parere.getAssegnatoreUserId())
+								.getFullName()) %>' />
+		<liferay-ui:search-container-column-text name="Localizzazione" value="<%= intPratica.getIndirizzo() %>" />
+		<liferay-ui:search-container-column-jsp path="/html/pareregeologo/actions.jsp" align="right" />
+	</liferay-ui:search-container-row>
+	<liferay-ui:search-iterator paginate="true" />
+</liferay-ui:search-container>

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/pareridaassegnare.jsp

@@ -0,0 +1,50 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@page import="com.liferay.portal.kernel.util.HtmlUtil"%>
+<%@page import="com.liferay.portal.service.UserLocalServiceUtil"%>
+<%@page import="it.mwg.sismica.bo.shared.util.Generics"%>
+<%@page import="it.mwg.sismica.bo.shared.util.UserUtil"%>
+<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%>
+<%@page import="it.tref.liferay.portos.bo.model.IntPratica"%>
+<%@page import="it.tref.liferay.portos.bo.model.ParereGeologo"%>
+<%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil"%>
+<%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%>
+<%@page import="it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil"%>
+<%@include file="/html/pareregeologo/init.jsp"%>
+<liferay-portlet:renderURL varImpl="searchURL">
+	<liferay-portlet:param name="tabs1" value="<%= tabs[3] %>" />
+</liferay-portlet:renderURL>
+<liferay-ui:search-container delta="20" emptyResultsMessage="no-entries-were-found" iteratorURL="<%= searchURL %>" >
+	<%
+	List<ParereGeologo> lista = ParereGeologoLocalServiceUtil.findByUserDaAssegnare(user, searchContainer.getStart(),
+			searchContainer.getEnd());
+	int totale = ParereGeologoLocalServiceUtil.countByUserDaAssegnare(user);
+	searchContainer.setTotal(totale);
+	pageContext.setAttribute("results", lista);
+	pageContext.setAttribute("total", totale);
+	%>
+	<liferay-ui:search-container-results results="<%= lista %>" />
+	<liferay-ui:search-container-row className="it.tref.liferay.portos.bo.model.ParereGeologo" modelVar="parere">
+		<%
+		DettPratica dettPratica = DettPraticaLocalServiceUtil.fetchDettPratica(parere.getDettPraticaId());
+		IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(parere.getIntPraticaId());
+		%>
+		<liferay-ui:search-container-column-text name="progetto" value="<%= dettPratica.getMiddleDescription() %>" />
+		<liferay-ui:search-container-column-text name="Data di creazione"
+				value="<%= dateFormatDateTime.format(parere.getCreateDate()) %>" />
+		<liferay-ui:search-container-column-text name="Richiedente"
+				value="<%= UserLocalServiceUtil.getUser(parere.getUserId()).getFullName() %>" />
+		<liferay-ui:search-container-column-text name="Note del richiedente"
+				value="<%= HtmlUtil.escape(parere.getNoteRichiedente()) %>" />
+		<liferay-ui:search-container-column-text name="U.O." cssClass="text-center"
+				value="<%= parere.getUnitaOperativa() == 0 ? StringPool.BLANK
+						: String.valueOf(parere.getUnitaOperativa()) %>" />
+		<liferay-ui:search-container-column-text name="Assegnatore"
+				value='<%= parere.getAssegnatoreUserId() == 0
+						? "U.O. " + parere.getUnitaOperativa() + " - tutti gli assegnatori"
+						: Generics.capitalizeFull(UserLocalServiceUtil.getUser(parere.getAssegnatoreUserId())
+								.getFullName()) %>' />
+		<liferay-ui:search-container-column-text name="Localizzazione" value="<%= intPratica.getIndirizzo() %>" />
+		<liferay-ui:search-container-column-jsp path="/html/pareregeologo/actions.jsp" align="right" />
+	</liferay-ui:search-container-row>
+	<liferay-ui:search-iterator paginate="true" />
+</liferay-ui:search-container>

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/pareridacompletare.jsp

@@ -3,12 +3,10 @@
 <%@page import="com.liferay.portal.service.UserLocalServiceUtil"%>
 <%@page import="it.tref.liferay.portos.bo.model.DettPratica"%>
 <%@page import="it.tref.liferay.portos.bo.model.IntPratica"%>
-<%@page import="it.tref.liferay.portos.bo.model.Provincia"%>
-<%@page import="it.tref.liferay.portos.bo.model.Territorio"%>
-<%@page import="it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil"%>
-<%@page import="it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil"%>
+<%@page import="it.tref.liferay.portos.bo.model.ParereGeologo"%>
 <%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil"%>
-<%@page import="java.util.Collections"%>
+<%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%>
+<%@page import="it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil"%>
 <%@ include file="/html/pareregeologo/init.jsp" %>
 <style>
 .width-40{
@@ -19,7 +17,7 @@
 }
 </style>
 <liferay-portlet:renderURL varImpl="searchURL">
-	<liferay-portlet:param name="tabs1" value="<%= StringUtil.split(tabNames)[0] %>" />
+	<liferay-portlet:param name="tabs1" value="<%= tabs[0] %>" />
 </liferay-portlet:renderURL>
 <liferay-ui:search-container delta="20" emptyResultsMessage="no-entries-were-found" iteratorURL="<%= searchURL %>" >
 	<%
@@ -37,14 +35,17 @@
 		IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(parere.getIntPraticaId());
 		%>
 		<liferay-ui:search-container-column-text name="progetto" value="<%= dettPratica.getMiddleDescription() %>" />
-		<liferay-ui:search-container-column-text  name="Data di creazione"
+		<liferay-ui:search-container-column-text name="Data di creazione"
 				value="<%= dateFormatDateTime.format(parere.getCreateDate()) %>" />
-		<liferay-ui:search-container-column-text  name="Richiedente"
+		<liferay-ui:search-container-column-text name="Richiedente"
 				value="<%= UserLocalServiceUtil.getUser(parere.getUserId()).getFullName() %>" />
 		<liferay-ui:search-container-column-text name="Note del richiedente"
 				value="<%= HtmlUtil.escape(parere.getNoteRichiedente()) %>" />
-		<liferay-ui:search-container-column-text  name="Localizzazione" value="<%= intPratica.getIndirizzo() %>" />
-		<liferay-ui:search-container-column-jsp path="/html/pareregeologo/actions.jsp" />
+		<liferay-ui:search-container-column-text name="U.O." cssClass="text-center"
+				value="<%= parere.getUnitaOperativa() == 0 ? StringPool.BLANK
+						: String.valueOf(parere.getUnitaOperativa()) %>" />
+		<liferay-ui:search-container-column-text name="Localizzazione" value="<%= intPratica.getIndirizzo() %>" />
+		<liferay-ui:search-container-column-jsp path="/html/pareregeologo/actions.jsp" align="right" />
 	</liferay-ui:search-container-row>
 	<liferay-ui:search-iterator paginate="true" />
 </liferay-ui:search-container>

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/view.jsp

@@ -8,12 +8,12 @@ PortletURL portletURL = renderResponse.createRenderURL();
 %>
 <!-- BUG bo: VISUALIZZA CARICO LAVORO PER GEOLOGI -->
 <liferay-portlet:renderURL portletName="<%=PortletKeys.CARICHI_LAVORO %>"
-		windowState="<%=LiferayWindowState.POP_UP.toString() %>" var="carichiDiLavoroGeologo">
+		windowState="<%= LiferayWindowState.POP_UP.toString() %>" var="carichiDiLavoroGeologo">
 	<liferay-portlet:param name="geologo" value="true" />
 </liferay-portlet:renderURL>
 <div id="<portlet:namespace />pareregeologoId">
 	<div class="row" style="margin-top:5.5em">
-		<div class="col-xs-11">				
+		<div class="col-xs-11">
 			<liferay-ui:tabs names="<%= tabNames %>" url="<%= portletURL.toString() %>" />
 		</div>
 		<div class="col-xs-1">
@@ -21,10 +21,16 @@ PortletURL portletURL = renderResponse.createRenderURL();
 					linkCssClass="btn" iconCssClass="icon-bar-chart" />
 		</div>
 	</div>
-	<c:if test="<%= tabs1.equals(StringUtil.split(tabNames)[0]) %>">
+	<c:if test="<%= tabs.length > 0 && tabs1.equals(tabs[0]) %>">
 		<jsp:include page="/html/pareregeologo/pareridacompletare.jsp" />
 	</c:if>
-	<c:if test="<%= tabs1.equals(StringUtil.split(tabNames)[1]) %>">
+	<c:if test="<%= tabs.length > 1 && tabs1.equals(tabs[1]) %>">
 		<jsp:include page="/html/pareregeologo/parericompletati.jsp" />
 	</c:if>
+	<c:if test="<%= tabs.length > 2 && tabs1.equals(tabs[2]) %>">
+		<jsp:include page="/html/pareregeologo/pareridaassegnare.jsp" />
+	</c:if>
+	<c:if test="<%= tabs.length > 3 && tabs1.equals(tabs[3]) %>">
+		<jsp:include page="/html/pareregeologo/pareridaapprovare.jsp" />
+	</c:if>
 </div>

liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/service.properties

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=sicilia_sue
-    build.number=65
-    build.date=1632751092514
+    build.number=66
+    build.date=1635416035127
     build.auto.upgrade=true
 
 ##

liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath

@@ -6,5 +6,5 @@
 	<classpathentry kind="lib" path="/home/ture/liferay/portali/paesaggistica/tomcat-7.0.62/lib/ext/portlet.jar"/>
 	<classpathentry kind="lib" path="/home/ture/liferay/portali/paesaggistica/tomcat-7.0.62/lib/servlet-api.jar"/>
 	<classpathentry kind="lib" path="/home/ture/liferay/portali/paesaggistica/tomcat-7.0.62/lib/jsp-api.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="classes"/>
 </classpath>

liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/ParereConstants.java

@@ -0,0 +1,7 @@
+package it.mwg.sismica.bo.shared.util;
+
+public class ParereConstants {
+
+	public static final int STATUS_CHIUSO = 0;
+	public static final int STATUS_APERTO = 1;
+}

liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/UnitaOperativeUtil.java

@@ -2,20 +2,61 @@ package it.mwg.sismica.bo.shared.util;
 
 import it.tref.liferay.portos.bo.shared.util.Constants;
 
-import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.model.Role;
+import com.liferay.portal.model.RoleConstants;
 import com.liferay.portal.model.User;
+import com.liferay.portal.model.UserGroupRole;
+import com.liferay.portal.service.RoleLocalServiceUtil;
+import com.liferay.portal.service.UserGroupRoleLocalServiceUtil;
 
 public class UnitaOperativeUtil {
 
-	public static List<Integer> getUnitaOperative(User user) {
+	public static SortedSet<Integer> getUnitaOperative(long companyId, long groupId, String roleName)
+			throws PortalException, SystemException {
 
-		List<Integer> ret = new ArrayList<>();
-		short uo[] = (short[]) user.getExpandoBridge().getAttribute(Constants.USER_CUSTOM_FIELD_UNITA_OPERATIVE);
-		for (int i = 0; i < uo.length; i++) {
-			ret.add((int) uo[i]);
+		SortedSet<Integer> ret = new TreeSet<>();
+		Role role = RoleLocalServiceUtil.getRole(companyId, roleName);
+		switch (role.getType()) {
+			case RoleConstants.TYPE_REGULAR:
+				List<UserGroupRole> userGroupRoles = UserGroupRoleLocalServiceUtil.getUserGroupRolesByGroup(groupId);
+				for (UserGroupRole userGroupRole : userGroupRoles) {
+					User user = userGroupRole.getUser();
+					if (user.getRoles().contains(role)) {
+						ret.addAll(UserUtil.getUnitaOperative(user));
+					}
+				}
+				break;
+			case RoleConstants.TYPE_ORGANIZATION:
+				userGroupRoles = UserGroupRoleLocalServiceUtil.getUserGroupRolesByGroupAndRole(groupId,
+						role.getRoleId());
+				for (UserGroupRole userGroupRole : userGroupRoles) {
+					ret.addAll(UserUtil.getUnitaOperative(userGroupRole.getUser()));
+				}
+				break;
 		}
 		return ret;
 	}
+
+	public static Set<User> getGeologi(long companyId, long groupId, int unitaOperativa) throws PortalException,
+			SystemException {
+
+		Set<User> users = new HashSet<>();
+		Role role = RoleLocalServiceUtil.getRole(companyId, Constants.ROLE_NAME_GEOLOGO);
+		List<UserGroupRole> userGroupRoles = UserGroupRoleLocalServiceUtil.getUserGroupRolesByGroup(groupId);
+		for (UserGroupRole userGroupRole : userGroupRoles) {
+			User user = userGroupRole.getUser();
+			if (UserUtil.getUnitaOperative(user).contains(unitaOperativa) && user.getRoles().contains(role)) {
+				users.add(user);
+			}
+		}
+		return users;
+	}
 }

liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/UserUtil.java

@@ -0,0 +1,52 @@
+package it.mwg.sismica.bo.shared.util;
+
+import it.tref.liferay.portos.bo.shared.util.Constants;
+
+import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.model.Organization;
+import com.liferay.portal.model.User;
+import com.liferay.portal.service.OrganizationLocalServiceUtil;
+import com.liferay.portal.service.RoleLocalServiceUtil;
+
+public class UserUtil {
+
+	public static long[] getGroupIds(User user) throws SystemException {
+
+		List<Organization> organizations = OrganizationLocalServiceUtil.getUserOrganizations(user.getUserId());
+		long[] groupIds = new long[organizations.size()];
+		for (int i = 0; i < organizations.size(); i++) {
+			groupIds[i] = organizations.get(i).getGroupId();
+		}
+		return groupIds;
+	}
+
+	public static SortedSet<Integer> getUnitaOperative(User user) {
+
+		short uo[] = (short[]) user.getExpandoBridge().getAttribute(Constants.USER_CUSTOM_FIELD_UNITA_OPERATIVE);
+		SortedSet<Integer> ret = new TreeSet<>();
+		for (int i = 0; i < uo.length; i++) {
+			ret.add((int) uo[i]);
+		}
+		return ret;
+	}
+
+	public static int[] getUnitaOperativeArray(User user) {
+
+		short uo[] = (short[]) user.getExpandoBridge().getAttribute(Constants.USER_CUSTOM_FIELD_UNITA_OPERATIVE);
+		int[] ret = new int[uo.length];
+		for (int i = 0; i < uo.length; i++) {
+			ret[i] = uo[i];
+		}
+		return ret;
+	}
+
+	public static boolean isGeologo(User user) throws PortalException, SystemException {
+
+		return user.getRoles().contains(RoleLocalServiceUtil.getRole(user.getCompanyId(), Constants.ROLE_NAME_GEOLOGO));
+	}
+}

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java

@@ -1,6 +1,6 @@
 package it.tref.liferay.portos.kaleo.hook.struts;
 
-import it.mwg.sismica.bo.shared.util.UnitaOperativeUtil;
+import it.mwg.sismica.bo.shared.util.UserUtil;
 import it.tref.liferay.portos.bo.model.ControlloPratica;
 import it.tref.liferay.portos.bo.model.IntPratica;
 import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil;
@@ -22,6 +22,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
@@ -202,8 +203,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 						WorkflowUtil.getWorkflowContext(controllo));
 			} else if (uo == 0) {
 				User user = UserLocalServiceUtil.getUser(Long.parseLong(istruttore));
-				List<Integer> uos = UnitaOperativeUtil.getUnitaOperative(user);
-				uo = uos.get(uos.size() - 1);
+				uo = UserUtil.getUnitaOperative(user).last();
 			}
 			if (uo != pratica.getUnitaOperativa()) {
 				pratica.setUnitaOperativa(uo);
@@ -393,7 +393,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 		User user = themeDisplay.getUser();
 		Organization org = OrganizationLocalServiceUtil.getOrganization(group.getClassPK());
 		int unitaOperativa = WorkflowUtil.getIntPratica(workflowTaskId).getUnitaOperativa();
-		List<Integer> unitaOperativeUtente = UnitaOperativeUtil.getUnitaOperative(user);
+		Set<Integer> unitaOperativeUtente = UserUtil.getUnitaOperative(user);
 		boolean canPortosAssegnatore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(),
 				org.getGroupId(), Constants.ROLE_NAME_ASSEGNATORE)
 				&& (unitaOperativeUtente.contains(unitaOperativa) || unitaOperativeUtente.contains(0));

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=Kaleo
-    build.number=69
-    build.date=1634550959519
+    build.number=70
+    build.date=1635250473094
     build.auto.upgrade=true
 
 ##