apuc/guild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes in manager and manager_employee, replaced user_id to card_id

Browse Source
This commit is contained in:
iIronside
2021-12-23 11:28:27 +03:00
parent ce25dc44ea
commit ac4e5d62ec
22 changed files with 2570 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
backend/modules/employee/views/manager-employee/_form.php
View File

@ -1,7 +1,7 @@
<?php
use backend\modules\card\models\UserCard;
use backend\modules\employee\models\Manager;
use common\models\User;
use kartik\select2\Select2;
use yii\helpers\Html;
use yii\widgets\ActiveForm;
@ -17,26 +17,27 @@ use yii\widgets\ActiveForm;
<?= $form->field($model, 'manager_id')->widget(Select2::className(),
[
'data' => Manager::find()->select(['username', 'manager.id'])
->joinWith('user')->indexBy('manager.id')->column(),
'data' => Manager::find()->select(['fio', 'manager.id'])
->joinWith('userCard')->indexBy('manager.id')->column(),
'options' => ['placeholder' => '...','class' => 'form-control'],
'pluginOptions' => [
'allowClear' => true
],
]) ?>
<?= $form->field($model, 'employee_id')->widget(Select2::className(),
<?= $form->field($model, 'user_card_id')->widget(Select2::className(),
[
'data' => User::find()->select(['username', 'user.id'])
->joinWith('manager')->where(['manager.user_id' => null])->indexBy('user.id')->column(),
'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'],
'pluginOptions' => [
'allowClear' => true
'allowClear' => true,
'multiple' => true,
],
]) ?>
<div class="form-group">
<?= Html::submitButton('Save', ['class' => 'btn btn-success']) ?>
<?= Html::submitButton('Сохранить', ['class' => 'btn btn-success']) ?>
</div>
<?php ActiveForm::end(); ?>

18
backend/modules/employee/views/manager-employee/index.php
View File

@ -1,5 +1,7 @@
<?php
use backend\modules\card\models\UserCard;
use common\models\ManagerEmployee;
use common\models\User;
use yii\helpers\Html;
use yii\grid\GridView;
@ -24,15 +26,17 @@ $this->params['breadcrumbs'][] = $this->title;
['class' => 'yii\grid\SerialColumn'],
[
'attribute' => 'manager_id',
'filter' => User::find()->select(['username', 'user.id'])
->joinWith('manager')->where(['not',['manager.user_id' => null]])->indexBy('user.id')->column(),
'value' => 'manager.user.username',
'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',
],
[
'attribute' => 'employee_id',
'filter' => User::find()->select(['username', 'user.id'])
->joinWith('manager')->where(['manager.user_id' => null])->indexBy('user.id')->column(),
'value' => 'user.username',
'attribute' => 'user_card_id',
'filter' => ManagerEmployee::find()->select(['fio', 'manager_employee.id'])
->joinWith('userCard')
->indexBy('manager_employee.id')->column(),
'value' => 'userCard.fio',
],
['class' => 'yii\grid\ActionColumn'],
],

4
backend/modules/employee/views/manager-employee/view.php
View File

@ -36,11 +36,11 @@ YiiAsset::register($this);
'id',
[
'attribute' => 'manager_id',
'value' => ArrayHelper::getValue($model,'manager.user.username'),
'value' => ArrayHelper::getValue($model,'manager.userCard.fio'),
],
[
'attribute' => 'employee_id',
'value' => ArrayHelper::getValue($model,'user.username'),
'value' => ArrayHelper::getValue($model,'userCard.fio'),
],
],
]) ?>

8
backend/modules/employee/views/manager/_form.php
View File

@ -1,5 +1,6 @@
<?php
use backend\modules\card\models\UserCard;
use common\models\User;
use yii\helpers\Html;
use yii\widgets\ActiveForm;
@ -14,10 +15,11 @@ use kartik\select2\Select2;
<?php $form = ActiveForm::begin(); ?>
<?= $form->field($model, 'user_id')->widget(Select2::className(),
<?= $form->field($model, 'user_card_id')->widget(Select2::className(),
[
'data' => User::find()->select(['username', 'user.id'])
->joinWith('manager')->where(['manager.user_id' => null])->indexBy('user.id')->column(),
'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'],
'pluginOptions' => [
'allowClear' => true

7
backend/modules/employee/views/manager/index.php
View File

@ -1,5 +1,6 @@
<?php
use backend\modules\card\models\UserCard;
use common\models\User;
use yii\helpers\Html;
use yii\grid\GridView;
@ -23,9 +24,9 @@ $this->params['breadcrumbs'][] = $this->title;
'columns' => [
['class' => 'yii\grid\SerialColumn'],
[
'attribute' => 'user_id',
'filter' => User::find()->select(['username', 'id'])->indexBy('id')->column(),
'value' => 'user.username',
'attribute' => 'user_card_id',
'filter' => UserCard::find()->select(['fio', 'id'])->indexBy('id')->column(),
'value' => 'userCard.fio',
],

9
backend/modules/employee/views/manager/view.php
View File

@ -1,5 +1,6 @@
<?php
use backend\modules\card\models\UserCard;
use common\models\User;
use kartik\grid\GridView;
use yii\helpers\ArrayHelper;
@ -37,7 +38,7 @@ YiiAsset::register($this);
'id',
[
'attribute' => 'user_id',
'value' => ArrayHelper::getValue($model,'user.username'),
'value' => ArrayHelper::getValue($model,'userCard.fio'),
],
],
]) ?>
@ -47,9 +48,9 @@ YiiAsset::register($this);
'columns' => [
['class' => 'yii\grid\SerialColumn'],
[
'attribute' => 'user_id',
'filter' => User::find()->select(['username', 'id'])->indexBy('id')->column(),
'value' => 'user.username',
'attribute' => 'user_card_id',
'filter' => UserCard::find()->select(['fio', 'id'])->indexBy('id')->column(),
'value' => 'userCard.fio',
],
[
'class' => 'yii\grid\ActionColumn',