From 9bb0160de4c9f22b8a0afe64958b30703e5af9e4 Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Wed, 10 Feb 2016 17:36:23 +0200
Subject: [PATCH] 09.02.16

---
 common/models/Fields.php                     |  7 ++++++-
 common/widgets/views/courses_field.php       |  2 +-
 common/widgets/views/development_field.php   |  2 +-
 common/widgets/views/education_field.php     |  4 ++--
 frontend/config/main.php                     |  1 +
 frontend/controllers/PerformerController.php | 28 ++++++++++++++++------------
 frontend/views/performer/common.php          | 22 ++++------------------
 7 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/common/models/Fields.php b/common/models/Fields.php
index e7083aa..c434c42 100755
--- a/common/models/Fields.php
+++ b/common/models/Fields.php
@@ -3,6 +3,7 @@
 namespace common\models;
 
 use Yii;
+use yii\helpers\ArrayHelper;
 
 /**
  * This is the model class for table "{{%fields}}".
@@ -55,7 +56,11 @@ 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();
+        $data = ArrayHelper::toArray(self::find()->where(['table_id'=>$id, 'table_name'=>$model, 'field_type'=>$type])->all());
+        print_r($data);
+
+        die();
+       return self::find()->where(['table_id'=>$id, 'table_name'=>$model, 'field_type'=>$type])->indexBy('parent_key')->all();
     }
 
 
diff --git a/common/widgets/views/courses_field.php b/common/widgets/views/courses_field.php
index 71a87b6..813fb22 100644
--- a/common/widgets/views/courses_field.php
+++ b/common/widgets/views/courses_field.php
@@ -43,7 +43,7 @@
                             var block_id  = $ (this)
                                 .parent ('fieldset');
                             var sub_block = '<div class="form-group" >' +
-                                            '<input type="text" placeholder="Курсы, тренинги" class="form-control" value="" name="Fields[courses][' + start_i_<?=$this->context->id?>++ + '][0][name]" />' +
+                                            '<input type="text" placeholder="Курсы, тренинги" class="form-control" value="" name="Fields[courses][' + start_i_<?=$this->context->id?> + '][0][name]" />' +
                                             '<input type="number" class="form-control" value="" name="Fields[courses][' + start_i_<?=$this->context->id?>++ + '][1][year]" />' +
                                             '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>' +
                                             '<div>';
diff --git a/common/widgets/views/development_field.php b/common/widgets/views/development_field.php
index 6ead254..be4adc2 100644
--- a/common/widgets/views/development_field.php
+++ b/common/widgets/views/development_field.php
@@ -42,7 +42,7 @@
                             var block_id  = $ (this)
                                 .parent ('fieldset');
                             var sub_block = '<div class="form-group" >' +
-                                            '<input type="text" placeholder="Телефон" class="form-control" value="" name="Fields[development][' + start_i_<?=$this->context->id?>++ + '][0][name]" />' +
+                                            '<input type="text" placeholder="Телефон" class="form-control" value="" name="Fields[development][' + start_i_<?=$this->context->id?> + '][0][name]" />' +
                                             '<input type="number" class="form-control" value="" name="Fields[development][' + start_i_<?=$this->context->id?>++ + '][1][year]" />' +
                                             '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>' +
                                             '<div>';
diff --git a/common/widgets/views/education_field.php b/common/widgets/views/education_field.php
index 7ed5e16..6a7ddb3 100755
--- a/common/widgets/views/education_field.php
+++ b/common/widgets/views/education_field.php
@@ -55,9 +55,9 @@
                             var block_id  = $ (this)
                                 .parent ('fieldset');
                             var sub_block = '<div class="form-group" >' +
-                                            '<input id="edu-name-' + ++start_label_<?=$this->context->id?> +'" type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][0][name]" />' +
+                                            '<input id="edu-name-' + ++start_label_<?=$this->context->id?> +'" type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[education][' + start_i_<?=$this->context->id?> + '][0][name]" />' +
                                             '<label for="edu-name-' + start_label_<?=$this->context->id?> +'"></label>'+
-                                            '<input id="edu-to-' + ++start_label_<?=$this->context->id?> +'" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][1][year_from]" />' +
+                                            '<input id="edu-to-' + ++start_label_<?=$this->context->id?> +'" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[education][' + start_i_<?=$this->context->id?> + '][1][year_from]" />' +
                                             '<label for="edu-to-' + start_label_<?=$this->context->id?>  +'"></label>'+
                                             '<input id="edu-out-' + ++start_label_<?=$this->context->id?>  +'"" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][2][year_to]" />' +
                                             '<label for="edu-out-' + start_label_<?=$this->context->id?> +'"></label>'+
diff --git a/frontend/config/main.php b/frontend/config/main.php
index 967bd17..8edda86 100755
--- a/frontend/config/main.php
+++ b/frontend/config/main.php
@@ -64,6 +64,7 @@ return [
             'showScriptName' => false,
                 'rules' => [
                     'landing/<view:[\w-]+>' => 'landing/view',
+                    'performer/common/<performer_id:[\w-]+>' => 'performer/common',
                 ]
         ],
     ],
diff --git a/frontend/controllers/PerformerController.php b/frontend/controllers/PerformerController.php
index 83c91b9..6f37ced 100755
--- a/frontend/controllers/PerformerController.php
+++ b/frontend/controllers/PerformerController.php
@@ -48,24 +48,28 @@ class PerformerController extends Controller
         ];
     }
 
-    /**
-     * @var $user common\models\User
-     */
+
     public function actionIndex()
     {
-        $user = \Yii::$app->user->identity;
+        $this->redirect('site/index');
 
-        $education = Fields::getData($user->id,$user::className(),'education');
-
-        return $this->render('common',[
-            'user' => \Yii::$app->user->identity,
-            '$education' => $education
-        ]);
     }
 
-    public function actionCommon(/*$performer_id*/)
+    public function actionCommon($performer_id)
     {
-        return $this->render('common');
+        if(\Yii::$app->user->identity instanceof User && \Yii::$app->user->identity->id == $performer_id ){
+            $user = \Yii::$app->user->identity;
+        } else {
+            $user = User::findOne($performer_id);
+        }
+
+
+        $educations = Fields::getData($user->id,$user::className(),'education');
+
+        return $this->render('common',[
+            'user' => $user,
+            'educations' => $educations
+        ]);
     }
 
     public function actionPortfolio(/*$performer_id*/)
diff --git a/frontend/views/performer/common.php b/frontend/views/performer/common.php
index 74aa02e..a8835fa 100755
--- a/frontend/views/performer/common.php
+++ b/frontend/views/performer/common.php
@@ -14,27 +14,13 @@ $this->title = 'My Yii Application';
     </div>
     <a href="#" class="profile-see-all"></a>
     <div class="proektant-profile-courses-wr style">
+        <?php foreach( $educations as $education):?>
         <div class="proektant-profile-courses">
             <div class="proektant-profile-courses-title">Образование:</div>
-            <div class="proektant-profile-courses-year">1996-2000</div>
-            <div class="proektant-profile-courses-content">Сочинский государственный университет, специальность "Дизайнер среды".</div>
-        </div>
-
-        <div class="proektant-profile-courses">
-            <div class="proektant-profile-courses-title">Собственные разработки, патенты:</div>
-            <div class="proektant-profile-courses-year">2006</div>
-            <div class="proektant-profile-courses-content">Патент "Технология сборки деревянной клеенной стены".</div>
-            <div class="proektant-profile-courses-year">2014</div>
-            <div class="proektant-profile-courses-content">Патент "Способ литья центробежным способом".</div>
-        </div>
-
-        <div class="proektant-profile-courses">
-            <div class="proektant-profile-courses-title">Курсы, тренинги:</div>
-            <div class="proektant-profile-courses-year">2003</div>
-            <div class="proektant-profile-courses-content">Тренинг "Основы САПР и 2D черчения и проектирования на компьютере".</div>
-            <div class="proektant-profile-courses-year">2014</div>
-            <div class="proektant-profile-courses-content">Курс "Архитектурное моделирование".</div>
+            <div class="proektant-profile-courses-year"><?= $education->year_from ?>-<?= $education->year_to ?></div>
+            <div class="proektant-profile-courses-content"><?= $education->name ?></div>
         </div>
+        <?php endforeach; ?>
     </div>
 
     <div class="proektant-profile-statistic-wr style">
--
libgit2 0.21.4