FIX download fattura html

consiglionazionaledellericerche · Apr 5, 2019 · c8dbbc5 · c8dbbc5
1 parent b082ab9
commit c8dbbc5
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
 		<java.version>1.8</java.version>
 		<siopeplus.version>0.0.1</siopeplus.version>
 		<spring.version>4.3.3.RELEASE</spring.version>
-		<jada.version>6.0.52</jada.version>
+		<jada.version>6.0.53</jada.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<sigla.build.number>${maven.build.timestamp}</sigla.build.number>
 		<slf4j.version>1.7.21</slf4j.version>

diff --git a/sigla-ejb/src/main/java/it/cnr/contab/docamm00/bp/CRUDFatturaPassivaBP.java b/sigla-ejb/src/main/java/it/cnr/contab/docamm00/bp/CRUDFatturaPassivaBP.java
@@ -1512,6 +1512,15 @@ public String getNomeFileAllegato() {
         return null;
     }
 
+    public String getNomeFileFirmato() {
+        return Optional.ofNullable(getModel())
+                    .filter(Fattura_passivaBulk.class::isInstance)
+                    .map(Fattura_passivaBulk.class::cast)
+                    .flatMap(fattura_passivaBulk -> Optional.ofNullable(fattura_passivaBulk.getDocumentoEleTestata()))
+                    .map(DocumentoEleTestataBulk::getNomeFileFirmato)
+                    .orElse(null);
+    }
+
     public void scaricaAllegato(ActionContext actioncontext) throws IOException, ServletException, ApplicationException {
         StoreService storeService = SpringUtil.getBean("storeService", StoreService.class);
         DocumentoEleAllegatiBulk allegato = (DocumentoEleAllegatiBulk) getCrudDocEleAllegatiColl().getModel();

diff --git a/sigla-swarm/pom.xml b/sigla-swarm/pom.xml
@@ -24,7 +24,7 @@
 		<java.version>1.8</java.version>
 		<siopeplus.version>0.0.1</siopeplus.version>
 		<spring.version>4.3.3.RELEASE</spring.version>
-		<jada.version>6.0.52</jada.version>
+		<jada.version>6.0.53</jada.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<sigla.build.number>${maven.build.timestamp}</sigla.build.number>
 		<slf4j.version>1.7.21</slf4j.version>

diff --git a/sigla-web/pom.xml b/sigla-web/pom.xml
@@ -224,7 +224,7 @@
             <properties>
                 <sonar.skip>true</sonar.skip>
                 <spring.version>4.3.3.RELEASE</spring.version>
-                <jada.version>6.0.52</jada.version>
+                <jada.version>6.0.53</jada.version>
                 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                 <sigla.build.number>${maven.build.timestamp}</sigla.build.number>
                 <slf4j.version>1.7.21</slf4j.version>

diff --git a/sigla-web/src/main/webapp/docamm00/fattura_passiva.jsp b/sigla-web/src/main/webapp/docamm00/fattura_passiva.jsp
@@ -17,7 +17,7 @@
 <title> <%=(bp.getModel() instanceof Nota_di_creditoBulk) ?"Nota di Credito":(bp.getModel() instanceof Nota_di_debitoBulk)?"Nota di Debito":"Fattura Passiva"%></title>
 <script language="JavaScript">
 function doScaricaFatturaHtml() {
-	window.open('<%=JSPUtils.getAppRoot(request)%>genericdownload/fattura.html?methodName=scaricaFatturaHtml&it.cnr.jada.action.BusinessProcess=<%=bp.getPath()%>', 
+	window.open('<%=JSPUtils.getAppRoot(request)%>genericdownload/<%=bp.getNomeFileFirmato()%>.html?methodName=scaricaFatturaHtml&it.cnr.jada.action.BusinessProcess=<%=bp.getPath()%>',
 			'Fattura', 'toolbar=no, location=no, directories=no, status=no, menubar=no,resizable,scrollbars,width=800,height=600').focus() ;
 }
 </script>

diff --git a/sigla-web/src/main/webapp/docamm00/fattura_passiva_elettronica.jsp b/sigla-web/src/main/webapp/docamm00/fattura_passiva_elettronica.jsp
@@ -26,7 +26,7 @@
 <title>FATTURA ELETTRONICA</title>
 <script language="JavaScript">
 function doScaricaFatturaHtml() {
-	window.open('<%=JSPUtils.getAppRoot(request)%>genericdownload/fattura.html?methodName=scaricaFatturaHtml&it.cnr.jada.action.BusinessProcess=<%=bp.getPath()%>', 
+	window.open('<%=JSPUtils.getAppRoot(request)%>genericdownload/<%=nomeFileFirmato%>.html?methodName=scaricaFatturaHtml&it.cnr.jada.action.BusinessProcess=<%=bp.getPath()%>',
 			'Fattura', 'toolbar=no, location=no, directories=no, status=no, menubar=no,resizable,scrollbars,width=800,height=600').focus() ;
 }
 function doScaricaFatturaFirmata() {