From 138b6abc0fb992d74c62f1d0ebe180fb36264aa2 Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Fri, 5 Jul 2024 13:11:27 +0300
Subject: [PATCH] =?utf8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?utf8?q?=D0=B0=20=D1=81=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA?=
 =?utf8?q?=D0=B0=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?utf8?q?=20=D0=B2=D0=B8=D0=B7=D1=83=D0=B0=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/controllers/TimetableFactController.php | 7 +++++--
 erp24/views/timetable-fact/index.php          | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/erp24/controllers/TimetableFactController.php b/erp24/controllers/TimetableFactController.php
index d62b217b..16a76f5e 100644
--- a/erp24/controllers/TimetableFactController.php
+++ b/erp24/controllers/TimetableFactController.php
@@ -49,9 +49,9 @@ class TimetableFactController extends Controller
     public function actionIndex()
     {
         $model = DynamicModel::validateData([
-            'store_id' => null, 'date_start' => null, 'date_end' => null, 'group_id' => null, 'autoclosed' => false
+            'store_id' => null, 'date_start' => null, 'date_end' => null, 'group_id' => null, 'autoclosed' => false, 'sort' => null,
         ], [
-           [['store_id', 'date_start', 'date_end', 'group_id', 'autoclosed'], 'safe']
+           [['store_id', 'date_start', 'date_end', 'group_id', 'autoclosed', 'sort'], 'safe']
         ]);
         $model->load(Yii::$app->request->get());
         $timetableFactModelQuery = TimetableFactModel::find();
@@ -70,6 +70,9 @@ class TimetableFactController extends Controller
         if ($model->autoclosed) {
             $timetableFactModelQuery->andWhere(['autoclosed' => '1']);
         }
+        if (!$model->sort) {
+            $timetableFactModelQuery->orderBy(['date_shift' => SORT_DESC]);
+        }
 
         $stores = ArrayHelper::map(CityStore::find()->all(), 'id', 'name');
         $stores = [0 => 'Любой', ...$stores];
diff --git a/erp24/views/timetable-fact/index.php b/erp24/views/timetable-fact/index.php
index 23b25fa9..01963257 100644
--- a/erp24/views/timetable-fact/index.php
+++ b/erp24/views/timetable-fact/index.php
@@ -32,6 +32,7 @@ $this->params['breadcrumbs'][] = $this->title;
                         'allowClear' => true
                     ],
                 ])->label(false) ?></div>
+            &nbsp;&nbsp;&nbsp;
             Дата до: <div style="display:inline-block"><?= $form->field($model, 'date_start')->widget(DateTimePicker::class, [
                     'language' => 'ru',
                     'template' => '{input}',
@@ -41,6 +42,7 @@ $this->params['breadcrumbs'][] = $this->title;
                         'todayBtn' => true
                     ],
                 ])->label(false) ?></div>
+            &nbsp;&nbsp;&nbsp;
                 после: <div style="display:inline-block"><?= $form->field($model, 'date_end')->widget(DateTimePicker::class, [
                     'language' => 'ru',
                     'template' => '{input}',
@@ -50,6 +52,7 @@ $this->params['breadcrumbs'][] = $this->title;
                         'todayBtn' => true
                     ],
                 ])->label(false) ?></div>
+            &nbsp;&nbsp;&nbsp;
             Группа: <div style="display:inline-block"><?= $form->field($model, 'group_id')->widget(Select2::class, [
                     'data' => $adminGroup,
                     'language' => 'ru',
@@ -58,6 +61,7 @@ $this->params['breadcrumbs'][] = $this->title;
                         'allowClear' => true
                     ],
                 ])->label(false) ?></div>
+            &nbsp;&nbsp;&nbsp;
             Автоматическое закрытие: <div style="display:inline-block"><?= $form->field($model, 'autoclosed')->checkbox([0 => 'unchecked', 1 => 'checked'], [])->label(false) ?></div>
             &nbsp;&nbsp;&nbsp;
             <?= Html::submitButton('Применить', ['class' => 'btn btn-secondary btn-sm'])?>
-- 
2.39.5