Sample Tracker EXTJS frontend merge part 1

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

diff --git a/htsworkflow/frontend/samples/views.py b/htsworkflow/frontend/samples/views.py
index e64ce6748660c8034b4e8589399fed138a1a6d8b..c72a8335c2677285542c3b894426df49994e1bef 100644 (file)
--- a/htsworkflow/frontend/samples/views.py
+++ b/htsworkflow/frontend/samples/views.py
@@ -14,12 +14,16 @@ from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render_to_response
 from django.template import RequestContext
 from django.template.loader import get_template
+from django.contrib.auth.decorators import login_required
 
 import StringIO
 import logging
 import os
 
 LANE_LIST = [1,2,3,4,5,6,7,8]
+SAMPLES_CONTEXT_DEFAULTS = {
+    'app_name': 'Flowcell/Library Tracker'
+}
 
 def create_library_context(cl):
     """
@@ -59,7 +63,16 @@ def library(request):
     context.update(create_library_context(fcl))
     t = get_template('samples/library_index.html')
     c = RequestContext(request, context)
-    return HttpResponse( t.render(c) )
+    
+    app_context = {
+        'page_name': 'Library Index',
+        'body': t.render(c)
+    }
+    app_context.update(SAMPLES_CONTEXT_DEFAULTS)
+    
+    app_t = get_template('flowcell_libraries_app.html')
+    app_c = RequestContext(request, app_context)
+    return HttpResponse( app_t.render(app_c) )
 
 def library_to_flowcells(request, lib_id):
     """
@@ -320,17 +333,19 @@ def _make_eland_results(flowcell_id, lane, interesting_flowcells):
     if cur_fc is None:
       return []
 
+    flowcell = FlowCell.objects.get(flowcell_id=flowcell_id)
     # Loop throw storage devices if a result has been archived
     storage_id_list = []
-    for lts in cur_fc.longtermstorage_set.all():
-        for sd in lts.storage_devices.all():
-            # Use barcode_id if it exists
-            if sd.barcode_id is not None and sd.barcode_id != '':
-                storage_id_list.append(sd.barcode_id)
-            # Otherwise use UUID
-            else:
-                storage_id_list.append(sd.uuid)
-    
+    if cur_fc is not None:
+        for lts in flowcell.longtermstorage_set.all():
+            for sd in lts.storage_devices.all():
+                # Use barcode_id if it exists
+                if sd.barcode_id is not None and sd.barcode_id != '':
+                    storage_id_list.append(sd.barcode_id)
+                # Otherwise use UUID
+                else:
+                    storage_id_list.append(sd.uuid)
+        
     # Formatting for template use
     if len(storage_id_list) == 0:
         storage_ids = None
@@ -409,3 +424,17 @@ def library_id_to_admin_url(request, lib_id):
     lib = Library.objects.get(library_id=lib_id)
     return HttpResponseRedirect('/admin/samples/library/%s' % (lib.id,))
 
+@login_required
+def user_profile(request):
+    """
+    Information about the user
+    """
+    context = {
+                'page_name': 'User Profile',
+                'media': '',
+                #'bcmagic': BarcodeMagicForm(),
+                #'select': 'settings',
+            }
+    context.update(SAMPLES_CONTEXT_DEFAULTS)
+    return render_to_response('registration/profile.html', context,
+                              context_instance=RequestContext(request))
\ No newline at end of file