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

task manager

Browse Source
This commit is contained in:
Kavalar
2023-04-25 01:32:15 +03:00
parent 5508fcb1ee
commit 226f2daa34
18 changed files with 746 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/modules/task/models/TaskSearch.php
View File

@ -18,7 +18,7 @@ class TaskSearch extends ProjectTask
public function rules()
{
return [
[['id', 'project_id', 'status', 'card_id_creator', 'card_id'], 'integer'], // 'card_id_creator', 'card_id'
[['id', 'project_id', 'status'], 'integer'], // 'card_id_creator', 'card_id'
[['title', 'created_at', 'updated_at', 'description'], 'safe'],
];
}
@ -64,8 +64,6 @@ class TaskSearch extends ProjectTask
'task.status' => $this->status,
'task.created_at' => $this->created_at,
'task.updated_at' => $this->updated_at,
'task.card_id_creator' => $this->card_id_creator,
'task.card_id' => $this->card_id,
]);
$query->andFilterWhere(['like', 'title', $this->title])

14
backend/modules/task/views/task/_form.php
View File

@ -24,13 +24,13 @@ use yii\widgets\ActiveForm;
);
?>
<?= $form->field($model, 'card_id_creator')->widget(Select2::class,
<?= $form->field($model, 'user_id')->widget(
Select2::class,
[
'data' => UserCard::find()->select(['fio', 'id'])->indexBy('id')->column(),
'options' => ['placeholder' => '...','class' => 'form-control', 'value' => Yii::$app->user->id],
'data' => \common\models\UserCard::getListUserWithUserId(),
'options' => ['placeholder' => '...', 'class' => 'form-control'],
'pluginOptions' => [
'allowClear' => true,
'prompt' => 'Выберите'
'allowClear' => true
],
]
); ?>
@ -44,9 +44,9 @@ use yii\widgets\ActiveForm;
]
) ?>
<?= $form->field($model, 'card_id')->widget(Select2::class,
<?= $form->field($model, 'column_id')->widget(Select2::class,
[
'data' => UserCard::find()->select(['fio', 'id'])->indexBy('id')->column(),
'data' => \common\models\ProjectColumn::find()->select(['title', 'id'])->indexBy('id')->column(),
'options' => ['placeholder' => '...','class' => 'form-control'],
'pluginOptions' => [
'allowClear' => true,

36
backend/modules/task/views/task/index.php
View File

@ -49,42 +49,6 @@ $this->params['breadcrumbs'][] = $this->title;
])
],
'title',
[
'attribute' => 'card_id_creator',
'value' => 'userCardCreator.fio',
'filter' => Select2::widget([
'model' => $searchModel,
'attribute' => 'card_id_creator',
'data' => ProjectTask::find()->joinWith('userCardCreator')
->select(['user_card.fio', 'user_card.id'])->indexBy('user_card.id')->column(),
'pluginOptions' => [
'allowClear' => true,
'width' => '150px',
],
'options' => [
'class' => 'form-control',
'placeholder' => 'Выберите значение'
],
])
],
[
'attribute' => 'card_id',
'value' => 'userCard.fio',
'filter' => Select2::widget([
'model' => $searchModel,
'attribute' => 'card_id',
'data' => ProjectTask::find()->joinWith('userCard')
->select(['user_card.fio', 'user_card.id'])->indexBy('user_card.id')->column(),
'pluginOptions' => [
'allowClear' => true,
'width' => '150px',
],
'options' => [
'class' => 'form-control',
'placeholder' => 'Выберите значение'
],
])
],
'description',
[
'attribute' => 'status',

8
backend/modules/task/views/task/view.php
View File

@ -47,12 +47,12 @@ YiiAsset::register($this);
'created_at',
'updated_at',
[
'attribute' => 'card_id_creator',
'value' => ArrayHelper::getValue($model, 'userCardCreator.fio'),
'attribute' => 'column_id',
'value' => ArrayHelper::getValue($model, 'column.title'),
],
[
'attribute' => 'card_id',
'value' => ArrayHelper::getValue($model, 'userCard.fio'),
'attribute' => 'user_id',
'value' => ArrayHelper::getValue($model, 'user.userCard.fio'),
],
'description',
],