From 8796b38a252115821fc2cdab2b9cc2187178e0e0 Mon Sep 17 00:00:00 2001 From: Zelda Ababil Date: Mon, 5 Feb 2024 19:34:47 +0700 Subject: [PATCH] migration to lepi merah --- .../pages/admin/dashboard/chart.blade.php | 19 ++++++++++++++++--- .../pages/admin/dashboard/chartjs.blade.php | 19 +++++++++++++------ .../views/pages/admin/penjualan/js.blade.php | 1 - 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/resources/views/pages/admin/dashboard/chart.blade.php b/resources/views/pages/admin/dashboard/chart.blade.php index 07942c1..aab923a 100644 --- a/resources/views/pages/admin/dashboard/chart.blade.php +++ b/resources/views/pages/admin/dashboard/chart.blade.php @@ -105,8 +105,10 @@
+
+
@@ -138,8 +140,10 @@
+
+
@@ -172,9 +176,18 @@
- - +
+
+ + +
+
+ + +
+
diff --git a/resources/views/pages/admin/dashboard/chartjs.blade.php b/resources/views/pages/admin/dashboard/chartjs.blade.php index 66bd2bc..b911422 100644 --- a/resources/views/pages/admin/dashboard/chartjs.blade.php +++ b/resources/views/pages/admin/dashboard/chartjs.blade.php @@ -62,7 +62,7 @@ // You can switch between pie and douhnut using the method below. // eslint-disable-next-line no-unused-vars var pieChart = new Chart(pieChartCanvas, { - type: 'doughnut', + type: 'pie', data: pieData, options: pieOptions }) @@ -103,7 +103,7 @@ // You can switch between pie and douhnut using the method below. // eslint-disable-next-line no-unused-vars var pieChart = new Chart(pieChartCanvas, { - type: 'doughnut', + type: 'pie', data: pieData, options: pieOptions }) @@ -229,11 +229,18 @@ var color = ['#605ca8', '#ff851b', '#00a65a', '#f39c12', '#00c0ef', '#3c8dbc', '#d2d6de', '#f56954', '#4b0082', '#ff0000' ]; - var menuLaukLegend = $('#menuLaukLegend'); + var menuLaukLegend1 = $('#menuLaukLegend1'); + var menuLaukLegend2 = $('#menuLaukLegend2'); $.each(data.labels, function(index, value) { - menuLaukLegend.append('
  • ' + value + ' : ' + data.data[ - index] + '
  • '); + if (index > 4) { + menuLaukLegend2.append('
  • ' + value + ' : ' + data.data[ + index] + '
  • '); + } else { + menuLaukLegend1.append('
  • ' + value + ' : ' + data.data[ + index] + '
  • '); + } }); var pieData = { labels: data.labels, diff --git a/resources/views/pages/admin/penjualan/js.blade.php b/resources/views/pages/admin/penjualan/js.blade.php index 4a0177b..f7ef591 100644 --- a/resources/views/pages/admin/penjualan/js.blade.php +++ b/resources/views/pages/admin/penjualan/js.blade.php @@ -287,7 +287,6 @@ id: id }, success: function(result) { - console.log(result); if (result.status) { Swal.fire( 'Berhasil!',