Merge pull request #7 from apuc/change_profile

Change profile

backend/modules/card/controllers/UserCardController.php

@@ -43,7 +43,6 @@ class UserCardController extends Controller
      */
     public function actionIndex()
     {
-        $status = new Status();
         $searchModel = new UserCardSearch();
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
 
@@ -107,7 +106,6 @@ class UserCardController extends Controller
     public function actionUpdate($id)
     {
         $model = $this->findModel($id);
-//        Debug::dd($model);
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             return $this->redirect(['view', 'id' => $model->id]);
         }

backend/modules/card/models/UserCard.php

@@ -74,9 +74,6 @@ class UserCard extends \common\models\UserCard
             }
         }
 
-
-
-
         if($post['skill']){
             CardSkill::deleteAll(['card_id' => $this->id]);
 

backend/modules/card/models/UserCardSearch.php

@@ -2,6 +2,7 @@
 
 namespace backend\modules\card\models;
 
+use common\classes\Debug;
 use Yii;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
@@ -12,6 +13,7 @@ use backend\modules\card\models\UserCard;
  */
 class UserCardSearch extends UserCard
 {
+    public $skills;
     /**
      * {@inheritdoc}
      */
@@ -20,6 +22,7 @@ class UserCardSearch extends UserCard
         return [
             [['id', 'gender', 'status'], 'integer'],
             [['fio', 'passport', 'photo', 'email', 'dob', 'created_at', 'updated_at'], 'safe'],
+            ['skills', 'each', 'rule' => ['integer']],
         ];
     }
 
@@ -42,9 +45,12 @@ class UserCardSearch extends UserCard
     public function search($params)
     {
         $query = UserCard::find();
-
         // add conditions that should always apply here
 
+        //try join 3 tables
+        $query->leftJoin('card_skill', 'card_skill.card_id=user_card.id');
+        $query->leftJoin('skill', 'skill.id=card_skill.skill_id');
+
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
         ]);
@@ -74,6 +80,8 @@ class UserCardSearch extends UserCard
             ->andFilterWhere(['like', 'photo', $this->photo])
             ->andFilterWhere(['like', 'email', $this->email]);
 
+        $query->andFilterWhere(['skill.id' => $this->skills]);
+
         return $dataProvider;
     }
 }

backend/modules/card/views/user-card/_additional.php

@@ -0,0 +1 @@
+<?= $model->skill->name; ?>

backend/modules/card/views/user-card/index.php

@@ -3,6 +3,7 @@
 use yii\helpers\Html;
 use yii\grid\GridView;
 use yii\helpers\Url;
+use yii\widgets\ListView;
 
 /* @var $this yii\web\View */
 /* @var $searchModel backend\modules\card\models\UserCardSearch */
@@ -56,6 +57,29 @@ $this->params['breadcrumbs'][] = $this->title;
             ],
             //'created_at',
             //'updated_at',
+            [
+                    'label' => 'Навыки',
+                    'format' => 'raw',
+                    'value' => function($model){
+                        $dataProvider = new \yii\data\ActiveDataProvider([
+                                'query' => $model->getSkillValues(),
+                        ]);
+                        return ListView::widget([
+                            'dataProvider' => $dataProvider,
+                            'itemView' => '_additional',
+                            'layout' => "{items}",
+                        ]);
+                    },
+                'filter' => kartik\select2\Select2::widget([
+                        'attribute' => 'skills',
+                    'model' => $searchModel,
+                    'data' => \common\models\UserCard::getNameSkills(),
+                    'options' => ['multiple' => true,'placeholder' => 'Выбрать параметр','class' => 'form-control'],
+                    'pluginOptions' => [
+                        'allowClear' => true
+                    ],
+                ]),
+            ],
 
             ['class' => 'yii\grid\ActionColumn'],
         ],

common/models/UserCard.php

@@ -5,6 +5,7 @@ namespace common\models;
 use Yii;
 use yii\behaviors\TimestampBehavior;
 use yii\db\Expression;
+use yii\helpers\ArrayHelper;
 
 /**
  * This is the model class for table "user_card".
@@ -140,4 +141,14 @@ class UserCard extends \yii\db\ActiveRecord
     {
         return $this->genders[$this->gender];
     }
+
+    public function getSkillValues()
+    {
+        return $this->hasMany(CardSkill::class, ['card_id' => 'id'])->with('skill');
+    }
+
+    public static function getNameSkills()
+    {
+        return ArrayHelper::map(Skill::find()->all(),'id', 'name');
+    }
 }