dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6230
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-03-09 15:19:09 +0700
message:
  (patient) Minor fix for Tabular report.
modified:
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/tabularReport.js


--
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-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2012-03-09 03:20:39 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2012-03-09 08:19:09 +0000
@@ -198,8 +198,8 @@
         attrGrid.setTitle( patient.getFullName() );
         attrGrid.setSubtitle( "" );
 
-        attrGrid.addHeader( new GridHeader( i18n.getString( "name" ), false, false ) );
-        attrGrid.addHeader( new GridHeader( i18n.getString( "value" ), false, false ) );
+        attrGrid.addHeader( new GridHeader( i18n.getString( "name" ), false, true ) );
+        attrGrid.addHeader( new GridHeader( i18n.getString( "value" ), false, true ) );
         attrGrid.addHeader( new GridHeader( "", true, false ) );
         
         Collection<PatientAttribute> patientAttributes = patient.getAttributes();

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java	2012-03-09 07:59:38 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java	2012-03-09 08:19:09 +0000
@@ -252,8 +252,8 @@
             // Headers
             // ---------------------------------------------------------------------
 
-            grid.addHeader( new GridHeader( i18n.getString( "name" ), false, false ) );
-            grid.addHeader( new GridHeader( i18n.getString( "value" ), false, false ) );
+            grid.addHeader( new GridHeader( i18n.getString( "name" ), false, true ) );
+            grid.addHeader( new GridHeader( i18n.getString( "value" ), false, true ) );
 
             // ---------------------------------------------------------------------
             // Values
@@ -322,7 +322,7 @@
 
             for ( DataElement dataElement : dataElements )
             {
-                grid.addHeader( new GridHeader( dataElement.getName(), false, false ) );
+                grid.addHeader( new GridHeader( dataElement.getName(), false, true ) );
             }
 
             if ( !anonymous )
@@ -365,7 +365,7 @@
                     grid.addValue( programStageInstance.getProgramInstance().getPatient()
                         .getId() );
                 }
-                else
+                else if( !anonymous )
                 {
                     grid.addValue( "" );
                 }

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/tabularReport.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/tabularReport.js	2012-03-09 07:59:38 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/tabularReport.js	2012-03-09 08:19:09 +0000
@@ -2,9 +2,6 @@
 function organisationUnitSelected( orgUnits, orgUnitNames )
 {
 	setInnerHTML( 'contentDiv' , '');
-	clearListById( 'programStageId' );
-	clearListById( 'availableDataElementIds' );
-	clearListById( 'dataElementIds' );
 	setFieldValue( 'orgunitname', orgUnitNames[0] );
 			
 	showCriteria();