33
44from partner_programs .models import PartnerProgram
55from projects .models import Project
6- from .constants import VERBOSE_TYPES
6+ from rate_projects .constants import VERBOSE_NAME_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_TYPES )
27+ type = models .CharField (verbose_name = "Тип" , max_length = 8 , choices = VERBOSE_NAME_TYPES )
2828
2929 min_value = models .FloatField (
3030 verbose_name = "Минимально допустимое числовое значение" ,
@@ -60,10 +60,7 @@ class ProjectScore(models.Model):
6060 criteria: A ForeignKey connection to Criteria model
6161 user: A ForeignKey connection to User model
6262
63- value_int: IntegerField for value
64- value_float: FloatField for value
65- value_bool: BooleanField for value
66- value_str: CharField for value
63+ value: CharField for value
6764
6865 commentary: CharField for optional commentary
6966
@@ -75,17 +72,8 @@ class ProjectScore(models.Model):
7572 user = models .ForeignKey (User , on_delete = models .CASCADE , related_name = "scores" )
7673 project = models .ForeignKey (Project , on_delete = models .CASCADE , related_name = "scores" )
7774
78- value_int = models .IntegerField (
79- verbose_name = "Целочисленное значение" , null = True , blank = True
80- )
81- value_float = models .FloatField (
82- verbose_name = "Значение с плавающей запятой" , null = True , blank = True
83- )
84- value_bool = models .BooleanField (
85- verbose_name = "'Да или нет' значение" , null = True , blank = True
86- )
87- value_str = models .CharField (
88- verbose_name = "Текстовое значение" , max_length = 50 , null = True , blank = True
75+ value = models .CharField (
76+ verbose_name = "Значение" , max_length = 50 , null = True , blank = True
8977 )
9078
9179 comment = models .CharField (
0 commit comments