From 8df0bda39f6c7e56e6f8f4e59b42c8b82aeb750b Mon Sep 17 00:00:00 2001 From: Mitch Riedstra Date: Tue, 1 Aug 2017 10:55:23 -0400 Subject: Schema and template updates --- app/dispatch/migrations/0006_auto_20170715_2104.py | 22 ++++++++++++++++++++++ app/dispatch/migrations/0007_auto_20170715_2105.py | 21 +++++++++++++++++++++ app/dispatch/models.py | 4 ++-- app/dispatch/templates/dispatch/base.html | 20 +------------------- app/dispatch/templates/dispatch/index.html | 2 +- app/dispatch/templates/dispatch/login.html | 3 +-- app/dispatch/urls.py | 1 + app/dispatch/views.py | 22 ++++++++++++++++++---- 8 files changed, 67 insertions(+), 28 deletions(-) create mode 100644 app/dispatch/migrations/0006_auto_20170715_2104.py create mode 100644 app/dispatch/migrations/0007_auto_20170715_2105.py (limited to 'app') diff --git a/app/dispatch/migrations/0006_auto_20170715_2104.py b/app/dispatch/migrations/0006_auto_20170715_2104.py new file mode 100644 index 0000000..391240f --- /dev/null +++ b/app/dispatch/migrations/0006_auto_20170715_2104.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.1 on 2017-07-15 21:04 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('dispatch', '0005_auto_20170628_1614'), + ] + + operations = [ + migrations.AlterField( + model_name='load', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/app/dispatch/migrations/0007_auto_20170715_2105.py b/app/dispatch/migrations/0007_auto_20170715_2105.py new file mode 100644 index 0000000..72781ab --- /dev/null +++ b/app/dispatch/migrations/0007_auto_20170715_2105.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.1 on 2017-07-15 21:05 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('dispatch', '0006_auto_20170715_2104'), + ] + + operations = [ + migrations.AlterField( + model_name='load', + name='company', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dispatch.Company'), + ), + ] diff --git a/app/dispatch/models.py b/app/dispatch/models.py index 16703fd..f97c42b 100644 --- a/app/dispatch/models.py +++ b/app/dispatch/models.py @@ -25,8 +25,8 @@ class Contact(models.Model): class Load(models.Model): date = models.DateField() - user = models.OneToOneField(settings.AUTH_USER_MODEL) - company = models.OneToOneField(Company) + user = models.ForeignKey(settings.AUTH_USER_MODEL) + company = models.ForeignKey(Company) description = models.CharField(max_length=256) amount = models.DecimalField(max_digits=10,decimal_places=2) diff --git a/app/dispatch/templates/dispatch/base.html b/app/dispatch/templates/dispatch/base.html index 71483d6..8654d2e 100644 --- a/app/dispatch/templates/dispatch/base.html +++ b/app/dispatch/templates/dispatch/base.html @@ -17,7 +17,7 @@