diff --git a/common/models/Message.php b/common/models/Message.php
index 5a008da..d60c5e8 100644
--- a/common/models/Message.php
+++ b/common/models/Message.php
@@ -89,8 +89,6 @@ class Message extends \yii\db\ActiveRecord
 
     }
 
-
-
     public function isMy(){
         if($this->user_id == \Yii::$app->user->id){
             return true;
diff --git a/common/models/TenderSearch.php b/common/models/TenderSearch.php
index 67941a5..df6cb04 100644
--- a/common/models/TenderSearch.php
+++ b/common/models/TenderSearch.php
@@ -66,6 +66,13 @@
                 ],
                 [
                     [
+                        'contractual',
+                    ],
+                    'default',
+                    'value' => 1,
+                ],
+                [
+                    [
                         'budget_currency',
                     ],
                     'default',
diff --git a/common/models/User.php b/common/models/User.php
index a632bf1..8e960dc 100755
--- a/common/models/User.php
+++ b/common/models/User.php
@@ -9,6 +9,7 @@
     use yii\behaviors\TimestampBehavior;
     use yii\db\ActiveQuery;
     use yii\db\ActiveRecord;
+    use yii\helpers\Url;
     use yii\rbac\ManagerInterface;
     use yii\rbac\Role;
     use yii\web\IdentityInterface;
@@ -28,6 +29,32 @@
      * @property string   $password write-only password
      * @property string   $type
      * @property UserInfo $userInfo
+     * @property string   $userName
+     * @property array[]  $roles
+     * @property CompanyInfo $companyInfo
+     * @property array[] $phones
+     * @property array[] $site
+     * @property string $address
+     * @property string $liveTime
+     * @property Payment[] $payments
+     * @property integer[] $paymentInput
+     * @property Specialization[] $specializations
+     * @property integer[] $specializationInput
+     * @property Blog[] $blog
+     * @property Job[] $jobs
+     * @property Job $currentJob
+     * @property Portfolio[] $portfolios
+     * @property Project[] $projects
+     * @property Team[] $teams
+     * @property Vacancy[] $vacancies
+     * @property Gallery[] $galleries
+     * @property UserInfo|CompanyInfo $owner
+     * @property string $name
+     * @property Comment[] $comments
+     * @property Rating[] $commentRating
+     * @property int $ratingPG
+     * @property string $lastVisit
+     * @property string $link
      */
     class User extends ActiveRecord implements IdentityInterface, UserRbacInterface
     {
@@ -51,8 +78,6 @@
             return '{{%user}}';
         }
 
-
-
         /**
          * @inheritdoc
          */
@@ -60,7 +85,7 @@
         {
             return [
                 [
-                    'class'              => 'common\behaviors\ShowImage',
+                    'class' => 'common\behaviors\ShowImage',
                 ],
                 TimestampBehavior::className(),
             ];
@@ -560,11 +585,21 @@
                         ->inverseOf('user');
         }
 
+        /**
+         * Return all user's galleries
+         *
+         * @return ActiveQuery
+         */
         public function getGalleries()
         {
             return $this->hasMany(Gallery::className(), [ 'user_id' => 'id' ]);
         }
 
+        /**
+         * Return company info or user info according to user type
+         *
+         * @return ActiveQuery
+         */
         public function getOwner()
         {
             if($this->type == 2) {
@@ -574,6 +609,11 @@
             }
         }
 
+        /**
+         * Return company name or user firstname and lastname according to user type
+         *
+         * @return string
+         */
         public function getName()
         {
             if($this->type == 2) {
@@ -584,6 +624,8 @@
         }
 
         /**
+         * Return all comments to user
+         *
          * @return ActiveQuery
          */
         public function getComments()
@@ -597,6 +639,8 @@
         }
 
         /**
+         * Return all ratings to user
+         *
          * @return ActiveQuery
          */
         public function getCommentRating()
@@ -608,6 +652,13 @@
                         ]);
         }
 
+        /**
+         * Return user's rating<br>
+         * <b>Available only for PostgreSQL</b>
+         *
+         * @return int
+         * @throws InvalidConfigException
+         */
         public function getRatingPG()
         {
             if(\Yii::$app->db->driverName != 'pgsql') {
@@ -622,6 +673,15 @@
                         ->scalar();
         }
 
+        /**
+         * Recalculate rating and write it to db.
+         *
+         * <b>Only for PostgreSQL</b>
+         *
+         * @see \common\models\User::getRatingPG()
+         *
+         * @throws InvalidConfigException
+         */
         public function updateRating()
         {
             if($rating = $this->getRatingPG()) {
@@ -630,4 +690,23 @@
             }
         }
 
+        public function getLastVisit()
+        {
+            return \Yii::$app->formatter->asRelativeTime($this->userInfo->date_visit);
+        }
+
+        /**
+         * Return link to user personal page according to user type
+         *
+         * @return string
+         */
+        public function getLink($page = 'common')
+        {
+            if($this->type == 2) {
+                return Url::to(['company/'.$page, 'company_id' => $this->id]);
+            } else {
+                return Url::to(['performer/'.$page, 'performer_id' => $this->id]);
+            }
+        }
+
     }
diff --git a/common/modules/comment/models/CommentProject.php b/common/modules/comment/models/CommentProject.php
index 7cc3793..635bb3d 100644
--- a/common/modules/comment/models/CommentProject.php
+++ b/common/modules/comment/models/CommentProject.php
@@ -3,26 +3,29 @@
 
     use common\models\Currency;
     use common\models\File;
+    use common\models\User;
     use yii\db\ActiveQuery;
+    use yii\db\ActiveRecord;
     use yii\web\UploadedFile;
 
     /**
      * Class Comment
-     * @property bool    $guestComment
-     * @property integer $comment_id
-     * @property string  $text
-     * @property int     $user_id
-     * @property int     $status
-     * @property string  $date_add
-     * @property string  $date_update
-     * @property string  $date_delete
-     * @property string  $model
-     * @property int     $model_id
-     * @property string $files
-     * @property float $budget_from
-     * @property float $budget_to
-     * @property int $term_from
-     * @property int $term_to
+     * @property bool     $guestComment
+     * @property integer  $comment_id
+     * @property string   $text
+     * @property int      $user_id
+     * @property int      $status
+     * @property string   $date_add
+     * @property string   $date_update
+     * @property string   $date_delete
+     * @property string   $model
+     * @property int      $model_id
+     * @property string   $files
+     * @property float    $budget_from
+     * @property float    $budget_to
+     * @property int      $term_from
+     * @property int      $term_to
+     * @property Currency $currency
      * @package common\modules\comment\models
      */
     class CommentProject extends \yii\db\ActiveRecord
@@ -42,6 +45,7 @@
          * @var bool
          */
         public $guestComment = false;
+
         public $file;
 
         public function rules()
@@ -84,7 +88,7 @@
                 [
                     [ 'budget_currency' ],
                     'exist',
-                    'targetClass' => Currency::className(),
+                    'targetClass'     => Currency::className(),
                     'targetAttribute' => 'currency_id',
                 ],
                 [
@@ -118,7 +122,7 @@
                     'term_to',
                     'file',
                 ],
-                self::SCENARIO_GUEST  => [
+                self::SCENARIO_GUEST => [
 
                 ],
             ];
@@ -150,11 +154,11 @@
         public function attributeLabels()
         {
             return [
-                'text'       => \Yii::t('app', 'Текст ответа'),
+                'text'        => \Yii::t('app', 'Текст ответа'),
                 'budget_from' => \Yii::t('app', 'от'),
-                'budget_to' => \Yii::t('app', 'до'),
-                'term_from' => \Yii::t('app', 'от'),
-                'term_to' => \Yii::t('app', 'до'),
+                'budget_to'   => \Yii::t('app', 'до'),
+                'term_from'   => \Yii::t('app', 'от'),
+                'term_to'     => \Yii::t('app', 'до'),
             ];
         }
 
@@ -163,10 +167,10 @@
             return $this->guestComment;
         }
 
-//        public function setGuestComment($value)
-//        {
-//            $this->guestComment = $value;
-//        }
+        //        public function setGuestComment($value)
+        //        {
+        //            $this->guestComment = $value;
+        //        }
 
         /**
          * @param string  $model
@@ -181,27 +185,28 @@
                             'comment_project.model'    => $model,
                             'comment_project.model_id' => $model_id,
                             'comment_project.status'   => 1,
-                        ]);
+                        ])
+                        ->with('currency', 'user', 'user.userInfo', 'user.companyInfo', 'user.comments');
         }
 
         public function postComment()
         {
             if($this->checkCreate()) {
-                if(!empty(\Yii::$app->request->post($this->formName())['anonymous'])) {
+                if(!empty( \Yii::$app->request->post($this->formName())[ 'anonymous' ] )) {
                     $this->status = self::STATUS_ANONYMOUS;
                 }
                 $this->file = UploadedFile::getInstances($this, 'file');
-                if(!empty($this->file)) {
-                    $file_id = [];
-                    if(is_array($this->file)){
-                        foreach($this->file as $file){
-                            if($file instanceof UploadedFile){
+                if(!empty( $this->file )) {
+                    $file_id = [ ];
+                    if(is_array($this->file)) {
+                        foreach($this->file as $file) {
+                            if($file instanceof UploadedFile) {
                                 $file_model = new File();
                                 $file_id[] = $file_model->saveFile($file);
                             }
                         }
                     } else {
-                        if($this->file instanceof UploadedFile){
+                        if($this->file instanceof UploadedFile) {
                             $file_model = new File();
                             $file_id[] = $file_model->saveFile($this->file);
                         }
@@ -325,4 +330,47 @@
             //            }
         }
 
+        /**
+         * @return ActiveQuery
+         */
+        public function getCurrency()
+        {
+            return $this->hasOne(Currency::className(), [ 'currency_id' => 'budget_currency' ]);
+        }
+
+        /**
+         * @return File[]
+         */
+        public function getFilesList()
+        {
+            $files = json_decode($this->files);
+            if(!empty( $files )) {
+                return File::findAll($files);
+            } else {
+                return [ ];
+            }
+        }
+
+        /**
+         * @return ActiveRecord
+         * @throws \TypeError
+         */
+        public function getOwner()
+        {
+            $model = new $this->model();
+            if($model instanceof ActiveRecord) {
+                return $model->findOne($this->model_id);
+            } else {
+                throw new \TypeError('Model must extends Active Record Class');
+            }
+        }
+
+        /**
+         * @return User
+         */
+        public function getUser()
+        {
+            return $this->hasOne(User::className(), ['id' => 'user_id']);
+        }
+
     }
diff --git a/common/modules/comment/widgets/views/_project_comment_view.php b/common/modules/comment/widgets/views/_project_comment_view.php
index 8e3c04f..1f68b07 100644
--- a/common/modules/comment/widgets/views/_project_comment_view.php
+++ b/common/modules/comment/widgets/views/_project_comment_view.php
@@ -10,13 +10,7 @@
      * @var \yii\widgets\ListView                         $widget current ListView instance
      * @var User                                          $user
      */
-    $user = NULL;
-    if(!empty( $model->user_id )) {
-        $user = User::find()
-                    ->where([ 'id' => $model->user_id ])
-                    ->with('userInfo')
-                    ->one();
-    }
+    $user = $model->user;
 ?>
 <div class="performer-vacancy-sidebar-left-wr">
     <div class="performer-vacancy-sidebar-left">
@@ -28,22 +22,22 @@
                 <ul>
                     <?php
                         if(!empty( $user->userInfo->social_fb )) {
-                            echo '<li>'.Html::a(Html::img('/images/ico-fb.png'), $user->userInfo->social_fb, ['target' => '_blank']).'</li>';
+                            echo '<li>' . Html::a(Html::img('/images/ico-fb.png'), $user->userInfo->social_fb, [ 'target' => '_blank' ]) . '</li>';
                         }
                     ?>
                     <?php
                         if(!empty( $user->userInfo->social_t )) {
-                            echo '<li>'.Html::a(Html::img('/images/ico-tw.png'), $user->userInfo->social_t, ['target' => '_blank']).'</li>';
+                            echo '<li>' . Html::a(Html::img('/images/ico-tw.png'), $user->userInfo->social_t, [ 'target' => '_blank' ]) . '</li>';
                         }
                     ?>
                     <?php
                         if(!empty( $user->userInfo->social_in )) {
-                            echo '<li>'.Html::a(Html::img('/images/ico-in.png'), $user->userInfo->social_in, ['target' => '_blank']).'</li>';
+                            echo '<li>' . Html::a(Html::img('/images/ico-in.png'), $user->userInfo->social_in, [ 'target' => '_blank' ]) . '</li>';
                         }
                     ?>
                     <?php
                         if(!empty( $user->userInfo->social_vk )) {
-                            echo '<li>'.Html::a(Html::img('/images/ico-vk.png'), $user->userInfo->social_vk, ['target' => '_blank']).'</li>';
+                            echo '<li>' . Html::a(Html::img('/images/ico-vk.png'), $user->userInfo->social_vk, [ 'target' => '_blank' ]) . '</li>';
                         }
                     ?>
                 </ul>
@@ -54,60 +48,62 @@
                         <div class="sidebarvievstxt"><?= $user->userInfo->view_count ?></div>
                     </li>
                     <li><img src="/images/sidebar-ico/ico-9.png" alt="">
-                        <div class="sidebarvievstxt"><span class="sidebar-views-txt">Статус: </span><?= (empty($user->userInfo->busy)?'Свободен':'Занят') ?>
+                        <div class="sidebarvievstxt">
+                            <span class="sidebar-views-txt">Статус: </span><?= ( empty( $user->userInfo->busy ) ? 'Свободен' : 'Занят' ) ?>
                         </div>
                     </li>
                     <li><img src="/images/sidebar-ico/ico-2.png" alt="">
                         <div class="sidebarvievstxt">
-                            <span class="sidebar-views-txt">На сайте: </span>1г. 8 мес.
+                            <span class="sidebar-views-txt">На сайте: </span><?= $user->liveTime ?>
                         </div>
                     </li>
                     <li><img src="/images/sidebar-ico/ico-3.png" alt="">
-                        <div class="sidebarvievstxt"><span class="sidebar-views-txt">Последний визит:<br></span>2 дня назад
+                        <div class="sidebarvievstxt"><span class="sidebar-views-txt">Последний визит:<br></span><?= $user->lastVisit ?>
                         </div>
                     </li>
                 </ul>
-                <a href="#" class="tender-see-profile style">Посмотреть профиль</a>
+                <?= Html::a('Посмотреть профиль', $user->link, [ 'class' => 'tender-see-profile style' ]) ?>
             </div>
         </div>
     </div>
 </div>
 <div class="tender-offer-proj-block-right-wr">
     <div class="tender-offer-proj-block-right">
-        <div class="tender-offer-proj-min-blocks"><span>2000 грн</span></div>
-        <div class="tender-offer-proj-min-blocks"><span>3 ДНЯ</span></div>
+        <div class="tender-offer-proj-min-blocks">
+            <span><?= $model->budget_from . '-' . $model->budget_to . ' ' . $model->currency->label ?></span>
+        </div>
+        <div class="tender-offer-proj-min-blocks">
+            <span><?= $model->term_from . '-' . $model->term_to ?> ДНЯ</span></div>
     </div>
     <div class="tender-offer-proj-block-left">
         <div class="search-worker-blocks-title-wr">
-            <div class="search-worker-blocks-title-title">Петер Цумтор</div>
+            <div class="search-worker-blocks-title-title"><?= $user->name ?></div>
             <div class="rating-new">
                 <!--оценка-->
-                <input type="hidden" class="val" value="4"/>
+                <input type="hidden" class="val" value="<?= $user->userInfo->rating ?>"/>
             </div>
-            <a href="#" class="link-to-comm">30 отзывов</a>
+            <?= Html::a(count($user->comments). ' отзывов', $user->getLink('review'), ['class' => 'link-to-comm']) ?>
         </div>
         <div class="tender-offer-proj-txt">
-            <p>1.1 Строительная площадка расположена по адресу: г. Киев.</p>
-            <p>1.2 Существующий объект представляет собой помещение общей площадью ориентировочно – 140 м2.</p>
-            <p>1.3. Цель проекта состоит в проведении внутренних общестроительных и отделочных работ.</p>
-            <p>1.4. При разработке методов строительства и выборе материалов, используемых в настоящем проекте, необходимо учитывать климатические условия, характерные для г. Киева.</p>
-            <p>1.5. Требования к проектированию и производству работ определяются следующими документами:</p>
-            <p>- Техническим заданием.</p>
-            <p>- Строительными нормами и правилами.</p>
-            <p>Все проектные решения и все разделы рабочего проекта должны быть согласованы с Заказчиком в объеме, необходимом для последующей сдачи инженерных систем и коммуникаций.</p>
+            <?= $model->text ?>
         </div>
         <ul class="download-list-files">
-            <li>
-                <span></span><a href="#" class="download-link-file">КП.doc</a><a href="#" class="download-link">Скачать</a>
-            </li>
-            <li>
-                <span></span><a href="#" class="download-link-file">Резюме.txt</a><a href="#" class="download-link">Скачать</a>
-            </li>
+            <?php
+                foreach($model->getFilesList() as $file) {
+                    ?>
+                    <li>
+                        <span></span>
+                        <?= Html::a($file->name, $file->dir, ['class' => 'download-link-file']) ?>
+                        <?= Html::a('Скачать', $file->dir, ['class' => 'download-link', 'download' => 'download']) ?>
+                    </li>
+                    <?php
+                }
+            ?>
         </ul>
     </div>
     <div class="tender-more-buttons-wr">
-        <a class="get-project-new" href="#">Портфолио</a>
-        <a class="get-list-new" href="#">Конаткты</a>
+        <?= Html::a('Портфолио', $user->getLink('portfolio'), ['class' => 'get-project-new']) ?>
+        <?= Html::a('Контакты', $user->link, ['class' => 'get-list-new']) ?>
     </div>
 
 </div>
diff --git a/common/modules/comment/widgets/views/list-project-comment.php b/common/modules/comment/widgets/views/list-project-comment.php
index f592675..ce045e5 100644
--- a/common/modules/comment/widgets/views/list-project-comment.php
+++ b/common/modules/comment/widgets/views/list-project-comment.php
@@ -5,7 +5,7 @@
 ?>
 <div class="box-wr">
     <div class="box-all">
-        <div class="tender-offer-proj-title-all style">Предложения проектантов</div>
+        <div class="tender-offer-proj-title-all style">Предложения проектантов (<?=$dataProvider->getTotalCount()?>)</div>
         <div class="tender-offer-proj-blocks-wr style">
             <?php
                 echo \yii\widgets\ListView::widget([
diff --git a/frontend/views/search/project.php b/frontend/views/search/project.php
index d4cf341..d665768 100755
--- a/frontend/views/search/project.php
+++ b/frontend/views/search/project.php
@@ -75,7 +75,7 @@
                             'options'  => [ 'class' => 'blocks-check-list' ],
                         ])
                                  ->label("<span></span>{$model->getAttributeLabel('contractual')}", ['class' => ''])
-                                 ->checkbox([ 'uncheck' => NULL ], false) ?>
+                                 ->checkbox([ ], false) ?>
                         <?= $form->field($model, 'payment', [ 'template' => "{input}\n{error}" ])
                                  ->checkboxList($payments, [
                                      'item' => function($index, $label, $name, $checked, $value) {
--
libgit2 0.21.4