minor changes

diff --git a/htswfrontend/htswfrontend/exp_track/exptrack.py b/htswfrontend/htswfrontend/exp_track/exptrack.py
index 6486b5c5f0bbbe1017d7a48f2a355f176c6527ba..2105d457ae6070678c8d24e0974af50939aaf86f 100755 (executable)
--- a/htswfrontend/htswfrontend/exp_track/exptrack.py
+++ b/htswfrontend/htswfrontend/exp_track/exptrack.py
@@ -82,7 +82,7 @@ def generateConfile(request,fcid):
     #if not granted: return HttpResponse("access denied.")
 
     cnfgfile = 'READ_LENGTH 25\n'
-    cnfgfile += 'ANALYSIS eland\n'
+    cnfgfile += 'ANALYSIS eland_extended\n'
     cnfgfile += 'GENOME_FILE all_chr.fa\n'
     cnfgfile += 'ELAND_MULTIPLE_INSTANCES 8\n'
     genome_dir = 'GENOME_DIR /Volumes/Genomes/'

diff --git a/htswfrontend/htswfrontend/exp_track/models.py b/htswfrontend/htswfrontend/exp_track/models.py
index faf09117d24e538dd53062729878e61e6d281741..1dcfee2b2c25e41a264b0e09c0afff9b9146a855 100755 (executable)
--- a/htswfrontend/htswfrontend/exp_track/models.py
+++ b/htswfrontend/htswfrontend/exp_track/models.py
@@ -151,7 +151,14 @@ class DataRun(models.Model):
     str += '<div style="margin-top:5px;">'    
     str +='<a title="View Lane List here ..."  onClick="el = document.getElementById(\'LanesOf'+self.fcid.__str__()+'\');if(el) (el.style.display==\'none\'?el.style.display=\'block\':el.style.display=\'none\')" style="cursor:pointer;color: #5b80b2;">View/hide lanes</a>'
     str += '<div id="LanesOf'+self.fcid.__str__()+'" style="display:block;border:solid #cccccc 1px;width:350px">'
-    LanesList = '1: '+self.fcid.lane_1_library.__str__()+' ('+self.fcid.lane_1_library.library_species.use_genome_build+')<br/>2: '+self.fcid.lane_2_library.__str__()+' ('+self.fcid.lane_2_library.library_species.use_genome_build+')<br/>3: '+self.fcid.lane_3_library.__str__()+' ('+self.fcid.lane_3_library.library_species.use_genome_build+')<br/>4: '+self.fcid.lane_4_library.__str__()+' ('+self.fcid.lane_4_library.library_species.use_genome_build+')<br/>5: '+self.fcid.lane_5_library.__str__()+' ('+self.fcid.lane_5_library.library_species.use_genome_build+')<br/>6: '+self.fcid.lane_6_library.__str__()+' ('+self.fcid.lane_6_library.library_species.use_genome_build+')<br/>7: '+self.fcid.lane_7_library.__str__()+' ('+self.fcid.lane_7_library.library_species.use_genome_build+')<br/>8: '+self.fcid.lane_8_library.__str__()+' ('+self.fcid.lane_8_library.library_species.use_genome_build+')'
+    LanesList = '<div style="'+('background-color:#cccccc;' if 'Bad library' in self.fcid.lane_1_library.libtags() else '')+'">1: '+self.fcid.lane_1_library.__str__()+' ('+self.fcid.lane_1_library.library_species.use_genome_build+')</div> '
+    LanesList += '<div style="'+('background-color:#cccccc;' if 'Bad library' in self.fcid.lane_2_library.libtags() else '')+'">2: '+self.fcid.lane_2_library.__str__()+' ('+self.fcid.lane_2_library.library_species.use_genome_build+')</div>'
+    LanesList += '<div style="'+('background-color:#cccccc;' if 'Bad library' in self.fcid.lane_3_library.libtags() else '')+'">3: '+self.fcid.lane_3_library.__str__()+' ('+self.fcid.lane_3_library.library_species.use_genome_build+')</div>'
+    LanesList += '<div style="'+('background-color:#cccccc;' if 'Bad library' in self.fcid.lane_4_library.libtags() else '')+'">4: '+self.fcid.lane_4_library.__str__()+' ('+self.fcid.lane_4_library.library_species.use_genome_build+')</div>'
+    LanesList += '<div style="'+('background-color:#cccccc;' if 'Bad library' in self.fcid.lane_5_library.libtags() else '')+'">5: '+self.fcid.lane_5_library.__str__()+' ('+self.fcid.lane_5_library.library_species.use_genome_build+')</div>'
+    LanesList += '<div style="'+('background-color:#cccccc;' if 'Bad library' in self.fcid.lane_6_library.libtags() else '')+'">6: '+self.fcid.lane_6_library.__str__()+' ('+self.fcid.lane_6_library.library_species.use_genome_build+')</div>'
+    LanesList += '<div style="'+('background-color:#cccccc;' if 'Bad library' in self.fcid.lane_7_library.libtags() else '')+'">7: '+self.fcid.lane_7_library.__str__()+' ('+self.fcid.lane_7_library.library_species.use_genome_build+')</div>'
+    LanesList += '<div style="'+('background-color:#cccccc;' if 'Bad library' in self.fcid.lane_8_library.libtags() else '')+'">8: '+self.fcid.lane_8_library.__str__()+' ('+self.fcid.lane_8_library.library_species.use_genome_build+')</div>'
     str += LanesList ## self.fcid.Lanes()
     str += '</div>'
     str += '<div><a title="open Flowcell record" href="/admin/exp_track/flowcell/'+self.fcid.id.__str__()+'/" target=_self>Edit Flowcell record</a>'

diff --git a/htswfrontend/htswfrontend/exp_track/views.py b/htswfrontend/htswfrontend/exp_track/views.py
index e59d52c319a1e51353c2267d0a5270c55769907a..c8f0233b8c2b5a1fc5f5488be5ca604b0f7c7775 100755 (executable)
--- a/htswfrontend/htswfrontend/exp_track/views.py
+++ b/htswfrontend/htswfrontend/exp_track/views.py
@@ -33,3 +33,6 @@ def makeFCSheet(request,fcid):
     pass
   lanes = ['1','2','3','4','5','6','7','8']
   return render_to_response('exptrack/flowcellSheet.html',{'fc': rec})
+
+def DRuns():
+  return 'test'