Upgrade python3

.gitignore

@@ -15,10 +15,12 @@ __pycache__/
 
 # C extensions
 *.so
+# hah
 
 # Distribution / packaging
 .Python
 env/
+.env
 build/
 develop-eggs/
 dist/

requirements.txt → 111requirements.txt

@@ -13,3 +13,7 @@ requests==2.7.0
 selenium==2.47.1
 splinter==0.7.3
 wheel==0.24.0
+
+pipenv install dj-database-url django django-bootstrap3 django-grappelli django-localflavor django-registration-redux djangorestframework factory-boy Pillow psycopg2-binary 
+
+pipenv install -d requests selenium splinter wheel

Pipfile

@@ -0,0 +1,25 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+dj-database-url = "*"
+django = "*"
+"django-bootstrap3" = "*"
+django-grappelli = "*"
+django-localflavor = "*"
+django-registration-redux = "*"
+djangorestframework = "*"
+factory-boy = "*"
+pillow = "*"
+"psycopg2-binary" = "*"
+
+[dev-packages]
+requests = "*"
+selenium = "*"
+splinter = "*"
+wheel = "*"
+
+[requires]
+python_version = "3.7"

estmator_project/est_client/migrations/0001_initial.py

@@ -1,43 +1,47 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+# Generated by Django 2.1.1 on 2018-09-27 22:25
 
-from django.db import models, migrations
+from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
 
+    initial = True
+
     dependencies = [
     ]
 
     operations = [
         migrations.CreateModel(
             name='Client',
             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')),
                 ('first_name', models.CharField(max_length=256)),
                 ('last_name', models.CharField(max_length=256)),
                 ('title', models.CharField(max_length=256)),
                 ('cell', models.CharField(max_length=20)),
-                ('desk', models.CharField(max_length=20, blank=True)),
+                ('desk', models.CharField(blank=True, max_length=20)),
                 ('email', models.EmailField(max_length=254)),
             ],
         ),
         migrations.CreateModel(
             name='Company',
             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')),
                 ('company_name', models.CharField(max_length=256)),
-                ('phone', models.IntegerField()),
+                ('phone', models.CharField(max_length=20)),
                 ('address', models.CharField(max_length=256)),
-                ('address2', models.CharField(max_length=256, blank=True)),
+                ('address2', models.CharField(blank=True, max_length=256)),
                 ('city', models.CharField(max_length=256)),
-                ('state', models.CharField(default='Washington', max_length=10, choices=[('Alabama', 'AL'), ('Alaska', 'AK'), ('Arizona', 'AZ'), ('Arkansas', 'AR'), ('California', 'CA'), ('Colorado', 'CO'), ('Connecticut', 'CT'), ('Delaware', 'DE'), ('Florida', 'FL'), ('Georgia', 'GA'), ('Hawaii', 'HI'), ('Idaho', 'ID'), ('Illinois', 'IL'), ('Indiana', 'IN'), ('Iowa', 'IA'), ('Kansas', 'KS'), ('Kentucky', 'KY'), ('Louisiana', 'LA'), ('Maine', 'ME'), ('Maryland', 'MD'), ('Massachusetts', 'MA'), ('Michigan', 'MI'), ('Minnesota', 'MN'), ('Mississippi', 'MS'), ('Missouri', 'MO'), ('Montana', 'MT'), ('Nebraska', 'NE'), ('Nevada', 'NV'), ('New Hampshire', 'NH'), ('New Jersey', 'NJ'), ('New Mexico', 'NM'), ('New York', 'NY'), ('North Carolina', 'NC'), ('North Dakota', 'ND'), ('Ohio', 'OH'), ('Oklahoma', 'OK'), ('Oregon', 'OR'), ('Pennsylvania', 'PA'), ('Rhode Island', 'RI'), ('South Carolina', 'SC'), ('South Dakota', 'SD'), ('Tennessee', 'TN'), ('Texas', 'TX'), ('Utah', 'UT'), ('Vermont', 'VT'), ('Virginia', 'VA'), ('Washington', 'WA'), ('West Virginia', 'WV'), ('Wisconsin', 'WI'), ('Wyoming', 'WY')])),
+                ('state', models.CharField(choices=[('Alabama', 'AL'), ('Alaska', 'AK'), ('Arizona', 'AZ'), ('Arkansas', 'AR'), ('California', 'CA'), ('Colorado', 'CO'), ('Connecticut', 'CT'), ('Delaware', 'DE'), ('Florida', 'FL'), ('Georgia', 'GA'), ('Hawaii', 'HI'), ('Idaho', 'ID'), ('Illinois', 'IL'), ('Indiana', 'IN'), ('Iowa', 'IA'), ('Kansas', 'KS'), ('Kentucky', 'KY'), ('Louisiana', 'LA'), ('Maine', 'ME'), ('Maryland', 'MD'), ('Massachusetts', 'MA'), ('Michigan', 'MI'), ('Minnesota', 'MN'), ('Mississippi', 'MS'), ('Missouri', 'MO'), ('Montana', 'MT'), ('Nebraska', 'NE'), ('Nevada', 'NV'), ('New Hampshire', 'NH'), ('New Jersey', 'NJ'), ('New Mexico', 'NM'), ('New York', 'NY'), ('North Carolina', 'NC'), ('North Dakota', 'ND'), ('Ohio', 'OH'), ('Oklahoma', 'OK'), ('Oregon', 'OR'), ('Pennsylvania', 'PA'), ('Rhode Island', 'RI'), ('South Carolina', 'SC'), ('South Dakota', 'SD'), ('Tennessee', 'TN'), ('Texas', 'TX'), ('Utah', 'UT'), ('Vermont', 'VT'), ('Virginia', 'VA'), ('Washington', 'WA'), ('West Virginia', 'WV'), ('Wisconsin', 'WI'), ('Wyoming', 'WY')], default='Washington', max_length=20)),
                 ('postal', models.IntegerField()),
+                ('st_rate', models.IntegerField(default=30)),
+                ('ot_rate', models.IntegerField(default=40)),
             ],
         ),
         migrations.AddField(
             model_name='client',
             name='company',
-            field=models.ForeignKey(to='est_client.Company'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='est_client.Company'),
         ),
     ]