fix
This commit is contained in:
@@ -0,0 +1,19 @@
|
|||||||
|
# Generated by Django 5.2.7 on 2026-04-20 13:08
|
||||||
|
|
||||||
|
import django.db.models.deletion
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('evaluation', '0029_autoevaluationmodel_user'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='autoevaluationmodel',
|
||||||
|
name='evaluation_request',
|
||||||
|
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='auto_evaluations_request', to='evaluation.evaluationrequestmodel', verbose_name='evaluation request'),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -30,6 +30,14 @@ class AutoEvaluationModel(AbstractBaseModel):
|
|||||||
null=True,
|
null=True,
|
||||||
blank=True,
|
blank=True,
|
||||||
)
|
)
|
||||||
|
evaluation_request = models.ForeignKey(
|
||||||
|
"evaluation.EvaluationRequestModel",
|
||||||
|
on_delete=models.SET_NULL,
|
||||||
|
related_name="auto_evaluations_request",
|
||||||
|
verbose_name=_("evaluation request"),
|
||||||
|
null=True,
|
||||||
|
blank=True,
|
||||||
|
)
|
||||||
valuation = models.OneToOneField(
|
valuation = models.OneToOneField(
|
||||||
ValuationModel,
|
ValuationModel,
|
||||||
on_delete=models.CASCADE,
|
on_delete=models.CASCADE,
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ from django.contrib.auth import get_user_model
|
|||||||
|
|
||||||
from rest_framework import serializers
|
from rest_framework import serializers
|
||||||
|
|
||||||
from core.apps.evaluation.models import AutoEvaluationModel,ReferenceitemModel
|
from core.apps.evaluation.models import AutoEvaluationModel,ReferenceitemModel, EvaluationrequestModel
|
||||||
from core.apps.evaluation.serializers.reference import ListReferenceitemSerializer
|
from core.apps.evaluation.serializers.reference import ListReferenceitemSerializer
|
||||||
|
|
||||||
User = get_user_model()
|
User = get_user_model()
|
||||||
@@ -50,6 +50,7 @@ class BaseAutoevaluationSerializer(serializers.ModelSerializer):
|
|||||||
"property_rights",
|
"property_rights",
|
||||||
"form_ownership",
|
"form_ownership",
|
||||||
"user",
|
"user",
|
||||||
|
"evaluation_request",
|
||||||
]
|
]
|
||||||
|
|
||||||
def get_user(self, obj):
|
def get_user(self, obj):
|
||||||
@@ -265,6 +266,11 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer):
|
|||||||
required=False,
|
required=False,
|
||||||
allow_null=True,
|
allow_null=True,
|
||||||
)
|
)
|
||||||
|
evaluation_request = serializers.PrimaryKeyRelatedField(
|
||||||
|
queryset=EvaluationrequestModel.objects.all(),
|
||||||
|
required=False,
|
||||||
|
allow_null=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
@@ -272,6 +278,7 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer):
|
|||||||
fields = [
|
fields = [
|
||||||
# Step 1
|
# Step 1
|
||||||
"registration_number",
|
"registration_number",
|
||||||
|
"evaluation_request",
|
||||||
"contract_date",
|
"contract_date",
|
||||||
"object_inspection_date",
|
"object_inspection_date",
|
||||||
"rate_date",
|
"rate_date",
|
||||||
|
|||||||
Reference in New Issue
Block a user