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

changed the creator for tasks from project_user to user, fixed api, documentation, filters, some other fixes

Browse Source
This commit is contained in:
iIronside
2021-12-06 15:13:31 +03:00
parent daae8b16b6
commit e78ff7d779
23 changed files with 6024 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@
namespace backend\modules\task\models;
use backend\modules\project\models\ProjectUser;
use yii\base\Model;
use yii\data\ActiveDataProvider;
use backend\modules\task\models\Task;
@ -17,7 +18,7 @@ class TaskSearch extends Task
public function rules()
{
return [
[['id', 'project_id', 'status', 'project_user_id', 'user_id'], 'integer'],
[['id', 'project_id', 'status', 'user_id_creator', 'user_id'], 'integer'],
[['title', 'created_at', 'updated_at', 'description'], 'safe'],
];
}
@ -40,7 +41,10 @@ class TaskSearch extends Task
*/
public function search($params)
{
$query = Task::find()->joinWith(['user', 'project', 'projectUser.user']);
$query = Task::find()->joinWith(['user', 'project']);
// => function($query){
// $query->from(ProjectUser::tableName() . ' pt');
// }]); //,
// add conditions that should always apply here
@ -59,16 +63,16 @@ class TaskSearch extends Task
// grid filtering conditions
$query->andFilterWhere([
'id' => $this->id,
'project_id' => $this->project_id,
'status' => $this->status,
'created_at' => $this->created_at,
'updated_at' => $this->updated_at,
'project_user_id' => $this->project_user_id,
'user_id' => $this->user_id,
'task.project_id' => $this->project_id,
'task.status' => $this->status,
'task.created_at' => $this->created_at,
'task.updated_at' => $this->updated_at,
'user_id_creator' => $this->user_id_creator,
'task.user_id' => $this->user_id,
]);
$query->andFilterWhere(['like', 'title', $this->title])
->andFilterWhere(['like', 'description', $this->description]);
->andFilterWhere(['like', 'task.description', $this->description]);
return $dataProvider;
}

8
backend/modules/task/models/TaskUserSearch.php
View File

@ -11,6 +11,7 @@ use backend\modules\task\models\TaskUser;
*/
class TaskUserSearch extends TaskUser
{
public $projectId;
/**
* {@inheritdoc}
*/
@ -18,6 +19,7 @@ class TaskUserSearch extends TaskUser
{
return [
[['id', 'task_id', 'project_user_id'], 'integer'],
[['projectId'], 'safe']
];
}
@ -39,7 +41,7 @@ class TaskUserSearch extends TaskUser
*/
public function search($params)
{
$query = TaskUser::find()->joinWith(['task', 'projectUser']);
$query = TaskUser::find()->joinWith(['task', 'projectUser', 'projectUser.project']);
// add conditions that should always apply here
@ -59,9 +61,11 @@ class TaskUserSearch extends TaskUser
$query->andFilterWhere([
'id' => $this->id,
'task_id' => $this->task_id,
'project_user_id' => $this->project_user_id,
'task_user.project_user_id' => $this->project_user_id,
]);
$query->andFilterWhere(['like', 'project.id', $this->projectId]);
return $dataProvider;
}
}