-
Notifications
You must be signed in to change notification settings - Fork 3.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #676 from edx/diana/course-modes
Add Course Modes to LMS
- Loading branch information
Showing
8 changed files
with
155 additions
and
0 deletions.
There are no files selected for viewing
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
from ratelimitbackend import admin | ||
from course_modes.models import CourseMode | ||
|
||
admin.site.register(CourseMode) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
# -*- coding: utf-8 -*- | ||
import datetime | ||
from south.db import db | ||
from south.v2 import SchemaMigration | ||
from django.db import models | ||
|
||
|
||
class Migration(SchemaMigration): | ||
|
||
def forwards(self, orm): | ||
# Adding model 'CourseMode' | ||
db.create_table('course_modes_coursemode', ( | ||
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), | ||
('course_id', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)), | ||
('mode_slug', self.gf('django.db.models.fields.CharField')(max_length=100)), | ||
('mode_display_name', self.gf('django.db.models.fields.CharField')(max_length=255)), | ||
('min_price', self.gf('django.db.models.fields.IntegerField')(default=0)), | ||
('suggested_prices', self.gf('django.db.models.fields.CommaSeparatedIntegerField')(default='', max_length=255, blank=True)), | ||
)) | ||
db.send_create_signal('course_modes', ['CourseMode']) | ||
|
||
|
||
def backwards(self, orm): | ||
# Deleting model 'CourseMode' | ||
db.delete_table('course_modes_coursemode') | ||
|
||
|
||
models = { | ||
'course_modes.coursemode': { | ||
'Meta': {'object_name': 'CourseMode'}, | ||
'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), | ||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
'min_price': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
'mode_display_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
'mode_slug': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
'suggested_prices': ('django.db.models.fields.CommaSeparatedIntegerField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}) | ||
} | ||
} | ||
|
||
complete_apps = ['course_modes'] |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
""" | ||
Add and create new modes for running courses on this particular LMS | ||
""" | ||
from django.db import models | ||
from collections import namedtuple | ||
from django.utils.translation import ugettext as _ | ||
|
||
Mode = namedtuple('Mode', ['slug', 'name', 'min_price', 'suggested_prices']) | ||
|
||
|
||
class CourseMode(models.Model): | ||
""" | ||
We would like to offer a course in a variety of modes. | ||
""" | ||
# the course that this mode is attached to | ||
course_id = models.CharField(max_length=255, db_index=True) | ||
|
||
# the reference to this mode that can be used by Enrollments to generate | ||
# similar behavior for the same slug across courses | ||
mode_slug = models.CharField(max_length=100) | ||
|
||
# The 'pretty' name that can be translated and displayed | ||
mode_display_name = models.CharField(max_length=255) | ||
|
||
# minimum price in USD that we would like to charge for this mode of the course | ||
min_price = models.IntegerField(default=0) | ||
|
||
# the suggested prices for this mode | ||
suggested_prices = models.CommaSeparatedIntegerField(max_length=255, blank=True, default='') | ||
|
||
DEFAULT_MODE = Mode('honor', _('Honor Code Certificate'), 0, '') | ||
|
||
@classmethod | ||
def modes_for_course(cls, course_id): | ||
""" | ||
Returns a list of the modes for a given course id | ||
If no modes have been set in the table, returns the default mode | ||
""" | ||
found_course_modes = cls.objects.filter(course_id=course_id) | ||
modes = ([Mode(mode.mode_slug, mode.mode_display_name, mode.min_price, mode.suggested_prices) | ||
for mode in found_course_modes]) | ||
if not modes: | ||
modes = [cls.DEFAULT_MODE] | ||
return modes |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
""" | ||
This file demonstrates writing tests using the unittest module. These will pass | ||
when you run "manage.py test". | ||
Replace this with more appropriate tests for your application. | ||
""" | ||
|
||
from django.test import TestCase | ||
from course_modes.models import CourseMode, Mode | ||
|
||
|
||
class CourseModeModelTest(TestCase): | ||
""" | ||
Tests for the CourseMode model | ||
""" | ||
|
||
def setUp(self): | ||
self.course_id = 'TestCourse' | ||
CourseMode.objects.all().delete() | ||
|
||
def create_mode(self, mode_slug, mode_name, min_price=0, suggested_prices=''): | ||
""" | ||
Create a new course mode | ||
""" | ||
CourseMode.objects.get_or_create( | ||
course_id=self.course_id, | ||
mode_display_name=mode_name, | ||
mode_slug=mode_slug, | ||
min_price=min_price, | ||
suggested_prices=suggested_prices | ||
) | ||
|
||
def test_modes_for_course_empty(self): | ||
""" | ||
If we can't find any modes, we should get back the default mode | ||
""" | ||
# shouldn't be able to find a corresponding course | ||
modes = CourseMode.modes_for_course(self.course_id) | ||
self.assertEqual([CourseMode.DEFAULT_MODE], modes) | ||
|
||
def test_nodes_for_course_single(self): | ||
""" | ||
Find the modes for a course with only one mode | ||
""" | ||
|
||
self.create_mode('verified', 'Verified Certificate') | ||
modes = CourseMode.modes_for_course(self.course_id) | ||
self.assertEqual([Mode(u'verified', u'Verified Certificate', 0, '')], modes) | ||
|
||
def test_modes_for_course_multiple(self): | ||
""" | ||
Finding the modes when there's multiple modes | ||
""" | ||
mode1 = Mode(u'honor', u'Honor Code Certificate', 0, '') | ||
mode2 = Mode(u'verified', u'Verified Certificate', 0, '') | ||
set_modes = [mode1, mode2] | ||
for mode in set_modes: | ||
self.create_mode(mode.slug, mode.name, mode.min_price, mode.suggested_prices) | ||
|
||
modes = CourseMode.modes_for_course(self.course_id) | ||
self.assertEqual(modes, set_modes) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
# Create your views here. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters