manager employee fix

backend/modules/employee/views/manager-employee/_form.php

@@ -17,8 +17,8 @@ use yii\widgets\ActiveForm;
 
     <?= $form->field($model, 'manager_id')->widget(Select2::className(),
         [
-            'data' => Manager::find()->select(['fio', 'manager.id'])
-                ->joinWith('userCard')->indexBy('manager.id')->column(),
+            'data' => Manager::find()->select(['email', 'manager.id'])
+                ->joinWith('user')->indexBy('manager.id')->column(),
             'options' => ['placeholder' => '...','class' => 'form-control'],
             'hideSearch' => false,
             'pluginOptions' => [
@@ -26,18 +26,16 @@ use yii\widgets\ActiveForm;
             ],
         ]) ?>
 
-    <?= $form->field($model, 'user_card_id')->widget(Select2::className(),
+    <?= $form->field($model, 'employee_id')->widget(
+        Select2::class,
         [
-            'data' => UserCard::find()->select(['fio', 'user_card.id'])
-                ->joinWith('manager')->where(['manager.user_card_id' => null])->indexBy('user_card.id')->column(),
-            'options' => ['placeholder' => '...','class' => 'form-control'],
-            'hideSearch' => false,
+            'data' => \common\models\UserCard::getListUserWithUserId(),
+            'options' => ['placeholder' => '...', 'class' => 'form-control'],
             'pluginOptions' => [
-                'allowClear' => true,
-                'multiple' => true,
-                'closeOnSelect' => false
+                'allowClear' => true
             ],
-        ]) ?>
+        ]
+    ); ?>
 
     <div class="form-group">
         <?= Html::submitButton('Сохранить', ['class' => 'btn btn-success']) ?>

backend/modules/employee/views/manager-employee/index.php

@@ -26,17 +26,11 @@ $this->params['breadcrumbs'][] = $this->title;
             ['class' => 'yii\grid\SerialColumn'],
             [
                 'attribute' => 'manager_id',
-                'filter' => UserCard::find()->select(['fio', 'user_card.id'])
-                    ->joinWith('manager')->where(['not',['manager.user_card_id' => null]])
-                    ->indexBy('user_card.id')->column(),
-                'value' => 'manager.userCard.fio',
+                'value' => 'manager.user.userCard.fio',
             ],
             [
-                'attribute' => 'user_card_id',
-                'filter' => ManagerEmployee::find()->select(['fio', 'manager_employee.id'])
-                    ->joinWith('userCard')
-                    ->indexBy('manager_employee.id')->column(),
-                'value' => 'userCard.fio',
+                'attribute' => 'employee_id',
+                'value' => 'employee.email',
             ],
             ['class' => 'yii\grid\ActionColumn'],
         ],

backend/modules/employee/views/manager/_form.php

@@ -15,16 +15,16 @@ use kartik\select2\Select2;
 
     <?php $form = ActiveForm::begin(); ?>
 
-    <?= $form->field($model, 'user_card_id')->widget(Select2::className(),
+    <?= $form->field($model, 'user_id')->widget(
+        Select2::class,
         [
-            'data' => UserCard::find()->select(['user_card.fio', 'user_card.id'])
-                ->joinWith('manager')->where(['manager.user_card_id' => null])
-                ->indexBy('user_card.id')->column(),
-            'options' => ['placeholder' => '...','class' => 'form-control'],
+            'data' => \common\models\UserCard::getListUserWithUserId(),
+            'options' => ['placeholder' => '...', 'class' => 'form-control'],
             'pluginOptions' => [
                 'allowClear' => true
             ],
-        ]) ?>
+        ]
+    ); ?>
 
     <div class="form-group">
         <?= Html::submitButton('Сохранить', ['class' => 'btn btn-success']) ?>

backend/modules/employee/views/manager/index.php

@@ -24,9 +24,8 @@ $this->params['breadcrumbs'][] = $this->title;
         'columns' => [
             ['class' => 'yii\grid\SerialColumn'],
             [
-                'attribute' => 'user_card_id',
-                'filter' => UserCard::find()->select(['fio', 'id'])->indexBy('id')->column(),
-                'value' => 'userCard.fio',
+                'attribute' => 'user_id',
+                'value' => 'user.email',
             ],
 
             ['class' => 'yii\grid\ActionColumn'],

backend/modules/employee/views/manager/view.php

@@ -38,7 +38,7 @@ YiiAsset::register($this);
             'id',
             [
                 'attribute' => 'user_id',
-                'value' => ArrayHelper::getValue($model,'userCard.fio'),
+                'value' => ArrayHelper::getValue($model,'user.email'),
             ],
         ],
     ]) ?>
@@ -52,9 +52,8 @@ YiiAsset::register($this);
         'columns' => [
             ['class' => 'yii\grid\SerialColumn'],
             [
-                'attribute' => 'user_card_id',
-                'filter' => UserCard::find()->select(['fio', 'id'])->indexBy('id')->column(),
-                'value' => 'userCard.fio',
+                'attribute' => 'employee_id',
+                'value' => 'employee.email',
             ],
             [
                 'class' => 'yii\grid\ActionColumn',