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

fix project

Browse Source
This commit is contained in:
Kavalar 2018-11-23 16:14:28 +03:00
parent 25e922cd37
commit 553e3b885e
2 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
backend/modules/project/controllers/ProjectController.php
View File

@ -58,14 +58,18 @@ class ProjectController extends Controller
public function actionView($id)
{
$model = $this->findModel($id);
$hh = Hh::findOne($model->hh_id);
$jobsProvider = new ActiveDataProvider([
'query' => HhJob::find()->where(['employer_id' => $hh->hh_id]),
'pagination' => [
'pageSize' => 200,
],
]);
$jobsProvider = null;
if($model->hh_id){
$hh = Hh::findOne($model->hh_id);
$jobsProvider = new ActiveDataProvider([
'query' => HhJob::find()->where(['employer_id' => $hh->hh_id]),
'pagination' => [
'pageSize' => 200,
],
]);
}
$dataProvider = new ActiveDataProvider([
'query' => FieldsValue::find()->where(['project_id' => $id])->orderBy('order'),

44
backend/modules/project/views/project/view.php
View File

@ -43,7 +43,7 @@ $this->params['breadcrumbs'][] = $this->title;
<?= GridView::widget([
'dataProvider' => $modelFildValue,
'layout'=>"{items}",
'layout' => "{items}",
'columns' => [
'field.name:text:Поле',
'value',
@ -54,21 +54,21 @@ $this->params['breadcrumbs'][] = $this->title;
<?= GridView::widget([
'dataProvider' => $modelUser,
'layout'=>"{items}",
'layout' => "{items}",
'columns' => [
'card.fio:text:ФИО',
[
'class' => 'yii\grid\ActionColumn',
'template' => '{view} {update}',
'buttons' => [
'update' => function ($url,$model) {
'update' => function ($url, $model) {
return Html::a(
'<span class="glyphicon glyphicon-pencil"></span>',
['/card/user-card/update', 'id' => $model->id],
['target' => '_blank']
);
},
'view' => function ($url,$model) {
'view' => function ($url, $model) {
return Html::a(
'<span class="glyphicon glyphicon-eye-open"></span>',
['/card/user-card/view', 'id' => $model->id],
@ -81,24 +81,26 @@ $this->params['breadcrumbs'][] = $this->title;
],
]); ?>
<h2>Вакансии hh.ru</h2>
<?= GridView::widget([
'dataProvider' => $jobsProvider,
'columns' => [
['class' => 'yii\grid\SerialColumn'],
<?php if ($jobsProvider): ?>
<h2>Вакансии hh.ru</h2>
<?= GridView::widget([
'dataProvider' => $jobsProvider,
'columns' => [
['class' => 'yii\grid\SerialColumn'],
'title',
'url:url',
'salary_from',
'salary_to',
'salary_currency',
'address',
'dt_add:date',
'title',
'url:url',
'salary_from',
'salary_to',
'salary_currency',
'address',
'dt_add:date',
[
'class' => 'yii\grid\ActionColumn',
'template' => '{view} {delete}'
[
'class' => 'yii\grid\ActionColumn',
'template' => '{view} {delete}'
],
],
],
]); ?>
]); ?>
<?php endif; ?>
</div>