dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4311
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-08-16 10:07:09 +0200
message:
  Loading forms asynchronously
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css


--
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-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2011-08-16 07:51:39 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2011-08-16 08:07:09 +0000
@@ -688,13 +688,8 @@
 function updateForms()
 {
 	purgeLocalForms();
-	console.log( 'Purged local forms' );
-	
-	updateExistingLocalForms();
-	console.log( 'Updated existing local forms' );
-	
+	updateExistingLocalForms();	
 	downloadRemoteForms();
-	console.log( 'Downloaded remote forms' );
 }
 
 function purgeLocalForms()
@@ -711,6 +706,8 @@
 			console.log( 'Deleted locally stored form: ' + localId );
 		}
 	}
+	
+	console.log( 'Purged local forms' );
 }
 
 function updateExistingLocalForms()
@@ -922,8 +919,7 @@
 	/**
 	 * Downloads the form for the data set with the given identifier from the 
 	 * remote server and saves the form locally. Potential existing forms with
-	 * the same identifier will be overwritten. Updates the form version. Method 
-	 * is synchronous.
+	 * the same identifier will be overwritten. Updates the form version.
 	 * 
 	 * @param dataSetId the identifier of the data set of the form.
 	 * @param formVersion the version of the form of the remote data set.
@@ -934,10 +930,11 @@
 			url: 'loadForm.action',
 			data: { dataSetId: dataSetId },
 			dataType: 'text',
-			async: false,
+			dataSetId: dataSetId,
+			formVersion: formVersion,
 			success: function( data, textStatus, jqXHR ) {					
-				storageManager.saveForm( dataSetId, data );
-				storageManager.saveFormVersion( dataSetId, formVersion );
+				storageManager.saveForm( this.dataSetId, data );
+				storageManager.saveFormVersion( this.dataSetId, this.formVersion );
 			}
 		} );
 	}

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css	2011-08-13 14:21:36 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css	2011-08-16 08:07:09 +0000
@@ -8,7 +8,7 @@
   font-size: 14px;
   text-align: right;
   position: fixed;
-  top: 55px;
+  top: 58px;
   right: 10px;
   filter: alpha(opacity=85);
   opacity: 0.85;