From bcbefaa25773cc80f6ef5771d1f2761ff435487a Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Thu, 18 Jul 2024 14:28:19 +0300
Subject: [PATCH] =?utf8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BA=D0=BE?=
 =?utf8?q?=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=80=D0=B8=D0=B9=20=D1=81?=
 =?utf8?q?=D1=82=D0=B0=D1=80=D0=BE=D0=B3=D0=BE=20=D0=BA=D0=BE=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/services/CabinetService.php | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/erp24/services/CabinetService.php b/erp24/services/CabinetService.php
index ad2cb08c..aaabd600 100755
--- a/erp24/services/CabinetService.php
+++ b/erp24/services/CabinetService.php
@@ -2384,30 +2384,12 @@ class CabinetService
 
         $normalCountShiftArray = SalaryHelper::$normalCountShift;
         if (!empty($employeeSelect["group_id"])) {
-//            if (Admin::ADMINISTRATOR_GROUP_ID == $employeeSelect["group_id"]){
-//                if ($dateFrom >= '2023-12-01') {
-//                    $dayMonthDateRow = $yearSelect . '-' . $monthSelect . '-01';
-//                    $timeRow = strtotime($dayMonthDateRow);
-//                    $monthSelectRow = date('n', $timeRow);
-//                    $yearSelectRow = date('Y', $timeRow);
-//                    if ($yearSelectRow == '2024' && $monthSelectRow == 1) {
-//                        $normalCountShift = 20;
-//                    } else {
-//                        // у Администратора число смен равно количеству дней со вторника по субботу в месяце
-//                        $normalCountShift = HtmlHelper::getAdministratorWorkDays($monthSelect, $yearSelect);
-//                    }
-//                } else {
-//                    // у Администратора число смен равно количеству рабочих дней в месяце
-//                    $normalCountShift = HtmlHelper::getWorkDays($monthSelect, $yearSelect);
-//                }
-//            } else {
-                $employeeSelectGroupId = $this->getGroupId($employeeId, $employeeSelect['group_id'], $dateFrom, $dateTo);
-                if (array_key_exists($employeeSelectGroupId, $normalCountShiftArray)) {
-                    $normalCountShift = $normalCountShiftArray[$employeeSelectGroupId];
-                } else {
-                    $normalCountShift = 15;
-                }
-//            }
+            $employeeSelectGroupId = $this->getGroupId($employeeId, $employeeSelect['group_id'], $dateFrom, $dateTo);
+            if (array_key_exists($employeeSelectGroupId, $normalCountShiftArray)) {
+                $normalCountShift = $normalCountShiftArray[$employeeSelectGroupId];
+            } else {
+                $normalCountShift = 15;
+            }
         }
 
 
-- 
2.39.5