test

Yarik
1 parent 1b09a6ee
Showing 7 changed files with 94 additions and 26 deletions Show diff stats
common/models/Portfolio.php
common/modules/comment/widgets/views/form-comment.php
common/modules/comment/widgets/views/project_comment_view.php
frontend/views/performer/_portfolio_list_view.php
frontend/views/performer/portfolio-view.php
frontend/views/performer/portfolio.php
frontend/web/css/style.css
@@ -2,9 +2,12 @@
     namespace common\models;
+    use common\modules\comment\models\Comment;
+    use common\modules\comment\models\Rating;
     use Yii;
     use yii\behaviors\BlameableBehavior;
     use yii\behaviors\TimestampBehavior;
+    use yii\db\ActiveQuery;
     use yii\db\Expression;
     /**
@@ -26,6 +29,9 @@
      * @property PortfolioSpecialization[] $portfolioSpecializations
      * @property Specialization[]          $specializations
      * @property User                      $user
+     * @property Comment[]                 $comment
+     * @property Rating[]                  $rating
+     * @property string                    $ratingValue
      */
     class Portfolio extends \yii\db\ActiveRecord
     {
@@ -199,4 +205,37 @@
         {
             return $this->hasOne(User::className(), [ 'id' => 'user_id' ]);
         }
+
+        /**
+         * @return ActiveQuery
+         */
+        public function getComments()
+        {
+            return $this->hasMany(Comment::className(), [ 'model_id' => 'portfolio_id' ])
+                        ->andWhere([ 'comment.model' => $this->className(), 'comment.status' => Comment::STATUS_ACTIVE ]);
+        }
+
+        /**
+         * @return ActiveQuery
+         */
+        public function getRating()
+        {
+            return $this->hasMany(Rating::className(), [ 'model_id' => 'comment_id' ])
+                        ->via('comments')
+                        ->andWhere([
+                            'not',
+                            [ 'rating.value' => NULL ],
+                        ]);
+        }
+
+        /**
+         * @return string
+         */
+        public function getRatingValue()
+        {
+            return $this->getRating()
+                        ->asArray()
+                        ->select([ 'sum' => 'ROUND(SUM(rating.value)/COUNT(rating.value)::numeric, 1)' ])
+                        ->scalar();
+        }
     }
@@ -5,6 +5,7 @@
      * @var \yii\data\ActiveDataProvider               $dataProvider
      * @var null|\common\modules\comment\models\Rating $rating
      */
+    use kartik\rating\StarRating;
     use yii\widgets\ActiveForm;
     use yii\helpers\Html;
@@ -15,16 +16,16 @@
     <?php
         $form = ActiveForm::begin();
-
-        echo $form->field($rating, 'value')
-                  ->label(false)
-                  ->radioList([
-                      1 => 1,
-                      2 => 2,
-                      3 => 3,
-                      4 => 4,
-                      5 => 5,
-                  ]);
+        if($rating) {
+            echo $form->field(( !empty( $model->rating ) ? $model->rating : $rating ), 'value')
+                      ->label(false)
+                      ->widget(StarRating::className(), [ 'pluginOptions' => [ 'size'        => 'xxs',
+                                                                               'step'        => 1,
+                                                                               'value'       => 2,
+                                                                               'showCaption' => false,
+                      ],
+                      ]);
+        }
         if($model->scenario == $model::SCENARIO_GUEST) {
             echo $form->field($model, 'user_name', [
@@ -44,7 +45,8 @@
                     'class' => 'custom-input-4',
                 ],
             ])
-                      ->textInput();
+                      ->textInput()
+                      ->hint('Ваш email не будет доступен к просмотру.');
         }
     ?>
 <?php
     use common\models\User;
+    use common\modules\comment\widgets\CommentWidget;
     use kartik\rating\StarRating;
     use yii\helpers\Html;
@@ -18,8 +19,9 @@
                     ->with('userInfo')
                     ->one();
     }
+    $model->buildButtons(['delete']);
 ?>
-<div class="new-portf-comm-read artbox_comment_container" data-comment_id="<?= $model->comment_id ?>" data-form_name="<?= $model->formName() ?>">
+<div class="new-portf-comm-read artbox_comment_container" data-key="<?= $model->comment_id ?>" data-form="<?= $model->formName() ?>">
     <div class="style">
         <div class="header-cabinet-foto">
             <?php
@@ -64,6 +66,19 @@
             <?= Html::encode($model->text) ?>
         </div>
         <div style="clear:both"></div>
+        <div>
+            <?php
+                if(!empty( $model->buttons[ 'delete' ] )) {
+                    echo Html::a(($model->user_id != NULL && $model->user_id == \Yii::$app->user->id)?'Удалить':'Пожаловаться   ', $model->buttons[ 'delete' ], [ 'class' => CommentWidget::$baseClass[ 'comment_delete' ] ]);
+                }
+                if(!empty( $model->buttons[ 'update' ] )) {
+                    echo Html::a('Редактировать', $model->buttons[ 'update' ], [ 'class' => CommentWidget::$baseClass[ 'comment_update' ] ]);
+                }
+                if(!empty( $model->buttons[ 'reply' ] )) {
+                    echo Html::a('Ответить', $model->buttons[ 'reply' ], [ 'class' => CommentWidget::$baseClass[ 'comment_reply' ] ]);
+                }
+            ?>
+        </div>
         <?php
             /*
             ?>
@@ -37,21 +37,21 @@
                 <div class="portfolio-project-views-img">
                     <img src="/images/portfolio-project/ico-1.png"/></div>
             </div>
-            <div class="portfolio-project-views-txt">127</div>
+            <div class="portfolio-project-views-txt"><?=$model->view_count?></div>
         </div>
         <div class="portfolio-project-rati ico-views-bl">
             <div class="portfolio-project-views-img-wr">
                 <div class="portfolio-project-views-img">
                     <img src="/images/portfolio-project/ico-2.png"/></div>
             </div>
-            <div class="portfolio-project-views-txt">10.0</div>
+            <div class="portfolio-project-views-txt"><?=($model->getRatingValue()?:'Нет')?></div>
         </div>
         <div class="ico-views-bl">
             <div class="portfolio-project-views-img-wr">
                 <div class="portfolio-project-views-img">
                     <img src="/images/portfolio-project/ico-3.png"/></div>
             </div>
-            <div class="portfolio-project-views-txt">14</div>
+            <div class="portfolio-project-views-txt"><?=count($model->comments)?></div>
         </div>
     </div>
     <div title="<?= implode(', ', ArrayHelper::getColumn($model->specializations, 'specialization_name')) ?>" class="portfolio-project-blocks-tags"><?= implode(', ', ArrayHelper::getColumn($model->specializations, 'specialization_name')) ?></div>
@@ -2,6 +2,7 @@
     use common\models\Portfolio;
     use common\models\User;
+    use kartik\rating\StarRating;
     use yii\helpers\Html;
     use yii\web\ViewAction;
     use yii\web\View;
@@ -15,6 +16,7 @@
     $this->params[ 'user' ] = $user;
     $this->title = 'My Yii Application';
+    $rating = $portfolio->getRatingValue();
 ?>
 <div class="portfolio-new-page-wrapper style">
     <div class="new-portfolio-bg style ">
@@ -35,24 +37,25 @@
                         <div class="portfolio-project-views-img">
                             <img src="/images/portfolio-project/ico-2.png"></div>
                     </div>
-                    <div class="portfolio-project-views-txt">XX.X</div>
+                    <div class="portfolio-project-views-txt"><?=(!empty($rating)?$rating:'Нет')?></div>
                 </div>
                 <div class="ico-views-bl">
                     <div class="portfolio-project-views-img-wr">
                         <div class="portfolio-project-views-img">
                             <img src="/images/portfolio-project/ico-3.png"></div>
                     </div>
-                    <div class="portfolio-project-views-txt"></div>
+                    <div class="portfolio-project-views-txt"><?=count($portfolio->comments)?></div>
                 </div>
             </div>
         </div>
         <div class="new-portfolio-rating">
-            <div class="rating new-portf-rat">
-                <!--оценка-->
-                <input type="hidden" class="val" value="4"/>
-                <!--количество голосов-->
-                <input type="hidden" class="votes" value="12"/>
-            </div>
+            <?php
+                echo StarRating::widget([
+                    'name' => 'rating_portfolio',
+                    'value' => $portfolio->getRatingValue(),
+                    'pluginOptions' => ['displayOnly' => true, 'size' => 'xxs']
+                ]);
+            ?>
         </div>
     </div>
@@ -60,13 +63,15 @@
         <div class="new-portf-slider-title"><?= $portfolio->name ?></div>
         <?php
             if(!empty( $portfolio->gallery ) || !empty( $portfolio->gallery->photo )) {
+                $gallery = explode(',', $portfolio->gallery->photo);
+                array_pop($gallery);
                 ?>
                 <div class="new-portf-slider style">
                     <div class="slider-video-wr">
                         <div id="demo5" class="scroll-img">
                             <ul>
                                 <?php
-                                    foreach( explode(',', $portfolio->gallery->photo) as $one_photo ) {
+                                    foreach($gallery as $one_photo)  {
                                 ?>
                                 <li><img src="<?= $one_photo ?>" alt=""/>
                                     <?php
@@ -117,7 +122,7 @@
             'model'         => $portfolio::className(),
             'model_id'      => $portfolio->portfolio_id,
             'comment_class' => \common\modules\comment\models\Comment::className(),
-            'rating_class'  => \common\modules\comment\models\Rating::className(),
+            'rating_class'  => (\Yii::$app->user->id?\common\modules\comment\models\Rating::className():false),
             'class_options' => [
                 'scenario'     => is_int(\Yii::$app->user->getId()) ? \common\modules\comment\models\Comment::SCENARIO_USER : \common\modules\comment\models\Comment::SCENARIO_GUEST,
                 'user_id'      => \Yii::$app->user->getId(),
@@ -4,6 +4,7 @@
     use \yii\helpers\Html;
     use yii\helpers\Url;
     use yii\widgets\ListView;
+    use yii\widgets\Pjax;
     /* @var $this yii\web\View
      * @var $portfolio yii\data\ArrayDataProvider
@@ -13,6 +14,9 @@
 ?>
 <div class="performer-vacancy-vacant-title-reclam-wr style">
+    <?php
+        Pjax::begin();
+    ?>
     <div class="portfolio-project-wr style">
         <div class="workplace-title style"><p>Проектов: <?= $portfolio->totalCount ?></p></div>
         <div class="portfolio-project-tags style">
@@ -44,5 +48,8 @@
         </div>
     </div>
+    <?php
+        Pjax::end();
+    ?>
 </div>
 \ No newline at end of file
@@ -6650,7 +6650,7 @@ input[disabled], select[disabled] {
 .admin-portfolio-foto .btn {margin-top: 0}
 .admin-portfolio-foto.success_download .btn {margin-top: 15px}
 .admin-portfolio-foto #cover_buttons_block {
-    top: 173px;
+    top: 188px;
     left: 116px;
 }
 .admin-portfolio-foto .admin-ava-wr {