Commit e556dca537901d69cc60a76fa3acc9e8cdb3d274
1 parent
67490c2d
Importers CRUD
Showing
3 changed files
with
35 additions
and
12 deletions
Show diff stats
backend/views/art-history/index.php
@@ -26,10 +26,14 @@ $this->params['breadcrumbs'][] = $this->title; | @@ -26,10 +26,14 @@ $this->params['breadcrumbs'][] = $this->title; | ||
26 | 'filterModel' => $searchModel, | 26 | 'filterModel' => $searchModel, |
27 | 'columns' => [ | 27 | 'columns' => [ |
28 | ['class' => 'yii\grid\SerialColumn'], | 28 | ['class' => 'yii\grid\SerialColumn'], |
29 | - 'dt', | ||
30 | 'user_id', | 29 | 'user_id', |
31 | - 'accounts.name', | 30 | + [ |
31 | + 'attribute' => 'name', | ||
32 | + 'value' => 'name', | ||
33 | + | ||
34 | + ], | ||
32 | 'art', | 35 | 'art', |
36 | + 'dt', | ||
33 | ['class' => 'yii\grid\ActionColumn'], | 37 | ['class' => 'yii\grid\ActionColumn'], |
34 | ], | 38 | ], |
35 | ]); ?> | 39 | ]); ?> |
common/models/ArtHistory.php
@@ -14,6 +14,8 @@ use Yii; | @@ -14,6 +14,8 @@ use Yii; | ||
14 | */ | 14 | */ |
15 | class ArtHistory extends \yii\db\ActiveRecord | 15 | class ArtHistory extends \yii\db\ActiveRecord |
16 | { | 16 | { |
17 | + | ||
18 | + public $name; | ||
17 | /** | 19 | /** |
18 | * @inheritdoc | 20 | * @inheritdoc |
19 | */ | 21 | */ |
@@ -30,7 +32,7 @@ class ArtHistory extends \yii\db\ActiveRecord | @@ -30,7 +32,7 @@ class ArtHistory extends \yii\db\ActiveRecord | ||
30 | return [ | 32 | return [ |
31 | [['user_id', 'art', 'dt'], 'required'], | 33 | [['user_id', 'art', 'dt'], 'required'], |
32 | [['user_id'], 'integer'], | 34 | [['user_id'], 'integer'], |
33 | - [['art'], 'string', 'max' => 100], | 35 | + [['art','name'], 'string', 'max' => 100], |
34 | [['dt'], 'string', 'max' => 15], | 36 | [['dt'], 'string', 'max' => 15], |
35 | [['user_id', 'art'], 'unique', 'targetAttribute' => ['user_id', 'art'], 'message' => 'The combination of User ID and Art has already been taken.'] | 37 | [['user_id', 'art'], 'unique', 'targetAttribute' => ['user_id', 'art'], 'message' => 'The combination of User ID and Art has already been taken.'] |
36 | ]; | 38 | ]; |
@@ -43,15 +45,20 @@ class ArtHistory extends \yii\db\ActiveRecord | @@ -43,15 +45,20 @@ class ArtHistory extends \yii\db\ActiveRecord | ||
43 | { | 45 | { |
44 | return [ | 46 | return [ |
45 | 'id' => 'ID', | 47 | 'id' => 'ID', |
46 | - 'user_id' => 'User ID', | ||
47 | - 'art' => 'Art', | ||
48 | - 'dt' => 'Dt', | 48 | + 'user_id' => '№', |
49 | + 'art' => 'Нмер', | ||
50 | + 'dt' => 'Дата', | ||
51 | + 'name' => 'Клиент' | ||
49 | ]; | 52 | ]; |
50 | } | 53 | } |
51 | 54 | ||
52 | 55 | ||
53 | - public function getAccounts() | ||
54 | - { | ||
55 | - return $this->hasOne(Accounts::className(), ['id' => 'user_id']); | 56 | +// public function getAccounts() |
57 | +// { | ||
58 | +// return $this->hasOne(Accounts::className(), ['id' => 'user_id']); | ||
59 | +// } | ||
60 | + | ||
61 | + public function getName(){ | ||
62 | + return $this->user_id.'11111111'; | ||
56 | } | 63 | } |
57 | } | 64 | } |
common/models/ArtHistorySearch.php
@@ -12,6 +12,7 @@ use common\models\ArtHistory; | @@ -12,6 +12,7 @@ use common\models\ArtHistory; | ||
12 | */ | 12 | */ |
13 | class ArtHistorySearch extends ArtHistory | 13 | class ArtHistorySearch extends ArtHistory |
14 | { | 14 | { |
15 | + | ||
15 | /** | 16 | /** |
16 | * @inheritdoc | 17 | * @inheritdoc |
17 | */ | 18 | */ |
@@ -19,7 +20,7 @@ class ArtHistorySearch extends ArtHistory | @@ -19,7 +20,7 @@ class ArtHistorySearch extends ArtHistory | ||
19 | { | 20 | { |
20 | return [ | 21 | return [ |
21 | [['id', 'user_id'], 'integer'], | 22 | [['id', 'user_id'], 'integer'], |
22 | - [['art', 'dt'], 'safe'], | 23 | + [['art', 'dt', 'name'], 'safe'], |
23 | ]; | 24 | ]; |
24 | } | 25 | } |
25 | 26 | ||
@@ -46,7 +47,17 @@ class ArtHistorySearch extends ArtHistory | @@ -46,7 +47,17 @@ class ArtHistorySearch extends ArtHistory | ||
46 | $dataProvider = new ActiveDataProvider([ | 47 | $dataProvider = new ActiveDataProvider([ |
47 | 'query' => $query, | 48 | 'query' => $query, |
48 | ]); | 49 | ]); |
49 | - | 50 | + $dataProvider->setSort([ |
51 | + 'attributes' => [ | ||
52 | + 'id', | ||
53 | + 'user_id', | ||
54 | + 'art', | ||
55 | + 'dt', | ||
56 | + 'name' => [ | ||
57 | + 'default' => SORT_ASC | ||
58 | + ] | ||
59 | + ] | ||
60 | + ]); | ||
50 | $this->load($params); | 61 | $this->load($params); |
51 | 62 | ||
52 | if (!$this->validate()) { | 63 | if (!$this->validate()) { |
@@ -54,6 +65,7 @@ class ArtHistorySearch extends ArtHistory | @@ -54,6 +65,7 @@ class ArtHistorySearch extends ArtHistory | ||
54 | // $query->where('0=1'); | 65 | // $query->where('0=1'); |
55 | return $dataProvider; | 66 | return $dataProvider; |
56 | } | 67 | } |
68 | + $query->joinWith(['accounts']); | ||
57 | 69 | ||
58 | $query->andFilterWhere([ | 70 | $query->andFilterWhere([ |
59 | 'id' => $this->id, | 71 | 'id' => $this->id, |
@@ -62,7 +74,7 @@ class ArtHistorySearch extends ArtHistory | @@ -62,7 +74,7 @@ class ArtHistorySearch extends ArtHistory | ||
62 | 74 | ||
63 | $query->andFilterWhere(['like', 'art', $this->art]) | 75 | $query->andFilterWhere(['like', 'art', $this->art]) |
64 | ->andFilterWhere(['like', 'dt', $this->dt]); | 76 | ->andFilterWhere(['like', 'dt', $this->dt]); |
65 | - | 77 | + //$query->andFilterWhere(['like', Accounts::tableName().'.name', $this->name]); |
66 | return $dataProvider; | 78 | return $dataProvider; |
67 | } | 79 | } |
68 | } | 80 | } |