test

Yarik
1 parent 816e328e
Showing 6 changed files with 53 additions and 29 deletions Show diff stats
common/models/Vacancy.php
common/models/VacancySearch.php
common/widgets/views/requirements_field.php
frontend/controllers/AccountsController.php
frontend/views/accounts/_vacancy_form.php
frontend/views/company/_company_list_view.php
@@ -29,6 +29,8 @@
     class Vacancy extends \yii\db\ActiveRecord
     {
+        const STATUS_ACTIVE = 1;
+        const STATUS_CLOSED = 3;
         /**
          * @inheritdoc
          */
@@ -82,10 +84,15 @@
                     'safe',
                 ],
                 [
-                    ['salary_currency'],
+                    ['salary_currency', 'status',],
                     'integer'
                 ],
                 [
+                    ['salary'],
+                    'integer',
+                    'min' => 0,
+                ],
+                [
                     [ 'employmentInput', 'specializationInput' ],
                     'default',
                     'value' => [],
@@ -96,6 +103,11 @@
                     'value' => 0,
                 ],
                 [
+                    [ 'status' ],
+                    'default',
+                    'value' => 1,
+                ],
+                [
                     [
                         'name',
                         'link',
@@ -112,16 +112,11 @@
             $query->andFilterWhere([
                 'like',
-                'name',
-                $this->name,
+                'LOWER(name)',
+                mb_strtolower($this->name),
             ])
                   ->andFilterWhere([
                       'like',
-                      'link',
-                      $this->link,
-                  ])
-                  ->andFilterWhere([
-                      'like',
                       'user_name',
                       $this->user_name,
                   ])
@@ -26,7 +26,7 @@
         <?php endfor; ?>
     </div>
-    <p class="btn btn-success add_field_<?= $this->context->id ?>">Добавить поле</p>
+    <p class="btn btn-success add_field_<?= $this->context->id ?>">Добавить еще</p>
 </fieldset>
 <script>
     var start_i_<?=$this->context->id?> = <?=$i?>;
@@ -416,16 +416,15 @@
             $post = \Yii::$app->request->post();
             if(!empty( $post )) {
-
-                if($user_info->load($post)){
+                if($user_info->load($post)) {
                     $user_info->save();
                 }
-                if($company_info->load($post)){
+                if($company_info->load($post)) {
                     $company_info->save();
                 }
-                if($user->load($post) && $user->save() ) {
+                if($user->load($post) && $user->save()) {
                     \Yii::$app->session->setFlash('userinfoupdate', 'Информация успешно обновлена');
                 } else {
                     \Yii::$app->session->setFlash('userinfoupdate', 'Ошибка обновления. Проверьте форму');
@@ -730,7 +729,7 @@
                     foreach($project->paymentInput as $one_payment) {
                         $project->link('payments', Payment::findOne($one_payment));
                     }
-                    return $this->redirect(['projects']);
+                    return $this->redirect([ 'projects' ]);
                 }
             }
             return $this->render('_projects_form', [
@@ -957,9 +956,9 @@
                     'department' => $department,
                     'country'    => $country,
                 ]);
-//                return $this->redirect([
-//                    'team',
-//                ]);
+                //                return $this->redirect([
+                //                    'team',
+                //                ]);
             } else {
                 return $this->render('_team_form', [
                     'team'       => $team,
@@ -1026,10 +1025,14 @@
                                              ->orderBy('specialization_id')
                                              ->all();
             $currencies = Currency::getCurrencyDropdown();
+            $user = \Yii::$app->user->identity;
             $post = \Yii::$app->request->post();
             if(!empty( $post )) {
                 $vacancy->load($post);
                 $vacancy->validate();
+                if(empty( $vacancy->specializationInput )) {
+                    $vacancy->addError('specializationInput');
+                }
                 if(!$vacancy->hasErrors()) {
                     $vacancy->save();
                     Fields::saveFieldData(Yii::$app->request->post('Fields'), $vacancy->vacancy_id, Vacancy::className(), 'ru');
@@ -1051,6 +1054,7 @@
                 'employment'      => $employment,
                 'currencies'      => $currencies,
                 'specializations' => $specializations,
+                'user'            => $user,
             ]);
         }
@@ -1083,6 +1087,7 @@
                                              ->where([ 'specialization_pid' => 0 ])
                                              ->orderBy('specialization_id')
                                              ->all();
+            $user = \Yii::$app->user->identity;
             $currencies = Currency::getCurrencyDropdown();
             $post = \Yii::$app->request->post();
             if(!empty( $post )) {
@@ -1111,6 +1116,7 @@
                 'employment'      => $employment,
                 'currencies'      => $currencies,
                 'specializations' => $specializations,
+                'user'            => $user,
             ]);
         }
@@ -4,6 +4,7 @@
      * @var Employment[] $employment
      * @var string[] $currencies
      * @var Specialization[] $specializations
+     * @var User $user
      */
     use common\components\Request;
     use common\models\Employment;
@@ -15,6 +16,7 @@
     use yii\helpers\Html;
     use yii\web\JsExpression;
     use yii\widgets\ActiveForm;
+    use common\models\User;
     $this->title = 'Вакансии';
     $this->params[ 'breadcrumbs' ][] = $this->title;
@@ -38,7 +40,7 @@
     <div class="input-blocks">
         <?= $form->field($vacancy, 'user_name')
             ->textInput (['class'=> 'custom-input-2']); ?>
-        <span class="admin-hint-vacancy-contact">Вы</span>
+        <span class="admin-hint-vacancy-contact form_auto_data" data-value="<?=$user->firstname.' '.$user->lastname?>">Вы</span>
     </div>
 </div>
@@ -46,7 +48,6 @@
     <div class="input-blocks">
         <?= $form->field($vacancy, 'phone')
                  ->textInput (['class'=> 'custom-input-2']); ?>
-        <span class="admin-hint-vacancy-contact">Ваш</span>
     </div>
 </div>
@@ -69,7 +70,7 @@
                 ],
             ]);
         ?>
-        <span class="admin-hint-vacancy-contact">Ваш</span>
+        <span class="admin-hint-vacancy-contact form_auto_data" data-value="<?=$user->userInfo->city?>">Ваш</span>
     </div>
 </div>
@@ -80,7 +81,7 @@
             'options'  => [ 'class' => 'form-inline' ],
         ])
             ->label('Заработная плата')
-            ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']);
+            ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number', 'min' => 0]);
         ?>
     </div>
     <div class="input-blocks admin-currency-second">
@@ -214,9 +215,14 @@
     $form->end();
 ?>
 <script>
-    $(document).ready(function(){
+    $(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');
+        });
+    });
 </script>
 \ No newline at end of file
 <?php
-use yii\helpers\Html;
-use yii\helpers\Url;
-
+    use yii\helpers\Html;
+    use yii\helpers\Url;
 ?>
 <div class="command-block-wrapper">
     <div class="command-block-wr-two">
         <div class="command-block-foto">
-            <?= Html::a(($model->photo ? Html::img($model->photo) : '') . '<div class="hover-command-bg"></div>', Url::toRoute(['#']))?>
+            <?= Html::a(( $model->photo ? Html::img($model->photo) : '' ) . '<div class="hover-command-bg"></div>', Url::toRoute([ '#' ])) ?>
         </div>
         <div class="command-block-name"><?= $model->user ?></div>
-        <div class="command-block-job"><?= $model->department->name ?></div>
+        <?php
+            if(!empty( $model->department->name )) {
+                ?>
+                <div class="command-block-job"><?= $model->department->name ?></div>
+                <?php
+            }
+        ?>
         <div class="command-block-line">
             <div class="command-block-line-left"></div>
             <div class="command-block-line-right"></div>