Up Portos bo portlet diff

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-display.xml

@@ -2,7 +2,6 @@
 <!DOCTYPE display PUBLIC "-//Liferay//DTD Display 6.2.0//EN" "http://www.liferay.com/dtd/liferay-display_6_2_0.dtd">
 
 <display>
-	
 	<category name="category.portos">
 		<category name="category.bo">
 			<portlet id="1"></portlet>
@@ -15,7 +14,7 @@
 			<portlet id="22"></portlet>
 			<portlet id="13"></portlet>
 		</category>
-	</category>	
+	</category>
 	<category name="category.hidden">
 		<portlet id="9"></portlet>
 		<portlet id="10"></portlet>

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!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-bo-portlet/docroot/WEB-INF/liferay-portlet.xml

@@ -1,12 +1,13 @@
 <?xml version="1.0"?>
 <!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>
 		<indexer-class>it.tref.liferay.portos.bo.indexer.IntPraticaIndexer</indexer-class>
 		<indexer-class>it.tref.liferay.portos.bo.indexer.ControlloPraticaIndexer</indexer-class>
- 		<scheduler-entry>
+		<scheduler-entry>
 			<scheduler-description>Estrazione Firme</scheduler-description>
 			<scheduler-event-listener-class>it.tref.liferay.portos.bo.scheduler.SchedulerEstrazioneFirme</scheduler-event-listener-class>
 			<trigger>
@@ -36,7 +37,7 @@
 				</simple>
 			</trigger>
 		</scheduler-entry>
- 		<scheduler-entry>
+		<scheduler-entry>
 			<scheduler-description>Sorteggio Pratiche</scheduler-description>
 			<scheduler-event-listener-class>it.mwg.sismica.bo.scheduler.SchedulerSorteggio</scheduler-event-listener-class>
 			<trigger>
@@ -75,7 +76,7 @@
 				</simple>
 			</trigger>
 		</scheduler-entry>
- 		<asset-renderer-factory>it.tref.liferay.portos.bo.asset.ControlloPraticaAssetRendererFactory</asset-renderer-factory>
+		<asset-renderer-factory>it.tref.liferay.portos.bo.asset.ControlloPraticaAssetRendererFactory</asset-renderer-factory>
 		<workflow-handler>it.tref.liferay.portos.bo.workflow.ControlloPraticaWorkflowHandler</workflow-handler>
 		<header-portlet-css>/css/main.css?v=4</header-portlet-css>
 		<footer-portlet-javascript>/js/main.js?v=4</footer-portlet-javascript>
@@ -84,9 +85,7 @@
 	<portlet>
 		<portlet-name>2</portlet-name>
 		<icon>/icon.png</icon>
-		<control-panel-entry-category>
+		<control-panel-entry-category>configuration</control-panel-entry-category>
-			configuration
-		</control-panel-entry-category>
 		<control-panel-entry-weight>1.5</control-panel-entry-weight>
 		<header-portlet-css>/css/main.css?v=4</header-portlet-css>
 		<footer-portlet-javascript>/js/main.js?v=4</footer-portlet-javascript>

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

@@ -1,13 +1,10 @@
 <?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>Fascicolo</display-name>
-		<portlet-class>
+		<portlet-class>it.tref.liferay.portos.bo.portlet.FascicoloPortlet</portlet-class>
-			it.tref.liferay.portos.bo.portlet.FascicoloPortlet
-		</portlet-class>
 		<init-param>
 			<name>view-template</name>
 			<value>/html/fascicolo/view.jsp</value>
@@ -47,14 +44,14 @@
 		<expiration-cache>0</expiration-cache>
 		<supports>
 			<mime-type>text/html</mime-type>
-			<portlet-mode>view</portlet-mode>			
+			<portlet-mode>view</portlet-mode>
 		</supports>
-        <resource-bundle>content.Language</resource-bundle>		
+		<resource-bundle>content.Language</resource-bundle>
 		<portlet-info>
 			<title>Tabelle di Sistema</title>
 			<short-title>Tabelle di Sistema</short-title>
 			<keywords></keywords>
-		</portlet-info>		
+		</portlet-info>
 		<security-role-ref>
 			<role-name>administrator</role-name>
 		</security-role-ref>
@@ -79,14 +76,14 @@
 		<expiration-cache>0</expiration-cache>
 		<supports>
 			<mime-type>text/html</mime-type>
-			<portlet-mode>view</portlet-mode>			
+			<portlet-mode>view</portlet-mode>
 		</supports>
-        <resource-bundle>content.Language</resource-bundle>		
+		<resource-bundle>content.Language</resource-bundle>
 		<portlet-info>
 			<title>Sorteggio</title>
 			<short-title>Sorteggio</short-title>
 			<keywords></keywords>
-		</portlet-info>		
+		</portlet-info>
 		<security-role-ref>
 			<role-name>administrator</role-name>
 		</security-role-ref>
@@ -111,14 +108,14 @@
 		<expiration-cache>0</expiration-cache>
 		<supports>
 			<mime-type>text/html</mime-type>
-			<portlet-mode>view</portlet-mode>			
+			<portlet-mode>view</portlet-mode>
 		</supports>
-        <resource-bundle>content.Language</resource-bundle>		
+		<resource-bundle>content.Language</resource-bundle>
 		<portlet-info>
 			<title>Gestione Firme</title>
 			<short-title>Gestione Firme</short-title>
 			<keywords></keywords>
-		</portlet-info>		
+		</portlet-info>
 		<security-role-ref>
 			<role-name>administrator</role-name>
 		</security-role-ref>
@@ -135,9 +132,7 @@
 	<portlet>
 		<portlet-name>5</portlet-name>
 		<display-name>Fascicolo</display-name>
-		<portlet-class>
+		<portlet-class>it.tref.liferay.portos.bo.portlet.DocAggiuntivaPortlet</portlet-class>
-			it.tref.liferay.portos.bo.portlet.DocAggiuntivaPortlet
-		</portlet-class>
 		<init-param>
 			<name>view-template</name>
 			<value>/html/doc_aggiuntiva/view.jsp</value>
@@ -169,9 +164,7 @@
 	<portlet>
 		<portlet-name>6</portlet-name>
 		<display-name>Gestione Attività</display-name>
-		<portlet-class>
+		<portlet-class>it.tref.liferay.portos.bo.portlet.GestioneAttivitaPortlet</portlet-class>
-			it.tref.liferay.portos.bo.portlet.GestioneAttivitaPortlet
-		</portlet-class>
 		<init-param>
 			<name>view-template</name>
 			<value>/html/gestioneattivita/view.jsp</value>
@@ -203,9 +196,7 @@
 	<portlet>
 		<portlet-name>7</portlet-name>
 		<display-name>Allegati Manuali</display-name>
-		<portlet-class>
+		<portlet-class>it.tref.liferay.portos.bo.portlet.AllegatiManualiPortlet</portlet-class>
-			it.tref.liferay.portos.bo.portlet.AllegatiManualiPortlet
-		</portlet-class>
 		<init-param>
 			<name>view-template</name>
 			<value>/html/allegati_manuali/view.jsp</value>
@@ -237,9 +228,7 @@
 	<portlet>
 		<portlet-name>8</portlet-name>
 		<display-name>Gestione Attivita Istruttore</display-name>
-		<portlet-class>
+		<portlet-class>it.tref.liferay.portos.bo.portlet.GestioneAttivitaIstruttorePortlet</portlet-class>
-			it.tref.liferay.portos.bo.portlet.GestioneAttivitaIstruttorePortlet
-		</portlet-class>
 		<init-param>
 			<name>view-template</name>
 			<value>/html/gestioneattivitaistruttore/view.jsp</value>
@@ -271,9 +260,7 @@
 	<portlet>
 		<portlet-name>9</portlet-name>
 		<display-name>Carichi di lavoro</display-name>
-		<portlet-class>
+		<portlet-class>it.tref.liferay.portos.bo.portlet.CarichiLavoroPortlet</portlet-class>
-			it.tref.liferay.portos.bo.portlet.CarichiLavoroPortlet
-		</portlet-class>
 		<init-param>
 			<name>view-template</name>
 			<value>/html/carichilavoro/view.jsp</value>
@@ -305,9 +292,7 @@
 	<portlet>
 		<portlet-name>10</portlet-name>
 		<display-name>Tempistiche</display-name>
-		<portlet-class>
+		<portlet-class>it.tref.liferay.portos.bo.portlet.TempistichePortlet</portlet-class>
-			it.tref.liferay.portos.bo.portlet.TempistichePortlet
-		</portlet-class>
 		<init-param>
 			<name>view-template</name>
 			<value>/html/tempistiche/view.jsp</value>
@@ -339,9 +324,7 @@
 	<portlet>
 		<portlet-name>11</portlet-name>
 		<display-name>Generate Protocollo Csv</display-name>
-		<portlet-class>
+		<portlet-class>it.tref.liferay.portos.bo.portlet.GenerateProtocolloCSVPortlet</portlet-class>
-			it.tref.liferay.portos.bo.portlet.GenerateProtocolloCSVPortlet
-		</portlet-class>
 		<init-param>
 			<name>view-template</name>
 			<value>/html/generateprotocollocsv/view.jsp</value>
@@ -351,7 +334,7 @@
 			<mime-type>text/html</mime-type>
 			<portlet-mode>view</portlet-mode>
 		</supports>
-        <resource-bundle>content.Language</resource-bundle>
+		<resource-bundle>content.Language</resource-bundle>
 		<portlet-info>
 			<title>Generate Protocollo Csv</title>
 			<short-title>11</short-title>
@@ -381,14 +364,14 @@
 		<expiration-cache>0</expiration-cache>
 		<supports>
 			<mime-type>text/html</mime-type>
-			<portlet-mode>view</portlet-mode>			
+			<portlet-mode>view</portlet-mode>
 		</supports>
-        <resource-bundle>content.Language</resource-bundle>		
+		<resource-bundle>content.Language</resource-bundle>
 		<portlet-info>
 			<title>Pagamenti in Pending</title>
 			<short-title>Pagamenti in Pending</short-title>
 			<keywords></keywords>
-		</portlet-info>		
+		</portlet-info>
 		<security-role-ref>
 			<role-name>administrator</role-name>
 		</security-role-ref>
@@ -405,9 +388,7 @@
 	<portlet>
 		<portlet-name>portos-administration</portlet-name>
 		<display-name>Amministrazione Sismica</display-name>
-		<portlet-class>
+		<portlet-class>it.tref.liferay.portos.bo.portlet.SismicaAdministrationPortlet</portlet-class>
-			it.tref.liferay.portos.bo.portlet.SismicaAdministrationPortlet
-		</portlet-class>
 		<init-param>
 			<name>view-template</name>
 			<value>/html/sismica_administration/view.jsp</value>
@@ -502,9 +483,7 @@
 	<portlet>
 		<portlet-name>22</portlet-name>
 		<display-name>Ricerca Protocollo</display-name>
-		<portlet-class>
+		<portlet-class>it.tref.liferay.portos.bo.portlet.RicercaProtocolloPortlet</portlet-class>
-			it.tref.liferay.portos.bo.portlet.RicercaProtocolloPortlet
-		</portlet-class>
 		<init-param>
 			<name>view-template</name>
 			<value>/html/ricercaprotocollo/view.jsp</value>
@@ -535,9 +514,7 @@
 	<portlet>
 		<portlet-name>13</portlet-name>
 		<display-name>Home Bo</display-name>
-		<portlet-class>
+		<portlet-class>it.tref.liferay.portos.bo.portlet.HomeBOPortlet</portlet-class>
-			it.tref.liferay.portos.bo.portlet.HomeBOPortlet
-		</portlet-class>
 		<init-param>
 			<name>view-template</name>
 			<value>/html/homebo/view.jsp</value>

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SorteggioPraticaUtil.java

@@ -131,6 +131,9 @@ public class SorteggioPraticaUtil {
 					IntPratica pratica = m.getValue();
 					long intPraticaId = pratica.getIntPraticaId();
 					DettPratica dettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPraticaId);
+					if (Validator.isNull(dettPratica)) {
+						dettPratica =DettPraticaLocalServiceUtil.getLastEditableByIntPratica(intPraticaId);
+					}
 					_log.info("Pratica " + pratica.getNumeroProgetto() + " id " + pratica.getIntPraticaId()
 							+ " dettPratica " + (dettPratica == null ? 0 : dettPratica.getDettPraticaId()));
 					ServiceContext serviceContext = new ServiceContext();