dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3105
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-03-20 23:35:55 +0100
message:
  Removing 0-decimals in web pivot table
modified:
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.js
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responsePivotTable.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responseTable.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.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-reporting/src/main/webapp/dhis-web-reporting/javascript/table.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.js	2011-02-26 19:24:20 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.js	2011-03-20 22:35:55 +0000
@@ -150,7 +150,6 @@
 function tableReceived( xmlObject )
 {
 	setInnerHTML( 'nameField', getElementValue( xmlObject, 'name' ) );
-	setInnerHTML( 'tableNameField', getElementValue( xmlObject, 'tableName' ) );
 	setInnerHTML( 'indicatorsField', getElementValue( xmlObject, 'indicators' ) );
 	setInnerHTML( 'periodsField', getElementValue( xmlObject, 'periods' ) );
 	setInnerHTML( 'unitsField', getElementValue( xmlObject, 'units' ) );

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responsePivotTable.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responsePivotTable.vm	2011-03-15 23:26:14 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responsePivotTable.vm	2011-03-20 22:35:55 +0000
@@ -26,7 +26,7 @@
 {
 #set( $size = $pivotTable.indicatorValues.size() )
 #foreach( $value in $pivotTable.indicatorValues )
-"${value.elementId}-${value.periodId}-${value.organisationUnitId}":"${value.value}"#if( $velocityCount < $size ),#end
+"${value.elementId}-${value.periodId}-${value.organisationUnitId}":"${format.formatValue( ${value.value} )}"#if( $velocityCount < $size ),#end
 #end } ] 
 }
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responseTable.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responseTable.vm	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responseTable.vm	2011-03-20 22:35:55 +0000
@@ -2,7 +2,6 @@
 <table>
 	<id>$table.id</id>
 	<name>$encoder.xmlEncode( $table.name )</name>
-	<tableName>$encoder.xmlEncode( $table.tableName )</tableName>
 	<indicators>$table.indicators.size()</indicators>
 	<periods>$table.periods.size()</periods>
 	<units>$table.units.size()</units>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm	2011-03-18 14:45:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm	2011-03-20 22:35:55 +0000
@@ -61,7 +61,6 @@
 					<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
 				</div>
 				<p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
-				<p><label>$i18n.getString( "table_name" ):</label><br><span id="tableNameField"></span></p>
 				<p><label>$i18n.getString( "indicators" ):</label><br><span id="indicatorsField"></span></p>
 				<p><label>$i18n.getString( "periods" ):</label><br><span id="periodsField"></span></p>
 				<p><label>$i18n.getString( "organisation_units" ):</label><br><span id="unitsField"></span></p>