ERP-65

Перенести в новый фактический табель все смены сотрудников, которые были до 13.06

diff --git a/erp24/actions/timetable/StartShiftStepOneAction.php b/erp24/actions/timetable/StartShiftStepOneAction.php
index 937d5b00b9297b10bc604e8956ae0dd833a761ac..f7f6ba941aee8626d4cf3f033b23060a5f0594ae 100755 (executable)
--- a/erp24/actions/timetable/StartShiftStepOneAction.php
+++ b/erp24/actions/timetable/StartShiftStepOneAction.php
@@ -38,7 +38,6 @@ class StartShiftStepOneAction extends Action
             ->all();
         $lastCheckin = end($dayCheckins);
 
-
         $modelTypeId = (function () use ($userModel, $lastCheckin) {
             if ($userModel->adminGroup->isRoaming()) {
                 return AdminCheckin::TYPE_APPEAR;

diff --git a/erp24/api3/core/services/TimetableService.php b/erp24/api3/core/services/TimetableService.php
index 1c620730996bc96bf70cfc3d0eff88ad991858d5..5cb9ab40e5ca708acbb16fbec723031c87e15e39 100644 (file)
--- a/erp24/api3/core/services/TimetableService.php
+++ b/erp24/api3/core/services/TimetableService.php
@@ -96,7 +96,7 @@ class TimetableService
             }
 
             if ($checkIn->save()) {
-                TimetableFactModel::setValues($checkIn, true);
+                TimetableFactModel::setValues($checkIn);
             }
 
             if ($checkIn->getErrors()) {

diff --git a/erp24/commands/TimetableController.php b/erp24/commands/TimetableController.php
index 5653f9446605b37365248c8bbd1029e30bfe79cf..33f3bc5eafb87f81c5a0b5edd52551edd4cef068 100644 (file)
--- a/erp24/commands/TimetableController.php
+++ b/erp24/commands/TimetableController.php
@@ -2,7 +2,7 @@
 
 namespace yii_app\commands;
 
-use app\records\TimetableFactModel;
+use yii_app\records\TimetableFactModel;
 use yii\console\Controller;
 use yii\helpers\Json;
 use yii_app\records\AdminCheckin;

diff --git a/erp24/controllers/TimetableFactController.php b/erp24/controllers/TimetableFactController.php
index d62676600607a06131c1f16cc52a5620e0086ae6..38d8595fdf534e81b1f8a42181b8fa3bc761f346 100644 (file)
--- a/erp24/controllers/TimetableFactController.php
+++ b/erp24/controllers/TimetableFactController.php
@@ -199,7 +199,7 @@ class TimetableFactController extends Controller
 
                         if ($adminCheckinEnd && $adminCheckinStart->id != $adminCheckinEnd->id) {
                             $adminCheckinEnd->shift_id = $timetable->shift_id;
-                            TimetableFactModel::setValues($adminCheckinEnd);
+                            TimetableFactModel::setValues($adminCheckinEnd, false);
                         }
                     }
                 }
@@ -226,7 +226,7 @@ class TimetableFactController extends Controller
                     $newCheckin->time = $timetable->datetime_end;
                     $newCheckin->type_id = $timetable->shift_id == 5 || $timetable->shift_id = 8 ? AdminCheckin::TYPE_APPEAR : AdminCheckin::TYPE_END;
                     $newCheckin->validate();
-                    TimetableFactModel::setValues($newCheckin);
+                    TimetableFactModel::setValues($newCheckin, false);
                 }
             }
         }

diff --git a/erp24/records/AdminCheckin.php b/erp24/records/AdminCheckin.php
index f0b7cab1d3c954b9f8f74a2065a0826b3678182b..91f32ea73ab58dc484c103bd0017beac91bd81f4 100755 (executable)
--- a/erp24/records/AdminCheckin.php
+++ b/erp24/records/AdminCheckin.php
@@ -34,7 +34,6 @@ class AdminCheckin extends ActiveRecord
     public $shift_id;
     public $cnt;
     public $adminGuid;
-    public $shift_id;
     const TYPE_START = 1;
     const TYPE_END = 2;
     const TYPE_APPEAR = 3;

diff --git a/erp24/records/TimetableFactModel.php b/erp24/records/TimetableFactModel.php
index bd05686bae9ba9f04419bdd62e884128f3dbb14d..d094f203c088ae20283a8d0713f8a653a3ccd048 100644 (file)
--- a/erp24/records/TimetableFactModel.php
+++ b/erp24/records/TimetableFactModel.php
@@ -102,7 +102,12 @@ class TimetableFactModel extends ActiveRecord
         ];
     }
 
-    public static function setValues($adminCheckin, $is_start)
+    //is_start моя пометка для выравнивания открытия/закрытия натыканных флористами смен
+
+    /**
+     * @throws \Exception
+     */
+    public static function setValues($adminCheckin, $is_start = true)
     {
         if ($model = self::find()
             ->where(['admin_id' => $adminCheckin->admin_id, 'is_opening' => true])