From: marina <m.zozirova@gmail.com>
Date: Wed, 5 Jun 2024 05:15:55 +0000 (+0300)
Subject: ERP-5 Доработать фактический план по сотрудникам
X-Git-Tag: 1.2^2~4^2~15
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=35d76484c1240c2b7784d5f30425a9f4f8f244ab;p=erp24_rep%2Fyii-erp24%2F.git

ERP-5 Доработать фактический план по сотрудникам
---

diff --git a/erp24/records/TimetableFactModel.php b/erp24/records/TimetableFactModel.php
index f58a603d..4b14bdd0 100644
--- a/erp24/records/TimetableFactModel.php
+++ b/erp24/records/TimetableFactModel.php
@@ -49,6 +49,7 @@ class TimetableFactModel extends ActiveRecord
         return [
             [[]],
             [['is_opening, is_close'], 'boolean'],
+            [['is_opening, is_close'], 'default', 'value' => null],
             [['d_id', 'admin_group_id'], 'exist', 'targetClass' => AdminGroup::class, 'targetAttribute' => 'id', 'skipOnEmpty' => true],
             [['admin_id', 'admin_id_add'], 'exist', 'targetClass' => Admin::class, 'targetAttribute' => 'id', 'skipOnEmpty' => true],
             [['store_id'], 'exist', 'targetClass' => CityStore::class, 'targetAttribute' => 'id', 'skipOnEmpty' => true],
@@ -67,7 +68,7 @@ class TimetableFactModel extends ActiveRecord
         ];
     }
 
-    public function setValues($adminCheckin, $timetable)
+    public function setValues($adminCheckin, $timetable, $lastCheckin)
     {
         $this->admin_id = $adminCheckin->admin_id;
         $this->admin_group_id = $adminCheckin->admin->shift;
@@ -85,6 +86,11 @@ class TimetableFactModel extends ActiveRecord
         $this->time_start = $timetable->time_start;
         $this->time_end = $timetable->time_end;
         $this->date_end = $timetable->datetime_end;
+        if (empty($lastCheckin)) {
+            $is_active = true;
+        } else {
+            $is_close = true;
+        }
         $this->save();
     }