parent
dbfe88610a
commit
70046b5104
14 changed files with 357 additions and 40 deletions
39
ccdb/processing/migrations/0003_set_labels.py
Normal file
39
ccdb/processing/migrations/0003_set_labels.py
Normal file
|
@ -0,0 +1,39 @@
|
|||
# -*- 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),
|
||||
),
|
||||
]
|
|
@ -47,16 +47,18 @@ class Flaw(models.Model):
|
|||
|
||||
|
||||
class Processing(models.Model):
|
||||
process_type = models.ForeignKey(ProcessType)
|
||||
container = models.ForeignKey('misc.Container')
|
||||
process_type = models.ForeignKey(ProcessType, related_name='processings')
|
||||
container = models.ForeignKey('misc.Container', related_name='processings')
|
||||
container_label = models.CharField(max_length=50)
|
||||
process_date = models.DateField(blank=True, null=True)
|
||||
process_time = models.TimeField(blank=True, null=True)
|
||||
reagent = models.ForeignKey(Reagent, blank=True, null=True)
|
||||
reagent = models.ForeignKey(Reagent, blank=True, null=True,
|
||||
related_name='processings')
|
||||
reagent_volume = models.FloatField(blank=True, null=True)
|
||||
measurement_unit = models.ForeignKey('misc.MeasurementUnit', blank=True, null=True)
|
||||
measurement_unit = models.ForeignKey('misc.MeasurementUnit', blank=True,
|
||||
null=True, related_name='processings')
|
||||
minutes_in_reagent = models.IntegerField(blank=True, null=True)
|
||||
flaw = models.ForeignKey(Flaw, blank=True, null=True)
|
||||
flaw = models.ForeignKey(Flaw, blank=True, null=True, related_name='processings')
|
||||
|
||||
def __str__(self):
|
||||
return "{} {} {}".format(self.process_date, self.process_type, self.container_label)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue