From 4a0c8de82a09de6c8294245f57334b81ca0d4754 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 21 Sep 2021 19:13:09 -0700 Subject: [PATCH] adds jquery eventlistner to monitor chart.js width and refresh accordingly --- public/css/build/app.css | Bin 16860 -> 16950 bytes public/css/build/overrides.css | Bin 10010 -> 10100 bytes public/css/dist/all.css | Bin 436928 -> 437108 bytes public/mix-manifest.json | 6 +++--- resources/assets/less/overrides.less | 2 +- resources/views/dashboard.blade.php | 14 +++++++++++--- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/public/css/build/app.css b/public/css/build/app.css index 437bb21e459a09c9d2e8180619fd16409d70577a..18037c5fbfd2dc93ae40d1941742f6775151e5ab 100644 GIT binary patch delta 79 zcmcc9%($(Eal>s#0lnmm#G(@2+ delta 11 Scmdni!g!~dal>s#MlJv!Gz4=1 diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index 3a2e2dbdb3270b266f928d6bb522a1828773840b..afb96a696b95c767cebde2327b893e9f41fb2034 100644 GIT binary patch delta 77 zcmbQ`_r-66q`H7!azX<>CSW64n^4 delta 9 Qcmez3H_LB>q&g!P02OQlCIA2c diff --git a/public/css/dist/all.css b/public/css/dist/all.css index 5a22019c30f4e74949f3cf1b3235f5f241d90be9..bf6f413e79287b3c42501f07c04cb6e0e12e7ebb 100644 GIT binary patch delta 150 zcmX?bRqD$%sfHHD7N!>F7M2#)Eo@iqS@n`L5{stmu`)|d{;-EfJ2$Z?Ju}ZrA+fY1 w-=SOex6#bIZ41v}b#lg=T;O2?khm)pBtG0De9(=Kufz delta 34 qcmexzP3pi^sfHHD7N!>F7M2#)Eo@iqryItziEMXvV7r#Z$OQoQ6bw-S diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 1796d19d5a..a70c1fe6b1 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,8 +1,8 @@ { "/js/build/app.js": "/js/build/app.js?id=8beeabe6e636080bceea", "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=83e39e254b7f9035eddc", - "/css/build/overrides.css": "/css/build/overrides.css?id=b9b59d80509972c3b16a", - "/css/build/app.css": "/css/build/app.css?id=1da91ae0ff24d10b7207", + "/css/build/overrides.css": "/css/build/overrides.css?id=ba5b2e0c743ab27c250d", + "/css/build/app.css": "/css/build/app.css?id=2b6c8fc2299606d50eef", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=65ca7a34198fa16ba846", "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=83271cb3576583918804", "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=400089ea82795d45c8dc", @@ -18,7 +18,7 @@ "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=efda2335fa5243175850", "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=6a9d0ac448c28b88e5d6", "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=c24716a423d375902723", - "/css/dist/all.css": "/css/dist/all.css?id=683ab3f90a03310078d5", + "/css/dist/all.css": "/css/dist/all.css?id=8da06c56702777a39c20", "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f212", "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced", diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index 73ab8ad1b4..c9d66d3bfe 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -563,4 +563,4 @@ th.css-accessory > .th-inner::before .form-group.has-error label { color: #a94442; -} \ No newline at end of file +} diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index 1e4f706986..377f99ea96 100755 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -418,14 +418,15 @@ // --------------------------- // - ASSET STATUS CHART - // --------------------------- + var pieChartCanvas = $("#statusPieChart").get(0).getContext("2d"); var pieChart = new Chart(pieChartCanvas); var ctx = document.getElementById("statusPieChart"); var pieOptions = { legend: { position: 'top', - responsive: true, - maintainAspectRatio: true, + responsive: true, + maintainAspectRatio: false, } }; @@ -446,7 +447,14 @@ }, error: function (data) { // window.location.reload(true); - } + }, + }); + var last = document.getElementById('statusPieChart').clientWidth; + addEventListener('resize', function() { + var current = document.getElementById('statusPieChart').clientWidth; + if (current != last) location.reload(); + last = current; + }); @endpush