Merge pull request #670 from openelisglobal/develop

6.1 release
openelisglobal · Jul 21, 2016 · 3d2e2ac · 3d2e2ac
2 parents 2cbb4b6 + ce3a04f
commit 3d2e2ac
Show file tree

Hide file tree

Showing 392 changed files with 21,084 additions and 3,442 deletions.
diff --git a/app/WebContent/WEB-INF/lib/commons-collections-2.1.jar b/app/WebContent/WEB-INF/lib/commons-collections-2.1.jar
diff --git a/app/WebContent/WEB-INF/lib/commons-collections4-4.0.jar b/app/WebContent/WEB-INF/lib/commons-collections4-4.0.jar
diff --git a/app/WebContent/WEB-INF/reports/ActivityReport.jasper b/app/WebContent/WEB-INF/reports/ActivityReport.jasper
diff --git a/app/WebContent/WEB-INF/reports/ActivityReport.jrxml b/app/WebContent/WEB-INF/reports/ActivityReport.jrxml
@@ -57,7 +57,7 @@
 				<textElement textAlignment="Left" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.util.Date"><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
-			<image>
+			<image isUsingCache="true">
 				<reportElement x="1" y="1" width="65" height="64"/>
 				<imageExpression class="java.io.InputStream"><![CDATA[$P{leftHeaderImage}]]></imageExpression>
 			</image>

diff --git a/app/WebContent/WEB-INF/reports/CDIHeader.jasper b/app/WebContent/WEB-INF/reports/CDIHeader.jasper
diff --git a/app/WebContent/WEB-INF/reports/CDIHeader.jrxml b/app/WebContent/WEB-INF/reports/CDIHeader.jrxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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="RetroCIHeader" pageWidth="572" pageHeight="136" orientation="Landscape" whenNoDataType="AllSectionsNoDetail" columnWidth="572" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" resourceBundle="MessageResources">
+<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="RetroCIHeader" pageWidth="572" pageHeight="94" orientation="Landscape" whenNoDataType="AllSectionsNoDetail" columnWidth="572" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" resourceBundle="MessageResources">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
-	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.zoom" value="2.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<property name="ireport.callouts" value="##Fri Dec 05 10:30:04 PST 2014"/>
@@ -41,52 +41,56 @@
 		<band splitType="Stretch"/>
 	</columnHeader>
 	<detail>
-		<band height="136" splitType="Stretch">
+		<band height="94" splitType="Stretch">
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-1" x="102" y="116" width="366" height="20">
+				<reportElement key="textField-1" x="2" y="79" width="568" height="13">
 					<printWhenExpression><![CDATA[$P{directorName} != null]]></printWhenExpression>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="10"/>
+				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[$R{report.labManager} + ": " + $P{directorName}]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report" pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement key="textField" x="176" y="95" width="226" height="20">
+				<reportElement key="textField" x="80" y="51" width="412" height="17">
 					<printWhenExpression><![CDATA[$P{orderFinishDate} != null]]></printWhenExpression>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="10"/>
+				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[($P{localization} == null ?  "Date d'achèvement" : $P{localization}.get("collectionDate") ) + ": " + $P{orderFinishDate}]]></textFieldExpression>
 			</textField>
 			<image isUsingCache="true">
-				<reportElement x="0" y="20" width="118" height="100"/>
+				<reportElement x="2" y="2" width="100" height="88"/>
 				<imageExpression class="java.io.InputStream"><![CDATA[$P{leftHeaderImage}]]></imageExpression>
 			</image>
-			<image isUsingCache="true">
-				<reportElement x="468" y="18" width="102" height="102">
-					<printWhenExpression><![CDATA[]]></printWhenExpression>
-				</reportElement>
-				<imageExpression class="java.io.InputStream"><![CDATA[$P{rightHeaderImage}]]></imageExpression>
-			</image>
 			<textField isBlankWhenNull="true">
-				<reportElement x="58" y="5" width="450" height="20"/>
+				<reportElement x="2" y="2" width="568" height="13"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="true"/>
+					<font size="10" isBold="true"/>
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[$P{labName1}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement positionType="Float" x="97" y="46" width="371" height="24"/>
+				<reportElement positionType="Float" x="131" y="31" width="310" height="16"/>
 				<textElement textAlignment="Center">
-					<font size="16" isBold="true"/>
+					<font size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[$P{reportTitle}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="102" y="26" width="366" height="20" backcolor="#FFFFFF"/>
+				<reportElement mode="Transparent" x="2" y="16" width="568" height="13" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle" markup="html">
-					<font size="12" isBold="true"/>
+					<font size="10" isBold="true"/>
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[$P{labName2}]]></textFieldExpression>
 			</textField>
+			<elementGroup>
+				<image hAlign="Right" isUsingCache="true">
+					<reportElement x="470" y="3" width="100" height="88"/>
+					<imageExpression class="java.io.InputStream"><![CDATA[$P{rightHeaderImage}]]></imageExpression>
+				</image>
+			</elementGroup>
 		</band>
 	</detail>
 	<columnFooter>

diff --git a/app/WebContent/WEB-INF/reports/CILNSPFooter.jasper b/app/WebContent/WEB-INF/reports/CILNSPFooter.jasper
diff --git a/app/WebContent/WEB-INF/reports/GeneralHeader.jasper b/app/WebContent/WEB-INF/reports/GeneralHeader.jasper
diff --git a/app/WebContent/WEB-INF/reports/LabAggregate.jasper b/app/WebContent/WEB-INF/reports/LabAggregate.jasper
diff --git a/app/WebContent/WEB-INF/reports/LabAggregate.jrxml b/app/WebContent/WEB-INF/reports/LabAggregate.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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="HaitiHIVSummary" pageWidth="612" pageHeight="792" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isSummaryWithPageHeaderAndFooter="true">
+<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="LabAggregate" pageWidth="612" pageHeight="792" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isSummaryWithPageHeaderAndFooter="true" resourceBundle="MessageResources">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -15,14 +15,15 @@
 		<defaultValueExpression><![CDATA["../reports/"]]></defaultValueExpression>
 	</parameter>
 	<parameter name="headerName" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["HaitiHeader.jasper"]]></defaultValueExpression>
+		<defaultValueExpression><![CDATA["GeneralHeader.jasper"]]></defaultValueExpression>
 	</parameter>
 	<parameter name="usePageNumbers" class="java.lang.String" isForPrompting="false">
 		<defaultValueExpression><![CDATA["true"]]></defaultValueExpression>
 	</parameter>
 	<parameter name="directorName" class="java.lang.String"/>
 	<parameter name="rightHeaderImage" class="java.io.InputStream" isForPrompting="false"/>
 	<parameter name="localization" class="java.util.Map" isForPrompting="false"/>
+	<parameter name="leftHeaderImage" class="java.io.InputStream" isForPrompting="false"/>
 	<field name="testName" class="java.lang.String"/>
 	<field name="sectionName" class="java.lang.String"/>
 	<field name="notStarted" class="java.lang.Integer"/>
@@ -82,30 +83,39 @@
 		</groupHeader>
 		<groupFooter>
 			<band height="24">
+				<printWhenExpression><![CDATA[$V{totalTotal} != 0]]></printWhenExpression>
 				<textField>
-					<reportElement x="4" y="0" width="100" height="20"/>
+					<reportElement x="4" y="0" width="100" height="20">
+						<printWhenExpression><![CDATA[$V{totalTotal} != 0]]></printWhenExpression>
+					</reportElement>
 					<textElement verticalAlignment="Middle">
 						<font size="12" isBold="true"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$P{localization}.get("total")]]></textFieldExpression>
+					<textFieldExpression class="java.lang.String"><![CDATA[$R{report.total}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement x="294" y="0" width="70" height="20"/>
+					<reportElement x="294" y="0" width="70" height="20">
+						<printWhenExpression><![CDATA[$V{totalTotal} != 0]]></printWhenExpression>
+					</reportElement>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="12" isBold="true"/>
 					</textElement>
 					<textFieldExpression class="java.lang.Integer"><![CDATA[$V{notStartedTotal}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement x="504" y="0" width="70" height="20"/>
+					<reportElement x="504" y="0" width="70" height="20">
+						<printWhenExpression><![CDATA[$V{totalTotal} != 0]]></printWhenExpression>
+					</reportElement>
 					<box rightPadding="4"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="12" isBold="true"/>
 					</textElement>
 					<textFieldExpression class="java.lang.Integer"><![CDATA[$V{totalTotal}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement x="434" y="0" width="70" height="20"/>
+					<reportElement x="434" y="0" width="70" height="20">
+						<printWhenExpression><![CDATA[$V{totalTotal} != 0]]></printWhenExpression>
+					</reportElement>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="12" isBold="true"/>
 					</textElement>
@@ -131,31 +141,55 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="24" isBold="true"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{localization}.get("globalLabReport")]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{report.globalLabReport}]]></textFieldExpression>
 			</textField>
 			<subreport>
 				<reportElement x="0" y="0" width="572" height="136"/>
+				<subreportParameter name="SUBREPORT_DIR">
+					<subreportParameterExpression><![CDATA[$P{SUBREPORT_DIR}]]></subreportParameterExpression>
+				</subreportParameter>
+				<subreportParameter name="leftHeaderImage">
+					<subreportParameterExpression><![CDATA[$P{leftHeaderImage}]]></subreportParameterExpression>
+				</subreportParameter>
 				<subreportParameter name="labName2">
 					<subreportParameterExpression><![CDATA[$P{labName2}]]></subreportParameterExpression>
 				</subreportParameter>
-				<subreportParameter name="SUBREPORT_DIR">
-					<subreportParameterExpression><![CDATA[$P{SUBREPORT_DIR}]]></subreportParameterExpression>
+				<subreportParameter name="startDate">
+					<subreportParameterExpression><![CDATA[$P{startDate}]]></subreportParameterExpression>
+				</subreportParameter>
+				<subreportParameter name="stopDate">
+					<subreportParameterExpression><![CDATA[$P{stopDate}]]></subreportParameterExpression>
 				</subreportParameter>
 				<subreportParameter name="labName1">
-					<subreportParameterExpression><![CDATA[$P{labName1}]]></subreportParameterExpression>
+					<subreportParameterExpression><![CDATA[$P{siteName}]]></subreportParameterExpression>
 				</subreportParameter>
-				<subreportParameter name="reportTitle">
-					<subreportParameterExpression><![CDATA[$P{reportTitle}]]></subreportParameterExpression>
+				<subreportParameter name="siteId">
+					<subreportParameterExpression><![CDATA[$P{siteId}]]></subreportParameterExpression>
 				</subreportParameter>
 				<subreportParameter name="localization">
 					<subreportParameterExpression><![CDATA[$P{localization}]]></subreportParameterExpression>
 				</subreportParameter>
+				<subreportParameter name="reportTitle">
+					<subreportParameterExpression><![CDATA[$P{reportTitle}]]></subreportParameterExpression>
+				</subreportParameter>
+				<subreportParameter name="usePageNumbers">
+					<subreportParameterExpression><![CDATA[$P{usePageNumbers}]]></subreportParameterExpression>
+				</subreportParameter>
+				<subreportParameter name="referralSiteName">
+					<subreportParameterExpression><![CDATA[$P{referralSiteName}]]></subreportParameterExpression>
+				</subreportParameter>
 				<subreportParameter name="rightHeaderImage">
 					<subreportParameterExpression><![CDATA[$P{rightHeaderImage}]]></subreportParameterExpression>
 				</subreportParameter>
 				<subreportParameter name="directorName">
 					<subreportParameterExpression><![CDATA[$P{directorName}]]></subreportParameterExpression>
 				</subreportParameter>
+				<subreportParameter name="headerName">
+					<subreportParameterExpression><![CDATA[$P{headerName}]]></subreportParameterExpression>
+				</subreportParameter>
+				<subreportParameter name="siteName">
+					<subreportParameterExpression><![CDATA[$P{siteName}]]></subreportParameterExpression>
+				</subreportParameter>
 				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.JREmptyDataSource()]]></dataSourceExpression>
 				<subreportExpression class="java.lang.String"><![CDATA[$P{SUBREPORT_DIR} + $P{headerName}]]></subreportExpression>
 			</subreport>
@@ -194,36 +228,36 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{localization}.get("notStarted")]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{report.notStarted}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement x="4" y="4" width="80" height="40"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{localization}.get("test")]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{report.test}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement x="364" y="4" width="70" height="40"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{localization}.get("inProgress")]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{report.inProgress}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement x="434" y="4" width="70" height="40"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{localization}.get("complete")]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{report.complete}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement x="504" y="4" width="70" height="40"/>
 				<box rightPadding="4"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{localization}.get("total")]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{report.total}]]></textFieldExpression>
 			</textField>
 		</band>
 	</columnHeader>
@@ -232,23 +266,29 @@
 			<frame>
 				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="573" height="21" isPrintWhenDetailOverflows="true"/>
 				<textField>
-					<reportElement x="504" y="0" width="68" height="20"/>
+					<reportElement x="504" y="0" width="68" height="20" isRemoveLineWhenBlank="true">
+						<printWhenExpression><![CDATA[$F{testName} != null]]></printWhenExpression>
+					</reportElement>
 					<box rightPadding="4"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle"/>
 					<textFieldExpression class="java.lang.Integer"><![CDATA[$F{total}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement x="294" y="1" width="70" height="20"/>
+					<reportElement x="314" y="1" width="50" height="20" isRemoveLineWhenBlank="true">
+						<printWhenExpression><![CDATA[$F{testName} != null]]></printWhenExpression>
+					</reportElement>
 					<textElement textAlignment="Right" verticalAlignment="Middle"/>
 					<textFieldExpression class="java.lang.Integer"><![CDATA[$F{notStarted}]]></textFieldExpression>
 				</textField>
-				<textField isStretchWithOverflow="true">
-					<reportElement stretchType="RelativeToBandHeight" mode="Transparent" x="4" y="0" width="280" height="20" isPrintWhenDetailOverflows="true" backcolor="#FFFFFF"/>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToBandHeight" mode="Transparent" x="4" y="0" width="310" height="20" isPrintWhenDetailOverflows="true" backcolor="#FFFFFF"/>
 					<textElement verticalAlignment="Middle"/>
-					<textFieldExpression class="java.lang.String"><![CDATA[$F{testName}]]></textFieldExpression>
+					<textFieldExpression class="java.lang.String"><![CDATA[$F{testName} != null ? $F{testName} : $R{report.no.section.tests}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement x="364" y="1" width="70" height="20"/>
+					<reportElement x="364" y="1" width="70" height="20" isRemoveLineWhenBlank="true">
+						<printWhenExpression><![CDATA[$F{testName} != null]]></printWhenExpression>
+					</reportElement>
 					<textElement textAlignment="Right" verticalAlignment="Middle"/>
 					<textFieldExpression class="java.lang.Integer"><![CDATA[$F{inProgress}]]></textFieldExpression>
 				</textField>
@@ -259,7 +299,9 @@
 					</graphicElement>
 				</line>
 				<textField>
-					<reportElement x="434" y="1" width="70" height="20"/>
+					<reportElement x="434" y="1" width="70" height="20" isRemoveLineWhenBlank="true">
+						<printWhenExpression><![CDATA[$F{testName} != null]]></printWhenExpression>
+					</reportElement>
 					<textElement textAlignment="Right" verticalAlignment="Middle"/>
 					<textFieldExpression class="java.lang.Integer"><![CDATA[$F{finished}]]></textFieldExpression>
 				</textField>
@@ -290,7 +332,18 @@
 				<textElement markup="styled">
 					<font size="9"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{localization}.get("footNote")]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{report.footNote}]]></textFieldExpression>
+			</textField>
+			<textField pattern="MM/dd/yyyy">
+				<reportElement x="284" y="17" width="121" height="20"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression class="java.util.Date"><![CDATA[new java.util.Date()]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="194" y="17" width="90" height="20"/>
+				<box rightPadding="4"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle" markup="none"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{referral.report.date}]]></textFieldExpression>
 			</textField>
 		</band>
 	</pageFooter>
@@ -304,7 +357,7 @@
 				<textElement verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{localization}.get("labTotal")]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{report.labTotal}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement x="294" y="2" width="70" height="20"/>

diff --git a/app/WebContent/WEB-INF/reports/NonConformityByReceivedDate.jasper b/app/WebContent/WEB-INF/reports/NonConformityByReceivedDate.jasper