test

Yarik
1 parent f94a00a6
Showing 6 changed files with 98 additions and 39 deletions Show diff stats
common/models/User.php
common/modules/comment/models/Comment.php
frontend/controllers/SearchController.php
frontend/views/search/_customer_list_view.php
frontend/views/search/customer.php
frontend/web/css/style.css
 <?php
     namespace common\models;
+    use common\modules\comment\models\Comment;
+    use common\modules\comment\models\Rating;
     use Yii;
+    use yii\base\InvalidConfigException;
     use yii\base\NotSupportedException;
     use yii\behaviors\TimestampBehavior;
     use yii\db\ActiveQuery;
@@ -13,17 +16,18 @@
     /**
      * User model
-     * @property integer $id
-     * @property string  $username
-     * @property string  $password_hash
-     * @property string  $password_reset_token
-     * @property string  $email
-     * @property string  $auth_key
-     * @property integer $status
-     * @property integer $created_at
-     * @property integer $updated_at
-     * @property string  $password write-only password
-     * @property string  $type
+     * @property integer  $id
+     * @property string   $username
+     * @property string   $password_hash
+     * @property string   $password_reset_token
+     * @property string   $email
+     * @property string   $auth_key
+     * @property integer  $status
+     * @property integer  $created_at
+     * @property integer  $updated_at
+     * @property string   $password write-only password
+     * @property string   $type
+     * @property UserInfo $userInfo
      */
     class User extends ActiveRecord implements IdentityInterface, UserRbacInterface
     {
@@ -57,9 +61,6 @@
             ];
         }
-
-
-
         /**
          * @inheritdoc
          */
@@ -93,7 +94,7 @@
                     [
                         'specializationInput',
                         'paymentInput',
-                        'type'
+                        'type',
                     ],
                     'safe',
                 ],
@@ -101,7 +102,7 @@
                     'type',
                     'default',
                     'value' => 1,
-                ]
+                ],
             ];
         }
@@ -112,8 +113,8 @@
         {
             return [
                 'firstname' => Yii::t('app', 'Имя'),
-                'lastname' => Yii::t('app', 'Фамилия'),
-                'email' => Yii::t('app', 'Email'),
+                'lastname'  => Yii::t('app', 'Фамилия'),
+                'email'     => Yii::t('app', 'Email'),
             ];
         }
@@ -348,7 +349,8 @@
          */
         public function getUserInfo()
         {
-            return $this->hasOne(UserInfo::className(), [ 'user_id' => 'id' ])->inverseOf('user');
+            return $this->hasOne(UserInfo::className(), [ 'user_id' => 'id' ])
+                        ->inverseOf('user');
         }
         /**
@@ -408,11 +410,11 @@
             $date1 = new \DateTime(date('Y-m-d H:i:s', $this->created_at));
             $result = explode(',', \Yii::$app->formatter->asDuration($date1->diff($now)));
-            if($result >= 4){
+            if($result >= 4) {
                 array_splice($result, 2);
             }
-            return implode(',',$result);
+            return implode(',', $result);
         }
         /**
@@ -549,7 +551,8 @@
          */
         public function getVacancies()
         {
-            return $this->hasMany(Vacancy::className(), [ 'user_id' => 'id' ])->inverseOf('user');
+            return $this->hasMany(Vacancy::className(), [ 'user_id' => 'id' ])
+                        ->inverseOf('user');
         }
         public function getGalleries()
@@ -559,22 +562,44 @@
         public function getOwner()
         {
-            if($this->type == 1){
-                return $this->hasOne(UserInfo::className(), [ 'user_id' => 'id' ]);
-            } else if($this->type == 2) {
+            if($this->type == 2) {
                 return $this->hasOne(CompanyInfo::className(), [ 'user_id' => 'id' ]);
+            } else {
+                return $this->hasOne(UserInfo::className(), [ 'user_id' => 'id' ]);
             }
-
         }
-        public function getName(){
-            if($this->type == 1){
-                return $this->firstname. ' '.$this->lastname;
-            } else if($this->type == 2){
+        public function getName()
+        {
+            if($this->type == 2) {
                 return $this->companyInfo->name;
+            } else {
+                return $this->firstname . ' ' . $this->lastname;
             }
+        }
+        public function getComments()
+        {
+            $entity = 'user-' . $this->id;
+            $comments = (new Comment())->getComments($entity);
+            return $comments;
         }
+        public function getRatingPG()
+        {
+            if(\Yii::$app->db->driverName != 'pgsql') {
+                throw new InvalidConfigException('This method is available only in PostgreSQL');
+            }
+            $entity = 'user-' . $this->id;
+            $rating = (new Comment())->getComments($entity)
+                                     ->select('ROUND(SUM("rating"."value")/COUNT("rating"."rating_id")::float) as rating')
+                                     ->leftJoin(Rating::tableName(), "CONCAT('Comment-', \"comment\".\"comment_id\") = \"rating\".\"entity\"")
+                                     ->andWhere([
+                                         'not',
+                                         [ 'rating.value' => NULL ],
+                                     ])
+                                     ->one();
+            return $rating;
+        }
     }
 <?php
     namespace common\modules\comment\models;
+    use yii\db\ActiveQuery;
+
     /**
      * Class Comment
      * @property bool    $guestComment
@@ -19,6 +21,8 @@
         const SCENARIO_USER = 'user';
         const SCENARIO_GUEST = 'guest';
+        public $rating;
+
         /**
          * @var bool
          */
@@ -130,12 +134,17 @@
             $this->guestComment = $value;
         }
+        /**
+         * @param string $entity
+         *
+         * @return ActiveQuery
+         */
         public function getComments($entity)
         {
             return $this->find()
                         ->where([
-                            'entity' => $this->entity,
-                            'status' => 1,
+                            'comment.entity' => $entity,
+                            'comment.status' => 1,
                         ]);
         }
@@ -71,6 +71,9 @@ class SearchController extends Controller
     public function actionCustomer(){
         $model = new CustomerSearch();
         $dataProvider = $model->search(Yii::$app->request->queryParams);
+        $dataProvider->setPagination([
+            'pageSize' => 5
+        ]);
         $dataProvider->setSort([
             'attributes' => [
                 'name' => [
@@ -5,30 +5,37 @@
      * @var integer  $index
      * @var ListView $widget
      */
+    use common\models\Project;
     use common\models\User;
     use frontend\helpers\TextHelper;
     use yii\bootstrap\Html;
     use yii\helpers\Url;
     use yii\widgets\ListView;
-
 ?>
 <div class="search_perform_txt-wr">
     <div class="search_perform_title">
         <?php
             if($model->type == 2) {
-                echo $model->companyInfo->name;
+                echo Html::a($model->companyInfo->name, ['company/common', 'company_id' => $model->id]);
             } else {
-                echo $model->firstname . $model->lastname;
+                echo Html::a($model->firstname . $model->lastname, ['performer/common', 'performer_id' => $model->id]);
             }
         ?>
     </div>
     <div class="search_perform-stars-wr">
         <div class="rating_search_performer">
             <!--оценка-->
+            <?php
+            if($rating = $model->getRatingPG()->rating) {
+                echo "<input type='hidden' class='val' value='{$rating}'/>";
+            } else {
+                echo "<input type='hidden' class='val' value='0'/>";
+            }
+            ?>
             <input type="hidden" class="val" value="4"/>
         </div>
         <div class="search_perform-stars-txt">
-            30 отзывов
+            <?= $model->getComments()->count() ?> отзывов
             <?php
                 if(!empty( $model->userInfo->city )) {
                     echo ", {$model->userInfo->city}";
@@ -49,12 +56,17 @@
         <span>Послелний визит:</span> <?= \Yii::$app->formatter->asRelativeTime($model->userInfo->date_visit) ?>
     </div>
     <div class="search_perform_projets_nam">
-        <a href="#">Заказано проектов: 21</a></div>
+        <?= Html::a("Заказано проектов {$model->getProjects()->count()}", ['search/project', (new Project())->formName().'[user_id]' => $model->id]) ?>
+    </div>
 </div>
 <div class="right_search_perform_block-wr">
     <div class="right_search_perform_foto-wr">
-        <div><img src="/images/search_performer_img-1.jpg" alt=""/></div>
+        <div>
+            <?php
+            echo Html::img($model->userInfo->image?:"/images/search_performer_img-1.jpg", ['class' => 'search_customer_image']);
+            ?>
+        </div>
     </div>
     <a class="get-list" href="#">Добавить в закладки</a>
 </div>
 \ No newline at end of file
@@ -135,6 +135,9 @@
                     'itemView' => '_customer_list_view',
                 ]);
                 ?>
+                <?php
+                /* == Layout ==
+                ?>
                 <div class="search-worker-blocks-wr style">
                     <div class="search-worker-blocks">
@@ -259,6 +262,10 @@
                     </ul>
                 </div>
+                <?php
+                == End of layout == */
+                ?>
+
                 <script>
                     $('div.rating_search_performer').rating(
                         {
@@ -6677,4 +6677,7 @@ input[disabled], select[disabled] {
 }
 .form_site_logn-wr input.custom-check + label span {margin-top: 1px; margin-right: 6px}
 .callback .input-blocks-wrapper {margin-top: 0}
-.list_item.title {margin-top: 20px}
 \ No newline at end of file
+.list_item.title {margin-top: 20px}
+.search_customer_image {
+    height: 100%;
+}
 \ No newline at end of file