@wavemaker/app-runtime-wm-build 11.4.0-next.1417051 → 11.4.0-next.1417052

app-runtime-wm-build/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/app-runtime-wm-build",
-    "version": "11.4.0-next.1417051",
+    "version": "11.4.0-next.1417052",
     "description": "All modules required for a wavemaker application.",
     "main": "index.js",
     "scripts": {

app-runtime-wm-build/wmapp/scripts/wm-libs.js

@@ -166188,6 +166188,11 @@ $.widget("wm.datatable", {
         var self = this, preparedData, $tbody, pageStartIndex = self.getPageStartIndex(), startRowIndex = self.options.startRowIndex, isScrollorOnDemand = self.options.isNavTypeScrollOrOndemand();
         if (isScrollorOnDemand) {
             $tbody = this.gridElement;
+            if (this.renderTableOnViewLess) {
+                $tbody = this.gridElement.empty();
+                this.hideLoadingIndicator();
+                this.renderTableOnViewLess = false;
+            }
         } else {
             $tbody = this.gridElement.empty();
         }
@@ -166655,17 +166660,40 @@ $.widget("wm.datatable", {
             }), 100);
         }
     },
-    addLoadMoreBtn: function(onDemandMsg, loadingdatamsg, cb) {
-        if (!this.options.isLastPage) {
+    addLoadMoreBtn: function(onDemandMsg, loadingdatamsg, cb, infScroll) {
+        var $btnEl;
+        if (!this.options.isLastPage || infScroll) {
             var self = this;
             var $parenEl = $('<div class="on-demand-datagrid"><a class="app-button btn btn-block on-demand-load-btn"></a></div>');
-            var $btnEl = $parenEl.find("a");
+            $btnEl = $parenEl.find("a");
             $btnEl.append(onDemandMsg);
             this.element.find(".app-grid-header-inner").append($parenEl);
+            if (infScroll) {
+                if (this.element.find(".on-demand-load-btn").length) {
+                    this.element.find(".on-demand-load-btn").text(this.options.viewlessmessage);
+                }
+            }
             $btnEl.on("click", (function(e) {
-                if (cb && typeof cb === "function") {
-                    $btnEl.hide();
+                var lastPage = self.options.getCurrentPage() == self.options.getPageCount();
+                if (!lastPage) {
                     self.showLoadingIndicator(loadingdatamsg, false);
+                }
+                if (!self.options.showviewlessbutton) {
+                    $btnEl.hide();
+                }
+                if (infScroll) {
+                    if (lastPage) {
+                        self.element.find(".on-demand-datagrid").remove();
+                    }
+                }
+                if (lastPage && self.options.showviewlessbutton) {
+                    $btnEl.hide();
+                    self.renderTableOnViewLess = true;
+                    self.renderPaginationOnViewLess = true;
+                    self.options.enableNavigation();
+                    self._renderGrid();
+                }
+                if (cb && typeof cb === "function") {
                     cb(e);
                 }
             }));
@@ -166692,7 +166720,17 @@ $.widget("wm.datatable", {
     hideLoadingIndicator: function(showLoadBtn, infScroll) {
         if (!showLoadBtn && !infScroll) {
             this.element.find(".loading-data-msg").hide();
+            this.element.find(".on-demand-load-btn").text(this.options.ondemandmessage);
             this.element.find(".on-demand-load-btn").show();
+        } else if (this.options.getCurrentPage() == this.options.getPageCount() && this.options.showviewlessbutton) {
+            this.element.find(".on-demand-load-btn").show().text(this.options.viewlessmessage);
+            this.element.find(".loading-data-msg").hide();
+            if (infScroll) {
+                if (!this.element.find(".on-demand-load-btn").length) {
+                    this.options.addLoadMoreBtn();
+                }
+                this.element.find(".loading-data-msg").hide();
+            }
         } else {
             this.element.find(".on-demand-datagrid").hide();
         }
@@ -168228,7 +168266,9 @@ $.widget("wm.datatable", {
         if (this.options.summaryRow) {
             var $summaryRowHtm = $(this._getSummaryRowTemplate());
             this.tableContainer.find("tfoot").remove();
-            this.tableContainer.append($summaryRowHtm);
+            if (this.options.data.length) {
+                this.tableContainer.append($summaryRowHtm);
+            }
         }
         if (!this.options.data.length && this.dataStatus.state === "nodata") {
             this.setStatus("nodata");
@@ -168238,7 +168278,7 @@ $.widget("wm.datatable", {
             this.setStatus(this.dataStatus.state, this.dataStatus.message, isCreated);
         }
         this.gridBody = this.gridElement.find("tbody");
-        this.gridFooter = this.gridElement.find("tfoot");
+        this.gridFooter = this.tableContainer.find("tfoot");
         this._findAndReplaceCompiledTemplates();
         this.options.clearRowActions();
         this._appendRowExpansionButtons($htm);
@@ -168298,6 +168338,9 @@ $.widget("wm.datatable", {
             this._toggleSpacingClasses("condensed");
         }
         this._renderGrid(isCreated);
+        this.addNavigationControls();
+    },
+    addNavigationControls: function() {
         if (this.options.isdynamictable) {
             this.element.find(".on-demand-datagrid").remove();
             if (this.options.navigation === "On-Demand" && !this.element.find(".on-demand-datagrid").length) {
@@ -168318,7 +168361,7 @@ $.widget("wm.datatable", {
         if (state === "ready") {
             this.dataStatusContainer.hide();
         } else {
-            if (this.options.isNavTypeScrollOrOndemand() && (state === "nodata" || this.options.isLastPage)) {
+            if (this.options.isNavTypeScrollOrOndemand() && (state === "nodata" || this.options.getCurrentPage() == this.options.getPageCount() && !this.options.showviewlessbutton)) {
                 this.element.find(".on-demand-datagrid a").hide();
             }
             this.dataStatusContainer.show();