From: marina <m.zozirova@gmail.com>
Date: Mon, 9 Sep 2024 12:54:22 +0000 (+0300)
Subject: правка для отображения данных в телеграм боте
X-Git-Tag: 1.5~31^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=refs%2Fremotes%2Forigin%2Ffixes_for_tg_bot;p=erp24_rep%2Fyii-erp24%2F.git

правка для отображения данных в телеграм боте
---

diff --git a/erp24/api3/modules/v1/models/timetable/Timetable.php b/erp24/api3/modules/v1/models/timetable/Timetable.php
index 80133fef..240e0491 100644
--- a/erp24/api3/modules/v1/models/timetable/Timetable.php
+++ b/erp24/api3/modules/v1/models/timetable/Timetable.php
@@ -190,8 +190,8 @@ class Timetable extends \yii_app\records\TimetableV3
             return $this->hasMany(AdminCheckin::class, ['plan_id' => 'id']);
         } else {
             return $this->hasMany(AdminCheckin::class, ['admin_id' => 'admin_id'])
-                ->andWhere(['BETWEEN', 'datetime_start', date('Y-m-d H:i:s'), date('Y-m-d H:i:s', strtotime('+6 hour'))])
-                ->andWhere(['BETWEEN', 'datetime_end', date('Y-m-d H:i:s', strtotime('-6 hour')), date('Y-m-d H:i:s')]);
+                ->andWhere(['BETWEEN', 'time', date('Y-m-d H:i:s'), date('Y-m-d H:i:s', strtotime('+6 hour'))])
+                ->andWhere(['BETWEEN', 'time', date('Y-m-d H:i:s', strtotime('-6 hour')), date('Y-m-d H:i:s')]);
 
 //           return $this->hasOne(AdminCheckin::class, ['admin_id' => 'id'])
 //                ->andWhere(['>=', 'date', date('Y-m-d 00:00:00')])
@@ -205,8 +205,8 @@ class Timetable extends \yii_app\records\TimetableV3
             return $this->hasMany(AdminCheckin::class, ['plan_id' => 'id'])->count();
         } else {
             return $this->hasMany(AdminCheckin::class, ['admin_id' => 'admin_id'])
-                ->andWhere(['BETWEEN', 'datetime_start', date('Y-m-d H:i:s'), date('Y-m-d H:i:s', strtotime('+6 hour'))])
-                ->andWhere(['BETWEEN', 'datetime_end', date('Y-m-d H:i:s', strtotime('-6 hour')), date('Y-m-d H:i:s')])->count();
+                ->andWhere(['BETWEEN', 'time', date('Y-m-d H:i:s'), date('Y-m-d H:i:s', strtotime('+6 hour'))])
+                ->andWhere(['BETWEEN', 'time', date('Y-m-d H:i:s', strtotime('-6 hour')), date('Y-m-d H:i:s')])->count();
         }
     }
 }
\ No newline at end of file