dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19617
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-07-10 18:00:04 +0200
message:
  Program indicator, filter ui
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramIndicator.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programIndicator.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicator.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/ajax/jsonProgramIndicator.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramIndicator.vm	2014-06-13 10:58:05 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramIndicator.vm	2015-07-10 16:00:04 +0000
@@ -7,6 +7,7 @@
 	"description": "$!encoder.xmlEncode( ${programIndicator.displayDescription} )",
     "valueType": "$!{programIndicator.valueType}",
 	"rootDate" : "$!format.formatDate( $programIndicator.rootDate )",
-	"expression": "$!encoder.jsonEncode( $!{programIndicator.expression} )"
+	"expression": "$!encoder.jsonEncode( $!{programIndicator.expression} )",
+	"filter": "$!encoder.jsonEncode( $!{programIndicator.filter} )"
   }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programIndicator.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programIndicator.js	2015-06-05 10:40:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programIndicator.js	2015-07-10 16:00:04 +0000
@@ -25,6 +25,7 @@
     setInnerHTML('valueTypeField', json.programIndicator.valueType);
     setInnerHTML('rootDateField', json.programIndicator.rootDate);
     setInnerHTML('expressionField', json.programIndicator.expression);
+    setInnerHTML('filterField', json.programIndicator.filter);
     setInnerHTML('idField', json.programIndicator.uid);
 
     showDetails();

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicator.vm	2015-07-06 04:56:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicator.vm	2015-07-10 16:00:04 +0000
@@ -43,8 +43,8 @@
 						    data-can-manage="$security.canManage( $programIndicator )"
 						    data-can-update="$security.canUpdate( $programIndicator )"
 						    data-can-delete="$security.canDelete( $programIndicator )">
-						    <td>$encoder.htmlEncode( $!programIndicator.displayName )</td>
-						    <td>$encoder.htmlEncode( $!programIndicator.description )</td>
+						    <td>$!encoder.htmlEncode( $programIndicator.displayName )</td>
+						    <td>$!encoder.htmlEncode( $programIndicator.description )</td>
 						</tr>
 					#end
 				</tbody>
@@ -61,6 +61,7 @@
 				<p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
 				<p><label class="bold">$i18n.getString( "value_type" ):</label><br><span id="valueTypeField"></span></p>
 				<p><label class="bold">$i18n.getString( "expression" ):</label><br><span id="expressionField"></span></p>
+				<p><label class="bold">$i18n.getString( "filter" ):</label><br><span id="filterField"></span></p>
 				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
 			</div>
 		</td>