landon/Submissions-App
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Debugging

Browse Source
This commit is contained in:
lwark
2025-04-30 15:20:31 -05:00
parent b42a7ab100
commit 62bc90cfca
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/submissions/backend/db/models/kits.py
View File

@@ -3,6 +3,7 @@ All kit and reagent related models
"""
from __future__ import annotations
import json, zipfile, yaml, logging, re, sys
from operator import itemgetter
from pprint import pformat
from jinja2 import Template, TemplateNotFound
@@ -2088,10 +2089,10 @@ class Equipment(BaseClass, LogMixin):
asset_number=self.asset_number
)
if full_data:
subs = []
output['submissions'] = [dict(plate=item.submission.rsl_plate_num, process=item.process.name)
subs = [dict(plate=item.submission.rsl_plate_num, process=item.process.name, sub_date=item.submission.submitted_date)
if item.process else dict(plate=item.submission.rsl_plate_num, process="NA")
for item in self.equipment_submission_associations]
output['submissions'] = sorted(subs, key=itemgetter("sub_date"), reverse=True)
output['excluded'] = ['missing', 'submissions', 'excluded', 'editable']
return output
@@ -2501,7 +2502,8 @@ class Process(BaseClass):
name=self.name,
)
if full_data:
output['submissions'] = [dict(plate=sub.submission.rsl_plate_num, equipment=sub.equipment.name) for sub in self.submissions]
subs = [dict(plate=sub.submission.rsl_plate_num, equipment=sub.equipment.name, sub_date=sub.submission.submitted_date) for sub in self.submissions]
output['submissions'] = sorted(subs, key=itemgetter("sub_date"), reverse=True)
output['excluded'] = ['missing', 'submissions', 'excluded', 'editable']
return output
@@ -2683,8 +2685,9 @@ class Tips(BaseClass, LogMixin):
lot=self.lot,
)
if full_data:
output['submissions'] = [dict(plate=item.submission.rsl_plate_num, role=item.role_name)
subs = [dict(plate=item.submission.rsl_plate_num, role=item.role_name, sub_date=item.submission.submitted_date)
for item in self.tips_submission_associations]
output['submissions'] = sorted(subs, key=itemgetter("sub_date"), reverse=True)
output['excluded'] = ['missing', 'submissions', 'excluded', 'editable']
return output
@@ -2708,6 +2711,7 @@ class Tips(BaseClass, LogMixin):
template = env.get_template("tips_details.html")
return template
class SubmissionTypeTipRoleAssociation(BaseClass):
"""
Abstract association between SubmissionType and TipRole

4
src/submissions/templates/tips_details.html
View File

@@ -2,12 +2,12 @@
<head>
{% block head %}
{{ super() }}
<title>Tips Details for {{ tips['name'] }}</title>
<title>Tips Details for {{ tips['name'] }} - {{ tips['lot'] }}</title>
{% endblock %}
</head>
<body>
{% block body %}
<h2><u>Tips Details for {{ tips['name'] }}</u></h2>
<h2><u>Tips Details for {{ tips['name'] }} - {{ tips['lot'] }}</u></h2>
{{ super() }}
<p>{% for key, value in tips.items() if key not in tips['excluded'] %}
<!-- &nbsp;&nbsp;&nbsp;&nbsp;<b>{{ key | replace("_", " ") | title }}: </b>{% if permission and key in reagent['editable']%}<input type={% if key=='expiry' %}"date"{% else %}"text"{% endif %} id="{{ key }}" name="{{ key }}" value="{{ value }}">{% else %}{{ value }}{% endif %}<br>-->