Django 1.7 done

coco/api.py

@@ -6,7 +6,7 @@
 from tastypie.authentication import SessionAuthentication
 from tastypie.authorization import Authorization
 from tastypie.exceptions import NotFound
-from tastypie.resources import ModelResource, NOT_AVAILABLE
+from tastypie.resources import ModelResource
 from tastypie.validation import FormValidation
 
 from activities.models import Screening, PersonAdoptPractice, PersonMeetingAttendance

coco/data_log.py

@@ -81,7 +81,7 @@ def send_updated_log(request):
             rows = rows | ServerLog.objects.filter(timestamp__gte = timestamp, village__in = villages)
         if rows:
             data = serializers.serialize('json', rows, fields=('action','entry_table','model_id', 'timestamp'))
-            return HttpResponse(data, mimetype="application/json")
+            return HttpResponse(data, content_type="application/json")
     return HttpResponse("0")
 
 def get_latest_timestamp():

coco/migrations/0001_initial.py

@@ -1,72 +1,66 @@
 # -*- 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 'FullDownloadStats'
-        db.create_table('coco_fulldownloadstats', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
-            ('start_time', self.gf('django.db.models.fields.DateTimeField')()),
-            ('end_time', self.gf('django.db.models.fields.DateTimeField')()),
-        ))
-        db.send_create_signal('coco', ['FullDownloadStats'])
+from __future__ import unicode_literals
 
+from django.db import models, migrations
+from django.conf import settings
+import datetime
 
-    def backwards(self, orm):
-        # Deleting model 'FullDownloadStats'
-        db.delete_table('coco_fulldownloadstats')
 
+class Migration(migrations.Migration):
 
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'coco.fulldownloadstats': {
-            'Meta': {'object_name': 'FullDownloadStats'},
-            'end_time': ('django.db.models.fields.DateTimeField', [], {}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'start_time': ('django.db.models.fields.DateTimeField', [], {}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        }
-    }
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('videos', '0001_initial'),
+        ('programs', '0001_initial'),
+        ('geographies', '0001_initial'),
+    ]
 
-    complete_apps = ['coco']
+    operations = [
+        migrations.CreateModel(
+            name='CocoUser',
+            fields=[
+                ('time_created', models.DateTimeField(auto_now_add=True, null=True)),
+                ('time_modified', models.DateTimeField(auto_now=True, null=True)),
+                ('id', models.AutoField(serialize=False, primary_key=True)),
+                ('old_coco_id', models.IntegerField(null=True, editable=False)),
+                ('partner', models.ForeignKey(to='programs.Partner')),
+                ('user', models.OneToOneField(related_name='coco_user', to=settings.AUTH_USER_MODEL)),
+                ('user_created', models.ForeignKey(related_name='coco_cocouser_created', blank=True, editable=False, to=settings.AUTH_USER_MODEL, null=True)),
+                ('user_modified', models.ForeignKey(related_name='coco_cocouser_related_modified', blank=True, editable=False, to=settings.AUTH_USER_MODEL, null=True)),
+                ('videos', models.ManyToManyField(to='videos.Video')),
+                ('villages', models.ManyToManyField(to='geographies.Village')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='FullDownloadStats',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('start_time', models.DateTimeField()),
+                ('end_time', models.DateTimeField()),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='ServerLog',
+            fields=[
+                ('id', models.AutoField(serialize=False, primary_key=True)),
+                ('timestamp', models.DateTimeField(default=datetime.datetime.utcnow)),
+                ('village', models.IntegerField(null=True)),
+                ('action', models.IntegerField()),
+                ('entry_table', models.CharField(max_length=100)),
+                ('model_id', models.IntegerField(null=True)),
+                ('partner', models.IntegerField(null=True)),
+                ('user', models.ForeignKey(related_name='serverlog_user', to=settings.AUTH_USER_MODEL, null=True)),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+    ]

communications/migrations/0001_initial.py

@@ -1,42 +1,44 @@
 # -*- 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 'Article'
-        db.create_table('communications_article', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('title', self.gf('django.db.models.fields.CharField')(max_length=500)),
-            ('pub_date', self.gf('django.db.models.fields.DateField')()),
-            ('source', self.gf('django.db.models.fields.CharField')(max_length=300)),
-            ('location', self.gf('django.db.models.fields.CharField')(max_length=200)),
-            ('content', self.gf('django.db.models.fields.TextField')()),
-            ('link', self.gf('django.db.models.fields.URLField')(max_length=1000)),
-        ))
-        db.send_create_signal('communications', ['Article'])
-
-
-    def backwards(self, orm):
-        # Deleting model 'Article'
-        db.delete_table('communications_article')
+from __future__ import unicode_literals
 
+from django.db import models, migrations
+import datetime
 
-    models = {
-        'communications.article': {
-            'Meta': {'object_name': 'Article'},
-            'content': ('django.db.models.fields.TextField', [], {}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'link': ('django.db.models.fields.URLField', [], {'max_length': '1000'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'pub_date': ('django.db.models.fields.DateField', [], {}),
-            'source': ('django.db.models.fields.CharField', [], {'max_length': '300'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '500'})
-        }
-    }
 
-    complete_apps = ['communications']
+class Migration(migrations.Migration):
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Article',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('title', models.CharField(max_length=500)),
+                ('pub_date', models.DateField(verbose_name=b'Date Published on')),
+                ('source', models.CharField(max_length=300)),
+                ('location', models.CharField(max_length=200)),
+                ('content', models.TextField()),
+                ('link', models.URLField(max_length=1000)),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='Feedback',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('rating', models.IntegerField(default=5)),
+                ('comments', models.CharField(max_length=1000)),
+                ('email', models.EmailField(max_length=254)),
+                ('date', models.DateField(default=datetime.datetime(2016, 7, 5, 18, 14, 20, 354000))),
+                ('time', models.DateTimeField(default=datetime.datetime.utcnow)),
+            ],
+            options={
+                'verbose_name_plural': 'Feedback',
+            },
+            bases=(models.Model,),
+        ),
+    ]

communications/models.py

@@ -16,7 +16,7 @@ class Feedback(models.Model):
     rating = models.IntegerField(default=5)
     comments = models.CharField(max_length=1000)
     email = models.EmailField(max_length=254)
-    date = models.DateField(default=lambda : datetime.datetime.utcnow().date())
+    date = models.DateField(default=datetime.datetime.today())
     time = models.DateTimeField(default=datetime.datetime.utcnow)
 
     class Meta:

data_upload/migrations/0001_initial.py

@@ -1,32 +1,28 @@
 # -*- coding: utf-8 -*-
-from south.utils import datetime_utils as 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 'Document'
-        db.create_table(u'data_upload_document', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('docfile', self.gf('django.db.models.fields.files.FileField')(max_length=100)),
-        ))
-        db.send_create_signal(u'data_upload', ['Document'])
-
-
-    def backwards(self, orm):
-        # Deleting model 'Document'
-        db.delete_table(u'data_upload_document')
-
-
-    models = {
-        u'data_upload.document': {
-            'Meta': {'object_name': 'Document'},
-            'docfile': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        }
-    }
-
-    complete_apps = ['data_upload']
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import datetime
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Document',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('docfile', models.FileField(upload_to=b'documents')),
+                ('upload_DateTime', models.DateTimeField(default=datetime.datetime(2016, 7, 5, 12, 44, 20, 372000))),
+                ('user_id', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+    ]

data_upload/views.py

@@ -154,7 +154,7 @@ def handle_zip_download(request):
     zip_file.close() 
 
     resp = HttpResponse(buffer.getvalue(), 
-                        mimetype = "application/x-zip-compressed")
+                        content_type = "application/x-zip-compressed")
     resp['Content-Disposition'] = 'attachment; filename=%s' % zip_filename
     return resp
 

dg/base_settings.py

@@ -135,7 +135,7 @@
     #'debug_toolbar',
     'output',
     'django.contrib.humanize',
-    'south',
+    #'south',
     'farmerbook',
     'fbconnect',
     'dimagi',

dg/feedback_view.py

@@ -8,7 +8,6 @@
 from django.http import *
 from django.shortcuts import render_to_response
 from django.template import RequestContext
-from django.utils import simplejson
 from django.views.decorators.csrf import csrf_exempt
 
 @csrf_exempt