diff --git a/common/models/Fields.php b/common/models/Fields.php index 243ed4b..e7083aa 100755 --- a/common/models/Fields.php +++ b/common/models/Fields.php @@ -68,7 +68,7 @@ class Fields extends \yii\db\ActiveRecord public static function saveFieldData($post,$table_id,$table_name, $language){ - self::deleteAll(['table_id'=>$table_id, 'table_name'=>$table_name, 'language' => $language]); + self::deleteAll(['table_id'=>$table_id, 'table_name'=>$table_name, 'language' => $language, 'field_type' => array_keys($post)]); if($post){ diff --git a/common/widgets/FieldEditor.php b/common/widgets/FieldEditor.php index 6fe7066..34824c5 100755 --- a/common/widgets/FieldEditor.php +++ b/common/widgets/FieldEditor.php @@ -33,13 +33,13 @@ class FieldEditor extends Widget protected function findModel() { - 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 { diff --git a/common/widgets/views/courses_field.php b/common/widgets/views/courses_field.php new file mode 100644 index 0000000..8c1aa78 --- /dev/null +++ b/common/widgets/views/courses_field.php @@ -0,0 +1,58 @@ + +
+ + + diff --git a/common/widgets/views/development_field.php b/common/widgets/views/development_field.php new file mode 100644 index 0000000..7d4d642 --- /dev/null +++ b/common/widgets/views/development_field.php @@ -0,0 +1,58 @@ + + + + + diff --git a/common/widgets/views/education_field.php b/common/widgets/views/education_field.php index 446b16a..1a48418 100755 --- a/common/widgets/views/education_field.php +++ b/common/widgets/views/education_field.php @@ -1,49 +1,60 @@ diff --git a/common/widgets/views/soft_field.php b/common/widgets/views/soft_field.php new file mode 100644 index 0000000..0d97168 --- /dev/null +++ b/common/widgets/views/soft_field.php @@ -0,0 +1,56 @@ + + + + + diff --git a/frontend/controllers/AccountsController.php b/frontend/controllers/AccountsController.php index 7b7a9b4..c7d1d82 100755 --- a/frontend/controllers/AccountsController.php +++ b/frontend/controllers/AccountsController.php @@ -233,7 +233,11 @@ public function actionAddSkills() { - return $this->render('add-skills'); + $user = \Yii::$app->user->identity; + if(!empty(\Yii::$app->request->post())) { + Fields::saveFieldData(Yii::$app->request->post('Fields'), \Yii::$app->user->identity->id, User::className(), 'ru'); + } + return $this->render('add-skills', ['user' => $user]); } public function actionDescription() diff --git a/frontend/views/accounts/add-skills.php b/frontend/views/accounts/add-skills.php index b6bb1c4..846cd44 100755 --- a/frontend/views/accounts/add-skills.php +++ b/frontend/views/accounts/add-skills.php @@ -1,6 +1,11 @@ - += FieldEditor::widget ( + [ + 'template' => 'soft', 'item_id' => $user->id, 'model' => 'common\models\User', 'language' => 'ru', + ] +); ?> += FieldEditor::widget ( + [ + 'template' => 'education', 'item_id' => $user->id, 'model' => 'common\models\User', 'language' => 'ru', + ] +); ?> += FieldEditor::widget ( + [ + 'template' => 'development', 'item_id' => $user->id, 'model' => 'common\models\User', 'language' => 'ru', + ] +); ?> += FieldEditor::widget ( + [ + 'template' => 'courses', 'item_id' => $user->id, 'model' => 'common\models\User', 'language' => 'ru', + ] +); ?> + = Html::submitButton('Обновить') ?> end(); ?> \ No newline at end of file diff --git a/frontend/views/accounts/general.php b/frontend/views/accounts/general.php index 3babd7c..6aa0193 100755 --- a/frontend/views/accounts/general.php +++ b/frontend/views/accounts/general.php @@ -14,41 +14,22 @@ use \common\widgets\MultiLangForm; $this->title = 'Учетные данные'; - $this->params['breadcrumbs'][] = $this->title; + $this->params[ 'breadcrumbs' ][] = $this->title; ?>