Merge branch 'release/1.2.0'

This commit is contained in:
Nathan Chapman 2021-07-28 19:42:33 -06:00
commit 4489b94cdf
6 changed files with 1100 additions and 134 deletions

View File

@ -5,6 +5,8 @@ name = "pypi"
[packages]
django = "*"
gunicorn = "*"
psycopg2-binary = "*"
django-anymail = {extras = ["mailgun"], version = "*"}
celery = {extras = ["redis"], version = "*"}
django-celery-beat = "*"

View File

@ -1,4 +1,4 @@
# Generated by Django 3.2.5 on 2021-07-09 00:52
# Generated by Django 3.2.5 on 2021-07-29 01:32
from django.db import migrations, models
import django.db.models.deletion
@ -12,49 +12,57 @@ class Migration(migrations.Migration):
]
operations = [
migrations.CreateModel(
name='Checklist',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
],
),
migrations.CreateModel(
name='Employee',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('first_name', models.CharField(max_length=50)),
('last_name', models.CharField(max_length=50)),
('first_name', models.CharField(max_length=64)),
('last_name', models.CharField(max_length=64)),
('hire_date', models.DateField()),
('title', models.CharField(blank=True, max_length=50, null=True)),
('department', models.CharField(blank=True, max_length=50, null=True)),
('manager', models.CharField(blank=True, max_length=50, null=True)),
('title', models.CharField(blank=True, max_length=64, null=True)),
('department', models.CharField(blank=True, max_length=64, null=True)),
('manager', models.CharField(blank=True, max_length=64, null=True)),
('initial_comments', models.TextField(blank=True, null=True)),
('archived', models.BooleanField(default=False)),
],
options={
'ordering': ('-hire_date',),
},
),
migrations.CreateModel(
name='Todo',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('description', models.CharField(max_length=50)),
('description', models.CharField(max_length=64)),
('completed', models.BooleanField(default=False)),
('completed_at', models.DateTimeField(blank=True, null=True)),
('checklist', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='board.checklist')),
('employee', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='board.employee')),
],
),
migrations.CreateModel(
name='LogEntry',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('notes', models.CharField(max_length=50)),
('notes', models.CharField(max_length=500)),
('created_at', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now=True)),
('employee', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='board.employee')),
],
options={
'ordering': ('-created_at',),
},
),
migrations.AddField(
model_name='checklist',
name='employee',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='board.employee'),
migrations.CreateModel(
name='Event',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=64)),
('date', models.DateField()),
('time', models.TimeField(blank=True, null=True)),
('employee', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='board.employee')),
],
options={
'ordering': ('date', 'time'),
},
),
]

View File

@ -1,27 +0,0 @@
# Generated by Django 3.2.5 on 2021-07-09 01:03
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('board', '0001_initial'),
]
operations = [
migrations.RemoveField(
model_name='todo',
name='checklist',
),
migrations.AddField(
model_name='todo',
name='employee',
field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='board.employee'),
preserve_default=False,
),
migrations.DeleteModel(
name='Checklist',
),
]

View File

@ -1,70 +0,0 @@
# Generated by Django 3.2.5 on 2021-07-27 00:06
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('board', '0002_auto_20210709_0103'),
]
operations = [
migrations.AlterModelOptions(
name='employee',
options={'ordering': ('-hire_date',)},
),
migrations.AlterModelOptions(
name='logentry',
options={'ordering': ('-created_at',)},
),
migrations.AlterField(
model_name='employee',
name='department',
field=models.CharField(blank=True, max_length=64, null=True),
),
migrations.AlterField(
model_name='employee',
name='first_name',
field=models.CharField(max_length=64),
),
migrations.AlterField(
model_name='employee',
name='last_name',
field=models.CharField(max_length=64),
),
migrations.AlterField(
model_name='employee',
name='manager',
field=models.CharField(blank=True, max_length=64, null=True),
),
migrations.AlterField(
model_name='employee',
name='title',
field=models.CharField(blank=True, max_length=64, null=True),
),
migrations.AlterField(
model_name='logentry',
name='notes',
field=models.CharField(max_length=500),
),
migrations.AlterField(
model_name='todo',
name='description',
field=models.CharField(max_length=64),
),
migrations.CreateModel(
name='Event',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('description', models.CharField(max_length=64)),
('date', models.DateField()),
('time', models.TimeField(blank=True, null=True)),
('employee', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='board.employee')),
],
options={
'ordering': ('date', 'time'),
},
),
]

View File

@ -1,18 +0,0 @@
# Generated by Django 3.2.5 on 2021-07-27 01:53
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('board', '0003_auto_20210727_0006'),
]
operations = [
migrations.RenameField(
model_name='event',
old_name='description',
new_name='name',
),
]

1071
fixtures/dump.json Normal file

File diff suppressed because it is too large Load Diff