dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8883
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-11-05 15:59:48 +0100
message:
  mobile: more testing..
modified:
  dhis-2/dhis-web/dhis-web-mobile/src/main/resources/dhis-mobile-manifest.appcache
  dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm
  dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/dhis-web-mobile-resources/js/dhis2.storage.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-mobile/src/main/resources/dhis-mobile-manifest.appcache'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/resources/dhis-mobile-manifest.appcache	2012-11-05 13:43:28 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/resources/dhis-mobile-manifest.appcache	2012-11-05 14:59:48 +0000
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Version: 30
+# Version: 31
 
 CACHE:
 ../mobile/index

=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm	2012-11-05 12:16:28 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm	2012-11-05 14:59:48 +0000
@@ -89,6 +89,8 @@
     function renderOfflineStatus() {
         var dataValueSets = fm.dataValueSets();
 
+        alert(JSON.stringify(dataValueSets));
+
         var tmpl = jQuery('#offline-status-template').html();
 
         $('#offline-status').html(

=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/dhis-web-mobile-resources/js/dhis2.storage.js'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/dhis-web-mobile-resources/js/dhis2.storage.js	2012-11-05 14:28:26 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/dhis-web-mobile-resources/js/dhis2.storage.js	2012-11-05 14:59:48 +0000
@@ -31,7 +31,7 @@
 dhis2.storage.FormManager = function ( args ) {
     this._organisationUnits = undefined;
     this._forms = undefined;
-    this._id = _.uniqueId('formManager');
+    this._id = _.uniqueId('form-manager');
 };
 
 dhis2.storage.FormManager.prototype.getMetaData = function () {
@@ -133,7 +133,7 @@
 dhis2.storage.FormManager.prototype.saveDataValueSet = function( dataValueSet ) {
     var dataValueSets = this.dataValueSets();
 
-    return dhis2.storage.makeUploadDataValueSetRequest( dataValueSet ).always(function() {
+    return dhis2.storage.makeUploadDataValueSetRequest( dataValueSet ).error(function() {
         // add to local dataValueSets
         dataValueSets[dhis2.storage.getUniqueKey(dataValueSet)] = dataValueSet;
 
@@ -141,11 +141,12 @@
         localStorage.removeItem('dataValueSets');
         localStorage.setItem('dataValueSets', JSON.stringify( dataValueSets ));
 
-        alert('stored locally');
+        alert(JSON.stringify( dataValueSets ));
     });
 };
 
 dhis2.storage.FormManager.prototype.uploadDataValueSets = function() {
+/*
     var dataValueSets = this.dataValueSets();
     var deferreds = [];
 
@@ -162,6 +163,7 @@
         localStorage.removeItem('dataValueSets');
         localStorage.setItem('dataValueSets', JSON.stringify( dataValueSets ));
     });
+ */
 };
 
 // global storage manager instance