add migration for view Details Currency and change check-price view

Mihail
1 parent afcbaa24
Showing 7 changed files with 137 additions and 36 deletions Show diff stats
backend/controllers/CheckPriceController.php
backend/models/Currency.php
backend/models/Importers.php
backend/views/check-price/view.php
common/models/DetailsCurrency.php
console/migrations/m151016_130143_add_fk_currency_to_Importers.php
console/migrations/m151016_144435_addViewDetailsCurrency.php
@@ -8,6 +8,7 @@ use yii\filters\AccessControl;
 use backend\components\base\BaseController;
 use yii\filters\VerbFilter;
 use backend\models\Details;
+use common\models\DetailsCurrency;
 use backend\models\ImportersFiles;
 use backend\models\Importers;
 use yii\base\ErrorException;
@@ -61,7 +62,7 @@ class CheckPriceController extends BaseController
  
     public function actionIndex()
     {
-        //$query = (new Query())->select('*')->from('{{%importer_files}}')->where(['not', ['time_end' => null]])->orderBy(['upload_time' => SORT_DESC]);
+
         $query = Importers::find()->where(['active' => true])->orderBy(['price_date_update' => SORT_DESC]);
         $provider = new ActiveDataProvider([
             'query' => $query,
@@ -79,11 +80,12 @@ class CheckPriceController extends BaseController
     public function actionView ($id, $date_update)
     {
  
-        $query = Details::find()->where(['IMPORT_ID' => $id, 'timestamp' => $date_update])->limit(20);
+        $query = DetailsCurrency::find()->where(['IMPORT_ID' => $id, 'timestamp' => $date_update])->limit(20);
  
-        $importer = Importers::findOne($id)->name;
+        $importer = Importers::findOne( $id );
         $date = Yii::$app->formatter->asDate( $date_update, 'yyyy-MM-dd' );
  
+
         $provider = new ActiveDataProvider([
             'query' => $query,
             'pagination' => false,
@@ -15,13 +15,6 @@ use Yii;
  */
 class Currency extends \yii\db\ActiveRecord
 {
-    /**
-     * @inheritdoc
-     */
-    public static function tableName()
-    {
-        return 'w_currency';
-    }
  
     /**
      * @inheritdoc
@@ -5,6 +5,7 @@ namespace backend\models;
 use common\components\CustomVarDamp;
 use Yii;
 use backend\components\base\BaseActiveRecord;
+use backend\models\Currency;
  
 /**
  *
@@ -89,6 +90,15 @@ class Importers extends BaseActiveRecord
         ];
     }
  
+    public function getCurrency ()
+    {
+        return $this->hasOne(Currency::className(), ['id' => 'currency_id'])->one()->name;
+    }
+
+    public function getCurrencyRate ()
+    {
+        return $this->hasOne(Currency::className(), ['id' => 'currency_id'])->one()->rate;
+    }
  
     public function getKeys ()
     {
@@ -8,24 +8,29 @@ use yii\bootstrap\Modal;
 /* @var $this yii\web\View */
 /* @var $searchModel backend\models\CatalogSearch */
 /* @var $dataProvider yii\data\ActiveDataProvider */
-$this->title = 'Прайс ' . Html::encode( "{$importer} от {$date}" );
+$this->title = 'Прайс ' . Html::encode("{$importer->name} от {$date}");
 $this->params['breadcrumbs'][] = $this->title;
  
 ?>
-<div class="catalog-index">
-
-    <h1><?= Html::encode($this->title) ?></h1>
-
-    <?= GridView::widget( ['dataProvider' => $dataProvider,
-
-        ] );
-
-
- ?>
-
-
-
-</div>
+    <div class="catalog-index">
+
+        <h1><?= Html::encode($this->title) ?></h1>
+
+        <?= GridView::widget( ['dataProvider' => $dataProvider,
+            'columns' => [
+                ['attribute' => 'FULL_ARTICLE'],
+                ['attribute' => 'ARTICLE'],
+                ['attribute' => 'BRAND'],
+                ['attribute' => 'DESCR'],
+                ['attribute' => 'BOX'],
+                ['attribute' => 'ADD_BOX'],
+                ['attribute' => 'GROUP'],
+                ['attribute' => 'name'],
+                ['attribute' => 'PRICE'],
+        ]
+        ] ); ?>
+
+    </div>
 <?php
  
 ?>
 \ No newline at end of file
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "{{%details_currency}}".
+ *
+ * @property string $ID
+ * @property string $IMPORT_ID
+ * @property string $BRAND
+ * @property string $ARTICLE
+ * @property string $FULL_ARTICLE
+ * @property double $PRICE
+ * @property string $DESCR
+ * @property string $BOX
+ * @property string $ADD_BOX
+ * @property string $GROUP
+ * @property string $timestamp
+ * @property string $name
+ * @property double $rate
+ */
+class DetailsCurrency extends \backend\components\base\BaseActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return '{{%details_currency}}';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['ID', 'IMPORT_ID', 'BOX', 'ADD_BOX'], 'integer'],
+            [['IMPORT_ID', 'BRAND', 'ARTICLE', 'FULL_ARTICLE', 'PRICE', 'DESCR', 'BOX', 'name', 'rate'], 'required'],
+            [['PRICE', 'rate'], 'number'],
+            [['timestamp'], 'safe'],
+            [['BRAND', 'ARTICLE'], 'string', 'max' => 100],
+            [['FULL_ARTICLE'], 'string', 'max' => 150],
+            [['DESCR', 'GROUP'], 'string', 'max' => 200],
+            [['name'], 'string', 'max' => 50]
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'ID' => Yii::t('app', 'ID'),
+            'IMPORT_ID' => Yii::t('app', 'Import  ID'),
+            'BRAND' => Yii::t('app', 'Бренд'),
+            'ARTICLE' => Yii::t('app', 'Имя'),
+            'FULL_ARTICLE' => Yii::t('app', 'Артикул'),
+            'PRICE' => Yii::t('app', 'Цена'),
+            'DESCR' => Yii::t('app', 'Описание'),
+            'BOX' => Yii::t('app', 'Кол-во'),
+            'ADD_BOX' => Yii::t('app', 'В пути'),
+            'GROUP' => Yii::t('app', 'Группа RG'),
+            'timestamp' => Yii::t('app', 'Дата обновления'),
+            'name' => Yii::t('app', 'Валюта'),
+            'rate' => Yii::t('app', 'Курс'),
+        ];
+    }
+}
@@ -7,17 +7,6 @@ class m151016_130143_add_fk_currency_to_Importers extends Migration
 {
     public function safeUp()
     {
-//        // сначала отберем записи которых нет уже в поставщиках
-//        $id_arr = (new \yii\db\Query())
-//            ->select(['{{%importers_files}}.id'])
-//            ->from('{{%importers_files}}')
-//            ->leftJoin('{{%importers}}', 'importer_id = {{%importers}}.id')
-//            ->where(['name' => null])
-//            ->all();
-//        $id_arr = array_column($id_arr,'id');
-//        // удалим их
-//        $this->delete('{{%importers_files}}',['id' => $id_arr]);
-
         $this->addForeignKey('currency_fk', '{{%importers}}', 'currency_id', '{{%currency}}', 'id');
     }
  
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151016_144435_addViewDetailsCurrency extends Migration
+{
+    public function up()
+    {
+
+        $view = <<< MySQL
+        create view w_details_currency as
+        select w_details.*, w_currency.name, w_currency.rate  from w_details
+        inner join  w_importers on w_importers.id = w_details.import_id
+        inner join w_currency on w_currency.id = w_importers.currency_id;
+MySQL;
+
+        $this->execute($view);
+
+    }
+
+    public function down()
+    {
+        // вернем все как было
+        $drop_view = 'drop view if exists w_details_currency';
+
+        $this->execute($drop_view);
+
+    }
+}