changing code structure
This commit is contained in:
@@ -13,17 +13,23 @@ from core.apps.evaluation.models import ReferenceitemModel
|
||||
|
||||
|
||||
class EvaluationrequestModel(AbstractBaseModel):
|
||||
# request sender
|
||||
user = models.ForeignKey(
|
||||
"accounts.User",
|
||||
on_delete=models.CASCADE,
|
||||
related_name="evaluation_requests",
|
||||
verbose_name=_("user"),
|
||||
)
|
||||
|
||||
# request type -> "Automobil", "Ko'chmas mulk", "Uskuna"
|
||||
rate_type = models.CharField(
|
||||
verbose_name=_("rate type"),
|
||||
max_length=50,
|
||||
choices=EvaluationRateType.choices,
|
||||
)
|
||||
###################
|
||||
# Automobil fields
|
||||
###################
|
||||
object_type = models.CharField(
|
||||
verbose_name=_("object type"),
|
||||
max_length=50,
|
||||
@@ -45,6 +51,21 @@ class EvaluationrequestModel(AbstractBaseModel):
|
||||
blank=True,
|
||||
null=True,
|
||||
)
|
||||
worked_hours = models.IntegerField(
|
||||
verbose_name=_("worked hours"),
|
||||
blank=True,
|
||||
null=True,
|
||||
)
|
||||
chassi = models.CharField(
|
||||
verbose_name=_("chassi"),
|
||||
max_length=100,
|
||||
blank=True,
|
||||
null=True,
|
||||
)
|
||||
|
||||
###################
|
||||
# Value fields
|
||||
###################
|
||||
value_determined = models.ForeignKey(
|
||||
"evaluation.ReferenceitemModel",
|
||||
verbose_name=_("value determined"),
|
||||
@@ -77,21 +98,10 @@ class EvaluationrequestModel(AbstractBaseModel):
|
||||
blank=True,
|
||||
null=True,
|
||||
)
|
||||
worked_hours = models.IntegerField(
|
||||
verbose_name=_("worked hours"),
|
||||
blank=True,
|
||||
null=True,
|
||||
)
|
||||
chassi = models.CharField(
|
||||
verbose_name=_("chassi"),
|
||||
max_length=100,
|
||||
blank=True,
|
||||
null=True,
|
||||
)
|
||||
need_delivering = models.BooleanField(
|
||||
verbose_name=_("need delivering"),
|
||||
default=True,
|
||||
)
|
||||
|
||||
###################
|
||||
# Location fields
|
||||
###################
|
||||
location_name = models.CharField(
|
||||
verbose_name=_("location name"),
|
||||
max_length=255,
|
||||
@@ -112,6 +122,14 @@ class EvaluationrequestModel(AbstractBaseModel):
|
||||
blank=True,
|
||||
null=True,
|
||||
)
|
||||
|
||||
###################
|
||||
# Other fields
|
||||
###################
|
||||
need_delivering = models.BooleanField(
|
||||
verbose_name=_("need delivering"),
|
||||
default=True,
|
||||
)
|
||||
status = models.CharField(
|
||||
verbose_name=_("status"),
|
||||
max_length=50,
|
||||
@@ -122,6 +140,7 @@ class EvaluationrequestModel(AbstractBaseModel):
|
||||
verbose_name=_("is archive"),
|
||||
default=False,
|
||||
)
|
||||
|
||||
def __str__(self):
|
||||
return f"Requests #{self.pk} — {self.get_rate_type_display()}"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user