dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #16215
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6110: (patient) Minor fix for program report.
------------------------------------------------------------
revno: 6110
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2012-02-25 10:16:51 +0700
message:
(patient) Minor fix for program report.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPatient.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEventReport.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPatient.vm 2011-12-21 10:15:27 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPatient.vm 2012-02-25 03:16:51 +0000
@@ -1,4 +1,7 @@
-<table>
+<table class='mainPageTable'>
+ <tr>
+ <th colspan='2'><label class="bold">$i18n.getString( "demographics" )</label></th>
+ </tr>
<tr>
<td>
<label class="bold">$i18n.getString('full_name') : </label>
@@ -7,7 +10,7 @@
$patient.getFullName()
</td>
</tr>
- <tr>
+ <tr #alternate( true )>
<td>
<label class="bold">$i18n.getString('gender') : </label>
</td>
@@ -22,7 +25,7 @@
$!patient.dobType
</td>
</tr>
- <tr>
+ <tr #alternate( true )>
<td><label class="bold">$i18n.getString('date_of_birth') : </label>
</td>
<td>
@@ -39,10 +42,11 @@
<tr><td> </td></tr>
<tr>
- <td><label class="bold">$i18n.getString( "identifiers" )</label></td>
+ <th colspan='2'><label class="bold">$i18n.getString( "identifiers" )</label></th>
</tr>
+ #set( $mark = false )
#foreach( $patientIdentifier in $patient.identifiers )
- <tr>
+ <tr #alternate( $mark )>
<td>
<label class="bold">
#if($!patientIdentifier.identifierType) $!patientIdentifier.identifierType.name
@@ -53,15 +57,17 @@
$patientIdentifier.identifier
</td>
</tr>
+ #set( $mark = !$mark )
#end
<tr><td colspan='2'> </td></tr>
<tr>
- <td colspan='2'><label class="bold">$i18n.getString( "attributes" )</label></td>
+ <th colspan='2'><label class="bold">$i18n.getString( "attributes" )</label></th>
</tr>
+ #set( $mark = false )
#foreach( $attribute in $patient.attributes )
#if( $patientAttributeValueMap.get( $attribute.id ) != " " )
- <tr>
+ <tr #alternate( $mark )>
<td><label class="bold">$attribute.name : </label>
</td>
<td>
@@ -72,16 +78,19 @@
#end
</td>
</tr>
+ #set( $mark = !$mark )
#end
#end
<tr><td> </td></tr>
<tr>
- <td><label class="bold">$i18n.getString( "enrolled_in_program" )</label></td>
- <td>
- #foreach( $program in $patient.programs )
- $program.name<br>
- #end
- </td>
- </tr>
+ <th colspan='2'><label class="bold">$i18n.getString( "enrolled_in_program" )</label></th>
+ </tr>
+ #set( $mark = false )
+ #foreach( $program in $patient.programs )
+ <tr #alternate( $mark )>
+ <td colspan='2' >$program.name</td>
+ </tr>
+ #set( $mark = !$mark )
+ #end
</table>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2012-02-23 09:58:41 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2012-02-25 03:16:51 +0000
@@ -109,7 +109,7 @@
title: i18n_patient_details,
maximize: true,
closable: true,
- modal:true,
+ modal:false,
overlay:{background:'#000000', opacity:0.1},
width: 450,
height: 400
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js 2012-02-23 09:58:41 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js 2012-02-25 03:16:51 +0000
@@ -98,20 +98,3 @@
height: 400
});
}
-
-function patientDetails( patientId )
-{
- jQuery('#patientDetailsArea' ).load( 'getPatientDetails.action?id=' + patientId
- ,function(){
- hideById('closeBtn');
- $( "#loaderDiv" ).hide();
- }).dialog({
- title: i18n_patient_profile,
- maximize: true,
- closable: true,
- modal:true,
- overlay:{background:'#000000', opacity:0.1},
- width: 450,
- height: 400
- });
-}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEventReport.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEventReport.js 2012-02-22 09:14:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEventReport.js 2012-02-25 03:16:51 +0000
@@ -64,7 +64,13 @@
,function( )
{
showById('entryFormContainer');
- $("#entryForm :input").attr("disabled", true);
+ jQuery("#entryFormContainer :input").attr("disabled", true);
+ jQuery("#entryFormContainer .ui-datepicker-trigger").each(function()
+ {
+ jQuery(this).hide();
+ });
+
+
}).dialog({
title: i18n_reports,
maximize: true,
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm 2011-12-22 05:33:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm 2012-02-25 03:16:51 +0000
@@ -25,7 +25,7 @@
#set( $nr = ( ( $paging.getCurrentPage() - 1 ) * $paging.pageSize ) + $velocityCount )
$nr
</td>
- <td><a href="javascript:patientDetails( $programInstance.patient.id )" title='$i18n.getString( "show_details" )'>$programInstance.patient.getFullName()</a></td>
+ <td><a href="javascript:showPatientDetails( $programInstance.patient.id )" title='$i18n.getString( "show_details" )'>$programInstance.patient.getFullName()</a></td>
#foreach( $programStageInstance in $programInstance.programStageInstances )
#if( $programStageInstance.executionDate )
<td style="text-align:center" bgcolor="$colorMap.get( $programStageInstance.id )">
@@ -60,4 +60,6 @@
<div id="viewRecordsDiv"></div>
#end
-<p></p>
\ No newline at end of file
+<script>
+ var i18n_patient_details = '$encoder.jsEscape( $i18n.getString( "patient_details" ) , "'" )';
+</script>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm 2012-02-23 09:58:41 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm 2012-02-25 03:16:51 +0000
@@ -60,7 +60,7 @@
#parse( "dhis-web-commons/loader/loader.vm" )
<div id="contentDiv"></div>
-<div id="patientDetailsArea" style="display:none;"></div>
+<div id="detailsInfo" style="display:none;"></div>
<span id="message"></span>
