Skip to content

Add VendingMachine Model #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arzdev wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add VendingMachine Model #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6276dac
Made changes
Feb 13, 2019
a0e808c
Merge branch 'master' of https://github.com/eceusc/project-vending-ma…
Feb 13, 2019
9161e59
Added a new VendingMachine model
Feb 13, 2019
46f60e6
Updated the VendingMachine model (removed max_length from id)
Feb 13, 2019
7ec2637
remove file1.txt
arzdev Feb 13, 2019
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.env
.idea
1 change: 0 additions & 1 deletion web_server/Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ python-dotenv = "*"
pygithub = "*"

[requires]
python_version = "3.5"
6 changes: 6 additions & 0 deletions web_server/web_server/models/VendingMachine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.db import models


class VendingMachine(models.Model):
id = models.IntegerField(primary_key=True)
last_online = models.DateTimeField()
1 change: 1 addition & 0 deletions web_server/web_server/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
from .Doggo import Doggo
from .Owner import Owner
from .VendingMachine import VendingMachine
1 change: 0 additions & 1 deletion web_server/web_server/wsgi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@
from django.core.wsgi import get_wsgi_application

os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'web_server.settings')

application = get_wsgi_application()