From ece973ad28ae5f16da754a7952fd1db0e99d2cf2 Mon Sep 17 00:00:00 2001 From: Verox001 Date: Thu, 7 Mar 2024 19:01:00 +0100 Subject: [PATCH 1/3] Fixed checked habit sorting --- app.py | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/app.py b/app.py index cda5edb..988146a 100644 --- a/app.py +++ b/app.py @@ -142,7 +142,7 @@ def index(): # Sort habits by whether they have been checked today and then by slot for habit_list in habit_lists: - habit_list.habits = sorted(habit_list.get_habits(), key=lambda habit: (not habit.checked, habit.slot)) + habit_list.habits = sorted(habit_list.get_habits(), key=lambda habit: (habit.checked, habit.slot)) days = {"Monday": "Montag", "Tuesday": "Dienstag", "Wednesday": "Mittwoch", "Thursday": "Donnerstag", "Friday": "Freitag", "Saturday": "Samstag", "Sunday": "Sonntag"} @@ -795,6 +795,46 @@ def user_leave(): habit_list.remove_user(current_user.id) return redirect(url_for("index")) +@app.route('/accept-list', methods=['POST']) +@login_required +def accept_list(): + list_id = request.form.get('list_id') + habit_list = HabitList.get(int(list_id)) + + users = habit_list.get_users() + # Check if user is part of the list + found = False + for user in users: + if user.id == habit_list.id: + found = True + break + + if not found: + return redirect(url_for("index")) + + current_user.accept_List(list_id) + return {} + +@app.route('/deny-list', methods=['POST']) +@login_required +def deny_list(): + list_id = request.form.get('list_id') + habit_list = HabitList.get(int(list_id)) + + users = habit_list.get_users() + # Check if user is part of the list + found = False + for user in users: + if user.id == habit_list.id: + found = True + break + + if not found: + return redirect(url_for("index")) + + habit_list.remove_user(current_user.id) + return {} + # Run the application if __name__ == '__main__': From b02458d96c2c2061b0046f2b1f4f49c9854de7be Mon Sep 17 00:00:00 2001 From: nikolaswollenberg Date: Thu, 7 Mar 2024 19:22:32 +0100 Subject: [PATCH 2/3] User Stack bei beigetretner Liste --- templates/components/habit_lists.html | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/templates/components/habit_lists.html b/templates/components/habit_lists.html index bddfd67..1643dbd 100644 --- a/templates/components/habit_lists.html +++ b/templates/components/habit_lists.html @@ -115,12 +115,22 @@ {% endif %} {% else %} -
+
+
+
+ {% for user in habit_list.get_users() %} + {% if current_user.id != user.id %} + + {% endif %} + {% endfor %} +
+ {% endif %}
From 343bb265361c3c6d19b80086f3d6a0bb99582db7 Mon Sep 17 00:00:00 2001 From: nikolaswollenberg Date: Thu, 7 Mar 2024 19:58:05 +0100 Subject: [PATCH 3/3] favicon.ico --- static/favicon.ico | Bin 0 -> 4494 bytes templates/layouts/main.html | 1 + 2 files changed, 1 insertion(+) create mode 100644 static/favicon.ico diff --git a/static/favicon.ico b/static/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..2ca62994f80db0f3733e7e6c0867e559e0928fba GIT binary patch literal 4494 zcmcJT_fykNyT-qX1VRu&igZDd4#J~A;E~=T5<-y@0-+;82u&cN1*Iq*=|w;gM5^>& zl#bGyASDVSAXR!1j=pEk%=ri2-Pzr1=bqX7hn<~!KNkRi{`9{M1n>a9R{`MKAN?GK z)TD*6!~RHGZ7nr}ztO(~O7Uko@UzT;3lL(^-Fna9=&xEkYBQf-zmJrMP+UupyOyzCFSZI=T zCX8hR>mPz*SxSr>m^wM&m!1hy-U_~zu|V+l_BjY}bW9kq)1F;A47eEnv_F@&)x5Q9 z=|F!YgkA;uUzxPkW0o8QLvd*dsBQ-B(-(Ac)0Hx+PFYb&*Fc`576rXvv($J=EWeJx z{Hzx%zaItLeNFp=$mdTv}TCSLmZJ@_H`tSiBv{#NGzDGKRn6H>}Ht!)Mp%|d1G+zl!0 z6i9D-TYnkhj}V8&?SuF39zfY1DDfSTgWT^8sykaGgkM-w4@*E~ICQJQ5d{vZn`J`X z^}U5IqFmvcLQ1MkWcuVqZTRnLD2L+MK`@FGc3TOj&>;cap17K$vbe414%i1%2#$Pd zz%Cx8hqzlo+a21qhuA1E%3zA-`)U9X9b8Dsa zO!+EJ`!hmbKDfA|U4GEUMN5OocwXp8=)`d^t){W8jfR>=%rWs)fzMiWK$G7L{0E5F zsBCDnG!S_~Uxi!Z`@mkEBB@VZ*}n)R*NnO>NX7&LCeHM%iUtU|l8@I_gLh4O`~AF% z3y5J4m~u8LeAzAh3&y>BqS-41&Ra)KNVUW&^P}}SDv{a6pt93+5B0#$n3n0cZ+5fn z)^$NR!S>^s!K`I%pReej)NqI|t%c!in8W0*><1H4oWpp~R@KW~1vD7r#3d!HWXTN9 zj7nnSDFjwuhX7qf+ZJa}|HB;?o{CtXa{l_ewc*)7Yyp$Ni+;tPEOHAxXGa zCbQtobH>f8s2Jr!y@WwCwhFCLN&IwZm}KPRjT35AM8M3_Y|;BSY+SSD2wtb4bqo`k zmFAs^GtM*BAJ5?0xW9>J+FEHd5t$+mU=v5qed=tjG?H6 zGV+A6z+j!EXt5LZaNk|NN3v*k=hJ%@jjJ>ghsAZ$z5joGy*(SmC^ zpK($lZmMGZ#Ren*oM;_YgEu*&{IpELpG558198mXsiZPkE{e{p9 zC z8qhdu#Fe%`@<;GN8|?LNBpZ^vAcezkz6ZLrca0SbmGxlca#;R-alKtmFB`igWD� zT3m;V65eZ`XCeobb}eeQU{gYE%@tfT@vXIh@DAu2E&(rD*6lm@LoCml^}+b3ubk1l zi(MCij_X^7>&B3+sTX9$y|by6_~k`L82#P``HssRUQg$qoKS^Bow-ejeniL2S5ZWZMI(DhldGvy@^GQPCCE%6Y-PjSS7f4fQl_AF#HJt$F6I zT{rJ{m8M1!&?9P^C-4S8{9ZKQfi>-Q&x1zVu^pL79Dxz3O8QN#RU?{AJz#|ga%6SM zrxt3yjDQd`8HUV!7B>PCGeL`qlM$R3w{l>rfJRe%$;kmq#8oE2u&1!(l z4cedLb@BQYhbG0kOEs=kLkHa~=51=1!!N`?VKUja>?kr|kPEF{{ovY<=(;h9x$g)NVO}>u*S^AB@HmG}i zVnP@2#E=G60-I4C-HGqgDH%RHp*6|Q%}3-??I?I!JdaBJvXoO{_b)`E8=y49Q(&!I z=+P_9vo&LmgGye#buCgZdz8F^rWku$$=4Gq!l3^BV;2V(d4Rh+rio$B;CdBpmeY}YHn+OTRO!A$A;1d89?1WpJ+w;7^A34OQ)Q7aM**u#-T1@O(YC- z#nezWZ}IfEI~yg=!jk?=rCcabPF&`%o|57H2O-@rjm48MS-UL{2(`+a{i`YIUamhX6bNUz$O)d?H!PH$eVEH#c+wEP$)gLm@J5+xl* zFSdSu^!>+OX1nZIV6LWw%{fV!Ff)vh+&;H6(mS3JJ~9Y0yR|V<$v4usA2e7yOk-1klT8Xrp z)v{1Ynd0ZyP3v$9-ENiYt8P%(TBRn_Dz*I#^BQsZzETYyIX$EJ%p*Y6%3R0Zlg9Uo z^0v~iDI&JY@?gCjQr`#8cF2)u-G5x7Z3y61-NPKw(-OrPr(A+AQrE368xY6IUr)^D z=t+B-bYZ2YOYv~6dPvu@j@^FYpjk;_3df@X`TU5f?@985`&-ozC_#a3>aKBiPjSZ8 z$$OfN|IoDUYnLBWzf*DcfYIM4(Hirs>==I*Y+eCQoAwS{^G;?vUNE=QnuSwn}<|Epo#JL?o+Y z$g7b@@jEf(ryA7pd2588TXY;>3`kMbr~@8bB_^Be&uAMn$L9urwz98`t7dM#s==&dVoi z*^Yic5wq?es7mxud~ZZ-7)=F9eC_#8v5+GgRKdQtU-rjx;J7E3#43S+9irn%=X!97RDSy+L7XW2qd7T;-Qy?a&`~@l3ze zjve5i42$$_T=k#=E1t)k*JQX8W4MnshF&+HR^OOH(wuWHUXz;Q2*}@LA;5RICWKpk zt~54v+>8Ivn$pDoqI}UEzfM!|-B(-vr){$iyA$J*Gn)HFWT!_2-wbP#96x<#s_LL()*sy|S2)F1g8Mf*fbnpDz__qv69X(Eh*=Y6X z&E}jNGcr+~-_bXt-Um6w9fozU@9++KcuF(IvMx{+bqezi`8Z$U{)aswAKiMUzk5d` zmaT7KfS8#?EK}=n6Di=9`+cLqkl!g?R59*MLlnrwpWia5kEr>IYaM-TgdhDuycAmx zFDl~gi48J6Ji?f-Qpsb1vc1fvB8)(}_?Y*5kN})dyJ6Cwnd=1J64!t%(xnSjrO(kf z2npo2|7MILtuz1SKD#P_Zuj=&la~0PIMECU)cWT9c${p;Xyd5QWJ*cox%j!6_d~|X z2}9)hE8Q2H(_%`mo7O`_5v6#Uyp81}ZkGd$HwZn2wY(|c`6oD;AAd8na^!cF)*z?B zkZeC1RGExS{ts;C{!RD)K#)|I3Z{oC2?DQxkiWu!#*KLCNS#qo3H2X}<+XKADvQ5+ zNpDrolJa9sjod}ee;}6Uu2Yi^)6!|HKtEVE@oO`RM5G5QA2dRG`@|RqeUXAnHB8qp zfrRa}NSUAHDR&WTn;gn!2pY5aosZ|CnH++|@=w0V^8|Q3G3?`Jl;xgB8ZYF}PteTR z@#vsDF{Zg?g7L)`PQT$V$z!;WXs{Oc>7xB8g{(Mj4;bFHajA2@uQ&iUf$k~SQ26f{ h3xC{-7yK7=Z`)8pMe6% {{ title }} - HabitTracker +