diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index bef3798b..c6b9e548 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -391,6 +391,13 @@ class MlogSerializer(CustomModelSerializer): if mtask: if mtask.start_date == mtask.end_date: attrs['handle_date'] = mtask.start_date + else: + if attrs['work_end_time']: + attrs['handle_date'] = attrs['work_end_time'].date() + elif attrs['work_start_time']: + attrs['handle_date'] = attrs['work_start_time'].date() + if attrs['handle_date'] >= mtask.start_date and attrs['handle_date'] <= mtask.end_date: + pass else: if attrs['handle_date'] >= mtask.start_date and attrs['handle_date'] <= mtask.end_date: pass