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

Merge pull request #8 from apuc/change_profile

Browse Source 
Change profile
This commit is contained in:
kavalar 2019-07-03 18:30:54 +03:00 committed by GitHub
commit 288173d233
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/modules/card/views/user-card/_additional.php
View File

@ -1 +0,0 @@
<?= $model->skill->name; ?>

15
backend/modules/card/views/user-card/index.php
View File

@ -61,14 +61,13 @@ $this->params['breadcrumbs'][] = $this->title;
'label' => 'Навыки', 'label' => 'Навыки',
'format' => 'raw', 'format' => 'raw',
'value' => function($model){ 'value' => function($model){
$dataProvider = new \yii\data\ActiveDataProvider([ $str = '';
'query' => $model->getSkillValues(), foreach ($model->skillValues as $item)
]); {
return ListView::widget([ $str .= $item->skill->name . ', ';
'dataProvider' => $dataProvider, }
'itemView' => '_additional', $str = substr( $str, 0, -2);
'layout' => "{items}", return $str;
]);
}, },
'filter' => kartik\select2\Select2::widget([ 'filter' => kartik\select2\Select2::widget([
'attribute' => 'skills', 'attribute' => 'skills',

4
backend/modules/project/models/ProjectSearch.php
View File

@ -2,7 +2,6 @@
namespace backend\modules\project\models; namespace backend\modules\project\models;
use common\classes\Debug;
use Yii; use Yii;
use yii\base\Model; use yii\base\Model;
use yii\data\ActiveDataProvider; use yii\data\ActiveDataProvider;
@ -19,7 +18,7 @@ class ProjectSearch extends Project
public function rules() public function rules()
{ {
return [ return [
[['id'], 'integer'], [['id','status'], 'integer'],
[['name', 'description', 'created_at', 'updated_at'], 'safe'], [['name', 'description', 'created_at', 'updated_at'], 'safe'],
]; ];
} }
@ -61,6 +60,7 @@ class ProjectSearch extends Project
// grid filtering conditions // grid filtering conditions
$query->andFilterWhere([ $query->andFilterWhere([
'id' => $this->id, 'id' => $this->id,
'status' => $this->status,
'created_at' => $this->created_at, 'created_at' => $this->created_at,
'updated_at' => $this->updated_at, 'updated_at' => $this->updated_at,
]); ]);

9
backend/views/layouts/left.php
View File

@ -6,6 +6,11 @@
foreach($userStatuses as $key => $status){ foreach($userStatuses as $key => $status){
$menuItems[] = ['label' => $status, 'icon' => 'user', 'url' => ['/card/user-card?UserCardSearch[status]=' . $key]]; $menuItems[] = ['label' => $status, 'icon' => 'user', 'url' => ['/card/user-card?UserCardSearch[status]=' . $key]];
} }
$projectStatuses = \common\models\Status::getStatusesArray(\common\models\UseStatus::USE_PROJECT);
$projectItems = [['label' => 'Все', 'icon' => 'files-o', 'url' => ['/project/project']]];
foreach($projectStatuses as $key => $status){
$projectItems[] = ['label' => $status, 'icon' => 'user', 'url' => ['/project/project?ProjectSearch[status]=' . $key]];
}
?> ?>
<?= dmstr\widgets\Menu::widget( <?= dmstr\widgets\Menu::widget(
@ -25,7 +30,9 @@
'label' => 'Профили', 'icon' => 'users', 'url' => '#', 'label' => 'Профили', 'icon' => 'users', 'url' => '#',
'items' => $menuItems, 'items' => $menuItems,
], ],
['label' => 'Проекты', 'icon' => 'files-o', 'url' => ['/project/project']], [ 'label' => 'Проекты', 'icon' => 'files-o', 'url' => ['#'],
'items' => $projectItems,
],
['label' => 'Компании', 'icon' => 'files-o', 'url' => ['/company/company']], ['label' => 'Компании', 'icon' => 'files-o', 'url' => ['/company/company']],
[ [
'label' => 'Hh.ru', 'icon' => 'user-circle', 'url' => '#', 'label' => 'Hh.ru', 'icon' => 'user-circle', 'url' => '#',