paging

EyeSeeTea · Feb 28, 2017 · 89fc5bf · 89fc5bf
1 parent a997f8c
commit 89fc5bf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/manifest.webapp b/manifest.webapp
@@ -1,6 +1,6 @@
 {
   "version": "26.0.0",
-  "name": "DHIS 2 Event Reports",
+  "name": "Event reports app",
   "description": "DHIS2 event reports app",
   "icons": {},
   "developer": {

diff --git a/src/api/Layout.js b/src/api/Layout.js
@@ -209,9 +209,11 @@ Layout.prototype.req = function(source, format, isSorted, isTableLayout, isFilte
         }
 
         // paging
-        if (this.dataType === dimensionConfig.dataType['individual_cases'] && isObject(this.paging)) {
-            request.add('pageSize=' + this.paging.pageSize);
-            request.add('page=' + this.paging.page);
+        if (this.dataType === dimensionConfig.dataType['individual_cases']) {
+            var paging = this.paging || {};
+
+            request.add('pageSize=' + (paging.pageSize || 100));
+            request.add('page=' + (paging.page || 1));
         }
     }
 

diff --git a/src/index.js b/src/index.js
@@ -120,7 +120,7 @@ manifestReq.done(function(text) {
     appManager.manifest = JSON.parse(text);
     appManager.env = process.env.NODE_ENV;
     appManager.setAuth();
-    //appManager.logVersion();
+    appManager.logVersion();
 
     var systemInfoReq = $.getJSON(appManager.getApiPath() + systemInfoUrl);
 
@@ -230,6 +230,7 @@ function initialize() {
 
         var createEventDataTable = function(layout, response) {
             var _table = new table.EventDataTable(refs, layout, response);
+            var statusBar = uiManager.get('statusBar');
 
             if (_table) {
 
@@ -243,6 +244,10 @@ function initialize() {
                 // events
                 tableManager.setColumnHeaderMouseHandlers(_layout, _table);
 
+                if (statusBar) {
+                    statusBar.setStatus(layout, response);
+                }
+
                 afterLoad();
             }
         };

diff --git a/src/manager/InstanceManager.js b/src/manager/InstanceManager.js
@@ -1,6 +1,6 @@
-import {InstanceManager} from 'd2-analysis';
+import { InstanceManager } from 'd2-analysis';
 
-export {InstanceManager};
+export { InstanceManager };
 
 InstanceManager.prototype.getReport = function(layout, isFavorite, skipState, forceUiState, fn) {
     var t = this,