add api, docs

backend/modules/questionnaire/views/answer/_search_by_questionnaire.php

@@ -6,7 +6,7 @@ use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
 /* @var $this yii\web\View */
-/* @var $model backend\modules\questionnaire\models\AnswerSearch */
+/* @var $modelSearch backend\modules\questionnaire\models\AnswerSearch */
 /* @var $form yii\widgets\ActiveForm */
 ?>
 
@@ -17,7 +17,7 @@ use yii\widgets\ActiveForm;
         'method' => 'get',
     ]); ?>
 
-    <?= $form->field($model, 'questionnaire')->widget(Select2::className(),[
+    <?= $form->field($modelSearch, 'questionnaire')->widget(Select2::className(),[
         'data' => Questionnaire::find()->select(['title', 'id'])->indexBy('id')->column(),
         'options' => ['placeholder' => 'Выберите анкету'],
         'pluginOptions' => [

backend/modules/questionnaire/views/answer/index.php

@@ -21,7 +21,7 @@ $this->params['breadcrumbs'][] = $this->title;
     </p>
 
     <?= $this->render('_search_by_questionnaire', [
-        'model' => $searchModel,
+        'modelSearch' => $searchModel,
     ]) ?>
 
     <?= GridView::widget([

backend/modules/questionnaire/views/user-questionnaire/index.php

@@ -32,7 +32,7 @@ $this->params['breadcrumbs'][] = $this->title;
             ],
             [
                 'attribute' => 'user_id',
-                'filter' => ArrayHelper::map(User::find()->all(), 'id', 'username'),
+                'filter' => User::find()->select(['username', 'id'])->indexBy('id')->column(),
                 'value' => 'user.username'
             ],
             'score',

backend/modules/questionnaire/views/user-response/_search_by_questionnaire.php

@@ -1,7 +1,6 @@
 <?php
 
 use backend\modules\questionnaire\models\Questionnaire;
-use backend\modules\questionnaire\models\UserQuestionnaire;
 use kartik\select2\Select2;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;

backend/modules/task/controllers/TaskController.php

@@ -3,6 +3,8 @@
 namespace backend\modules\task\controllers;
 
 use backend\modules\project\models\ProjectUser;
+use backend\modules\task\models\TaskUser;
+use yii\data\ActiveDataProvider;
 use yii\web\Response;
 use Yii;
 use backend\modules\task\models\Task;
@@ -54,8 +56,17 @@ class TaskController extends Controller
      */
     public function actionView($id)
     {
+        $model = $this->findModel($id);
+        $taskDataProvider = new ActiveDataProvider([
+            'query' => $model->getTaskUsers()->with(['task', 'projectUser']),
+            'pagination' => [
+                'pageSize' => 20,
+            ],
+        ]);
+
         return $this->render('view', [
-            'model' => $this->findModel($id),
+            'model' => $model,
+            'taskDataProvider' => $taskDataProvider,
         ]);
     }
 

backend/modules/task/models/TaskSearch.php

@@ -40,7 +40,7 @@ class TaskSearch extends Task
      */
     public function search($params)
     {
-        $query = Task::find();
+        $query = Task::find()->joinWith(['user', 'project', 'projectUser.user']);
 
         // add conditions that should always apply here
 

backend/modules/task/models/TaskUserSearch.php

@@ -39,7 +39,7 @@ class TaskUserSearch extends TaskUser
      */
     public function search($params)
     {
-        $query = TaskUser::find();
+        $query = TaskUser::find()->joinWith(['task', 'projectUser']);
 
         // add conditions that should always apply here
 

backend/modules/task/views/task-user/index.php

@@ -27,13 +27,13 @@ $this->params['breadcrumbs'][] = $this->title;
 
             [
                 'attribute' => 'task_id',
-                'filter' => ArrayHelper::map(Task::find()->all(), 'id', 'title'),
+                'filter' => Task::find()->select(['title', 'id'])->indexBy('id')->column(),
                 'value' => 'task.title'
             ],
             [
                 'attribute' => 'project_user_id',
-                'filter' => ArrayHelper::map(ProjectUser::find()->joinWith('user')
-                    ->all(), 'id', 'user.username'),
+                'filter' => ProjectUser::find()->select(['user.username', 'project_user.id'])
+                    ->joinWith('user')->indexBy('project_user.id')->column(),
                 'value' => 'projectUser.user.username'
             ],
 

backend/modules/task/views/task/index.php

@@ -1,7 +1,9 @@
 <?php
 
 use backend\modules\project\models\Project;
+use backend\modules\project\models\ProjectUser;
 use common\helpers\StatusHelper;
+use common\models\User;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Html;
 use yii\grid\GridView;
@@ -31,6 +33,17 @@ $this->params['breadcrumbs'][] = $this->title;
                 'value' => 'project.name'
             ],
             'title',
+            [
+                'attribute' => 'project_user_id',
+                'filter' => ProjectUser::find()->select(['username', 'project_user.id'])->joinWith('user')->indexBy('id')->column(),
+                'value' => 'projectUser.user.username'
+            ],
+            [
+                'attribute' => 'user_id',
+                'filter' => User::find()->select(['username', 'id'])->indexBy('id')->column(),
+                'value' => 'user.username'
+            ],
+            'description',
             [
                 'attribute' => 'status',
                 'format' => 'raw',
@@ -40,6 +53,7 @@ $this->params['breadcrumbs'][] = $this->title;
                 },
             ],
             'created_at',
+            'updated_at',
 
             ['class' => 'yii\grid\ActionColumn'],
         ],

backend/modules/task/views/task/view.php

@@ -1,17 +1,20 @@
 <?php
 
 use common\helpers\StatusHelper;
+use kartik\grid\GridView;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Html;
+use yii\web\YiiAsset;
 use yii\widgets\DetailView;
 
 /* @var $this yii\web\View */
 /* @var $model backend\modules\task\models\Task */
+/* @var $taskDataProvider yii\data\ActiveDataProvider */
 
 $this->title = 'Задача: ' . $model->title;
 $this->params['breadcrumbs'][] = ['label' => 'Tasks', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
-\yii\web\YiiAsset::register($this);
+YiiAsset::register($this);
 ?>
 <div class="task-view">
 
@@ -55,4 +58,28 @@ $this->params['breadcrumbs'][] = $this->title;
         ],
     ]) ?>
 
+    <div>
+        <h2>
+            <?= 'Исполнители' ?>
+        </h2>
+    </div>
+
+    <?= GridView::widget([
+        'dataProvider' => $taskDataProvider,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+            [
+                'attribute' => 'task_id', // ArrayHelper::map(Task::find()->all(), 'id', 'title'),
+                'value' => 'task.title'
+            ],
+            [
+                'attribute' => 'project_user_id',
+                'value' => 'projectUser.user.username'
+            ],
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+
 </div>