add commas to numbers on the library summary statistics page

diff --git a/gaworkflow/frontend/settings.py b/gaworkflow/frontend/settings.py
index 9980c8068b29a032ccd0984767cfd3de7869234f..05d9be56132465910728950c93ddbe7133a6bfb6 100644 (file)
--- a/gaworkflow/frontend/settings.py
+++ b/gaworkflow/frontend/settings.py
@@ -79,6 +79,7 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
+    'django.contrib.humanize',
     'django.contrib.sessions',
     'django.contrib.sites',
     'gaworkflow.frontend.eland_config',
@@ -92,4 +93,4 @@ UPLOADTO_CONFIG_FILE = os.path.join(UPLOADTO_HOME, 'eland_config')
 UPLOADTO_ELAND_RESULT_PACKS = os.path.join(UPLOADTO_HOME, 'eland_results')
 UPLOADTO_BED_PACKS = os.path.join(UPLOADTO_HOME, 'bed_packs')
 
-RESULT_HOME_DIR = os.path.abspath('../../results')
+RESULT_HOME_DIR = os.path.abspath('/woldlab/loxcyc/data00/solexa-sequence/flowcells')

diff --git a/templates/summary_stats.html b/templates/summary_stats.html
index 289015516a9a0e1c83becb6d1a096350fb9fc263..3533477506e6420e87387d5891923129e50a0419 100644 (file)
--- a/templates/summary_stats.html
+++ b/templates/summary_stats.html
@@ -1,3 +1,5 @@
+{% load humanize %}
+
 <hr/>
 <br/>
 <style type="text/css">
@@ -39,7 +41,7 @@
     <td>Flowcell</td>
     <td>Lane</td>
     <td>End</td>
-    <td>Clusters</td>
+    <td>Cluster / Tile</td>
     <td>Raw Reads</td>
     <td>total</td>
     <td>%</td>
@@ -63,20 +65,20 @@
       <td>{{ lane.flowcell_id }}</td>
       <td>{{ lane.lane_id }}</td>
       <td>{% if lane.end %}{{ lane.end }}{% endif %}</td>
-      <td>{{ lane.clusters.0 }} &plusmn; {{ lane.clusters.1 }}</td>
-      <td>{{ lane.reads }}</td>
-      <td>{{ lane.no_match }}</td>
+      <td>{{ lane.clusters.0|intcomma }}</td>
+      <td>{{ lane.reads|intcomma }}</td>
+      <td>{{ lane.no_match|intcomma }}</td>
       <td>{{ lane.no_match_percent|stringformat:".2f" }}</td>
-      <td>{{ lane.qc_failed }}</td>
+      <td>{{ lane.qc_failed|intcomma }}</td>
       <td>{{ lane.qc_failed_percent|stringformat:".2f" }}</td>
-      <td>{{ lane.match_codes.U0 }}</td>
-      <td>{{ lane.match_codes.U1 }}</td>
-      <td>{{ lane.match_codes.U2 }}</td>
-      <td>{{ lane.unique_reads }}</td>
-      <td>{{ lane.match_codes.R0 }}</td>
-      <td>{{ lane.match_codes.R1 }}</td>
-      <td>{{ lane.match_codes.R2 }}</td>
-      <td>{{ lane.repeat_reads }}</td>
+      <td>{{ lane.match_codes.U0|intcomma }}</td>
+      <td>{{ lane.match_codes.U1|intcomma }}</td>
+      <td>{{ lane.match_codes.U2|intcomma }}</td>
+      <td>{{ lane.unique_reads|intcomma }}</td>
+      <td>{{ lane.match_codes.R0|intcomma }}</td>
+      <td>{{ lane.match_codes.R1|intcomma }}</td>
+      <td>{{ lane.match_codes.R2|intcomma }}</td>
+      <td>{{ lane.repeat_reads|intcomma }}</td>
     </tr>
     {% endfor %}
   </tbody>
@@ -90,7 +92,7 @@
 </h2>
   <ul>
     {% for name, counts in lane.summarized_reads.items %}
-    <li><b>{{ name }}</b>: {{ counts }}</li>
+    <li><b>{{ name }}</b>: {{ counts|intcomma }}</li>
     {% endfor %}
   </ul>
 {% endfor %}