Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GRAD2-2403 #625

Merged
merged 3 commits into from
Nov 22, 2023
Merged

GRAD2-2403 #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a43dc33
GRAD2-2403
arybakov-cgi Nov 22, 2023
40e3aa4
GRAD2-2403
arybakov-cgi Nov 22, 2023
075979d
GRAD2-2403
arybakov-cgi Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions api/src/main/resources/reports/PackingSlip.jrxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,30 +62,30 @@
<band height="513">
<property name="com.jaspersoft.studio.unit.height" value="mm"/>
<frame>
<reportElement x="42" y="138" width="323" height="79" uuid="460c7736-768d-4aae-a49f-61b2a0751d50">
<reportElement x="42" y="139" width="323" height="88" uuid="460c7736-768d-4aae-a49f-61b2a0751d50">
<property name="com.jaspersoft.studio.unit.x" value="mm"/>
<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"/>
</reportElement>
<frame>
<reportElement positionType="FixRelativeToBottom" x="17" y="4" width="293" height="71" uuid="6924188b-c6fa-4041-bb0e-16a51b564201">
<reportElement x="0" y="0" width="323" height="88" 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="293" height="71" uuid="c12fe4f0-6776-4fd9-9c5d-e55852a07ff7">
<textField textAdjust="ScaleFont">
<reportElement style="Address" x="3" y="4" width="317" height="80" uuid="c12fe4f0-6776-4fd9-9c5d-e55852a07ff7">
<property name="com.jaspersoft.studio.unit.height" value="mm"/>
</reportElement>
<textElement verticalAlignment="Bottom"/>
<textElement verticalAlignment="Top"/>
<textFieldExpression><![CDATA[($F{recipient} + "\n" + "ATTN:" + $F{attentionTo} + "\n" + $F{address.formatted}).toUpperCase()]]></textFieldExpression>
</textField>
</frame>
</frame>
<textField>
<reportElement style="Numbers" x="400" y="129" width="20" height="70" uuid="de09dbf9-f924-40ec-9be3-1017ea8bc090">
<reportElement style="Numbers" x="400" y="110" width="20" height="80" uuid="de09dbf9-f924-40ec-9be3-1017ea8bc090">
<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
<property name="com.jaspersoft.studio.unit.y" value="mm"/>
</reportElement>
Expand Down
50 changes: 25 additions & 25 deletions api/src/test/resources/json/schoolLabelReportRequest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@
"schools":[
{
"mincode": "03939008",
"name": "LORD BYNG SECONDARY",
"name": "Ecole Secondaire Mark R. Isfeld Secondary",
"typeIndicator": "",
"typeBanner": "Principal",
"signatureCode": "039",
"distno": "039",
"schlno": "03939008",
"schoolCategoryCode": "",
"address": {
"streetLine1": "3939 16TH AVENUE W",
"streetLine2": "",
"city": "VANCOUVER",
"region": "BC",
"country": "",
"code": "V6R3C9"
"streetLine1": "4TH FLOOR 620 SUPERIOR",
"streetLine2": "PO BOX 9886 STN PROV GOVT",
"city": "VICTORIA",
"region": "BRITISH COLUMBIA",
"country": "CANADA",
"code": "V8W9T6"
}
},
{
Expand Down Expand Up @@ -52,12 +52,12 @@
"schlno": "03434052",
"schoolCategoryCode": null,
"address": {
"streetLine1": "31150 BLUE RIDGE DRIVE",
"streetLine2": "",
"city": "ABBOTSFORD",
"region": "BC",
"country": "CN",
"code": "V2T5R2"
"streetLine1": "4TH FLOOR 620 SUPERIOR",
"streetLine2": "PO BOX 9886 STN PROV GOVT",
"city": "VICTORIA",
"region": "BRITISH COLUMBIA",
"country": "CANADA",
"code": "V8W9T6"
},
"phoneNumber": "",
"dogwoodElig": "",
Expand Down Expand Up @@ -202,12 +202,12 @@
"schlno": "03939008",
"schoolCategoryCode": "",
"address": {
"streetLine1": "3939 16TH AVENUE W",
"streetLine2": "",
"city": "VANCOUVER",
"region": "BC",
"country": "",
"code": "V6R3C9"
"streetLine1": "4TH FLOOR 620 SUPERIOR",
"streetLine2": "PO BOX 9886 STN PROV GOVT",
"city": "VICTORIA",
"region": "BRITISH COLUMBIA",
"country": "CANADA",
"code": "V8W9T6"
}
},
{
Expand Down Expand Up @@ -499,12 +499,12 @@
"schlno": "03939000",
"schoolCategoryCode": null,
"address": {
"streetLine1": "6010 FRASER ST",
"streetLine2": "",
"city": "VANCOUVER",
"region": "BC",
"country": "CN",
"code": "V5W2Z7"
"streetLine1": "4TH FLOOR 620 SUPERIOR",
"streetLine2": "PO BOX 9886 STN PROV GOVT",
"city": "VICTORIA",
"region": "BRITISH COLUMBIA",
"country": "CANADA",
"code": "V8W9T6"
}
},
{
Expand Down
Loading