dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2348
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2010-12-12 20:06:42 +0100
message:
  Work in progress on orgunit search
modified:
  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-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	2010-12-12 18:39:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitSearch.vm	2010-12-12 19:06:42 +0000
@@ -36,7 +36,7 @@
 
 <td></td>
 <td><input type="submit" value="$i18n.getString( 'search' )" style="width:100px">
-<input type="button" onclick="window.location.href='organisationUnitSearch.action'" value="$i18n.getString( 'clear' )"></td>
+<input type="button" onclick="window.location.href='organisationUnitSearch.action'" value="$i18n.getString( 'clear' )" style="width:100px"></td>
 
 <tr>
 <td style="height:15px" colspan="2"></td>
@@ -52,17 +52,35 @@
 
 <h4>$i18n.getString( "found" ) $organisationUnits.size() $i18n.getString( "organisation_units" )</h4>
 
-<table>
+<table class="listTable" style="width:90%">
+<thead>
 <tr>
 <th style="min-width:300px">$i18n.getString( "name" )</th>
+#foreach( $groupSet in $groupSets )
+<th>$encoder.htmlEncode( $groupSet.name )</th>
+#end
+<th class="{sorter: false}" style="width:24px"></th>
 </tr>
+</thead>
 
+<tbody id="list">
 #foreach( $unit in $organisationUnits )
 <tr>
 <td>$encoder.htmlEncode( $unit.name )</td>
+#foreach( $groupSet in $groupSets )
+<td>$!unit.getGroupNameInGroupSet( $groupSet )</td>
+#end
+<td><a href="#"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"/></a></td>
 </tr>
 #end
+</tbody>
 
 </table>
 
 #end
+
+<script type="text/javascript">
+	jQuery(document).ready(function(){	
+		tableSorter( 'listTable' );	
+	});
+</script>