add modal form by ajax for check-price form

Mihail
1 parent 5d3ee0c2
Showing 8 changed files with 96 additions and 235 deletions Show diff stats
backend/assets/CheckPriceAsset.php
backend/controllers/CheckPriceController.php
backend/controllers/Check_priceController.php
backend/views/check-price/index.php
backend/views/check_price/index.php
backend/views/check_price/view.php
backend/views/parser/server-files.php
backend/web/js/check-price.js
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Cibermag
+ * Date: 28.09.2015
+ * Time: 11:40
+ */
+
+namespace backend\assets;
+
+use yii\web\AssetBundle;
+
+class CheckPriceAsset extends AssetBundle {
+    public $basePath = '@webroot';
+    public $baseUrl = '@web';
+    public $css = [
+        'css/site.css',
+    ];
+    public $js = [
+        'js/check-price.js',
+    ];
+    public $depends = [
+        'yii\web\YiiAsset',
+        'yii\bootstrap\BootstrapAsset',
+    ];
+}
 \ No newline at end of file
@@ -62,7 +62,7 @@ class CheckPriceController extends BaseController
     public function actionIndex()
     {
         if(Yii::$app->request->isAjax){
-            CustomVarDamp::dumpAndDie(1);
+            CustomVarDamp::dumpAndDie('Ajax!!!');
         }
         //$query = (new Query())->select('*')->from('{{%importer_files}}')->where(['not', ['time_end' => null]])->orderBy(['upload_time' => SORT_DESC]);
@@ -81,18 +81,18 @@ class CheckPriceController extends BaseController
     }
-    public function actionView ($id)
+    public function actionView ($id, $date_update)
     {
-        // @todo  переписать запрос - нужно условие на равенство даты, а также вьюшка должна быть модальным окном вызываемой по аджаксу
-        $query = Details::find()->where(['IMPORT_ID' => $id])->orderBy(['timestamp' => SORT_DESC]);
+
+        $query = Details::find()->where(['IMPORT_ID' => $id, 'timestamp' => $date_update])->limit(20);
         $provider = new ActiveDataProvider([
             'query' => $query,
-            'pagination' => [
-                'pageSize' => 16,
-            ],
+            'pagination' => false,
+            'sort' => false,
         ]);
-        return $this->render('view',
+
+        return $this->renderAjax('view',
             ['dataProvider' => $provider]);
     }
-<?php
-namespace backend\controllers;
-
-use Yii;
-use yii\bootstrap\Modal;
-use yii\data\ActiveDataProvider;
-use yii\filters\AccessControl;
-use backend\components\base\BaseController;
-use yii\filters\VerbFilter;
-use backend\models\UploadFileParsingForm;
-use yii\web\UploadedFile;
-use yii\data\ArrayDataProvider;
-use yii\multiparser\DynamicFormHelper;
-use backend\components\parsers\CustomParserConfigurator;
-use backend\models\Details;
-use backend\models\ImporterFiles;
-use backend\models\Importer;
-use yii\base\ErrorException;
-use yii\db\Query;
-
-use common\components\CustomVarDamp;
-
-/**
- * Parser controller
- */
-class Check_priceController extends BaseController
-{
-    public $layout = "/column";
-
-    /**
-     * @inheritdoc
-     */
-    public function behaviors()
-    {
-        return [
-            'access' => [
-                'class' => AccessControl::className(),
-                'rules' => [
-                    [
-                        'actions' => ['index', 'view'],
-                        'allow' => true,
-                        'roles' => ['@'],
-                    ],
-                ],
-            ],
-//            'verbs' => [
-//                'class' => VerbFilter::className(),
-//                'actions' => [
-//                    'logout' => ['post'],
-//                ],
-//            ],
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function actions()
-    {
-        return [
-            'error' => [
-                'class' => 'yii\web\ErrorAction',
-            ],
-        ];
-    }
-
-
-    public function actionIndex()
-    {
-
-        if(Yii::$app->request->isAjax){
-            CustomVarDamp::dumpAndDie(1);
-        }
-
-        //$query = (new Query())->select('*')->from('{{%importer_files}}')->where(['not', ['time_end' => null]])->orderBy(['upload_time' => SORT_DESC]);
-        $query = Importer::find()->where(['active' => true])->orderBy(['price_date_update' => SORT_DESC]);
-
-        $provider = new ActiveDataProvider([
-            'query' => $query,
-            'pagination' => [
-                'pageSize' => 10,
-            ],
-        ]);
-        return $this->render('index',
-            [
-               'dataProvider' => $provider,
-           ]);
-    }
-
-
-    public function actionView ($id)
-    {
-
-
-
-
-        $query = Details::find()->where(['IMPORT_ID' => $id])->orderBy(['timestamp' => SORT_DESC]);
-
-        $provider = new ActiveDataProvider([
-            'query' => $query,
-            'pagination' => [
-                'pageSize' => 16,
-            ],
-        ]);
-        return $this->render('view',
-            ['dataProvider' => $provider]);
-    }
-}
@@ -4,6 +4,9 @@ use yii\grid\GridView;
 use yii\grid\SerialColumn;
 use yii\grid\ActionColumn;
 use yii\widgets\Pjax;
+use yii\bootstrap\Modal;
+use yii\helpers\Url;
+use backend\assets\CheckPriceAsset;
 /* @var $this yii\web\View */
@@ -12,47 +15,68 @@ use yii\widgets\Pjax;
 $this->title = 'Проверка прайсов';
 $this->params['breadcrumbs'][] = $this->title;
+// зарегистрируем скрипт для обработки загрузки модального окна
+CheckPriceAsset::register($this);
 ?>
 <div class="catalog-index">
     <h1><?= Html::encode($this->title) ?></h1>
-    <?= GridView::widget( ['dataProvider' => $dataProvider,
-        'columns' => [['class' => SerialColumn::className()],
-            [
-                'class' => ActionColumn::className(),
-                'template'=>'{view}',
-                'contentOptions' => function ($model, $key, $index, $column){
-                    return ['data' => ['id' => $model->id, 'date' => $model->price_date_update]];
-                }
+    <?= GridView::widget(['dataProvider' => $dataProvider,
+        'columns' => [
+            ['class' => SerialColumn::className()],
+
+            ['content' => function ($model) {
+                $url = Url::to(['view', 'id' => $model->id, 'date_update' => $model->price_date_update]);
+                return Html::a('<span class="glyphicon glyphicon-remove"> Просмотреть </span>', '#', [
+                    'title' => Yii::t('yii', 'Просмотреть прайс'),
+                    'class' => 'modalButton',
+                    'value' => $url,
+                ]);
+            },
             ],
+
             [
-                'label' =>'Поставщик',
+                'label' => 'Поставщик',
                 'value' => function ($data) {
-                    return '№ ' .$data->id . ' ' . $data->name;
+                    return '№ ' . $data->id . ' ' . $data->name;
                 },
             ],
-                           ['label' =>'Дата обновления',
-                           'attribute' => 'price_date_update' ],
-        ['label' => 'Кол-во дней',
-            'value' => function ($data) {
-                $date1 = new DateTime("now");
-                $date2 = new DateTime( $data->price_date_update );
-                $quo_days = $date2->diff($date1)->format('%R%a');
-                // уберем первый символ - там знак "+"
-                $quo_days = substr( $quo_days, 1, strlen($quo_days) );
-                $quo_days = (int) $quo_days;
-
-                if($quo_days > 15)
-                    $quo_days = '>15';
-
-                return $quo_days;
-            }
-        ],
-        ]] );?>
+            ['label' => 'Дата обновления',
+                'attribute' => 'price_date_update'],
+
+            ['label' => 'Кол-во дней',
+                'value' => function ($data) {
+                    $date1 = new DateTime("now");
+                    $date2 = new DateTime($data->price_date_update);
+                    $quo_days = $date2->diff($date1)->format('%R%a');
+                    // уберем первый символ - там знак "+"
+                    $quo_days = substr($quo_days, 1, strlen($quo_days));
+                    $quo_days = (int)$quo_days;
+
+                    if ($quo_days > 15)
+                        $quo_days = '>15';
+
+                    return $quo_days;
+                }
+            ],
+        ]
+    ]); ?>
+
+    <?php
+    // сюда будем всавлять контент модального окна
+    Modal::begin([
+        //     'header'=>'<h4>Прайс</h4>',
+        'id' => 'modal',
+        'size' => 'modal-lg',
+    ]);
+
+    echo "<div id='modalContent'></div>";
+    Modal::end();
+    ?>
 </div>
 \ No newline at end of file
-<?php
-use yii\helpers\Html;
-use yii\grid\GridView;
-use yii\grid\SerialColumn;
-use yii\grid\ActionColumn;
-use yii\widgets\Pjax;
-
-
-/* @var $this yii\web\View */
-/* @var $searchModel backend\models\CatalogSearch */
-/* @var $dataProvider yii\data\ActiveDataProvider */
-
-$this->title = 'Проверка прайсов';
-$this->params['breadcrumbs'][] = $this->title;
-?>
-<div class="catalog-index">
-
-    <h1><?= Html::encode($this->title) ?></h1>
-
-
-    <?= GridView::widget( ['dataProvider' => $dataProvider,
-        'columns' => [['class' => SerialColumn::className()],
-            [
-                'class' => ActionColumn::className(),
-                'template'=>'{view}',
-                'contentOptions' => function ($model, $key, $index, $column){
-                    return ['data' => ['id' => $model->id, 'date' => $model->price_date_update]];
-                }
-            ],
-            [
-                'label' =>'Поставщик',
-                'value' => function ($data) {
-                    return '№ ' .$data->id . ' ' . $data->name;
-                },
-            ],
-                           ['label' =>'Дата обновления',
-                           'attribute' => 'price_date_update' ],
-        ['label' => 'Кол-во дней',
-            'value' => function ($data) {
-                $date1 = new DateTime("now");
-                $date2 = new DateTime( $data->price_date_update );
-                $quo_days = $date2->diff($date1)->format('%R%a');
-                // уберем первый символ - там знак "+"
-                $quo_days = substr( $quo_days, 1, strlen($quo_days) );
-                $quo_days = (int) $quo_days;
-
-                if($quo_days > 15)
-                    $quo_days = '>15';
-
-                return $quo_days;
-            }
-        ],
-        ]] );?>
-
-
-
-
-</div>
 \ No newline at end of file
-<?php
-use yii\helpers\Html;
-use yii\grid\GridView;
-use yii\grid\SerialColumn;
-use yii\bootstrap\Modal;
-
-
-/* @var $this yii\web\View */
-/* @var $searchModel backend\models\CatalogSearch */
-/* @var $dataProvider yii\data\ActiveDataProvider */
-
-$this->title = 'Проверка прайсов';
-$this->params['breadcrumbs'][] = $this->title;
-
-?>
-<div class="catalog-index">
-
-    <h1><?= Html::encode($this->title) ?></h1>
-
-    <?= GridView::widget( ['dataProvider' => $dataProvider,
-
-        ] );
-
-
- ?>
-
-
-
-</div>
-<?php
-
-?>
 \ No newline at end of file
@@ -38,7 +38,7 @@ Pjax::begin();
                                 'title' => Yii::t('yii', 'Удалить файл'),
                                 'data-confirm' => 'Вы уверены что хотите удалить этот файл?',
                                 'data-method' => 'post',
-                                'data-pjax' => '1',
+                                'data-pjax' => '0',
                             ]);
                         },
                     ],
+$(function(){
+
+    // get the click of the create button
+    $('.modalButton').click(function (){
+        $('#modal').modal('show')
+            .find('#modalContent')
+            .load($(this).attr('value'));
+    });
+});