Alan D6 kind of finished

.Python

@@ -0,0 +1 @@
+/usr/local/Cellar/python3/3.4.3/Frameworks/Python.framework/Versions/3.4/Python

.envrc

@@ -0,0 +1 @@
+layout python3

.gitignore

@@ -1,3 +1,4 @@
+venv/
 # Created by https://www.gitignore.io
 
 ### Python ###
@@ -60,5 +61,31 @@ docs/_build/
 target/
 
 data/
+ml-1m/
+.DS_Store
+.direnv/
+movieratings/fixtures/
+
+*.sqlite
+*.sqlite3
+*.sqlite3.old
+db.sqlite3
+
+fixtures/*
+*.pyc
+**/*.pyc
+**/*.*.pyc
+**/*.*.*.pyc
+/**/*.pyc
+Rater/__pycache__/models.cpython-34.pyc
+.DS_Store
+Rater/__pycache__/*
+*/__pycache__/
+
+
+movieratings/__pycache__/
+lib/
+Rater/__pycache__/
+*.zip
 *.sqlite
 *.sqlite3

Procfile

@@ -0,0 +1 @@
+web: gunicorn movieratings.wsgi --log-file -

README.md

@@ -4,6 +4,17 @@
 
 Create an interface in Django to the [MovieLens dataset][movielens].
 
+## File Structure
+
+The Rater class was created as its own app, with most of the files there.
+The top-level is movingratings, which is on a different level from the
+original repository.
+
+A live version on heroku can be found at:
+
+https://nameless-mountain-9760.herokuapp.com/index.html
+
+
 ## Learning Objectives
 
 After completing this assignment, you should be able to:

Rater/admin.py

@@ -0,0 +1,17 @@
+from django.contrib import admin
+from .models import Movie, Rating, Rater
+
+
+class MovieAdmin(admin.ModelAdmin):
+    list_display = ['__str__', 'release_date', 'total_ratings', "avg_rating"]
+
+class RatingAdmin(admin.ModelAdmin):
+    list_display = ['__str__', 'rating']
+
+class RaterAdmin(admin.ModelAdmin):
+    list_display = ['__str__', 'age', 'gender', 'rating_count']
+
+# Register your models here.
+admin.site.register(Movie, MovieAdmin)
+admin.site.register(Rater, RaterAdmin)
+admin.site.register(Rating, RatingAdmin)

Rater/forms.py

@@ -0,0 +1,26 @@
+from django import forms
+from django.contrib.auth.models import User
+from Rater.models import Rater, Rating
+# Profile
+
+class UserForm(forms.ModelForm):
+    password = forms.CharField(widget=forms.PasswordInput())
+
+    class Meta:
+        model = User
+        fields = ('username', 'email', 'password',)
+
+class RaterForm(forms.ModelForm):
+    class Meta:
+        model = Rater
+        fields = ('age', 'gender', 'occupation', 'zip_code',)
+
+class RatingForm(forms.ModelForm):
+    class Meta:
+        model = Rating
+        fields = ('rating', 'review',)
+
+class LoginForm(forms.ModelForm):
+    class Meta:
+        model = User
+        fields = ('username', 'password')

Rater/migrations/0001_initial.py

@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Genre',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('text', models.CharField(default='', max_length=300)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Movie',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(default='unknown', max_length=200)),
+                ('release_date', models.IntegerField(default=1990)),
+                ('genre', models.ManyToManyField(to='Rater.Genre')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Rater',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('age', models.IntegerField(default=0)),
+                ('gender', models.CharField(default='M', max_length=1, choices=[('M', 'Male'), ('F', 'Female')])),
+                ('occupation', models.IntegerField(default=0, choices=[(0, 'other'), (1, 'academic/educator'), (2, 'artist'), (3, 'clerical/admin'), (4, 'college/grad student'), (5, 'customer service'), (6, 'doctor/health care'), (7, 'executive/managerial'), (8, 'farmer'), (9, 'homemaker'), (10, 'K-12 student'), (11, 'lawyer'), (12, 'programmer'), (13, 'retired'), (14, 'sales/marketing'), (15, 'scientist'), (16, 'self-employed'), (17, 'technician/engineer'), (18, 'tradesman/craftsman'), (19, 'unemployed'), (20, 'writer')])),
+                ('zip_code', models.CharField(default='00000', max_length=10)),
+                ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL, null=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Rating',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('posted', models.IntegerField(default=0)),
+                ('rating', models.IntegerField(default=1, choices=[(1, '*'), (2, '**'), (3, '***'), (4, '****'), (5, '*****')])),
+                ('movie', models.ForeignKey(default=1, to='Rater.Movie')),
+                ('rater', models.ForeignKey(default=1, to='Rater.Rater')),
+            ],
+        ),
+    ]

Rater/migrations/0002_auto_20150615_2021.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Rater', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='rating',
+            name='review',
+            field=models.TextField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='rater',
+            name='occupation',
+            field=models.IntegerField(choices=[(0, 'other'), (1, 'academic/educator'), (2, 'artist'), (3, 'clerical/admin'), (4, 'college/grad student'), (5, 'customer service'), (6, 'doctor/health care'), (7, 'executive/managerial'), (8, 'farmer'), (9, 'homemaker'), (10, 'K-12 student'), (11, 'lawyer'), (12, 'programmer'), (13, 'retired'), (14, 'sales/marketing'), (15, 'scientist'), (16, 'self-employed'), (17, 'technician/engineer'), (18, 'tradesman/craftsman'), (19, 'unemployed'), (20, 'writer')]),
+        ),
+    ]

Rater/migrations/0003_auto_20150615_2023.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Rater', '0002_auto_20150615_2021'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='rater',
+            name='zip_code',
+            field=models.CharField(max_length=10),
+        ),
+    ]

Rater/migrations/0004_movie_avg_save.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Rater', '0003_auto_20150615_2023'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='movie',
+            name='avg_save',
+            field=models.FloatField(null=True),
+        ),
+    ]

Rater/migrations/0005_auto_20150617_2019.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Rater', '0004_movie_avg_save'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='genre',
+            name='Nmovies_save',
+            field=models.IntegerField(null=True),
+        ),
+        migrations.AddField(
+            model_name='genre',
+            name='Nratings_save',
+            field=models.IntegerField(null=True),
+        ),
+    ]

Rater/migrations/0006_movie_total_save.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Rater', '0005_auto_20150617_2019'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='movie',
+            name='total_save',
+            field=models.IntegerField(null=True),
+        ),
+    ]