Добавлена сортировка исправлен визуал

diff --git a/erp24/controllers/TimetableFactController.php b/erp24/controllers/TimetableFactController.php
index d62b217bc0ba922b235d646bee1cf231120a4fa8..16a76f5e2351d9abf59e827425511a3d505e49ac 100644 (file)
--- 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 23b25fa9c3ef7b38387fc89f6211e809b44d59c5..0196325736fbca43bd8fff4f06c8895d25ea5c57 100644 (file)
--- 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'])?>