Merge pull request #14 from carapai/master

Version bump up and Date time bug correction
HISP-Uganda · Dec 12, 2019 · 34d8614 · 34d8614
2 parents 253168a + 34c9de7
commit 34d8614
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/public/manifest.webapp b/public/manifest.webapp
@@ -8,7 +8,7 @@
   },
   "appType": "APP",
   "name": "Data Import Wizard",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Data Importer Wizard",
   "icons": {
     "48": "favicon.ico"

diff --git a/src/index.js b/src/index.js
@@ -13,13 +13,13 @@ if (process.env.NODE_ENV === 'development') {
     // config.baseUrl = `http://localhost:8080/api`;
     // config.baseUrl = 'https://play.dhis2.org/2.30/api'
     // config.baseUrl = 'https://ds.dev.hispuganda.org/api'
-    config.baseUrl = 'https://ds.dev.hispuganda.org/api';
-    // config.baseUrl = 'https://programs.psiug.org/psi/api'
+    // config.baseUrl = 'https://ds.dev.hispuganda.org/api';
+    config.baseUrl = 'https://programs.psiug.org/psi/api'
     // config.headers = { Authorization: 'Basic YWRtaW46ZGlzdHJpY3Q=' }; // admin
-    // config.headers = { Authorization: 'Basic SGlzcDpBcGlAMjAxOSE=' };// dev pace
+    config.headers = { Authorization: 'Basic SGlzcDpBcGlAMjAxOSE=' };// dev pace
     // config.baseUrl = `http://dhis2-staging.kuunika.org:8087/api`;
     // config.headers = { Authorization: 'Basic bWJvbmdlbmljaGl6b25kYTpBYmlreWwyMkA=' };
-    config.headers = { Authorization: 'Basic c3RlcGhlbjpIaXNwQDIwMTk=' };
+    // config.headers = { Authorization: 'Basic c3RlcGhlbjpIaXNwQDIwMTk=' };
 } else {
     let baseUrl = '';
     let urlArray = window.location.pathname.split('/');
@@ -29,7 +29,6 @@ if (process.env.NODE_ENV === 'development') {
     } else {
         baseUrl = '/';
     }
-
     baseUrl = window.location.protocol + '//' + window.location.host + baseUrl;
     config.baseUrl = baseUrl + 'api'
 }

diff --git a/src/utils/utils.js b/src/utils/utils.js
@@ -436,7 +436,7 @@ export const validateValue = (dataType, value, optionSet) => {
         }
     } else if (validText(dataType, value)) {
         if (dataType === 'DATETIME') {
-            return moment(value).format('YYYY-MM-DD HH:mm:ss');
+            return moment(value).format('YYYY-MM-DDTHH:mm');
         } else if (dataType === 'DATE') {
             return moment(value).format('YYYY-MM-DD');
         } else if (dataType === 'TIME') {