dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7453
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-06-29 10:08:25 +0700
message:
  local vn - Fixed query and added new more 6 element-columns for ICD report.
modified:
  local/vn/dhis-web-dataentry-hospital/src/main/java/org/hisp/dhis/de/action/ShowICDReportAction.java
  local/vn/dhis-web-dataentry-hospital/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties


--
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 'local/vn/dhis-web-dataentry-hospital/src/main/java/org/hisp/dhis/de/action/ShowICDReportAction.java'
--- local/vn/dhis-web-dataentry-hospital/src/main/java/org/hisp/dhis/de/action/ShowICDReportAction.java	2012-06-28 08:17:52 +0000
+++ local/vn/dhis-web-dataentry-hospital/src/main/java/org/hisp/dhis/de/action/ShowICDReportAction.java	2012-06-29 03:08:25 +0000
@@ -72,7 +72,8 @@
      * This would be the title showed in ICD REPORTING FORM
      */
     private static final String[] titles = { "icd_element_1", "icd_element_2", "icd_element_3", "icd_element_4",
-        "icd_element_5", "icd_element_6" };
+        "icd_element_5", "icd_element_6", "icd_element_7", "icd_element_8", "icd_element_9", "icd_element_10",
+        "icd_element_11", "icd_element_12" };
 
     // -------------------------------------------------------------------------
     // Dependencies
@@ -170,7 +171,7 @@
         StringBuffer sqlsb = new StringBuffer();
 
         sqlsb
-            .append( "SELECT av.attributevalueid, av.value AS Disease, sorted_de.dataelementid, dv.value, 1 as col_index " );
+            .append( "SELECT av.attributevalueid, av.value AS Disease, sorted_de.dataelementid, dv.value, sorted_de.column_index " );
         sqlsb.append( "FROM datavalue AS dv " );
         sqlsb.append( "JOIN (" + getOrderedDataElement() );
         sqlsb.append( ") AS sorted_de ON (dv.dataelementid = sorted_de.dataelementid) " );
@@ -195,7 +196,8 @@
 
         for ( String title : titles )
         {
-            grid.addHeader( new GridHeader( i18n.getString( title ), String.valueOf( column ), String.class.getName(), false, false ) );
+            grid.addHeader( new GridHeader( i18n.getString( title ), String.valueOf( column ), String.class.getName(),
+                false, false ) );
             column++;
         }
     }

=== modified file 'local/vn/dhis-web-dataentry-hospital/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties'
--- local/vn/dhis-web-dataentry-hospital/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties	2012-06-28 08:17:52 +0000
+++ local/vn/dhis-web-dataentry-hospital/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties	2012-06-29 03:08:25 +0000
@@ -123,9 +123,15 @@
 attribute_column_index = Ph\u00e2n lo\u1ea1i d\u1eef li\u1ec7u
 #-------------------------------------------------------------------------------#
 
-icd_element_1 = T\u1ed5ng s\u1ed1 b\u1ec7nh nh\u00e2n (M\u1eafc)
-icd_element_2 = T\u1ed5ng s\u1ed1 b\u1ec7nh nh\u00e2n (Ch\u1ebft)
-icd_element_3 = T\u1ed5ng s\u1ed1 tr\u1ebb em d\u01b0\u1edbi 15 (M\u1eafc)
-icd_element_4 = Tr\u1ebb em 0-4 tu\u1ed5i (M\u1eafc)
-icd_element_5 = T\u1ed5ng s\u1ed1 tr\u1ebb em d\u01b0\u1edbi 15 (Ch\u1ebft)
-icd_element_6 = Tr\u1ebb em 0-4 tu\u1ed5i (Ch\u1ebft)
\ No newline at end of file
+icd_element_1 = T\u1ed5ng s\u1ed1 l\u1ea7n kh\u00e1m chung - Khoa kh\u00e1m b\u1ec7nh
+icd_element_2 = S\u1ed1 l\u1ea7n kh\u00e1m cho b\u1ec7nh nh\u00e2n n\u1eef - Khoa kh\u00e1m b\u1ec7nh
+icd_element_3 = S\u1ed1 l\u1ea7n kh\u00e1m cho TE < 15t - Khoa kh\u00e1m b\u1ec7nh
+icd_element_4 = S\u1ed1 l\u1ea7n kh\u00e1m do t\u1eed vong
+icd_element_5 = T\u1ed5ng s\u1ed1 s\u1ed1 m\u1eafc b\u1ec7nh - \u0110i\u1ec1u tr\u1ecb n\u1ed9i tr\u00fa (\u0110TNT)
+icd_element_6 = S\u1ed1 n\u1eef m\u1eafc (\u0110TNT)
+icd_element_7 = T\u1ed5ng s\u1ed1 s\u1ed1 m\u1eafc (\u0110TNT)
+icd_element_8 = S\u1ed1 n\u1eef t\u1eed vong (\u0110TNT)
+icd_element_9 = T\u1ed5ng s\u1ed1 tr\u1ebb < 15t m\u1eafc b\u1ec7nh (\u0110TNT)
+icd_element_10 = S\u1ed1 tr\u1ebb < 5t m\u1eafc b\u1ec7nh (\u0110TNT)
+icd_element_11 = T\u1ed5ng s\u1ed1 tr\u1ebb < 15t t\u1eed vong (\u0110TNT)
+icd_element_12 = S\u1ed1 tr\u1ebb < 5t t\u1eed vong (\u0110TNT)
\ No newline at end of file