add crud models for ImportersPrefix

Mihail
1 parent ef571c30
Showing 16 changed files with 444 additions and 14 deletions Show diff stats
backend/controllers/CheckPriceController.php
backend/controllers/ImportersPrefixController.php
backend/models/ImportersPrefix.php
backend/models/ImportersPrefixSearch.php
backend/models/UploadFileParsingForm.php
backend/views/check-price/index.php
backend/views/check-price/view.php
backend/views/importers-prefix/_form.php
backend/views/importers-prefix/_search.php
backend/views/importers-prefix/create.php
backend/views/importers-prefix/index.php
backend/views/importers-prefix/update.php
backend/views/importers-prefix/view.php
backend/views/layouts/column.php
backend/web/js/parser.js
vendor/yiisoft/multiparser/CsvParser.php
@@ -63,7 +63,6 @@ class CheckPriceController extends BaseController
     {
         //$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,
             'pagination' => [
@@ -82,6 +81,9 @@ class CheckPriceController extends BaseController
         $query = Details::find()->where(['IMPORT_ID' => $id, 'timestamp' => $date_update])->limit(20);
+        $importer = Importers::findOne($id)->name;
+        $date = Yii::$app->formatter->asDate( $date_update, 'yyyy-MM-dd' );
+
         $provider = new ActiveDataProvider([
             'query' => $query,
             'pagination' => false,
@@ -89,7 +91,10 @@ class CheckPriceController extends BaseController
         ]);
         return $this->renderAjax('view',
-            ['dataProvider' => $provider]);
+            ['dataProvider' => $provider,
+            'importer' => $importer,
+            'date' => $date,
+            ]);
     }
 }
+<?php
+
+namespace backend\controllers;
+
+use Yii;
+use backend\models\ImportersPrefix;
+use backend\models\ImportersPrefixSearch;
+use backend\components\base\BaseController;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * ImportersPrefixController implements the CRUD actions for ImportersPrefix model.
+ */
+class ImportersPrefixController extends BaseController
+{
+    public $layout = "/column";
+
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all ImportersPrefix models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new ImportersPrefixSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+
+    /**
+     * Creates a new ImportersPrefix model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new ImportersPrefix();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing ImportersPrefix model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param string $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing ImportersPrefix model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param string $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the ImportersPrefix model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param string $id
+     * @return ImportersPrefix the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = ImportersPrefix::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
+<?php
+
+namespace backend\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "w_importers_prefix".
+ *
+ * @property string $id
+ * @property string $importer_id
+ * @property string $brand
+ * @property string $prefix
+ * @property string $timestamp
+ */
+class ImportersPrefix extends \backend\components\base\BaseActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'w_importers_prefix';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['importer_id', 'brand', 'prefix'], 'required'],
+            [['importer_id'], 'integer'],
+            [['timestamp'], 'safe'],
+            [['brand'], 'string', 'max' => 100],
+            [['prefix'], 'string', 'max' => 50],
+            [['importer_id', 'brand', 'prefix'], 'unique', 'targetAttribute' => ['importer_id', 'brand', 'prefix'], 'message' => 'The combination of Importer ID, Brand and Prefix has already been taken.']
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => Yii::t('app', 'ID'),
+            'importer_id' => Yii::t('app', 'Importer ID'),
+            'brand' => Yii::t('app', 'Brand'),
+            'prefix' => Yii::t('app', 'Prefix'),
+            'timestamp' => Yii::t('app', 'Timestamp'),
+        ];
+    }
+}
+<?php
+
+namespace backend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use backend\models\ImportersPrefix;
+
+/**
+ * ImportersPrefixSearh represents the model behind the search form about `backend\models\ImportersPrefix`.
+ */
+class ImportersPrefixSearch extends ImportersPrefix
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id', 'importer_id'], 'integer'],
+            [['brand', 'prefix', 'timestamp'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = ImportersPrefix::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id' => $this->id,
+            'importer_id' => $this->importer_id,
+            'timestamp' => $this->timestamp,
+        ]);
+
+        $query->andFilterWhere(['like', 'brand', $this->brand])
+            ->andFilterWhere(['like', 'prefix', $this->prefix]);
+
+        return $dataProvider;
+    }
+}
@@ -69,10 +69,10 @@ class UploadFileParsingForm extends Model
         ];
     }
-    public function readFile(){
+    public function readFile( $options = [] ){
-        $data = Yii::$app->multiparser->parse( $this->file_path );
-        if( !is_array($data) ){
+        $data = Yii::$app->multiparser->parse( $this->file_path, $options );
+        if( !is_array( $data ) ){
             $data = ['No results'];
         }
@@ -16,7 +16,8 @@ $this-&gt;title = &#39;Проверка прайсов&#39;;
 $this->params['breadcrumbs'][] = $this->title;
 // зарегистрируем скрипт для обработки загрузки модального окна
 ParserAsset::register($this);
-Pjax::begin();
+// убрал Pjax потому что он при выполнении блокирует скрипт вызова модального окна
+//Pjax::begin();
 ?>
 <div class="catalog-index">
@@ -73,9 +74,8 @@ Pjax::begin();
     ]);
     echo "<div id='modalContent'></div>";
-
     Modal::end();
-    Pjax::end();
+   // Pjax::end();
     ?>
@@ -8,8 +8,7 @@ use yii\bootstrap\Modal;
 /* @var $this yii\web\View */
 /* @var $searchModel backend\models\CatalogSearch */
 /* @var $dataProvider yii\data\ActiveDataProvider */
-
-$this->title = 'Проверка прайсов';
+$this->title = 'Прайс ' . Html::encode( "{$importer} от {$date}" );
 $this->params['breadcrumbs'][] = $this->title;
 ?>
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\ImportersPrefix */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="importers-prefix-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'importer_id')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'brand')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'prefix')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'timestamp')->textInput() ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('app', 'Create') : Yii::t('app', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\ImportersPrefixSearсh */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="importers-prefix-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id') ?>
+
+    <?= $form->field($model, 'importer_id') ?>
+
+    <?= $form->field($model, 'brand') ?>
+
+    <?= $form->field($model, 'prefix') ?>
+
+    <?= $form->field($model, 'timestamp') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('app', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('app', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\ImportersPrefix */
+
+$this->title = Yii::t('app', 'Create Importers Prefix');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Importers Prefixes'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="importers-prefix-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\models\ImportersPrefixSearсh */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('app', 'Список префиксов поставщиков');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+
+<div class="importers-prefix-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+        <?= Html::a(Yii::t('app', 'Create Importers Prefix'), ['create'], ['class' => 'btn btn-success']) ?>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'filterModel' => $searchModel,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+            'importer_id',
+            'brand',
+            'prefix',
+            'timestamp',
+
+            ['class' => 'yii\grid\ActionColumn',
+                'template' => '{update},{delete}'],
+        ],
+    ]); ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\ImportersPrefix */
+
+$this->title = Yii::t('app', 'Update {modelClass}: ', [
+    'modelClass' => 'Importers Prefix',
+]) . ' ' . $model->id;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Importers Prefixes'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->id, 'url' => ['view', 'id' => $model->id]];
+$this->params['breadcrumbs'][] = Yii::t('app', 'Update');
+?>
+<div class="importers-prefix-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\ImportersPrefix */
+
+$this->title = $model->id;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Importers Prefixes'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="importers-prefix-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('app', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('app', 'Delete'), ['delete', 'id' => $model->id], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('app', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'id',
+            'importer_id',
+            'brand',
+            'prefix',
+            'timestamp',
+        ],
+    ]) ?>
+
+</div>
@@ -287,6 +287,7 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
                             ['label' => 'Загрузить файл на сервер', 'url' => ['parser/index', 'mode' => 1]],
                             ['label' => 'Ручная загрузка', 'url' => ['parser/index']],
                             ['label' => 'Проверка прайс файлов', 'url' => ['check-price/index']],
+                            ['label' => 'Управление префиксами', 'url' => ['importers-prefix/index']],
                         ],
                         ],
                         ['label' => 'Управление ролями', 'url' => ['#'], 'items' => [
 $(function(){
+    // check-price\view.php
     // для каждой строки обрабатываем клик по ссылке
     $('.modalButton').click(function (){
         // находим контейнер с модальным контентом и подгружаем в него по оджаксу результат
         $('#modal').modal('show')
             .find('#modalContent')
             .load($(this).attr('value')); // в 'value' - у нас указан путь с гет параметрами к конроллеру
+
     });
+
+    // server-files.php
     $('.deleteLink').click(function ()
     {
         if ( confirm('Вы уверены что хотите удалить этот файл?') ){
@@ -97,7 +97,7 @@ class CsvParser implements ParserInterface
     {
         $finish = false;
-        while (!$finish) {
+        while (!$finish ) {
             $this->current_line ++;
             $j = 0;
@@ -118,9 +118,10 @@ class CsvParser implements ParserInterface
                 }
             }
         }
-        die();
-     //   $this->current_line --;
-        $this->file->seek( $this->current_line );
+        // @todo - сделать опционально
+        // код для того что бы парсить первую строку, закомментировано как предполагается что первая значимая строка это заголовок
+ //       $this->current_line --;
+//        $this->file->seek( $this->current_line );
     }
     /**