Close #45

controllers/PanelController.php

@@ -39,7 +39,7 @@ public function actionIndex()
             . '";
         ', View::POS_HEAD);
 
-        $roomModels = Room::find()->all();
+        $roomModels = Room::find()->orderBy('sort_order')->all();
 
         return $this->render('index', [
             'roomModels' => $roomModels,

migrations/m170312_221606_add_room_order_to_room.php

@@ -0,0 +1,18 @@
+<?php
+
+use yii\db\Migration;
+
+class m170312_221606_add_room_order_to_room extends Migration
+{
+    public function safeUp()
+    {
+        $this->addColumn('room', 'sort_order', $this->integer()->defaultValue(0));
+        $this->dropColumn('room', 'bg');
+    }
+
+    public function safeDown()
+    {
+        $this->dropColumn('room', 'sort_order');
+        $this->addColumn('room', 'bg', $this->string());
+    }
+}

models/Room.php

@@ -3,18 +3,19 @@
 namespace app\models;
 
 use Yii;
+use yii\db\ActiveRecord;
 use yii\helpers\ArrayHelper;
 
 /**
  * This is the model class for table "room".
  *
  * @property integer $id
  * @property string $name
- * @property string $bg
+ * @property integer $sort_order
  *
  * @property Item[] $items
  */
-class Room extends \yii\db\ActiveRecord
+class Room extends ActiveRecord
 {
     /**
      * @inheritdoc
@@ -31,7 +32,9 @@ public function rules()
     {
         return [
             [['name'], 'required'],
-            [['name', 'bg'], 'string', 'max' => 255],
+            [['name'], 'string', 'max' => 255],
+            [['sort_order'], 'integer'],
+            [['sort_order'], 'default', 'value' => 0],
         ];
     }
 
@@ -43,18 +46,10 @@ public function attributeLabels()
         return [
             'id' => Yii::t('app', 'ID'),
             'name' => Yii::t('app', 'Название'),
-            'bg' => Yii::t('app', 'Фон'),
+            'sort_order' => Yii::t('app', 'Порядок сортировки'),
         ];
     }
 
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getItems()
-    {
-        return $this->hasMany(Item::className(), ['room_id' => 'id'])->inverseOf('room');
-    }
-
     /**
      * @return \yii\db\ActiveQuery|ItemWidgetQuery
      */
@@ -63,15 +58,6 @@ public function getItemWidgets()
         return $this->hasMany(ItemWidget::className(), ['room_id' => 'id'])->inverseOf('room');
     }
 
-    /**
-     * @inheritdoc
-     * @return RoomQuery the active query used by this AR class.
-     */
-    public static function find()
-    {
-        return new RoomQuery(get_called_class());
-    }
-
     /**
      * @return array
      */

models/RoomSearch.php

@@ -18,8 +18,8 @@ class RoomSearch extends Room
     public function rules()
     {
         return [
-            [['id'], 'integer'],
-            [['name', 'bg'], 'safe'],
+            [['id', 'sort_order'], 'integer'],
+            [['name'], 'safe'],
         ];
     }
 
@@ -60,10 +60,10 @@ public function search($params)
         // grid filtering conditions
         $query->andFilterWhere([
             'id' => $this->id,
+            'sort_order' => $this->sort_order,
         ]);
 
-        $query->andFilterWhere(['like', 'name', $this->name])
-            ->andFilterWhere(['like', 'bg', $this->bg]);
+        $query->andFilterWhere(['like', 'name', $this->name]);
 
         return $dataProvider;
     }

modules/admin/views/room/_form.php

@@ -14,12 +14,7 @@
 
     <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
 
-    <?= $form->field($model, 'bg')->dropDownList([
-        'success' => 'Зеленый',
-        'danger' => 'Красный',
-        'warning' => 'Оранжевый',
-        'info' => 'Синий',
-    ]) ?>
+    <?= $form->field($model, 'sort_order')->input('number') ?>
 
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Сохранить', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>

modules/admin/views/room/index.php

@@ -25,7 +25,7 @@
         'columns' => [
             'id',
             'name',
-            'bg',
+            'sort_order',
 
             ['class' => 'app\components\ActionButtonColumn'],
         ],

modules/admin/views/room/view.php

@@ -28,7 +28,7 @@
         'attributes' => [
             'id',
             'name',
-            'bg',
+            'sort_order',
         ],
     ]) ?>