Merge remote-tracking branch 'origin/master'

Виталий
2 parents fa403e14 b3ef6f91
Showing 8 changed files with 231 additions and 118 deletions Show diff stats
common/models/CompanyInfo.php
common/models/UserInfo.php
console/migrations/m160309_124241_add_vacancy_status.php
console/migrations/m160310_080610_hide_email_to_user_info.php
frontend/views/accounts/_vacancy_form.php
frontend/views/accounts/general.php
frontend/views/company/_vacancy_list_view.php
frontend/views/company/vacancy-view.php
@@ -11,7 +11,6 @@
      * @property integer $staff
      * @property string  $street
      * @property string  $house
-     * @property integer $hide_mail
      */
     class CompanyInfo extends \yii\db\ActiveRecord
     {
@@ -45,10 +44,6 @@
                     'string',
                 ],
                 [
-                    [ 'hide_mail' ],
-                    'integer',
-                ],
-                [
                     [ 'staff' ],
                     'default',
                     'value' => 1,
@@ -72,7 +67,6 @@
                 'staff'           => Yii::t('app', 'Количество сотрудников'),
                 'street'          => Yii::t('app', 'Улица'),
                 'house'           => Yii::t('app', 'Дом'),
-                'hide_mail'       => Yii::t('app', 'не публиковать Email'),
             ];
         }
     }
@@ -30,6 +30,7 @@
      * @property string  $geography
      * @property integer $salary_currency
      * @property string $email
+     * @property integer $hide_mail
      */
     class UserInfo extends \yii\db\ActiveRecord
     {
@@ -215,6 +216,17 @@
                     ],
                     'email',
                 ],
+                [
+                    [ 'hide_mail' ],
+                    'integer',
+                    'min' => 0,
+                    'max' => 1,
+                ],
+                [
+                    ['hide_mail'],
+                    'default',
+                    'value' => 0,
+                ]
             ];
         }
@@ -268,6 +280,7 @@
                 'salary_currency' => Yii::t('app', 'Валюта'),
                 'is_customer'     => '',
                 'is_freelancer'   => '',
+                'hide_mail'       => Yii::t('app', 'не публиковать Email'),
             ];
         }
+<?php
+
+use yii\db\Migration;
+
+class m160309_124241_add_vacancy_status extends Migration
+{
+    public function up()
+    {
+        $this->addColumn('{{%vacancy}}', 'status', $this->integer()->defaultValue(1));
+    }
+
+    public function down()
+    {
+        $this->dropColumn('{{%vacancy}}', 'status');
+    }
+}
+<?php
+
+use yii\db\Migration;
+
+class m160310_080610_hide_email_to_user_info extends Migration
+{
+    public function up()
+    {
+        $this->dropColumn('{{%company_info}}', 'hide_mail');
+        $this->addColumn('{{%user_info}}', 'hide_mail', $this->smallInteger()->defaultValue(0));
+    }
+
+    public function down()
+    {
+        $this->dropColumn('{{%user_info}}', 'hide_mail');
+        $this->addColumn('{{%company_info}}', 'hide_mail', $this->smallInteger()->defaultValue(0));
+    }
+}
 <?php
     /**
-     * @var Vacancy $vacancy
-     * @var Employment[] $employment
-     * @var string[] $currencies
+     * @var Vacancy          $vacancy
+     * @var Employment[]     $employment
+     * @var string[]         $currencies
      * @var Specialization[] $specializations
-     * @var User $user
+     * @var User             $user
      */
     use common\components\Request;
     use common\models\Employment;
@@ -30,47 +30,70 @@
 <div class="input-blocks-wrapper">
     <div class="input-blocks">
         <?= $form->field($vacancy, 'name')
-            ->textInput (['class'=> 'custom-input-2']); ?>
+                 ->textInput([ 'class' => 'custom-input-2' ]); ?>
     </div>
 </div>
-
 <div class="input-blocks-wrapper">
     <div class="input-blocks">
         <?= $form->field($vacancy, 'user_name')
-            ->textInput (['class'=> 'custom-input-2']); ?>
-        <span class="admin-hint-vacancy-contact form_auto_data" data-value="<?=$user->firstname.' '.$user->lastname?>">Вы</span>
+                 ->textInput([ 'class' => 'custom-input-2' ]); ?>
+        <?php
+            if(!empty( $user->firstname ) && !empty( $user->lastname )) {
+                echo Html::tag('span', 'Вы', [
+                        'class'      => 'admin-hint-vacancy-contact form_auto_data',
+                        'data-value' => $user->firstname . ' ' . $user->lastname,
+                        'title'      => 'Вставить данные с Вашего личного кабинета',
+                    ]);
+            }
+        ?>
     </div>
 </div>
-
 <div class="input-blocks-wrapper">
     <div class="input-blocks">
         <?= $form->field($vacancy, 'phone')
-                 ->textInput (['class'=> 'custom-input-2']); ?>
+                 ->textInput([ 'class' => 'custom-input-2' ]); ?>
+        <?php
+            if(!empty($user->getPhones()[1]['phone'])) {
+                echo Html::tag('span', 'Вы', [
+                    'class'      => 'admin-hint-vacancy-contact form_auto_data',
+                    'data-value' => $user->getPhones()[1]['phone'],
+                    'title'      => 'Вставить данные с Вашего личного кабинета',
+                ]);
+            }
+        ?>
     </div>
 </div>
 <div class="input-blocks-wrapper">
     <div class="input-blocks">
-        <?=
-            $form->field($vacancy, 'city')->widget(Select2::classname(), [
-                'options' => ['placeholder' => 'Выбор города ...'],
-                'pluginOptions' => [
-                    'allowClear' => true,
-                    'minimumInputLength' => 3,
-                    'ajax' => [
-                        'url' => \yii\helpers\Url::to(['site/city']),
-                        'dataType' => 'json',
-                        'data' => new JsExpression('function(params) { return {q:params.term}; }')
-                    ],
-                    'escapeMarkup' => new JsExpression('function (markup) { return markup; }'),
-                    'templateResult' => new JsExpression('function(city) { return city.text; }'),
-                    'templateSelection' => new JsExpression('function (city) { return city.text; }'),
-                ],
-            ]);
+        <?= $form->field($vacancy, 'city')
+                 ->hint('Город, в котором предлагается работа', ['tag' => 'span'])
+                 ->widget(Select2::classname(), [
+                     'options'       => [ 'placeholder' => 'Выбор города ...' ],
+                     'pluginOptions' => [
+                         'allowClear'         => true,
+                         'minimumInputLength' => 3,
+                         'ajax'               => [
+                             'url'      => \yii\helpers\Url::to([ 'site/city' ]),
+                             'dataType' => 'json',
+                             'data'     => new JsExpression('function(params) { return {q:params.term}; }'),
+                         ],
+                         'escapeMarkup'       => new JsExpression('function (markup) { return markup; }'),
+                         'templateResult'     => new JsExpression('function(city) { return city.text; }'),
+                         'templateSelection'  => new JsExpression('function (city) { return city.text; }'),
+                     ],
+                 ]); ?>
+        <?php
+            if(!empty( $user->userInfo->city )) {
+                echo Html::tag('span', 'Ваш', [
+                        'class'      => 'admin-hint-vacancy-contact form_auto_data',
+                        'data-value' => $user->userInfo->city,
+                        'title'      => 'Вставить данные с Вашего личного кабинета',
+                    ]);
+            }
         ?>
-        <span class="admin-hint-vacancy-contact form_auto_data" data-value="<?=$user->userInfo->city?>">Ваш</span>
     </div>
 </div>
@@ -80,18 +103,19 @@
             'template' => "{label}<br /><span class='admn-input-txt'>от</span>{input}\n{hint}\n{error}",
             'options'  => [ 'class' => 'form-inline' ],
         ])
-            ->label('Заработная плата')
-            ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number', 'min' => 0]);
-        ?>
+                 ->label('Заработная плата')
+                 ->textInput([
+                     'class' => 'custom-input-2 custom-input-2-date',
+                     'type'  => 'number',
+                     'min'   => 0,
+                 ]); ?>
     </div>
     <div class="input-blocks admin-currency-second">
-        <?=
-        $form->field($vacancy, 'salary_currency', [
+        <?= $form->field($vacancy, 'salary_currency', [
             'template' => "{input}\n{hint}\n{error}",
         ])
-            ->label(false)
-            ->dropDownList($currencies)
-        ?>
+                 ->label(false)
+                 ->dropDownList($currencies) ?>
     </div>
 </div>
@@ -119,15 +143,15 @@
                                                 <li>
                                                     <a href="#" title="<?= $child_second->specialization_name ?>">
                                                         <?= $form->field($vacancy, "specializationInput[{$child_second->specialization_id}]", [
-                                                            'template'     => '{input}{label}{hint}{error}',
+                                                            'template' => '{input}{label}{hint}{error}',
                                                         ])
-                                                            ->label('<span></span>' . $child_second->specialization_name)
-                                                            ->checkbox([
-                                                                'value'   => $child_second->specialization_id,
-                                                                'label'   => NULL,
-                                                                'uncheck' => NULL,
-                                                                'class' => 'custom-check',
-                                                            ], false) ?>
+                                                                 ->label('<span></span>' . $child_second->specialization_name)
+                                                                 ->checkbox([
+                                                                     'value'   => $child_second->specialization_id,
+                                                                     'label'   => NULL,
+                                                                     'uncheck' => NULL,
+                                                                     'class'   => 'custom-check',
+                                                                 ], false) ?>
                                                     </a>
                                                 </li>
                                             <?php endif; ?>
@@ -148,65 +172,67 @@
     </div>
 </div>
-<div class="admin-specialization-selected style"><ul></ul></div>
+<div class="admin-specialization-selected style">
+    <ul></ul>
+</div>
 <div class="input-blocks-wrapper admin-vacancy-check admin-vacancy-check-fx-marg" style="margin-top: 19px">
     <div class="input-blocks">
         <?= $form->field($vacancy, 'employmentInput')
-            ->checkboxList($employment,
-                [
-                    'item' => function($index, $label, $name, $checked, $value) {
-                        $return = '<div class="admin-who-check-payment">';
-                        $return .= '<input class="custom-check" id="select_admin_payment'.$value.'" type="checkbox" name="' . $name . '" value="' . $value . '" '.($checked ? "checked" :"").' >';
-                        $return .= '<label for="select_admin_payment'.$value.'" >';
-                        $return .= '<span></span>' . ucwords($label);
-                        $return .= '</label>';
-                        $return .= '</div>';
-                        return $return;
-                    }
-                ]
-            ) ?>
+                 ->checkboxList($employment, [
+                     'item' => function($index, $label, $name, $checked, $value) {
+                         $return = '<div class="admin-who-check-payment">';
+                         $return .= '<input class="custom-check" id="select_admin_payment' . $value . '" type="checkbox" name="' . $name . '" value="' . $value . '" ' . ( $checked ? "checked" : "" ) . ' >';
+                         $return .= '<label for="select_admin_payment' . $value . '" >';
+                         $return .= '<span></span>' . ucwords($label);
+                         $return .= '</label>';
+                         $return .= '</div>';
+                         return $return;
+                     },
+                 ]) ?>
     </div>
 </div>
 <div class="skills-admin-wrapper style">
     <div class="input-blocks-wrapper skills-programs">
         <div class="input-blocks">
-            <?= FieldEditor::widget (
-                [
-                    'template' => 'requirements', 'item_id' => $vacancy->vacancy_id, 'model' => 'common\models\Vacancy', 'language' => 'ru',
-                ]
-            ); ?>
+            <?= FieldEditor::widget([
+                'template' => 'requirements',
+                'item_id'  => $vacancy->vacancy_id,
+                'model'    => 'common\models\Vacancy',
+                'language' => 'ru',
+            ]); ?>
         </div>
     </div>
 </div>
 <div class="input-blocks-wrapper full-blocks admin-editor-bl">
     <div class="input-blocks">
-        <?= $form->field($vacancy, 'description')->widget(CKEditor::className()) ?>
+        <?= $form->field($vacancy, 'description')
+                 ->widget(CKEditor::className()) ?>
     </div>
 </div>
 <div class="admin-save-btn skills-save-btn admin-add-remove-wr style">
-    <?= Html::submitButton($vacancy->isNewRecord?'Добавить':'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?>
+    <?= Html::submitButton($vacancy->isNewRecord ? 'Добавить' : 'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?>
     <div class="admin-remove-note">
         <?php
-        if(!$vacancy->isNewRecord) {
-            echo Html::a('Удалить', [
-                'accounts/vacancy-delete',
-                'id' => $vacancy->vacancy_id,
-            ], [
-                'title'        => 'Удалить',
-                'aria-label'   => 'Удалить',
-                'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?',
-                'data-method'  => 'post',
-                'data-pjax'    => 0,
-            ]);
-        }
+            if(!$vacancy->isNewRecord) {
+                echo Html::a('Удалить', [
+                    'accounts/vacancy-delete',
+                    'id' => $vacancy->vacancy_id,
+                ], [
+                    'title'        => 'Удалить',
+                    'aria-label'   => 'Удалить',
+                    'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?',
+                    'data-method'  => 'post',
+                    'data-pjax'    => 0,
+                ]);
+            }
         ?>
     </div>
     <div class="admin-back-note">
-        <?= Html::a('вернуться', Request::getIsLocal(\Yii::$app->request->referrer)?\Yii::$app->request->referrer:['accounts/vacancy' ]) ?>
+        <?= Html::a('вернуться', Request::getIsLocal(\Yii::$app->request->referrer) ? \Yii::$app->request->referrer : [ 'accounts/vacancy' ]) ?>
     </div>
 </div>
@@ -215,14 +241,34 @@
     $form->end();
 ?>
 <script>
-    $(function() {
-        $('.input-blocks.admin-currency-second select').change(function(){
-            $(this).blur()
-        });
-        $(document).on('click', '.form_auto_data', function() {
-            var value = $(this).data('value');
-            var container = $(this).parents('.input-blocks').first();
-            $('#vacancy-city').select2().val(value).trigger('change');
-        });
-    });
+    $(
+        function()
+        {
+            $('.input-blocks.admin-currency-second select').change(
+                function()
+                {
+                    $(this).blur()
+                }
+            );
+            $(document).on(
+                'click', '.form_auto_data', function()
+                {
+                    var value = $(this).data('value');
+                    var container = $(this).parents('.input-blocks').first();
+                    var select = $(container).find('select[data-krajee-select2]').first();
+                    if(select.length >= 1)
+                    {
+                        $(select)
+                        .append('<option value="' + value + '" selected>' + value + '</option>');
+                        var id = $(select).attr('id');
+                        $(container).find('#select2-' + id + '-container').attr('title', value);
+                        $(container).find('#select2-' + id + '-container').text(value);
+                    } else
+                    {
+                        $(container).find('input, textarea').val(value);
+                    }
+                }
+            );
+        }
+    );
 </script>
 \ No newline at end of file
@@ -176,7 +176,7 @@
             ?>
             </div>
             <div class="input-blocks hide-mail-check">
-            <?= $form->field ($company_info, 'hide_mail', ['options' => ['class' => 'form-group', ], 'template' => "{input}{label}\n{hint}\n{error}"])
+            <?= $form->field ($user_info, 'hide_mail', ['options' => ['class' => 'form-group', ], 'template' => "{input}{label}\n{hint}\n{error}"])
                       ->label ('<span></span>не публиковать Email')
                       ->checkbox (['checked'=>'checked', 'class'=> 'custom-check'], false);
             ?>
 <?php
-use frontend\helpers\TextHelper;
-use yii\bootstrap\Html;
-use yii\helpers\Url;
-use yii\i18n\Formatter;
+    use frontend\helpers\TextHelper;
+    use yii\bootstrap\Html;
+    use yii\helpers\Url;
+    use yii\helpers\StringHelper;
 ?>
 <div class="performer-vacant-reclam-bl">
-    <?= Html::a($model->name, Url::toRoute( ['company/vacancy-view', 'company_id' => $model->user_id,'link' => $model->link]), ['class' => 'performer-vacant-reclam-bl-title']) ?>
-    <div class="performer-vacant-reclam-bl-title-two"> <?= $model->city ?>  <?= \Yii::$app->formatter->asDatetime($model->date_add, 'Y-MM-dd') ?>  <?=$model->salary ?> <?=$model->salaryCurrency->label ?> </div>
+    <?= Html::a($model->name, Url::toRoute([
+        'company/vacancy-view',
+        'company_id' => $model->user_id,
+        'link'       => $model->link,
+    ]), [ 'class' => 'performer-vacant-reclam-bl-title' ]) ?>
+    <div class="performer-vacant-reclam-bl-title-two">
+        <?= $model->city ?>
+        <?= \Yii::$app->formatter->asDatetime($model->date_add, 'Y-MM-dd') ?>
+        <?php
+            if(!empty( $model->salary )) {
+                ?>
+                <?= $model->salary ?>
+                <?= $model->salaryCurrency->label ?>
+                <?php
+            }
+        ?>
+    </div>
     <div class="performer-vacant-reclam-bl-content">
-        <span><?= TextHelper::truncateHtmlText($model->description, 200, '...') ?></span>
-         <?= Html::a('<img src="/images/performar_vacancy/arrow-post.png" alt=""/>', ['vacancy-view', 'company_id' => $model->user_id,'vacancy_id' => $model->vacancy_id], ['class' => 'performer-vacant-reclam-bl-content-read']) ?>
+        <span>
+            <?= TextHelper::truncateHtmlText($model->description, 200, '...') ?>
+        </span>
+        <?= Html::a('<img src="/images/performar_vacancy/arrow-post.png" alt=""/>', [
+            'company/vacancy-view',
+            'company_id' => $model->user_id,
+            'link'       => $model->link,
+        ], [ 'class' => 'performer-vacant-reclam-bl-content-read' ]) ?>
     </div>
 </div>
 \ No newline at end of file
 <?php
     /**
-     * @var $this yii\web\View
-     * @var User $company
+     * @var         $this yii\web\View
+     * @var User    $company
      * @var Vacancy $vacancy
      */
@@ -10,12 +10,15 @@
     use yii\helpers\ArrayHelper;
     use yii\helpers\Html;
-    $this->params[ 'company'] = $company;
-$this->title = 'My Yii Application';
+    $this->params[ 'company' ] = $company;
+    $this->title = 'My Yii Application';
 ?>
 <div class="performer-vacancy-list style">
     <?php
-    echo Html::a('к списку вакансий', ['vacancy-list', 'company_id' => $company->id]);
+        echo Html::a('к списку вакансий', [
+            'vacancy-list',
+            'company_id' => $company->id,
+        ]);
     ?>
 </div>
 <div class="performer-vacancy-blocks-desk-wr style">
@@ -24,24 +27,26 @@ $this-&gt;title = &#39;My Yii Application&#39;;
     <div class="performance-vacancy-page-options style">
         <ul>
             <?php
-            if(!empty($vacancy->user_name)) {
-                echo "<li><span>Контактное лицо:</span><p>{$vacancy->user_name}</p></li>";
-            }
+                if(!empty( $vacancy->user_name )) {
+                    echo "<li><span>Контактное лицо:</span><p>{$vacancy->user_name}</p></li>";
+                }
+                if(!empty( $vacancy->phone )) {
+                    echo "<li><span>Телефон:</span><p>{$vacancy->phone}</p></li>";
+                }
             ?>
-            <li><span>Телефон:</span><p>XXX XXX-XX-XX</p></li>
             <?php
-                if(!empty($vacancy->city)) {
+                if(!empty( $vacancy->city )) {
                     echo "<li><span>Город:</span><p>{$vacancy->city}</p></li>";
                 }
             ?>
             <?php
-                if(!empty($vacancy->employments)) {
-                    echo "<li><span>Вид занятости:</span><p>".implode(', ', ArrayHelper::getColumn($vacancy->employments, 'name'))."</p></li>";
+                if(!empty( $vacancy->employments )) {
+                    echo "<li><span>Вид занятости:</span><p>" . implode(', ', ArrayHelper::getColumn($vacancy->employments, 'name')) . "</p></li>";
                 }
             ?>
             <?php
-                if(!empty($vacancy->requirements)) {
-                    echo "<li><span>Требования:</span><p>".implode(', ', ArrayHelper::getColumn($vacancy->requirements, 'requirements'))."</p></li>";
+                if(!empty( $vacancy->requirements )) {
+                    echo "<li><span>Требования:</span><p>" . implode(', ', ArrayHelper::getColumn($vacancy->requirements, 'requirements')) . "</p></li>";
                 }
             ?>
         </ul>
@@ -49,7 +54,7 @@ $this-&gt;title = &#39;My Yii Application&#39;;
     <div class="performance-vacancy-description style">Описание вакансии</div>
     <div class="performance-vacancy-desc-txt style">
         <?php
-        echo $vacancy->description;
+            echo $vacancy->description;
         ?>
     </div>
     <div class="performance-vacancy-desc-form style">
@@ -67,7 +72,7 @@ $this-&gt;title = &#39;My Yii Application&#39;;
         <div class="performance-vacancy-similar-blocks-wr style">
             <a href="#" class="performer-vacant-reclam-bl-title">Разнорабочий (в Бровары)</a>
-            <div class="performer-vacant-reclam-bl-title-two">Наш Дом. Киев. </div>
+            <div class="performer-vacant-reclam-bl-title-two">Наш Дом. Киев.</div>
         </div>
         <div class="performance-vacancy-similar-blocks-wr style">