commit
4dc254d38e
@ -53,6 +53,7 @@ class HolidaySearch extends Holiday
|
||||
|
||||
$query->andFilterWhere(['between', 'dt_start', $dt_start, $dt_end ])
|
||||
->orFilterWhere(['between', 'dt_end', $dt_start, $dt_end ]);
|
||||
$query->orderBy('id DESC');
|
||||
|
||||
return $dataProvider;
|
||||
}
|
||||
|
@ -42,7 +42,7 @@
|
||||
],
|
||||
],
|
||||
['label' => 'Баланс', 'icon' => 'dollar', 'url' => ['/balance/balance']],
|
||||
['label' => 'Отпуска', 'icon' => 'user-circle', 'url' => ['/holiday/holiday']],
|
||||
['label' => 'Отпуска', 'icon' => 'plane', 'url' => ['/holiday/holiday']],
|
||||
|
||||
/*['label' => 'Gii', 'icon' => 'file-code-o', 'url' => ['/gii']],
|
||||
['label' => 'Debug', 'icon' => 'dashboard', 'url' => ['/debug']],
|
||||
|
@ -26,7 +26,7 @@ class Holiday extends ActiveRecord
|
||||
{
|
||||
return [
|
||||
[['card_id', 'dt_start', 'dt_end'], 'integer'],
|
||||
// [['card_id', 'dt_start', 'dt_end'], 'required'],
|
||||
[['card_id', 'dt_start', 'dt_end'], 'required'],
|
||||
];
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user