* Now displays a message on the summary page rather than returning a useless page.
-def container_summary(request, container_id):
+def container_summary(request, container_id, msg=None):
"""
Returns details of a container
"""
"""
Returns details of a container
"""
# Render prepared samples into container summary
cc = Context({'container': container,
# Render prepared samples into container summary
cc = Context({'container': container,
'rendered_samples': ts.render(cs) })
tc = get_template('container_summary.html')
'rendered_samples': ts.render(cs) })
tc = get_template('container_summary.html')
t = get_template('zpl_container_label.txt')
print_zpl(t.render(c))
t = get_template('zpl_container_label.txt')
print_zpl(t.render(c))
- return HttpResponse('print command for container %s sent.' % (container.uuid))
+ return container_summary(request, container_id, msg='print command for container %s sent.' % (container.uuid))
################################################
################################################
context_instance=RequestContext(request))
@login_required
context_instance=RequestContext(request))
@login_required
-def freezer_summary(request, freezer_id):
+def freezer_summary(request, freezer_id, msg=None):
"""
Returns summary of freezer_id
"""
"""
Returns summary of freezer_id
"""
# Render prepared container index into freezer summary
# Render prepared container index into freezer summary
- cf = Context({'freezer': freezer })
+ cf = Context({'freezer': freezer,
+ 'msg': msg})
tf = get_template('freezer_summary.html')
# Render Freezer summary to app html
tf = get_template('freezer_summary.html')
# Render Freezer summary to app html
t = get_template('zpl_freezer_label.txt')
print_zpl(t.render(c))
t = get_template('zpl_freezer_label.txt')
print_zpl(t.render(c))
- return HttpResponse('print command for freezer %s sent.' % (freezer.uuid))
+ return freezer_summary(request, freezer_id, msg='print command for freezer %s sent.' % (freezer.uuid))
################################################
################################################
t = get_template('half_inch_samples.txt')
print_zpl(t.render(c))
t = get_template('half_inch_samples.txt')
print_zpl(t.render(c))
- return HttpResponse('print command for sample %s sent.' % (sample.sampleid))
+ return sample_summary(request, sampleid, msg='print command for sample %s sent.' % (sample.sampleid))
@login_required
def user_profile(request):
@login_required
def user_profile(request):
| <a href="{{ container.get_absolute_url }}print/">Print Label</a> ]<br />
<br />
| <a href="{{ container.get_absolute_url }}print/">Print Label</a> ]<br />
<br />
+{% if msg %}
+<div class="msg">
+ {{ msg }}
+</div>
+<br />
+{% endif %}
+
<b>Name:</b> {{ container.name }}<br />
<b>Freezer:</b> <a href="{{ container.freezer.get_absolute_url }}">{{ container.freezer.name }}</a><br />
<br />
<b>Name:</b> {{ container.name }}<br />
<b>Freezer:</b> <a href="{{ container.freezer.get_absolute_url }}">{{ container.freezer.name }}</a><br />
<br />
[ <a href="{{ freezer.get_absolute_url }}edit/">Edit</a> | <a href="{{ freezer.get_absolute_url }}print/">Print Label</a> ]<br />
<br />
[ <a href="{{ freezer.get_absolute_url }}edit/">Edit</a> | <a href="{{ freezer.get_absolute_url }}print/">Print Label</a> ]<br />
<br />
+{% if msg %}
+<div class="msg">
+ {{ msg }}
+</div>
+<br />
+{% endif %}
+
<b>Name:</b> {{ freezer.name }}<br />
<b>Temp. (C):</b> {{ freezer.temperature }}<br />
<br />
<b>Name:</b> {{ freezer.name }}<br />
<b>Temp. (C):</b> {{ freezer.temperature }}<br />
<br />
<h2>Sample Summary</h2>
[ <a href="{{ sample.get_absolute_url }}edit/">Edit</a> | <a href="{{ sample.get_absolute_url }}print/">Print Label</a> ]<br />
<h2>Sample Summary</h2>
[ <a href="{{ sample.get_absolute_url }}edit/">Edit</a> | <a href="{{ sample.get_absolute_url }}print/">Print Label</a> ]<br />
{% if msg %}
<div class="msg">
{{ msg }}
</div>
{% if msg %}
<div class="msg">
{{ msg }}
</div>
<b>Name:</b> {{ sample.name }}<br />
<b>SampleID:</b> {{ sample.sampleid }}<br />
<b>Type:</b> {{ sample.sample_type.name }}<br />
<b>Name:</b> {{ sample.name }}<br />
<b>SampleID:</b> {{ sample.sampleid }}<br />
<b>Type:</b> {{ sample.sample_type.name }}<br />