Skip to content

Commit

Permalink
Merge pull request #695 from openelisglobal/develop
Browse files Browse the repository at this point in the history 
OE 6.2
  • Loading branch information
@caseyi
caseyi authored Dec 6, 2016
2 parents 3d2e2ac + 4793ec6 commit 2867a1c
Show file tree
Hide file tree
Showing 165 changed files with 21,641 additions and 1,318 deletions.
10 changes: 10 additions & 0 deletions app/WebContent/META-INF/context.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<Context path="openElisGlobal-core">
<Resource auth="Container"
driverClassName="org.postgresql.Driver"
maxActive="20" maxIdle="10" maxWait="-1"
name="jdbc/LimsDS"
password="clinlims"
type="javax.sql.DataSource"
url="jdbc:postgresql://localhost:5432/regional"
username="clinlims"/>
</Context>
Binary file modified app/WebContent/WEB-INF/reports/GeneralHeader.jasper
View file
Binary file not shown.
Binary file modified app/WebContent/WEB-INF/reports/PatientReportCDI.jasper
View file
Binary file not shown.
443 changes: 250 additions & 193 deletions app/WebContent/WEB-INF/reports/PatientReportCDI.jrxml
View file

Large diffs are not rendered by default.

Binary file added app/WebContent/WEB-INF/reports/PatientReportCDI_vreduit.jasper
View file
Binary file not shown.
971 changes: 971 additions & 0 deletions app/WebContent/WEB-INF/reports/PatientReportCDI_vreduit.jrxml
View file

Large diffs are not rendered by default.

Binary file modified app/WebContent/WEB-INF/reports/Patient_ARV_Followup_patient_info.jasper
View file
Binary file not shown.
119 changes: 78 additions & 41 deletions app/WebContent/WEB-INF/reports/Patient_ARV_Followup_patient_info.jrxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<import value="net.sf.jasperreports.engine.*"/>
<import value="java.util.*"/>
<import value="net.sf.jasperreports.engine.data.*"/>
<import value="java.util.*"/>
<parameter name="subjectNumber" class="java.lang.String"/>
<parameter name="birth_date" class="java.lang.String" isForPrompting="false"/>
<parameter name="age" class="java.lang.String" isForPrompting="false"/>
Expand Down Expand Up @@ -40,88 +40,88 @@
<detail>
<band height="74" splitType="Stretch">
<textField pattern="" isBlankWhenNull="true">
<reportElement key="textField" x="96" y="18" width="100" height="18" forecolor="#000000" backcolor="#FFFFFF"/>
<reportElement key="textField" x="58" y="18" width="87" height="18" forecolor="#000000" backcolor="#FFFFFF"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineColor="#000000"/>
<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement>
<font size="12"/>
<font size="10"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$P{birth_date}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="true">
<reportElement key="textField" x="96" y="36" width="100" height="18" forecolor="#000000" backcolor="#FFFFFF"/>
<reportElement key="textField" x="58" y="36" width="87" height="18" forecolor="#000000" backcolor="#FFFFFF"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineColor="#000000"/>
<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement>
<font size="12"/>
<font size="10"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$P{age}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="true">
<reportElement key="textField" x="96" y="54" width="100" height="18" forecolor="#000000" backcolor="#FFFFFF"/>
<reportElement key="textField" x="58" y="54" width="87" height="18" forecolor="#000000" backcolor="#FFFFFF"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineColor="#000000"/>
<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement>
<font size="12"/>
<font size="10"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$P{gender}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="true">
<reportElement key="textField" x="437" y="18" width="115" height="18" forecolor="#000000" backcolor="#FFFFFF"/>
<reportElement key="textField" x="251" y="36" width="88" height="18" forecolor="#000000" backcolor="#FFFFFF"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineColor="#000000"/>
<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement>
<font size="12"/>
<font size="10"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$P{receptiondate}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="true">
<reportElement key="textField" mode="Transparent" x="248" y="0" width="85" height="18" forecolor="#000000" backcolor="#FFFFFF"/>
<reportElement key="textField" mode="Transparent" x="186" y="0" width="127" height="18" forecolor="#000000" backcolor="#FFFFFF"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineColor="#000000"/>
<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement>
<font size="12"/>
<font size="10" isBold="true"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$P{labNo}]]></textFieldExpression>
</textField>
<rectangle>
<reportElement key="rectangle-1" x="206" y="35" width="346" height="36" backcolor="#F8F8F8"/>
<reportElement key="rectangle-1" x="339" y="17" width="213" height="53" backcolor="#F8F8F8"/>
</rectangle>
<textField pattern="" isBlankWhenNull="true">
<reportElement key="textField" x="285" y="55" width="263" height="17" forecolor="#000000" backcolor="#FFFFFF"/>
<reportElement key="textField" x="403" y="36" width="149" height="17" forecolor="#000000" backcolor="#FFFFFF"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineColor="#000000"/>
<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement>
<font size="12"/>
<font size="10"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$P{orgname}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="true">
<reportElement key="textField" x="285" y="36" width="263" height="17" forecolor="#000000" backcolor="#FFFFFF">
<reportElement key="textField" x="408" y="18" width="144" height="17" forecolor="#000000" backcolor="#FFFFFF">
<printWhenExpression><![CDATA[$P{showDoctor}]]></printWhenExpression>
</reportElement>
<box>
Expand All @@ -131,66 +131,82 @@
<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement>
<font size="12"/>
<font size="10"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$P{doctor}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="false">
<reportElement key="textField-3" x="96" y="0" width="100" height="18"/>
<textElement/>
<reportElement key="textField-3" x="58" y="0" width="87" height="18"/>
<textElement>
<font size="9" isBold="true"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$P{subjectNumber}]]></textFieldExpression>
</textField>
<staticText>
<reportElement key="staticText-1" x="208" y="54" width="77" height="18"/>
<textElement/>
<text><![CDATA[Nom du Centre]]></text>
<reportElement key="staticText-1" x="340" y="36" width="58" height="18"/>
<textElement>
<font isBold="true"/>
</textElement>
<text><![CDATA[Service:]]></text>
</staticText>
<staticText>
<reportElement key="staticText-2" x="0" y="0" width="89" height="18"/>
<textElement/>
<reportElement key="staticText-2" x="0" y="0" width="55" height="18"/>
<textElement>
<font isBold="true"/>
</textElement>
<text><![CDATA[Sujetno: ]]></text>
</staticText>
<staticText>
<reportElement key="staticText-3" x="0" y="18" width="89" height="18"/>
<textElement/>
<text><![CDATA[Date de Naissance:]]></text>
<reportElement key="staticText-3" x="0" y="18" width="58" height="18"/>
<textElement>
<font isBold="true"/>
</textElement>
<text><![CDATA[Date Naiss.:]]></text>
</staticText>
<staticText>
<reportElement key="staticText-4" x="0" y="36" width="89" height="18"/>
<textElement/>
<reportElement key="staticText-4" x="0" y="36" width="55" height="18"/>
<textElement>
<font isBold="true"/>
</textElement>
<text><![CDATA[Age:]]></text>
</staticText>
<staticText>
<reportElement key="staticText-5" x="0" y="54" width="89" height="18"/>
<textElement/>
<reportElement key="staticText-5" x="0" y="54" width="55" height="18"/>
<textElement>
<font isBold="true"/>
</textElement>
<text><![CDATA[Sexe:]]></text>
</staticText>
<staticText>
<reportElement key="staticText-6" x="208" y="0" width="41" height="18"/>
<textElement/>
<reportElement key="staticText-6" x="145" y="0" width="41" height="18"/>
<textElement>
<font isBold="true"/>
</textElement>
<text><![CDATA[Labno:]]></text>
</staticText>
<staticText>
<reportElement key="staticText-7" x="347" y="0" width="90" height="18"/>
<reportElement key="staticText-7" x="145" y="18" width="106" height="18"/>
<textElement/>
<text><![CDATA[Date/Heure Prél.]]></text>
<text><![CDATA[Date/Heure Prél.:]]></text>
</staticText>
<staticText>
<reportElement key="staticText-8" x="208" y="36" width="77" height="18">
<reportElement key="staticText-8" x="340" y="18" width="63" height="17">
<printWhenExpression><![CDATA[$P{showDoctor}]]></printWhenExpression>
</reportElement>
<textElement/>
<text><![CDATA[Médecin]]></text>
<textElement>
<font isBold="true"/>
</textElement>
<text><![CDATA[Prescripteur:]]></text>
</staticText>
<staticText>
<reportElement key="staticText-7" x="347" y="18" width="90" height="18">
<reportElement key="staticText-7" x="145" y="36" width="106" height="18">
<printWhenExpression><![CDATA[$P{receptiondate} != ""]]></printWhenExpression>
</reportElement>
<textElement/>
<text><![CDATA[Date de réception:]]></text>
<text><![CDATA[Date/Heure Réception:]]></text>
</staticText>
<textField pattern="" isBlankWhenNull="true">
<reportElement key="textField" x="437" y="0" width="115" height="18" forecolor="#000000" backcolor="#FFFFFF">
<reportElement key="textField" x="251" y="18" width="88" height="18" forecolor="#000000" backcolor="#FFFFFF">
<printWhenExpression><![CDATA[$P{receptiondate} != ""]]></printWhenExpression>
</reportElement>
<box>
Expand All @@ -200,10 +216,31 @@
<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement>
<font size="12"/>
<font size="10"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$P{collectiondate}]]></textFieldExpression>
</textField>
<staticText>
<reportElement key="staticText-7" x="145" y="54" width="106" height="18">
<printWhenExpression><![CDATA[$P{receptiondate} != ""]]></printWhenExpression>
</reportElement>
<textElement/>
<text><![CDATA[Eatat de l'échantillon:]]></text>
</staticText>
<staticText>
<reportElement key="staticText-7" x="251" y="54" width="88" height="18">
<printWhenExpression><![CDATA[$P{receptiondate} != ""]]></printWhenExpression>
</reportElement>
<textElement/>
<text><![CDATA[Normal]]></text>
</staticText>
<staticText>
<reportElement key="staticText-1" x="340" y="54" width="58" height="18"/>
<textElement>
<font isBold="true"/>
</textElement>
<text><![CDATA[Adresse:]]></text>
</staticText>
</band>
</detail>
<columnFooter>
Expand Down
Binary file modified app/WebContent/WEB-INF/reports/Patient_ARV_Version1.jasper
View file
Binary file not shown.
Loading

0 comments on commit 2867a1c

Please sign in to comment.