From 6de0c1a35578bf37a0482c366476cb4bca50bf98 Mon Sep 17 00:00:00 2001 From: Bryan Date: Mon, 6 Jan 2014 18:56:23 -0500 Subject: [PATCH] closes #253 by removing field, adds backend for #236, and nearly completes #68 --- karmaworld/apps/courses/forms.py | 4 +- ..._course_academic_year__add_field_course.py | 84 +++++++++++++++++++ karmaworld/apps/courses/models.py | 25 +++++- .../management/commands/import_ocw_json.py | 20 ++++- .../templates/courses/course_detail.html | 10 ++- .../templates/courses/course_list_entry.html | 2 +- 6 files changed, 134 insertions(+), 11 deletions(-) create mode 100644 karmaworld/apps/courses/migrations/0005_auto__add_department__del_field_course_academic_year__add_field_course.py diff --git a/karmaworld/apps/courses/forms.py b/karmaworld/apps/courses/forms.py index 7b18fe1..bde2cfc 100644 --- a/karmaworld/apps/courses/forms.py +++ b/karmaworld/apps/courses/forms.py @@ -9,6 +9,6 @@ from karmaworld.apps.courses.models import Course class CourseForm(ModelForm): class Meta: model = Course - fields = ('name', 'school', 'desc', 'url', 'instructor_name', \ - 'instructor_email') + fields = ('name', 'school', 'url', 'instructor_name', \ + 'instructor_email') diff --git a/karmaworld/apps/courses/migrations/0005_auto__add_department__del_field_course_academic_year__add_field_course.py b/karmaworld/apps/courses/migrations/0005_auto__add_department__del_field_course_academic_year__add_field_course.py new file mode 100644 index 0000000..433b562 --- /dev/null +++ b/karmaworld/apps/courses/migrations/0005_auto__add_department__del_field_course_academic_year__add_field_course.py @@ -0,0 +1,84 @@ +# -*- 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 'Department' + db.create_table('courses_department', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('name', self.gf('django.db.models.fields.CharField')(max_length=255)), + ('school', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['courses.School'])), + ('slug', self.gf('django.db.models.fields.SlugField')(max_length=150, null=True)), + ('url', self.gf('django.db.models.fields.URLField')(max_length=511, null=True, blank=True)), + )) + db.send_create_signal('courses', ['Department']) + + # Deleting field 'Course.academic_year' + db.delete_column('courses_course', 'academic_year') + + # Adding field 'Course.department' + db.add_column('courses_course', 'department', + self.gf('django.db.models.fields.related.ForeignKey')(to=orm['courses.Department'], null=True, blank=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting model 'Department' + db.delete_table('courses_department') + + # Adding field 'Course.academic_year' + db.add_column('courses_course', 'academic_year', + self.gf('django.db.models.fields.IntegerField')(default=2014, null=True, blank=True), + keep_default=False) + + # Deleting field 'Course.department' + db.delete_column('courses_course', 'department_id') + + + models = { + 'courses.course': { + 'Meta': {'ordering': "['-file_count', 'school', 'name']", 'unique_together': "(('school', 'name', 'instructor_name'),)", 'object_name': 'Course'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'department': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['courses.Department']", 'null': 'True', 'blank': 'True'}), + 'desc': ('django.db.models.fields.TextField', [], {'max_length': '511', 'null': 'True', 'blank': 'True'}), + 'file_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'flags': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'instructor_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), + 'instructor_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'school': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['courses.School']"}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '150', 'null': 'True'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'}), + 'url': ('django.db.models.fields.URLField', [], {'max_length': '511', 'null': 'True', 'blank': 'True'}) + }, + 'courses.department': { + 'Meta': {'object_name': 'Department'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'school': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['courses.School']"}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '150', 'null': 'True'}), + 'url': ('django.db.models.fields.URLField', [], {'max_length': '511', 'null': 'True', 'blank': 'True'}) + }, + 'courses.school': { + 'Meta': {'ordering': "['-file_count', '-priority', 'name']", 'object_name': 'School'}, + 'alias': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'facebook_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), + 'file_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'hashtag': ('django.db.models.fields.CharField', [], {'max_length': '16', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'location': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'priority': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '150', 'null': 'True'}), + 'url': ('django.db.models.fields.URLField', [], {'max_length': '511', 'blank': 'True'}), + 'usde_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) + } + } + + complete_apps = ['courses'] \ No newline at end of file diff --git a/karmaworld/apps/courses/models.py b/karmaworld/apps/courses/models.py index d18e7d6..f13ddb3 100644 --- a/karmaworld/apps/courses/models.py +++ b/karmaworld/apps/courses/models.py @@ -56,18 +56,37 @@ class School(models.Model): self.save() +class Department(models.Model): + """ Department within a School. """ + name = models.CharField(max_length=255) + school = models.ForeignKey(School) # Should this be optional ever? + slug = models.SlugField(max_length=150, null=True) + url = models.URLField(max_length=511, blank=True, null=True) + + def __unicode__(self): + return self.name + + def save(self, *args, **kwargs): + """ Save department and generate a slug if one doesn't exist """ + if not self.slug: + self.slug = defaultfilters.slugify(self.name) + super(Department, self).save(*args, **kwargs) + + class Course(models.Model): """ First class object that contains many notes.Note objects """ # Core metadata name = models.CharField(max_length=255) slug = models.SlugField(max_length=150, null=True) - school = models.ForeignKey(School) # Should this be optional ever? + # department should remove nullable when school gets yoinked + department = models.ForeignKey(Department, blank=True, null=True) + # school is an appendix: the kind that gets swollen and should be removed + # (vistigial) + school = models.ForeignKey(School) file_count = models.IntegerField(default=0) desc = models.TextField(max_length=511, blank=True, null=True) url = models.URLField(max_length=511, blank=True, null=True) - academic_year = models.IntegerField(blank=True, null=True, - default=datetime.datetime.now().year) instructor_name = models.CharField(max_length=255, blank=True, null=True) instructor_email = models.EmailField(blank=True, null=True) diff --git a/karmaworld/apps/notes/management/commands/import_ocw_json.py b/karmaworld/apps/notes/management/commands/import_ocw_json.py index 3113c72..89f30a4 100644 --- a/karmaworld/apps/notes/management/commands/import_ocw_json.py +++ b/karmaworld/apps/notes/management/commands/import_ocw_json.py @@ -10,6 +10,7 @@ from apps.notes.models import Note from apps.notes.gdrive import convert_raw_document from apps.courses.models import Course from apps.courses.models import School +from apps.courses.models import Department from apps.licenses.models import License from apps.document_upload.models import RawDocument from django.core.management.base import BaseCommand @@ -63,22 +64,33 @@ class Command(BaseCommand): with open(filename, 'r') as jsondata: # parse JSON into python parsed = json.load(jsondata) + + # find the department or create one. + dept_info = { + 'name': parsed['subject'], + 'school': dbschool, + 'url': parsed['departmentLink'], + } + dbdept = Department.objects.get_or_create(**dept_info)[0] + # process courses for course in parsed['courses']: - # Extract the course info course_info = { 'name': course['courseTitle'], 'instructor_name': course['professor'], 'school': dbschool, - # courseLink is "course-number-name-semester-year" - 'academic_year': \ - int(course['courseLink'].split('-')[-1]) } # Create or Find the Course object. dbcourse = Course.objects.get_or_create(**course_info)[0] + dbcourse.department = dbdept; + dbcourse.save() print "Course is in the database: {0}".format(dbcourse.name) + if 'noteLinks' not in course: + print "No Notes in course." + continue + # process notes for each course for note in course['noteLinks']: # Check to see if the Note is already uploaded. diff --git a/karmaworld/templates/courses/course_detail.html b/karmaworld/templates/courses/course_detail.html index 4722655..c5a1443 100644 --- a/karmaworld/templates/courses/course_detail.html +++ b/karmaworld/templates/courses/course_detail.html @@ -35,7 +35,15 @@
- {{ course.instructor_name }} // {{ course.school.name }} + {{ course.instructor_name }} {% if course.department %}// {{ course.department.name }}{% endif %} +
+
+
+ +
+
+
+ {{ course.school.name }}
diff --git a/karmaworld/templates/courses/course_list_entry.html b/karmaworld/templates/courses/course_list_entry.html index 5668ebb..36d2ed4 100644 --- a/karmaworld/templates/courses/course_list_entry.html +++ b/karmaworld/templates/courses/course_list_entry.html @@ -4,7 +4,7 @@ {{ course.file_count }} - {{ course.name }} + {% if course.department %}{{course.department.name}}: {% endif %}{{ course.name }}
-- 2.25.1