diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.classpath b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.classpath deleted file mode 100644 index 991a105e..00000000 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.classpath +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.project b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.project deleted file mode 100644 index c3a8b7b2..00000000 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.project +++ /dev/null @@ -1,37 +0,0 @@ - - - portos-p7m-preview-hook - - - - - - 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 - org.apache.ivyde.eclipse.ivynature - - diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/.jsdtscope b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/.jsdtscope deleted file mode 100644 index 840a01d5..00000000 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f42de363..00000000 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.wst.common.component deleted file mode 100644 index d9ed48a7..00000000 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml deleted file mode 100644 index 1f9ee534..00000000 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 92ef9c01..00000000 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.wst.jsdt.ui.superType.container b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a4..00000000 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.wst.jsdt.ui.superType.name b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b6..00000000 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/build.xml b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/build.xml deleted file mode 100644 index 2f4e1eb9..00000000 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/build.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/META-INF/MANIFEST.MF b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/META-INF/MANIFEST.MF deleted file mode 100644 index 254272e1..00000000 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/WEB-INF/.gitignore b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/WEB-INF/.gitignore deleted file mode 100644 index 840e7d31..00000000 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/WEB-INF/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/classes/ diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/WEB-INF/lib/util-java.jar b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/WEB-INF/lib/util-java.jar deleted file mode 100644 index 6b5d95f8..00000000 Binary files a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/WEB-INF/lib/util-java.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/WEB-INF/liferay-hook.xml b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/WEB-INF/liferay-hook.xml deleted file mode 100644 index 984d2e70..00000000 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/WEB-INF/liferay-hook.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/WEB-INF/liferay-plugin-package.properties b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/WEB-INF/liferay-plugin-package.properties deleted file mode 100644 index b13bf1ef..00000000 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/WEB-INF/liferay-plugin-package.properties +++ /dev/null @@ -1,11 +0,0 @@ -name=Portos P7m Preview -module-group-id=liferay -module-incremental-version=1 -tags= -short-description= -long-description= -change-log= -page-url=http://www.liferay.com -author=Liferay, Inc. -licenses=LGPL -liferay-versions=6.2.0+ \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/WEB-INF/src/it/tref/liferay/portlet/p7mpreview/P7mPreview.java b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/WEB-INF/src/it/tref/liferay/portlet/p7mpreview/P7mPreview.java deleted file mode 100644 index 073f22d5..00000000 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/WEB-INF/src/it/tref/liferay/portlet/p7mpreview/P7mPreview.java +++ /dev/null @@ -1,52 +0,0 @@ -package it.tref.liferay.portlet.p7mpreview; - -import java.util.List; - -import com.liferay.portal.kernel.lar.PortletDataContext; -import com.liferay.portal.kernel.log.Log; -import com.liferay.portal.kernel.log.LogFactoryUtil; -import com.liferay.portal.kernel.repository.model.FileEntry; -import com.liferay.portal.kernel.repository.model.FileVersion; -import com.liferay.portal.kernel.xml.Element; -import com.liferay.portlet.documentlibrary.util.DLPreviewableProcessor; - -public class P7mPreview extends DLPreviewableProcessor { - Log _log = LogFactoryUtil.getLog(P7mPreview.class); - - @Override - public void afterPropertiesSet() throws Exception {} - - @Override - public boolean isSupported(String mimeType) { - - _log.info("isSupported(\"" + mimeType + "\""); - return false; - } - - @Override - protected void doExportGeneratedFiles(PortletDataContext portletDataContext, FileEntry fileEntry, - Element fileEntryElement) throws Exception {} - - @Override - protected void doImportGeneratedFiles(PortletDataContext portletDataContext, FileEntry fileEntry, - FileEntry importedFileEntry, Element fileEntryElement) throws Exception {} - - @Override - protected List getFileVersionIds() { - - return null; - } - - @Override - protected String getPreviewType(FileVersion fileVersion) { - - return null; - } - - @Override - protected String getThumbnailType(FileVersion fileVersion) { - - return null; - } - -} diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/WEB-INF/web.xml b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/WEB-INF/web.xml deleted file mode 100644 index 1aa8cdb8..00000000 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/WEB-INF/web.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/ivy.xml b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/ivy.xml deleted file mode 100644 index 12cc7c7c..00000000 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/ivy.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/ivy.xml.MD5 deleted file mode 100644 index 65d421b8..00000000 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/ivy.xml.MD5 +++ /dev/null @@ -1 +0,0 @@ -2c267788e15963b22e4e720e12f5611c diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/test/integration/arquillian.xml b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/test/integration/arquillian.xml deleted file mode 100644 index 9413609b..00000000 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/test/integration/arquillian.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - 8099 - tomcat - tomcat - - - \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/hooks/sicilia-p7m-preview-hook/docroot/WEB-INF/src/it/mwg/sicilia/preview/SiciliaP7MProcessor.java b/liferay-plugins-sdk-6.2/hooks/sicilia-p7m-preview-hook/docroot/WEB-INF/src/it/mwg/sicilia/preview/SiciliaP7MProcessor.java index 9bb30da0..207b1989 100644 --- a/liferay-plugins-sdk-6.2/hooks/sicilia-p7m-preview-hook/docroot/WEB-INF/src/it/mwg/sicilia/preview/SiciliaP7MProcessor.java +++ b/liferay-plugins-sdk-6.2/hooks/sicilia-p7m-preview-hook/docroot/WEB-INF/src/it/mwg/sicilia/preview/SiciliaP7MProcessor.java @@ -12,13 +12,11 @@ import java.io.File; import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Properties; import java.util.Set; import java.util.Vector; -import java.util.concurrent.Future; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.time.StopWatch; @@ -317,7 +315,9 @@ public class SiciliaP7MProcessor extends DLPreviewableProcessor implements PDFPr File file = DocumentConversionUtil.convert(tempFileId, inputStream, extension, "pdf"); _generateImages(destinationFileVersion, file); } - } catch (NoSuchFileEntryException nsfee) {} finally { + } catch (NoSuchFileEntryException nsfee) { + // Ignore + } finally { StreamUtil.cleanUp(inputStream); _fileVersionIds.remove(destinationFileVersion.getFileVersionId()); } @@ -327,26 +327,8 @@ public class SiciliaP7MProcessor extends DLPreviewableProcessor implements PDFPr // openssl smime -verify -noverify -in document.pdf.p7m -inform DER -out document.pdf File pdf = File.createTempFile("p7m-output", ".pdf"); - List arguments = new LinkedList<>(); - arguments.add("openssl"); - arguments.add("smime"); - arguments.add("-verify"); - arguments.add("-noverify"); - arguments.add("-in"); - arguments.add(p7m.getAbsolutePath()); - arguments.add("-inform"); - arguments.add("DER"); - arguments.add("-out"); - arguments.add(pdf.getAbsolutePath()); - Future future = ProcessUtil.execute(ProcessUtil.LOGGING_OUTPUT_PROCESSOR, arguments); - while (!future.isCancelled()) { - if (future.isDone()) { - futures.put(pdf.getAbsolutePath(), future); - break; - } - Thread.sleep(1000); - } - future.get(); + ProcessUtil.execute(ProcessUtil.LOGGING_OUTPUT_PROCESSOR, "openssl", "smime", "-verify", "-noverify", "-in", + p7m.getAbsolutePath(), "-inform", "DER", "-out", pdf.getAbsolutePath()).get(); return pdf; } @@ -406,16 +388,7 @@ public class SiciliaP7MProcessor extends DLPreviewableProcessor implements PDFPr arguments.add("-dDEVICEHEIGHT=" + PropsValues.DL_FILE_ENTRY_PREVIEW_DOCUMENT_MAX_HEIGHT); } arguments.add(file.getPath()); - Future future = GhostscriptUtil.execute(arguments); - String processIdentity = String.valueOf(fileVersion.getFileVersionId()); - while (!future.isCancelled()) { - if (future.isDone()) { - futures.put(processIdentity, future); - break; - } - Thread.sleep(1000); - } - future.get(); + GhostscriptUtil.execute(arguments).get(); // Store images if (thumbnail) { File thumbnailTempFile = getThumbnailTempFile(tempFileId); @@ -476,10 +449,7 @@ public class SiciliaP7MProcessor extends DLPreviewableProcessor implements PDFPr PropsValues.DL_FILE_ENTRY_PREVIEW_DOCUMENT_DPI, PropsValues.DL_FILE_ENTRY_PREVIEW_DOCUMENT_MAX_HEIGHT, PropsValues.DL_FILE_ENTRY_PREVIEW_DOCUMENT_MAX_WIDTH, generatePreview, generateThumbnail); - Future future = ProcessExecutor.execute(ClassPathUtil.getPortalClassPath(), processCallable); - String processIdentity = String.valueOf(fileVersion.getFileVersionId()); - futures.put(processIdentity, future); - future.get(); + ProcessExecutor.execute(ClassPathUtil.getPortalClassPath(), processCallable).get(); } else { LiferayPDFBoxConverter liferayConverter = new LiferayPDFBoxConverter(file, thumbnailFile, previewFiles, getPreviewType(fileVersion), getThumbnailType(fileVersion), diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalService.java index b5d5c720..cd2dec31 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalService.java @@ -702,6 +702,11 @@ public interface DettPraticaLocalService extends BaseLocalService, com.liferay.portal.kernel.exception.SystemException, java.io.IOException; + public void concludiPagamento(long dettPraticaId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException, + java.io.IOException; + @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) public boolean isControlloObbligatorio( it.tref.liferay.portos.bo.model.DettPratica dettPratica); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceClp.java index f1cde09a..2f0c805e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceClp.java @@ -351,23 +351,27 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { "long", "long", "long", "java.lang.String" }; - _methodName47 = "isControlloObbligatorio"; + _methodName47 = "concludiPagamento"; - _methodParameterTypes47 = new String[] { + _methodParameterTypes47 = new String[] { "long" }; + + _methodName48 = "isControlloObbligatorio"; + + _methodParameterTypes48 = new String[] { "it.tref.liferay.portos.bo.model.DettPratica" }; - _methodName48 = "updateEsito"; + _methodName49 = "updateEsito"; - _methodParameterTypes48 = new String[] { "long", "int" }; + _methodParameterTypes49 = new String[] { "long", "int" }; - _methodName49 = "updateEsitoIntegrazione"; + _methodName50 = "updateEsitoIntegrazione"; - _methodParameterTypes49 = new String[] { "long", "int" }; + _methodParameterTypes50 = new String[] { "long", "int" }; - _methodName50 = "pagaInvia"; + _methodName51 = "pagaInvia"; - _methodParameterTypes50 = new String[] { + _methodParameterTypes51 = new String[] { "long", "int", "int", "int", "int", "boolean", "boolean", "boolean", "java.lang.String", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", @@ -376,151 +380,151 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName51 = "updateStatus"; + _methodName52 = "updateStatus"; - _methodParameterTypes51 = new String[] { + _methodParameterTypes52 = new String[] { "long", "long", "int", "com.liferay.portal.service.ServiceContext" }; - _methodName52 = "updateDettPraticaProtocollo"; + _methodName53 = "updateDettPraticaProtocollo"; - _methodParameterTypes52 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes53 = new String[] { "long", "java.lang.String" }; - _methodName53 = "findByProtocollo"; + _methodName54 = "findByProtocollo"; - _methodParameterTypes53 = new String[] { + _methodParameterTypes54 = new String[] { "long", "long", "java.lang.String" }; - _methodName54 = "fetchByProtocollo"; + _methodName55 = "fetchByProtocollo"; - _methodParameterTypes54 = new String[] { + _methodParameterTypes55 = new String[] { "long", "long", "java.lang.String" }; - _methodName55 = "fetchByProtocollo"; + _methodName56 = "fetchByProtocollo"; - _methodParameterTypes55 = new String[] { "java.lang.String" }; + _methodParameterTypes56 = new String[] { "java.lang.String" }; - _methodName56 = "findByIntPraticaId"; + _methodName57 = "findByIntPraticaId"; - _methodParameterTypes56 = new String[] { "long" }; + _methodParameterTypes57 = new String[] { "long" }; - _methodName57 = "findByIntPraticaIdInviate"; + _methodName58 = "findByIntPraticaIdInviate"; - _methodParameterTypes57 = new String[] { "long", "int", "int" }; + _methodParameterTypes58 = new String[] { "long", "int", "int" }; - _methodName58 = "findPraticheCompleteNotProtocollo"; + _methodName59 = "findPraticheCompleteNotProtocollo"; - _methodParameterTypes58 = new String[] { "int", "int" }; + _methodParameterTypes59 = new String[] { "int", "int" }; - _methodName59 = "countPraticheCompleteNotProtocollo"; + _methodName60 = "countPraticheCompleteNotProtocollo"; - _methodParameterTypes59 = new String[] { }; + _methodParameterTypes60 = new String[] { }; - _methodName60 = "findPraticheCompleteNotGestite"; + _methodName61 = "findPraticheCompleteNotGestite"; - _methodParameterTypes60 = new String[] { "int", "int" }; + _methodParameterTypes61 = new String[] { "int", "int" }; - _methodName61 = "countPraticheCompleteNotGestite"; + _methodName62 = "countPraticheCompleteNotGestite"; - _methodParameterTypes61 = new String[] { }; + _methodParameterTypes62 = new String[] { }; - _methodName62 = "findByIntPraticaId_TipoIntegrazione_Completa"; + _methodName63 = "findByIntPraticaId_TipoIntegrazione_Completa"; - _methodParameterTypes62 = new String[] { + _methodParameterTypes63 = new String[] { "long", "java.lang.String", "boolean" }; - _methodName63 = "countByIntPraticaId_TipoIntegrazione_Completa"; + _methodName64 = "countByIntPraticaId_TipoIntegrazione_Completa"; - _methodParameterTypes63 = new String[] { + _methodParameterTypes64 = new String[] { "long", "java.lang.String", "boolean" }; - _methodName64 = "findPraticheCompletateNonVersionate"; + _methodName65 = "findPraticheCompletateNonVersionate"; - _methodParameterTypes64 = new String[] { "int", "int" }; + _methodParameterTypes65 = new String[] { "int", "int" }; - _methodName65 = "countPraticheCompletateNonversionate"; + _methodName66 = "countPraticheCompletateNonversionate"; - _methodParameterTypes65 = new String[] { }; + _methodParameterTypes66 = new String[] { }; - _methodName66 = "updateDettPraticaGestita"; + _methodName67 = "updateDettPraticaGestita"; - _methodParameterTypes66 = new String[] { "long", "boolean" }; + _methodParameterTypes67 = new String[] { "long", "boolean" }; - _methodName67 = "updateAsset"; + _methodName68 = "updateAsset"; - _methodParameterTypes67 = new String[] { + _methodParameterTypes68 = new String[] { "it.tref.liferay.portos.bo.model.DettPratica", "long[][]", "boolean" }; - _methodName68 = "updateStatus"; + _methodName69 = "updateStatus"; - _methodParameterTypes68 = new String[] { "long", "int" }; + _methodParameterTypes69 = new String[] { "long", "int" }; - _methodName69 = "updateSignal"; + _methodName70 = "updateSignal"; - _methodParameterTypes69 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes70 = new String[] { "long", "java.util.Date" }; - _methodName70 = "countInvioSignal"; + _methodName71 = "countInvioSignal"; - _methodParameterTypes70 = new String[] { }; + _methodParameterTypes71 = new String[] { }; - _methodName71 = "getInvioSignal"; + _methodName72 = "getInvioSignal"; - _methodParameterTypes71 = new String[] { "long" }; + _methodParameterTypes72 = new String[] { "long" }; - _methodName72 = "getInviiSignal"; + _methodName73 = "getInviiSignal"; - _methodParameterTypes72 = new String[] { "int", "int" }; + _methodParameterTypes73 = new String[] { "int", "int" }; - _methodName73 = "dynamicQueryInvioSignal"; + _methodName74 = "dynamicQueryInvioSignal"; - _methodParameterTypes73 = new String[] { "java.lang.Long" }; + _methodParameterTypes74 = new String[] { "java.lang.Long" }; - _methodName74 = "findByPagamentoId"; + _methodName75 = "findByPagamentoId"; - _methodParameterTypes74 = new String[] { "long" }; + _methodParameterTypes75 = new String[] { "long" }; - _methodName75 = "updatePrincipale"; + _methodName76 = "updatePrincipale"; - _methodParameterTypes75 = new String[] { + _methodParameterTypes76 = new String[] { "long", "java.lang.String", "java.lang.String" }; - _methodName76 = "getDettPraticaFields"; + _methodName77 = "getDettPraticaFields"; - _methodParameterTypes76 = new String[] { }; + _methodParameterTypes77 = new String[] { }; - _methodName77 = "getVersioni"; + _methodName78 = "getVersioni"; - _methodParameterTypes77 = new String[] { "long" }; + _methodParameterTypes78 = new String[] { "long" }; - _methodName78 = "callForChanges"; + _methodName79 = "callForChanges"; - _methodParameterTypes78 = new String[] { "long" }; + _methodParameterTypes79 = new String[] { "long" }; - _methodName79 = "isNumber"; + _methodName80 = "isNumber"; - _methodParameterTypes79 = new String[] { "java.lang.String" }; + _methodParameterTypes80 = new String[] { "java.lang.String" }; - _methodName80 = "format"; + _methodName81 = "format"; - _methodParameterTypes80 = new String[] { + _methodParameterTypes81 = new String[] { "java.lang.String", "java.io.Serializable" }; - _methodName81 = "countVariateByIntPratica"; + _methodName82 = "countVariateByIntPratica"; - _methodParameterTypes81 = new String[] { "long" }; + _methodParameterTypes82 = new String[] { "long" }; - _methodName82 = "getFirstCompletedByIntPratica"; + _methodName83 = "getFirstCompletedByIntPratica"; - _methodParameterTypes82 = new String[] { "long" }; + _methodParameterTypes83 = new String[] { "long" }; } @Override @@ -3158,14 +3162,48 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { } } + @Override + public void concludiPagamento(long dettPraticaId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException, + java.io.IOException { + try { + _invokableLocalService.invokeMethod(_methodName47, + _methodParameterTypes47, new Object[] { dettPraticaId }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof com.liferay.portal.kernel.exception.PortalException) { + throw (com.liferay.portal.kernel.exception.PortalException)t; + } + + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { + 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; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + } + @Override public boolean isControlloObbligatorio( it.tref.liferay.portos.bo.model.DettPratica dettPratica) { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName47, - _methodParameterTypes47, + returnObj = _invokableLocalService.invokeMethod(_methodName48, + _methodParameterTypes48, new Object[] { ClpSerializer.translateInput(dettPratica) }); } catch (Throwable t) { @@ -3192,8 +3230,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName48, - _methodParameterTypes48, + returnObj = _invokableLocalService.invokeMethod(_methodName49, + _methodParameterTypes49, new Object[] { dettPraticaId, stato }); } catch (Throwable t) { @@ -3232,8 +3270,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName49, - _methodParameterTypes49, + returnObj = _invokableLocalService.invokeMethod(_methodName50, + _methodParameterTypes50, new Object[] { dettPraticaId, stato }); } catch (Throwable t) { @@ -3286,8 +3324,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName50, - _methodParameterTypes50, + returnObj = _invokableLocalService.invokeMethod(_methodName51, + _methodParameterTypes51, new Object[] { dettPraticaId, @@ -3372,8 +3410,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName51, - _methodParameterTypes51, + returnObj = _invokableLocalService.invokeMethod(_methodName52, + _methodParameterTypes52, new Object[] { userId, @@ -3415,8 +3453,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName52, - _methodParameterTypes52, + returnObj = _invokableLocalService.invokeMethod(_methodName53, + _methodParameterTypes53, new Object[] { dettPraticaId, @@ -3454,8 +3492,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName53, - _methodParameterTypes53, + returnObj = _invokableLocalService.invokeMethod(_methodName54, + _methodParameterTypes54, new Object[] { companyId, @@ -3495,8 +3533,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName54, - _methodParameterTypes54, + returnObj = _invokableLocalService.invokeMethod(_methodName55, + _methodParameterTypes55, new Object[] { companyId, @@ -3536,8 +3574,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName55, - _methodParameterTypes55, + returnObj = _invokableLocalService.invokeMethod(_methodName56, + _methodParameterTypes56, new Object[] { ClpSerializer.translateInput(protocollo) }); } catch (Throwable t) { @@ -3570,8 +3608,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName56, - _methodParameterTypes56, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName57, + _methodParameterTypes57, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -3599,8 +3637,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName57, - _methodParameterTypes57, + returnObj = _invokableLocalService.invokeMethod(_methodName58, + _methodParameterTypes58, new Object[] { intPraticaId, start, end }); } catch (Throwable t) { @@ -3629,8 +3667,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName58, - _methodParameterTypes58, new Object[] { start, end }); + returnObj = _invokableLocalService.invokeMethod(_methodName59, + _methodParameterTypes59, new Object[] { start, end }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -3657,8 +3695,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName59, - _methodParameterTypes59, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName60, + _methodParameterTypes60, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -3686,8 +3724,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName60, - _methodParameterTypes60, new Object[] { start, end }); + returnObj = _invokableLocalService.invokeMethod(_methodName61, + _methodParameterTypes61, new Object[] { start, end }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -3714,8 +3752,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName61, - _methodParameterTypes61, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName62, + _methodParameterTypes62, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -3743,8 +3781,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName62, - _methodParameterTypes62, + returnObj = _invokableLocalService.invokeMethod(_methodName63, + _methodParameterTypes63, new Object[] { intPraticaId, @@ -3779,8 +3817,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName63, - _methodParameterTypes63, + returnObj = _invokableLocalService.invokeMethod(_methodName64, + _methodParameterTypes64, new Object[] { intPraticaId, @@ -3815,8 +3853,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName64, - _methodParameterTypes64, new Object[] { start, end }); + returnObj = _invokableLocalService.invokeMethod(_methodName65, + _methodParameterTypes65, new Object[] { start, end }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -3843,8 +3881,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName65, - _methodParameterTypes65, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName66, + _methodParameterTypes66, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -3872,8 +3910,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName66, - _methodParameterTypes66, + returnObj = _invokableLocalService.invokeMethod(_methodName67, + _methodParameterTypes67, new Object[] { dettPraticaId, gestita }); } catch (Throwable t) { @@ -3902,8 +3940,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName67, - _methodParameterTypes67, + _invokableLocalService.invokeMethod(_methodName68, + _methodParameterTypes68, new Object[] { ClpSerializer.translateInput(dettPratica), @@ -3938,8 +3976,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName68, - _methodParameterTypes68, new Object[] { dettPraticaId, status }); + _invokableLocalService.invokeMethod(_methodName69, + _methodParameterTypes69, new Object[] { dettPraticaId, status }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -3969,8 +4007,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName69, - _methodParameterTypes69, + returnObj = _invokableLocalService.invokeMethod(_methodName70, + _methodParameterTypes70, new Object[] { dettPraticaId, @@ -4002,8 +4040,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName70, - _methodParameterTypes70, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName71, + _methodParameterTypes71, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4031,8 +4069,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName71, - _methodParameterTypes71, new Object[] { dettPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName72, + _methodParameterTypes72, new Object[] { dettPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4060,8 +4098,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName72, - _methodParameterTypes72, new Object[] { start, end }); + returnObj = _invokableLocalService.invokeMethod(_methodName73, + _methodParameterTypes73, new Object[] { start, end }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4089,8 +4127,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName73, - _methodParameterTypes73, + returnObj = _invokableLocalService.invokeMethod(_methodName74, + _methodParameterTypes74, new Object[] { ClpSerializer.translateInput(dettPraticaId) }); } catch (Throwable t) { @@ -4119,8 +4157,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName74, - _methodParameterTypes74, new Object[] { pagamentoId }); + returnObj = _invokableLocalService.invokeMethod(_methodName75, + _methodParameterTypes75, new Object[] { pagamentoId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4150,8 +4188,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName75, - _methodParameterTypes75, + returnObj = _invokableLocalService.invokeMethod(_methodName76, + _methodParameterTypes76, new Object[] { dettPraticaId, @@ -4188,8 +4226,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName76, - _methodParameterTypes76, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName77, + _methodParameterTypes77, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4213,8 +4251,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName77, - _methodParameterTypes77, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName78, + _methodParameterTypes78, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4242,8 +4280,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName78, - _methodParameterTypes78, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName79, + _methodParameterTypes79, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4269,8 +4307,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName79, - _methodParameterTypes79, + returnObj = _invokableLocalService.invokeMethod(_methodName80, + _methodParameterTypes80, new Object[] { ClpSerializer.translateInput(field) }); } catch (Throwable t) { @@ -4294,8 +4332,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName80, - _methodParameterTypes80, + returnObj = _invokableLocalService.invokeMethod(_methodName81, + _methodParameterTypes81, new Object[] { ClpSerializer.translateInput(field), @@ -4323,8 +4361,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName81, - _methodParameterTypes81, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName82, + _methodParameterTypes82, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4352,8 +4390,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName82, - _methodParameterTypes82, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName83, + _methodParameterTypes83, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4539,4 +4577,6 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { private String[] _methodParameterTypes81; private String _methodName82; private String[] _methodParameterTypes82; + private String _methodName83; + private String[] _methodParameterTypes83; } \ 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/DettPraticaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceUtil.java index abea57c6..dcf5ea39 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceUtil.java @@ -932,6 +932,13 @@ public class DettPraticaLocalServiceUtil { .updateEsitoPagamento(pagamentoId, dettPraticaId, fileEntryId, stato); } + public static void concludiPagamento(long dettPraticaId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException, + java.io.IOException { + getService().concludiPagamento(dettPraticaId); + } + public static boolean isControlloObbligatorio( it.tref.liferay.portos.bo.model.DettPratica dettPratica) { return getService().isControlloObbligatorio(dettPratica); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceWrapper.java index c6ed5bdc..5485084d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceWrapper.java @@ -964,6 +964,14 @@ public class DettPraticaLocalServiceWrapper implements DettPraticaLocalService, dettPraticaId, fileEntryId, stato); } + @Override + public void concludiPagamento(long dettPraticaId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException, + java.io.IOException { + _dettPraticaLocalService.concludiPagamento(dettPraticaId); + } + @Override public boolean isControlloObbligatorio( it.tref.liferay.portos.bo.model.DettPratica dettPratica) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AsseverazioniUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AsseverazioniUtil.java index 716a8eaf..99c866af 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AsseverazioniUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AsseverazioniUtil.java @@ -60,7 +60,7 @@ public class AsseverazioniUtil { public final static String ASSEVERAZIONE_DA_ALLEGATO = "AL"; private static final String[] statiAttivi = new String[] { STATO_ASSEGNATA, STATO_ESEGUITA }; - private static final Log _log = LogFactoryUtil.getLog(ValidazionePraticaUtil.class); + private static final Log _log = LogFactoryUtil.getLog(AsseverazioniUtil.class); public static boolean hasAsseverazioniAttive(long dettPraticaId) throws SystemException { @@ -136,6 +136,7 @@ public class AsseverazioniUtil { put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14, Arrays.asList(TipoSoggettoUtil.GEOLOGO)); put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A15, Arrays.asList(TipoSoggettoUtil.GEOLOGO, TipoSoggettoUtil.DIRETTORE_LAVORI)); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A29, Arrays.asList(TipoSoggettoUtil.DIRETTORE_LAVORI)); // Domanda put(ASSEVERAZIONI_DOMANDA, Arrays.asList(TipoSoggettoUtil.COMMITTENTE, TipoSoggettoUtil.DIRETTORE_LAVORI, TipoSoggettoUtil.PROGETTISTA, TipoSoggettoUtil.DITTA, TipoSoggettoUtil.COLLAUDATORE)); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AzioniPraticheUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AzioniPraticheUtil.java index b8750a27..26f24b35 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AzioniPraticheUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AzioniPraticheUtil.java @@ -61,9 +61,8 @@ public class AzioniPraticheUtil { put(STATE_ANNULLATO, new ArrayList()); put(STATE_NON_CONFORME, new ArrayList()); put(NON_AUTORIZZATA, new ArrayList()); - put(STATE_INTEGRAZIONE_AUTORIZZAZIONE, - ListUtil.toList(new String[] { ACTION_AGGIUNGI_SOGGETTO, ACTION_RIMUOVI_SOGGETTO, - ACTION_INTEGRAZIONE, ACTION_ANNULLA })); + put(STATE_INTEGRAZIONE_AUTORIZZAZIONE, Arrays.asList(ACTION_AGGIUNGI_SOGGETTO, ACTION_RIMUOVI_SOGGETTO, + ACTION_INTEGRAZIONE, ACTION_ANNULLA)); put(STATE_INTEGRAZIONE_DEPOSITO, ListUtil.toList(new String[] { ACTION_AGGIUNGI_SOGGETTO, ACTION_RIMUOVI_SOGGETTO, ACTION_INTEGRAZIONE, ACTION_ANNULLA })); 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 acb0d6dd..11e70860 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 @@ -76,19 +76,19 @@ public class ValidazionePraticaUtil { DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); return !intPratica.getSospesa() && !intPratica.isAnnullata() - && !AsseverazioniUtil.hasAsseverazioniAttive(dettPraticaId) - && !ValidazionePraticaUtil.pagamentoIsEnable(dettPraticaId) + && !AsseverazioniUtil.hasAsseverazioniAttive(dettPraticaId) && !pagamentoIsEnable(dettPraticaId) && dettPratica.getStatus() == WorkflowConstants.STATUS_DRAFT; } public static boolean praticaIsCompleta(long dettPraticaId) throws SystemException, PortalException { DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId); - return isDettagliPrincipaliCompleta(dettPraticaId) - && isAnagrafeSoggettiCompleta(dettPraticaId) - && isDescrizioneEdificioCompleta(dettPraticaId) - && isSezioneGeologicaCompleta(dettPraticaId) - && ((dettPratica.getStatus() != WorkflowConstants.STATUS_DRAFT) || isSezioneAllegatiCompleta(dettPraticaId)); + return notCompletedDettagliPrincipali(dettPraticaId).isEmpty() + && notCompletedAnagrafeSoggetti(dettPraticaId).isEmpty() + && notCompletedDescrizioneEdificio(dettPraticaId).isEmpty() + && notCompletedSezioneGeologica(dettPraticaId).isEmpty() + && ((dettPratica.getStatus() != WorkflowConstants.STATUS_DRAFT) || notCompletedSezioniAllegati( + dettPraticaId).isEmpty()); } public static boolean canEditPratica(long intPraticaId) throws PortalException, SystemException { @@ -120,7 +120,8 @@ public class ValidazionePraticaUtil { DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); - return isAnagrafeSoggettiCompleta(dettPraticaId) && intPratica.getStatus() != WorkflowConstants.STATUS_ANY + return notCompletedAnagrafeSoggetti(dettPraticaId).isEmpty() + && intPratica.getStatus() != WorkflowConstants.STATUS_ANY && intPratica.getStatus() != WorkflowConstants.STATUS_INCOMPLETE && TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equals(dettPratica.getTipoIntegrazione()); } @@ -141,8 +142,9 @@ public class ValidazionePraticaUtil { DettPratica dettPratica = DettPraticaServiceUtil.getLastEditabledByIntPraticaAndTipoPratica(intPraticaId, Arrays.asList(TipoIntegrazioneUtil.VARIANTE, TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE, TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO)); - return Validator.isNotNull(dettPratica) || intPratica.getStatus() == WorkflowConstants.STATUS_ANY - || intPratica.getStatus() == WorkflowConstants.STATUS_INCOMPLETE; + return (Validator.isNotNull(dettPratica) || intPratica.getStatus() == WorkflowConstants.STATUS_ANY || intPratica + .getStatus() == WorkflowConstants.STATUS_INCOMPLETE) + && !StatoPraticaConstants.NON_AUTORIZZATA.equalsIgnoreCase(intPratica.getStatoPratica()); } public static boolean praticaCanAddVariante(long intPraticaId) throws SystemException, PortalException { @@ -327,7 +329,8 @@ public class ValidazionePraticaUtil { return praticaIsCompleta(dettPraticaId) && !DelegheUtil.hasDelegheCompilazioneAttive(dettPraticaId) && AsseverazioniUtil.allAsseverazioniCompleted(dettPraticaId) // se è un'integrazione non si paga - && !intPratica.getStatoPratica().equals(StatoPraticaConstants.INTEGRAZIONE); + && !intPratica.getStatoPratica().equals(StatoPraticaConstants.INTEGRAZIONE) + && !dettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO); } public static boolean canCompleteDettPraticaEsente(long dettPraticaId) throws SystemException, PortalException { @@ -391,25 +394,6 @@ public class ValidazionePraticaUtil { && !AsseverazioniUtil.hasAsseverazioniAttive(dettPraticaId); } - public static boolean isSectionCompleted(String section, long dettPraticaId) throws PortalException, - SystemException { - - switch (section) { - case SezioniUtil.SEZIONE_DETTAGLI_PRINCIPALI: - return isDettagliPrincipaliCompleta(dettPraticaId); - case SezioniUtil.SEZIONE_ANAGRAFE_SOGGETTI: - return isAnagrafeSoggettiCompleta(dettPraticaId); - case SezioniUtil.SEZIONE_DESCRIZIONE_EDIFICIO: - return isDescrizioneEdificioCompleta(dettPraticaId); - case SezioniUtil.SEZIONE_GEOLOGICA: - return isSezioneGeologicaCompleta(dettPraticaId); - case SezioniUtil.SEZIONE_ALLEGATI: - return isSezioneAllegatiCompleta(dettPraticaId); - default: - return false; - } - } - public static List notCompletedSection(String section, long dettPraticaId) throws PortalException, SystemException { @@ -434,41 +418,6 @@ public class ValidazionePraticaUtil { return notCompletedSezioneGeologica(dettPraticaId).isEmpty(); } - private static boolean isDettagliPrincipaliCompleta(long dettPraticaId) throws PortalException, SystemException { - - DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); - IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); - boolean ag = true; - if (!territorio.getZona().equals(Constants.ZONA_2) && !territorio.getZona().equals(Constants.ZONA_4)) { - ag = Validator.isNotNull(dettPratica.getAg()); - } - boolean aiSensi = AzioniPraticheUtil.isDeposito(intPratica.getIntPraticaId()) ? (dettPratica.getNormDpr01Dep() || dettPratica - .getNormDpr02Dep()) : (dettPratica.getNormDpr01Aut() || dettPratica.getNormDpr02Aut()); - boolean nelRispetto = dettPratica.getNormDm01() || dettPratica.getNormDm02() || dettPratica.getNormDm2018(); - boolean sismaBonus = !dettPratica.getNormSismaBonus() - || (Validator.isNotNull(dettPratica.getClRischioPreInt()) || Validator.isNotNull(dettPratica - .getClRischioPostInt())); - boolean tipologiaCostruttiva = intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_C) - || dettPratica.getTcInCA() || dettPratica.getTcInAcciaio() || dettPratica.getTcInMuratura() - || dettPratica.getTcInLegno() || dettPratica.getTcAltro(); - boolean intervFinPub = !dettPratica.getIntervFinPub() || Validator.isNotNull(dettPratica.getIntervFinPubDesc()); - boolean controllo = ag - && aiSensi - && nelRispetto - && sismaBonus - && tipologiaCostruttiva - && intervFinPub - && Validator.isNotNull(dettPratica.getDescLongIntervento()) - && Validator.isNotNull(dettPratica.getDestinazione()) - && (dettPratica.getTcNuovaCostruzione() || dettPratica.getTcMiglioramentoSismico() - || dettPratica.getTcAdeguamentoSismico() || dettPratica.getTcRiparazioneInterventoLocale() || dettPratica - .getTcNuovaCostruzioneComplessa()) && Validator.isNotNull(dettPratica.getVia()); - boolean coordinateGeografiche = Validator.isNotNull(dettPratica.getLocalizzazioneGeografica()) - && !("|||".equals(dettPratica.getLocalizzazioneGeografica())); - return controllo && coordinateGeografiche; - } - private static List notCompletedDettagliPrincipali(long dettPraticaId) throws PortalException, SystemException { @@ -480,8 +429,9 @@ public class ValidazionePraticaUtil { && Validator.isNull(dettPratica.getAg())) { notCompleted.add("ag"); } - boolean aiSensi = AzioniPraticheUtil.isDeposito(intPratica.getIntPraticaId()) ? (dettPratica.getNormDpr01Dep() || dettPratica - .getNormDpr02Dep()) : (dettPratica.getNormDpr01Aut() || dettPratica.getNormDpr02Aut()); + boolean aiSensi = AzioniPraticheUtil.isDeposito(intPratica.getIntPraticaId()) + ? (dettPratica.getNormDpr01Dep() || dettPratica.getNormDpr02Dep()) + : (dettPratica.getNormDpr01Aut() || dettPratica.getNormDpr02Aut()); if (!aiSensi) { notCompleted.add("at-least-aiSensi"); } @@ -543,100 +493,6 @@ public class ValidazionePraticaUtil { && !isRiparazioneLocale(dettPratica); } - private static boolean isAnagrafeSoggettiCompleta(long dettPraticaId) throws PortalException, SystemException { - - DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); - long intPraticaId = dettPratica.getIntPraticaId(); - boolean titolare = SoggettiUtil.isTitolareInSoggetti(intPraticaId); - boolean collaudatoreNotRequired = !isCollaudatoreRequired(dettPratica); - boolean direttoreLavoriNotRequired = dettPratica.getLavoriPubblici(); - boolean dittaNotRequired = dettPratica.getNormLavoriInProprio() || dettPratica.getLavoriPubblici(); - boolean collaudatore = true; - int numeroCollaudatori = 0; - boolean ditta = dettPratica.getNormLavoriInProprio() || dettPratica.getLavoriPubblici(); - boolean committente = false; - boolean progettista = false; - boolean direttore = dettPratica.getLavoriPubblici(); - boolean geologo = false; - List soggetti = SoggettoLocalServiceUtil.getValidTmpByIntPratica(intPraticaId); - for (Soggetto soggetto : soggetti) { - if (!TipoSoggettoUtil.validaCodiceFiscale(soggetto.getCodiceFiscale(), true)) { - return false; - } - switch (soggetto.getTipologiaSoggetto()) { - case TipoSoggettoUtil.COLLAUDATORE: - numeroCollaudatori++; - collaudatore = true; - break; - case TipoSoggettoUtil.COMMITTENTE: - committente = true; - break; - case TipoSoggettoUtil.DIRETTORE_LAVORI: - direttore = true; - break; - case TipoSoggettoUtil.DITTA: - ditta = true; - break; - case TipoSoggettoUtil.GEOLOGO: - geologo = true; - break; - case TipoSoggettoUtil.PROGETTISTA: - progettista = true; - break; - default: - break; - } - } - boolean isDelegaCommittente = SoggettiUtil.isTitolareInCommittenti(intPraticaId) - || Validator.isNotNull(dettPratica.getCodiceFiscaleDelegatoCommittente()); - boolean isDelegaFineLavori = direttoreLavoriNotRequired - || Validator.isNotNull(dettPratica.getCodiceFiscaleDelegatoFineLavori()); - boolean isDelegaCollaudo = collaudatoreNotRequired - || Validator.isNotNull(dettPratica.getCodiceFiscaleDelegatoCollaudo()); - boolean deleghe = isDelegaCommittente && isDelegaFineLavori && isDelegaCollaudo; - boolean collaudatorePrincipale = true; - boolean committentePrincipale = true; - boolean direttorePrincipale = true; - boolean dittaPrincipale = true; - boolean geologoPrincipale = true; - boolean progettistaPrincipale = true; - if (!collaudatoreNotRequired && collaudatore - && Validator.isNull(dettPratica.getCodiceFiscalePrincipaleCollaudatore())) { - collaudatorePrincipale = false; - } - if (dettPratica.getNormLavoriInProprio() && (dettPratica.getTcInCA() || dettPratica.getTcInAcciaio()) - && (numeroCollaudatori < 3)) { - collaudatore = false; - } - if (committente && Validator.isNull(dettPratica.getCodiceFiscalePrincipaleCommittente())) { - committentePrincipale = false; - } - if (!direttoreLavoriNotRequired && direttore - && Validator.isNull(dettPratica.getCodiceFiscalePrincipaleDirettoreLavori())) { - direttorePrincipale = false; - } - if (!dittaNotRequired && ditta && Validator.isNull(dettPratica.getCodiceFiscalePrincipaleDitta())) { - dittaPrincipale = false; - } - if (geologo && Validator.isNull(dettPratica.getCodiceFiscalePrincipaleGeologo())) { - geologoPrincipale = false; - } - if (progettista && Validator.isNull(dettPratica.getCodiceFiscalePrincipaleProgettista())) { - progettistaPrincipale = false; - } - boolean principali = collaudatorePrincipale & committentePrincipale & direttorePrincipale & dittaPrincipale - & geologoPrincipale & progettistaPrincipale; - if (dettPratica.getNormArt3com3()) { - geologo = true; - } - int soggettiIncompleti = SoggettoLocalServiceUtil.countTmpNotCompletedByDettPratica(dettPraticaId); - if (soggettiIncompleti > 0) { - return false; - } - return titolare && collaudatore && ditta && committente && progettista && direttore && geologo && deleghe - && principali; - } - private static List notCompletedAnagrafeSoggetti(long dettPraticaId) throws PortalException, SystemException { @@ -759,86 +615,6 @@ public class ValidazionePraticaUtil { return notCompleted; } - private static boolean isDescrizioneEdificioCompleta(long dettPraticaId) throws PortalException, SystemException { - - DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); - if (intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_C)) { - return true; - } - // se infrastruttura controllo solo DATI INFRASTRUTTURA - boolean infrastruttura = infrastrutture.contains(dettPratica.getDestinazione()); - if (infrastruttura) { - return dettPratica.getDeInfStradaleStrada() || dettPratica.getDeInfStradalePonte() - || dettPratica.getDeInfStradaleAltro() || dettPratica.getDeInfIdraulicaLong() - || dettPratica.getDeInfIdraulicaTrasv() || dettPratica.getDeInfIdraulicaAltro() - || dettPratica.getDeInfOperaAccStradale() || dettPratica.getDeInfOperaAccIdraulica() - || dettPratica.getDeInfOperaAccAltro() || dettPratica.getDeInfAltraInfrastruttura() - || Validator.isNotNull(dettPratica.getDeInfAltroDesc()); - } - // se non infrastruttura controllo il resto - boolean controllo = Validator.isNotNull(dettPratica.getDePiani()) - && Validator.isNotNull(dettPratica.getDeAltezza()) && Validator.isNotNull(dettPratica.getDeInterrati()) - && Validator.isNotNull(dettPratica.getDeSuperficie()) - && Validator.isNotNull(dettPratica.getDeCostruzione()) && Validator.isNotNull(dettPratica.getDeUso()) - && Validator.isNotNull(dettPratica.getDeUtilizzazione()) - && Validator.isNotNull(dettPratica.getDePrivata()) && Validator.isNotNull(dettPratica.getDePubblica()); - boolean isComponentiCostruttiveDisabled = !dettPratica.getTcNuovaCostruzione() - && dettPratica.getTcRiparazioneInterventoLocale(); - if (isComponentiCostruttiveDisabled) { - return controllo; - } - boolean fondazioni = Validator.isNotNull(dettPratica.getDccFondazioni()); - boolean elevazioni = (Validator.isNotNull(dettPratica.getDccStruttureEleMuraturePietrame()) - || Validator.isNotNull(dettPratica.getDccStruttureEleMuratureLaterizio()) - || Validator.isNotNull(dettPratica.getDccStruttureEleMuratureMisto()) || Validator - .isNotNull(dettPratica.getDccStruttureEleMuratureStoriche())) - || Validator.isNotNull(dettPratica.getDccStruttureEleAcciaio()) - || Validator.isNotNull(dettPratica.getDccStruttureEleCA()) - || Validator.isNotNull(dettPratica.getDccStruttureEleLegno()) - || (Validator.isNotNull(dettPratica.getDccStruttureEleMistoCA()) - || Validator.isNotNull(dettPratica.getDccStruttureEleMistoAcciaio()) - || Validator.isNotNull(dettPratica.getDccStruttureEleMistoMuratura()) || Validator - .isNotNull(dettPratica.getDccStruttureEleMistoLegno())) - || Validator.isNotNull(dettPratica.getDccStruttureElePrefabbricato()) - || (Validator.isNotNull(dettPratica.getDccStruttureEleAltro()) && Validator.isNotNull(dettPratica - .getDccStruttureEleAltroDescrizione())); - boolean orizzontamenti = Validator.isNotNull(dettPratica.getDccOrizzontamentiCAAcciaio()) - || Validator.isNotNull(dettPratica.getDccOrizzontamentiLamieraGrecata()) - || Validator.isNotNull(dettPratica.getDccOrizzontamentiLegno()) - || Validator.isNotNull(dettPratica.getDccOrizzontamentiLegnoCA()) - || Validator.isNotNull(dettPratica.getDccOrizzontamentiVolte()) - || (Validator.isNotNull(dettPratica.getDccOrizzontamentiAltro()) && Validator.isNotNull(dettPratica - .getDccOrizzontamentiAltroDescrizione())); - boolean coperture = Validator.isNotNull(dettPratica.getDccCopertura()) - || Validator.isNotNull(dettPratica.getDccCoperturaCAAcciaio()) - || Validator.isNotNull(dettPratica.getDccCoperturaLamieraGrecata()) - || Validator.isNotNull(dettPratica.getDccCoperturaLeggere()) - || Validator.isNotNull(dettPratica.getDccCoperturaLegno()) - || Validator.isNotNull(dettPratica.getDccCoperturaLegnoCA()) - || Validator.isNotNull(dettPratica.getDccCoperturaPannelli()) - || Validator.isNotNull(dettPratica.getDccCoperturaPVCTelonati()) - || (Validator.isNotNull(dettPratica.getDccCoperturaAltro()) && Validator.isNotNull(dettPratica - .getDccCoperturaAltroDesrizione())); - boolean non_strutturali = Validator.isNotNull(dettPratica.getDccElemNonStrutLaterizio()) - || Validator.isNotNull(dettPratica.getDccElemNonStrutCalcestruzzo()) - || Validator.isNotNull(dettPratica.getDccElemNonStrutCartongesso()) - || Validator.isNotNull(dettPratica.getDccElemNonStrutLegno()) - || (Validator.isNotNull(dettPratica.getDccElemNonStrutAltro()) && Validator.isNotNull(dettPratica - .getDccElemNonStrutAltroDescrizione())); - boolean rinforzo = Validator.isNotNull(dettPratica.getDccOpereDiRinforzoInsCatene()) - || Validator.isNotNull(dettPratica.getDccOpereDiRinforzoInsCordoli()) - || Validator.isNotNull(dettPratica.getDccOpereDiRinforzoIniArmate()) - || Validator.isNotNull(dettPratica.getDccOpereDiRinforzoPlaccaggi()) - || Validator.isNotNull(dettPratica.getDccOpereDiRinforzoIrrSolai()) - || Validator.isNotNull(dettPratica.getDccOpereDiRinforzoRinforziFRP()) - || Validator.isNotNull(dettPratica.getDccOpereDiRinforzoTelaiECerchiature()) - || Validator.isNotNull(dettPratica.getDccOpereDiRinforzoInsRompitratta()) - || (Validator.isNotNull(dettPratica.getDccOpereDiRinforzoAltro()) && Validator.isNotNull(dettPratica - .getDccOpereDiRinforzoAltroDescrizione())); - return controllo && fondazioni && elevazioni && orizzontamenti && coperture && non_strutturali && rinforzo; - } - private static List notCompletedDescrizioneEdificio(long dettPraticaId) throws PortalException, SystemException { @@ -959,134 +735,6 @@ public class ValidazionePraticaUtil { return notCompleted; } - private static boolean isSezioneGeologicaCompleta(long dettPraticaId) throws PortalException, SystemException { - - DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); - // Se check NormArt3com3 sez. geologica non obbligatoria - if (dettPratica.getNormArt3com3()) { - return true; - } - boolean formGeologo = false; - formGeologo = Validator.isNotNull(dettPratica.getGeoDtRelazione()) - && Validator.isNotNull(dettPratica.getGeoClasseIndagine()) - && Validator.isNotNull(dettPratica.getGeoOperaRilevante()) - && Validator.isNotNull(dettPratica.getGeoCategoriaSottosuolo()) - && Validator.isNotNull(dettPratica.getGeoCategoriaTopografica()) - && Validator.isNotNull(dettPratica.getGeoOpereDiSostegno()) - && Validator.isNotNull(dettPratica.getGeoConsolidamento()) - && Validator.isNotNull(dettPratica.getGeoOpereInSotterranea()) - && Validator.isNotNull(dettPratica.getGeoPericolositaGeologica()) - && Validator.isNotNull(dettPratica.getGeoPericolositaGeomorfica()) - && Validator.isNotNull(dettPratica.getGeoRischioGeomorfologicoPai()) - && Validator.isNotNull(dettPratica.getGeoPericolositaIdraulicaPai()) - && Validator.isNotNull(dettPratica.getGeoRischioIdraulicoPai()) - && Validator.isNotNull(dettPratica.getGeoPericolositaSismica()) - && Validator.isNotNull(dettPratica.getGeoFattibilitaSismica()) - && Validator.isNotNull(dettPratica.getGeoPericolositaIdraulica()) - && Validator.isNotNull(dettPratica.getGeoFattibilitaIdraulica()) - && Validator.isNotNull(dettPratica.getGeoFattibilitaGeologica()) - && Validator.isNotNull(dettPratica.getGeoPresenzaPrescrizioni()) - && Validator.isNotNull(dettPratica.getGeoEvidenzeGeologiche()) - && Validator.isNotNull(dettPratica.getGeoEvidenzeGeomorfiche()); - List delegheGeologo = DelegaLocalServiceUtil.findByDettPratica_Tipologia_InEsito(dettPraticaId, - DelegheUtil.TIPO_GEOLOGO, new String[] { DelegheUtil.STATO_ESEGUITA }, QueryUtil.ALL_POS, - QueryUtil.ALL_POS, null); - boolean allegatiGeologo = dettPratica.getNormArt3com3(); - if (!allegatiGeologo) { - long intPraticaId = dettPratica.getIntPraticaId(); - List a14Docs = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia( - dettPratica.getIntPraticaId(), DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14, QueryUtil.ALL_POS, - QueryUtil.ALL_POS); - boolean a14 = !a14Docs.isEmpty() || !delegheGeologo.isEmpty(); - if (!a14) { - for (DocPratica doc : a14Docs) { - FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari()); - List signatures = firme.allSignatures(); - if (!isAllRequiredValid(doc.getTipologia(), dettPratica.getIntPraticaId(), signatures, - AsseverazioniUtil.getRequiredSubjectsByCodiceDoc(doc.getTipologia()), doc)) { - return false; - } - } - } - List a05Docs = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia( - dettPratica.getIntPraticaId(), DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A05, QueryUtil.ALL_POS, - QueryUtil.ALL_POS); - // ADT BUG ID=20 (A05 SEMPRE OBBLIGATORIO SE NON SETTATO IL CHECK SULLA SEZIONE GEOLOGICA) - boolean a05 = !a05Docs.isEmpty(); - if (a05) { - for (DocPratica doc : a05Docs) { - FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari()); - List signatures = firme.allSignatures(); - List firmeRichieste = AsseverazioniUtil.getRequiredSubjectsByCodiceDoc(doc.getTipologia()); - List soggettiInseriti = SoggettoLocalServiceUtil.findByIntPratica(dettPratica - .getIntPraticaId()); - List firmeFiltrate = new ArrayList(); - for (String string : firmeRichieste) { - firmeFiltrate.add(string); - } - boolean DLPresente = false; - for (Soggetto soggetto : soggettiInseriti) { - - if (soggetto.getTipologiaSoggetto().equals(TipoSoggettoUtil.DIRETTORE_LAVORI)) { - DLPresente = true; - } - } - if (!DLPresente || !dettPratica.isLavoriPubblici()) { - firmeFiltrate.remove(TipoSoggettoUtil.DIRETTORE_LAVORI); - } - if (!isAllRequiredValid(doc.getTipologia(), dettPratica.getIntPraticaId(), signatures, - firmeFiltrate, doc)) { - return false; - } - } - } - List a06Docs = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia( - dettPratica.getIntPraticaId(), DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A06, QueryUtil.ALL_POS, - QueryUtil.ALL_POS); - boolean a06 = !a06Docs.isEmpty(); - if (!a06Docs.isEmpty()) { - for (DocPratica doc : a06Docs) { - FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari()); - List signatures = firme.allSignatures(); - if (!isA06Valid(dettPratica, dettPratica.getIntPraticaId(), signatures, doc)) { - // Return false if A06 doesn't contain (Progettista OR Geologo ) AND Direttore_Lavori - return false; - } - } - } - List a15Docs = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia( - dettPratica.getIntPraticaId(), DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A15, QueryUtil.ALL_POS, - QueryUtil.ALL_POS); - boolean a15 = true; - if (!a15Docs.isEmpty()) { - for (DocPratica doc : a15Docs) { - FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari()); - List signatures = firme.allSignatures(); - if (!isA07A15Valid(dettPratica, intPraticaId, signatures, doc)) { - return false; - } - } - } - List tipologiaAllegati = DocumentiPraticaUtil.getIndaginiGeologiche(); - List a16Docs = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologie(intPraticaId, - tipologiaAllegati.toArray(new String[0]), QueryUtil.ALL_POS, QueryUtil.ALL_POS); - boolean a16 = !a16Docs.isEmpty(); - if (!a16Docs.isEmpty()) { - for (DocPratica doc : a16Docs) { - FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari()); - List signatures = firme.allSignatures(); - List signaturesPerSubject = getSignaturePerSubject(intPraticaId, signatures, - TipoSoggettoUtil.GEOLOGO, doc.getClassPk()); - if (signaturesPerSubject.isEmpty()) { - return false; - } - } - } - allegatiGeologo = a14 && a05 && a06 && a15 && a16; - } - return formGeologo && allegatiGeologo; - } - public static List notCompletedSezioneGeologica(long dettPraticaId) throws PortalException, SystemException { DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); @@ -1266,119 +914,6 @@ public class ValidazionePraticaUtil { return notCompleted; } - private static boolean isSezioneAllegatiCompleta(long dettPraticaId) throws PortalException, SystemException { - - DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); - long intPraticaId = dettPratica.getIntPraticaId(); - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - List tipologiaAllegati = DocumentiPraticaUtil.getDocObbligatoriDomanda(intPratica.getTipoProcedura()); - List tipologiaSoggetti = new ArrayList(); - boolean collaudatoreNotRequired = dettPratica.getCollaudoStatico() || dettPratica.getLavoriPubblici(); - boolean direttoreLavoriNotRequired = dettPratica.getLavoriPubblici(); - boolean dittaNotRequired = dettPratica.getNormLavoriInProprio() || dettPratica.getLavoriPubblici(); - for (String tipSoggetto : TipoSoggettoUtil.getAllSubjects()) { - if (tipSoggetto.equals(TipoSoggettoUtil.COLLAUDATORE) && collaudatoreNotRequired) { - continue; - } - if (tipSoggetto.equals(TipoSoggettoUtil.DIRETTORE_LAVORI) && direttoreLavoriNotRequired) { - continue; - } - if (tipSoggetto.equals(TipoSoggettoUtil.DITTA) && dittaNotRequired) { - continue; - } - tipologiaSoggetti.add(tipSoggetto); - } - - Set firmeTotali = new HashSet<>(); - boolean contieneDocumenti = false; - for (String codiceDoc : tipologiaAllegati) { - if (isDocPraticaRequired(dettPratica, codiceDoc)) { - List docs = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(intPraticaId, - codiceDoc, QueryUtil.ALL_POS, QueryUtil.ALL_POS); - if (docs.isEmpty()) { - // Ci dev'essere almeno un allegato per ogni tipologia obbligatoria - return false; - } - for (DocPratica doc : docs) { - // Se il documento proviene da una dett precedente non viene controllato perche si presuppone che - // sia stata già verificato - if (!doc.getClassName().equalsIgnoreCase(DettPratica.class.getName()) - || doc.getClassPk() != dettPraticaId) { - continue; - } - contieneDocumenti = true; - FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari()); - List signatures = firme.allSignatures(); - firmeTotali.addAll(signatures); - boolean isEnoughOne = AsseverazioniUtil.isEnoughOne(codiceDoc); - if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A00)) { - if (!isA00Valid(dettPratica, signatures)) { - return false; - } - } else if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A06)) { - if (!isA06Valid(dettPratica, intPraticaId, signatures, doc)) { - // Return false if A06 doesn't contain (Progettista OR Geologo ) AND Direttore_Lavori - return false; - } - } else if (DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A07.equals(codiceDoc)) { - if (!isA07A15Valid(dettPratica, intPraticaId, signatures, doc)) { - // Return false if A07 doesn't contain Progettista AND Direttore_Lavori - return false; - } - } else if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A09)) { - if (!isA09Valid(dettPratica, intPraticaId, signatures, doc)) { - // Return false if A09 doesn't contain Progettista AND Direttore_Lavori - return false; - } - } else if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A15)) { - if (!isA07A15Valid(dettPratica, intPraticaId, signatures, doc)) { - return false; - } - } else if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A17)) { - if (!isA17Valid(dettPratica, signatures)) { - return false; - } - } else if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_DELEGA)) { - if (!isA98Valid(dettPratica, intPraticaId, signatures)) { - return false; - } - } else if (isEnoughOne && signatures.isEmpty()) { - // Return false if one sign is enought but there are no signs for this subjectType - return false; - } else { - if (!isAllRequiredValid(codiceDoc, intPraticaId, signatures, tipologiaSoggetti, doc)) { - // Return false if is required per this subjectType but it is not present - return false; - } - } - } - } - } - - // Ogni progettista e direttore dei lavori deve avere apposto almeno una firma sulla totalità degli allegati - if (contieneDocumenti) { - List progettisti = SoggettoLocalServiceUtil.getValidTmpByIntPratica_TipologiaSoggetto( - intPraticaId, TipoSoggettoUtil.PROGETTISTA); - for (Soggetto progettista : progettisti) { - if (progettista.getDettPraticaId() == dettPraticaId) { - if (!firmeTotali.contains(progettista.getCodiceFiscale().toLowerCase())) { - return false; - } - } - } - List direttoriLavori = SoggettoLocalServiceUtil.getValidTmpByIntPratica_TipologiaSoggetto( - intPraticaId, TipoSoggettoUtil.DIRETTORE_LAVORI); - for (Soggetto direttore : direttoriLavori) { - if (direttore.getDettPraticaId() == dettPraticaId) { - if (!firmeTotali.contains(direttore.getCodiceFiscale().toLowerCase())) { - return false; - } - } - } - } - return true; - } - private static List notCompletedSezioniAllegati(long dettPraticaId) throws PortalException, SystemException { DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); @@ -1436,15 +971,20 @@ public class ValidazionePraticaUtil { if (!isA98Valid(dettPratica, intPraticaId, signatures)) { notCompleted.add("Allegato Delega firme obbligatorie mancanti"); } - } else if (isEnoughOne && signatures.isEmpty()) { - // Return false if one sign is enought but there are no signs for this subjectType - notCompleted.add(codiceDoc + " non firmato"); - } else { + } else if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A29)) { + if (!signatures.contains(dettPratica.getUserName().toLowerCase())) { + notCompleted.add("A29 firma del titolare digitale richiesta"); + } if (!isAllRequiredValid(codiceDoc, intPraticaId, signatures, TipoSoggettoUtil.getAllSubjects(), doc)) { - // Return false if is required per this subjectType but it is not present notCompleted.add(codiceDoc + " firme obbligatorie mancanti"); } + } else if (isEnoughOne && signatures.isEmpty()) { + // Return false if one sign is enought but there are no signs for this subjectType + notCompleted.add(codiceDoc + " non firmato"); + } else if (!isAllRequiredValid(codiceDoc, intPraticaId, signatures, + TipoSoggettoUtil.getAllSubjects(), doc)) { + notCompleted.add(codiceDoc + " firme obbligatorie mancanti"); } } } @@ -1505,13 +1045,14 @@ public class ValidazionePraticaUtil { return !dettPratica.getNormArt3com3(); case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A15: // nell'ultima version A15 non è più obbligatorio, ma se c'è deve essere firmato da GEOLOGO E DIRETTORE - // dei - // LAVORI + // dei LAVORI return false; case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A09: return !dettPratica.getNormArt3com4(); case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A17: return isA17Required(dettPratica); + case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A29: + return dettPratica.getNormLavoriInProprio(); case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_DELEGA: return isA98Required(dettPratica); default: @@ -1639,7 +1180,6 @@ public class ValidazionePraticaUtil { } for (String tipoSoggetto : tipologiaSoggetti) { - boolean isRequired = AsseverazioniUtil.isAsseverazioneRequiredByCodiceDoc(codiceDoc, tipoSoggetto); if (TipoSoggettoUtil.DIRETTORE_LAVORI.equalsIgnoreCase(tipoSoggetto) && direttoreLavoriNotRequired) { isRequired = false; 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 795757d2..dc00e3de 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 @@ -237,8 +237,6 @@ norm-lavori-in-proprio = il committente esegue i lavori in proprio (IN ECONOMIA) lavori-pubblici = lavori pubblici norm-esente-bollo = esente da bollo ai sensi di D.P.R. 26/10/1972 n. 642 e s.m.i. norm-esente-spese = esente da spese istruttoria -#collaudo-statico = Trattandosi di opere di riparazione o intervento locale eseguibile su un edificio esistente ai sensi del D.M. 14/01/2008, punto 8.4.3, non si effettuera' il collaudo statico -#bug id #1 collaudo-statico = Trattandosi di opere di riparazione o intervento locale eseguibile su un edificio esistente ai sensi del D.M. 17/01/2018, punto 8.4, non si effettuerà il collaudo statico norm-art3com3 = Possono essere omessi i seguenti allegati @@ -834,6 +832,7 @@ label-documenti-tipologia-A15 = Relazione Modellazione Sismica label-documenti-tipologia-A15-old = Certificazione del rispetto delle norme tecniche (in bollo) redatta dal tecnico rilevatore (solo per opere conformi) label-documenti-tipologia-A16-old = Certificato di collaudo statico in bollo (se dovuto) label-documenti-tipologia-A17 = Terna Collaudatori +label-documenti-tipologia-A29 = Dichiarazione impresa label-documenti-tipologia-A98 = Delega al titolare digitale e lettere di incarico ai professionisti label-documenti-tipologia-A99 = Altri label-documenti-tipologia-dnf = Pratica non firmata diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoImpl.java index 382931ca..1845ddc1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoImpl.java @@ -73,16 +73,21 @@ public class AvvisoImpl extends AvvisoBaseImpl { + " n° " + dettPratica.getVarianteNumero() + ""; } } else if (this.getClassName().equals(FineLavori.class.getName())) { - FineLavori fineLavori = FineLavoriLocalServiceUtil.getFineLavori(this.getClassPk()); + FineLavori fineLavori = FineLavoriLocalServiceUtil.fetchFineLavori(this.getClassPk()); + boolean parziale = Validator.isNull(fineLavori) ? false : fineLavori.getParziale(); + String numero = Validator.isNull(fineLavori) ? StringPool.BLANK : " n° " + fineLavori.getNumero(); fullDescription += " di " + LanguageUtil.get(LocaleUtil.ITALIAN, "label-integrazione-" - + (fineLavori.getParziale() ? "09" : "07")) + " n° " + fineLavori.getNumero() - + ""; + + (parziale ? TipoIntegrazioneUtil.FINE_LAVORI_PARZIALE + : TipoIntegrazioneUtil.FINE_LAVORI)) + numero + ""; } else if (this.getClassName().equals(Collaudo.class.getName())) { - Collaudo collaudo = CollaudoLocalServiceUtil.getCollaudo(this.getClassPk()); + Collaudo collaudo = CollaudoLocalServiceUtil.fetchCollaudo(this.getClassPk()); + boolean parziale = Validator.isNull(collaudo) ? false : collaudo.getParziale(); + String numero = Validator.isNull(collaudo) ? StringPool.BLANK : " n° " + collaudo.getNumero(); fullDescription += " di " + LanguageUtil.get(LocaleUtil.ITALIAN, "label-integrazione-" - + (collaudo.getParziale() ? "10" : "08")) + " n° " + collaudo.getNumero() + ""; + + (parziale ? TipoIntegrazioneUtil.COLLAUDO_PARZIALE : TipoIntegrazioneUtil.COLLAUDO)) + + numero + ""; } } else if (this.getTipoDocumento().equalsIgnoreCase(StatoPraticaConstants.CONFORME)) { IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(this.getIntPraticaId()); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java index 4cf8e193..544ec2cf 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java @@ -218,7 +218,7 @@ public class FascicoloPortlet extends MVCPortlet { User user = UserLocalServiceUtil.fetchUserByScreenName(companyId, nuovoSoggettoCF); if (Validator.isNotNull(user)) { if (!ValidazionePraticaUtil.praticaInProgress(intPraticaId)) { - _log.info("cambiaTitolare: cfNuovoTitolare " + nuovoSoggettoCF + " intpratica" + intPraticaId); + _log.info("cambiaTitolare: cfNuovoTitolare " + nuovoSoggettoCF + " intpratica " + intPraticaId); IntPraticaServiceUtil.cambiaTitolare(intPraticaId, user.getUserId(), serviceContext); SessionMessages.add(actionRequest, "success-cambio-titolare"); } else { @@ -503,9 +503,9 @@ public class FascicoloPortlet extends MVCPortlet { // ADT BUG-ID=15 Sezione Ricerca / Export csv - Max 30 chars int MAX_LENGHT_DESCR_INTERVENTO = 30; if (Validator.isNotNull(lastDettPratica.getDescLongIntervento())) { - sb.append(lastDettPratica.getDescLongIntervento().length() > MAX_LENGHT_DESCR_INTERVENTO ? lastDettPratica - .getDescLongIntervento().substring(0, MAX_LENGHT_DESCR_INTERVENTO) : lastDettPratica - .getDescLongIntervento()); + sb.append(lastDettPratica.getDescLongIntervento().length() > MAX_LENGHT_DESCR_INTERVENTO + ? lastDettPratica.getDescLongIntervento().substring(0, MAX_LENGHT_DESCR_INTERVENTO) + : lastDettPratica.getDescLongIntervento()); } sb.append(StringPool.SEMICOLON); } catch (Throwable e) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceClpInvoker.java index bb6ff553..54395f7f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceClpInvoker.java @@ -360,23 +360,27 @@ public class DettPraticaLocalServiceClpInvoker { "long", "long", "long", "java.lang.String" }; - _methodName242 = "isControlloObbligatorio"; + _methodName242 = "concludiPagamento"; - _methodParameterTypes242 = new String[] { + _methodParameterTypes242 = new String[] { "long" }; + + _methodName243 = "isControlloObbligatorio"; + + _methodParameterTypes243 = new String[] { "it.tref.liferay.portos.bo.model.DettPratica" }; - _methodName243 = "updateEsito"; + _methodName244 = "updateEsito"; - _methodParameterTypes243 = new String[] { "long", "int" }; + _methodParameterTypes244 = new String[] { "long", "int" }; - _methodName245 = "updateEsitoIntegrazione"; + _methodName246 = "updateEsitoIntegrazione"; - _methodParameterTypes245 = new String[] { "long", "int" }; + _methodParameterTypes246 = new String[] { "long", "int" }; - _methodName246 = "pagaInvia"; + _methodName247 = "pagaInvia"; - _methodParameterTypes246 = new String[] { + _methodParameterTypes247 = new String[] { "long", "int", "int", "int", "int", "boolean", "boolean", "boolean", "java.lang.String", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", @@ -385,151 +389,151 @@ public class DettPraticaLocalServiceClpInvoker { "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName247 = "updateStatus"; + _methodName248 = "updateStatus"; - _methodParameterTypes247 = new String[] { + _methodParameterTypes248 = new String[] { "long", "long", "int", "com.liferay.portal.service.ServiceContext" }; - _methodName250 = "updateDettPraticaProtocollo"; + _methodName251 = "updateDettPraticaProtocollo"; - _methodParameterTypes250 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes251 = new String[] { "long", "java.lang.String" }; - _methodName251 = "findByProtocollo"; + _methodName252 = "findByProtocollo"; - _methodParameterTypes251 = new String[] { + _methodParameterTypes252 = new String[] { "long", "long", "java.lang.String" }; - _methodName252 = "fetchByProtocollo"; + _methodName253 = "fetchByProtocollo"; - _methodParameterTypes252 = new String[] { + _methodParameterTypes253 = new String[] { "long", "long", "java.lang.String" }; - _methodName253 = "fetchByProtocollo"; + _methodName254 = "fetchByProtocollo"; - _methodParameterTypes253 = new String[] { "java.lang.String" }; + _methodParameterTypes254 = new String[] { "java.lang.String" }; - _methodName254 = "findByIntPraticaId"; + _methodName255 = "findByIntPraticaId"; - _methodParameterTypes254 = new String[] { "long" }; + _methodParameterTypes255 = new String[] { "long" }; - _methodName255 = "findByIntPraticaIdInviate"; + _methodName256 = "findByIntPraticaIdInviate"; - _methodParameterTypes255 = new String[] { "long", "int", "int" }; + _methodParameterTypes256 = new String[] { "long", "int", "int" }; - _methodName256 = "findPraticheCompleteNotProtocollo"; + _methodName257 = "findPraticheCompleteNotProtocollo"; - _methodParameterTypes256 = new String[] { "int", "int" }; + _methodParameterTypes257 = new String[] { "int", "int" }; - _methodName257 = "countPraticheCompleteNotProtocollo"; + _methodName258 = "countPraticheCompleteNotProtocollo"; - _methodParameterTypes257 = new String[] { }; + _methodParameterTypes258 = new String[] { }; - _methodName259 = "findPraticheCompleteNotGestite"; + _methodName260 = "findPraticheCompleteNotGestite"; - _methodParameterTypes259 = new String[] { "int", "int" }; + _methodParameterTypes260 = new String[] { "int", "int" }; - _methodName260 = "countPraticheCompleteNotGestite"; + _methodName261 = "countPraticheCompleteNotGestite"; - _methodParameterTypes260 = new String[] { }; + _methodParameterTypes261 = new String[] { }; - _methodName262 = "findByIntPraticaId_TipoIntegrazione_Completa"; + _methodName263 = "findByIntPraticaId_TipoIntegrazione_Completa"; - _methodParameterTypes262 = new String[] { + _methodParameterTypes263 = new String[] { "long", "java.lang.String", "boolean" }; - _methodName263 = "countByIntPraticaId_TipoIntegrazione_Completa"; + _methodName264 = "countByIntPraticaId_TipoIntegrazione_Completa"; - _methodParameterTypes263 = new String[] { + _methodParameterTypes264 = new String[] { "long", "java.lang.String", "boolean" }; - _methodName264 = "findPraticheCompletateNonVersionate"; + _methodName265 = "findPraticheCompletateNonVersionate"; - _methodParameterTypes264 = new String[] { "int", "int" }; + _methodParameterTypes265 = new String[] { "int", "int" }; - _methodName265 = "countPraticheCompletateNonversionate"; + _methodName266 = "countPraticheCompletateNonversionate"; - _methodParameterTypes265 = new String[] { }; + _methodParameterTypes266 = new String[] { }; - _methodName267 = "updateDettPraticaGestita"; + _methodName268 = "updateDettPraticaGestita"; - _methodParameterTypes267 = new String[] { "long", "boolean" }; + _methodParameterTypes268 = new String[] { "long", "boolean" }; - _methodName268 = "updateAsset"; + _methodName269 = "updateAsset"; - _methodParameterTypes268 = new String[] { + _methodParameterTypes269 = new String[] { "it.tref.liferay.portos.bo.model.DettPratica", "long[][]", "boolean" }; - _methodName269 = "updateStatus"; + _methodName270 = "updateStatus"; - _methodParameterTypes269 = new String[] { "long", "int" }; + _methodParameterTypes270 = new String[] { "long", "int" }; - _methodName270 = "updateSignal"; + _methodName271 = "updateSignal"; - _methodParameterTypes270 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes271 = new String[] { "long", "java.util.Date" }; - _methodName271 = "countInvioSignal"; + _methodName272 = "countInvioSignal"; - _methodParameterTypes271 = new String[] { }; + _methodParameterTypes272 = new String[] { }; - _methodName272 = "getInvioSignal"; + _methodName273 = "getInvioSignal"; - _methodParameterTypes272 = new String[] { "long" }; + _methodParameterTypes273 = new String[] { "long" }; - _methodName273 = "getInviiSignal"; + _methodName274 = "getInviiSignal"; - _methodParameterTypes273 = new String[] { "int", "int" }; + _methodParameterTypes274 = new String[] { "int", "int" }; - _methodName274 = "dynamicQueryInvioSignal"; + _methodName275 = "dynamicQueryInvioSignal"; - _methodParameterTypes274 = new String[] { "java.lang.Long" }; + _methodParameterTypes275 = new String[] { "java.lang.Long" }; - _methodName275 = "findByPagamentoId"; + _methodName276 = "findByPagamentoId"; - _methodParameterTypes275 = new String[] { "long" }; + _methodParameterTypes276 = new String[] { "long" }; - _methodName276 = "updatePrincipale"; + _methodName277 = "updatePrincipale"; - _methodParameterTypes276 = new String[] { + _methodParameterTypes277 = new String[] { "long", "java.lang.String", "java.lang.String" }; - _methodName277 = "getDettPraticaFields"; + _methodName278 = "getDettPraticaFields"; - _methodParameterTypes277 = new String[] { }; + _methodParameterTypes278 = new String[] { }; - _methodName278 = "getVersioni"; + _methodName279 = "getVersioni"; - _methodParameterTypes278 = new String[] { "long" }; + _methodParameterTypes279 = new String[] { "long" }; - _methodName279 = "callForChanges"; + _methodName280 = "callForChanges"; - _methodParameterTypes279 = new String[] { "long" }; + _methodParameterTypes280 = new String[] { "long" }; - _methodName280 = "isNumber"; + _methodName281 = "isNumber"; - _methodParameterTypes280 = new String[] { "java.lang.String" }; + _methodParameterTypes281 = new String[] { "java.lang.String" }; - _methodName281 = "format"; + _methodName282 = "format"; - _methodParameterTypes281 = new String[] { + _methodParameterTypes282 = new String[] { "java.lang.String", "java.io.Serializable" }; - _methodName282 = "countVariateByIntPratica"; + _methodName283 = "countVariateByIntPratica"; - _methodParameterTypes282 = new String[] { "long" }; + _methodParameterTypes283 = new String[] { "long" }; - _methodName284 = "getFirstCompletedByIntPratica"; + _methodName285 = "getFirstCompletedByIntPratica"; - _methodParameterTypes284 = new String[] { "long" }; + _methodParameterTypes285 = new String[] { "long" }; } public Object invokeMethod(String name, String[] parameterTypes, @@ -1205,23 +1209,30 @@ public class DettPraticaLocalServiceClpInvoker { if (_methodName242.equals(name) && Arrays.deepEquals(_methodParameterTypes242, parameterTypes)) { - return DettPraticaLocalServiceUtil.isControlloObbligatorio((it.tref.liferay.portos.bo.model.DettPratica)arguments[0]); + DettPraticaLocalServiceUtil.concludiPagamento(((Long)arguments[0]).longValue()); + + return null; } if (_methodName243.equals(name) && Arrays.deepEquals(_methodParameterTypes243, parameterTypes)) { + return DettPraticaLocalServiceUtil.isControlloObbligatorio((it.tref.liferay.portos.bo.model.DettPratica)arguments[0]); + } + + if (_methodName244.equals(name) && + Arrays.deepEquals(_methodParameterTypes244, parameterTypes)) { return DettPraticaLocalServiceUtil.updateEsito(((Long)arguments[0]).longValue(), ((Integer)arguments[1]).intValue()); } - if (_methodName245.equals(name) && - Arrays.deepEquals(_methodParameterTypes245, parameterTypes)) { + if (_methodName246.equals(name) && + Arrays.deepEquals(_methodParameterTypes246, parameterTypes)) { return DettPraticaLocalServiceUtil.updateEsitoIntegrazione(((Long)arguments[0]).longValue(), ((Integer)arguments[1]).intValue()); } - if (_methodName246.equals(name) && - Arrays.deepEquals(_methodParameterTypes246, parameterTypes)) { + if (_methodName247.equals(name) && + Arrays.deepEquals(_methodParameterTypes247, parameterTypes)) { return DettPraticaLocalServiceUtil.pagaInvia(((Long)arguments[0]).longValue(), ((Integer)arguments[1]).intValue(), ((Integer)arguments[2]).intValue(), @@ -1246,189 +1257,189 @@ public class DettPraticaLocalServiceClpInvoker { (com.liferay.portal.service.ServiceContext)arguments[21]); } - if (_methodName247.equals(name) && - Arrays.deepEquals(_methodParameterTypes247, parameterTypes)) { + if (_methodName248.equals(name) && + Arrays.deepEquals(_methodParameterTypes248, parameterTypes)) { return DettPraticaLocalServiceUtil.updateStatus(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Integer)arguments[2]).intValue(), (com.liferay.portal.service.ServiceContext)arguments[3]); } - if (_methodName250.equals(name) && - Arrays.deepEquals(_methodParameterTypes250, parameterTypes)) { - return DettPraticaLocalServiceUtil.updateDettPraticaProtocollo(((Long)arguments[0]).longValue(), - (java.lang.String)arguments[1]); - } - if (_methodName251.equals(name) && Arrays.deepEquals(_methodParameterTypes251, parameterTypes)) { - return DettPraticaLocalServiceUtil.findByProtocollo(((Long)arguments[0]).longValue(), - ((Long)arguments[1]).longValue(), (java.lang.String)arguments[2]); + return DettPraticaLocalServiceUtil.updateDettPraticaProtocollo(((Long)arguments[0]).longValue(), + (java.lang.String)arguments[1]); } if (_methodName252.equals(name) && Arrays.deepEquals(_methodParameterTypes252, parameterTypes)) { - return DettPraticaLocalServiceUtil.fetchByProtocollo(((Long)arguments[0]).longValue(), + return DettPraticaLocalServiceUtil.findByProtocollo(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), (java.lang.String)arguments[2]); } if (_methodName253.equals(name) && Arrays.deepEquals(_methodParameterTypes253, parameterTypes)) { - return DettPraticaLocalServiceUtil.fetchByProtocollo((java.lang.String)arguments[0]); + return DettPraticaLocalServiceUtil.fetchByProtocollo(((Long)arguments[0]).longValue(), + ((Long)arguments[1]).longValue(), (java.lang.String)arguments[2]); } if (_methodName254.equals(name) && Arrays.deepEquals(_methodParameterTypes254, parameterTypes)) { - return DettPraticaLocalServiceUtil.findByIntPraticaId(((Long)arguments[0]).longValue()); + return DettPraticaLocalServiceUtil.fetchByProtocollo((java.lang.String)arguments[0]); } if (_methodName255.equals(name) && Arrays.deepEquals(_methodParameterTypes255, parameterTypes)) { + return DettPraticaLocalServiceUtil.findByIntPraticaId(((Long)arguments[0]).longValue()); + } + + if (_methodName256.equals(name) && + Arrays.deepEquals(_methodParameterTypes256, parameterTypes)) { return DettPraticaLocalServiceUtil.findByIntPraticaIdInviate(((Long)arguments[0]).longValue(), ((Integer)arguments[1]).intValue(), ((Integer)arguments[2]).intValue()); } - if (_methodName256.equals(name) && - Arrays.deepEquals(_methodParameterTypes256, parameterTypes)) { + if (_methodName257.equals(name) && + Arrays.deepEquals(_methodParameterTypes257, parameterTypes)) { return DettPraticaLocalServiceUtil.findPraticheCompleteNotProtocollo(((Integer)arguments[0]).intValue(), ((Integer)arguments[1]).intValue()); } - if (_methodName257.equals(name) && - Arrays.deepEquals(_methodParameterTypes257, parameterTypes)) { + if (_methodName258.equals(name) && + Arrays.deepEquals(_methodParameterTypes258, parameterTypes)) { return DettPraticaLocalServiceUtil.countPraticheCompleteNotProtocollo(); } - if (_methodName259.equals(name) && - Arrays.deepEquals(_methodParameterTypes259, parameterTypes)) { + if (_methodName260.equals(name) && + Arrays.deepEquals(_methodParameterTypes260, parameterTypes)) { return DettPraticaLocalServiceUtil.findPraticheCompleteNotGestite(((Integer)arguments[0]).intValue(), ((Integer)arguments[1]).intValue()); } - if (_methodName260.equals(name) && - Arrays.deepEquals(_methodParameterTypes260, parameterTypes)) { + if (_methodName261.equals(name) && + Arrays.deepEquals(_methodParameterTypes261, parameterTypes)) { return DettPraticaLocalServiceUtil.countPraticheCompleteNotGestite(); } - if (_methodName262.equals(name) && - Arrays.deepEquals(_methodParameterTypes262, parameterTypes)) { + if (_methodName263.equals(name) && + Arrays.deepEquals(_methodParameterTypes263, parameterTypes)) { return DettPraticaLocalServiceUtil.findByIntPraticaId_TipoIntegrazione_Completa(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Boolean)arguments[2]).booleanValue()); } - if (_methodName263.equals(name) && - Arrays.deepEquals(_methodParameterTypes263, parameterTypes)) { + if (_methodName264.equals(name) && + Arrays.deepEquals(_methodParameterTypes264, parameterTypes)) { return DettPraticaLocalServiceUtil.countByIntPraticaId_TipoIntegrazione_Completa(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Boolean)arguments[2]).booleanValue()); } - if (_methodName264.equals(name) && - Arrays.deepEquals(_methodParameterTypes264, parameterTypes)) { + if (_methodName265.equals(name) && + Arrays.deepEquals(_methodParameterTypes265, parameterTypes)) { return DettPraticaLocalServiceUtil.findPraticheCompletateNonVersionate(((Integer)arguments[0]).intValue(), ((Integer)arguments[1]).intValue()); } - if (_methodName265.equals(name) && - Arrays.deepEquals(_methodParameterTypes265, parameterTypes)) { + if (_methodName266.equals(name) && + Arrays.deepEquals(_methodParameterTypes266, parameterTypes)) { return DettPraticaLocalServiceUtil.countPraticheCompletateNonversionate(); } - if (_methodName267.equals(name) && - Arrays.deepEquals(_methodParameterTypes267, parameterTypes)) { + if (_methodName268.equals(name) && + Arrays.deepEquals(_methodParameterTypes268, parameterTypes)) { return DettPraticaLocalServiceUtil.updateDettPraticaGestita(((Long)arguments[0]).longValue(), ((Boolean)arguments[1]).booleanValue()); } - if (_methodName268.equals(name) && - Arrays.deepEquals(_methodParameterTypes268, parameterTypes)) { + if (_methodName269.equals(name) && + Arrays.deepEquals(_methodParameterTypes269, parameterTypes)) { DettPraticaLocalServiceUtil.updateAsset((it.tref.liferay.portos.bo.model.DettPratica)arguments[0], (long[])arguments[1], ((Boolean)arguments[2]).booleanValue()); return null; } - if (_methodName269.equals(name) && - Arrays.deepEquals(_methodParameterTypes269, parameterTypes)) { + if (_methodName270.equals(name) && + Arrays.deepEquals(_methodParameterTypes270, parameterTypes)) { DettPraticaLocalServiceUtil.updateStatus(((Long)arguments[0]).longValue(), ((Integer)arguments[1]).intValue()); return null; } - if (_methodName270.equals(name) && - Arrays.deepEquals(_methodParameterTypes270, parameterTypes)) { - return DettPraticaLocalServiceUtil.updateSignal(((Long)arguments[0]).longValue(), - (java.util.Date)arguments[1]); - } - if (_methodName271.equals(name) && Arrays.deepEquals(_methodParameterTypes271, parameterTypes)) { - return DettPraticaLocalServiceUtil.countInvioSignal(); + return DettPraticaLocalServiceUtil.updateSignal(((Long)arguments[0]).longValue(), + (java.util.Date)arguments[1]); } if (_methodName272.equals(name) && Arrays.deepEquals(_methodParameterTypes272, parameterTypes)) { - return DettPraticaLocalServiceUtil.getInvioSignal(((Long)arguments[0]).longValue()); + return DettPraticaLocalServiceUtil.countInvioSignal(); } if (_methodName273.equals(name) && Arrays.deepEquals(_methodParameterTypes273, parameterTypes)) { - return DettPraticaLocalServiceUtil.getInviiSignal(((Integer)arguments[0]).intValue(), - ((Integer)arguments[1]).intValue()); + return DettPraticaLocalServiceUtil.getInvioSignal(((Long)arguments[0]).longValue()); } if (_methodName274.equals(name) && Arrays.deepEquals(_methodParameterTypes274, parameterTypes)) { - return DettPraticaLocalServiceUtil.dynamicQueryInvioSignal((java.lang.Long)arguments[0]); + return DettPraticaLocalServiceUtil.getInviiSignal(((Integer)arguments[0]).intValue(), + ((Integer)arguments[1]).intValue()); } if (_methodName275.equals(name) && Arrays.deepEquals(_methodParameterTypes275, parameterTypes)) { - return DettPraticaLocalServiceUtil.findByPagamentoId(((Long)arguments[0]).longValue()); + return DettPraticaLocalServiceUtil.dynamicQueryInvioSignal((java.lang.Long)arguments[0]); } if (_methodName276.equals(name) && Arrays.deepEquals(_methodParameterTypes276, parameterTypes)) { - return DettPraticaLocalServiceUtil.updatePrincipale(((Long)arguments[0]).longValue(), - (java.lang.String)arguments[1], (java.lang.String)arguments[2]); + return DettPraticaLocalServiceUtil.findByPagamentoId(((Long)arguments[0]).longValue()); } if (_methodName277.equals(name) && Arrays.deepEquals(_methodParameterTypes277, parameterTypes)) { - return DettPraticaLocalServiceUtil.getDettPraticaFields(); + return DettPraticaLocalServiceUtil.updatePrincipale(((Long)arguments[0]).longValue(), + (java.lang.String)arguments[1], (java.lang.String)arguments[2]); } if (_methodName278.equals(name) && Arrays.deepEquals(_methodParameterTypes278, parameterTypes)) { - return DettPraticaLocalServiceUtil.getVersioni(((Long)arguments[0]).longValue()); + return DettPraticaLocalServiceUtil.getDettPraticaFields(); } if (_methodName279.equals(name) && Arrays.deepEquals(_methodParameterTypes279, parameterTypes)) { - return DettPraticaLocalServiceUtil.callForChanges(((Long)arguments[0]).longValue()); + return DettPraticaLocalServiceUtil.getVersioni(((Long)arguments[0]).longValue()); } if (_methodName280.equals(name) && Arrays.deepEquals(_methodParameterTypes280, parameterTypes)) { - return DettPraticaLocalServiceUtil.isNumber((java.lang.String)arguments[0]); + return DettPraticaLocalServiceUtil.callForChanges(((Long)arguments[0]).longValue()); } if (_methodName281.equals(name) && Arrays.deepEquals(_methodParameterTypes281, parameterTypes)) { - return DettPraticaLocalServiceUtil.format((java.lang.String)arguments[0], - (java.io.Serializable)arguments[1]); + return DettPraticaLocalServiceUtil.isNumber((java.lang.String)arguments[0]); } if (_methodName282.equals(name) && Arrays.deepEquals(_methodParameterTypes282, parameterTypes)) { + return DettPraticaLocalServiceUtil.format((java.lang.String)arguments[0], + (java.io.Serializable)arguments[1]); + } + + if (_methodName283.equals(name) && + Arrays.deepEquals(_methodParameterTypes283, parameterTypes)) { return DettPraticaLocalServiceUtil.countVariateByIntPratica(((Long)arguments[0]).longValue()); } - if (_methodName284.equals(name) && - Arrays.deepEquals(_methodParameterTypes284, parameterTypes)) { + if (_methodName285.equals(name) && + Arrays.deepEquals(_methodParameterTypes285, parameterTypes)) { return DettPraticaLocalServiceUtil.getFirstCompletedByIntPratica(((Long)arguments[0]).longValue()); } @@ -1535,14 +1546,14 @@ public class DettPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes242; private String _methodName243; private String[] _methodParameterTypes243; - private String _methodName245; - private String[] _methodParameterTypes245; + private String _methodName244; + private String[] _methodParameterTypes244; private String _methodName246; private String[] _methodParameterTypes246; private String _methodName247; private String[] _methodParameterTypes247; - private String _methodName250; - private String[] _methodParameterTypes250; + private String _methodName248; + private String[] _methodParameterTypes248; private String _methodName251; private String[] _methodParameterTypes251; private String _methodName252; @@ -1557,20 +1568,20 @@ public class DettPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes256; private String _methodName257; private String[] _methodParameterTypes257; - private String _methodName259; - private String[] _methodParameterTypes259; + private String _methodName258; + private String[] _methodParameterTypes258; private String _methodName260; private String[] _methodParameterTypes260; - private String _methodName262; - private String[] _methodParameterTypes262; + private String _methodName261; + private String[] _methodParameterTypes261; private String _methodName263; private String[] _methodParameterTypes263; private String _methodName264; private String[] _methodParameterTypes264; private String _methodName265; private String[] _methodParameterTypes265; - private String _methodName267; - private String[] _methodParameterTypes267; + private String _methodName266; + private String[] _methodParameterTypes266; private String _methodName268; private String[] _methodParameterTypes268; private String _methodName269; @@ -1601,6 +1612,8 @@ public class DettPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes281; private String _methodName282; private String[] _methodParameterTypes282; - private String _methodName284; - private String[] _methodParameterTypes284; + private String _methodName283; + private String[] _methodParameterTypes283; + private String _methodName285; + private String[] _methodParameterTypes285; } \ 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/ConfigurazioneLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ConfigurazioneLocalServiceImpl.java index 84187d6d..0d5dfbc6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ConfigurazioneLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ConfigurazioneLocalServiceImpl.java @@ -58,7 +58,11 @@ public class ConfigurazioneLocalServiceImpl extends ConfigurazioneLocalServiceBa public List findByC_ChiaveList(long companyId, String chiave) throws SystemException { Configurazione configurazione = configurazionePersistence.fetchByC_Chiave(companyId, chiave); - return DESERIALIZER.deserialize(configurazione.getValore()); + try { + return DESERIALIZER.deserialize(configurazione.getValore()); + } catch (Exception e) { + return null; + } } @Override @@ -118,11 +122,15 @@ public class ConfigurazioneLocalServiceImpl extends ConfigurazioneLocalServiceBa } @Override - public boolean isDeveloper(User user) throws SystemException { + public boolean isDeveloper(User user) { - return !isProduction() - && configurazioneLocalService.findByC_ChiaveList(user.getCompanyId(), - ConfigurazioneConstants.SVILUPPATORI).contains(user.getScreenName()); + try { + return !isProduction() + && findByC_ChiaveList(user.getCompanyId(), ConfigurazioneConstants.SVILUPPATORI).contains( + user.getScreenName()); + } catch (Exception e) { + return false; + } } @Override 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 200c5423..2029a79c 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 @@ -601,8 +601,8 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl boolean normArt3com4, boolean normOrd01, boolean normDm04, boolean normDm05, boolean normCI01, boolean normLTC01, boolean suap, boolean normSismaBonus, String clRischioPreInt, String clRischioPostInt, boolean intervFinPub, String intervFinPubDesc, boolean tcNuovaCostruzioneComplessa, - String contestoPaesaggistico, String livelloDiTutela, String vincoli, - ServiceContext serviceContext, boolean bozza) throws PortalException, SystemException { + String contestoPaesaggistico, String livelloDiTutela, String vincoli, ServiceContext serviceContext, + boolean bozza) throws PortalException, SystemException { Date now = new Date(); DettPratica dettPratica = dettPraticaPersistence.fetchByPrimaryKey(dettPraticaId); @@ -863,8 +863,8 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl boolean normArt3com4, boolean normOrd01, boolean normDm04, boolean normDm05, boolean normCI01, boolean normLTC01, boolean suap, boolean normSismaBonus, String clRischioPreInt, String clRischioPostInt, boolean intervFinPub, String intervFinPubDesc, boolean tcNuovaCostruzioneComplessa, - String contestoPaesaggistico, String livelloDiTutela, String vincoli, - ServiceContext serviceContext, boolean bozza) throws PortalException, SystemException { + String contestoPaesaggistico, String livelloDiTutela, String vincoli, ServiceContext serviceContext, + boolean bozza) throws PortalException, SystemException { Date now = new Date(); DettPratica dettPratica = dettPraticaPersistence.fetchByPrimaryKey(dettPraticaId); @@ -1130,7 +1130,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl dettPratica.setModifiedDate(now); Pagamento pagamento = pagamentoPersistence.findByPrimaryKey(pagamentoId); String tipoPagamento = pagamento.getTipoPagamento(); - if (stato.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_PAGATA)) { + if (stato.equals(PagamentoConstants.UTILIZZATA_PAGATA)) { boolean completed = false; if (!dettPratica.isNormEsenteBollo() && !dettPratica.isNormEsenteSpese()) { if (PagamentoConstants.PAGAMENTO_ONERI.equals(tipoPagamento)) { @@ -1148,12 +1148,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl } } if (completed) { - dettPratica = updateEsito(dettPraticaId, WorkflowConstants.STATUS_APPROVED); - try { - WorkflowUtil.valutaEffettiInvioVariante(dettPratica); - } catch (Exception e) { - throw new SystemException(e); - } + concludiPagamento(dettPraticaId); } pagamentoLocalService.updatePagamentoUtilizzata(pagamentoId, stato); delegaLocalService.concludiDeleghePagamento(dettPraticaId); @@ -1165,6 +1160,17 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl } } + @Override + public void concludiPagamento(long dettPraticaId) throws SystemException, PortalException, IOException { + + DettPratica dettPratica = updateEsito(dettPraticaId, WorkflowConstants.STATUS_APPROVED); + try { + WorkflowUtil.valutaEffettiInvioVariante(dettPratica); + } catch (Exception e) { + throw new SystemException(e); + } + } + @Override public boolean isControlloObbligatorio(DettPratica dettPratica) { @@ -1305,10 +1311,16 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl DettPratica dettPratica = dettPraticaPersistence.findByPrimaryKey(dettPraticaId); BigDecimal importoBolli = PagamentiUtil.getImportoBolli(dettPratica.getCompanyId(), dettPratica.getDettPraticaId(), dettPratica.getTipoIntegrazione()); - PagamentiUtil.nuovoPagamento(currentURL, dettPratica.getDettPraticaId(), DettPratica.class.getName(), - PagamentoConstants.PAGAMENTO_BOLLI, importoBolli.toString(), codiceFiscaleCommittente, serviceContext); - PagamentiUtil.nuovoPagamento(currentURL, dettPratica.getDettPraticaId(), DettPratica.class.getName(), - PagamentoConstants.PAGAMENTO_ONERI, importoSpeseIstruttoria, codiceFiscaleCommittente, serviceContext); + if (dettPratica.getPagamentoIdBolli() == 0) { + PagamentiUtil.nuovoPagamento(currentURL, dettPratica.getDettPraticaId(), DettPratica.class.getName(), + PagamentoConstants.PAGAMENTO_BOLLI, importoBolli.toString(), codiceFiscaleCommittente, + serviceContext); + } + if (dettPratica.getPagamentoIdOneri() == 0) { + PagamentiUtil.nuovoPagamento(currentURL, dettPratica.getDettPraticaId(), DettPratica.class.getName(), + PagamentoConstants.PAGAMENTO_ONERI, importoSpeseIstruttoria, codiceFiscaleCommittente, + serviceContext); + } dettPratica = updateDettPraticaPagamento(dettPratica.getDettPraticaId(), pagAdeguamentoSismico, pagAltro, pagMiglioramentoSismico, pagNuovaCostruzione, pagNuoveCostruzioni, pagRiparazioneInterventoLocale, pagVarianti, importoSpeseIstruttoria, importoBolli.toString(), pagMiglioramentoSismicoSicilia, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java index 2d319a20..a68018fc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java @@ -23,6 +23,8 @@ import java.util.Map; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.security.permission.ActionKeys; import com.liferay.portal.service.ServiceContext; @@ -46,6 +48,8 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { * it.tref.liferay.portos.bo.service.DettPraticaServiceUtil} to access the dett pratica remote service. */ + private static final Log _log = LogFactoryUtil.getLog(DettPraticaServiceImpl.class); + @Override public DettPratica getDettPratica(long dettPraticaId) throws PortalException, SystemException { @@ -172,10 +176,9 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { boolean normDm2018, boolean normDprg01, boolean normDprg02, boolean normAnr, boolean normArt3com3, boolean normArt3com4, boolean normOrd01, boolean normDm04, boolean normDm05, boolean normCI01, boolean normLTC01, boolean suap, boolean normSismaBonus, String clRischioPreInt, String clRischioPostInt, - boolean intervFinPub, String intervFinPubDesc, boolean tcNuovaCostruzioneComplessa, String contestoPaesaggistico, - String livelloDiTutela, String vincoli, ServiceContext serviceContext, boolean bozza, - boolean disabledSubmit, boolean geoDisabledSubmit) - throws PortalException, SystemException { + boolean intervFinPub, String intervFinPubDesc, boolean tcNuovaCostruzioneComplessa, + String contestoPaesaggistico, String livelloDiTutela, String vincoli, ServiceContext serviceContext, + boolean bozza, boolean disabledSubmit, boolean geoDisabledSubmit) throws PortalException, SystemException { DettPratica dettPratica = null; if (!disabledSubmit && DelegheUtil.hasDelegaCompilazioneDomanda(userId, dettPraticaId)) { @@ -210,8 +213,8 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { normEsenteBollo, normEsenteSpese, normDpr01Dep, normDpr02Dep, normDpr01Aut, normDpr02Aut, normDm01, normDm02, normDm03, normDm2018, normDprg01, normDprg02, normAnr, normArt3com3, normArt3com4, normOrd01, normDm04, normDm05, normCI01, normLTC01, suap, normSismaBonus, clRischioPreInt, - clRischioPostInt, intervFinPub, intervFinPubDesc, tcNuovaCostruzioneComplessa, contestoPaesaggistico, - livelloDiTutela, vincoli, serviceContext, bozza); + clRischioPostInt, intervFinPub, intervFinPubDesc, tcNuovaCostruzioneComplessa, + contestoPaesaggistico, livelloDiTutela, vincoli, serviceContext, bozza); } if (!geoDisabledSubmit && DelegheUtil.hasDelegaCompilazioneSezioneGeologica(userId, dettPraticaId)) { dettPratica = dettPraticaLocalService.updateDettPraticaGeologo(userId, dettPraticaId, intPraticaId, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java index 47dc3b26..df990ae0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java @@ -156,11 +156,14 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { DynamicQuery dq = intPraticaLocalService.dynamicQuery(); dq.add(PropertyFactoryUtil.forName("companyId").eq(companyId)); dq.add(PropertyFactoryUtil.forName("status").eq(WorkflowConstants.STATUS_DRAFT)); - dq.add(PropertyFactoryUtil.forName("statoPratica").eq(StatoPraticaConstants.CONFORME)); - Disjunction or = RestrictionsFactoryUtil.disjunction(); - or.add(RestrictionsFactoryUtil.eq("tipoProcedura", Constants.PROCEDURA_B)); - or.add(RestrictionsFactoryUtil.eq("tipoProcedura", Constants.PROCEDURA_B1)); - dq.add(or); + Disjunction orStato = RestrictionsFactoryUtil.disjunction(); + orStato.add(PropertyFactoryUtil.forName("statoPratica").eq(StatoPraticaConstants.CONFORME)); + orStato.add(PropertyFactoryUtil.forName("statoPratica").eq(StatoPraticaConstants.VIDIMATA)); + dq.add(orStato); + Disjunction orProcedura = RestrictionsFactoryUtil.disjunction(); + orProcedura.add(RestrictionsFactoryUtil.eq("tipoProcedura", Constants.PROCEDURA_B)); + orProcedura.add(RestrictionsFactoryUtil.eq("tipoProcedura", Constants.PROCEDURA_B1)); + dq.add(orProcedura); dq.add(PropertyFactoryUtil.forName("dtPratica").between(date[0], date[1])); dq.add(PropertyFactoryUtil.forName("dtSorteggio").isNull()); try { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java index 0a59dc35..a6ff66dc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java @@ -534,8 +534,8 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { ServiceContext serviceContext) throws IOException, PortalException, SystemException { Pagamento pagamento = getPagamento(pagamentoId); - if (pagamento.getMezzo().equalsIgnoreCase(PagamentoConstants.MEZZO_MANUALE) - && pagamento.getUtilizzata().equalsIgnoreCase(PagamentoConstants.UTILIZZATA_IN_CORSO)) { + if (pagamento.getMezzo().equals(PagamentoConstants.MEZZO_MANUALE) + && pagamento.getUtilizzata().equals(PagamentoConstants.UTILIZZATA_IN_CORSO)) { long fileEntryId = 0L; long defaultFolderId = configurazioneLocalService.findByC_ChiaveLong(serviceContext.getCompanyId(), ConfigurazioneConstants.ATTACHMENT_FOLDER_ID); @@ -552,14 +552,13 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { defaultFolder.getFolderId(), folderName, StringPool.BLANK, serviceContext); } Date now = new Date(); - String title = now.getTime() + StringPool.UNDERLINE + "pagamento_manuale" + StringPool.UNDERLINE - + pagamento.getPagamentoId() + StringPool.UNDERLINE + sourceFileName; + String title = now.getTime() + "_pagamento_manuale_" + pagamento.getPagamentoId() + '_' + sourceFileName; String description = StringPool.BLANK; String mimeType = MimeTypesUtil.getContentType(sourceFileName); String changeLog = StringPool.BLANK; FileEntry fileEntry = dlAppLocalService.addFileEntry(serviceContext.getUserId(), folder.getRepositoryId(), - folder.getFolderId(), now.getTime() + StringPool.UNDERLINE + sourceFileName, mimeType, title, - description, changeLog, content, serviceContext); + folder.getFolderId(), now.getTime() + '_' + sourceFileName, mimeType, title, description, + changeLog, content, serviceContext); fileEntryId = fileEntry.getFileEntryId(); pagamento.setFileEntryId(fileEntryId); pagamento = updatePagamento(pagamento); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/PagamentiUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/PagamentiUtil.java index 44d3587b..e107e30c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/PagamentiUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/PagamentiUtil.java @@ -1,27 +1,18 @@ package it.tref.liferay.portos.bo.util; -import it.tasgroup.idp.generazioneiuv.ElencoIdentificativiType; -import it.toscana.rete.cart.www.servizi.iris_1_1.IdpEsito.IdpOTFType; import it.toscana.rete.cart.www.servizi.iris_1_1.IdpEsito.InformazioniPagamentoType; import it.toscana.rete.cart.www.servizi.iris_1_1.IdpEsito.VerificaStatoPagamentoDettagliato; -import it.tref.liferay.portos.bo.iris.IrisCommonUtil; -import it.tref.liferay.portos.bo.iris.IrisComunicaPosizioniDebitorie; import it.tref.liferay.portos.bo.iris.IrisVerificaPagamenti; import it.tref.liferay.portos.bo.model.Collaudo; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.FineLavori; import it.tref.liferay.portos.bo.model.Pagamento; -import it.tref.liferay.portos.bo.model.Provincia; -import it.tref.liferay.portos.bo.model.Soggetto; import it.tref.liferay.portos.bo.service.CollaudoLocalServiceUtil; import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil; import it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil; -import it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil; import it.tref.liferay.portos.bo.shared.util.PagamentoConstants; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; -import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; import java.io.IOException; import java.math.BigDecimal; @@ -29,16 +20,13 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.List; -import java.util.Map; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.util.CalendarFactoryUtil; -import com.liferay.portal.kernel.util.HttpUtil; import com.liferay.portal.kernel.util.StringPool; -import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.service.ServiceContext; @@ -143,12 +131,10 @@ public abstract class PagamentiUtil { String importo, String codiceFiscaleCommittente, ServiceContext serviceContext) throws PortalException, SystemException { - boolean irisDisabled = !PagamentiCommonUtil.irisIsEnable(serviceContext.getCompanyId()); boolean esenzioneBolli = false; boolean esenzioneSpeseIstruttoria = false; String tipoIntegrazione = StringPool.BLANK; long pagamentoId = 0L; - long intPraticaId = 0L; if (DettPratica.class.getName().equals(className)) { DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(classPk); esenzioneBolli = dettPratica.isNormEsenteBollo(); @@ -159,7 +145,6 @@ public abstract class PagamentiUtil { } else if (PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento)) { pagamentoId = dettPratica.getPagamentoIdBolli(); } - intPraticaId = dettPratica.getIntPraticaId(); } else if (FineLavori.class.getName().equals(className)) { FineLavori fineLavori = FineLavoriLocalServiceUtil.getFineLavori(classPk); esenzioneBolli = fineLavori.isNormEsenteBollo(); @@ -170,7 +155,6 @@ public abstract class PagamentiUtil { } else if (PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento)) { pagamentoId = fineLavori.getPagamentoId(); } - intPraticaId = fineLavori.getIntPraticaId(); } else if (Collaudo.class.getName().equals(className)) { Collaudo collaudo = CollaudoLocalServiceUtil.getCollaudo(classPk); esenzioneBolli = collaudo.isNormEsenteBollo(); @@ -181,7 +165,6 @@ public abstract class PagamentiUtil { } else if (PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento)) { pagamentoId = collaudo.getPagamentoId(); } - intPraticaId = collaudo.getIntPraticaId(); } else { throw new SystemException("error.fields.pratica.pagamento.classPk.invalid"); } @@ -222,77 +205,20 @@ public abstract class PagamentiUtil { return null; } } - if (!irisDisabled) { - if (Validator.isNull(pagamentoId)) { - Soggetto committente = SoggettoLocalServiceUtil - .getValidTmpByIntPratica_CodiceFiscale_TipologiaSoggetto(intPraticaId, - codiceFiscaleCommittente, TipoSoggettoUtil.COMMITTENTE); - String provincia = StringPool.BLANK; - String codiceProvincia = committente.getProvincia(); - if (codiceProvincia.equalsIgnoreCase("ee")) { - provincia = "EE"; - } else { - Provincia provinciaEntity = ProvinciaLocalServiceUtil.fetchByC_C(serviceContext.getCompanyId(), - codiceProvincia); - if (Validator.isNotNull(provinciaEntity)) { - provincia = provinciaEntity.getSigla(); - } - } - String codice = IrisCommonUtil.createCodicePendenza(); - String causale = IrisCommonUtil.getDescrizioneCausale(tipoPagamento); - long irisPagamentoId = PagamentoLocalServiceUtil.createPagamentoId(); - currentURL = StringUtil.replaceLast(currentURL, "/0", StringPool.SLASH + irisPagamentoId); - String auth = HttpUtil.getParameter(currentURL, "p_auth", false); - // Se non li rimuovi non funziona più - Map parameters = HttpUtil.getParameterMap(HttpUtil.getQueryString(currentURL)); - for (String key : parameters.keySet()) { - currentURL = HttpUtil.removeParameter(currentURL, key); - } - if (Validator.isNotNull(auth)) { - currentURL = HttpUtil.addParameter(currentURL, "p_auth", auth); - } - if (Validator.isNull(codiceFiscaleCommittente)) { - throw new SystemException("error.fields.pratica.pagamento.codicefiscale.richiesto"); - } - List iuvs = new ArrayList(); - if (PagamentoConstants.PAGAMENTO_BOLLI.equalsIgnoreCase(tipoPagamento)) { - iuvs = IrisComunicaPosizioniDebitorie.generaIUV(serviceContext.getCompanyId(), importi.size()); - } - IdpOTFType idpOTFType = IrisComunicaPosizioniDebitorie.comunicaPosizioniDebitorieOTF( - serviceContext.getCompanyId(), serviceContext.getScopeGroupId(), serviceContext.getUserId(), - codice, causale, codiceFiscaleCommittente, tipoPagamento, importi, iuvs, currentURL, - currentURL, provincia); - String urlPagamento = StringPool.BLANK; - if (idpOTFType == null) { - urlPagamento = currentURL; - throw new SystemException("error.geniocivilefe.pratica.pagamento | intPraticaId=" + intPraticaId - + " | classPk=" + classPk + " | className=" + className); - } else { - urlPagamento = idpOTFType.getUrlGW().toString(); - } - return PagamentoLocalServiceUtil.addPagamentoAndUpdate(irisPagamentoId, codice, causale, - PagamentoConstants.MEZZO_IRIS, codiceFiscaleCommittente, tipoPagamento, importo, - PagamentoConstants.UTILIZZATA_IN_CORSO, classPk, className, 0l, urlPagamento, iuvs, - serviceContext); - } else { - return PagamentoLocalServiceUtil.getPagamento(pagamentoId); - } - } else { - boolean add = true; - if (Validator.isNotNull(pagamentoId)) { - Pagamento pagamento = PagamentoLocalServiceUtil.getPagamento(pagamentoId); - if (pagamento.getClassPk() == classPk) { - add = false; - PagamentoLocalServiceUtil.updatePagamento(pagamentoId, codiceFiscaleCommittente, importo); - } - return pagamento; - } - if (add) { - return PagamentoLocalServiceUtil.addPagamentoAndUpdate(StringPool.BLANK, StringPool.BLANK, - PagamentoConstants.MEZZO_MANUALE, codiceFiscaleCommittente, tipoPagamento, importo, - PagamentoConstants.UTILIZZATA_IN_CORSO, classPk, className, 0l, serviceContext); + boolean add = true; + if (Validator.isNotNull(pagamentoId)) { + Pagamento pagamento = PagamentoLocalServiceUtil.getPagamento(pagamentoId); + if (pagamento.getClassPk() == classPk) { + add = false; + PagamentoLocalServiceUtil.updatePagamento(pagamentoId, codiceFiscaleCommittente, importo); } - return null; + return pagamento; + } + if (add) { + return PagamentoLocalServiceUtil.addPagamentoAndUpdate(StringPool.BLANK, StringPool.BLANK, + PagamentoConstants.MEZZO_MANUALE, codiceFiscaleCommittente, tipoPagamento, importo, + PagamentoConstants.UTILIZZATA_IN_CORSO, classPk, className, 0l, serviceContext); } + return null; } } 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 dff53512..d55e5bf5 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=2772 - build.date=1646228476610 + build.number=2799 + build.date=1649693475997 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/servlet/Instrumentation.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/servlet/Instrumentation.java new file mode 100644 index 00000000..957ad4bc --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/servlet/Instrumentation.java @@ -0,0 +1,94 @@ +package it.mwg.sismica.fe.servlet; + +import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil; + +import java.io.IOException; +import java.lang.management.ManagementFactory; +import java.util.Date; +import java.util.Iterator; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +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.servlet.ServletResponseUtil; +import com.liferay.portal.kernel.util.ContentTypes; +import com.liferay.portal.kernel.util.ParamUtil; +import com.liferay.portal.kernel.util.StringPool; +import com.liferay.portal.util.PortalUtil; + +public class Instrumentation extends HttpServlet { + + private static final long serialVersionUID = 5542429846030601941L; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + process(request, response); + } + + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, + IOException { + + process(request, response); + } + + private void process(HttpServletRequest request, HttpServletResponse response) throws IOException { + + switch (request.getPathInfo()) { + case "/status": + status(response, ParamUtil.getString(request, "fmt", StringPool.BLANK).toLowerCase()); + break; + default: + response.sendError(HttpServletResponse.SC_NOT_FOUND); + } + } + + private void status(HttpServletResponse response, String mode) throws IOException { + + JSONObject json = JSONFactoryUtil.createJSONObject(); + long time = new Date().getTime() / 1000; + Runtime runtime = Runtime.getRuntime(); + json.put("status", "OK"); + json.put("cpus", runtime.availableProcessors()); + json.put("freeMemory", runtime.freeMemory()); + json.put("maxMemory", runtime.maxMemory()); + json.put("totalMemory", runtime.totalMemory()); + json.put("threads", ManagementFactory.getThreadMXBean().getThreadCount()); + json.put("time", time); + json.put("uptime", time - PortalUtil.getUptime().getTime() / 1000); + try { + AvvisoLocalServiceUtil.countAvvisiInvioSignal(); + } catch (SystemException e) { + json.put("status", "KO"); + } + switch (mode) { + case FMT_JSON: + response.setContentType(ContentTypes.APPLICATION_JSON); + ServletResponseUtil.write(response, json.toString()); + break; + case FMT_TEXT: + response.setContentType(ContentTypes.TEXT_PLAIN); + StringBuilder sb = new StringBuilder(); + Iterator keys = json.keys(); + while (keys.hasNext()) { + String key = keys.next(); + String value = json.getString(key); + sb.append('X').append(key.toUpperCase()).append('=').append(value).append('\n'); + } + ServletResponseUtil.write(response, sb.toString()); + break; + default: + response.setContentType(ContentTypes.TEXT_PLAIN); + ServletResponseUtil.write(response, json.getString("status")); + } + } + + private static final String FMT_JSON = "json"; + private static final String FMT_TEXT = "text"; +} diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/servlet/SorgentiServlet.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/servlet/SorgentiServlet.java deleted file mode 100644 index e10171dd..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/servlet/SorgentiServlet.java +++ /dev/null @@ -1,223 +0,0 @@ -package it.mwg.sismica.fe.servlet; - -import it.tref.liferay.portos.bo.shared.util.Constants; -import it.tref.liferay.portos.mailmanager.shared.messaging.util.DestinationNames; -import it.tref.liferay.portos.mailmanager.shared.util.MailManagerConstants; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.nio.file.Files; -import java.text.SimpleDateFormat; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Comparator; -import java.util.Date; - -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.FilenameUtils; - -import com.liferay.portal.kernel.exception.PortalException; -import com.liferay.portal.kernel.exception.SystemException; -import com.liferay.portal.kernel.log.Log; -import com.liferay.portal.kernel.log.LogFactoryUtil; -import com.liferay.portal.kernel.mail.MailMessage; -import com.liferay.portal.kernel.messaging.Message; -import com.liferay.portal.kernel.messaging.MessageBusUtil; -import com.liferay.portal.kernel.util.DigesterUtil; -import com.liferay.portal.kernel.util.ParamUtil; -import com.liferay.portal.kernel.util.PropsUtil; -import com.liferay.portal.kernel.util.StringUtil; -import com.liferay.portal.kernel.util.Validator; -import com.liferay.portal.model.Company; -import com.liferay.portal.model.Role; -import com.liferay.portal.model.RoleConstants; -import com.liferay.portal.model.User; -import com.liferay.portal.service.RoleLocalServiceUtil; -import com.liferay.portal.service.ServiceContext; -import com.liferay.portal.service.ServiceContextFactory; -import com.liferay.portal.service.UserLocalServiceUtil; -import com.liferay.portal.util.PortalUtil; - -public class SorgentiServlet extends HttpServlet { - private static final long serialVersionUID = 5549374841236285035L; - - private static final int validita = 3; - private static final String folder = "condivisi"; - private static final String uri = "/portos-fe-portlet/sorgenti-sismica/"; - - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, - IOException { - String pathInfo = request.getPathInfo(); - - if (Validator.isNull(pathInfo) || pathInfo.equals("/")) { - request.getRequestDispatcher("/html/sorgenti/form.jsp").forward(request, response); - } else { - String[] parti = StringUtil.split(pathInfo, '/'); - if (parti.length == 4) { - registra(request, "Scaricamento - " + parti[1] + "/" + parti[2] + "/" + parti[3]); - String path = parti[1]; - File file = new File(PropsUtil.get("liferay.home") + "/" + folder + "/" + parti[3]); - if (file.exists() && !file.isDirectory() && pathValido(request, path)) { - String contentType = probeContentType(file); - response.setContentType(contentType); - response.setContentLength((int) file.length()); - response.setHeader("Content-Disposition", "attachment; filename=" + file.getName()); - FileUtils.copyFile(file, response.getOutputStream()); - } else { - response.sendError(HttpServletResponse.SC_NOT_FOUND, request.getRequestURI()); - } - } else { - response.sendError(HttpServletResponse.SC_NOT_FOUND, request.getRequestURI()); - } - } - } - - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, - IOException { - String pathInfo = request.getPathInfo(); - - if (Validator.isNotNull(pathInfo) && pathInfo.equals("/richiedi")) { - try { - if (inviaMail(request, response)) { - request.getRequestDispatcher("/html/sorgenti/invio_ok.jsp").forward(request, response); - } else { - request.getRequestDispatcher("/html/sorgenti/invio_ko.jsp").forward(request, response); - } - } catch (AddressException | PortalException | SystemException e) { - request.getRequestDispatcher("/html/sorgenti/invio_ko.jsp").forward(request, response); - e.printStackTrace(); - } - } else { - response.sendError(HttpServletResponse.SC_NOT_FOUND, request.getRequestURI()); - } - } - - private static boolean pathValido(HttpServletRequest request, String path) { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(new Date()); - for (int i = 0; i <= validita; i++) { - if (path.equals(getLink(request, calendar.getTime()))) { - return true; - } - calendar.add(Calendar.DAY_OF_MONTH, -1); - } - return false; - } - - private static String getSeed(HttpServletRequest request) { - String seed = null; - try { - Company company = PortalUtil.getCompany(request); - seed = (String) company.getExpandoBridge().getAttribute(Constants.COMPANY_CUSTOM_FIELD_LINK_SEED, - false); - } catch (PortalException | SystemException e) { - } - return seed; - } - - private static boolean inviaMail(HttpServletRequest request, HttpServletResponse response) - throws AddressException, PortalException, SystemException, IOException { - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - calendar.add(Calendar.DAY_OF_MONTH, validita); - - String nome = ParamUtil.getString(request, "nome"); - String cognome = ParamUtil.getString(request, "cognome"); - String email = ParamUtil.getString(request, "email"); - - String link = getLink(request, date); - String digest = digest(request, email); - String scadenza = new SimpleDateFormat("dd/MM/yyyy").format(calendar.getTime()); - - String testo = "Gentile " + nome + " " + cognome - + ".

Puoi scaricare i sorgenti di Sismica Sicilia da qui:
"; - - File[] lista = new File(PropsUtil.get("liferay.home") + "/" + folder).listFiles(); - Arrays.sort(lista, new Comparator() { - @Override - public int compare(File f1, File f2) { - return f1.getName().compareTo(f2.getName()); - } - }); - for (File file : lista) { - testo += "" + file.getName() + ".
"; - } - if (lista.length > 1) { - testo += "
I link saranno validi"; - } else { - testo += "
Il link sarà valido"; - } - testo += " fino a tutto il giorno " + scadenza - + ".

È possibile in ogni momento richiedere un nuovo link da questa pagina."; - - InternetAddress from = new InternetAddress("noreply-Sismica@lavoripubblici.sicilia.it", true); - InternetAddress[] to = { new InternetAddress(email, true) }; - - MailMessage mail = new MailMessage(from, "Sorgenti del portale Sismica Sicilia", testo, true); - mail.setTo(to); - - ServiceContext serviceContext = ServiceContextFactory.getInstance(request); - Role role = RoleLocalServiceUtil.getRole(serviceContext.getCompanyId(), RoleConstants.ADMINISTRATOR); - User user = UserLocalServiceUtil.getRoleUsers(role.getRoleId(), 0, 1).get(0); - serviceContext.setUserId(user.getUserId()); - - Message message = new Message(); - message.put("serviceContext", serviceContext); - message.put("mode", MailManagerConstants.MESSAGING_SEND_MODE_ASYNC); - - message.setPayload(mail); - - MessageBusUtil.sendMessage(DestinationNames.SEND_MAIL, message); - - registra(request, "Richiesta - nome: " + nome + ", cognome: " + cognome + ", email: " + email - + ", cartella: " + link + "/" + digest); - - return true; - } - - private static String getLink(HttpServletRequest request, Date date) { - return digest(request, new SimpleDateFormat("dd/MM/yyyy").format(date)); - } - - private static String digest(HttpServletRequest request, String text) { - return DigesterUtil.digestHex("md5", getSeed(request) + text); - } - - private static void registra(HttpServletRequest request, String text) throws IOException { - FileWriter writer = new FileWriter(PropsUtil.get("liferay.home") + "/logs/sorgenti.log", true); - writer.write(new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(new Date()) + " [" - + request.getRemoteAddr() + "] " + text + "\n"); - writer.close(); - } - - // La macchina di produzione non ha il supporto per mime, aggiriamo per i - // casi che ci interessano - private static String probeContentType(File file) { - try { - String extension = FilenameUtils.getExtension(file.getName()).toLowerCase(); - switch (extension) { - case "pdf": - return "application/pdf"; - case "zip": - return "application/zip"; - default: - return Files.probeContentType(file.toPath()); - } - } catch (IOException e) { - return "application/octet-stream"; - } - } -} 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 63fc91d5..4fdddf5b 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 @@ -13,12 +13,14 @@ 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.CollaudoLocalServiceUtil; import it.tref.liferay.portos.bo.service.CollaudoServiceUtil; import it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil; import it.tref.liferay.portos.bo.service.DelegaLocalServiceUtil; import it.tref.liferay.portos.bo.service.DelegaServiceUtil; import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.DettPraticaServiceUtil; +import it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil; import it.tref.liferay.portos.bo.service.FineLavoriServiceUtil; import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.IntPraticaServiceUtil; @@ -113,7 +115,7 @@ import com.liferay.util.bridges.mvc.MVCPortlet; public class FascicoloFePortlet extends MVCPortlet { - private static Log _log = LogFactoryUtil.getLog(FascicoloFePortlet.class); + private static final Log _log = LogFactoryUtil.getLog(FascicoloFePortlet.class); @Override public void serveResource(ResourceRequest resourceRequest, ResourceResponse resourceResponse) throws IOException, @@ -426,6 +428,12 @@ public class FascicoloFePortlet extends MVCPortlet { } } + public void concludiPagamento(ActionRequest request, ActionResponse response) throws Exception { + + long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId"); + DettPraticaLocalServiceUtil.concludiPagamento(dettPraticaId); + } + public void addGestioneUtenti(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); @@ -1366,6 +1374,7 @@ public class FascicoloFePortlet extends MVCPortlet { Pattern.quote(StringPool.PIPE), StringPool.SPACE); String dcParticelle = particella1 + StringPool.PIPE + particella2 + StringPool.PIPE + particella3 + StringPool.PIPE + particella4; + String localizzazioneGeografica = ParamUtil.getString(actionRequest, "localizzazioneGeografica"); boolean tcNuovaCostruzione = ParamUtil.getBoolean(actionRequest, "tcNuovaCostruzione"); boolean tcAdeguamentoSismico = ParamUtil.getBoolean(actionRequest, "tcAdeguamentoSismico"); boolean tcMiglioramentoSismico = ParamUtil.getBoolean(actionRequest, "tcMiglioramentoSismico"); @@ -1597,7 +1606,7 @@ public class FascicoloFePortlet extends MVCPortlet { pagCalcolatoRiparazioneInterventoLocale, pagCalcolatoOperaNonQuantificabile, pagEffettivoAdeguamentoSismico, pagEffettivoMiglioramentoSismico, pagEffettivoRiparazioneInterventoLocale, pagEffettivoOperaNonQuantificabile, pagNoteUtente, note, - noteUfficio, dettPratica.getLocalizzazioneGeografica(), tcNuovaCostruzione, tcAdeguamentoSismico, + noteUfficio, localizzazioneGeografica, tcNuovaCostruzione, tcAdeguamentoSismico, tcMiglioramentoSismico, tcRiparazioneInterventoLocale, tcInCA, tcInOpera, tcPrefabbricato, tcInAcciaio, tcMista, tcInMuratura, tcInMuraturaOrdinaria, tcInMuraturaArmata, tcInMuraturaMista, tcInLegno, tcAltro, tcAltroDescrizione, tcConDispositivi, normLavoriInProprio, normEsenteBollo, @@ -1956,40 +1965,70 @@ public class FascicoloFePortlet extends MVCPortlet { long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId"); long fineLavoriId = ParamUtil.getLong(actionRequest, "fineLavoriId"); long collaudoId = ParamUtil.getLong(actionRequest, "collaudoId"); - String codiceFiscaleCommittente = ParamUtil.getString(actionRequest, "codiceFiscaleCommittente"); + DettPratica dettPratica = null; + FineLavori fineLavori = null; + Collaudo collaudo = null; + Pagamento pagamento = null; + if (dettPraticaId != 0) { + dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId); + pagamento = PagamentoLocalServiceUtil.fetchPagamento(dettPratica.getPagamentoIdOneri()); + if (Validator.isNull(pagamento)) { + pagamento = PagamentoLocalServiceUtil.fetchPagamento(dettPratica.getPagamentoIdBolli()); + } + } else if (fineLavoriId != 0) { + fineLavori = FineLavoriLocalServiceUtil.getFineLavori(fineLavoriId); + pagamento = PagamentoLocalServiceUtil.fetchPagamento(fineLavori.getPagamentoId()); + } else if (collaudoId != 0) { + collaudo = CollaudoLocalServiceUtil.getCollaudo(collaudoId); + pagamento = PagamentoLocalServiceUtil.fetchPagamento(collaudo.getPagamentoId()); + } + String codiceFiscaleCommittente = null; + if (Validator.isNotNull(pagamento)) { + codiceFiscaleCommittente = pagamento.getCodiceFiscaleCommittente(); + } + codiceFiscaleCommittente = ParamUtil.getString(actionRequest, "codiceFiscaleCommittente", + codiceFiscaleCommittente); String url = ParamUtil.getString(actionRequest, "url"); - if (Validator.isNotNull(dettPraticaId)) { + if (Validator.isNotNull(dettPratica)) { if (ValidazionePraticaUtil.pagamentoIsEnable(dettPraticaId) && DelegheUtil.canDoPayment(serviceContext.getUserId(), dettPraticaId)) { - int pagAdeguamentoSismico = ParamUtil.getInteger(actionRequest, "pagAdeguamentoSismico"); - int pagAltro = ParamUtil.getInteger(actionRequest, "pagAltro"); - int pagMiglioramentoSismico = ParamUtil.getInteger(actionRequest, "pagMiglioramentoSismico"); - int pagNuovaCostruzione = ParamUtil.getInteger(actionRequest, "pagNuovaCostruzione"); - - boolean pagNuoveCostruzioni = ParamUtil.getBoolean(actionRequest, "pagNuoveCostruzioni"); + int pagAdeguamentoSismico = ParamUtil.getInteger(actionRequest, "pagAdeguamentoSismico", + dettPratica.getPagAdeguamentoSismico()); + int pagAltro = ParamUtil.getInteger(actionRequest, "pagAltro", dettPratica.getPagAltro()); + int pagMiglioramentoSismico = ParamUtil.getInteger(actionRequest, "pagMiglioramentoSismico", + dettPratica.getPagMiglioramentoSismico()); + int pagNuovaCostruzione = ParamUtil.getInteger(actionRequest, "pagNuovaCostruzione", + dettPratica.getPagNuovaCostruzione()); + + boolean pagNuoveCostruzioni = ParamUtil.getBoolean(actionRequest, "pagNuoveCostruzioni", + dettPratica.getPagNuoveCostruzioni()); boolean pagRiparazioneInterventoLocale = ParamUtil.getBoolean(actionRequest, - "pagRiparazioneInterventoLocale"); + "pagRiparazioneInterventoLocale", dettPratica.getPagRiparazioneInterventoLocale()); boolean pagMiglioramentoSismicoSicilia = ParamUtil.getBoolean(actionRequest, - "pagMiglioramentoSismicoSicilia"); + "pagMiglioramentoSismicoSicilia", dettPratica.getPagMiglioramentoSismicoSicilia()); String pagCalcolatoAdeguamentoSismico = ParamUtil.getString(actionRequest, - "pagCalcolatoAdeguamentoSismico"); + "pagCalcolatoAdeguamentoSismico", dettPratica.getPagCalcolatoAdeguamentoSismico()); String pagCalcolatoMiglioramentoSismico = ParamUtil.getString(actionRequest, - "pagCalcolatoMiglioramentoSismico"); + "pagCalcolatoMiglioramentoSismico", dettPratica.getPagCalcolatoMiglioramentoSismico()); String pagCalcolatoRiparazioneInterventoLocale = ParamUtil.getString(actionRequest, - "pagCalcolatoRiparazioneInterventoLocale"); + "pagCalcolatoRiparazioneInterventoLocale", + dettPratica.getPagCalcolatoRiparazioneInterventoLocale()); String pagCalcolatoOperaNonQuantificabile = ParamUtil.getString(actionRequest, - "pagCalcolatoOperaNonQuantificabile"); + "pagCalcolatoOperaNonQuantificabile", dettPratica.getPagCalcolatoOperaNonQuantificabile()); String pagEffettivoAdeguamentoSismico = ParamUtil.getString(actionRequest, - "pagEffettivoAdeguamentoSismico"); + "pagEffettivoAdeguamentoSismico", dettPratica.getPagEffettivoAdeguamentoSismico()); String pagEffettivoMiglioramentoSismico = ParamUtil.getString(actionRequest, - "pagEffettivoMiglioramentoSismico"); + "pagEffettivoMiglioramentoSismico", dettPratica.getPagEffettivoMiglioramentoSismico()); String pagEffettivoRiparazioneInterventoLocale = ParamUtil.getString(actionRequest, - "pagEffettivoRiparazioneInterventoLocale"); + "pagEffettivoRiparazioneInterventoLocale", + dettPratica.getPagEffettivoRiparazioneInterventoLocale()); String pagEffettivoOperaNonQuantificabile = ParamUtil.getString(actionRequest, - "pagEffettivoOperaNonQuantificabile"); - String pagNoteUtente = ParamUtil.getString(actionRequest, "pagNoteUtente"); - boolean pagVarianti = ParamUtil.getBoolean(actionRequest, "pagVarianti"); - String importoSpeseIstruttoria = ParamUtil.getString(actionRequest, "importoSpeseIstruttoria"); + "pagEffettivoOperaNonQuantificabile", dettPratica.getPagEffettivoOperaNonQuantificabile()); + String pagNoteUtente = ParamUtil.getString(actionRequest, "pagNoteUtente", + dettPratica.getPagNoteUtente()); + boolean pagVarianti = ParamUtil.getBoolean(actionRequest, "pagVarianti", dettPratica.getPagVarianti()); + String importoSpeseIstruttoria = ParamUtil.getString(actionRequest, "importoSpeseIstruttoria", + dettPratica.getImportoSpeseIstruttoria()); // ADT: BUG FE ID=30 - CALCOLO IMPORTO // controllo non effettuato se spese esente boolean esenteSpeseIstruttoria = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId) @@ -2027,7 +2066,7 @@ public class FascicoloFePortlet extends MVCPortlet { throw new PortalException("You have not permission to create the payment for dettPratica " + dettPraticaId); } - } else if (Validator.isNotNull(fineLavoriId)) { + } else if (Validator.isNotNull(fineLavori)) { if (ValidazionePraticaUtil.pagamentoFineLavoriIsEnable(fineLavoriId)) { _log.debug("pagamento inizializzato per fineLavori" + fineLavoriId); FineLavoriServiceUtil.pagaInvia(fineLavoriId, codiceFiscaleCommittente, url, serviceContext); @@ -2035,7 +2074,7 @@ public class FascicoloFePortlet extends MVCPortlet { throw new PortalException("You have not permission to create the payment for Fine Lavori " + fineLavoriId); } - } else if (Validator.isNotNull(collaudoId)) { + } else if (Validator.isNotNull(collaudo)) { if (ValidazionePraticaUtil.pagamentoCollaudoIsEnable(collaudoId)) { CollaudoServiceUtil.pagaInvia(collaudoId, codiceFiscaleCommittente, url, serviceContext); } else { @@ -2267,7 +2306,6 @@ public class FascicoloFePortlet extends MVCPortlet { public void rigeneraPagamento(ActionRequest actionRequest, ActionResponse actionResponse) throws PortalException, SystemException, InterruptedException { - _log.info("Entro"); ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY); ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); serviceContext.setCompanyId(themeDisplay.getCompanyId()); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/web.xml b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/web.xml index d6eb336f..16f9d31e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/web.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/web.xml @@ -3,12 +3,12 @@ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - SorgentiServlet - it.mwg.sismica.fe.servlet.SorgentiServlet + Instrumentation + it.mwg.sismica.fe.servlet.Instrumentation - SorgentiServlet - /sorgenti-sismica/* + Instrumentation + /instrumentation/* \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_fascicolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_fascicolo.jsp index 31bad46a..79031ad8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_fascicolo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_fascicolo.jsp @@ -1,3 +1,4 @@ +<%@page import="it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants"%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.kernel.util.HttpUtil"%> <%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp index de4366d8..cf06d664 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp @@ -1,3 +1,4 @@ +<%@page import="it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil"%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="java.util.Map"%> <%@page import="it.tref.liferay.portos.bo.shared.util.SessionUtil"%> @@ -55,6 +56,8 @@ boolean isDisabled = disabledInput && !enabledByIntegrazione; String displayStyle = proceduraC ? "display:none" : StringPool.BLANK; String urlIframeMappe = dettPratica.getUrlMappeFe(request, comune, disabledInput || isGeoEditable); +String originMappe = ConfigurazioneLocalServiceUtil.isProduction() ? + PortalUtil.getPortalURL(request) : "https://sismica.sicilia.it"; %> @@ -188,7 +191,7 @@ String urlIframeMappe = dettPratica.getUrlMappeFe(request, comune, disabledInput name="normEsenteSpese" label="norm-esente-spese" /> -
+
@@ -351,50 +354,45 @@ document.addEventListener('DOMContentLoaded', function(event) { window.addEventListener('message', messageListener, false); }); function messageListener(event) { - try { - var data = JSON.parse(event.data); - } catch (e) { - return; - } - var trasferiti = []; - var lat = ''; - var lng = ''; - for (key in data) { - var name = ''; - switch (key) { - case 'latitudine': - lat = data[key]; - break; - case 'longitudine': - lng = data[key]; - break; - case 'paesaggioLocale': - name = 'input_contestoPaesaggistico'; - data[key] = duplicati(data[key]); - break; - case 'livelloDiTutela': - case 'vincoli': - data[key] = duplicati(data[key]); - // Fall through - default: - name = 'input_' + key; + if (event.origin == '<%= originMappe %>') { + try { + var data = JSON.parse(event.data); + } catch (e) { + return; } - if (name !== '') { - var el = document.getElementById('' + name); - if (null !== el) { - el.value = data[key]; - trasferiti.push(key); + var lat = ''; + var lng = ''; + for (key in data) { + var name = ''; + switch (key) { + case 'latitudine': + lat = data[key]; + break; + case 'longitudine': + lng = data[key]; + break; + case 'paesaggioLocale': + name = 'input_contestoPaesaggistico'; + data[key] = duplicati(data[key]); + break; + case 'livelloDiTutela': + case 'vincoli': + data[key] = duplicati(data[key]); + // Fall through + default: + name = 'input_' + key; + } + if (name !== '') { + var el = document.getElementById('' + name); + if (null !== el) { + el.value = data[key]; + } } } - } - var el = document.getElementById('localizzazioneGeografica'); - el.value = lat + '|' + lng + '|8'; - trasferiti.push('localizzazioneGeografica'); - if (trasferiti.length > 0) { - console.log('Trasferiti correttamente: ' + trasferiti.join(', ')); - } - if (trasferiti.length > 0) { - console.log('Trasferiti correttamente: ' + trasferiti.join(', ')); + if (lat.length > 0 && lng.length > 0) { + var el = document.getElementById('localizzazioneGeografica'); + el.value = lat + '|' + lng + '|8'; + } } } @@ -801,7 +799,6 @@ function localize(){ var url = "https://nominatim.openstreetmap.org/search?format=json&addressdetails=0&q="+ localization.join("+"); - /* console.log(url); */ var point_lat = "", point_long = ""; @@ -833,15 +830,13 @@ function localize(){ }); } - - - - - - - - - \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/form.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/form.jsp deleted file mode 100644 index 18dd7fc7..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/form.jsp +++ /dev/null @@ -1,33 +0,0 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ include file="/html/sorgenti/header.jsp"%> -
-
-

Sorgenti del portale Sismica Sicilia

-
Compila il form sottostante e riceverai per email il collegamento per scaricare - i sorgenti del portale Sismica.
-
-
-
-
-
- - - - - - - - - - - - - - - - -
Nome
Cognome
E-mail
-
-
-
-<%@ include file="/html/sorgenti/footer.jsp"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/header.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/header.jsp deleted file mode 100644 index 970e26c9..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/header.jsp +++ /dev/null @@ -1,22 +0,0 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="com.liferay.portal.kernel.util.ParamUtil" %> - - - -Sorgenti del portale Sismica Sicilia - - - - - -
-
-
- Regione Siciliana -
-
- -
-
-
\ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/invio_ko.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/invio_ko.jsp deleted file mode 100644 index f0c337f1..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/invio_ko.jsp +++ /dev/null @@ -1,10 +0,0 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ include file="/html/sorgenti/header.jsp"%> -
-
- Si è verificato un errore durante l'inzio di una mail all'indirizzo - <%=ParamUtil.getString(request, "email")%>

- Ti invitiamo a riprovare tra qualche minuto. -
-
-<%@ include file="/html/sorgenti/footer.jsp"%> \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/invio_ok.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/invio_ok.jsp deleted file mode 100644 index b575c2fe..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/invio_ok.jsp +++ /dev/null @@ -1,10 +0,0 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ include file="/html/sorgenti/header.jsp"%> -
-
- È stata inviata una mail all'indirizzo - <%=ParamUtil.getString(request, "email")%> - contente l'indirizzo per scaricare i sorgenti del portale Sismica di Regione Siciliana -
-
-<%@ include file="/html/sorgenti/footer.jsp"%> \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/DocumentiPraticaUtil.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/DocumentiPraticaUtil.java index 39c5bedd..c74a0694 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/DocumentiPraticaUtil.java +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/DocumentiPraticaUtil.java @@ -26,6 +26,7 @@ public class DocumentiPraticaUtil { public final static String TIPOLOGIA_ALLEGATO_A14 = "A14"; public final static String TIPOLOGIA_ALLEGATO_A15 = "A15"; public final static String TIPOLOGIA_ALLEGATO_A17 = "A17"; + public final static String TIPOLOGIA_ALLEGATO_A29 = "A29"; public final static String TIPOLOGIA_ALLEGATO_ALTRI = "A99"; public final static String TIPOLOGIA_ALLEGATO_DELEGA = "A98"; @@ -89,7 +90,7 @@ public class DocumentiPraticaUtil { TIPOLOGIA_ALLEGATO_A02, TIPOLOGIA_ALLEGATO_A03, TIPOLOGIA_ALLEGATO_A04, TIPOLOGIA_ALLEGATO_A06, TIPOLOGIA_ALLEGATO_A07, TIPOLOGIA_ALLEGATO_A08, TIPOLOGIA_ALLEGATO_A09, TIPOLOGIA_ALLEGATO_A10, TIPOLOGIA_ALLEGATO_A11, TIPOLOGIA_ALLEGATO_A12, TIPOLOGIA_ALLEGATO_A13, TIPOLOGIA_ALLEGATO_A17, - TIPOLOGIA_ALLEGATO_ALTRI, TIPOLOGIA_ALLEGATO_DELEGA); + TIPOLOGIA_ALLEGATO_A29, TIPOLOGIA_ALLEGATO_ALTRI, TIPOLOGIA_ALLEGATO_DELEGA); public static List getDocDomanda() { @@ -100,7 +101,8 @@ public class DocumentiPraticaUtil { TIPOLOGIA_ALLEGATO_A02, TIPOLOGIA_ALLEGATO_A03, TIPOLOGIA_ALLEGATO_A04, TIPOLOGIA_ALLEGATO_A06, TIPOLOGIA_ALLEGATO_A07, TIPOLOGIA_ALLEGATO_A08, TIPOLOGIA_ALLEGATO_A09, TIPOLOGIA_ALLEGATO_A10, TIPOLOGIA_ALLEGATO_A13, TIPOLOGIA_ALLEGATO_A17, TIPOLOGIA_ALLEGATO_DELEGA); - private static final List DOC_OBBLIGATORI_DOMANDA_C = Arrays.asList(TIPOLOGIA_ALLEGATO_A03); + private static final List DOC_OBBLIGATORI_DOMANDA_C = Arrays.asList(TIPOLOGIA_ALLEGATO_A03, + TIPOLOGIA_ALLEGATO_A29); public static List getDocObbligatoriDomanda(String tipoProcedura) {