Skip to content

Commit 02ee8f1

Browse files
committed
fixed model, added comment
1 parent 62c9937 commit 02ee8f1

3 files changed

Lines changed: 48 additions & 8 deletions

File tree

rate_projects/constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERBOSE_NAME_TYPES = (
1+
VERBOSE_TYPES = (
22
("str", "Текст"),
33
("int", "Целочисленное число"),
44
("float", "Число с плавающей точкой"),
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Generated by Django 4.2.3 on 2024-02-10 02:14
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
("rate_projects", "0001_initial"),
10+
]
11+
12+
operations = [
13+
migrations.AddField(
14+
model_name="projectscore",
15+
name="comment",
16+
field=models.CharField(
17+
blank=True, max_length=100, null=True, verbose_name="Комментарий"
18+
),
19+
),
20+
migrations.AlterField(
21+
model_name="projectscore",
22+
name="value_float",
23+
field=models.FloatField(
24+
blank=True, null=True, verbose_name="Значение с плавающей запятой"
25+
),
26+
),
27+
migrations.AlterField(
28+
model_name="projectscore",
29+
name="value_str",
30+
field=models.CharField(
31+
blank=True, max_length=50, null=True, verbose_name="Текстовое значение"
32+
),
33+
),
34+
]

rate_projects/models.py

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
from partner_programs.models import PartnerProgram
55
from projects.models import Project
6-
from .constants import VERBOSE_NAME_TYPES
6+
from .constants import VERBOSE_TYPES
77

88
User = 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

Comments
 (0)