Mascali/raspisms
1
0
Fork 0
mirror of https://github.com/RaspbianFrance/raspisms.git synced 2025-04-20 16:37:48 +02:00
Code Issues Projects Releases Wiki Activity

improve icons for credit

Browse source
This commit is contained in:
osaajani 2021-06-14 20:21:06 +02:00
parent c3637ab3ab
commit ca9b7c7c6e
6 changed files with 42 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
controllers/internals/Tool.php
View file

@ -123,6 +123,26 @@ namespace controllers\internals;
break;
case 'QUOTA_LIMIT_CLOSE':
$logo = 'fa-exclamation';
break;
case 'QUOTA_LIMIT_REACHED':
$logo = 'fa-exclamation-triangle';
break;
case 'QUOTA_RENEWAL':
$logo = 'fa-retweet';
break;
case 'QUOTA_CONSUME':
$logo = 'fa-euro';
break;
default:
$logo = 'fa-question';
}

6
controllers/publics/Dashboard.php
View file

@ -78,9 +78,12 @@ namespace controllers\publics;
$stats_start_date_formated = $stats_start_date->format('Y-m-d');
//If user have a quota and the quota start before today, use quota start date instead
$quota_limit = false;
$quota = $this->internal_quota->get_user_quota($id_user);
if ($quota && (new \DateTime($quota['start_date']) <= $now) && (new \DateTime($quota['expiration_date']) > $now))
{
$quota_limit = $quota['credit'] + $quota['additional'];
$stats_start_date = new \DateTime($quota['start_date']);
$stats_start_date_formated = $stats_start_date->format('Y-m-d');
}
@ -124,7 +127,7 @@ namespace controllers\publics;
$total_receiveds += $nb_received;
}
$nb_days = $stats_start_date->diff($now)->days;
$nb_days = $stats_start_date->diff($now)->days + 1;
$avg_sendeds = round($total_sendeds / $nb_days, 2);
$avg_receiveds = round($total_receiveds / $nb_days, 2);
@ -139,6 +142,7 @@ namespace controllers\publics;
'nb_unreads' => $nb_unreads,
'avg_sendeds' => $avg_sendeds,
'avg_receiveds' => $avg_receiveds,
'quota_limit' => $quota_limit,
'sendeds' => $sendeds,
'receiveds' => $receiveds,
'events' => $events,