diff --git a/backend/modules/card/models/UserCardSearch.php b/backend/modules/card/models/UserCardSearch.php index cae6b3b..5cac5e3 100755 --- a/backend/modules/card/models/UserCardSearch.php +++ b/backend/modules/card/models/UserCardSearch.php @@ -21,7 +21,7 @@ class UserCardSearch extends UserCard { return [ [['id', 'gender', 'status'], 'integer'], - [['fio', 'passport', 'photo', 'email', 'dob', 'created_at', 'updated_at', 'city'], 'safe'], + [['fio', 'passport', 'photo', 'email', 'dob', 'created_at', 'updated_at', 'city', 'test_task_getting_date', 'test_task_complete_date'], 'safe'], ['skills', 'each', 'rule' => ['integer']], ]; } @@ -83,6 +83,8 @@ class UserCardSearch extends UserCard 'city' => $this->city, 'created_at' => $this->created_at, 'updated_at' => $this->updated_at, + 'test_task_getting_date' => $this->test_task_getting_date, + 'test_task_complete_date' => $this->test_task_complete_date, ]); $query->andFilterWhere(['like', 'fio', $this->fio]) diff --git a/backend/modules/card/views/user-card/_form.php b/backend/modules/card/views/user-card/_form.php index 5bbcecb..8327dc6 100755 --- a/backend/modules/card/views/user-card/_form.php +++ b/backend/modules/card/views/user-card/_form.php @@ -26,7 +26,7 @@ use yii\widgets\ActiveForm; -
+
add_a_test_task_completion_date_to_ucer_card
'ru', ] ]); ?> + +
+
+ field($model, 'test_task_getting_date')->input( + 'date', + [ + 'language' => 'en', + "data-format" => "DD MMMM YYYY", + ] + ) ?> +
+
+ field($model, 'test_task_complete_date')->input( + 'date', + [ + 'language' => 'en', + "data-format" => "DD MMMM YYYY", + ] + ) ?> +
+
+
field($model, 'achievements')->widget(Select2::class, diff --git a/backend/modules/card/views/user-card/view.php b/backend/modules/card/views/user-card/view.php index ee87e0b..4cb509f 100755 --- a/backend/modules/card/views/user-card/view.php +++ b/backend/modules/card/views/user-card/view.php @@ -88,7 +88,15 @@ $this->params['breadcrumbs'][] = $this->title; [ 'attribute' => 'vc_text', 'format' => 'raw' - ] + ], + [ + 'attribute' => 'test_task_getting_date', + 'format' => ['datetime', 'php:d.m.Y'] + ], + [ + 'attribute' => 'test_task_complete_date', + 'format' => ['datetime', 'php:d.m.Y'] + ], ], ]) ?> diff --git a/common/models/UserCard.php b/common/models/UserCard.php index 8cbcae7..30fadd7 100755 --- a/common/models/UserCard.php +++ b/common/models/UserCard.php @@ -36,6 +36,8 @@ use yii\helpers\ArrayHelper; * @property int $position_id * @property int $city * @property int $level + * @property string $test_task_getting_date + * @property string $test_task_complete_date * * @property FieldsValue[] $fieldsValues * @property ProjectUser[] $projectUsers @@ -103,7 +105,7 @@ class UserCard extends \yii\db\ActiveRecord return [ [['fio', 'status', 'gender', 'email', 'level', 'position_id'], 'required'], [['gender', 'status', 'position_id', 'id_user', 'level', 'years_of_exp'], 'integer'], - [['dob', 'created_at', 'updated_at', 'deleted_at', 'vc_text', 'vc_text_short'], 'safe'], + [['dob', 'created_at', 'updated_at', 'deleted_at', 'vc_text', 'vc_text_short', 'test_task_getting_date', 'test_task_complete_date'], 'safe'], ['email', 'unique', 'message'=>'Почтовый адрес уже используется'], [['fio', 'passport', 'photo', 'email', 'resume', 'city', 'link_vk', 'link_telegram', 'specification'], 'string', 'max' => 255], [['salary'], 'string', 'max' => 100], @@ -140,7 +142,9 @@ class UserCard extends \yii\db\ActiveRecord 'vc_text_short' => 'Резюме короткий текст', 'level' => 'Уровень', 'years_of_exp' => 'Лет опыта', - 'specification' => 'Спецификация' + 'specification' => 'Спецификация', + 'test_task_getting_date' => 'Дата получения тестового', + 'test_task_complete_date' => 'Дата выполнения тестового', ]; } diff --git a/console/migrations/m220307_081259_add_test_task_completion_date_column_to_user_card_table.php b/console/migrations/m220307_081259_add_test_task_completion_date_column_to_user_card_table.php new file mode 100644 index 0000000..2982f65 --- /dev/null +++ b/console/migrations/m220307_081259_add_test_task_completion_date_column_to_user_card_table.php @@ -0,0 +1,27 @@ +addColumn('user_card', 'test_task_getting_date', $this->date()->defaultValue(null)); + $this->addColumn('user_card', 'test_task_complete_date', $this->date()->defaultValue(null)); + } + + /** + * {@inheritdoc} + */ + public function safeDown() + { + $this->dropColumn('user_card', 'test_task_getting_date'); + $this->dropColumn('user_card', 'test_task_complete_date'); + } +}