thermokarst/ccdb-api
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SQUASHING

Browse source
This commit is contained in:
Matthew Ryan Dillon 2016-06-15 15:12:34 -07:00
parent 8573b0326b
commit a541a6f301
42 changed files with 588 additions and 1001 deletions
Download patch file Download diff file Expand all files Collapse all files

67
ccdb/processing/migrations/0001_initial.py
View file

@ -1,12 +1,8 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
import autoslug.fields
class Migration(migrations.Migration):
dependencies = [
('misc', '0001_initial'),
]
@ -15,10 +11,10 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Flaw',
fields=[
('id', models.AutoField(primary_key=True, auto_created=True, verbose_name='ID', serialize=False)),
('id', models.AutoField(auto_created=True, verbose_name='ID', serialize=False, primary_key=True)),
('name', models.CharField(max_length=200)),
('description', models.CharField(blank=True, max_length=255)),
('sort_order', models.IntegerField(blank=True, null=True)),
('description', models.CharField(max_length=255, blank=True)),
('sort_order', models.IntegerField(null=True, blank=True)),
('slug', autoslug.fields.AutoSlugField(populate_from='name', editable=False)),
],
options={
@ -28,25 +24,25 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Processing',
fields=[
('id', models.AutoField(primary_key=True, auto_created=True, verbose_name='ID', serialize=False)),
('id', models.AutoField(auto_created=True, verbose_name='ID', serialize=False, primary_key=True)),
('container_label', models.CharField(max_length=50)),
('process_date', models.DateField(blank=True, null=True)),
('process_time', models.TimeField(blank=True, null=True)),
('reagent_volume', models.FloatField(blank=True, null=True)),
('minutes_in_reagent', models.IntegerField(blank=True, null=True)),
('process_date', models.DateField(null=True, blank=True)),
('process_time', models.TimeField(null=True, blank=True)),
('reagent_volume', models.FloatField(null=True, blank=True)),
('minutes_in_reagent', models.IntegerField(null=True, blank=True)),
('container', models.ForeignKey(to='misc.Container')),
('flaw', models.ForeignKey(to='processing.Flaw', blank=True, null=True)),
('measurement_unit', models.ForeignKey(to='misc.MeasurementUnit', blank=True, null=True)),
('flaw', models.ForeignKey(to='processing.Flaw', null=True, blank=True)),
('measurement_unit', models.ForeignKey(to='misc.MeasurementUnit', null=True, blank=True)),
],
),
migrations.CreateModel(
name='ProcessType',
fields=[
('id', models.AutoField(primary_key=True, auto_created=True, verbose_name='ID', serialize=False)),
('id', models.AutoField(auto_created=True, verbose_name='ID', serialize=False, primary_key=True)),
('name', models.CharField(max_length=100)),
('code', models.CharField(blank=True, max_length=10)),
('description', models.CharField(blank=True, max_length=255)),
('sort_order', models.IntegerField(blank=True, null=True)),
('code', models.CharField(max_length=10, blank=True)),
('description', models.CharField(max_length=255, blank=True)),
('sort_order', models.IntegerField(null=True, blank=True)),
('slug', autoslug.fields.AutoSlugField(populate_from='name', editable=False)),
],
options={
@ -56,11 +52,11 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Reagent',
fields=[
('id', models.AutoField(primary_key=True, auto_created=True, verbose_name='ID', serialize=False)),
('id', models.AutoField(auto_created=True, verbose_name='ID', serialize=False, primary_key=True)),
('name', models.CharField(max_length=100)),
('code', models.CharField(blank=True, max_length=10)),
('reagent_class', models.CharField(blank=True, max_length=50)),
('sort_order', models.IntegerField(blank=True, null=True)),
('code', models.CharField(max_length=10, blank=True)),
('reagent_class', models.CharField(max_length=50, blank=True)),
('sort_order', models.IntegerField(null=True, blank=True)),
('slug', autoslug.fields.AutoSlugField(populate_from='name', editable=False)),
],
options={
@ -83,10 +79,35 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='processing',
name='reagent',
field=models.ForeignKey(to='processing.Reagent', blank=True, null=True),
field=models.ForeignKey(to='processing.Reagent', null=True, blank=True),
),
migrations.AlterUniqueTogether(
name='processing',
unique_together=set([('process_type', 'container', 'container_label', 'process_date', 'process_time', 'reagent')]),
),
migrations.AlterField(
model_name='processing',
name='container',
field=models.ForeignKey(related_name='processings', to='misc.Container'),
),
migrations.AlterField(
model_name='processing',
name='flaw',
field=models.ForeignKey(to='processing.Flaw', null=True, related_name='processings', blank=True),
),
migrations.AlterField(
model_name='processing',
name='measurement_unit',
field=models.ForeignKey(to='misc.MeasurementUnit', null=True, related_name='processings', blank=True),
),
migrations.AlterField(
model_name='processing',
name='process_type',
field=models.ForeignKey(related_name='processings', to='processing.ProcessType'),
),
migrations.AlterField(
model_name='processing',
name='reagent',
field=models.ForeignKey(to='processing.Reagent', null=True, related_name='processings', blank=True),
),
]

1
ccdb/processing/migrations/0002_DATA_initial.py
View file

@ -50,6 +50,7 @@ class Migration(migrations.Migration):
dependencies = [
('processing', '0001_initial'),
('species', '0002_DATA_initial'),
]
operations = [

39
ccdb/processing/migrations/0003_set_labels.py
View file

@ -1,39 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('processing', '0002_DATA_initial'),
]
operations = [
migrations.AlterField(
model_name='processing',
name='container',
field=models.ForeignKey(related_name='processings', to='misc.Container'),
),
migrations.AlterField(
model_name='processing',
name='flaw',
field=models.ForeignKey(to='processing.Flaw', blank=True, related_name='processings', null=True),
),
migrations.AlterField(
model_name='processing',
name='measurement_unit',
field=models.ForeignKey(to='misc.MeasurementUnit', blank=True, related_name='processings', null=True),
),
migrations.AlterField(
model_name='processing',
name='process_type',
field=models.ForeignKey(related_name='processings', to='processing.ProcessType'),
),
migrations.AlterField(
model_name='processing',
name='reagent',
field=models.ForeignKey(to='processing.Reagent', blank=True, related_name='processings', null=True),
),
]