From 65399077b381dccf4d17af179185c8b072964df3 Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Wed, 20 Nov 2024 15:23:01 +0300
Subject: [PATCH] =?utf8?q?[ERP-241]=20=D0=B2=20=D0=BF=D0=B5=D1=80=D0=B5?=
 =?utf8?q?=D1=87=D0=B8=D1=81=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BE?=
 =?utf8?q?=D1=82=D1=80=D1=83=D0=B4=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=B3?=
 =?utf8?q?=D1=80=D1=83=D0=BF=D0=BF=D0=B0=20=D0=94=D1=80=D1=83=D0=B3=D0=B8?=
 =?utf8?q?=D0=B5=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D0=BD=D1=8F=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/controllers/ShiftTransferController.php | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/erp24/controllers/ShiftTransferController.php b/erp24/controllers/ShiftTransferController.php
index ecac7147..18031e84 100644
--- a/erp24/controllers/ShiftTransferController.php
+++ b/erp24/controllers/ShiftTransferController.php
@@ -23,6 +23,24 @@ class ShiftTransferController extends Controller
         return $this->render('index', compact('shiftTransfers', 'storeNameById', 'admins'));
     }
 
+    public static function getAdminsWithDrugieLast() {
+        $adminArr = [];
+        $adminArrOther = [];
+        foreach (\yii_app\records\Admin::find()->with('adminGroup')->all() as $admin) {
+            if ($admin->group_id > 0) {
+                $tmp = ['id' => $admin->id, 'name' => $admin->name, 'groupName' => $admin->adminGroup->name ?? "Другие"];
+                if ($tmp['groupName'] == 'Другие') {
+                    $adminArrOther[] = $tmp;
+                } else {
+                    $adminArr[] = $tmp;
+                }
+            }
+        }
+        $adminArr = ArrayHelper::merge($adminArr, $adminArrOther);
+        $admins = ArrayHelper::map($adminArr, 'id', 'name', 'groupName');
+        return $admins;
+    }
+
     public function actionCreate() {
         $shiftTransfer = new ShiftTransfer;
 
@@ -30,13 +48,7 @@ class ShiftTransferController extends Controller
 
         $storeNameById = TaskService::getEntitiesByAlias('store');
 
-        $adminArr = [];
-        foreach (\yii_app\records\Admin::find()->with('adminGroup')->all() as $admin) {
-            if ($admin->group_id > 0) {
-                $adminArr[] = ['id' => $admin->id, 'name' => $admin->name, 'groupName' => $admin->adminGroup->name ?? "Другие"];
-            }
-        }
-        $admins = ArrayHelper::map($adminArr, 'id', 'name', 'groupName');
+        $admins = self::getAdminsWithDrugieLast();
 
         return $this->render('update', compact('shiftTransfer', 'isCreate', 'storeNameById',
             'admins'));
@@ -72,13 +84,7 @@ class ShiftTransferController extends Controller
 
         $storeNameById = TaskService::getEntitiesByAlias('store');
 
-        $adminArr = [];
-        foreach (\yii_app\records\Admin::find()->with('adminGroup')->all() as $admin) {
-            if ($admin->group_id > 0) {
-                $adminArr[] = ['id' => $admin->id, 'name' => $admin->name, 'groupName' => $admin->adminGroup->name ?? "Другие"];
-            }
-        }
-        $admins = ArrayHelper::map($adminArr, 'id', 'name', 'groupName');
+        $admins = self::getAdminsWithDrugieLast();
 
         return $this->render('update', compact('shiftTransfer', 'isCreate', 'storeNameById',
             'admins'));
-- 
2.39.5