Skip to content

Commit

Permalink
Merge pull request #62 from OpenLMIS-Angola/feature/OAM-284
Browse files Browse the repository at this point in the history 
OAM-284: show empty table and appropriate info if no records found
  • Loading branch information
@olewandowski1
olewandowski1 authored Aug 1, 2024
2 parents e474d04 + 30005be commit 45f3304
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 16 deletions.
32 changes: 16 additions & 16 deletions reports/pick_pack_list.jrxml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Jaspersoft Studio version 6.6.0.final using JasperReports Library version 6.6.0 -->
<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="LocalFulfillmentPickPackList" pageWidth="842" pageHeight="595" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" whenResourceMissingType="Empty" uuid="be52f660-1499-4fdb-bac0-fa964fc1e938">
<!-- 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="LocalFulfillmentPickPackList" pageWidth="842" pageHeight="595" whenNoDataType="AllSectionsNoDetail" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" whenResourceMissingType="Empty" uuid="be52f660-1499-4fdb-bac0-fa964fc1e938">
<property name="com.jaspersoft.studio.data.sql.tables">
<![CDATA[ZnVsZmlsbG1lbnQuc2hpcG1lbnRfZHJhZnRzICwxNSwxNSw3MWEyZDQzYi1mZGE2LTQwZjQtYmU0
NC0xMzJjNjI2OWRkODc7]]>
Expand All @@ -11,7 +11,7 @@ NC0xMzJjNjI2OWRkODc7]]>
<property name="net.sf.jasperreports.export.csv.one.page.per.sheet" value="false"/>
<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/>
<property name="net.sf.jasperreports.export.csv.remove.empty.space.between.rows" value="true"/>
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="Angola"/>
<property name="com.jaspersoft.studio.data.sql.SQLQueryDesigner.sash.w1" value="337"/>
<property name="com.jaspersoft.studio.data.sql.SQLQueryDesigner.sash.w2" value="654"/>
<property name="com.jaspersoft.studio.property.dataset.dialog.DatasetDialog.sash.w1" value="685"/>
Expand Down Expand Up @@ -203,15 +203,15 @@ ORDER BY
<topPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
</box>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<textField textAdjust="StretchHeight" isBlankWhenNull="true">
<reportElement x="129" y="0" width="150" height="30" uuid="a123b79a-45c2-4dfa-b17a-1fb24e91bc5c"/>
<box>
<topPen lineWidth="1.0"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{orderProductName}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<textField textAdjust="StretchHeight" isBlankWhenNull="true">
<reportElement x="-1" y="0" width="130" height="30" uuid="c0448d36-ff6d-4d65-a4de-765540d681fa"/>
<box>
<topPen lineWidth="1.0"/>
Expand All @@ -234,22 +234,22 @@ ORDER BY
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textField isStretchWithOverflow="true" evaluationTime="Group" evaluationGroup="ProductGroup" isBlankWhenNull="false">
<textField textAdjust="StretchHeight" evaluationTime="Group" evaluationGroup="ProductGroup" isBlankWhenNull="false">
<reportElement x="550" y="0" width="127" height="30" uuid="d5c3dd3e-eab9-417d-8bc3-ea9753d06ed1"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$V{sumFilledQuantityDoses} == null ? 0 : $P{decimalFormat}.format($V{sumFilledQuantityDoses}).toString()]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" evaluationTime="Group" evaluationGroup="ProductGroup" isBlankWhenNull="false">
<textField textAdjust="StretchHeight" evaluationTime="Group" evaluationGroup="ProductGroup" isBlankWhenNull="false">
<reportElement x="677" y="0" width="125" height="30" uuid="7941fdc6-1a22-41ef-b4bf-ee02d5d78136"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$V{sumFilledQuantity} == null ? 0 : $P{decimalFormat}.format($V{sumFilledQuantity}).toString()]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<textField textAdjust="StretchHeight" isBlankWhenNull="true">
<reportElement x="130" y="0" width="150" height="30" uuid="45d213d8-f881-40c5-b90f-d29e1e9d1f55"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{productName}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<textField textAdjust="StretchHeight" isBlankWhenNull="true">
<reportElement x="0" y="0" width="130" height="30" uuid="c4953041-4676-4701-9830-4ad98d6ac9a2"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{productCode}]]></textFieldExpression>
Expand Down Expand Up @@ -438,39 +438,39 @@ ORDER BY
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<textField textAdjust="StretchHeight" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="677" y="0" width="125" height="30" isRemoveLineWhenBlank="true" uuid="0c1d0af5-6283-4b1c-85dc-2ad9b1c51f4d"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$P{decimalFormat}.format($F{filledQuantity}).toString()]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<textField textAdjust="StretchHeight" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="460" y="0" width="90" height="30" isRemoveLineWhenBlank="true" uuid="917b7f62-622f-4619-9c0b-680009d1681f"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[DateTimeFormatter.ofPattern($P{dateFormat}).format(LocalDate.parse($F{expirationDate}))]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<textField textAdjust="StretchHeight" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="380" y="0" width="80" height="30" isRemoveLineWhenBlank="true" uuid="014431ee-6970-4028-8824-8a25ffff1945"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{vvmStatus}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<textField textAdjust="StretchHeight" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="550" y="0" width="127" height="30" isRemoveLineWhenBlank="true" uuid="df186412-f2f2-4679-9b34-35f91f391307"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$P{decimalFormat}.format($V{filledQuantityDoses}).toString()]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<textField textAdjust="StretchHeight" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="280" y="0" width="100" height="30" isRemoveLineWhenBlank="true" uuid="56b32764-1ae0-4254-9464-5ed16a874f0d"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[($F{lotCode} == null) ? "No Lot Defined" : $F{lotCode}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<textField textAdjust="StretchHeight" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="130" y="0" width="150" height="30" isRemoveLineWhenBlank="true" uuid="77d9da27-b8cf-4dc7-b8a0-f98f383d347c">
<printWhenExpression><![CDATA[$F{lotCode} == null]]></printWhenExpression>
</reportElement>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{productName}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<textField textAdjust="StretchHeight" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToTallestObject" x="0" y="0" width="130" height="30" isRemoveLineWhenBlank="true" uuid="ee99fd26-a2f5-4ae5-8ed0-a9a17a83bbcf">
<printWhenExpression><![CDATA[$F{lotCode} == null]]></printWhenExpression>
</reportElement>
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/db/migration/20240731090559029__update_pick_pack_list.sql
View file

Large diffs are not rendered by default.

0 comments on commit 45f3304

Please sign in to comment.