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

Рефакторинг, дебаг календаря, добавление кнопки назад, отображение выбранного дня

Browse Source
This commit is contained in:
maxim
2021-09-08 14:39:32 +03:00
parent 415d8e4ee9
commit 0c29d4f4d5
8 changed files with 692 additions and 747 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backend/modules/reports/models/Month.php
View File

@ -2,10 +2,6 @@
namespace backend\modules\reports\models;
use common\classes\Debug;
use yii\base\Model;
use function GuzzleHttp\Psr7\str;
class Month
{
@ -18,10 +14,9 @@ class Month
{
$this->inactive_begin = [];
$this->inactive_end = [];
if (!$date and !self::is_date($date)) {
if ( !($date and self::is_date($date)) ){
$date = date('Y-m-d');
}
$first_day_of_week = self::get_day_week(self::get_first_day($date));
$quantity_days = self::get_days_month($date);

6
backend/modules/reports/models/ReportsSearch.php
View File

@ -59,7 +59,9 @@ class ReportsSearch extends Reports
$this->load($params);
if (isset($params['user_id'])) {
$this->user_card_id = $params['user_id'];
}
if (isset($params['year'])) {
$query->andFilterWhere(['=', 'YEAR(reports.created_at)', $params['year']]);
}
@ -79,7 +81,7 @@ class ReportsSearch extends Reports
$query->andFilterWhere([
'user_card.id' => $this->id,
'reports.id' => $this->id,
'reports.created_at' => $this->created_at,
'user_card_id' => $this->user_card_id,
]);