[ERP-241] в перечисление сотрудников группа Другие последняя

diff --git a/erp24/controllers/ShiftTransferController.php b/erp24/controllers/ShiftTransferController.php
index ecac7147981ccaed9200d6ae8af04773ccc535d4..18031e84cdabf2368902211cd9c3967722d6a7de 100644 (file)
--- 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'));