From 0a9600cb00480e8e15334d5b3decdae8a7275cfa Mon Sep 17 00:00:00 2001 From: SoHardKI Date: Thu, 27 Jun 2019 15:41:58 +0300 Subject: [PATCH] transfer_to_new_table --- .../card/controllers/UserCardController.php | 7 ++++-- backend/modules/card/models/UserCard.php | 24 +++++++++++-------- backend/modules/company/models/Company.php | 2 +- .../modules/company/views/company/view.php | 4 ++-- .../project/controllers/ProjectController.php | 5 +++- backend/modules/project/models/Project.php | 22 ++++++++++------- .../AdditionalFieldsController.php | 1 + backend/views/layouts/left.php | 2 +- common/models/Company.php | 2 +- common/models/Project.php | 2 +- common/models/UserCard.php | 2 +- 11 files changed, 45 insertions(+), 28 deletions(-) diff --git a/backend/modules/card/controllers/UserCardController.php b/backend/modules/card/controllers/UserCardController.php index 2bad674..682223a 100755 --- a/backend/modules/card/controllers/UserCardController.php +++ b/backend/modules/card/controllers/UserCardController.php @@ -6,6 +6,7 @@ use common\classes\Debug; use common\models\AdditionalFields; use common\models\CardSkill; use common\models\FieldsValue; +use common\models\FieldsValueNew; use common\models\Status; use Yii; use backend\modules\card\models\UserCard; @@ -62,7 +63,9 @@ class UserCardController extends Controller public function actionView($id) { $dataProvider = new ActiveDataProvider([ - 'query' => FieldsValue::find()->where(['card_id' => $id])->orderBy('order'), + 'query' => FieldsValueNew::find() + ->where(['item_id' => $id, 'item_type' => FieldsValueNew::TYPE_PROFILE]) + ->orderBy('order'), 'pagination' => [ 'pageSize' => 200, ], @@ -105,7 +108,7 @@ 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]); } diff --git a/backend/modules/card/models/UserCard.php b/backend/modules/card/models/UserCard.php index f1ead04..ae2e498 100755 --- a/backend/modules/card/models/UserCard.php +++ b/backend/modules/card/models/UserCard.php @@ -5,6 +5,7 @@ namespace backend\modules\card\models; use backend\modules\settings\models\Skill; use common\models\CardSkill; use common\models\FieldsValue; +use common\models\FieldsValueNew; use yii\helpers\ArrayHelper; class UserCard extends \common\models\UserCard @@ -16,17 +17,20 @@ class UserCard extends \common\models\UserCard { parent::init(); - $fieldValue = FieldsValue::find()->where( + $fieldValue = FieldsValueNew::find()->where( [ - 'card_id' => \Yii::$app->request->get('id'), - 'project_id' => null, - 'company_id' => null, + 'item_id' => \Yii::$app->request->get('id'), + 'item_type' => FieldsValueNew::TYPE_PROFILE, ]) ->all(); $array = []; if(!empty($fieldValue)){ foreach ($fieldValue as $item){ - array_push($array, ['field_id' => $item->field_id, 'value' => $item->value, 'order' => $item->order]); + array_push($array, + ['field_id' => $item->field_id, + 'value' => $item->value, + 'order' => $item->order, + 'field_name' => $item->field->name]); } $this->fields = $array; } @@ -36,6 +40,7 @@ class UserCard extends \common\models\UserCard 'field_id' => null, 'value' => null, 'order' => null, + 'field_name' => null, ], ]; } @@ -54,17 +59,16 @@ class UserCard extends \common\models\UserCard { $post = \Yii::$app->request->post('UserCard'); - - if($post['fields']){ - FieldsValue::deleteAll(['card_id' => $this->id]); + FieldsValueNew::deleteAll(['item_id' => $this->id, 'item_type' => FieldsValueNew::TYPE_PROFILE]); foreach ( $post['fields'] as $item) { - $fildsValue = new FieldsValue(); + $fildsValue = new FieldsValueNew(); $fildsValue->field_id = $item['field_id']; $fildsValue->value = $item['value']; $fildsValue->order = $item['order']; - $fildsValue->card_id = $this->id; + $fildsValue->item_id = $this->id; + $fildsValue->item_type = FieldsValueNew::TYPE_PROFILE; $fildsValue->save(); } diff --git a/backend/modules/company/models/Company.php b/backend/modules/company/models/Company.php index fe44a2a..19f6d7f 100755 --- a/backend/modules/company/models/Company.php +++ b/backend/modules/company/models/Company.php @@ -47,7 +47,7 @@ class Company extends \common\models\Company { $post = \Yii::$app->request->post('Company'); - FieldsValue::deleteAll(['company_id' => $this->id]); + FieldsValueNew::deleteAll(['item_id' => $this->id, 'item_type' => FieldsValueNew::TYPE_COMPANY]); foreach ( $post['fields'] as $item) { $fildsValue = new FieldsValueNew(); diff --git a/backend/modules/company/views/company/view.php b/backend/modules/company/views/company/view.php index 4ddd155..df256a4 100755 --- a/backend/modules/company/views/company/view.php +++ b/backend/modules/company/views/company/view.php @@ -15,8 +15,8 @@ $this->params['breadcrumbs'][] = $this->title;

'btn btn-primary']) ?> - $model->id], ['class' => 'btn btn-primary']) ?> - $model->id], [ + $model->id], ['class' => 'btn btn-primary']) ?> + $model->id], [ 'class' => 'btn btn-danger', 'data' => [ 'confirm' => 'Are you sure you want to delete this item?', diff --git a/backend/modules/project/controllers/ProjectController.php b/backend/modules/project/controllers/ProjectController.php index ca147bb..1db532d 100755 --- a/backend/modules/project/controllers/ProjectController.php +++ b/backend/modules/project/controllers/ProjectController.php @@ -3,6 +3,7 @@ namespace backend\modules\project\controllers; use common\models\FieldsValue; +use common\models\FieldsValueNew; use common\models\Hh; use common\models\HhJob; use common\models\ProjectUser; @@ -72,7 +73,9 @@ class ProjectController extends Controller $dataProvider = new ActiveDataProvider([ - 'query' => FieldsValue::find()->where(['project_id' => $id])->orderBy('order'), + 'query' => FieldsValueNew::find() + ->where(['item_id' => $id, 'item_type' => FieldsValueNew::TYPE_PROJECT]) + ->orderBy('order'), 'pagination' => [ 'pageSize' => 200, ], diff --git a/backend/modules/project/models/Project.php b/backend/modules/project/models/Project.php index cc0c31a..57fc08a 100755 --- a/backend/modules/project/models/Project.php +++ b/backend/modules/project/models/Project.php @@ -4,6 +4,7 @@ namespace backend\modules\project\models; use common\classes\Debug; use common\models\FieldsValue; +use common\models\FieldsValueNew; use common\models\ProjectUser; use yii\helpers\ArrayHelper; @@ -16,18 +17,21 @@ class Project extends \common\models\Project { parent::init(); - $fieldValue = FieldsValue::find() + $fieldValue = FieldsValueNew::find() ->where( [ - 'project_id' => \Yii::$app->request->get('id'), - 'card_id' => null, - 'company_id' => null, + 'item_id' => \Yii::$app->request->get('id'), + 'item_type' => FieldsValueNew::TYPE_PROJECT, ]) ->all(); $array = []; if (!empty($fieldValue)) { foreach ($fieldValue as $item) { - array_push($array, ['field_id' => $item->field_id, 'value' => $item->value, 'order' => $item->order]); + array_push($array, [ + 'field_id' => $item->field_id, + 'value' => $item->value, + 'order' => $item->order, + 'field_name' => $item->field->name]); } $this->fields = $array; } else { @@ -36,6 +40,7 @@ class Project extends \common\models\Project 'field_id' => null, 'value' => null, 'order' => null, + 'field_name' => null, ], ]; } @@ -53,14 +58,15 @@ class Project extends \common\models\Project { $post = \Yii::$app->request->post('Project'); - FieldsValue::deleteAll(['project_id' => $this->id]); + FieldsValueNew::deleteAll(['item_id' => $this->id, 'item_type' => FieldsValueNew::TYPE_PROJECT]); foreach ($post['fields'] as $item) { - $fildsValue = new FieldsValue(); + $fildsValue = new FieldsValueNew(); $fildsValue->field_id = $item['field_id']; $fildsValue->value = $item['value']; $fildsValue->order = $item['order']; - $fildsValue->project_id = $this->id; + $fildsValue->item_id = $this->id; + $fildsValue->item_type = FieldsValueNew::TYPE_PROJECT; $fildsValue->save(); } diff --git a/backend/modules/settings/controllers/AdditionalFieldsController.php b/backend/modules/settings/controllers/AdditionalFieldsController.php index fa157af..aac3dce 100755 --- a/backend/modules/settings/controllers/AdditionalFieldsController.php +++ b/backend/modules/settings/controllers/AdditionalFieldsController.php @@ -2,6 +2,7 @@ namespace backend\modules\settings\controllers; +use common\classes\Debug; use common\models\UseField; use Yii; use backend\modules\settings\models\AdditionalFields; diff --git a/backend/views/layouts/left.php b/backend/views/layouts/left.php index a1ca583..8a001ed 100755 --- a/backend/views/layouts/left.php +++ b/backend/views/layouts/left.php @@ -25,7 +25,7 @@ 'label' => 'Профили', 'icon' => 'users', 'url' => '#', 'items' => $menuItems, ], - ['label' => 'Пректы', 'icon' => 'files-o', 'url' => ['/project/project']], + ['label' => 'Проекты', 'icon' => 'files-o', 'url' => ['/project/project']], ['label' => 'Компании', 'icon' => 'files-o', 'url' => ['/company/company']], [ 'label' => 'Hh.ru', 'icon' => 'user-circle', 'url' => '#', diff --git a/common/models/Company.php b/common/models/Company.php index 0deafe7..7c74d00 100755 --- a/common/models/Company.php +++ b/common/models/Company.php @@ -86,7 +86,7 @@ class Company extends \yii\db\ActiveRecord */ public function getFieldsValues() { - return $this->hasMany(FieldsValue::className(), ['company_id' => 'id']); + return $this->hasMany(FieldsValueNew::class, ['item_id' => 'id'])->where(['item_type' => FieldsValueNew::TYPE_COMPANY])->with('field'); } /** diff --git a/common/models/Project.php b/common/models/Project.php index b82da67..c83910d 100755 --- a/common/models/Project.php +++ b/common/models/Project.php @@ -84,7 +84,7 @@ class Project extends \yii\db\ActiveRecord */ public function getFieldsValues() { - return $this->hasMany(FieldsValue::class, ['project_id' => 'id']); + return $this->hasMany(FieldsValueNew::class, ['item_id' => 'id'])->where(['item_type' => FieldsValueNew::TYPE_PROJECT])->with('field'); } /** diff --git a/common/models/UserCard.php b/common/models/UserCard.php index cfe477a..de772fe 100755 --- a/common/models/UserCard.php +++ b/common/models/UserCard.php @@ -98,7 +98,7 @@ class UserCard extends \yii\db\ActiveRecord */ public function getFieldsValues() { - return $this->hasMany(FieldsValue::class, ['card_id' => 'id']); + return $this->hasMany(FieldsValueNew::class, ['item_id' => 'id'])->where(['item_type' => FieldsValueNew::TYPE_PROFILE])->with('field'); } /**