From 6d55f1cd3b7cd958d5cea6797dc58f2e36ff4533 Mon Sep 17 00:00:00 2001 From: Mojtaba-z Date: Sat, 24 Jan 2026 15:03:04 +0330 Subject: [PATCH] fix --> livestock species --- .../migrations/0017_livestockspecies_value.py | 18 +++++++++++++++ ...ies_en_name_alter_livestockspecies_name.py | 23 +++++++++++++++++++ apps/livestock/models.py | 4 +++- .../tag/services/tag_distribution_services.py | 7 ++++++ apps/tag/services/tag_services.py | 8 +++++++ 5 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 apps/livestock/migrations/0017_livestockspecies_value.py create mode 100644 apps/livestock/migrations/0018_livestockspecies_en_name_alter_livestockspecies_name.py diff --git a/apps/livestock/migrations/0017_livestockspecies_value.py b/apps/livestock/migrations/0017_livestockspecies_value.py new file mode 100644 index 0000000..2e1674c --- /dev/null +++ b/apps/livestock/migrations/0017_livestockspecies_value.py @@ -0,0 +1,18 @@ +# Generated by Django 5.0 on 2026-01-24 11:28 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('livestock', '0016_temporarylivestock'), + ] + + operations = [ + migrations.AddField( + model_name='livestockspecies', + name='value', + field=models.IntegerField(default=0), + ), + ] diff --git a/apps/livestock/migrations/0018_livestockspecies_en_name_alter_livestockspecies_name.py b/apps/livestock/migrations/0018_livestockspecies_en_name_alter_livestockspecies_name.py new file mode 100644 index 0000000..6b36b10 --- /dev/null +++ b/apps/livestock/migrations/0018_livestockspecies_en_name_alter_livestockspecies_name.py @@ -0,0 +1,23 @@ +# Generated by Django 5.0 on 2026-01-24 11:32 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('livestock', '0017_livestockspecies_value'), + ] + + operations = [ + migrations.AddField( + model_name='livestockspecies', + name='en_name', + field=models.CharField(max_length=50, null=True), + ), + migrations.AlterField( + model_name='livestockspecies', + name='name', + field=models.CharField(max_length=50, null=True), + ), + ] diff --git a/apps/livestock/models.py b/apps/livestock/models.py index 5020b9a..426b997 100644 --- a/apps/livestock/models.py +++ b/apps/livestock/models.py @@ -7,7 +7,9 @@ from apps.tag import models as tag_models class LiveStockSpecies(BaseModel): # noqa """ species of live stocks like Kurdi, Luri, etc """ # noqa - name = models.CharField(max_length=50) + name = models.CharField(max_length=50, null=True) + en_name = models.CharField(max_length=50, null=True) + value = models.IntegerField(default=0) def __str__(self): return f'{self.name}' diff --git a/apps/tag/services/tag_distribution_services.py b/apps/tag/services/tag_distribution_services.py index 457c8ad..37c3af0 100644 --- a/apps/tag/services/tag_distribution_services.py +++ b/apps/tag/services/tag_distribution_services.py @@ -179,4 +179,11 @@ class TagDistributionService: remaining_tag_count=Sum('remaining_tag_count'), ) + distributions = TagDistribution.objects.filter( + Q(assigner_org=org) | + Q(assigned_org=org), + is_closed=is_closed, + ) + + print(distributions) return data diff --git a/apps/tag/services/tag_services.py b/apps/tag/services/tag_services.py index 2aa500e..cbb123d 100644 --- a/apps/tag/services/tag_services.py +++ b/apps/tag/services/tag_services.py @@ -9,6 +9,14 @@ from apps.tag.exceptions import TagException from apps.tag.models import Tag, TagBatch from apps.tag.tools import tag_code_serial_scanning +SPECIES_MAP = { + 'cow': 1, + 'buffalo': 2, + 'camel': 3, + 'sheep': 4, + 'goat': 5, +} + class TagService: """