33
44from partner_programs .models import PartnerProgram
55from projects .models import Project
6- from .constants import VERBOSE_NAME_TYPES
6+ from .constants import VERBOSE_TYPES
77
88User = get_user_model ()
99
@@ -24,7 +24,7 @@ class Criteria(models.Model):
2424
2525 name = models .CharField (verbose_name = "Название" , max_length = 50 )
2626 description = models .TextField (verbose_name = "Описание" , null = True , blank = True )
27- type = models .CharField (verbose_name = "Тип" , max_length = 8 , choices = VERBOSE_NAME_TYPES )
27+ type = models .CharField (verbose_name = "Тип" , max_length = 8 , choices = VERBOSE_TYPES )
2828
2929 min_value = models .FloatField (
3030 verbose_name = "Минимально допустимое числовое значение" ,
@@ -61,9 +61,11 @@ class ProjectScore(models.Model):
6161 user: A ForeignKey connection to User model
6262
6363 value_int: IntegerField for value
64- value_float: IntegerField for value
65- value_bool: IntegerField for value
66- value_str: IntegerField for value
64+ value_float: FloatField for value
65+ value_bool: BooleanField for value
66+ value_str: CharField for value
67+
68+ commentary: CharField for optional commentary
6769
6870 """
6971
@@ -77,15 +79,19 @@ class ProjectScore(models.Model):
7779 verbose_name = "Целочисленное значение" , null = True , blank = True
7880 )
7981 value_float = models .FloatField (
80- verbose_name = "Значение с плавающей запятой" , max_length = 50 , null = True , blank = True
82+ verbose_name = "Значение с плавающей запятой" , null = True , blank = True
8183 )
8284 value_bool = models .BooleanField (
8385 verbose_name = "'Да или нет' значение" , null = True , blank = True
8486 )
85- value_str = models .FloatField (
87+ value_str = models .CharField (
8688 verbose_name = "Текстовое значение" , max_length = 50 , null = True , blank = True
8789 )
8890
91+ comment = models .CharField (
92+ verbose_name = "Комментарий" , null = True , blank = True , max_length = 100
93+ )
94+
8995 def __str__ (self ):
9096 return f"ProjectScore<{ self .id } > - { self .criteria .name } "
9197
0 commit comments