From 73e55643751b9ee9e5398655e750370aecf78edf Mon Sep 17 00:00:00 2001 From: denisvandyshev Date: Fri, 15 Dec 2023 16:23:21 +0300 Subject: [PATCH] date added --- db.sqlite3 | Bin 172032 -> 180224 bytes templates/check_choice.html | 4 +- templates/tickets.html | 64 ++++++++++++------ test_browser/__pycache__/admin.cpython-39.pyc | Bin 330 -> 330 bytes .../__pycache__/models.cpython-39.pyc | Bin 1213 -> 1289 bytes test_browser/__pycache__/views.cpython-39.pyc | Bin 1358 -> 1446 bytes test_browser/migrations/0017_delete_order.py | 16 +++++ test_browser/migrations/0018_order.py | 25 +++++++ .../migrations/0019_alter_order_date.py | 18 +++++ .../0017_delete_order.cpython-39.pyc | Bin 0 -> 567 bytes .../__pycache__/0018_order.cpython-39.pyc | Bin 0 -> 942 bytes .../0019_alter_order_date.cpython-39.pyc | Bin 0 -> 617 bytes test_browser/models.py | 6 +- test_browser/views.py | 6 +- 14 files changed, 113 insertions(+), 26 deletions(-) create mode 100644 test_browser/migrations/0017_delete_order.py create mode 100644 test_browser/migrations/0018_order.py create mode 100644 test_browser/migrations/0019_alter_order_date.py create mode 100644 test_browser/migrations/__pycache__/0017_delete_order.cpython-39.pyc create mode 100644 test_browser/migrations/__pycache__/0018_order.cpython-39.pyc create mode 100644 test_browser/migrations/__pycache__/0019_alter_order_date.cpython-39.pyc diff --git a/db.sqlite3 b/db.sqlite3 index 03652cb983a71faf3d5f6ca26329620f77b1c607..fdb642286e99d83c1c342702f7cc4d781664975f 100644 GIT binary patch delta 9380 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 diff --git a/templates/check_choice.html b/templates/check_choice.html index ef655fb..195fe6c 100644 --- a/templates/check_choice.html +++ b/templates/check_choice.html @@ -39,7 +39,7 @@
- +
@@ -75,7 +75,7 @@
Cледуйте инструкциям на терминале -

+

diff --git a/templates/tickets.html b/templates/tickets.html index 11e760e..804db22 100644 --- a/templates/tickets.html +++ b/templates/tickets.html @@ -1,7 +1,8 @@ {% load static %} - + @@ -38,11 +39,11 @@ + - + + @@ -52,13 +53,17 @@ - + + + + + + + + + @@ -66,19 +71,18 @@ - + + - - +
@@ -766,11 +769,6 @@ } - - - - - /* 本体と関係ないスタイル */ .container{ width : 100% ; @@ -785,5 +783,27 @@ margin-bottom : 80px ; } + .button { + background-color: #mediumseagreen; + -webkit-border-radius: 60px; + border-radius: 60px; + border: none; + color: #eeeeee; + cursor: pointer; + display: inline-block; + font-family: sans-serif; + font-size: 32px; + padding: 20px; + text-align: center; + text-decoration: none; + } + @keyframes glowing { + 0% { background-color: mediumseagreen; box-shadow: 0 0 5px #mediumseagreen; } + 50% { background-color: darkgreen; box-shadow: 0 0 20px #mediumseagreen; } + 100% { background-color: mediumseagreen; box-shadow: 0 0 5px #mediumseagreen; } + } + .button { + animation: glowing 1700ms infinite; + } \ No newline at end of file diff --git a/test_browser/__pycache__/admin.cpython-39.pyc b/test_browser/__pycache__/admin.cpython-39.pyc index 31d12d53e5d27c88f88d3c2bb9e1d8329ed78f53..1265b7d92f26fed5755b3b58199748afbc1bd638 100644 GIT binary patch delta 20 acmX@bbc%^Pk(ZZ?0SFWvYBqA)GXelEz61dP delta 20 acmX@bbc%^Pk(ZZ?0SLS=7H#CVX9NH<9|W@i diff --git a/test_browser/__pycache__/models.cpython-39.pyc b/test_browser/__pycache__/models.cpython-39.pyc index ad4935a056e78c6c143e30cbf0172d2a124a84d1..faa40d3fd71117792f42768999ce532417fe3f56 100644 GIT binary patch delta 573 zcmZ{g%Syvg5QcMdX;0EL+E%>RDkxF~S8fDRP_Y!eEEJI}l-N0FOWMe3-H0G!L0pK0 zJc(Puja%O!dlv;C!kH+j3v`RB#Fw;V5SChv-r8UQ*h4i?-PGw9HXAPZ%Kl z43*47gBGJlZEUJfj!=J;Fh-zca-2{gOhj+m%ykj3Zl)7-JpcGy)@vfpZg?HBkLyYD z$2wps|IJ^*|H-cHASnOW!7b>LdOH}9lLakYs;I;!G`!YnumC4gi>mtMf&NQ%gFqTo k8`}X0KiOnr^ebo*nbO95xf#HPFIH$rZQ7QtCP&ZnPZc8Xnl3#P~s}r zh7#98)+;!|2c#o)$;)HKJG{qm$SR?VInXLhE_du18L+}!U3aL^4S4wdXu z-rk%?6{>$RN2Z1_@FWC-SbKqZCF4ZCS5Z>9{Y&M%8qWDv^wHCEddl4)>c=75%6!9YUpoJ}BuocpPm-HsyJj8i{ zuR}DylLM(OEgs3h z(YBU`m3Fi;>}pqghCR)*^Z-t>_cu@&!3X%bMZ55Xr}VOx*pZ#ff@u3$%tR`3ryxKQ zg`e~Y1TxmM=3EaG?6W?&IA-lYnsk)hjz@DgxqrYHcGg)k;-(v=M5>^2x?S?Gpb{j| zfB%V_=<&vG&&(wxf}9p)1}Q{rMiUWZWYU%ke-a}_ A00000 delta 296 zcmZ3+eU6JSk(ZZ?0SI>RR;0dToyaG{7%)-WK#?VdwS^&yBZV!69Y}MgaHMboX|5Em z6mB5Rox(G*#cJaI&5WFriy3z?@=VrY(q^oi9KjSVkiy=}TFX|$wt#&h10zET$K=yY z9*nG$MVL({`!SmWHMB6RP2R~I;4TcbwO9^hHxm~l1gZdOrvGeA9E=={Oc3~|NCv1P znGvK83YdX3D-b&aak0YW02a~7l`IOvtVL`Aj zuiyn|3j~~GzRcf#JKx0hdX1o+w%*{867p@6UGp$$qpM>CPB=|TMng);E#VG#KL~e$ zPMmi)bhy_iLFotQNI*?38xLiy$0ApWE$y0%NgG`qApi*}C-|HWY3PDCDOuuAo0V6T zrrOzX1&;AGD9r{^yeg39qS-t-V|tuCgJv93(7<9oOZETKlLS~-;+(TgNHC>4$wA_( zULI%A4fafhF&i>wY7A$P#>PHlFS9sZcYF?0$T{T67?gBSfZ4w({_P0--_*nu*1Erl zJivYdzv=a5^ne?yh&SfA!$OT<9`zQzOxi)}q^OGaAA6C%kkS`&EFO!y~XmQ$HpH44j0e z&cI3efII9B0}k#N1}-`y_p>{2!8>97+JerqKDX^u#!48OXWG`&95B&Q;kr3|0y{MI zS2D;34zK|SCw2xddZSvA0PCX$c=Xhu4vo1tiM~VXiH~7|S!~X2>-|JzMw;1%aw=~Fa405;S-Lit%Pre6xe-Z7StDE& zpDc<#Qz<>bh?tNo5fSPt3&>a+Z9O2aeXe?R)YgX*6VONfu5E@Ty)d-xFr+?C5~Q^s zhQulIEDj2U1SNz{rL5jwkN@rOm@61pTT&QZfcARTzP&Z!*qzE0E7;D*czwBkGWCSQm*x-dz6jotz&e2SsmNfa&v6 z)jWsuHK%v|tT^r8{I7Rao;;!p(W+9c!&xa$sYvNulCM@zDWYw@tc2b!gwutdEABtQ CWfbNB literal 0 HcmV?d00001 diff --git a/test_browser/migrations/__pycache__/0019_alter_order_date.cpython-39.pyc b/test_browser/migrations/__pycache__/0019_alter_order_date.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..43c358040d5216413e114bc2c01844c3fc8dbe22 GIT binary patch literal 617 zcmYjO&1&2*5SA=?*K4v6NS~o#C`)>4O9?3r>8T-*^kNJ`@k};$ZEGWWH!SqlUV6xb z^p$k&DX$PH>Bw%$j?rh$5A)4@((`%B$o%Oy{K*;n9h_a0+Zsxd3^=viN~&Sr+-Ut(I2zmFb+Hv<9$oWk~JXgq&kK?iB&DoCC`v z;7gthlyw{ka8ge}LVV9*axW;8z?5hbKl}W@KauVA=z4W!&7DJ=r-z5H-zZ}Nt&hi_ z1l^;hC0WM(6!2QFn?4gXWtdELxI4K-GtiU z0j{tE?8*wAji|p*KQu&j8oF2!0`n8%zN}gtVm>u1{3pyWW)G-hfXCIxcf}VP-xaXf z=nl5-1~(m(QP$ev}=&qjs?Tn+mTI}OR_*~i-p>f)34qf$p< Kbr%HL7k>fmEva?@ literal 0 HcmV?d00001 diff --git a/test_browser/models.py b/test_browser/models.py index 7f14201..3f8c50c 100644 --- a/test_browser/models.py +++ b/test_browser/models.py @@ -1,4 +1,7 @@ +from datetime import timezone + from django.db import models + from django.contrib.auth.models import User from djangoZoo import settings @@ -15,10 +18,11 @@ class Ticket(models.Model): class Order(models.Model): name = models.CharField(max_length=150) - quantity0 = models.PositiveIntegerField(default=0) + quantity0 = models.PositiveIntegerField(default=0) quantity1 = models.PositiveIntegerField(default=0) quantity2 = models.PositiveIntegerField(default=0) total_price = models.DecimalField(max_digits=10, decimal_places=1) + date = models.DateTimeField(default=00000) diff --git a/test_browser/views.py b/test_browser/views.py index 141b0cb..536724e 100644 --- a/test_browser/views.py +++ b/test_browser/views.py @@ -2,6 +2,7 @@ from django.shortcuts import render, redirect from djangoZoo import settings from test_browser.models import Ticket, Order +import datetime # Create your views here. @@ -22,9 +23,10 @@ def check_choice(request): quantity0 = request.GET['ticket1'] quantity1 = request.GET['ticket2'] quantity2 = request.GET['ticket3'] + total_price = (all_Ticket[0].price * int(quantity0) + all_Ticket[1].price * int(quantity1)) element = Order(name = 'Order #', quantity0 = quantity0, quantity1 = quantity1, quantity2 = quantity2, - total_price = total_price) + total_price = total_price, date = datetime.datetime.now()) element.save() return render(request, 'check_choice.html', {'quantity1' : quantity0, 'quantity2' : quantity1, @@ -35,6 +37,8 @@ def check_choice(request): def QR(request): total_cost = Order.objects.last() total_price = total_cost.total_price + total_cost.date = datetime.datetime.now() + total_cost.save() return render(request, 'QR.html', {'total_price' : total_price})