diff --git a/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar index a398b634..ef3049c8 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar index e682e8ef..b2d436e6 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar index a398b634..ef3049c8 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalService.java index 956a1296..fe8c232f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalService.java @@ -726,6 +726,11 @@ public interface AvvisoLocalService extends BaseLocalService, long intPraticaId, long dettPraticaID) throws com.liferay.portal.kernel.exception.SystemException; + @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) + public it.tref.liferay.portos.bo.model.Avviso getAvvisoPraticaOspedaliera( + long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException; + @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) public it.tref.liferay.portos.bo.model.Avviso getLastAvvisoIntegrazione( long intPraticaId) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceClp.java index 023f3d0e..11586df8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceClp.java @@ -558,9 +558,13 @@ public class AvvisoLocalServiceClp implements AvvisoLocalService { _methodParameterTypes110 = new String[] { "long", "long" }; - _methodName111 = "getLastAvvisoIntegrazione"; + _methodName111 = "getAvvisoPraticaOspedaliera"; _methodParameterTypes111 = new String[] { "long" }; + + _methodName112 = "getLastAvvisoIntegrazione"; + + _methodParameterTypes112 = new String[] { "long" }; } @Override @@ -4278,7 +4282,7 @@ public class AvvisoLocalServiceClp implements AvvisoLocalService { } @Override - public it.tref.liferay.portos.bo.model.Avviso getLastAvvisoIntegrazione( + public it.tref.liferay.portos.bo.model.Avviso getAvvisoPraticaOspedaliera( long intPraticaId) throws com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; @@ -4306,6 +4310,35 @@ public class AvvisoLocalServiceClp implements AvvisoLocalService { return (it.tref.liferay.portos.bo.model.Avviso)ClpSerializer.translateOutput(returnObj); } + @Override + public it.tref.liferay.portos.bo.model.Avviso getLastAvvisoIntegrazione( + long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName112, + _methodParameterTypes112, new Object[] { intPraticaId }); + } + 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 (it.tref.liferay.portos.bo.model.Avviso)ClpSerializer.translateOutput(returnObj); + } + private InvokableLocalService _invokableLocalService; private String _methodName0; private String[] _methodParameterTypes0; @@ -4529,4 +4562,6 @@ public class AvvisoLocalServiceClp implements AvvisoLocalService { private String[] _methodParameterTypes110; private String _methodName111; private String[] _methodParameterTypes111; + private String _methodName112; + private String[] _methodParameterTypes112; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceUtil.java index 72c816f9..ebb2efc1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceUtil.java @@ -960,6 +960,12 @@ public class AvvisoLocalServiceUtil { return getService().getAvvisoVidimazione(intPraticaId, dettPraticaID); } + public static it.tref.liferay.portos.bo.model.Avviso getAvvisoPraticaOspedaliera( + long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException { + return getService().getAvvisoPraticaOspedaliera(intPraticaId); + } + public static it.tref.liferay.portos.bo.model.Avviso getLastAvvisoIntegrazione( long intPraticaId) throws com.liferay.portal.kernel.exception.SystemException { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceWrapper.java index be28987e..48923b3e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/AvvisoLocalServiceWrapper.java @@ -1050,6 +1050,13 @@ public class AvvisoLocalServiceWrapper implements AvvisoLocalService, dettPraticaID); } + @Override + public it.tref.liferay.portos.bo.model.Avviso getAvvisoPraticaOspedaliera( + long intPraticaId) + throws com.liferay.portal.kernel.exception.SystemException { + return _avvisoLocalService.getAvvisoPraticaOspedaliera(intPraticaId); + } + @Override public it.tref.liferay.portos.bo.model.Avviso getLastAvvisoIntegrazione( long intPraticaId) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java index 158706af..b5d52818 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java @@ -30,6 +30,9 @@ public class AvvisoUtil { public final static String FINE_LAVORI_AVVISO_INIZIO_LAVORI = "FL1"; public final static String FINE_LAVORI_AVVISO_FINE_LAVORI = "FL2"; + + /* Pratiche Ospedaliere */ + public static final String PRATICA_OSPEDALIERA = "PO"; @SuppressWarnings("serial") private final static Map allTipoAvviso = new LinkedHashMap(2) { @@ -60,6 +63,7 @@ public class AvvisoUtil { put(StatoPraticaConstants.CAMBIO_ISTRUTTORE, "label.admingeniocivile.avviso.tipoDocumento.cambioistruttore"); put(FINE_LAVORI_AVVISO_INIZIO_LAVORI, "label.admingeniocivile.avviso.tipoDocumento.avvisoInizioLavori"); put(FINE_LAVORI_AVVISO_FINE_LAVORI, "label.admingeniocivile.avviso.tipoDocumento.avvisoFineLavori"); + put(PRATICA_OSPEDALIERA, "label.admingeniocivile.avviso.tipoDocumento.praticaOspedaliera"); } }; @@ -85,6 +89,7 @@ public class AvvisoUtil { put("DOM", "conf.geniocivile.avviso.folder.id.domanda_pdf"); put(FINE_LAVORI_AVVISO_INIZIO_LAVORI, "conf.geniocivile.avviso.folder.id.finelavori.FL1"); put(FINE_LAVORI_AVVISO_FINE_LAVORI, "conf.geniocivile.avviso.folder.id.finelavori.FL2"); + put(PRATICA_OSPEDALIERA, "conf.geniocivile.avviso.folder.id.praticaospedaliera"); } }; @@ -123,6 +128,8 @@ public class AvvisoUtil { put(FINE_LAVORI_AVVISO_INIZIO_LAVORI, "conf.geniocivile.avviso.template.id.finelavori.FL1"); put(FINE_LAVORI_AVVISO_FINE_LAVORI, "conf.geniocivile.avviso.template.id.finelavori.FL2"); + + put(PRATICA_OSPEDALIERA, "conf.geniocivile.avviso.template.id.praticaospedaliera"); } }; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java index 0493578b..dc54e419 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java @@ -473,7 +473,7 @@ public class ValidazionePraticaUtil { || dettPratica.getTcAdeguamentoSismico() || dettPratica.getTcRiparazioneInterventoLocale())) { notCompleted.add("fascicolo_title_intervento"); } - if (Validator.isNull(dettPratica.getDestinazione())) { + if (Validator.isNull(dettPratica.getDestinazione()) && !intPratica.isPraticaOspedaliera()) { notCompleted.add("destinazione"); } if (Validator.isNull(dettPratica.getVia())) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-db2.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-db2.sql index 7e6ce0b6..4c306aca 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-db2.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-db2.sql @@ -608,6 +608,7 @@ create table portos_bo_IntPratica ( collaudoParziale smallint, collaudoTotale smallint, controlloObbligatorio smallint, + praticaOspedaliera smallint, inLavorazioneSue smallint ); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-derby.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-derby.sql index 96aa5c36..6f31d00f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-derby.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-derby.sql @@ -608,6 +608,7 @@ create table portos_bo_IntPratica ( collaudoParziale smallint, collaudoTotale smallint, controlloObbligatorio smallint, + praticaOspedaliera smallint, inLavorazioneSue smallint ); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-firebird.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-firebird.sql index ee79cdba..19b7d664 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-firebird.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-firebird.sql @@ -17,7 +17,7 @@ create table portos_bo_HistoryWorkflowAction (historyWorkflowActionId int64 not create table portos_bo_IUV (uuid_ varchar(75),iuvId int64 not null primary key,companyId int64,userId int64,userName varchar(75),createDate timestamp,modifiedDate timestamp,groupId int64,pagamentoId int64,codice varchar(75),tipoPagamento varchar(75)); create table portos_bo_InfoFascicolo (uuid_ varchar(75),infoFascicoloId int64 not null primary key,companyId int64,userId int64,userName varchar(75),createDate timestamp,modifiedDate timestamp,groupId int64,intPraticaId int64,numeroProgetto varchar(75),alreadyImported smallint); create table portos_bo_InizioLavori (inizioLavoriId int64 not null primary key,companyId int64,userId int64,userName varchar(75),createDate timestamp,modifiedDate timestamp,groupId int64,intPraticaId int64,dataInizioLavori timestamp); -create table portos_bo_IntPratica (uuid_ varchar(75),intPraticaId int64 not null primary key,companyId int64,userId int64,userName varchar(75),createDate timestamp,modifiedDate timestamp,groupId int64,tipoPratica varchar(75),territorioId int64,tipoProcedura varchar(75),dtAnnullamento timestamp,docPraticaAnnullamentoId int64,dtSorteggio timestamp,statoPratica varchar(10),numeroProgetto varchar(75),validata smallint,status integer,statusByUserId int64,statusDate timestamp,esitoControllo integer,dtPratica timestamp,sospesa smallint,dtSospensione timestamp,codiceFiscaleDelegatoFineLavori varchar(75),codiceFiscaleDelegatoCollaudo varchar(75),fineLavoriParziale smallint,fineLavoriTotale smallint,collaudoParziale smallint,collaudoTotale smallint,controlloObbligatorio smallint,inLavorazioneSue smallint); +create table portos_bo_IntPratica (uuid_ varchar(75),intPraticaId int64 not null primary key,companyId int64,userId int64,userName varchar(75),createDate timestamp,modifiedDate timestamp,groupId int64,tipoPratica varchar(75),territorioId int64,tipoProcedura varchar(75),dtAnnullamento timestamp,docPraticaAnnullamentoId int64,dtSorteggio timestamp,statoPratica varchar(10),numeroProgetto varchar(75),validata smallint,status integer,statusByUserId int64,statusDate timestamp,esitoControllo integer,dtPratica timestamp,sospesa smallint,dtSospensione timestamp,codiceFiscaleDelegatoFineLavori varchar(75),codiceFiscaleDelegatoCollaudo varchar(75),fineLavoriParziale smallint,fineLavoriTotale smallint,collaudoParziale smallint,collaudoTotale smallint,controlloObbligatorio smallint,praticaOspedaliera smallint,inLavorazioneSue smallint); create table portos_bo_Pagamento (uuid_ varchar(75),pagamentoId int64 not null primary key,companyId int64,userId int64,userName varchar(75),createDate timestamp,modifiedDate timestamp,groupId int64,intPraticaId int64,classPk int64,className varchar(75),fileEntryId int64,oldFileEntryId int64,tipoPagamento varchar(75),url varchar(4000),codice varchar(75),causale varchar(75),mezzo varchar(75),codiceFiscaleCommittente varchar(75),importo varchar(75),utilizzata varchar(75),utilizzataSostituita varchar(75),otf smallint,otfCreateDate timestamp,emailPending smallint,oldPagamentoId int64); create table portos_bo_ParereGeo (uuid_ varchar(75),parereGeologoId int64 not null primary key,companyId int64,userId int64,userName varchar(75),createDate timestamp,modifiedDate timestamp,groupId int64,geologoUserId int64,parere varchar(4000),intPraticaId int64,dettPraticaId int64,fileEntryId int64,dtRichista timestamp,dtCompilazione timestamp,status integer); create table portos_bo_PraticaAttenzionata (praticaAttenzionataId int64 not null primary key,companyId int64,userId int64,userName varchar(75),createDate timestamp,modifiedDate timestamp,groupId int64,intPraticaId int64,fineLavoriId int64,numeroProgetto varchar(75),dataFineLavoriTotale timestamp,dataRelazioneFineLavoriTotale timestamp,verificata smallint,dataVerifica timestamp); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-informix.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-informix.sql index 8201bbc7..a6692866 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-informix.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-informix.sql @@ -653,6 +653,7 @@ create table portos_bo_IntPratica ( collaudoParziale boolean, collaudoTotale boolean, controlloObbligatorio boolean, + praticaOspedaliera boolean, inLavorazioneSue boolean ) extent size 16 next size 16 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-mysql.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-mysql.sql index 42847324..6208192a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-mysql.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-mysql.sql @@ -609,6 +609,7 @@ create table portos_bo_IntPratica ( collaudoParziale tinyint, collaudoTotale tinyint, controlloObbligatorio tinyint, + praticaOspedaliera tinyint, inLavorazioneSue tinyint ) engine InnoDB; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-oracle.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-oracle.sql index 6304bc57..8a7d1b2a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-oracle.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-oracle.sql @@ -611,6 +611,7 @@ create table portos_bo_IntPratica ( collaudoParziale number(1, 0), collaudoTotale number(1, 0), controlloObbligatorio number(1, 0), + praticaOspedaliera number(1, 0), inLavorazioneSue number(1, 0) ); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-postgresql.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-postgresql.sql index 75729334..ab0c04c4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-postgresql.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-postgresql.sql @@ -609,6 +609,7 @@ create table portos_bo_IntPratica ( collaudoParziale bool, collaudoTotale bool, controlloObbligatorio bool, + praticaOspedaliera bool, inLavorazioneSue bool ); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-sql-server.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-sql-server.sql index 8f2b40d9..cd2fbf81 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-sql-server.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-sql-server.sql @@ -612,6 +612,7 @@ create table portos_bo_IntPratica ( collaudoParziale bit, collaudoTotale bit, controlloObbligatorio bit, + praticaOspedaliera bit, inLavorazioneSue bit ); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-sybase.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-sybase.sql index bf7b11cb..8afe59f1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-sybase.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/create/create-sybase.sql @@ -631,6 +631,7 @@ create table portos_bo_IntPratica ( collaudoParziale int, collaudoTotale int, controlloObbligatorio int, + praticaOspedaliera int, inLavorazioneSue int ) go diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-db2.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-db2.sql index 6f9e379b..64dde1d8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-db2.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-db2.sql @@ -605,6 +605,7 @@ create table portos_bo_IntPratica ( collaudoParziale smallint, collaudoTotale smallint, controlloObbligatorio smallint, + praticaOspedaliera smallint, inLavorazioneSue smallint ); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-derby.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-derby.sql index 8c812798..16fa48f2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-derby.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-derby.sql @@ -605,6 +605,7 @@ create table portos_bo_IntPratica ( collaudoParziale smallint, collaudoTotale smallint, controlloObbligatorio smallint, + praticaOspedaliera smallint, inLavorazioneSue smallint ); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-firebird.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-firebird.sql index 624b02c3..85313e53 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-firebird.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-firebird.sql @@ -605,6 +605,7 @@ create table portos_bo_IntPratica ( collaudoParziale smallint, collaudoTotale smallint, controlloObbligatorio smallint, + praticaOspedaliera smallint, inLavorazioneSue smallint ); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-hypersonic.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-hypersonic.sql index e0123858..c2be874a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-hypersonic.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-hypersonic.sql @@ -605,6 +605,7 @@ create table portos_bo_IntPratica ( collaudoParziale bit, collaudoTotale bit, controlloObbligatorio bit, + praticaOspedaliera bit, inLavorazioneSue bit ); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-informix.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-informix.sql index 222b0c15..2d7c719e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-informix.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-informix.sql @@ -639,6 +639,7 @@ create table portos_bo_IntPratica ( collaudoParziale boolean, collaudoTotale boolean, controlloObbligatorio boolean, + praticaOspedaliera boolean, inLavorazioneSue boolean ) extent size 16 next size 16 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-ingres.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-ingres.sql index 5f30333a..7a240fc4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-ingres.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-ingres.sql @@ -605,6 +605,7 @@ create table portos_bo_IntPratica ( collaudoParziale tinyint, collaudoTotale tinyint, controlloObbligatorio tinyint, + praticaOspedaliera tinyint, inLavorazioneSue tinyint ); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-interbase.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-interbase.sql index 624b02c3..85313e53 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-interbase.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-interbase.sql @@ -605,6 +605,7 @@ create table portos_bo_IntPratica ( collaudoParziale smallint, collaudoTotale smallint, controlloObbligatorio smallint, + praticaOspedaliera smallint, inLavorazioneSue smallint ); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-jdatastore.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-jdatastore.sql index 4d116c72..69336393 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-jdatastore.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-jdatastore.sql @@ -605,6 +605,7 @@ create table portos_bo_IntPratica ( collaudoParziale boolean, collaudoTotale boolean, controlloObbligatorio boolean, + praticaOspedaliera boolean, inLavorazioneSue boolean ); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-mysql.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-mysql.sql index b3446f8b..80d26804 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-mysql.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-mysql.sql @@ -605,6 +605,7 @@ create table portos_bo_IntPratica ( collaudoParziale tinyint, collaudoTotale tinyint, controlloObbligatorio tinyint, + praticaOspedaliera tinyint, inLavorazioneSue tinyint ) engine InnoDB; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-oracle.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-oracle.sql index 281737ee..d051b527 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-oracle.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-oracle.sql @@ -605,6 +605,7 @@ create table portos_bo_IntPratica ( collaudoParziale number(1, 0), collaudoTotale number(1, 0), controlloObbligatorio number(1, 0), + praticaOspedaliera number(1, 0), inLavorazioneSue number(1, 0) ); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-postgresql.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-postgresql.sql index 6f3b67c3..b553f156 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-postgresql.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-postgresql.sql @@ -605,6 +605,7 @@ create table portos_bo_IntPratica ( collaudoParziale bool, collaudoTotale bool, controlloObbligatorio bool, + praticaOspedaliera bool, inLavorazioneSue bool ); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-sap.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-sap.sql index b2f7c45c..9fc808c9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-sap.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-sap.sql @@ -605,6 +605,7 @@ create table portos_bo_IntPratica ( collaudoParziale boolean, collaudoTotale boolean, controlloObbligatorio boolean, + praticaOspedaliera boolean, inLavorazioneSue boolean ); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-sql-server.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-sql-server.sql index 3db7d3e6..d60a6c3c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-sql-server.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-sql-server.sql @@ -605,6 +605,7 @@ create table portos_bo_IntPratica ( collaudoParziale bit, collaudoTotale bit, controlloObbligatorio bit, + praticaOspedaliera bit, inLavorazioneSue bit ); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-sybase.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-sybase.sql index 2c7b13cd..22046a1f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-sybase.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables/tables-sybase.sql @@ -622,6 +622,7 @@ create table portos_bo_IntPratica ( collaudoParziale int, collaudoTotale int, controlloObbligatorio int, + praticaOspedaliera int, inLavorazioneSue int ) go diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties index 0d73ca22..fcf20718 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties @@ -186,6 +186,7 @@ conf.geniocivile.avviso.template.id.deposito.PS = Template Avvisio avvio di proc conf.geniocivile.avviso.template.id.deposito.S = Template Avviso di sorteggio conf.geniocivile.avviso.template.id.finelavori.FL1 = Template Avviso di Inizio Lavori conf.geniocivile.avviso.template.id.finelavori.FL2 = Template Avviso di Fine Lavori +conf.geniocivile.avviso.template.id.praticaospedaliera = Template Avviso Pratica Ospedaliera #Configurazione Allegati conf.geniocivile.attachment.folder.id = Folder Allegati diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties index 30840046..691c269c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties @@ -1175,6 +1175,7 @@ label.admingeniocivile.avviso.tipoDocumento.cambioistruttore = Avviso di cambio label.admingeniocivile.avviso.tipoDocumento.variazioneSoggetto = Avviso di variazione soggetto label.admingeniocivile.avviso.tipoDocumento.avvisoInizioLavori = Avviso di Inizio Lavori label.admingeniocivile.avviso.tipoDocumento.avvisoFineLavori = Avviso di Fine Lavori +label.admingeniocivile.avviso.tipoDocumento.praticaOspedaliera = Avviso Pratica Ospedaliera label.admingeniocivile.avviso.documento.conforme = Conformità/Autorizzazione @@ -1245,7 +1246,7 @@ tipo-procedura-A = A - Interventi “rilevanti” da realizzare previo rilascio tipo-procedura-B = B - Interventi di “minore rilevanza” D.D.G. 344/20 all. A - lettera B tipo-procedura-B1 = B1 - Interventi di “minore rilevanza” zone 1-2 ed interventi in abitati da consolidare, art.61 (zone 3-4) tipo-procedura-C = C - Interventi “privi di rilevanza“ D.D.G. 344/20 all. A - lett. C -tipo-procedura-H = H - Interventi per il potenziamento della rete ospedaliera della Regione Siciliana, emergenza COVID-19 ex ordinanza 25/20 +tipo-procedura-OSPEDALIERA = - Interventi per il potenziamento della rete ospedaliera della Regione Siciliana, emergenza COVID-19 ex ordinanza 25/20 mappe-bbcc = Mappe BBCC mappe-openstreetmap = OpenStreetmap diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java index bc2385b5..4d0d8f03 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java @@ -267,6 +267,17 @@ public class SchedulerPratiche implements MessageListener { long controlloPraticaId = 0L; AvvisoLocalServiceUtil.addAvviso(intPraticaId, descLong, dtAvviso, tipoAvviso, tipoDocumento, fileEntryIdTemplate, classPk, className, controlloPraticaId, serviceContext); + if(IntPraticaLocalServiceUtil.getIntPratica(intPraticaId).isPraticaOspedaliera()){ + tipoDocumento = AvvisoUtil.PRATICA_OSPEDALIERA; + propertiesTemplateType = AvvisoUtil.PRATICA_OSPEDALIERA; + propertiesTemplate = AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get(propertiesTemplateType); + fileEntryIdTemplate = ConfigurazioneLocalServiceUtil.findByC_ChiaveLong(companyId, propertiesTemplate); + if(Validator.isNull(AvvisoLocalServiceUtil.getAvvisoPraticaOspedaliera(intPraticaId))){ + AvvisoLocalServiceUtil.addAvviso(intPraticaId, descLong, + dtAvviso, tipoAvviso, tipoDocumento, fileEntryIdTemplate, classPk, + className, controlloPraticaId, serviceContext); + } + } } private IntPratica assegnaNumeroProgetto(IntPratica intPratica) throws PortalException, SystemException { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoLocalServiceClpInvoker.java index 51805058..718fe2f1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AvvisoLocalServiceClpInvoker.java @@ -574,9 +574,13 @@ public class AvvisoLocalServiceClpInvoker { _methodParameterTypes290 = new String[] { "long", "long" }; - _methodName291 = "getLastAvvisoIntegrazione"; + _methodName291 = "getAvvisoPraticaOspedaliera"; _methodParameterTypes291 = new String[] { "long" }; + + _methodName292 = "getLastAvvisoIntegrazione"; + + _methodParameterTypes292 = new String[] { "long" }; } public Object invokeMethod(String name, String[] parameterTypes, @@ -1291,6 +1295,11 @@ public class AvvisoLocalServiceClpInvoker { if (_methodName291.equals(name) && Arrays.deepEquals(_methodParameterTypes291, parameterTypes)) { + return AvvisoLocalServiceUtil.getAvvisoPraticaOspedaliera(((Long)arguments[0]).longValue()); + } + + if (_methodName292.equals(name) && + Arrays.deepEquals(_methodParameterTypes292, parameterTypes)) { return AvvisoLocalServiceUtil.getLastAvvisoIntegrazione(((Long)arguments[0]).longValue()); } @@ -1525,4 +1534,6 @@ public class AvvisoLocalServiceClpInvoker { private String[] _methodParameterTypes290; private String _methodName291; private String[] _methodParameterTypes291; + private String _methodName292; + private String[] _methodParameterTypes292; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java index af0b51c0..fe4ef877 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java @@ -1285,6 +1285,21 @@ public class AvvisoLocalServiceImpl extends AvvisoLocalServiceBaseImpl { List ritorno = dynamicQuery(dynamicQuery, 0, 1); return ritorno.isEmpty() ? null : ritorno.get(0); } + + @Override + public Avviso getAvvisoPraticaOspedaliera(long intPraticaId) throws SystemException { + + DynamicQuery dynamicQuery = avvisoLocalService.dynamicQuery(); + dynamicQuery.add(PropertyFactoryUtil.forName("tipoDocumento").in( + new String[] { AvvisoUtil.PRATICA_OSPEDALIERA })); + dynamicQuery.add(PropertyFactoryUtil.forName("fileEntryIdProtocollo").ne(0L)); + dynamicQuery.add(PropertyFactoryUtil.forName("errore").eq(false)); + dynamicQuery.add(PropertyFactoryUtil.forName("annullato").eq(false)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); + @SuppressWarnings("unchecked") + List ritorno = dynamicQuery(dynamicQuery, 0, 1); + return ritorno.isEmpty() ? null : ritorno.get(0); + } @Override public Avviso getLastAvvisoIntegrazione(long intPraticaId) throws SystemException { 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 99e5d2eb..145a389e 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=2896 - build.date=1682068938465 + build.number=2902 + build.date=1682512524937 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar index 8466b772..b2d436e6 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar index a398b634..ef3049c8 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java index 82a0ee81..7e4ab94b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java @@ -1202,6 +1202,14 @@ public class FascicoloFePortlet extends MVCPortlet { String vincoli = ParamUtil.getString(request, "vincoli"); long userId = PortalUtil.getUserId(request); + + IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); + if(intPratica.isPraticaOspedaliera()){ + destinazione = dettPratica.getDestinazione(); + normEsenteBollo = dettPratica.getNormEsenteBollo(); + normEsenteSpese = dettPratica.getNormEsenteSpese(); + lavoriPubblici = dettPratica.getLavoriPubblici(); + } try { DettPraticaServiceUtil.updateDettPratica(userId, dettPratica.getDettPraticaId(), dettPratica.getIntPraticaId(), integrazione, protocollo, tipoIntegrazione, completa, gestita, @@ -1581,10 +1589,10 @@ public class FascicoloFePortlet extends MVCPortlet { } IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); if(intPratica.isPraticaOspedaliera()){ - dettPratica.setNormEsenteBollo(true); - dettPratica.setNormEsenteSpese(true); - dettPratica.setLavoriPubblici(true); - dettPratica.setDestinazione("A1A"); + destinazione = dettPratica.getDestinazione(); + normEsenteBollo = dettPratica.getNormEsenteBollo(); + normEsenteSpese = dettPratica.getNormEsenteSpese(); + lavoriPubblici = dettPratica.getLavoriPubblici(); } try { DettPraticaServiceUtil.updateDettPratica(userId, dettPratica.getDettPraticaId(), diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/FascicoloFEUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/FascicoloFEUtil.java index e0ec1718..c96276e6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/FascicoloFEUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/FascicoloFEUtil.java @@ -9,7 +9,7 @@ public class FascicoloFEUtil { boolean enabledByIntegrazione, boolean alertClassi, boolean isPraticaOspedaliera){ if(destinazioneClasse){ - return disabledInput && !enabledByIntegrazione; + return (disabledInput && !enabledByIntegrazione) || isPraticaOspedaliera; } else { return (disabledInput && !enabledByIntegrazione) || alertClassi || isPraticaOspedaliera; } diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/Constants.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/Constants.java index 5b9328f1..a21a1f86 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/Constants.java +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/Constants.java @@ -18,7 +18,7 @@ public class Constants implements com.liferay.portal.kernel.util.Constants { public static final String PROCEDURA_B = "B"; public static final String PROCEDURA_B1 = "B1"; public static final String PROCEDURA_C = "C"; - public static final String PROCEDURA_H = "H"; + public static final String PROCEDURA_H = "OSPEDALIERA"; public static final String TIPO_PRATICA_DEPOSITO = "01"; public static final String TIPO_PRATICA_AUTORIZZAZIONE = "02";