Dashboard bugfix

This commit is contained in:
Pinga 2024-02-27 13:22:39 +02:00
parent 78594c693f
commit ba0a0a6a19
2 changed files with 28 additions and 33 deletions

View file

@ -57,22 +57,17 @@ class HomeController extends Controller
'tickets' => $tickets, 'tickets' => $tickets,
]); ]);
} else { } else {
$endDate = new \DateTime(); $startDate = (new \DateTime())->modify('-6 days');
$startDate = (new \DateTime())->modify('-4 days');
// Format dates for comparison
$startDateFormatted = $startDate->format('Y-m-d'); $startDateFormatted = $startDate->format('Y-m-d');
$endDateFormatted = $endDate->format('Y-m-d');
$query = "SELECT DATE(crdate) as date, COUNT(id) as count $query = "SELECT DATE(crdate) as date, COUNT(id) as count
FROM domain FROM domain
WHERE crdate >= :startDate AND crdate <= :endDate WHERE crdate >= :startDate
GROUP BY DATE(crdate) GROUP BY DATE(crdate)
ORDER BY DATE(crdate) ASC"; ORDER BY DATE(crdate) ASC";
$params = [ $params = [
':startDate' => $startDateFormatted, ':startDate' => $startDateFormatted,
':endDate' => $endDateFormatted,
]; ];
$domainsCount = $db->select($query, $params); $domainsCount = $db->select($query, $params);

View file

@ -113,6 +113,30 @@
</div> </div>
</a> </a>
</div> </div>
<div class="col-lg-6 col-xl-4">
<div class="card">
<div class="card-body">
<h3 class="card-title">{{ __('Last 7 Days: Domain Registrations') }}</h3>
<div id="last-7-days"></div>
</div>
</div>
</div>
<div class="col-lg-6 col-xl-4">
<div class="card">
<div class="card-body">
<h3 class="card-title">{{ __('Top Registrars by Domains') }}</h3>
<div id="top-registrars"></div>
</div>
</div>
</div>
<div class="col-lg-6 col-xl-4">
<div class="card">
<div class="card-body">
<h3 class="card-title">{{ __('Support Tickets: Last Week') }}</h3>
<div id="support-tickets"></div>
</div>
</div>
</div>
{% else %} {% else %}
<div class="col-sm-4 col-lg-4"> <div class="col-sm-4 col-lg-4">
<a class="card card-link" href="{{route('listDomains')}}"> <a class="card card-link" href="{{route('listDomains')}}">
@ -166,30 +190,6 @@
</a> </a>
</div> </div>
{% endif %} {% endif %}
<div class="col-lg-6 col-xl-4">
<div class="card">
<div class="card-body">
<h3 class="card-title">{{ __('Last 5 Days: Domain Registrations') }}</h3>
<div id="last-5-days"></div>
</div>
</div>
</div>
<div class="col-lg-6 col-xl-4">
<div class="card">
<div class="card-body">
<h3 class="card-title">{{ __('Top Registrars by Domains') }}</h3>
<div id="top-registrars"></div>
</div>
</div>
</div>
<div class="col-lg-6 col-xl-4">
<div class="card">
<div class="card-body">
<h3 class="card-title">{{ __('Support Tickets: Last Week') }}</h3>
<div id="support-tickets"></div>
</div>
</div>
</div>
<div class="col-12 col-md-6 mt-5"> <div class="col-12 col-md-6 mt-5">
<h3 class="card-title">{{ __('Recent Domains') }}</h3> <h3 class="card-title">{{ __('Recent Domains') }}</h3>
<div class="card"> <div class="card">
@ -265,7 +265,7 @@
var answeredData = JSON.parse('{{ answeredData|raw }}'); var answeredData = JSON.parse('{{ answeredData|raw }}');
var unansweredData = JSON.parse('{{ unansweredData|raw }}'); var unansweredData = JSON.parse('{{ unansweredData|raw }}');
window.ApexCharts && (new ApexCharts(document.getElementById('last-5-days'), { window.ApexCharts && (new ApexCharts(document.getElementById('last-7-days'), {
chart: { chart: {
type: "bar", type: "bar",
fontFamily: 'inherit', fontFamily: 'inherit',