dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19271
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-06-03 11:27:40 +0200
message:
  Program indicator ui, added logical operators
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.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-services/dhis-service-core/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties	2015-06-02 22:11:37 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties	2015-06-03 09:27:40 +0000
@@ -773,6 +773,15 @@
 less_than=<
 less_than_or_equal_to=<=
 
+and_title=And
+or_title=Or
+equal_to_title=Equal to
+not_equal_to_title=Not equal to
+less_than_title=Less than
+less_than_or_equal_to_title=Less than or equal to
+greater_than_title=Greater than
+greater_than_or_equal_to_title=Greater than or equal to
+
 #-- Constant ------------------------------------------------------------------#
 
 constant=Constant

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.vm	2015-06-02 22:11:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.vm	2015-06-03 09:27:40 +0000
@@ -253,7 +253,17 @@
 			<a class="greyButtonLink" href="javascript:insertOperator( 'filter', '*' )" title="$i18n.getString( 'multiply' )">&#42;</a>
 			<a class="greyButtonLink" href="javascript:insertOperator( 'filter', '/' )" title="$i18n.getString( 'divide' )">&#47;</a>
 			<a class="greyButtonLink" href="javascript:insertOperator( 'filter', '+' )" title="$i18n.getString( 'plus' )">&#43;</a>
-			<a class="greyButtonLink" href="javascript:insertOperator( 'filter', '-' )" title="$i18n.getString( 'minus' )">&#45;</a><br><br>
+			<a class="greyButtonLink" href="javascript:insertOperator( 'filter', '-' )" title="$i18n.getString( 'minus' )">&#45;</a>&nbsp;&#124;&nbsp;
+			
+			<a class="greyButtonLink" href="javascript:insertOperator( 'filter', 'and' )" title="$i18n.getString( 'and' )">$i18n.getString( 'and_title' )</a>
+			<a class="greyButtonLink" href="javascript:insertOperator( 'filter', 'or' )" title="$i18n.getString( 'or' )">$i18n.getString( 'or_title' )</a>
+			<a class="greyButtonLink" href="javascript:insertOperator( 'filter', '&#61;&#61;' )" title="$i18n.getString( 'equal_to_title' )">&#61;&#61;</a>
+			<a class="greyButtonLink" href="javascript:insertOperator( 'filter', '&#33&#61;' )" title="$i18n.getString( 'not_equal_to_title' )">&#33;&#61;</a>
+			<a class="greyButtonLink" href="javascript:insertOperator( 'filter', '&#60;' )" title="$i18n.getString( 'less_than_title' )">&#60;</a>
+			<a class="greyButtonLink" href="javascript:insertOperator( 'filter', '&#60;&#61;' )" title="$i18n.getString( 'less_than_or_equal_to_title' )">&#60;&#61;</a>
+			<a class="greyButtonLink" href="javascript:insertOperator( 'filter', '&#62;' )" title="$i18n.getString( 'greater_than_title' )">&#62;</a>
+			<a class="greyButtonLink" href="javascript:insertOperator( 'filter', '&#62;&#61;' )" title="$i18n.getString( 'greater_than_or_equal_to_title' )">&#62;&#61;</a>
+			<br><br>
 		</td>
 	</tr>	
 	<tr>