From e99c1090537aeb811052cf9404c7176adba136d1 Mon Sep 17 00:00:00 2001 From: Irwan Cahyono Date: Thu, 16 Oct 2025 16:22:47 +0700 Subject: [PATCH] datetime valid --- freekake_api/mission/models.py | 11 +++++++---- freekake_api/mission/serializers.py | 12 ++++-------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/freekake_api/mission/models.py b/freekake_api/mission/models.py index 97486d5..0fd4771 100644 --- a/freekake_api/mission/models.py +++ b/freekake_api/mission/models.py @@ -58,11 +58,14 @@ class Mission(SoftDeleteModel): category = models.CharField(max_length=50, choices=MISSION_CATEGORY_CHOICES) task = models.CharField(max_length=50, choices=MISSION_TASK_CHOICES) - date_from = models.DateField(null=True, blank=True) - date_to = models.DateField(null=True, blank=True) + # date_from = models.DateField(null=True, blank=True) + # date_to = models.DateField(null=True, blank=True) - time_from_valid = models.TimeField(null=True, blank=True) - time_to_valid = models.TimeField(null=True, blank=True) + # time_from_valid = models.TimeField(null=True, blank=True) + # time_to_valid = models.TimeField(null=True, blank=True) + + date_time_from_valid = models.DateTimeField(null=True, blank=True) + date_time_to_valid = models.DateTimeField(null=True, blank=True) status = models.CharField(max_length=50, choices=MISSION_STATUS_CHOICES, default='draft') diff --git a/freekake_api/mission/serializers.py b/freekake_api/mission/serializers.py index 6aa66e5..a38d189 100644 --- a/freekake_api/mission/serializers.py +++ b/freekake_api/mission/serializers.py @@ -17,10 +17,8 @@ class MissionSerializer(serializers.ModelSerializer): 'category', 'task', 'status', - 'date_from', - 'date_to', - 'time_from_valid', - 'time_to_valid', + 'date_time_from_valid', + 'date_time_to_valid', ] def __init__(self, *args, **kwargs): @@ -48,10 +46,8 @@ class MissionDetailSerializer(serializers.ModelSerializer): 'category', 'task', 'status', - 'date_from', - 'date_to', - 'time_from_valid', - 'time_to_valid', + 'date_time_from_valid', + 'date_time_to_valid', 'category_display', 'task_display', 'status_display',