Skip to content

Commit fe2270f

Browse files
HashJProgrammingHashJProgramming
committed
Version 8.7 - New Improve Dashboard
1 parent 1a59943 commit fe2270f

File tree

2 files changed

+95
-30
lines changed

2 files changed

+95
-30
lines changed

‎functions/views/dashboard-chart.php

Lines changed: 67 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,79 @@
11
<?php
22
include_once 'functions/connection.php';
33

4-
$sql = "SELECT YEAR(created_at) AS year, MONTH(created_at) AS month, SUM(total) AS total_sales
5-
FROM transactions
6-
WHERE status = 4
7-
GROUP BY YEAR(created_at), MONTH(created_at)
8-
ORDER BY YEAR(created_at), MONTH(created_at)";
9-
10-
$stmt = $db->prepare($sql);
11-
$stmt->execute();
12-
13-
$labels = [];
14-
$data = [];
15-
while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
4+
function daily_chart(){
5+
global $db;
6+
$sql = "SELECT DATE(created_at) AS date, SUM(total) AS total_sales
7+
FROM transactions
8+
WHERE status = 4
9+
GROUP BY DATE(created_at)
10+
ORDER BY DATE(created_at)";
11+
12+
$stmt = $db->prepare($sql);
13+
$stmt->execute();
14+
15+
$labels = [];
16+
$data = [];
17+
while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
18+
$date = date("M d, Y", strtotime($row['date']));
19+
$labels[] = $date;
20+
$data[] = $row['total_sales'];
21+
}
22+
$chartData = [
23+
'labels' => $labels,
24+
'datasets' => [
25+
[
26+
'label' => 'Daily Earnings',
27+
'fill' => true,
28+
'data' => $data,
29+
'backgroundColor' => 'rgba(78, 115, 223, 0.05)',
30+
'borderColor' => 'rgba(78, 115, 223, 1)'
31+
]
32+
]
33+
];
34+
35+
$chartDataJson = json_encode($chartData);
36+
?>
37+
<canvas data-bss-chart='{"type":"line","data":<?php echo $chartDataJson; ?>,"options":{"maintainAspectRatio":false,"legend":{"display":false,"labels":{"fontStyle":"normal"}},"title":{"fontStyle":"normal"},"scales":{"xAxes":[{"gridLines":{"color":"rgb(234, 236, 244)","zeroLineColor":"rgb(234, 236, 244)","drawBorder":false,"drawTicks":false,"borderDash":["2"],"zeroLineBorderDash":["2"],"drawOnChartArea":false},"ticks":{"fontColor":"#858796","fontStyle":"normal","padding":20}}],"yAxes":[{"gridLines":{"color":"rgb(234, 236, 244)","zeroLineColor":"rgb(234, 236, 244)","drawBorder":false,"drawTicks":false,"borderDash":["2"],"zeroLineBorderDash":["2"]},"ticks":{"fontColor":"#858796","fontStyle":"normal","padding":20}}]}}}'></canvas>
38+
<?php
39+
}
40+
41+
42+
function month_chart(){
43+
global $db;
44+
$sql = "SELECT YEAR(created_at) AS year, MONTH(created_at) AS month, SUM(total) AS total_sales
45+
FROM transactions
46+
WHERE status = 4
47+
GROUP BY YEAR(created_at), MONTH(created_at)
48+
ORDER BY YEAR(created_at), MONTH(created_at)";
49+
50+
$stmt = $db->prepare($sql);
51+
$stmt->execute();
52+
53+
$labels = [];
54+
$data = [];
55+
while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
1656
$monthName = date("M", mktime(0, 0, 0, $row['month'], 10));
1757
$labels[] = $monthName . ' ' . $row['year'];
1858
$data[] = $row['total_sales'];
19-
}
20-
$chartData = [
59+
}
60+
$chartData = [
2161
'labels' => $labels,
2262
'datasets' => [
23-
[
24-
'label' => 'Earnings',
25-
'fill' => true,
26-
'data' => $data,
27-
'backgroundColor' => 'rgba(78, 115, 223, 0.05)',
28-
'borderColor' => 'rgba(78, 115, 223, 1)'
29-
]
63+
[
64+
'label' => 'Earnings',
65+
'fill' => true,
66+
'data' => $data,
67+
'backgroundColor' => 'rgba(78, 115, 223, 0.05)',
68+
'borderColor' => 'rgba(78, 115, 223, 1)'
69+
]
3070
]
31-
];
71+
];
3272

3373

34-
$chartDataJson = json_encode($chartData);
35-
?>
74+
$chartDataJson = json_encode($chartData);
75+
?>
76+
<canvas data-bss-chart='{"type":"line","data":<?php echo $chartDataJson; ?>,"options":{"maintainAspectRatio":false,"legend":{"display":false,"labels":{"fontStyle":"normal"}},"title":{"fontStyle":"normal"},"scales":{"xAxes":[{"gridLines":{"color":"rgb(234, 236, 244)","zeroLineColor":"rgb(234, 236, 244)","drawBorder":false,"drawTicks":false,"borderDash":["2"],"zeroLineBorderDash":["2"],"drawOnChartArea":false},"ticks":{"fontColor":"#858796","fontStyle":"normal","padding":20}}],"yAxes":[{"gridLines":{"color":"rgb(234, 236, 244)","zeroLineColor":"rgb(234, 236, 244)","drawBorder":false,"drawTicks":false,"borderDash":["2"],"zeroLineBorderDash":["2"]},"ticks":{"fontColor":"#858796","fontStyle":"normal","padding":20}}]}}}'></canvas>
77+
<?php
78+
}
3679

37-
<canvas data-bss-chart='{"type":"line","data":<?php echo $chartDataJson; ?>,"options":{"maintainAspectRatio":false,"legend":{"display":false,"labels":{"fontStyle":"normal"}},"title":{"fontStyle":"normal"},"scales":{"xAxes":[{"gridLines":{"color":"rgb(234, 236, 244)","zeroLineColor":"rgb(234, 236, 244)","drawBorder":false,"drawTicks":false,"borderDash":["2"],"zeroLineBorderDash":["2"],"drawOnChartArea":false},"ticks":{"fontColor":"#858796","fontStyle":"normal","padding":20}}],"yAxes":[{"gridLines":{"color":"rgb(234, 236, 244)","zeroLineColor":"rgb(234, 236, 244)","drawBorder":false,"drawTicks":false,"borderDash":["2"],"zeroLineBorderDash":["2"]},"ticks":{"fontColor":"#858796","fontStyle":"normal","padding":20}}]}}}'></canvas>

‎index.php

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22
include_once 'functions/authentication.php';
33
include_once 'functions/views/dashboard-count.php';
4+
include_once 'functions/views/dashboard-chart.php'
45
?>
56

67
<!DOCTYPE html>
@@ -68,7 +69,7 @@
6869
<div class="card-body">
6970
<div class="row align-items-center no-gutters">
7071
<div class="col me-2">
71-
<div class="text-uppercase text-primary fw-bold text-xs mb-1"><span>Earnings (monthly)</span></div>
72+
<div class="text-uppercase text-primary fw-bold text-xs mb-1"><span>Earnings (monthly) - <?php echo date('F')?> </span></div>
7273
<div class="text-dark fw-bold h5 mb-0"><span>₱<?php get_monthly()?></span></div>
7374
</div>
7475
<div class="col-auto"><i class="fas fa-calendar fa-2x text-gray-300"></i></div>
@@ -81,7 +82,7 @@
8182
<div class="card-body">
8283
<div class="row align-items-center no-gutters">
8384
<div class="col me-2">
84-
<div class="text-uppercase text-success fw-bold text-xs mb-1"><span>Earnings (annual)</span></div>
85+
<div class="text-uppercase text-success fw-bold text-xs mb-1"><span>Earnings (annual) - <?php echo date('Y')?> </span></div>
8586
<div class="text-dark fw-bold h5 mb-0"><span>₱<?php get_yearly()?></span></div>
8687
</div>
8788
<div class="col-auto"><i class="fas fa-dollar-sign fa-2x text-gray-300"></i></div>
@@ -172,18 +173,40 @@
172173
<div class="col">
173174
<div class="card shadow mb-4">
174175
<div class="card-header d-flex justify-content-between align-items-center">
175-
<h6 class="text-primary fw-bold m-0">Earnings Overview</h6>
176+
<h6 class="text-primary fw-bold m-0">Monthly Earnings Overview</h6>
176177
<div class="dropdown no-arrow"><button class="btn btn-link btn-sm dropdown-toggle" aria-expanded="false" data-bs-toggle="dropdown" type="button"><i class="fas fa-ellipsis-v text-gray-400"></i></button>
177178
<div class="dropdown-menu shadow dropdown-menu-end animated--fade-in">
178-
<p class="text-center dropdown-header">dropdown header:</p><a class="dropdown-item" href="#">&nbsp;Action</a><a class="dropdown-item" href="#">&nbsp;Another action</a>
179+
<p class="text-center dropdown-header">Under Maintainance:</p>
180+
<a class="dropdown-item" href="#">&nbsp;Under Maintainance</a><a class="dropdown-item" href="#">&nbsp;Under Maintainance</a>
179181
<div class="dropdown-divider"></div><a class="dropdown-item" href="#">&nbsp;Something else here</a>
180182
</div>
181183
</div>
182184
</div>
183185
<div class="card-body">
184186
<div class="chart-area">
185187
<?php
186-
include_once 'functions/views/dashboard-chart.php'
188+
month_chart();
189+
?>
190+
</div>
191+
</div>
192+
</div>
193+
</div>
194+
<div class="col">
195+
<div class="card shadow mb-4">
196+
<div class="card-header d-flex justify-content-between align-items-center">
197+
<h6 class="text-primary fw-bold m-0">Daily Earnings Overview</h6>
198+
<div class="dropdown no-arrow"><button class="btn btn-link btn-sm dropdown-toggle" aria-expanded="false" data-bs-toggle="dropdown" type="button"><i class="fas fa-ellipsis-v text-gray-400"></i></button>
199+
<div class="dropdown-menu shadow dropdown-menu-end animated--fade-in">
200+
<p class="text-center dropdown-header">Under Maintainance:</p>
201+
<a class="dropdown-item" href="#">&nbsp;Under Maintainance</a><a class="dropdown-item" href="#">&nbsp;Under Maintainance</a>
202+
<div class="dropdown-divider"></div><a class="dropdown-item" href="#">&nbsp;Something else here</a>
203+
</div>
204+
</div>
205+
</div>
206+
<div class="card-body">
207+
<div class="chart-area">
208+
<?php
209+
daily_chart();
187210
?>
188211
</div>
189212
</div>

0 commit comments

Comments
 (0)