From 93c92562a74356ec3c22b858d463443c00b8f8cb Mon Sep 17 00:00:00 2001 From: BelPE Date: Thu, 22 Dec 2022 17:02:38 +0800 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B0=20=D0=B2=D1=8B=D0=B4=D0=B0=D1=87=D0=B0?= =?UTF-8?q?=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=B0=D0=BA=D0=BA=D0=B0=D1=83=D0=BD=D1=82=D0=B0=20=D0=B8=D0=B7?= =?UTF-8?q?=20=D0=91=D0=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/settings.cpython-310.pyc | Bin 2566 -> 2585 bytes djangosite/settings.py | 1 + main/__pycache__/models.cpython-310.pyc | Bin 379 -> 9128 bytes main/__pycache__/views.cpython-310.pyc | Bin 1973 -> 2691 bytes main/models.py | 250 ++++++++++++++++++ main/templates/main/workout.html | 116 +++++++- main/templatetags/__init__.py | 0 .../__pycache__/__init__.cpython-310.pyc | Bin 0 -> 136 bytes .../__pycache__/set_var.cpython-310.pyc | Bin 0 -> 384 bytes main/templatetags/set_var.py | 7 + main/views.py | 29 +- 11 files changed, 388 insertions(+), 15 deletions(-) create mode 100644 main/templatetags/__init__.py create mode 100644 main/templatetags/__pycache__/__init__.cpython-310.pyc create mode 100644 main/templatetags/__pycache__/set_var.cpython-310.pyc create mode 100644 main/templatetags/set_var.py diff --git a/djangosite/__pycache__/settings.cpython-310.pyc b/djangosite/__pycache__/settings.cpython-310.pyc index 3fd4b2a3b286b9d060cb89f944c797f669111cb5..275014aad74e646df0ab696ee180b2997429ceef 100644 GIT binary patch delta 60 zcmZn@nJL1X&&$ij00c!sOOjPL^7b%Eaol3bP0Y-z5(JTYC8@auIf*5yC5h?9n-?$% Mvomr}-ohCK0QCzJ4*&oF delta 41 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 U6q%f=%+JLJRL;Y|!zjW604&T7xc~qF diff --git a/main/__pycache__/views.cpython-310.pyc b/main/__pycache__/views.cpython-310.pyc index 20c7122b57f9fa2a878f0ace656fddb4ef221c2d..12f50301e258eece076f2d913fff0abfcb34c674 100644 GIT binary patch literal 2691 zcma)8TW=IM6t+E=o$MvqTp$SnM4`7WRUoKWN-HF!woMhXnPp~ovAyA< z%~N>gAM_!S`odqDr%HXQ)HmMp(tgLYNka%qXJq>v`*_a9-#MOsqfupeE-(Gw`6FWN zPht)}KA7uh=5KV8NuIHoMv<|c$D9-GWg_=tk2A%#`3`e)e&**v9OPjfI-X}0w=c*l zc@#%(F3cwKYFy20an13Ste!XGhNGiwGM|d496gaW^XYgRbXC?~uy{t+Wdq}^oRm`- z=VVh(V>}^e3*$9WTC1AK%eLj^ZY41`BWlxvaZJxd2x&onByr^jPc&Lnh#dH%h zyGu8&-k05^x7IhQRrhJ%{SA0%mIu#@z}+u8Dr9A-axLQa|m~!~PAWjWa+u zu%sucBei8W4XUV&#ZJ=nEOm3}j@Qw2I`U_o^~4^dA}pm&?Q1x3SOcLvK%;P)RdgfP zWnHe%ThaBpzT*PPU-C_E!$UJ-#79Dk-^8Y8D>wvipbG?8$Glc+NDl4bdMWF# zrM+WLC2&F?@K{a$E0h$V-?j8ZuxXy--V;}QC>L^P>dx*Hu2RmTt{Iy zgbSzummzB?L42;?$IwB0Cmkf9p2 z2`MeF@QunImMC%gaVR^zHD$lVZWE#lh5yf__q@Jm-7*&6Fpg@>zHu2CR3+Z!TQF`U zw#5$97cqKtMT|t(-$qL9@J(+_3(&p|N8ZSn-b=9=*h)9*PHb1(1fED0B{otC|p8ObilZ0BO0>66H*^H?zwx=?@{(nshNK{F}erzEecVu#F^3 zC8CjRsG{DJrYEgJG90+b_B58doraHb@=j`o`Hw+CnC0md8< z7I7#Ee|}Lxp`*J*FG9{0p;ZLtb7H=rj(}AbvjBFh%$Zrtj_Y5$EO5@bBQ5?K+kZlP zy=O6O=9*^TX|etatEFXE{-eA06Ob)NELAgy0T)*1+fgAX mqH87az9VRuPtZk-pc@H5SJZj41hR}C5nJ9x6W!)&AzM9_jH6euf5$r46!%`3c;C%p6%-_3aulwlG&-Y=rEm9!im6z#H;bbt>< z^qM5GXo)t^uIPvu=#J=$9iY2nSM-4P#Gcp(x+f0AA<+Hrh`1w;UK4R7TT3rF5cDzW zAO8iKkzt?OIGdY^tV}-2jO;TTC|L=qY^0>fl^hwA`QDh>BdKR~r6tVyFS&dUwD+@? z>O{%ROl@*F9s7+7FSfE^cA(C zlF#N+n=7JXSh>D;^3|!BX4SaXxsj)M?(_^a(1Y1a>$@8|h{0fJQ?&!+e-%*?>>~W0 zg9rW3q|#0S)q*XBiaOY4=)%;7E3sYNb3+ff?HE0WQNA2aGP4CDXrvC-2z&2@&{*-j zR!{5sHi&Q~cD%;ee;#3_089~3*aPJ{>{V@#ErFp^x zO+3Mb2kFNJ7d}v51b`UY=#g`#RO%28jPUqP!{|rdoRW8e5!8?+$>}*WbU_zn$`)+t zx$Lq038Y)!Qz6K?ys=#)%UJ69)(!3DcumqdLI)Vm~4bhBdlq%NgG2ljWIe=Ps;hsQtJDA(y(R^$RalbuN$j|!PpQlug?nfd_a z6+VXznp)F1P36B@jwMpL)I{^0yVZMmf2iKa1@y54bgC!}M9WcE<#GUv*hV$svs#-k zU`=C0wP^%j?7kjwym^K0`V~-m*bi)!x`$0u+fLK67V|;^AE)WFc~+oP($p!{Skhl( z-bPoL{huK?7QzVPI%09)R{MwcpfP=b;R2QqoZ+A1Rp=S`x40@i(34u3(cI|973dV( zS?x{WSE1miNNl`Xaiv;ege7e(hyx5=-9#?dYK6sAVZBpWkQzs03cHMRs%^xrGsjis a=

Программа тренировок

{% if user.is_authenticated %} -

Раздел в разработке!

-
-

Для просмотра иформации введите ник:

- + {% if tw1 and tw2 %} + + {% if tw1 %} + {% with '0' as prevdate %} + {% for row in tw1 %} + {% if forloop.first %} + + + + + + + + + + {% endif %} + {% if prevdate == row.date %} + {% else %} + + + + {% update_variable row.date as prevdate %} + {% endif %} + + + + + + + {% update_variable row.date as prevdate %} + {% endfor %} + {% endwith %} + {% else %} + + + + {% endif %} +
+ {{ row.week }} +
+ Упражнение + + Группа мышц + + Время/подходы + + Вес +
+ [{{row.date}}] {{row.day_name}} +
{{ row.exercise }}{{ row.muscle_group_name }}{{ row.sets_count }}{{ row.weigth }}
Записей нет

- -
- -
-
- -
+ + {% if tw2 %} + {% with '0' as prevdate %} + {% for row in tw2 %} + {% if forloop.first %} + + + + + + + + + + {% endif %} + {% if prevdate == row.date %} + {% else %} + + + + {% update_variable row.date as prevdate %} + {% endif %} + + + + + + + {% update_variable row.date as prevdate %} + {% endfor %} + {% endwith %} + {% else %} + + + + {% endif %} +
+ {{ row.week }} +
+ Упражнение + + Группа мышц + + Время/подходы + + Вес +
+ [{{row.date}}] {{row.day_name}} +
{{ row.exercise }}{{ row.muscle_group_name }}{{ row.sets_count }}{{ row.weigth }}
Записей нет
+ {% else %} +

Записей нет

+ {% endif %} {% else %} -

Для просмотра информации войдите или зарегистрируйтесь!

+

Для просмотра информации войдите или зарегистрируйтесь!

{% endif %} {% endblock %} diff --git a/main/templatetags/__init__.py b/main/templatetags/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/main/templatetags/__pycache__/__init__.cpython-310.pyc b/main/templatetags/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..d786f334c87e8e755da477688b71c67fdf320cfb GIT binary patch literal 136 zcmd1j<>g`kf~5jWl0o!i5P=LBfgA@QE@lA|DGb33nv8xc8Hzx{2;!HvvsFw=R$^Xy zesN|=YD{ioW?oE5YHmSJVo7RAVtR2*e0*kJW=VX!UP0w84x8Nkl+v73JCGs8OhAH# F0RTr`9jO2S literal 0 HcmV?d00001 diff --git a/main/templatetags/__pycache__/set_var.cpython-310.pyc b/main/templatetags/__pycache__/set_var.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..c20d3dac2f0caf8be4b006283de5112ac6ee6af5 GIT binary patch literal 384 zcmYjM%}N6?5Ki{brC9Y5auU`pkYuYBZ~7n#UVH}MBv(&; z1y4?PTk61kGZXTC^G!RQP6$SI_PP4T`s0WH5#n%zY0eP@5mb?y=9Chk@4*MjLkO!# z1R{JRuQZQE^gyzBi+@Q*U23836t}RV{$&@w_c_Nj5yA^W5`CWCD%Cz3W?R;G0$B{6 zq_MIo*_vy~mkO9{*k1F?Z;01i^`O1W0e&y$mxZW!Q?^E0C~7X7V$ZO=G=%}XK)G4B zai`-NKMv~NiwO{-P$yXKv&1E%nD)=^=uR#**Bh5=DA5{dH!%`Vgav93oP(9Ii#;#B Us$0=3xb|n86ycbpGzw1WA3alC>i_@% literal 0 HcmV?d00001 diff --git a/main/templatetags/set_var.py b/main/templatetags/set_var.py new file mode 100644 index 0000000..f458bbd --- /dev/null +++ b/main/templatetags/set_var.py @@ -0,0 +1,7 @@ +from django import template +register = template.Library() + +@register.simple_tag +def update_variable(value): + """Allows to update existing variable in template""" + return value \ No newline at end of file diff --git a/main/views.py b/main/views.py index 1dd1130..c45cc70 100644 --- a/main/views.py +++ b/main/views.py @@ -1,3 +1,10 @@ +import django as django +from django import setup +from django.views.generic import ListView + +django.setup() +from main.models import VWorkoutTasksW1, VWorkoutTasksW2 + import django.contrib.auth from django.contrib.auth import authenticate from django.shortcuts import render, redirect @@ -21,7 +28,13 @@ def mychat(request): def workout(request): - return render(request, 'main/workout.html') + if request.user.is_authenticated: + tw1 = VWorkoutTasksW1.objects.filter(user=request.user.username) + tw2 = VWorkoutTasksW2.objects.filter(user=request.user.username) + data = {'tw1' : tw1, 'tw2': tw2} + return render(request, 'main/workout.html', context=data) + else: + return render(request, 'main/workout.html') def login(request): @@ -53,8 +66,18 @@ class Register(View): password = form.cleaned_data.get('password1') user = authenticate(username=username, password=password) django.contrib.auth.login(request, user) - return redirect('home') + return redirect('/') context = { 'form': form } - return render(request, self.template_name, context) \ No newline at end of file + return render(request, self.template_name, context) + +class tw1view(ListView): + model = VWorkoutTasksW1 + template_name = 'main/workout.html' + context_object_name = 'tw1' + +class tw2view(ListView): + model = VWorkoutTasksW2 + template_name = 'main/workout.html' + context_object_name = 'tw2' \ No newline at end of file