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

changes in task_user, replaced user_id to card_id

Browse Source
This commit is contained in:
iIronside
2021-12-21 17:39:21 +03:00
parent e07dd0eff6
commit 1fa8fa5009
8 changed files with 1110 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backend/modules/task/controllers/TaskUserController.php
View File

@ -173,7 +173,7 @@ class TaskUserController extends Controller
$parents = $_POST['depdrop_parents'];
if ($parents != null) {
$task_id = $parents[0];
$users = ProjectUser::usersByTaskArr($task_id);
$users = ProjectUser::userCardByTaskArr($task_id);
$formattedUsersArr = array();
foreach ($users as $key => $value){
@ -185,9 +185,4 @@ class TaskUserController extends Controller
}
return ['output'=>'', 'selected'=>''];
}
public function actionDynamicProjectUser()
{
var_dump('hhh'); die;
}
}

2
backend/modules/task/views/task-user/_form.php
View File

@ -29,7 +29,7 @@ use yii\widgets\ActiveForm;
<?= $form->field($model, 'project_user_id')->widget(DepDrop::className(),
[
'type' => DepDrop::TYPE_SELECT2,
'options' => ['id' => 'project-user-id', 'allowClear' => true, 'multiple' => true], // , 'multiple' => true
'options' => ['id' => 'project-user-id', 'allowClear' => true, 'multiple' => true],
'select2Options' => [
'pluginOptions' => [
'allowClear' => true,

10
backend/modules/task/views/task-user/index.php
View File

@ -2,6 +2,7 @@
use backend\modules\project\models\ProjectUser;
use backend\modules\task\models\Task;
use backend\modules\task\models\TaskUser;
use kartik\select2\Select2;
use yii\helpers\Html;
use yii\grid\GridView;
@ -35,7 +36,8 @@ $this->params['breadcrumbs'][] = $this->title;
'filter' => Select2::widget([
'model' => $searchModel,
'attribute' => 'task_id',
'data' => Task::find()->select(['title', 'id'])->indexBy('id')->column(),
'data' => TaskUser::find()->joinWith('task')
->select(['task.title', 'task.id'])->indexBy('task.id')->column(),
'pluginOptions' => [
'allowClear' => true,
'width' => '250px',
@ -48,12 +50,12 @@ $this->params['breadcrumbs'][] = $this->title;
],
[
'attribute' => 'project_user_id',
'value' => 'projectUser.user.username',
'value' => 'projectUser.card.fio',
'filter' => Select2::widget([
'model' => $searchModel,
'attribute' => 'project_user_id',
'data' => ProjectUser::find()->select(['user.username', 'project_user.id'])
->joinWith('user')->indexBy('project_user.id')->column(),
'data' => TaskUser::find()->joinWith('projectUser.card')
->select(['user_card.fio', 'task_user.id'])->column(),
'pluginOptions' => [
'allowClear' => true,
'width' => '250px',

2
backend/modules/task/views/task-user/view.php
View File

@ -36,7 +36,7 @@ $this->params['breadcrumbs'][] = $this->title;
],
[
'attribute' => 'project_user_id',
'value' => ArrayHelper::getValue($model, 'projectUser.user.username'),
'value' => ArrayHelper::getValue($model, 'projectUser.card.fio'),
],
],
]) ?>