Activating bcmagic model & initial data.

diff --git a/htsworkflow/frontend/fixtures/bcmagic.xml b/htsworkflow/frontend/fixtures/bcmagic.xml
new file mode 100644 (file)
index 0000000..59dd041
--- /dev/null
+++ b/htsworkflow/frontend/fixtures/bcmagic.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<django-objects version="1.0">
+  <object model="bcmagic.keywordmap" pk="1">
+    <field name="keyword" type="CharField">frzr</field>
+    <field name="regex" type="CharField">(?P&lt;uuid&gt;[A-Fa-f0-9]+)</field>
+    <field name="url_template" type="TextField">/samples/freezer/{{ uuid }}/</field>
+  </object>
+  <object model="bcmagic.keywordmap" pk="2">
+    <field name="keyword" type="CharField">cntr</field>
+    <field name="regex" type="CharField">(?P&lt;uuid&gt;[A-Fa-f0-9]+)</field>
+    <field name="url_template" type="TextField">/samples/container/{{ uuid }}/</field>
+  </object>
+  <object model="bcmagic.keywordmap" pk="3">
+    <field name="keyword" type="CharField">s</field>
+    <field name="regex" type="CharField">(?P&lt;sampleid&gt;\d+)\|(?P&lt;owner&gt;[A-Za-z0-9_\- ]+)</field>
+    <field name="url_template" type="TextField">/samples/sample/{{ sampleid }}/</field>
+  </object>
+  <object model="bcmagic.keywordmap" pk="4">
+    <field name="keyword" type="CharField">gg</field>
+    <field name="regex" type="CharField">(?P&lt;search&gt;[\S\s]+)</field>
+    <field name="url_template" type="TextField">http://www.google.com/search?q={{ search }}</field>
+  </object>
+  <object model="bcmagic.keywordmap" pk="5">
+    <field name="keyword" type="CharField">flickr</field>
+    <field name="regex" type="CharField">(?P&lt;search&gt;[\S\s]+)</field>
+    <field name="url_template" type="TextField">http://www.flickr.com/search/?q={{ search }}</field>
+  </object>
+</django-objects>

diff --git a/htsworkflow/frontend/fixtures/initial_data.xml b/htsworkflow/frontend/fixtures/initial_data.xml
new file mode 100644 (file)
index 0000000..b0761a6
--- /dev/null
+++ b/htsworkflow/frontend/fixtures/initial_data.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<django-objects version="1.0">
+  <object model="bcmagic.keywordmap" pk="1">
+    <field name="keyword" type="CharField">frzr</field>
+    <field name="regex" type="CharField">(?P&lt;uuid&gt;[A-Fa-f0-9]+)</field>
+    <field name="url_template" type="TextField">/samples/freezer/{{ uuid }}/</field>
+  </object>
+  <object model="bcmagic.keywordmap" pk="2">
+    <field name="keyword" type="CharField">cntr</field>
+    <field name="regex" type="CharField">(?P&lt;uuid&gt;[A-Fa-f0-9]+)</field>
+    <field name="url_template" type="TextField">/samples/container/{{ uuid }}/</field>
+  </object>
+  <object model="bcmagic.keywordmap" pk="3">
+    <field name="keyword" type="CharField">s</field>
+    <field name="regex" type="CharField">(?P&lt;sampleid&gt;\d+)\|(?P&lt;owner&gt;[A-Za-z0-9_\- ]+)</field>
+    <field name="url_template" type="TextField">/samples/sample/{{ sampleid }}/</field>
+  </object>
+  <object model="bcmagic.keywordmap" pk="4">
+    <field name="keyword" type="CharField">gg</field>
+    <field name="regex" type="CharField">(?P&lt;search&gt;[\S\s]+)</field>
+    <field name="url_template" type="TextField">http://www.google.com/search?q={{ search }}</field>
+  </object>
+    <object model="bcmagic.keywordmap" pk="5">
+    <field name="keyword" type="CharField">flickr</field>
+    <field name="regex" type="CharField">(?P&lt;search&gt;[\S\s]+)</field>
+    <field name="url_template" type="TextField">http://www.flickr.com/search/?q={{ search }}</field>
+  </object>
+</django-objects>

diff --git a/htsworkflow/frontend/settings.py b/htsworkflow/frontend/settings.py
index 42d091adb9939421344b03e209b4ffac3ff9323c..17cdf23c6d26c1507d6217efc6535b58d0b84503 100644 (file)
--- a/htsworkflow/frontend/settings.py
+++ b/htsworkflow/frontend/settings.py
@@ -161,6 +161,7 @@ INSTALLED_APPS = (
     'htsworkflow.frontend.analysis', 
     'htsworkflow.frontend.reports',
     'htsworkflow.frontend.inventory',
+    'htsworkflow.frontend.bcmagic',
     'django.contrib.databrowse',
 )
 

diff --git a/htsworkflow/frontend/static/js/htsw.js b/htsworkflow/frontend/static/js/htsw.js
index 6f00cb16c10f092460c383ce5f48d1e891e94890..4be8a5dc69f6dc21ecb4ced9f74771781c0d2ad1 100644 (file)
--- a/htsworkflow/frontend/static/js/htsw.js
+++ b/htsworkflow/frontend/static/js/htsw.js
@@ -224,7 +224,6 @@ $(document).ready(function(){
     //----------------------------------------
     // ExtJS Barcode Magic Implementation
     var bcmagic_ext_keyhandler = function(sObj, e){
-      //e.preventDefault();
       //Process upon enter key as input.
       if (e.getKey() == e.ENTER)
        bcmagic_process();