dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10909
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-05-21 12:35:18 +0700
message:
  Fixed bug - When to select other status in list and click List Events button, nothing is shown
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/javascript/smsReminder.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.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-05-21 04:33:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-05-21 05:35:18 +0000
@@ -642,4 +642,5 @@
 organisationunitname = Organisation unit
 orgunit_group = Organisation unit group
 validation_rules_are_being_processed_please_wait = Validation rules are being processed please wait ...
-events = Events
\ No newline at end of file
+events = Events
+list_events = List events
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js	2013-05-14 13:16:44 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js	2013-05-21 05:35:18 +0000
@@ -58,7 +58,7 @@
 	var d = date.getDate() - 1;
 	var m = date.getMonth();
 	var y1 = date.getFullYear() - 100;
-	var y2 = date.getFullYear();
+	var y2 = date.getFullYear() + 100;
 	var startDate = jQuery.datepicker.formatDate( dateFormat, new Date(y1, m, d) );
 	var endDate = jQuery.datepicker.formatDate( dateFormat, new Date(y2, m, d) );
 	
@@ -104,11 +104,11 @@
 		type:"POST",
 		data: params,
 		success: function( html ){
-			setTableStyles();
 			jQuery('#listEventDiv').html(html);
 			showById('colorHelpLink');
 			showById('listEventDiv');
 			eventList = 2;
+			setTableStyles();
 			hideLoader();
 		}
 	});

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.vm	2013-04-10 04:35:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.vm	2013-05-21 05:35:18 +0000
@@ -20,6 +20,7 @@
 		setFieldValue('hideLink', 'true');
 		isDashboard = true;
 		showById('dueDateTR');
+		setFieldValue('listPatientBtn','$encoder.jsEscape( $i18n.getString( "list_events" ) , "'")');
 		mainPage = 0;
 	});	
 </script>