Merge branch 'feature/employee_priority' into 'develop'
Added employee position priority See merge request gm/gm-backend!9
This commit is contained in:
commit
22bdcbacea
18
apps/establishment/migrations/0019_position_priority.py
Normal file
18
apps/establishment/migrations/0019_position_priority.py
Normal 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),
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
@ -335,6 +335,8 @@ class Position(BaseAttributes, TranslatedFieldsMixin):
|
||||||
name = TJSONField(blank=True, null=True, default=None, verbose_name=_('Description'),
|
name = TJSONField(blank=True, null=True, default=None, verbose_name=_('Description'),
|
||||||
help_text='{"en":"some text"}')
|
help_text='{"en":"some text"}')
|
||||||
|
|
||||||
|
priority = models.IntegerField(unique=True, null=True, default=None)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
"""Meta class."""
|
"""Meta class."""
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -146,12 +146,13 @@ class EstablishmentEmployeeSerializer(serializers.ModelSerializer):
|
||||||
name = serializers.CharField(source='employee.name')
|
name = serializers.CharField(source='employee.name')
|
||||||
position_translated = serializers.CharField(source='position.name_translated')
|
position_translated = serializers.CharField(source='position.name_translated')
|
||||||
awards = AwardSerializer(source='employee.awards', many=True)
|
awards = AwardSerializer(source='employee.awards', many=True)
|
||||||
|
priority = serializers.IntegerField(source='position.priority')
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
"""Meta class."""
|
"""Meta class."""
|
||||||
|
|
||||||
model = models.Employee
|
model = models.Employee
|
||||||
fields = ('id', 'name', 'position_translated', 'awards')
|
fields = ('id', 'name', 'position_translated', 'awards', 'priority')
|
||||||
|
|
||||||
|
|
||||||
class EstablishmentBaseSerializer(serializers.ModelSerializer):
|
class EstablishmentBaseSerializer(serializers.ModelSerializer):
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user