Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions api/migrations/0047_auto_20200331_1153.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Generated by Django 2.2.10 on 2020-03-31 11:53

import api.models
from django.db import migrations, models
import enumfields.fields


class Migration(migrations.Migration):

dependencies = [
('api', '0046_merge_20200325_1016'),
]

operations = [
migrations.AddField(
model_name='event',
name='tab_one_title',
field=models.CharField(default='Additional Information', max_length=50),
),
migrations.AddField(
model_name='event',
name='tab_three_title',
field=models.CharField(max_length=50, null=True),
),
migrations.AddField(
model_name='event',
name='tab_two_title',
field=models.CharField(max_length=50, null=True),
),
migrations.AddField(
model_name='snippet',
name='tab',
field=enumfields.fields.EnumIntegerField(default=1, enum=api.models.TabNumber),
),
migrations.AlterField(
model_name='country',
name='society_url',
field=models.URLField(blank=True, verbose_name='URL - Society'),
),
migrations.AlterField(
model_name='country',
name='url_ifrc',
field=models.URLField(blank=True, verbose_name='URL - IFRC'),
),
]
28 changes: 28 additions & 0 deletions api/migrations/0048_auto_20200401_1249.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Generated by Django 2.2.10 on 2020-04-01 12:49

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('api', '0047_auto_20200331_1153'),
]

operations = [
migrations.AlterField(
model_name='event',
name='tab_one_title',
field=models.CharField(blank=True, default='Additional Information', max_length=50),
),
migrations.AlterField(
model_name='event',
name='tab_three_title',
field=models.CharField(blank=True, max_length=50, null=True),
),
migrations.AlterField(
model_name='event',
name='tab_two_title',
field=models.CharField(blank=True, max_length=50, null=True),
),
]
14 changes: 14 additions & 0 deletions api/migrations/0049_merge_20200403_1508.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Generated by Django 2.2.10 on 2020-04-03 15:08

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('api', '0048_auto_20200401_1249'),
('api', '0048_merge_20200401_1310'),
]

operations = [
]
14 changes: 14 additions & 0 deletions api/migrations/0054_merge_20200407_1212.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Generated by Django 2.2.10 on 2020-04-07 12:12

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('api', '0053_merge_20200406_1343'),
('api', '0049_merge_20200403_1508'),
]

operations = [
]
10 changes: 10 additions & 0 deletions api/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,10 @@ class PositionType(IntEnum):
LOW = 4
BOTTOM = 5

class TabNumber(IntEnum):
TAB_1 = 1
TAB_2 = 2
TAB_3 = 3

class RegionSnippet(models.Model):
region = models.ForeignKey(Region, related_name='snippets', on_delete=models.CASCADE)
Expand Down Expand Up @@ -298,6 +302,11 @@ class Event(models.Model):

hide_attached_field_reports = models.BooleanField(default=False)

# Tabs. Events can have upto 3 tabs to organize snippets.
tab_one_title = models.CharField(max_length=50, null=False, blank=True, default='Additional Information')
tab_two_title = models.CharField(max_length=50, null=True, blank=True)
tab_three_title = models.CharField(max_length=50, null=True, blank=True)

class Meta:
ordering = ('-disaster_start_date',)
verbose_name = 'Emergency'
Expand Down Expand Up @@ -387,6 +396,7 @@ class Snippet(models.Model):
event = models.ForeignKey(Event, related_name='snippets', on_delete=models.CASCADE)
visibility = EnumIntegerField(VisibilityChoices, default=3)
position = EnumIntegerField(PositionType, default=3)
tab = EnumIntegerField(TabNumber, default=1)

class Meta:
ordering = ('position', 'id',)
Expand Down
4 changes: 2 additions & 2 deletions api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ class Meta:
class SnippetSerializer(serializers.ModelSerializer):
class Meta:
model = Snippet
fields = ('event', 'snippet', 'image', 'visibility', 'position', 'id',)
fields = ('event', 'snippet', 'image', 'visibility', 'position', 'tab', 'id',)

class EventContactSerializer(serializers.ModelSerializer):
class Meta:
Expand Down Expand Up @@ -201,7 +201,7 @@ class DetailEventSerializer(serializers.ModelSerializer):
field_reports = MiniFieldReportSerializer(many=True, read_only=True)
class Meta:
model = Event
fields = ('name', 'dtype', 'countries', 'districts', 'summary', 'num_affected', 'ifrc_severity_level', 'glide', 'disaster_start_date', 'created_at', 'auto_generated', 'appeals', 'contacts', 'key_figures', 'is_featured', 'is_featured_region', 'field_reports', 'hide_attached_field_reports', 'updated_at', 'id', 'slug', 'parent_event',)
fields = ('name', 'dtype', 'countries', 'districts', 'summary', 'num_affected', 'ifrc_severity_level', 'glide', 'disaster_start_date', 'created_at', 'auto_generated', 'appeals', 'contacts', 'key_figures', 'is_featured', 'is_featured_region', 'field_reports', 'hide_attached_field_reports', 'updated_at', 'id', 'slug', 'tab_one_title', 'tab_two_title', 'tab_three_title', 'parent_event',)
lookup_field = 'slug'

class SituationReportTypeSerializer(serializers.ModelSerializer):
Expand Down