Final release commit

bartongroup · Jun 21, 2016 · 28470e9 · 28470e9
1 parent 962ca4c
commit 28470e9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/AlmostSignificant.tar.gz b/AlmostSignificant.tar.gz
diff --git a/almostSignificant/templates/baseAjax.html b/almostSignificant/templates/baseAjax.html
@@ -216,12 +216,10 @@
                 Written by <a id="footer-emaillinks" 
                 href="mailto:[email protected]" title="e-mail me"> Joseph Ward</a> with thanks for help from Nick Schurch.
                 &copy
-                <a id="footer-emaillinks" href="http://gsu.lifesci.dundee.ac.uk/" title="Visit the Genomic Sequecing Unit" target="_blank">Genomic Sequencing Unit</a>, 
                 <a id="footer-emaillinks" href="http://www.compbio.dundee.ac.uk/" title="Visit the Barton Group" target="_blank">Barton Group</a>, 
-                <a id="footer-emaillinks" href="http://www.lifesci.dundee.ac.uk/" title="Visit the College of Life Sciences" target="_blank">College of Life Sciences</a> 
+                <a id="footer-emaillinks" href="http://www.lifesci.dundee.ac.uk/" title="Visit the School of Life Sciences" target="_blank">School of Life Sciences</a> 
             </div>
             <div id="mainlogos">
-                <a href="http://gsu.lifesci.dundee.ac.uk/" target="_blank"><span id="GSUlogo" class="mainlogo" title="Visit the Genomic Sequencing Unit"></span></a>
                 <a href="http://www.dundee.ac.uk/" target="_blank"><span id="UODlogo" class="mainlogo" title="Visit the University of Dundee"></span></a>
             </div>
             <div id="date">

diff --git a/almostSignificant/urls.py b/almostSignificant/urls.py
@@ -17,15 +17,15 @@
     url(r'^project/$', views.projectView, name="project"),
     url(r'^project/Ajax/$', views.projectsAjax, name="projectsAjax"), 
     url(r'^project/([^/]+)/$', views.projectDetailView, name="projectDetailView"),
-#    url(r'^project/[^/]+/sample/(\d+)/Ajax/$', views.sampleAjax), 
+    url(r'^project/[^/]+/sample/(\d+)/Ajax/$', views.sampleAjax), 
 #    url(r'^project/[^/]+/run/(\d{6}_[^/]+)/$', views.runView),
 #    url(r'^project/[^/]+/run/(\d{6}_[^/]+)/Ajax/$', views.runAjax), 
 #    url(r'^project/[^/]+/run/(\d{6}_[^/]+)/(\d)/Ajax/$', views.laneAjax), 
 #    url(r'^project/[^/]+/runs/(\d+)/Ajax/$', views.runSummaryAjax),
 #    url(r'^project/[^/]+/run/\d{6}_[^/]+/sample/(\d+)/Ajax/$', views.sampleAjax), 
     url(r'^project/[^/]+/runNotes/(\d{6}_[^/]+)/$', views.runNotesEntry), 
     url(r'^projectNotes/(.*)/$', views.projectNotesEntry), 
-    url(r'^html/project/(.*)$', views.ProjectDetailViewHTML), 
+    url(r'^project/html/project/(.*)$', views.ProjectDetailViewHTML), 
 #
     url(r'^stats/$', views.statistics, name="stats"),
     url(r'^stats/Ajax/$', views.statisticsAjax),

diff --git a/almostSignificant/views.py b/almostSignificant/views.py
@@ -8,6 +8,7 @@
 from django.contrib import auth
 from django.template import RequestContext
 from django.db.models import Q
+from django.core.urlresolvers import reverse
 from almostSignificant import *
 import os, re, json, itertools, numpy
 from django.utils.http import urlquote
@@ -908,7 +909,6 @@ def buildContaminantsTable(sampleData):
                            %( curOrganism.organism, curOrganism.oneHitOneLib, \
                               curOrganism.manyHitOneLib, curOrganism.oneHitManyLib, \
                               curOrganism.manyHitManyLib) 
-            rightTable = rightTable + currentLine
             #data
             contamData[curOrganism.organism] = [ curOrganism.oneHitOneLib, \
                               curOrganism.manyHitOneLib, curOrganism.oneHitManyLib, \
@@ -1246,7 +1246,7 @@ def ProjectDetailViewHTML(request, projectID):
                    <th>Insert Size</th></tr>'
     tableClose = "</table>"
     tableRowsHTML = header + tableStart + tableHeader
-    runDetail = sampleData[0]
+    runDetail = Run.objects.get(id=sampleData[0].run_id)
     #loop over all of the samples.
     for dataset in sampleData:
         tempDataArray = []
@@ -1256,7 +1256,7 @@ def ProjectDetailViewHTML(request, projectID):
         tempDataArray.append(dataset.sampleDescription)
         tempDataArray.append(dataset.sampleName)
         tempDataArray.append("SAM%s" % dataset.sampleReference)
-        tempDataArray.append( runDetail.runName)
+        tempDataArray.append( runDetail.run.runName)
         tempDataArray.append( str(runDetail.date))
         tempDataArray.append(dataset.lane.lane)
         tempDataArray.append(dataset.readNumber)