From 9def6590ca04e80dee202006b5cdfad7c3da7af9 Mon Sep 17 00:00:00 2001 From: g4n3sha5 Date: Sat, 18 Mar 2023 22:24:18 +0100 Subject: [PATCH] v0.3.2-alpha0 --- Clubs/__pycache__/forms.cpython-310.pyc | Bin 2723 -> 2723 bytes Clubs/__pycache__/models.cpython-310.pyc | Bin 4418 -> 4335 bytes Clubs/__pycache__/views.cpython-310.pyc | Bin 5004 -> 5349 bytes .../views_schedule.cpython-310.pyc | Bin 2297 -> 2380 bytes Clubs/forms.py | 4 +- Clubs/migrations/0026_clubtrainingsession.py | 26 ++ .../0027_delete_clubtrainingsession.py | 16 + .../0026_clubtrainingsession.cpython-310.pyc | Bin 0 -> 1173 bytes ...delete_clubtrainingsession.cpython-310.pyc | Bin 0 -> 537 bytes Clubs/models.py | 8 +- Clubs/static/Clubs/sorry.png | Bin 0 -> 24401 bytes Clubs/templates/Clubs/clubMembers.html | 8 +- Clubs/templates/Clubs/clubsList.html | 11 +- Clubs/templates/Clubs/clubsSchedule.html | 301 +++++++++--------- Clubs/templates/Clubs/clubsTrainings.html | 7 + Clubs/templates/Clubs/noClub.html | 11 + Clubs/templates/Clubs/singleClubView.html | 28 +- Clubs/templatetags/Clubs_tags.py | 24 +- .../__pycache__/Clubs_tags.cpython-310.pyc | Bin 550 -> 174 bytes Clubs/views.py | 22 +- Clubs/views_schedule.py | 56 ++-- Notifications/routing.py | 6 +- Presentation/tests.py | 2 +- .../__pycache__/forms.cpython-310.pyc | Bin 2862 -> 2906 bytes .../__pycache__/models.cpython-310.pyc | Bin 3326 -> 3344 bytes .../__pycache__/views.cpython-310.pyc | Bin 5341 -> 5287 bytes WorkoutJournal/forms.py | 24 +- ...sion_user_trainingsession_club_and_more.py | 31 ++ .../migrations/0011_trainingsession_user.py | 22 ++ ...12_remove_trainingsession_club_and_more.py | 21 ++ ...iningsession_club_and_more.cpython-310.pyc | Bin 0 -> 1084 bytes .../0011_trainingsession_user.cpython-310.pyc | Bin 0 -> 933 bytes ...iningsession_club_and_more.cpython-310.pyc | Bin 0 -> 618 bytes WorkoutJournal/models.py | 9 +- .../BJR_addSession/BJR_addSession.html | 192 +++++------ .../BJJournal/BJR_dashboard_count.html | 2 +- .../BJJournal/BJR_index_reloadContent.html | 4 +- WorkoutJournal/views.py | 21 +- account_register/templates/account/base.html | 2 +- .../templates/myaccount/account.html | 10 +- .../templates/myaccount/base.html | 2 +- db.sqlite3 | Bin 995328 -> 1024000 bytes main/__pycache__/asgi.cpython-310.pyc | Bin 781 -> 703 bytes main/__pycache__/settings.cpython-310.pyc | Bin 3312 -> 3312 bytes main/asgi.py | 13 +- main/settings.py | 6 +- main/static/main/css/base.css | 134 +++++--- 47 files changed, 624 insertions(+), 399 deletions(-) create mode 100644 Clubs/migrations/0026_clubtrainingsession.py create mode 100644 Clubs/migrations/0027_delete_clubtrainingsession.py create mode 100644 Clubs/migrations/__pycache__/0026_clubtrainingsession.cpython-310.pyc create mode 100644 Clubs/migrations/__pycache__/0027_delete_clubtrainingsession.cpython-310.pyc create mode 100644 Clubs/static/Clubs/sorry.png create mode 100644 Clubs/templates/Clubs/noClub.html create mode 100644 WorkoutJournal/migrations/0010_remove_trainingsession_user_trainingsession_club_and_more.py create mode 100644 WorkoutJournal/migrations/0011_trainingsession_user.py create mode 100644 WorkoutJournal/migrations/0012_remove_trainingsession_club_and_more.py create mode 100644 WorkoutJournal/migrations/__pycache__/0010_remove_trainingsession_user_trainingsession_club_and_more.cpython-310.pyc create mode 100644 WorkoutJournal/migrations/__pycache__/0011_trainingsession_user.cpython-310.pyc create mode 100644 WorkoutJournal/migrations/__pycache__/0012_remove_trainingsession_club_and_more.cpython-310.pyc diff --git a/Clubs/__pycache__/forms.cpython-310.pyc b/Clubs/__pycache__/forms.cpython-310.pyc index ef5907c32843095485ea07f60e71079f67395378..ab40148cbe4b2cc0edc389b145bbd420cfe79770 100644 GIT binary patch delta 61 zcmZ21x>%GqpO=@50SGL_#8RR+^4c&na&GowW@TpN*c`xC#>nV6`8azgqr>Jvj$}qg QzsXxUU$Qa@Scvff0F4g~r2qf` delta 61 zcmZ21x>%GqpO=@50SIc8|0joU?db1Up$lX0r*|>?c~nCyp};4v8IXXF~?GBRexBUdA@O zu~%ptBLzCPSYCrf0WA{J7TZu$Ku`H7XlR0v5EK+hi@0}Y@&Vb!nS1W<-FM#gcQe1| zquod(=z`z3Q)w+Z`Z$^;+mGk>2E?Vgw15$9i;CEeDY153i4&JD>M?CZk88mbqJbG>ZDU`vy@Xk`e=Zy(@wb^90QhtW;PoKHes_9 zpEA1X(k8X+$1W|all#dNkCFnul=cuNeW~*q#P>TKJjj+2yfm~&u3pFyweiM!fXM5hI7v?ba>N(7V#p8{B@3>1_4|Q!vZ#Q*n zUSr>Qo1rC4yNrO&;InUEMLRmO@x;aUPf3$xVWxm z;hpI?z$AM+AdzwQN#N4~-c=GLHw|MH0qhvs2w*4BMgTjBHiF~wmg4F%a!s%VXyvrrCL(t4O#)W678Ehb+kTiz5lg)KxeVb6@b%ev@i`-JUs5U z4t3LhXN;U$`rzSpI6DVl>-m+lhbS8TChWy|J1eCu#c2Uk*Aa>UN_a=!S(mG7{a{zF zDNGE;b8leKgRl+21ssxYAYVj?vbA996%>xHAPkcgWklgkR4w2Vh~P{3VRo;?|b{)q2w^pjG(L zEc+$&1-ZdK3U97jmgdKmrgb>0V042CCZ`ajIbwjRl?+%vR&w{%`@mdrQ9X1UQuxGI; NmWj`L^NDnN;$LesTR#8* delta 1732 zcmZuwOK%%h6rMXXe%s?m+%(OTB$Q+bF-dr|;ho2jI!f%wc4#t4j2z#=4~^q;$1W18 zWQlay3RQOr5^PwoV!?uK1uOo-NC>uJgOCtHu;H9LZjy?OG~b->Jnuc{%GpqZhwpqU+LuF_}Al79UZo1ybh$u|Fm zd`z_OZp&YhiBV8`>T%C;PLpU?*cf~ms@W9Js;>s81m}C|2Sn%Js%0|Al|X}-+zBkr z&7o00gXcl=($!wK(P7O`Y`SZ=k8I{H@E-$5u^hU+h_J+$g5%Sd#m3rx#7@)g=6E}p zfBj_$&=oIKvOntCZg-FXvs@a_d^e0==6?j6GnaXVEDJJO7UpIz@q3~C$QvMf(R{mF zx8H5r4mDM$Q}3`h`Ol#Ra-B!QH&zzVdj;Vp!fOa`A)Mb|NZ1560x-&1SSKU=i|~U! zUS3yqnZ?kG05W!50LW>S5kMY789`Toy?_ism%T`(w3aXA3tMHjBQ*bLg<@fGZNGA> zSjwBmCffzIsr6i&4VvF*-uXuEvl+}X3vfD#61rhqYmH8`X1o5>C(t~PW-MNT+Wzo? zm`^6N;q;DROU}{>mx7*VZ)4m$2y5sc-!*pEjgnP4+%w81e=eFn$fHp~*aq-aJS1C3 zzKD=OWu)x%>S6+(>Vha5$zDPGWo^c`-sGP}uaO*V=tMsSyeqXxOTH&j@{qI?Sbe#m z6EB3-tR~e}cD9I~Qn$MzIXDE-A-{Q{jM(Nds`1j;Z&wCL5q1Ed8oWnfF)w{Oe@qOfRKY7h=g4$E6lzIWTcL$~*&KzO$ z{QLMkS>eCNSCi+vY(eY+pHD3JpPsQ7Ufb9(_V6ay7bfN_PK5Inef1K>W4qD;5Ht19 zf@c$R_kwP>+U>avD|iXZsyS8Ht=W!aSr_K;A^PJm#>F|YPi`C_EU6?D$PkTWWwy%y zO#C*A8>|zt=LJ1;aVPoT+Q#A~C%jPS{KgKXY4ApJ7XID`$uDbOingl9^-hi+<=P!; zJ1z@@3yUB`5pDpO(RE{|Viil9M#&58qMtt?v2eIE;`|J=|F10nIyJ+8N==6*!`X~H GJo+C_jd#WX diff --git a/Clubs/__pycache__/views.cpython-310.pyc b/Clubs/__pycache__/views.cpython-310.pyc index bcc13eafcec7aa03bdce2b1dffe970a4e199fd04..05f75d4c33128db82d1c4f276237a1468482302b 100644 GIT binary patch delta 2606 zcmaJ@OKcoP5S{M%?(FQwzt~=X;`KLKJ8?ojA_B`X@`qU1n-Dv}-b6~)+k>;4{g|F{ zh@-VOl5-;wf}9VHr5WS`dNZ?KtI4bSr_z! zpwrFvNSz_zdsq_rWM(f6dRd>G*av(+8<2d84K66DA#s>Itffex=d!uWZjRs;>ObUF zXp_*q1|YstAO%`g7`aUf>VmRO)7vC4*FBeC%(IlnEl>)~%1Xh_`Cg!|x_+SLit8(| zzkyn_Q`-vf1f@SuOulmAEJ(Zyud$MNM32@iRG0*12alsb8VK)(?gg6+5K5bpz+8{` zN>$pmMTqhi*tVb$`7JAq!VT5*;!H}FI|Uk^5m2xd%;xSp>#pZZdwAyo*o$`o38JWU zGV7r&yFlP!SSfLcAwS*=L(xRbqr4T>O}rpp-{KJ%^EMP3Z|94?%cVo48Xpj!($Sv! zVW=n1ilNW1oCz)QTE&=}Aj6-WQ;!jc?*^@H!h4_-ceJF=_aOI$HrRy>KLjMOOKxe! z<%=6@E>EEJ;D`EhCvQhqYT;^bA{jt(NceiP?ImCXeP(uUdLgj#-o>lgVxI9K@jy?Q zJQ?bJr+3s2qMn(nlzsP_4-9v+zRUP1iY?zQtrcOs^GY`Q&6_PV_ZlAVO#snUN}6Z` zv8hJ18wNFiqaf1=CB|R2*#ff`bzp3fR%jN5Mn>ojjXJQTg>sDdb3llL0R1h2pb;UA zUyp7PzX{M8*`mz8Yi`E;W*9}Qu`R%A%1O^im+}!<#rFeQOc9EztBZ0pk!NhwueppNoqM0&L<9 z`@jls0S@Xy47z9BhF*lDJ5ZWNA}_q-mMwMXgcqI9`j9I8ebBBSABXGmMe)%7r5*9i zWdh@+>#@~%TKpL8BL{`%4CWSb;%P=4#~~&+mup`|ZV1T}*MyOf(Q>4d0t4MXJ0;D| zMC;Z`l$^zt=fo{1d01X&9>wJex1) z%d6gJpy6RaEXYdZv7_+}*z$UFct#LGWp6GIb#hj8#E*?Ezqlhm53;YG?4tqa@)=)e7L2qiWs%$Jre4+WnfIaY|GUzMS!P#N>9c5>zlnBZA%vty94rRW zY!M0?+gNbR{*1&yK+~t<08E*(5-bVv-ma0FET=N{rBIf6i699Xi4o(OL^4Vnli)QO z{2-36Nj+IF=hyftv|~p^;vPhz=;EStdH3CKK*j3=5~mu~{-(OtLJTU#8`{Vvh)s(q zG#nwj#m5baQ_`}hu$I}4*$3!ILieAE6)C#etMag)K}BX0RA0=dEEJAz(chS^$r>qB z1MLWmsp+}t#c4hTgOvI7oeQg=bcOVp^oJ}wVPVNc>eY01DibMfJpbaNec>Z`Ia_8$ zxBd$L26FLxW2>11CY>4ehEny37+>%WMqt_eb(4qslwKa?l=JzZwyGg(goGeAq|ou gXQ}X+G-4Bbl-f3-!#1&^mSy#!j9Sn-py_e)59iSa>;M1& delta 2341 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 J{M)nY_AghRjywPW literal 0 HcmV?d00001 diff --git a/Clubs/models.py b/Clubs/models.py index 8da2049..9f1f9e9 100644 --- a/Clubs/models.py +++ b/Clubs/models.py @@ -4,6 +4,7 @@ from account_register.models import UserProfile from django.db.models.signals import post_save from django.dispatch import receiver +from WorkoutJournal.models import TrainingSession from django.db.models import Case, When, Value # Create your models here. @@ -52,6 +53,9 @@ def requestList(self): def __str__(self): return f'{self.name} {self.estabilished}' +# class ClubTrainingSession(TrainingSession): +# participants = models.ManyToManyField(User, blank=True) +# class UserMembership(models.Model): MEMBER_TYPES = ( @@ -73,8 +77,8 @@ class UserMembership(models.Model): slug = models.SlugField(null=True, blank=True) club = models.ForeignKey(Club, related_name='membersClub', on_delete=models.CASCADE, null=True) -def userClub( userID): - return UserMembership.objects.get(user_id=userID).club + + class Request(models.Model): ACCEPTED = ( ('YES', 'YES'), diff --git a/Clubs/static/Clubs/sorry.png b/Clubs/static/Clubs/sorry.png new file mode 100644 index 0000000000000000000000000000000000000000..39e3f9252380e2f22191119a7ef11c625d807148 GIT binary patch literal 24401 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 z

DRG1HxkF)`EHx*rT4W2!4q?a^8A-rzEQh;&8PCD^|6w6&iOPE9zkFKy=#>i&n;14k{NBN{ zd#g$VISQ};L!e@hMZP|X|9k@*bXh|NeSuAr8F6FD{_3JJGrm|29EJXu72|RGA1uoQ zcK!=HSC?u7TSERvh?UogMK37SO&(nV0YGd?y8lX|OTt*x`o{=D7b>|wMocmMAi_Ey z(q&bW5@p$U|%+zodO1 zaiKWx@akIoYqZN^m7rdZ`6$~(+zIYX-Y>IgsrLzIxEljtm35%(W`>QxZkSFo-M6u| z5P900tVX`(0as=8+V6p8kFai8Mc`8att{)42A3qC@I1hKAhzQ}oVFoDn9c}z25DGi zVPqFf5jGNkBF_TzdpOv99iS6g5qT3CQeRU!&CbhxaIVGyfYw+=AK>KkVDSpXK*U78 z2omg%c$i~q0azqpif%3w&iin=ETEi>HTGROqF4PF_~#G{!Zhcu$UfLYJ!y%N^5U?r z4lExw22v~>OYU#tx7$x$g3dhR%=GV%(N&e`1#`@(hE@|}X!E0Tui5vrUjon{39^Hl zXzcbA%@M)ax=03}o87S8W692vl4-RsO~g|DD=OFc{*{d+tw7}HR)H2%2-SX3Aa0m& z216s|A(I{B;@@#sj_mmdA%_*=GDCXg4w>{^H~yTvUEb1pX~L4FWFb^US0xkH3vcVHJCoF+RH*-jVrF=_*ZL5j2w6fY-bC~eK?$r5Qf`T6UFy8 z^B=POjnEv!+DU_>hb_|r z)g8W%7Pc1^=L0cy#>x_jIWIvSIj@;H3p^3Zgb^b{pW2>g_|Q?^#l8_IDow{7qHvCW zQd2&Fpu?WBpfqAdL3(XYChebV_Al@pt*lpg1e1hujJ#!~yt5FP<7_n6>Ex!I;YT)i zv)5ff1z+W8)}G>WQ=Sir;hG7VM3<`8b8GO06-cabF-mb`cIPc9Z>Q)Dh_u1^ z9RZ|WSs%eB>8dQqdk>B;hF>+Mr|ha(SeP-vwqYn8#0FyLL8bFf zBhG@M;lvm4-6N!1m?bu=@Qn9VLz(>ZgZnB!ur=FlpVx!t?Co4Qp?Q50K(BXyK+xUw z6o+Bt_uIQDo8xNIcbwm1sQe%Q_O*3voY#Cp#(fJuU_{>L%)271G0s{cdgp{M4EcW2 zySFM$`4!=urkF6MKeW4JAilK{b#${#8tH-*{9=612Rm$9ebI`$|Tk#qC~I??TkNQ`nr>cyMV z@Quqybu71lRM(z!CbJxUs&|u?qW0bE_-C1u?Mo4$5RZN zvgce@_^1`EBWWn8gX|C9x%3BX23-Ru58FmXjPe=fY6v?M#$*egHuupa>dq5Sn}k2K zS5yOp+!Q~3&v-3Ky$jvx);^oPdhOoqTf;#1^yBqOpyTdaow*qMOiR_qTyku-h`=^k zuaaf22-`|_N7AplBQQeyD6v2mTyM9iJ+`)Slqg6em+tNHvM6_0dvppoMzyJN=Zsav z?;0>`bSHU7%+TOjBjU}xQ9L97D>_OPpxM@FZKaUL%ARTk6Z%kzeD}A`#8md>xQ46D z&IaI}Z>g9(!!OWqIRd@3&4*~+?LKNHk5_G4x4=L$PLe3c`T>J~>Od)GJ#12Od<{Oq>vRjraK%;9Yj;fGEL#Ku)BB zt`C$#tXc=Qd?Mz1Ng?zzEs<~%_=n6CTagpyc`ARs_dYvqzJcO~q#N3Y! zbw3~RygRu-(4!yz253mL>Zp~PR0BIx?u|xYV-KdtFH;(LP)Mcw0%vBzk(jZ``jIYL z`CN87*H2(kYV2tvrhJ4n13hjMC!}cx2a6VcsFLGPA24?3l_H!Y3jqSH_ah&i6ha_`hw7LUwU~=Gvt&@kg1=M`>ml^qS z9ddx^NSE(fJ161_+nLM`%@x|*ymC8Beb(q451vVU8S2*bjd#)Oe3Br>;9`16dchU- z*20?h1XR%XhW*t^GjDV6OzJ4t?LeKB&>-~Q0~H*jrgm&+?A~AvnLm+5+ygD!i`YLg z9?I@AKHW}af=b%2$ab%m8cq)0y}47Hut7X?q4WlA6U1qDpCPPWxzoE} z=w>fJ-V4gz#^SO_#@$;dE=BTP>k%y)h}K6I8BhqZ-crg-E=6J{gApyEFK3Y*S`m>A zd7j@tzl@J_T%t#bO|;~j>t28vpNIMrmx_3kVKd5fTstnp-VAxXywJHR#!Fe(F&!=9 zNb&kMPe~Vf6wQQ9TxZ!4GA=$&(E^v6?w%FjOHvdo0y%}t7xx-L z7kOdNEcy~31wd)rdiOibybXX)Q|Xrp$Ek@?C$h|C%y`}Tc&tWqyoeLp38o3Gk?mT< zpz+gxvAKj%CdMms`aL4r40Av0@2VnR-RgK1$Ln}a(BV>Q76ZfwIoo}8e3^b{y~95O z*hg^7?8UNBs2h`Ga9*+9c9~2yk`TYm4N;5~(2RKO#&yepoB!imay{$a3a<%U^(^cw ztgeKxI%tOKCMy3r{7bekA+07~E}pGex^Z#8g-(mzN&wdlo}GOBEn#5(>4jdk1Ys+| zCCQAQ=K0x^dJCgc`T92bwg#d@)`{Xy3te)cKtND7XS84B0XX$@wx}+`$o+V-rCzHy zLs2!7M>C>s$~8Di#RvWPDTs-1@rlxTyG=rvX(8@!_cLc^QTX%URF8BdhBl&E?OtE348EKg>)$MDYNk9- zV!$K8*GNl+Owz#=>$To`cFF_#BJqE2jy$9Zq?At|vkM{XOz;E!swaZWop<@W`^;y! z?_Zu0!KDv9x8F{E{Eo0g&Q!>k)I1uVhBa}`0%q;fMY(Drh(5$W?0Lo^d?fFDiP;02 zL6*ynFW{N)^M}|C%wmkYo^==t^4+iP2a5)~-}8c7OSyyw?S+eh?s`bB)GpXw{apPR zcWuDJDbb8ex=b@rxNlj*$mZsAX%J!n@zTi(ziRXsLcFx+T&N0oDNRcjM%CMlUV<^# z!~D$M#){eB>1^HDv%4A>7jW-#%i=L^YdJ|A3N`rX6|wDI@wP7`>K)O+bh3&`xH?sH z^xKfr@0(7g-7};JMMS)r!PjRqh|S7Qy=$L|W5yr9EB<*RbW0W455PU_`SOAu#28#N zwRs<3@;S`YbY~8j&(EQ2%;&N##MqyIIW7B$9?cLBWt{L>-S;CIa=V$^XQeBL|1=&p ztlyBA$`gviCVvibraXro*sXXO71p_px4a@Rff2*w0{Iw$T*NvU#%giy>5eGh*<)Rl z<8i%&uOuoJS+V&Hy@NqD?e>nBR$W@5+>hI)YLscYgr=oeS@G)ZUf0BTefamixT}#q zB(P@r?{sD@lYXAt1yIUVz=YRL-_7=7$!MaWW3A7$KFlFrxq1m;6^Co^v%?Tk9N$A5 z`T%Ykbxrfr0@>d^)fcY)qGA9U_1$pqh33|u&He~Ja}rDriJt3M1RnCuPvphTV@mfy ziT9W3!`6d2#xx^(W|dR#(Qo9WqPPkf0T{}zBea+h!enDzIKcuWKo#+Jfy&XREwCwt z`_6g!ryy$!ckBD3kGb}Jw?RxS{LfjdQ^cf^fh4*_yPAsUszut1tPL3vd7uIn4eqB- z2Fy}bLNjNtT*eX?&q=uNtP*xgrbuqY1~5mStQ8g?;PSMMJTq6*p)i`gcesmjS8LCS zii<%0s`J-!N44L-a?;o8{UdPaF&^d} zvUmS!>UIk^YzcPf$of<>!H?w07)Q)g3y>Uyx`%8k!&gUNt4k6D#>4;mF~ZZEdTMEt%BLNa|Iu8&ui zckp>)j}3s*_CW-H zx>oArOmQCbLHCGfiz($S!C2Y-mu{WiqmmTh3{U>wf)2Zo*G#c{VPf&8=$b_d;>*U1 z_@D1}2^d4GA(s}7^Xsz#gdrj#-!*_=&c_hAx6x17-TFlcLWJ~EO|vVnLHAFt@t;<0 zg`tS5`!dkkqF=#JKoJAIUFAx3Wu+Rs;*RM`K8>`&t2Y1s?m^q);IpgquEedRc08YM zGu^vK9G@$C3;eAevP51SK_7rSHLvk?Ot;hpw^1q7;;(cAY)w(7{i&hmTEPsA9()<3 z1dQ&x+kwydqV^FUQ5`JF2$N~*!*f`4KFlMDW8*;_?i7LF3$i5BY*hEtcHLZUtpnQy zLND5F97m)S((|QxO0x|4<>N}KG{gbnLJ``|bf$VM)lW+GMXsfQ5Yhxld_#6XBW0sHA_RiJUs`?yNg8(Sj4Fnudy`ixr2Z!9p9!c4_iohnvZs<&6)qd;cwYZt zLafg&H_wxEg^_qqztzV_r9YT@8WPo^QX%PQQ;FdV>uEuNcLCBeFS0{fqV+o4< zIOf&vTl1>ufAQ*+M22yy!}6>~Z!-^j^hDHZ9-XBO1h-YOk|iU5<23;L1hI+;I73 zvy?YC*XlV*qX;K#4xH4G;nP2P4(slh4BZSY_qnkAZAN4)t}j;gvI_|LeuiJ#)G?RL ze0=Dfarfwu-`g7%{Ofodz7gb=aXycBI%#k?s_RhlivA{R_gQjzYC1BO@+I%tp!Qf) zRw>#2pRZ5UYaRt{!zI`G81LJV|5Sy%eDW+rQ1YcKv8d`lG&K{cM>PlEUMJdQK2{Tc z5#@n1{fP?9(g9Z6;;#o4rF@c7!{*@B>Q}(6XBf5sR z#S@~?ovM-W)mDc4kkj)NvSv!VV5X2~VGO0z71&0FQ!FvUe&9R3_Q6}qV`jE06O#T2 ziRyw=o(5@3Z?0~?-BTf>#iW7zJ1fnvFq4`-%l%{_;OQy!5av@fp>!a#s5^S~yo78g zjj0HQoUAXCeQ$ItJ1Lr?ogp;=_Dm98VxY4nP3GlEGUuvU1on>;WB$T{^c&n};&$%((jm3z&76#JSEyb@<1O;|^EY111mbs*^E6py+` zS=QyQ()N^}4MaSdq+4Kdj5-14!7MSOk-m2Nn7WnR&odvxmPt+dwq6`R*nTe8LQG34 zwAnQk7bd5@_w91lBfnCz(nI=hgbkTn7_6^={7)2jLcdY$$hX7p@Q$HsHTe{-@Ti`U zacdg&W(L}HiA}|6m3RmeG|zA!yu{Rm*R&UiZRQPQ_wBswiBlze^2RHSSBi$M_iydS zdg7yt80B1d;lGqNim=4E5HBINJ;oD2?=J4)-23cGyS}5I@Say;u$uyLR&*$+G_1oe z^Q01keiWgXA!?+85P9qpH*(lK~beJ`>5@U)(O1Km9pq!26>;1 zZxA~|dG@<=y#~L`e#lN4L6JON2H6>(S8;!9SgjExeE5@BGE-2F{+`gJu&m-$6P|oS z4vqP;i4J$N=vEy{HcE@e)2VnrM%958yi zsFHorES7y%xeU<27hc%Lp115FyDLYWxw--FAiVP0sScSW>T=>FfiW@{>pm*QGSk;} z?@!$G;E*W+g8Pq41dKtvEumhN-HI2hT{S0VfB+fiyjY4a@9K$dT$pV*f0MV6A9A=a zdH-g087B983X}8Wp4ktl`qO8l-9mKu@b&(PvicX}#1~A%)_Qq~9_B3e;o|^XBO0fW z523rKL2})*>o4Jh^=wx#$$Px$tF^}~WoYDC4vV|v#S=lhR`le-4 zVCv*NYyAsK<2kDQtPsBQxo;Uli2(y%oXtGVZ`g-@kmdfjroSf0G0wKmVL4}Omoot@ zhgT0%R;X@rPCog_VsDF-11|tP>Hf;m=Op0n_>nA6X3rqGa}9q=QO@Uo<^Ht)KFGYg z=D(^ShZib$7`JmAv8s1gB&}7Tm>a#wF2^KnWS{L7Mg<=(r<`fZTUgHH-|XK8e_RuA z5*fkMJ~TMrpe;U=1~^Vn64Ou6^O9~w!p z!|L~%S!#V<7H27Um+W2hl(Zutt_7|S5&`SLe;DUuH#hbq^*ZN^ak{4#1t{b#T(o9m zKge60c1>}>tButgOxvdGI>sazgNT5)V62f3d-m#Kx}OBu7QO=UjOQvcQUrnb%=Jb+ zvc6nr>vU!FPw&~fg9QVhmpOGSg{N2H?^nY+wY8^9T^ttxp*tOLmU}H8cAnwDKt(@b zDL3<5Qm;W@ep=!#qvAgM${}B(;FDYlYn>M`;lLg%>1l^PmZAo!_{ti5V>%VrnGe_- zWAxW{E4N?$xL*%rx-^F>NB%@uhRAMCKOnu;;g<&d zS81l}%tc0+rADAw4y?5adh}iZs?6)5PQfhB#6z8OnPl`WlT9X<&w z)}RY)2re>jmy4*4tHTHtR%nmSUZxu<&J{FxVoPMp#N$BZlx&Xyi#Ar4mJSEA^9Kj( zAi-~%RfA>1D)F69R+npr&JE6~Lv-e}6|u=aqfGl6$)f%DrYysPMqkjzbRX67WziSd zLqjn>1xzn7lk zlmGuVcYN3@hj&kLUN;5ynqZbQqDEy;^oX=Di4<&M_~w z>L?XfAw2gPJqWV69Tgr3$^^QbBC6-#o-*q5PMcfLE2%za?-(nLWS^;|AjQEaxyXc zA|;uzq(5uAYO_L$S~HLKL)=`(Fcg53`jzk<2lNn2ju$8W3bq>Ck2MFBK-|DF`}%=m zUCRQ04=_`b-}USu!@JJxHvRckO_~_sE!L>OK9Nh26~=U>+1ZhNNWBl%<+k~uLg-*j z$b%=cwCxs89LSMViX-R2MX7cn1I|qjQ0VF>Wh}T&WVP>kU{^O8smaZ87|p$$HO-ES zIYE6Z?fFZp<8pJW&6VOAtMa-@J^iO@rFhkZ1xX`6gNu*n|8P0o-M*Pz`Ju6Zk+}1d zZ{|9giNrO*U+$Ggs!+k%5Az&~%C_-C@hwfL-~8~#gX6&&Xf16y;rzorBV(R-A({0E z9b-_=6E)7%83goaZE{!&3v&D3GA=ry2-LZV89M-hK{?JqZ?a~7u7QeOkHeMHN(g^<7tTVxhpFY&n$X?k2&Us=F3?peiRWuJM>>wecuZ>%<(jP4sL2`E`IZKISzH zEIb(OE0#3ST`|d#`0M+K8||Czu#>qAFe;YEPw3h=zy8MlLl4<`2X>%kIlPy zB=U9hX_hUHH(_(Q>?Y~a7~+f)lAf}pzbMrMw9JuK@b0>UeB4dWI((?4gow-q?U)90 z%Z)Q$3cI|#kOnQ_Rc2zZxx6G_ZMoG&KD?NOu>iLlW$mo{4@5RlDu9cX4r-@`a~k(Od{G^YANsY@uaw_~PIf-w%^WqVXxK?{AOE%jN zzqF*Y4E-SxY{1)^c{&!$Ex0)xuhR1HS2$<`KTAMT(&#%==j%wK$&7v6bDV8?nQ#$Q zpx{5%ZQ}V1>j9vV^yZ6fdhw_Vu2F>x;^lOK8UzyW zDtNw{bA6RAw`Z~uwEmam8T5HDWTD_OHmUDKh4PzFeqvO%@b&*G<+}f=j{g7q-fN5N z+Sw!7MasHXsBDE~go`qwDC?4O$u1<4aE&svu631pDQ?Tiyk*==akFPe#{Itgd_Uj6 z;QQ;j=e*8(J??p*^BlTyynY&nHm|D6q9F3fJY59B*d6efTquyPvxebH-tWUGEhlVb zY;%}}Rswz)8lI}tq?}UVw^*c_R{d(B^&2HeZ3@(_cND3Gav;+8Y+*IhM-8U~bM!IS zIg0eTJ;b%?!@JjPz$f*~D-2o&f2kJbjhz!O@074l9IFP+X${*@)HT^JpOTR18D=|B zP?1Oed0^tDyU=6)6C|N>Oo;*#sJeOgY>${tk1vQ8nbv86izH@4! zz!h6^B~g8uoc{dNy~4sC$dV#B?olvXaH&HD(bF?;oI4CYP0zC~0$?^s)srA-_(bv9 zjCdHIyTMw8Wu_(|Az@Xa5CrhTq6nc2VOUR(YTpy#qUvRX6-FV3BJrh4C|$P-{Tq7^9QMP!_171iGz1RXtS!EKy1kZBwt0}&$?D5f z5q>u`1Q5V%VG4jUfQXV5uUO0dx~?-5x(N8vPg)+vNBBPZ{M^gQ*VwyBQlz9b4a17* zQkEM}a{3sluzA_n=-lmTBuxI&UiK{Bko3eR5AgvQ##q&0NWg}AL zb`bkzj}bRU6o)@zW_r)m*b>SZSK}oe=EfFYu6A5A#7Ov5{GI24*nVR9_rGd?xMtZO zt{Jvj6kW+-7ZUkp*67DHn&1(|G9iAJF708s)@o z*BHg>9TtJ`v_`)p;gaUW=DH8cB%Jr6X0wGgF4g{oHg0BoB&gB-i}vPW zY@`oIRpC|0NJ%3&gG>Qc``8Y%8FX0~^ASW?2iXKSEvJ-%vYfl(SM)z`s!jEfI7R#?8TfBn+w6KF6ow%+qmp7> z22I8w!kWs}PAh@j3@G*yZ`tj_eCLG|)PUjH(i0jZI5^$z0eOxRkeS=W+9LK1H5Q;*7BafOrs!=gtwqH>PI8_|}rcvA8b9mvRx|3(^&%GY1Vum9+D2AI}(>*}@^Q2*idk&v=d`oZ~J?{UY@XPG-h{UFS{zBe=dY8C}(# zdhGv&+4^_f-Fb1RCHSFwkodWK3ioHt6B|v1G5#Hfht;a>Q}%OFQ73wGwL$=#`=b7@ z4=*-cN^Q@3z6!SE{FcIZIb>5~sk7;{FaAMEOFAuJF#YO9zvNORezZBz7e=wJU=?pN z7RD&COPFzBvuhYn+iZ}d80-cr6zl^ya#*jv`8oJwr6ybjye_E*Svp~2H05UN=G_l| z)W(owU+q>LuN?8G#bkQP;+6ZvW&`gm;d~C?GZE#8X3JWECGZW2 zO5$z_o3)K1TU`rGrjrA;(#_<$oqxFbK;uWLiLQJo*}$a|Clspa;>ps-?-lXu_&HvOkV16 z>hkhT6tE+Fd=up$9Yu?vv=aE2A&%ABLYrO#eWVkIS4{R=%}HAEbv9}*id2dgUv~GA z-i2xDO}Brfy>oyb3XtftMZ{>rAN>eQpFpDJ;R>hNfFlk&mSww6w&;%MyYXKCX?_fw zcRp+0lXmkoLh!=D$Je;n?>pOMLJ>(i`9a%bdP$azhzo1*CcK9$_UjGUuXY2BmUT7; z`#P?FKlr^SO5&RrXJPGhrmCS!sy*pUOv?57;lzj~VV9sJO*L+QP&*{#tKK;z-nbh* z;O^I)pFWQF|0*v(@7}7XljNsGlhB^bCu)xJsZ)`>ZznV?)7ic02;*Ld0}E&C7*Wo? z-~($zT>|<-KFBrRI?qX4v2H*?{T~J7gPP+PKYI4kbhZ=PkG)seuQ22Q5YF>d+*$8BP?kIjMCm>R}>Q^4QAvF{Pp8T{! z$JOMspl3Cx?;eatN!`eQZ<~vj{js0^#F~+C0~9dp`1hZU2PNy^e^V!T>%N8rD4mnl zUer6v>qYL75#K)eCK(9>F4NHo3`i=U0UXqxXPw5|QSw|YsfYE&Hx{A4FuQ+tg|2Zd zfFC~{T4V+>njnjDN9cf`7Z|z;LUL?la%u0(&{X^IYH*CaTsYlREfuL4bbjpt*Mx$S4nvJoOW7{fFV$08K8lTPl+h zwFv6>Qyygu`1~xI@FH(3d|X5Ke^*U;y(J)DaviQNG4#@)BGU9X-nqn%+#D4j#r=^F zyT$cyn8zY4PpNzum!c)9nd*eNcYo&VzTC1E($Bu@-R^Fa7-$0Lj)K#D-VLO<$T(!j zHt^t=+!E)?p09=!Tp$8b#1QKWUU6p;L(O7#Oy|RL--&4}q1a1|TJRn=K3#d&TnlZ6 z6Y#(%2e3K8FJ6=a0#7XS*w&f-Cx@~crRCPg9*__>_!38$J69uUlr?Hv7w>If_|rJ@ zL{TFNp?H6P{JqD4DAP8xT@6UttG8ETv9s$YFF~qORt9&yeJu<>@|8M5=do6a>74gp zfu2S;5H+yDS0bcJ4fEdMuLmkhlI!=SS|f+@>U$pw&fl4Q*#ZdfJ&dDacfEdcfE%c0 zw3Ui?7~W_po_a{V@R7F2QWFVsQh7{ za{?LrOzyJl6LiFtB*mE)#%v%DRM?sP_>K)MF zdDH-?O9qMK{QNy#g`g{`TFDv1-u5TevlYFpHplyglH}sQMF#_rhnkrsO-VN6 z_RmzoF;+6O3Y}96y6Eto4$Yy?wnrCE+k0SiywCGJUMM5X+KTVg`_pd1 zrv^S^ciqUn2gv#FZer^XtKL75-{Czzy|duT#QQ8f1QpeNMkA6}Q91~;6VYNLAncwN zMsU6;sb-6wz=_tM{%$07+}VzV@A&BaR6kA?yjGk=dR6U|NS9)yz&uJyzC+K`G&VH! zs*&HMOj5J7TJE+9lHc9U*E>=1&Yj91aiqt+y!E5!lTO{b@3-21^z+lo&GGi#W^MA; zQGS3}DGnZB0ZliNw1gV6)7g{gR+tyx zZvyz)%)r@quQK+gn}6v<4$D}4IW#-;G&7Qx1BQlDk1)&8DW5x2(FZQIm%`-vO>Tm> z`|1);MquJnzpIw2pU%Llm<3~rjSW!jBj7KGll5m`4~`Y;Keaq7@=Ujr?r)EUgsVAe zXF^$#vDZ!I{HB-Y`g@XbW;6?CTM?)M@IAbUm$7SdZteD>xn#wCB{;fvxK4rK>C2MG zA$HH!V`JZkyF2~E8uTlHL45vhUayvKb>^iyE?F24u>UPpabJU-bRxG_SN_p}_UT6h z9HM-#rVYVDe2jndv_c^4l&x`@51M~v10jIO2iw)H=`-q?meGDcJ6nsk_2~6<`nu*1 z@6ih}wjtIVb|9)O{4U+^a+Fxhf3>p?ey?R}5WB(R1YjI7?#7*5I1b0FCNMLVVyGB7 zr%viz$cM;}`erom?kuI}hxRe;IxOM?PMH2ugvX0_HZ1_^(L$=&RD_O)>tiWxVPty! zHOSQy)dVTKR-F%f7-fi?iRuV_dDU+x0Cy?oGS|IHgZBJh+YGbYY?)SIRRu2Qt?7_7 zKv_y~5o%)_e+D2_5-dpDvm{$otuhgyCFPlVR{%2k0KntA zg&s0wIwkYH3ZaIiH$QKr!6XMHm-D>+sxkkDkkzj&h5Q#Y>x^E4EMbT6?pE`i8AlT4 z!#Bd?lM$uc`t*9r=DkrPYaaa@ryT#U<{U^2=OuW@+H2#4(cHNmTHLuHMOO89NeQ$t zn-^BALA*)S$iD@`1D`*S(f`JsmXR;hkd+lBCk_OR{tT8R!zoBo%S6E*k3@MJa z0k~i6rZoJJeniuZTAlCTXk%1~N55h>{ugSR{^_%Sy&yG-l{=rNTLJ!6exD!|&Ry#x zIdTr1O6eI)W(*6)O(2!__b8z9aJP-`4?n|+2gyMk#}k6o`v|Teh#ZJ#uvmhNfE5t) zXnGufC{OUDk!1TV^JWA0_$RVu{lJYga{^?wcz_-ix(VpWu*4g`l>sQPdergB^V2Q5 zCvsDNEnKIf?ZHu>11|@IHoz@EC4U`%#DnJu8Z|>sbjxTgLf(P@+J>2AbKxvm|q|Y$}MvgvRS1 zhNU?~RYeNRq){s(E_FL$UPf>3JEy!03`z;mDI49}_i_6|h<~eEHj-^>=^WDUW+5KaGF~BRomM>OIPbtokVR8YYj^zvV$o1#?2m zS+9a$Oja^-K(}4o=iyzeF@`+TpO(lKLR?B&#*;b19?6(4@WOGfMsyG)m7PN^ej|ET zgxQxz25;1C1H{$|?28=kdQ!a0?BGDNMo;oxt*+g^8l_2Fy3B^R~Ez3ta<=U(VOJg4}vgU3ym{HsDZP1rxpyoaHr?q zP%V8jjYG9Y%+Dd(Jvziq+KRpwu~^gsxUh1lWNkp)RMXe$45pZsef0Cn0Ve9{Wp6q7 zk2=K=X~yHc%JQh&UHm^VqKJ8Kc$LbmcfNJrRVU0`(4pG&_{T~d^C*2eRUp*l4^md@ zYGVn;U?rIv+6cO@-df-+n>28F!3D)eC1m6Uh|FY9c%;<~oRCEfFR_H_NwDNc^k(JtMe?Vra^R!gHC7C}BXpcIvi5I& zDjZ|*sNnX>U)0)!CxY72#lcpjkzq7c+&{8fY$a*HOK@@a1HlqoggdlqJ$o zb$m{d!aq9@e=_+fWlCun=+j2YGFXO~Vbev~o!(A$b(#)?_NhL7fYDRpU8JT8&8^1^IWobpTh%fyY zSRT-H6jVoKLls^f2SjoS`r&-=3yclQV~X!svrQw$e`!-ZC z0#;#AXe%XOZN+1DptAZ3my(cRiVhQrp%t;iI7TS7X>zUJd`XfEItv+qG)Vr+E$OS1 zy4`FSx=oBMCe(bA@b&0AkWahuk*q@}2!4c<3H{Bw!4_-aOLu90&&^wRA}BJx5wwe> zKQ4*wsc5FRuvXXD^Zc#Rsok~%O9_2;Xkj!zn)^WK!#RFOoiH^@C5h~>nnj+nOI6W!Vb-5S_fpW2(4YE{)-Uqj{O-* zo)E}#gD6dDOp6n)QnSJ0o08EHSoh-z4d?e(3c&P()N#6-7CBTo2?_57)|<@R_fvCk zLY}@l!gXP$iGKB3%m~D%5?#c+NTXwxbovb+)UcHPA*80~4H8_r{=d*0i23OT{;7v= zcKBV7nN|oHgqoMwq{PJHRYAg5Z0p)&##DvP+0o=%oVXi>q}S1&m@=I1=kusDgF?Tz zKx|C065`UuaF8N(XfPuj{d2tM;nPPiAOxZ1G!Wlk}P{q91f+zkV{eqz}ma=-ut@x1B% z#drEU6(5`l`ZU3hSzS(IYa^Wx2D8_SWeqhv?2?Ezl1yIzbtvvHY@4!@YR<=vKx~Y~ zRIi7e3SRrvB*6`!qB4oN6g~#P;3IX90mL*dS;xFZ67H_$R(3^d%XZ6SR()ZILX|^f zDS3|*6Muo;%C-~}%F)MnZ{_bm24_r3Pe66BGJ)`R0bKZ54_F!s)+b6RE#R~I#)_$l zhazDUZcZ`LdQqtAY-14IoacoV00Gep1V=*SbDBaN4U*VjeS1=G^$}=)4;WvvFs#u> G#rzK*+vev0 literal 0 HcmV?d00001 diff --git a/Clubs/templates/Clubs/clubMembers.html b/Clubs/templates/Clubs/clubMembers.html index 5a22332..17e2aa1 100644 --- a/Clubs/templates/Clubs/clubMembers.html +++ b/Clubs/templates/Clubs/clubMembers.html @@ -1,6 +1,11 @@ {% extends base_template %}{#{% if %}#} {% block content %} +{% if not userHasClub %} + {% include 'Clubs/noClub.html' %} +{% else %} + {% include 'CLubs/membersModals.html' %} +

@@ -167,4 +172,5 @@

Requests

{% endif %}
-{% endblock %} \ No newline at end of file +{% endif %} +{% endblock %} diff --git a/Clubs/templates/Clubs/clubsList.html b/Clubs/templates/Clubs/clubsList.html index 0761d0a..62708fe 100644 --- a/Clubs/templates/Clubs/clubsList.html +++ b/Clubs/templates/Clubs/clubsList.html @@ -1,8 +1,8 @@ {% extends base_template %} {% block content %} -
+
-
+

Clubs List

@@ -11,7 +11,8 @@

Clubs List

-
    + +
      {% for club in clubsList %}
    • {{ forloop.counter }}. {{ club.name }}
      • +
      {% endfor %}
    -
+ +
{% endblock %} \ No newline at end of file diff --git a/Clubs/templates/Clubs/clubsSchedule.html b/Clubs/templates/Clubs/clubsSchedule.html index 9915aef..f05e360 100644 --- a/Clubs/templates/Clubs/clubsSchedule.html +++ b/Clubs/templates/Clubs/clubsSchedule.html @@ -1,169 +1,172 @@ -{% extends base_template %} +{% extends base_template %} {% load static %} {% block content %} -{#{% load Clubs_tags %}#} - +
-
-
+
- {# {% if not userHasClub %}#} -

Your Club Schedule

- - -
- - {{ scheduleForm.errors }} - - - - {% for day in days %} - - {% endfor %} - {# #} - {# #} - {# #} - {# #} - {# #} - {# #} - {# #} - - - {% for timeHour, sessionsArray in hoursDict %} - {# backend provides dictionary, where key is hour, when trainings happen, and key is all info#} - - {% for day in days %} - - {% endfor %} - {##} - {% endfor %} - {# #} - - - {# #} - {# {% for day in days %}#} - {# {% get_obj_attr club day as dayDict %}#} - {##} - {# {% for time, info in dayDict %}#} - {##} - {# {% endfor %}#} - {##} - {# {% endfor %}#} - {# #} - - - {% for day in days %} - - - {% endfor %} - - -
{{ day }} MondayTuesdayWednesdayThursdayFridaySaturdaySunday
-
- - - {% for session in sessionsArray %} - - {% if session.0 == day %} - {# DAY #} - -
- {% for info in session.2 %} - {% if info == 'GI' or info == 'NOGI' or info == 'GYM' %} -{#
#} -
-

{{ session.1 }}

- -

{{ info }}

-
- {# TYPE#} + {# {% if not userHasClub %}#} +

Your Club Schedule

+ + +
+ + {{ scheduleForm.errors }} + + + + {% for day in days %} + + {% endfor %} + {# #} + {# #} + {# #} + {# #} + {# #} + {# #} + {# #} + + + {% for timeHour, sessionsArray in hoursDict %} + {# backend provides dictionary, where key is hour, when trainings happen, and key is all info#} + + {% for day in days %} + + {% endfor %} + {##} + {% endfor %} + {# #} + + + {# #} + {# {% for day in days %}#} + {# {% get_obj_attr club day as dayDict %}#} + {##} + {# {% for time, info in dayDict %}#} + {##} + {# {% endfor %}#} + {##} + {# {% endfor %}#} + {# #} + + + {% for day in days %} + + + {% endfor %} + +
{{ day }} MondayTuesdayWednesdayThursdayFridaySaturdaySunday
+
+ + + {% for session in sessionsArray %} + + {% if session.0 == day %} + {# DAY #} + +
+ {% for info in session.2 %} + {% if info == 'GI' or info == 'NOGI' or info == 'GYM' %} + {#
#} +
+

{{ session.1 }}

+ +

{{ info }}

+
+ {# TYPE#}
-
- {% if authorized %} - -
- {% csrf_token %} - + {% if authorized %} + + + {% csrf_token %} + - - {% endif %} - - {% else %} + + {% endif %} + + {% else %} + +

+ + {{ info }} + {# DESCRIPTON#} +

+ {% endif %} + + + + + {% endfor %} +
+ {% endif %} + {% endfor %} +
+
+
+
+ +
-

+

+ +
- {{ info }} - {# DESCRIPTON#} -

- {% endif %} +
+ +
+
+
+
+
- {% endfor %} -
- {% endif %} - {% endfor %} - -
-
-
- -
- -
- -
- -
- -
-
- -
+ {# {% endif %}#} + {##}
-
- - - {# {% endif %}#} - {##} -
+ {% endif %} {% endblock %} \ No newline at end of file diff --git a/Clubs/templates/Clubs/clubsTrainings.html b/Clubs/templates/Clubs/clubsTrainings.html index a91130c..15e9705 100644 --- a/Clubs/templates/Clubs/clubsTrainings.html +++ b/Clubs/templates/Clubs/clubsTrainings.html @@ -1,7 +1,14 @@ {% extends base_template %} {% block content %} +{% if not userHasClub %} + {% include 'Clubs/noClub.html' %} +{% else %} + +{% endif %} + + {% endblock %} \ No newline at end of file diff --git a/Clubs/templates/Clubs/noClub.html b/Clubs/templates/Clubs/noClub.html new file mode 100644 index 0000000..a48c72a --- /dev/null +++ b/Clubs/templates/Clubs/noClub.html @@ -0,0 +1,11 @@ +{% load static %} +
+

Looks like you don't have a Club, so there is no content to show

+
+ +
+ +

Please go to + Clubs List and join a Club, or create one if you are owner.

+ +
\ No newline at end of file diff --git a/Clubs/templates/Clubs/singleClubView.html b/Clubs/templates/Clubs/singleClubView.html index 4eaf3df..13075ea 100644 --- a/Clubs/templates/Clubs/singleClubView.html +++ b/Clubs/templates/Clubs/singleClubView.html @@ -1,11 +1,12 @@ {% load crispy_forms_filters %} {% load static %} -
+
-
+
- {% if not userHasClub and not alreadySent %} + {% if not alreadySent %} +{# {% if not userHasClub and not alreadySent %}#}
{% csrf_token %}
@@ -45,7 +46,8 @@

Since {{ Club.estabilished }}

{% if Club.description %} -
+

{{ Club.description }}

@@ -55,8 +57,8 @@

{{ Club.description }}

-
+
@@ -98,13 +100,13 @@

- {% if Club.instructors %} -
- -

{{ Club.description }}

-
- - {% endif %} +{# {% if Club.instructors %}#} +{#
#} +{# #} +{#

{{ Club.description }}

#} +{#
#} +{##} +{# {% endif %}#}

diff --git a/Clubs/templatetags/Clubs_tags.py b/Clubs/templatetags/Clubs_tags.py index e508e39..a2379ff 100644 --- a/Clubs/templatetags/Clubs_tags.py +++ b/Clubs/templatetags/Clubs_tags.py @@ -1,12 +1,12 @@ -from django import template -from Clubs.models import Schedule, userClub - -register = template.Library() - - -@register.simple_tag -def get_obj_attr(club, attr): - - obj = Schedule.objects.get(club_id=club.id) - dayTable = getattr(obj, attr) - return sorted(dayTable.items()) \ No newline at end of file +# from django import template +# from Clubs.models import Schedule +# +# register = template.Library() +# +# +# @register.simple_tag +# def get_obj_attr(club, attr): +# +# obj = Schedule.objects.get(club_id=club.id) +# dayTable = getattr(obj, attr) +# return sorted(dayTable.items()) \ No newline at end of file diff --git a/Clubs/templatetags/__pycache__/Clubs_tags.cpython-310.pyc b/Clubs/templatetags/__pycache__/Clubs_tags.cpython-310.pyc index 947dc9776b1697ed5515a2bdf1aaecf588942cb8..2f24e91be56d7726b02318e6c44147fba011cac8 100644 GIT binary patch delta 97 zcmZ3+vX0R?pO=@50SH7Nh^DABGB7*_agYH}jKKkji&=m~3PUi1CZpd=&cF!6>OU48!iXw@d#SPNtYp5W=kVV3gB3TAW4+8ATS-bTI zBxC;4t)220f($vTDUbtrJbv7J_l|6~xBHCj;Ll6G1C0Iki}xmIaY)1NlT%DV#cD_Z ze9S9ei$v5ik-#+E_a0ah=%5UhQ1Xs#Ac<7(lEuLj<+2zsa=KnrnbR@H=rX_2YFTNF zmR6flwVdYM-+MDjvnLoDK!d^ke*;u0VxhT6sL3tRdti8&nm40Mq zNNCUJqtEFz)ojxvRTuO0o3^*ES)@NNevD7PU;RoKt-ERF>G62nEX_QtQm@XY|JA!} zX8&zXe7Lu0aX{rvh-~6%LoYcXHxzvsfcZq>S-gdTDzo{lF}_X7pu^m&8>K7TsWiT2 z7@ihWlbIGHqi2P6+F;)n)OPL3I;>8`JNMD&MPCStp5rV10%rZE7_cEkT#66y3S*y< AAOHXW diff --git a/Clubs/views.py b/Clubs/views.py index b839681..dec9ffb 100644 --- a/Clubs/views.py +++ b/Clubs/views.py @@ -6,9 +6,18 @@ from django.contrib.auth.decorators import login_required from main.views import getBaseTemplate from django.contrib import messages - +from django.core.cache import cache # Create your views here. +def userClub( userID): + return UserMembership.objects.get(user_id=userID).club + +def userHasClub(request): + try: + userClub(request.user.id) + return True + except: + return False def checkRequests(): requests = Request.objects.filter(status = 'YES') @@ -21,6 +30,7 @@ def checkRequests(): @login_required def ClubsIndex(request): + authorized = True try: # find what club is the user in @@ -39,7 +49,8 @@ def ClubsIndex(request): 'form': form, 'Club': yourClub, 'user': request.user, - 'authorized': authorized + 'authorized': authorized, + } if request.method == 'POST': yourClub, created = Club.objects.get_or_create(id=membership.club_id) @@ -111,6 +122,7 @@ def clubMembers(request): 'Club': yourClub, 'authorized': authorized, 'requestsDict': requestsDict, + 'userHasClub' : userHasClub(request), 'base_template' : getBaseTemplate(request, "Clubs") } @@ -172,7 +184,8 @@ def memberProfile(request, clubID, userID): def clubTrainings(request): context = { - 'base_template': getBaseTemplate(request, "Clubs") + 'base_template': getBaseTemplate(request, "Clubs"), + 'userHasClub': userHasClub(request), } return render(request, "Clubs/clubsTrainings.html", context) @@ -192,12 +205,11 @@ def singleClubView(request, id): myClub = Club.objects.get(pk=id) context = { 'Club': myClub, - 'userHasClub': False } try: userMembership = UserMembership.objects.get(user=request.user) - context['userHasClub'] = True + # context['userHasClub'] = True except: userMembership = None diff --git a/Clubs/views_schedule.py b/Clubs/views_schedule.py index e90a68f..6461fe9 100644 --- a/Clubs/views_schedule.py +++ b/Clubs/views_schedule.py @@ -1,54 +1,56 @@ from django.shortcuts import render, HttpResponseRedirect, reverse from datetime import datetime, date -from .models import Schedule, UserMembership, userClub +from .models import Schedule, UserMembership from .utilis import Calendar from django.contrib.auth.decorators import login_required from main.views import getBaseTemplate from .forms import ScheduleForm from django.utils.safestring import mark_safe - +from .views import userHasClub, userClub @login_required def clubSchedule(request): days = Schedule.days - # userHasClub = False - myClub = userClub(request.user.id) + authorized = False + hoursDict = {} + + + try: + myClub = userClub(request.user.id) + membership = UserMembership.objects.get(user_id=request.user.id) + if membership.authorized == 'FULL': + authorized = True + except: + myClub = False + try: mySchedule = Schedule.objects.get(club_id=myClub.id) fields = mySchedule._meta.get_fields() except: mySchedule = None - hoursDict = {} - for day in days: - dayTable = getattr(mySchedule, day) - if bool(dayTable): - dayDict = sorted(dayTable.items()) - for time, info in dayDict: - timeHours = int(time[:2]) - if timeHours not in hoursDict: - hoursDict[timeHours] = [] - - hoursDict[timeHours].append([day, time, info]) - hoursDict = sorted(hoursDict.items()) + if mySchedule: + for day in days: + dayTable = getattr(mySchedule, day) + if bool(dayTable): + dayDict = sorted(dayTable.items()) + for time, info in dayDict: + timeHours = int(time[:2]) + if timeHours not in hoursDict: + hoursDict[timeHours] = [] + + hoursDict[timeHours].append([day, time, info]) + hoursDict = sorted(hoursDict.items()) - authorized = False - membership = UserMembership.objects.get(user_id=request.user.id) - if membership.authorized == 'FULL': - authorized = True - # for timeHour, sessionsArray in hoursDict: - # print(timeHour, sessionsArray) context = { - # 'userHasClub' : UserMembership.objects.get(user_id = request.user.id), - # 'cal' : mark_safe(HTMLcal), - # 'dayDict' : dayDict, 'authorized' : authorized, - 'club' : userClub(request.user.id), + 'club' : myClub, 'days' : days, 'hoursDict' : hoursDict, - 'base_template': getBaseTemplate(request, "Clubs") + 'base_template': getBaseTemplate(request, "Clubs"), + 'userHasClub': userHasClub(request) } diff --git a/Notifications/routing.py b/Notifications/routing.py index c561339..84e4022 100644 --- a/Notifications/routing.py +++ b/Notifications/routing.py @@ -2,6 +2,6 @@ from . import consumers -ws_urlpatterns = [ - path('ws/notify', consumers.WSConsumer.as_asgi()) -] \ No newline at end of file +# ws_urlpatterns = [ +# path('ws/notify', consumers.WSConsumer.as_asgi()) +# ] \ No newline at end of file diff --git a/Presentation/tests.py b/Presentation/tests.py index 7ce503c..a79ca8b 100644 --- a/Presentation/tests.py +++ b/Presentation/tests.py @@ -1,3 +1,3 @@ -from django.test import TestCase +# from django.test import TestCase # Create your tests here. diff --git a/WorkoutJournal/__pycache__/forms.cpython-310.pyc b/WorkoutJournal/__pycache__/forms.cpython-310.pyc index f9a6b63a1e993719558fb5744b27575e16ce3476..dadb56e3ae677c8aa234ddcb06bad1b259be6fc3 100644 GIT binary patch delta 975 zcma)4%Wl(95cQ4i_{NEyIIlK+5L!xGgH$MpA|%A7h^nGQpjJqPMM--vsliFw>!gqk z6^|XO=&o2GAwB?s5EA?VTlW3}b_nqU%s8zSsw}YOqj`JI%zP+@MZ0BLrUK8qxgz^! z_v{JszIS%*zQW?Z)v&8JQJBG~pWaYb6qaD-D}|YyKFYjQs}5L_ECrSnH$l&WZZR8l zJJNHYr&$K{Or+>Vz2lYtGgA{7Fc)L~v=}#PhDjI?Oaj9z0NLjwn7RZ$Rq+J=A z!mLvOt}0HTTt=9cM88x=U#K>`CP3|JsPEVO4j1zn922ug!LAz8J+OBJ-agC*SH+zc z18rjPID!EXCYN_w-ZsDCai57%`Bonz^YW{{MCRl#{rBl1bVLF2uwJkQKo#4Ny0J+L z(uw6|*SJk4Bk6%kW1=X38j}Yj5La>I$D6ngW>G>ILm2ie?6Zo_2?W$Cu6eu;@(||` zuwrO$@a>(Z2Xoly?(#q^UPc#=s!w~^e^$YJ7rvmspghT{Vl|@igFY^u1P_ck+Rrq| zVg?OFln06KCC(rGJLS+^@6_u&XnU>ZfAD;Wl?Qmzp*$~O)J23fglLgRjGTd^6F0%V zDHqL>fl|dS$UElq-D(oAJ6PEF_>(~3MThZ5i*Y{?OIQ!@JX)~8kwis?EheN_A*Ya}h52Rl%t}7-7vFWO@c;k- delta 927 zcma)4OKTHR6rP)T-Av}y$)io0)U+DQR4A=biz0$_VeyedlZ{f)+Iy*y*yx?fq6-b8 z8*vpc2)ghmxbX+L)rBCsn|~qh)pMq`#FB+G+;7fzzH`sH=gdt??@MmaaV!O%(t^r9 zdPBELUJuV)-!Pcjb=t}mg;AD$uCOep_uXgeEe|{v%Yi4yE#N+In>oOplurP6nFriU zdBFUZ5>5=i-IS~3r4c|S5y(%ZnYY2j%8>>@6-tEtA80u@vCwKo!@JHS;zp$j2trs^F5BNjW2muV`&h0@@6X<40Hn zx0pgGBaACj0pSjc(+J3#p>;fuiP|CpW=z~R-?_Kffhn}HE3veS5)LX&Ft*M*sGG2& zgWpjgfg{%CcRHw^051%<4j(a#a1tFPo$Xk>c9s5z&UW?G9}>}wy)eJ`o#%ND@62zk9}isxgNndvxDdgzHVAF`6p7zid6kb7 zpN7g&tP|xTiDQqVnZj|L=n7^U&)`|sGk6XsS1b>yi9zdGPrUU zt;3Uirs*eZkzt6#x3VaPkt~6(K1|XAH}VWehDeJrPz(73E{P1LYGX`r<>r_@h#qp8 xe;=)JFVH59GxxmJA#@+2T6((9)ID}QnL!qG6hS(ob=cQBs1Bc6!8a9I`U4wUU3&lk delta 365 zcmbOr^-q#7pO=@50SMfS1X8@XH}W|$bFqT>Kv3+kIg*)&(NZ9lD@#5_qL(>JAw@Dp zs)Zp+F-1B>21qNV$fn2vY2|i?G{zM96onR!D3x{w7KSL*UD|xC$S_oB|a}PH?_zJs3Js@rO0&hVQy2S0FWjYAQ8o#n39s3 z;#3)0oLW>A2oh!k5kVk1&XUyRjJ(Xk($pgV$yz*$;-NrMS0FCt01_Mw0*qpe0*pnW TlaqK#8AB)E;4x(u64L?z&RS9; diff --git a/WorkoutJournal/__pycache__/views.cpython-310.pyc b/WorkoutJournal/__pycache__/views.cpython-310.pyc index a8a4cfd23b9cbc36eb13cf210a0d7be96ab894fa..523153daf036e3468ceb718db4aa24a6d2f6dc4f 100644 GIT binary patch delta 2005 zcmZvdO>7%Q6vuaFcfITN+VMx4Y}2MmKSD8urX{FR1+=7T(-x&pTPF=QiGrJ1xpw^# zX4h?6t!1IKf=dt8lnX-0IaQSq9D3rw4T%#HTvznKfdd!B1uh80d*c+N5?k}zH#_s* zzWL9a-KW_{*?1!!w-oq&dvJh#^dLS=A`cGTYuB8DLlmYktGcr`R2U+P>#!KJ? zHY{ypKTGA6?1*@W{QiW~ON2P$8}$J27xlAaFF?9{1Tl)(i`WM!ShG|4`IQTEx%qQ^ zKimk7)kfWS*Zs!|9~WP1%OoXs>4(TsaaLcNd>Q=?BgX&55%h|(qIdmTqsZALbUh8A zQCs7$g0V`(Z>H0Z5Jh36MFORwR7i{7>Gx?xt!M#d^gd~+zAk%eCBjtbYk^uZT4YhF zn?%7s)0SvUZE07PfH3_A^$s!^hiE1haw(lP?$w6Yv+nL(tI?4$y-LN*Ce-e2(3 zEWSbV=$8S%1p3ugKf0md0|U+Puc)0Jn~FaGqkS6`5>0-px1uc7vZnpPKnbiMx}m~0 zrE@cU5VUzrcor`-mkYI-h1uCKI)8cUeC~YiY<@n}F3#oWvm`W%O~0{HX2LM?L>KQG zFWI35_pUd1`HsuPJ!AY8hs!<2Xgr2Eh!{iI0NB@R^BTn9Q_vGX8Y@FPaEt=7F)lY2 zM?$p;&$(zGA&12WW~TJqK3he`@~-EV8}*Yg+dBc!s7WYIkR-841e&R8#Dcy_ZD=O3 z;cvpINfR`pQk_B%JV@kE&9W)K3?Xt)el<-pjEe9H#A|@ZB&2IMI2IJhloJ_ijAX@e zYpUH_T5rv`NPY@oAf^#<1p4zch|`GI0inKHb&H&z#T(}kI>JP}jrgxBQqe`cJBzrW zC~tw9TOx22faef%h>M8r4oJ*pWq-@b6USq3l7hGun;y)g!xcbQ?&#sbwX*NlLbAr+lb&0-d0j2GTfBX{(d5q- z{|PvG4#1%fNf0XoWdemmsfvXW`O7wVRUAlMN=s=LU}9F~OK{jM6cSPy^b8P3S0Gb!h$2qR<8s7%Q6yDig+w1k(u^s2XZki@(X|3dv9hR zW`4^=E77Q_!1MEGaXR@RnkHip#y@Fhd#FN9r?=FX?IQ}v5vRX2kR6b+>yECn#O3yJ!O+*4}ct}2`LYOJVZNb>K*~hLFgT%U9?;FhN0I(d*!$hko#!A zlt)=6O$X>c**OG;G~F-d!ypgR15zHN;Uy(AET+g`qw^W!Tkp7)@>S+mD`l5KKh9a1 zGM@7)IoIQba{lqSx=2XBXlNsVUu$1Yjls705W+!(VT2KYta)X6X*oByFu#0}kAlJv ztyRh%yW{OB{J7ZAZ;(#$t3FO9KM$-fPN3T{gyYZQ1UiMO?cTasu{k{jT~`OtRZHiu zfiSzK0zP{%0YPXp(A+;oBHZ0ny+Dx^)w)^?QuRJ*XzwXygDCh?ZB=ck4eh#8SBfF3 zudDoqXMh~00UEroHuSo_Wo|2crLGqvG(-*X4}e{(2XfH1BHJ*FXKh963Jq_oM1gU! zEtQ(vq!FwKFDN&{%|@smD0Xbc>!G5)O^9;)qL-kNO|pcJNpQ5#v8;KhM=Y9R%g{9?X$XUp) zLAnZbc1Ju3UM0FX7dj#~La&bX@CXd%8HB?KGIclsw*VkNPVFW*ieEyxt{zk)y&02Z za(oRkCoUVuW-v>B)MKTpV|y%DwoB~gq?tCQOU!i(mGU%BqqG#N8>;w z_>Ug8RK5td$A23JN#l?FQqA+!nJhlOE-) zRM}wdRqn&2E*^)NY7m3)RdLjM*oPE-jwUFUfa}@Z<16Bcm5JEMxJ@Os-0&oQg@3Z+zRYN@qIKkm6Jo;;khkx_F}`jTdDDOoURaNY>2FjS7M7v zNyjoqrtuFjjur7~Y$pGll-BApJ%L?DTIqQo$M3aT!i9UwdB)31fqnD{hPqhtF%=$Q zC-|=w;Ep)e@w6!`Cx&y$%8^AQ%O`=lw-7XhiwLr0WOSFXyGu(uU$Q**h)I^=x8UOT z1DL8w49JoNk%;f&zb7OOxcn@~OOKxvj}mtVcUh1zcA({j7{%G-;8|JCV_@+++*&@* zT#wQ7cdxmO%gXkHcC`vOIuE0>Jo%E$b{5CQm&svL7C$6YnLVQRJ6lXHv$b30!tEME zE`JhFlasL;%$Fgv^5AAN;&kUX$MquoO8f{d+U0y@;+E%Cc?tvTZfl-hAQMi-hF=Wt z5`T1#G`n$#S+Wb|i4B$KT)HC$iT*WjnAXbuYpa?sQS+Is$d>zoys?SU+d`75j4+3 zHWeL1x=A?YK^~?|$V!p|jm7>%;r?EV-zIJmqoJCogXS63{Af`-s(jKx2V;u2;B5|= z>h1+rqZ;}Z>PB^_LX|e6X5>b#s0|L(78bY*bBU=VW(5&=7Bm)ys^Dp>&_vEHS=&1! zh-~daJR1w|Mz44G9zm`&r(}YuoChIOUqpq#PeEksdCE`IS-z9bI16Ig!*!o$VL|MJe-7Cz;bL1Zz;ekn*Gid>5$?&LZnNO9n4~i zeuI!#vmjO!2;n$7n!GCB1X&i0u?{q&3@Dq-xuHt!{_*GuIX)U5lD&hi;ZxZ-M}$!G?c~f(pM6Nyz*yDo*n>^Pe3a>uu50ORX$s=DgG0Y|d@u<=_^#3&%AL-O#OHR<(Hkwk-9$rZTqj zTIf07i?=$Cte28>Cn-BAwXQ8QFfQ6ss(Af8*)4yx?wNdiUCE+2TnJQpw=gH22W872 Q>KF+{vtg|0j=pC80pV~!kN^Mx literal 0 HcmV?d00001 diff --git a/WorkoutJournal/migrations/__pycache__/0011_trainingsession_user.cpython-310.pyc b/WorkoutJournal/migrations/__pycache__/0011_trainingsession_user.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..b603455dbf5dc8e09b576d23bbeeeedfe1eeb09e GIT binary patch literal 933 zcmZWnOK;Oa5cc|!IBrUNK$Soh65Mi$+G~ZXhBgJIv_*XgVOd%^nQ5?Vug$JQl`~xX zAK=Je+8g53zkm=h>!c6pO0$}oo!R-mnJE?*1B=e%CoAyXwyYn=LvjrYHY4ej4Ho-ZzI*lvJw>nJw3acs+W7V;B zkSAjqS4kn1ZsY}ErVd6X?(Q-8wn)@~F0?`hR%oO1#YHb|d}YAKcG#p^KG@)3D-BG2 zTu9q#D_u+O5#YBoY3pdx+*4Mbi zy!eQ`l5rvoXjF>O@`*xu&pFB_Lmms@c_C3R{g9je;tGL_I7e+)#cs!?u9;5FTyFi~oh6uoUM?llzl3-G)j?-j z`@D|iTnC(x!6ZY{+nj%x#F@$FTsj8RLv<0CWjv&Jz!C+Z7)>SZgr%2yrzfxY>2d#v z?;q~;U+eZwM1o5DJ%C+mQ!7lMn#$perx&dh{#)Y&5}P3wqN1W6#b7?J=-=r@ zw~H0g9M|v7%JjcmPNhdBeG;`&D}iG(_qW@ynax&7++Y5mI;P|6g&CFZs1RqfwzTFR v7}gz}v43>q?9Mj2dre!e8h)nYEz_CyjC|UEKAX;_*$`zwwe4l*vlZtrsxK9Y literal 0 HcmV?d00001 diff --git a/WorkoutJournal/migrations/__pycache__/0012_remove_trainingsession_club_and_more.cpython-310.pyc b/WorkoutJournal/migrations/__pycache__/0012_remove_trainingsession_club_and_more.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..7ca684de79e392cac5e947895a076d37619971cd GIT binary patch literal 618 zcmZWnOK%i03{EncWjkznTq?M7K-$Zy<%ke!DGzB81r-ot6e&vA(U9#-GEHVcJ;RkB z!e7d@CvKcU0-V`JEnvxCY{#+vS#g`21wr|CdkfAeA!o_CC>)(#)Nl&{2+*1|w4{_g zA;2K}L?F|2$v$Q!1OAds^RJjkrZg6fsl4ipvtf}!7bQn$7d6ZfG$|<%d`>G`W|}Ya zR2cYYwzl(RSF9Yt2pe3A8_)h!p0ar5jq}H@@8+)eR@L$5_V&(>?7TA8*ed7{a01x} z?c>#dqLDA^{s?OnjRRdvs~R17!gA6o-a-_8iOMTFO{RiRpc<(Vj?o(yKZ> zNgn7{ThMl4bnpzR#mk4faqsnGqicwTYxQ~~Ux>ek_XB+Yuzy#)#sP!agT`3#P>18r zwc^F$^ZBEvuilFGw0q~Qcrag+6n}FT=bIMD{*LrR)Bl!`*h*yq=l6Qnp85<&7@>w6 z2xG!B{)^{~GRl8)zBb#P literal 0 HcmV?d00001 diff --git a/WorkoutJournal/models.py b/WorkoutJournal/models.py index c76d4f4..b8df046 100644 --- a/WorkoutJournal/models.py +++ b/WorkoutJournal/models.py @@ -23,7 +23,6 @@ class Technique (models.Model): def __str__(self): return self.EnglishName - class TrainingSession(models.Model): TStypes = ( ('GI', 'GI'), @@ -47,7 +46,11 @@ class TrainingSession(models.Model): notes = models.TextField(max_length=2500,blank=True, null=True) techniques = models.ManyToManyField(Technique, blank=True) fightTime = models.IntegerField(blank=True, null=True) - user = models.ForeignKey(User, blank=True, on_delete=models.CASCADE) + user = models.ForeignKey(User, related_name="userOwner", blank=True, on_delete=models.CASCADE) + # club = models.ForeignKey("Clubs.Club", blank=True, null=True, on_delete=models.CASCADE) + # participants = models.ManyToManyField(User, blank=True) + + #change to foreign key???????? ^ def __str__(self): return f'{self.type} {self.date}' @@ -66,6 +69,8 @@ def save(self, *args, **kwargs): self.totalLength = self.parseMinutes(self.hoursLength, self.minutesLength) super(TrainingSession, self).save(*args, **kwargs) + + class Suggestion(models.Model): addedByUser = models.ManyToManyField(User, related_name="suggestedByUser", default=None) technique = models.ForeignKey(Technique, on_delete=models.CASCADE, default=None, null=True, blank=True) diff --git a/WorkoutJournal/templates/BJJournal/BJR_addSession/BJR_addSession.html b/WorkoutJournal/templates/BJJournal/BJR_addSession/BJR_addSession.html index 9ea8445..77d6fc4 100644 --- a/WorkoutJournal/templates/BJJournal/BJR_addSession/BJR_addSession.html +++ b/WorkoutJournal/templates/BJJournal/BJR_addSession/BJR_addSession.html @@ -1,4 +1,4 @@ -{% extends base_template%} +{% extends base_template %} {% load static %} {% load crispy_forms_filters %} @@ -6,140 +6,150 @@ {% block content %} -
- {% include 'common/messages.html' %} +
+ {% include 'common/messages.html' %} + + {# #} + + {% csrf_token %} +
+

Add new session

+{# {% if authorized %}#} +{# #} +{# {{ form.club }}#} +{# Club Training Session#} +{# #} +{# {% endif %}#} +
+ - {# #} - - {% csrf_token %} -

Add new session

-
+
-
{{ form.errors }}
-
{{ form.errors }}
+
- {% include 'BJJournal/BJR_addSession/BJR_addSession_sessionType.html' %} + {% include 'BJJournal/BJR_addSession/BJR_addSession_sessionType.html' %} -
- -
-
+ +
+
- {% include 'BJJournal/BJR_addSession/BJR_addSession_Techniques.html' %} -
- {# DATE #} + {% include 'BJJournal/BJR_addSession/BJR_addSession_Techniques.html' %} +
+ {# DATE #} -
-
-
+
-
-
+
-
-

Date

- -
+
+

Date

+ +
-
- Today - Yesterday -
+
+ Today + Yesterday +
+
-
-
-
-

Time

- +
+

Time

+ -
- 6:00 - 9:00 - 12:00 - 18:00 - 20:00 -
+
+ 6:00 + 9:00 + 12:00 + 18:00 + 20:00 +
-
+
-
+
-
-
- 1h -
-
- 5min -
-
- 15min -
+
+
+ 1h +
+
+ 5min +
+
+ 15min +
-
- 1h +
+ 1h +
-
+
-
+
-
-
-
-

- +
+

+ +
-
-
+
-
+
-
+
- {% include 'BJJournal/BJR_addSession/BJR_addSession_sessionLength.html' %} + {% include 'BJJournal/BJR_addSession/BJR_addSession_sessionLength.html' %} -
-
- + hx-post="{% url 'addSession' %}" + hx-target="#BJR_view"> + Add Training Session + -
+
- + -
+
{% endblock %} \ No newline at end of file diff --git a/WorkoutJournal/templates/BJJournal/BJR_dashboard_count.html b/WorkoutJournal/templates/BJJournal/BJR_dashboard_count.html index 07b4602..7638c75 100644 --- a/WorkoutJournal/templates/BJJournal/BJR_dashboard_count.html +++ b/WorkoutJournal/templates/BJJournal/BJR_dashboard_count.html @@ -2,7 +2,7 @@
-

Your Statistics

+

Your Statistics

diff --git a/WorkoutJournal/templates/BJJournal/BJR_index_reloadContent.html b/WorkoutJournal/templates/BJJournal/BJR_index_reloadContent.html index c099656..a38ff85 100644 --- a/WorkoutJournal/templates/BJJournal/BJR_index_reloadContent.html +++ b/WorkoutJournal/templates/BJJournal/BJR_index_reloadContent.html @@ -1,11 +1,11 @@
+ BJRdashboard col-lg-10 col-12 row ">
-
+

Dashboard

diff --git a/WorkoutJournal/views.py b/WorkoutJournal/views.py index fcc787e..8fb95f9 100644 --- a/WorkoutJournal/views.py +++ b/WorkoutJournal/views.py @@ -5,11 +5,9 @@ from django.core.paginator import Paginator from django.contrib import messages from datetime import datetime, timedelta -import json -from django.http import JsonResponse -from django.template.loader import render_to_string from django.contrib.auth.decorators import login_required from main.views import getBaseTemplate + # Create your views here. # def countAllHours (user): @@ -63,15 +61,23 @@ def dashboard(request): return render(request, "BJJournal/BJR_dashboard.html", context) @login_required -def addSession(request, ext=False): +def addSession(request): + authorized = False + uid = request.user.id try: - membership = UserMembership.objects.get(user_id=request.user.id) + membership = UserMembership.objects.get(user_id=uid) yourClub = Club.objects.get(id=membership.club_id) + authorized = membership.authorized except: membership, yourClub = None, None + + + if authorized == "FULL" or "TRAININGS": + authorized = True + if request.method == 'POST': - form = TrainingSessionForm(request.POST, auto_id=True) + form = TrainingSessionForm( request.POST, auto_id=True) if form.is_valid(): instance = form.save(commit=False) @@ -96,7 +102,8 @@ def addSession(request, ext=False): 'form': form, 'Club': yourClub, 'techniquesList': Technique.objects.all(), - 'base_template' : getBaseTemplate(request, "BJJournal") + 'base_template' : getBaseTemplate(request, "BJJournal"), + 'authorized' : authorized } diff --git a/account_register/templates/account/base.html b/account_register/templates/account/base.html index c44adcc..e634e09 100644 --- a/account_register/templates/account/base.html +++ b/account_register/templates/account/base.html @@ -10,7 +10,7 @@ {% include "common/navbar.html" %} -
+
diff --git a/account_register/templates/myaccount/account.html b/account_register/templates/myaccount/account.html index 9f5e420..ac46921 100644 --- a/account_register/templates/myaccount/account.html +++ b/account_register/templates/myaccount/account.html @@ -3,10 +3,10 @@ {% load static %} {% block content %} -
+
{% load static %} -
-
+
+
{#
#} {##} @@ -51,13 +51,13 @@

Are you sure?

-
+
+ {# {% include 'account/password_reset.html' %}#} -
diff --git a/account_register/templates/myaccount/base.html b/account_register/templates/myaccount/base.html index ddaf34f..531b0d6 100644 --- a/account_register/templates/myaccount/base.html +++ b/account_register/templates/myaccount/base.html @@ -12,7 +12,7 @@ {%include "common/navbar.html" %} -
+
{# {% include "common/messages.html" %}#} {% if user.is_authenticated %} diff --git a/db.sqlite3 b/db.sqlite3 index 04ef7ae5482df0f361d8bcfe044d54568f1d36ad..0bf280779246df126a33c3caf65a50c58342e01f 100644 GIT binary patch delta 11043 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 ZX`$SVE;=3b#W@g&%IJ!9MxBAR{x6uXV_^UQ delta 5219 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 diff --git a/main/__pycache__/settings.cpython-310.pyc b/main/__pycache__/settings.cpython-310.pyc index 32ea2252de046e86c1dce27e817c8c1825dadaa4..3eb5d903c003e8779d3d890ce1a225549bf5300a 100644 GIT binary patch delta 115 zcmew$`9YF5pO=@50SH>|iKaMAwxDe->V* Q|12y({D*~i@-ZGQ0QEv1OEUBGHkWW5W}NKFr79F9;27-g y8SfYn;N$7+7~<*gw>gi?fk}digNc!ik>wxDe->V*|12y({D*~;g=O+F9xVWq-zw(- diff --git a/main/asgi.py b/main/asgi.py index 4ba595d..0949f4d 100644 --- a/main/asgi.py +++ b/main/asgi.py @@ -12,13 +12,14 @@ from django.core.asgi import get_asgi_application from channels.routing import ProtocolTypeRouter from channels.routing import URLRouter -from Notifications.routing import ws_urlpatterns +# from Notifications.routing import ws_urlpatterns from channels.auth import AuthMiddlewareStack os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'main.settings') -# application = get_asgi_application() -application = ProtocolTypeRouter({ - 'http' : get_asgi_application(), - # 'websocket' : AuthMiddlewareStack(URLRouter(ws_urlpatterns)) -}) +application = get_asgi_application() + +# application = ProtocolTypeRouter({ +# 'http' : get_asgi_application(), +# # 'websocket' : AuthMiddlewareStack(URLRouter(ws_urlpatterns)) +# }) diff --git a/main/settings.py b/main/settings.py index b1e13d3..68da22b 100644 --- a/main/settings.py +++ b/main/settings.py @@ -105,7 +105,9 @@ ] WSGI_APPLICATION = 'main.wsgi.application' -# ASGI_APPLICATION = 'main.asgi.application' +ASGI_APPLICATION = 'main.asgi.application' +# SESSIONS_ENGINE='django.contrib.sessions.backends.cache' +# # Database @@ -131,7 +133,7 @@ }, ] -ASGI_APPLICATION = 'main.asgi.application' + # Internationalization # https://docs.djangoproject.com/en/4.1/topics/i18n/ diff --git a/main/static/main/css/base.css b/main/static/main/css/base.css index 4764b64..4dab5bf 100644 --- a/main/static/main/css/base.css +++ b/main/static/main/css/base.css @@ -9,6 +9,7 @@ --cyanBlueFooter : #00b4d8; --paleBlack : #191919; --white-color: #F7F6FB; + --active: #C8C8C8; --normal-font-size: 1rem; --darkPurple: #3A0CA3; --SMgridHeight: 29.5vh !important; @@ -652,9 +653,9 @@ h2, .h2 { /*margin-bottom: -13% !important;*/ margin-top: 5%; width: 50vw; - margin-left: 44vw !important; - margin-right: 20px; - padding: 0 20px; + margin-left: 42vw !important; + padding: 0 15px !important; + } .unauthorized { @@ -690,15 +691,13 @@ h2, .h2 { .profText { /*margin-bottom: -13% !important;*/ - - margin-left: 23vw !important; margin-right: 20px; - padding: 0 20px; + padding: 0 20px !important; } .profileBackground { - height: 25vh !important; + height: 19.5vh !important; } } @@ -712,11 +711,11 @@ h2, .h2 { .profText { /*margin-bottom: -13% !important;*/ margin-top: 4vh; - width: 60vw; + width: 50vw; text-align: right !important; margin-left: 42vw !important; - margin-right: 10px; - padding: 0 15px; + margin-right:15px; + } } @@ -758,6 +757,7 @@ h2, .h2 { background-color: var(--paleBlack); /*background-color:#4361ee;*/ color: white; + /*min-height:100vh !important;*/ } /*.accountcontent > * > h2{*/ @@ -770,19 +770,32 @@ h2, .h2 { /*background-color:#3f37c9;*/ color: black; /*padding-bottom: 150px;*/ - display:flex; height: 100%; justify-content: center; padding-bottom: 20vh; } -.accountRCol{ + +.accountRCol { /*height:100vh;*/ - min-height:65vh; + height: 100%; + display:flex; + min-height: 65vh; } .accountRCol img{ max-width: 29vh; max-height:29vh; } +@media screen and (min-width: 768px) { + + .accMain, .accountRCol{ + height:100vh !important; +} + .accountRCol img{ + max-width: 40vh !important; + max-height:40vh !important; +} +} + .toggle { display: inline-block; cursor: pointer; @@ -842,9 +855,7 @@ h2, .h2 { } @media (max-width: 992px) { - /*.profile {*/ - /* width: 50%;*/ - /*}*/ + .beltIMG { max-width: 30vw; } @@ -855,12 +866,6 @@ h2, .h2 { } @media (min-width: 900px) { - /*.profile{*/ - /* width:19%;*/ - /* }*/ - .TheContainer { - height: 100vh !important; - } .beltIMG { max-width: 11vw; @@ -869,11 +874,6 @@ h2, .h2 { } -@media (min-width: 600px) { - .TheContainer { - height: auto; - } -} .profileInfo { @@ -1267,13 +1267,17 @@ a { /* =======BJJR DASHBOARD =======*/ .BJRdashboard { - background-color: #00a6ed; - height: 35%; + /*background-color: var(--paleBlack);*/ + /*background-color: #2284ee;*/ + + /*height: 40%;*/ } .countSection { - background-color: #2e2686; + background-color: #00b4d8; + /*background-color: #2e2686;*/ padding-right:15px !important; + color:black; /*background-color: #3f37c9;*/ } @@ -1318,9 +1322,9 @@ a { color: white; } -.dashboardCount .count_item { - box-shadow: rgba(50, 50, 93, 0.25) 0px 50px 100px -20px, rgba(0, 0, 0, 0.3) 0px 30px 60px -30px; -} +/*.dashboardCount .count_item {*/ +/* box-shadow: rgba(50, 50, 93, 0.25) 0px 50px 100px -20px, rgba(0, 0, 0, 0.3) 0px 30px 60px -30px;*/ +/*}*/ .count_icon img, .SessionDate img { width: 100%; @@ -1346,6 +1350,8 @@ a { .countItems .count_item { width: 90%; + /*background-color:#4361ee; */ + /*background-color:var(--cyanBlueFooter)*/ } .hours_count { @@ -1363,8 +1369,14 @@ a { outline: 2px solid black; } .count_item .count_icon{ - padding:25px; + padding:12px; } +@media (min-width: 1024px) { + .count_item .count_icon{ + padding:22px; +} +} + .hours_count h1 { font-weight: 800; letter-spacing: 2px; @@ -1541,7 +1553,15 @@ a { } - +.addSessionHeader h1{ + font-size:34px; +} +.clubTS{ + font-size:20px; + position:absolute; + right:45px; + width:15%; +} .addSession { padding: 0 4vw; /*overflow:hidden;*/ @@ -1683,6 +1703,9 @@ a { .activeType { background-color: #3e54ef !important; } +.activeColor{ + background-color:var(--active) !important; +} .smallCapt { font-weight: 400; @@ -1827,12 +1850,12 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset; .techniquesSearch i, .formIcon i { position: absolute; - left: 5%; + left: 15px; color: black; } .techniquesSearch input { - padding-left: 12%; + padding-left: 45px; width: 100%; border: 1px solid #b3b3b3; border-radius: 5px; @@ -2585,6 +2608,16 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset; } /*=============== CLUBS MODULE ===============*/ +.bearsorry img{ + width:45vw; + height:45vw; + background:white; + padding:3px; +} +.bearsorry a{ + text-decoration: none !important; + font-weight: 800; +} .Clubscontent { background-color: var(--paleBlack); } @@ -2670,8 +2703,10 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset; background-position: center; background-size: contain; } - -@media screen and (min-width: 765px) { +.clubProfile{ + /*min-height:100vh;*/ +} +@media screen and (min-width: 749px) { .clubProfile { height: 100vh; } @@ -2693,6 +2728,7 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset; .clubsListWrap { background-color: #187DFE; color: ghostwhite; + height:100vh; } #leaveClub, #cantLeave { @@ -2703,6 +2739,7 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset; /*background: black !important;*/ border: 5px solid white !important; /*color: ghostwhite !important;*/ + max-height:55vh; } #leaveClub .modal-dialog { @@ -2734,9 +2771,7 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset; background: #3f37c9; } -.clubsList { - overflow: auto; -} + .clubsList li { border-bottom: 2px solid #4ccaf0; @@ -2774,7 +2809,8 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset; .clubProfileName { font-size: 3rem; font-weight: 700; - + word-wrap:break-word; + margin-right:20px; } .singleClubView { @@ -2784,6 +2820,7 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset; .estabilished { font-weight: 400; font-size: 1.25rem; + margin-right:20px; } .leftSingleClub { @@ -2794,9 +2831,9 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset; letter-spacing: 0.07em; } -.adresSingleProfile { - background-color: #0164e4; -} +/*.adresSingleProfile {*/ +/* background-color: #0164e4;*/ +/*}*/ .clubProfileInfo h4 { @@ -2842,6 +2879,7 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset; .clubProfileDescription { color: #e9ecef; width: 100%; + /*background-color:#e9ecef;*/ } @@ -2917,7 +2955,7 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset; } @media screen and (min-width: 768px) { - .clubsListWrapper { + .xclubsListWrapper { padding: 0 3vw 8vh 3vw; } @@ -3214,7 +3252,7 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset; } .tdWRAP h1 { - font-size: 28px; + font-size: 22px; font-weight: 800; text-align: center; }