Merge remote-tracking branch 'origin/master'

Alexey Boroda
2 parents d12a1030 1d8bef6c
Showing 3 changed files with 84 additions and 13 deletions Show diff stats
frontend/controllers/CabinetController.php
frontend/models/IntellectualProperty.php
frontend/views/cabinet/index.php
@@ -88,7 +88,11 @@
             if ($id) {
                 $property = $this->findProperty($id);
             } else {
-                $property = new IntellectualProperty();
+                $property = new IntellectualProperty(
+                    [
+                        'user_id' => \Yii::$app->user->id,
+                    ]
+                );
                 $newRecord = true;
             }
             if ($property->load(\Yii::$app->request->post()) && $property->save()) {
@@ -129,11 +133,11 @@
         public function actionList()
         {
             $table = IntellectualProperty::find()
-//                                         ->where(
-//                                             [
-//                                                 'user_id' => \Yii::$app->user->identity->id,
-//                                             ]
-//                                         )
+                                         ->where(
+                                             [
+                                                 'user_id' => \Yii::$app->user->id,
+                                             ]
+                                         )
                                          ->all();
             return $this->render(
                 'list',
@@ -424,8 +428,15 @@
         public function findProperty($id)
         {
-            $model = IntellectualProperty::findOne($id);
-            if (empty($model)) {
+            $model = IntellectualProperty::find()
+                                         ->where(
+                                             [
+                                                 'id'      => $id,
+                                                 'user_id' => \Yii::$app->user->id,
+                                             ]
+                                         )
+                                         ->one();
+            if (empty( $model )) {
                 throw new NotFoundHttpException();
             }
             return $model;
@@ -17,6 +17,7 @@
      * @property string         $contract
      * @property string         $type
      * @property CreativeRole[] $creativeRoles
+     * @property CreativeRole   $creativeRole
      * @property User           $user
      * @property Report[]       $reports
      */
@@ -93,6 +94,12 @@
             return $this->hasMany(CreativeRole::className(), [ 'intellectual_property_id' => 'id' ]);
         }
+        public function getCreativeRole()
+        {
+            return $this->hasOne(CreativeRole::className(), [ 'intellectual_property_id' => 'id' ])
+                        ->where([ 'user_id' => \Yii::$app->user->id ]);
+        }
+        
         /**
          * @return \yii\db\ActiveQuery
          */
@@ -7,6 +7,7 @@
      * @var IntellectualProperty[] $table
      */
+    use common\models\User;
     use frontend\models\UserData;
     use frontend\models\UserPassport;
     use frontend\models\IntellectualProperty;
@@ -15,6 +16,10 @@
     use yii\widgets\Pjax;
     $this->title = 'My Yii Application';
+    /**
+     * @var User $user
+     */
+    $user = \Yii::$app->user->identity;
 ?>
 <div class="style cab_content_list active-cab">
     <?php
@@ -68,13 +73,61 @@
                       ?>
                 <tr>
                   <td><?= $i; ?></td>
-                  <td><?php echo Html::a($row->title, ['sales', 'id' => $row->id])?></td>
+                  <td>
+                      <?php
+                          if($row->user_id == $user->id) {
+                              echo Html::a($row->title, ['sales', 'id' => $row->id]);
+                          } else {
+                              echo $row->title;
+                          }
+                      ?>
+                  </td>
                   <td><?= $row->registration_date ?></td>
                   <td><?= $row->genre ?></td>
-                  <td><?= $row->author_role ?></td>
-                  <td></td>
-                  <td></td>
-                  <td></td>
+                  <td>
+                      <?php
+                          if(!empty($row->creativeRole)) {
+                              echo $row->creativeRole->title;
+                          } elseif($user->isAdmin()) {
+                              echo '-';
+                          } else {
+                              echo 'У Вас немає ролі в даному ОІВ';
+                          }
+                      ?>
+                  </td>
+                  <td>
+                      <?php
+                          if(!empty($row->creativeRole)) {
+                              echo $row->creativeRole->part.'%';
+                          } else {
+                              echo '-';
+                          }
+                      ?>
+                  </td>
+                  <td>
+                      <?php
+                          if(!empty($row->creativeRole)) {
+                              $sum = 0;
+                              foreach ($row->reports as $report) {
+                                  $sum += $report->sum;
+                              }
+                              echo ($sum * $row->creativeRole->part / 100);
+                              unset($sum);
+                          } else {
+                              echo '-';
+                          }
+                      ?>
+                  </td>
+                  <td>
+                      <?php
+                          $sum = 0;
+                          foreach ($row->reports as $report) {
+                              $sum += $report->count;
+                          }
+                          echo $sum;
+                          unset($sum);
+                      ?>
+                  </td>
                 </tr>
                 <?php
                         $i++;