Sfoglia il codice sorgente

Correzioni moduli

master
Salvatore La Manna 4 anni fa
parent
commit
b96ddb5410
  1. 2
      jasper/Modello_autorizzazione.jrxml
  2. 2
      jasper/Modello_diniego.jrxml
  3. 2
      jasper/Modello_non_competenza.jrxml
  4. 2
      jasper/Modello_preavviso.jrxml
  5. 18
      liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/servlet/FirmaServlet.java
  6. 7
      liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/util/FirmaGetUtil.java
  7. 3
      liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/html/firma/init.jsp
  8. 4
      liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties
  9. 1
      liferay-plugins-sdk-6.2/view_panel_pagamenti_spese.jsp

2
jasper/Modello_autorizzazione.jrxml

@ -390,7 +390,7 @@ L’eventuale ricorso gerarchico, debitamente sottoscritto e regolarizzato in bo
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font fontName="DejaVu Sans" size="12" isBold="false"/> <font fontName="DejaVu Sans" size="12" isBold="false"/>
</textElement> </textElement>
<text><![CDATA[Il sopritendente]]></text> <text><![CDATA[Il soprintendente]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement x="4" y="230" width="547" height="10" uuid="e484cc67-3e66-431a-ad1f-bc7fc56c0836"> <reportElement x="4" y="230" width="547" height="10" uuid="e484cc67-3e66-431a-ad1f-bc7fc56c0836">

2
jasper/Modello_diniego.jrxml

@ -383,7 +383,7 @@ L’eventuale ricorso gerarchico, debitamente sottoscritto e regolarizzato in bo
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font fontName="DejaVu Sans" size="12" isBold="false"/> <font fontName="DejaVu Sans" size="12" isBold="false"/>
</textElement> </textElement>
<text><![CDATA[Il sopritendente]]></text> <text><![CDATA[Il soprintendente]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement x="4" y="120" width="547" height="10" uuid="42bb187f-a205-4b2e-85d2-3c3655078c1b"> <reportElement x="4" y="120" width="547" height="10" uuid="42bb187f-a205-4b2e-85d2-3c3655078c1b">

2
jasper/Modello_non_competenza.jrxml

@ -370,7 +370,7 @@ esaminata la documentazione allegata all’istanza;]]></text>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font fontName="DejaVu Sans" size="12" isBold="false"/> <font fontName="DejaVu Sans" size="12" isBold="false"/>
</textElement> </textElement>
<text><![CDATA[Il sopritendente]]></text> <text><![CDATA[Il soprintendente]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement x="4" y="30" width="547" height="10" uuid="e484cc67-3e66-431a-ad1f-bc7fc56c0836"> <reportElement x="4" y="30" width="547" height="10" uuid="e484cc67-3e66-431a-ad1f-bc7fc56c0836">

2
jasper/Modello_preavviso.jrxml

@ -326,7 +326,7 @@ Trascorso infruttuosamente tale termine si procederà all’emissione di provved
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font fontName="DejaVu Sans" size="12" isBold="false"/> <font fontName="DejaVu Sans" size="12" isBold="false"/>
</textElement> </textElement>
<text><![CDATA[Il sopritendente]]></text> <text><![CDATA[Il soprintendente]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement x="4" y="90" width="547" height="10" uuid="6cddce1d-3ed3-4b5e-b923-6761daf35645"> <reportElement x="4" y="90" width="547" height="10" uuid="6cddce1d-3ed3-4b5e-b923-6761daf35645">

18
liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/servlet/FirmaServlet.java

@ -58,10 +58,12 @@ public class FirmaServlet extends HttpServlet {
} }
/** /**
* @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response) * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse
* response)
*/ */
@Override @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException,
IOException {
String pathInfo = request.getPathInfo().substring(1); String pathInfo = request.getPathInfo().substring(1);
String[] pathArray = StringUtil.split(pathInfo, "/"); String[] pathArray = StringUtil.split(pathInfo, "/");
@ -113,10 +115,12 @@ public class FirmaServlet extends HttpServlet {
} }
/** /**
* @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response) * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse
* response)
*/ */
@Override @Override
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException,
IOException {
String pathInfo = request.getPathInfo().substring(1); String pathInfo = request.getPathInfo().substring(1);
String[] pathArray = StringUtil.split(pathInfo, "/"); String[] pathArray = StringUtil.split(pathInfo, "/");
@ -163,7 +167,8 @@ public class FirmaServlet extends HttpServlet {
if (pathArray.length == 3) { if (pathArray.length == 3) {
String tipo = pathArray[1]; String tipo = pathArray[1];
String idFile = pathArray[2]; String idFile = pathArray[2];
JSONDeserializer<Map<String, String>> jsonDeserializer = JSONFactoryUtil.createJSONDeserializer(); JSONDeserializer<Map<String, String>> jsonDeserializer = JSONFactoryUtil
.createJSONDeserializer();
Map<String, String> map = jsonDeserializer.deserialize(token); Map<String, String> map = jsonDeserializer.deserialize(token);
ServiceContext serviceContext = null; ServiceContext serviceContext = null;
@ -173,7 +178,8 @@ public class FirmaServlet extends HttpServlet {
_log.error(e.getMessage()); _log.error(e.getMessage());
} }
risposta = firmaPostUtil.setFile(map.get("token"), map.get("file"), tipo, idFile, serviceContext); risposta = firmaPostUtil.setFile(map.get("token"), map.get("file"), tipo, idFile,
serviceContext);
} }
break; break;
} }

7
liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/util/FirmaGetUtil.java

@ -150,12 +150,11 @@ public class FirmaGetUtil {
if (codiceFiscale.equals(codiceFiscaleTest)) { if (codiceFiscale.equals(codiceFiscaleTest)) {
String tokenTest = jxPortletPreferences.getValue("tokenTest", StringPool.BLANK); String tokenTest = jxPortletPreferences.getValue("tokenTest", StringPool.BLANK);
risposta.setObj(tokenTest); risposta.setObj(tokenTest);
risposta.setRisposta(RispostaCostanti.OK);
} else { } else {
// TODO da migliorare per sicurezza e poi modificare a giro // TODO da migliorare per sicurezza e poi modificare a giro
risposta.setObj(codiceFiscale); risposta.setObj(codiceFiscale);
risposta.setRisposta(RispostaCostanti.OK);
} }
risposta.setRisposta(RispostaCostanti.OK);
return risposta; return risposta;
} }
@ -178,7 +177,9 @@ public class FirmaGetUtil {
javax.portlet.PortletPreferences jxPortletPreferences = FirmaUtil.getPortletPreferences(); javax.portlet.PortletPreferences jxPortletPreferences = FirmaUtil.getPortletPreferences();
String versione = jxPortletPreferences.getValue("versione", StringPool.BLANK); String versione = jxPortletPreferences.getValue("versione", StringPool.BLANK);
Risposta<String> risposta = new Risposta<>(); Risposta<String> risposta = new Risposta<>();
if (!Validator.isBlank(versione)) { if (Validator.isBlank(versione)) {
risposta.setRisposta(RispostaCostanti.ERRORE_APPLICAZIONE);
} else {
risposta.setObj(versione); risposta.setObj(versione);
risposta.setRisposta(RispostaCostanti.OK); risposta.setRisposta(RispostaCostanti.OK);
} }

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

@ -1,8 +1,7 @@
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@taglib uri="http://liferay.com/tld/aui" prefix="aui"%> <%@taglib uri="http://liferay.com/tld/aui" prefix="aui"%>
<%@taglib uri="http://liferay.com/tld/portlet" prefix="liferay-portlet"%> <%@taglib uri="http://liferay.com/tld/portlet" prefix="liferay-portlet"%>
<%@taglib uri="http://liferay.com/tld/security" <%@taglib uri="http://liferay.com/tld/security" prefix="liferay-security"%>
prefix="liferay-security"%>
<%@taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme"%> <%@taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme"%>
<%@taglib uri="http://liferay.com/tld/ui" prefix="liferay-ui"%> <%@taglib uri="http://liferay.com/tld/ui" prefix="liferay-ui"%>
<%@taglib uri="http://liferay.com/tld/util" prefix="liferay-util"%> <%@taglib uri="http://liferay.com/tld/util" prefix="liferay-util"%>

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

@ -13,8 +13,8 @@
## ##
build.namespace=portos_Mail build.namespace=portos_Mail
build.number=81 build.number=82
build.date=1606914570374 build.date=1607506075611
build.auto.upgrade=true build.auto.upgrade=true
## ##

1
liferay-plugins-sdk-6.2/view_panel_pagamenti_spese.jsp

@ -1 +0,0 @@
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
Caricamento…
Annulla
Salva