From f9927a62f6fdf4a8c9fef79002412a6e5274a8f8 Mon Sep 17 00:00:00 2001 From: marcoalderighi Date: Fri, 10 Mar 2023 15:20:47 +0100 Subject: [PATCH] fixes vari --- .../dist/portos-bo-shared-6.2.0.1.jar | Bin 45581 -> 45581 bytes .../portlets/portos-bo-portlet/.classpath | 23 ---- .../portlets/portos-bo-portlet/.project | 47 -------- ....eclipse.wst.common.project.facet.core.xml | 11 -- .../portlets/portos-bo-portlet/bin/.gitignore | 10 -- .../docroot/WEB-INF/.gitignore | 1 + .../WEB-INF/lib/portos-bo-portlet-service.jar | Bin 1539947 -> 1540058 bytes .../docroot/WEB-INF/lib/portos-bo-shared.jar | Bin 45581 -> 45581 bytes .../liferay/portos/bo/util/AvvisoUtil.java | 8 +- .../WEB-INF/src/content/Portal.properties | 3 + .../builder/ReportAvvisoBeanBuilder.java | 12 +- .../bo/scheduler/SchedulerInvioDocumento.java | 56 ++++----- .../impl/DettPraticaLocalServiceImpl.java | 2 +- .../impl/FineLavoriLocalServiceImpl.java | 2 +- .../docroot/WEB-INF/src/service.properties | 4 +- .../amministrazione/tabs/parametri/view.jsp | 2 +- .../docroot/html/avvisi/view.jsp | 2 +- .../docroot/WEB-INF/.gitignore | 1 + .../WEB-INF/lib/portos-bo-portlet-service.jar | Bin 1539947 -> 1540058 bytes .../docroot/WEB-INF/lib/portos-bo-shared.jar | Bin 45581 -> 45581 bytes .../portos/fe/portlet/FascicoloFePortlet.java | 113 +++++++++--------- .../docroot/html/allegatipratica/view.jsp | 4 +- 22 files changed, 113 insertions(+), 188 deletions(-) delete mode 100644 liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.classpath delete mode 100644 liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.project delete mode 100644 liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/bin/.gitignore 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 17a80458f30c52a145dd162c58696d0e7abf705e..1e7ac734d2dbb47a4507ad9922721bf84a57facf 100644 GIT binary patch delta 1109 zcmY+CT}YE*6vvLh3@Wpx&Lci+pc>=l?(FIp;jQPx}JfzQD?} z(mCFX5Gf(DYZaaH-JDc}s%@93^2mQ5C&uO4sP*NGJ2|nAdNF%|u}mbejEM#sm^k1Z z6YOFa8xB&zDuEZ+7~p+2892`##XOe@Y~r%qJm^<-rMRSW{d5|_?}vN|uLj!qRNycE zxZ77!jZQ*eGE#}ubv>a~@``h%gwwM37{tkSKHvyj19=Eu2cDBb5FHxM`-;VRi_Om- z)v$zwc@UCG=Q$O%SptNo;SDU*sTDPN@_{lIot5Y(+y>Xl9a)L1A0>qRl+(wJp~8~t zj|7e^CaAG8Ol`$rHkrag=89A_s?y#tP#GFB+C`k@3c9oPX!06{kI%`lPKFuh%B0D+!_WuhWA@IX4OQEiDolRJc(o^A{gZ zkS8t5iJ+q$n}y7~A=u=4$8QX3yH@cwSG!w1T|3aV9+m4A(inXrXq{dGwCeHQe9-R$ z9bh;BEHI=1O@=h!cf(#_urVH3WK05DjE8_fj3;0%vz7qWwu?Z!trECxs0`RL)Bxm%tAN_!BH-KM%fK`{_8GBbUtb5#t8-j}{IUc4 joEX9U_((bUL8GXfNAdhuH#3~rcfyH#D8{f)&sg<8?R9e0 delta 1109 zcmY+CZAepL6vyw|bW>M}24xAEp_w{iDb6fyYMEJ1OAXh{v~;Fvr3@D;Vx^gcLOw_z za+`B*Zo28@Vg!A#0tKwQqT68&PR9d{bP{l$ z4)?H&i3TZSGkDAqZg5vv{)qeT#s)Py<$Bn{;cFZ21!zV066^iP!59Ep%)|OPRfkJWNQp?1X zT85&cd?-pq7FY#w*h2W{(Txn$DP^^I@{v3doz?hf>?Y62UAd`iA4L@PQ%asTMe@sv zKO#7?l%mASD5V{PxpV>xSt>KpsLpyrL+#P*X>@{fzTnR5c}3_H=IgQFOi>&I1I5V! zbKSzfEC>-) zWA!~4yl7m;MaG(DaQ@v}cAWNj`jf6fxL&)ItfoYgziuBA=ib6Mw6=<1Q1NEDBv^Pj zVZNj!KZcBSZsk??BCyGg&fgf+b*dMgs5WK*&BiR?cjJCwxG5P}VoC$rOhQ|1$(xAo-# ztNP9WC;QF=BP{6GThO1g+y-CWkNn(U2fE0LoV7NCF0j=DXKh+w@&K}bpb~VT9rw`L zFM@t&F9Rwamw`@46>!I3Ik0uG5y%Zy19d|sz_&wJfmu%MGwj5^fi9d^@45o{6&Ln7 iHH`VO;R^7>Mo_nm;Q6m!=D4x%xEuG7jbfjk(VBlR=(yAX diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.classpath deleted file mode 100644 index bc2c439b..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.classpath +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.project deleted file mode 100644 index 3f54558e..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.project +++ /dev/null @@ -1,47 +0,0 @@ - - - portos-bo-portlet - - - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.jsdt.core.jsNature - - - - 1672831492376 - - 30 - - org.eclipse.core.resources.regexFilterMatcher - node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ - - - - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index f256af25..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/bin/.gitignore b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/bin/.gitignore deleted file mode 100644 index 98f66096..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/bin/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -/.ant-targets-build.xml -/.classpath -/.project -/.settings/ -/.tern-project -/build.xml -/docroot/ -/ivy.xml -/ivy.xml.MD5 -/test/ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/.gitignore b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/.gitignore index 840e7d31..3e1644af 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/.gitignore +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/.gitignore @@ -1 +1,2 @@ /classes/ +/service-classes/ 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 2d4f267936a5d75fa2c6e718b2d3ea775ca59fba..89ae4284678021313c3f9754fc3dafe6aa294ad0 100644 GIT binary patch delta 16782 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 delta 16634 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 delta 1109 zcmY+CZAepL6vyw|bW>M}24xAEp_w{iDb6fyYMEJ1OAXh{v~;Fvr3@D;Vx^gcLOw_z za+`B*Zo28@Vg!A#0tKwQqT68&PR9d{bP{l$ z4)?H&i3TZSGkDAqZg5vv{)qeT#s)Py<$Bn{;cFZ21!zV066^iP!59Ep%)|OPRfkJWNQp?1X zT85&cd?-pq7FY#w*h2W{(Txn$DP^^I@{v3doz?hf>?Y62UAd`iA4L@PQ%asTMe@sv zKO#7?l%mASD5V{PxpV>xSt>KpsLpyrL+#P*X>@{fzTnR5c}3_H=IgQFOi>&I1I5V! zbKSzfEC>-) zWA!~4yl7m;MaG(DaQ@v}cAWNj`jf6fxL&)ItfoYgziuBA=ib6Mw6=<1Q1NEDBv^Pj zVZNj!KZcBSZsk??BCyGg&fgf+b*dMgs5WK*&BiR?cjJCwxG5P}VoC$rOhQ|1$(xAo-# ztNP9WC;QF=BP{6GThO1g+y-CWkNn(U2fE0LoV7NCF0j=DXKh+w@&K}bpb~VT9rw`L zFM@t&F9Rwamw`@46>!I3Ik0uG5y%Zy19d|sz_&wJfmu%MGwj5^fi9d^@45o{6&Ln7 iHH`VO;R^7>Mo_nm;Q6m!=D4x%xEuG7jbfjk(VBlR=(yAX 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 9e45a856..777fe321 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 @@ -56,6 +56,8 @@ public class AvvisoUtil { put(StatoPraticaConstants.INTEGRAZIONE_ACCETTATA, "label.admingeniocivile.avviso.tipoDocumento.integrazioneaccettata"); 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"); } }; @@ -79,6 +81,8 @@ public class AvvisoUtil { put("MA", "conf.geniocivile.avviso.folder.id.manuale"); put("PG", "conf.geniocivile.avviso.folder.id.doc_pagamento"); 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"); } }; @@ -115,8 +119,8 @@ public class AvvisoUtil { put("DPPS", "conf.geniocivile.avviso.template.id.deposito.PS"); put("DPS", "conf.geniocivile.avviso.template.id.deposito.S"); - put("FL1", "conf.geniocivile.avviso.template.id.finelavori.FL1"); - put("FL2", "conf.geniocivile.avviso.template.id.finelavori.FL2"); + 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"); } }; 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 6142b25b..615e015d 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 @@ -1173,6 +1173,9 @@ label.admingeniocivile.avviso.tipoDocumento.integrazioneaccettata = Avviso di vi label.admingeniocivile.avviso.tipoDocumento.avvisomanuale = Avviso generico label.admingeniocivile.avviso.tipoDocumento.cambioistruttore = Avviso di cambio istruttore 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.documento.conforme = Conformità/Autorizzazione label.admingeniocivile.avviso.documento.nonconforme = Conformità negata diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java index f763e89d..64371783 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java @@ -179,14 +179,20 @@ public class ReportAvvisoBeanBuilder { if (FineLavori.class.getName().equalsIgnoreCase(avviso.getClassName())) { FineLavori fineLavori = FineLavoriLocalServiceUtil.getFineLavori(avviso.getClassPk()); bean.setDataPratica(fineLavori.getDtProtocollo()); - bean.setDataPraticaString(new SimpleDateFormat("dd/MM/yyy").format(fineLavori.getDtProtocollo())); + if(Validator.isNotNull(fineLavori.getDtProtocollo())){ + bean.setDataPraticaString(new SimpleDateFormat("dd/MM/yyy").format(fineLavori.getDtProtocollo())); + } } else if (Collaudo.class.getName().equalsIgnoreCase(avviso.getClassName())) { Collaudo collaudo = CollaudoLocalServiceUtil.getCollaudo(avviso.getClassPk()); bean.setDataPratica(collaudo.getDtProtocollo()); - bean.setDataPraticaString(new SimpleDateFormat("dd/MM/yyy").format(collaudo.getDtProtocollo())); + if(Validator.isNotNull(collaudo.getDtProtocollo())){ + bean.setDataPraticaString(new SimpleDateFormat("dd/MM/yyy").format(collaudo.getDtProtocollo())); + } } else { bean.setDataPratica(intPratica.getDtPratica()); - bean.setDataPraticaString(new SimpleDateFormat("dd/MM/yyy").format(intPratica.getDtPratica())); + if(Validator.isNotNull(intPratica.getDtPratica())){ + bean.setDataPraticaString(new SimpleDateFormat("dd/MM/yyy").format(intPratica.getDtPratica())); + } } bean.setDataAvviso(avviso.getModifiedDate()); bean.setTipoPratica(intPratica.getTipoPratica()); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerInvioDocumento.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerInvioDocumento.java index 0ec55e1d..50fd7765 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerInvioDocumento.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerInvioDocumento.java @@ -1,5 +1,33 @@ package it.tref.liferay.portos.bo.scheduler; +import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.json.JSONFactoryUtil; +import com.liferay.portal.kernel.json.JSONObject; +import com.liferay.portal.kernel.json.JSONSerializer; +import com.liferay.portal.kernel.language.LanguageUtil; +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.kernel.messaging.Message; +import com.liferay.portal.kernel.messaging.MessageListener; +import com.liferay.portal.kernel.messaging.MessageListenerException; +import com.liferay.portal.kernel.repository.model.FileEntry; +import com.liferay.portal.kernel.util.ArrayUtil; +import com.liferay.portal.kernel.util.FastDateFormatFactoryUtil; +import com.liferay.portal.kernel.util.LocaleUtil; +import com.liferay.portal.kernel.util.StringPool; +import com.liferay.portal.kernel.util.Validator; +import com.liferay.portal.kernel.workflow.WorkflowException; +import com.liferay.portal.kernel.workflow.WorkflowInstance; +import com.liferay.portal.kernel.workflow.WorkflowInstanceManagerUtil; +import com.liferay.portal.model.Company; +import com.liferay.portal.service.CompanyLocalServiceUtil; +import com.liferay.portal.service.ServiceContext; +import com.liferay.portal.workflow.kaleo.model.KaleoInstance; +import com.liferay.portal.workflow.kaleo.model.KaleoInstanceToken; +import com.liferay.portal.workflow.kaleo.service.KaleoInstanceLocalServiceUtil; +import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; + import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.model.Collaudo; import it.tref.liferay.portos.bo.model.Comune; @@ -47,34 +75,6 @@ import java.util.Set; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import com.liferay.portal.kernel.exception.PortalException; -import com.liferay.portal.kernel.exception.SystemException; -import com.liferay.portal.kernel.json.JSONFactoryUtil; -import com.liferay.portal.kernel.json.JSONObject; -import com.liferay.portal.kernel.json.JSONSerializer; -import com.liferay.portal.kernel.language.LanguageUtil; -import com.liferay.portal.kernel.log.Log; -import com.liferay.portal.kernel.log.LogFactoryUtil; -import com.liferay.portal.kernel.messaging.Message; -import com.liferay.portal.kernel.messaging.MessageListener; -import com.liferay.portal.kernel.messaging.MessageListenerException; -import com.liferay.portal.kernel.repository.model.FileEntry; -import com.liferay.portal.kernel.util.ArrayUtil; -import com.liferay.portal.kernel.util.FastDateFormatFactoryUtil; -import com.liferay.portal.kernel.util.LocaleUtil; -import com.liferay.portal.kernel.util.StringPool; -import com.liferay.portal.kernel.util.Validator; -import com.liferay.portal.kernel.workflow.WorkflowException; -import com.liferay.portal.kernel.workflow.WorkflowInstance; -import com.liferay.portal.kernel.workflow.WorkflowInstanceManagerUtil; -import com.liferay.portal.model.Company; -import com.liferay.portal.service.CompanyLocalServiceUtil; -import com.liferay.portal.service.ServiceContext; -import com.liferay.portal.workflow.kaleo.model.KaleoInstance; -import com.liferay.portal.workflow.kaleo.model.KaleoInstanceToken; -import com.liferay.portal.workflow.kaleo.service.KaleoInstanceLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; - public class SchedulerInvioDocumento implements MessageListener { private static final Log _log = LogFactoryUtil.getLog(SchedulerInvioDocumento.class); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java index dbb26ed1..f961d8b9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java @@ -1836,7 +1836,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl String className, ServiceContext serviceContext) throws SystemException, PortalException { String descLong = StringPool.BLANK; - Date dtAvviso = serviceContext.getModifiedDate(); + Date dtAvviso = serviceContext.getModifiedDate(new Date()); String tipoAvviso = AvvisoUtil.TIPO_AVVISO_DIRETTO; String tipoDocumento = AvvisoUtil.FINE_LAVORI_AVVISO_INIZIO_LAVORI; String propertiesTemplateType = AvvisoUtil.FINE_LAVORI_AVVISO_INIZIO_LAVORI; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java index 88956e03..333b52d8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java @@ -175,7 +175,7 @@ public class FineLavoriLocalServiceImpl extends FineLavoriLocalServiceBaseImpl { String tipoDocumento,ServiceContext serviceContext) throws SystemException, PortalException { String descLong = StringPool.BLANK; - Date dtAvviso = serviceContext.getModifiedDate(); + Date dtAvviso = serviceContext.getModifiedDate(new Date()); String tipoAvviso = AvvisoUtil.TIPO_AVVISO_DIRETTO; String propertiesTemplateType = tipoDocumento; String propertiesTemplate = AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get(propertiesTemplateType); 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 8a2a37f1..86e1e9e0 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=2857 - build.date=1678097661105 + build.number=2860 + build.date=1678457427172 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/parametri/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/parametri/view.jsp index f18412de..68cd1ef4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/parametri/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/parametri/view.jsp @@ -17,7 +17,7 @@ <% long companyId = company.getCompanyId(); String tabs1 = "parametri"; -String redirect = "/html/amministrazione/tabs/view.jsp"; +String redirect = "/html/amministrazione/tabs/view.jps"; String schedulerVersioning = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.SCHEDULER_VERSIONING); String schedulerGeneraDocumento = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/avvisi/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/avvisi/view.jsp index 16004128..77e5323c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/avvisi/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/avvisi/view.jsp @@ -29,7 +29,7 @@ modelVar="avviso" > - + <%= avviso.getFullDescription() %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/.gitignore b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/.gitignore index 840e7d31..22dde0b0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/.gitignore +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/.gitignore @@ -1 +1,2 @@ /classes/ +/classes/ 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 2d4f267936a5d75fa2c6e718b2d3ea775ca59fba..89ae4284678021313c3f9754fc3dafe6aa294ad0 100644 GIT binary patch delta 16782 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 delta 16634 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 delta 1109 zcmY+CZAepL6vyw|bW>M}24xAEp_w{iDb6fyYMEJ1OAXh{v~;Fvr3@D;Vx^gcLOw_z za+`B*Zo28@Vg!A#0tKwQqT68&PR9d{bP{l$ z4)?H&i3TZSGkDAqZg5vv{)qeT#s)Py<$Bn{;cFZ21!zV066^iP!59Ep%)|OPRfkJWNQp?1X zT85&cd?-pq7FY#w*h2W{(Txn$DP^^I@{v3doz?hf>?Y62UAd`iA4L@PQ%asTMe@sv zKO#7?l%mASD5V{PxpV>xSt>KpsLpyrL+#P*X>@{fzTnR5c}3_H=IgQFOi>&I1I5V! zbKSzfEC>-) zWA!~4yl7m;MaG(DaQ@v}cAWNj`jf6fxL&)ItfoYgziuBA=ib6Mw6=<1Q1NEDBv^Pj zVZNj!KZcBSZsk??BCyGg&fgf+b*dMgs5WK*&BiR?cjJCwxG5P}VoC$rOhQ|1$(xAo-# ztNP9WC;QF=BP{6GThO1g+y-CWkNn(U2fE0LoV7NCF0j=DXKh+w@&K}bpb~VT9rw`L zFM@t&F9Rwamw`@46>!I3Ik0uG5y%Zy19d|sz_&wJfmu%MGwj5^fi9d^@45o{6&Ln7 iHH`VO;R^7>Mo_nm;Q6m!=D4x%xEuG7jbfjk(VBlR=(yAX 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 d45abb1a..a16c228b 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 @@ -1,5 +1,42 @@ package it.tref.liferay.portos.fe.portlet; +import com.liferay.portal.kernel.dao.orm.QueryUtil; +import com.liferay.portal.kernel.exception.NestableException; +import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.json.JSONArray; +import com.liferay.portal.kernel.json.JSONFactoryUtil; +import com.liferay.portal.kernel.json.JSONObject; +import com.liferay.portal.kernel.json.JSONSerializer; +import com.liferay.portal.kernel.language.LanguageUtil; +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.kernel.repository.model.FileEntry; +import com.liferay.portal.kernel.servlet.ServletResponseUtil; +import com.liferay.portal.kernel.servlet.SessionErrors; +import com.liferay.portal.kernel.upload.UploadPortletRequest; +import com.liferay.portal.kernel.util.ContentTypes; +import com.liferay.portal.kernel.util.DateFormatFactoryUtil; +import com.liferay.portal.kernel.util.FileUtil; +import com.liferay.portal.kernel.util.HttpUtil; +import com.liferay.portal.kernel.util.LocaleUtil; +import com.liferay.portal.kernel.util.ParamUtil; +import com.liferay.portal.kernel.util.StringPool; +import com.liferay.portal.kernel.util.Validator; +import com.liferay.portal.kernel.util.WebKeys; +import com.liferay.portal.kernel.workflow.WorkflowConstants; +import com.liferay.portal.model.User; +import com.liferay.portal.service.ServiceContext; +import com.liferay.portal.service.ServiceContextFactory; +import com.liferay.portal.service.UserLocalServiceUtil; +import com.liferay.portal.theme.ThemeDisplay; +import com.liferay.portal.util.PortalUtil; +import com.liferay.portlet.documentlibrary.model.DLFolder; +import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; +import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; +import com.liferay.portlet.documentlibrary.util.DLUtil; +import com.liferay.util.bridges.mvc.MVCPortlet; + import it.tref.liferay.portos.bo.model.Asseverazione; import it.tref.liferay.portos.bo.model.Collaudo; import it.tref.liferay.portos.bo.model.Comune; @@ -13,11 +50,9 @@ import it.tref.liferay.portos.bo.model.Soggetto; import it.tref.liferay.portos.bo.model.Territorio; import it.tref.liferay.portos.bo.service.AsseverazioneLocalServiceUtil; import it.tref.liferay.portos.bo.service.AsseverazioneServiceUtil; -import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil; import it.tref.liferay.portos.bo.service.CollaudoLocalServiceUtil; import it.tref.liferay.portos.bo.service.CollaudoServiceUtil; import it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil; -import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil; import it.tref.liferay.portos.bo.service.DelegaLocalServiceUtil; import it.tref.liferay.portos.bo.service.DelegaServiceUtil; import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; @@ -39,7 +74,6 @@ import it.tref.liferay.portos.bo.shared.util.FirmeUtil; 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 it.tref.liferay.portos.bo.util.AvvisoUtil; import it.tref.liferay.portos.bo.util.AzioniPraticheUtil; import it.tref.liferay.portos.bo.util.DelegheUtil; import it.tref.liferay.portos.bo.util.MailUtil; @@ -82,43 +116,6 @@ import net.sf.jasperreports.engine.xml.JRXmlLoader; import org.apache.commons.lang.StringUtils; -import com.liferay.portal.kernel.dao.orm.QueryUtil; -import com.liferay.portal.kernel.exception.NestableException; -import com.liferay.portal.kernel.exception.PortalException; -import com.liferay.portal.kernel.exception.SystemException; -import com.liferay.portal.kernel.json.JSONArray; -import com.liferay.portal.kernel.json.JSONFactoryUtil; -import com.liferay.portal.kernel.json.JSONObject; -import com.liferay.portal.kernel.json.JSONSerializer; -import com.liferay.portal.kernel.language.LanguageUtil; -import com.liferay.portal.kernel.log.Log; -import com.liferay.portal.kernel.log.LogFactoryUtil; -import com.liferay.portal.kernel.repository.model.FileEntry; -import com.liferay.portal.kernel.servlet.ServletResponseUtil; -import com.liferay.portal.kernel.servlet.SessionErrors; -import com.liferay.portal.kernel.upload.UploadPortletRequest; -import com.liferay.portal.kernel.util.ContentTypes; -import com.liferay.portal.kernel.util.DateFormatFactoryUtil; -import com.liferay.portal.kernel.util.FileUtil; -import com.liferay.portal.kernel.util.HttpUtil; -import com.liferay.portal.kernel.util.LocaleUtil; -import com.liferay.portal.kernel.util.ParamUtil; -import com.liferay.portal.kernel.util.StringPool; -import com.liferay.portal.kernel.util.Validator; -import com.liferay.portal.kernel.util.WebKeys; -import com.liferay.portal.kernel.workflow.WorkflowConstants; -import com.liferay.portal.model.User; -import com.liferay.portal.service.ServiceContext; -import com.liferay.portal.service.ServiceContextFactory; -import com.liferay.portal.service.UserLocalServiceUtil; -import com.liferay.portal.theme.ThemeDisplay; -import com.liferay.portal.util.PortalUtil; -import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; -import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; -import com.liferay.portlet.documentlibrary.util.DLUtil; -import com.liferay.util.bridges.mvc.MVCPortlet; - public class FascicoloFePortlet extends MVCPortlet { private static final Log _log = LogFactoryUtil.getLog(FascicoloFePortlet.class); @@ -584,22 +581,26 @@ public class FascicoloFePortlet extends MVCPortlet { if (dettPratica == null) { dettPratica = DettPraticaServiceUtil.getLastEditableByIntPratica(intPraticaId); } - try { - FineLavori fineLavori = FineLavoriServiceUtil - .addFineLavori(intPraticaId, true, dettPratica.getCollaudoStatico(), serviceContext); - successURL = HttpUtil.addParameter(successURL, response.getNamespace() + "fineLavoriId", - String.valueOf(fineLavori.getFineLavoriId())); - /* - * SDB: forse non è più necessario distinguere la fase i creazione di una nuovo fineLavori da un editing - */ - response.sendRedirect(successURL); - } catch (PortalException | SystemException e) { - successURL = HttpUtil.setParameter(successURL, response.getNamespace() + "mvcPath", - "/html/fascicolofe/view.jsp"); - - response.sendRedirect(successURL); - _log.error(e, e); - throw e; + FineLavori curFineLavori = FineLavoriLocalServiceUtil.fetchByProtocollo(serviceContext.getCompanyId(), + serviceContext.getScopeGroupId(), dettPratica.getProtocollo()); + if(Validator.isNull(curFineLavori) || (curFineLavori.isCompletata() && curFineLavori.isParziale())){ + try { + FineLavori fineLavori = FineLavoriServiceUtil + .addFineLavori(intPraticaId, true, dettPratica.getCollaudoStatico(), serviceContext); + successURL = HttpUtil.addParameter(successURL, response.getNamespace() + "fineLavoriId", + String.valueOf(fineLavori.getFineLavoriId())); + /* + * SDB: forse non è più necessario distinguere la fase i creazione di una nuovo fineLavori da un editing + */ + response.sendRedirect(successURL); + } catch (PortalException | SystemException e) { + successURL = HttpUtil.setParameter(successURL, response.getNamespace() + "mvcPath", + "/html/fascicolofe/view.jsp"); + + response.sendRedirect(successURL); + _log.error(e, e); + throw e; + } } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp index 696125c7..394fbd73 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp @@ -224,8 +224,8 @@ for (String codiceDoc : tipologiaAllegati) { %>
<%=docPraticas.size()%> - + <% if (docPraticas.isEmpty()) { %>