apuc/guild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix reports

Browse Source
This commit is contained in:
iIronside 2023-01-19 16:40:01 +03:00
parent 2f8e6466f4
commit 56ec8d8b13
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/modules/api/controllers/ReportsController.php
View File

@ -159,6 +159,7 @@ class ReportsController extends ApiController
// return $reportsModel; // return $reportsModel;
$reports = $reportsModel->reportsByDate(); $reports = $reportsModel->reportsByDate();
return $reports;
return ArrayHelper::toArray($reports , [ return ArrayHelper::toArray($reports , [
'common\models\Reports' => [ 'common\models\Reports' => [
'date' => 'created_at', 'date' => 'created_at',

3
frontend/modules/api/models/ReportSearchForm.php
View File

@ -71,8 +71,7 @@ class ReportSearchForm extends Model
{ {
return Reports::find()->with('task') return Reports::find()->with('task')
->where(['reports.user_card_id' => $this->user_card_id]) ->where(['reports.user_card_id' => $this->user_card_id])
->where(['reports.user_card_id' => $this->user_card_id]) ->andWhere(['between', 'reports.created_at', $this->fromDate, $this->toDate])
->where(['between', 'reports.created_at', $this->fromDate, $this->toDate])
->asArray()->all(); ->asArray()->all();
} }
} }