dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4558
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-09-11 11:37:07 +0200
message:
  Fixed minor bug and improved gui in organisation unit search.
modified:
  dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/dataelement/DefaultDataElementDataMart.java
  dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/indicator/DefaultIndicatorDataMart.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitSearch.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitDetails.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitSearch.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-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/dataelement/DefaultDataElementDataMart.java'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/dataelement/DefaultDataElementDataMart.java	2011-07-01 11:20:25 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/dataelement/DefaultDataElementDataMart.java	2011-09-11 09:37:07 +0000
@@ -203,6 +203,8 @@
         
         cacheHandler.flush();
 
+        log.info( "Data element export task done" );
+        
         return null;
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/indicator/DefaultIndicatorDataMart.java'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/indicator/DefaultIndicatorDataMart.java	2011-07-01 11:20:25 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/indicator/DefaultIndicatorDataMart.java	2011-09-11 09:37:07 +0000
@@ -185,6 +185,8 @@
         
         batchHandler.flush();
         
+        log.info( "Indicator export task done" );
+        
         return null;
     }
     

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitSearch.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitSearch.js	2011-08-08 15:09:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitSearch.js	2011-09-11 09:37:07 +0000
@@ -4,7 +4,6 @@
     initOrgUnitDetails();
 
     selection.setListenerFunction( organisationUnitSelected );
-    selection.responseReceived();
 } );
 
 function organisationUnitSelected( orgUnitIds )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitDetails.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitDetails.vm	2011-03-29 20:21:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitDetails.vm	2011-09-11 09:37:07 +0000
@@ -4,61 +4,61 @@
 <table>
 
 <tr>
-<td><b>$i18n.getString( "short_name" ):</b></td>
+<td><label>$i18n.getString( "short_name" ):</label></td>
 <td>$!encoder.htmlEncode( $organisationUnit.shortName )</td>
 </tr>
 <tr>
-<td><b>$i18n.getString( "code" ):</b></td>
+<td><label>$i18n.getString( "code" ):</label></td>
 <td>$!encoder.htmlEncode( $organisationUnit.code )</td>
 </tr>
 <tr>
-<td><b>$i18n.getString( "opening_date" ):</b></td>
+<td><label>$i18n.getString( "opening_date" ):</label></td>
 <td>$!format.formatDate( $organisationUnit.openingDate )</td>
 </tr>
 <tr>
-<td><b>$i18n.getString( "closed_date" ):</b></td>
+<td><label>$i18n.getString( "closed_date" ):</label></td>
 <td>$!format.formatDate( $organisationUnit.closedDate )</td>
 </tr>
 <tr>
-<td><b>$i18n.getString( "active" ):</b></td>
+<td><label>$i18n.getString( "active" ):</label></td>
 <td>#formatBool( $organisationUnit.active )</td>
 </tr>
 <tr>
-<td><b>$i18n.getString( "comment" ):</b></td>
+<td><label>$i18n.getString( "comment" ):</label></td>
 <td>$!encoder.htmlEncode( $organisationUnit.comment )</td>
 </tr>
 <tr>
-<td><b>$i18n.getString( "url" ):</b></td>
+<td><label>$i18n.getString( "url" ):</label></td>
 <td>$!encoder.htmlEncode( $organisationUnit.url )</td>
 </tr>
 <tr>
-<td><b>$i18n.getString( "last_updated" ):</b></td>
+<td><label>$i18n.getString( "last_updated" ):</label></td>
 <td>$!format.formateDate( $organisationUnit.lastUpdated )</td>
 </tr>
 <tr>
-<td><b>$i18n.getString( "contact_person" ):</b></td>
+<td><label>$i18n.getString( "contact_person" ):</label></td>
 <td>$!encoder.htmlEncode( $organisationUnit.contactPerson )</td>
 </tr>
 <tr>
-<td><b>$i18n.getString( "address" ):</b></td>
+<td><label>$i18n.getString( "address" ):</label></td>
 <td>$!encoder.htmlEncode( $organisationUnit.address )</td>
 </tr>
 <tr>
-<td><b>$i18n.getString( "email" ):</b></td>
+<td><label>$i18n.getString( "email" ):</label></td>
 <td>$!encoder.htmlEncode( $organisationUnit.email )</td>
 </tr>
 <tr>
-<td><b>$i18n.getString( "phone_number" ):</b></td>
+<td><label>$i18n.getString( "phone_number" ):</label></td>
 <td>$!encoder.htmlEncode( $organisationUnit.phoneNumber )</td>
 </tr>
 <tr>
-<td><b>$i18n.getString( "hierarchy" ):</b></td>
+<td><label>$i18n.getString( "hierarchy" ):</label></td>
 <td>$!encoder.htmlEncode( $organisationUnit.ancestorNames )</td>
 </tr>
 
 #foreach( $groupSet in $groupSets )
 <tr>
-<td><b>$!encoder.htmlEncode( $groupSet.name ):</b></td>
+<td><label>$!encoder.htmlEncode( $groupSet.name ):</label></td>
 <td>$!encoder.htmlEncode( $!organisationUnit.getGroupNameInGroupSet( $groupSet ) )</td>
 </tr>
 #end

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitSearch.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitSearch.vm	2011-08-08 15:09:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitSearch.vm	2011-09-11 09:37:07 +0000
@@ -112,4 +112,4 @@
 
 #end
 
-<div id="organisationUnitDetails"></div>
+<div id="organisationUnitDetails" class="page"></div>