From 5d096bdbbb4e801d9bd6e34b5fa05688453c9a8c Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Thu, 26 Sep 2024 17:00:27 +0300 Subject: [PATCH] =?utf8?q?[ERP-187]=20=D0=9F=D0=BE=D0=B4=D1=81=D1=87=D1=91?= =?utf8?q?=D1=82=20=D0=BF=D0=B5=D1=80=D1=81=D0=BE=D0=BD=D0=B0=D0=BB=D0=B0?= =?utf8?q?=20=D1=81=20=D0=BF=D1=80=D0=BE=D0=B8=D0=B7=D0=B2=D0=BE=D0=B4?= =?utf8?q?=D1=81=D1=82=D0=B2=D0=B5=D0=BD=D0=BD=D1=8B=D0=BC=20=D0=BA=D0=B0?= =?utf8?q?=D0=BB=D0=B5=D0=BD=D0=B4=D0=B0=D1=80=D1=91=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/helpers/HtmlHelper.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/erp24/helpers/HtmlHelper.php b/erp24/helpers/HtmlHelper.php index 8cb0d7bf..0d68bcb2 100755 --- a/erp24/helpers/HtmlHelper.php +++ b/erp24/helpers/HtmlHelper.php @@ -5,6 +5,7 @@ namespace yii_app\helpers; use DateTime; use yii\helpers\ArrayHelper; use yii_app\records\Admin; +use yii_app\records\ProductionCalendar; class HtmlHelper { @@ -150,7 +151,7 @@ class HtmlHelper } - public static function getWorkDays($m, $y): int + public static function getWorkDaysOld($m, $y): int { $lastDay = date("t",mktime(0, 0, 0, $m, 1, $y)); $weekdays = 0; @@ -162,6 +163,18 @@ class HtmlHelper return $weekdays+20; } + public static function getWorkDays($m, $y): int + { + $firstDay = date($y . "-" . $m . '-01'); + $lastDay = date($y . "-" . $m . '-t', strtotime($firstDay)); + $cntWorkDays = 0; + while ($firstDay <= $lastDay) { + $productionCalendar = ProductionCalendar::findOne(['date' => $firstDay]); + $cntWorkDays += $productionCalendar ? $productionCalendar->work : 1; + $firstDay = date("Y-m-d", strtotime("+1 day", strtotime($firstDay))); + } + return $cntWorkDays == 0 ? self::getWorkDaysOld($m, $y) : $cntWorkDays; + } public static function getAdministratorWorkDays($month, $year): int { -- 2.39.5