dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #19911
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8886: mobile: uncommented uploadDataValueSets, should be working now.. needs more real-worl testing
------------------------------------------------------------
revno: 8886
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-11-05 17:44:03 +0100
message:
mobile: uncommented uploadDataValueSets, should be working now.. needs more real-worl 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/data-entry.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 16:12:23 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/resources/dhis-mobile-manifest.appcache 2012-11-05 16:44:03 +0000
@@ -1,5 +1,5 @@
CACHE MANIFEST
-# Version: 33
+# Version: 34
CACHE:
../mobile/index
=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/data-entry.vm'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/data-entry.vm 2012-11-05 11:44:21 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/data-entry.vm 2012-11-05 16:44:03 +0000
@@ -189,6 +189,7 @@
} else {
$.ajax({
url: '../api/dataSets/' + Selected.dataSet + '/form',
+ cache: false,
data: {
ou: Selected.orgUnit,
pe: Selected.period
=== 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 16:12:23 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/dhis-web-mobile-resources/js/dhis2.storage.js 2012-11-05 16:44:03 +0000
@@ -146,14 +146,12 @@
};
dhis2.storage.FormManager.prototype.uploadDataValueSets = function() {
-/*
var dataValueSets = this.dataValueSets();
var deferreds = [];
_.each(dataValueSets, function( value, key ) {
deferreds.push(dhis2.storage.makeUploadDataValueSetRequest( value ).success(function() {
- // Do not remove old dvs for now
- // delete dataValueSets[key];
+ delete dataValueSets[key];
})
);
});
@@ -163,7 +161,6 @@
localStorage.removeItem('dataValueSets');
localStorage.setItem('dataValueSets', JSON.stringify( dataValueSets ));
});
- */
};
// global storage manager instance