Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
roomlist
Commits
9c7f2759
Commit
9c7f2759
authored
Feb 09, 2015
by
Daniel W Bond
Browse files
added floor object
parent
44ac6dff
Changes
1
Hide whitespace changes
Inline
Side-by-side
roomlist/housing/models.py
View file @
9c7f2759
...
...
@@ -2,7 +2,7 @@ from django.db import models
from
autoslug
import
AutoSlugField
from
model_utils.models
import
TimeStampedModel
from
localflavor.us.models
import
USStateField
#
from localflavor.us.models import USStateField
class
Building
(
TimeStampedModel
):
name
=
models
.
CharField
(
max_length
=
100
)
...
...
@@ -28,7 +28,7 @@ class Building(TimeStampedModel):
CAMPUS_CHOICES
=
(
(
NONE
,
'None'
),
(
PRINCE_WILLIAM
,
'Prince William'
),
(
MASONVALE
,
'
mv
'
),
(
MASONVALE
,
'
MasonVale
'
),
(
FAIRFAX
,
'Fairfax'
),
)
...
...
@@ -41,10 +41,16 @@ class Building(TimeStampedModel):
def
__unicode__
(
self
):
# __unicode__ on Python 2
return
unicode
(
self
.
name
)
class
Floor
(
TimeStampedModel
):
building
=
models
.
ForeignKey
(
'Building'
)
number
=
models
.
IntegerField
()
def
__str__
(
self
):
# __unicode__ on Python 2
return
self
.
building
.
__str__
()
+
" "
+
self
.
number
.
__str__
()
class
Room
(
TimeStampedModel
):
number
=
models
.
IntegerField
()
floor
=
models
.
IntegerField
()
building
=
models
.
ForeignKey
(
'Building'
)
floor
=
models
.
ForeignKey
(
'Floor'
)
slug
=
AutoSlugField
(
populate_from
=
'number'
,
unique
=
True
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment