test

Yarik
1 parent a952c014
Showing 9 changed files with 578 additions and 26 deletions Show diff stats
common/models/Blog.php
common/models/Portfolio.php
common/models/Project.php
common/models/ProjectPayment.php
common/models/ProjectSpecialization.php
console/migrations/m160209_104201_add_field_project_budget.php
frontend/controllers/AccountsController.php
frontend/views/accounts/_blog_form.php
frontend/views/accounts/blog.php
+<?php
+
+    namespace common\models;
+
+    use Yii;
+    use yii\behaviors\BlameableBehavior;
+    use yii\behaviors\TimestampBehavior;
+    use yii\db\Expression;
+
+    /**
+     * This is the model class for table "blog".
+     * @property integer $blog_id
+     * @property integer $user_id
+     * @property string  $name
+     * @property string  $link
+     * @property string  $date_add
+     * @property integer $user_add_id
+     * @property integer $view_count
+     * @property string  $description
+     * @property string  $cover
+     */
+    class Blog extends \yii\db\ActiveRecord
+    {
+
+        /**
+         * @inheritdoc
+         */
+        public static function tableName()
+        {
+            return 'blog';
+        }
+
+        /**
+         * @inheritdoc
+         */
+        public function behaviors()
+        {
+            return [
+                [
+                    'class'              => BlameableBehavior::className(),
+                    'createdByAttribute' => 'user_id',
+                    'updatedByAttribute' => false,
+                ],
+                [
+                    'class'              => TimestampBehavior::className(),
+                    'createdAtAttribute' => 'date_add',
+                    'updatedAtAttribute' => false,
+                    'value'              => new Expression('NOW()'),
+                ],
+            ];
+        }
+
+        /**
+         * @inheritdoc
+         */
+        public function rules()
+        {
+            return [
+                [
+                    [ 'name' ],
+                    'required',
+                ],
+                [
+                    [ 'description' ],
+                    'string',
+                ],
+                [
+                    [
+                        'name',
+                        'link',
+                        'cover',
+                    ],
+                    'string',
+                    'max' => 255,
+                ],
+            ];
+        }
+
+        /**
+         * @inheritdoc
+         */
+        public function attributeLabels()
+        {
+            return [
+                'blog_id'     => Yii::t('app', 'Blog ID'),
+                'user_id'     => Yii::t('app', 'User ID'),
+                'name'        => Yii::t('app', 'Название'),
+                'link'        => Yii::t('app', 'URL'),
+                'date_add'    => Yii::t('app', 'Дата добавления'),
+                'user_add_id' => Yii::t('app', 'User Add ID'),
+                'view_count'  => Yii::t('app', 'Количество просмотров'),
+                'description' => Yii::t('app', 'Описание'),
+                'cover'       => Yii::t('app', 'Фото главное'),
+            ];
+        }
+    }
@@ -9,24 +9,25 @@
     /**
      * This is the model class for table "portfolio".
-     * @property integer $portfolio_id
-     * @property integer $user_id
-     * @property string $name
-     * @property string $link
-     * @property string $date_add
-     * @property integer $user_add_id Currently inactive attribute
-     * @property integer $view_count
-     * @property string $city
-     * @property string $street
-     * @property string $house
-     * @property string $description
-     * @property string $cover
-     * @property integer $gallery_id
+     * @property integer                   $portfolio_id
+     * @property integer                   $user_id
+     * @property string                    $name
+     * @property string                    $link
+     * @property string                    $date_add
+     * @property integer                   $user_add_id Currently inactive attribute
+     * @property integer                   $view_count
+     * @property string                    $city
+     * @property string                    $street
+     * @property string                    $house
+     * @property string                    $description
+     * @property string                    $cover
+     * @property integer                   $gallery_id
      * @property PortfolioSpecialization[] $portfolioSpecializations
-     * @property Specialization[] $specializations
+     * @property Specialization[]          $specializations
      */
     class Portfolio extends \yii\db\ActiveRecord
     {
+
         /**
          * @inheritdoc
          */
@@ -42,15 +43,15 @@
         {
             return [
                 [
-                    'class' => BlameableBehavior::className(),
+                    'class'              => BlameableBehavior::className(),
                     'createdByAttribute' => 'user_id',
                     'updatedByAttribute' => false,
                 ],
                 [
-                    'class' => TimestampBehavior::className(),
+                    'class'              => TimestampBehavior::className(),
                     'createdAtAttribute' => 'date_add',
                     'updatedAtAttribute' => false,
-                    'value' => new Expression('NOW()'),
+                    'value'              => new Expression('NOW()'),
                 ],
             ];
         }
@@ -69,7 +70,6 @@
                 ],
                 [
                     [
-                        'view_count',
                         'gallery_id',
                     ],
                     'integer',
@@ -94,7 +94,7 @@
                 ],
                 [
                     [
-                        'specializationInput'
+                        'specializationInput',
                     ],
                     'safe',
                 ],
@@ -139,7 +139,9 @@
         public function getSpecializationInput()
         {
-            return $this->getSpecializations()->asArray()->column();
+            return $this->getSpecializations()
+                        ->asArray()
+                        ->column();
         }
         public function setSpecializationInput($value)
+<?php
+
+    namespace common\models;
+
+    use Yii;
+    use yii\behaviors\BlameableBehavior;
+    use yii\behaviors\TimestampBehavior;
+    use yii\db\Expression;
+
+    /**
+     * This is the model class for table "project".
+     * @property integer                 $project_id
+     * @property integer                 $user_id
+     * @property string                  $name
+     * @property string                  $link
+     * @property integer                 $project_pid
+     * @property string                  $date_add
+     * @property string                  $date_end
+     * @property integer                 $user_add_id
+     * @property double                  $view_count
+     * @property string                  $budget
+     * @property string                  $city
+     * @property string                  $street
+     * @property string                  $house
+     * @property integer                 $payment_variant
+     * @property integer                 $deadline
+     * @property string                  $description
+     * @property integer                 $contractual
+     * @property ProjectPayment[]        $projectPayments
+     * @property ProjectSpecialization[] $projectSpecializations
+     * @property Specialization[]        $specializations
+     */
+    class Project extends \yii\db\ActiveRecord
+    {
+
+        /**
+         * @inheritdoc
+         */
+        public static function tableName()
+        {
+            return 'project';
+        }
+
+        /**
+         * @inheritdoc
+         */
+        public function behaviors()
+        {
+            return [
+                [
+                    'class'              => BlameableBehavior::className(),
+                    'createdByAttribute' => 'user_id',
+                    'updatedByAttribute' => false,
+                ],
+                [
+                    'class'              => TimestampBehavior::className(),
+                    'createdAtAttribute' => 'date_add',
+                    'updatedAtAttribute' => false,
+                    'value'              => new Expression('NOW()'),
+                ],
+            ];
+        }
+
+        /**
+         * @inheritdoc
+         */
+        public function rules()
+        {
+            return [
+                [
+                    [ 'name' ],
+                    'required',
+                ],
+                [
+                    [
+                        'project_pid',
+                        'payment_variant',
+                        'contractual',
+                    ],
+                    'integer',
+                ],
+                [
+                    [ 'description' ],
+                    'string',
+                ],
+                [
+                    [
+                        'name',
+                        'link',
+                        'budget',
+                        'city',
+                        'street',
+                        'house',
+                    ],
+                    'string',
+                    'max' => 255,
+                ],
+            ];
+        }
+
+        /**
+         * @inheritdoc
+         */
+        public function attributeLabels()
+        {
+            return [
+                'project_id'      => Yii::t('app', 'Project ID'),
+                'user_id'         => Yii::t('app', 'User ID'),
+                'name'            => Yii::t('app', 'Название'),
+                'link'            => Yii::t('app', 'URL'),
+                'project_pid'     => Yii::t('app', 'Родительский проект'),
+                'date_add'        => Yii::t('app', 'Дата добавления'),
+                'date_end'        => Yii::t('app', 'Дата окончания'),
+                'user_add_id'     => Yii::t('app', 'User Add ID'),
+                'view_count'      => Yii::t('app', 'Количество просмотров'),
+                'budget'          => Yii::t('app', 'Бюджет'),
+                'city'            => Yii::t('app', 'Город'),
+                'street'          => Yii::t('app', 'Улица'),
+                'house'           => Yii::t('app', 'Дом'),
+                'payment_variant' => Yii::t('app', 'Варианты оплаты'),
+                'deadline'        => Yii::t('app', 'Deadline'),
+                'description'     => Yii::t('app', 'Описание'),
+                'contractual'     => Yii::t('app', 'Договорной'),
+            ];
+        }
+
+        /**
+         * @return \yii\db\ActiveQuery
+         */
+        public function getProjectPayments()
+        {
+            return $this->hasMany(ProjectPayment::className(), [ 'project_id' => 'project_id' ]);
+        }
+
+        public function getPayments()
+        {
+            return $this->hasMany(Payment::className(), [ 'payment_id' => 'payment_id' ])
+                        ->viaTable('project_specialization', [ 'project_id' => 'project_id' ]);
+        }
+
+        /**
+         * @return \yii\db\ActiveQuery
+         */
+        public function getProjectSpecializations()
+        {
+            return $this->hasMany(ProjectSpecialization::className(), [ 'project_id' => 'project_id' ]);
+        }
+
+        public function getSpecializations()
+        {
+            return $this->hasMany(Specialization::className(), [ 'specialization_id' => 'specialization_id' ])
+                        ->viaTable('project_specialization', [ 'project_id' => 'project_id' ]);
+        }
+
+        public function getSpecializationInput()
+        {
+            return $this->getSpecializations()
+                        ->asArray()
+                        ->column();
+        }
+
+        public function setSpecializationInput($value) {
+            $this->specializationInput = $value;
+        }
+
+        public function getPaymentInput()
+        {
+            return $this->getPayments()
+                        ->asArray()
+                        ->column();
+        }
+
+        public function setPaymentInput($value) {
+            $this->paymentInput = $value;
+        }
+    }
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "project_payment".
+ *
+ * @property integer $project_payment_id
+ * @property integer $project_id
+ * @property integer $payment_id
+ *
+ * @property Payment $payment
+ * @property Project $project
+ */
+class ProjectPayment extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'project_payment';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['project_id', 'payment_id'], 'integer'],
+            [['payment_id'], 'exist', 'skipOnError' => true, 'targetClass' => Payment::className(), 'targetAttribute' => ['payment_id' => 'payment_id']],
+            [['project_id'], 'exist', 'skipOnError' => true, 'targetClass' => Project::className(), 'targetAttribute' => ['project_id' => 'project_id']],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'project_payment_id' => Yii::t('app', 'Project Payment ID'),
+            'project_id' => Yii::t('app', 'Project ID'),
+            'payment_id' => Yii::t('app', 'Payment ID'),
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getPayment()
+    {
+        return $this->hasOne(Payment::className(), ['payment_id' => 'payment_id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getProject()
+    {
+        return $this->hasOne(Project::className(), ['project_id' => 'project_id']);
+    }
+}
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "project_specialization".
+ *
+ * @property integer $project_specialization_id
+ * @property integer $project_id
+ * @property integer $specialization_id
+ *
+ * @property Project $project
+ * @property Specialization $specialization
+ */
+class ProjectSpecialization extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'project_specialization';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['project_id', 'specialization_id'], 'integer'],
+            [['project_id'], 'exist', 'skipOnError' => true, 'targetClass' => Project::className(), 'targetAttribute' => ['project_id' => 'project_id']],
+            [['specialization_id'], 'exist', 'skipOnError' => true, 'targetClass' => Specialization::className(), 'targetAttribute' => ['specialization_id' => 'specialization_id']],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'project_specialization_id' => Yii::t('app', 'Project Specialization ID'),
+            'project_id' => Yii::t('app', 'Project ID'),
+            'specialization_id' => Yii::t('app', 'Specialization ID'),
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getProject()
+    {
+        return $this->hasOne(Project::className(), ['project_id' => 'project_id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getSpecialization()
+    {
+        return $this->hasOne(Specialization::className(), ['specialization_id' => 'specialization_id']);
+    }
+}
+<?php
+
+use yii\db\Migration;
+
+class m160209_104201_add_field_project_budget extends Migration
+{
+    public function up()
+    {
+        $this->addColumn('{{%project}}', 'contractual', $this->smallInteger());
+    }
+
+    public function down()
+    {
+        $this->dropColumn('{{%project}}', 'contractual');
+    }
+}
 <?php
     namespace frontend\controllers;
+    use common\models\Blog;
     use common\models\CompanyInfo;
     use common\models\Fields;
     use common\models\Job;
@@ -8,6 +9,7 @@
     use common\models\Payment;
     use common\models\Portfolio;
     use common\models\PortfolioSpecialization;
+    use common\models\Project;
     use common\models\Specialization;
     use common\models\UserPayment;
     use common\models\UserSpecialization;
@@ -110,6 +112,33 @@
             ]);
         }
+        public function actionBlog()
+        {
+            return $this->render('blog');
+        }
+
+        public function actionBlogCreate()
+        {
+            $blog = new Blog();
+            $post = \Yii::$app->request->post();
+            if($blog->load($post) && $blog->save()) {
+                return $this->redirect('blog');
+            } else {
+                return $this->render('_blog_form', [ 'blog' => $blog ]);
+            }
+        }
+
+        public function actionBlogUpdate($id)
+        {
+            $blog = Blog::findOne($id);
+            $post = \Yii::$app->request->post();
+            if($blog->load($post) && $blog->save()) {
+                return $this->redirect('blog');
+            } else {
+                return $this->render('_blog_form', [ 'blog' => $blog ]);
+            }
+        }
+
         public function actionPortfolio()
         {
             return $this->render('portfolio');
@@ -127,7 +156,7 @@
                                             ->asArray()
                                             ->column();
             $post = \Yii::$app->request->post();
-            if(!empty($post)) {
+            if(!empty( $post )) {
                 $portfolio->load($post);
                 $portfolio->validate();
                 if(!$portfolio->hasErrors()) {
@@ -136,10 +165,13 @@
                     foreach($portfolio->specializationInput as $one_specialization) {
                         $portfolio->link('specializations', Specialization::findOne($one_specialization));
                     }
-                    return $this->render('portfolio');
+                    return $this->redirect('portfolio');
                 }
             }
-            return $this->render('_portfolio_form', [ 'portfolio' => $portfolio, 'specialization' => $specialization ]);
+            return $this->render('_portfolio_form', [
+                'portfolio'      => $portfolio,
+                'specialization' => $specialization,
+            ]);
         }
         public function actionPortfolioUpdate($id)
@@ -154,7 +186,7 @@
                                             ->asArray()
                                             ->column();
             $post = \Yii::$app->request->post();
-            if(!empty($post)) {
+            if(!empty( $post )) {
                 $portfolio->load($post);
                 $portfolio->validate();
                 if(!$portfolio->hasErrors()) {
@@ -163,10 +195,13 @@
                     foreach($portfolio->specializationInput as $one_specialization) {
                         $portfolio->link('specializations', Specialization::findOne($one_specialization));
                     }
-                    return $this->render('portfolio');
+                    return $this->redirect('portfolio');
                 }
             }
-            return $this->render('_portfolio_form', [ 'portfolio' => $portfolio, 'specialization' => $specialization ]);
+            return $this->render('_portfolio_form', [
+                'portfolio'      => $portfolio,
+                'specialization' => $specialization,
+            ]);
         }
         /**
@@ -360,6 +395,45 @@
             return $this->render('projects');
         }
+        public function actionProjectsCreate()
+        {
+            $project = new Project();
+            $specialization = Specialization::find()
+                                            ->select([
+                                                'specialization_name',
+                                                'specialization_id',
+                                            ])
+                                            ->indexBy('specialization_id')
+                                            ->asArray()
+                                            ->column();
+            $payment = Payment::find()
+                              ->select([
+                                  'name',
+                                  'payment_id',
+                              ])
+                              ->indexBy('payment_id')
+                              ->asArray()
+                              ->column();
+            $post = \Yii::$app->request->post();
+            if(!empty($post)) {
+                $project->load($post);
+                $project->validate();
+                if(!$project->hasErrors()) {
+                    $project->save();
+                    $project->unlinkAll('specializations', true);
+                    foreach($project->specializationInput as $one_specialization) {
+                        $project->link('specialization', Specialization::findOne($one_specialization));
+                    }
+                    $project->unlinkAll('payments', true);
+                    foreach($project->paymentInput as $one_payment) {
+                        $project->link('payment', Payment::findOne($one_payment));
+                    }
+                    return $this->redirect('projects');
+                }
+            }
+            return $this->render('_projects_form', [ 'project' => $project, 'specialization' => $specialization, 'payment' => $payment ]);
+        }
+
         public function actionGallery()
         {
+<?php
+    /**
+     * @var Blog $blog
+     */
+    use common\models\Blog;
+    use common\widgets\ImageUploader;
+    use mihaildev\ckeditor\CKEditor;
+    use yii\helpers\Html;
+    use yii\widgets\ActiveForm;
+
+    $this->title = 'Мой профиль';
+    $this->params[ 'breadcrumbs' ][] = $this->title;
+?>
+<h1><?= $this->title ?></h1>
+
+<?php
+    $form = ActiveForm::begin();
+?>
+
+<?= $form->field($blog, 'date_add')
+         ->textInput([ 'disabled' => 'disabled' ]) ?>
+
+<?= $form->field($blog, 'name')
+         ->textInput() ?>
+
+<?= $form->field($blog, 'link')
+         ->textInput() ?>
+
+<?= $form->field($blog, 'description')->widget(CKEditor::className()) ?>
+
+<?= ImageUploader::widget([
+    'model'=> $blog,
+    'field'=>'cover',
+    'width'=>100,
+    'height'=>100,
+    'multi'=>false,
+    'gallery' =>$blog->cover,
+    'name' => 'Загрузить главное фото'
+]);
+?>
+
+<?= Html::submitButton('Добавить') ?>
+
+<?php
+    $form->end();
+?>
+<?php
+use common\models\Option;
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use \common\widgets\MultiLangForm;
+
+    $this->title = 'Мой профиль';
+    $this->params['breadcrumbs'][] = $this->title;
+?>
+<h1><?=  $this->title ?></h1>
 \ No newline at end of file