From af24301d713170438e544f5b88e143b86d8dbff9 Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Wed, 25 Sep 2024 14:33:56 +0300 Subject: [PATCH] =?utf8?q?[ERP-195]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?utf8?q?=D0=B5=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD?= =?utf8?q?=D0=BE=D1=81=D1=82=D1=8C=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=B0?= =?utf8?q?=20=D0=B3=D1=80=D0=B0=D1=84=D0=B8=D0=BA=D0=B0=20=D1=80=D0=B0?= =?utf8?q?=D0=B1=D0=BE=D1=82=20=D0=B4=D0=BB=D1=8F=20=D0=B0=D0=B4=D0=BC?= =?utf8?q?=D0=B8=D0=BD=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?utf8?q?=D0=BE=D0=B2=20=D0=B2=20admin-update?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/actions/grade/AdminUpdateAction.php | 1 + ...alter_table_admin_add_column_work_rate.php | 28 +++++++++++++++++++ erp24/records/Admin.php | 4 ++- erp24/views/grade/admin-update.php | 14 +++++++++- 4 files changed, 45 insertions(+), 2 deletions(-) create mode 100755 erp24/migrations/m240925_095312_alter_table_admin_add_column_work_rate.php diff --git a/erp24/actions/grade/AdminUpdateAction.php b/erp24/actions/grade/AdminUpdateAction.php index 6fab2367..c4db7f36 100644 --- a/erp24/actions/grade/AdminUpdateAction.php +++ b/erp24/actions/grade/AdminUpdateAction.php @@ -63,6 +63,7 @@ class AdminUpdateAction extends Action unset($attributes['pol']); unset($attributes['inn']); unset($attributes['snils']); + unset($attributes['work_rate']); } if (!Yii::$app->user->can("manageAvatarka", ['id' => $model->id])) { diff --git a/erp24/migrations/m240925_095312_alter_table_admin_add_column_work_rate.php b/erp24/migrations/m240925_095312_alter_table_admin_add_column_work_rate.php new file mode 100755 index 00000000..5deea886 --- /dev/null +++ b/erp24/migrations/m240925_095312_alter_table_admin_add_column_work_rate.php @@ -0,0 +1,28 @@ +addColumn(self::TABLE_NAME, 'work_rate', $this->tinyInteger()->null()->after('group_id') + ->comment('График работы для администраторов: 1 - 5/2, 2 - 2/2, 3 - 3/3')); + } + + /** + * {@inheritdoc} + */ + public function safeDown() + { + $this->dropColumn(self::TABLE_NAME, 'work_rate'); + } +} diff --git a/erp24/records/Admin.php b/erp24/records/Admin.php index 6f6486f8..658c06c7 100755 --- a/erp24/records/Admin.php +++ b/erp24/records/Admin.php @@ -28,6 +28,7 @@ use yii_app\api3\core\validators\PhoneValidator; * @property string store_arr * @property string $popular_modules * @property string $guid + * @property int|null $work_rate График работы для администраторов: 1 - 5/2, 2 - 2/2, 3 - 3/3 * @package yii_app\records */ class Admin extends ActiveRecord implements IdentityInterface @@ -103,7 +104,7 @@ class Admin extends ActiveRecord implements IdentityInterface [['guid', 'name', 'name_full', 'group_name', 'group_id', 'd_id', 'parent_admin_id', 'mentor_id', 'org_id', 'org_arr', 'login_user', 'pass_user', 'mobile', 'adress', 'description', 'adress_fakt', 'photo', 'avatarka', 'lasttime', 'sites_arr', 'city_arr', 'filial_id', 'city_id', 'store_arr', 'store_arr_guid', 'kassa_arr', 'kassa_default', 'sklad_arr', 'sklad_id', 'istochnik_arr', 'status_dostup_arr', 'birthdate', 'mesto_r', 'adress_prozhivaniya', 'adress_info', 'passport_nomer', 'passport_seriya', 'kem_vidan', 'data_passport', 'passport_kod_podrazdel', 'passport_srok_begin', 'passport_end', 'passport_mesto_rozhdeniya', 'inn', 'snils', 'vid_zanatosti', 'kol_deti', 'org_id_ustroen', 'summa_oklad', 'summa_oklad_nalog', 'tabel_number', 'data_priem', 'data_uval', 'ignor_post_arr', 'popular_modules', 'posit', 'group_id_last', 'remove_date', 'remove_admin_id'], 'required'], [['group_id', 'work_status', 'd_id', 'parent_admin_id', 'mentor_id', 'org_id', 'dostup', 'sites_dostup_all', 'city_dostup_all', 'filial_dostup_all', 'filial_id', 'city_id', 'store_id', 'store_dostup_all', 'kassa_dostup_all', 'kassa_default', 'sklad_dostup_all', 'sklad_id', 'istochnik_dostup_all', 'istochnik_id', 'avans_percent', 'kol_deti', 'org_id_ustroen', 'summa_oklad', 'summa_oklad_nalog', 'tabel_number', 'posit', 'group_id_last', 'remove_admin_id'], 'integer'], [['org_arr', 'adress', 'sites_arr', 'city_arr', 'store_arr', 'store_arr_guid', 'kassa_arr', 'sklad_arr', 'istochnik_arr', 'status_dostup_arr', 'mesto_r', 'adress_prozhivaniya', 'adress_info', 'kem_vidan', 'passport_mesto_rozhdeniya', 'pol', 'active', 'tip_ustroen', 'vcompany', 'ignor_post_arr', 'popular_modules'], 'string'], - [['lasttime', 'date_add', 'birthdate', 'data_passport', 'passport_srok_begin', 'passport_end', 'data_priem', 'data_uval', 'remove_date'], 'safe'], + [['lasttime', 'date_add', 'birthdate', 'data_passport', 'passport_srok_begin', 'passport_end', 'data_priem', 'data_uval', 'remove_date', 'work_rate'], 'safe'], [['sale_percent'], 'number'], [['guid'], 'string', 'max' => 36], [['name'], 'string', 'max' => 55], @@ -207,6 +208,7 @@ class Admin extends ActiveRecord implements IdentityInterface 'remove_date' => 'Remove Date', 'remove_admin_id' => 'Remove Admin ID', 'access_token' => 'Access Token', + 'work_rate' => 'Work Rate', ]; } diff --git a/erp24/views/grade/admin-update.php b/erp24/views/grade/admin-update.php index 60a1cb00..afd4561d 100644 --- a/erp24/views/grade/admin-update.php +++ b/erp24/views/grade/admin-update.php @@ -31,7 +31,7 @@ use yii_app\services\FileService;
- field($model, 'group_id')->dropDownList($adminGroups)->label(false)) ?> + field($model, 'group_id')->dropDownList($adminGroups, ['onchange' => 'changeWorkRateVisibility(this);'])->label(false)) ?> field($model, 'group_name')->textInput(['maxlength' => true])->label(false)) ?> +
+ field($model, 'work_rate')->dropDownList([1 => '5/2', 2 => '2/2', 3 => '3/3'])->label(false)) ?> +
+ field($model, 'parent_admin_id')->widget(Select2::class, [ 'data' => $admins, 'language' => 'ru', @@ -221,4 +225,12 @@ use yii_app\services\FileService; function toggleView(e) { $(e.target).parent().find('.toggleableVisibility').toggleClass('hidden'); } + + function changeWorkRateVisibility(t) { + if (t.value == 50) { + $('#workRate').show(); + } else { + $('#workRate').hide(); + } + } \ No newline at end of file -- 2.39.5