From 77345cb40be0b31f0a1ee1c5e167a69554747cf3 Mon Sep 17 00:00:00 2001 From: Brandon King Date: Thu, 13 Aug 2009 22:24:48 +0000 Subject: [PATCH] New lane model patch for library_to_flowcells view. --- htsworkflow/frontend/samples/views.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/htsworkflow/frontend/samples/views.py b/htsworkflow/frontend/samples/views.py index e79262a..2db0f0f 100644 --- a/htsworkflow/frontend/samples/views.py +++ b/htsworkflow/frontend/samples/views.py @@ -44,9 +44,10 @@ def create_library_context(cl): else: summary['amplified_from'] = '' lanes_run = 0 - for lane_id in LANE_LIST: - lane = getattr(lib, 'lane_%d_library' % (lane_id,)) - lanes_run += len( lane.all() ) + #for lane_id in LANE_LIST: + # lane = getattr(lib, 'lane_%d_library' % (lane_id,)) + # lanes_run += len( lane.all() ) + lanes_run = lib.lane_set.count() summary['lanes_run'] = lanes_run summary['is_archived'] = lib.is_archived() records.append(summary) @@ -90,13 +91,15 @@ def library_to_flowcells(request, lib_id): flowcell_list = [] interesting_flowcells = {} # aka flowcells we're looking at - for lane in LANE_LIST: - lane_library = getattr(lib, 'lane_%d_library' % (lane,)) - for fc in lane_library.all(): - 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)) + #for lane in LANE_LIST: + for lane in lib.lane_set.all(): + #lane_library = getattr(lib, 'lane_%d_library' % (lane,)) + #for fc in lane_library.all(): + fc = lane.flowcell + 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.sort() -- 2.30.2