diff --git a/common/models/Job.php b/common/models/Job.php
index f15732c..d82d374 100755
--- a/common/models/Job.php
+++ b/common/models/Job.php
@@ -84,22 +84,43 @@
                     'string',
                     'max' => 255,
                 ],
+                [
+                    [
+                        'link',
+                    ],
+                    'match',
+                    'pattern' => '/^(?:https?:\/\/)?(?:w{3}\.)?'.preg_quote($_SERVER['HTTP_HOST']).'\/company\/\w+\/\d+$/i',
+                ],
             ];
         }
 
         public function getExpTime()
         {
-            if($this->date_end && $this->date_start) {
-                $date = new \DateTime(date('Y-m-d H:i:s', $this->date_start));
-                return \Yii::$app->formatter->asRelativeTime($date->diff(new \DateTime(date('Y-m-d H:i:s', $this->date_end))));
-            } elseif($this->date_start) {
-                $now = new \DateTime();
-                $date = new \DateTime(date('Y-m-d H:i:s', strtotime($this->date_start)));
-                return \Yii::$app->formatter->asRelativeTime($date->diff(new \DateTime()));
+            if(!empty($this->date_start) && !empty($this->date_end)) {
+                $result = '';
+                $start = new \DateTime($this->date_start);
+                $end =  new \DateTime($this->date_end);
+                $interval = $end->diff($start);
+                if(!empty($interval->y)) {
+                    if($interval->y) {
+                        $result
+                    }
+                }
+            } elseif(!empty($this->date_start)) {
+
             } else {
-                return 'неизвестна дата начала';
+                return false;
             }
-
+//            if($this->date_end && $this->date_start) {
+//                $date = new \DateTime(date('Y-m-d H:i:s', $this->date_start));
+//                return \Yii::$app->formatter->asRelativeTime($date->diff(new \DateTime(date('Y-m-d H:i:s', $this->date_end))));
+//            } elseif($this->date_start) {
+//                $now = new \DateTime();
+//                $date = new \DateTime(date('Y-m-d H:i:s', strtotime($this->date_start)));
+//                return \Yii::$app->formatter->asRelativeTime($date->diff(new \DateTime()));
+//            } else {
+//                return 'неизвестна дата начала';
+//            }
         }
 
         /**
diff --git a/common/models/User.php b/common/models/User.php
index 7649808..4c0a3f5 100755
--- a/common/models/User.php
+++ b/common/models/User.php
@@ -523,7 +523,7 @@
         public function getJobs()
         {
             return $this->hasMany(Job::className(), [ 'user_id' => 'id' ])
-                        ->orderBy([ 'current' => SORT_DESC ]);
+                        ->orderBy([ 'current' => SORT_DESC, 'date_start' => SORT_DESC]);
         }
 
         /**
diff --git a/frontend/controllers/PerformerController.php b/frontend/controllers/PerformerController.php
index ee1c271..7019972 100755
--- a/frontend/controllers/PerformerController.php
+++ b/frontend/controllers/PerformerController.php
@@ -250,7 +250,7 @@
 
         public function actionWorkplace($performer_id)
         {
-            $user = User::findOne($performer_id);
+            $user = User::find()->where(['id' => $performer_id])->with('jobs')->one();
             if(!$user instanceof User) {
                 throw new BadRequestHttpException('Пользователь не найден');
             }
diff --git a/frontend/views/accounts/_job_form.php b/frontend/views/accounts/_job_form.php
index 785a4b4..b17364d 100755
--- a/frontend/views/accounts/_job_form.php
+++ b/frontend/views/accounts/_job_form.php
@@ -1,75 +1,98 @@
 <?php
-/**
- * @var integer $index
- */
-use common\models\Job;
-use yii\helpers\Html;
-use yii\jui\DatePicker;
-use yii\widgets\ActiveForm;
+    /**
+     * @var integer $index
+     */
+    use common\models\Job;
+    use yii\helpers\Html;
+    use yii\jui\DatePicker;
+    use yii\widgets\ActiveForm;
 
-$model = new Job(['user_id' => \Yii::$app->user->getId (), 'current' => 0]);
-$form = ActiveForm::begin ();
+    $model = new Job([
+        'user_id' => \Yii::$app->user->getId(),
+        'current' => 0,
+    ]);
+    $form = ActiveForm::begin();
 ?>
-<div class='ajax-loaded'><div class='prev_job_inputs'>
+<div class='ajax-loaded'>
+    <div class='prev_job_inputs'>
         <div class="input-blocks-wrapper">
             <div class="input-blocks">
-                <?= $form->field ($model, '[' . $index . ']name')
-                    ->label ('Название')
-                    ->textInput (['class'=> 'custom-input-2']);
-                ?>
+                <?= $form->field($model, '[' . $index . ']name')
+                         ->label('Название')
+                         ->textInput([ 'class' => 'custom-input-2' ]); ?>
             </div>
         </div>
         <div class="input-blocks-wrapper">
             <div class="input-blocks">
-                <?= $form->field ($model, '[' . $index . ']link')
-                    ->label ('Ссылка на компанию на сайте МФП')
-                    ->textInput (['class'=> 'custom-input-2']);
-                ?>
+                <?= $form->field($model, '[' . $index . ']link')
+                         ->label('Ссылка на компанию на сайте МФП')
+                         ->hint('Пример: ' . $_SERVER[ 'HTTP_HOST' ] . '/company/common/1')
+                         ->textInput([ 'class' => 'custom-input-2' ]); ?>
             </div>
         </div>
         <div class="input-blocks-wrapper">
             <div class="input-blocks">
-                <?= $form->field ($model, '[' . $index . ']date_start')
-                    ->label ('Дата начала работы')
-                    ->widget (DatePicker::className (), ['options' => ['class' => 'custom-input-2'], 'language' => 'ru', 'dateFormat' => 'dd-MM-yyyy', 'clientOptions' => ['changeYear' => true, 'yearRange' => 'c-20:c', 'changeMonth' => true]]);
-                ?>
+                <?= $form->field($model, '[' . $index . ']date_start')
+                         ->label('Дата начала работы')
+                         ->widget(DatePicker::className(), [
+                             'options'       => [ 'class' => 'custom-input-2' ],
+                             'language'      => 'ru',
+                             'dateFormat'    => 'dd-MM-yyyy',
+                             'clientOptions' => [
+                                 'changeYear'  => true,
+                                 'yearRange'   => 'c-20:c',
+                                 'changeMonth' => true,
+                             ],
+                         ]); ?>
             </div>
         </div>
 
         <div class="input-blocks-wrapper">
             <div class="input-blocks">
-                <?= $form->field ($model, '[' . $index . ']date_end')
-                    ->label ('Дата окончания работы')
-                    ->widget (DatePicker::className (), ['options' => ['class' => 'custom-input-2'], 'language' => 'ru', 'dateFormat' => 'dd-MM-yyyy', 'clientOptions' => ['changeYear' => true, 'yearRange' => 'c-20:c', 'changeMonth' => true]]);
-                ?>
+                <?= $form->field($model, '[' . $index . ']date_end')
+                         ->label('Дата окончания работы')
+                         ->widget(DatePicker::className(), [
+                             'options'       => [ 'class' => 'custom-input-2' ],
+                             'language'      => 'ru',
+                             'dateFormat'    => 'dd-MM-yyyy',
+                             'clientOptions' => [
+                                 'changeYear'  => true,
+                                 'yearRange'   => 'c-20:c',
+                                 'changeMonth' => true,
+                             ],
+                         ]); ?>
             </div>
         </div>
 
         <div class="input-blocks-wrapper">
             <div class="input-blocks">
-                <?= $form->field ($model, '[' . $index . ']position')
-                    ->label ('Должность')
-                    ->textInput (['class'=> 'custom-input-2']);
-                ?>
+                <?= $form->field($model, '[' . $index . ']position')
+                         ->label('Должность')
+                         ->textInput([ 'class' => 'custom-input-2' ]); ?>
             </div>
         </div>
 
         <div class="input-blocks-wrapper admin-quantity-project">
             <div class="input-blocks">
-                <?= $form->field ($model, '[' . $index . ']total_count')
-                    ->label ('Количество проектов, в которых принимали участие')
-                    ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']);
-                ?>
+                <?= $form->field($model, '[' . $index . ']total_count')
+                         ->label('Количество проектов, в которых принимали участие')
+                         ->textInput([
+                             'class' => 'custom-input-2 custom-input-2-date',
+                             'type'  => 'number',
+                         ]); ?>
 
                 <div class="fix-quantity-project">
-                    <?= $form->field ($model, '[' . $index . ']complete_count')
-                        ->label ('из них реализовано')
-                        ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']);
-                    ?>
+                    <?= $form->field($model, '[' . $index . ']complete_count')
+                             ->label('из них реализовано')
+                             ->textInput([
+                                 'class' => 'custom-input-2 custom-input-2-date',
+                                 'type'  => 'number',
+                             ]); ?>
                 </div>
             </div>
         </div>
 
-        <?= Html::button('', ['class' => 'remove_job_button']);?>
-    </div></div>
-<?php $form->end (); ?>
+        <?= Html::button('', [ 'class' => 'remove_job_button' ]); ?>
+    </div>
+</div>
+<?php $form->end(); ?>
diff --git a/frontend/views/accounts/employment.php b/frontend/views/accounts/employment.php
index 5e22dde..ae8254d 100755
--- a/frontend/views/accounts/employment.php
+++ b/frontend/views/accounts/employment.php
@@ -32,6 +32,7 @@
             <div class="input-blocks">
                 <?= $form->field($current, '[0]link')
                          ->label('Ссылка на компанию на сайте МФП')
+                         ->hint('Пример: ' . $_SERVER[ 'HTTP_HOST' ] . '/company/common/1')
                          ->textInput([ 'class' => 'custom-input-2' ]); ?>
             </div>
         </div>
@@ -46,29 +47,40 @@
 
         <div class="input-blocks-wrapper">
             <div class="input-blocks">
-                <?= $form->field ($current, '[0]date_start', ['options' => ['class' => 'test2class']])
-                    ->label ('Дата начала работы')
-                    ->widget (DatePicker::className (), ['options' => ['class' => 'custom-input-2'], 'language' => 'ru', 'dateFormat' => 'dd-MM-yyyy', 'clientOptions' => ['changeYear' => true, 'yearRange' => 'c-20:c', 'changeMonth' => true]]);
-                ?>
+                <?= $form->field($current, '[0]date_start', [ 'options' => [ 'class' => 'test2class' ] ])
+                         ->label('Дата начала работы')
+                         ->widget(DatePicker::className(), [
+                             'options'       => [ 'class' => 'custom-input-2' ],
+                             'language'      => 'ru',
+                             'dateFormat'    => 'dd-MM-yyyy',
+                             'clientOptions' => [
+                                 'changeYear'  => true,
+                                 'yearRange'   => 'c-20:c',
+                                 'changeMonth' => true,
+                             ],
+                         ]); ?>
             </div>
         </div>
 
         <div class="input-blocks-wrapper admin-quantity-project">
             <div class="input-blocks">
-                <?= $form->field ($current, '[0]total_count')
-                    ->label ('Количество проектов, в которых принимали участие')
-                    ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']);
-                ?>
+                <?= $form->field($current, '[0]total_count')
+                         ->label('Количество проектов, в которых принимали участие')
+                         ->textInput([
+                             'class' => 'custom-input-2 custom-input-2-date',
+                             'type'  => 'number',
+                         ]); ?>
                 <div class="fix-quantity-project">
-                    <?= $form->field ($current, '[0]complete_count')
-                        ->label ('из них реализовано')
-                        ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']);
-                    ?>
+                    <?= $form->field($current, '[0]complete_count')
+                             ->label('из них реализовано')
+                             ->textInput([
+                                 'class' => 'custom-input-2 custom-input-2-date',
+                                 'type'  => 'number',
+                             ]); ?>
                 </div>
             </div>
 
 
-
         </div>
 
     </div>
@@ -77,7 +89,11 @@
             <div class="input-blocks">
                 <?= $form->field($user_info, 'experience')
                          ->label('Когда начали заниматься проектированием')
-                         ->input('number', [ 'class' => 'custom-input-2', 'min' => '1950', 'max' => date('Y') ]); ?>
+                         ->input('number', [
+                             'class' => 'custom-input-2',
+                             'min'   => '1950',
+                             'max'   => date('Y'),
+                         ]); ?>
             </div>
         </div>
     </div>
@@ -85,17 +101,15 @@
 <div class="prev_job_container style">
     <div class="login-left-column-title-two previous-employment-wr style">Предыдущие места работы</div>
     <?php
-    foreach ($job as $index => $job_model)
-    {
-    ?>
+        foreach($job as $index => $job_model) {
+            ?>
 
-    <div class='prev_job_inputs'>
+            <div class='prev_job_inputs'>
                 <div class="input-blocks-wrapper">
                     <div class="input-blocks">
-                        <?= $form->field ($job_model, '['. ($index + 1) .']name')
-                            ->label ('Название')
-                            ->textInput (['class'=> 'custom-input-2']);
-                        ?>
+                        <?= $form->field($job_model, '[' . ( $index + 1 ) . ']name')
+                                 ->label('Название')
+                                 ->textInput([ 'class' => 'custom-input-2' ]); ?>
                     </div>
                 </div>
 
@@ -103,100 +117,143 @@
                     <div class="input-blocks">
                         <?= $form->field($job_model, '[' . ( $index + 1 ) . ']link')
                                  ->label('Ссылка на компанию на сайте МФП')
+                                 ->hint('Пример: ' . $_SERVER[ 'HTTP_HOST' ] . '/company/common/1')
                                  ->textInput([ 'class' => 'custom-input-2' ]); ?>
                     </div>
                 </div>
 
                 <div class="input-blocks-wrapper">
                     <div class="input-blocks">
-                        <?= $form->field ($job_model, '['. ($index + 1) .']date_start')
-                            ->label ('Дата начала работы')
-                            ->widget (DatePicker::className (), ['options' => ['class' => 'custom-input-2'], 'language' => 'ru', 'dateFormat' => 'dd-MM-yyyy', 'clientOptions' => ['changeYear' => true, 'yearRange' => 'c-20:c', 'changeMonth' => true]]);
-                        ?>
+                        <?= $form->field($job_model, '[' . ( $index + 1 ) . ']date_start')
+                                 ->label('Дата начала работы')
+                                 ->widget(DatePicker::className(), [
+                                     'options'       => [ 'class' => 'custom-input-2' ],
+                                     'language'      => 'ru',
+                                     'dateFormat'    => 'dd-MM-yyyy',
+                                     'clientOptions' => [
+                                         'changeYear'  => true,
+                                         'yearRange'   => 'c-20:c',
+                                         'changeMonth' => true,
+                                     ],
+                                 ]); ?>
                     </div>
                 </div>
 
                 <div class="input-blocks-wrapper">
                     <div class="input-blocks">
-                        <?= $form->field ($job_model, '['. ($index + 1) .']date_end')
-                            ->label ('Дата окончания работы')
-                            ->widget (DatePicker::className (), ['options' => ['class' => 'custom-input-2'], 'language' => 'ru', 'dateFormat' => 'dd-MM-yyyy', 'clientOptions' => ['changeYear' => true, 'yearRange' => 'c-20:c', 'changeMonth' => true]]);
-                        ?>
+                        <?= $form->field($job_model, '[' . ( $index + 1 ) . ']date_end')
+                                 ->label('Дата окончания работы')
+                                 ->widget(DatePicker::className(), [
+                                     'options'       => [ 'class' => 'custom-input-2' ],
+                                     'language'      => 'ru',
+                                     'dateFormat'    => 'dd-MM-yyyy',
+                                     'clientOptions' => [
+                                         'changeYear'  => true,
+                                         'yearRange'   => 'c-20:c',
+                                         'changeMonth' => true,
+                                     ],
+                                 ]); ?>
                     </div>
                 </div>
 
                 <div class="input-blocks-wrapper">
                     <div class="input-blocks">
-                        <?= $form->field ($job_model, '['. ($index + 1) .']position')
-                            ->label ('Должность')
-                            ->textInput (['class'=> 'custom-input-2']);
-                        ?>
+                        <?= $form->field($job_model, '[' . ( $index + 1 ) . ']position')
+                                 ->label('Должность')
+                                 ->textInput([ 'class' => 'custom-input-2' ]); ?>
                     </div>
                 </div>
 
                 <div class="input-blocks-wrapper admin-quantity-project">
                     <div class="input-blocks">
-                        <?= $form->field ($job_model, '['. ($index + 1) .']total_count')
-                            ->label ('Количество проектов, в которых принимали участие')
-                            ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']);
-                        ?>
+                        <?= $form->field($job_model, '[' . ( $index + 1 ) . ']total_count')
+                                 ->label('Количество проектов, в которых принимали участие')
+                                 ->textInput([
+                                     'class' => 'custom-input-2 custom-input-2-date',
+                                     'type'  => 'number',
+                                 ]); ?>
                         <div class="fix-quantity-project">
-                        <?= $form->field ($job_model, '['. ($index + 1) .']complete_count')
-                            ->label ('из них реализовано')
-                            ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']);
-                        ?>
-                    </div>
+                            <?= $form->field($job_model, '[' . ( $index + 1 ) . ']complete_count')
+                                     ->label('из них реализовано')
+                                     ->textInput([
+                                         'class' => 'custom-input-2 custom-input-2-date',
+                                         'type'  => 'number',
+                                     ]); ?>
+                        </div>
                     </div>
                 </div>
-                <?= Html::button('', ['class' => 'remove_job_button']) ?>
-    </div>
-            <?php } ?>
+                <?= Html::button('', [ 'class' => 'remove_job_button' ]) ?>
+            </div>
+        <?php } ?>
 
 </div>
 
 <div class="add-field-employment fix_add-field-employment style">
-    <?=
-     Html::button('добавить еще место работы', ['id' => 'add_job_button', 'class' => 'btn']);
-    ?>
+    <?= Html::button('добавить еще место работы', [
+        'id'    => 'add_job_button',
+        'class' => 'btn',
+    ]); ?>
 </div>
 
 
 <div class="input-blocks-wrapper">
     <div class="admin-save-btn skills-save-btn  style">
-        <?= Html::submitButton('Сохранить',['class'=>'input-blocks-wrapper button']) ?>
+        <?= Html::submitButton('Сохранить', [ 'class' => 'input-blocks-wrapper button' ]) ?>
     </div>
 </div>
-        <?php
-             $form->end ();
-        ?>
+<?php
+    $form->end();
+?>
 <script>
-    $(function() {
-        var regexp = /^[\w]+\[(\d+)\].*$/;
-        $(document).on('click', '#add_job_button', function() {
-            var inputs = $('.prev_job_inputs').last();
-            var name = $(inputs).find('input, textarea').first().attr('name');
-            var result = regexp.exec(name);
-            var lastindex;
-            if(result != null) {
-                lastindex = result[1];
-            } else {
-                lastindex = 0;
-                $('.prev_job_container').removeClass('none-job-inputs')
-                $('.add-field-employment').removeClass('none-job-inputs')
-            }
-            $.get('/accounts/get-form', { lastindex: lastindex }, function(data) {
-                $('.prev_job_container').append($(data).find('.ajax-loaded').first().html());
-                $(data).filter('script').appendTo('body');
-            });
-
-        });
-        $(document).on('click', '.remove_job_button', function() {
-            $(this).parents('.prev_job_inputs').remove()
-            var prevEmploy =  $('.prev_job_inputs').length
-            if(prevEmploy<1){
+    $(
+        function()
+        {
+            var regexp = /^[\w]+\[(\d+)\].*$/;
+            var prevEmploy = $('.prev_job_inputs').length
+            if(prevEmploy < 1)
+            {
                 $('.prev_job_container').addClass('none-job-inputs')
                 $('.add-field-employment').addClass('none-job-inputs')
             }
-        });
-    });
+            $(document).on(
+                'click', '#add_job_button', function()
+                {
+                    var inputs = $('.prev_job_inputs').last();
+                    var name = $(inputs).find('input, textarea').first().attr('name');
+                    var result = regexp.exec(name);
+                    var lastindex;
+                    if(result != null)
+                    {
+                        lastindex = result[1];
+                    } else
+                    {
+                        lastindex = 0;
+                        $('.prev_job_container').removeClass('none-job-inputs')
+                        $('.add-field-employment').removeClass('none-job-inputs')
+                    }
+                    $.get(
+                        '/accounts/get-form', {lastindex : lastindex}, function(data)
+                        {
+                            $('.prev_job_container')
+                            .append($(data).find('.ajax-loaded').first().html());
+                            $(data).filter('script').appendTo('body');
+                        }
+                    );
+
+                }
+            );
+            $(document).on(
+                'click', '.remove_job_button', function()
+                {
+                    $(this).parents('.prev_job_inputs').remove()
+                    var prevEmploy = $('.prev_job_inputs').length
+                    if(prevEmploy < 1)
+                    {
+                        $('.prev_job_container').addClass('none-job-inputs')
+                        $('.add-field-employment').addClass('none-job-inputs')
+                    }
+                }
+            );
+        }
+    );
 </script>
diff --git a/frontend/views/layouts/performer.php b/frontend/views/layouts/performer.php
index 068e6bd..b8ce798 100755
--- a/frontend/views/layouts/performer.php
+++ b/frontend/views/layouts/performer.php
@@ -186,12 +186,18 @@
                                         <li><img src="/images/sidebar-ico/ico-13.png" alt=""/>
                                             <div class="sidebarvievstxt"><?= implode(', ', ArrayHelper::getColumn($this->params[ 'user' ]->payments, 'name')) ?></div>
                                         </li>
-                                        <li><img src="/images/sidebar-ico/ico-14.png" alt=""/>
-                                            <div class="sidebarvievstxt">
-                                                <span class="sidebar-views-txt">Текущее место работы:<br/></span><?= isset( $this->params[ 'user' ]->currentJob ) ? $this->params[ 'user' ]->currentJob->name : "" ?>
-                                            </div>
-                                        </li>
-
+                                        <?php
+                                            if(!empty( $this->params[ 'user' ]->currentJob )) {
+                                                ?>
+                                                <li>
+                                                    <img src="/images/sidebar-ico/ico-14.png" alt=""/>
+                                                    <div class="sidebarvievstxt">
+                                                        <span class="sidebar-views-txt">Текущее место работы:<br/></span><?= $this->params[ 'user' ]->currentJob->name ?>
+                                                    </div>
+                                                </li>
+                                                <?php
+                                            }
+                                        ?>
                                     </ul>
                                 </div>
                             </div>
--
libgit2 0.21.4