dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10764
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-05-06 11:40:47 +0700
message:
  Display loading icon when to load proprograms by selected orgunit in tracker module.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/multiDataEntry.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEvent.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js


--
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/webapp/dhis-web-caseentry/javascript/multiDataEntry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/multiDataEntry.js	2013-04-15 07:46:11 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/multiDataEntry.js	2013-05-06 04:40:47 +0000
@@ -2,6 +2,10 @@
 
 function multiDataEntryOrgunitSelected( orgUnits, orgUnitNames )
 {
+	var width = jQuery('#programIdAddPatient').width();
+	jQuery('#programIdAddPatient').width(width-30);
+	showById( "programLoader" );
+	disable('programIdAddPatient');
 	setFieldValue('orgunitName', orgUnitNames[0]);
 	setFieldValue('orgunitId', orgUnits[0]);
 	hideById("listPatientDiv");
@@ -17,6 +21,9 @@
 				}
 			}
 			enableBtn();
+			hideById('programLoader');
+			jQuery('#programIdAddPatient').width(width);
+			enable('programIdAddPatient');
 		});
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEvent.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEvent.js	2013-02-18 12:16:32 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEvent.js	2013-05-06 04:40:47 +0000
@@ -3,6 +3,10 @@
 
 function orgunitSelected( orgUnits, orgUnitNames )
 {	
+	var width = jQuery('#programIdAddPatient').width();
+	jQuery('#programIdAddPatient').width(width-30);
+	showById( "programLoader" );
+	disable('programIdAddPatient');
 	hideById('addNewDiv');
 	organisationUnitSelected( orgUnits, orgUnitNames );
 	clearListById('programIdAddPatient');
@@ -13,6 +17,9 @@
 				jQuery( '#programIdAddPatient').append( '<option value="' + json.programs[i].id +'" programStageId="' + json.programs[i].programStageId + '" type="' + json.programs[i].type + '">' + json.programs[i].name + '</option>' );
 			}
 			enableBtn();
+			hideById('programLoader');
+			jQuery('#programIdAddPatient').width(width);
+			enable('programIdAddPatient');
 		});
 }
 selection.setListenerFunction( orgunitSelected );

=== 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-04-15 07:46:11 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js	2013-05-06 04:40:47 +0000
@@ -1,6 +1,10 @@
 
 function orgunitSelected( orgUnits, orgUnitNames )
 {
+	var width = jQuery('#programIdAddPatient').width();
+	jQuery('#programIdAddPatient').width(width-30);
+	showById( "programLoader" );
+	disable('programIdAddPatient');
 	showById('mainLinkLbl');
 	showById('searchDiv');
 	hideById('listEventDiv');
@@ -29,6 +33,9 @@
 				}
 			}
 			enableBtn();
+			hideById('programLoader');
+			jQuery('#programIdAddPatient').width(width);
+			enable('programIdAddPatient');
 		});
 }