4 changed files with 10 additions and 24 deletions
--- a/choose/models.py
+++ b/choose/models.py
@ -47,7 +47,6 @@ class Tea(models.Model):
    type = models.ForeignKey(TeaType,
                             related_name='teas',
                             on_delete=models.CASCADE)
-    m = models.IntegerField()

    def __str__(self):
        return self.name
--- a/choose/templates/choose.html
+++ b/choose/templates/choose.html
@ -10,7 +10,7 @@
    <tr>
        <th></th>
        <th>Название</th>
-        <th>Цена за минимальную массу</th>
+        <th>Цена за 50 гр</th>
        <th>Вес</th>
        <th></th>
    </tr>
@ -37,8 +37,8 @@
                <td>
                    <div class="select-wrapper">
                        <select class="selector" name="{{ type_name }}" id="{{ type_name }}"
-                                onchange="change(value, '{{ type_name }}', {{ type.ms.1 }})">
-                            {% for m in type.ms %}
+                                onchange="change(value, '{{ type_name }}')">
+                            {% for m in ms %}
                                <option value="{{ m }}">{{ m }}</option>
                            {% endfor %}
                        </select>
@ -81,21 +81,17 @@
            {% for type_name,type in category.items %}
                "{{ type_name }}": {
                    {% for key,item in type.items%}
-                        {% if not key == 'ms' %}
                        "{{ key }}": "{{ item }}",
-                        {% else %}
-                            "{{ key }}": {{ item }},
-                        {% endif %}
                    {% endfor %}
                },
            {% endfor %}
        {% endfor %}
    }

-    function change(value, type, step) {
+    function change(value, type) {
        choice[type] = parseInt(value)
        const price_el = document.getElementById('price ' + type);
-        price_el.innerText = parseInt(value) / step * parseInt(a[type].price)
+        price_el.innerText = parseInt(value) / 50 * parseInt(a[type].price)
        sum_price()
    }

--- a/choose/templates/vote.html
+++ b/choose/templates/vote.html
@ -7,7 +7,7 @@
 <body>
 <button class="btn" onclick="location.replace('/logout');">Выйти</button>
 {% if not voted %}
-    <button class="btn" onclick="location.href='/choose'">Предложить свой набор чаев</button>
+    <button class="btn" onclick="location.href='/choose'">Проголосовать</button>
 {% endif %}
 <table>
    <tbody>
--- a/choose/views.py
+++ b/choose/views.py
@ -38,9 +38,8 @@ def list_of_teas():
            dic[tt.category.name][tt.name]['price'] = int(tt.preferred.price / 100)
            dic[tt.category.name][tt.name]['pic'] = '/media/' + str(tt.preferred.pic.id) + '.' + get_extension(
                tt.preferred.pic.href)
-            dic[tt.category.name][tt.name]['ms'] = [tt.preferred.m * x for x in range(0, 11)]

-    return dic
+    return {'categories': dic, 'ms': [0, 50, 100, 150, 200, 250, 300, 350, 400, 450, 500]}


 def list_of_choices(request):
@ -69,17 +68,9 @@ def list_of_choices(request):
    return {'choices': arr, 'voted': voted}


-def get_my_choice(request):
-    my_choice = Choice.objects.filter(users__in=[request.user]).first()
-    if my_choice is None:
-        return {}
-    else:
-        return {tea_id: str(mass) for tea_id, mass in json.loads(my_choice.choice).items()}
-
-
@login_requiered
 def choose(request):
-    context = {'categories': list_of_teas(), 'teas': get_my_choice(request)}
+    context = list_of_teas()
    template = loader.get_template('choose.html')
    return HttpResponse(template.render(context, request))