Commit fb0f96304235277312f4321ed7cf527a39e2e182
1 parent
fd02a639
-Greed ready
Showing
3 changed files
with
35 additions
and
139 deletions
Show diff stats
frontend/controllers/CabinetController.php
| @@ -50,9 +50,15 @@ | @@ -50,9 +50,15 @@ | ||
| 50 | if(!$userPassport = $user->userPassport) { | 50 | if(!$userPassport = $user->userPassport) { |
| 51 | $userPassport = new UserPassport(); | 51 | $userPassport = new UserPassport(); |
| 52 | } | 52 | } |
| 53 | + | ||
| 54 | + $table = IntellectualProperty::find()->where([ | ||
| 55 | + 'user_id' => \Yii::$app->user->identity->id, | ||
| 56 | + ])->all(); | ||
| 57 | + | ||
| 53 | return $this->render('index', [ | 58 | return $this->render('index', [ |
| 54 | 'userData' => $userData, | 59 | 'userData' => $userData, |
| 55 | 'userPassport' => $userPassport, | 60 | 'userPassport' => $userPassport, |
| 61 | + 'table' => $table, | ||
| 56 | ]); | 62 | ]); |
| 57 | } | 63 | } |
| 58 | 64 | ||
| @@ -121,6 +127,8 @@ | @@ -121,6 +127,8 @@ | ||
| 121 | 127 | ||
| 122 | $intProperty = new IntellectualProperty(); | 128 | $intProperty = new IntellectualProperty(); |
| 123 | 129 | ||
| 130 | + $intProperty->user_id = \Yii::$app->user->identity->id; | ||
| 131 | + | ||
| 124 | if($intProperty->load($request->post()) && $intProperty->save()) { | 132 | if($intProperty->load($request->post()) && $intProperty->save()) { |
| 125 | return [ | 133 | return [ |
| 126 | 'success' => true, | 134 | 'success' => true, |
frontend/views/cabinet/index.php
| @@ -4,6 +4,7 @@ | @@ -4,6 +4,7 @@ | ||
| 4 | * @var UserData $userData | 4 | * @var UserData $userData |
| 5 | * @var UserPassport $userPassport | 5 | * @var UserPassport $userPassport |
| 6 | * @var yii\web\View $this | 6 | * @var yii\web\View $this |
| 7 | + * @var IntellectualProperty[] $table | ||
| 7 | */ | 8 | */ |
| 8 | 9 | ||
| 9 | use frontend\models\UserData; | 10 | use frontend\models\UserData; |
| @@ -11,6 +12,7 @@ | @@ -11,6 +12,7 @@ | ||
| 11 | use frontend\models\IntellectualProperty; | 12 | use frontend\models\IntellectualProperty; |
| 12 | use yii\helpers\Html; | 13 | use yii\helpers\Html; |
| 13 | use yii\widgets\ActiveForm; | 14 | use yii\widgets\ActiveForm; |
| 15 | + use yii\widgets\Pjax; | ||
| 14 | 16 | ||
| 15 | $this->title = 'My Yii Application'; | 17 | $this->title = 'My Yii Application'; |
| 16 | ?> | 18 | ?> |
| @@ -44,6 +46,11 @@ | @@ -44,6 +46,11 @@ | ||
| 44 | ) ?> | 46 | ) ?> |
| 45 | </div> | 47 | </div> |
| 46 | <div class="style table-forms-wrapp"> | 48 | <div class="style table-forms-wrapp"> |
| 49 | + <?php | ||
| 50 | + Pjax::begin([ | ||
| 51 | + 'id' => 'int-prop-greed', | ||
| 52 | + ]); | ||
| 53 | + ?> | ||
| 47 | <table class="table-1" cellpadding="0" cellspacing="0" border="0"> | 54 | <table class="table-1" cellpadding="0" cellspacing="0" border="0"> |
| 48 | <tr> | 55 | <tr> |
| 49 | <td>№<br/>п/п</td> | 56 | <td>№<br/>п/п</td> |
| @@ -55,148 +62,28 @@ | @@ -55,148 +62,28 @@ | ||
| 55 | <td>Нараховано</td> | 62 | <td>Нараховано</td> |
| 56 | <td>К-ть відтворень</td> | 63 | <td>К-ть відтворень</td> |
| 57 | </tr> | 64 | </tr> |
| 58 | - | ||
| 59 | - <tr> | ||
| 60 | - <td></td> | ||
| 61 | - <td></td> | ||
| 62 | - <td></td> | ||
| 63 | - <td></td> | ||
| 64 | - <td></td> | ||
| 65 | - <td></td> | ||
| 66 | - <td></td> | ||
| 67 | - <td></td> | ||
| 68 | - </tr> | ||
| 69 | - <tr> | ||
| 70 | - <td></td> | ||
| 71 | - <td></td> | ||
| 72 | - <td></td> | ||
| 73 | - <td></td> | ||
| 74 | - <td></td> | ||
| 75 | - <td></td> | ||
| 76 | - <td></td> | ||
| 77 | - <td></td> | ||
| 78 | - </tr> | ||
| 79 | - <tr> | ||
| 80 | - <td></td> | ||
| 81 | - <td></td> | ||
| 82 | - <td></td> | ||
| 83 | - <td></td> | ||
| 84 | - <td></td> | ||
| 85 | - <td></td> | ||
| 86 | - <td></td> | ||
| 87 | - <td></td> | ||
| 88 | - </tr> | ||
| 89 | - <tr> | ||
| 90 | - <td></td> | ||
| 91 | - <td></td> | ||
| 92 | - <td></td> | ||
| 93 | - <td></td> | ||
| 94 | - <td></td> | ||
| 95 | - <td></td> | ||
| 96 | - <td></td> | ||
| 97 | - <td></td> | ||
| 98 | - </tr> | ||
| 99 | - <tr> | ||
| 100 | - <td></td> | ||
| 101 | - <td></td> | ||
| 102 | - <td></td> | ||
| 103 | - <td></td> | ||
| 104 | - <td></td> | ||
| 105 | - <td></td> | ||
| 106 | - <td></td> | ||
| 107 | - <td></td> | ||
| 108 | - </tr> | ||
| 109 | - <tr> | ||
| 110 | - <td></td> | ||
| 111 | - <td></td> | ||
| 112 | - <td></td> | ||
| 113 | - <td></td> | ||
| 114 | - <td></td> | ||
| 115 | - <td></td> | ||
| 116 | - <td></td> | ||
| 117 | - <td></td> | ||
| 118 | - </tr> | 65 | + <?php |
| 66 | + $i = 1; | ||
| 67 | + foreach ($table as $row) { | ||
| 68 | + ?> | ||
| 119 | <tr> | 69 | <tr> |
| 120 | - <td></td> | ||
| 121 | - <td></td> | ||
| 122 | - <td></td> | ||
| 123 | - <td></td> | ||
| 124 | - <td></td> | ||
| 125 | - <td></td> | ||
| 126 | - <td></td> | ||
| 127 | - <td></td> | ||
| 128 | - </tr> | ||
| 129 | - <tr> | ||
| 130 | - <td></td> | ||
| 131 | - <td></td> | ||
| 132 | - <td></td> | ||
| 133 | - <td></td> | ||
| 134 | - <td></td> | ||
| 135 | - <td></td> | ||
| 136 | - <td></td> | ||
| 137 | - <td></td> | ||
| 138 | - </tr> | ||
| 139 | - <tr> | ||
| 140 | - <td></td> | ||
| 141 | - <td></td> | ||
| 142 | - <td></td> | ||
| 143 | - <td></td> | ||
| 144 | - <td></td> | ||
| 145 | - <td></td> | ||
| 146 | - <td></td> | ||
| 147 | - <td></td> | ||
| 148 | - </tr> | ||
| 149 | - <tr> | ||
| 150 | - <td></td> | ||
| 151 | - <td></td> | ||
| 152 | - <td></td> | ||
| 153 | - <td></td> | ||
| 154 | - <td></td> | ||
| 155 | - <td></td> | ||
| 156 | - <td></td> | ||
| 157 | - <td></td> | ||
| 158 | - </tr> | ||
| 159 | - <tr> | ||
| 160 | - <td></td> | ||
| 161 | - <td></td> | ||
| 162 | - <td></td> | ||
| 163 | - <td></td> | ||
| 164 | - <td></td> | ||
| 165 | - <td></td> | ||
| 166 | - <td></td> | ||
| 167 | - <td></td> | ||
| 168 | - </tr> | ||
| 169 | - <tr> | ||
| 170 | - <td></td> | ||
| 171 | - <td></td> | ||
| 172 | - <td></td> | ||
| 173 | - <td></td> | ||
| 174 | - <td></td> | ||
| 175 | - <td></td> | ||
| 176 | - <td></td> | ||
| 177 | - <td></td> | ||
| 178 | - </tr> | ||
| 179 | - <tr> | ||
| 180 | - <td></td> | ||
| 181 | - <td></td> | ||
| 182 | - <td></td> | ||
| 183 | - <td></td> | ||
| 184 | - <td></td> | ||
| 185 | - <td></td> | ||
| 186 | - <td></td> | ||
| 187 | - <td></td> | ||
| 188 | - </tr> | ||
| 189 | - <tr> | ||
| 190 | - <td></td> | ||
| 191 | - <td></td> | ||
| 192 | - <td></td> | ||
| 193 | - <td></td> | ||
| 194 | - <td></td> | ||
| 195 | - <td></td> | ||
| 196 | - <td></td> | ||
| 197 | - <td></td> | 70 | + <td><?= $i; ?></td> |
| 71 | + <td><?= $row->title ?></td> | ||
| 72 | + <td><?= $row->registration_date ?></td> | ||
| 73 | + <td><?= $row->genre ?></td> | ||
| 74 | + <td><?= $row->author_role ?></td> | ||
| 75 | + <td><?= $row->percent ?></td> | ||
| 76 | + <td><?= $row->calculated ?></td> | ||
| 77 | + <td><?= $row->play_count ?></td> | ||
| 198 | </tr> | 78 | </tr> |
| 79 | + <?php | ||
| 80 | + $i++; | ||
| 81 | + } | ||
| 82 | + ?> | ||
| 199 | </table> | 83 | </table> |
| 84 | + <?php | ||
| 85 | + Pjax::end(); | ||
| 86 | + ?> | ||
| 200 | </div> | 87 | </div> |
| 201 | </div> | 88 | </div> |
| 202 | </div> | 89 | </div> |
frontend/web/js/script.js
| @@ -262,6 +262,7 @@ $(document).ready(function(){ | @@ -262,6 +262,7 @@ $(document).ready(function(){ | ||
| 262 | } | 262 | } |
| 263 | $('#add-composition-modal').modal('hide'); | 263 | $('#add-composition-modal').modal('hide'); |
| 264 | showStatus(data.message, type); | 264 | showStatus(data.message, type); |
| 265 | + $.pjax.reload('#int-prop-greed'); | ||
| 265 | document.getElementById('add-int-prop-form').reset(); | 266 | document.getElementById('add-int-prop-form').reset(); |
| 266 | }); | 267 | }); |
| 267 | 268 |