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

78
ccdb/misc/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 = [
]
@ -14,11 +10,11 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Color',
fields=[
('id', models.AutoField(primary_key=True, serialize=False, auto_created=True, verbose_name='ID')),
('id', models.AutoField(serialize=False, primary_key=True, verbose_name='ID', auto_created=True)),
('name', models.CharField(max_length=50)),
('code', models.CharField(blank=True, max_length=10)),
('color_number', models.FloatField(null=True, blank=True)),
('sort_order', models.IntegerField(null=True, blank=True)),
('code', models.CharField(max_length=10, blank=True)),
('color_number', models.FloatField(blank=True, null=True)),
('sort_order', models.IntegerField(blank=True, null=True)),
('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name')),
],
options={
@ -28,14 +24,14 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Container',
fields=[
('id', models.AutoField(primary_key=True, serialize=False, auto_created=True, verbose_name='ID')),
('id', models.AutoField(serialize=False, primary_key=True, verbose_name='ID', auto_created=True)),
('name', models.CharField(max_length=100)),
('code', models.CharField(blank=True, max_length=10)),
('application', models.CharField(blank=True, max_length=50)),
('volume', models.FloatField(null=True, blank=True)),
('sort_order', models.IntegerField(null=True, blank=True)),
('code', models.CharField(max_length=10, blank=True)),
('application', models.CharField(max_length=50, blank=True)),
('volume', models.FloatField(blank=True, null=True)),
('sort_order', models.IntegerField(blank=True, null=True)),
('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name')),
('color', models.ForeignKey(null=True, to='misc.Color', blank=True)),
('color', models.ForeignKey(blank=True, to='misc.Color', null=True)),
],
options={
'ordering': ['sort_order'],
@ -44,12 +40,12 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Material',
fields=[
('id', models.AutoField(primary_key=True, serialize=False, auto_created=True, verbose_name='ID')),
('id', models.AutoField(serialize=False, primary_key=True, verbose_name='ID', auto_created=True)),
('name', models.CharField(max_length=100)),
('code', models.CharField(blank=True, max_length=10)),
('material_class', models.CharField(blank=True, max_length=50)),
('description', models.CharField(blank=True, max_length=255)),
('sort_order', models.IntegerField(null=True, blank=True)),
('code', models.CharField(max_length=10, blank=True)),
('material_class', models.CharField(max_length=50, blank=True)),
('description', models.CharField(max_length=255, blank=True)),
('sort_order', models.IntegerField(blank=True, null=True)),
('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name')),
],
options={
@ -59,12 +55,12 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='MeasurementType',
fields=[
('id', models.AutoField(primary_key=True, serialize=False, auto_created=True, verbose_name='ID')),
('id', models.AutoField(serialize=False, primary_key=True, verbose_name='ID', auto_created=True)),
('name', models.CharField(max_length=100)),
('code', models.CharField(blank=True, max_length=10)),
('measurement_type_class', models.CharField(blank=True, max_length=50)),
('description', models.CharField(blank=True, max_length=255)),
('sort_order', models.IntegerField(null=True, blank=True)),
('code', models.CharField(max_length=10, blank=True)),
('measurement_type_class', models.CharField(max_length=50, blank=True)),
('description', models.CharField(max_length=255, blank=True)),
('sort_order', models.IntegerField(blank=True, null=True)),
('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name')),
],
options={
@ -74,12 +70,12 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='MeasurementUnit',
fields=[
('id', models.AutoField(primary_key=True, serialize=False, auto_created=True, verbose_name='ID')),
('id', models.AutoField(serialize=False, primary_key=True, verbose_name='ID', auto_created=True)),
('name', models.CharField(max_length=100)),
('code', models.CharField(max_length=25)),
('unit_class', models.CharField(blank=True, max_length=50)),
('description', models.CharField(blank=True, max_length=255)),
('sort_order', models.IntegerField(null=True, blank=True)),
('unit_class', models.CharField(max_length=50, blank=True)),
('description', models.CharField(max_length=255, blank=True)),
('sort_order', models.IntegerField(blank=True, null=True)),
('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name')),
],
options={
@ -93,7 +89,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='measurementtype',
name='default_measurement_unit',
field=models.ForeignKey(null=True, to='misc.MeasurementUnit', blank=True),
field=models.ForeignKey(blank=True, to='misc.MeasurementUnit', null=True),
),
migrations.AlterUniqueTogether(
name='material',
@ -102,15 +98,35 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='container',
name='material',
field=models.ForeignKey(null=True, to='misc.Material', blank=True),
field=models.ForeignKey(blank=True, to='misc.Material', null=True),
),
migrations.AddField(
model_name='container',
name='measurement_unit',
field=models.ForeignKey(null=True, to='misc.MeasurementUnit', blank=True),
field=models.ForeignKey(blank=True, to='misc.MeasurementUnit', null=True),
),
migrations.AlterUniqueTogether(
name='color',
unique_together=set([('name', 'code', 'color_number')]),
),
migrations.AlterField(
model_name='container',
name='color',
field=models.ForeignKey(blank=True, to='misc.Color', related_name='containers', null=True),
),
migrations.AlterField(
model_name='container',
name='material',
field=models.ForeignKey(blank=True, to='misc.Material', related_name='containers', null=True),
),
migrations.AlterField(
model_name='container',
name='measurement_unit',
field=models.ForeignKey(blank=True, to='misc.MeasurementUnit', related_name='containers', null=True),
),
migrations.AlterField(
model_name='measurementtype',
name='default_measurement_unit',
field=models.ForeignKey(blank=True, to='misc.MeasurementUnit', related_name='measurement_types', null=True),
),
]

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

@ -104,6 +104,7 @@ class Migration(migrations.Migration):
dependencies = [
('misc', '0001_initial'),
('projects', '0002_DATA_initial'),
]
operations = [

34
ccdb/misc/migrations/0003_set_labels.py
View file

@ -1,34 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('misc', '0002_DATA_initial'),
]
operations = [
migrations.AlterField(
model_name='container',
name='color',
field=models.ForeignKey(related_name='containers', blank=True, to='misc.Color', null=True),
),
migrations.AlterField(
model_name='container',
name='material',
field=models.ForeignKey(related_name='containers', blank=True, to='misc.Material', null=True),
),
migrations.AlterField(
model_name='container',
name='measurement_unit',
field=models.ForeignKey(related_name='containers', blank=True, to='misc.MeasurementUnit', null=True),
),
migrations.AlterField(
model_name='measurementtype',
name='default_measurement_unit',
field=models.ForeignKey(related_name='measurement_types', blank=True, to='misc.MeasurementUnit', null=True),
),
]