From dcfb3d5cb38d93c7c15b08aeeb352d060b2c3f17 Mon Sep 17 00:00:00 2001
From: Alex <kennen.md@gmail.com>
Date: Tue, 27 Dec 2016 17:26:18 +0200
Subject: [PATCH] -Form ajax ready

---
 frontend/controllers/CabinetController.php |  22 ++++++++++++++++++++++
 frontend/models/IntellectualProperty.php   | 194 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------
 frontend/views/cabinet/index.php           |   8 +++++---
 frontend/web/js/script.js                  |  16 ++++++++++++++++
 4 files changed, 155 insertions(+), 85 deletions(-)

diff --git a/frontend/controllers/CabinetController.php b/frontend/controllers/CabinetController.php
index 85242a5..a306041 100644
--- a/frontend/controllers/CabinetController.php
+++ b/frontend/controllers/CabinetController.php
@@ -2,6 +2,7 @@
     namespace frontend\controllers;
     
     use common\models\User;
+    use frontend\models\IntellectualProperty;
     use frontend\models\UserData;
     use frontend\models\UserPassport;
     use yii\filters\VerbFilter;
@@ -103,4 +104,25 @@
                 ];
             }
         }
+    
+        public function actionAddIntProp()
+        {
+            $request = \Yii::$app->request;
+            $response = \Yii::$app->response;
+            $response->format = $response::FORMAT_JSON;
+            
+            $intProperty = new IntellectualProperty();
+            
+            if($intProperty->load($request->post()) && $intProperty->save()) {
+                return [
+                    'success' => true,
+                    'message' => 'Данные успешно сохранены',
+                ];
+            } else {
+                return [
+                    'error' => true,
+                    'message' => 'Ошибка сохранения данных',
+                ];
+            }
+        }
     }
diff --git a/frontend/models/IntellectualProperty.php b/frontend/models/IntellectualProperty.php
index 381b6cc..32ff22e 100644
--- a/frontend/models/IntellectualProperty.php
+++ b/frontend/models/IntellectualProperty.php
@@ -1,87 +1,117 @@
 <?php
-
-namespace frontend\models;
-
-use common\models\User;
-
-/**
- * This is the model class for table "intellectual_property".
- *
- * @property integer $id
- * @property integer $user_id
- * @property string $title
- * @property integer $creation_date
- * @property string $code
- * @property string $genre
- * @property integer $registration_date
- * @property string $contract
- * @property string $type
- *
- * @property CreativeRole[] $creativeRoles
- * @property User $user
- * @property Report[] $reports
- */
-class IntellectualProperty extends \yii\db\ActiveRecord
-{
+    
+    namespace frontend\models;
+    
+    use common\models\User;
+    
     /**
-     * @inheritdoc
+     * This is the model class for table "intellectual_property".
+     *
+     * @property integer        $id
+     * @property integer        $user_id
+     * @property string         $title
+     * @property integer        $creation_date
+     * @property string         $code
+     * @property string         $genre
+     * @property integer        $registration_date
+     * @property string         $contract
+     * @property string         $type
+     * @property CreativeRole[] $creativeRoles
+     * @property User           $user
+     * @property Report[]       $reports
      */
-    public static function tableName()
+    class IntellectualProperty extends \yii\db\ActiveRecord
     {
-        return 'intellectual_property';
+        /**
+         * @inheritdoc
+         */
+        public static function tableName()
+        {
+            return 'intellectual_property';
+        }
+        
+        /**
+         * @inheritdoc
+         */
+        public function rules()
+        {
+            return [
+                [
+                    [
+                        'user_id',
+                    ],
+                    'integer',
+                ],
+                [
+                    [
+                        'creation_date',
+                        'registration_date',
+                        'title',
+                        'code',
+                        'genre',
+                        'contract',
+                        'type',
+                        'author_role',
+                        'percent',
+                        'calculated',
+                        'play_count',
+                    ],
+                    'string',
+                    'max' => 255,
+                ],
+                [
+                    [ 'user_id' ],
+                    'exist',
+                    'skipOnError'     => true,
+                    'targetClass'     => User::className(),
+                    'targetAttribute' => [ 'user_id' => 'id' ],
+                ],
+            ];
+        }
+        
+        /**
+         * @inheritdoc
+         */
+        public function attributeLabels()
+        {
+            return [
+                'id'                => 'ID',
+                'user_id'           => 'User ID',
+                'title'             => 'Назва',
+                'creation_date'     => 'Creation Date',
+                'code'              => 'Code',
+                'genre'             => 'Жанр',
+                'registration_date' => 'Дата реєстрації',
+                'contract'          => 'Contract',
+                'type'              => 'Type',
+                'author_role' => 'Роль автора',
+                'percent' => 'Процент долі автора',
+                'calculated' => 'Нараховано',
+                'play_count' => 'К-ть відтворень',
+            ];
+        }
+        
+        /**
+         * @return \yii\db\ActiveQuery
+         */
+        public function getCreativeRoles()
+        {
+            return $this->hasMany(CreativeRole::className(), [ 'intellectual_property_id' => 'id' ]);
+        }
+        
+        /**
+         * @return \yii\db\ActiveQuery
+         */
+        public function getUser()
+        {
+            return $this->hasOne(User::className(), [ 'id' => 'user_id' ]);
+        }
+        
+        /**
+         * @return \yii\db\ActiveQuery
+         */
+        public function getReports()
+        {
+            return $this->hasMany(Report::className(), [ 'intellectual_property_id' => 'id' ]);
+        }
     }
-
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            [['user_id', 'creation_date', 'registration_date'], 'integer'],
-            [['title', 'code', 'genre', 'contract', 'type'], 'string', 'max' => 255],
-            [['user_id'], 'exist', 'skipOnError' => true, 'targetClass' => User::className(), 'targetAttribute' => ['user_id' => 'id']],
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function attributeLabels()
-    {
-        return [
-            'id' => 'ID',
-            'user_id' => 'User ID',
-            'title' => 'Title',
-            'creation_date' => 'Creation Date',
-            'code' => 'Code',
-            'genre' => 'Genre',
-            'registration_date' => 'Registration Date',
-            'contract' => 'Contract',
-            'type' => 'Type',
-        ];
-    }
-
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getCreativeRoles()
-    {
-        return $this->hasMany(CreativeRole::className(), ['intellectual_property_id' => 'id']);
-    }
-
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getUser()
-    {
-        return $this->hasOne(User::className(), ['id' => 'user_id']);
-    }
-
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getReports()
-    {
-        return $this->hasMany(Report::className(), ['intellectual_property_id' => 'id']);
-    }
-}
diff --git a/frontend/views/cabinet/index.php b/frontend/views/cabinet/index.php
index 4f5ab16..7b51444 100644
--- a/frontend/views/cabinet/index.php
+++ b/frontend/views/cabinet/index.php
@@ -2278,7 +2278,7 @@ EOT;
         <?php
             $form = ActiveForm::begin(
                 [
-                    'action' => 'som-act',
+                    'action' => 'add-int-prop',
                     'id'     => 'add-int-prop-form',
                 ]
             );
@@ -2293,7 +2293,9 @@ EOT;
           ?>
           
           <?php
-              echo $form->field($addIntProp, 'registration_date');
+              echo $form->field($addIntProp, 'registration_date')->textInput([
+                'class' => '_datepicker form-control',
+                                                                             ]);
           ?>
           
           <?php
@@ -2333,7 +2335,7 @@ EOT;
 
 <?php
     $js = <<<EOT
-$('._datepicer')
+$('._datepicer, ._datepicker')
                 .datepicker(
                     {
                         changeMonth: true,
diff --git a/frontend/web/js/script.js b/frontend/web/js/script.js
index 8cf9e05..8d5dc40 100644
--- a/frontend/web/js/script.js
+++ b/frontend/web/js/script.js
@@ -221,6 +221,22 @@ $(document).ready(function(){
         $('#'+id).prepend('<div class="preloader"></div>');
         $.pjax.reload('#'+id);
     }
+
+    $(document).on('beforeSubmit', '#add-int-prop-form', function() {
+        $.post($(this).attr('action'), $(this).serialize(), function(data) {
+            var type;
+            if(data.error) {
+                type = 'danger';
+            } else {
+                type = 'success';
+            }
+            $('#add-composition-modal').modal('hide');
+            showStatus(data.message, type);
+            document.getElementById('add-int-prop-form').reset();
+        });
+
+        return false;
+    });
 });
 
 
--
libgit2 0.21.4