sifatbaho/backend-v1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Shaxobff
2026-05-06 17:05:35 +05:00
parent a17c2a52ce
commit 89a5411e3c
16 changed files with 226 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/apps/evaluation/choices/auto.py
View File

@@ -16,6 +16,7 @@ class AutoEvaluationStatus(models.TextChoices):
EVALUATED = "baxolandi", _("Baholandi")
REJECTED = "rad_etildi", _("Rad etildi")
APPROVED = "tasdiqlandi", _("Tasdiqlandi")
PENDING = "pending", _("Pending")
class ObjectOwnerType(models.IntegerChoices):

109
core/apps/evaluation/migrations/0047_autoevaluationmodel_tender_contract_date_and_more.py Normal file
View File

@@ -0,0 +1,109 @@
# Generated by Django 5.2.7 on 2026-05-06 12:03
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("evaluation", "0046_mechanicauto_fields_and_multi_tex_passport"),
]
operations = [
migrations.AddField(
model_name="autoevaluationmodel",
name="tender_contract_date",
field=models.DateField(blank=True, null=True),
),
migrations.AddField(
model_name="autoevaluationmodel",
name="tender_contract_file",
field=models.FileField(blank=True, null=True, upload_to="tender_contracts/%Y/%m/"),
),
migrations.AddField(
model_name="autoevaluationmodel",
name="tender_contract_number",
field=models.CharField(blank=True, max_length=255, null=True),
),
migrations.AddField(
model_name="autoevaluationmodel",
name="with_tender_field",
field=models.BooleanField(default=False),
),
migrations.AddField(
model_name="mechanicautoevaluationmodel",
name="tender_contract_date",
field=models.DateField(blank=True, null=True),
),
migrations.AddField(
model_name="mechanicautoevaluationmodel",
name="tender_contract_file",
field=models.FileField(blank=True, null=True, upload_to="tender_contracts/%Y/%m/"),
),
migrations.AddField(
model_name="mechanicautoevaluationmodel",
name="tender_contract_number",
field=models.CharField(blank=True, max_length=255, null=True),
),
migrations.AddField(
model_name="mechanicautoevaluationmodel",
name="with_tender_field",
field=models.BooleanField(default=False),
),
migrations.AddField(
model_name="mechanicautoevaluationtexpassportfile",
name="calculated_price",
field=models.DecimalField(decimal_places=2, max_digits=12, null=True),
),
migrations.AddField(
model_name="mechanicautoevaluationtexpassportfile",
name="status",
field=models.CharField(
choices=[
("yaratildi", "Yaratildi"),
("baxolovchi_biriktirildi", "Baholovchi biriktirildi"),
("baxolandi", "Baholandi"),
("rad_etildi", "Rad etildi"),
("tasdiqlandi", "Tasdiqlandi"),
("pending", "Pending"),
],
default="yaratildi",
max_length=50,
verbose_name="status",
),
),
migrations.AlterField(
model_name="autoevaluationmodel",
name="status",
field=models.CharField(
choices=[
("yaratildi", "Yaratildi"),
("baxolovchi_biriktirildi", "Baholovchi biriktirildi"),
("baxolandi", "Baholandi"),
("rad_etildi", "Rad etildi"),
("tasdiqlandi", "Tasdiqlandi"),
("pending", "Pending"),
],
default="yaratildi",
max_length=50,
verbose_name="status",
),
),
migrations.AlterField(
model_name="mechanicautoevaluationmodel",
name="status",
field=models.CharField(
choices=[
("yaratildi", "Yaratildi"),
("baxolovchi_biriktirildi", "Baholovchi biriktirildi"),
("baxolandi", "Baholandi"),
("rad_etildi", "Rad etildi"),
("tasdiqlandi", "Tasdiqlandi"),
("pending", "Pending"),
],
default="yaratildi",
max_length=50,
verbose_name="status",
),
),
]

18
core/apps/evaluation/models/auto.py
View File

@@ -32,6 +32,24 @@ class AutoEvaluationModel(AbstractBaseModel):
null=True,
blank=True,
)
with_tender_field = models.BooleanField(default=False)
tender_contract_number = models.CharField(
max_length=255,
null=True,
blank=True
)
tender_contract_file = models.FileField(
upload_to="tender_contracts/%Y/%m/",
null=True,
blank=True
)
tender_contract_date = models.DateField(
null=True,
blank=True
)
valuation = models.OneToOneField(
ValuationModel,
on_delete=models.CASCADE,

28
core/apps/evaluation/models/mechanic_auto.py
View File

@@ -1,4 +1,5 @@
from django.db import models
from django.db.models import DecimalField
from django.utils.translation import gettext_lazy as _
from django_core.models import AbstractBaseModel
from model_bakery import baker
@@ -28,6 +29,25 @@ class MechanicAutoEvaluationModel(AbstractBaseModel):
null=True,
blank=True,
)
with_tender_field = models.BooleanField(default=False)
tender_contract_number = models.CharField(
max_length=255,
null=True,
blank=True
)
tender_contract_file = models.FileField(
upload_to="tender_contracts/%Y/%m/",
null=True,
blank=True
)
tender_contract_date = models.DateField(
null=True,
blank=True
)
valuation = models.OneToOneField(
ValuationModel,
on_delete=models.CASCADE,
@@ -298,6 +318,14 @@ class MechanicAutoEvaluationTexPassportFile(AbstractBaseModel):
verbose_name=_("tech passport file"),
upload_to="mechanic_evaluation/tech_passports/%Y/%m/",
)
status = models.CharField(
verbose_name=_("status"),
max_length=50,
choices=AutoEvaluationStatus.choices,
default=AutoEvaluationStatus.CREATED,
)
calculated_price = DecimalField(max_digits=12, decimal_places=2, null=True)
def __str__(self):
return f"Tex passport file for MechanicAutoEvaluation #{self.mechanic_auto_evaluation_id}"

5
core/apps/evaluation/serializers/auto/MechanicAutoEvaluation.py
View File

@@ -499,3 +499,8 @@ class MechanicAutoEvaluationModelSerializer(serializers.ModelSerializer):
"created_at",
"updated_at",
)
class MechanicAutoEvaluationTexPassportFileCreateSerializer(serializers.ModelSerializer):
class Meta:
model = MechanicAutoEvaluationTexPassportFile
fields = ['mechanic_auto_evaluation','file', 'calculated_price']

14
core/apps/evaluation/urls.py
View File

@@ -2,7 +2,8 @@ from django.urls import include, path
from rest_framework.routers import DefaultRouter
from core.apps.evaluation import views
from core.apps.evaluation.views import MechanicAutoEvaluationTexPassportFileCreateView, \
MechanicAutoEvaluationTexPassportFileRetrieveAPIView, MechanicAutoEvaluationTexPassportFileListAPIView
router = DefaultRouter()
router.register("document-category", views.DocumentCategoryView, basename="DocumentCategory")
@@ -33,6 +34,7 @@ router.register("bonus-type", views.BonusTypeView, basename="bonus-type")
router.register("bonus-employee", views.BonusEmployeeViewSet, basename="bonus-employee")
router.register("bonus-base", views.BaseBonusViewSet, basename="bonus-base")
urlpatterns = [
path("", include(router.urls)),
@@ -111,4 +113,14 @@ urlpatterns = [
path("calculate_avg_cost/", views.AvgCostAPIView.as_view()),
path("vehicle_document/", views.GeneratePDFView.as_view()),
path("mechanic-auto/", include([
path('upload-passport/', MechanicAutoEvaluationTexPassportFileCreateView.as_view()),
path('passport/<int:pk>', MechanicAutoEvaluationTexPassportFileRetrieveAPIView.as_view()),
path('passport/', MechanicAutoEvaluationTexPassportFileListAPIView.as_view())
]))
]

2
core/apps/evaluation/views/bonus.py
View File

@@ -38,7 +38,7 @@ class BonusTypeView(BaseViewSetMixin, ModelViewSet):
'list': [IsAdminUser],
}
@extend_schema(tags=["Bonus-Employee"])
class BonusEmployeeViewSet(BaseViewSetMixin, ModelViewSet):
queryset = EmployeeBonus.objects.all()
serializer_class = BonusEmployeeBonusSerializer

33
core/apps/evaluation/views/mechanic_auto.py
View File

@@ -4,8 +4,10 @@ from django_core.mixins import BaseViewSetMixin
from django_filters.rest_framework import DjangoFilterBackend
from drf_spectacular.utils import extend_schema, OpenApiParameter
from rest_framework import generics
from rest_framework.decorators import action
from rest_framework.filters import OrderingFilter, SearchFilter
from rest_framework.generics import GenericAPIView, ListAPIView
from rest_framework.parsers import FormParser, MultiPartParser
from rest_framework.permissions import AllowAny, IsAuthenticated
from rest_framework.response import Response
from rest_framework.views import APIView
@@ -13,15 +15,17 @@ from rest_framework.viewsets import ModelViewSet
from core.apps.accounts.permissions import IsAdminRole
from core.apps.accounts.serializers.user import UserSerializer
from core.apps.evaluation.choices.auto import AutoEvaluationStatus
from core.apps.evaluation.filters.mechanic_auto import MechanicAutoevaluationFilter
from core.apps.evaluation.models import MechanicAutoEvaluationModel
from core.apps.evaluation.models import MechanicAutoEvaluationModel, MechanicAutoEvaluationTexPassportFile
from core.apps.evaluation.serializers.auto.MechanicAutoEvaluation import (
ListMechanicAutoevaluationSerializer,
RetrieveMechanicAutoevaluationSerializer,
CreateMechanicAutoevaluationSerializer,
UpdateMechanicAutoevaluationSerializer,
MechanicAutoEvaluationAppraisersSerializer,
MechanicAutoEvaluationModelSerializer,
MechanicAutoEvaluationModelSerializer, MechanicAutoEvaluationTexPassportFileCreateSerializer,
MechanicAutoEvaluationTexPassportFileSerializer,
)
@@ -196,3 +200,28 @@ class AdminMechanicEvaluationsAPIView(generics.GenericAPIView):
).distinct()
serializer = MechanicAutoEvaluationModelSerializer(evaluations, many=True)
return Response(serializer.data)
@extend_schema(tags=["MechanicAutoEvaluationTexPassportFile"])
class MechanicAutoEvaluationTexPassportFileCreateView(generics.CreateAPIView):
permission_classes = [IsAuthenticated, IsAdminRole]
serializer_class = MechanicAutoEvaluationTexPassportFileCreateSerializer
queryset = MechanicAutoEvaluationTexPassportFile.objects.all()
def perform_create(self, serializer):
eval_id = self.kwargs.get('eval_id')
serializer.save(mechanic_auto_evaluation_id=eval_id, status=AutoEvaluationStatus.PENDING)
@extend_schema(tags=["MechanicAutoEvaluationTexPassportFile"])
class MechanicAutoEvaluationTexPassportFileRetrieveAPIView(generics.RetrieveAPIView):
permission_classes = [IsAuthenticated, IsAdminRole]
queryset = MechanicAutoEvaluationTexPassportFile.objects.all()
serializer_class = MechanicAutoEvaluationTexPassportFileSerializer
@extend_schema(tags=["MechanicAutoEvaluationTexPassportFile"])
class MechanicAutoEvaluationTexPassportFileListAPIView(generics.ListAPIView):
permission_classes = [IsAuthenticated, IsAdminRole]
queryset = MechanicAutoEvaluationTexPassportFile.objects.all()
serializer_class = MechanicAutoEvaluationTexPassportFileSerializer