dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #17819
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7243: Data browser - Used ajax for paging.
------------------------------------------------------------
revno: 7243
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-06-08 09:43:59 +0700
message:
Data browser - Used ajax for paging.
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserGrid.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataBrowser.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-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties 2012-06-01 11:35:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties 2012-06-08 02:43:59 +0000
@@ -161,6 +161,7 @@
drilldown_select_org_unit=Please select an organization unit
drilldown_orgunit=Organisation unit
drilldown_orgunit_group=Organisation unit group
+drilldown_data_element=Data element
drilldown_data_element_group=Data element group
drilldown_data_set=Data set
counts_of_aggregated_values=Number of recorded values
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties 2012-04-25 15:07:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties 2012-06-08 02:43:59 +0000
@@ -309,3 +309,4 @@
batch_delete=X\u00f3a m\u1ed9t t\u1eadp
deleting_lock_exceptions=\u0110ang x\u00f3a c\u00e1c kh\u00f3a ngo\u1ea1i l\u1ec7
Are=B\u1ea1n c\u00f3 ch\u1eafc mu\u1ed1n c\u1ea5t x\u00e9n?
+drilldown_data_element=Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml 2012-04-26 18:32:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml 2012-06-08 02:43:59 +0000
@@ -114,6 +114,12 @@
<param name="javascripts">javascript/dataBrowser.js</param>
</action>
+ <action name="searchResultByAjax" class="org.hisp.dhis.dataadmin.action.databrowser.DataBrowserAction">
+ <result name="success" type="velocity">/content.vm</result>
+ <result name="error" type="velocity">/content.vm</result>
+ <param name="page">/dhis-web-maintenance-dataadmin/dataBrowserResult.vm</param>
+ </action>
+
<action name="error" class="org.hisp.dhis.dataadmin.action.NoAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-commons/oust/selectedOrgunitError.vm</param>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserGrid.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserGrid.vm 2011-05-22 12:36:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserGrid.vm 2012-06-08 02:43:59 +0000
@@ -1,53 +1,45 @@
-<script type="text/javascript">
- jQuery(document).ready( function()
- {
- validation( 'exportPDF', function( form ){ form.submit() });
- loadListeners();
- });
-</script>
-
#if ( $grid.getHeight() == 0 || $grid.getWidth() == 0 )
<br/><br/>$i18n.getString( "no_data_found" )
#else
<div id="content">
-<table id="drillDownGrid" class="listTable" border="1">
- <thead>
- <tr>
- #foreach( $header in $grid.getVisibleHeaders() )
- <th #if( $header.meta )style="text-align:left"#else style="text-align:center"#end>$!encoder.htmlEncode( $header.name )</th>
- #end
- </tr>
- </thead>
+ <table id="drillDownGrid" class="listTable" border="1">
+ <thead>
+ <tr>
+ #foreach( $header in $grid.getVisibleHeaders() )
+ <th #if( $header.meta )style="text-align:left"#else style="text-align:center"#end>$!encoder.htmlEncode( $header.name )</th>
+ #end
+ </tr>
+ </thead>
- <tbody>
- #foreach( $meta in $!MetaValues )
- #set( $list = $!MetaValueMaps.get( $meta.id ) )
- <tr>
- #if ( $mode=="OU" && !$parent && $meta.id )
- #set ( $URL = "?mode=OU&periodTypeId=$periodTypeId&fromDate=$fromDate&toDate=$toDate&showZeroCheckBox=$!showZeroCheckBox&selectedUnitChanger=$meta.id" )
- <td style="min-width:200px;cursor:pointer" onclick="viewDrillDownMenu( '$URL', '$meta.id' );" title="$i18n.getString('click_on_this_orgunit')">$meta.name</td>
-
- #elseif ( !$parent && $meta.id )
- <td style="min-width:200px"><a href="?mode=$mode&periodTypeId=$periodTypeId&fromDate=$fromDate&toDate=$toDate&showZeroCheckBox=$!showZeroCheckBox&parent=$meta.id">$meta.name</a></td>
-
- #else
- <td style="min-width:200px">$meta.name</td>
- #end
-
- #foreach( $item in $list )
- <td style="min-width:80px;text-align:right" title="$title">
- #if ( $!item == "0" )<span style="color:red;font-weight:bold;">$!item</span>
- #else<span style="color:blue;font-weight:bold;">$!item</span>#end
- </td>
- #end
- </tr>
- #end
- </tbody>
-</table>
-<p></p>
+ <tbody id="list">
+ #foreach( $meta in $!MetaValues )
+ #set( $list = $!MetaValueMaps.get( $meta.id ) )
+ <tr>
+ #if ( $mode=="OU" && !$parent && $meta.id )
+ #set ( $URL = "?mode=OU&periodTypeId=$periodTypeId&fromDate=$fromDate&toDate=$toDate&showZeroCheckBox=$!showZeroCheckBox&selectedUnitChanger=$meta.id" )
+ <td style="min-width:200px;cursor:pointer" onclick="viewDrillDownMenu( '$URL', '$meta.id' );" title="$i18n.getString('click_on_this_orgunit')">$meta.name</td>
+
+ #elseif ( !$parent && $meta.id )
+ <td style="min-width:200px"><a href="?mode=$mode&periodTypeId=$periodTypeId&fromDate=$fromDate&toDate=$toDate&showZeroCheckBox=$!showZeroCheckBox&parent=$meta.id">$meta.name</a></td>
+
+ #else
+ <td style="min-width:200px">$meta.name</td>
+ #end
+
+ #foreach( $item in $list )
+ <td style="min-width:80px;text-align:right" title="$title">
+ #if ( $!item == "0" )<span style="color:red;font-weight:bold;">$!item</span>
+ #else<span style="color:blue;font-weight:bold;">$!item</span>#end
+ </td>
+ #end
+ </tr>
+ #end
+ </tbody>
+ </table>
+ <p></p>
+</div>
#parse( "/dhis-web-commons/paging/paging.vm" )
-</div>
<!-- Drill-down menu -->
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm 2011-03-17 14:42:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm 2012-06-08 02:43:59 +0000
@@ -1,3 +1,5 @@
+<div id="dataBrowserContent">
+
<style type="text/css">
div#drillDownMenu
{
@@ -11,6 +13,24 @@
}
</style>
+<script type="text/javascript">
+
+ jQuery( document ).ready( function()
+ {
+ contentDiv = 'dataBrowserContent';
+
+ if ( jQuery( '#baseLink' ).length )
+ {
+ var newBaseLink = getFieldValue( 'baseLink' ).replace( 'searchResult.action', 'searchResultByAjax.action' );
+ setFieldValue( 'baseLink', newBaseLink );
+ }
+
+ setTableStyles();
+ loadListeners();
+ } );
+
+</script>
+
<h3>$!encoder.htmlEncode( $grid.title )</h3>
<h5>$!encoder.htmlEncode( $grid.subtitle )</h5>
@@ -22,6 +42,7 @@
<input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='displayDataBrowserForm.action'" style="width:10em"/>
</div>
+
#if ( $summary )
#set( $title = "$!item $i18n.getString( 'no_hits' )" )
#else
@@ -94,3 +115,5 @@
<!-- Data Browser Grid -->
#parse( "/dhis-web-maintenance-dataadmin/dataBrowserGrid.vm" )
+
+</div>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataBrowser.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataBrowser.js 2011-12-23 13:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataBrowser.js 2012-06-08 02:43:59 +0000
@@ -7,6 +7,7 @@
currentUrlLink = "";
currentParentId = "";
+isAjax = true;
var isOrgUnitSelected = false;
function organisationUnitModeSelected( units )
