From b0f1b4690f9d9bf603c404480da8d7743c7c9816 Mon Sep 17 00:00:00 2001
From: paov <firstov_ov@spacecorp.ru>
Date: Wed, 19 Oct 2022 10:23:56 +0300
Subject: [PATCH] 19

---
 choose/templates/choose.html | 12 ++++++++++--
 choose/views.py              | 18 +++++++-----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/choose/templates/choose.html b/choose/templates/choose.html
index 67ee75e..4f0f5b7 100644
--- a/choose/templates/choose.html
+++ b/choose/templates/choose.html
@@ -39,7 +39,7 @@
                         <select class="selector" name="{{ type_name }}" id="{{ type_name }}"
                                 onchange="change(value, '{{ type_name }}', {{ type.ms.1 }})">
                             {% for m in type.ms %}
-                                <option value="{{ m }}">{{ m }}</option>
+                                <option {% if type.my_m == m %} selected {% endif %} value="{{ m }}">{{ m }}</option>
                             {% endfor %}
                         </select>
                         <div class="select-arrow"></div>
@@ -75,7 +75,13 @@
     }
 
     const csrftoken = getCookie('csrftoken');
-    choice = {}
+    choice = {
+        {% for category_name,category in categories.items %}
+            {% for type_name,type in category.items %}
+                "{{ type_name }}": {{ type.my_m }}
+            {% endfor %}
+        {% endfor %}
+    }
     a = {
         {% for category_name,category in categories.items %}
             {% for type_name,type in category.items %}
@@ -140,6 +146,8 @@
                 }
             })
     }
+
+    sum_price()
 </script>
 <style>
     table {
diff --git a/choose/views.py b/choose/views.py
index 8983eca..d43854e 100644
--- a/choose/views.py
+++ b/choose/views.py
@@ -26,7 +26,10 @@ def login_requiered(func):
     return wrapper
 
 
-def list_of_teas():
+def list_of_teas(request):
+    my_choice = Choice.objects.filter(users__in=[request.user]).first()
+    choice = json.loads(my_choice.choice)
+    print(choice)
     dic = OrderedDict()
     for cat in TeaCategory.objects.all():
         dic[cat.name] = OrderedDict()
@@ -38,7 +41,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)]
+            dic[tt.category.name][tt.name]['ms'] = [tt.preferred.m * x for x in range(0, 11)],
+            dic[tt.category.name][tt.name]['my_m'] = choice.get(str(tt.id), 0)
 
     return dic
 
@@ -69,17 +73,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 = {'categories': list_of_teas()}
     template = loader.get_template('choose.html')
     return HttpResponse(template.render(context, request))