From 9374ff7c645557a7e88cca3325f765c0d25341d8 Mon Sep 17 00:00:00 2001 From: marina Date: Thu, 4 Jul 2024 09:58:56 +0300 Subject: [PATCH] =?utf8?q?ERP-65=20=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D0=B5?= =?utf8?q?=D1=81=D1=82=D0=B8=20=D0=B2=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B9=20?= =?utf8?q?=D1=84=D0=B0=D0=BA=D1=82=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B8?= =?utf8?q?=D0=B9=20=D1=82=D0=B0=D0=B1=D0=B5=D0=BB=D1=8C=20=D0=B2=D1=81?= =?utf8?q?=D0=B5=20=D1=81=D0=BC=D0=B5=D0=BD=D1=8B=20=D1=81=D0=BE=D1=82?= =?utf8?q?=D1=80=D1=83=D0=B4=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2,=20=D0=BA=D0=BE?= =?utf8?q?=D1=82=D0=BE=D1=80=D1=8B=D0=B5=20=D0=B1=D1=8B=D0=BB=D0=B8=20?= =?utf8?q?=D0=B4=D0=BE=2013.06?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/controllers/TimetableFactController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erp24/controllers/TimetableFactController.php b/erp24/controllers/TimetableFactController.php index d9b53ec9..14c40a1c 100644 --- a/erp24/controllers/TimetableFactController.php +++ b/erp24/controllers/TimetableFactController.php @@ -165,7 +165,6 @@ class TimetableFactController extends Controller ->andWhere(['is not', 'plan_id', null]) ->all(); - foreach ($timetables as $timetable) { $newFact = TimetableFactModel::find() ->andWhere(['date_shift' => $timetable->date]) @@ -199,10 +198,10 @@ class TimetableFactController extends Controller } } - if ($timetable && empty($adminCheckinStart) && empty($adminCheckinEnd)) { + if ($timetable && empty($adminCheckinStart) && empty($adminCheckinEnd) && empty($newFact)) { $newCheckin = new AdminCheckin(); $newCheckin->admin_id = $timetable->admin_id; - $newCheckin->type_id = $timetable->shift_id == 5 || $timetable->shift_id = 8 ? AdminCheckin::TYPE_APPEAR : AdminCheckin::TYPE_START; + $newCheckin->type_id = $timetable->shift_id == 5 || $timetable->shift_id == 8 ? AdminCheckin::TYPE_APPEAR : AdminCheckin::TYPE_START; $newCheckin->date = $timetable->date; $newCheckin->shift_id = $timetable->shift_id; $newCheckin->time = $timetable->datetime_start; @@ -222,6 +221,7 @@ class TimetableFactController extends Controller $newCheckin->type_id = $timetable->shift_id == 5 || $timetable->shift_id = 8 ? AdminCheckin::TYPE_APPEAR : AdminCheckin::TYPE_END; $newCheckin->validate(); TimetableFactModel::setValues($newCheckin); + var_dump($timetable, $newCheckin);die(); } } } -- 2.39.5