Merge pull request #251 from PatrickWaweru/fixPrintErrorsOnFirefoxBrowser

Fixed the issue of printing specimen label and manifest in firefox.

Author: ojwanganto

api/src/main/java/org/openmrs/module/kenyaemrorderentry/api/itext/HeiLabManifestReport.java

@@ -31,8 +31,8 @@
 import com.itextpdf.layout.element.Paragraph;
 import com.itextpdf.layout.element.Table;
 import com.itextpdf.layout.element.Text;
-import com.itextpdf.layout.property.TextAlignment;
-import com.itextpdf.layout.property.UnitValue;
+import com.itextpdf.layout.properties.TextAlignment;
+import com.itextpdf.layout.properties.UnitValue;
 
 public class HeiLabManifestReport {
 

api/src/main/java/org/openmrs/module/kenyaemrorderentry/api/itext/PrintSpecimenLabel.java

@@ -13,7 +13,7 @@
 import com.itextpdf.layout.element.Paragraph;
 import com.itextpdf.layout.element.Table;
 import com.itextpdf.layout.element.Text;
-import com.itextpdf.layout.property.UnitValue;
+import com.itextpdf.layout.properties.UnitValue;
 import org.apache.commons.lang.WordUtils;
 import org.openmrs.Patient;
 import org.openmrs.module.kenyaemrorderentry.manifest.LabManifestOrder;

api/src/main/java/org/openmrs/module/kenyaemrorderentry/api/itext/ViralLoadLabManifestReport.java

@@ -17,8 +17,8 @@
 import com.itextpdf.layout.element.Paragraph;
 import com.itextpdf.layout.element.Table;
 import com.itextpdf.layout.element.Text;
-import com.itextpdf.layout.property.TextAlignment;
-import com.itextpdf.layout.property.UnitValue;
+import com.itextpdf.layout.properties.TextAlignment;
+import com.itextpdf.layout.properties.UnitValue;
 import org.apache.commons.lang.WordUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.openmrs.Encounter;

omod/src/main/java/org/openmrs/module/kenyaemrorderentry/page/controller/manifest/DownloadManifestPageController.java

@@ -12,6 +12,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
 public class DownloadManifestPageController {
 
 
@@ -39,9 +41,14 @@ public void controller(@RequestParam(value = "manifest") LabManifest manifest, H
         if (generatedManifest != null) {
             try {
                 InputStream is = new FileInputStream(generatedManifest);
+                // response.setContentType(MediaType.APPLICATION_PDF);
                 response.setContentType("application/pdf");
-                response.addHeader("content-disposition", "inline;filename=" + generatedManifest.getName());
-                IOUtils.copy(is, response.getOutputStream());
+                // To open PDF in browser
+                // response.addHeader(HttpHeaders.CONTENT_DISPOSITION, "inline; filename=" + generatedManifest.getName());
+                // To download PDF
+                response.addHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + generatedManifest.getName());
+                int bytes = IOUtils.copy(is, response.getOutputStream());
+                response.setContentLength(bytes);
                 response.flushBuffer();
             } catch (IOException ex) {
                 System.out.println("Error writing file to output stream");

omod/src/main/java/org/openmrs/module/kenyaemrorderentry/page/controller/manifest/PrintSpecimenLabelPageController.java

@@ -11,25 +11,33 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+
 public class PrintSpecimenLabelPageController {
 
 
     public void controller(@RequestParam(value = "manifestOrder") LabManifestOrder order, HttpServletResponse response) {
 
         PrintSpecimenLabel report = new PrintSpecimenLabel(order);
-        File generatedManifest = null;
+        File generatedSpecimenLabel = null;
         try {
-            generatedManifest = report.downloadSpecimenLabel();
+            generatedSpecimenLabel = report.downloadSpecimenLabel();
         } catch (Exception ex) {
             ex.printStackTrace();
         }
 
-        if (generatedManifest != null) {
+        if (generatedSpecimenLabel != null) {
             try {
-                InputStream is = new FileInputStream(generatedManifest);
+                InputStream is = new FileInputStream(generatedSpecimenLabel);
+                // response.setContentType(MediaType.APPLICATION_PDF);
                 response.setContentType("application/pdf");
-                response.addHeader("content-disposition", "inline;filename=" + generatedManifest.getName());
-                IOUtils.copy(is, response.getOutputStream());
+                // To open PDF in browser
+                // response.addHeader(HttpHeaders.CONTENT_DISPOSITION, "inline; filename=" + generatedSpecimenLabel.getName());
+                // To download PDF
+                response.addHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + generatedSpecimenLabel.getName());
+                int bytes = IOUtils.copy(is, response.getOutputStream());
+                response.setContentLength(bytes);
                 response.flushBuffer();
             } catch (IOException ex) {
                 System.out.println("Error writing file to output stream");

pom.xml

@@ -55,7 +55,7 @@
         <webservices.restVersion>2.26.0</webservices.restVersion>
         <jacksonVersion>2.10.1</jacksonVersion>
         <apacheHttpClientVersion>4.5.10</apacheHttpClientVersion>
-        <itextPdfVersion>7.1.13</itextPdfVersion>
+        <itextPdfVersion>7.2.5</itextPdfVersion>
         <gsonVersion>2.8.7</gsonVersion>
         <apacheCommonsVersion>1.3</apacheCommonsVersion>