Merge remote-tracking branch 'origin/master'

Yarik
2 parents f819c230 ea8c5991
Showing 43 changed files with 81 additions and 114 deletions Show diff stats
.bowerrc
backend/views/specialization/_form.php
common/models/CompanyInfo.php
common/models/CompanyInfoSearch.php
common/models/Job.php
common/models/JobSearch.php
common/models/Specialization.php
common/widgets/FieldEditor.php
common/widgets/views/education_field.php
console/migrations/m160202_090343_user_add_fields.php
console/migrations/m160202_094943_user_info_country_city.php
console/migrations/m160203_133308_add_field_specialization.php
console/migrations/m160203_140144_add_field_user_info.php
frontend/assets/AppAsset.php
frontend/controllers/AccountsController.php
frontend/controllers/CompanyInfoController.php
frontend/controllers/JobController.php
frontend/controllers/SiteController.php
frontend/views/accounts/_form.php
frontend/views/accounts/_job_form.php
@@ -14,15 +14,24 @@ use yii\helpers\ArrayHelper;
  
     <?= $form->field($model, 'specialization_pid')->dropDownList(ArrayHelper::map($model->find()->all(), 'specialization_id', 'specialization_name'), ['prompt' => 'Выберие родителя']) ?>
     <?= $form->field($model, 'specialization_name')->textInput(['maxlength' => true]) ?>
-    <?= \common\widgets\ImageUploader::widget([
-        'model'=> $model,
-        'field'=>'img',
-        'width'=>240,
-        'height'=>160,
-        'multi'=>false,
-        'gallery' =>$model->img,
-        'name' => 'Загрузить картинку'
-    ]); ?>
+
+    <?php
+
+    echo $form->field($model, 'background')->textInput();
+
+    if($model->specialization_pid == 0 && !empty($model->specialization_id) ){
+       echo  \common\widgets\ImageUploader::widget([
+            'model'=> $model,
+            'field'=>'image',
+            'width'=>940,
+            'height'=>324,
+            'multi'=>false,
+            'gallery' =>$model->image,
+            'name' => 'Загрузить картинку'
+        ]);
+    }
+ ?>
+
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
@@ -10,10 +10,11 @@ use Yii;
  * @property integer $specialization_id
  * @property integer $specialization_pid
  * @property string $specialization_name
+ * @property string $image
+ * @property string $background
  */
 class Specialization extends \yii\db\ActiveRecord
 {
-    public $img;
     /**
      * @inheritdoc
      */
@@ -28,10 +29,10 @@ class Specialization extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['specialization_pid'], 'integer'],
+            [['specialization_pid','status'], 'integer'],
             [['specialization_pid'], 'default', 'value' => '0',],
             [['specialization_name'], 'required'],
-            [['specialization_name'], 'string', 'max' => 255],
+            [['specialization_name','image','background'], 'string', 'max' => 255],
         ];
     }
  
@@ -45,6 +46,9 @@ class Specialization extends \yii\db\ActiveRecord
             'specialization_pid' => 'Specialization Pid',
             'specialization_name' => 'Specialization Name',
             'specialization_parent_name' => 'Specialization Parent Name',
+            'image' => 'Картинка',
+            'background' => 'Background',
+            'status' => 'Status',
         ];
     }
  
@@ -54,4 +58,9 @@ class Specialization extends \yii\db\ActiveRecord
         return $this->hasOne(self::className(), ['specialization_id' => 'specialization_pid']);
     }
  
+    public function getChildren()
+    {
+        return $this->hasMany(self::className(), ['specialization_pid' => 'specialization_id']);
+    }
+
 }
@@ -33,6 +33,7 @@ class FieldEditor extends Widget
     protected function findModel()
     {
  
+
         if (($model = Fields::find()->where([
                 'table_id'=>$this->item_id,
                 'table_name'=>$this->model,
 <?php
 use yii\helpers\Html;
+
 ?>
 <fieldset>
  
@@ -8,16 +9,18 @@ use yii\helpers\Html;
     <p class="btn btn-success add_field">Добавить поле</p>
  
  
-    <?php for($i=1; $i <= count($model); $i++):
+    <?php    $t = 0; for($i=1; $i <= count($model); $i++):
         $row = $i;
+
         ?>
  
         <?= Html::beginTag('div',['class'=>'form-group','id'=>isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ])?>
-            <input type="text" placeholder="С" class="form-control" value="<?= isset($model[$i]['value']) ? $model[$i]['value'] : '' ?>" name="Fields[education][<?=$row?>][0][year_from]" />
-            <input type="text" placeholder="По"  class="form-control" value="<?= isset($model[++$i]['value']) ? $model[$i]['value'] : ''  ?>" name="Fields[education][<?=$row?>][1][year_to]" />
-            <textarea placeholder="Место" name="Fields[education][<?=$row?>][2][place]" /><?= isset($model[++$i]['value']) ? $model[$i]['value'] : '' ?></textarea>
+            <input type="text" placeholder="С" class="form-control" value="<?= isset($model[$t]['value']) ? $model[$t]['value'] : '' ?>" name="Fields[education][<?=$row?>][0][year_from]" />
+            <input type="text" placeholder="По"  class="form-control" value="<?= isset($model[++$t]['value']) ? $model[$t]['value'] : ''  ?>" name="Fields[education][<?=$row?>][1][year_to]" />
+            <textarea placeholder="Место" name="Fields[education][<?=$row?>][2][place]" /><?= isset($model[++$t]['value']) ? $model[$t]['value'] : '' ?></textarea>
             <span data-id="<?= isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
         <?= Html::endTag('div')?>
+        <?php $i = ++ $t; ?>
     <?php endfor; ?>
  
  
@@ -30,7 +33,7 @@ use yii\helpers\Html;
             var block = $(this).parent('fieldset');
             var block_id =  $(this).parent('fieldset');
             var sub_block = '<div class="form-group" >'+
-                '<input type="text" placeholder="С" class="form-control" value="" name="Fields[education]['+ start_i++ +'][0][year_from]" />'+
+                '<input type="text" placeholder="С" class="form-control" value="" name="Fields[education]['+ ++start_i +'][0][year_from]" />'+
                 '<input type="text" placeholder="По"  class="form-control" value="" name="Fields[education]['+ start_i +'][1][year_to]" />'+
                 '<textarea placeholder="Место" name="Fields[education]['+ start_i +'][2][place]" /></textarea>'+
                 '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>'+
@@ -19,7 +19,7 @@ class AppAsset extends AssetBundle
     public $css = [
         'css/style.css',
         '/admin/css/flags32.css',
-        //'https://fonts.googleapis.com/css?family=Roboto:400,700&subset=cyrillic,latin',
+        'https://fonts.googleapis.com/css?family=Roboto:400,700&subset=cyrillic,latin',
     ];
     public $js = [
         '/js/script.js',
@@ -48,11 +48,10 @@ class AccountsController extends Controller
  
         $langs = Language::getActiveLanguages();
  
-
         if ($user->load(Yii::$app->request->post()) && $user->save()) {
             $user->userInfo->load(Yii::$app->request->post());
             $user->userInfo->save();
-            Fields::saveFieldData( Yii::$app->request->post('Fields'), $user->id, $user::className());
+            Fields::saveFieldData( Yii::$app->request->post('Fields'), $user->id, $user::className(),'ru');
             return $this->render('cabinet', [
                 'user' => $user,
                 'user_info' => $user->userInfo,
 <?php
 namespace frontend\controllers;
  
+use common\models\Specialization;
 use common\models\UserInfo;
 use Yii;
 use common\models\LoginForm;
@@ -62,7 +63,11 @@ class SiteController extends Controller
      */
     public function actionIndex()
     {
-        return $this->render('index'); 
+        $specializations = Specialization::find()->where(['specialization_pid'=>0])->all();
+
+        return $this->render('index',[
+            'specializations' => $specializations,
+        ]);
     }
  
     /**
@@ -56,7 +56,7 @@ use mihaildev\elfinder\ElFinder;
     'template'=>'education',
     'item_id'=> $user->id,
     'model'=>'common\models\User',
-    'language'=>'0'
+    'language'=>'ru'
 ]); ?>
  
  
@@ -9,18 +9,6 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
 ?>
     <div class="wrap">
         <div class="container">
-            <div class="left_block">
-                <?php
-                echo Menu::widget([
-                    'options' => ['class' => 'nav nav-pills nav-stacked'],
-                    'items' => [
-                        ['label' => 'Кабинет', 'url' => ['accounts/cabinet']],
-
-                        ['label' => 'Выход', 'url' => ['/site/logout']],
-                    ],
-                ]);
-                ?>
-            </div>
             <div class="right_block">
                 <?= Breadcrumbs::widget([
                     'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
@@ -71,6 +59,10 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
                                             'label' => 'Галерея',
                                             'url' => ['accounts/gallery'],
                                         ],
+                                        [
+                                            'label' => 'Выход',
+                                            'url' => ['/site/logout']
+                                        ],
                                     ],
                                 ]);
                             ?>
@@ -3,7 +3,7 @@
 use yii\widgets\Breadcrumbs;
 use yii\widgets\Menu;
  
-\frontend\assets\AdminAsset::register($this);
+\frontend\assets\AppAsset::register($this);
 /* @var $content string */
 $this->beginContent('@app/views/layouts/main.php');
 ?>
 <?php
  
 use \yii\helpers\Html;
-
-/* @var $this yii\web\View */
+use \common\models\Specialization;
+/**
+ * @var $this yii\web\View
+ * @var $specializations common\models\Specialization
+ */
  
 $this->title = 'My Yii Application';
 ?>
@@ -49,83 +52,29 @@ $this-&gt;title = &#39;My Yii Application&#39;;
                 <div class="menu-two-wrapp-title">Специализация работ по исполнителям</div>
                 <div class="menu-two-wrapp" style="background: url('/images/menu-pic-1.jpg') 100% 100% no-repeat">
                     <ul class="content-menu-first">
-                        <li data-img="/images/menu-pic-1-2.jpg">
-                            <span data-menu-bg="#bb0f3f"  style="background: #bb0f3f"></span><a href="#">Жилые</a>
-                            <ul>
-                                <li>
-                                    <a href="#">Жилые дома</a>
-                                    <ul>
-                                        <li><a href="#">Дизайн</a></li>
-                                        <li>
-                                            <a href="#">Разработка градостроительной документации</a>
-                                            <ul>
-                                                <li><a href="#">Архитекторы</a></li>
-                                                <li><a href="#">Junior-архитекторы</a></li>
-                                            </ul>
-                                        </li>
-                                        <li><a href="#">Проектирование объектов архитектуры</a></li>
-                                        <li><a href="#">Инжиниринговая деятельность в сфере строительства</a>
-                                            <ul>
-                                                <li><a href="#">йййййй</a></li>
-                                                <li><a href="#">ййййййййййй</a></li>
-                                            </ul>
-                                        </li>
-                                        <li><a href="#">Анимация и реклама</a></li>
-                                    </ul>
-                                </li>
-                                <li><a href="#">Виллы</a></li>
-                                <li><a href="#">Коттеджи</a></li>
-                                <li><a href="#">Гостиницы</a></li>
-                                <li>
-                                    <a href="#">Базы отдыха</a>
-                                    <ul>
-                                        <li><a href="#">2---2</a></li>
-                                        <li><a href="#">2---3</a></li>
-                                        <li><a href="#">2---4</a></li>
-                                    </ul>
-                                </li>
-                                <li><a href="#">Таунхаусы</a></li>
-                                <li><a href="#">Квартиры</a></li>
-                                <li><a href="#">Квартиры</a></li>
-                                <li><a href="#">Квартиры</a></li>
-                            </ul>
-                        </li>
-                        <li data-img="/images/menu-pic-1.jpg">
-                            <span data-menu-bg="#ea640b"  style="background: #ea640b"></span><a href="#">Офисные</a>
-                            <ul>
-                                <li>
-                                    <a href="#">Коттеджи</a>
-                                    <ul>
-                                        <li><a href="#">1---1</a></li>
-                                        <li>
-                                            <a href="#">1---2</a>
-                                            <ul>
-                                                <li><a href="#">Архитекторы</a></li>
-                                                <li><a href="#">Junior-архитекторы</a></li>
-                                            </ul>
-                                        </li>
-                                        <li><a href="#">1---3</a></li>
-                                        <li><a href="#">1---4</a></li>
-                                    </ul>
-                                </li>
-                                <li><a href="#">Гостиницы</a></li>
-                                <li>
-                                    <a href="#">Базы отдыха</a>
-                                    <ul>
-                                        <li><a href="#">2---2</a></li>
-                                        <li><a href="#">2---3</a></li>
-                                        <li><a href="#">2---4</a></li>
-                                    </ul>
-                                </li>
-                            </ul>
-                        </li>
-                        <li data-img="/images/menu-pic-1-2.jpg"><span  data-menu-bg="#f7a901" style="background: #f7a901"></span><a href="#">Торговые</a></li>
-                        <li data-img="/images/menu-pic-1.jpg"><span  data-menu-bg="#53a827" style="background: #53a827"></span><a href="#">Мосты</a></li>
-                        <li data-img="/images/menu-pic-1-2.jpg"><span  data-menu-bg="#018232" style="background: #018232"></span><a href="#">Дороги</a></li>
-                        <li data-img="/images/menu-pic-1.jpg"><span  data-menu-bg="#02857d" style="background: #02857d"></span><a href="#">Сооружения</a></li>
-                        <li data-img="/images/menu-pic-1-2.jpg"><span  data-menu-bg="#019abf" style="background: #019abf"></span><a href="#">Склады</a></li>
-                        <li data-img="/images/menu-pic-1.jpg"><span  data-menu-bg="#116da8" style="background: #116da8"></span><a href="#">Заводы</a></li>
-                        <li data-img="/images/menu-pic-1-2.jpg"><span  data-menu-bg="#413e7f" style="background: #413e7f"></span><a href="#">Разное</a></li>
+                        <?php foreach($specializations as $specialization):?>
+                            <li data-img="<?= $specialization->image?>">
+                                <span data-menu-bg="<?= $specialization->background ?>"  style="background: <?= $specialization->background ?>"></span><a href="#"><?= $specialization->specialization_name?></a>
+                                <ul>
+                                    <?php  foreach($specialization->children as $child_first):?>
+
+                                       <?php if($child_first instanceof Specialization):?>
+                                            <li>
+                                                <a href="#"><?= $child_first->specialization_name?></a>
+                                                <ul>
+                                                    <?php foreach($child_first->children as $child_second):?>
+                                                        <?php if($child_first instanceof Specialization): ?>
+                                                            <li><a href="#"><?= $child_second->specialization_name?></a></li>
+                                                        <?php endif;?>
+                                                    <?php endforeach; ?>
+                                                </ul>
+                                            </li>
+                                        <?php endif; ?>
+                                    <?php endforeach; ?>
+
+                                </ul>
+                            </li>
+                        <?php endforeach; ?>
                     </ul>
                 </div>
             </div>