Added courses app

academe/settings.py

@@ -43,6 +43,7 @@ INSTALLED_APPS = [
     'reviews',
     'profs',
 	'accounts',
+    'courses',
 ]
 
 MIDDLEWARE = [

academe/urls.py

@@ -23,6 +23,8 @@ from reviews import views as reviews_views
 
 from profs import views as profs_views
 
+from courses import views as courses_views
+
 from academe import views as academe_views
 
 urlpatterns = [
@@ -37,4 +39,6 @@ urlpatterns = [
     url(r'reviews/$', reviews_views.index, name="reviews_index"),
     url(r'^prof/$', profs_views.index, name="profs_index"),
     url(r'^prof/(?P<prof_id>[0-9]+)/$', profs_views.getProf, name="profs_getProf"),
+    url(r'^course/$', courses_views.index, name="courses_index"),
+    # url(r'^course/(?P<course_id>[0-9]+)/$', courses_views.getCourse, name="courses_getCourse"),
 ]

courses/admin.py

+from django.contrib import admin
+from .models import Course
+
+admin.site.register(Course)
\ No newline at end of file

courses/apps.py

+from django.apps import AppConfig
+
+
+class CoursesConfig(AppConfig):
+    name = 'courses'

courses/models.py

+from django.db import models
+
+from profs.models import Prof
+
+class Course(models.Model):
+	name = models.CharField(max_length = 20, unique = True)
+	prof = models.ManyToManyField(Prof)
+
+	def __str__ (self):
+		return self.name
\ No newline at end of file

courses/templates/courses/index.html

+{% extends 'templates/base.html' %}
+{% block content %}
+<center><h1>Courses</h1></center>
+<!-- Create the table rows -->
+{% for course in courses %} 
+	<ul style="text-align: center; list-style: none; padding: 0">
+		<li><a href="">{{ course.name }}</a></li>
+	</ul>
+{% endfor %}
+
+<!-- Form for making a new review -->
+<h1>New Review</h1>
+<form method="POST">
+	{% csrf_token %}
+	<p>{{ review_form.message }}</p>d
+    <p>{{ review_form.rating }}</p>
+    <p>{{ review_form.prof }}</p>
+	<button type="submit">Save</button>
+</form>
+
+{% endblock %}
\ No newline at end of file

courses/tests.py

+from django.test import TestCase
+
+# Create your tests here.

courses/views.py

+from django.shortcuts import render, redirect
+from django.urls import reverse
+from profs.models import Prof
+from profs.forms import ProfForm
+from .models import Course
+from django.contrib import messages 
+from django.contrib.auth.models import User
+
+from reviews.models import Review
+from reviews.forms import ReviewForm
+from django.contrib.auth.decorators import login_required
+
+def index(request):
+	"""Show all the courses"""
+	courses = Course.objects.all()
+	return render(request, 'courses/index.html', {'courses': courses})

profs/migrations/0001_initial.py

 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-11-16 10:04
+# Generated by Django 1.11.5 on 2017-11-30 06:35
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -13,13 +13,6 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.CreateModel(
-            name='Course',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=20, unique=True)),
-            ],
-        ),
         migrations.CreateModel(
             name='Prof',
             fields=[
@@ -28,9 +21,4 @@ class Migration(migrations.Migration):
                 ('last_name', models.CharField(max_length=20)),
             ],
         ),
-        migrations.AddField(
-            model_name='course',
-            name='prof',
-            field=models.ManyToManyField(to='profs.Prof'),
-        ),
     ]

profs/models.py

@@ -8,9 +8,3 @@ class Prof(models.Model):
 	def __str__ (self):
 		return self.first_name + " " + self.last_name
 
-class Course(models.Model):
-	name = models.CharField(max_length = 20, unique = True)
-	prof = models.ManyToManyField(Prof)
-
-	def __str__ (self):
-		return self.name

profs/templates/profs/prof.html

@@ -44,6 +44,7 @@
     {% csrf_token %}
     <p>{{ review_form.message }}</p>
     <p>{{ review_form.rating }}</p>
+    <p>{{ review_form.course }}</p>
     <button type="submit" class="btn btn-default">Submit Review</button>
   </form>
 </div>

profs/views.py

 from django.shortcuts import render, redirect
 from django.urls import reverse
-from profs.models import Prof, Course
+from profs.models import Prof
+from courses.models import Course
 from profs.forms import ProfForm
 from django.contrib import messages 
 from django.contrib.auth.models import User
@@ -50,7 +51,6 @@ def getProf(request, prof_id):
 			messages.error(request, "Error")
 			return render(request, 'profs/prof.html')
 	prof = Prof.objects.get(pk=prof_id)
-	# prof_course = Course.objects.filter(prof__id = prof_id)
 	reviews = Review.objects.filter(prof = prof)
 	return render(request, 'profs/prof.html', {'review_form': ReviewForm, 'prof': prof, 'reviews': reviews})
 	# return redirect(reverse('homepage'))

reviews/forms.py

 from django.forms import ModelForm, CharField, TextInput
 from reviews.models import Review
+from profs.models import Prof
+from courses.models import Course
 
-# Make a custom widget for rating so it can only be 0 - 5
 from django.forms import widgets
 from django.utils.safestring import mark_safe
 
-# class RatingWidget(widgets.TextInput):
-	# def render(self, name, value, attrs=None):
-		# return mark_safe(u'''<span>USD</span>%s''' % (super(RatingWidget, self).render(name, value, attrs)))
-
 class ReviewForm(ModelForm):
-	# rating = CharField(label='Cost Price Per Unit', widget=RatingWidget, max_length=5)
 	rating = CharField(widget=TextInput(attrs={'type': 'number','value': 5, 'min': 0, 'max': 5}))
-	
+
 	class Meta:
 		model = Review
 		fields = ['message', 'rating', 'prof', 'course', 'user']
\ No newline at end of file

reviews/migrations/0001_initial.py

 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-11-16 10:04
+# Generated by Django 1.11.5 on 2017-11-30 06:35
 from __future__ import unicode_literals
 
 from django.conf import settings
@@ -15,6 +15,7 @@ class Migration(migrations.Migration):
     dependencies = [
         ('profs', '0001_initial'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('courses', '0001_initial'),
     ]
 
     operations = [
@@ -26,7 +27,7 @@ class Migration(migrations.Migration):
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(null=True)),
                 ('rating', models.IntegerField(default=5, validators=[django.core.validators.MaxValueValidator(5), django.core.validators.MinValueValidator(0)])),
-                ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reviews', to='profs.Course')),
+                ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reviews', to='courses.Course')),
                 ('prof', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reviews', to='profs.Prof')),
                 ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reviews', to=settings.AUTH_USER_MODEL)),
             ],

reviews/models.py

@@ -3,7 +3,8 @@ from django.core.validators import MaxValueValidator, MinValueValidator
 from django.contrib.auth.models import User
 
 # Import profs
-from profs.models import Prof, Course
+from profs.models import Prof
+from courses.models import Course
 
 # Create your models here.	
 class Review(models.Model):
@@ -16,7 +17,6 @@ class Review(models.Model):
 	)
 	prof = models.ForeignKey(Prof, related_name = 'reviews')
 	course = models.ForeignKey(Course, related_name = 'reviews')
-	# prof_course = models.ForeignKey(Course, related_name='reviews')
 	user = models.ForeignKey(User, related_name = 'reviews')
 	
 	def __str__ (self):

templates/base.html

@@ -16,6 +16,9 @@
                 <li class="nav-item">
                     <a class="nav-link" href="{% url 'profs_index' %}">Professors</a>
                 </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="{% url 'course_index' %}">Courses</a>
+                </li>
             </ul>
             <form class="form-inline">
                 <input type="text" class="form-control" placeholder="Search">