up diff

.gitignore

@@ -10,3 +10,10 @@ portos-*.jar
 **/build/
 .DS_Store
 ._*
+liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/bin/
+.idea/
+liferay-plugins-sdk-6.2/.metadata/
+liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/
+portos-versioning/.gradle/
+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/hooks/hms-taglib-hook/.project

@@ -33,4 +33,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1672931803975</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/.project

@@ -34,4 +34,15 @@
 		<nature>org.apache.ivyde.eclipse.ivynature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1672931804246</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/layouttpl/bootstrapt_1_column-layouttpl/.project

@@ -33,4 +33,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1672931803957</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-accesso-atti-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>1672931803987</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-accesso-atti-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.fe">
 		<portlet id="1"></portlet>
 		<portlet id="3"></portlet>

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

@@ -2,32 +2,25 @@
 <!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>
 		<header-portlet-css>/css/main.css</header-portlet-css>
-		<footer-portlet-javascript>
+		<footer-portlet-javascript>/js/main.js</footer-portlet-javascript>
-			/js/main.js
-		</footer-portlet-javascript>
 		<css-class-wrapper>1-portlet</css-class-wrapper>
 	</portlet>
 	<portlet>
 		<portlet-name>2</portlet-name>
 		<icon>/icon.png</icon>
 		<header-portlet-css>/css/main.css</header-portlet-css>
-		<footer-portlet-javascript>
+		<footer-portlet-javascript>/js/main.js</footer-portlet-javascript>
-			/js/main.js
-		</footer-portlet-javascript>
 		<css-class-wrapper>2-portlet</css-class-wrapper>
 	</portlet>
 	<portlet>
 		<portlet-name>3</portlet-name>
 		<icon>/icon.png</icon>
 		<header-portlet-css>/css/main.css</header-portlet-css>
-		<footer-portlet-javascript>
+		<footer-portlet-javascript>/js/main.js</footer-portlet-javascript>
-			/js/main.js
-		</footer-portlet-javascript>
 		<css-class-wrapper>3-portlet</css-class-wrapper>
 	</portlet>
 	<role-mapper>

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-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>Accesso Atti FE</display-name>
-		<portlet-class>
+		<portlet-class>it.tref.liferay.portos.accesso.atti.portlet.AccessoAttiFEPortlet</portlet-class>
-			it.tref.liferay.portos.accesso.atti.portlet.AccessoAttiFEPortlet
-		</portlet-class>
 		<init-param>
 			<name>view-template</name>
 			<value>/html/accesso_atti_fe/view.jsp</value>
@@ -39,9 +36,7 @@
 	<portlet>
 		<portlet-name>2</portlet-name>
 		<display-name>Accesso Atti BO</display-name>
-		<portlet-class>
+		<portlet-class>it.tref.liferay.portos.accesso.atti.portlet.AccessoAttiBOPortlet</portlet-class>
-			it.tref.liferay.portos.accesso.atti.portlet.AccessoAttiBOPortlet
-		</portlet-class>
 		<init-param>
 			<name>view-template</name>
 			<value>/html/accesso_atti_bo/view.jsp</value>
@@ -73,9 +68,7 @@
 	<portlet>
 		<portlet-name>3</portlet-name>
 		<display-name>Creazione Account Portos</display-name>
-		<portlet-class>
+		<portlet-class>it.tref.liferay.portos.accesso.atti.portlet.CreazioneAccountPortosPortlet</portlet-class>
-			it.tref.liferay.portos.accesso.atti.portlet.CreazioneAccountPortosPortlet
-		</portlet-class>
 		<init-param>
 			<name>view-template</name>
 			<value>/html/creazione_account/view.jsp</value>

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

@@ -1,59 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!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" />
+		<column name="richiestaAccessoAttiId" type="long" primary="true"></column>
-		
 		<!-- Audit fields -->
-		<column name="companyId" type="long" />
+		<column name="companyId" type="long"></column>
-		<column name="userId" type="long" />
+		<column name="userId" type="long"></column>
-		<column name="userName" type="String" />
+		<column name="userName" type="String"></column>
-		<column name="createDate" type="Date" />
+		<column name="createDate" type="Date"></column>
-		<column name="modifiedDate" type="Date" />
+		<column name="modifiedDate" type="Date"></column>
-		<column name="groupId" type="long" />
+		<column name="groupId" type="long"></column>
-		
 		<!-- Other fields -->
-		<column name="intPraticaId" type="long" />
+		<column name="intPraticaId" type="long"></column>
-		<column name="territorioId" type="long" />
+		<column name="territorioId" type="long"></column>
-		<column name="numeroProgetto" type="String" />
+		<column name="numeroProgetto" type="String"></column>
-		<column name="emailRicontatto" type="String" />
+		<column name="emailRicontatto" type="String"></column>
-		<column name="dtVidimazione" type="Date" />
+		<column name="dtVidimazione" type="Date"></column>
-		<column name="sanatoria" type="boolean" />
+		<column name="sanatoria" type="boolean"></column>
-		<column name="dtSanatoria" type="Date" />
+		<column name="dtSanatoria" type="Date"></column>
-		<column name="tipologiaPersona" type="String" />
+		<column name="tipologiaPersona" type="String"></column>
-		<column name="tipologiaRichiesta" type="String" />
+		<column name="tipologiaRichiesta" type="String"></column>
-		<column name="tipologiaRichiestaDettaglio" type="String" />
+		<column name="tipologiaRichiestaDettaglio" type="String"></column>
-		<column name="motivazioneRichiesta" type="String" />
+		<column name="motivazioneRichiesta" type="String"></column>
-		<column name="fileEntryIdPagamento" type="long" />
+		<column name="fileEntryIdPagamento" type="long"></column>
-		<column name="fileEntryIdDocumentoIdentita" type="long" />
+		<column name="fileEntryIdDocumentoIdentita" type="long"></column>
-		<column name="accettata" type="boolean" />
+		<column name="accettata" type="boolean"></column>
-		<column name="dtAccettazione" type="Date" />
+		<column name="dtAccettazione" type="Date"></column>
-		<column name="gestita" type="boolean" />
+		<column name="gestita" type="boolean"></column>
-		<column name="accessToken" type="String" />
+		<column name="accessToken" type="String"></column>
-		<column name="protocolloEntrata" type="String" />
+		<column name="protocolloEntrata" type="String"></column>
-		<column name="protocolloUscita" type="String" />
+		<column name="protocolloUscita" type="String"></column>
-		<column name="funzionarioId" type="long" />
+		<column name="funzionarioId" type="long"></column>
-		
 		<!-- Order -->
 		<order by="asc">
-			<order-column name="gestita" />
+			<order-column name="gestita"></order-column>
 		</order>
-		
 		<!-- Finder -->
 		<finder name="NumeroProgetto" return-type="Collection">
-			<finder-column name="numeroProgetto" />
+			<finder-column name="numeroProgetto"></finder-column>
 		</finder>
 		<finder name="Gestita" return-type="Collection">
-			<finder-column name="gestita" />
+			<finder-column name="gestita"></finder-column>
 		</finder>
-		
 	</entity>
-	
-	
-	
 </service-builder>

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

@@ -15,22 +15,19 @@
 package it.tref.liferay.portos.accesso.atti.model.impl;
 
 /**
- * The extended model implementation for the RichiestaAccessoAtti service. Represents a row in the
+ * The extended model implementation for the RichiestaAccessoAtti service. Represents a row in the "portos_atti_RichiestaAccessoAtti" database table, with each column mapped to a property of this class.
- * "portos_atti_RichiestaAccessoAtti" database table, with each column mapped to a property of this class.
  *
  * <p>
- * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun
+ * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.accesso.atti.model.RichiestaAccessoAtti} interface.
- * ServiceBuilder to copy their definitions into the
- * {@link it.tref.liferay.portos.accesso.atti.model.RichiestaAccessoAtti} interface.
  * </p>
  *
  * @author 3F Consulting
  */
-@SuppressWarnings("serial")
 public class RichiestaAccessoAttiImpl extends RichiestaAccessoAttiBaseImpl {
 	/*
-	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a richiesta accesso atti model
+	 * NOTE FOR DEVELOPERS:
-	 * instance should use the {@link it.tref.liferay.portos.accesso.atti.model.RichiestaAccessoAtti} interface instead.
+	 *
+	 * Never reference this class directly. All methods that expect a richiesta accesso atti model instance should use the {@link it.tref.liferay.portos.accesso.atti.model.RichiestaAccessoAtti} interface instead.
 	 */
 	public RichiestaAccessoAttiImpl() {
 	}

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

@@ -37,173 +37,211 @@ import com.liferay.portal.service.OrganizationLocalServiceUtil;
  * The implementation of the richiesta accesso atti local service.
  *
  * <p>
- * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
+ * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.accesso.atti.service.RichiestaAccessoAttiLocalService} interface.
- * their definitions into the {@link it.tref.liferay.portos.accesso.atti.service.RichiestaAccessoAttiLocalService}
- * interface.
  *
  * <p>
- * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
+ * This is a local service. Methods of this service will not have security checks based on the propagated JAAS credentials because this service can only be accessed from within the same VM.
- * credentials because this service can only be accessed from within the same VM.
  * </p>
  *
  * @author 3F Consulting
  * @see it.tref.liferay.portos.accesso.atti.service.base.RichiestaAccessoAttiLocalServiceBaseImpl
  * @see it.tref.liferay.portos.accesso.atti.service.RichiestaAccessoAttiLocalServiceUtil
  */
-public class RichiestaAccessoAttiLocalServiceImpl extends RichiestaAccessoAttiLocalServiceBaseImpl {
+public class RichiestaAccessoAttiLocalServiceImpl
+extends RichiestaAccessoAttiLocalServiceBaseImpl {
 	/*
-	 * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
+	 * NOTE FOR DEVELOPERS:
-	 * it.tref.liferay.portos.accesso.atti.service.RichiestaAccessoAttiLocalServiceUtil} to access the richiesta accesso
+	 *
-	 * atti local service.
+	 * Never reference this interface directly. Always use {@link it.tref.liferay.portos.accesso.atti.service.RichiestaAccessoAttiLocalServiceUtil} to access the richiesta accesso atti local service.
 	 */
 
-	@Override
 	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{
-	public List<RichiestaAccessoAtti> findCompletate(String numeroProgetto, String protocollo, String dataDal,
-			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("")){
 			dq.add(RestrictionsFactoryUtil.eq("numeroProgetto", numeroProgetto));
 		}
+
 		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("")){
+			
 			Date dateDal = sdf.parse(dataDal);
 			Calendar calDal = Calendar.getInstance();
 			calDal.setTime(dateDal);
 			calDal.set(Calendar.HOUR_OF_DAY, 00);
 			calDal.set(Calendar.MINUTE, 00);
 			dateDal = calDal.getTime();
+			
 			Date dateAl = sdf.parse(dataAl);
 			Calendar calAl = Calendar.getInstance();
 			calAl.setTime(dateAl);
 			calAl.set(Calendar.HOUR_OF_DAY, 23);
 			calAl.set(Calendar.MINUTE, 59);
 			dateAl = calAl.getTime();
+			
+			
 			Property createDateProperty = PropertyFactoryUtil.forName("dtAccettazione");
 			dq.add(createDateProperty.between(dateDal, dateAl));
 		}
+		
 		if(!dataDal.equals("") && dataAl.equals("")){
+			
 			Date dateDal = sdf.parse(dataDal);
 			Calendar calDal = Calendar.getInstance();
 			calDal.setTime(dateDal);
 			calDal.set(Calendar.HOUR_OF_DAY, 00);
 			calDal.set(Calendar.MINUTE, 00);
 			dateDal = calDal.getTime();
+			
 			Date now = new Date();
+			
 			Property createDateProperty = PropertyFactoryUtil.forName("dtAccettazione");
 			dq.add(createDateProperty.between(dateDal, now));
+			
 		}
 		
 		if(dataDal.equals("") && !dataAl.equals("")){
+			
 			Date now = new Date("01/01/2018");
+			
 			Date dateAl = sdf.parse(dataAl);
 			Calendar calAl = Calendar.getInstance();
 			calAl.setTime(dateAl);
 			calAl.set(Calendar.HOUR_OF_DAY, 23);
 			calAl.set(Calendar.MINUTE, 59);
 			dateAl = calAl.getTime();
+			
 			Property createDateProperty = PropertyFactoryUtil.forName("dtAccettazione");
 			dq.add(createDateProperty.between(now, dateAl));
+			
 		}
+
 		return  richiestaAccessoAttiLocalService.dynamicQuery(dq, start, end);
 	}
 	
-	@Override
+	public int countCompletate(String numeroProgetto, String protocollo, String dataDal, String dataAl) throws SystemException, ParseException{
-	public int countCompletate(String numeroProgetto, String protocollo, String dataDal, String dataAl)
-			throws SystemException, ParseException {
 
 		SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
+		
 		DynamicQuery dq = richiestaAccessoAttiLocalService.dynamicQuery();
 		dq.add(RestrictionsFactoryUtil.eq("gestita", true));
+
 		if(!numeroProgetto.equals("")){
 			dq.add(RestrictionsFactoryUtil.eq("numeroProgetto", numeroProgetto));
 		}
+
 		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("")){
+		
 			Date dateDal = sdf.parse(dataDal);
 			Calendar calDal = Calendar.getInstance();
 			calDal.setTime(dateDal);
 			calDal.set(Calendar.HOUR_OF_DAY, 00);
 			calDal.set(Calendar.MINUTE, 00);
 			dateDal = calDal.getTime();
+			
 			Date dateAl = sdf.parse(dataAl);
 			Calendar calAl = Calendar.getInstance();
 			calAl.setTime(dateAl);
 			calAl.set(Calendar.HOUR_OF_DAY, 23);
 			calAl.set(Calendar.MINUTE, 59);
 			dateAl = calAl.getTime();
+			
+			
 			Property createDateProperty = PropertyFactoryUtil.forName("dtAccettazione");
 			dq.add(createDateProperty.between(dateDal, dateAl));
 		}
+		
 		if(!dataDal.equals("") && dataAl.equals("")){
+			
 			Date dateDal = sdf.parse(dataDal);
 			Calendar calDal = Calendar.getInstance();
 			calDal.setTime(dateDal);
 			calDal.set(Calendar.HOUR_OF_DAY, 00);
 			calDal.set(Calendar.MINUTE, 00);
 			dateDal = calDal.getTime();
+			
 			Date now = new Date();
+			
 			Property createDateProperty = PropertyFactoryUtil.forName("dtAccettazione");
 			dq.add(createDateProperty.between(dateDal, now));
+			
 		}
+		
 		if(dataDal.equals("") && !dataAl.equals("")){
+			
 			Date now = new Date("01/01/2018");
+			
 			Date dateAl = sdf.parse(dataAl);
 			Calendar calAl = Calendar.getInstance();
 			calAl.setTime(dateAl);
 			calAl.set(Calendar.HOUR_OF_DAY, 23);
 			calAl.set(Calendar.MINUTE, 59);
 			dateAl = calAl.getTime();
+			
 			Property createDateProperty = PropertyFactoryUtil.forName("dtAccettazione");
 			dq.add(createDateProperty.between(now, dateAl));
+			
 		}
+		
 		List<RichiestaAccessoAtti> lista = richiestaAccessoAttiLocalService.dynamicQuery(dq);
+
 		return lista.size();
 	}
 
-	@Override
 	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()){
 			return lista.get(0);
 		}
+
 		return null;
 	}
 
-	@Override
 	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()){
 			for (Organization organization : organizationList) {
 				listaLong.add(organization.getGroupId());
 			}
 		}
+
 		listaLong.add(0L);
+
 		DynamicQuery dq = richiestaAccessoAttiLocalService.dynamicQuery();
 		dq.add(RestrictionsFactoryUtil.eq("gestita", false));
 		dq.add(RestrictionsFactoryUtil.in("groupId", listaLong));
+
 		return richiestaAccessoAttiLocalService.dynamicQuery(dq, start, end);
+
 	}
 }

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

@@ -20,22 +20,21 @@ import it.tref.liferay.portos.accesso.atti.service.base.RichiestaAccessoAttiServ
  * The implementation of the richiesta accesso atti remote service.
  *
  * <p>
- * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
+ * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.accesso.atti.service.RichiestaAccessoAttiService} interface.
- * their definitions into the {@link it.tref.liferay.portos.accesso.atti.service.RichiestaAccessoAttiService} interface.
  *
  * <p>
- * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
+ * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS credentials because this service can be accessed remotely.
- * credentials because this service can be accessed remotely.
  * </p>
  *
  * @author 3F Consulting
  * @see it.tref.liferay.portos.accesso.atti.service.base.RichiestaAccessoAttiServiceBaseImpl
  * @see it.tref.liferay.portos.accesso.atti.service.RichiestaAccessoAttiServiceUtil
  */
-public class RichiestaAccessoAttiServiceImpl extends RichiestaAccessoAttiServiceBaseImpl {
+public class RichiestaAccessoAttiServiceImpl
+	extends RichiestaAccessoAttiServiceBaseImpl {
 	/*
-	 * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
+	 * NOTE FOR DEVELOPERS:
-	 * it.tref.liferay.portos.accesso.atti.service.RichiestaAccessoAttiServiceUtil} to access the richiesta accesso atti
+	 *
-	 * remote service.
+	 * Never reference this interface directly. Always use {@link it.tref.liferay.portos.accesso.atti.service.RichiestaAccessoAttiServiceUtil} to access the richiesta accesso atti remote service.
 	 */
 }

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

@@ -43,7 +43,6 @@ import it.tref.liferay.portos.accesso.atti.NoSuchRichiestaAccessoAttiException;
 import it.tref.liferay.portos.accesso.atti.model.RichiestaAccessoAtti;
 import it.tref.liferay.portos.accesso.atti.model.impl.RichiestaAccessoAttiImpl;
 import it.tref.liferay.portos.accesso.atti.model.impl.RichiestaAccessoAttiModelImpl;
-import it.tref.liferay.portos.accesso.atti.service.persistence.RichiestaAccessoAttiPersistence;
 
 import java.io.Serializable;
 

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

@@ -14,18 +14,28 @@ public class AccessoAttiAccessTokenUtil {
 	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;
+			String concatString = String.valueOf(richiestaAccessoAttiId) + StringPool.UNDERLINE + 
+					numeroProgetto + StringPool.UNDERLINE + richiedenteUserId;
+			
 			MessageDigest md = MessageDigest.getInstance("MD5");
+			
 			md.update(concatString.getBytes());
+	        
 	        byte byteData[] = md.digest();
+	        
 	        for (int i = 0; i < byteData.length; i++) {
 	         sb.append(Integer.toString((byteData[i] & 0xff) + 0x100, 16).substring(1));
 	        }
+	        
 		} catch (NoSuchAlgorithmException 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

@@ -24,41 +24,55 @@ public class DocumentLibraryUtil {
 	public static final String PAGAMENTO_CODEC_FILENAME = "PAGAMENTO_";
 	public static final String DOCUMENTO_CODEC_FILENAME = "DOCUMENTO_";
 	
-	public static long saveFileEntryAccessoAtti(long companyGroupId, long richiestaAccessoAttiId,
+	public static long saveFileEntryAccessoAtti(long companyGroupId, long richiestaAccessoAttiId, String originFileName,
-			String originFileName, File file, boolean pagamento) {
+			File file, boolean pagamento) {
 		
 		long fileEntryId = 0L;
+		
 		try {
 			DLFolder folder = getRichiestaAttiFolder(companyGroupId);
 			if(folder != null){
-				RichiestaAccessoAtti richiestaAccessoAtti = RichiestaAccessoAttiLocalServiceUtil
+				
-						.fetchRichiestaAccessoAtti(richiestaAccessoAttiId);
+				RichiestaAccessoAtti richiestaAccessoAtti = 
+						RichiestaAccessoAttiLocalServiceUtil.fetchRichiestaAccessoAtti(richiestaAccessoAttiId);
+				
 				if(richiestaAccessoAtti != null){
+					
 					ServiceContext serviceContext = new ServiceContext();
 					serviceContext.setCompanyId(richiestaAccessoAtti.getCompanyId());
 					serviceContext.setUserId(richiestaAccessoAtti.getUserId());
+					
 					String mineType = FileUtil.getExtension(originFileName);
+					
 					String prefixedFileName = "";
 					if(pagamento){
 						prefixedFileName = PAGAMENTO_CODEC_FILENAME + richiestaAccessoAttiId + "." + mineType;
 					} else {
 						prefixedFileName = DOCUMENTO_CODEC_FILENAME + richiestaAccessoAttiId + "." + mineType;
 					}
-					FileEntry fileEntry = DLAppLocalServiceUtil.addFileEntry(richiestaAccessoAtti.getUserId(),
+				
-							folder.getRepositoryId(), folder.getFolderId(), prefixedFileName, mineType,
+					FileEntry fileEntry = DLAppLocalServiceUtil.addFileEntry(
-							prefixedFileName, "", "", file, serviceContext);
+							richiestaAccessoAtti.getUserId(), folder.getRepositoryId(), folder.getFolderId(), 
+							prefixedFileName, mineType, prefixedFileName, "", "", file, serviceContext);
+				
 					fileEntryId = fileEntry.getFileEntryId();
+					
 				}
 			}
+		
 		} catch (PortalException | SystemException e) {
 			_log.error(e,e);
 		}
+		
 		return fileEntryId;
+		
 	}
 	
 	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,4 +1,3 @@
-<%@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,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@include file="init.jsp" %>
 
 <div style="width:30%;">
@@ -89,7 +88,7 @@
 				<aui:input checked="true" inlineField="true" inlineLabel="right" name="qualitaPersona" value="committente" type="radio" label="Proprietario/committente" />
 				<aui:input inlineField="true" inlineLabel="right" name="qualitaPersona" value="progettista" type="radio" label="Progettista/collaudatore" />
 				<aui:input inlineField="true" inlineLabel="right" name="qualitaPersona" value="impresa" type="radio" label="Impresa" />
-				<aui:input inlineField="true" inlineLabel="right" name="qualitaPersona" value="autorita" type="radio" label="Autorità giudiziaria/CTU" />
+				<aui:input inlineField="true" inlineLabel="right" name="qualitaPersona" value="autorita" type="radio" label="Autorit<EFBFBD> giudiziaria/CTU" />
 				<aui:input inlineField="true" inlineLabel="right" name="qualitaPersona" value="confinanti" type="radio" label="Confinante/vicini" />
 				<aui:input inlineField="true" inlineLabel="right" name="qualitaPersona" value="ctp" type="radio" label="CTP" />
 				<aui:input inlineField="true" inlineLabel="right" name="qualitaPersona" value="altriSoggetti" type="radio" label="Altro soggetto" />
@@ -119,7 +118,7 @@
 	</div>
 	<div class="row-fluid" style="margin-top: 10px;">
 		<div class="span12">
-			<aui:input name="documentoIdentita" type="file" label="Documento d'identità" >
+			<aui:input name="documentoIdentita" type="file" label="Documento d'identit<EFBFBD>" >
 				<aui:validator name="required" />
 			</aui:input>
 		</div>

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

@@ -1,4 +1,3 @@
-<%@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,4 +1,3 @@
-<%@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,4 +1,3 @@
-<%@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,4 +1,3 @@
-<%@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,4 +1,3 @@
-<%@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"%>
@@ -79,7 +78,7 @@
 			String docUrl = DLUtil.getPreviewURL(fileEntryDoc, fileEntryDoc.getFileVersion(), themeDisplay, StringPool.BLANK, false, true);
 			%>
 			<div class="span4">
-				<span style="color:#812121;font-weight: bold;">Documento di identità: </span> <a target="_blank" href="<%=docUrl%>"><%=fileEntryDoc.getTitle() %></a>
+				<span style="color:#812121;font-weight: bold;">Documento di identit<EFBFBD>: </span> <a target="_blank" href="<%=docUrl%>"><%=fileEntryDoc.getTitle() %></a>
 			</div>
 		</c:if>
 		<c:if test="<%=richiestaAccessoAtti.getFileEntryIdPagamento() != 0L %>">

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

@@ -1,4 +1,3 @@
-<%@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,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@include file="init.jsp" %>
 
 <%
@@ -73,7 +72,7 @@ boolean isNoCNSUser = UserLocalServiceUtil.hasRoleUser(roleNoCNS.getRoleId(), th
 				<aui:input checked="true" inlineField="true" inlineLabel="right" name="qualitaPersona" value="committente" type="radio" label="Proprietario/committente" />
 				<aui:input inlineField="true" inlineLabel="right" name="qualitaPersona" value="progettista" type="radio" label="Progettista/collaudatore" />
 				<aui:input inlineField="true" inlineLabel="right" name="qualitaPersona" value="impresa" type="radio" label="Impresa" />
-				<aui:input inlineField="true" inlineLabel="right" name="qualitaPersona" value="autorita" type="radio" label="Autorità giudiziaria/CTU" />
+				<aui:input inlineField="true" inlineLabel="right" name="qualitaPersona" value="autorita" type="radio" label="Autorit<EFBFBD> giudiziaria/CTU" />
 				<aui:input inlineField="true" inlineLabel="right" name="qualitaPersona" value="confinanti" type="radio" label="Confinante/vicini" />
 				<aui:input inlineField="true" inlineLabel="right" name="qualitaPersona" value="ctp" type="radio" label="CTP" />
 				<aui:input inlineField="true" inlineLabel="right" name="qualitaPersona" value="altriSoggetti" type="radio" label="Altro soggetto" />
@@ -104,7 +103,7 @@ boolean isNoCNSUser = UserLocalServiceUtil.hasRoleUser(roleNoCNS.getRoleId(), th
 	<c:if test="<%=isNoCNSUser %>">
 		<div class="row-fluid" style="margin-top: 10px;">
 			<div class="span12">
-				<aui:input name="documentoIdentita" type="file" label="Documento d'identità" >
+				<aui:input name="documentoIdentita" type="file" label="Documento d'identit<EFBFBD>" >
 					<aui:validator name="required" />
 				</aui:input>
 			</div>

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

@@ -1,10 +1,9 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@include file="init.jsp" %>
 
 <div class="container" style="margin-top: 10%;">
 	<div class="row-fluid">
 		<div class="span12">
-			<h2>La tua richiesta è stata acquisita con successo. Verrai contattato alla mail da te indicata non appena la tua richiesta verrà presa in gestione.</h2>
+			<h2>La tua richiesta <EFBFBD> stata acquisita con successo. Verrai contattato alla mail da te indicata non appena la tua richiesta verr<EFBFBD> presa in gestione.</h2>
 		</div>
 	</div>
 </div>

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

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@include file="init.jsp" %>
 
 <%
@@ -10,7 +9,7 @@ boolean loggedUser = themeDisplay.isSignedIn();
 	<div class="container">
 		<div class="row-fluid">
 			<div class="span12">
-				<span style="font-size:17px;font-weight: bold;">Per accedere a questa funzionalità bisogna essere loggati al portale.</span>
+				<span style="font-size:17px;font-weight: bold;">Per accedere a questa funzionalit<EFBFBD> bisogna essere loggati al portale.</span>
 			</div>
 		</div>
 		<div class="row-fluid" style="margin-top:10px;">

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

@@ -1,4 +1,3 @@
-<%@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"%>
@@ -1400,7 +1399,7 @@ RichiestaAccessoAtti accettoAtti = RichiestaAccessoAttiLocalServiceUtil.getRichi
 
 <c:if test="<%=accettoAtti.getIntPraticaId() == 0L %>">
 	<h3>
-		Questo fascicolo non è disponibile sotto forma digitale. Potrà ritirare una copia cartacea presso uno degli Uffici del Settore Sismica.
+		Questo fascicolo non <EFBFBD> disponibile sotto forma digitale. Potr<EFBFBD> ritirare una copia cartacea presso uno degli Uffici del Settore Sismica.
 	</h3>
 </c:if>
 

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

@@ -1,10 +1,9 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@include file="../init.jsp" %>
 
 <div class="container" style="margin-top: 10%;">
 	<div class="row-fluid">
 		<div class="span12">
-			<h2>La tua registrazione è andata a buon fine. Clicca <strong><a href="#">qui</a></strong> per autenticarti al sistema.</h2>
+			<h2>La tua registrazione <EFBFBD> andata a buon fine. Clicca <strong><a href="#">qui</a></strong> per autenticarti al sistema.</h2>
 		</div>
 	</div>
 </div>

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

@@ -1,8 +1,7 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@include file="../init.jsp" %>
 
 
-<liferay-ui:error key="error-user-exist" message="Username già esistente" />
+<liferay-ui:error key="error-user-exist" message="Username gi<EFBFBD> esistente" />
 
 <liferay-portlet:actionURL name="creaAccount" var="creaAccountURL" />
 

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

@@ -1,4 +1,3 @@
-<%@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-audit-portlet/.project

@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
 			<arguments>
@@ -32,5 +37,17 @@
 		<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.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1672931804000</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-audit-portlet/docroot/WEB-INF/liferay-display.xml

@@ -3,11 +3,11 @@
 
 <display>
 	<category name="category.hidden">
-		<portlet id="1" />		
+		<portlet id="1"></portlet>
 	</category>
 	<category name="category.portos">
 		<category name="category.tools">
-			<portlet id="2" />
+			<portlet id="2"></portlet>
 		</category>
 	</category>
 </display>

liferay-plugins-sdk-6.2/portlets/portos-audit-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-audit-portlet/docroot/WEB-INF/liferay-portlet.xml

@@ -5,9 +5,7 @@
 	<portlet>
 		<portlet-name>1</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>6</control-panel-entry-weight>
 		<header-portlet-css>/css/main.css</header-portlet-css>
 		<css-class-wrapper>portos-audit-portlet</css-class-wrapper>

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

@@ -1,94 +1,81 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!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>
 	<namespace>portos_AUDIT</namespace>
-
 	<entity name="AuditEvent" local-service="true" remote-service="false">
-		<column name="auditEventId" type="long" primary="true" />
+		<column name="auditEventId" type="long" primary="true"></column>
-
+		<column name="companyId" type="long"></column>
-		<column name="companyId" type="long" />
+		<column name="createDate" type="Date"></column>
-		<column name="createDate" type="Date" />
-		
 		<!-- Dati dell'utente che ha effettuato l'operazione -->
-		<column name="userId" type="long" />
+		<column name="userId" type="long"></column>
-		<column name="userName" type="String" />
+		<column name="userName" type="String"></column>
-		
 		<!-- Questo campo è utilizzato per definire la tipologia di audit STORICO, LOG  -->
-		<column name="auditEventTable" type="String" />
+		<column name="auditEventTable" type="String"></column>
-		
 		<!-- 3 Campi utilizzati per categorizzare gli eventi inseriti e migliorare la ricerca  -->
-		<column name="eventType" type="String" />
+		<column name="eventType" type="String"></column>
-		<column name="eventCategory" type="String" />
+		<column name="eventCategory" type="String"></column>
-		<column name="eventAction" type="String" />
+		<column name="eventAction" type="String"></column>
-		
 		<!--3 Campi per stabilire quale è l'oggetto di interesse  in caso di urcgroupid= 0 si riferisce ad un evento globale-->
-		<column name="classNameId" type="long" />
+		<column name="classNameId" type="long"></column>
-		<column name="classPK" type="String" />
+		<column name="classPK" type="String"></column>
-		<column name="enteGroupId" type="long" />
+		<column name="enteGroupId" type="long"></column>
-		<column name="enteCodice" type="String" />
+		<column name="enteCodice" type="String"></column>
-		
 		<!--2 Campi per stabilire quale è l'oggetto padre a cui è legato qeullo del log-->
-		<column name="parentClassNameId" type="long" />
+		<column name="parentClassNameId" type="long"></column>
-		<column name="parentClassPK" type="String" />
+		<column name="parentClassPK" type="String"></column>
-		
 		<!--2 Campi per stabilire quale è l'aggetto a cui è relazionato il log (escluso il parent)-->
-		<column name="relatedClassNameId" type="long" />
+		<column name="relatedClassNameId" type="long"></column>
-		<column name="relatedClassPK" type="String" />
+		<column name="relatedClassPK" type="String"></column>
-		
 		<!-- Messaggio testuale dell'evento -->
-		<column name="message" type="String" />
+		<column name="message" type="String"></column>
-		
 		<!-- Dati per lo storico -->
-		<column name="diff" type="String" />
+		<column name="diff" type="String"></column>
-		
 		<!-- Dati generici dell'utente che ha effettuato l'operazione -->
-		<column name="clientHost" type="String" />
+		<column name="clientHost" type="String"></column>
-		<column name="clientIP" type="String" />
+		<column name="clientIP" type="String"></column>
-		<column name="serverName" type="String" />
+		<column name="serverName" type="String"></column>
-		<column name="serverPort" type="int" />
+		<column name="serverPort" type="int"></column>
-		<column name="sessionID" type="String" />		
+		<column name="sessionID" type="String"></column>
-		
 		<!-- Informazioni addizionale dell'evento -->
-		<column name="additionalInfo" type="String" />
+		<column name="additionalInfo" type="String"></column>
-
 		<order by="desc">
-			<order-column name="createDate" />
+			<order-column name="createDate"></order-column>
 		</order>
-
 		<finder name="CompanyId" return-type="Collection">
-			<finder-column name="companyId" />
+			<finder-column name="companyId"></finder-column>
 		</finder>
 		<finder name="C_ClassNameId" return-type="Collection">
-			<finder-column name="companyId" />
+			<finder-column name="companyId"></finder-column>
-			<finder-column name="classNameId" />
+			<finder-column name="classNameId"></finder-column>
 		</finder>
 		<finder name="C_ClassNameId_ClassPK" return-type="Collection">
-			<finder-column name="companyId" />
+			<finder-column name="companyId"></finder-column>
-			<finder-column name="classNameId" />
+			<finder-column name="classNameId"></finder-column>
-			<finder-column name="classPK"/>
+			<finder-column name="classPK"></finder-column>
 		</finder>
 		<finder name="C_ClassNameId_AuditEventTable" return-type="Collection">
-			<finder-column name="companyId" />
+			<finder-column name="companyId"></finder-column>
-			<finder-column name="classNameId" />
+			<finder-column name="classNameId"></finder-column>
-			<finder-column name="auditEventTable"/>
+			<finder-column name="auditEventTable"></finder-column>
 		</finder>
 		<finder name="C_ClassNameId_ClassPK_AuditEventTable" return-type="Collection">
-			<finder-column name="companyId" />
+			<finder-column name="companyId"></finder-column>
-			<finder-column name="classNameId" />
+			<finder-column name="classNameId"></finder-column>
-			<finder-column name="classPK"/>
+			<finder-column name="classPK"></finder-column>
-			<finder-column name="auditEventTable"/>
+			<finder-column name="auditEventTable"></finder-column>
 		</finder>
 		<finder name="C_ParentClassNameId_ParentClassPK" return-type="Collection">
-			<finder-column name="companyId" />
+			<finder-column name="companyId"></finder-column>
-			<finder-column name="parentClassNameId" />
+			<finder-column name="parentClassNameId"></finder-column>
-			<finder-column name="parentClassPK"/>
+			<finder-column name="parentClassPK"></finder-column>
 		</finder>
 		<finder name="C_ParentClassNameId_ParentClassPK_ClassNameId" return-type="Collection">
-			<finder-column name="companyId" />
+			<finder-column name="companyId"></finder-column>
-			<finder-column name="parentClassNameId" />
+			<finder-column name="parentClassNameId"></finder-column>
-			<finder-column name="parentClassPK"/>
+			<finder-column name="parentClassPK"></finder-column>
-			<finder-column name="classNameId" />
+			<finder-column name="classNameId"></finder-column>
 		</finder>
 	</entity>
 </service-builder>

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

@@ -43,7 +43,6 @@ 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/html/common/details_column.jsp

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

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

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

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

@@ -34,4 +34,15 @@
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 		<nature>org.apache.ivyde.eclipse.ivynature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1672931804016</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/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>

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,5 +1,6 @@
 <?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>
@@ -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>
@@ -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>
@@ -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();

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.project

@@ -34,4 +34,15 @@
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 		<nature>org.apache.ivyde.eclipse.ivynature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1672931804033</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-calendar-appointments-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.calendar">
 			<portlet id="calendar-appointment"></portlet>

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

@@ -2,7 +2,6 @@
 <!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>
@@ -16,21 +15,11 @@
 		</scheduler-entry>
 		<header-portlet-css>/css/jquery-ui.css</header-portlet-css>
 		<header-portlet-css>/css/main.css</header-portlet-css>
-		<footer-portlet-javascript>
+		<footer-portlet-javascript>/js/jquery-ui.js</footer-portlet-javascript>
-			/js/jquery-ui.js
+		<footer-portlet-javascript>/js/perfect-scrollbar.js</footer-portlet-javascript>
-		</footer-portlet-javascript>
+		<footer-portlet-javascript>/js/datepicker-it.js</footer-portlet-javascript>
-		<footer-portlet-javascript>
+		<footer-portlet-javascript>/js/main.js</footer-portlet-javascript>
-			/js/perfect-scrollbar.js
+		<css-class-wrapper>calendar-appointment-portlet</css-class-wrapper>
-		</footer-portlet-javascript>
-		<footer-portlet-javascript>
-			/js/datepicker-it.js
-		</footer-portlet-javascript>
-		<footer-portlet-javascript>
-			/js/main.js
-		</footer-portlet-javascript>
-		<css-class-wrapper>
-			calendar-appointment-portlet
-		</css-class-wrapper>
 	</portlet>
 	<role-mapper>
 		<role-name>administrator</role-name>

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-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>Calendar Appointment</display-name>
-		<portlet-class>
+		<portlet-class>it.tref.portos.calendar.appointments.portlet.CalendarAppointmentPortlet</portlet-class>
-			it.tref.portos.calendar.appointments.portlet.CalendarAppointmentPortlet
-		</portlet-class>
 		<init-param>
 			<name>view-template</name>
 			<value>/html/calendar_appointments/view.jsp</value>

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

@@ -1,107 +1,99 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!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.portos.calendar.appointments">
 	<author>3F Consulting</author>
 	<namespace>portos_calendar_appointments</namespace>
-
-
 	<entity name="Funzionario" local-service="true" remote-service="true" uuid="true">
 		<!-- PK fields -->
-		<column name="funzionarioId" type="long" primary="true" />
+		<column name="funzionarioId" type="long" primary="true"></column>
 		<!-- Audit fields -->
-		<column name="companyId" type="long" />
+		<column name="companyId" type="long"></column>
-		<column name="userId" type="long" />
+		<column name="userId" type="long"></column>
-		<column name="userName" type="String" />
+		<column name="userName" type="String"></column>
-		<column name="createDate" type="Date" />
+		<column name="createDate" type="Date"></column>
-		<column name="modifiedDate" type="Date" />
+		<column name="modifiedDate" type="Date"></column>
-		<column name="groupId" type="long" />
+		<column name="groupId" type="long"></column>
 		<!-- Other fields -->
-		<column name="nome" type="String" />
+		<column name="nome" type="String"></column>
-		<column name="cognome" type="String" />
+		<column name="cognome" type="String"></column>
-		<column name="presidio" type="String" />
+		<column name="presidio" type="String"></column>
-		<column name="tipologia" type="String" />
+		<column name="tipologia" type="String"></column>
 		<!-- Finder -->
 		<finder return-type="Funzionario" name="Funzionario">
-			<finder-column name="funzionarioId" />
+			<finder-column name="funzionarioId"></finder-column>
 		</finder>
 		<finder return-type="Collection" name="Presidio">
-			<finder-column name="presidio" />
+			<finder-column name="presidio"></finder-column>
 		</finder>
 	</entity>
-	
 	<entity name="Professionista" local-service="true" remote-service="true" uuid="true">
 		<!-- PK fields -->
-		<column name="professionistaId" type="long" primary="true" />
+		<column name="professionistaId" type="long" primary="true"></column>
 		<!-- Audit fields -->
-		<column name="companyId" type="long" />
+		<column name="companyId" type="long"></column>
-		<column name="userId" type="long" />
+		<column name="userId" type="long"></column>
-		<column name="userName" type="String" />
+		<column name="userName" type="String"></column>
-		<column name="createDate" type="Date" />
+		<column name="createDate" type="Date"></column>
-		<column name="modifiedDate" type="Date" />
+		<column name="modifiedDate" type="Date"></column>
-		<column name="groupId" type="long" />
+		<column name="groupId" type="long"></column>
 		<!-- Other fields -->
-		<column name="nome" type="String" />
+		<column name="nome" type="String"></column>
-		<column name="cognome" type="String" />
+		<column name="cognome" type="String"></column>
 	</entity>
-	
 	<entity name="Disponibilita" local-service="true" remote-service="true" uuid="true">
 		<!-- PK fields -->
-		<column name="disponibilitaId" type="long" primary="true" />
+		<column name="disponibilitaId" type="long" primary="true"></column>
 		<!-- Audit fields -->
-		<column name="companyId" type="long" />
+		<column name="companyId" type="long"></column>
-		<column name="userId" type="long" />
+		<column name="userId" type="long"></column>
-		<column name="userName" type="String" />
+		<column name="userName" type="String"></column>
-		<column name="createDate" type="Date" />
+		<column name="createDate" type="Date"></column>
-		<column name="modifiedDate" type="Date" />
+		<column name="modifiedDate" type="Date"></column>
-		<column name="groupId" type="long" />
+		<column name="groupId" type="long"></column>
 		<!-- Other fields -->
-		<column name="funzionarioId" type="long" />
+		<column name="funzionarioId" type="long"></column>
-		<column name="startDate" type="Date" />
+		<column name="startDate" type="Date"></column>
-		<column name="endDate" type="Date" />
+		<column name="endDate" type="Date"></column>
-		<column name="exactDate" type="String" />
+		<column name="exactDate" type="String"></column>
-		<column name="presidio" type="long" />
+		<column name="presidio" type="long"></column>
-		<column name="disponibile" type="boolean" />
+		<column name="disponibile" type="boolean"></column>
 	</entity>
-	
 	<entity name="Prenotazione" local-service="true" remote-service="true" uuid="true">
 		<!-- PK fields -->
-		<column name="prenotazioneId" type="long" primary="true" />
+		<column name="prenotazioneId" type="long" primary="true"></column>
 		<!-- Audit fields -->
-		<column name="companyId" type="long" />
+		<column name="companyId" type="long"></column>
-		<column name="userId" type="long" />
+		<column name="userId" type="long"></column>
-		<column name="userName" type="String" />
+		<column name="userName" type="String"></column>
-		<column name="createDate" type="Date" />
+		<column name="createDate" type="Date"></column>
-		<column name="modifiedDate" type="Date" />
+		<column name="modifiedDate" type="Date"></column>
-		<column name="groupId" type="long" />
+		<column name="groupId" type="long"></column>
 		<!-- Other fields -->
-		<column name="funzionarioId" type="long" />
+		<column name="funzionarioId" type="long"></column>
-		<column name="professionistaId" type="long" />
+		<column name="professionistaId" type="long"></column>
-		<column name="startDate" type="Date" />
+		<column name="startDate" type="Date"></column>
-		<column name="endDate" type="Date" />
+		<column name="endDate" type="Date"></column>
-		<column name="descLong" type="String" />
+		<column name="descLong" type="String"></column>
 		<!-- Product Backlog Item 32934 -->
-		<column name="telefono" type="String" />
+		<column name="telefono" type="String"></column>
-		<column name="email" type="String" />
+		<column name="email" type="String"></column>
-		
 		<!-- Finder -->
 		<finder return-type="Prenotazione" name="prenotazione">
-			<finder-column name="prenotazioneId" />
+			<finder-column name="prenotazioneId"></finder-column>
 		</finder>
 		<finder return-type="Collection" name="Funzionario_StartDate">
-			<finder-column name="funzionarioId" />
+			<finder-column name="funzionarioId"></finder-column>
-			<finder-column name="startDate" />
+			<finder-column name="startDate"></finder-column>
 		</finder>
 		<finder return-type="Collection" name="StartDate">
-			<finder-column name="startDate" />
+			<finder-column name="startDate"></finder-column>
 		</finder>
-		
 	</entity>
-	
 	<exceptions>
 		<exception>DuplicateFunzionario</exception>
 		<exception>DuplicateProfessionista</exception>
 		<exception>DuplicatePrenotazione</exception>
 		<exception>SlotNotAvailable</exception>
 	</exceptions>
-
 </service-builder>

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaServiceImpl.java

@@ -1,9 +1,13 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ *
- * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * This library is free software; you can redistribute it and/or modify it under the terms of the
- * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * GNU Lesser General Public License as published by the Free Software Foundation; either version
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
  */
 
 package it.tref.portos.calendar.appointments.service.impl;
@@ -42,12 +46,15 @@ import com.liferay.portal.service.UserLocalServiceUtil;
 
 /**
  * The implementation of the disponibilita remote service.
+ *
  * <p>
- * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
+ * All custom service methods should be put in this class. Whenever methods are added, rerun
- * their definitions into the {@link it.tref.portos.calendar.appointments.service.DisponibilitaService} interface.
+ * ServiceBuilder to copy their definitions into the
+ * {@link it.tref.portos.calendar.appointments.service.DisponibilitaService} interface.
+ *
  * <p>
- * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
+ * This is a remote service. Methods of this service are expected to have security checks based on
- * credentials because this service can be accessed remotely.
+ * the propagated JAAS credentials because this service can be accessed remotely.
  * </p>
  *
  * @author 3F Consulting
@@ -56,24 +63,23 @@ import com.liferay.portal.service.UserLocalServiceUtil;
  */
 public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl {
 	/*
-	 * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
+	 * NOTE FOR DEVELOPERS:
-	 * it.tref.portos.calendar.appointments.service.DisponibilitaServiceUtil} to access the disponibilita remote
+	 * 
-	 * service.
+	 * Never reference this interface directly. Always use {@link
+	 * it.tref.portos.calendar.appointments.service.DisponibilitaServiceUtil} to access the
+	 * disponibilita remote service.
 	 */
 	
 	private static Log _log = LogFactoryUtil.getLog(DisponibilitaServiceImpl.class);
 
-	@Override
 	public Disponibilita addDisponibilita(long userId, long funzionarioId, Date startDate, Date endDate, long presidio,
 			ServiceContext serviceContext) throws SystemException, PortalException {
-		return disponibilitaLocalService.addDisponibilita(userId, funzionarioId, startDate, endDate, presidio,
+		return disponibilitaLocalService.addDisponibilita(userId, funzionarioId, startDate, endDate, presidio, serviceContext);
-				serviceContext);
 	}
 
-	@Override
 	public List<Disponibilita> addDisponibilitaGenerale(long presidio, long userId, Date dataInizioDisponibilita,
-			Date dataFineDisponibilita, String giornoSettimana, String oraInizioDisponibilita,
+			Date dataFineDisponibilita, String giornoSettimana, String oraInizioDisponibilita, String oraFineDisponibilita,
-			String oraFineDisponibilita, ServiceContext serviceContext) throws SystemException, PortalException {
+			ServiceContext serviceContext) throws SystemException, PortalException {
 
 		// ciclo su tutti i funzionari e chiamo il service su ogniuno di essi
 		List<Funzionario> funzionari = new ArrayList<Funzionario>();
@@ -84,16 +90,14 @@ public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl {
 
 		for (Funzionario funzionario : funzionari) {
 			funzionarioId = funzionario.getFunzionarioId();
-			listDisponibilita.add(disponibilitaLocalService.addDisponibilita(userId, funzionarioId,
+			listDisponibilita.add(disponibilitaLocalService.addDisponibilita(userId, funzionarioId, dataInizioDisponibilita,
-					dataInizioDisponibilita, dataFineDisponibilita, presidio, serviceContext));
+					dataFineDisponibilita, presidio, serviceContext));
 		}
 
 		return listDisponibilita;
 	}
 
-	@Override
+	public String verifyDisponibilitaByDateHour(String presidio, String date,String[] oreInizio, String idFunzionario) throws SystemException, ParseException {
-	public String verifyDisponibilitaByDateHour(String presidio, String date, String[] oreInizio, String idFunzionario)
-			throws SystemException, ParseException {
 		
 		JSONObject json = JSONFactoryUtil.createJSONObject();
 		JSONArray array = JSONFactoryUtil.createJSONArray();
@@ -112,8 +116,10 @@ public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl {
 			
 			Date dateVerify = formatDateTime(oraInizio, dateVerifyTemp);
 			
-			List<Prenotazione> lista = PrenotazioneLocalServiceUtil.findByDateHourFunzionario(dateVerify,
+			
-					Long.parseLong(idFunzionario), org.getGroupId());
+			List<Prenotazione> lista = 
+					PrenotazioneLocalServiceUtil.findByDateHourFunzionario(
+							dateVerify, Long.parseLong(idFunzionario), org.getGroupId());
 			
 			if(lista.isEmpty()){
 				jsonFiglio.put("disponibile", true);
@@ -129,36 +135,55 @@ public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl {
 		return json.toString();
 	}
 	
-	@Override
+	
 	public String getDisponibilitaByDate(String presidio, String date) throws SystemException, ParseException {
+		// TODO permessi
+
 		
 		Organization organization = OrganizationLocalServiceUtil.fetchOrganization(Long.valueOf(presidio));
+		
 		List<User> userDefinitivo = new ArrayList<User>();
+		
 		try {
+		
 			if(organization != null){
 				List<User> users = UserLocalServiceUtil.getOrganizationUsers(Long.valueOf(presidio));
+				
 				for (User user : users) {
+					
 					Role portosSupporto = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_supporto");
-					Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(),
+					
-							"portos_calendario");
+					Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_calendario");
+					
 					if(!UserLocalServiceUtil.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())){
-						boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(),
+						
-								organization.getGroupId(), portosIstruttore.getRoleId());
+						boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(
+								user.getUserId(), organization.getGroupId(), portosIstruttore.getRoleId());
+						
+						
 						if(isIstruttore){
 							userDefinitivo.add(user);
 						}
 					}
 				}
+	
 			}
-		} catch (NumberFormatException | PortalException | SystemException e) {
+
+		} catch (NumberFormatException | SystemException e) {
+			_log.error(e,e);
+		} catch (PortalException e) {
 			_log.error(e,e);
 		}	
+
 		Date startDate = new SimpleDateFormat("dd/MM/yyyy").parse(date);
+		
 		SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
+
 		JSONArray json = JSONFactoryUtil.createJSONArray();
 		for (User funzionario : userDefinitivo) {
-			List<Disponibilita> disponibilitaByFunzionario = disponibilitaLocalService
+
-					.findByFunzionarioStartAndPresidio(funzionario.getUserId(), startDate, organization.getGroupId());
+			List<Disponibilita> disponibilitaByFunzionario =
+					disponibilitaLocalService.findByFunzionarioStartAndPresidio(funzionario.getUserId(), startDate, organization.getGroupId());
 			if (disponibilitaByFunzionario.isEmpty()) {
 				continue;
 			}

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/init.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="java.util.ArrayList"%>
 <%@page import="com.liferay.portal.model.Role"%>
 <%@page import="com.liferay.portal.service.UserGroupRoleLocalServiceUtil"%>

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/amministrazione.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="it.tref.portos.calendar.appointments.service.PrenotazioneLocalServiceUtil"%>
 <%@page import="com.liferay.portal.service.OrganizationLocalServiceUtil"%>
 <%@page import="com.liferay.portal.model.Organization"%>
@@ -245,11 +244,11 @@ String dataFine = ParamUtil.getString(request, "dataFineRicerca","");
 							<div class="lfr-form-row lfr-form-row-inline">
 								<div class="row-fields" style="display: flex;">
 					                <aui:select id="giornoSettimana1" name="giornoSettimana1" label="Giorno della Settimana">
-											<aui:option value="2" label="Lunedì"></aui:option>
+											<aui:option value="2" label="Luned<EFBFBD>"></aui:option>
-											<aui:option value="3" label="Martedì"></aui:option>
+											<aui:option value="3" label="Marted<EFBFBD>"></aui:option>
-											<aui:option value="4" label="Mercoledì"></aui:option>
+											<aui:option value="4" label="Mercoled<EFBFBD>"></aui:option>
-											<aui:option value="5" label="Giovedì"></aui:option>
+											<aui:option value="5" label="Gioved<EFBFBD>"></aui:option>
-											<aui:option value="6" label="Venerdì"></aui:option>
+											<aui:option value="6" label="Venerd<EFBFBD>"></aui:option>
 					                </aui:select>
 					            	<aui:select id="oraIn1" name="oraIn1" label="Ora Inizio">
 											<aui:option value="08:00" label="08:00"></aui:option>

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/calendar.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="com.liferay.portal.service.OrganizationLocalServiceUtil"%>
 <%@page import="com.liferay.portal.model.Organization"%>
 <%@page import="it.tref.portos.calendar.appointments.service.DisponibilitaLocalServiceUtil"%>

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/gestione_disponibilita.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="com.liferay.portal.service.UserLocalServiceUtil"%>
 <%@page import="it.tref.portos.calendar.appointments.service.PrenotazioneLocalServiceUtil"%>
 <%@page import="it.tref.portos.calendar.appointments.service.DisponibilitaLocalServiceUtil"%>
@@ -44,7 +43,7 @@ SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
 
 	<div class="module-group fm_user_disponibilita_container" style="margin-top:2%;">
 		<aui:form name="fm_disponibilita_user" method="post" action="<%= addDisponibilitaURL %>">
-			<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="Aggiungi Disponibilità">
+			<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="Aggiungi Disponibilit<EFBFBD>">
 			
 				<div class="container-fluid container-presidio-select">
 					<div class="row">
@@ -157,7 +156,7 @@ SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
 	
 	<div class="module-group fm_user_indisponibilita_container" style="margin-top:2%;">
 		<aui:form name="fm_indisponibilita_user" method="post" action="<%= addIndisponibilitaURL %>">
-			<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="Aggiungi Indisponibilità">
+			<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="Aggiungi Indisponibilit<EFBFBD>">
 			
 				<div class="container-fluid container-presidio-select">
 					<div class="row">
@@ -263,7 +262,7 @@ SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
 </c:if>
 
 <div class="module-group fm_generale_disponibilita_container" style="margin-top:2%;">
-	<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="Le mie disponibilità">
+	<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="Le mie disponibilit<EFBFBD>">
 		<div class="container-fluid container-presidio-select">
 			<div class="row">
 				<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
@@ -284,7 +283,7 @@ SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
 							className="it.tref.portos.calendar.appointments.model.Disponibilita"				
 							modelVar="disponibilita"
 						>
-							<liferay-ui:search-container-column-text name="Disponibilità Appuntamento">
+							<liferay-ui:search-container-column-text name="Disponibilit<EFBFBD> Appuntamento">
 								<%
 								out.print(sdfGiorno.format(disponibilita.getStartDate()) + " dalle " + sdfOra.format(disponibilita.getStartDate()) + " alle " + sdfOra.format(disponibilita.getEndDate()));
 								%>
@@ -328,7 +327,7 @@ SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
 <c:if test="<%=isPO %>">
 
 	<div class="module-group fm_generale_disponibilita_container" style="margin-top:2%;">
-		<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="Disponibilità Sotto Controllo">
+		<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="Disponibilit<EFBFBD> Sotto Controllo">
 			
 			
 		<!-- FILTRO PER PROVINCIA O FUNZIONARIO -->
@@ -395,7 +394,7 @@ SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
 										out.print(funzionario.getFullName());
 									%>
 								</liferay-ui:search-container-column-text>
-								<liferay-ui:search-container-column-text name="Disponibilità Appuntamento">
+								<liferay-ui:search-container-column-text name="Disponibilit<EFBFBD> Appuntamento">
 									<%
 									out.print(sdfGiorno.format(disponibilita.getStartDate()) + " dalle " + sdfOra.format(disponibilita.getStartDate()) + " alle " + sdfOra.format(disponibilita.getEndDate()));
 									%>

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/gestione_disponibilita_action.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="it.tref.portos.calendar.appointments.model.Disponibilita"%>
 <%@ include file="/html/calendar_appointments/init.jsp" %>
 

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/view.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="com.liferay.portal.service.GroupLocalServiceUtil"%>
 <%@ include file="/html/calendar_appointments/init.jsp" %>
 <%

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

@@ -1,4 +1,3 @@
-<%@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-calendar-appointments-portlet/docroot/view.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.

liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.project

@@ -34,4 +34,15 @@
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 		<nature>org.apache.ivyde.eclipse.ivynature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1672931804039</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-company-configuration-portlet/docroot/WEB-INF/liferay-portlet.xml

@@ -5,14 +5,10 @@
 	<portlet>
 		<portlet-name>1</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</header-portlet-css>
-		<footer-portlet-javascript>
+		<footer-portlet-javascript>/js/main.js</footer-portlet-javascript>
-			/js/main.js
-		</footer-portlet-javascript>
 		<css-class-wrapper>1-portlet</css-class-wrapper>
 	</portlet>
 	<role-mapper>

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

@@ -4,9 +4,7 @@
 	<portlet>
 		<portlet-name>1</portlet-name>
 		<display-name>Company Configuration</display-name>
-		<portlet-class>
+		<portlet-class>it.tref.liferay.portos.companyconfig.portlet.CompanyConfigurationPortlet</portlet-class>
-			it.tref.liferay.portos.companyconfig.portlet.CompanyConfigurationPortlet
-		</portlet-class>
 		<init-param>
 			<name>view-template</name>
 			<value>/html/company_configuration/view.jsp</value>

liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/html/company_configuration/init.jsp

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

liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/html/company_configuration/view.jsp

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

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

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

liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-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>1672931804049</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-comunicazioni-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.comunicazioni">
 		<portlet id="1"></portlet>
 	</category>

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

@@ -2,14 +2,11 @@
 <!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>
 		<header-portlet-css>/css/main.css</header-portlet-css>
-		<footer-portlet-javascript>
+		<footer-portlet-javascript>/js/main.js</footer-portlet-javascript>
-			/js/main.js
-		</footer-portlet-javascript>
 		<css-class-wrapper>1-portlet</css-class-wrapper>
 	</portlet>
 	<role-mapper>

liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-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>1</display-name>
-		<portlet-class>
+		<portlet-class>it.tref.portos.comunicazione.ComunicazioneMediata</portlet-class>
-			it.tref.portos.comunicazione.ComunicazioneMediata
-		</portlet-class>
 		<init-param>
 			<name>view-template</name>
 			<value>/html/comunicazionemediata/view.jsp</value>

liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/html/common/submit_text_window.jsp

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

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

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

liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/html/comunicazionemediata/view.jsp

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

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

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@page import="java.text.Format"%>
 <%@page import="java.text.MessageFormat"%>

liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/view.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.

liferay-plugins-sdk-6.2/portlets/portos-cookies-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>1672931804057</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-cookies-portlet/docroot/WEB-INF/liferay-hook.xml

@@ -1,9 +1,7 @@
-<?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>
 	<portal-properties>portal.properties</portal-properties>
-	<language-properties>
+	<language-properties>content/Language.properties</language-properties>
-		content/Language.properties
-	</language-properties>
 </hook>

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

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@page import="java.text.SimpleDateFormat"%>
 <%@page import="com.liferay.portlet.PortletURLUtil"%>

liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/view.jsp

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

liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-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>1672931804068</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-deploy-alert-portlet/docroot/WEB-INF/liferay-portlet.xml

@@ -5,15 +5,11 @@
 	<portlet>
 		<portlet-name>1</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>
 		<control-panel-entry-class>it.tref.liferay.portos.deployalert.control.DeployAlertControl</control-panel-entry-class>
 		<header-portlet-css>/css/main.css</header-portlet-css>
-		<footer-portlet-javascript>
+		<footer-portlet-javascript>/js/main.js</footer-portlet-javascript>
-			/js/main.js
-		</footer-portlet-javascript>
 		<css-class-wrapper>notificator-portlet</css-class-wrapper>
 	</portlet>
 	<role-mapper>

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

@@ -4,9 +4,7 @@
 	<portlet>
 		<portlet-name>1</portlet-name>
 		<display-name>Deploy Alert</display-name>
-		<portlet-class>
+		<portlet-class>it.tref.liferay.portos.deployalert.portlet.NotificatorPortlet</portlet-class>
-			it.tref.liferay.portos.deployalert.portlet.NotificatorPortlet
-		</portlet-class>
 		<init-param>
 			<name>view-template</name>
 			<value>/html/notificator/view.jsp</value>

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

@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!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.deployalert">
 	<author>Matteo</author>
 	<namespace>DA</namespace>
-
 	<entity name="NotificationMail" local-service="true" uuid="true">
-
 		<!-- PK fields -->
-
 		<column name="notificationMailId" type="long" primary="true"></column>
-
 		<!-- Group instance -->
-
 		<column name="groupId" type="long"></column>
-
 		<!-- Audit fields -->
-
 		<column name="companyId" type="long"></column>
 		<column name="userId" type="long"></column>
 		<column name="userName" type="String"></column>
@@ -28,31 +22,17 @@
 		</finder>
 	</entity>
 	<entity name="NotificationLog" local-service="true" uuid="true">
-
 		<!-- PK fields -->
-
 		<column name="notificationLogId" type="long" primary="true"></column>
-
 		<!-- Group instance -->
-
 		<!-- Audit fields -->
-
-
 		<!-- PK fields -->
-
 		<!-- Group instance -->
-
 		<!-- Audit fields -->
-
-
 		<!-- PK fields -->
-
 		<!-- Group instance -->
-
 		<column name="groupId" type="long"></column>
-
 		<!-- Audit fields -->
-
 		<column name="companyId" type="long"></column>
 		<column name="userId" type="long"></column>
 		<column name="userName" type="String"></column>

liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/action/DeployAction.java

@@ -1,10 +1,5 @@
 package it.tref.liferay.portos.deployalert.action;
 
-import it.tref.liferay.portos.deployalert.constants.MailConstants;
-import it.tref.liferay.portos.deployalert.util.DeployAlertUtil;
-
-import java.util.List;
-
 import com.liferay.portal.kernel.events.ActionException;
 import com.liferay.portal.kernel.events.SimpleAction;
 import com.liferay.portal.kernel.exception.PortalException;
@@ -21,12 +16,29 @@ import com.liferay.portal.model.Company;
 import com.liferay.portal.service.ServiceContext;
 import com.liferay.portal.util.PortalUtil;
 
+import it.tref.liferay.portos.deployalert.constants.MailConstants;
+import it.tref.liferay.portos.deployalert.model.NotificationMail;
+import it.tref.liferay.portos.deployalert.service.NotificationLogLocalServiceUtil;
+import it.tref.liferay.portos.deployalert.service.NotificationMailLocalServiceUtil;
+import it.tref.liferay.portos.deployalert.util.DeployAlertUtil;
+import it.tref.liferay.portos.mailmanager.shared.messaging.util.MailManagerUtil;
+
+import java.util.List;
+
 public class DeployAction extends SimpleAction {
 
   private final static Log _log = LogFactoryUtil.getLog(DeployAction.class);
 
   @Override
   public void run(final String[] ids) throws ActionException {
+    /*
+     * ServiceContext serviceContext = DeployAlertUtil.getServiceContext(); try {
+     * PermissionThreadLocal
+     * .setPermissionChecker(PermissionCheckerFactoryUtil.create(UserLocalServiceUtil
+     * .getUser(serviceContext.getUserId()))); } catch (Exception e) { _log.error(e, e); }
+     * DeployAlertUtil.addDefaultDeployMailTemplate(serviceContext);
+     * DeployAlertUtil.addDefaultUndeployMailTemplate(serviceContext);
+     */
 
     MessageBusUtil.registerMessageListener(DestinationNames.HOT_DEPLOY, new MessageListener() {
 
@@ -49,8 +61,8 @@ public class DeployAction extends SimpleAction {
 
             NotificationLogLocalServiceUtil.addNotification(nomePlugin, evento);
 
-						notifications = NotificationMailLocalServiceUtil.findNotifications(
+            notifications =
-								PortalUtil.getDefaultCompanyId(), nomePlugin);
+                NotificationMailLocalServiceUtil.findNotifications(PortalUtil.getDefaultCompanyId(), nomePlugin);
 
             for (int i = 0; i < notifications.size(); i++) {
 
@@ -67,8 +79,8 @@ public class DeployAction extends SimpleAction {
               JSONObject parametri = DeployAlertUtil.getParametri(nomePlugin, evento);
 
               ServiceContext serviceContext = DeployAlertUtil.getServiceContext();
-							MailManagerUtil.sendMailByTemplateName(Company.class.toString(),
+              MailManagerUtil.sendMailByTemplateName(Company.class.toString(), serviceContext.getCompanyId(),
-									serviceContext.getCompanyId(), templateName, parametri, serviceContext);
+                  templateName, parametri, serviceContext);
             }
 
           } catch (Exception e) {

liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/persistence/NotificationLogPersistenceImpl.java

@@ -45,7 +45,6 @@ import it.tref.liferay.portos.deployalert.NoSuchNotificationLogException;
 import it.tref.liferay.portos.deployalert.model.NotificationLog;
 import it.tref.liferay.portos.deployalert.model.impl.NotificationLogImpl;
 import it.tref.liferay.portos.deployalert.model.impl.NotificationLogModelImpl;
-import it.tref.liferay.portos.deployalert.service.persistence.NotificationLogPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/persistence/NotificationMailPersistenceImpl.java

@@ -45,7 +45,6 @@ import it.tref.liferay.portos.deployalert.NoSuchNotificationMailException;
 import it.tref.liferay.portos.deployalert.model.NotificationMail;
 import it.tref.liferay.portos.deployalert.model.impl.NotificationMailImpl;
 import it.tref.liferay.portos.deployalert.model.impl.NotificationMailModelImpl;
-import it.tref.liferay.portos.deployalert.service.persistence.NotificationMailPersistence;
 
 import java.io.Serializable;
 

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

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

liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/html/notificator/edit_notification.jsp

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

liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/html/notificator/init.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ include file="/html/init.jsp"%>
 <%@ page
 	import="it.tref.liferay.portos.deployalert.service.NotificationMailLocalServiceUtil"%>

liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/html/notificator/view.jsp

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

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

@@ -34,4 +34,15 @@
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 		<nature>org.apache.ivyde.eclipse.ivynature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1672931804074</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-fe-portlet/docroot/WEB-INF/liferay-portlet.xml

@@ -1,13 +1,11 @@
 <?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 6.2.0//EN"
+<!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">
-		"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>
-		<configuration-action-class>
+		<configuration-action-class>com.liferay.portal.kernel.portlet.DefaultConfigurationAction</configuration-action-class>
-			com.liferay.portal.kernel.portlet.DefaultConfigurationAction
-		</configuration-action-class>
 		<header-portlet-css>/css/main.css?v=4</header-portlet-css>
 		<footer-portlet-javascript>/js/main.js?v=4</footer-portlet-javascript>
 		<css-class-wrapper>1-portlet</css-class-wrapper>

liferay-plugins-sdk-6.2/portlets/portos-fe-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 Fe</display-name>
-		<portlet-class>
+		<portlet-class>it.tref.liferay.portos.fe.portlet.FascicoloFePortlet</portlet-class>
-			it.tref.liferay.portos.fe.portlet.FascicoloFePortlet
-		</portlet-class>
 		<init-param>
 			<name>view-template</name>
 			<value>/html/fascicolofe/view.jsp</value>

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp

@@ -1,10 +1,13 @@
+<%@page import="it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil"%>
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="java.util.Map"%>
 <%@page import="it.tref.liferay.portos.bo.shared.util.SessionUtil"%>
 <%@page import="it.tref.liferay.portos.bo.util.AzioniPraticheUtil"%>
 <%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%>
 <%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%>
+<%@page import="it.tref.liferay.portos.bo.service.SoggettoServiceUtil"%>
 <%@page import="it.tref.liferay.portos.bo.util.SoggettiUtil"%>
+<%@page import="it.tref.liferay.portos.bo.util.DelegheUtil"%>
 <%@page import="it.tref.liferay.portos.bo.model.Soggetto"%>
 <%@page import="com.liferay.portal.kernel.workflow.WorkflowConstants"%>
 <%@page import="java.util.regex.Pattern"%>
@@ -14,7 +17,6 @@
 <%@page import="it.tref.liferay.portos.bo.model.Provincia"%>
 <%@page import="it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil"%>
 <%@page import="it.tref.liferay.portos.bo.service.ComuneLocalService"%>
-<%@page import="it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil"%>
 <%@page import="it.tref.liferay.portos.bo.model.Territorio"%>
 <%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%>
 <%@page import="it.tref.liferay.portos.bo.model.IntPratica"%>

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo.jsp

@@ -166,17 +166,12 @@ List<String> tipologiaSoggetti = Arrays.asList(TipoSoggettoUtil.COMMITTENTE, Tip
 			- Intervento in <b>zona
 					<%= Constants.ZONA_1.equalsIgnoreCase(territorio.getZona()) ? "1" : "2" %></b><br />
 			- Valore di AG: <b><%= dettPratica.getAg() %></b><br />
-			- Tipo di intervento:<b>
 			<c:if test="<%= dettPratica.isTcAdeguamentoSismico() %>">
-					<%= LanguageUtil.get(pageContext, "tc-adeguamento-sismico") %>
+				- Tipo di intervento: <b><%= LanguageUtil.get(pageContext, "tc-adeguamento-sismico") %></b><br />
-					<c:if test="<%= dettPratica.isTcMiglioramentoSismico() %>">
-						e
-					</c:if>
 			</c:if>
 			<c:if test="<%= dettPratica.isTcMiglioramentoSismico() %>">
-					<%= LanguageUtil.get(pageContext, "tc-miglioramento-sismico") %>
+				- Tipo di intervento: <b><%= LanguageUtil.get(pageContext, "tc-miglioramento-sismico") %></b><br />
 			</c:if>
-			</b>
 		</div>
 	</c:if>
 	<div class="col-xs-12 asseverazioni tab-error">