Merge branch 'draft'

Mihail
2 parents 9d57a9ea ae27b007
Showing 10 changed files with 169 additions and 267 deletions Show diff stats
.htaccess
backend/assets/ParserAsset.php
backend/controllers/CheckPriceController.php
backend/controllers/Check_priceController.php
backend/controllers/ParserController.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/parser.js
@@ -53,4 +53,10 @@
  
     RewriteRule ^.*$ frontend/web/index.php
  
+</IfModule>
+
+#для возможности загрузки файлов парсера
+<IfModule mod_php5.c>
+    php_value upload_max_filesize 20M
+    php_value post_max_size 30M
 </IfModule>
 \ No newline at end of file
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Cibermag
+ * Date: 28.09.2015
+ * Time: 11:40
+ */
+
+namespace backend\assets;
+
+use yii\web\AssetBundle;
+
+class ParserAsset extends AssetBundle {
+    public $basePath = '@webroot';
+    public $baseUrl = '@web';
+    public $css = [
+        'css/site.css',
+    ];
+    public $js = [
+        'js/parser.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]);
-    }
-}
@@ -275,14 +275,14 @@ class ParserController extends BaseController
  
     public function actionServerFiles ()
     {
-        $arr_id = [];
+        $arr_id_files = [];
         // получим список файлов которые ожидают к загрузке
         foreach (glob(Yii::getAlias('@auto_upload') . '/*') as $server_file) {
             $file_id = basename($server_file,".csv");
-            $arr_id[] = (int) $file_id;
+            $arr_id_files[] = (int) $file_id;
         }
-
-        $query = ImporterFiles::find()->where(['in', 'id', $arr_id])->orderBy(['upload_time' => SORT_DESC]);
+        Yii::$app->cache->set( 'files_to_delete',json_encode( $arr_id_files ) );
+        $query = ImporterFiles::find()->where(['in', 'id', $arr_id_files])->orderBy(['upload_time' => SORT_DESC]);
  
         $provider = new ActiveDataProvider([
             'query' => $query,
@@ -295,24 +295,35 @@ class ParserController extends BaseController
                 'dataProvider' => $provider]);
     }
  
-    public function actionDelete ($id)
+    public function actionDelete ()
     {
-        if(Yii::$app->request->isAjax){
-            CustomVarDamp::dumpAndDie(1);
-        }
-
-        $files_model = new ImporterFiles();
-        try {
+        if ( Yii::$app->request->isAjax ) {
  
-            $files_model->delete($id);
-            unlink(Yii::getAlias('@auto_upload') . '/' . $id . '.csv' );
-
-        } catch (ErrorException  $e) {
+            $files_model = new ImporterFiles();
+            if ( isset(Yii::$app->request->post()['id'] )) {
+                $id = Yii::$app->request->post()['id'];
+                try {
+                    $files_model->delete($id);
+                    unlink(Yii::getAlias('@auto_upload') . '/' . $id . '.csv' );
+
+                    // удалим этот id и из кэша
+                   if( $arr_id_files = Yii::$app->cache->get( 'files_to_delete' ) ){
+                       $arr_id_files = json_decode($arr_id_files);
+                       if (isset( $arr_id_files[$id] ) ) {
+                           unset( $arr_id_files[$id] );
+                           // положем уже обновленный массив
+                           Yii::$app->cache->set( 'files_to_delete',json_encode( $arr_id_files ) );
+                       }
+                   }
+                    // сообщим скрипту что все ОК
+                    echo 1;
+                } catch (ErrorException  $e) {
  
-            CustomVarDamp::dump($e->getMessage());
+                    CustomVarDamp::dump($e->getMessage());
  
+                }
+            }
         }
  
-        $this->redirect('server-files');
     }
 }
@@ -2,8 +2,10 @@
 use yii\helpers\Html;
 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\ParserAsset;
  
  
 /* @var $this yii\web\View */
@@ -12,47 +14,69 @@ use yii\widgets\Pjax;
  
 $this->title = 'Проверка прайсов';
 $this->params['breadcrumbs'][] = $this->title;
+// зарегистрируем скрипт для обработки загрузки модального окна
+ParserAsset::register($this);
+Pjax::begin();
 ?>
 <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>', '#', [
+                    '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();
+    Pjax::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
@@ -4,15 +4,17 @@ use yii\grid\GridView;
 use yii\grid\SerialColumn;
 use yii\grid\ActionColumn;
 use yii\widgets\Pjax;
+use backend\assets\ParserAsset;
  
  
 /* @var $this yii\web\View */
 /* @var $searchModel backend\models\CatalogSearch */
 /* @var $dataProvider yii\data\ActiveDataProvider */
  
-$this->title = 'Проверка прайсов';
+$this->title = 'Файлы на сервере';
 $this->params['breadcrumbs'][] = $this->title;
-Pjax::begin();
+ParserAsset::register($this);
+Pjax::begin(['id' => 'server_files_grid']);
  
 ?>
     <div class="catalog-index">
@@ -30,19 +32,15 @@ Pjax::begin();
                 ['label' =>'Дата загрузки',
                     'attribute' => 'upload_time' ],
  
-                ['class' => ActionColumn::className(),
-                'template'=>'{delete}',
-                    'buttons' => [
-                        'delete' => function ($url, $model, $key) {
-                            return Html::a('<span class="glyphicon glyphicon-remove"></span>', $url, [
-                                'title' => Yii::t('yii', 'Удалить файл'),
-                                'data-confirm' => 'Вы уверены что хотите удалить этот файл?',
-                                'data-method' => 'post',
-                                'data-pjax' => '1',
-                            ]);
-                        },
-                    ],
-                ]
+                ['content' => function ($model) {
+                     //Url::to(['delete', 'id' => $model->id, 'date_update' => $model->price_date_update]);
+                    return Html::a('<span class="glyphicon glyphicon-remove"> Удалить </span>', '#', [
+                        'value' => $model->id,
+                        'class' => 'deleteLink',
+                    ]);
+                },
+                ],
+
  
             ]] );?>
  
+$(function(){
+
+    // для каждой строки обрабатываем клик по ссылке
+    $('.modalButton').click(function (){
+        // находим контейнер с модальным контентом и подгружаем в него по оджаксу результат
+        $('#modal').modal('show')
+            .find('#modalContent')
+            .load($(this).attr('value')); // в 'value' - у нас указан путь с гет параметрами к конроллеру
+    });
+
+    $('.deleteLink').click(function ()
+    {
+        if ( confirm('Вы уверены что хотите удалить этот файл?') ){
+            var data = $(this).attr('value');// здесь у нас id удаляемой модели
+
+            $.post( 'delete',{'id':data} )
+                .done(function(result) {
+                    if(result == 1)
+                    {
+                        $.pjax.reload({container:'#server_files_grid'});
+                    }else
+                    {
+                        $("#message").html(result);
+                    }
+                }).fail(function()
+                {
+                    console.log("server error");
+                });
+        }
+
+
+
+
+});
+});