Skip to content

Commit 07e2675

Browse files
Add new choice field EAP Activation in field report model
1 parent 73448f6 commit 07e2675

File tree

4 files changed

+22
-2
lines changed

4 files changed

+22
-2
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Generated by Django 2.2.28 on 2022-07-21 07:54
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('api', '0156_appealfilter_comment'),
10+
]
11+
12+
operations = [
13+
migrations.AlterField(
14+
model_name='fieldreport',
15+
name='status',
16+
field=models.IntegerField(choices=[(0, 'Unknown'), (2, 'Two'), (3, 'Three'), (8, 'Early Warning'), (9, 'Event-related'), (10, 'Ten'), (11, 'EAP Activation')], default=0, verbose_name='type'),
17+
),
18+
]

api/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1220,6 +1220,7 @@ class Status(IntegerChoices):
12201220
EW = 8, _('Early Warning')
12211221
EVT = 9, _('Event-related')
12221222
TEN = 10, _('Ten') # legacy usage. Covid?
1223+
EAP_ACTV = 11, _('EAP Activation') # EAP Activation
12231224

12241225
user = models.ForeignKey(
12251226
settings.AUTH_USER_MODEL, verbose_name=_('user'), related_name='user',

api/views.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ def get(self, request):
127127
}
128128
}
129129
}
130-
131130
results = ES_CLIENT.search(
132131
index=index,
133132
doc_type='page',

eap/serializers.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ class Meta:
4444

4545

4646
class EarlyActionIndicatorSerializer(serializers.ModelSerializer):
47+
indicator_display = serializers.CharField(source='get_indicator_display', read_only=True)
48+
4749
class Meta:
4850
model = EarlyActionIndicator
4951
fields = ('__all__')
@@ -100,7 +102,6 @@ def create(self, validated_data):
100102

101103

102104
class EAPSerializer(
103-
EnumSupportSerializerMixin,
104105
NestedUpdateMixin,
105106
NestedCreateMixin,
106107
serializers.ModelSerializer
@@ -113,6 +114,7 @@ class EAPSerializer(
113114
created_by_details = UserNameSerializer(source='created_by', read_only=True)
114115
hazard_type_details = DisasterTypeSerializer(source='disaster_type', read_only=True)
115116
document_details = EAPDocumentSerializer(source='document', read_only=True, required=False)
117+
status_display = serializers.CharField(source='get_status_display', read_only=True)
116118

117119
class Meta:
118120
model = EAP

0 commit comments

Comments
 (0)