Fix forms and reviews

backend/web/.gitignore

 /index.php
 /index-test.php
-/uploads/temp/*
+/uploads/temp/*
\ No newline at end of file
+/uploads/reviews/*
\ No newline at end of file

common/components/BaseForm.php

@@ -2,6 +2,7 @@
 namespace common\components;
 use \yii\db\ActiveRecord;
 use yii\widgets\ActiveForm;
+use yii\helpers\ArrayHelper;
 
 class BaseForm extends \yii\widgets\ActiveForm
 {
@@ -137,7 +138,7 @@ JS;
         }
 		//$config['ActiveForm'] = $config['activeForm'];
 		//die(print_r($config['elements']));
-		unset($config['activeForm']);
+		// unset($config['activeForm']);
 		$config['options'] = [];
 		//die(print_r(\yii::$app->controller->getAction('captcha')));
         //$config['options'][] = $this->errorSummary($model);
@@ -286,11 +287,14 @@ JS;
     public function initCustom($config) {
         ob_start();
         ob_implicit_flush(false);
-        $form = ActiveForm::begin([
-            'enableAjaxValidation' => true,
-            'enableClientValidation' => false,
-            'validateOnType' => true,
-        ]);
+        $form = ActiveForm::begin(ArrayHelper::merge(
+            $config['activeForm'], 
+            [
+                'enableAjaxValidation' => true,
+                'enableClientValidation' => false,
+                'validateOnType' => true,
+            ]
+        ));
         foreach($config['options'] as $item) {
             echo $item;
         }

common/modules/content/forms/BlockForm.php

@@ -5,14 +5,6 @@ use yii\helpers\Html;
 return [
     'activeForm'=>[
         'id' => 'block-form',
-        'class' => 'ActiveForm',
-		'options' => ['class' => 'form-horizontal'],
-		'fieldConfig' => [
-//			'template' => '<div class="form-group">{label}<div class="col-md-9">{input}</div><div class="col-md-9">{error}</div></div>',
-			'labelOptions' => ['class' => 'col-md-3 control-label'],
-		],
-        'enableAjaxValidation' => false,
-// 	'htmlOptions'=>['class'=>'registr'),
     ],
     'elements'       => [
 		/*'lang' => [

common/modules/content/forms/CategoryForm.php

@@ -5,14 +5,6 @@ use yii\helpers\ArrayHelper;
 return [
     'activeForm'=>[
         'id' => 'module-form',
-        'class' => 'ActiveForm',
-		'options' => ['class' => 'form-horizontal'],
-		'fieldConfig' => [
-//			'template' => '<div class="form-group">{label}<div class="col-md-9">{input}</div><div class="col-md-9">{error}</div></div>',
-			'labelOptions' => ['class' => 'col-md-3 control-label'],
-		],
-        'enableAjaxValidation' => false,
-// 	'htmlOptions'=>['class'=>'registr'),
     ],
     'elements'       => [
 		'name'				=> ['type' => 'text', 'class' => 'form-control'],

common/modules/content/forms/ContentDataForm.php

@@ -5,14 +5,6 @@ use yii\helpers\ArrayHelper;
 return [
     'activeForm'=>[
         'id' => 'controller-form',
-        'class' => 'ActiveForm',
-		'options' => ['class' => 'form-horizontal'],
-		'fieldConfig' => [
-//			'template' => '<div class="form-group">{label}<div class="col-md-9">{input}</div><div class="col-md-9">{error}</div></div>',
-			'labelOptions' => ['class' => 'col-md-3 control-label'],
-		],
-        'enableAjaxValidation' => false,
-// 	'htmlOptions'=>['class'=>'registr'),
     ],
     'elements'       => [
 		'content_id' => [

common/modules/content/forms/ContentForm.php

@@ -17,14 +17,6 @@ if(count($blocks)) {
 return [
     'activeForm'=>[
         'id' => 'controller-form',
-        'class' => 'ActiveForm',
-		'options' => ['class' => 'form-horizontal'],
-		'fieldConfig' => [
-//			'template' => '<div class="form-group">{label}<div class="col-md-9">{input}</div><div class="col-md-9">{error}</div></div>',
-			'labelOptions' => ['class' => 'col-md-3 control-label'],
-		],
-        'enableAjaxValidation' => false,
-// 	'htmlOptions'=>['class'=>'registr'),
     ],
     'elements'       => [
 		'category_id' => [

common/modules/faq/forms/FaqForm.php

@@ -11,14 +11,6 @@ use yii\helpers\ArrayHelper;
 return [
     'activeForm'=>[
         'id' => 'faq-form',
-        'class' => 'ActiveForm',
-        'options' => ['class' => 'form-horizontal'],
-        'fieldConfig' => [
-//			'template' => '<div class="form-group">{label}<div class="col-md-9">{input}</div><div class="col-md-9">{error}</div></div>',
-            'labelOptions' => ['class' => 'col-md-3 control-label'],
-        ],
-        'enableAjaxValidation' => false,
-// 	'htmlOptions'=>['class'=>'registr'),
     ],
     'elements'       => [
         'lang'  => [

common/modules/reviews/controllers/ReviewAdminController.php

@@ -8,6 +8,7 @@ use common\modules\reviews\models\SearchReviews;
 use common\components\AdminController;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
+use yii\web\UploadedFile;
 
 /**
  * ReviewAdminController implements the CRUD actions for Reviews model.
@@ -109,9 +110,21 @@ class ReviewAdminController extends AdminController
             'Добавить отзыв'
         ];
 
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+        if ($model->load(Yii::$app->request->post()) && $model->validate()) 
+        {
+            if($model->file)
+            {
+                $model->file = UploadedFile::getInstance($model, 'file');
+
+                $model->upload();
+            }
+
+            $model->save();
+
             return $this->redirect(['manage']);
-        } else {
+        } 
+        else 
+        {
             //die(print_r($model->errors));
             $form = new \common\components\BaseForm('/common/modules/reviews/forms/ReviewForm', $model);
             return $this->render('create', [
@@ -131,15 +144,32 @@ class ReviewAdminController extends AdminController
     {
         $model = $this->findModel($id);
 
-        \yii::$app->controller->page_title = 'Редактировать отзыв <small>'.$model->user->email.'</small>';
+        \yii::$app->controller->page_title = 'Редактировать отзыв';
         \yii::$app->controller->breadcrumbs = [
             ['Список отзывов' => '/reviews/review-admin/manage'],
             'Редактировать отзыв'
         ];
 
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+        if ($model->load(Yii::$app->request->post()) && $model->validate()) 
+        {
+            if($model->file)
+            {
+                if($model->photo)
+                {
+                    $model->deletePhoto();
+                }
+
+                $model->file = UploadedFile::getInstance($model, 'file');
+
+                $model->upload();
+            }
+
+            $model->save();
+
             return $this->redirect(['manage']);
-        } else {
+        } 
+        else 
+        {
             $form = new \common\components\BaseForm('/common/modules/reviews/forms/ReviewForm', $model);
             return $this->render('update', [
                 'model' => $model,

common/modules/reviews/forms/AnswerForm.php

@@ -4,15 +4,6 @@ use yii\helpers\ArrayHelper;
 
 return [
     'activeForm'=>[
-        'id' => 'answer-form',
-        'class' => 'ActiveForm',
-		'options' => ['class' => 'form-horizontal'],
-		'fieldConfig' => [
-//			'template' => '<div class="form-group">{label}<div class="col-md-9">{input}</div><div class="col-md-9">{error}</div></div>',
-			'labelOptions' => ['class' => 'col-md-3 control-label'],
-		],
-        'enableAjaxValidation' => false,
-// 	'htmlOptions'=>['class'=>'registr'),
     ],
     'elements'       => [
         'admin_id'              => [

common/modules/reviews/forms/ReviewForm.php

@@ -6,33 +6,32 @@ use common\modules\reviews\models\Reviews;
 
 return [
     'activeForm'=>[
-        'id' => 'module-form',
-        'class' => 'ActiveForm',
-		'options' => ['class' => 'form-horizontal'],
-		'fieldConfig' => [
-//			'template' => '<div class="form-group">{label}<div class="col-md-9">{input}</div><div class="col-md-9">{error}</div></div>',
-			'labelOptions' => ['class' => 'col-md-3 control-label'],
-		],
+		'options' => [
+            'enctype' => 'multipart/form-data'
+        ],
         'enableAjaxValidation' => false,
-// 	'htmlOptions'=>['class'=>'registr'),
     ],
     'elements'       => [
+        'title'              => [
+            'type' => 'text',
+        ],
 		'lang'              => [
             'type' => 'dropdownlist',
             'items' => ArrayHelper::map(\common\modules\languages\models\Languages::find()->all(),'code','name')
         ],
+        'file'              => ['type' => 'file', 'class' => 'form-control',],
         'date'				=> ['type' => 'date', 'class' => 'form-control',],
         'text'				=> ['type' => 'textarea', 'class' => 'form-control'],
-        '<a id="doAnswer" style="cursor: pointer;" onclick="$(this).next().next().slideToggle(); return false;">Ответить</a>' .
-        '<br><div style="display: none;">',
-        'admin_id'              => [
-            'type' => 'dropdownlist',
-            'items' => ArrayHelper::map(\common\modules\users\models\User::find()->all(),'id','fio'),
-            'empty' => 'Оператор',
+        // '<a id="doAnswer" style="cursor: pointer;" onclick="$(this).next().next().slideToggle(); return false;">Ответить</a>' .
+        // '<br><div style="display: none;">',
+        // 'admin_id'              => [
+        //     'type' => 'dropdownlist',
+        //     'items' => ArrayHelper::map(\common\modules\users\models\User::find()->all(),'id','fio'),
+        //     'empty' => 'Оператор',
 
-        ],
-        'answer'			=> ['type' => 'textarea', 'class' => 'form-control'],
-        '</div>',
+        // ],
+        // 'answer'			=> ['type' => 'textarea', 'class' => 'form-control'],
+        // '</div>',
         'state'				=> [
             'type' => 'dropdownlist',
             'items' => ['active','hidden'],

common/modules/reviews/models/Reviews.php

@@ -34,6 +34,10 @@ use Yii;
  */
 class Reviews extends \common\components\ActiveRecordModel
 {
+    public $file;
+
+    const TEMP_FOLDER = '/uploads/reviews/';
+
     private static $rate = [
         'rate_usability' => [
             0 => 'Не определено',
@@ -93,6 +97,7 @@ class Reviews extends \common\components\ActiveRecordModel
         return [
             [['text', 'state', 'date', 'notification_send', 'show_in_module'], 'required'],
             [['admin_id', 'priority', 'notification_send', 'order', 'cat_id', 'show_in_module', 'rate_usability', 'rate_loyality', 'rate_profit'], 'integer'],
+            [['file'], 'file', 'skipOnEmpty' => true, 'extensions' => 'png, jpg, jpeg, gif'],
             [['text', 'state', 'attendant_products'], 'string'],
             [['admin_id'], 'adminIdValidate'],
             [['date', 'answer', 'good', 'bad', 'date_create', 'notification_date', 'rate_usability', 'rate_loyality', 'rate_profit', 'title', 'order'], 'safe'],
@@ -126,6 +131,7 @@ class Reviews extends \common\components\ActiveRecordModel
             'good' => Yii::t('reviews', 'Понравилось'),
             'bad' => Yii::t('reviews', 'Не понравилось'),
             'photo' => Yii::t('reviews', 'Фото'),
+            'file' => Yii::t('reviews', 'Фото'),
             'state' => Yii::t('reviews', 'Состояние'),
             'date' => Yii::t('reviews', 'Дата'),
             'date_create' => Yii::t('reviews', 'Создана'),
@@ -197,4 +203,36 @@ class Reviews extends \common\components\ActiveRecordModel
 
         return parent::beforeSave($insert);
     }
+
+    private function getPath()
+    {
+        return Yii::getAlias('@webroot') . self::TEMP_FOLDER;
+    }
+
+    public function upload()
+    {
+        if($this->validate()) 
+        {
+            if(!file_exists($this->getPath()))
+            {
+                mkdir($this->getPath(), 0777, true);
+            }
+
+            $this->photo = $this->getPath() . date('dmYHis-') . uniqid() . '.' . $this->file->extension;
+            $this->file->saveAs($this->photo);
+            return true;
+        } 
+        else 
+        {
+            return false;
+        }
+    }
+
+    public function deletePhoto()
+    {
+        if(file_exists($this->getPath() . $this->photo))
+        {
+            unlink($this->getPath() . $this->photo);
+        }
+    }
 }

common/modules/reviews/views/review-admin/index.php

@@ -28,23 +28,7 @@ use yii\grid\GridView;
 
             // 'id',
             // 'lang',
-            [
-                'attribute' => 'user_id',
-                'format' => 'raw',
-                'value' => function($data){
-                    if(!$data->hasComment()){
-                        $add = Html::a('Ответить',Url::toRoute(['updateanswer', 'id'=>$data->id]), ['class' => 'btn btn-primary m-r-5 m-b-5']);
-                    }
-                    else {
-                        $add = Html::a('Редактировать',Url::toRoute(['updateanswer', 'id'=>$data->id]), ['class' => 'btn btn-primary m-r-5 m-b-5']);
-                    }
-                    if(!empty($data->user))
-                        return $data->user->fullName . '<br >' . $add;
-
-                    return 'Удален ' . '<br >' . $add;
-                }
-            ],
-            //'title',
+            'title',
             [
                 'attribute' => 'text:ntext',
                 'header' => 'Отзыв',

common/modules/testings/forms/TestingMistakeForm.php

@@ -16,11 +16,6 @@ $buttons = array(
 return array(
     'activeForm' => array(
         'id' => 'testing-mistake-form',
-		//'enableAjaxValidation' => true,
-		//'clientOptions' => array(
-		//	'validateOnSubmit' => true,
-		//	'validateOnChange' => true
-		//)
     ),
     'elements' => array(
         //'passing_id' => array('type' => 'text'),

console/migrations/m160126_110636_fix_review_table.php

+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m160126_110636_fix_review_table extends Migration
+{
+    public function safeUp()
+    {
+        $tableOptions = null;
+        if ($this->db->driverName === 'mysql') 
+        {
+            $tableOptions = 'CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE=InnoDB';
+        }
+
+        $this->addColumn('reviews', 'title', Schema::TYPE_STRING . '(255) AFTER `user_id`');
+    }
+
+    public function safeDown()
+    {
+        $this->dropColumn('reviews', 'title');
+    }
+}