ids = fineLavoriLocalService.findIntPraticaByFineLavori();
- // if (ids.isEmpty()) {
- // return Collections.emptyList();
- // }
- //
- // System.out.println(ids.size());
- //
- //
- // DynamicQuery dynamicQuery = createQueryCollaudi(companyId,
- // codiceFiscale, ids);
-
- // return intPraticaPersistence.findWithDynamicQuery(dynamicQuery,
- // start, end);
-
return intPraticaFinder.canAddCollaudo(codiceFiscale, start, end);
}
@@ -2067,11 +2033,12 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl {
public int countIngressiCO(Date dtMin, Date dtMax, long groupId) throws SystemException {
return IntPraticaFinderUtil.countIngressiCO(dtMin, dtMax, groupId);
}
-
- public Organization getOrganizationByIntPraticaId(long intPraticaId) throws PortalException, SystemException{
+
+ public Organization getOrganizationByIntPraticaId(long intPraticaId) throws PortalException,
+ SystemException {
IntPratica intPratica = intPraticaLocalService.getIntPratica(intPraticaId);
Group group = GroupLocalServiceUtil.getGroup(intPratica.getGroupId());
- Organization organization = OrganizationLocalServiceUtil.getOrganization(group.getOrganizationId());
+ Organization organization = OrganizationLocalServiceUtil.getOrganization(group.getOrganizationId());
return organization;
}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaServiceImpl.java
index 0a94d529..352ff84e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaServiceImpl.java
@@ -37,13 +37,14 @@ import com.liferay.portal.service.ServiceContext;
* The implementation of the int pratica remote service.
*
*
- * All custom service methods should be put in this class. Whenever methods are added, rerun
- * ServiceBuilder to copy their definitions into the
+ * All custom service methods should be put in this class. Whenever methods are
+ * added, rerun ServiceBuilder to copy their definitions into the
* {@link it.tref.liferay.portos.bo.service.IntPraticaService} interface.
*
*
- * This is a remote service. Methods of this service are expected to have security checks based on
- * the propagated JAAS credentials because this service can be accessed remotely.
+ * This is a remote service. Methods of this service are expected to have
+ * security checks based on the propagated JAAS credentials because this service
+ * can be accessed remotely.
*
*
* @author Davide Barbagallo, 3F Consulting
@@ -51,179 +52,192 @@ import com.liferay.portal.service.ServiceContext;
* @see it.tref.liferay.portos.bo.service.IntPraticaServiceUtil
*/
public class IntPraticaServiceImpl extends IntPraticaServiceBaseImpl {
- /*
- * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
- * it.tref.liferay.portos.bo.service.IntPraticaServiceUtil} to access the int pratica remote
- * service.
- */
+ /*
+ * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use
+ * {@link it.tref.liferay.portos.bo.service.IntPraticaServiceUtil} to access
+ * the int pratica remote service.
+ */
- public IntPratica getIntPratica(long intPraticaId) throws PortalException, SystemException {
+ public IntPratica getIntPratica(long intPraticaId) throws PortalException, SystemException {
- // TODO: Permessi
- return intPraticaLocalService.getIntPratica(intPraticaId);
- }
+ // TODO: Permessi
+ return intPraticaLocalService.getIntPratica(intPraticaId);
+ }
- public void deleteIntPratica(long intPraticaId, long userId) throws PortalException, SystemException {
+ public void deleteIntPratica(long intPraticaId, long userId) throws PortalException, SystemException {
- IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
- if (ValidazionePraticaUtil.canDeletePratica(intPraticaId, userId)) {
- intPraticaLocalService.deleteIntPratica(intPratica);
- } else {
- throw new SystemException("impossibile cancellare la int pratica");
- }
- }
+ IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
+ if (ValidazionePraticaUtil.canDeletePratica(intPraticaId, userId)) {
+ intPraticaLocalService.deleteIntPratica(intPratica);
+ } else {
+ throw new SystemException("impossibile cancellare la int pratica");
+ }
+ }
- // public void pagaInvia(long intPraticaId, int pagAdeguamentoSismico, int pagAltro, int
- // pagMiglioramentoSismico,
- // int pagNuovaCostruzione, boolean pagNuoveCostruzioni, boolean pagRiparazioneInterventoLocale,
- // boolean pagVarianti, String importoSpeseIstruttoria, String codiceFiscaleCommittente, String
- // currentUrl,
- // ServiceContext serviceContext) throws PortalException, SystemException {
- //
- //
- // intPraticaLocalService.pagaInvia(intPraticaId, pagAdeguamentoSismico, pagAltro,
- // pagMiglioramentoSismico,
- // pagNuovaCostruzione, pagNuoveCostruzioni, pagRiparazioneInterventoLocale, pagVarianti,
- // importoSpeseIstruttoria,
- // codiceFiscaleCommittente, currentUrl, serviceContext);
- //
- // }
+ // public void pagaInvia(long intPraticaId, int pagAdeguamentoSismico, int
+ // pagAltro, int
+ // pagMiglioramentoSismico,
+ // int pagNuovaCostruzione, boolean pagNuoveCostruzioni, boolean
+ // pagRiparazioneInterventoLocale,
+ // boolean pagVarianti, String importoSpeseIstruttoria, String
+ // codiceFiscaleCommittente, String
+ // currentUrl,
+ // ServiceContext serviceContext) throws PortalException, SystemException {
+ //
+ //
+ // intPraticaLocalService.pagaInvia(intPraticaId, pagAdeguamentoSismico,
+ // pagAltro,
+ // pagMiglioramentoSismico,
+ // pagNuovaCostruzione, pagNuoveCostruzioni, pagRiparazioneInterventoLocale,
+ // pagVarianti,
+ // importoSpeseIstruttoria,
+ // codiceFiscaleCommittente, currentUrl, serviceContext);
+ //
+ // }
+ public void sospendiPratica(long intPraticaId, boolean sospesa) throws PortalException, SystemException {
- public void sospendiPratica(long intPraticaId, boolean sospesa) throws PortalException, SystemException {
+ IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
+ Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
- IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
- Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
+ IntPraticaPermission.check(getPermissionChecker(), territorio.getGroupId(),
+ ActionKeys.SOSPENDI_FASCICOLO);
+ intPraticaLocalService.sospendiPratica(intPraticaId, sospesa);
- IntPraticaPermission.check(getPermissionChecker(), territorio.getGroupId(), ActionKeys.SOSPENDI_FASCICOLO);
- intPraticaLocalService.sospendiPratica(intPraticaId, sospesa);
+ }
- }
+ public void cambiaTitolare(long intPraticaId, long soggettoId, ServiceContext serviceContext)
+ throws PortalException, SystemException {
- public void cambiaTitolare(long intPraticaId, long soggettoId, ServiceContext serviceContext) throws PortalException,
- SystemException {
+ IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
+ Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
- IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
- Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
+ IntPraticaPermission.check(getPermissionChecker(), territorio.getGroupId(),
+ ActionKeys.CAMBIO_TITOLARE);
+ intPraticaLocalService.cambiaTitolare(intPraticaId, soggettoId, serviceContext);
+ }
- IntPraticaPermission.check(getPermissionChecker(), territorio.getGroupId(), ActionKeys.CAMBIO_TITOLARE);
- intPraticaLocalService.cambiaTitolare(intPraticaId, soggettoId, serviceContext);
- }
+ public void updateStatoPratica(long intPraticaId, String statoPratica) throws PortalException,
+ SystemException {
- public void updateStatoPratica(long intPraticaId, String statoPratica) throws PortalException, SystemException {
+ IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
+ Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
- IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
- Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
+ IntPraticaPermission.check(getPermissionChecker(), territorio.getGroupId(), ActionKeys.CAMBIO_STATO);
+ intPraticaLocalService.updateStatoPratica(intPraticaId, statoPratica);
+ }
- IntPraticaPermission.check(getPermissionChecker(), territorio.getGroupId(), ActionKeys.CAMBIO_STATO);
- intPraticaLocalService.updateStatoPratica(intPraticaId, 0l, statoPratica);
- }
+ public List search(List groupIds, int start, int end) throws SystemException {
- public List search(List groupIds, int start, int end) throws SystemException {
+ // TODO Modificare tramite Indexer
+ // TODO Aggiungere controllo permessi
- // TODO Modificare tramite Indexer
- // TODO Aggiungere controllo permessi
+ return intPraticaLocalService.search(groupIds, start, end);
- return intPraticaLocalService.search(groupIds, start, end);
+ }
- }
+ public int countSearch(List groupIds) throws SystemException {
- public int countSearch(List groupIds) throws SystemException {
+ // TODO Modificare tramite Indexer
+ // TODO Aggiungere controllo permessi
- // TODO Modificare tramite Indexer
- // TODO Aggiungere controllo permessi
+ return intPraticaLocalService.countSearch(groupIds);
- return intPraticaLocalService.countSearch(groupIds);
+ }
- }
+ public List findByCompanyIdSoggettoProgetti(long companyId, long soggettoId)
+ throws SystemException, PortalException {
- public List findByCompanyIdSoggettoProgetti(long companyId, long soggettoId) throws SystemException,
- PortalException {
+ return intPraticaLocalService.findByCompanyIdSoggettoProgetti(companyId, soggettoId);
+ }
- return intPraticaLocalService.findByCompanyIdSoggettoProgetti(companyId, soggettoId);
- }
+ public int countByCompanyIdSoggettoProgetti(long companyId, long soggettoId) throws SystemException,
+ PortalException {
- public int countByCompanyIdSoggettoProgetti(long companyId, long soggettoId) throws SystemException, PortalException {
+ return intPraticaLocalService.countByCompanyIdSoggettoProgetti(companyId, soggettoId);
+ }
- return intPraticaLocalService.countByCompanyIdSoggettoProgetti(companyId, soggettoId);
- }
+ public List findByCompanyIdSoggettoArchivio(long companyId, long soggettoId)
+ throws SystemException, PortalException {
- public List findByCompanyIdSoggettoArchivio(long companyId, long soggettoId) throws SystemException,
- PortalException {
+ return intPraticaLocalService.findByCompanyIdSoggettoArchivio(companyId, soggettoId);
+ }
- return intPraticaLocalService.findByCompanyIdSoggettoArchivio(companyId, soggettoId);
- }
+ public int countByCompanyIdSoggettoArchivio(long companyId, long soggettoId) throws SystemException,
+ PortalException {
- public int countByCompanyIdSoggettoArchivio(long companyId, long soggettoId) throws SystemException, PortalException {
+ return intPraticaLocalService.countByCompanyIdSoggettoArchivio(companyId, soggettoId);
+ }
- return intPraticaLocalService.countByCompanyIdSoggettoArchivio(companyId, soggettoId);
- }
+ public List findByCompanyIdSoggettoAltriProgetti(long companyId, long soggettoId, int start,
+ int end) throws SystemException, PortalException {
- public List findByCompanyIdSoggettoAltriProgetti(long companyId, long soggettoId, int start, int end)
- throws SystemException, PortalException {
+ return intPraticaLocalService.findByCompanyIdSoggettoAltriProgetti(companyId, soggettoId, start, end);
+ }
- return intPraticaLocalService.findByCompanyIdSoggettoAltriProgetti(companyId, soggettoId, start, end);
- }
+ public int countByCompanyIdSoggettoAltriProgetti(long companyId, long soggettoId) throws SystemException,
+ PortalException {
- public int countByCompanyIdSoggettoAltriProgetti(long companyId, long soggettoId) throws SystemException,
- PortalException {
+ return intPraticaLocalService.countByCompanyIdSoggettoAltriProgetti(companyId, soggettoId);
+ }
- return intPraticaLocalService.countByCompanyIdSoggettoAltriProgetti(companyId, soggettoId);
- }
+ public List findByCanAddFineLavori(long companyId, String codiceFiscale, int start, int end)
+ throws SystemException, PortalException {
- public List findByCanAddFineLavori(long companyId, String codiceFiscale, int start, int end)
- throws SystemException, PortalException {
+ return intPraticaLocalService.findByCanAddFineLavori(companyId, codiceFiscale, start, end);
+ }
- return intPraticaLocalService.findByCanAddFineLavori(companyId, codiceFiscale, start, end);
- }
+ public int countByCanAddFineLavori(long companyId, String codiceFiscale) throws SystemException,
+ PortalException {
- public int countByCanAddFineLavori(long companyId, String codiceFiscale) throws SystemException, PortalException {
+ return intPraticaLocalService.countByCanAddFineLavori(companyId, codiceFiscale);
+ }
- return intPraticaLocalService.countByCanAddFineLavori(companyId, codiceFiscale);
- }
+ public List findByCanAddCollaudo(long companyId, String codiceFiscale, int start, int end)
+ throws SystemException, PortalException {
- public List findByCanAddCollaudo(long companyId, String codiceFiscale, int start, int end)
- throws SystemException, PortalException {
+ return intPraticaLocalService.findByCanAddCollaudo(companyId, codiceFiscale, start, end);
+ }
- return intPraticaLocalService.findByCanAddCollaudo(companyId, codiceFiscale, start, end);
- }
+ public int countByCanAddCollaudo(long companyId, String codiceFiscale) throws SystemException,
+ PortalException {
- public int countByCanAddCollaudo(long companyId, String codiceFiscale) throws SystemException, PortalException {
+ return intPraticaLocalService.countByCanAddCollaudo(companyId, codiceFiscale);
+ }
- return intPraticaLocalService.countByCanAddCollaudo(companyId, codiceFiscale);
- }
+ public FileEntry allegaFileAnnullamento(long intPraticaId, byte[] content, String sourceFileName,
+ String jsonFirmatari, ServiceContext serviceContext) throws SystemException, PortalException,
+ IOException {
- public FileEntry allegaFileAnnullamento(long intPraticaId, byte[] content, String sourceFileName,
- String jsonFirmatari, ServiceContext serviceContext) throws SystemException, PortalException, IOException {
+ return intPraticaLocalService.allegaFileAnnullamento(intPraticaId, content, sourceFileName,
+ jsonFirmatari, serviceContext);
+ }
- return intPraticaLocalService.allegaFileAnnullamento(intPraticaId, content, sourceFileName,jsonFirmatari, serviceContext);
- }
+ public void completeAnnullamento(long intPraticaId, long userId) throws PortalException, SystemException {
- public void completeAnnullamento(long intPraticaId, long userId) throws PortalException, SystemException {
+ if (!AzioniPraticheUtil.isAllowedAction(intPraticaId, AzioniPraticheUtil.ACTION_ANNULLA)
+ || !ValidazionePraticaUtil.praticaCanAbort(intPraticaId, userId)) {
+ throw new SystemException("error.annullamento.add.file.not.allowed");
+ }
+ intPraticaLocalService.completeAnnullamento(intPraticaId);
+ }
- if (!AzioniPraticheUtil.isAllowedAction(intPraticaId, AzioniPraticheUtil.ACTION_ANNULLA)
- || !ValidazionePraticaUtil.praticaCanAbort(intPraticaId, userId)) {
- throw new SystemException("error.annullamento.add.file.not.allowed");
- }
- intPraticaLocalService.completeAnnullamento(intPraticaId);
- }
+ public void cambiaIstruttore(long intPraticaId, long controlloPraticaId, long istruttoreId)
+ throws PortalException, SystemException {
- public void cambiaIstruttore(long intPraticaId, long controlloPraticaId, long istruttoreId) throws PortalException,
- SystemException {
+ intPraticaLocalService.cambiaIstruttore(intPraticaId, controlloPraticaId, istruttoreId);
+ }
- intPraticaLocalService.cambiaIstruttore(intPraticaId, controlloPraticaId, istruttoreId);
- }
+ public String geosisma(long intPraticaId) throws PortalException, SystemException {
- public String geosisma(long intPraticaId) throws PortalException, SystemException {
+ JSONObject json = JSONFactoryUtil.createJSONObject();
- JSONObject json = JSONFactoryUtil.createJSONObject();
+ IntPratica intPratica = intPraticaLocalService.fetchIntPratica(intPraticaId);
+ if (Validator.isNotNull(intPratica)) {
+ json.put("intPraticaId", intPratica.getIntPraticaId());
+ }
- IntPratica intPratica = intPraticaLocalService.fetchIntPratica(intPraticaId);
- if (Validator.isNotNull(intPratica)) {
- json.put("intPraticaId", intPratica.getIntPraticaId());
- }
-
- return json.toString();
- }
+ return json.toString();
+ }
}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/ProtocollazioneUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/ProtocollazioneUtil.java
index fa89a2a6..cca45d77 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/ProtocollazioneUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/ProtocollazioneUtil.java
@@ -235,7 +235,7 @@ public class ProtocollazioneUtil {
public static List searchProtocolli(HttpServletRequest request, long companyId,
long userId) {
- List result = Collections.emptyList();
+ List result = Collections.emptyList();
String ufficioIds = "";
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
index 9cb5a666..b66c3a6b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
@@ -13,8 +13,8 @@
##
build.namespace=portos_bo
- build.number=2775
- build.date=1607527945037
+ build.number=2800
+ build.date=1607692123061
build.auto.upgrade=true
##
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp
index f054be1b..51eea24b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp
@@ -96,19 +96,22 @@ List pareriGeologo = ParereGeologoLocalServiceUtil.findByIntPrati
Dettagli dati inseriti nel Workflow
<%
- if( parametri.isEmpty()){
+ if (parametri.isEmpty()) {
out.print("- Nessun dato inserito
");
- }else {
- for(Entry entry: parametri.entrySet()){
- String key = entry.getKey();
- if (key.equals("ingloba_variante")){
- String value = entry.getValue().toString();
- out.print("- "+value+"
");
- }else{
- String value = entry.getValue().toString();
- out.print("- "+LanguageUtil.get(pageContext, key)+": "+LanguageUtil.get(pageContext, WorkflowUtil.adjustWorkflowContextValue(key, value, intPratica.getIntPraticaId()))+"
");
- }
- }
+ } else {
+ for (Entry entry : parametri.entrySet()) {
+ String key = entry.getKey();
+ if (key.equals("ingloba_variante")) {
+ String value = entry.getValue().toString();
+ out.print("- "+value+"
");
+ } else {
+ String value = entry.getValue().toString();
+ out.print("- " + LanguageUtil.get(pageContext, key) + ": "
+ + LanguageUtil.get(pageContext,
+ WorkflowUtil.adjustWorkflowContextValue(key, value, intPratica.getIntPraticaId()))
+ + "
");
+ }
+ }
}
%>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/header.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/header.jsp
index 0177c372..a0b894d6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/header.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/header.jsp
@@ -79,7 +79,7 @@
Stato:
<%=LanguageUtil.get(pageContext,
- PraticaUtil.getStatoPraticaLabel(intPratica.getStatoPratica(), intPratica))%>
+ PraticaUtil.getStatoPraticaLabel(intPratica.getStatoPratica(), intPratica.getIntPraticaId()))%>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp
index a1e848d1..832dfe64 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp
@@ -95,8 +95,6 @@ String orderByType = ParamUtil.getString(request, "orderByType", "asc");
String orderByCol = ParamUtil.getString(request, "orderByCol", "nome");
String keywords = StringPool.BLANK;
-String dtSorteggioNullo = "2020-03-05 11:12:18.006";
-
%>
@@ -194,15 +192,17 @@ String dtSorteggioNullo = "2020-03-05 11:12:18.006";
className="it.tref.liferay.portos.bo.model.IntPratica"
modelVar="intPratica"
>
- <%
- DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId());
+ <%
+ long intPraticaId = intPratica.getIntPraticaId();
+ DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPraticaId);
Log _log = LogFactoryUtil.getLog("fascicolo/view.jsp");
- if (lastDettPratica == null)
- _log.info("intPraticaId=" + intPratica.getIntPraticaId() + ", lastDettPratica null");
+ if (lastDettPratica == null) {
+ _log.info("intPraticaId=" + intPraticaId + ", lastDettPratica null");
+ }
%>
-
+
@@ -219,9 +219,9 @@ String dtSorteggioNullo = "2020-03-05 11:12:18.006";
Le pratiche sottoposte a parere sono quelle che hanno
statoPratica == 'SP', non quelle in status di workflow = pending
-->
- ">
+
- SP
+ <%= StatoPraticaConstants.SOTTOPOSTA_A_PARERE %>
@@ -232,20 +232,11 @@ String dtSorteggioNullo = "2020-03-05 11:12:18.006";
- <% Sorteggio sorteggio = SorteggioLocalServiceUtil.findByIntPratica(intPratica.getIntPraticaId()); %>
+ <% Sorteggio sorteggio = SorteggioLocalServiceUtil.findByIntPratica(intPraticaId); %>
-
- ">
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -302,11 +293,11 @@ String dtSorteggioNullo = "2020-03-05 11:12:18.006";
- <%= LanguageUtil.get(pageContext, PraticaUtil.getStatoPraticaLabel(intPratica.getStatoPratica(), intPratica)) %>
+ <%= LanguageUtil.get(pageContext, PraticaUtil.getStatoPraticaLabel(intPratica.getStatoPratica(), intPraticaId)) %>
<%
- List avvisi = AvvisoLocalServiceUtil.findByIntPratica(intPratica.getIntPraticaId(), QueryUtil.ALL_POS, QueryUtil.ALL_POS, OrderByComparatorFactoryUtil.create("portos_bo_Avviso", "createDate", false));
+ List avvisi = AvvisoLocalServiceUtil.findByIntPratica(intPraticaId, QueryUtil.ALL_POS, QueryUtil.ALL_POS, OrderByComparatorFactoryUtil.create("portos_bo_Avviso", "createDate", false));
StringBuilder sb = new StringBuilder();
if(!avvisi.isEmpty()){
sb.append("
- <%= LanguageUtil.get(pageContext, PraticaUtil.getStatoPraticaLabel(intPratica.getStatoPratica(), intPratica)) %>
+ <%= LanguageUtil.get(pageContext, PraticaUtil.getStatoPraticaLabel(intPratica.getStatoPratica(), intPratica.getIntPraticaId())) %>
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/StatoPraticaConstants.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/StatoPraticaConstants.java
index d6699157..48a12ee1 100644
--- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/StatoPraticaConstants.java
+++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/StatoPraticaConstants.java
@@ -52,6 +52,8 @@ public class StatoPraticaConstants {
put(FINE_LAVORI, "label.admingeniocivile.statopratica.finelavori");
put(FINE_LAVORI_PARZIALE, "label.admingeniocivile.statopratica.finelavoriparziale");
put(INTEGRAZIONE, "label.admingeniocivile.statopratica.integrazione");
+ put(PREAVVISO_CONTRARIO, "label.admingeniocivile.statopratica.preavvisocontrario");
+ put(NO_PARERE, "label.admingeniocivile.statopratica.noparere");
put(NON_AUTORIZZATA, "label.admingeniocivile.statopratica.autorizzazionenegata");
put(NON_CONFORME, "label.admingeniocivile.statopratica.nonconforme");
put(RIFIUTATA, "label.admingeniocivile.statopratica.rifiutata");
diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties
index 64d712ec..0217ce0b 100644
--- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties
+++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties
@@ -13,8 +13,8 @@
##
build.namespace=Kaleo
- build.number=13
- build.date=1607528045052
+ build.number=14
+ build.date=1607618436751
build.auto.upgrade=true
##