amacocian/monica
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Improve Date and DateTime parsing (#1576)

Browse Source
This commit is contained in:
Alexis Saettler
2018-07-23 00:15:48 +02:00
committed by GitHub
parent 0ec0e8591d
commit ed80f544a5
51 changed files with 583 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/Statistics/ApiStatisticsController.php
+4 -4
View File
@@ -2,7 +2,7 @@
namespace App\Http\Controllers\Api\Statistics;
use Carbon\Carbon;
use App\Helpers\DateHelper;
use Illuminate\Http\Request;
use App\Models\Instance\Instance;
use App\Models\Instance\Statistic;
@@ -26,11 +26,11 @@ class ApiStatisticsController extends ApiController
$instance = Instance::first();
// Get the date of the monday of last week
$dateMondayLastWeek = Carbon::now()->subDays(7);
$dateMondayLastWeek = now()->subDays(7);
$dateMondayLastWeek = $dateMondayLastWeek->startOfWeek();
// Get the date of the sunday of last week
$dateSundayLastWeek = Carbon::now()->subDays(7);
$dateSundayLastWeek = now()->subDays(7);
$dateSundayLastWeek = $dateSundayLastWeek->endOfWeek();
// Get the number of users last monday
@@ -44,7 +44,7 @@ class ApiStatisticsController extends ApiController
$statistics = collect();
$statistics->push([
'instance_creation_date' => $instance->created_at->format(config('api.timestamp_format')),
'instance_creation_date' => DateHelper::getTimestamp($instance->created_at),
'number_of_contacts' => ($statistic ? $statistic->number_of_contacts : 0),
'number_of_users' => ($statistic ? $statistic->number_of_users : 0),
'number_of_activities' => ($statistic ? $statistic->number_of_activities : 0),