viarch

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.project

@@ -33,4 +33,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1737018941321</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/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java

@@ -547,6 +547,8 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi
 			esito.put(etichettaEsito("Concludi VIArch", StatoPraticaConstants.NON_CONFORME));
 			esito.put(etichettaEsito(StatoPraticaConstants.INTEGRAZIONE));
 			esito.put(etichettaEsito(StatoPraticaConstants.NO_PARERE));
+			esito.put(etichettaEsito("Preavviso di Parere Contrario", StatoPraticaConstants.PREAVVISO_PARERE_CONTRARIO));
+			esito.put(etichettaEsito("Autorizzazione Negata", StatoPraticaConstants.NEGATA));
 			JSONObject json = JSONFactoryUtil.createJSONObject();
 			json.put("esito", esito);
 			jsonViarch = json.toString();

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

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_bo
-    build.number=3679
+    build.number=3681
-    build.date=1709032683993
+    build.date=1736853764242
     build.auto.upgrade=true
 
 ##

liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath

@@ -3,5 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.liferay.ide.eclipse.server.tomcat.runtimeClasspathProvider/Liferay v6.2 CE (Tomcat 7)"/>
+	<classpathentry kind="lib" path="C:/liferay-project/Paesaggistica/git/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>

liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/StatoPraticaConstants.java

@@ -24,6 +24,8 @@ public class StatoPraticaConstants {
 	public static final String SOTTOPOSTA_A_PARERE = "SP";
 	public static final String VARIATA = "VA";
 	public static final String VIDIMATA = "VI";
+	public static final String NEGATA = "NG";
+	public static final String PREAVVISO_PARERE_CONTRARIO = "PP";	
 
 	/* Stati "virtuali" */
 	public static final String IN_COMPILAZIONE = "IC";

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.classpath

@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="docroot/WEB-INF/src"/>
-	<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/jre7">
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="con" path="com.liferay.ide.eclipse.server.plugin.container/web">
 		<attributes>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
+			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.liferay.ide.eclipse.server.tomcat.runtimeClasspathProvider/Liferay v6.2 CE (Tomcat 7)">
 		<attributes>
 			<attribute name="owner.project.facets" value="jst.web"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre">
+	<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/web">
 		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="docroot/WEB-INF/classes"/>

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.project

@@ -35,7 +35,7 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1676466957723</id>
+			<id>1737018941343</id>
 			<name></name>
 			<type>30</type>
 			<matcher>

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.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"/>
-  <installed facet="jst.web" version="2.5"/>
+  <fixed facet="java"/>
+  <installed facet="java" version="1.7"/>
+  <installed facet="jst.web" version="3.0"/>
   <installed facet="liferay.web" version="6.0"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
-  <installed facet="java" version="1.7"/>
 </faceted-project>

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java

@@ -21,6 +21,7 @@ import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -97,7 +98,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 	private static final List<String> VALORI_AMMESSI = Arrays.asList(StatoPraticaConstants.ANNULLATA,
 			StatoPraticaConstants.CONFORME, StatoPraticaConstants.INTEGRAZIONE, StatoPraticaConstants.NON_CONFORME,
 			StatoPraticaConstants.NO_PARERE, StatoPraticaConstants.PREAVVISO_CONTRARIO,
-			StatoPraticaConstants.PERIZIA_SANZIONE, StatoPraticaConstants.DECRETO_SANZIONE);
+			StatoPraticaConstants.PERIZIA_SANZIONE, StatoPraticaConstants.DECRETO_SANZIONE,
+			StatoPraticaConstants.PREAVVISO_PARERE_CONTRARIO, StatoPraticaConstants.NEGATA);
 
 	private static final List<Integer> LOG_TYPES = Arrays.asList(WorkflowLog.TASK_ASSIGN, WorkflowLog.TASK_COMPLETION,
 			WorkflowLog.TASK_UPDATE, WorkflowLog.TRANSITION);
@@ -176,6 +178,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 							|| esito.equalsIgnoreCase(StatoPraticaConstants.PREAVVISO_CONTRARIO)
 							|| esito.equalsIgnoreCase(StatoPraticaConstants.PERIZIA_SANZIONE) || esito
 								.equalsIgnoreCase(StatoPraticaConstants.DECRETO_SANZIONE)) && testoDocumento.isEmpty())) {
+//TODO controllare che 2 siano ammessi				
 				_log.error("controllo validazione completamento task registra-esito = " + workflowTaskId
 						+ " non riuscito - esito non valorizzato o esito " + StatoPraticaConstants.INTEGRAZIONE
 						+ StringPool.SLASH + StatoPraticaConstants.PREAVVISO_CONTRARIO + StringPool.SLASH

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/RenderFormTaskPortletAction.java

@@ -104,13 +104,40 @@ public class RenderFormTaskPortletAction extends BaseStrutsPortletAction {
 			parameters.remove("esito");
 			parameters.remove("testo_del_documento");
 		}
+		
+		printValues(fieldNameOptions);
+		_log.info("Questo e parameters");
+		for (String key : parameters.keySet()){
+			_log.info("Key: "+ key+ "  Value: "+ parameters.get(key));
+		}
+		_log.info(" ");
+		_log.info("Questo e workflowContext");
+		for (String key : workflowContext.keySet()){
+			_log.info("Key: "+ key+ "  Value: "+ workflowContext.get(key));
+		}
+		
+		
+		
 		return "/portlet/workflow_tasks/render_form_task.jsp";
 	}
+	
+	private void printValues (Map<String, List<Map<String, Serializable>>> fieldNameOptions){
+		_log.info("Questo e fieldNameOptions");
+        for (Map.Entry<String, List<Map<String, Serializable>>> entry : fieldNameOptions.entrySet()) {
+            for (Map<String, Serializable> option : entry.getValue()) {
+            	for (String key : option.keySet()){
+            		_log.info("Key: "+ key+ "  Value: "+ option.get(key));            		
+            	}
+            }
+            _log.info(" ");
+        }
+
+    }
 
 	@Override
 	public void serveResource(PortletConfig portletConfig, ResourceRequest resourceRequest,
 			ResourceResponse resourceResponse) throws Exception {
-
+		 _log.info("serveResource");
 		ServiceContext serviceContext = ServiceContextFactory.getInstance(resourceRequest);
 		long companyId = PortalUtil.getCompanyId(resourceRequest);
 		long workflowTaskId = ParamUtil.getLong(resourceRequest, "workflowTaskId");

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/util/WorkflowUtil.java

@@ -1,36 +1,13 @@
 package it.tref.liferay.portos.kaleo.util;
 
-import it.tref.liferay.portos.bo.model.ControlloPratica;
-import it.tref.liferay.portos.bo.model.IntPratica;
-import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil;
-import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil;
-import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil;
-import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
-import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants;
-import it.tref.liferay.portos.bo.util.PraticaUtil;
-import it.tref.liferay.portos.kaleo.model.FormLog;
-import it.tref.liferay.portos.kaleo.service.FormLogLocalServiceUtil;
-import it.tref.liferay.portos.kaleo.shared.util.WorkflowConstants;
-
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.portlet.PortletRequest;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang.StringUtils;
-
 import com.liferay.portal.NoSuchWorkflowInstanceLinkException;
 import com.liferay.portal.kernel.dao.orm.QueryUtil;
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
 import com.liferay.portal.kernel.json.JSONDeserializer;
 import com.liferay.portal.kernel.json.JSONFactoryUtil;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.repository.model.Folder;
 import com.liferay.portal.kernel.util.Base64;
 import com.liferay.portal.kernel.util.ContentTypes;
@@ -55,6 +32,32 @@ import com.liferay.portal.workflow.kaleo.service.KaleoTaskInstanceTokenLocalServ
 import com.liferay.portlet.documentlibrary.NoSuchFolderException;
 import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil;
 
+import it.tref.liferay.portos.bo.model.ControlloPratica;
+import it.tref.liferay.portos.bo.model.IntPratica;
+import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil;
+import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil;
+import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil;
+import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
+import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants;
+import it.tref.liferay.portos.bo.util.PraticaUtil;
+import it.tref.liferay.portos.kaleo.hook.struts.RenderFormTaskPortletAction;
+import it.tref.liferay.portos.kaleo.model.FormLog;
+import it.tref.liferay.portos.kaleo.service.FormLogLocalServiceUtil;
+import it.tref.liferay.portos.kaleo.shared.util.WorkflowConstants;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.portlet.PortletRequest;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang.StringUtils;
+
 public class WorkflowUtil {
 
 	public static final String PARAMETER_BASE64 = WorkflowConstants.PREFIX_NAME_ELEMENT_FORM + "base64"
@@ -104,6 +107,8 @@ public class WorkflowUtil {
 		return instance.getWorkflowContext();
 	}
 
+	private static final Log _log = LogFactoryUtil.getLog(WorkflowUtil.class);
+	
 	public static Map<String, Serializable> executeOnOpenForm(long companyId, long workflowTaskId, long assigneeUserId,
 			String transitionName) throws PortalException, SystemException {