lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch back to jenseggers/date

Browse Source
This commit is contained in:
James Brooks
2017-03-09 19:42:35 +00:00
parent ecb05d588f
commit f223e264c1
10 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/Dashboard/DashboardController.php
View File

@@ -17,12 +17,12 @@ use CachetHQ\Cachet\Models\Component;
use CachetHQ\Cachet\Models\ComponentGroup;
use CachetHQ\Cachet\Models\Incident;
use CachetHQ\Cachet\Models\Subscriber;
use Carbon\Carbon;
use Illuminate\Contracts\Auth\Guard;
use Illuminate\Routing\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\View;
use Jenssegers\Date\Date;
/**
* This is the dashboard controller class.
@@ -34,7 +34,7 @@ class DashboardController extends Controller
/**
* Start date.
*
* @var \Carbon\Carbon
* @var \Jenssegers\Date\Date
*/
protected $startDate;
@@ -71,7 +71,7 @@ class DashboardController extends Controller
{
$this->feed = $feed;
$this->guard = $guard;
$this->startDate = Carbon::now();
$this->startDate = new Date();
$this->dateTimeZone = Config::get('cachet.timezone');
}
@@ -131,13 +131,13 @@ class DashboardController extends Controller
$this->startDate->copy()->subDays(30)->format('Y-m-d').' 00:00:00',
$this->startDate->format('Y-m-d').' 23:59:59',
])->orderBy('occurred_at', 'desc')->get()->groupBy(function (Incident $incident) {
return (new Carbon($incident->occurred_at))
return (new Date($incident->occurred_at))
->setTimezone($this->dateTimeZone)->toDateString();
});
// Add in days that have no incidents
foreach (range(0, 30) as $i) {
$date = (new Carbon($this->startDate))->setTimezone($this->dateTimeZone)->subDays($i);
$date = (new Date($this->startDate))->setTimezone($this->dateTimeZone)->subDays($i);
if (!isset($allIncidents[$date->toDateString()])) {
$allIncidents[$date->toDateString()] = [];
@@ -163,13 +163,13 @@ class DashboardController extends Controller
$this->startDate->copy()->subDays(30)->format('Y-m-d').' 00:00:00',
$this->startDate->format('Y-m-d').' 23:59:59',
])->orderBy('created_at', 'desc')->get()->groupBy(function (Subscriber $incident) {
return (new Carbon($incident->created_at))
return (new Date($incident->created_at))
->setTimezone($this->dateTimeZone)->toDateString();
});
// Add in days that have no incidents
foreach (range(0, 30) as $i) {
$date = (new Carbon($this->startDate))->setTimezone($this->dateTimeZone)->subDays($i);
$date = (new Date($this->startDate))->setTimezone($this->dateTimeZone)->subDays($i);
if (!isset($allSubscribers[$date->toDateString()])) {
$allSubscribers[$date->toDateString()] = [];

8
app/Http/Controllers/StatusPageController.php
View File

@@ -19,7 +19,6 @@ use CachetHQ\Cachet\Models\Metric;
use CachetHQ\Cachet\Models\Schedule;
use CachetHQ\Cachet\Repositories\Metric\MetricRepository;
use CachetHQ\Cachet\Services\Dates\DateFactory;
use Carbon\Carbon;
use Exception;
use GrahamCampbell\Binput\Facades\Binput;
use Illuminate\Routing\Controller;
@@ -27,6 +26,7 @@ use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\Response;
use Illuminate\Support\Facades\View;
use Jenssegers\Date\Date;
use McCool\LaravelAutoPresenter\Facades\AutoPresenter;
/**
@@ -45,14 +45,14 @@ class StatusPageController extends AbstractApiController
*/
public function showIndex()
{
$today = Carbon::now();
$startDate = Carbon::now();
$today = Date::now();
$startDate = Date::now();
// Check if we have another starting date
if (Binput::has('start_date')) {
try {
// If date provided is valid
$oldDate = Carbon::createFromFormat('Y-m-d', Binput::get('start_date'));
$oldDate = Date::createFromFormat('Y-m-d', Binput::get('start_date'));
// If trying to get a future date fallback to today
if ($today->gt($oldDate)) {