From: marina <m.zozirova@gmail.com>
Date: Thu, 4 Jul 2024 06:44:07 +0000 (+0300)
Subject: мелко правки
X-Git-Tag: 1.3~23^2~7
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=30ab4360343ef3fe251e1320b02bb0dc2e71d241;p=erp24_rep%2Fyii-erp24%2F.git

мелко правки
---

diff --git a/erp24/controllers/TimetableFactController.php b/erp24/controllers/TimetableFactController.php
index a24d7cef..3f1ea30f 100644
--- a/erp24/controllers/TimetableFactController.php
+++ b/erp24/controllers/TimetableFactController.php
@@ -2,7 +2,6 @@
 
 namespace app\controllers;
 
-use app\records\TimetableFactModel;
 use yii\data\ActiveDataProvider;
 use yii\db\Query;
 use yii\web\Controller;
@@ -11,6 +10,7 @@ use yii\filters\VerbFilter;
 use yii_app\records\Admin;
 use yii_app\records\AdminCheckin;
 use yii_app\records\Timetable;
+use yii_app\records\TimetableFactModel;
 
 /**
  * TimetableFactController implements the CRUD actions for TimetableFactModel model.
@@ -158,8 +158,7 @@ class TimetableFactController extends Controller
             ->andWhere(['is not', 'plan_id', null])
             ->andWhere(['not in', 'id', (new Query())->select('plan_id')->from('timetable_fact')]);
 
-
-        if ($action == 'applyPlus') {
+        if ($action == 'applyPlus' || true) {
 
             $timetables = Timetable::find()
                 ->andWhere(['>=', 'date', '2024-06-01'])
@@ -167,6 +166,7 @@ class TimetableFactController extends Controller
                 ->andWhere(['is not', 'plan_id', null])
                 ->all();
 
+
             foreach ($timetables as $timetable) {
                 $newFact = TimetableFactModel::find()
                     ->andWhere(['date_shift' => $timetable->date])
@@ -175,32 +175,26 @@ class TimetableFactController extends Controller
                     ->one();
 
                 if ($newFact) {
-                    var_dump($newFact);die();
-                    $newFact->plan_id = $timetable->id;
+                    $newFact->plan_id = $timetable->plan_id;
                     $newFact->tabel = $timetable->tabel;
                     $newFact->save();
                 } else {
                     $adminCheckinStart = AdminCheckin::find()
-                        ->where(['plan_id' => $timetable->id])
+                        ->where(['plan_id' => $timetable->plan_id])
                         ->orderBy('id asc')
                         ->one();
 
                     $adminCheckinEnd = AdminCheckin::find()
-                        ->where(['plan_id' => $timetable->id])
+                        ->where(['plan_id' => $timetable->plan_id])
                         ->orderBy('id desc')
                         ->one();
 
                     if ($adminCheckinStart) {
                         $adminCheckinStart->shift_id = $timetable->shift_id;
-                        var_dump($timetable->shift_id);
-                        var_dump($adminCheckinStart->shift_id);
                         TimetableFactModel::setValues($adminCheckinStart);
 
                         if ($adminCheckinEnd && $adminCheckinStart->id != $adminCheckinEnd->id) {
                             $adminCheckinEnd->shift_id = $timetable->shift_id;
-                            var_dump($timetable->shift_id);
-                            var_dump($adminCheckinStart->shift_id);
-                            die();
                             TimetableFactModel::setValues($adminCheckinEnd);
                         }
                     }
diff --git a/erp24/records/TimetableFactModel.php b/erp24/records/TimetableFactModel.php
index 85489137..9176e52c 100644
--- a/erp24/records/TimetableFactModel.php
+++ b/erp24/records/TimetableFactModel.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace app\records;
+namespace yii_app\records;
 
 use Throwable;
 use yii\db\ActiveRecord;
@@ -126,7 +126,7 @@ class TimetableFactModel extends ActiveRecord
             $model->status = AdminCheckin::TYPE_START;
             $model->checkin_start_id = $adminCheckin->id;
 
-            $timetable = Timetable::findOne(['date' => $adminCheckin->date, 'admin_id' => $adminCheckin->admin_id]);
+            $timetable = Timetable::findOne(['plan_id' => $adminCheckin->plan_id]);
 
             if (!empty($timetable)) {
                 $model->tabel = 1;