Commit b4142e17bb39c18e15350d54fec5d7fcaccb835f
1 parent
fd384984
test
Showing
5 changed files
with
64 additions
and
5 deletions
Show diff stats
frontend/controllers/AccountsController.php
@@ -404,6 +404,9 @@ | @@ -404,6 +404,9 @@ | ||
404 | */ | 404 | */ |
405 | public function actionGeneral() | 405 | public function actionGeneral() |
406 | { | 406 | { |
407 | + /** | ||
408 | + * @var User $user | ||
409 | + */ | ||
407 | $user = \Yii::$app->user->identity; | 410 | $user = \Yii::$app->user->identity; |
408 | $user_info = $user->userInfo; | 411 | $user_info = $user->userInfo; |
409 | $company_info = $user->companyInfo; | 412 | $company_info = $user->companyInfo; |
frontend/controllers/PerformerController.php
@@ -7,6 +7,7 @@ | @@ -7,6 +7,7 @@ | ||
7 | use common\models\Portfolio; | 7 | use common\models\Portfolio; |
8 | use common\models\PortfolioSpecialization; | 8 | use common\models\PortfolioSpecialization; |
9 | use Yii; | 9 | use Yii; |
10 | + use yii\data\ActiveDataProvider; | ||
10 | use yii\data\ArrayDataProvider; | 11 | use yii\data\ArrayDataProvider; |
11 | use yii\data\Pagination; | 12 | use yii\data\Pagination; |
12 | use yii\helpers\ArrayHelper; | 13 | use yii\helpers\ArrayHelper; |
@@ -179,6 +180,27 @@ | @@ -179,6 +180,27 @@ | ||
179 | ]); | 180 | ]); |
180 | } | 181 | } |
181 | 182 | ||
183 | + public function actionProjects($performer_id) | ||
184 | + { | ||
185 | + $user = User::findOne($performer_id); | ||
186 | + | ||
187 | + if(!$user instanceof User) { | ||
188 | + throw new BadRequestHttpException('Пользователь не найден'); | ||
189 | + } | ||
190 | + | ||
191 | + $dataProvider = new ActiveDataProvider([ | ||
192 | + 'query' => $user->getProjects(), | ||
193 | + 'pagination' => [ | ||
194 | + 'pageSize' => 10, | ||
195 | + ], | ||
196 | + ]); | ||
197 | + | ||
198 | + return $this->render('project-list', [ | ||
199 | + 'user' => $user, | ||
200 | + 'dataProvider' => $dataProvider, | ||
201 | + ]); | ||
202 | + } | ||
203 | + | ||
182 | public function actionBlogList($performer_id) | 204 | public function actionBlogList($performer_id) |
183 | { | 205 | { |
184 | $user = User::findOne($performer_id); | 206 | $user = User::findOne($performer_id); |
@@ -250,7 +272,10 @@ | @@ -250,7 +272,10 @@ | ||
250 | 272 | ||
251 | public function actionWorkplace($performer_id) | 273 | public function actionWorkplace($performer_id) |
252 | { | 274 | { |
253 | - $user = User::find()->where(['id' => $performer_id])->with('jobs')->one(); | 275 | + $user = User::find() |
276 | + ->where([ 'id' => $performer_id ]) | ||
277 | + ->with('jobs') | ||
278 | + ->one(); | ||
254 | if(!$user instanceof User) { | 279 | if(!$user instanceof User) { |
255 | throw new BadRequestHttpException('Пользователь не найден'); | 280 | throw new BadRequestHttpException('Пользователь не найден'); |
256 | } | 281 | } |
frontend/views/accounts/general.php
@@ -30,8 +30,7 @@ | @@ -30,8 +30,7 @@ | ||
30 | <?= $form->field($user_info, 'is_freelancer', [ 'template' => "{input}\n{label}\n{error}" ]) | 30 | <?= $form->field($user_info, 'is_freelancer', [ 'template' => "{input}\n{label}\n{error}" ]) |
31 | ->label('<span></span>Я - исполнитель') | 31 | ->label('<span></span>Я - исполнитель') |
32 | ->checkbox([ | 32 | ->checkbox([ |
33 | - 'class' => 'custom-check disabled admin-check', | ||
34 | - 'disabled' => 'disabled', | 33 | + 'class' => 'custom-check admin-check', |
35 | ], false); ?> | 34 | ], false); ?> |
36 | </div> | 35 | </div> |
37 | <div class="general-check-right"> | 36 | <div class="general-check-right"> |
@@ -44,8 +43,7 @@ | @@ -44,8 +43,7 @@ | ||
44 | <?= $form->field($user_info, 'is_customer', [ 'template' => "{input}\n{label}\n{error}" ]) | 43 | <?= $form->field($user_info, 'is_customer', [ 'template' => "{input}\n{label}\n{error}" ]) |
45 | ->label('<span></span>Я - заказчик') | 44 | ->label('<span></span>Я - заказчик') |
46 | ->checkbox([ | 45 | ->checkbox([ |
47 | - 'class' => 'custom-check disabled admin-check', | ||
48 | - 'disabled' => 'disabled', | 46 | + 'class' => 'custom-check admin-check', |
49 | ], false); ?> | 47 | ], false); ?> |
50 | </div> | 48 | </div> |
51 | <div class="general-check-right"> | 49 | <div class="general-check-right"> |
frontend/views/layouts/performer.php
@@ -72,6 +72,13 @@ | @@ -72,6 +72,13 @@ | ||
72 | ], | 72 | ], |
73 | ], | 73 | ], |
74 | [ | 74 | [ |
75 | + 'label' => 'Заказанные работы', | ||
76 | + 'url' => [ | ||
77 | + 'performer/projects', | ||
78 | + 'performer_id' => $this->params[ 'user' ]->id, | ||
79 | + ], | ||
80 | + ], | ||
81 | + [ | ||
75 | 'label' => 'Блог', | 82 | 'label' => 'Блог', |
76 | 'url' => [ | 83 | 'url' => [ |
77 | 'performer/blog-list', | 84 | 'performer/blog-list', |
1 | +<?php | ||
2 | + | ||
3 | + use common\models\User; | ||
4 | + use yii\data\ActiveDataProvider; | ||
5 | + use yii\helpers\ArrayHelper; | ||
6 | + use \yii\helpers\Html; | ||
7 | + use yii\widgets\ListView; | ||
8 | + | ||
9 | + /* @var yii\web\View $this | ||
10 | + * @var User $user | ||
11 | + * @var ActiveDataProvider $dataProvider | ||
12 | + */ | ||
13 | + $this->params[ 'user' ] = $user; | ||
14 | + | ||
15 | + $this->title = 'My Yii Application'; | ||
16 | +?> | ||
17 | +<div class="proektant-profile-content"> | ||
18 | + <div class="search-worker-title style">Сейчас <?= $dataProvider->totalCount ?> предложений</div> | ||
19 | + <div class="search-profile-blocks-wr style"> | ||
20 | + <?= ListView::widget([ | ||
21 | + 'dataProvider' => $dataProvider, | ||
22 | + 'itemView' => '@frontend/views/search/_projects_list_view', | ||
23 | + 'layout' => "{items}\n<div class='navi-buttons-wr style navi-buttons-yet-wr'>{pager}</div>", | ||
24 | + ]); ?> | ||
25 | + </div> | ||
26 | +</div> |