mirror of
https://github.com/lemeow125/Borrowing-TrackerBackend.git
synced 2024-11-17 06:19:26 +08:00
Format last updated field properly to add space between actual time and AM/PM indicator
This commit is contained in:
parent
9e16bda918
commit
938614fafa
1 changed files with 10 additions and 10 deletions
|
@ -16,9 +16,9 @@ class EquipmentHistoricalRecordField(serializers.ListField):
|
||||||
|
|
||||||
class EquipmentSerializer(serializers.HyperlinkedModelSerializer):
|
class EquipmentSerializer(serializers.HyperlinkedModelSerializer):
|
||||||
date_added = serializers.DateTimeField(
|
date_added = serializers.DateTimeField(
|
||||||
format="%m-%d-%Y %I:%M%p", read_only=True)
|
format="%m-%d-%Y %I:%M %p", read_only=True)
|
||||||
last_updated = serializers.DateTimeField(
|
last_updated = serializers.DateTimeField(
|
||||||
format="%m-%d-%Y %I:%M%p", read_only=True)
|
format="%m-%d-%Y %I:%M %p", read_only=True)
|
||||||
last_updated_by = serializers.SerializerMethodField()
|
last_updated_by = serializers.SerializerMethodField()
|
||||||
name = serializers.CharField()
|
name = serializers.CharField()
|
||||||
description = serializers.CharField(
|
description = serializers.CharField(
|
||||||
|
@ -67,7 +67,7 @@ class EquipmentSerializer(serializers.HyperlinkedModelSerializer):
|
||||||
|
|
||||||
class EquipmentLogsSerializer(serializers.HyperlinkedModelSerializer):
|
class EquipmentLogsSerializer(serializers.HyperlinkedModelSerializer):
|
||||||
history_date = serializers.DateTimeField(
|
history_date = serializers.DateTimeField(
|
||||||
format="%m-%d-%Y %I:%M%p", read_only=True)
|
format="%m-%d-%Y %I:%M %p", read_only=True)
|
||||||
history_user = serializers.SerializerMethodField()
|
history_user = serializers.SerializerMethodField()
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
@ -84,9 +84,9 @@ class EquipmentLogsSerializer(serializers.HyperlinkedModelSerializer):
|
||||||
|
|
||||||
class EquipmentLogSerializer(serializers.HyperlinkedModelSerializer):
|
class EquipmentLogSerializer(serializers.HyperlinkedModelSerializer):
|
||||||
date_added = serializers.DateTimeField(
|
date_added = serializers.DateTimeField(
|
||||||
format="%m-%d-%Y %I:%M%p", read_only=True)
|
format="%m-%d-%Y %I:%M %p", read_only=True)
|
||||||
last_updated = serializers.DateTimeField(
|
last_updated = serializers.DateTimeField(
|
||||||
format="%m-%d-%Y %I:%M%p", read_only=True)
|
format="%m-%d-%Y %I:%M %p", read_only=True)
|
||||||
last_updated_by = serializers.SerializerMethodField()
|
last_updated_by = serializers.SerializerMethodField()
|
||||||
name = serializers.CharField()
|
name = serializers.CharField()
|
||||||
description = serializers.CharField(required=False)
|
description = serializers.CharField(required=False)
|
||||||
|
@ -126,9 +126,9 @@ class EquipmentInstanceSerializer(serializers.HyperlinkedModelSerializer):
|
||||||
remarks = serializers.CharField(
|
remarks = serializers.CharField(
|
||||||
max_length=512, required=False, allow_blank=True)
|
max_length=512, required=False, allow_blank=True)
|
||||||
date_added = serializers.DateTimeField(
|
date_added = serializers.DateTimeField(
|
||||||
format="%m-%d-%Y %I:%M%p", read_only=True)
|
format="%m-%d-%Y %I:%M %p", read_only=True)
|
||||||
last_updated = serializers.DateTimeField(
|
last_updated = serializers.DateTimeField(
|
||||||
format="%m-%d-%Y %I:%M%p", read_only=True)
|
format="%m-%d-%Y %I:%M %p", read_only=True)
|
||||||
last_updated_by = serializers.SerializerMethodField()
|
last_updated_by = serializers.SerializerMethodField()
|
||||||
status = serializers.ChoiceField(
|
status = serializers.ChoiceField(
|
||||||
choices=EquipmentInstance.EQUIPMENT_INSTANCE_STATUS_CHOICES)
|
choices=EquipmentInstance.EQUIPMENT_INSTANCE_STATUS_CHOICES)
|
||||||
|
@ -202,7 +202,7 @@ class EquipmentInstanceSerializer(serializers.HyperlinkedModelSerializer):
|
||||||
|
|
||||||
class EquipmentInstanceLogsSerializer(serializers.HyperlinkedModelSerializer):
|
class EquipmentInstanceLogsSerializer(serializers.HyperlinkedModelSerializer):
|
||||||
history_date = serializers.DateTimeField(
|
history_date = serializers.DateTimeField(
|
||||||
format="%m-%d-%Y %I:%M%p", read_only=True)
|
format="%m-%d-%Y %I:%M %p", read_only=True)
|
||||||
history_user = serializers.SerializerMethodField()
|
history_user = serializers.SerializerMethodField()
|
||||||
equipment = serializers.SlugRelatedField(
|
equipment = serializers.SlugRelatedField(
|
||||||
slug_field='id', queryset=Equipment.objects.all())
|
slug_field='id', queryset=Equipment.objects.all())
|
||||||
|
@ -231,9 +231,9 @@ class EquipmentInstanceLogSerializer(serializers.HyperlinkedModelSerializer):
|
||||||
status = serializers.CharField()
|
status = serializers.CharField()
|
||||||
remarks = serializers.CharField()
|
remarks = serializers.CharField()
|
||||||
date_added = serializers.DateTimeField(
|
date_added = serializers.DateTimeField(
|
||||||
format="%m-%d-%Y %I:%M%p", read_only=True)
|
format="%m-%d-%Y %I:%M %p", read_only=True)
|
||||||
last_updated = serializers.DateTimeField(
|
last_updated = serializers.DateTimeField(
|
||||||
format="%m-%d-%Y %I:%M%p", read_only=True)
|
format="%m-%d-%Y %I:%M %p", read_only=True)
|
||||||
last_updated_by = serializers.SerializerMethodField()
|
last_updated_by = serializers.SerializerMethodField()
|
||||||
history = EquipmentInstanceHistoricalRecordField()
|
history = EquipmentInstanceHistoricalRecordField()
|
||||||
category = serializers.CharField(
|
category = serializers.CharField(
|
||||||
|
|
Loading…
Reference in a new issue