From d197b99e763d5e470b1c781e584a7fc2d331937b Mon Sep 17 00:00:00 2001 From: Senad Uka Date: Thu, 6 Jul 2023 06:22:18 +0200 Subject: [PATCH] Add support for ordering --- .../__pycache__/settings.cpython-310.pyc | Bin 2847 -> 2975 bytes .../core/__pycache__/models.cpython-310.pyc | Bin 1514 -> 1561 bytes .../core/__pycache__/views.cpython-310.pyc | Bin 1739 -> 1760 bytes CTOAsYouGo/core/models.py | 5 ++++- .../core/templates/core/how_it_works.html | 2 +- .../currency_filters.cpython-310.pyc | Bin 486 -> 492 bytes CTOAsYouGo/core/views.py | 2 +- CTOAsYouGo/db.sqlite3 | Bin 147456 -> 151552 bytes 8 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CTOAsYouGo/CTOAsYouGo/__pycache__/settings.cpython-310.pyc b/CTOAsYouGo/CTOAsYouGo/__pycache__/settings.cpython-310.pyc index 759b27a7920447848cff7e597729beb4655f4a5b..1f2a7e2de4b193d8d44dfeb0e0db090a952a505c 100644 GIT binary patch delta 476 zcmXX@O;6iE5cO;}X6@J^AtZq~;iK&Zr9I|cIoK_zV8hx`>40RZ8aEAxfCA#$-++AR z1&J1^H*UFc=&^sGQV;YW^iuU+m97yxnt8kLy_q@eW#h7GAKA94sq^#Z3;j5^JMizk z+xw6f4vjMnO)6q3HBTOsj@D44nJYkBp-@;>XegXb%}I|;tSC>FN;pTkQ>WZlzJd|Z z>;)eJ)~JH>${SEM<)7-GwGm)rY*3ZvQb9FGqxlP#b5y6Wq1x)yysr!Qb#Vkkj!kOe z0y(&-mbFwms0GFqM+yL~tElY!it9=iLU3%+uDPWQ_}Y~ zrN16$Z;hwfN8_vBRo^k`X8R`f-l;3sEK7iZO2K4Y=LHUeiK4K0iGvEpI0L3QcE|tn LJ6_@0FSGX_%2ssJ delta 356 zcmXYsJx>Bb5Qca5_U`tMJviXtfa9YkBz9Cr;}J|OYy@pKCN@LJQ9wdLVWEFPvMmWp zVsCOkz|P**PD?v`6I_Us%seym=1peS;kxY2JkKRM!k1^PExiVOFFW0P>7XgyF+pns zGNWm03Qex*p(C@nQ%&4yVgm`Fw_;|E=X5g|Bm@C{}&gHvvD!7`Llpuj2JvR}4k JzN;pg?jK}0Q5OIJ diff --git a/CTOAsYouGo/core/__pycache__/models.cpython-310.pyc b/CTOAsYouGo/core/__pycache__/models.cpython-310.pyc index 965405036e0f7222c6618c2c1ef78ec840bc118d..60114d491ea8821121768feea24300503c040143 100644 GIT binary patch delta 448 zcmZ{fy-ve06oum?ZbK9ICzSG6+DafG60jjvst{9|03nDNxsq#DtU-xlVge^nOa75uLvG*G3j26yKpi znQ0?~7HCoG3N`4=jWVdx(wX9zViRrE9h4O*8~T$lb*0v$Nf-(j^-xtjpz~%$Iwz_` z0bN_JpIq*EUXpUpJ9cV9Rd*2)UG>D(X>gHdcElKE)C;0v%*TEj#8HN0P8sL6wBXgh zsKFJ3w>$|H4aGtRvgNi^OT4LHn49uhylPjgL<+tDC^DH>!}FkWhec2tU|w5Q{QX-o4zCaZE=X(s3St$UEhXz Yd=yg_=0D@m@GEPcx+Y%mil#NJZy7mQod5s; delta 363 zcmbQq^NO1{pO=@50SNAAEJ+EQ$a|16Wa4>Okp(;p8KQVoSX0P)U+v}WX+yoE80k!LbDlN2NWWHlyJM()WmOaYTOF$o(L2>{J1;zK3)L0ncK0m8)~ zNe%`cMh-?HAmo_D{EhP#drE3rVrfpvI4b zqFvA%%%&cpb*sK(SuXk(KfeFD{yDGeyQ;dX8W#B5+I+MIeHE$;TzJAMJct%pVqd%k zPwEPmWXWA{;9lAj3}wexT(oTTMaN=gSj&Y*(mcLGiMJb~A4L1&(r$Yg<$5Tf#@cWY zh=B%}U{A_C`+%}G#dE0rBF@TU2GZ&8=dsAD_6nbK6VF4~nk+BMG}PbfFM*4b#V5&p49%}azFAxNNEm?ta~LIkpjtAq&? zT>3HAQwmVz2g^c|y(sxo>Yu7;!|j-kXLej{wl}C?noweT;K)eOH%%}I#ZiXvw`%l@ IvwooP1z#dSQURjB@)usDEI*GH70J{sR@#_3i4CE3^7KG3l}bpnZ&g$ zT;Kz+^#Oc?CMLdvu3R}6q7Y~C<=ozLZ_mt!@n#r-Vd#=LFB8w+L)ReLc~LOwlsw5@ z>6$Rwkv!tb9a1H?bWd{VF5e_}hL-Dfpu+0NVFdj1w%=lai+U2o`5igXbYc=P`Ky}d zioEU`q6hImB!mj1tWs{)E`xSVRG+edPQc=aa$gDMs>f5bNG!fZuQq1Ut{ex@aFU>k z0&paxCq4_chR-U27piAaZ8C^pH^skberFCP-Uk*CX#{5Osep092rIX0rK$(G9+m|5 zV@>~}^n0JNxZGEY#O9C6jWvztl)yJB3@0<(Ru{K%-qAS{B#4r=86+{jZMPM4p yBgX%AuNH_aUM@qD{9VnNlm87#ZAP2IkE?u5J912v7Q#ljgAQV}bf6Nvuem>iVPaGO diff --git a/CTOAsYouGo/core/models.py b/CTOAsYouGo/core/models.py index 7b16de4..ad6b48a 100644 --- a/CTOAsYouGo/core/models.py +++ b/CTOAsYouGo/core/models.py @@ -2,12 +2,15 @@ from django.db import models from django.core.validators import MinValueValidator, MaxValueValidator import uuid + class Task(models.Model): title = models.CharField(max_length=255) description = models.TextField() price_from = models.IntegerField(validators=[MinValueValidator(0)]) price_to = models.IntegerField(validators=[MinValueValidator(0)]) - needed_information = models.JSONField() + + needed_information = models.JSONField(default=dict) + order = models.IntegerField(null=True) def __str__(self): return self.title diff --git a/CTOAsYouGo/core/templates/core/how_it_works.html b/CTOAsYouGo/core/templates/core/how_it_works.html index 22313cf..ba0a342 100644 --- a/CTOAsYouGo/core/templates/core/how_it_works.html +++ b/CTOAsYouGo/core/templates/core/how_it_works.html @@ -3,7 +3,7 @@ {% block content %}
-

How does it function?

+

How does it work?

It's straightforward!

    diff --git a/CTOAsYouGo/core/templatetags/__pycache__/currency_filters.cpython-310.pyc b/CTOAsYouGo/core/templatetags/__pycache__/currency_filters.cpython-310.pyc index 6cb9a1e6ed650b9d642fa04201b1b4bee56eefbb..8cb26db9bb80a1a82d18c11204883d0606808e9f 100644 GIT binary patch delta 35 ncmaFH{Dzq~pO=@50SGcLEKRvLk#{9$DTw>1X^q0how|$wzaR@R delta 29 jcmaFE{EV45pO=@50SH`57Ny*t$h(rcid|*neqBZYd>aU# diff --git a/CTOAsYouGo/core/views.py b/CTOAsYouGo/core/views.py index 852b064..30edf39 100644 --- a/CTOAsYouGo/core/views.py +++ b/CTOAsYouGo/core/views.py @@ -5,7 +5,7 @@ from django.http import HttpResponseRedirect from django.urls import reverse def home(request): - tasks = Task.objects.all() + tasks = Task.objects.order_by('order','id') return render(request, 'core/home.html', {'tasks': tasks}) def thankyou(request): diff --git a/CTOAsYouGo/db.sqlite3 b/CTOAsYouGo/db.sqlite3 index d0abb001cb370db89ac9ec0bb90f1095f01a519f..583b68d1e478606215c5f94026a1a0b96cb3b1ee 100644 GIT binary patch delta 651 zcmZutO=uHQ5PtKvdE4D&vsD@*2Ai}PCAG0HP5(?#Nkb07s6ZVig!JDw4f)?DhPrHw<{D1KKLFp-wfY3GnI-^*%VfN zhhhk!poLxwU?I6S5QSJP^GxPE;!>0E3Sn`nRXrz8Pk9{3GoQ#6OB$s#s+85`1*KS; z)k=z5C|kcx=$baG%_@0)u2@=B%lV={M2DhbIu@p*0XiI`(O6{UG>y>l;qms)(W?%} zC;5du*{Tl7-STtP4Z60XD0?Qh9%*IO5yPewJ_pTt*TLNUg6}T5mksAij=LN}Y_HfvSaX>+Gerdd^@pu~BckKnCMl#_ercj8&{GJmL&%CpNB}o|nwnY!1|8F0QJ| z*il}Rn3R*6oL`h0U)17i%nlaxMG{OcEKMygfhb7bu9d>5#x(t7GNUC|Q-Be>xV$`L zOa65JBt~&Y#p&uvj7O$RrZVO*X>x65e86n5on-;zpLlj&{v-xAHm0rYOh4@bArf8W