Merge pull request #53 from TheDMSGroup/ENG-403

[ENG-403] make datatables scroll on dashboard and reduce font size
TheDMSGroup · Jul 27, 2018 · 35efc53 · 35efc53
2 parents b67f901 + afaea53
commit 35efc53
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/Assets/js/global-revenue.js b/Assets/js/global-revenue.js
@@ -1,5 +1,6 @@
 Mautic.loadGlobalRevenueWidget = function () {
     var $globaltarget = mQuery('#global-revenue');
+    var $globalwrapper = mQuery('#global-revenue_wrapper');
     if ($globaltarget.length) {
         mQuery('#global-revenue:not(.table-initialized):first').addClass('table-initialized').each(function () {
             mQuery.getScriptCachedOnce(mauticBasePath + '/' + mauticAssetPrefix + 'plugins/MauticContactLedgerBundle/Assets/js/datatables.min.js', function () {
@@ -22,6 +23,7 @@ Mautic.loadGlobalRevenueWidget = function () {
                                     },
                                     data: response.rows,
                                     autoFill: true,
+                                    autoWidth: true,
                                     columns: response.columns,
                                     order: [[2, 'asc']],
                                     bLengthChange: false,
@@ -57,8 +59,8 @@ Mautic.loadGlobalRevenueWidget = function () {
                                             targets: 10
                                         },
                                         {visible: false, targets: [1]},
-                                        {width: '5%', targets: [0]},
-                                        {width: '20%', targets: [2]}
+                                        // {width: '5%', targets: [0]},
+                                        // {width: '20%', targets: [2]}
                                     ],
 
                                     footerCallback: function (row, data, start, end, display) {
@@ -122,6 +124,9 @@ Mautic.loadGlobalRevenueWidget = function () {
                                     } // FooterCallback
                                 }); //.DataTables
                                 mQuery('#global-revenue_wrapper .dt-buttons').css({float: "right", marginLeft: "10px"});
+                                mQuery('#global-revenue').css('width', 'auto');
+                                mQuery('#global-revenue').css("font-size", ".8em")
+                                mQuery('#global-revenue_wrapper').css('overflow-x', 'scroll');
                             } //success
                         }); //ajax
                     }); //getScriptsCachedOnce - fonteawesome css

diff --git a/Assets/js/source-revenue.js b/Assets/js/source-revenue.js
@@ -65,8 +65,8 @@ Mautic.loadSourceRevenueWidget = function () {
                                         },
                                         {visible: false, targets: [1, 3]},
                                         {width: '5%', targets: [0]},
-                                        {width: '20%', targets: [2]},
-                                        {width: '15%', targets: [4]}
+                                        {width: '15%', targets: [2]},
+                                        {width: '12%', targets: [4]}
                                     ],
 
                                     footerCallback: function (row, data, start, end, display) {
@@ -84,7 +84,7 @@ Mautic.loadSourceRevenueWidget = function () {
                                                 var tr2 = mQuery('<tr class=\'detailGrandTotal\' style=\'font-weight: 600; background: #fafafa;\'></tr>');
                                                 tr.append(mQuery('<td colspan=\'3\'>Page totals</td>'));
                                                 tr2.append(mQuery('<td colspan=\'3\'>Grand totals</td>'));
-                                                for (var i = 2; i < columns; i++) {
+                                                for (var i = 5; i < columns; i++) {
                                                     tr.append(mQuery('<td class=\'td-right\'></td>'));
                                                     tr2.append(mQuery('<td class=\'td-right\'></td>'));
                                                 }
@@ -134,6 +134,9 @@ Mautic.loadSourceRevenueWidget = function () {
 
                                 }); //.DataTables
                                 mQuery('#source-revenue_wrapper .dt-buttons').css({float: "right", marginLeft: "10px"});
+                                mQuery('#source-revenue').css("width", "auto");
+                                mQuery('#source-revenue').css("font-size", ".8em")
+                                mQuery('#source-revenue_wrapper').css("overflow-x", "scroll");
                             } //success
                         });//ajax
                     }); //getScriptsCachedOnce - fonteawesome css