Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .idea/dataSources.local.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions .idea/dataSources.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/libraries/R_User_Library.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 27 additions & 0 deletions .idea/project3.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

665 changes: 665 additions & 0 deletions .idea/workspace.xml

Large diffs are not rendered by default.

80 changes: 80 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,83 @@
# Project 3

Web Programming with Python and JavaScript

# Created by Sergey L. Sundukovskiy

<h3>File Content</h3>

<h4>forms.py</h4>

Contains definition of all the forms (RegisterForm, LoginForm, ToppingsForm)

<h4>db.sqlite3</h4>

Contains database for the entire assignment

<h4>admin.py</h4>

Contains registration of all the model object with django admin and
custom definition for OrderAdmin. To allow admin (sergey) with password (galaug01) to
see all the orders that have been placed and modify order status. It fulfills
Viewing Orders and Personal Touch requirement of the assignment allowing site
administrators to mark orders as complete. It also fulfills Adding Items
requirement of the assignment

<h4>models.py</h4>

Contains contains definition and relationship between model objects representing
(Pizza, Toppings, Order, Salad, Dinner Plate, Pasta )

<h4>urls.py</h4>

Contains contains definition of all the applications routes

<h4>views.py</h4>

Contains contains main code of the application. Among many other things it fulfills
Logout requirement of the assignment

<h4>login.html</h4>

Contains a Login form. It fulfills Login requirement of the assignment

<h4>register.html</h4>

Contains a Registration form. It fulfills Registration requirement of the assignment

<h4>index.html</h4>

Contains html and python code for displaying Restaurant Menu. It fulfills
Menu requirement of the assignment

<h4>visitor.html</h4>

Contains html and python code for displaying navigation menu of the application

<h4>cart.html</h4>

Contains html and python code for displaying and adding items added to cart. It fulfills
Shopping Cart requirement of the assignment

<h4>order.html</h4>

Contains html and python code for placing orders. It fulfills Placing an Order
requirement of the assignment

<h4>order_list.html</h4>

Contains html and python code for displaying placed orders for a particular user.
It fulfills Personal Touch requirement of the assignment, allowing site administrators
to mark orders as complete and allowing users to see the status of their pending
or completed orders

<h3>Short Description</h3>

Initial project implementation only handled placing orders containing
Pizza and Pizza Toppings. Subsequent implementation added support for placing orders for
Dinner Plates, Salads and Pastas

<h4>Special Pizza requires 5 toppings</h4>

<h4>Admin username is 'sergey' password 'galaug01'</h4>

Binary file modified db.sqlite3
Binary file not shown.
Binary file added orders/__pycache__/__init__.cpython-36.pyc
Binary file not shown.
Binary file added orders/__pycache__/admin.cpython-36.pyc
Binary file not shown.
Binary file added orders/__pycache__/apps.cpython-36.pyc
Binary file not shown.
Binary file added orders/__pycache__/forms.cpython-36.pyc
Binary file not shown.
Binary file added orders/__pycache__/models.cpython-36.pyc
Binary file not shown.
Binary file added orders/__pycache__/urls.cpython-36.pyc
Binary file not shown.
Binary file added orders/__pycache__/views.cpython-36.pyc
Binary file not shown.
23 changes: 23 additions & 0 deletions orders/admin.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
from django.contrib import admin

# Register your models here.

from orders.models import Size, Topping, Pizza, Pizza_Type, Option, Order, Pizza_Assembly, Pasta, Item, Salad, Dinner_Plate_Type

admin.site.register(Pizza_Type)
admin.site.register(Size)
admin.site.register(Topping)
admin.site.register(Pizza)
admin.site.register(Option)
admin.site.register(Pasta)
admin.site.register(Item)
admin.site.register(Salad)
admin.site.register(Pizza_Assembly)
admin.site.register(Dinner_Plate_Type)

class OrderAdmin(admin.ModelAdmin):

list_display = ['id', 'customer', 'is_complete', 'is_paid', 'update_date', 'total']
list_editable = ['is_complete']

admin.site.register(Order,OrderAdmin)



36 changes: 36 additions & 0 deletions orders/forms.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
from django import forms
from .models import Topping
from django.contrib.auth.models import User

class RegisterForm(forms.ModelForm):

username = forms.CharField(widget=forms.TextInput())
password = forms.CharField(widget=forms.PasswordInput)
first_name = forms.CharField(required=True, widget=forms.TextInput())
last_name = forms.CharField(required=True, widget=forms.TextInput())
email = forms.EmailField(required=True,widget=forms.TextInput())

class Meta:
model = User
fields = ['username', 'password', 'first_name', 'last_name', 'email']

class LoginForm(forms.Form):


username = forms.CharField(widget=forms.TextInput(attrs={'placeholder': 'Username'}))
password = forms.CharField(widget=forms.PasswordInput(attrs={'placeholder': 'Password'}))

class Meta:
model = User
fields = ['username', 'password']


class ToppingsForm(forms.ModelForm):

all_toppings = [(topping.description) for topping in Topping.objects.all()]

toppings = forms.MultipleChoiceField(choices=all_toppings, widget=forms.CheckboxSelectMultiple())

class Meta:
model = Topping
fields = ['description']
102 changes: 102 additions & 0 deletions orders/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
# Generated by Django 2.0.3 on 2018-04-06 04:39

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

initial = True

dependencies = [
]

operations = [
migrations.CreateModel(
name='Customer',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=24)),
],
),
migrations.CreateModel(
name='Option',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('description', models.CharField(max_length=24)),
],
),
migrations.CreateModel(
name='Order',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('date', models.DateField()),
('is_complete', models.BooleanField(default=False)),
('total', models.DecimalField(decimal_places=2, default=0.0, max_digits=4)),
('customer', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='orders.Customer')),
],
),
migrations.CreateModel(
name='Pizza',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('cost', models.DecimalField(decimal_places=2, default=0.0, max_digits=4)),
('option', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='orders.Option')),
],
),
migrations.CreateModel(
name='Pizza_Type',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('description', models.CharField(max_length=24)),
],
),
migrations.CreateModel(
name='Price',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('price', models.DecimalField(decimal_places=2, default=0.0, max_digits=4)),
('option', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='orders.Option')),
('pizza_type', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='orders.Pizza_Type')),
],
),
migrations.CreateModel(
name='Size',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('description', models.CharField(max_length=5)),
],
),
migrations.CreateModel(
name='Topping',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('description', models.CharField(max_length=24)),
],
),
migrations.AddField(
model_name='price',
name='size',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='orders.Size'),
),
migrations.AddField(
model_name='pizza',
name='size',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='orders.Size'),
),
migrations.AddField(
model_name='pizza',
name='toppings',
field=models.ManyToManyField(to='orders.Topping'),
),
migrations.AddField(
model_name='pizza',
name='type',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='orders.Pizza_Type'),
),
migrations.AddField(
model_name='order',
name='pizzas',
field=models.ManyToManyField(to='orders.Pizza'),
),
]
23 changes: 23 additions & 0 deletions orders/migrations/0002_auto_20180405_2210.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 2.0.3 on 2018-04-06 05:10

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('orders', '0001_initial'),
]

operations = [
migrations.AlterField(
model_name='order',
name='customer',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
),
migrations.DeleteModel(
name='Customer',
),
]
22 changes: 22 additions & 0 deletions orders/migrations/0003_auto_20180407_1105.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Generated by Django 2.0.3 on 2018-04-07 18:05

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('orders', '0002_auto_20180405_2210'),
]

operations = [
migrations.RemoveField(
model_name='option',
name='description',
),
migrations.AddField(
model_name='option',
name='number_of_topings',
field=models.IntegerField(default=0),
),
]
Loading