diff --git a/backend/modules/card/models/UserCard.php b/backend/modules/card/models/UserCard.php index 514241c..07c8b70 100644 --- a/backend/modules/card/models/UserCard.php +++ b/backend/modules/card/models/UserCard.php @@ -16,6 +16,7 @@ class UserCard extends \common\models\UserCard [ 'card_id' => \Yii::$app->request->get('id'), 'project_id' => null, + 'company_id' => null, ]) ->all(); $array = []; diff --git a/backend/modules/card/views/user-card/_form.php b/backend/modules/card/views/user-card/_form.php index dc2ffd0..69e2dd5 100644 --- a/backend/modules/card/views/user-card/_form.php +++ b/backend/modules/card/views/user-card/_form.php @@ -100,6 +100,15 @@ use yii\widgets\ActiveForm; ) ?> + +
+
+ field($model, 'salary')->textInput(['maxlength' => true]) ?> +
+ +
+ +
field($model, 'fields')->widget(MultipleInput::class, [ diff --git a/backend/modules/card/views/user-card/view.php b/backend/modules/card/views/user-card/view.php index 1a600ad..caef680 100644 --- a/backend/modules/card/views/user-card/view.php +++ b/backend/modules/card/views/user-card/view.php @@ -48,6 +48,7 @@ $this->params['breadcrumbs'][] = $this->title; 'label' => 'status', 'value' => $model->status0->name, ], + 'salary', 'created_at', 'updated_at', ], diff --git a/backend/modules/project/models/Project.php b/backend/modules/project/models/Project.php index 2721e74..430d936 100644 --- a/backend/modules/project/models/Project.php +++ b/backend/modules/project/models/Project.php @@ -21,6 +21,7 @@ class Project extends \common\models\Project [ 'project_id' => \Yii::$app->request->get('id'), 'card_id' => null, + 'company_id' => null, ]) ->all(); $array = []; diff --git a/backend/modules/project/views/project/_form.php b/backend/modules/project/views/project/_form.php index a8bf3dd..3880b2b 100644 --- a/backend/modules/project/views/project/_form.php +++ b/backend/modules/project/views/project/_form.php @@ -18,6 +18,18 @@ use yii\widgets\ActiveForm; field($model, 'description')->textarea(['rows' => 6]) ?> + field($model, 'budget')->textInput(['maxlength' => true]) ?> + + field($model, 'company_id')->widget(Select2::class, + [ + 'data' => \yii\helpers\ArrayHelper::map(\common\models\Company::find()->all(),'id', 'name'), + 'options' => ['placeholder' => '...','class' => 'form-control'], + 'pluginOptions' => [ + 'allowClear' => true + ], + ] + ); ?> +
field($model, 'fields')->widget(MultipleInput::class, [