From 7af4d34d31a04e8a9fc07f74bab85b69f6f60d7d Mon Sep 17 00:00:00 2001
From: Alex <kennen.md@gmail.com>
Date: Fri, 30 Dec 2016 14:56:32 +0200
Subject: [PATCH] -Kind of ready

---
 frontend/controllers/CabinetController.php | 34 +++++++++++++++++++++++++++++-----
 frontend/views/cabinet/arrivals.php        | 12 +++++++++---
 frontend/views/cabinet/notifications.php   | 13 ++++++++++---
 frontend/views/cabinet/users.php           | 17 ++++++++++-------
 4 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/frontend/controllers/CabinetController.php b/frontend/controllers/CabinetController.php
index a978cba..9f5b641 100755
--- a/frontend/controllers/CabinetController.php
+++ b/frontend/controllers/CabinetController.php
@@ -9,6 +9,7 @@
     use frontend\models\UserPassport;
     use yii\filters\AccessControl;
     use yii\filters\VerbFilter;
+    use yii\helpers\VarDumper;
     use yii\web\Controller;
     use yii\web\NotFoundHttpException;
     
@@ -144,9 +145,20 @@
         
         public function actionArrivals()
         {
-            $reports = Report::find()
-                             ->with('intellectualProperty')
-                             ->all();
+            /**
+             * @var User $user
+             */
+            $user = \Yii::$app->user->identity;
+            if ($user->isAdmin()) {
+                $reports = Report::find()
+                               ->with('intellectualProperty')
+                               ->all();
+            } else {
+                $reports = Report::find()
+                               ->joinWith('intellectualProperty.creativeRoles')
+                               ->where([ 'creative_role.user_id' => $user->id ])
+                               ->all();
+            }
             return $this->render(
                 'arrivals',
                 [
@@ -157,8 +169,20 @@
         
         public function actionNotifications()
         {
-            $table = Report::find()
-                           ->all();
+            /**
+             * @var User $user
+             */
+            $user = \Yii::$app->user->identity;
+            if ($user->isAdmin()) {
+                $table = Report::find()
+                                 ->with('intellectualProperty')
+                                 ->all();
+            } else {
+                $table = Report::find()
+                                 ->joinWith('intellectualProperty.creativeRoles')
+                                 ->where([ 'creative_role.user_id' => $user->id ])
+                                 ->all();
+            }
             return $this->render(
                 'notifications',
                 [
diff --git a/frontend/views/cabinet/arrivals.php b/frontend/views/cabinet/arrivals.php
index bda8813..e77392f 100755
--- a/frontend/views/cabinet/arrivals.php
+++ b/frontend/views/cabinet/arrivals.php
@@ -1,4 +1,5 @@
 <?php
+    use common\models\User;
     use frontend\models\Report;
     use yii\helpers\Html;
     use yii\web\View;
@@ -6,7 +7,9 @@
     /**
      * @var View     $this
      * @var Report[] $reports
+     * @var User $user
      */
+    $user = \Yii::$app->user->identity;
 ?>
 <div class="style cab_content_list">
     <div class="title_forms">Мої надходження</div>
@@ -15,22 +18,25 @@
             <tr>
                 <td>№<br/>п/п</td>
                 <td>Користувач</td>
-                <td>Виконавець</td>
                 <td>Твір</td>
                 <td>Кількість сповіщень</td>
                 <td>Перерахована сума</td>
             </tr>
             <?php
                 foreach ($reports as $index => $report) {
+                  if ($user->isAdmin()) {
+                    $sum = $report->sum;
+                  } else {
+                    $sum = $report->sum * $report->intellectualProperty->creativeRoles[0]->part /100;
+                  }
                     ?>
                     <tr>
                         <?php
                             echo Html::tag('td', ++$index);
                             echo Html::tag('td', $report->user);
-                            echo Html::tag('td', $report->artist);
                             echo Html::tag('td', $report->intellectualProperty->title);
                             echo Html::tag('td', $report->count);
-                            echo Html::tag('td', $report->sum);
+                            echo Html::tag('td', $sum);
                         ?>
                     </tr>
                     <?php
diff --git a/frontend/views/cabinet/notifications.php b/frontend/views/cabinet/notifications.php
index c71daf9..7cfc6ed 100755
--- a/frontend/views/cabinet/notifications.php
+++ b/frontend/views/cabinet/notifications.php
@@ -1,11 +1,14 @@
 <?php
+    use common\models\User;
     use frontend\models\Report;
     use yii\web\View;
     
     /**
      * @var View                 $this
      * @var Report[] $table
+     * @var User $user
      */
+    $user = \Yii::$app->user->identity;
 ?>
 <div class="style cab_content_list">
     <div class="cab_content_list-dropdown">
@@ -16,7 +19,6 @@
                     <tr>
                         <td>№<br/>п/п</td>
                         <td>Назва використаного твору</td>
-                        <td>Виконавець — П.І.Б. виконавця (співвиконавців) або назва колективу виконавців</td>
                         <td>Автор музики (П.І.Б.)</td>
                         <td>Автор тексту (П.І.Б.)</td>
                         <td width="150">Тривалість звучання<br/> (год.:хвил.: сек.)<br/>0:00:00</td>
@@ -31,11 +33,16 @@
                       <tr>
                         <td><?=$i?></td>
                         <td><span class="name-songs"><?=$row->intellectualProperty->title?></span></td>
-                        <td><?=$row->artist?></td>
                         <td>-</td>
                         <td>-</td>
                         <td>—</td>
-                        <td><?=$row->royalty?></td>
+                        <td><?php
+                            if ($user->isAdmin()) {
+                              echo $row->royalty;
+                            } else {
+                              echo $row->royalty * $row->intellectualProperty->creativeRoles[0]->part /100;
+                            }
+                            ?></td>
                         <td><?=$row->count?></td>
                         <td>—</td>
                       </tr>
diff --git a/frontend/views/cabinet/users.php b/frontend/views/cabinet/users.php
index 4a7b3a5..9d8ff2d 100755
--- a/frontend/views/cabinet/users.php
+++ b/frontend/views/cabinet/users.php
@@ -44,7 +44,6 @@
                 <tr>
                     <td>№<br/>п/п</td>
                     <td>Користувач</td>
-                    <td>Виконавець</td>
                     <td>Твір</td>
                     <td>Кількість сповіщень</td>
                     <td>Перерахована сума</td>
@@ -55,19 +54,23 @@
                 </tr>
                 <?php
                     foreach ($reports as $index => $report) {
+                      if ($user->isAdmin()) {
+                        $sum = $report->sum;
+                      } else {
+                        $sum = $report->sum * $report->intellectualProperty->creativeRoles[0]->part / 100;
+                      }
                         ?>
                         <tr>
                             <?php
                                 echo Html::tag('td', ++$index);
                                 echo Html::tag('td', $report->user);
-                                echo Html::tag('td', '');
                                 echo Html::tag('td', $report->intellectualProperty->title);
                                 echo Html::tag('td', $report->count);
-                                echo Html::tag('td', $report->sum);
-                                echo Html::tag('td', $report->sum*0.2);
-                                echo Html::tag('td', $report->sum*0.8);
-                                echo Html::tag('td', $report->sum*0.8*0.195);
-                                echo Html::tag('td', $report->sum*0.8*0.805);
+                                echo Html::tag('td', $sum);
+                                echo Html::tag('td', $sum*0.2);
+                                echo Html::tag('td', $sum*0.8);
+                                echo Html::tag('td', $sum*0.8*0.195);
+                                echo Html::tag('td', $sum*0.8*0.805);
                             ?>
                         </tr>
                         <?php
--
libgit2 0.21.4