Skip to content

Commit

Permalink
Merge pull request #427 from jfurlong/master
Browse files Browse the repository at this point in the history 
oe4.1.1 merge into Master
  • Loading branch information
@jfurlong
jfurlong committed Nov 6, 2014
2 parents faae247 + bb6b367 commit 7468c26
Show file tree
Hide file tree
Showing 84 changed files with 126,816 additions and 303 deletions.
Binary file modified app/WebContent/WEB-INF/reports/ActivityReport.jasper
View file
Binary file not shown.
49 changes: 28 additions & 21 deletions app/WebContent/WEB-INF/reports/ActivityReport.jrxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,11 @@
<parameter name="accessionPrefix" class="java.lang.String" isForPrompting="false"/>
<parameter name="startDate" class="java.lang.String" isForPrompting="false"/>
<parameter name="endDate" class="java.lang.String" isForPrompting="false"/>
<parameter name="splitNameAndTest" class="java.lang.Boolean" isForPrompting="false">
<defaultValueExpression><![CDATA[false]]></defaultValueExpression>
<parameter name="underlineResults" class="java.lang.Boolean" isForPrompting="false">
<defaultValueExpression><![CDATA[Boolean.TRUE]]></defaultValueExpression>
</parameter>
<parameter name="isReportByTest" class="java.lang.Boolean" isForPrompting="false">
<defaultValueExpression><![CDATA[Boolean.FALSE]]></defaultValueExpression>
</parameter>
<queryString>
<![CDATA[]]>
Expand Down Expand Up @@ -113,7 +116,7 @@
<columnHeader>
<band height="45" splitType="Stretch">
<staticText>
<reportElement x="61" y="15" width="61" height="15"/>
<reportElement x="66" y="15" width="56" height="15"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<text><![CDATA[réception]]></text>
</staticText>
Expand All @@ -139,7 +142,7 @@
<text><![CDATA[Tech ID]]></text>
</staticText>
<staticText>
<reportElement key="staticText" x="61" y="0" width="61" height="16"/>
<reportElement key="staticText" x="66" y="0" width="56" height="16"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
Expand All @@ -159,7 +162,7 @@
<textFieldExpression class="java.lang.String"><![CDATA["(" + $P{accessionPrefix} + ")"]]></textFieldExpression>
</textField>
<staticText>
<reportElement key="staticText" x="0" y="0" width="61" height="16"/>
<reportElement key="staticText" x="0" y="0" width="66" height="16"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
Expand All @@ -172,19 +175,19 @@
<text><![CDATA[Date de]]></text>
</staticText>
<staticText>
<reportElement x="0" y="16" width="61" height="15"/>
<reportElement x="0" y="16" width="66" height="15"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<text><![CDATA[collection]]></text>
<text><![CDATA[prélèvement]]></text>
</staticText>
<staticText>
<reportElement x="182" y="0" width="163" height="16"/>
<textElement textAlignment="Left" verticalAlignment="Middle"/>
<text><![CDATA[Noms/Code du patient]]></text>
<text><![CDATA[Noms/Codes du patient]]></text>
</staticText>
<staticText>
<reportElement x="344" y="15" width="79" height="16"/>
<textElement textAlignment="Left" verticalAlignment="Middle"/>
<text><![CDATA[Statu]]></text>
<text><![CDATA[Statut]]></text>
</staticText>
<staticText>
<reportElement key="staticText" x="422" y="0" width="61" height="16"/>
Expand All @@ -205,19 +208,21 @@
<text><![CDATA[résultats]]></text>
</staticText>
<staticText>
<reportElement x="182" y="16" width="162" height="14"/>
<reportElement x="182" y="16" width="162" height="14">
<printWhenExpression><![CDATA[!$P{isReportByTest}]]></printWhenExpression>
</reportElement>
<textElement/>
<text><![CDATA[Nom du test]]></text>
</staticText>
<staticText>
<reportElement x="0" y="30" width="61" height="12"/>
<reportElement x="0" y="30" width="66" height="12"/>
<textElement textAlignment="Center" verticalAlignment="Top">
<font size="8"/>
</textElement>
<text><![CDATA[(jj/mm/aa)]]></text>
</staticText>
<staticText>
<reportElement x="61" y="30" width="61" height="12"/>
<reportElement x="66" y="30" width="56" height="12"/>
<textElement textAlignment="Center" verticalAlignment="Top">
<font size="8"/>
</textElement>
Expand All @@ -235,10 +240,10 @@
<detail>
<band height="16" splitType="Stretch">
<frame>
<reportElement stretchType="RelativeToTallestObject" isPrintRepeatedValues="false" mode="Opaque" x="0" y="0" width="553" height="15" printWhenGroupChanges="accession" backcolor="#E0E0E0"/>
<reportElement stretchType="RelativeToTallestObject" isPrintRepeatedValues="false" mode="Opaque" x="0" y="0" width="553" height="16" printWhenGroupChanges="accession" backcolor="#FFFFFF"/>
<box>
<topPen lineWidth="1.0"/>
<bottomPen lineWidth="1.0"/>
<bottomPen lineWidth="0.0"/>
</box>
</frame>
<textField isBlankWhenNull="true">
Expand All @@ -247,14 +252,14 @@
<textFieldExpression class="java.lang.String"><![CDATA[$F{technician}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement key="textField" isPrintRepeatedValues="false" mode="Transparent" x="61" y="0" width="61" height="13" printWhenGroupChanges="accession" backcolor="#FFFFFF"/>
<reportElement key="textField" isPrintRepeatedValues="false" mode="Transparent" x="66" y="0" width="56" height="13" printWhenGroupChanges="accession" backcolor="#FFFFFF"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Left" verticalAlignment="Middle">
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{receivedDate}]]></textFieldExpression>
Expand All @@ -273,7 +278,7 @@
<textFieldExpression class="java.lang.String"><![CDATA[$F{accessionNumber}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement mode="Transparent" x="182" y="0" width="163" height="13" backcolor="#FFFFFF"/>
<reportElement mode="Transparent" x="182" y="0" width="152" height="13" backcolor="#FFFFFF"/>
<textElement verticalAlignment="Middle"/>
<textFieldExpression class="java.lang.String"><![CDATA[$F{patientOrTestName} != null && !"".equals($F{patientOrTestName}) ? $F{patientOrTestName} : "Pas enregistré"]]></textFieldExpression>
</textField>
Expand All @@ -283,20 +288,22 @@
<textFieldExpression class="java.lang.String"><![CDATA[$F{resultValue}]]></textFieldExpression>
</textField>
<frame>
<reportElement stretchType="RelativeToTallestObject" x="182" y="0" width="371" height="15" forecolor="#000000"/>
<reportElement stretchType="RelativeToTallestObject" x="182" y="0" width="371" height="16" forecolor="#000000">
<printWhenExpression><![CDATA[$P{underlineResults}.equals( Boolean.TRUE )]]></printWhenExpression>
</reportElement>
<box>
<bottomPen lineWidth="1.0"/>
</box>
</frame>
<textField isBlankWhenNull="true">
<reportElement key="textField" mode="Transparent" x="0" y="0" width="61" height="13" backcolor="#FFFFFF"/>
<reportElement key="textField" mode="Transparent" x="0" y="0" width="66" height="13" backcolor="#FFFFFF"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Left" verticalAlignment="Middle">
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{collectionDate}]]></textFieldExpression>
Expand All @@ -309,7 +316,7 @@
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Left" verticalAlignment="Middle">
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{resultDate}]]></textFieldExpression>
Expand Down
Binary file renamed ...reports/PatientReportHaitiNoAlerts.jasper → ...WEB-INF/reports/PatientReportHaiti.jasper
View file
Binary file not shown.
27 changes: 16 additions & 11 deletions .../reports/PatientReportHaitiNoAlerts.jrxml → .../WEB-INF/reports/PatientReportHaiti.jrxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<group name="Accession Number" isStartNewPage="true" isResetPageNumber="true" isReprintHeaderOnEachPage="true">
<groupExpression><![CDATA[$F{accessionNumber}]]></groupExpression>
<groupHeader>
<band height="92" splitType="Prevent">
<band height="113" splitType="Prevent">
<line>
<reportElement x="-1" y="-1" width="548" height="1"/>
</line>
Expand Down Expand Up @@ -97,19 +97,19 @@
<textFieldExpression class="java.lang.String"><![CDATA[$F{patientName}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="173" y="78" width="378" height="14"/>
<reportElement x="297" y="78" width="254" height="14"/>
<box leftPadding="4">
<pen lineWidth="0.0"/>
<topPen lineWidth="0.0"/>
<leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/>
<rightPen lineWidth="0.0"/>
</box>
<textElement verticalAlignment="Middle"/>
<textElement textAlignment="Right" verticalAlignment="Middle"/>
<textFieldExpression class="java.lang.String"><![CDATA["No d'ordre: " + $F{accessionNumber}]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
<reportElement x="0" y="78" width="173" height="14"/>
<reportElement x="0" y="78" width="297" height="14"/>
<box leftPadding="0">
<pen lineWidth="0.0"/>
<topPen lineWidth="0.0"/>
Expand All @@ -118,7 +118,7 @@
<rightPen lineWidth="0.0"/>
</box>
<textElement verticalAlignment="Middle"/>
<textFieldExpression class="java.lang.String"><![CDATA["Date demandé: " + $F{orderDate}]]></textFieldExpression>
<textFieldExpression class="java.lang.String"><![CDATA["Date & heure de demande: " + $F{orderDate}]]></textFieldExpression>
</textField>
<staticText>
<reportElement mode="Opaque" x="404" y="0" width="50" height="14" backcolor="#CCCCCC"/>
Expand Down Expand Up @@ -346,6 +346,11 @@
<textElement verticalAlignment="Middle"/>
<textFieldExpression class="java.lang.String"><![CDATA[$F{siteInfo}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement isPrintRepeatedValues="false" x="-1" y="92" width="553" height="20" isPrintWhenDetailOverflows="true"/>
<textElement verticalAlignment="Middle"/>
<textFieldExpression class="java.lang.String"><![CDATA["Date & heure de prélèvement: " + $F{collectionDateTime}]]></textFieldExpression>
</textField>
</band>
</groupHeader>
<groupFooter>
Expand Down Expand Up @@ -428,21 +433,21 @@
<band height="158" splitType="Stretch">
<subreport>
<reportElement x="0" y="0" width="552" height="130" printWhenGroupChanges="person"/>
<subreportParameter name="labName2">
<subreportParameterExpression><![CDATA[$P{additionalSiteInfo}]]></subreportParameterExpression>
</subreportParameter>
<subreportParameter name="SUBREPORT_DIR">
<subreportParameterExpression><![CDATA[$P{SUBREPORT_DIR}]]></subreportParameterExpression>
</subreportParameter>
<subreportParameter name="labName2">
<subreportParameterExpression><![CDATA[$P{additionalSiteInfo}]]></subreportParameterExpression>
</subreportParameter>
<subreportParameter name="orderFinishDate">
<subreportParameterExpression><![CDATA[$F{orderFinishDate}]]></subreportParameterExpression>
</subreportParameter>
<subreportParameter name="siteLogo">
<subreportParameterExpression><![CDATA[$P{siteLogo}]]></subreportParameterExpression>
</subreportParameter>
<subreportParameter name="labName1">
<subreportParameterExpression><![CDATA[$P{siteName}]]></subreportParameterExpression>
</subreportParameter>
<subreportParameter name="siteLogo">
<subreportParameterExpression><![CDATA[$P{siteLogo}]]></subreportParameterExpression>
</subreportParameter>
<subreportParameter name="reportTitle">
<subreportParameterExpression><![CDATA["Résultats d'Analyses"]]></subreportParameterExpression>
</subreportParameter>
Expand Down
Binary file modified app/WebContent/WEB-INF/reports/RejectionReport.jasper
View file
Binary file not shown.
28 changes: 15 additions & 13 deletions app/WebContent/WEB-INF/reports/RejectionReport.jrxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<parameter name="accessionPrefix" class="java.lang.String" isForPrompting="false"/>
<parameter name="startDate" class="java.lang.String" isForPrompting="false"/>
<parameter name="endDate" class="java.lang.String" isForPrompting="false"/>
<parameter name="splitNameAndTest" class="java.lang.Boolean" isForPrompting="false">
<defaultValueExpression><![CDATA[false]]></defaultValueExpression>
<parameter name="isReportByTest" class="java.lang.Boolean" isForPrompting="false">
<defaultValueExpression><![CDATA[Boolean.FALSE]]></defaultValueExpression>
</parameter>
<queryString>
<![CDATA[]]>
Expand Down Expand Up @@ -81,7 +81,7 @@
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="12" isBold="true"/>
</textElement>
<text><![CDATA[Rapport de reject]]></text>
<text><![CDATA[Rapport de Rejet]]></text>
</staticText>
<textField isBlankWhenNull="true">
<reportElement key="textField-2" x="1" y="67" width="554" height="22"/>
Expand Down Expand Up @@ -112,7 +112,7 @@
<columnHeader>
<band height="33" splitType="Stretch">
<staticText>
<reportElement x="61" y="15" width="61" height="15"/>
<reportElement x="71" y="15" width="51" height="15"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<text><![CDATA[réception]]></text>
</staticText>
Expand All @@ -133,7 +133,7 @@
<text><![CDATA[Tech ID]]></text>
</staticText>
<staticText>
<reportElement key="staticText" x="61" y="0" width="61" height="16"/>
<reportElement key="staticText" x="71" y="0" width="51" height="16"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
Expand All @@ -153,7 +153,7 @@
<textFieldExpression class="java.lang.String"><![CDATA["(" + $P{accessionPrefix} + ")"]]></textFieldExpression>
</textField>
<staticText>
<reportElement key="staticText" x="0" y="0" width="61" height="16"/>
<reportElement key="staticText" x="0" y="0" width="71" height="16"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
Expand All @@ -166,29 +166,31 @@
<text><![CDATA[Date de]]></text>
</staticText>
<staticText>
<reportElement x="0" y="16" width="61" height="15"/>
<reportElement x="0" y="16" width="71" height="15"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<text><![CDATA[collection]]></text>
<text><![CDATA[prélèvement]]></text>
</staticText>
<staticText>
<reportElement x="182" y="0" width="163" height="16"/>
<textElement textAlignment="Left" verticalAlignment="Middle"/>
<text><![CDATA[Noms/Code du patient]]></text>
</staticText>
<staticText>
<reportElement x="182" y="16" width="162" height="14"/>
<reportElement x="182" y="16" width="162" height="14">
<printWhenExpression><![CDATA[!$P{isReportByTest}]]></printWhenExpression>
</reportElement>
<textElement/>
<text><![CDATA[Nom du test]]></text>
</staticText>
<staticText>
<reportElement x="345" y="0" width="145" height="30"/>
<textElement verticalAlignment="Middle"/>
<text><![CDATA[Raison de reject]]></text>
<text><![CDATA[Raison de rejet]]></text>
</staticText>
</band>
</columnHeader>
<detail>
<band height="15" splitType="Stretch">
<band height="16" splitType="Stretch">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement mode="Transparent" x="345" y="0" width="130" height="13" isPrintWhenDetailOverflows="true" backcolor="#FFFFFF"/>
<textElement markup="styled"/>
Expand All @@ -207,7 +209,7 @@
<textFieldExpression class="java.lang.String"><![CDATA[$F{technician}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement key="textField" isPrintRepeatedValues="false" mode="Transparent" x="61" y="0" width="61" height="13" printWhenGroupChanges="accession" backcolor="#FFFFFF"/>
<reportElement key="textField" isPrintRepeatedValues="false" mode="Transparent" x="71" y="0" width="51" height="13" printWhenGroupChanges="accession" backcolor="#FFFFFF"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
Expand Down Expand Up @@ -244,7 +246,7 @@
</box>
</frame>
<textField isBlankWhenNull="true">
<reportElement key="textField" mode="Transparent" x="0" y="0" width="61" height="13" backcolor="#FFFFFF"/>
<reportElement key="textField" mode="Transparent" x="0" y="0" width="71" height="13" backcolor="#FFFFFF"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
Expand Down
Binary file modified app/WebContent/WEB-INF/reports/WorkplanResultsByTest.jasper
View file
Binary file not shown.
18 changes: 9 additions & 9 deletions app/WebContent/WEB-INF/reports/WorkplanResultsByTest.jrxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,7 @@
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{receivedDate}]]></textFieldExpression>
</textField>
<line>
<reportElement key="line-2" x="1" y="14" width="557" height="1"/>
<graphicElement fill="Solid">
<pen lineWidth="0.5" lineStyle="Solid"/>
</graphicElement>
</line>
<textField isBlankWhenNull="true">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement mode="Transparent" x="222" y="0" width="91" height="13" backcolor="#FFFFFF">
<printWhenExpression><![CDATA[$P{printSubjectNo}]]></printWhenExpression>
</reportElement>
Expand All @@ -175,11 +169,17 @@
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{accessionNumber}.substring($P{prefixLength})]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement mode="Transparent" x="222" y="0" width="189" height="13" backcolor="#FFFFFF"/>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement mode="Transparent" x="222" y="0" width="189" height="13" isPrintWhenDetailOverflows="true" backcolor="#FFFFFF"/>
<textElement verticalAlignment="Middle"/>
<textFieldExpression class="java.lang.String"><![CDATA[$F{patientName}]]></textFieldExpression>
</textField>
<frame>
<reportElement stretchType="RelativeToBandHeight" x="0" y="0" width="550" height="15"/>
<box>
<bottomPen lineWidth="0.25"/>
</box>
</frame>
</band>
</detail>
<columnFooter>
Expand Down
Binary file modified app/WebContent/WEB-INF/reports/WorkplanResultsByTestSection.jasper
View file
Binary file not shown.
Loading

0 comments on commit 7468c26

Please sign in to comment.