Sfoglia il codice sorgente

Fix strutture classe I e II

master
Salvatore La Manna 5 anni fa
parent
commit
2fb3880dd7
  1. BIN
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/util-java.jar
  2. 6
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaService.java
  3. 14
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceClp.java
  4. 6
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceUtil.java
  5. 6
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceWrapper.java
  6. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalService.java
  7. 7
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceClp.java
  8. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceUtil.java
  9. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceWrapper.java
  10. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoService.java
  11. 7
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceClp.java
  12. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceUtil.java
  13. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceWrapper.java
  14. 19
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java
  15. 2
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties
  16. 20
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/VerificaPagamentiScheduler.java
  17. 4
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java
  18. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java
  19. 45
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoServiceImpl.java
  20. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/resource/asseverazioni/costruttore.html
  21. 4
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
  22. 12
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java
  23. 5
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp

BIN
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/util-java.jar

File binario non mostrato.

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

@ -306,12 +306,14 @@ public interface DettPraticaService extends BaseService, InvokableService {
public it.tref.liferay.portos.bo.model.DettPratica updateEsito(
long dettPraticaId, int stato)
throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException;
com.liferay.portal.kernel.exception.SystemException,
java.io.IOException;
public it.tref.liferay.portos.bo.model.DettPratica updateEsitoIntegrazione(
long dettPraticaId, int stato)
throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException;
com.liferay.portal.kernel.exception.SystemException,
java.io.IOException;
public it.tref.liferay.portos.bo.model.DettPratica updatePrincipale(
long dettPraticaId, java.lang.String codiceFiscale,

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

@ -1501,7 +1501,8 @@ public class DettPraticaServiceClp implements DettPraticaService {
public it.tref.liferay.portos.bo.model.DettPratica updateEsito(
long dettPraticaId, int stato)
throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException {
com.liferay.portal.kernel.exception.SystemException,
java.io.IOException {
Object returnObj = null;
try {
@ -1520,6 +1521,10 @@ public class DettPraticaServiceClp implements DettPraticaService {
throw (com.liferay.portal.kernel.exception.SystemException)t;
}
if (t instanceof java.io.IOException) {
throw (java.io.IOException)t;
}
if (t instanceof RuntimeException) {
throw (RuntimeException)t;
}
@ -1536,7 +1541,8 @@ public class DettPraticaServiceClp implements DettPraticaService {
public it.tref.liferay.portos.bo.model.DettPratica updateEsitoIntegrazione(
long dettPraticaId, int stato)
throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException {
com.liferay.portal.kernel.exception.SystemException,
java.io.IOException {
Object returnObj = null;
try {
@ -1555,6 +1561,10 @@ public class DettPraticaServiceClp implements DettPraticaService {
throw (com.liferay.portal.kernel.exception.SystemException)t;
}
if (t instanceof java.io.IOException) {
throw (java.io.IOException)t;
}
if (t instanceof RuntimeException) {
throw (RuntimeException)t;
}

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

@ -436,14 +436,16 @@ public class DettPraticaServiceUtil {
public static it.tref.liferay.portos.bo.model.DettPratica updateEsito(
long dettPraticaId, int stato)
throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException {
com.liferay.portal.kernel.exception.SystemException,
java.io.IOException {
return getService().updateEsito(dettPraticaId, stato);
}
public static it.tref.liferay.portos.bo.model.DettPratica updateEsitoIntegrazione(
long dettPraticaId, int stato)
throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException {
com.liferay.portal.kernel.exception.SystemException,
java.io.IOException {
return getService().updateEsitoIntegrazione(dettPraticaId, stato);
}

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

@ -439,7 +439,8 @@ public class DettPraticaServiceWrapper implements DettPraticaService,
public it.tref.liferay.portos.bo.model.DettPratica updateEsito(
long dettPraticaId, int stato)
throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException {
com.liferay.portal.kernel.exception.SystemException,
java.io.IOException {
return _dettPraticaService.updateEsito(dettPraticaId, stato);
}
@ -447,7 +448,8 @@ public class DettPraticaServiceWrapper implements DettPraticaService,
public it.tref.liferay.portos.bo.model.DettPratica updateEsitoIntegrazione(
long dettPraticaId, int stato)
throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException {
com.liferay.portal.kernel.exception.SystemException,
java.io.IOException {
return _dettPraticaService.updateEsitoIntegrazione(dettPraticaId, stato);
}

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

@ -472,7 +472,8 @@ public interface PagamentoLocalService extends BaseLocalService,
java.lang.String sourceFileName,
com.liferay.portal.service.ServiceContext serviceContext)
throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException;
com.liferay.portal.kernel.exception.SystemException,
java.io.IOException;
public void updatePagamentoManualeFromImport(long pagamentoId,
byte[] content, java.lang.String sourceFileName,

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

@ -2184,7 +2184,8 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService {
java.lang.String sourceFileName,
com.liferay.portal.service.ServiceContext serviceContext)
throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException {
com.liferay.portal.kernel.exception.SystemException,
java.io.IOException {
try {
_invokableLocalService.invokeMethod(_methodName53,
_methodParameterTypes53,
@ -2209,6 +2210,10 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService {
throw (com.liferay.portal.kernel.exception.SystemException)t;
}
if (t instanceof java.io.IOException) {
throw (java.io.IOException)t;
}
if (t instanceof RuntimeException) {
throw (RuntimeException)t;
}

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

@ -588,7 +588,8 @@ public class PagamentoLocalServiceUtil {
java.lang.String sourceFileName,
com.liferay.portal.service.ServiceContext serviceContext)
throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException {
com.liferay.portal.kernel.exception.SystemException,
java.io.IOException {
getService()
.updatePagamentoManuale(pagamentoId, content, sourceFileName,
serviceContext);

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

@ -629,7 +629,8 @@ public class PagamentoLocalServiceWrapper implements PagamentoLocalService,
java.lang.String sourceFileName,
com.liferay.portal.service.ServiceContext serviceContext)
throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException {
com.liferay.portal.kernel.exception.SystemException,
java.io.IOException {
_pagamentoLocalService.updatePagamentoManuale(pagamentoId, content,
sourceFileName, serviceContext);
}

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

@ -87,5 +87,6 @@ public interface PagamentoService extends BaseService, InvokableService {
java.lang.String sourceFileName,
com.liferay.portal.service.ServiceContext serviceContext)
throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException;
com.liferay.portal.kernel.exception.SystemException,
java.io.IOException;
}

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

@ -236,7 +236,8 @@ public class PagamentoServiceClp implements PagamentoService {
java.lang.String sourceFileName,
com.liferay.portal.service.ServiceContext serviceContext)
throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException {
com.liferay.portal.kernel.exception.SystemException,
java.io.IOException {
try {
_invokableService.invokeMethod(_methodName6,
_methodParameterTypes6,
@ -261,6 +262,10 @@ public class PagamentoServiceClp implements PagamentoService {
throw (com.liferay.portal.kernel.exception.SystemException)t;
}
if (t instanceof java.io.IOException) {
throw (java.io.IOException)t;
}
if (t instanceof RuntimeException) {
throw (RuntimeException)t;
}

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

@ -96,7 +96,8 @@ public class PagamentoServiceUtil {
java.lang.String sourceFileName,
com.liferay.portal.service.ServiceContext serviceContext)
throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException {
com.liferay.portal.kernel.exception.SystemException,
java.io.IOException {
getService()
.updatePagamentoManuale(pagamentoId, content, sourceFileName,
serviceContext);

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

@ -91,7 +91,8 @@ public class PagamentoServiceWrapper implements PagamentoService,
java.lang.String sourceFileName,
com.liferay.portal.service.ServiceContext serviceContext)
throws com.liferay.portal.kernel.exception.PortalException,
com.liferay.portal.kernel.exception.SystemException {
com.liferay.portal.kernel.exception.SystemException,
java.io.IOException {
_pagamentoService.updatePagamentoManuale(pagamentoId, content,
sourceFileName, serviceContext);
}

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

@ -19,6 +19,7 @@ import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
import it.tref.liferay.portos.bo.service.IntPraticaServiceUtil;
import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil;
import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil;
import it.tref.liferay.portos.bo.service.persistence.AsseverazioneUtil;
import it.tref.liferay.portos.bo.shared.bean.FirmeBean;
import it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil;
import it.tref.liferay.portos.bo.shared.util.FirmeUtil;
@ -26,6 +27,7 @@ import it.tref.liferay.portos.bo.shared.util.GenericUtils;
import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants;
import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil;
import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil;
import it.tref.liferay.portos.bo.util.AsseverazioniUtil;
import java.io.IOException;
import java.util.ArrayList;
@ -341,10 +343,11 @@ public class ValidazionePraticaUtil {
public static boolean asseverazioniIsEnable(long dettPraticaId) throws SystemException, PortalException {
DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId);
return dettPratica.getStatus() == WorkflowConstants.STATUS_DRAFT
return AsseverazioniUtil.hasAsseverazioniAttive(dettPraticaId)
|| (dettPratica.getStatus() == WorkflowConstants.STATUS_DRAFT
&& SoggettoLocalServiceUtil.countValidTmpByIntPratica(dettPratica.getIntPraticaId()) > 0
&& praticaIsCompleta(dettPraticaId)
&& !DelegheUtil.hasDelegheCompilazioneAttive(dettPraticaId);
&& praticaIsCompleta(dettPraticaId) && !DelegheUtil
.hasDelegheCompilazioneAttive(dettPraticaId));
}
public static boolean pagamentoIsEnable(long dettPraticaId) throws SystemException, PortalException {
@ -500,7 +503,7 @@ public class ValidazionePraticaUtil {
IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(dettPratica.getIntPraticaId());
Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
boolean ag = true;
if (!territorio.getZona().equalsIgnoreCase("2") && !territorio.getZona().equalsIgnoreCase("4")) {
if (!territorio.getZona().equals("2") && !territorio.getZona().equals("4")) {
ag = Validator.isNotNull(dettPratica.getAg());
}
@ -566,7 +569,7 @@ public class ValidazionePraticaUtil {
IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(dettPratica.getIntPraticaId());
Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
if (!territorio.getZona().equalsIgnoreCase("2") && !territorio.getZona().equalsIgnoreCase("4")
if (!territorio.getZona().equals("2") && !territorio.getZona().equals("4")
&& Validator.isNull(dettPratica.getAg())) {
notCompleted.add("ag");
}
@ -915,7 +918,7 @@ public class ValidazionePraticaUtil {
return true;
}
List<String> infrastrutture = Arrays.asList("2", "A4A", "A4B", "A4C", "A4D", "A4E", "A4F", "A5A",
List<String> infrastrutture = Arrays.asList("A4A", "A4B", "A4C", "A4D", "A4E", "A4F", "A5A",
"B4A", "B4B", "B4C", "B5A");
// se infrastruttura controllo solo DATI INFRASTRUTTURA
boolean infrastruttura = infrastrutture.contains(dettPratica.getDestinazione());
@ -1016,7 +1019,7 @@ public class ValidazionePraticaUtil {
List<String> notCompleted = new ArrayList<>();
List<String> infrastrutture = Arrays.asList("2", "A4A", "A4B", "A4C", "A4D", "A4E", "A4F", "A5A",
List<String> infrastrutture = Arrays.asList("A4A", "A4B", "A4C", "A4D", "A4E", "A4F", "A5A",
"B4A", "B4B", "B4C", "B5A");
// se infrastruttura controllo solo DATI INFRASTRUTTURA
boolean infrastruttura = infrastrutture.contains(dettPratica.getDestinazione());
@ -1147,7 +1150,7 @@ public class ValidazionePraticaUtil {
}
// List<String> infrastrutture =
// Arrays.asList("2", "A4A", "A4B", "A4C", "A4D", "A4E", "A4F", "A5A",
// Arrays.asList("A4A", "A4B", "A4C", "A4D", "A4E", "A4F", "A5A",
// "B4A", "B4B", "B4C",
// "B5A");
// boolean infrastruttura =

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

@ -289,7 +289,7 @@ destinazione = Destinazione
#destinazione-1 = EDIFICI IN CLASSE D'USO II<small> (anche classe d'uso I per progetti presentati prima del 18/05/2020)</small>
destinazione-1 = EDIFICI, INFRASTRUTTURE O ALTRO IN CLASSE D'USO I
#destinazione-2 = INFRASTRUTTURE ORDINARIE
destinazione-2 = EDIFICI, INFRASTRUTTURE O ALTRO IN CLASSE D'USO II<small> (anche classe d'uso I per progetti presentati prima del 18/05/2020)</small>
destinazione-2 = EDIFICI, INFRASTRUTTURE O ALTRO IN CLASSE D'USO II<small> (anche classe d'uso I per progetti presentati prima del 20/05/2020)</small>
destinazione-uso-1 = EDIFICIO ORDINARIO
destinazione-uso-2 = INFRASTRUTTURA O ALTRO ORDINARIO

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

@ -6,6 +6,7 @@ import it.tref.liferay.portos.bo.shared.util.PagamentoConstants;
import it.tref.liferay.portos.bo.util.PagamentiCommonUtil;
import it.tref.liferay.portos.bo.util.PagamentiUtil;
import java.io.IOException;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@ -51,17 +52,17 @@ public class VerificaPagamentiScheduler implements MessageListener {
Date date = calendar.getTime();
int count =
PagamentoLocalServiceUtil.countByMezzo_Utilizzata_CreateDate(PagamentoConstants.MEZZO_IRIS,
PagamentoConstants.UTILIZZATA_IN_CORSO, date);
int count = PagamentoLocalServiceUtil.countByMezzo_Utilizzata_CreateDate(
PagamentoConstants.MEZZO_IRIS, PagamentoConstants.UTILIZZATA_IN_CORSO, date);
if (count > 0) {
for (int cursor = 0; cursor <= count; cursor += SIZE) {
List<Pagamento> pagamenti =
PagamentoLocalServiceUtil.findByMezzo_Utilizzata_CreateDate(PagamentoConstants.MEZZO_IRIS,
PagamentoConstants.UTILIZZATA_IN_CORSO, date, cursor, cursor + SIZE);
List<Pagamento> pagamenti = PagamentoLocalServiceUtil
.findByMezzo_Utilizzata_CreateDate(PagamentoConstants.MEZZO_IRIS,
PagamentoConstants.UTILIZZATA_IN_CORSO, date, cursor, cursor
+ SIZE);
for (Pagamento pagamento : pagamenti) {
process(pagamento);
@ -82,12 +83,9 @@ public class VerificaPagamentiScheduler implements MessageListener {
private void process(Pagamento pagamento) {
try {
PagamentiUtil.verificaPagamentoIRIS(pagamento);
} catch (PortalException e) {
} catch (IOException | PortalException | SystemException e) {
_log.error("Errore", e);
} catch (SystemException e) {
_log.error("Errore", e);
}
}
}
}

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

@ -429,13 +429,13 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl {
return dettPraticaLocalService.updateCheckPagamenti(dettPraticaId, normEsenteSpese, normEsenteBollo);
}
public DettPratica updateEsito(long dettPraticaId, int stato) throws SystemException, PortalException {
public DettPratica updateEsito(long dettPraticaId, int stato) throws IOException,SystemException, PortalException {
DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId);
DettPraticaPermission.check(getPermissionChecker(), dettPratica.getGroupId(), ActionKeys.ADD_ENTRY);
return dettPraticaLocalService.updateEsito(dettPraticaId, stato);
}
public DettPratica updateEsitoIntegrazione(long dettPraticaId, int stato) throws SystemException,
public DettPratica updateEsitoIntegrazione(long dettPraticaId, int stato) throws IOException,SystemException,
PortalException {
DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId);
DettPraticaPermission.check(getPermissionChecker(), dettPratica.getGroupId(), ActionKeys.ADD_ENTRY);

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

@ -25,6 +25,7 @@ import it.tref.liferay.portos.bo.util.PagamentiCommonUtil;
import it.tref.liferay.portos.bo.util.PagamentiUtil;
import it.tref.liferay.portos.bo.util.PraticaUtil;
import java.io.IOException;
import java.util.Date;
import java.util.List;
@ -567,7 +568,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl {
}
public void updatePagamentoManuale(long pagamentoId, byte[] content, String sourceFileName,
ServiceContext serviceContext) throws PortalException, SystemException {
ServiceContext serviceContext) throws IOException, PortalException, SystemException {
Pagamento pagamento = pagamentoLocalService.getPagamento(pagamentoId);
// if (dettPratica.getPagamentoId() != pagamentoId) {

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

@ -12,6 +12,8 @@
package it.tref.liferay.portos.bo.service.impl;
import java.io.IOException;
import it.tref.liferay.portos.bo.model.Collaudo;
import it.tref.liferay.portos.bo.model.DettPratica;
import it.tref.liferay.portos.bo.model.FineLavori;
@ -30,13 +32,14 @@ import com.liferay.portal.service.ServiceContext;
* The implementation of the pagamento remote service.
*
* <p>
* 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.PagamentoService} interface.
*
* <p>
* 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.
* </p>
*
* @author Davide Barbagallo, 3F Consulting
@ -45,25 +48,28 @@ import com.liferay.portal.service.ServiceContext;
*/
public class PagamentoServiceImpl extends PagamentoServiceBaseImpl {
/*
* NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
* it.tref.liferay.portos.bo.service.PagamentoServiceUtil} to access the pagamento remote service.
* NOTE FOR DEVELOPERS: Never reference this interface directly. Always use
* {@link it.tref.liferay.portos.bo.service.PagamentoServiceUtil} to access
* the pagamento remote service.
*/
public void sostituisciPagamento(long pagamentoId, String codiceFiscaleCommittente, String mezzo, String url,
ServiceContext serviceContext) throws PortalException, SystemException {
public void sostituisciPagamento(long pagamentoId, String codiceFiscaleCommittente, String mezzo,
String url, ServiceContext serviceContext) throws PortalException, SystemException {
Pagamento pagamento = PagamentoLocalServiceUtil.getPagamento(pagamentoId);
long userId = findTitolare(pagamentoId);
if (getUserId() == userId || DelegheUtil.hasDelegaPagamento(userId, pagamento.getClassPk())) {
pagamentoLocalService.sostituisciPagamento(pagamentoId, codiceFiscaleCommittente, mezzo, url, serviceContext);
pagamentoLocalService.sostituisciPagamento(pagamentoId, codiceFiscaleCommittente, mezzo, url,
serviceContext);
} else {
throw new SystemException("pagamento aggiornabile solo da titolare digitale del " + pagamento.getClassName());
throw new SystemException("pagamento aggiornabile solo da titolare digitale del "
+ pagamento.getClassName());
}
}
public void rigeneraPagamento(long pagamentoId, String codiceFiscaleCommittente, String mezzo, String url,
ServiceContext serviceContext) throws PortalException, SystemException {
public void rigeneraPagamento(long pagamentoId, String codiceFiscaleCommittente, String mezzo,
String url, ServiceContext serviceContext) throws PortalException, SystemException {
if (PendingPagamentiPermission.contains(getPermissionChecker(), serviceContext.getScopeGroupId(),
ActionKeys.PAGAMENTI_PENDING)) {
@ -76,13 +82,15 @@ public class PagamentoServiceImpl extends PagamentoServiceBaseImpl {
// }
// }
// if (isAllowed) {
pagamentoLocalService.sostituisciPagamento(pagamentoId, codiceFiscaleCommittente, mezzo, url, serviceContext);
pagamentoLocalService.sostituisciPagamento(pagamentoId, codiceFiscaleCommittente, mezzo, url,
serviceContext);
} else {
throw new SystemException("pagamento rigenerabile solo da personale autorizzato");
}
}
public void annullaPagamento(long pagamentoId, ServiceContext serviceContext) throws PortalException, SystemException {
public void annullaPagamento(long pagamentoId, ServiceContext serviceContext) throws PortalException,
SystemException {
if (PendingPagamentiPermission.contains(getPermissionChecker(), serviceContext.getScopeGroupId(),
ActionKeys.PAGAMENTI_PENDING)) {
@ -93,13 +101,14 @@ public class PagamentoServiceImpl extends PagamentoServiceBaseImpl {
}
public void updatePagamentoManuale(long pagamentoId, byte[] content, String sourceFileName,
ServiceContext serviceContext) throws PortalException, SystemException {
ServiceContext serviceContext) throws IOException, PortalException, SystemException {
Pagamento pagamento = PagamentoLocalServiceUtil.getPagamento(pagamentoId);
long userId = findTitolare(pagamentoId);
if (getUserId() == userId || DelegheUtil.hasDelegaPagamento(userId, pagamento.getClassPk())) {
pagamentoLocalService.updatePagamentoManuale(pagamentoId, content, sourceFileName, serviceContext);
pagamentoLocalService
.updatePagamentoManuale(pagamentoId, content, sourceFileName, serviceContext);
} else {
throw new SystemException("pagamento manuale aggiornabile solo da titolare digitale del "
+ pagamento.getClassName());
@ -121,8 +130,8 @@ public class PagamentoServiceImpl extends PagamentoServiceBaseImpl {
Collaudo collaudo = collaudoLocalService.getCollaudo(pagamento.getClassPk());
userId = collaudo.getUserId();
} else {
throw new RuntimeException("unable to replace pagamento for entity type " + pagamento.getClassName()
+ " with id " + pagamento.getClassPk());
throw new RuntimeException("unable to replace pagamento for entity type "
+ pagamento.getClassName() + " with id " + pagamento.getClassPk());
}
return userId;
}

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/resource/asseverazioni/costruttore.html

@ -17,7 +17,6 @@
<li>
di aver preso visione del progetto;
</li>
</li>
<li>
di impegnasi a realizzare l’opera così come è descritta nel progetto architettonico e strutturale, a rispettare le
indicazioni del direttore dei lavori, le prescrizioni inerenti alla qualità dei materiali impiegati e alla corretta

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

@ -13,8 +13,8 @@
##
build.namespace=portos_bo
build.number=2254
build.date=1589897278985
build.number=2265
build.date=1590077289969
build.auto.upgrade=true
##

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

@ -1105,7 +1105,7 @@ public class FascicoloFePortlet extends MVCPortlet {
}
private void asseveraDomanda(ActionRequest actionRequest, ActionResponse actionResponse)
throws NestableException {
throws IOException, NestableException {
try {
String dichiarazioni = "";
@ -2416,7 +2416,7 @@ public class FascicoloFePortlet extends MVCPortlet {
}
public void confermaAsseverazione(ActionRequest actionRequest, ActionResponse actionResponse)
throws PortalException, SystemException {
throws IOException, PortalException, SystemException {
ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest);
long asseverazioneId = ParamUtil.getLong(actionRequest, "asseverazioneId");
@ -2430,7 +2430,7 @@ public class FascicoloFePortlet extends MVCPortlet {
}
public void annullaAsseverazioni(ActionRequest actionRequest, ActionResponse actionResponse)
throws PortalException, SystemException {
throws IOException, PortalException, SystemException {
ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest);
long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId");
@ -2786,7 +2786,7 @@ public class FascicoloFePortlet extends MVCPortlet {
}
public void completeDomandaEsente(ActionRequest actionRequest, ActionResponse actionResponse)
throws PortalException, SystemException {
throws IOException, PortalException, SystemException {
long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId");
long fineLavoriId = ParamUtil.getLong(actionRequest, "fineLavoriId");
@ -2804,7 +2804,7 @@ public class FascicoloFePortlet extends MVCPortlet {
}
public void completeIntegrazione(ActionRequest actionRequest, ActionResponse actionResponse)
throws PortalException, SystemException {
throws IOException, PortalException, SystemException {
long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId");
@ -2816,7 +2816,7 @@ public class FascicoloFePortlet extends MVCPortlet {
}
public void completeCambioSoggetti(ActionRequest actionRequest, ActionResponse actionResponse)
throws PortalException, SystemException {
throws IOException, PortalException, SystemException {
long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId");

5
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp

@ -814,7 +814,7 @@ $('#sistemi_costruttivi input').on('change', function(){
function checkIfDisableInfrastrutture(){
var destinazione = AUI().one("#destinazioneinazione input:checked"),
allowedValues = ["2", "A4A","A4B","A4C","A4D","A4E","A4F","A5A","B4A","B4B","B4C","B5A"];
allowedValues = ["A4A","A4B","A4C","A4D","A4E","A4F","A5A","B4A","B4B","B4C","B5A"];
if( destinazione!=null && allowedValues.indexOf(destinazione.val()) != -1 ){
disableInput('#dati_metrici');
@ -823,7 +823,8 @@ function checkIfDisableInfrastrutture(){
} else {
enableInput('#dati_metrici');
enableInput('#descrizione_componenti_costruttiveContent');
disableInput('#dati_infrastruttre_altro');
enableInput('#dati_infrastruttre_altro');
// disableInput('#dati_infrastruttre_altro');
}
}

Caricamento…
Annulla
Salva