apuc/guild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #28 from apuc/NotesAdd

Browse Source 
Notes add
This commit is contained in:
kavalar
2019-12-09 17:29:58 +02:00
committed by GitHub
parent ff5f421d9c 34e56f9fcc
commit 3264f1c944
8 changed files with 61 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/modules/card/models/UserCardSearch.php
View File

@@ -21,7 +21,7 @@ class UserCardSearch extends UserCard
{
return [
[['id', 'gender', 'status'], 'integer'],
[['fio', 'passport', 'photo', 'email', 'dob', 'created_at', 'updated_at'], 'safe'],
[['fio', 'passport', 'photo', 'email', 'dob', 'created_at', 'updated_at', 'city'], 'safe'],
['skills', 'each', 'rule' => ['integer']],
];
}
@@ -71,6 +71,7 @@ class UserCardSearch extends UserCard
'gender' => $this->gender,
'dob' => $this->dob,
'status' => $this->status,
'city' => $this->city,
'created_at' => $this->created_at,
'updated_at' => $this->updated_at,
]);
@@ -78,6 +79,7 @@ class UserCardSearch extends UserCard
$query->andFilterWhere(['like', 'fio', $this->fio])
->andFilterWhere(['like', 'passport', $this->passport])
->andFilterWhere(['like', 'photo', $this->photo])
->andFilterWhere(['like', 'city', $this->city])
->andFilterWhere(['like', 'email', $this->email]);
$query->andFilterWhere(['skill.id' => $this->skills]);

6
backend/modules/card/views/user-card/_form.php
View File

@@ -67,6 +67,12 @@ use yii\widgets\ActiveForm;
</div>
</div>
<div class="row">
<div class="col-xs-6">
<?= $form->field($model, 'city')->textInput(['maxlength' => true]) ?>
</div>
</div>
<div class="row">
<div class="col-xs-6">
<?= $form->field($model, 'email')->textInput(['maxlength' => true]) ?>

1
backend/modules/card/views/user-card/index.php
View File

@@ -36,6 +36,7 @@ $this->params['breadcrumbs'][] = $this->title;
},
],
'fio',
// 'city',
//'passport',
'salary',
'email:email',

4
backend/modules/card/views/user-card/update.php
View File

@@ -6,9 +6,9 @@ use yii\helpers\Html;
/* @var $model backend\modules\card\models\UserCard */
$this->title = $model->fio;
$this->params['breadcrumbs'][] = ['label' => 'User Cards', 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => 'Профили', 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->id, 'url' => ['view', 'id' => $model->id]];
$this->params['breadcrumbs'][] = 'Update';
$this->params['breadcrumbs'][] = 'Редактировать';
?>
<div class="user-card-update">

11
backend/modules/card/views/user-card/view.php
View File

@@ -12,12 +12,13 @@ use yii\widgets\DetailView;
/* @var $modelFildValue yii\data\ActiveDataProvider */
$this->title = $model->fio;
$this->params['breadcrumbs'][] = ['label' => 'User Cards', 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => 'Профили', 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="user-card-view">
<p>
<?= Html::a('Список', ['index'], ['class' => 'btn btn-primary']) ?>
<?= Html::a('Редактировать', ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
</p>
@@ -27,19 +28,23 @@ $this->params['breadcrumbs'][] = $this->title;
'fio',
'passport',
[
'attribute' => 'Photo',
'attribute' => 'photo',
'format' => 'raw',
'value' => function ($model) {
return Html::tag('img', null, ['src' => $model->photo, 'width' => '100px']);
}
],
[
'attribute' => 'Resume',
'attribute' => 'resume',
'format' => 'raw',
'value' => function ($model) {
return Html::a('Скачать', $model->resume, ['target' => '_blank']);
}
],
[
'attribute' => 'city',
'value' => $model->city
],
[
'attribute' => 'gender',
'value' => $model->gendersText,

2
backend/modules/notes/views/notes/index.php
View File

@@ -23,7 +23,7 @@ $this->params['breadcrumbs'][] = $this->title;
['class' => 'yii\grid\SerialColumn'],
// 'id',
'name',
'description',
// 'description',
'created_at',
// 'updated_at',

4
common/models/UserCard.php
View File

@@ -26,6 +26,7 @@ use yii\helpers\ArrayHelper;
* @property string $resume
* @property string $salary
* @property int $position_id
* @property int $city
*
* @property FieldsValue[] $fieldsValues
* @property ProjectUser[] $projectUsers
@@ -66,7 +67,7 @@ class UserCard extends \yii\db\ActiveRecord
[['fio', 'status', 'gender'], 'required'],
[['gender', 'status', 'position_id', 'id_user'], 'integer'],
[['dob', 'created_at', 'updated_at', 'deleted_at'], 'safe'],
[['fio', 'passport', 'photo', 'email', 'resume'], 'string', 'max' => 255],
[['fio', 'passport', 'photo', 'email', 'resume', 'city'], 'string', 'max' => 255],
[['salary'], 'string', 'max' => 100],
[['position_id'], 'exist', 'skipOnError' => true, 'targetClass' => Position::class, 'targetAttribute' => ['position_id' => 'id']],
[['status'], 'exist', 'skipOnError' => true, 'targetClass' => Status::class, 'targetAttribute' => ['status' => 'id']],
@@ -94,6 +95,7 @@ class UserCard extends \yii\db\ActiveRecord
'resume' => 'Резюме',
'salary' => 'Зарплата',
'position_id' => 'Должность',
'city' => 'Город',
];
}

37
console/migrations/m191206_145411_add_column_city_to_user_card.php Normal file
View File

@@ -0,0 +1,37 @@
<?php
use yii\db\Migration;
/**
* Class m191206_145411_add_column_city_to_user_card
*/
class m191206_145411_add_column_city_to_user_card extends Migration
{
/**
* {@inheritdoc}
*/
public function safeUp()
{
$this->addColumn('user_card', 'city', $this->string(255));
// $this->addColumn('user_card', 'city', $this->integer(11)->notNull()->defaultValue('1'));
// $this->addForeignKey(
// 'city',
// 'user_card',
// 'city',
// 'cities',
// 'id',
// 'RESTRICT',
// 'CASCADE'
// );
}
/**
* {@inheritdoc}
*/
public function safeDown()
{
$this->dropForeignKey('cityID', 'user_card');
$this->dropColumn('user_card', 'city');
}
}