Merge branch 'feature/employee_priority' into 'develop'

Added employee position priority

See merge request gm/gm-backend!9
This commit is contained in:
d.kuzmenko 2019-09-19 07:02:45 +00:00
commit 22bdcbacea
3 changed files with 22 additions and 1 deletions

View File

@ -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),
),
]

View File

@ -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."""

View File

@ -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):