dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5251
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-12-01 11:07:26 +0700
message:
  Indicator details updated.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicator.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.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-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicator.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicator.vm	2011-09-27 07:36:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicator.vm	2011-12-01 04:07:26 +0000
@@ -12,6 +12,15 @@
     "numerator": "$!{indicator.numerator}",
     "numeratorDescription": "$!encoder.jsonEncode( ${indicator.numeratorDescription} )",
     "denominator": "$!{indicator.denominator}",
-    "denominatorDescription": "$!encoder.jsonEncode( ${indicator.denominatorDescription} )"
+    "denominatorDescription": "$!encoder.jsonEncode( ${indicator.denominatorDescription} )",
+	
+	#set( $size = ${indicator.dataSets.size()} )
+	"dataSets": [
+	#foreach( $ds in ${indicator.dataSets} )
+	  {
+		"name": "$!encoder.xmlEncode( ${ds.name} )"
+	  }#if( $velocityCount < $size ),#end
+	#end
+	]
   }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm	2011-09-26 09:31:56 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm	2011-12-01 04:07:26 +0000
@@ -84,6 +84,7 @@
 				<p><label>$i18n.getString( "denominator_description" ):</label><br/><span id="denominatorDescriptionField"></span></p>
 			    <p><label>$i18n.getString( "url" ):</label><br/><span id="urlField"></span></p>   
                 <p><label>$i18n.getString( "last_updated" ):</label><br/><span id="lastUpdatedField"></span></p>             
+                <p><label>$i18n.getString( "data_sets" ):</label><br/><span id="dataSetsField"></span></p>             
 			</div>
 
 			<div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js	2011-09-27 07:36:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js	2011-12-01 04:07:26 +0000
@@ -73,6 +73,9 @@
 
 		var lastUpdated = json.indicator.lastUpdated;
 		setInnerHTML( 'lastUpdatedField', lastUpdated ? lastUpdated : '[' + i18n_none + ']' );
+		
+		var dataSets = joinNameableObjects( json.indicator.dataSets );
+		setInnerHTML( 'dataSetsField', dataSets ? dataSets : '[' + i18n_none + ']' );
 
 		showDetails();
 	});