From: Alexander Smirnov Date: Fri, 31 Jan 2025 14:39:28 +0000 (+0300) Subject: [ERP-301] должность не выбрана X-Git-Tag: 1.7~24^2 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=bf25eea607f43e23cc15d85bc546ae1a14af3d86;p=erp24_rep%2Fyii-erp24%2F.git [ERP-301] должность не выбрана --- diff --git a/erp24/actions/payroll/ListShiftAdminsAction.php b/erp24/actions/payroll/ListShiftAdminsAction.php index 70125a84..ebf70324 100644 --- a/erp24/actions/payroll/ListShiftAdminsAction.php +++ b/erp24/actions/payroll/ListShiftAdminsAction.php @@ -27,7 +27,7 @@ class ListShiftAdminsAction extends Action $model->load(Yii::$app->request->get()); $adminGroups = ArrayHelper::map(AdminGroup::find()->where(['id' => Admin::ADMIN_CABINET_GROUP_IDS])->all(), 'id', 'name'); - $adminGroups = [0 => 'Должность'] + $adminGroups; + $adminGroups = [0 => 'Должность не выбрана'] + $adminGroups; $adminPayrollQuery = AdminPayroll::find() ->andWhere(['between', 'admin_payroll.date', $model->month_start, $model->month_end]) diff --git a/erp24/views/payroll/list-shift-admins.php b/erp24/views/payroll/list-shift-admins.php index b5c56b6e..72e54ac6 100644 --- a/erp24/views/payroll/list-shift-admins.php +++ b/erp24/views/payroll/list-shift-admins.php @@ -51,7 +51,7 @@ $this->registerJsFile('/js/payroll/list-shift-admins.js', ['position' => \yii\we ->dropDownList($adminGroups)->label(false) ?>
- field($model, 'shift_id')->dropDownList([0 => 'Смена', 1 => 'Дневная', 2 => 'Ночная'])->label(false) ?> + field($model, 'shift_id')->dropDownList([0 => 'Смена не выбрана', 1 => 'Дневная', 2 => 'Ночная'])->label(false) ?>
'btn btn-secondary'])?>