Merge branch 'master' of gitlab.artweb.com.ua:steska/clinica

Alex Savenko
2 parents 4fc465c1 d15518de
Showing 7 changed files with 132 additions and 94 deletions Show diff stats
clinica
common/models/Question.php
common/models/Service.php
common/models/ServiceLang.php
frontend/controllers/SiteController.php
frontend/views/site/questions.php
frontend/web/contacts/joule.vcf
-Subproject commit 8b1b0efde228ff71e43eba90086e0c15392645cc
@@ -150,4 +150,5 @@
         {
             return $this->hasOne(Doctor::className(), [ 'id' => 'doctor_id' ]);
         }
+        
     }
@@ -2,6 +2,7 @@
 namespace common\models;
+use artbox\core\models\Alias;
 use artbox\core\models\Image;
 use artbox\core\models\traits\AliasableTrait;
 use backend\behaviors\LevelBehavior;
@@ -5,7 +5,8 @@
     use artbox\core\models\Alias;
     use artbox\core\models\Language;
     use Yii;
-    
+    use yii\helpers\Json;
+
     /**
      * This is the model class for table "service_lang".
      *
 <?php
     namespace frontend\controllers;
+    use artbox\core\models\Alias;
     use artbox\core\models\Feedback;
+    use artbox\core\models\Language;
     use common\models\Comment;
     use common\models\Package;
     use common\models\Question;
@@ -13,10 +15,13 @@
     use yii\db\ActiveQuery;
     use yii\db\Expression;
     use yii\filters\VerbFilter;
+    use yii\helpers\ArrayHelper;
+    use yii\helpers\Json;
     use yii\swiftmailer\Mailer;
     use yii\web\BadRequestHttpException;
     use yii\web\Controller;
     use yii\web\Response;
+    use yii\helpers\VarDumper as d;
     /**
      * Site controller
@@ -224,6 +229,7 @@
         }
         public function actionQuestions($service_id = null){
+            Language::getCurrent();
             if (\Yii::$app->request->isAjax){
                 Yii::$app->response->format = Response::FORMAT_JSON;
@@ -248,11 +254,16 @@
                    ],
                 ]);
             $services = Service::find()->where(['status' => true])->andWhere(['parent_id' => null])->all();
-            
+            $route = [];
+            foreach ($services as $service){
+               $route[] = Json::encode(['site/questions', 'service_id' => $service->id]);
+            }
+            $alias = Alias::find()->where(['route' => $route])->andWhere(['language_id' => Language::getCurrent()->id])->indexBy('route')->asArray()->all();
             return $this->render('questions', [
                'dataProvider' => $dataProvider,
                'services'  => $services,
-               'service_id' => $service_id
+               'service_id' => $service_id,
+                'alias' => $alias
             ]);
         }
 <?php
     /**
      * @var \yii\data\ActiveDataProvider $dataProvider
-     * @var  \common\models\Service[] $services
-     * @var \yii\web\View $this
-     * @var int $service_id
+     * @var  \common\models\Service[]    $services
+     * @var \yii\web\View                $this
+     * @var int                          $service_id
+     * @var array $alias;
      */
     use artbox\core\helpers\Url;
     use common\models\Question;
     use yii\helpers\ArrayHelper;
     use yii\helpers\Html;
+    use yii\helpers\Json;
     use yii\widgets\ActiveForm;
     use yii\widgets\ListView;
+    use yii\helpers\VarDumper as d;
+    use artbox\core\models\Alias;
-    $this->params[ 'breadcrumbs'][] = \Yii::t('app', 'Quest/Answer');
+    $this->params[ 'breadcrumbs' ][] = \Yii::t('app', 'Quest/Answer');
-    $model = new Question(['service_id' => $service_id]);
+    $model = new Question([ 'service_id' => $service_id ]);
     $model->scenario = Question::SCENARIO_QUESTION;
-    $data = ['' =>\Yii::t('app','General issues')] + ArrayHelper::map($services, 'id', 'title');
-    ?>
+    $data = [ '' => \Yii::t('app', 'General issues') ] + ArrayHelper::map($services, 'id', 'title');
+?>
 <section class="section-service-page section-answer-page">
-    <div class="container">
-        <div class="row">
-            <div class="col-xs-12 col-sm-12">
-                <h1 class="title-pages"><?=\Yii::t('app','Quest/Answer')?></h1>
-            </div>
+  <div class="container">
+    <div class="row">
+      <div class="col-xs-12 col-sm-12">
+        <h1 class="title-pages"><?= \Yii::t('app', 'Quest/Answer') ?></h1>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-xs-12 col-sm-12">
+        <div class="style add-answer-forms">
+          <span class="btn_"><?= \Yii::t('app', 'Asc question'); ?></span>
         </div>
-        <div class="row">
-            <div class="col-xs-12 col-sm-12">
-                <div class="style add-answer-forms">
-                    <span class="btn_"><?=\Yii::t('app','Asc question');?></span>
-                </div>
-                <div class="style hidden-answer-comment-form hidden">
-                    <div class="hidden-answer-comment-form-title"><?=\Yii::t('app','Asc question');?></div>
-                    <?php $form = ActiveForm::begin(['id' => 'total_question_form'])?>
-                        <div class="col-xs-12 col-sm-6">
-                            <div class="input-wr">
-                              <?=$form->field($model, 'service_id')->dropDownList($data)
-                                  ->label(\Yii::t('app','Choosing department'))?>
-                            </div>
-
-                            <div class="input-wr required">
-                                <?=$form->field($model, 'name')
-                                    ->label(\Yii::t('app','FIO'))?>
-                            </div>
-                            <div class="input-wr required">
-                                <?=$form->field($model, 'email')
-                                    ->label(\Yii::t('app','Email'))?>
-                            </div>
-                        </div>
-                        <div class="col-xs-12 col-sm-6">
-                            <div class="input-wr">
-                              <?=$form->field($model, 'question')->textarea(['cols' => 30, 'rows' => 10])
-                                  ->label(\Yii::t('app','Yours question'))?>
-<!--                                <label class="control-label" for="feedback-name">Ваш вопрос</label>-->
-<!--                                <textarea name="" id="" cols="30" rows="10"></textarea>-->
-                            </div>
-                        </div>
-                        <div class="col-xs-12 col-sm-12">
-                            <div class="button-wr submit-close-wr-c-a">
-                              <?=Html::submitButton(\Yii::t('app','Send question'))?>
-<!--                                <button type="submit">Отправить вопрос</button>-->
-                                <div class="submit-close-c-a submit-close-c-a-page">
-                                    <span><?=\Yii::t('app','Minimize a window');?></span></div>
-                            </div>
-                        </div>
-                    <?php $form::end();?>
-                </div>
+        <div class="style hidden-answer-comment-form hidden">
+          <div class="hidden-answer-comment-form-title"><?= \Yii::t('app', 'Asc question'); ?></div>
+            <?php $form = ActiveForm::begin([ 'id' => 'total_question_form' ]) ?>
+          <div class="col-xs-12 col-sm-6">
+            <div class="input-wr">
+                <?= $form->field($model, 'service_id')
+                         ->dropDownList($data)
+                         ->label(\Yii::t('app', 'Choosing department')) ?>
             </div>
-            <div class="col-xs-12 col-sm-12">
-                <ul class="answers-category-list">
-                    <li  <?=($service_id == null ? 'class="active"' : '')?>>
-                        <a href="<?=Url::current(['service_id' => null])?>">
-                            <span><?=\Yii::t('app','General issues');?></span></a></li>
-                    <?php foreach ($services as $service){?>
-                    <li <?=($service_id == $service->id ? 'class="active"' : '')?>>
-                        <a href="<?=Url::current(['service_id' => $service->id])?>"><span><?=$service->title?></span></a></li>
-                  <?php } ?>
-                </ul>
+            
+            <div class="input-wr required">
+                <?= $form->field($model, 'name')
+                         ->label(\Yii::t('app', 'FIO')) ?>
             </div>
-            <div class="col-xs-12 col-sm-12">
-                <div class="service-comments-wr style">
-                  <?php echo ListView::widget(
-                      [
-                          'itemOptions'  => [
-                          ],
-                          'layout'       => '{items}',
-                          'dataProvider' => $dataProvider,
-                          'itemView'     => '_question'
-                      ]
-                  );?>
-                  
-
-                    <div class="style navi-c-a">
-                        <?php  echo \frontend\widgets\FrontendPager::widget(
-                            [
-                                'pagination'     => $dataProvider->pagination,
-                                'prevPageLabel'  => 'previous',
-                                'nextPageLabel'  => 'next',
-                                'maxButtonCount' => 3,
-                                'lastPageLabel'  => 'last_number',
-                            ]
-                        );?>
-                    </div>
-
-
-                </div>
+            <div class="input-wr required">
+                <?= $form->field($model, 'email')
+                         ->label(\Yii::t('app', 'Email')) ?>
+            </div>
+          </div>
+          <div class="col-xs-12 col-sm-6">
+            <div class="input-wr">
+                <?= $form->field($model, 'question')
+                         ->textarea(
+                             [
+                                 'cols' => 30,
+                                 'rows' => 10,
+                             ]
+                         )
+                         ->label(\Yii::t('app', 'Yours question')) ?>
+              <!--                                <label class="control-label" for="feedback-name">Ваш вопрос</label>-->
+              <!--                                <textarea name="" id="" cols="30" rows="10"></textarea>-->
             </div>
+          </div>
+          <div class="col-xs-12 col-sm-12">
+            <div class="button-wr submit-close-wr-c-a">
+                <?= Html::submitButton(\Yii::t('app', 'Send question')) ?>
+              <!--                                <button type="submit">Отправить вопрос</button>-->
+              <div class="submit-close-c-a submit-close-c-a-page">
+                <span><?= \Yii::t('app', 'Minimize a window'); ?></span></div>
+            </div>
+          </div>
+            <?php $form::end(); ?>
+        </div>
+      </div>
+      <div class="col-xs-12 col-sm-12">
+        <ul class="answers-category-list">
+          <li <?= ( $service_id == null ? 'class="active"' : '' ) ?>>
+            <a href="<?= Url::current([ 'service_id' => null ]) ?>">
+              <span><?= \Yii::t('app', 'General issues'); ?></span></a></li>
+            <?php foreach ($services as $service) {
+              $route = Json::encode(['site/questions', 'service_id' => $service->id]);
+              ?>
+              <li <?= ( $service_id == $service->id ? 'class="active"' : '' ) ?>>
+                <a href="<?= ( array_key_exists($route, $alias) ) ? Url::to(
+                    [ 'alias' => $alias[$route] ]
+                ) : Url::current([ 'service_id' => $service->id ]) ?>"><span><?= $service->title ?></span></a></li>
+            <?php } ?>
+        
+        
+        </ul>
+      </div>
+      <div class="col-xs-12 col-sm-12">
+        <div class="service-comments-wr style">
+            <?php echo ListView::widget(
+                [
+                    'itemOptions'  => [],
+                    'layout'       => '{items}',
+                    'dataProvider' => $dataProvider,
+                    'itemView'     => '_question',
+                ]
+            ); ?>
+          
+          
+          <div class="style navi-c-a">
+              <?php echo \frontend\widgets\FrontendPager::widget(
+                  [
+                      'pagination'     => $dataProvider->pagination,
+                      'prevPageLabel'  => 'previous',
+                      'nextPageLabel'  => 'next',
+                      'maxButtonCount' => 3,
+                      'lastPageLabel'  => 'last_number',
+                  ]
+              ); ?>
+          </div>
+        
+        
         </div>
+      </div>
     </div>
+  </div>
 </section>
+BEGIN:VCARD
+VERSION:2.1
+N:;
+joule.net.ua;;;
+FN:joule.net.ua
+SOUND;X-IRMC-N:;;;;
+TEL;CELL:+380676198730
+TEL;CELL:+380444655420
+END:VCARD