Merge remote-tracking branch 'origin/master'

# Conflicts: # frontend/controllers/AccountsController.php

Merge remote-tracking branch 'origin/master'
# Conflicts: # frontend/controllers/AccountsController.php
Yarik
2 parents 7fc05ac5 70abf3e7
Showing 11 changed files with 271 additions and 158 deletions Show diff stats
backend/web/js/fieldWidget.js
backend/web/js/option.js
common/models/Fields.php
common/models/User.php
common/widgets/FieldEditor.php
common/widgets/views/education_field.php
console/migrations/m160128_101543_fields.php
frontend/assets/AdminAsset.php
frontend/controllers/AccountsController.php
frontend/controllers/SiteController.php
frontend/views/accounts/_form.php
+$('body').on('click', '.delete-field-item', function(){
+
+    $(this).parent('.form-group').remove();
+
+});
+
+
+$('.add_field').click(function(){
+    var block = $('.fields_video_result');
+    var sub_block = '<div class="form-group">'+
+        '<input type="text"   class="form-control" value="" name="Fields[video]['+ start_i++ +'][value]">'+
+        '<span data-id="none" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>'+
+        '<div>';
+    block.append(sub_block);
+
+});
 \ No newline at end of file
@@ -58,55 +58,55 @@ $(function() {
         }
         return false;
     });
-    //$.each($('.nav-tabs.f32'), function(key, value) {
-    //    if($(value).find('li').length > 1) {
-    //        $(value).find('li').append('<span class="glyphicon glyphicon-remove-circle remove-lang"></span>');
-    //    }
-    //});
-    //$(document).on('click', '.dropdown-menu.f32:not(.old) li a[data-lang]', function() {
-    //    var lang = $(this).data('lang');
-    //    var flag = $(this).find('span').first().clone();
-    //    var el = $(this);
-    //    var id = $(this).attr('href').substr(1);
-    //    var path = form[id].handler;
-    //    var view = form[id].view;
-    //    var model = form[id].model;
-    //    $.get(path, { language_id: lang, widget_id: id, ajaxView: view, model: model }, function(data) {
-    //        $('#'+id+'-tabs li').removeClass('active');
-    //        $('#'+id+'-tabs').append('<li role="lang_inputs" class="active" data-lang="'+lang+'"><a href="#'+id+'-'+lang+'" aria-controls="'+id+'-'+lang+'" role="tab" data-toggle="tab">'+$('<p>').append($(flag)).html()+'</a></li>');
-    //        $('#tab-content-'+id+' .tab-pane.active').removeClass('active');
-    //        $('#tab-content-'+id).append($(data).find('.ajax-loaded').first());
-    //        $('body').append($(data).filter('script'));
-    //        $(el).parent().remove();
-    //        if(!$('#lang-'+id+' li').length) {
-    //            $('#'+id+'Lang').addClass('disabled');
-    //        }
-    //        if($('#'+id+'-tabs li').length > 1) {
-    //            $('#'+id+'-tabs li').append('<span class="glyphicon glyphicon-remove-circle remove-lang"></span>')
-    //        }
-    //    });
-    //});
-    //$(document).on('click', '.dropdown-menu.f32.old li a[data-lang]', function(e) {
-    //    e.preventDefault();
-    //    var lang = $(this).data('lang');
-    //    var flag = $(this).find('span').first().clone();
-    //    var el = $(this);
-    //    var id = $(this).attr('href').substr(1);
-    //    $.get(form[id], { language_id: lang, widget_id: id }, function(data) {
-    //        $('#'+id+'-tabs li').removeClass('active');
-    //        $('#'+id+'-tabs').append('<li role="lang_inputs" class="active" data-lang="'+lang+'"><a href="#'+id+'-'+lang+'" aria-controls="'+id+'-'+lang+'" role="tab" data-toggle="tab">'+$('<p>').append($(flag)).html()+'</a></li>');
-    //        $('#tab-content-'+id+' .tab-pane.active').removeClass('active');
-    //        $('#tab-content-'+id).append($(data).find('.ajax-loaded').first());
-    //        $('body').append($(data).filter('script'));
-    //        $(el).parent().remove();
-    //        if(!$('#lang-'+id+' li').length) {
-    //            $('#'+id+'Lang').addClass('disabled');
-    //        }
-    //        if($('#'+id+'-tabs li').length > 1) {
-    //            $('#'+id+'-tabs li').append('<span class="glyphicon glyphicon-remove-circle remove-lang"></span>')
-    //        }
-    //    });
-    //});
+    $.each($('.nav-tabs.f32'), function(key, value) {
+        if($(value).find('li').length > 1) {
+            $(value).find('li').append('<span class="glyphicon glyphicon-remove-circle remove-lang"></span>');
+        }
+    });
+    $(document).on('click', '.dropdown-menu.f32:not(.old) li a[data-lang]', function() {
+        var lang = $(this).data('lang');
+        var flag = $(this).find('span').first().clone();
+        var el = $(this);
+        var id = $(this).attr('href').substr(1);
+        var path = form[id].handler;
+        var view = form[id].view;
+        var model = form[id].model;
+        $.get(path, { language_id: lang, widget_id: id, ajaxView: view, model: model }, function(data) {
+            $('#'+id+'-tabs li').removeClass('active');
+            $('#'+id+'-tabs').append('<li role="lang_inputs" class="active" data-lang="'+lang+'"><a href="#'+id+'-'+lang+'" aria-controls="'+id+'-'+lang+'" role="tab" data-toggle="tab">'+$('<p>').append($(flag)).html()+'</a></li>');
+            $('#tab-content-'+id+' .tab-pane.active').removeClass('active');
+            $('#tab-content-'+id).append($(data).find('.ajax-loaded').first());
+            $('body').append($(data).filter('script'));
+            $(el).parent().remove();
+            if(!$('#lang-'+id+' li').length) {
+                $('#'+id+'Lang').addClass('disabled');
+            }
+            if($('#'+id+'-tabs li').length > 1) {
+                $('#'+id+'-tabs li').append('<span class="glyphicon glyphicon-remove-circle remove-lang"></span>')
+            }
+        });
+    });
+    $(document).on('click', '.dropdown-menu.f32.old li a[data-lang]', function(e) {
+        e.preventDefault();
+        var lang = $(this).data('lang');
+        var flag = $(this).find('span').first().clone();
+        var el = $(this);
+        var id = $(this).attr('href').substr(1);
+        $.get(form[id], { language_id: lang, widget_id: id }, function(data) {
+            $('#'+id+'-tabs li').removeClass('active');
+            $('#'+id+'-tabs').append('<li role="lang_inputs" class="active" data-lang="'+lang+'"><a href="#'+id+'-'+lang+'" aria-controls="'+id+'-'+lang+'" role="tab" data-toggle="tab">'+$('<p>').append($(flag)).html()+'</a></li>');
+            $('#tab-content-'+id+' .tab-pane.active').removeClass('active');
+            $('#tab-content-'+id).append($(data).find('.ajax-loaded').first());
+            $('body').append($(data).filter('script'));
+            $(el).parent().remove();
+            if(!$('#lang-'+id+' li').length) {
+                $('#'+id+'Lang').addClass('disabled');
+            }
+            if($('#'+id+'-tabs li').length > 1) {
+                $('#'+id+'-tabs li').append('<span class="glyphicon glyphicon-remove-circle remove-lang"></span>')
+            }
+        });
+    });
     $(document).on('click', '.remove-lang', function() {
         var lang = $(this).parent().data('lang');
         var flag = $(this).parent().find('span.flag').first().clone();
@@ -13,6 +13,9 @@ use Yii;
  * @property string $value
  * @property string $field_name
  * @property string $field_type
+ * @property string $language
+ * @property string $parent_key
+ * @property string $key
  */
 class Fields extends \yii\db\ActiveRecord
 {
@@ -31,8 +34,8 @@ class Fields extends \yii\db\ActiveRecord
     {
         return [
             [['table_name', 'table_id',], 'required'],
-            [['table_id','language'], 'integer'],
-            [['table_name', 'value', 'field_name','field_type'], 'string', 'max' => 255]
+            [['table_id','parent_key','key'], 'integer'],
+            [['table_name', 'value', 'field_name','field_type','language'], 'string', 'max' => 255]
         ];
     }
@@ -54,4 +57,44 @@ class Fields extends \yii\db\ActiveRecord
     public static function getData($id, $model, $type){
        return self::find()->where(['table_id'=>$id, 'table_name'=>$model, 'field_type'=>$type])->all();
     }
+
+
+    /**
+     * @param $post - array with field data
+     * @param $table_id - row id in model table
+     * @param $table_name - madel table name
+     * @param $language - language id
+     */
+
+    public static function saveFieldData($post,$table_id,$table_name, $language){
+
+        self::deleteAll(['table_id'=>$table_id, 'table_name'=>$table_name, 'language' => $language]);
+
+        if($post){
+
+
+            foreach($post as $k => $field){
+
+
+
+                foreach($field as $parent_key => $row){
+
+                    foreach($row as $key => $value){
+
+                        $field_model = new Fields();
+                        $field_model->field_name =  array_keys($value)[0];
+                        $field_model->value = $value[array_keys($value)[0]];
+                        $field_model->table_name =  $table_name;
+                        $field_model->table_id   = $table_id;
+                        $field_model->field_type =  $k;
+                        $field_model->language =  'ru';
+                        $field_model->parent_key =  $parent_key;
+                        $field_model->key =  $key;
+                        $field_model->save();
+                    }
+
+                }
+            }
+        }
+    }
 }
@@ -254,9 +254,13 @@ class User extends ActiveRecord implements IdentityInterface, UserRbacInterface
         }
     }
-    public function afterSave ($insert, $changedAttributes)
-    {
-        parent::afterSave ($insert, $changedAttributes);
-        \Yii::$app->options->createOptions($this->id);
+//    public function afterSave ($insert, $changedAttributes)
+//    {
+//        parent::afterSave ($insert, $changedAttributes);
+//        \Yii::$app->options->createOptions($this->id);
+//    }
+
+    public function getUserInfo(){
+        return $this->hasOne(UserInfo::className(), ['user_id' => 'id']);
     }
 }
 <?php
 namespace common\widgets;
 use common\models\Fields;
+use common\models\Language;
 use yii\base\Widget;
-
+use yii\helpers\ArrayHelper;
 class FieldEditor extends Widget
 {
     public $item_id;
     public $model;
     public $template;
+    public $language;
     public function init(){
@@ -25,14 +27,18 @@ class FieldEditor extends Widget
             $widgetData= [new Fields()];
         }
-
-        return $this->render($this->template.'_field',['model'=>$widgetData]);
+        return $this->render($this->template.'_field',['model'=>ArrayHelper::toArray($widgetData)]);
     }
     protected function findModel()
     {
-        if (($model = Fields::find()->where(['table_id'=>$this->item_id, 'table_name'=>$this->model, 'field_type'=>$this->template])->all()) !== null) {
+        if (($model = Fields::find()->where([
+                'table_id'=>$this->item_id,
+                'table_name'=>$this->model,
+                'field_type'=>$this->template,
+                'language'=>$this->language,
+            ])->all())) {
             return $model;
         } else {
+<?php
+use yii\helpers\Html;
+?>
+<fieldset>
+
+    <legend>Образование</legend>
+
+    <p class="btn btn-success add_field">Добавить поле</p>
+
+
+    <?php for($i=1; $i <= count($model); $i++):
+        $row = $i;
+        ?>
+
+        <?= Html::beginTag('div',['class'=>'form-group','id'=>isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ])?>
+            <input type="text" placeholder="С" class="form-control" value="<?= isset($model[$i]['value']) ? $model[$i]['value'] : '' ?>" name="Fields[education][<?=$row?>][0][year_from]" />
+            <input type="text" placeholder="По"  class="form-control" value="<?= isset($model[++$i]['value']) ? $model[$i]['value'] : ''  ?>" name="Fields[education][<?=$row?>][1][year_to]" />
+            <textarea placeholder="Место" name="Fields[education][<?=$row?>][2][place]" /><?= isset($model[++$i]['value']) ? $model[$i]['value'] : '' ?></textarea>
+            <span data-id="<?= isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
+        <?= Html::endTag('div')?>
+    <?php endfor; ?>
+
+
+
+</fieldset>
+<script>
+    $( document ).ready(function(){
+        var start_i = <?=$i?>;
+        $('.add_field').click(function(){
+            var block = $(this).parent('fieldset');
+            var block_id =  $(this).parent('fieldset');
+            var sub_block = '<div class="form-group" >'+
+                '<input type="text" placeholder="С" class="form-control" value="" name="Fields[education]['+ start_i++ +'][0][year_from]" />'+
+                '<input type="text" placeholder="По"  class="form-control" value="" name="Fields[education]['+ start_i +'][1][year_to]" />'+
+                '<textarea placeholder="Место" name="Fields[education]['+ start_i +'][2][place]" /></textarea>'+
+                '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>'+
+                '<div>';
+            block.append(sub_block);
+
+        });
+    });
+</script>
+
+
@@ -15,7 +15,9 @@ class m160128_101543_fields extends Migration
             'value' => $this->string(255),
             'field_name' => $this->string(),
             'field_type' => $this->string(32)->notNull(),
-            'language' => $this->integer()
+            'language' => $this->string(3),
+            'key' => $this->integer(),
+            'parent_key' => $this->integer()
         ], $tableOptions);
     }
@@ -30,7 +30,7 @@ class AdminAsset extends AssetBundle
         'js/jquery.scrollbox.min.js',
         'js/slider.js',
         'js/jquery.rating.js',
-        '/admin/js/option.js'
+        '/admin/js/fieldWidget.js'
     ];
     public $depends = [
         'yii\web\YiiAsset',
 <?php
 namespace frontend\controllers;
+use common\models\Fields;
 use common\models\Language;
 use Yii;
 use common\models\User;
@@ -27,7 +28,7 @@ class AccountsController extends Controller
                 'class' => AccessControl::className(),
                 'rules' => [
                     [
-                        'actions' => ['cabinet','change-password', 'bookmarks', 'projects'],
+                        'actions' => ['cabinet','change-password', 'bookmarks'],
                         'allow' => true,
                         'roles' => ['@'],
                     ],
@@ -43,18 +44,28 @@ class AccountsController extends Controller
         $user =  $this->findUser(Yii::$app->user->identity->id);
-        $user_info =  $this->findUserInfo(Yii::$app->user->identity->id);
-
         $langs = Language::getActiveLanguages();
+        if ($user->load(Yii::$app->request->post()) && $user->save()) {
+            $user->userInfo->load(Yii::$app->request->post());
+            $user->userInfo->save();
+            Fields::saveFieldData( Yii::$app->request->post('Fields'), $user->id, $user::className());
+            return $this->render('cabinet', [
+                'user' => $user,
+                'user_info' => $user->userInfo,
+                'langs' => $langs,
+            ]);
-        return $this->render('cabinet', [
-            'user' => $user,
-            'user_info' => $user_info,
-            'langs' => $langs,
-        ]);
+        } else {
+            return $this->render('cabinet', [
+                'user' => $user,
+                'user_info' => $user->userInfo,
+                'langs' => $langs,
+            ]);
+
+        }
     }
@@ -65,12 +76,15 @@ class AccountsController extends Controller
     }
-
-
+    /**
+     * @param $id
+     * @return User
+     * @throws NotFoundHttpException
+     */
     protected function findUser($id)
     {
-        if (($model = User::findOne(["id"=>$id])) !== null) {
+        if ($model = User::findOne(["id"=>$id])) {
             return $model;
         } else {
             throw new NotFoundHttpException('The requested page does not exist.');
@@ -79,19 +93,4 @@ class AccountsController extends Controller
-    protected function findUserInfo($id)
-    {
-
-        if (($model = UserInfo::findOne(["user_id"=>$id])) !== null) {
-            return $model;
-        } else {
-            throw new NotFoundHttpException('The requested page does not exist.');
-        }
-    }
-
-    public function actionProjects()
-    {
-        return $this->render('projects');
-    }
-
 }
@@ -94,70 +94,70 @@ class SiteController extends Controller
         }
     // creat new model table Social and new model User
-    $social = new Social();
-    $user = new User();
-
-    $serviceName = Yii::$app->getRequest()->getQueryParam('service');
-
-        if (isset($serviceName)) {
-            /** @var $eauth \nodge\eauth\ServiceBase */
-            $eauth = Yii::$app->get('eauth')->getIdentity($serviceName);
-            $eauth->setRedirectUrl(Yii::$app->getUser()->getReturnUrl());
-            $eauth->setCancelUrl(Yii::$app->getUrlManager()->createAbsoluteUrl('site/login'));
-
-            try {
-                if ($eauth->authenticate()) {
-                    $identity = User::findByEAuth($eauth);
-                    Yii::$app->getUser()->login($identity);
-
-                    //Save date get social network in database
-                    if (! $social::find()->where(['social_user_id' => $identity[profile][id], 'social_name' => $identity[profile][service]])->exists()) {
-                        $name = explode(' ',$identity[profile][name]);
-                        $user->firstname = $name[0];
-                        $user->lastname = $name[1];
-                        $user->id_system_date = date("d.m.y.H:i:s");
-                        $user->save();
-                        $social->social_name = $identity[profile][service];
-                        $social->social_user_id = $identity[profile][id];
-                        $social->user_id = $user->id;
-                        $social->validate();
-                        $social->errors;
-                        $social->save();
-                    }
-
-                    // special redirect with closing popup window
-                    $eauth->redirect();
-                }
-                else {
-                    // close popup window and redirect to cancelUrl
-                    $eauth->cancel();
-                }
-            }
-            catch (\nodge\eauth\ErrorException $e) {
-                // save error to show it later
-                Yii::$app->getSession()->setFlash('error', 'EAuthException: '.$e->getMessage());
-
-                                // close popup window and redirect to cancelUrl
-                //              $eauth->cancel();
-                $eauth->redirect($eauth->getCancelUrl());
-            }
-        }
-
-
-
-
-        if (!\Yii::$app->user->isGuest) {
-            return $this->goHome();
-        }
-
-        $model = new LoginForm();
-        if ($model->load(Yii::$app->request->post()) && $model->login()) {
-            return $this->goBack();
-        } else {
-            return $this->render('login', [
-                'model' => $model,
-            ]);
-        }
+//    $social = new Social();
+//    $user = new User();
+//
+//    $serviceName = Yii::$app->getRequest()->getQueryParam('service');
+//
+//        if (isset($serviceName)) {
+//            /** @var $eauth \nodge\eauth\ServiceBase */
+//            $eauth = Yii::$app->get('eauth')->getIdentity($serviceName);
+//            $eauth->setRedirectUrl(Yii::$app->getUser()->getReturnUrl());
+//            $eauth->setCancelUrl(Yii::$app->getUrlManager()->createAbsoluteUrl('site/login'));
+//
+//            try {
+//                if ($eauth->authenticate()) {
+//                    $identity = User::findByEAuth($eauth);
+//                    Yii::$app->getUser()->login($identity);
+//
+//                    //Save date get social network in database
+//                    if (! $social::find()->where(['social_user_id' => $identity[profile][id], 'social_name' => $identity[profile][service]])->exists()) {
+//                        $name = explode(' ',$identity[profile][name]);
+//                        $user->firstname = $name[0];
+//                        $user->lastname = $name[1];
+//                        $user->id_system_date = date("d.m.y.H:i:s");
+//                        $user->save();
+//                        $social->social_name = $identity[profile][service];
+//                        $social->social_user_id = $identity[profile][id];
+//                        $social->user_id = $user->id;
+//                        $social->validate();
+//                        $social->errors;
+//                        $social->save();
+//                    }
+//
+//                    // special redirect with closing popup window
+//                    $eauth->redirect();
+//                }
+//                else {
+//                    // close popup window and redirect to cancelUrl
+//                    $eauth->cancel();
+//                }
+//            }
+//            catch (\nodge\eauth\ErrorException $e) {
+//                // save error to show it later
+//                Yii::$app->getSession()->setFlash('error', 'EAuthException: '.$e->getMessage());
+//
+//                                // close popup window and redirect to cancelUrl
+//                //              $eauth->cancel();
+//                $eauth->redirect($eauth->getCancelUrl());
+//            }
+//        }
+//
+//
+//
+//
+//        if (!\Yii::$app->user->isGuest) {
+//            return $this->goHome();
+//        }
+//
+//        $model = new LoginForm();
+//        if ($model->load(Yii::$app->request->post()) && $model->login()) {
+//            return $this->goBack();
+//        } else {
+//            return $this->render('login', [
+//                'model' => $model,
+//            ]);
+//        }
     }
     /**
@@ -17,16 +17,10 @@ use yii\widgets\ActiveForm;
 <?= $form->field($user_info, 'user_id')->textInput() ?>
-<?= $form->field($user_info, 'view_count')->textInput() ?>
-
 <?= $form->field($user_info, 'busy')->textInput(['maxlength' => true]) ?>
-<?= $form->field($user_info, 'date_visit')->textInput() ?>
-
 <?= $form->field($user_info, 'experience')->textInput() ?>
-<?= $form->field($user_info, 'rank')->textInput(['maxlength' => true]) ?>
-
 <?= $form->field($user_info, 'salary')->textInput(['maxlength' => true]) ?>
 <?= $form->field($user_info, 'job')->textInput(['maxlength' => true]) ?>
@@ -49,7 +43,12 @@ use yii\widgets\ActiveForm;
 <?= $form->field($user_info, 'about')->textarea(['rows' => 6]) ?>
-<?= \common\widgets\FieldEditor::widget(['template'=>'', 'item_id'=> $user->id, 'model'=>'User']); ?>
+<?= \common\widgets\FieldEditor::widget([
+    'template'=>'education',
+    'item_id'=> $user->id,
+    'model'=>'common\models\User',
+    'language'=>'0'
+]); ?>
 <div class="form-group">