This commit is contained in:
2018-12-03 12:10:39 +03:00
parent c730e2547e
commit 45173d3b66
7 changed files with 111 additions and 13 deletions

View File

@ -2,6 +2,7 @@
namespace backend\modules\company\models;
use common\classes\Debug;
use Yii;
use yii\base\Model;
use yii\data\ActiveDataProvider;
@ -18,7 +19,7 @@ class CompanySearch extends Company
public function rules()
{
return [
[['id', 'status_id'], 'integer'],
[['id', 'status_id', 'projectId'], 'integer'],
[['name', 'description', 'created_at', 'updated_at'], 'safe'],
];
}
@ -41,7 +42,7 @@ class CompanySearch extends Company
*/
public function search($params)
{
$query = Company::find();
$query = Company::find()->joinWith('project');
// add conditions that should always apply here
@ -63,6 +64,7 @@ class CompanySearch extends Company
'status_id' => $this->status_id,
'created_at' => $this->created_at,
'updated_at' => $this->updated_at,
'project.id' => $this->projectId
]);
$query->andFilterWhere(['like', 'name', $this->name])

View File

@ -26,8 +26,36 @@ $this->params['breadcrumbs'][] = $this->title;
//'id',
'name',
'description:ntext',
'status_id',
[
'attribute' => 'project.name',
'label' => 'Проект',
'filter' => kartik\select2\Select2::widget([
'model' => $searchModel,
'name' => 'CompanySearch[projectId]',
'data' => \common\models\Project::getList(),
'options' => ['placeholder' => 'Начните вводить...','class' => 'form-control'],
'pluginOptions' => [
'allowClear' => true
],
]),
],
//'description:ntext',
//'status_id',
[
'attribute' => 'status',
'value' => function($model){
return isset($model->status0->name) ? $model->status0->name : 'Не задано';
},
'filter' => kartik\select2\Select2::widget([
'model' => $searchModel,
'attribute' => 'status',
'data' => \common\models\Status::getStatusesArray(\common\models\UseStatus::USE_COMPANY),
'options' => ['placeholder' => 'Начните вводить...','class' => 'form-control'],
'pluginOptions' => [
'allowClear' => true
],
]),
],
//'created_at',
//'updated_at',