From f389cee65b3db6e9775c46dbf4a1b0ead516d7d4 Mon Sep 17 00:00:00 2001
From: Yarik <kingofdusk@gmail.com>
Date: Mon, 15 Feb 2016 15:50:51 +0200
Subject: [PATCH] test

---
 common/models/Vacancy.php                  |  5 +++++
 frontend/controllers/CompanyController.php | 22 +++++++++++++++++++---
 frontend/views/company/vacancy-list.php    | 41 +++++++++++++++++++++++++++++++++++++----
 frontend/views/company/vacancy-view.php    | 55 +++++++++++++++++++++++++++++++++++++++++--------------
 4 files changed, 102 insertions(+), 21 deletions(-)

diff --git a/common/models/Vacancy.php b/common/models/Vacancy.php
index ace7c51..2f899f5 100644
--- a/common/models/Vacancy.php
+++ b/common/models/Vacancy.php
@@ -135,4 +135,9 @@
             $this->employmentInput = $value;
         }
 
+        public function getRequirements()
+        {
+            return Fields::getData($this->vacancy_id, Vacancy::className(), 'requirements');
+        }
+
     }
diff --git a/frontend/controllers/CompanyController.php b/frontend/controllers/CompanyController.php
index 377b38b..2234130 100755
--- a/frontend/controllers/CompanyController.php
+++ b/frontend/controllers/CompanyController.php
@@ -11,6 +11,7 @@ use frontend\models\ContactForm;
 use frontend\models\Options;
 use frontend\models\OptionValues;
 use yii\base\InvalidParamException;
+use yii\data\ActiveDataProvider;
 use yii\helpers\ArrayHelper;
 use yii\web\BadRequestHttpException;
 use yii\web\Controller;
@@ -121,19 +122,34 @@ class CompanyController extends Controller
     public function actionVacancyList($company_id)
     {
         $company = User::findOne($company_id);
-        $vacancies = $company->vacancies;
+        $query = $company->getVacancies();
+        $provider = new ActiveDataProvider([
+            'query' => $query,
+            'pagination' => [
+                'pageSize' => 2,
+            ],
+            'sort' => [
+                'defaultOrder' => [
+                    'date_add' => SORT_DESC,
+                    'name' => SORT_ASC,
+                ]
+            ],
+        ]);
 
         return $this->render('vacancy-list',[
-            'company' => $company
+            'company' => $company,
+            'provider' => $provider,
         ]);
     }
 
     public function actionVacancyView($company_id, $vacancy_id)
     {
         $company = User::findOne($company_id);
+        $vacancy = $company->getVacancies()->where(['vacancy_id' => $vacancy_id])->with(['employments'])->one();
 
         return $this->render('vacancy-view',[
-            'company' => $company
+            'company' => $company,
+            'vacancy' => $vacancy,
         ]);
     }
 
diff --git a/frontend/views/company/vacancy-list.php b/frontend/views/company/vacancy-list.php
index a1f74a1..015cccc 100755
--- a/frontend/views/company/vacancy-list.php
+++ b/frontend/views/company/vacancy-list.php
@@ -1,12 +1,43 @@
 <?php
+    /**
+     * @var User $company
+     * @var ActiveDataProvider $provider
+     */
+    use common\models\User;
+    use yii\data\ActiveDataProvider;
+    use yii\helpers\Html;
+    use yii\helpers\StringHelper;
+    use yii\widgets\ListView;
 
-use \yii\helpers\Html;
-
-/* @var $this yii\web\View */
+    /* @var $this yii\web\View */
 $this->params['company'] = $company;
 $this->title = 'My Yii Application';
 ?>
 <div class="performer-vacancy-vacant-title style">Вакансии</div>
+<?php
+echo ListView::widget([
+    'dataProvider' => $provider,
+    'itemView' => function($model, $key, $index, $widget) {
+        $html =
+            '<div class="performer-vacant-reclam-bl">'
+                . Html::a($model->name, ['vacancy-view', 'company_id' => $model->user_id,'vacancy_id' => $model->vacancy_id], ['class' => 'performer-vacant-reclam-bl-title']) .
+                '<div class="performer-vacant-reclam-bl-title-two">' . $model->city . '. ' . $model->date_add . ' xxxx грн.</div>
+                <div class="performer-vacant-reclam-bl-content">
+                    <span>' . StringHelper::truncateWords($model->description, 50, '...') . '</span>'
+                    . Html::a('<img src="/images/performar_vacancy/arrow-post.png" alt=""/>', ['vacancy-view', 'company_id' => $model->user_id,'vacancy_id' => $model->vacancy_id], ['class' => 'performer-vacant-reclam-bl-content-read']) .
+                    '
+                </div>
+            </div>';
+        return $html;
+    },
+    'options' => [
+        'class' => 'list-view performer-vacancy-vacant-title-reclam-wr style',
+    ],
+]);
+?>
+
+<?php
+/*    Markup
 <div class="performer-vacancy-vacant-title-reclam-wr style">
     <div class="performer-vacant-reclam-bl">
         <a href="#" class="performer-vacant-reclam-bl-title">Инженер-технолог строитель</a>
@@ -109,4 +140,6 @@ $this->title = 'My Yii Application';
         <li class="dots-next"><a href="#">...</a></li>
         <li><a href="#">156</a></li>
     </ul>
-</div>
\ No newline at end of file
+</div>
+*/
+?>
\ No newline at end of file
diff --git a/frontend/views/company/vacancy-view.php b/frontend/views/company/vacancy-view.php
index 8718e4b..3a90deb 100755
--- a/frontend/views/company/vacancy-view.php
+++ b/frontend/views/company/vacancy-view.php
@@ -1,29 +1,56 @@
 <?php
+    /**
+     * @var $this yii\web\View
+     * @var User $company
+     * @var Vacancy $vacancy
+     */
 
-use \yii\helpers\Html;
+    use common\models\User;
+    use common\models\Vacancy;
+    use yii\helpers\ArrayHelper;
+    use yii\helpers\Html;
 
-/* @var $this yii\web\View */
-$this->params['company'] = $company;
+    $this->params[ 'company'] = $company;
 $this->title = 'My Yii Application';
 ?>
-<div class="performer-vacancy-list style"><a href="#" >к списку вакансий</a></div>
+<div class="performer-vacancy-list style">
+    <?php
+    echo Html::a('к списку вакансий', ['vacancy-list', 'company_id' => $company->id]);
+    ?>
+</div>
 <div class="performer-vacancy-blocks-desk-wr style">
-    <div class="performer-vacancy-date style"> Вакансия от 17.11.2015 </div>
-    <div class="performance-vacancy-page-title style">Инженер-технолог строитель</div>
+    <div class="performer-vacancy-date style"> Вакансия от <?= $vacancy->date_add ?> </div>
+    <div class="performance-vacancy-page-title style"><?= $vacancy->name ?></div>
     <div class="performance-vacancy-page-options style">
         <ul>
-            <li><span>Контактное лицо:</span><p>Владимир</p></li>
-            <li><span>Телефон:</span><p>096 345-23-42</p></li>
-            <li><span>Город:</span><p>Бровары, ищем в Киеве</p></li>
-            <li><span>Вид занятости:</span><p>полная занятость</p></li>
-            <li><span>Требования:</span><p>опыт работы от 2 лет, высшее образование</p></li>
+            <?php
+            if(!empty($vacancy->user_name)) {
+                echo "<li><span>Контактное лицо:</span><p>{$vacancy->user_name}</p></li>";
+            }
+            ?>
+            <li><span>Телефон:</span><p>XXX XXX-XX-XX</p></li>
+            <?php
+                if(!empty($vacancy->city)) {
+                    echo "<li><span>Город:</span><p>{$vacancy->city}</p></li>";
+                }
+            ?>
+            <?php
+                if(!empty($vacancy->employments)) {
+                    echo "<li><span>Вид занятости:</span><p>".implode(', ', ArrayHelper::getColumn($vacancy->employments, 'name'))."</p></li>";
+                }
+            ?>
+            <?php
+                if(!empty($vacancy->requirements)) {
+                    echo "<li><span>Требования:</span><p>".implode(', ', ArrayHelper::getColumn($vacancy->requirements, 'requirements'))."</p></li>";
+                }
+            ?>
         </ul>
     </div>
     <div class="performance-vacancy-description style">Описание вакансии</div>
     <div class="performance-vacancy-desc-txt style">
-        <p>Требования: Инженер технолог строитель. Образование инженер-строитель. Доскональное знание технологиии строительных работ.</p>
-        <p>Условия работы: Работа в офисе и командировки на стройки.</p>
-        <p>Обязанности: Составление технологических карт, Ведение обучения технологии выполнения общестроительных и отделочных работ. Контроль.качества выполнения строительных работ. Работа с рекламациями. Работа с проектными организациями.</p>
+        <?php
+        echo $vacancy->description;
+        ?>
     </div>
     <div class="performance-vacancy-desc-form style">
         <a href="#">Отправить резюме</a>
--
libgit2 0.21.4