Merge branch 'dev'
This commit is contained in:
commit
a144144942
@ -105,8 +105,8 @@ def batch_labels(request, batch_id):
|
|||||||
for sample in to_print:
|
for sample in to_print:
|
||||||
labels.append({
|
labels.append({
|
||||||
'id': sample.id,
|
'id': sample.id,
|
||||||
'title': '{} {}'.format(sample.batch.strain.manufacturer.name, sample.batch.strain.name),
|
'title': '{} {}'.format(sample.propogation.strain.manufacturer.name, sample.propogation.strain.name),
|
||||||
'data': ['ID: {}'.format(sample.id), 'Date: {}'.format(sample.batch.production_date)],
|
'data': ['ID: {}'.format(sample.id), 'Date: {}'.format(sample.propogation.production_date)],
|
||||||
'blank': False,
|
'blank': False,
|
||||||
'host': request.get_host(),
|
'host': request.get_host(),
|
||||||
'template': 'yeast',
|
'template': 'yeast',
|
||||||
|
Loading…
Reference in New Issue
Block a user