From 9d7e724b11f0c7e3e3794855b7cc76e048c9008b Mon Sep 17 00:00:00 2001
From: arybakov <alex.rybakov@cgi.com>
Date: Thu, 16 Nov 2023 09:51:15 -0700
Subject: [PATCH] GRAD2-2403 Fix packing slip jasper file to accommodate
 address line 2

---
 .../bundle/decorator/AchievementReportDecorator.java |  2 +-
 .../bundle/decorator/CertificateReportDecorator.java |  2 +-
 .../bundle/decorator/TranscriptReportDecorator.java  |  2 +-
 api/src/main/resources/reports/PackingSlip.jrxml     |  9 ++++-----
 .../resources/json/packingSlipReportRequest.json     | 12 ++++++------
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/api/src/main/java/ca/bc/gov/educ/grad/report/dto/reports/bundle/decorator/AchievementReportDecorator.java b/api/src/main/java/ca/bc/gov/educ/grad/report/dto/reports/bundle/decorator/AchievementReportDecorator.java
index 495c3d8e..41ef96a1 100644
--- a/api/src/main/java/ca/bc/gov/educ/grad/report/dto/reports/bundle/decorator/AchievementReportDecorator.java
+++ b/api/src/main/java/ca/bc/gov/educ/grad/report/dto/reports/bundle/decorator/AchievementReportDecorator.java
@@ -70,6 +70,6 @@ public String getFilenamePrefix() {
 
     @Override
     protected int getRotateDegree() {
-        return 90;
+        return 0;
     }
 }
diff --git a/api/src/main/java/ca/bc/gov/educ/grad/report/dto/reports/bundle/decorator/CertificateReportDecorator.java b/api/src/main/java/ca/bc/gov/educ/grad/report/dto/reports/bundle/decorator/CertificateReportDecorator.java
index e8d2ec77..a7f79945 100644
--- a/api/src/main/java/ca/bc/gov/educ/grad/report/dto/reports/bundle/decorator/CertificateReportDecorator.java
+++ b/api/src/main/java/ca/bc/gov/educ/grad/report/dto/reports/bundle/decorator/CertificateReportDecorator.java
@@ -82,6 +82,6 @@ public String getFilenamePrefix() {
 
     @Override
     protected int getRotateDegree() {
-        return 90;
+        return 0;
     }
 }
diff --git a/api/src/main/java/ca/bc/gov/educ/grad/report/dto/reports/bundle/decorator/TranscriptReportDecorator.java b/api/src/main/java/ca/bc/gov/educ/grad/report/dto/reports/bundle/decorator/TranscriptReportDecorator.java
index ba96439f..34872cb7 100644
--- a/api/src/main/java/ca/bc/gov/educ/grad/report/dto/reports/bundle/decorator/TranscriptReportDecorator.java
+++ b/api/src/main/java/ca/bc/gov/educ/grad/report/dto/reports/bundle/decorator/TranscriptReportDecorator.java
@@ -81,7 +81,7 @@ public String getFilenamePrefix() {
 
     @Override
     protected int getRotateDegree() {
-        return 90;
+        return 0;
     }
 
 
diff --git a/api/src/main/resources/reports/PackingSlip.jrxml b/api/src/main/resources/reports/PackingSlip.jrxml
index 385b0023..5a172ee1 100644
--- a/api/src/main/resources/reports/PackingSlip.jrxml
+++ b/api/src/main/resources/reports/PackingSlip.jrxml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.3.0.final using JasperReports Library version 6.3.0  -->
-<!-- 2017-06-06T09:13:51 -->
+<!-- Created with Jaspersoft Studio version 6.20.5.final using JasperReports Library version 6.20.5-3efcf2e67f959db3888d79f73dde2dbd7acb4f8e  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="PackingSlip" pageWidth="612" pageHeight="793" whenNoDataType="AllSectionsNoDetail" columnWidth="612" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isSummaryNewPage="true" resourceBundle="PackingSlip" whenResourceMissingType="Empty" uuid="c014c02b-e6ca-40f9-b9e0-5ab376a22baf">
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="reports\PackingSlipAdapter.xml"/>
 	<property name="net.sf.jasperreports.export.html.remove.emtpy.space.between.rows" value="false"/>
@@ -70,14 +69,14 @@
 					<property name="com.jaspersoft.studio.unit.y" value="mm"/>
 				</reportElement>
 				<frame>
-					<reportElement positionType="FixRelativeToBottom" x="17" y="8" width="277" height="53" uuid="6924188b-c6fa-4041-bb0e-16a51b564201">
+					<reportElement positionType="FixRelativeToBottom" x="17" y="4" width="293" height="71" uuid="6924188b-c6fa-4041-bb0e-16a51b564201">
 						<property name="com.jaspersoft.studio.unit.width" value="mm"/>
 						<property name="com.jaspersoft.studio.unit.height" value="mm"/>
 						<property name="com.jaspersoft.studio.unit.y" value="mm"/>
 						<property name="com.jaspersoft.studio.unit.x" value="mm"/>
 					</reportElement>
 					<textField>
-						<reportElement style="Address" positionType="FixRelativeToBottom" x="0" y="0" width="277" height="53" uuid="c12fe4f0-6776-4fd9-9c5d-e55852a07ff7">
+						<reportElement style="Address" positionType="FixRelativeToBottom" x="0" y="0" width="293" height="71" uuid="c12fe4f0-6776-4fd9-9c5d-e55852a07ff7">
 							<property name="com.jaspersoft.studio.unit.height" value="mm"/>
 						</reportElement>
 						<textElement verticalAlignment="Bottom"/>
@@ -130,7 +129,7 @@
 						<reportElement style="OrderFieldName" x="0" y="0" width="160" height="40" uuid="16c220a5-9c0e-4359-b7a6-7df0c9b23bdf"/>
 						<text><![CDATA[Order #]]></text>
 					</staticText>
-					<textField isBlankWhenNull="true" textAdjust="StretchHeight">
+					<textField textAdjust="StretchHeight" isBlankWhenNull="true">
 						<reportElement style="OrderFieldValue" x="160" y="0" width="340" height="40" uuid="9828dc8f-1a17-43de-8adb-8d24be5bb796"/>
 						<textFieldExpression><![CDATA[$F{compositeOrderNumber}]]></textFieldExpression>
 					</textField>
diff --git a/api/src/test/resources/json/packingSlipReportRequest.json b/api/src/test/resources/json/packingSlipReportRequest.json
index 71957e0a..c29934c9 100644
--- a/api/src/test/resources/json/packingSlipReportRequest.json
+++ b/api/src/test/resources/json/packingSlipReportRequest.json
@@ -30,12 +30,12 @@
         "distno": "036",
         "schlno": "03699064",
         "address": {
-          "streetLine1": "300-10183 152A ST",
-          "streetLine2": "",
-          "city": "SURREY",
-          "region": "BC",
-          "country": "",
-          "code": "VER4H6"
+          "streetLine1": "4TH FLOOR 620 SUPERIOR",
+          "streetLine2": "PO BOX 9886 STN PROV GOVT",
+          "city": "VICTORIA",
+          "region": "BRITISH COLUMBIA",
+          "country": "CANADA",
+          "code": "V8W9T6"
         }
       }
     }