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

diff --git a/erp24/actions/timetable/StartShiftStepOneAction.php b/erp24/actions/timetable/StartShiftStepOneAction.php
index 47c3ac22c78b83e3609b7d4e5f229628c6c7566b..116156ea4bdba7e3fa3dfce96acc66ebf417bd47 100755 (executable)
--- a/erp24/actions/timetable/StartShiftStepOneAction.php
+++ b/erp24/actions/timetable/StartShiftStepOneAction.php
@@ -54,7 +54,7 @@ class StartShiftStepOneAction extends Action
             $shiftArray = $lastCheckinFact ? ['id' => $lastCheckinFact->shift_id, 'name' => $lastCheckinFact->shift->name] : [];
         } else {
             $adminStores = ArrayHelper::map($userModel->getStores(), 'id', 'name');
-            $shiftArray = ArrayHelper::map(Shift::find()->all(), 'id', 'name');
+            $shiftArray = ArrayHelper::map(Shift::find()->andWhere(['not in', 'id', [3, 4, 6]])->all(), 'id', 'name');
         }
 
 

diff --git a/erp24/records/AdminCheckin.php b/erp24/records/AdminCheckin.php
index 8f11e0fe3b770ba3cd7f236c802714d83c406509..1d7b01785609e5bb7ef2df9dcf688aaee9d52edf 100755 (executable)
--- a/erp24/records/AdminCheckin.php
+++ b/erp24/records/AdminCheckin.php
@@ -90,7 +90,7 @@ class AdminCheckin extends ActiveRecord
             [['lat', 'lon'], 'double'],
             [['comment', 'photo'], 'string'],
             [['date'], 'date', 'format' => 'yyyy-M-d'],
-            [['time'], 'date', 'format' => 'yyyy-M-d HH:mm:ss'],
+//            [['time'], 'date', 'format' => 'yyyy-M-d HH:mm:ss'],
             [['admin_id', 'type_id', 'status', 'date', 'time', 'device_id'], 'required'],
         ];
     }