diff --git a/backend/components/parsers/ParserHandler.php b/backend/components/parsers/ParserHandler.php index aa4dfb7..faefd66 100644 --- a/backend/components/parsers/ParserHandler.php +++ b/backend/components/parsers/ParserHandler.php @@ -22,7 +22,7 @@ class ParserHandler { $this->run(); } - private function run(){ + public function run(){ if ($this->extension = '.csv'){ $csvParser = new Reader( $this->filePath ); return $csvParser->read(); diff --git a/backend/controllers/ParserController.php b/backend/controllers/ParserController.php index c32a3c7..c657db6 100644 --- a/backend/controllers/ParserController.php +++ b/backend/controllers/ParserController.php @@ -63,10 +63,12 @@ class ParserController extends Controller $filePath = Yii::getAlias('@webroot') . '/uploads/' . $model->file->baseName . '.' . $model->file->extension; $model->file->saveAs( $filePath ); - $data = new ParserHandler( $filePath ); -// echo "
";
-//                var_dump($data);
-//                echo "
"; + $parser = new ParserHandler( $filePath ); + $data = $parser->run(); + + if( !is_array($data) ){ + $data = ['No results']; + } $provider = new ArrayDataProvider([ 'allModels' => $data, 'pagination' => [ @@ -78,7 +80,7 @@ class ParserController extends Controller ]); return $this->render('results', - ['model' => $model, + ['model' => $data, 'dataProvider' => $provider]); } } diff --git a/backend/views/parser/index.php b/backend/views/parser/index.php index 2345384..1f8e7b9 100644 --- a/backend/views/parser/index.php +++ b/backend/views/parser/index.php @@ -1,11 +1,12 @@ - +
['enctype' => 'multipart/form-data']]) ?> field($model, 'file')->fileInput() ?> - \ No newline at end of file + +
\ No newline at end of file diff --git a/backend/views/parser/results.php b/backend/views/parser/results.php index b460775..78df52e 100644 --- a/backend/views/parser/results.php +++ b/backend/views/parser/results.php @@ -4,43 +4,21 @@ use yii\helpers\Html; use yii\grid\GridView; /* @var $this yii\web\View */ -/* @var $searchModel backend\models\ArticlesSearch */ +/* @var $searchModel backend\models\CatalogSearch */ /* @var $dataProvider yii\data\ActiveDataProvider */ $this->title = 'Results'; $this->params['breadcrumbs'][] = $this->title; ?> -
+

title) ?>

render('_search', ['model' => $searchModel]); ?> -

- $type], ['class' => 'btn btn-success']) ?> -

+ $dataProvider, - 'filterModel' => $searchModel, - 'columns' => [ - ['class' => 'yii\grid\SerialColumn'], - - 'id', - 'name', - 'translit', - 'title', - [ - 'format' => 'image', - 'attribute'=>'image', - ], - // 'body:ntext', - // 'meta_title', - // 'description', - // 'h1', - // 'seo_text:ntext', - - ['class' => 'yii\grid\ActionColumn'], - ], ]); ?>
\ No newline at end of file -- libgit2 0.21.4