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
Nathan R Lapierre
advisor
Commits
62d11db1
Commit
62d11db1
authored
Feb 01, 2014
by
Daniel W Bond
Browse files
the database now can load
parent
f5373ef8
Changes
2
Hide whitespace changes
Inline
Side-by-side
advisor/trajectories/models.py
View file @
62d11db1
...
...
@@ -29,9 +29,9 @@ class Course(BaseModel):
# catalog year for the course
catalogYear
=
models
.
DateField
()
def
isUpperClass
:
def
isUpperClass
(
coursenumber
)
:
if
courseNumber
>
300
:
return
True
:
return
True
else
:
return
False
...
...
@@ -77,9 +77,6 @@ class Program(BaseModel):
name
=
models
.
CharField
(
max_length
=
150
)
# programSlug = models.SlugField(max_length = 50, unique = True)
# major or minor or gened
programType
=
models
.
CharField
(
max_length
=
25
)
# courseCollections
courseReqs
=
models
.
ManyToManyField
(
'CourseCollection'
,)
...
...
@@ -88,6 +85,9 @@ class Program(BaseModel):
# CHECK VIEWS, MAKE SURE I DIDN'T ALREADY SOMEHOW ACCOUNT FOR THIS
degreeType
=
models
.
ManyToManyField
(
'Program'
,
null
=
True
)
# major or minor or gened
programType
=
models
.
CharField
(
max_length
=
25
)
# catalog year for the Program
catalogYear
=
models
.
DateField
()
...
...
@@ -110,11 +110,10 @@ class Student(models.Model):
user
=
models
.
OneToOneField
(
User
)
# does User have a slug field?
alreadyTaken
=
models
.
ManyToManyField
(
'Course'
,
null
=
True
)
# all of the student's trajectories
trajectory
=
models
.
ManyToManyField
(
'Trajectory'
,
null
=
True
)
# a big ol' list of courses the student has already completed
completedCourses
=
models
.
ManyToManyField
(
'Course'
,
null
=
True
)
# aka username, etc should all be here
...
...
advisor/trajectories/templates/new.html
View file @
62d11db1
...
...
@@ -15,7 +15,8 @@ GMU Advisor
</div>
</div>
<p><h4>
Select the classes you've already taken, and follow the instructions to start visualizing your way to completing your degree.
</h4></p>
<p><h4>
Select the classes you've already taken, and follow the instructions to
start visualizing your way to completing your degree.
</h4></p>
<div
class=
"row well"
>
<div
class=
"col-md-12"
>
...
...
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