Consolidamento modifiche da branch secondari non effettuato dal manutentore precedente dopo verifica con versione rilasciata

.gitignore

@@ -1,6 +1,8 @@
 *.class
 *.war
 !kaleo-web-6.2.0.3.war
+portos-*.jar
+!portos-kaleo-portlet-service.jar
 **/classes/
 **/.sass-cache/
 **/.ivy/cache/
@@ -8,20 +10,3 @@
 **/build/
 .DS_Store
 ._*
-.idea/
-.metadata
-.shared
-.gradle
-liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/bin/
-liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/
-liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.settings/
-liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/
-liferay-plugins-sdk-6.2/.scannerwork/.sonar_lock
-liferay-plugins-sdk-6.2/sonar-scanner-4.8.0.2856-windows
-.settings
-liferay-plugins-sdk-6.2/build.malde.properties
-liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.classpath
-liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.project
-liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.tern-project
-*.MD5
-service-classes

.project

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>sismica</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>

iris-axis-client/.project

@@ -28,15 +28,4 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
-	<filteredResources>
-		<filter>
-			<id>1672738248521</id>
-			<name></name>
-			<type>30</type>
-			<matcher>
-				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
 </projectDescription>

liferay-plugins-sdk-6.2/.scannerwork/css-bundle/stylelintconfig.json

@@ -1 +0,0 @@
-{"rules":{"block-no-empty":true,"comment-no-empty":true,"string-no-newline":true,"function-linear-gradient-no-nonstandard-direction":true,"media-feature-name-no-unknown":true,"color-no-invalid-hex":true,"font-family-no-duplicate-names":true,"no-duplicate-at-import-rules":true,"no-empty-source":true,"declaration-block-no-duplicate-properties":[true,{"ignore":["consecutive-duplicates-with-different-values"]}],"selector-type-no-unknown":[true,{"ignoreTypes":["/^(mat|md|fa)-/"],"ignore":["custom-elements"]}],"at-rule-no-unknown":[true,{"ignoreAtRules":["value","at-root","content","debug","each","else","error","for","function","if","include","mixin","return","warn","while","extend","use","/^@.*/"]}],"no-duplicate-selectors":true,"font-family-no-missing-generic-family-keyword":true,"no-extra-semicolons":true,"no-invalid-double-slash-comments":true,"selector-pseudo-element-no-unknown":[true,{"ignorePseudoElements":["ng-deep","v-deep"]}],"selector-pseudo-class-no-unknown":[true,{"ignorePseudoClasses":["local","global","export","import"]}],"keyframe-declaration-no-important":true,"property-no-unknown":[true,{"ignoreProperties":["composes","/^mso-/"],"ignoreSelectors":["/^:export.*/","/^:import.*/"]}],"declaration-block-no-shorthand-property-overrides":true,"unit-no-unknown":[true,{"ignoreUnits":["x"]}],"function-calc-no-invalid":true}}

liferay-plugins-sdk-6.2/.scannerwork/report-task.txt

@@ -1,6 +0,0 @@
-projectKey=Sicilia-Sismica
-serverUrl=http://sonar.nextmind.it
-serverVersion=9.4.0.54424
-dashboardUrl=http://sonar.nextmind.it/dashboard?id=Sicilia-Sismica
-ceTaskId=AYZekmB9qvn_43R2i7P8
-ceTaskUrl=http://sonar.nextmind.it/api/ce/task?id=AYZekmB9qvn_43R2i7P8

liferay-plugins-sdk-6.2/build.ebusu.properties

@@ -1,10 +0,0 @@
-# Managed by Liferay IDE (remove this comment to prevent future updates)
-
-#Managed by Liferay IDE (remove this comment to prevent future updates)
-#Tue Jan 03 13:00:53 CET 2023
-app.server.tomcat.lib.global.dir = C:\\progetti\\sismica\\liferay-portal-6.2-ce-ga6\\tomcat-7.0.62\\lib\\ext
-app.server.tomcat.deploy.dir = C:\\progetti\\sismica\\liferay-portal-6.2-ce-ga6\\tomcat-7.0.62\\webapps
-app.server.parent.dir = C:\\progetti\\sismica\\liferay-portal-6.2-ce-ga6
-app.server.tomcat.dir = C:\\progetti\\sismica\\liferay-portal-6.2-ce-ga6\\tomcat-7.0.62
-app.server.type = tomcat
-app.server.tomcat.portal.dir = C:\\progetti\\sismica\\liferay-portal-6.2-ce-ga6\\tomcat-7.0.62\\webapps\\ROOT

liferay-plugins-sdk-6.2/build.ture.properties

@@ -1,11 +1,11 @@
 # Managed by Liferay IDE (remove this comment to prevent future updates)
 
-app.server.tomcat.lib.global.dir = /home/ture/liferay/portali/sismica/tomcat-7.0.62/lib/ext
+app.server.tomcat.lib.global.dir = /home/ture/liferay/portali/sismica/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/lib/ext
-app.server.tomcat.deploy.dir = /home/ture/liferay/portali/sismica/tomcat-7.0.62/webapps
+app.server.tomcat.deploy.dir = /home/ture/liferay/portali/sismica/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/webapps
-app.server.parent.dir = /home/ture/liferay/portali/sismica
+app.server.parent.dir = /home/ture/liferay/portali/sismica/liferay-portal-6.2-ce-ga6
-app.server.tomcat.dir = /home/ture/liferay/portali/sismica/tomcat-7.0.62
+app.server.tomcat.dir = /home/ture/liferay/portali/sismica/liferay-portal-6.2-ce-ga6/tomcat-7.0.62
 app.server.type = tomcat
-app.server.tomcat.portal.dir = /home/ture/liferay/portali/sismica/tomcat-7.0.62/webapps/ROOT
+app.server.tomcat.portal.dir = /home/ture/liferay/portali/sismica/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/webapps/ROOT
 javac.encoding = UTF-8
 ext.work.dir = /home/ture/liferay/src/work
 app.server.dir = /home/ture/liferay/src/work/liferay-portal-6.2-ce-ga6/tomcat-7.0.62

liferay-plugins-sdk-6.2/dependencies/aQute.bnd/ivy.xml.MD5

@@ -1 +1 @@
-b2996cd58c16b53d0e5cba6f59304ace
+45b38289274e4397c600a212c5477afa

liferay-plugins-sdk-6.2/dependencies/com.liferay.ant.bnd/ivy.xml.MD5

@@ -1 +1 @@
-edfd9cc2944faf63dd7d39e25283a4b6
+9e586203944d7fe5baccd02ed7bf20c1

liferay-plugins-sdk-6.2/dependencies/com.liferay.jasper.jspc/ivy.xml.MD5

@@ -1 +1 @@
-a7d8aaa34b7d1028a4d449b5ab8f767e
+cf39082434c04fdd3a9563acce7cb551

liferay-plugins-sdk-6.2/dependencies/net.sourceforge.pmd/ivy.xml.MD5

@@ -1 +1 @@
-4b40da73b53b5860b9adbb52cde18473
+6ad0549f4c64b52b40d871393d72f9aa

liferay-plugins-sdk-6.2/dependencies/org.apache.maven.maven.ant.tasks/ivy.xml.MD5

@@ -1 +1 @@
-0b9e4199159f29548166ac11ab8d12c0
+2aae42c5c43b993944b8c0fe9e31d5fb

liferay-plugins-sdk-6.2/dependencies/org.codehaus.groovy/ivy.xml.MD5

@@ -1 +1 @@
-8f22881d5bfb74c587681be94ad54598
+e1a7d560dfc36faf61c7d7da67bb03df

liferay-plugins-sdk-6.2/dependencies/org.freemarker/ivy.xml.MD5

@@ -1 +1 @@
-4102c750f16136e66085045251a34292
+f6d028f89713fdbf3004b38da2b16dcf

liferay-plugins-sdk-6.2/dependencies/org.sonar.ant/ivy.xml.MD5

@@ -1 +1 @@
-f6d022d60b1ed1cc45a21c61c21c8f22
+3325db6f628a33488c6c832368b134e4

liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.classpath

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="docroot/WEB-INF/src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_79">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>

liferay-plugins-sdk-6.2/hooks/sicilia-p7m-preview-hook/.classpath

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="docroot/WEB-INF/src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_80">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
@@ -18,5 +18,10 @@
 			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=sicilia-p7m-preview-hook&amp;ivyXmlPath=ivy.xml&amp;confs=*&amp;ivySettingsPath=%24%7Bliferay_sdk_dir%3Asicilia-p7m-preview-hook%7D%2Fivy-settings.xml&amp;loadSettingsOnDemand=false&amp;ivyUserDir=%24%7Bliferay_sdk_dir%3Asicilia-p7m-preview-hook%7D%2F.ivy&amp;propertyFiles=">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="docroot/WEB-INF/classes"/>
 </classpath>

liferay-plugins-sdk-6.2/hooks/sicilia-p7m-preview-hook/.project

@@ -31,17 +31,7 @@
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.apache.ivyde.eclipse.ivynature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
-	<filteredResources>
-		<filter>
-			<id>1672831492925</id>
-			<name></name>
-			<type>30</type>
-			<matcher>
-				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
 </projectDescription>

liferay-plugins-sdk-6.2/hooks/sicilia-p7m-preview-hook/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,7 @@
+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

liferay-plugins-sdk-6.2/hooks/sicilia-p7m-preview-hook/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
   <runtime name="Liferay v6.2 CE (Tomcat 7)"/>
-  <fixed facet="wst.jsdt.web"/>
-  <fixed facet="java"/>
   <fixed facet="jst.web"/>
+  <fixed facet="java"/>
+  <fixed facet="wst.jsdt.web"/>
   <installed facet="java" version="1.7"/>
   <installed facet="jst.web" version="3.0"/>
   <installed facet="liferay.hook" version="6.0"/>

liferay-plugins-sdk-6.2/hooks/sicilia-p7m-preview-hook/docroot/META-INF/MANIFEST.MF

@@ -1,3 +1,3 @@
-Manifest-Version: 1.0
+Manifest-Version: 1.0
-Class-Path: 
+Class-Path: 
-
+

liferay-plugins-sdk-6.2/ivy.xml.MD5

@@ -1 +1 @@
-8e943594b3e1f97e457b967864997dc5
+ae2292c03b059802eec34967b7e85b8a

liferay-plugins-sdk-6.2/layouttpl/bootstrapt_1_column-layouttpl/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,7 @@
+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

liferay-plugins-sdk-6.2/liferay-plugins-sdk-6.2.iml

@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web27">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/portlets/portos-firma-portlet/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/portlets/portos-firma-portlet/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web26">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/portlets/portos-audit-portlet/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/portlets/portos-audit-portlet/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web29">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/portlets/portos-report-portlet/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/portlets/portos-report-portlet/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web28">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/portlets/portos-maintenance-portlet/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/portlets/portos-maintenance-portlet/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web21">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/portlets/portos-deploy-alert-portlet/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web20">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/webs/elasticray-web/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/webs/elasticray-web/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web23">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/portlets/portos-cookies-portlet/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/portlets/portos-cookies-portlet/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web22">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/portlets/portos-log-portlet/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/portlets/portos-log-portlet/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web25">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/tools/templates/portlet_jsf_tmpl/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/tools/templates/portlet_jsf_tmpl/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web24">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/tools/templates/ext_tmpl/docroot/WEB-INF/ext-web/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/tools/templates/ext_tmpl/docroot/WEB-INF/ext-web/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web3">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/tools/templates/portlet_icefaces_tmpl/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/tools/templates/portlet_icefaces_tmpl/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web2">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/portlets/portos-notification-portlet/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/portlets/portos-notification-portlet/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web16">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/portlets/portos-calendar-appointments-portlet/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web15">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/portlets/portos-report-engine-portlet/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/portlets/portos-report-engine-portlet/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web18">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/portlets/portos-accesso-atti-portlet/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web17">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/portlets/portos-mail-manager-portlet/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/portlets/portos-mail-manager-portlet/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web19">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/webs/portos-kaleo-web/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/webs/portos-kaleo-web/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web5">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/portlets/portos-company-configuration-portlet/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/portlets/portos-company-configuration-portlet/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web4">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/hooks/sicilia-p7m-preview-hook/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/hooks/sicilia-p7m-preview-hook/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="javaeeApplication" name="javaEEApplication">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="application.xml" url="file://$MODULE_DIR$/tools/templates/ear_tmpl/modules/META-INF/application.xml" />
-        </descriptors>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web7">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/portlets/portos-kaleo-portlet/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/portlets/portos-kaleo-portlet/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web10">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/portlets/portos-bo-portlet/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/portlets/portos-bo-portlet/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web6">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/portlets/portos-comunicazioni-portlet/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web12">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/hooks/hms-taglib-hook/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/hooks/hms-taglib-hook/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web9">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/portlets/portos-fe-portlet/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/portlets/portos-fe-portlet/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web8">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/tools/templates/portlet_richfaces_tmpl/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/tools/templates/portlet_richfaces_tmpl/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web11">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/tools/templates/portlet_spring_mvc_tmpl/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web14">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/webs/resources-importer-web/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/webs/resources-importer-web/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web13">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/portlets/portos-kaleo-controller-portlet/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-    <facet type="web" name="Web">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/portlets/portos-jbpm-log-task-portlet/docroot" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/bin" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="corretto-1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.classpath

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="docroot/WEB-INF/src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7">
+	<classpathentry kind="src" path="docroot/WEB-INF/service"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_80">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,7 @@
+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

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.component

@@ -2,6 +2,7 @@
     <wb-module deploy-name="portos-accesso-atti-portlet">
         <wb-resource deploy-path="/" source-path="/docroot" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/src"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/service"/>
         <dependent-module archiveName="portos-bo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
   <runtime name="Liferay v6.2 CE (Tomcat 7)"/>
+  <fixed facet="jst.web"/>
   <fixed facet="wst.jsdt.web"/>
+  <fixed facet="java"/>
   <installed facet="java" version="1.7"/>
   <installed facet="jst.web" version="3.0"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="liferay.portlet" version="6.0"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
 </faceted-project>

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/liferay-portlet.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 6.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_6_2_0.dtd">
 
 <liferay-portlet-app>
-	
+
 	<portlet>
 		<portlet-name>1</portlet-name>
 		<icon>/icon.png</icon>

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/portlet.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" version="2.0">
-	
+
 	<portlet>
 		<portlet-name>1</portlet-name>
 		<display-name>Accesso Atti FE</display-name>

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/service.xml

@@ -1,14 +1,14 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE service-builder PUBLIC "-//Liferay//DTD Service Builder 6.1.0//EN" "http://www.liferay.com/dtd/liferay-service-builder_6_1_0.dtd">
 <service-builder package-path="it.tref.liferay.portos.accesso.atti">
 	<author>3F Consulting</author>
 	<namespace>portos_atti</namespace>
-	
+
 	<entity name="RichiestaAccessoAtti" local-service="true" remote-service="true">
-		
+
 		<!-- PK fields -->
 		<column name="richiestaAccessoAttiId" type="long" primary="true" />
-		
+
 		<!-- Audit fields -->
 		<column name="companyId" type="long" />
 		<column name="userId" type="long" />
@@ -16,7 +16,7 @@
 		<column name="createDate" type="Date" />
 		<column name="modifiedDate" type="Date" />
 		<column name="groupId" type="long" />
-		
+
 		<!-- Other fields -->
 		<column name="intPraticaId" type="long" />
 		<column name="territorioId" type="long" />
@@ -38,12 +38,12 @@
 		<column name="protocolloEntrata" type="String" />
 		<column name="protocolloUscita" type="String" />
 		<column name="funzionarioId" type="long" />
-		
+
 		<!-- Order -->
 		<order by="asc">
 			<order-column name="gestita" />
 		</order>
-		
+
 		<!-- Finder -->
 		<finder name="NumeroProgetto" return-type="Collection">
 			<finder-column name="numeroProgetto" />
@@ -51,9 +51,9 @@
 		<finder name="Gestita" return-type="Collection">
 			<finder-column name="gestita" />
 		</finder>
-		
+
 	</entity>
-	
+
-	
+
-	
+
 </service-builder>

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/service/impl/RichiestaAccessoAttiLocalServiceImpl.java

@@ -58,27 +58,27 @@ public class RichiestaAccessoAttiLocalServiceImpl extends RichiestaAccessoAttiLo
 	 */
 
 	@Override
-	public List<RichiestaAccessoAtti> findByGestita(boolean gestita, int start, int end) throws SystemException {
+	public List<RichiestaAccessoAtti> findByGestita(boolean gestita, int start, int end) throws SystemException{
 		return richiestaAccessoAttiPersistence.findByGestita(gestita, start, end);
 	}
 
 	@Override
 	public List<RichiestaAccessoAtti> findCompletate(String numeroProgetto, String protocollo, String dataDal,
-			String dataAl, int start, int end) throws SystemException, ParseException {
+			String dataAl, int start, int end) throws SystemException, ParseException{
 
 		SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
 		DynamicQuery dq = richiestaAccessoAttiLocalService.dynamicQuery();
 		dq.add(RestrictionsFactoryUtil.eq("gestita", true));
-		if (!numeroProgetto.equals("")) {
+		if(!numeroProgetto.equals("")){
 			dq.add(RestrictionsFactoryUtil.eq("numeroProgetto", numeroProgetto));
 		}
-		if (!protocollo.equals("")) {
+		if(!protocollo.equals("")){
 			Disjunction disjunction = RestrictionsFactoryUtil.disjunction();
 			disjunction.add(PropertyFactoryUtil.forName("protocolloEntrata").eq(protocollo));
 			disjunction.add(PropertyFactoryUtil.forName("protocolloUscita").eq(protocollo));
 			dq.add(disjunction);
 		}
-		if (!dataDal.equals("") && !dataAl.equals("")) {
+		if(!dataDal.equals("") && !dataAl.equals("")){
 			Date dateDal = sdf.parse(dataDal);
 			Calendar calDal = Calendar.getInstance();
 			calDal.setTime(dateDal);
@@ -94,7 +94,7 @@ public class RichiestaAccessoAttiLocalServiceImpl extends RichiestaAccessoAttiLo
 			Property createDateProperty = PropertyFactoryUtil.forName("dtAccettazione");
 			dq.add(createDateProperty.between(dateDal, dateAl));
 		}
-		if (!dataDal.equals("") && dataAl.equals("")) {
+		if(!dataDal.equals("") && dataAl.equals("")){
 			Date dateDal = sdf.parse(dataDal);
 			Calendar calDal = Calendar.getInstance();
 			calDal.setTime(dateDal);
@@ -106,7 +106,7 @@ public class RichiestaAccessoAttiLocalServiceImpl extends RichiestaAccessoAttiLo
 			dq.add(createDateProperty.between(dateDal, now));
 		}
 
-		if (dataDal.equals("") && !dataAl.equals("")) {
+		if(dataDal.equals("") && !dataAl.equals("")){
 			Date now = new Date("01/01/2018");
 			Date dateAl = sdf.parse(dataAl);
 			Calendar calAl = Calendar.getInstance();
@@ -117,26 +117,26 @@ public class RichiestaAccessoAttiLocalServiceImpl extends RichiestaAccessoAttiLo
 			Property createDateProperty = PropertyFactoryUtil.forName("dtAccettazione");
 			dq.add(createDateProperty.between(now, dateAl));
 		}
-		return richiestaAccessoAttiLocalService.dynamicQuery(dq, start, end);
+		return  richiestaAccessoAttiLocalService.dynamicQuery(dq, start, end);
 	}
 
 	@Override
 	public int countCompletate(String numeroProgetto, String protocollo, String dataDal, String dataAl)
-			throws SystemException, ParseException {
+			throws SystemException, ParseException{
 
 		SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
 		DynamicQuery dq = richiestaAccessoAttiLocalService.dynamicQuery();
 		dq.add(RestrictionsFactoryUtil.eq("gestita", true));
-		if (!numeroProgetto.equals("")) {
+		if(!numeroProgetto.equals("")){
 			dq.add(RestrictionsFactoryUtil.eq("numeroProgetto", numeroProgetto));
 		}
-		if (!protocollo.equals("")) {
+		if(!protocollo.equals("")){
 			Disjunction disjunction = RestrictionsFactoryUtil.disjunction();
 			disjunction.add(PropertyFactoryUtil.forName("protocolloEntrata").eq(protocollo));
 			disjunction.add(PropertyFactoryUtil.forName("protocolloUscita").eq(protocollo));
 			dq.add(disjunction);
 		}
-		if (!dataDal.equals("") && !dataAl.equals("")) {
+		if(!dataDal.equals("") && !dataAl.equals("")){
 			Date dateDal = sdf.parse(dataDal);
 			Calendar calDal = Calendar.getInstance();
 			calDal.setTime(dateDal);
@@ -152,7 +152,7 @@ public class RichiestaAccessoAttiLocalServiceImpl extends RichiestaAccessoAttiLo
 			Property createDateProperty = PropertyFactoryUtil.forName("dtAccettazione");
 			dq.add(createDateProperty.between(dateDal, dateAl));
 		}
-		if (!dataDal.equals("") && dataAl.equals("")) {
+		if(!dataDal.equals("") && dataAl.equals("")){
 			Date dateDal = sdf.parse(dataDal);
 			Calendar calDal = Calendar.getInstance();
 			calDal.setTime(dateDal);
@@ -163,7 +163,7 @@ public class RichiestaAccessoAttiLocalServiceImpl extends RichiestaAccessoAttiLo
 			Property createDateProperty = PropertyFactoryUtil.forName("dtAccettazione");
 			dq.add(createDateProperty.between(dateDal, now));
 		}
-		if (dataDal.equals("") && !dataAl.equals("")) {
+		if(dataDal.equals("") && !dataAl.equals("")){
 			Date now = new Date("01/01/2018");
 			Date dateAl = sdf.parse(dataAl);
 			Calendar calAl = Calendar.getInstance();
@@ -179,23 +179,23 @@ public class RichiestaAccessoAttiLocalServiceImpl extends RichiestaAccessoAttiLo
 	}
 
 	@Override
-	public RichiestaAccessoAtti findByAccessToken(String accessToken) throws SystemException {
+	public RichiestaAccessoAtti findByAccessToken(String accessToken) throws SystemException{
 
 		DynamicQuery dq = richiestaAccessoAttiLocalService.dynamicQuery();
 		dq.add(RestrictionsFactoryUtil.eq("accessToken", accessToken));
 		List<RichiestaAccessoAtti> lista = richiestaAccessoAttiLocalService.dynamicQuery(dq);
-		if (lista != null && !lista.isEmpty()) {
+		if(lista != null && !lista.isEmpty()){
 			return lista.get(0);
 		}
 		return null;
 	}
 
 	@Override
-	public List<RichiestaAccessoAtti> findRichiesteByGroup(long userId, int start, int end) throws SystemException {
+	public List<RichiestaAccessoAtti> findRichiesteByGroup(long userId, int start, int end) throws SystemException{
 
 		List<Long> listaLong = new ArrayList<Long>();
 		List<Organization> organizationList = OrganizationLocalServiceUtil.getUserOrganizations(userId);
-		if (organizationList != null && !organizationList.isEmpty()) {
+		if(organizationList != null && !organizationList.isEmpty()){
 			for (Organization organization : organizationList) {
 				listaLong.add(organization.getGroupId());
 			}

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/uti/AccessoAttiAccessTokenUtil.java

@@ -8,23 +8,23 @@ import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.util.StringPool;
 
 public class AccessoAttiAccessTokenUtil {
-
+	
 	private static final Log _log = LogFactoryUtil.getLog(AccessoAttiAccessTokenUtil.class);
-
+	
-	public static String generateAccessToken(long richiestaAccessoAttiId, String numeroProgetto, long richiedenteUserId) {
+	public static String generateAccessToken(long richiestaAccessoAttiId, String numeroProgetto, long richiedenteUserId){
-
+		
 		StringBuffer sb = new StringBuffer();
 		try {
 			String concatString = String.valueOf(richiestaAccessoAttiId) + StringPool.UNDERLINE + numeroProgetto
 					+ StringPool.UNDERLINE + richiedenteUserId;
 			MessageDigest md = MessageDigest.getInstance("MD5");
 			md.update(concatString.getBytes());
-			byte byteData[] = md.digest();
+	        byte byteData[] = md.digest();
-			for (int i = 0; i < byteData.length; i++) {
+	        for (int i = 0; i < byteData.length; i++) {
-				sb.append(Integer.toString((byteData[i] & 0xff) + 0x100, 16).substring(1));
+	         sb.append(Integer.toString((byteData[i] & 0xff) + 0x100, 16).substring(1));
-			}
+	        }
 		} catch (NoSuchAlgorithmException e) {
-			_log.error(e, e);
+			_log.error(e,e);
 		}
 		return sb.toString();
 	}

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/uti/DocumentLibraryUtil.java

@@ -17,29 +17,29 @@ import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil;
 import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil;
 
 public class DocumentLibraryUtil {
-
+	
 	public static Log _log = LogFactoryUtil.getLog(DocumentLibraryUtil.class);
 
 	public static final String RICHIESTA_ATTI_FOLDER_NAME = "RICHIESTA_ATTI";
 	public static final String PAGAMENTO_CODEC_FILENAME = "PAGAMENTO_";
 	public static final String DOCUMENTO_CODEC_FILENAME = "DOCUMENTO_";
-
+	
 	public static long saveFileEntryAccessoAtti(long companyGroupId, long richiestaAccessoAttiId,
 			String originFileName, File file, boolean pagamento) {
-
+		
 		long fileEntryId = 0L;
 		try {
 			DLFolder folder = getRichiestaAttiFolder(companyGroupId);
-			if (folder != null) {
+			if(folder != null){
 				RichiestaAccessoAtti richiestaAccessoAtti = RichiestaAccessoAttiLocalServiceUtil
 						.fetchRichiestaAccessoAtti(richiestaAccessoAttiId);
-				if (richiestaAccessoAtti != null) {
+				if(richiestaAccessoAtti != null){
 					ServiceContext serviceContext = new ServiceContext();
 					serviceContext.setCompanyId(richiestaAccessoAtti.getCompanyId());
 					serviceContext.setUserId(richiestaAccessoAtti.getUserId());
 					String mineType = FileUtil.getExtension(originFileName);
 					String prefixedFileName = "";
-					if (pagamento) {
+					if(pagamento){
 						prefixedFileName = PAGAMENTO_CODEC_FILENAME + richiestaAccessoAttiId + "." + mineType;
 					} else {
 						prefixedFileName = DOCUMENTO_CODEC_FILENAME + richiestaAccessoAttiId + "." + mineType;
@@ -51,13 +51,13 @@ public class DocumentLibraryUtil {
 				}
 			}
 		} catch (PortalException | SystemException e) {
-			_log.error(e, e);
+			_log.error(e,e);
 		}
 		return fileEntryId;
 	}
-
+	
-	private static DLFolder getRichiestaAttiFolder(long companyGroupId) throws PortalException, SystemException {
+	private static DLFolder getRichiestaAttiFolder(long companyGroupId) throws PortalException, SystemException{
-
+		
 		DLFolder folder = DLFolderLocalServiceUtil.getFolder(companyGroupId, 0L, RICHIESTA_ATTI_FOLDER_NAME);
 		return folder;
 	}

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/accesso_atti_bo/action_button.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
 <%@page import="com.liferay.portal.kernel.util.HtmlUtil"%>
 <%@include file="init.jsp" %>

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/accesso_atti_bo/add_richiesta.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@include file="init.jsp" %>
 
 <div style="width:30%;">

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/accesso_atti_bo/init.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@include file="../init.jsp" %>
 <%@page import="javax.portlet.PortletURL"%>
 <%@page import="java.util.ArrayList"%>

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/accesso_atti_bo/show_completed_request.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="com.liferay.portal.model.User"%>
 <%@page import="it.tref.liferay.portos.bo.model.Territorio"%>
 <%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%>

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/accesso_atti_bo/show_richieste.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil"%>
 <%@page import="it.tref.liferay.portos.bo.model.DettPratica"%>
 <%@page import="it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil"%>

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/accesso_atti_bo/view.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@include file="init.jsp" %>
 
 <div id="gestioneRichiestaAccessoAtti">

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/accesso_atti_bo/view_richiesta_popup.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="com.liferay.portlet.documentlibrary.util.DLUtil"%>
 <%@page import="com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil"%>
 <%@page import="com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil"%>

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/accesso_atti_fe/init.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="javax.portlet.PortletURL"%>
 <%@page import="com.liferay.portal.model.User"%>
 <%@page import="com.liferay.portal.service.UserLocalServiceUtil"%>

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/accesso_atti_fe/richiedi-atto.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@include file="init.jsp" %>
 
 <%

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/accesso_atti_fe/richiesta-inviata-success.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@include file="init.jsp" %>
 
 <div class="container" style="margin-top: 10%;">

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/accesso_atti_fe/view.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@include file="init.jsp" %>
 
 <%

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/accesso_atti_fe/visualizza-atto.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="it.tref.liferay.portos.bo.util.SoggettiUtil"%>
 <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
 <%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%>

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/creazione_account/success.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@include file="../init.jsp" %>
 
 <div class="container" style="margin-top: 10%;">

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/creazione_account/view.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@include file="../init.jsp" %>
 
 

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/init.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="java.text.Format"%>
 <%@page import="com.liferay.portal.kernel.util.FastDateFormatFactoryUtil"%>
 <%@page import="com.liferay.portal.kernel.util.StringUtil"%>

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.classpath

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="docroot/WEB-INF/src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_80">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
@@ -13,10 +13,15 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="con" path="com.liferay.ide.eclipse.server.plugin.container/theme">
+	<classpathentry kind="con" path="com.liferay.ide.eclipse.server.plugin.container/portlet">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=portos-advanced-operation-portlet&amp;ivyXmlPath=ivy.xml&amp;confs=*&amp;ivySettingsPath=%24%7Bliferay_sdk_dir%3Aportos-advanced-operation-portlet%7D%2Fivy-settings.xml&amp;loadSettingsOnDemand=false&amp;ivyUserDir=%24%7Bliferay_sdk_dir%3Aportos-advanced-operation-portlet%7D%2F.ivy&amp;propertyFiles=">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="docroot/WEB-INF/classes"/>
 </classpath>

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>provatema-theme</name>
+	<name>portos-advanced-operation-portlet</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -10,11 +10,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>com.liferay.ide.eclipse.theme.core.cssBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -37,5 +32,6 @@
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+		<nature>org.apache.ivyde.eclipse.ivynature</nature>
 	</natures>
 </projectDescription>

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,7 @@
+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

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.jst.jsp.core.prefs

@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+validateFragments=false
+validation.use-project-settings=true

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.wst.common.component

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="provatema-theme">
+    <wb-module deploy-name="portos-advanced-operation-portlet">
         <wb-resource deploy-path="/" source-path="/docroot" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/src"/>
-        <property name="context-root" value="provatema-theme"/>
+        <property name="context-root" value="portos-advanced-operation-portlet"/>
-        <property name="java-output-path" value="/provatema-theme/docroot/WEB-INF/classes"/>
+        <property name="java-output-path" value="/portos-advanced-operation-portlet/docroot/WEB-INF/classes"/>
     </wb-module>
 </project-modules>

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml

@@ -1,7 +1,7 @@
 <root>
-  <facet id="liferay.theme">
+  <facet id="liferay.portlet">
     <node name="libprov">
-      <attribute name="provider-id" value="com.liferay.ide.eclipse.plugin.theme.libraryProvider"/>
+      <attribute name="provider-id" value="com.liferay.ide.eclipse.plugin.portlet.libraryProvider"/>
     </node>
   </facet>
 </root>

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
   <runtime name="Liferay v6.2 CE (Tomcat 7)"/>
-  <fixed facet="wst.jsdt.web"/>
   <fixed facet="jst.web"/>
   <fixed facet="java"/>
+  <fixed facet="wst.jsdt.web"/>
   <installed facet="java" version="1.7"/>
   <installed facet="jst.web" version="3.0"/>
-  <installed facet="liferay.theme" version="6.0"/>
+  <installed facet="liferay.portlet" version="6.0"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
 </faceted-project>

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/portlet/AdvancedOperationPortlet.java

@@ -11,6 +11,8 @@ import com.liferay.portal.kernel.util.ParamUtil;
 import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.kernel.util.WebKeys;
 import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import com.liferay.portal.kernel.workflow.WorkflowTask;
+import com.liferay.portal.service.UserLocalServiceUtil;
 import com.liferay.portal.theme.ThemeDisplay;
 import com.liferay.portal.util.PortalUtil;
 import com.liferay.util.bridges.mvc.MVCPortlet;
@@ -24,8 +26,8 @@ import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
+import it.tref.liferay.portos.bo.util.WorkflowUtil;
 
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -35,11 +37,11 @@ import javax.portlet.ActionResponse;
 public class AdvancedOperationPortlet extends MVCPortlet {
 
 	private static final Log _log = LogFactoryUtil.getLog(AdvancedOperationPortlet.class);
-	
+
 	public void deleteControlloPratica(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{
 
 		_checkIfUserIsCompanyAdmin(actionRequest);
-		
+
 		long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", 0L);
 		if (intPraticaId != 0L) {
 			List<ControlloPratica> controlloPraticaList = 
@@ -50,24 +52,24 @@ public class AdvancedOperationPortlet extends MVCPortlet {
 			for(ControlloPratica cp : controlloPraticaList){
 				if(_log.isDebugEnabled()){
 					_log.debug("AdvancedOperationPortlet --- Cycling... ControlloPraticaID " + cp.getCompanyId()
-						+ " Status " + cp.getStatus());
+							+ " Status " + cp.getStatus());
 				}
 				if(ArrayUtil.contains(AdvancedOperationUtil.STATUS_ARRAY, cp.getStatus())){
 					_log.info("AdvancedOperationPortlet --- Deleting ControlloPratica " + cp.getControlloPraticaId() + 
-						" with Status " + cp.getStatus() +" of IntPraticaId " + intPraticaId);
+							" with Status " + cp.getStatus() +" of IntPraticaId " + intPraticaId);
 					ControlloPraticaLocalServiceUtil.deleteControlloPratica(cp);
 				}
 			}
 		}
 		actionResponse.setRenderParameter("intPraticaId", String.valueOf(intPraticaId));
 	}
-	
+
 	public void reindexPratica(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{
 
 		_checkIfUserIsCompanyAdmin(actionRequest);
-		
+
 		ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY);
-		
+
 		long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", 0L);
 		if (intPraticaId != 0L) {
 			_log.info("AdvancedOperationPortlet --- Reindexing fascicolo of IntPraticaId " + intPraticaId);
@@ -75,23 +77,45 @@ public class AdvancedOperationPortlet extends MVCPortlet {
 		}
 		actionResponse.setRenderParameter("intPraticaId", String.valueOf(intPraticaId));
 	}	
-	
+
 	public void cambiaDataInizioLavori(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{
 
 		_checkIfUserIsCompanyAdmin(actionRequest);
 
 		long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", -1L);
+		IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId);
+		
 		Date dataInizioLavoriOpera = ParamUtil.getDate(actionRequest, "dataInizioLavoriOperaInput",
 				DateFormatFactoryUtil.getSimpleDateFormat("yyyy-MM-dd"), null);
-		IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId);
+		
 		_log.info("AdvancedOperationPortlet --- Changing DataInizioLavori on DettPraticas of IntPraticaId" + intPraticaId);
+		_setDataInizioLavori(intPratica, dataInizioLavoriOpera);
+		
+		actionResponse.setRenderParameter("intPraticaId", String.valueOf(intPraticaId));
+	}
+
+	public void resetDataInizioLavori(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{
+
+		_checkIfUserIsCompanyAdmin(actionRequest);
+
+		long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", -1L);
+		IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId);
+		
+		if(AdvancedOperationUtil.hasNoFineLavori(intPratica)){
+			_log.info("AdvancedOperationPortlet --- Resetting DataInizioLavori on DettPraticas of IntPraticaId" + intPraticaId);
+			_setDataInizioLavori(intPratica, null);
+		}
+		actionResponse.setRenderParameter("intPraticaId", String.valueOf(intPraticaId));
+	}
+
+	private void _setDataInizioLavori(IntPratica intPratica, Date dataInizioLavoriOpera)
+			throws SystemException {
 		List<DettPratica> dettPraticaListWithInizioLavori = AdvancedOperationUtil.fetchDettPraticaListWithInizioLavori(intPratica);
 		for(DettPratica dettPratica : dettPraticaListWithInizioLavori){
 			dettPratica.setDataInizioLavoriOpera(dataInizioLavoriOpera);
 			dettPratica.setModifiedDate(new Date());
 			DettPraticaLocalServiceUtil.updateDettPratica(dettPratica);
 		}
-		actionResponse.setRenderParameter("intPraticaId", String.valueOf(intPraticaId));
 	}
 
 	public void fixNormLavoriInProprio(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{
@@ -160,7 +184,7 @@ public class AdvancedOperationPortlet extends MVCPortlet {
 		long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", -1L);
 		IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId);
 
-		if(WorkflowConstants.STATUS_INCOMPLETE == intPratica.getStatus()){
+		if(WorkflowConstants.STATUS_INACTIVE == intPratica.getStatus()){
 			_log.info("AdvancedOperationPortlet --- Recovering Pratica Vidimata (INCOMPLETE ==> DRAFT) "
 					+ "with IntPraticaId " + intPraticaId);
 			_ripristinaPratica(intPratica, WorkflowConstants.STATUS_DRAFT);
@@ -171,14 +195,53 @@ public class AdvancedOperationPortlet extends MVCPortlet {
 		actionResponse.setRenderParameter("intPraticaId", String.valueOf(intPraticaId));
 	}
 
+	public void cambiaIstruttore(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{
+		ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY);
+		long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", -1L);
+		long istruttoreId = ParamUtil.getLong(actionRequest, "istruttoreId", -1L);
+		IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId);
+		WorkflowTask lastTask = AdvancedOperationUtil.getLastTask(intPratica);
+		if (lastTask != null && lastTask.getName().equalsIgnoreCase("Esito")) {
+			List<ControlloPratica> controlloPraticas = ControlloPraticaLocalServiceUtil.findByIntPratica(intPratica.getIntPraticaId());
+			if(!controlloPraticas.isEmpty()){
+				for(ControlloPratica controlloPratica : controlloPraticas){
+					if(controlloPratica.getStatus() == WorkflowConstants.STATUS_PENDING){
+						WorkflowUtil.assegnaUltimoTask(intPratica.getCompanyId(), intPratica.getGroupId(),
+								istruttoreId, themeDisplay.getUserId(), controlloPratica);
+					}
+				}
+			}
+		}
+		actionResponse.setRenderParameter("intPraticaId", String.valueOf(intPraticaId));
+	}
+
+	public void fixUserID(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{
+
+		_checkIfUserIsCompanyAdmin(actionRequest);
+
+		long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", -1L);
+		IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId);
+
+		if(!AdvancedOperationUtil.evalInt_Dett_UserID(intPratica)){
+			DettPratica dettPratica = DettPraticaLocalServiceUtil.getLastEditableByIntPratica(intPratica.getIntPraticaId());
+			if(Validator.isNotNull(dettPratica)){
+				long userId = intPratica.getUserId();
+				dettPratica.setUserId(userId);
+				dettPratica.setUserName(UserLocalServiceUtil.getUser(userId).getScreenName());
+				DettPraticaLocalServiceUtil.updateDettPratica(dettPratica);
+			}
+		}
+		actionResponse.setRenderParameter("intPraticaId", String.valueOf(intPraticaId));
+	}
+
 	public void ripristinaPraticaConforme(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{
 
 		_checkIfUserIsCompanyAdmin(actionRequest);
 
 		long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", -1L);
 		IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId);
-		
+
-		if(WorkflowConstants.STATUS_INCOMPLETE == intPratica.getStatus()){
+		if(WorkflowConstants.STATUS_INACTIVE == intPratica.getStatus()){
 			_log.info("AdvancedOperationPortlet --- Recovering Pratica Vidimata (INCOMPLETE ==> APPROVED) "
 					+ "with IntPraticaId " + intPraticaId);
 			_ripristinaPratica(intPratica, WorkflowConstants.STATUS_APPROVED);
@@ -237,7 +300,9 @@ public class AdvancedOperationPortlet extends MVCPortlet {
 
 	private void _ripristinaPratica(IntPratica intPratica, int status) throws PortalException, SystemException{
 		long docPraticaAnnullamentoId = intPratica.getDocPraticaAnnullamentoId();
-		IntPraticaLocalServiceUtil.deleteFileAnnullamento(docPraticaAnnullamentoId);
+		if(Validator.isNotNull(docPraticaAnnullamentoId)){
+			IntPraticaLocalServiceUtil.deleteFileAnnullamento(docPraticaAnnullamentoId);
+		}
 		IntPraticaLocalServiceUtil.updateStatus(intPratica.getIntPraticaId(), status);
 	}
 

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/portlet/TemplateTesterPortlet.java

@@ -0,0 +1,156 @@
+//package it.nextmind.liferay.portos.advanced.operation.portlet;
+//
+//import com.liferay.portal.kernel.json.JSONFactoryUtil;
+//import com.liferay.portal.kernel.json.JSONObject;
+//import com.liferay.portal.kernel.log.Log;
+//import com.liferay.portal.kernel.log.LogFactoryUtil;
+//import com.liferay.portal.kernel.servlet.ServletResponseUtil;
+//import com.liferay.portal.kernel.upload.UploadPortletRequest;
+//import com.liferay.portal.kernel.util.ContentTypes;
+//import com.liferay.portal.kernel.util.GetterUtil;
+//import com.liferay.portal.kernel.util.ParamUtil;
+//import com.liferay.portal.kernel.util.StreamUtil;
+//import com.liferay.portal.kernel.util.StringPool;
+//import com.liferay.portal.kernel.util.Validator;
+//import com.liferay.portal.kernel.util.WebKeys;
+//import com.liferay.portal.theme.ThemeDisplay;
+//import com.liferay.portal.util.PortalUtil;
+//import com.liferay.util.bridges.mvc.MVCPortlet;
+//
+//import it.tref.liferay.portos.bo.report.builder.bean.ReportAvvisoBean;
+//import it.tref.liferay.portos.bo.report.builder.builder.ReportAvvisoBeanBuilder;
+//import it.tref.liferay.portos.report.html.core.HtmlToPdfEngine;
+//import it.tref.liferay.portos.report.jasper.core.provider.JasperPdfProvider;
+//import it.tref.liferay.portos.report.jasper.core.report.BeanReport;
+//import it.tref.liferay.portos.report.jasper.core.report.ReportInterface;
+//import it.tref.liferay.portos.report.odt.core.OdtToPdfEngine;
+//import it.tref.liferay.portos.report.shared.constants.ReportConstants;
+//import it.tref.liferay.portos.report.shared.constants.ReportConstants.ReportType;
+//import it.tref.liferay.portos.report.shared.dto.ReportDto;
+//import it.tref.liferay.portos.report.shared.dto.ReportResultDto;
+//import it.tref.liferay.portos.report.shared.util.ReportUtil;
+//import it.tref.liferay.portos.report.shared.util.VelocityUtil;
+//
+//import java.io.ByteArrayOutputStream;
+//import java.io.IOException;
+//import java.io.InputStream;
+//import java.util.HashMap;
+//
+//import javassist.ClassPool;
+//
+//import javax.portlet.PortletException;
+//import javax.portlet.ResourceRequest;
+//import javax.portlet.ResourceResponse;
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//
+//public class TemplateTesterPortlet extends MVCPortlet {
+//
+//	@Override
+//	public void serveResource(ResourceRequest resourceRequest,
+//			ResourceResponse resourceResponse) throws IOException,
+//			PortletException {
+//
+//		String resourceID = GetterUtil.getString(resourceRequest
+//				.getResourceID());
+//
+//		if (resourceID.equals("templateTester")) {
+//			_processTemplate(resourceRequest, resourceResponse);
+//		} else {
+//			super.serveResource(resourceRequest, resourceResponse);
+//		}
+//	}
+//
+//	private void _processTemplate(ResourceRequest resourceRequest,
+//			ResourceResponse resourceResponse){
+//
+//		HttpServletRequest request = PortalUtil
+//				.getHttpServletRequest(resourceRequest);
+//		HttpServletResponse response = PortalUtil
+//				.getHttpServletResponse(resourceResponse);
+//
+//		try {
+//
+//			ThemeDisplay themeDisplay = (ThemeDisplay) resourceRequest
+//					.getAttribute(WebKeys.THEME_DISPLAY);
+//
+//			byte[] bytes = new byte[0];
+//
+//			UploadPortletRequest uploadPortletRequest = PortalUtil
+//					.getUploadPortletRequest(resourceRequest);
+//			
+//			ReportAvvisoBean bean = ReportAvvisoBeanBuilder.build(avviso, parameters);
+//			String resourcePath = getClass().getName().replaceAll("\\w+\\.", "../")
+//					.replace(getClass().getSimpleName(), ReportConstants.PATH_LOGO_REGIONE);
+//			parameters.put(ReportConstants.LOGO_REGIONE, getClass().getResource(resourcePath).getPath());
+//			ReportDto reportDto = new ReportDto();
+//			reportDto.setFileEntryIds(new long[] { fileEntryIdTemplate });
+//			reportDto.setFolderId(folderId);
+//			reportDto.setFileName(fileName);
+//			reportDto.setParameters(parameters);
+//			reportDto.setShowNumberOfPage(true);
+//			reportDto.setType(ReportConstants.ReportType.JRXML_TO_PDF.toString());
+//			ReportResultDto result = ReportUtil.generateReport(companyId, userId, reportDto, bean);
+//
+//			String parametersJSON = ParamUtil.getString(
+//					uploadPortletRequest, "parametersJSON");
+//
+//			HashMap<String, Object> params = new HashMap<String, Object>();
+//			if (Validator.isNotNull(parametersJSON)) {
+//				params = (HashMap<String, Object>) JSONFactoryUtil
+//						.looseDeserialize(parametersJSON);
+//			}
+//
+//			String objectJSON = ParamUtil.getString(uploadPortletRequest,
+//					"objectJSON");
+//
+//			String fileNameTemplate = uploadPortletRequest
+//					.getFileName("fileTemplate");
+//
+//			ReportInterface reportInterface = null;
+//
+//			if (Validator.isNotNull(objectJSON)) {
+//
+//				JSONObject jsonObject = JSONFactoryUtil
+//						.createJSONObject(objectJSON);
+//
+//				ClassPool pool = ClassPool.getDefault();
+//
+//				Class<?> clazz = makeClass(pool, jsonObject);
+//				Object dataSource = clazz.newInstance();
+//
+//				reportInterface = new BeanReport(dataSource);
+//			}
+//
+//			if (Validator.isNotNull(fileNameTemplate)) {
+//
+//				InputStream inputStream = null;
+//				try {
+//					inputStream = uploadPortletRequest
+//							.getFileAsStream("fileTemplate");
+//
+//					JasperPdfProvider pdfProvider = new JasperPdfProvider();
+//					pdfProvider.doReport(inputStream, params,
+//							reportInterface);
+//
+//					bytes = pdfProvider.getBytes();
+//				} finally {
+//					StreamUtil.cleanUp(inputStream);
+//				}
+//			}
+//
+//			ServletResponseUtil.sendFile(request, response, "test.pdf", bytes,
+//					ContentTypes.APPLICATION_PDF);
+//
+//		} catch (Exception e) {
+//			_log.error(e, e);
+//
+//			ServletResponseUtil.sendFile(request, response, "test.html", e
+//					.toString().getBytes(StringPool.UTF8),
+//					ContentTypes.TEXT_HTML_UTF8);
+//		}
+//
+//	}
+//
+//	private final static Log _log = LogFactoryUtil.getLog(TestPdf.class);
+//}

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/util/AdvancedOperationUtil.java

@@ -11,186 +11,303 @@ import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.kernel.workflow.WorkflowConstants;
 import com.liferay.portal.kernel.workflow.WorkflowTask;
 import com.liferay.portal.kernel.workflow.WorkflowTaskManagerUtil;
+import com.liferay.portal.model.User;
 import com.liferay.portal.model.WorkflowInstanceLink;
 import com.liferay.portal.service.WorkflowInstanceLinkLocalServiceUtil;
 
 import it.tref.liferay.portos.bo.model.ControlloPratica;
 import it.tref.liferay.portos.bo.model.DettPratica;
 import it.tref.liferay.portos.bo.model.DocPratica;
+import it.tref.liferay.portos.bo.model.FineLavori;
 import it.tref.liferay.portos.bo.model.IntPratica;
 import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil;
+import it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil;
 import it.tref.liferay.portos.bo.shared.util.Constants;
 import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants;
+import it.tref.liferay.portos.bo.util.WorkflowUtil;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 public class AdvancedOperationUtil {
-	
+
-	public static final int[] STATUS_ARRAY = 
+	public static final int[] STATUS_ARRAY = { WorkflowConstants.STATUS_DRAFT,
-		{WorkflowConstants.STATUS_DRAFT, WorkflowConstants.STATUS_INACTIVE, WorkflowConstants.STATUS_PENDING};
+			WorkflowConstants.STATUS_INACTIVE, WorkflowConstants.STATUS_PENDING };
-	
+
-	public static boolean isNotWorkflowManuallyStarted(IntPratica intPratica){
+	public static boolean isNotWorkflowManuallyStarted(IntPratica intPratica) {
 		switch (intPratica.getStatoPratica()) {
-		case StatoPraticaConstants.VIDIMATA :
+		case StatoPraticaConstants.VIDIMATA:
 		case StatoPraticaConstants.AUTORIZZATA:
-		case StatoPraticaConstants.CONFORME:	
+		case StatoPraticaConstants.CONFORME:
 			return true;
 		default:
 			return false;
 		}
 	}
 
-	public static boolean hasControlloPratica_ProceduraC(IntPratica intPratica){
+	public static boolean hasControlloPratica_ProceduraC(IntPratica intPratica) {
-		if(Constants.PROCEDURA_C.equalsIgnoreCase(intPratica.getTipoProcedura())){
+		if (Constants.PROCEDURA_C.equalsIgnoreCase(intPratica
-			try{
+				.getTipoProcedura())) {
+			try {
 				long intPraticaId = intPratica.getIntPraticaId();
-				for(int i : STATUS_ARRAY){
+				for (int i : STATUS_ARRAY) {
-					List<ControlloPratica> controlloPraticas = 
+					List<ControlloPratica> controlloPraticas = ControlloPraticaLocalServiceUtil
-							ControlloPraticaLocalServiceUtil.findByIntPraticaId_Status(intPraticaId, i);
+							.findByIntPraticaId_Status(intPraticaId, i);
-					if(!controlloPraticas.isEmpty()){
+					if (!controlloPraticas.isEmpty()) {
 						return true;
 					}
 				}
-			} catch (SystemException e){
+			} catch (SystemException e) {
-				_log.error(e,e);
+				_log.error(e, e);
 				return false;
 			}
 		}
 		return false;
 	}
-	
+
 	public static List<WorkflowTask> getListaTask(IntPratica intPratica) {
-		if(Validator.isNull(intPratica)){
+		if (Validator.isNull(intPratica)) {
 			return null;
 		}
 		try {
 			ControlloPratica controlloPratica = null;
-			List<ControlloPratica> controlloPraticaList = 
+			List<ControlloPratica> controlloPraticaList = ControlloPraticaLocalServiceUtil
-					ControlloPraticaLocalServiceUtil.findByIntPraticaId_Status(intPratica.getIntPraticaId(), intPratica.getStatus());
+					.findByIntPraticaId_Status(intPratica.getIntPraticaId(),
-			if(controlloPraticaList.size() > 1){
+							intPratica.getStatus());
-				for(ControlloPratica cp : controlloPraticaList){
+			if (controlloPraticaList.size() > 1) {
-					if(Validator.isNull(controlloPratica) || cp.getCreateDate().after(controlloPratica.getCreateDate())) {
+				for (ControlloPratica cp : controlloPraticaList) {
+					if (Validator.isNull(controlloPratica)
+							|| cp.getCreateDate().after(
+									controlloPratica.getCreateDate())) {
 						controlloPratica = cp;
 					}
 				}
-			} else if(controlloPraticaList.size() == 1){
+			} else if (controlloPraticaList.size() == 1) {
 				controlloPratica = controlloPraticaList.get(0);
 			} else {
 				return null;
 			}
-			WorkflowInstanceLink workflowInstanceLink = WorkflowInstanceLinkLocalServiceUtil.fetchWorkflowInstanceLink(
+			WorkflowInstanceLink workflowInstanceLink = WorkflowInstanceLinkLocalServiceUtil
-					controlloPratica.getCompanyId(),controlloPratica.getGroupId(), ControlloPratica.class.getName(), 
+					.fetchWorkflowInstanceLink(controlloPratica.getCompanyId(),
-					controlloPratica.getPrimaryKey());
+							controlloPratica.getGroupId(),
+							ControlloPratica.class.getName(),
+							controlloPratica.getPrimaryKey());
 			List<WorkflowTask> listaTask = null;
 			if (workflowInstanceLink == null) {
 				return null;
 			} else {
-				return listaTask = WorkflowTaskManagerUtil.getWorkflowTasksByWorkflowInstance(controlloPratica.getCompanyId(), null,
+				return listaTask = WorkflowTaskManagerUtil
-						workflowInstanceLink.getWorkflowInstanceId(), false, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
+						.getWorkflowTasksByWorkflowInstance(
+								controlloPratica.getCompanyId(), null,
+								workflowInstanceLink.getWorkflowInstanceId(),
+								false, QueryUtil.ALL_POS, QueryUtil.ALL_POS,
+								null);
 			}
-		} catch (SystemException | PortalException e){
+		} catch (SystemException | PortalException e) {
-			_log.error(e,e);
+			_log.error(e, e);
 			return null;
 		}
 	}
 
-	public static boolean isPraticaAnnullata(IntPratica intPratica){
+	public static boolean isPraticaAnnullata(IntPratica intPratica) {
-		if(Validator.isNotNull(intPratica)){
+		if (Validator.isNotNull(intPratica)) {
 			return WorkflowConstants.STATUS_INACTIVE == intPratica.getStatus();
 		}
 		return false;
 	}
 
-	public static List<DocPratica> getDocPraticaOrfani(long intPraticaId){
+	public static List<DocPratica> getDocPraticaOrfani(long intPraticaId) {
 		List<DocPratica> docPraticaOrfaniList = new ArrayList<DocPratica>();
 		try {
-			List<DocPratica> docPraticaList = DocPraticaLocalServiceUtil.findByIntPratica(intPraticaId);
+			List<DocPratica> docPraticaList = DocPraticaLocalServiceUtil
-			for(DocPratica docPratica : docPraticaList){
+					.findByIntPratica(intPraticaId);
-				if(Validator.isNull(DettPraticaLocalServiceUtil.fetchDettPratica(docPratica.getClassPk()))
+			for (DocPratica docPratica : docPraticaList) {
-						&& DettPratica.class.getName().equals(docPratica.getClassName())){
+				if (Validator.isNull(DettPraticaLocalServiceUtil
+						.fetchDettPratica(docPratica.getClassPk()))
+						&& DettPratica.class.getName().equals(
+								docPratica.getClassName())) {
 					docPraticaOrfaniList.add(docPratica);
 				}
 			}
 		} catch (SystemException e) {
-			_log.error(e,e);
+			_log.error(e, e);
 		}
 		return docPraticaOrfaniList;
 	}
 
-	public static boolean hasDettPratica(long intPraticaId){
+	public static boolean hasDettPratica(long intPraticaId) {
 
 		return !_getDettPraticaList(intPraticaId).isEmpty();
 	}
 
-	public static boolean getNormLavoriInProprioFlag(long intPraticaId){
+	public static boolean getNormLavoriInProprioFlag(long intPraticaId) {
 		List<DettPratica> dettPraticaList = _getDettPraticaList(intPraticaId);
-		if(!dettPraticaList.isEmpty()){
+		if (!dettPraticaList.isEmpty()) {
 			return dettPraticaList.get(0).getNormLavoriInProprio();
 		}
 		return false;
 	}
 
-	public static boolean getCollaudoStaticoFlag(long intPraticaId){
+	public static boolean getCollaudoStaticoFlag(long intPraticaId) {
 		List<DettPratica> dettPraticaList = _getDettPraticaList(intPraticaId);
-		if(!dettPraticaList.isEmpty()){
+		if (!dettPraticaList.isEmpty()) {
 			return dettPraticaList.get(0).getCollaudoStatico();
 		}
 		return false;
 	}
 
-	public static String getLavoriInEconomiaBtnLabel(boolean normLavoriInProprioFlag){
+	public static String getLavoriInEconomiaBtnLabel(
-		return normLavoriInProprioFlag ? "Rimuovi flag normLavoriInProprio" : "Aggiungi flag normLavoriInProprio";
+			boolean normLavoriInProprioFlag) {
+		return normLavoriInProprioFlag ? "Rimuovi flag normLavoriInProprio"
+				: "Aggiungi flag normLavoriInProprio";
 	}
 
-	public static String getCollaudoStaticoBtnLabel(boolean collaudoStaticoFlag){
+	public static String getCollaudoStaticoBtnLabel(boolean collaudoStaticoFlag) {
-		return collaudoStaticoFlag ? "Rimuovi flag collaudoStatico" : "Aggiungi flag collaudoStatico";
+		return collaudoStaticoFlag ? "Rimuovi flag collaudoStatico"
+				: "Aggiungi flag collaudoStatico";
 	}
 
-	public static boolean isStatoPraticaIN(IntPratica intPratica){
+	public static boolean isStatoPraticaIN(IntPratica intPratica) {
-		if(Validator.isNotNull(intPratica)){
+		if (Validator.isNotNull(intPratica)) {
 			return "IN".equals(intPratica.getStatoPratica());
 		}
 		return false;
 	}
 
-	public static List<DettPratica> fetchDettPraticaListWithInizioLavori(IntPratica intPratica){
+	public static long getCurrentAssignee(IntPratica intPratica) {
-		if(Validator.isNotNull(intPratica)){
+		long currentAssignee = 0;
-			DynamicQuery dynamicQuery = DettPraticaLocalServiceUtil.dynamicQuery();
+		WorkflowTask lastTask = getLastTask(intPratica);
-			dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPratica.getIntPraticaId()));
+		if (Validator.isNotNull(lastTask)) {
-			dynamicQuery.add(RestrictionsFactoryUtil.isNotNull("dataInizioLavoriOpera"));
+			if (it.tref.liferay.portos.bo.util.WorkflowConstants.WORKFLOW_TASKNAME_ESITO
-			try{
+					.equalsIgnoreCase(lastTask.getName())) {
-				return (List<DettPratica>) DettPraticaLocalServiceUtil.dynamicQuery(dynamicQuery);
+				currentAssignee = lastTask.getAssigneeUserId();
-			} catch (SystemException e){
+			}
-				_log.error(e,e);
+		}
+		return currentAssignee;
+	}
+
+	public static WorkflowTask getLastTask(IntPratica intPratica) {
+		if (Validator.isNotNull(intPratica)) {
+			try {
+				List<ControlloPratica> controlloPraticas = ControlloPraticaLocalServiceUtil
+						.findByIntPratica(intPratica.getIntPraticaId());
+				if (!controlloPraticas.isEmpty()) {
+					for (ControlloPratica controlloPratica : controlloPraticas) {
+						if (controlloPratica.getStatus() == WorkflowConstants.STATUS_PENDING) {
+							return WorkflowUtil.getLastTask(
+									controlloPratica.getCompanyId(),
+									controlloPratica.getGroupId(), null,
+									controlloPratica);
+						}
+					}
+				}
+			} catch (SystemException | PortalException e) {
+				_log.error(e, e);
+			}
+		}
+		return null;
+	}
+
+	public static boolean evalCurrentAssignee(IntPratica intPratica,
+			User tecnico) {
+		WorkflowTask lastTask = getLastTask(intPratica);
+		if (Validator.isNotNull(lastTask)
+				&& lastTask.getName().equalsIgnoreCase("Esito")) {
+			return tecnico.getUserId() != lastTask.getAssigneeUserId()
+					|| lastTask.getAssigneeUserId() == 0;
+		}
+		return false;
+	}
+
+	public static boolean isWorkFlowCompleted(ControlloPratica controlloPratica) {
+		try {
+			WorkflowTask task = WorkflowUtil.getLastTask(
+					controlloPratica.getCompanyId(),
+					controlloPratica.getGroupId(), null, controlloPratica);
+			if(Validator.isNotNull(task)){
+				return task.isCompleted();
+			}
+		} catch (PortalException | SystemException e) {
+			_log.error(e, e);
+		}
+		return false;
+	}
+
+	public static List<DettPratica> fetchDettPraticaListWithInizioLavori(
+			IntPratica intPratica) {
+		if (Validator.isNotNull(intPratica)) {
+			DynamicQuery dynamicQuery = DettPraticaLocalServiceUtil
+					.dynamicQuery();
+			dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId",
+					intPratica.getIntPraticaId()));
+			dynamicQuery.add(RestrictionsFactoryUtil
+					.isNotNull("dataInizioLavoriOpera"));
+			try {
+				return (List<DettPratica>) DettPraticaLocalServiceUtil
+						.dynamicQuery(dynamicQuery);
+			} catch (SystemException e) {
+				_log.error(e, e);
 				return null;
 			}
 		}
 		return null;
 	}
 
-	public static Date fetchDataInizioLavoriOpera(IntPratica intPratica){
+	public static Date fetchDataInizioLavoriOpera(IntPratica intPratica) {
 		List<DettPratica> dettPraticaListWithInizioLavori = fetchDettPraticaListWithInizioLavori(intPratica);
-		if(!dettPraticaListWithInizioLavori.isEmpty()){
+		if (!dettPraticaListWithInizioLavori.isEmpty()) {
-			return dettPraticaListWithInizioLavori.get(0).getDataInizioLavoriOpera();
+			return dettPraticaListWithInizioLavori.get(0)
+					.getDataInizioLavoriOpera();
 		}
 		return null;
 	}
+	
+	public static boolean evalInt_Dett_UserID(IntPratica intPratica){
+		_log.info("lastDettPraticaUserID: "+getLastDettPraticaUserID(intPratica)+" || intPraticaUserID: "+intPratica.getUserId());
+		return getLastDettPraticaUserID(intPratica) == intPratica.getUserId();
+	}
+	
+	public static long getLastDettPraticaUserID(IntPratica intPratica){
+		try {
+			DettPratica dettPratica = DettPraticaLocalServiceUtil.getLastEditableByIntPratica(intPratica.getIntPraticaId());
+			if(Validator.isNotNull(dettPratica)){
+				return dettPratica.getUserId();
+			}
+		} catch (SystemException e){
+			_log.error(e,e);
+		}
+		return intPratica.getUserId();
+	}
+	
+	public static boolean hasNoFineLavori(IntPratica intPratica){
+		if(Validator.isNotNull(intPratica)){
+			try {
+				List<FineLavori> fineLavoriList = 
+						FineLavoriLocalServiceUtil.findByIntPraticaId(intPratica.getIntPraticaId(), QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
+				return fineLavoriList.isEmpty();
+			} catch (SystemException e) {
+				_log.error(e,e);
+			}
+		}
+		return false;
+	}
 
-	private static List<DettPratica> _getDettPraticaList(long intPraticaId){
+	private static List<DettPratica> _getDettPraticaList(long intPraticaId) {
 		List<DettPratica> dettPraticaList = new ArrayList<DettPratica>();
 
 		try {
-			dettPraticaList = DettPraticaLocalServiceUtil.findByIntPraticaId(intPraticaId);
+			dettPraticaList = DettPraticaLocalServiceUtil
+					.findByIntPraticaId(intPraticaId);
 		} catch (SystemException e) {
-			_log.error(e,e);
+			_log.error(e, e);
 		}
 
 		return dettPraticaList;
 	}
 
-	private static final Log _log = LogFactoryUtil.getLog(AdvancedOperationUtil.class);
+	private static final Log _log = LogFactoryUtil
+			.getLog(AdvancedOperationUtil.class);
 }

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/css/main.css

@@ -7,4 +7,8 @@
 
 #impersonaSoggettiBtn{
 	cursor: pointer;
+}
+
+.aop-ml-5{
+	margin-left: 5px!important;
 }

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/template/init.jsp

@@ -0,0 +1 @@
+<%@ include file="/html/init.jsp" %>

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/template/view.jsp

@@ -0,0 +1,41 @@
+<%@ include file="/html/template/init.jsp" %>
+
+<liferay-portlet:resourceURL 
+	var="templateTesterURL"
+	id="templateTester"
+>
+</liferay-portlet:resourceURL>
+
+<aui:container id="template-tester-portlet">
+	<aui:row style="margin-top: 10px">
+		<aui:col span="12">
+			<aui:row style="font-weight: bold; font-size: 18px; margin-bottom: 10px;">
+				<h2>Template Tester</h2>
+			</aui:row>
+			<aui:form action="<%= templateTesterURL %>" method="post" name="fmTemplateTester">
+				<aui:input 
+					name="template" 
+					type="file"
+					label="carica-template-input"
+					inlineLabel="left">
+				</aui:input>
+				<aui:input 
+					name="folderId" 
+					label="Folder ID:" 
+					inlineLabel="left">
+					<aui:validator name="number" />
+				</aui:input>
+				<aui:input 
+					name="avvisoId" 
+					label="Avviso ID:" 
+					inlineLabel="left">
+					<aui:validator name="number" />
+				</aui:input>
+				<aui:button 
+					name="generateTemplateBtn" 
+					type="submit" 
+					value="Genera Template" />
+			</aui:form>
+		</aui:col>
+	</aui:row>
+</aui:container>

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/view.jsp

@@ -1,8 +1,10 @@
+<%@page import="com.liferay.portal.model.Layout"%>
+<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%>
+<%@page import="com.liferay.portal.kernel.util.HtmlUtil"%>
 <%@page import="com.liferay.portal.service.UserLocalServiceUtil"%>
 <%@page import="com.liferay.portal.model.User"%>
 <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
 <%@page import="javax.portlet.PortletMode"%>
-<%@page import="com.liferay.portal.util.PortletKeys"%>
 <%@page import="javax.portlet.PortletRequest"%>
 <%@page import="javax.portlet.PortletURL"%>
 <%@page import="com.liferay.portal.model.Group"%>
@@ -37,6 +39,7 @@
 <%@page import="com.liferay.portal.kernel.util.ParamUtil"%>
 <%@ include file="/html/init.jsp"%>
 
+
 <%
 	long intPraticaId = ParamUtil.getLong(request, "intPraticaId");
 	String numeroProgetto = ParamUtil.getString(request, "numeroProgetto", StringPool.BLANK);
@@ -83,14 +86,35 @@
 			</aui:form>
 		</aui:col>
 	</aui:row>
-	
+	<%
+		long ricercaPagePlid = PortalUtil.getPlidFromFriendlyURL(20155, "/group/portos-backoffice/ricerca");
+	%>
+	<liferay-portlet:renderURL 
+		plid="<%= ricercaPagePlid %>"
+		portletName='<%= PortletKeys.FASCICOLO %>'
+		portletMode="<%= PortletMode.VIEW.toString() %>"
+		windowState="<%= LiferayWindowState.NORMAL.toString() %>" 
+		var="viewPraticaURL"
+	>
+		<liferay-portlet:param name="mvcPath" value="/html/fascicolo/view_fascicolo.jsp"/>
+		<liferay-portlet:param name="intPraticaId" value='<%= String.valueOf(intPraticaId) %>' />
+	</liferay-portlet:renderURL>
 	<% if(Validator.isNotNull(intPratica)){ %>
 		<aui:row style="margin-top: 10px" id="praticaAdminDiv">
 			<aui:row id="praticaRecapDiv">
 				<aui:row>
 					<aui:col span="3">
 						<p style="font-size: 30px; margin: 20px 0;">
-							<b>Pratica:</b>  <%= intPraticaId %> 
+							<b>Pratica:</b> 
+							<a href="<%= viewPraticaURL %>" target="_blank">
+								<%= intPraticaId %> 
+								<liferay-ui:icon 
+									image="action_right"
+									target="_blank"
+									message="Apri Pratica in Back Office"
+									url="<%= viewPraticaURL %>">
+								</liferay-ui:icon>
+							</a>
 						</p>
 					</aui:col>
 				</aui:row>
@@ -127,7 +151,11 @@
 							</aui:row>
 							<aui:row>
 								<aui:col span="2">
-									<p><b>Status:</b>  <%= intPratica.getStatus() %></p>
+									<p>
+										<b>Status:</b>  
+										<aui:workflow-status status="<%= intPratica.getStatus() %>"></aui:workflow-status>
+										(<%= intPratica.getStatus() %>)
+									</p>
 								</aui:col>
 						 	</aui:row>
 						 	<% 
@@ -142,28 +170,51 @@
 										<liferay-portlet:param name="mvcPath" value="/html/view.jsp"/>
 									</liferay-portlet:actionURL>
 									<%
-										String functionDataInizio = "javascript:"+renderResponse.getNamespace()+"openConfirmationDialog('"+renderResponse.getNamespace()+"cambiaDataInizioLavori','Sei sicuro di voler modificare la DATA di INIZIO LAVORI?')";
+										String functionChangeDataInizio = "javascript:"+renderResponse.getNamespace()+"openConfirmationDialog('"+renderResponse.getNamespace()+"cambiaDataInizioLavori','Sei sicuro di voler MODIFICARE la DATA di INIZIO LAVORI?')";
 									%>
-									<aui:form action="<%= cambiaDataInizioLavoriURL %>" method="post" name="cambiaDataInizioLavori">
+									<div style="display:flex;">
-										<div style="display:flex;">
+										<aui:form action="<%= cambiaDataInizioLavoriURL %>" method="post" name="cambiaDataInizioLavori">
+											<div style="display:flex;">
 											<p><b>Data inizio Lavori Opera:</b></p>
-											<aui:input 
+												<aui:input 
-												name="dataInizioLavoriOperaInput" 
+													name="dataInizioLavoriOperaInput" 
-												label=""
+													label=""
-												inlineLabel="left"
+													inlineLabel="left"
-												type="date"
+													type="date"
-												value='<%= DateFormatFactoryUtil.getSimpleDateFormat("yyyy-MM-dd").format(dataInizioLavoriOpera) %>'>
+													value='<%= DateFormatFactoryUtil.getSimpleDateFormat("yyyy-MM-dd").format(dataInizioLavoriOpera) %>'>
-											</aui:input>
+												</aui:input>
-											<div>
+												<div>
-												<aui:button 
+													<aui:button 
-													name="cambiaDataInizioLavoriBtn"
+														name="cambiaDataInizioLavoriBtn"
-													cssClass="btn-primary" 
+														cssClass="btn-primary aop-ml-5" 
-													type="button" 
+														type="button" 
-													value="Cambia" 
+														value="Cambia" 
-													onClick='<%= functionDataInizio %>'/>
+														onClick='<%= functionChangeDataInizio %>'/>
+												</div>
 											</div>
-										</div>
+										</aui:form>
-									</aui:form>
+										<c:if test="<%= AdvancedOperationUtil.hasNoFineLavori(intPratica) %>">
+											<liferay-portlet:actionURL 
+												name="resetDataInizioLavori" 
+												var="resetDataInizioLavoriURL" >
+												<liferay-portlet:param name="intPraticaId" value="<%= String.valueOf(intPraticaId) %>"/>
+												<liferay-portlet:param name="mvcPath" value="/html/view.jsp"/>
+											</liferay-portlet:actionURL>
+											<%
+												String functionResetDataInizio = "javascript:"+renderResponse.getNamespace()+"openConfirmationDialog('"+renderResponse.getNamespace()+"resetDataInizioLavori','Sei sicuro di voler RESETTARE la DATA di INIZIO LAVORI?')";
+											%>
+											<aui:form action="<%= resetDataInizioLavoriURL %>" method="post" name="resetDataInizioLavori"  cssClass="aop-ml-5">
+												<div>
+													<aui:button 
+														name="resetDataInizioLavoriBtn"
+														cssClass="btn-primary" 
+														type="button" 
+														value="Resetta" 
+														onClick='<%= functionResetDataInizio %>'/>
+												</div>
+											</aui:form>
+										</c:if>
+									</div>
 							 	</aui:row>
 						 	<% } %>
 						 	<aui:row>
@@ -218,6 +269,30 @@
 									</div>
 									<% } %>
 									
+									<% if(AdvancedOperationUtil.hasDettPratica(intPraticaId) 
+											&& !AdvancedOperationUtil.evalInt_Dett_UserID(intPratica)){ 
+									%>
+									<div style="margin-right: 50px;">
+										<liferay-portlet:actionURL 
+											name="fixUserID" 
+											var="fixUserIDURL" >
+											<liferay-portlet:param name="intPraticaId" value="<%= String.valueOf(intPraticaId) %>"/>
+											<liferay-portlet:param name="mvcPath" value="/html/view.jsp"/>
+										</liferay-portlet:actionURL>
+										<%
+											String functionFixUserID = "javascript:"+renderResponse.getNamespace()+"openConfirmationDialog('"+renderResponse.getNamespace()+"fixUserID','Sei sicuro di voler cambiare lo User dell'ultimo dettPratica?')";
+										%>
+										<aui:form action="<%= fixUserIDURL %>" method="post" name="fixCollaudoStatico">
+											<aui:button 
+												name="fixUserIDBtn"
+												cssClass="btn-primary" 
+												type="button" 
+												value="FIXA User ID" 
+												onClick='<%= functionFixUserID %>'/>
+										</aui:form>
+									</div>
+									<% } %>
+									
 									<% if(AdvancedOperationUtil.isStatoPraticaIN(intPratica)){ %>
 									<div style="margin-right: 50px;">
 										<liferay-portlet:actionURL 
@@ -354,6 +429,7 @@
 									<liferay-ui:icon 
 										image="impersonate_user"
 										target="_blank"
+										message="Impersona Titolare Digitale della pratica"
 										url="<%= impersonateUserURL %>">
 									</liferay-ui:icon>
 								</div>
@@ -381,10 +457,6 @@
 												total="<%= SoggettoLocalServiceUtil.countByIntPratica(intPraticaId) %>"
 											/>
 											<liferay-ui:search-container-row className="it.tref.liferay.portos.bo.model.Soggetto" modelVar="soggetto">
-												<liferay-security:doAsURL 
-													doAsUserId="<%= soggetto.getUserId() %>"
-													var="impersonateSoggettoURL">
-												</liferay-security:doAsURL>
 												<liferay-ui:search-container-column-text name="RUOLO">
 													<%= soggetto.getFullTipologiaSoggetto() %>
 												</liferay-ui:search-container-column-text>
@@ -399,14 +471,24 @@
 													}
 													%>
 												</liferay-ui:search-container-column-text>
+												<%
+													User soggettoUser = 
+														UserLocalServiceUtil.fetchUserByScreenName(company.getCompanyId(), soggetto.getCodiceFiscale());
+												%>
 												<liferay-ui:search-container-column-text name="IMPERSONA" cssClass="text-center text-nowrap">
-													<liferay-ui:icon 
+													<c:if test="<%= Validator.isNotNull(soggettoUser) %>">
-														image="impersonate_user"
+														<liferay-security:doAsURL 
-														message="Impersona Soggetto"
+															doAsUserId="<%= soggettoUser.getUserId() %>"
-														target="_blank"
+															var="impersonateSoggettoURL">
-														url="<%= impersonateSoggettoURL %>" 
+														</liferay-security:doAsURL>
-													>
+														<liferay-ui:icon 
-													</liferay-ui:icon>
+															image="impersonate_user"
+															message="Impersona Soggetto"
+															target="_blank"
+															url="<%= impersonateSoggettoURL %>" 
+														>
+														</liferay-ui:icon>
+													</c:if>
 												</liferay-ui:search-container-column-text>
 											</liferay-ui:search-container-row>
 											<liferay-ui:search-iterator paginate="false" />
@@ -420,12 +502,13 @@
 						<%
 							List<WorkflowTask> listaTask = AdvancedOperationUtil.getListaTask(intPratica);
 							if(Validator.isNotNull(listaTask) && !listaTask.isEmpty()){
+								long currentAssigneeId = AdvancedOperationUtil.getCurrentAssignee(intPratica);
 						%>
-					 	<liferay-ui:panel title="GESTIONE ATTIVITÀ" extended="true" collapsible="false">
+					 	<liferay-ui:panel title="GESTIONE ATTIVITÀ" extended="true" collapsible="false">
 							<aui:row>
 								<div style="display:flex;">
 									<div style=" margin-right: 15px;">
-										<p><b>Gestisci ultima attività:</b></p>
+										<p><b>Gestisci ultima attività:</b></p>
 									</div>
 									<%
 										Group controlPanelGroup = GroupLocalServiceUtil.getGroup(company.getCompanyId(), GroupConstants.CONTROL_PANEL);
@@ -441,17 +524,35 @@
 										<liferay-ui:icon 
 											useDialog="true" 
 											image="action_right"
-											message="Gestisci Attività"
+											message="Gestisci Attività"
 											url='<%= workflowTaskURL.toString() + "&controlPanelCategory=my" %>' 
 										/>
 									</div>
 								</div>
 							</aui:row>
+							<c:if test="<%= currentAssigneeId != 0L %>">
+								<aui:row>
+									<div style="display:flex;">
+										<liferay-security:doAsURL 
+											doAsUserId="<%= currentAssigneeId %>"
+											var="impersonateAssigneeURL">
+										</liferay-security:doAsURL>
+										<div style=" margin-right: 15px;">
+											<p><b>Impersona Assegnatario Workflow:</b></p>
+										</div>
+										<liferay-ui:icon 
+											image="team_icon"
+											target="_blank"	
+											message="Impersona Assegnatario"
+											url="<%= impersonateAssigneeURL %>">
+										</liferay-ui:icon>
+									</div>
+								</aui:row>
+							</c:if>
 								<%
 									if(intPratica.getStatusByUserId() != 0L ){
 										User tecnico = UserLocalServiceUtil.fetchUser(intPratica.getStatusByUserId());
 										if (Validator.isNotNull(tecnico)) {
-										
 								%>
 									<aui:row>
 										<div style="display:flex;">
@@ -469,6 +570,41 @@
 												url="<%= impersonateIstruttoreURL %>">
 											</liferay-ui:icon>
 										</div>
+										<c:if test="<%= AdvancedOperationUtil.evalCurrentAssignee(intPratica, tecnico) %>">
+											<% 
+												String currentAssigneeName = StringPool.BLANK;
+												if(currentAssigneeId != 0L){
+													currentAssigneeName = UserLocalServiceUtil.getUser(currentAssigneeId).getFullName();
+												}
+												String cambiaIstruttoreMsg = currentAssigneeId != 0 ? "Pratica attualmente assegnata a " + currentAssigneeName : "Pratica attualmente senza assegnatario";
+												String cambiaIstruttoreBtnLabelPrefix = currentAssigneeId != 0 ? "Riassegna" : "Assegna";
+											%>
+											<div>
+												<liferay-portlet:actionURL 
+													name="cambiaIstruttore" 
+													var="cambiaIstruttoreURL" >
+													<liferay-portlet:param name="intPraticaId" value="<%= String.valueOf(intPraticaId) %>"/>
+													<liferay-portlet:param name="istruttoreId" value="<%= String.valueOf(tecnico.getUserId()) %>"/>
+													<liferay-portlet:param name="mvcPath" value="/html/view.jsp"/>
+												</liferay-portlet:actionURL>
+												<%
+													String functionCambiaIstruttore = "javascript:"+renderResponse.getNamespace()+"openConfirmationDialog('"+renderResponse.getNamespace()+"cambiaIstruttore','Sei sicuro di voler riassegnare la pratica all istruttore?')";
+												%>
+												<aui:form action="<%= cambiaIstruttoreURL %>" method="post" name="cambiaIstruttore">
+													<aui:button 
+														type="button" 
+														cssClass="btn-primary"
+														name="cambiaIstruttoreBtn" 
+														onClick="<%= functionCambiaIstruttore %>"
+														value='<%= cambiaIstruttoreBtnLabelPrefix + " Pratica a " + tecnico.getFullName() %>'
+														>
+													</aui:button>
+													<span>
+														(<%= cambiaIstruttoreMsg %>)
+													</span>
+												</aui:form>
+											</div>
+										</c:if>
 									</aui:row>
 								<%	
 										}
@@ -557,6 +693,49 @@
 						}
 					%>
 				</aui:row>
+				<c:if test="<%= !ControlloPraticaLocalServiceUtil.findByIntPratica(intPraticaId).isEmpty() &&
+						ControlloPraticaLocalServiceUtil.findByIntPratica(intPraticaId).size() > 1 %>">
+					<aui:row id="controlloPraticaDiv">
+						<div class="module-group">
+							<liferay-ui:panel title="CONTROLLO PRATICA" collapsible="false" extended="true"> 
+								<aui:row>
+									<div id="sc-controllo-pratica">
+										<liferay-ui:search-container emptyResultsMessage="no-entries">
+											<liferay-ui:search-container-results
+												results="<%= ControlloPraticaLocalServiceUtil.findByIntPratica(intPraticaId) %>"
+												total="<%= ControlloPraticaLocalServiceUtil.findByIntPratica(intPraticaId).size() %>"
+											/>
+											<liferay-ui:search-container-row 
+												className="it.tref.liferay.portos.bo.model.ControlloPratica" 
+												modelVar="controlloPratica">
+												<liferay-ui:search-container-column-text name="ID">
+													<%= controlloPratica.getControlloPraticaId() %>
+												</liferay-ui:search-container-column-text>
+												<liferay-ui:search-container-column-text name="STATUS">
+													<aui:workflow-status 
+														status="<%= controlloPratica.getStatus() %>">
+													</aui:workflow-status>
+													<strong>(<%= controlloPratica.getStatus() %>)</strong>
+												</liferay-ui:search-container-column-text>
+												<liferay-ui:search-container-column-text name="STATO WORKFLOW">
+													<%
+														String statoWorkflowMsg = StringPool.BLANK;
+														statoWorkflowMsg = AdvancedOperationUtil.isWorkFlowCompleted(controlloPratica) ?
+																"COMPLETATO" : "ATTIVO";
+													%>
+													<strong>
+														<liferay-ui:message key="<%= statoWorkflowMsg %>"></liferay-ui:message>
+													</strong>
+												</liferay-ui:search-container-column-text>
+											</liferay-ui:search-container-row>
+											<liferay-ui:search-iterator paginate="false" />
+										</liferay-ui:search-container>
+									</div>
+								</aui:row>
+							</liferay-ui:panel>
+						</div>
+					</aui:row>
+				</c:if>
 			</aui:row>
 		</aui:row>
 	<% } %>
@@ -565,11 +744,9 @@
 <div id ='<%= renderResponse.getNamespace()+"confirmationModal" %>'>
 </div>
 <div id ='<%= renderResponse.getNamespace()+"confirmationModalDiv" %>' class="hide" style="display:block;">
-
 </div>
 
 
-
 <aui:script use="event-valuechange,aui-modal,aui-io-request">
 
 <% if(Validator.isNotNull(intPratica)){ %>
@@ -649,7 +826,5 @@
 		   modal.show();
 		}
 	);
-
-   
 </aui:script>
 

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/ivy.xml

@@ -7,7 +7,7 @@
 	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
 >
 	<info module="portos-advanced-operation-portlet" organisation="com.liferay">
-		<extends extendType="configurations,description,info" location="${sdk.dir}/ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+		<extends extendType="configurations,description,info" location="../../ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
 	</info>
 
 	<dependencies defaultconf="default">

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/ivy.xml.MD5

@@ -0,0 +1 @@
+da182e61a8d786e000ef56dfa8d9ece4

liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.classpath

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="docroot/WEB-INF/src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_80">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>

liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,7 @@
+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

liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
   <runtime name="Liferay v6.2 CE (Tomcat 7)"/>
-  <fixed facet="wst.jsdt.web"/>
   <fixed facet="jst.web"/>
+  <fixed facet="wst.jsdt.web"/>
   <fixed facet="java"/>
   <installed facet="java" version="1.7"/>
   <installed facet="jst.web" version="3.0"/>

liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/liferay-hook.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hook PUBLIC "-//Liferay//DTD Hook 6.2.0//EN" "http://www.liferay.com/dtd/liferay-hook_6_2_0.dtd">
 
 <hook>

liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/service.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE service-builder PUBLIC "-//Liferay//DTD Service Builder 6.2.0//EN" "http://www.liferay.com/dtd/liferay-service-builder_6_2_0.dtd">
 <service-builder package-path="it.tref.liferay.portos.audit">
 	<author>Marco</author>

liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/audit/service/persistence/AuditEventPersistenceImpl.java

@@ -43,6 +43,7 @@ import it.tref.liferay.portos.audit.NoSuchAuditEventException;
 import it.tref.liferay.portos.audit.model.AuditEvent;
 import it.tref.liferay.portos.audit.model.impl.AuditEventImpl;
 import it.tref.liferay.portos.audit.model.impl.AuditEventModelImpl;
+import it.tref.liferay.portos.audit.service.persistence.AuditEventPersistence;
 
 import java.io.Serializable;
 

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

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_AUDIT
-    build.number=17
+    build.number=16
-    build.date=1672849068307
+    build.date=1569596657517
     build.auto.upgrade=true
 
 ##

liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/common/details_column.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="com.liferay.portal.kernel.util.TextFormatter"%>
 <%@page import="com.liferay.portal.kernel.json.JSONArray"%>
 <%@page import="it.tref.liferay.portos.audit.model.AuditEvent"%>

liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/common/relations_column.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="com.liferay.portal.kernel.util.TextFormatter"%>
 <%@page import="com.liferay.portal.kernel.json.JSONArray"%>
 <%@page import="it.tref.liferay.portos.audit.model.AuditEvent"%>

liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/detail.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@page import="it.tref.liferay.portos.audit.shared.permission.HistoryPermission"%>
 <%@page import="com.liferay.portal.security.permission.ActionKeys"%>

liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/view.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@page import="it.tref.liferay.portos.audit.shared.permission.HistoryPermission"%>
 <%@page import="com.liferay.portal.security.permission.ActionKeys"%>

liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/view_list.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@page import="it.tref.liferay.portos.audit.shared.permission.HistoryPermission"%>
 <%@page import="com.liferay.portal.security.permission.ActionKeys"%>

liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/init.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
 
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>

liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/storicizzazione/edit.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@ include file="/html/init.jsp" %>