Merge branch 'feature/employee_position_index_name' into 'develop'
Added index_name in employee position See merge request gm/gm-backend!72
This commit is contained in:
commit
e0ada64f96
18
apps/establishment/migrations/0044_position_index_name.py
Normal file
18
apps/establishment/migrations/0044_position_index_name.py
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
# Generated by Django 2.2.4 on 2019-10-24 14:33
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('establishment', '0043_establishment_currency'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='position',
|
||||||
|
name='index_name',
|
||||||
|
field=models.CharField(db_index=True, max_length=255, null=True, unique=True, verbose_name='Index name'),
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
@ -497,6 +497,9 @@ class Position(BaseAttributes, TranslatedFieldsMixin):
|
||||||
|
|
||||||
priority = models.IntegerField(unique=True, null=True, default=None)
|
priority = models.IntegerField(unique=True, null=True, default=None)
|
||||||
|
|
||||||
|
index_name = models.CharField(max_length=255, db_index=True, unique=True,
|
||||||
|
null=True, verbose_name=_('Index name'))
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
"""Meta class."""
|
"""Meta class."""
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -147,12 +147,13 @@ class EstablishmentEmployeeSerializer(serializers.ModelSerializer):
|
||||||
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')
|
priority = serializers.IntegerField(source='position.priority')
|
||||||
|
position_index_name = serializers.CharField(source='position.index_name')
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
"""Meta class."""
|
"""Meta class."""
|
||||||
|
|
||||||
model = models.Employee
|
model = models.Employee
|
||||||
fields = ('id', 'name', 'position_translated', 'awards', 'priority')
|
fields = ('id', 'name', 'position_translated', 'awards', 'priority', 'position_index_name')
|
||||||
|
|
||||||
|
|
||||||
class EstablishmentBaseSerializer(ProjectModelSerializer):
|
class EstablishmentBaseSerializer(ProjectModelSerializer):
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user