dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9829
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-02-19 11:31:40 +0700
message:
  Minor fix for position message in Aggregate tabular report.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.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-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-02-13 15:16:11 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-02-19 04:31:40 +0000
@@ -544,7 +544,9 @@
 select_all_children = Select all children
 total = Total
 confirm_delete_date_range_list=Are you sure you want to delete date range list?
-invalid_position = Please select at most two row positions or two filter positions.
+invalid_position = There are 10 positions supported, include : \n 1.  Orgunit: Rows; Period: Rows; Data: Filter \n 2.  Orgunit: Rows; Period: Columns; Data: Filter \n 3.  Orgunit: Rows; Period: Filter; Data: Filter \n 4.  Orgunit: Rows; Period: Filter; Data: Columns \n 5.  Orgunit: Columns; Period: Rows; Data: Filter \n 6.  Orgunit: Columns; Period: Filter; Data: Rows \n 7.  Orgunit: Filter; Period: Rows; Data: Filter \n 8.  Orgunit: Filter; Period: Rows; Data: Columns \n 9.  Orgunit: Filter; Period: Columns; Data: Rows \n 10. Orgunit: Filter; Period: Filter; Data: Rows
+please_select_one_position_for_row = Please select one position for row
+please_select_one_position_for_filtering = Please select one position for filtering
 select_a_dataelement_for_sum_avg_operator = Please select a data element for sum/avg operator
 runing_validation_rules = Validation rules are being processed, please wait ...
 program_enrollment = Program enrollment

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2013-02-19 03:56:27 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2013-02-19 04:31:40 +0000
@@ -2194,14 +2194,30 @@
 					
 					var position = TR.state.aggregateReport.getPosition();
 					if( position==''){
-						TR.util.notification.error(TR.i18n.invalid_position, TR.i18n.invalid_position);
-						return false;	
+						var o = TR.cmp.settings.positionOrgunit.value;
+						var p = TR.cmp.settings.positionPeriod.value;
+						var d = TR.cmp.settings.positionData.value;
+
+						if( o!='1' && p!='1' && d!='1')
+						{
+							TR.util.notification.error(TR.i18n.please_select_one_position_for_row, TR.i18n.please_select_one_position_for_row);
+							return false;
+						}
+						if( o!='3' && p!='3' && d!='3')
+						{
+							TR.util.notification.error(TR.i18n.please_select_one_position_for_filter, TR.i18n.please_select_one_position_for_filter);
+							return false;
+						}
+						else {
+							TR.util.notification.error(TR.i18n.invalid_position, TR.i18n.invalid_position);
+							return false;
+						}
 					}
 					
 					if( Ext.getCmp('aggregateType').getValue().aggregateType != 'count'
 						&& ( Ext.getCmp('deSumCbx').getValue() == null || Ext.getCmp('deSumCbx').getValue=='')){
 						TR.util.notification.error(TR.i18n.select_a_dataelement_for_sum_avg_operator, TR.i18n.select_a_dataelement_for_sum_avg_operator );
-						return false;	
+						return false;
 					}
 				
 					// Check orgunit by period

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm	2013-02-13 15:16:11 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm	2013-02-19 04:31:40 +0000
@@ -161,4 +161,6 @@
 select_a_dataelement_for_sum_avg_operator: '$encoder.jsEscape($i18n.getString( 'select_a_dataelement_for_sum_avg_operator' ) , "'")',
 multiple_periods_selected_as_filter: '$encoder.jsEscape($i18n.getString( 'multiple_periods_selected_as_filter' ) , "'")',
 multiple_orgunits_selected_as_filter: '$encoder.jsEscape($i18n.getString( 'multiple_orgunits_selected_as_filter' ) , "'")',
+please_select_one_position_for_row: '$encoder.jsEscape($i18n.getString( 'please_select_one_position_for_row' ) , "'")',
+please_select_one_position_for_filter: '$encoder.jsEscape($i18n.getString( 'please_select_one_position_for_filter' ) , "'")'
 };
\ No newline at end of file