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

Merge pull request #61 from q6q9/API_reports

Browse Source 
Api reports
This commit is contained in:
kavalar 2021-09-14 13:49:45 +03:00 committed by GitHub
commit 724a287a5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backend/widgets/Calendar.php
View File

@ -3,6 +3,7 @@
namespace backend\widgets;
use common\classes\Debug;
use yii\base\Widget;
use yii\helpers\Html;
@ -17,14 +18,25 @@ class Calendar extends Widget
public $monthUpdate;
public $colorClasses = ['accept' => 'access', 'default' => 'danger', 'offDay' => ''];
public $colorClasses;// = ['accept' => 'access', 'default' => 'danger', 'offDay' => ''];
public $offDaysShow = 1;
public $offDaysShow = 0;
public $script = 'CalendarHelper.main()';
public function init()
{
if (!isset($this->monthUpdate['url'])){
Debug::dd('Не существует $monthUpdate["url"]');
}
if (!isset($this->dayUpdate['url'])){
Debug::dd('Не существует $dayUpdate["url"]');
}
if (!isset($this->colorClasses)){
Debug::dd('Не существует $colorClasses;<br> ["accept" => "access", "default" => "danger", "offDay" => ""]');
}
parent::init();
$view = $this->getView();
AppAsset::register($view);

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

@ -39,13 +39,12 @@ class ReportSearchForm extends Model
{
$queryBuilder = Reports::find()
->with('task')
->andWhere(['between', 'reports.created_at', $this->fromDate, $this->toDate, $this->user_id])
->andWhere(['between', 'reports.created_at', $this->fromDate, $this->toDate])
->limit($this->limit)
->offset($this->offset);
if(isset($this->user_id)) {
$userCardId = UserCard::findByUserId($this->user_id)->id;
$queryBuilder->andWhere(['user_card_id' => $userCardId]);
$queryBuilder->andWhere(['user_card_id' => $this->user_id]);
}
$data = $queryBuilder->asArray()->all();