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

Merge branch 'master' into update_projects_and_tasks

Browse Source
This commit is contained in:
iIronside
2023-01-25 10:38:17 +03:00
parent 78aaef28df 3ac2d54ec2
commit a353cbec6c
3 changed files with 52 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,32 +4,28 @@
namespace frontend\modules\api\models;
use common\models\Reports;
use common\models\ReportsTask;
use yii\base\Model;
/** */
class ReportSearchForm extends Model
{
public $user_card_id;
public $limit;
public $offset;
/** @var string */
public $date;
public $fromDate;
public $toDate;
public $user_id;
/**
* @var false
*/
public $byDate;
public $date;
public function __construct($config = [])
{
$this->limit = 10;
$this->offset = 0;
$this->user_id = null;
$this->user_card_id = null;
$this->toDate = date('Y-m-d', time());
$this->fromDate = date('Y-m-01', time());
$this->toDate = date('Y-m-d');
$this->fromDate = date('Y-m-d');
$this->date = date('Y-m-d');
$this->byDate = false;
parent::__construct($config);
}
@ -38,39 +34,43 @@ class ReportSearchForm extends Model
{
return [
[['byDate'], 'safe'],
[['fromDate', 'toDate', 'date'], 'date', 'format' => 'php:Y-m-d'],
[['limit', 'offset', 'user_id'], 'integer', 'min' => 0],
[['fromDate', 'toDate', 'date'], 'string'],
// [['fromDate', 'toDate', 'date'], 'date', 'format' => 'php:Y-m-d'],
[[ 'user_card_id'], 'integer', 'min' => 0],
];
}
public function byParams()
{
$queryBuilder = Reports::find()
->with('task');
$queryBuilder = Reports::find()->with('task');
if ($this->byDate) {
$queryBuilder->andWhere(['reports.created_at' => $this->date]);
} else {
if ($this->fromDate && $this->toDate) {
$queryBuilder->andWhere(['between', 'reports.created_at', $this->fromDate, $this->toDate]);
}
if (isset($this->user_card_id)) {
$queryBuilder->andWhere(['reports.user_card_id' => $this->user_card_id]);
}
$queryBuilder->limit($this->limit)
->offset($this->offset);
if (isset($this->user_id)) {
$queryBuilder->andWhere(['user_card_id' => $this->user_id]);
}
$data = $queryBuilder->asArray()->all();
return $data;
return $queryBuilder->asArray()->all();
}
public function findByDate(): array
public function findByDate()
{
return Reports::find()
->where(['between', 'reports.created_at', $this->fromDate, $this->toDate])
->andWhere(['user_card_id' => $this->user_id])
->all();
return Reports::find()->with('task')
->where(['reports.user_card_id' => $this->user_card_id])
->andWhere(['reports.created_at' => $this->date])
->asArray()->all();
}
public function reportsByDate()
{
return Reports::find()->with('task')
->where(['reports.user_card_id' => $this->user_card_id])
->andWhere(['between', 'reports.created_at', $this->fromDate, $this->toDate])
->asArray()->all();
}
}