提交 209b5b64 编写于 作者: A Andrey Zhavoronkov 提交者: Nikita Manovich

Fix working time calculation (#5973)

上级 8f2de468
......@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## \[2.4.1] - 2023-04-05
### Fixed
- Optimized annotation fetching up to 10 times (<https://github.com/opencv/cvat/pull/5974>)
- Incorrect calculation of working time in analytics (<https://github.com/opencv/cvat/pull/5973>)
## \[2.4.0] - 2023-03-16
### Added
......
......@@ -30,7 +30,8 @@ class EventSerializer(serializers.Serializer):
class ClientEventsSerializer(serializers.Serializer):
events = EventSerializer(many=True, default=[])
timestamp = serializers.DateTimeField()
_TIME_THRESHOLD = 100 # seconds
_TIME_THRESHOLD = datetime.timedelta(seconds=100)
_WORKING_TIME_RESOLUTION = datetime.timedelta(milliseconds=1)
def to_internal_value(self, data):
request = self.context.get("request")
......@@ -47,12 +48,12 @@ class ClientEventsSerializer(serializers.Serializer):
timestamp = datetime_parser.isoparse(event['timestamp'])
if last_timestamp:
t_diff = timestamp - last_timestamp
if t_diff.seconds < self._TIME_THRESHOLD:
if t_diff < self._TIME_THRESHOLD:
payload = event.get('payload', {})
if payload:
payload = json.loads(payload)
payload['working_time'] = t_diff.microseconds // 1000
payload['working_time'] = t_diff // self._WORKING_TIME_RESOLUTION
payload['username'] = request.user.username
event['payload'] = json.dumps(payload)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册