From: Brandon King Date: Wed, 1 Jul 2009 19:43:02 +0000 (+0000) Subject: Added start of inventory summary view and cleaned up inventory template location X-Git-Tag: 0.2.6~19 X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=07df4ce0e86434a3fe15c5aa28dae199e09b9bf5 Added start of inventory summary view and cleaned up inventory template location --- diff --git a/htsworkflow/frontend/inventory/urls.py b/htsworkflow/frontend/inventory/urls.py index 18f38a9..0d7da6c 100644 --- a/htsworkflow/frontend/inventory/urls.py +++ b/htsworkflow/frontend/inventory/urls.py @@ -7,5 +7,6 @@ urlpatterns = patterns('', (r'^lts/link/(?P.+)/(?P.+)/$', 'htsworkflow.frontend.inventory.views.link_flowcell_and_device'), # INDEX + (r'^(?P[a-fA-F0-9]{32})/$', 'htsworkflow.frontend.inventory.views.item_summary'), (r'^$', 'htsworkflow.frontend.inventory.views.index') ) diff --git a/htsworkflow/frontend/inventory/views.py b/htsworkflow/frontend/inventory/views.py index 3c72d20..9f9207b 100644 --- a/htsworkflow/frontend/inventory/views.py +++ b/htsworkflow/frontend/inventory/views.py @@ -17,6 +17,7 @@ INVENTORY_CONTEXT_DEFAULTS = { 'bcmagic': BarcodeMagicForm() } +@login_required def data_items(request): """ Returns items in json format @@ -56,7 +57,7 @@ def data_items(request): return HttpResponse(encode_json(d), content_type="application/javascript") - +@login_required def index(request): """ Inventory Index View @@ -66,10 +67,30 @@ def index(request): } context_dict.update(INVENTORY_CONTEXT_DEFAULTS) - return render_to_response('inventory_index.html', + return render_to_response('inventory/inventory_index.html', context_dict, context_instance=RequestContext(request)) +@login_required +def item_summary(request, uuid): + """ + Display a summary for an item + """ + try: + item = Item.objects.get(uuid=uuid) + except ObjectDoesNotExist, e: + item = None + + context_dict = { + 'page_name': 'Item Summary', + 'item': item, + 'uuid': uuid + } + context_dict.update(INVENTORY_CONTEXT_DEFAULTS) + + return render_to_response('inventory/inventory_summary.html', + context_dict, + context_instance=RequestContext(request)) def link_flowcell_and_device(request, flowcell, serial): """ diff --git a/htsworkflow/frontend/static/js/htsw-inventory.js b/htsworkflow/frontend/static/js/htsw-inventory.js index 6f44e50..3cbca3f 100644 --- a/htsworkflow/frontend/static/js/htsw-inventory.js +++ b/htsworkflow/frontend/static/js/htsw-inventory.js @@ -1,4 +1,11 @@ +var inventory_item_dblclick_handler = function(grid, row_index, e){ + //quick_msg('Choose Row: ' + row_index); + var rec = grid.getStore().getAt(row_index); + //quick_msg('UUID: ' + rec.get('uuid')); + goto_url('/inventory/'+rec.get('uuid')+'/'); +} + var getInventoryDataGrid = function(){ var Item = Ext.data.Record.create([ @@ -73,9 +80,11 @@ var getInventoryDataGrid = function(){ iconCls: 'icon-grid', id: 'inventory_item_panel', stateId: 'inventory_item_panel_state', - stateful: true, + stateful: true //renderTo: 'grid_target' }); + grid.on('rowdblclick', inventory_item_dblclick_handler); + return grid; } \ No newline at end of file diff --git a/htsworkflow/frontend/templates/app_base.html b/htsworkflow/frontend/templates/app_base.html index 0145c1a..1ba9fcd 100644 --- a/htsworkflow/frontend/templates/app_base.html +++ b/htsworkflow/frontend/templates/app_base.html @@ -44,30 +44,6 @@ Add
- - {% endblock %} @@ -87,7 +63,9 @@
{% block left_tbar_menu %}
+ {% if user.is_authenticated %}
+ {% endif %} {% endblock %}
diff --git a/htsworkflow/frontend/templates/inventory/inventory_app.html b/htsworkflow/frontend/templates/inventory/inventory_app.html new file mode 100644 index 0000000..b5271c6 --- /dev/null +++ b/htsworkflow/frontend/templates/inventory/inventory_app.html @@ -0,0 +1,21 @@ +{% extends "app_base.html" %} + +{% block additional_css %} +{% endblock %} + +{% block dynamic_panels %} + +{% endblock %} + +{% block app_toolbar_west %} +
+{% endblock %} + +{% block app_toolbar_east %} + +{% endblock %} diff --git a/htsworkflow/frontend/templates/inventory/inventory_index.html b/htsworkflow/frontend/templates/inventory/inventory_index.html new file mode 100644 index 0000000..1a1e32b --- /dev/null +++ b/htsworkflow/frontend/templates/inventory/inventory_index.html @@ -0,0 +1,10 @@ +{% extends "inventory/inventory_app.html" %} + +{% block additional_javascript %} + +{% endblock %} + +{% block content %} +
+{% endblock %} + \ No newline at end of file diff --git a/htsworkflow/frontend/templates/inventory/inventory_summary.html b/htsworkflow/frontend/templates/inventory/inventory_summary.html new file mode 100644 index 0000000..0f18488 --- /dev/null +++ b/htsworkflow/frontend/templates/inventory/inventory_summary.html @@ -0,0 +1,9 @@ +{% extends "inventory/inventory_app.html" %} + +{% block content %} + {% if item %} +

Item: {{item.uuid}}

+ {% else %} +

Item with UUID of {{ uuid }} not found.

+ {% endif %} +{% endblock %} diff --git a/htsworkflow/frontend/templates/inventory_app.html b/htsworkflow/frontend/templates/inventory_app.html deleted file mode 100644 index 108a9d4..0000000 --- a/htsworkflow/frontend/templates/inventory_app.html +++ /dev/null @@ -1,29 +0,0 @@ -{% extends "app_base.html" %} - -{% block additional_css %} -{% endblock %} - -{% block additional_javascript %} - -{% endblock %} - -{% block dynamic_panels %} - -{% endblock %} - -{% block app_toolbar_west %} -
-{% endblock %} - -{% block app_toolbar_east %} - -{% endblock %} - -{% block content %} -test -{% endblock %} \ No newline at end of file diff --git a/htsworkflow/frontend/templates/inventory_index.html b/htsworkflow/frontend/templates/inventory_index.html deleted file mode 100644 index 0cc0b5f..0000000 --- a/htsworkflow/frontend/templates/inventory_index.html +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "inventory_app.html" %} - -{% block content %} -
-{% endblock %} - \ No newline at end of file