dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15480
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2014-05-31 13:11:26 +0200
message:
  SQL view, download as json
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/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/showDataSqlViewForm.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-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	2014-05-04 12:21:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2014-05-31 11:11:26 +0000
@@ -235,6 +235,7 @@
 get_report_as_pdf=Download as PDF
 get_report_as_html=Download as HTML
 get_report_as_xml=Download as XML
+get_report_as_json=Download as JSON
 data_element_structure=Data element structure
 constant=Constant
 constant_management=Constant Management

=== 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	2014-01-27 11:37:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserGrid.vm	2014-05-31 11:11:26 +0000
@@ -61,8 +61,8 @@
 				
 				#foreach( $item in $list )
 				<td style="min-width:80px;text-align:right" title="$title">
-				#if ( $!item == "0" )<span class="bold" style="color:red">$!item</span> 
-				#else<span class="bold" style="color:blue;">$!item</span>#end
+				#if ( $!item == "0" )<span style="color:red">$!item</span> 
+				#else<span style="color:blue;">$!item</span>#end
 				</td>
 				#end
 			</tr>

=== 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	2013-02-01 04:45:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm	2014-05-31 11:11:26 +0000
@@ -1,17 +1,17 @@
 <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();
-	} );
+jQuery( document ).ready( function()
+{	
+	contentDiv = 'dataBrowserContent';
+
+	if ( jQuery( '#baseLink' ).length )
+	{
+		var newBaseLink = getFieldValue( 'baseLink' ).replace( 'searchResult.action', 'searchResultByAjax.action' );
+		setFieldValue( 'baseLink', newBaseLink );
+	}
+
+	setTableStyles();
+} );
 
 </script>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showDataSqlViewForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showDataSqlViewForm.vm	2014-02-18 16:16:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showDataSqlViewForm.vm	2014-05-31 11:11:26 +0000
@@ -22,6 +22,7 @@
 <input type="button" value="$i18n.getString( 'get_report_as_pdf' )" onclick="window.location.href='../api/sqlViews/${sqlView.uid}/data.pdf'" style="width:135px"/>
 <input type="button" value="$i18n.getString( 'get_report_as_html' )" onclick="window.location.href='../api/sqlViews/${sqlView.uid}/data.html'" style="width:135px"/>
 <input type="button" value="$i18n.getString( 'get_report_as_xml' )" onclick="window.location.href='../api/sqlViews/${sqlView.uid}/data.xml'" style="width:135px"/>
+<input type="button" value="$i18n.getString( 'get_report_as_json' )" onclick="window.location.href='../api/sqlViews/${sqlView.uid}/data.json'" style="width:135px"/>
 <input type="button" value="$i18n.getString( 'back' )" onclick="javascript:window.location.href='showSqlViewListForm.action'" style="width:140px" style="width:135px"/>
 </div>
 <br/>