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

diff --git a/erp24/actions/timetable/StartShiftStepTwoAction.php b/erp24/actions/timetable/StartShiftStepTwoAction.php
index 0a7d91eba4b63986919202ec206d596aaab7062a..9716da08e0f56b544d601270c8308955a76af4f2 100755 (executable)
--- a/erp24/actions/timetable/StartShiftStepTwoAction.php
+++ b/erp24/actions/timetable/StartShiftStepTwoAction.php
@@ -110,7 +110,7 @@ class StartShiftStepTwoAction extends Action
         }
 
         $timetableFact = new TimetableFactModel();
-        $timetableFact->setValues($model, $planSlots);
+        $timetableFact->setValues($model, $planSlots, $lastCheckin);
 
         if (!$model->date) {
             \Yii::warning('Не указана дата явки. Скорее всего отсутствуент связанный план. admin_id:' . $model->admin_id . ', plan_id:' . $model->plan_id . ', store_id:' . $model->store_id);

diff --git a/erp24/records/TimetableFactModel.php b/erp24/records/TimetableFactModel.php
index 4b14bdd07fd37b6142e079dece877a01f884b3b9..582d2e14ed42257bffe6f1116eba9b66d76df767 100644 (file)
--- a/erp24/records/TimetableFactModel.php
+++ b/erp24/records/TimetableFactModel.php
@@ -41,7 +41,7 @@ class TimetableFactModel extends ActiveRecord
 {
     public static function tableName()
     {
-        return '{{%timetable_fact}}';
+        return 'timetable_fact';
     }
 
     public function rules()