From 4a0c8de82a09de6c8294245f57334b81ca0d4754 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 21 Sep 2021 19:13:09 -0700 Subject: [PATCH 1/3] adds jquery eventlistner to monitor chart.js width and refresh accordingly --- public/css/build/app.css | 6 ++++++ public/css/build/overrides.css | 6 ++++++ public/css/dist/all.css | 12 ++++++++++++ public/mix-manifest.json | 6 +++--- resources/assets/less/overrides.less | 2 +- resources/views/dashboard.blade.php | 14 +++++++++++--- 6 files changed, 39 insertions(+), 7 deletions(-) diff --git a/public/css/build/app.css b/public/css/build/app.css index 437bb21e4..18037c5fb 100644 --- a/public/css/build/app.css +++ b/public/css/build/app.css @@ -857,4 +857,10 @@ th.css-accessory > .th-inner::before { .form-group.has-error label { color: #a94442; } +.chart-container { + position: relative; + margin: auto; + height: 80vh; + width: 80vw; +} diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index 3a2e2dbdb..afb96a696 100644 --- a/public/css/build/overrides.css +++ b/public/css/build/overrides.css @@ -490,4 +490,10 @@ th.css-accessory > .th-inner::before { .form-group.has-error label { color: #a94442; } +.chart-container { + position: relative; + margin: auto; + height: 80vh; + width: 80vw; +} diff --git a/public/css/dist/all.css b/public/css/dist/all.css index 5a22019c3..bf6f413e7 100644 --- a/public/css/dist/all.css +++ b/public/css/dist/all.css @@ -18118,6 +18118,12 @@ th.css-accessory > .th-inner::before { .form-group.has-error label { color: #a94442; } +.chart-container { + position: relative; + margin: auto; + height: 80vh; + width: 80vw; +} .select2-container { @@ -19094,4 +19100,10 @@ th.css-accessory > .th-inner::before { .form-group.has-error label { color: #a94442; } +.chart-container { + position: relative; + margin: auto; + height: 80vh; + width: 80vw; +} diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 1796d19d5..a70c1fe6b 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 73ab8ad1b..c9d66d3bf 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 1e4f70698..377f99ea9 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 From 941cba73b9d8af7547db401c370f03fbdc54dc43 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 21 Sep 2021 19:27:17 -0700 Subject: [PATCH 2/3] removed deadspace and unnecessary css changes --- public/css/build/app.css | 6 ------ public/css/build/overrides.css | 7 +------ public/css/dist/all.css | 13 +------------ public/mix-manifest.json | 6 +++--- resources/assets/less/overrides.less | 2 +- resources/views/dashboard.blade.php | 4 +--- 6 files changed, 7 insertions(+), 31 deletions(-) diff --git a/public/css/build/app.css b/public/css/build/app.css index 18037c5fb..437bb21e4 100644 --- a/public/css/build/app.css +++ b/public/css/build/app.css @@ -857,10 +857,4 @@ th.css-accessory > .th-inner::before { .form-group.has-error label { color: #a94442; } -.chart-container { - position: relative; - margin: auto; - height: 80vh; - width: 80vw; -} diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index afb96a696..cbe8a1f53 100644 --- a/public/css/build/overrides.css +++ b/public/css/build/overrides.css @@ -490,10 +490,5 @@ th.css-accessory > .th-inner::before { .form-group.has-error label { color: #a94442; } -.chart-container { - position: relative; - margin: auto; - height: 80vh; - width: 80vw; -} + diff --git a/public/css/dist/all.css b/public/css/dist/all.css index bf6f413e7..d2d68dfe7 100644 --- a/public/css/dist/all.css +++ b/public/css/dist/all.css @@ -18118,12 +18118,7 @@ th.css-accessory > .th-inner::before { .form-group.has-error label { color: #a94442; } -.chart-container { - position: relative; - margin: auto; - height: 80vh; - width: 80vw; -} + .select2-container { @@ -19100,10 +19095,4 @@ th.css-accessory > .th-inner::before { .form-group.has-error label { color: #a94442; } -.chart-container { - position: relative; - margin: auto; - height: 80vh; - width: 80vw; -} diff --git a/public/mix-manifest.json b/public/mix-manifest.json index a70c1fe6b..1796d19d5 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=ba5b2e0c743ab27c250d", - "/css/build/app.css": "/css/build/app.css?id=2b6c8fc2299606d50eef", + "/css/build/overrides.css": "/css/build/overrides.css?id=b9b59d80509972c3b16a", + "/css/build/app.css": "/css/build/app.css?id=1da91ae0ff24d10b7207", "/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=8da06c56702777a39c20", + "/css/dist/all.css": "/css/dist/all.css?id=683ab3f90a03310078d5", "/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 c9d66d3bf..73ab8ad1b 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 377f99ea9..7486464a4 100755 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -418,7 +418,6 @@ // --------------------------- // - ASSET STATUS CHART - // --------------------------- - var pieChartCanvas = $("#statusPieChart").get(0).getContext("2d"); var pieChart = new Chart(pieChartCanvas); var ctx = document.getElementById("statusPieChart"); @@ -426,7 +425,7 @@ legend: { position: 'top', responsive: true, - maintainAspectRatio: false, + maintainAspectRatio: true, } }; @@ -448,7 +447,6 @@ error: function (data) { // window.location.reload(true); }, - }); var last = document.getElementById('statusPieChart').clientWidth; addEventListener('resize', function() { From 160017c720dabf256b7b41ffef6693af4d2ee42e Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 21 Sep 2021 19:28:39 -0700 Subject: [PATCH 3/3] more deadspace --- public/css/build/overrides.css | 2 -- public/css/dist/all.css | 2 -- 2 files changed, 4 deletions(-) diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index cbe8a1f53..94adeae5d 100644 --- a/public/css/build/overrides.css +++ b/public/css/build/overrides.css @@ -490,5 +490,3 @@ th.css-accessory > .th-inner::before { .form-group.has-error label { color: #a94442; } - - diff --git a/public/css/dist/all.css b/public/css/dist/all.css index d2d68dfe7..d2edb6eab 100644 --- a/public/css/dist/all.css +++ b/public/css/dist/all.css @@ -18119,8 +18119,6 @@ th.css-accessory > .th-inner::before { color: #a94442; } - - .select2-container { box-sizing: border-box; display: inline-block;