New way of accessing pM for a lane in _summary_stats

[htsworkflow.git] / htsworkflow / frontend / samples / views.py

diff --git a/htsworkflow/frontend/samples/views.py b/htsworkflow/frontend/samples/views.py
index 2db0f0fd1cd2769cc267c7b717115b5b938bfa1a..9ddc5775a395c2f5485f7872a46d81371723c698 100644 (file)
--- a/htsworkflow/frontend/samples/views.py
+++ b/htsworkflow/frontend/samples/views.py
@@ -99,16 +99,16 @@ def library_to_flowcells(request, lib_id):
         flowcell_id, id = parse_flowcell_id(fc.flowcell_id)
         if flowcell_id not in interesting_flowcells:
             interesting_flowcells[flowcell_id] = get_flowcell_result_dict(flowcell_id)
-        flowcell_list.append((fc.flowcell_id, lane))
+        flowcell_list.append((fc.flowcell_id, lane.lane_number))
 
     flowcell_list.sort()
     
     lane_summary_list = []
     eland_results = []
-    for fc, lane in flowcell_list:
-        lane_summary, err_list = _summary_stats(fc, lane)
+    for fc, lane_number in flowcell_list:
+        lane_summary, err_list = _summary_stats(fc, lane_number)
 
-        eland_results.extend(_make_eland_results(fc, lane, interesting_flowcells))
+        eland_results.extend(_make_eland_results(fc, lane_number, interesting_flowcells))
         lane_summary_list.extend(lane_summary)
 
     context = {
@@ -258,8 +258,9 @@ def _summary_stats(flowcell_id, lane_id):
 
             # grab some more information out of the flowcell db
             flowcell = FlowCell.objects.get(flowcell_id=flowcell_id)
-            pm_field = 'lane_%d_pM' % (lane_id)
-            eland_summary.successful_pm = getattr(flowcell, pm_field)
+            #pm_field = 'lane_%d_pM' % (lane_id)
+            lane_obj = flowcell.lane_set.get(lane_number=lane_id)
+            eland_summary.successful_pm = lane_obj.pM
 
             summary_list.append(eland_summary)