← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2478: Sort data analysis result on columns

 

------------------------------------------------------------
revno: 2478
committer: Tri <Tri@Tri-Laptop>
branch nick: dhis2
timestamp: Fri 2011-01-07 10:46:17 +0700
message:
  Sort data analysis result on columns
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/css/theme/jquery-ui-1.8.6.css
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/searchResult.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-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/css/theme/jquery-ui-1.8.6.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/css/theme/jquery-ui-1.8.6.css	2010-12-03 05:41:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/css/theme/jquery-ui-1.8.6.css	2011-01-07 03:46:17 +0000
@@ -58,7 +58,7 @@
 ----------------------------------*/
 .ui-widget { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 0.8em; }
 .ui-widget .ui-widget { font-size: 1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { /*font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1em;*/ }
 .ui-widget-content { border: 1px solid #a6c9e2; background: #fcfdfd url(images/ui-bg_inset-hard_100_fcfdfd_1x100.png) 50% bottom repeat-x; color: #222222; }
 .ui-widget-content a { color: #222222; }
 .ui-widget-header { border: 1px solid #4297d7; background: #5c9ccc url(images/ui-bg_glass_55_5c9ccc_1x400.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/searchResult.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/searchResult.vm	2010-07-04 23:55:46 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/searchResult.vm	2011-01-07 03:46:17 +0000
@@ -11,16 +11,16 @@
 
 <input type="button" onclick="window.location.href='viewAnalysisForm.action?key=$!{key}'" value="Back" style="width:120px"><br><br>
 
-<table class="listTable" style="width:100%">
+<table class="listTable" id="listTable" style="width:100%">
 	<thead>
 	<tr>
 		<th>$i18n.getString( "data_element" )</th>
 		<th>$i18n.getString( "organisation_unit" )</th>
 		<th>$i18n.getString( "period" )</th>
 		<th style="text-align:center">$i18n.getString( "min" )</th>
-		<th style="width: 100px; text-align:center">$i18n.getString( "value" )</th>
+		<th style="width: 100px; text-align:center" class="{sorter: false}">$i18n.getString( "value" )</th>
 		<th style="text-align:center">$i18n.getString( "max" )</th>
-		<th style="text-align:center">$i18n.getString( "mark" )</th>
+		<th style="text-align:center" class="{sorter: false}">$i18n.getString( "mark" )</th>
 	</tr>
 	</thead>
 	#set( $count = 0 )	
@@ -70,5 +70,9 @@
     var i18n_mark_value_for_followup = '$encoder.jsEscape( $i18n.getString( "mark_value_for_followup" ) , "'")';
     var i18n_unmark_value_for_followup = '$encoder.jsEscape( $i18n.getString( "unmark_value_for_followup" ) , "'")';
     
-    $( document ).ready( function() { pageInit(); } );
+   
+	jQuery(document).ready(function(){	
+		tableSorter( 'listTable' );	
+		pageInit();
+	});
 </script>