upgrade base code dependencies fixes #74

pillbox-engine/compare/migrations/0001_initial.py

@@ -1,123 +1,127 @@
 # -*- coding: utf-8 -*-
+# Generated by Django 1.9.12 on 2017-02-28 21:30
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
 
+    initial = True
+
     dependencies = [
-        ('pillbox', '0003_auto_20141211_1532'),
-        ('spl', '0004_auto_20141212_1142'),
+        ('spl', '0001_initial'),
+        ('pillbox', '0001_initial'),
     ]
 
     operations = [
         migrations.CreateModel(
             name='Color',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('spl_value', models.CharField(max_length=200, verbose_name=b'SPL Value')),
-                ('pillbox_value', models.CharField(max_length=200, verbose_name=b'Pillbox Value')),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('spl_value', models.CharField(blank=True, max_length=200, null=True, verbose_name=b'SPL Value')),
+                ('pillbox_value', models.CharField(blank=True, max_length=200, null=True, verbose_name=b'Pillbox Value')),
+                ('verified', models.BooleanField(default=False, verbose_name=b'Verified?')),
                 ('is_different', models.BooleanField(default=False, verbose_name=b'Is Different?')),
-                ('reason', models.TextField(null=True, verbose_name=b'Reason', blank=True)),
+                ('reason', models.TextField(blank=True, null=True, verbose_name=b'Reason')),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
-                ('pillbox', models.ForeignKey(to='pillbox.PillBoxData')),
-                ('spl', models.ForeignKey(to='spl.Pill')),
+                ('pillbox', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='pillbox.PillBoxData')),
+                ('spl', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='spl.Pill')),
             ],
             options={
                 'abstract': False,
             },
-            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Image',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('spl_value', models.CharField(max_length=200, verbose_name=b'SPL Value')),
-                ('pillbox_value', models.CharField(max_length=200, verbose_name=b'Pillbox Value')),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('spl_value', models.CharField(blank=True, max_length=200, null=True, verbose_name=b'SPL Value')),
+                ('pillbox_value', models.CharField(blank=True, max_length=200, null=True, verbose_name=b'Pillbox Value')),
+                ('verified', models.BooleanField(default=False, verbose_name=b'Verified?')),
                 ('is_different', models.BooleanField(default=False, verbose_name=b'Is Different?')),
-                ('reason', models.TextField(null=True, verbose_name=b'Reason', blank=True)),
+                ('reason', models.TextField(blank=True, null=True, verbose_name=b'Reason')),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
-                ('pillbox', models.ForeignKey(to='pillbox.PillBoxData')),
-                ('spl', models.ForeignKey(to='spl.Pill')),
+                ('pillbox', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='pillbox.PillBoxData')),
+                ('spl', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='spl.Pill')),
             ],
             options={
                 'abstract': False,
             },
-            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Imprint',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('spl_value', models.CharField(max_length=200, verbose_name=b'SPL Value')),
-                ('pillbox_value', models.CharField(max_length=200, verbose_name=b'Pillbox Value')),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('spl_value', models.CharField(blank=True, max_length=200, null=True, verbose_name=b'SPL Value')),
+                ('pillbox_value', models.CharField(blank=True, max_length=200, null=True, verbose_name=b'Pillbox Value')),
+                ('verified', models.BooleanField(default=False, verbose_name=b'Verified?')),
                 ('is_different', models.BooleanField(default=False, verbose_name=b'Is Different?')),
-                ('reason', models.TextField(null=True, verbose_name=b'Reason', blank=True)),
+                ('reason', models.TextField(blank=True, null=True, verbose_name=b'Reason')),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
-                ('pillbox', models.ForeignKey(to='pillbox.PillBoxData')),
-                ('spl', models.ForeignKey(to='spl.Pill')),
+                ('pillbox', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='pillbox.PillBoxData')),
+                ('spl', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='spl.Pill')),
             ],
             options={
                 'abstract': False,
             },
-            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Score',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('spl_value', models.CharField(max_length=200, verbose_name=b'SPL Value')),
-                ('pillbox_value', models.CharField(max_length=200, verbose_name=b'Pillbox Value')),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('spl_value', models.CharField(blank=True, max_length=200, null=True, verbose_name=b'SPL Value')),
+                ('pillbox_value', models.CharField(blank=True, max_length=200, null=True, verbose_name=b'Pillbox Value')),
+                ('verified', models.BooleanField(default=False, verbose_name=b'Verified?')),
                 ('is_different', models.BooleanField(default=False, verbose_name=b'Is Different?')),
-                ('reason', models.TextField(null=True, verbose_name=b'Reason', blank=True)),
+                ('reason', models.TextField(blank=True, null=True, verbose_name=b'Reason')),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
-                ('pillbox', models.ForeignKey(to='pillbox.PillBoxData')),
-                ('spl', models.ForeignKey(to='spl.Pill')),
+                ('pillbox', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='pillbox.PillBoxData')),
+                ('spl', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='spl.Pill')),
             ],
             options={
                 'abstract': False,
             },
-            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Shape',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('spl_value', models.CharField(max_length=200, verbose_name=b'SPL Value')),
-                ('pillbox_value', models.CharField(max_length=200, verbose_name=b'Pillbox Value')),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('spl_value', models.CharField(blank=True, max_length=200, null=True, verbose_name=b'SPL Value')),
+                ('pillbox_value', models.CharField(blank=True, max_length=200, null=True, verbose_name=b'Pillbox Value')),
+                ('verified', models.BooleanField(default=False, verbose_name=b'Verified?')),
                 ('is_different', models.BooleanField(default=False, verbose_name=b'Is Different?')),
-                ('reason', models.TextField(null=True, verbose_name=b'Reason', blank=True)),
+                ('reason', models.TextField(blank=True, null=True, verbose_name=b'Reason')),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
-                ('pillbox', models.ForeignKey(to='pillbox.PillBoxData')),
-                ('spl', models.ForeignKey(to='spl.Pill')),
+                ('pillbox', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='pillbox.PillBoxData')),
+                ('spl', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='spl.Pill')),
             ],
             options={
                 'abstract': False,
             },
-            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Size',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('spl_value', models.CharField(max_length=200, verbose_name=b'SPL Value')),
-                ('pillbox_value', models.CharField(max_length=200, verbose_name=b'Pillbox Value')),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('spl_value', models.CharField(blank=True, max_length=200, null=True, verbose_name=b'SPL Value')),
+                ('pillbox_value', models.CharField(blank=True, max_length=200, null=True, verbose_name=b'Pillbox Value')),
+                ('verified', models.BooleanField(default=False, verbose_name=b'Verified?')),
                 ('is_different', models.BooleanField(default=False, verbose_name=b'Is Different?')),
-                ('reason', models.TextField(null=True, verbose_name=b'Reason', blank=True)),
+                ('reason', models.TextField(blank=True, null=True, verbose_name=b'Reason')),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
-                ('pillbox', models.ForeignKey(to='pillbox.PillBoxData')),
-                ('spl', models.ForeignKey(to='spl.Pill')),
+                ('pillbox', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='pillbox.PillBoxData')),
+                ('spl', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='spl.Pill')),
             ],
             options={
                 'abstract': False,
             },
-            bases=(models.Model,),
         ),
     ]

pillbox-engine/config/__init__.py

@@ -1,5 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import
-
-from .local import Local  # noqa
-from .production import Production  # noqa

pillbox-engine/config/local.py

@@ -6,33 +6,29 @@
 - Uses console backend for emails
 - Use Django Debug Toolbar
 '''
-from configurations import values
-from .common import Common
+import environ
+BASE_DIR = environ.Path(__file__) - 1  # (/a/myfile.py - 2 = /)
 
+from .common import *  # noqa
 
-class Local(Common):
 
-    # DEBUG
-    DEBUG = values.BooleanValue(True)
-    TEMPLATE_DEBUG = DEBUG
-    # END DEBUG
+# DEBUG
+DEBUG = env.bool('DEBUG', True)
+TEMPLATE_DEBUG = DEBUG
+# END DEBUG
 
-    # INSTALLED_APPS
-    INSTALLED_APPS = Common.INSTALLED_APPS
-    # END INSTALLED_APPS
+# django-debug-toolbar
+MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + ('debug_toolbar.middleware.DebugToolbarMiddleware',)
+INSTALLED_APPS += ('debug_toolbar',)
 
-    # django-debug-toolbar
-    MIDDLEWARE_CLASSES = Common.MIDDLEWARE_CLASSES + ('debug_toolbar.middleware.DebugToolbarMiddleware',)
-    INSTALLED_APPS += ('debug_toolbar',)
+INTERNAL_IPS = ('127.0.0.1',)
 
-    INTERNAL_IPS = ('127.0.0.1',)
+DEBUG_TOOLBAR_CONFIG = {
+    'DISABLE_PANELS': [
+        'debug_toolbar.panels.redirects.RedirectsPanel',
+    ],
+    'SHOW_TEMPLATE_CONTEXT': True,
+}
+# end django-debug-toolbar
 
-    DEBUG_TOOLBAR_CONFIG = {
-        'DISABLE_PANELS': [
-            'debug_toolbar.panels.redirects.RedirectsPanel',
-        ],
-        'SHOW_TEMPLATE_CONTEXT': True,
-    }
-    # end django-debug-toolbar
-
-    # Your local stuff: Below this line define 3rd party libary settings
+# Your local stuff: Below this line define 3rd party libary settings

pillbox-engine/config/production.py

@@ -2,30 +2,22 @@
 '''
 Production Configurations
 '''
-from configurations import values
+from .common import *  # noqa
 
 
-from .common import Common
+# INSTALLED_APPS
+# END INSTALLED_APPS
 
+# Mail settings
+EMAIL_HOST = "localhost"
+EMAIL_PORT = 1025
+EMAIL_BACKEND = env.str('EMAIL_BACKEND', 'django.core.mail.backends.console.EmailBackend')
+# End mail settings
 
-class Production(Common):
+# SITE CONFIGURATION
+# Hosts/domain names that are valid for this site
+# See https://docs.djangoproject.com/en/1.6/ref/settings/#allowed-hosts
+ALLOWED_HOSTS = ["*"]
+# END SITE CONFIGURATION
 
-    # INSTALLED_APPS
-    INSTALLED_APPS = Common.INSTALLED_APPS
-    # END INSTALLED_APPS
-
-    # Mail settings
-    EMAIL_HOST = "localhost"
-    EMAIL_PORT = 1025
-    EMAIL_BACKEND = values.Value('django.core.mail.backends.console.EmailBackend')
-    # End mail settings
-
-    # SITE CONFIGURATION
-    # Hosts/domain names that are valid for this site
-    # See https://docs.djangoproject.com/en/1.6/ref/settings/#allowed-hosts
-    ALLOWED_HOSTS = ["*"]
-    # END SITE CONFIGURATION
-
-    INSTALLED_APPS += ("gunicorn", )
-
-    # Your production stuff: Below this line define 3rd party libary settings
+INSTALLED_APPS += ("gunicorn", )

pillbox-engine/manage.py

@@ -3,9 +3,8 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config")
-    os.environ.setdefault("DJANGO_CONFIGURATION", "Local")
-
-    from configurations.management import execute_from_command_line
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.production")
+    from django.core.management import execute_from_command_line
 
+    # sys.path.insert(0, os.path.abspath('pillbox-engine'))
     execute_from_command_line(sys.argv)

pillbox-engine/pillbox/adminx.py

@@ -190,7 +190,7 @@ def pillbox_image(self, instance):
     list_filter = [PillboxFilter, 'new', 'updated', 'stale', 'has_image']
     list_quick_filter = ['new', 'updated', 'stale', 'has_image']
     search_fields = ['medicine_name', 'part_medicine_name', 'produce_code', 'setid', 'setid_product']
-    reversion_enable = True
+    # reversion_enable = True
 
     model_icon = 'fa fa-briefcase'
 

pillbox-engine/pillbox/migrations/0001_initial.py

@@ -1,89 +1,134 @@
 # -*- coding: utf-8 -*-
+# Generated by Django 1.9.12 on 2017-02-28 21:30
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
+    initial = True
+
     dependencies = [
     ]
 
     operations = [
+        migrations.CreateModel(
+            name='Color',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('display_name', models.CharField(max_length=250, verbose_name=b'SPL Display Name')),
+                ('code', models.CharField(max_length=250, verbose_name=b'SPL Code')),
+                ('hex_value', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'HEX Value')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Export',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('is_active', models.BooleanField(default=True, verbose_name=b'Enabled?')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('file_type', models.CharField(choices=[(b'json', b'JSON'), (b'csv', b'CSV'), (b'yaml', b'YAML'), (b'xml', b'XML')], max_length=200, verbose_name=b'File Type')),
+                ('file_name', models.CharField(max_length=200, verbose_name=b'File Name')),
+                ('export_file', models.FileField(blank=True, null=True, upload_to=b'export', verbose_name=b'Export File')),
+                ('completed', models.BooleanField(default=False, verbose_name=b'Completed?')),
+                ('task_id', models.CharField(blank=True, max_length=200, null=True, verbose_name=b'Task ID')),
+                ('status', models.CharField(blank=True, max_length=200, null=True, verbose_name=b'Status')),
+                ('duration', models.FloatField(blank=True, null=True, verbose_name=b'Duration (Sec.)')),
+            ],
+            options={
+                'verbose_name': 'Export',
+                'verbose_name_plural': 'Export',
+            },
+        ),
         migrations.CreateModel(
             name='Import',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('is_active', models.BooleanField(default=True, verbose_name=b'Enabled?')),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
-                ('file_name', models.CharField(max_length=200, null=True, verbose_name=b'File Name', blank=True)),
+                ('file_name', models.CharField(blank=True, max_length=200, null=True, verbose_name=b'File Name')),
                 ('csv_file', models.FileField(upload_to=b'csv', verbose_name=b'CSV File')),
                 ('completed', models.BooleanField(default=False, verbose_name=b'Completed?')),
-                ('added', models.IntegerField(null=True, verbose_name=b'Reocrds Added', blank=True)),
-                ('updated', models.IntegerField(null=True, verbose_name=b'Records Updated', blank=True)),
-                ('task_id', models.CharField(max_length=200, null=True, verbose_name=b'Task ID', blank=True)),
-                ('status', models.CharField(max_length=200, null=True, verbose_name=b'Status', blank=True)),
-                ('duration', models.FloatField(null=True, verbose_name=b'Duration (Sec.)', blank=True)),
+                ('added', models.IntegerField(blank=True, null=True, verbose_name=b'Reocrds Added')),
+                ('updated', models.IntegerField(blank=True, null=True, verbose_name=b'Records Updated')),
+                ('task_id', models.CharField(blank=True, max_length=200, null=True, verbose_name=b'Task ID')),
+                ('status', models.CharField(blank=True, max_length=200, null=True, verbose_name=b'Status')),
+                ('duration', models.FloatField(blank=True, null=True, verbose_name=b'Duration (Sec.)')),
             ],
             options={
                 'verbose_name': 'Data Import',
                 'verbose_name_plural': 'Data Import',
             },
-            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='PillBoxData',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('is_active', models.BooleanField(default=True, verbose_name=b'Enabled?')),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
-                ('setid', models.CharField(unique=True, max_length=250, verbose_name=b'setid')),
-                ('setid_product', models.CharField(max_length=250, verbose_name=b'setid_product')),
-                ('splsize', models.CharField(max_length=250, null=True, verbose_name=b'SPLSIZE', blank=True)),
-                ('splshape', models.CharField(max_length=250, null=True, verbose_name=b'SPLSHAPE', blank=True)),
-                ('splscore', models.CharField(max_length=250, null=True, verbose_name=b'SPLSCORE', blank=True)),
-                ('splimprint', models.CharField(max_length=250, null=True, verbose_name=b'SPLIMPRINT', blank=True)),
-                ('splcolor', models.CharField(max_length=250, null=True, verbose_name=b'SPLCOLOR', blank=True)),
-                ('spl_strength', models.TextField(null=True, verbose_name=b'SPL_STRENGTH', blank=True)),
-                ('spl_ingredients', models.TextField(null=True, verbose_name=b'SPL_INGREDIENTS', blank=True)),
-                ('spl_inactive_ing', models.TextField(null=True, verbose_name=b'SPL_INACTIVE_ING', blank=True)),
-                ('source', models.CharField(max_length=250, null=True, verbose_name=b'source', blank=True)),
-                ('rxtty', models.CharField(max_length=250, null=True, verbose_name=b'rxtty', blank=True)),
-                ('rxstring', models.TextField(null=True, verbose_name=b'rxttystring', blank=True)),
-                ('rxcui', models.CharField(max_length=250, null=True, verbose_name=b'rxcui', blank=True)),
-                ('produce_code', models.CharField(max_length=250, null=True, verbose_name=b'produce_code', blank=True)),
-                ('part_num', models.CharField(max_length=250, null=True, verbose_name=b'part_num', blank=True)),
-                ('part_medicine_name', models.CharField(max_length=250, null=True, verbose_name=b'part_medicine_name', blank=True)),
-                ('ndc9', models.CharField(max_length=250, null=True, verbose_name=b'ndc9', blank=True)),
-                ('medicine_name', models.CharField(max_length=250, null=True, verbose_name=b'medicine_name', blank=True)),
-                ('marketing_act_code', models.CharField(max_length=250, null=True, verbose_name=b'MARKETING_ACT_CODE', blank=True)),
-                ('effective_time', models.CharField(max_length=250, null=True, verbose_name=b'effective_time', blank=True)),
-                ('file_name', models.CharField(max_length=250, null=True, verbose_name=b'file_name', blank=True)),
-                ('equal_product_code', models.CharField(max_length=250, null=True, verbose_name=b'equal_product_code', blank=True)),
-                ('dosage_form', models.CharField(max_length=250, null=True, verbose_name=b'dosage_form', blank=True)),
-                ('document_type', models.CharField(max_length=250, null=True, verbose_name=b'document_type', blank=True)),
-                ('dea_schedule_code', models.CharField(max_length=250, null=True, verbose_name=b'DEA_SCHEDULE_CODE', blank=True)),
-                ('dea_schedule_name', models.CharField(max_length=250, null=True, verbose_name=b'DEA_SCHEDULE_NAME', blank=True)),
-                ('author_type', models.CharField(max_length=250, null=True, verbose_name=b'author_type', blank=True)),
-                ('author', models.CharField(max_length=250, null=True, verbose_name=b'author', blank=True)),
-                ('approval_code', models.CharField(max_length=250, null=True, verbose_name=b'approval_code', blank=True)),
-                ('image_source', models.CharField(max_length=250, null=True, verbose_name=b'Image Source', blank=True)),
-                ('image_id', models.CharField(max_length=250, null=True, verbose_name=b'MARKETING_ACT_CODE', blank=True)),
-                ('has_image', models.CharField(max_length=250, null=True, verbose_name=b'MARKETING_ACT_CODE', blank=True)),
-                ('from_sis', models.CharField(max_length=250, null=True, verbose_name=b'MARKETING_ACT_CODE', blank=True)),
-                ('version_number', models.CharField(max_length=250, null=True, verbose_name=b'MARKETING_ACT_CODE', blank=True)),
-                ('clinical_setid', models.CharField(max_length=250, null=True, verbose_name=b'MARKETING_ACT_CODE', blank=True)),
-                ('unii_code', models.CharField(max_length=250, null=True, verbose_name=b'MARKETING_ACT_CODE', blank=True)),
-                ('physical_characteristics', models.CharField(max_length=250, null=True, verbose_name=b'MARKETING_ACT_CODE', blank=True)),
-                ('laberer_code', models.CharField(max_length=250, null=True, verbose_name=b'MARKETING_ACT_CODE', blank=True)),
-                ('application_number', models.CharField(max_length=250, null=True, verbose_name=b'MARKETING_ACT_CODE', blank=True)),
+                ('setid', models.CharField(max_length=250, unique=True, verbose_name=b'spp')),
+                ('setid_product', models.CharField(max_length=250, verbose_name=b'setid')),
+                ('splsize', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'splsize')),
+                ('pillbox_size', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'pillbox_size')),
+                ('splshape', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'splshape')),
+                ('splshape_text', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'splshape_text')),
+                ('pillbox_shape_text', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'pillbox_shape_text')),
+                ('splscore', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'splscore')),
+                ('pillbox_score', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'pillbox_score')),
+                ('splimprint', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'splimprint')),
+                ('pillbox_imprint', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'pillbox_imprint')),
+                ('splcolor', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'splcolor')),
+                ('splcolor_text', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'splcolor_text')),
+                ('pillbox_color_text', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'pillbox_color_text')),
+                ('spl_strength', models.TextField(blank=True, null=True, verbose_name=b'spl_strength')),
+                ('spl_ingredients', models.TextField(blank=True, null=True, verbose_name=b'spl_ingredients')),
+                ('spl_inactive_ing', models.TextField(blank=True, null=True, verbose_name=b'spl_inactive_ing')),
+                ('source', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'source')),
+                ('rxtty', models.TextField(blank=True, null=True, verbose_name=b'rxtty')),
+                ('rxstring', models.TextField(blank=True, null=True, verbose_name=b'rxtty')),
+                ('rxcui', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'rxcui')),
+                ('produce_code', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'product_code')),
+                ('part_num', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'part_num')),
+                ('part_medicine_name', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'part_medicine_name')),
+                ('ndc9', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'ndc9')),
+                ('medicine_name', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'medicine_name')),
+                ('marketing_act_code', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'marketing_act_code')),
+                ('effective_time', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'effective_time')),
+                ('file_name', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'file_name')),
+                ('equal_product_code', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'equal_product_code')),
+                ('dosage_form', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'dosage_form')),
+                ('document_type', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'document_type')),
+                ('dea_schedule_code', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'dea_schedule_code')),
+                ('dea_schedule_name', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'dea_schedule_name')),
+                ('author_type', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'author_type')),
+                ('author', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'author')),
+                ('approval_code', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'approval_code')),
+                ('image_source', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'image_source')),
+                ('splimage', models.FileField(blank=True, max_length=250, null=True, upload_to=b'pillbox', verbose_name=b'splimage')),
+                ('has_image', models.BooleanField(default=False, verbose_name=b'has_image')),
+                ('from_sis', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'epc_match')),
+                ('version_number', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'version_number')),
+                ('laberer_code', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'laberer_code')),
+                ('application_number', models.CharField(blank=True, max_length=250, null=True, verbose_name=b'application_number')),
+                ('updated', models.BooleanField(default=False, verbose_name=b'updated')),
+                ('stale', models.BooleanField(default=False, verbose_name=b'stale')),
+                ('new', models.BooleanField(default=False, verbose_name=b'new')),
             ],
             options={
                 'verbose_name': 'Pillbox Data',
                 'verbose_name_plural': 'Pillbox Data',
             },
-            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='Shape',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('display_name', models.CharField(max_length=250, verbose_name=b'SPL Display Name')),
+                ('code', models.CharField(max_length=250, verbose_name=b'SPL Code')),
+            ],
         ),
     ]

pillbox-engine/pillbox/tasks.py

@@ -2,7 +2,7 @@
 import os
 import time
 from django.utils import timezone
-from _celery import app
+# from _celery import app
 
 from pillbox.models import Import, Export
 from pillbox.importer import importer
@@ -11,7 +11,7 @@
 from compare.sync import transfer_new, compare
 
 
-@app.task(bind=True, ignore_result=True)
+# @app.task(bind=True, ignore_result=True)
 def import_task(self, csv_file, task_id, download_id):
     start = time.time()
     task = Task.objects.get(pk=task_id)
@@ -40,7 +40,7 @@ def import_task(self, csv_file, task_id, download_id):
     imprt.save()
 
 
-@app.task(bind=True, ignore_result=True)
+# @app.task(bind=True, ignore_result=True)
 def export_task(self, filename, export_type, task_id, export_id):
     start = time.time()
     task = Task.objects.get(pk=task_id)
@@ -68,7 +68,7 @@ def export_task(self, filename, export_type, task_id, export_id):
     exprt.save()
 
 
-@app.task(bind=True, ignore_result=True)
+# @app.task(bind=True, ignore_result=True)
 def transfer_task(self, task_id, action):
     start = time.time()
     task = Task.objects.get(pk=task_id)

pillbox-engine/spl/adminx.py

@@ -23,7 +23,7 @@ class GlobalSetting(object):
 class SourceAdmin(object):
 
     search_fields = ['title']
-    reversion_enable = True
+    # reversion_enable = True
 
     list_display = ('title', 'host', 'path', 'files', 'last_downloaded')
     readonly_fields = ['last_downloaded', 'zip_size', 'unzip_size', 'xml_count']
@@ -38,7 +38,7 @@ class IngredientAdmin(object):
     list_filter = ['code_system', 'class_code']
     list_quick_filter = ['class_code']
     search_fields = ['name']
-    reversion_enable = True
+    # reversion_enable = True
 
     model_icon = 'fa fa-dot-circle-o'
 
@@ -57,7 +57,7 @@ def name(self, instance):
     list_filter = ['version_number', 'is_osdf', 'discontinued']
     list_quick_filter = ['is_osdf', 'source']
     search_fields = ['title', 'setid', 'author', 'author_legal', 'filename']
-    reversion_enable = True
+    # reversion_enable = True
 
     model_icon = 'fa fa-stethoscope'
 
@@ -78,7 +78,7 @@ class PillAdmin(object):
     list_filter = ['product_code', 'dosage_form']
     list_quick_filter = ['splcolor', 'splsize', 'splscore']
     search_fields = ['medicine_name', 'part_medicine_name', 'setid__setid']
-    reversion_enable = True
+    # reversion_enable = True
 
     model_icon = 'fa fa-medkit'
     list_per_page = 10

pillbox-engine/spl/migrations/0001_initial.py

@@ -1,140 +1,142 @@
 # -*- coding: utf-8 -*-
+# Generated by Django 1.9.12 on 2017-02-28 21:30
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
+import django.db.models.deletion
 import jsonfield.fields
 
 
 class Migration(migrations.Migration):
 
+    initial = True
+
     dependencies = [
     ]
 
     operations = [
         migrations.CreateModel(
             name='Ingredient',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('is_active', models.BooleanField(default=True, verbose_name=b'Enabled?')),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
-                ('spl_id', models.CharField(unique=True, max_length=100, verbose_name=b'Unii Code')),
-                ('code_system', models.CharField(max_length=200, null=True, verbose_name=b'Code System', blank=True)),
+                ('spl_id', models.CharField(max_length=100, unique=True, verbose_name=b'Unii Code')),
+                ('code_system', models.CharField(blank=True, max_length=200, null=True, verbose_name=b'Code System')),
                 ('name', models.CharField(max_length=300, verbose_name=b'Name')),
-                ('class_code', models.CharField(max_length=100, null=True, verbose_name=b'Class Code', blank=True)),
+                ('class_code', models.CharField(blank=True, max_length=100, null=True, verbose_name=b'Class Code')),
             ],
             options={
                 'verbose_name': 'OSDF Ingredient',
             },
-            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Pill',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('is_active', models.BooleanField(default=True, verbose_name=b'Enabled?')),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
-                ('ssp', models.CharField(unique=True, max_length=200, verbose_name=b'Pillbox Unique ID')),
+                ('ssp', models.CharField(max_length=200, unique=True, verbose_name=b'Pillbox Unique ID')),
                 ('dosage_form', models.CharField(max_length=20, verbose_name=b'Dosage Form')),
-                ('ndc', models.CharField(max_length=100, null=True, verbose_name=b'NDC9', blank=True)),
-                ('ndc9', models.CharField(max_length=100, null=True, verbose_name=b'NDC9', blank=True)),
-                ('product_code', models.CharField(max_length=60, null=True, verbose_name=b'Product Code', blank=True)),
-                ('equal_product_code', models.CharField(max_length=30, null=True, verbose_name=b'Equal Product Code', blank=True)),
-                ('approval_code', models.CharField(max_length=100, null=True, verbose_name=b'approval_code', blank=True)),
+                ('ndc', models.CharField(blank=True, max_length=100, null=True, verbose_name=b'NDC9')),
+                ('ndc9', models.CharField(blank=True, max_length=100, null=True, verbose_name=b'NDC9')),
+                ('product_code', models.CharField(blank=True, max_length=60, null=True, verbose_name=b'Product Code')),
+                ('produce_code', models.CharField(blank=True, max_length=60, null=True, verbose_name=b'Produce Code')),
+                ('equal_product_code', models.CharField(blank=True, max_length=30, null=True, verbose_name=b'Equal Product Code')),
+                ('approval_code', models.CharField(blank=True, max_length=100, null=True, verbose_name=b'approval_code')),
                 ('medicine_name', models.CharField(max_length=300, verbose_name=b'Medicine Name')),
                 ('part_num', models.IntegerField(default=0, verbose_name=b'Part Number')),
-                ('part_medicine_name', models.CharField(max_length=200, null=True, verbose_name=b'Part Medicine Name', blank=True)),
-                ('rxtty', models.CharField(max_length=100, null=True, verbose_name=b'rxtty', blank=True)),
-                ('rxstring', models.CharField(max_length=100, null=True, verbose_name=b'rxttystring', blank=True)),
-                ('rxcui', models.CharField(max_length=100, null=True, verbose_name=b'rxcui', blank=True)),
-                ('dea_schedule_code', models.CharField(max_length=100, null=True, verbose_name=b'DEA_SCHEDULE_CODE', blank=True)),
-                ('dea_schedule_name', models.CharField(max_length=100, null=True, verbose_name=b'DEA_SCHEDULE_NAME', blank=True)),
-                ('marketing_act_code', models.CharField(max_length=100, null=True, verbose_name=b'MARKETING_ACT_CODE', blank=True)),
-                ('splcolor', models.CharField(max_length=100, null=True, verbose_name=b'SPL Color', blank=True)),
-                ('splsize', models.CharField(max_length=100, null=True, verbose_name=b'SPL Size', blank=True)),
-                ('splshape', models.CharField(max_length=100, null=True, verbose_name=b'SPL Shape', blank=True)),
-                ('splimprint', models.CharField(max_length=100, null=True, verbose_name=b'SPL Imprint', blank=True)),
-                ('splimage', models.CharField(max_length=100, null=True, verbose_name=b'SPL Image', blank=True)),
-                ('splscore', models.CharField(max_length=100, null=True, verbose_name=b'SPL Score', blank=True)),
+                ('part_medicine_name', models.CharField(blank=True, max_length=200, null=True, verbose_name=b'Part Medicine Name')),
+                ('rxtty', models.TextField(blank=True, null=True, verbose_name=b'rxtty')),
+                ('rxstring', models.TextField(blank=True, null=True, verbose_name=b'rxttystring')),
+                ('rxcui', models.CharField(blank=True, max_length=100, null=True, verbose_name=b'rxcui')),
+                ('dea_schedule_code', models.CharField(blank=True, max_length=100, null=True, verbose_name=b'DEA_SCHEDULE_CODE')),
+                ('dea_schedule_name', models.CharField(blank=True, max_length=100, null=True, verbose_name=b'DEA_SCHEDULE_NAME')),
+                ('marketing_act_code', models.CharField(blank=True, max_length=100, null=True, verbose_name=b'MARKETING_ACT_CODE')),
+                ('splcolor', models.CharField(blank=True, max_length=100, null=True, verbose_name=b'SPL Color Code')),
+                ('splcolor_text', models.CharField(blank=True, max_length=100, null=True, verbose_name=b'SPL Color Display Name')),
+                ('splsize', models.CharField(blank=True, max_length=100, null=True, verbose_name=b'SPL Size')),
+                ('splshape', models.CharField(blank=True, max_length=100, null=True, verbose_name=b'SPL Shape Code')),
+                ('splshape_text', models.CharField(blank=True, max_length=100, null=True, verbose_name=b'SPL Shape Display Name')),
+                ('splimprint', models.CharField(blank=True, max_length=100, null=True, verbose_name=b'SPL Imprint')),
+                ('splimage', models.FileField(blank=True, null=True, upload_to=b'spl', verbose_name=b'SPL Image')),
+                ('splscore', models.CharField(blank=True, max_length=100, null=True, verbose_name=b'SPL Score')),
+                ('spl_strength', models.TextField(blank=True, null=True, verbose_name=b'SPL_STRENGTH')),
+                ('spl_ingredients', models.TextField(blank=True, null=True, verbose_name=b'SPL_INGREDIENTS')),
+                ('spl_inactive_ing', models.TextField(blank=True, null=True, verbose_name=b'SPL_INACTIVE_ING')),
             ],
             options={
                 'verbose_name': 'SPL OSDF Pill',
                 'verbose_name_plural': 'SPL OSDF Pills',
             },
-            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Product',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('is_active', models.BooleanField(default=True, verbose_name=b'Enabled?')),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
-                ('setid', models.CharField(unique=True, max_length=200, verbose_name=b'setid')),
+                ('setid', models.CharField(max_length=200, unique=True, verbose_name=b'setid')),
                 ('id_root', models.CharField(max_length=200, verbose_name=b'id root')),
-                ('title', models.TextField(null=True, verbose_name=b'Title', blank=True)),
+                ('title', models.TextField(blank=True, null=True, verbose_name=b'Title')),
                 ('effective_time', models.CharField(max_length=100, verbose_name=b'Effective Time')),
                 ('version_number', models.IntegerField(verbose_name=b'Version Number')),
                 ('code', models.CharField(max_length=250, verbose_name=b'Document Type (Code)')),
                 ('filename', models.CharField(max_length=300, verbose_name=b'File Name')),
                 ('source', models.CharField(max_length=250, verbose_name=b'Source')),
-                ('author', models.CharField(max_length=300, null=True, verbose_name=b'Author (Laberer)', blank=True)),
-                ('author_legal', models.CharField(max_length=300, null=True, verbose_name=b'Legal Author', blank=True)),
+                ('author', models.CharField(blank=True, max_length=300, null=True, verbose_name=b'Author (Laberer)')),
+                ('author_legal', models.CharField(blank=True, max_length=300, null=True, verbose_name=b'Legal Author')),
                 ('is_osdf', models.BooleanField(default=False, verbose_name=b'Is In Oral Solid Dosage Form?')),
                 ('discontinued', models.BooleanField(default=False, verbose_name=b'Is Discontinued from SPL?')),
             ],
             options={
                 'verbose_name': 'SPL Product',
                 'verbose_name_plural': 'SPL Products',
             },
-            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Source',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('is_active', models.BooleanField(default=True, verbose_name=b'Enabled?')),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
                 ('title', models.CharField(max_length=100, verbose_name=b'Title')),
                 ('host', models.CharField(help_text=b'FTP host to download the files from', max_length=200, verbose_name=b'FTP Host')),
                 ('path', models.CharField(help_text=b'Path where the files are located on the ftp server', max_length=200, verbose_name=b'PATH')),
                 ('files', jsonfield.fields.JSONField(help_text=b'Enter in form python list', verbose_name=b'File Names')),
-                ('last_downloaded', models.DateTimeField(null=True, verbose_name=b'Last Downloaded and Unzipped', blank=True)),
-                ('zip_size', models.FloatField(null=True, verbose_name=b'Total zip folder size (bytes)', blank=True)),
-                ('unzip_size', models.FloatField(null=True, verbose_name=b'Total unzip folder size (bytes)', blank=True)),
-                ('xml_count', models.IntegerField(null=True, verbose_name=b'Total xml files', blank=True)),
+                ('last_downloaded', models.DateTimeField(blank=True, null=True, verbose_name=b'Last Downloaded and Unzipped')),
+                ('zip_size', models.FloatField(blank=True, null=True, verbose_name=b'Total zip folder size (bytes)')),
+                ('unzip_size', models.FloatField(blank=True, null=True, verbose_name=b'Total unzip folder size (bytes)')),
+                ('xml_count', models.IntegerField(blank=True, null=True, verbose_name=b'Total xml files')),
             ],
             options={
                 'abstract': False,
             },
-            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Task',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=250, verbose_name=b'Task Name')),
-                ('task_id', models.CharField(max_length=250, unique=True, null=True, verbose_name=b'Task ID', blank=True)),
+                ('task_id', models.CharField(blank=True, max_length=250, null=True, unique=True, verbose_name=b'Task ID')),
                 ('time_started', models.DateTimeField(auto_now_add=True)),
-                ('time_ended', models.DateTimeField(null=True, verbose_name=b'Time Ended', blank=True)),
+                ('time_ended', models.DateTimeField(blank=True, null=True, verbose_name=b'Time Ended')),
                 ('duration', models.FloatField(default=0, verbose_name=b'Duration')),
-                ('status', models.CharField(max_length=200, null=True, verbose_name=b'Status', blank=True)),
+                ('status', models.CharField(blank=True, max_length=200, null=True, verbose_name=b'Status')),
                 ('meta', jsonfield.fields.JSONField(default={}, verbose_name=b'Meta')),
-                ('pid', models.CharField(max_length=100, null=True, verbose_name=b'PID', blank=True)),
+                ('pid', models.CharField(blank=True, max_length=100, null=True, verbose_name=b'PID')),
                 ('is_active', models.BooleanField(default=True, verbose_name=b'Task is active (running)?')),
-                ('download_type', models.CharField(max_length=200, null=True, verbose_name=b'Download source name', blank=True)),
-                ('traceback', models.TextField(null=True, verbose_name=b'Traceback', blank=True)),
+                ('download_type', models.CharField(blank=True, max_length=200, null=True, verbose_name=b'Download source name')),
+                ('traceback', models.TextField(blank=True, null=True, verbose_name=b'Traceback')),
             ],
-            options={
-            },
-            bases=(models.Model,),
         ),
         migrations.AddField(
             model_name='pill',
             name='setid',
-            field=models.ForeignKey(to='spl.Product'),
-            preserve_default=True,
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='spl.Product'),
         ),
     ]

pillbox-engine/spl/models.py

@@ -40,7 +40,6 @@ class Meta:
     def __unicode__(self):
         return self.name
 
-
 class Product(CommonInfo):
 
     setid = models.CharField('setid', max_length=200, unique=True)

pillbox-engine/spl/tasks.py

@@ -10,14 +10,14 @@
 from zipfile import BadZipfile
 from ftputil.error import TemporaryError, FTPOSError
 
-from _celery import app
+# from _celery import app
 from spl.sync.controller import Controller
 from spl.sync.rxnorm import ThreadXNorm
 from spl.download import DownloadAndUnzip
 from spl.models import Task, Source, Pill, Product
 
 
-@app.task(bind=True, ignore_result=True)
+# @app.task(bind=True, ignore_result=True)
 def rxnorm_task(self, task_id):
     start = time.time()
 
@@ -62,7 +62,7 @@ def rxnorm_task(self, task_id):
     return
 
 
-@app.task(bind=True, ignore_result=True)
+# @app.task(bind=True, ignore_result=True)
 def sync(self, action, task_id):
     start = time.time()
     arguments = ['products', 'pills', 'all']
@@ -93,7 +93,7 @@ def sync(self, action, task_id):
     return
 
 
-@app.task(bind=True, ignore_result=True)
+# @app.task(bind=True, ignore_result=True)
 def download_unzip(self, task_id, source_id):
 
     source = Source.objects.get(pk=source_id)

pillbox-engine/templates/xadmin/base.html

@@ -1,4 +1,4 @@
-{% load url from future %}{% load xadmin_tags %}{% load i18n %}
+{% load xadmin_tags %}{% load i18n %}
 {% load staticfiles %}
 <!DOCTYPE html>
 <html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>

pillbox-engine/templates/xadmin/views/dashboard.html

@@ -1,6 +1,5 @@
 {% extends base_template %}
 {% load i18n xadmin_tags %}
-{% load url from future %}
 {% load spl_tags %}
 {% load pillbox_tags %}
 

pillbox-engine/urls.py

@@ -8,28 +8,28 @@
 
 import spl.urls
 import pillbox.urls
-from kombu.transport.django.models import Message
-from djcelery_pillbox.models import TaskMeta
-from spl.models import Task
+# from kombu.transport.django.models import Message
+# from djcelery_pillbox.models import TaskMeta
+# from spl.models import Task
 
 import xadmin
 xadmin.autodiscover()
 
  # Version module automatically registration required version control Model
-from xadmin.plugins import xversion
-xversion.register_models()
+# from xadmin.plugins import xversion
+# xversion.register_models()
 
 # Uncomment the next two lines to enable the admin:
 from django.contrib import admin
 admin.autodiscover()
 
 # REST ALL WORKERS
-try:
-    Message.objects.all().delete()
-    TaskMeta.objects.all().delete()
-    tasks = Task.objects.filter(is_active=True).update(is_active=False, status='FAILED')
-except ProgrammingError:
-    pass
+# try:
+    # Message.objects.all().delete()
+    # TaskMeta.objects.all().delete()
+    # tasks = Task.objects.filter(is_active=True).update(is_active=False, status='FAILED')
+# except ProgrammingError:
+    # pass
 
 urlpatterns = patterns('',
     # Uncomment the next line to enable the admin:

pillbox-engine/wsgi.py

@@ -19,13 +19,12 @@
 # if running multiple sites in the same mod_wsgi process. To fix this, use
 # mod_wsgi daemon mode with each site in its own daemon process, or use
 # os.environ["DJANGO_SETTINGS_MODULE"] = ".settings"
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config")
-os.environ.setdefault("DJANGO_CONFIGURATION", "Production")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.production")
 
 # This application object is used by any WSGI server configured to use this
 # file. This includes Django's development server, if the WSGI_APPLICATION
 # setting points here.
-from configurations.wsgi import get_wsgi_application
+from django.core.wsgi import get_wsgi_application
 application = get_wsgi_application()
 
 # Apply WSGI middleware here.