- doctors

- add doctor to question

- doctors
- add doctor to question
Anastasia
1 parent fab1487f
Showing 14 changed files with 590 additions and 7 deletions Show diff stats
backend/controllers/DoctorController.php
backend/controllers/QuestionController.php
backend/views/layouts/menu_items.php
backend/views/question/_form.php
backend/views/question/update.php
common/models/Doctor.php
common/models/DoctorLang.php
common/models/Question.php
console/migrations/m180531_104933_create_doctor_table.php
console/migrations/m180531_111128_create_doctor_lang_table.php
console/migrations/m180531_115620_alter_table_question.php
frontend/controllers/SiteController.php
frontend/views/service/view.php
frontend/views/site/_question.php
+<?php
+    /**
+     * Created by PhpStorm.
+     * User: stes
+     * Date: 31.05.18
+     * Time: 14:30
+     */
+    
+    namespace backend\controllers;
+    
+    use artbox\core\admin\actions\Create;
+    use artbox\core\admin\actions\Delete;
+    use artbox\core\admin\actions\Index;
+    use artbox\core\admin\actions\Update;
+    use artbox\core\admin\actions\View;
+    use artbox\core\admin\interfaces\ControllerInterface;
+    use artbox\core\admin\widgets\Form;
+    use common\models\Doctor;
+    use yii\filters\AccessControl;
+    use yii\filters\VerbFilter;
+    use yii\web\Controller;
+    use yii\web\NotFoundHttpException;
+
+    class DoctorController extends Controller implements ControllerInterface
+    {
+        public function behaviors()
+        {
+            return [
+                'verbs'  => [
+                    'class'   => VerbFilter::className(),
+                    'actions' => [
+                        'delete' => [ 'POST' ],
+                    ],
+                ],
+                'access' => [
+                    'class' => AccessControl::className(),
+                    'rules' => [
+                        [
+                            'allow' => true,
+                            'roles' => [ '@' ],
+                        ],
+                    ],
+                ],
+            ];
+        }
+    
+        public function actions()
+        {
+            return [
+                'index'  => [
+                    'class'            => Index::className(),
+                    'columns'          => [
+                        'name'      => [
+                            'type' => Index::ACTION_COL,
+                        ],
+                        
+                        'position' => [
+                            'type' => Index::STRING_COL,
+                        ],
+                        'sort'       => [
+                            'type' => Index::POSITION_COL,
+                        ],
+                        'status'    => [
+                            'type' => Index::STATUS_COL,
+                        ],
+                    ],
+                    'model'            => Doctor::className(),
+                    'hasLanguage'      => true,
+                    'enableMassDelete' => true,
+                    'modelPrimaryKey'  => 'id',
+                ],
+                'create' => array_merge([ 'class' => Create::className() ], self::fieldsConfig()),
+                'update' => array_merge([ 'class' => Update::className() ], self::fieldsConfig()),
+                'view'   => [
+                    'class'          => View::className(),
+                    'model'          => Doctor::className(),
+                    'hasAlias'       => true,
+                    'languageFields' => [
+                        [
+                            'name' => 'name',
+                            'type' => Form::STRING,
+                        ],
+                        [
+                            'name' => 'position',
+                            'type' => Form::STRING,
+                        ],
+                        [
+                            'name' => 'description',
+                            'type' => Form::WYSIWYG,
+                        ],
+                    ],
+                    'fields'         => [
+                        [
+                            'name'              => 'service_id',
+                            'type'              => Form::RELATION,
+                            'relationAttribute' => 'title',
+                            'relationName'      => 'service',
+                            'multiple'          => false,
+                        ],
+                    ],
+                ],
+                'delete' => [
+                    'class' => Delete::className(),
+                ],
+            ];
+        }
+    
+        public function findModel($id)
+        {
+            $model = Doctor::find()
+                            ->with('languages')
+                            ->where([ 'id' => $id ])
+                            ->one();
+            if ($model !== null) {
+                return $model;
+            } else {
+                throw new NotFoundHttpException('The requested page does not exist.');
+            }
+        }
+    
+        public function newModel()
+        {
+            return new Doctor();
+        }
+    
+        public function deleteModel($id)
+        {
+            $page = Doctor::find()
+                           ->with('languages.alias')
+                           ->where(
+                               [
+                                   'id' => $id,
+                               ]
+                           )
+                           ->one();
+            $langs = call_user_func(
+                [
+                    $page,
+                    'getVariationModels',
+                ]
+            );
+            foreach ($langs as $lang) {
+                if ($lang->alias !== null) {
+                    $lang->alias->delete();
+                }
+            }
+        
+            return $page->delete();
+        }
+    
+        protected static function fieldsConfig()
+        {
+            return [
+                'model'          => Doctor::className(),
+                'hasAlias'       => true,
+                'languageFields' => [
+                    [
+                        'name' => 'name',
+                        'type' => Form::STRING,
+                        'decorate' => true
+                    ],
+                    [
+                        'name' => 'description',
+                        'type' => Form::WYSIWYG,
+                    ],
+                    [
+                        'name' => 'position',
+                        'type' => Form::STRING,
+                    ],
+                ],
+                'fields'         => [
+                    [
+                        'name' => 'image_id',
+                        'type' => Form::IMAGE
+                    ],
+                    [
+                        'name'              => 'service_id',
+                        'type'              => Form::RELATION,
+                        'relationAttribute' => 'title',
+                        'relationName'      => 'service',
+                        'multiple'          => false,
+                    ],
+                    [
+                        'name' => 'status',
+                        'type' => Form::BOOL,
+                    ],
+                    [
+                        'name' => 'sort',
+                        'type' => Form::NUMBER,
+                    ],
+                ],
+            ];
+        }
+        
+    }
 \ No newline at end of file
@@ -12,6 +12,7 @@
     use artbox\core\admin\actions\Index;
     use artbox\core\admin\actions\View;
     use artbox\core\admin\widgets\Form;
+    use common\models\Doctor;
     use common\models\Question;
     use common\models\Service;
     use yii\filters\AccessControl;
@@ -133,6 +134,9 @@
             $model = $this->findModel($id);
             $services = Service::find()->all();
             $data = ArrayHelper::map($services, 'id', 'title');
+    
+            $doctors = Doctor::find()->all();
+            $dataDoctors = ArrayHelper::map($doctors, 'id', 'name');
             $model->scenario = Question::SCENARIO_ANSWER;
             if ($model->load(\Yii::$app->request->post()) && $model->save()) {
                 return $this->redirect('index');
@@ -141,7 +145,8 @@
                     'update',
                     [
                         'model' => $model,
-                        'services' => $data
+                        'services' => $data,
+                        'doctors'  => $dataDoctors
                     ]
                 );
             }
@@ -65,6 +65,11 @@
                         'url'    => [ '/package/index' ],
                     ],
+                    [
+                        'label'  => \Yii::t('app', 'Doctors'),
+                        'url'    => [ '/doctor/index' ],
+
+                    ],
                 ],
             ],
@@ -8,6 +8,7 @@
     /* @var $this yii\web\View */
     /* @var $model \common\models\Question */
     /* @var $form yii\widgets\ActiveForm */
+    /* @var $doctors \common\models\Doctor[]*/
     Switchery::register($this);
     $js = <<< JS
 $('.switchery').each(function(idx, elem) {
@@ -18,6 +19,7 @@ $(&#39;.switchery&#39;).each(function(idx, elem) {
 });
 $(".select_service").select2();
+$(".select_doctors").select2();
 JS;
@@ -30,6 +32,9 @@ JS;
     <?=$form->field($model, 'service_id')->dropDownList($services, [
         'class' => 'select_service'
     ])?>
+    <?=$form->field($model, 'doctor_id')->dropDownList($doctors, [
+        'class' => 'select_doctors'
+    ])?>
     <?= $form->field($model, 'name')
              ->textInput([ 'maxlength' => true ]) ?>
@@ -4,6 +4,7 @@
     /* @var $this yii\web\View */
     /* @var $model \common\models\Question */
+    /* @var $doctors \common\models\Doctor[]*/
     $this->title = Yii::t(
             'app',
@@ -40,6 +41,7 @@
     [
         'model' => $model,
         'services' => $services,
+        'doctors'  => $doctors
     ]
 ) ?>
+<?php
+
+namespace common\models;
+
+use artbox\core\models\Image;
+use artbox\core\models\Language;
+use artbox\core\models\traits\AliasableTrait;
+use Yii;
+use yii\db\ActiveQuery;
+use yii\helpers\Json;
+use yii2tech\ar\position\PositionBehavior;
+use yii2tech\ar\variation\VariationBehavior;
+
+/**
+ * This is the model class for table "doctor".
+ *
+ * @property int $id
+ * @property int $service_id
+ * @property bool $status
+ * @property int $sort
+ *
+ * @property Service $service
+ * @property DoctorLang[] $doctorLangs
+ * @property Language[] $languages
+ * * from VariationBehavior
+ * @method ActiveQuery  hasDefaultVariationRelation();
+ */
+class Doctor extends \yii\db\ActiveRecord
+{
+    use AliasableTrait;
+    /**
+     * {@inheritdoc}
+     */
+    public static function tableName()
+    {
+        return 'doctor';
+    }
+    public function behaviors()
+    {
+        return [
+            'translations'         => [
+                'class'                             => VariationBehavior::className(),
+                'variationsRelation'                => 'languages',
+                'defaultVariationRelation'          => 'language',
+                'variationOptionReferenceAttribute' => 'language_id',
+                'optionModelClass'                  => Language::className(),
+                'defaultVariationOptionReference'   => function () {
+                    return Language::getCurrent()->id;
+                },
+                'optionQueryFilter'                 => function (ActiveQuery $query) {
+                    $query->where(
+                        [
+                            'status' => true,
+                        ]
+                    );
+                },
+            ],
+            'positionBehavior'     => [
+                'class'             => PositionBehavior::className(),
+                'positionAttribute' => 'sort',
+            ],
+        ];
+    }
+    /**
+     * {@inheritdoc}
+     */
+    public function rules()
+    {
+        return [
+            [['service_id', 'sort'], 'default', 'value' => null],
+            [['service_id', 'sort'], 'integer'],
+            [['status'], 'boolean'],
+            [['service_id'], 'exist', 'skipOnError' => true, 'targetClass' => Service::className(), 'targetAttribute' => ['service_id' => 'id']],
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => Yii::t('app', 'ID'),
+            'service_id' => Yii::t('app', 'Service ID'),
+            'status' => Yii::t('app', 'Status'),
+            'sort' => Yii::t('app', 'Sort'),
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getService()
+    {
+        return $this->hasOne(Service::className(), ['id' => 'service_id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getLanguages()
+    {
+        return $this->hasMany(DoctorLang::className(), ['doctor_id' => 'id']);
+    }
+    
+    public function getLanguage(){
+        return $this->hasDefaultVariationRelation();
+    }
+    
+    /**
+     * @return string
+     */
+    public function getRoute()
+    {
+        return Json::encode(
+            [
+                'doctor/view',
+                'id' => $this->id,
+            ]
+        );
+    }
+    
+    public function getImage(){
+        return $this->hasOne(Image::className(), ['id' => 'image_id']);
+    }
+}
+<?php
+
+namespace common\models;
+
+use artbox\core\models\Alias;
+use artbox\core\models\Language;
+use Yii;
+
+/**
+ * This is the model class for table "doctor_lang".
+ *
+ * @property int $language_id
+ * @property int $alias_id
+ * @property int $doctor_id
+ * @property string $name
+ * @property string $position
+ * @property string $description
+ *
+ * @property Alias $alias
+ * @property Doctor $doctor
+ * @property Language $language
+ */
+class DoctorLang extends \yii\db\ActiveRecord
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function tableName()
+    {
+        return 'doctor_lang';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rules()
+    {
+        return [
+            [['language_id', 'alias_id', 'doctor_id'], 'default', 'value' => null],
+            [['language_id', 'alias_id', 'doctor_id'], 'integer'],
+            [['description'], 'string'],
+            [['name', 'position'], 'string', 'max' => 255],
+            [['language_id', 'doctor_id'], 'unique', 'targetAttribute' => ['language_id', 'doctor_id']],
+            [['alias_id'], 'exist', 'skipOnError' => true, 'targetClass' => Alias::className(), 'targetAttribute' => ['alias_id' => 'id']],
+            [['doctor_id'], 'exist', 'skipOnError' => true, 'targetClass' => Doctor::className(), 'targetAttribute' => ['doctor_id' => 'id']],
+            [['language_id'], 'exist', 'skipOnError' => true, 'targetClass' => Language::className(), 'targetAttribute' => ['language_id' => 'id']],
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function attributeLabels()
+    {
+        return [
+            'language_id' => Yii::t('app', 'Language ID'),
+            'alias_id' => Yii::t('app', 'Alias ID'),
+            'doctor_id' => Yii::t('app', 'Doctor ID'),
+            'name' => Yii::t('app', 'Name'),
+            'position' => Yii::t('app', 'Position'),
+            'description' => Yii::t('app', 'Description'),
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getAlias()
+    {
+        return $this->hasOne(Alias::className(), ['id' => 'alias_id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getDoctor()
+    {
+        return $this->hasOne(Doctor::className(), ['id' => 'doctor_id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getLanguage()
+    {
+        return $this->hasOne(Language::className(), ['id' => 'language_id']);
+    }
+}
@@ -47,7 +47,8 @@
                     ],
                     self::SCENARIO_ANSWER => [
                         'answer',
-                        'status'
+                        'status',
+                        'doctor_id'
                     ],
                 ]
             );
@@ -91,6 +92,7 @@
                         'service_id',
                         'created_at',
                         'updated_at',
+                        'doctor_id'
                     ],
                     'integer',
                 ],
@@ -143,4 +145,9 @@
         {
             return $this->hasOne(Service::className(), [ 'id' => 'service_id' ]);
         }
+    
+        public function getDoctor()
+        {
+            return $this->hasOne(Doctor::className(), [ 'id' => 'doctor_id' ]);
+        }
     }
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Handles the creation of table `odctor`.
+ */
+class m180531_104933_create_doctor_table extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $this->createTable('doctor', [
+            'id' => $this->primaryKey(),
+            'service_id' => $this->integer(),
+            'status' => $this->boolean(),
+            'sort' => $this->integer(),
+            'image_id' => $this->integer()
+        ]);
+        
+        $this->addForeignKey('doctor_service_fk',
+                            'doctor',
+                            'service_id',
+                            'service',
+                            'id',
+                            'SET NULL',
+                            'CASCADE');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        $this->dropTable('doctor');
+    }
+}
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Handles the creation of table `doctor_lang`.
+ */
+class m180531_111128_create_doctor_lang_table extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $this->createTable('doctor_lang', [
+            'language_id' => $this->integer(),
+            'alias_id'    => $this->integer(),
+            'doctor_id'   => $this->integer(),
+            'name'        => $this->string(),
+            'position'    => $this->string(),
+            'description' => $this->text()
+        ]);
+        
+        $this->addPrimaryKey('doctor_lang_pk', 'doctor_lang', ['language_id', 'doctor_id']);
+        
+        $this->addForeignKey('doctor_lang_language_fk',
+                            'doctor_lang',
+                            'language_id',
+                            'language',
+                            'id');
+        $this->addForeignKey('doctor_lang_doctor_fk',
+                            'doctor_lang',
+                            'doctor_id',
+                            'doctor',
+                            'id',
+                            'CASCADE',
+                            'CASCADE');
+        
+        $this->addForeignKey('doctor_lang_alias_fk',
+                            'doctor_lang',
+                            'alias_id',
+                            'alias',
+                            'id',
+                            'CASCADE',
+                            'CASCADE');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        $this->dropForeignKey('doctor_lang_language_fk', 'doctor_lang');
+        $this->dropForeignKey('doctor_lang_doctor_fk', 'doctor_lang');
+        $this->dropForeignKey('doctor_lang_alias_fk', 'doctor_lang');
+        $this->dropTable('doctor_lang');
+    }
+}
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Class m180531_115620_alter_table_question
+ */
+class m180531_115620_alter_table_question extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $this->addColumn('question', 'doctor_id', $this->integer());
+        
+        $this->addForeignKey('question_doctor_fk',
+                            'question',
+                            'doctor_id',
+                            'doctor',
+                            'id',
+                            'SET NULL',
+                            'CASCADE');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        $this->dropForeignKey('question_doctor_fk', 'question');
+        $this->dropColumn('coctor_id', 'question');
+    }
+
+    /*
+    // Use up()/down() to run migration code without a transaction.
+    public function up()
+    {
+
+    }
+
+    public function down()
+    {
+        echo "m180531_115620_alter_table_question cannot be reverted.\n";
+
+        return false;
+    }
+    */
+}
@@ -239,7 +239,7 @@
                 }
             }
             $dataProvider = new ActiveDataProvider([
-                   'query' => Question::find()->where(['status' => true])->andFilterWhere(['service_id' => $service_id]),
+                   'query' => Question::find()->where(['status' => true])->andFilterWhere(['service_id' => $service_id])->with(['doctor.language']),
                    'pagination' => [
                        'pageSize' => 10,
                    ],
@@ -71,7 +71,7 @@
           <?php }?>
         </div>
-        <div class="style service-links-c-a"><a href="#">Все отзывы</a></div>
+        <div class="style service-links-c-a"><a href="<?=Url::to(['site/comments'])?>">Все отзывы</a></div>
         <div class="style service-c-a-btns">
           <span class="btn_">Оставить отзыв</span>
         </div>
@@ -91,7 +91,9 @@
             <div class="style comments-h-autor"><?=$question->name?></div>
             <div class="style comments-h-text"><?=$question->question?> </div>
             <div class="service-ansvers-text-wr style">
-              <div class="service-ansvers-title">врач-гинеколог <span>Алексей нестеренко</span></div>
+              <?php if ($question->doctor !== null){?>
+              <div class="service-ansvers-title"><?=$question->doctor->position?><span><?=$question->doctor->name?></span></div>
+              <?php }?>
               <div class="service-ansvers-txt">
                 <?=$question->answer?>
               </div>
@@ -101,7 +103,7 @@
         </div>
         <?php } ?>
-        <div class="style service-links-c-a service-links-a"><a href="#">Все вопросы</a></div>
+        <div class="style service-links-c-a service-links-a"><a href="<?=Url::to(['site/questions'])?>">Все вопросы</a></div>
         <div class="style service-c-a-btns">
           <span class="btn_">Задать вопрос</span>
         </div>
@@ -14,7 +14,9 @@
         <?php }?>
     </div>
     <div class="service-ansvers-text-wr style">
-        <div class="service-ansvers-title">врач-гинеколог <span>Алексей нестеренко</span></div>
+      <?php if ($model->doctor !== null){?>
+        <div class="service-ansvers-title"><?=$model->doctor->position?> <span><?=$model->doctor->name?></span></div>
+      <?php }?>
         <div class="service-ansvers-txt">
             <?=$model->answer?>
         </div>