From f700491d42b36db07384c848ce77917b54689937 Mon Sep 17 00:00:00 2001 From: Semyon Yekhmenin Date: Thu, 19 Sep 2019 07:02:45 +0000 Subject: [PATCH] Added employee position priority --- .../migrations/0019_position_priority.py | 18 ++++++++++++++++++ apps/establishment/models.py | 2 ++ apps/establishment/serializers/common.py | 3 ++- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 apps/establishment/migrations/0019_position_priority.py diff --git a/apps/establishment/migrations/0019_position_priority.py b/apps/establishment/migrations/0019_position_priority.py new file mode 100644 index 00000000..b632271d --- /dev/null +++ b/apps/establishment/migrations/0019_position_priority.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.4 on 2019-09-13 13:41 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('establishment', '0018_socialnetwork'), + ] + + operations = [ + migrations.AddField( + model_name='position', + name='priority', + field=models.IntegerField(default=None, null=True, unique=True), + ), + ] diff --git a/apps/establishment/models.py b/apps/establishment/models.py index 00115303..c3a71e92 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -335,6 +335,8 @@ class Position(BaseAttributes, TranslatedFieldsMixin): name = TJSONField(blank=True, null=True, default=None, verbose_name=_('Description'), help_text='{"en":"some text"}') + priority = models.IntegerField(unique=True, null=True, default=None) + class Meta: """Meta class.""" diff --git a/apps/establishment/serializers/common.py b/apps/establishment/serializers/common.py index ac881c20..87931485 100644 --- a/apps/establishment/serializers/common.py +++ b/apps/establishment/serializers/common.py @@ -146,12 +146,13 @@ class EstablishmentEmployeeSerializer(serializers.ModelSerializer): name = serializers.CharField(source='employee.name') position_translated = serializers.CharField(source='position.name_translated') awards = AwardSerializer(source='employee.awards', many=True) + priority = serializers.IntegerField(source='position.priority') class Meta: """Meta class.""" model = models.Employee - fields = ('id', 'name', 'position_translated', 'awards') + fields = ('id', 'name', 'position_translated', 'awards', 'priority') class EstablishmentBaseSerializer(serializers.ModelSerializer):