dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7112
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-05-31 11:40:52 +0700
message:
  (patient) Validation for startdate and enddate in TB.
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	2012-05-30 15:51:44 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-05-31 04:40:52 +0000
@@ -346,4 +346,5 @@
 last_name = Last name
 confirmation = Confirmation
 data_entry_form = Data entry form
-view = View
\ No newline at end of file
+view = View
+start_date_must_be_less_then_or_equals_to_end_date = Start date must be less then or equals to end date
\ No newline at end of file

=== 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	2012-05-31 04:02:09 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2012-05-31 04:40:52 +0000
@@ -36,7 +36,6 @@
             path_api: '../../api/',
             path_images: 'images/',
 			initialize: 'tabularInitialize.action',
-			program_get: 'getReportPrograms.action',
 			patientproperties_get: 'loadPatientProperties.action',
 			programstages_get: 'loadReportProgramStages.action',
 			dataelements_get: 'loadDataElements.action',
@@ -927,6 +926,12 @@
 					return false;
 				}
 				
+				if( TR.cmp.settings.startDate.getValue() > TR.cmp.settings.endDate.getValue() )
+				{
+					TR.util.notification.error(TR.i18n.start_date_must_be_less_then_or_equals_to_end_date, TR.i18n.start_date_must_be_less_then_or_equals_to_end_date);
+					return false;
+				}
+			
 				if (TR.state.orgunitId == '') {
 					TR.util.notification.error(TR.i18n.et_no_orgunits, TR.i18n.em_no_orgunits);
 					return false;
@@ -979,7 +984,7 @@
 		},
 		view: function( psiId )
 		{
-			TR.util.mask.showMask(TR.cmp.region.center, TR.i18n.loading);asdf
+			TR.util.mask.showMask(TR.cmp.region.center, TR.i18n.loading);
 			var params = 'programStageInstanceId=' + psiId;
 			Ext.Ajax.request({
 				url: TR.conf.finals.ajax.path_commons + TR.conf.finals.ajax.datavalue_view,

=== 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	2012-05-30 15:51:44 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm	2012-05-31 04:40:52 +0000
@@ -73,4 +73,5 @@
 view: '$encoder.jsEscape($i18n.getString( 'view' ) , "'")',
 confirmation:'$encoder.jsEscape($i18n.getString( 'confirmation' ) , "'")',
 data_entry_form:'$encoder.jsEscape($i18n.getString( 'data_entry_form' ) , "'")',
+start_date_must_be_less_then_or_equals_to_end_date:'$encoder.jsEscape($i18n.getString( 'start_date_must_be_less_then_or_equals_to_end_date' ) , "'")',
 };
\ No newline at end of file