diff --git a/AlmostSignificant.tar.gz b/AlmostSignificant.tar.gz
index 86b78cd..9efe52b 100644
Binary files a/AlmostSignificant.tar.gz and b/AlmostSignificant.tar.gz differ
diff --git a/almostSignificant/templates/baseAjax.html b/almostSignificant/templates/baseAjax.html
index 4a9e33f..90cd3b8 100644
--- a/almostSignificant/templates/baseAjax.html
+++ b/almostSignificant/templates/baseAjax.html
@@ -216,12 +216,10 @@
Written by with thanks for help from Nick Schurch.
©
- ,
,
-
+
diff --git a/almostSignificant/urls.py b/almostSignificant/urls.py
index 84d2211..a633c37 100644
--- a/almostSignificant/urls.py
+++ b/almostSignificant/urls.py
@@ -17,7 +17,7 @@
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),
@@ -25,7 +25,7 @@
# 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
index d8c468c..67ad7c2 100644
--- 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):
Insert Size | '
tableClose = ""
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)