diff --git a/db.sqlite3 b/db.sqlite3 index 03652cb..fdb6422 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ 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 31d12d5..1265b7d 100644 Binary files a/test_browser/__pycache__/admin.cpython-39.pyc and b/test_browser/__pycache__/admin.cpython-39.pyc differ diff --git a/test_browser/__pycache__/models.cpython-39.pyc b/test_browser/__pycache__/models.cpython-39.pyc index ad4935a..faa40d3 100644 Binary files a/test_browser/__pycache__/models.cpython-39.pyc and b/test_browser/__pycache__/models.cpython-39.pyc differ diff --git a/test_browser/__pycache__/views.cpython-39.pyc b/test_browser/__pycache__/views.cpython-39.pyc index 68f931b..a5cbb17 100644 Binary files a/test_browser/__pycache__/views.cpython-39.pyc and b/test_browser/__pycache__/views.cpython-39.pyc differ diff --git a/test_browser/migrations/0017_delete_order.py b/test_browser/migrations/0017_delete_order.py new file mode 100644 index 0000000..ede749d --- /dev/null +++ b/test_browser/migrations/0017_delete_order.py @@ -0,0 +1,16 @@ +# Generated by Django 4.2.7 on 2023-12-15 11:53 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('test_browser', '0016_ticket_delete_adultticket_delete_freeticket_and_more'), + ] + + operations = [ + migrations.DeleteModel( + name='Order', + ), + ] diff --git a/test_browser/migrations/0018_order.py b/test_browser/migrations/0018_order.py new file mode 100644 index 0000000..cedbec3 --- /dev/null +++ b/test_browser/migrations/0018_order.py @@ -0,0 +1,25 @@ +# Generated by Django 4.2.7 on 2023-12-15 11:54 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('test_browser', '0017_delete_order'), + ] + + operations = [ + migrations.CreateModel( + name='Order', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=150)), + ('quantity0', models.PositiveIntegerField(default=0)), + ('quantity1', models.PositiveIntegerField(default=0)), + ('quantity2', models.PositiveIntegerField(default=0)), + ('total_price', models.DecimalField(decimal_places=1, max_digits=10)), + ('date', models.DateTimeField()), + ], + ), + ] diff --git a/test_browser/migrations/0019_alter_order_date.py b/test_browser/migrations/0019_alter_order_date.py new file mode 100644 index 0000000..d9af344 --- /dev/null +++ b/test_browser/migrations/0019_alter_order_date.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.7 on 2023-12-15 12:30 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('test_browser', '0018_order'), + ] + + operations = [ + migrations.AlterField( + model_name='order', + name='date', + field=models.DateTimeField(default=0), + ), + ] diff --git a/test_browser/migrations/__pycache__/0017_delete_order.cpython-39.pyc b/test_browser/migrations/__pycache__/0017_delete_order.cpython-39.pyc new file mode 100644 index 0000000..c474acc Binary files /dev/null and b/test_browser/migrations/__pycache__/0017_delete_order.cpython-39.pyc differ diff --git a/test_browser/migrations/__pycache__/0018_order.cpython-39.pyc b/test_browser/migrations/__pycache__/0018_order.cpython-39.pyc new file mode 100644 index 0000000..42d8603 Binary files /dev/null and b/test_browser/migrations/__pycache__/0018_order.cpython-39.pyc differ 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 0000000..43c3580 Binary files /dev/null and b/test_browser/migrations/__pycache__/0019_alter_order_date.cpython-39.pyc differ 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})