Commit 253dcdf4 authored by Penom Nom's avatar Penom Nom
Browse files

Fix key arrow for carousel. project name to retrieve in CasavaG6Wf is the same...

Fix key arrow for carousel. project name to retrieve in CasavaG6Wf is the same as project name in ng6 database
parent 5e47d99e
......@@ -310,18 +310,11 @@ class CasavaNG6Workflow(NG6Workflow):
assert len(barcodes_list) == len(sample_ids_list) == len(subdirs_list), "Invalid lane {0} in SampleSheet.mk".format(lane_number)
# get the casava project_name from subdirs
input_files = None
project_name = None
for subdir in subdirs_list :
m = re.match( r"^Project_(.*)/Sample_", subdir)
if m :
project_name = m.group(1)
input_files = casava_directory.get_files( lane_number, project_name)
break
if input_files is None :
raise Exception("Error while parsing casava directory %s, invalide project name for lane %s"% (casava_directory, lane_number))
project_name = self.project_name.replace(" ", "_")
input_files = casava_directory.get_files( lane_number, project_name)
if len(input_files) == 0 :
raise Exception("Error while parsing casava directory %s, invalid project name '%s' for lane %s"% (casava_directory, project_name, lane_number))
# parse samples
for i in range(len(barcodes_list)):
......
......@@ -1812,6 +1812,10 @@ function addRunHandler() {
' </div>'
].join(''));
$('#myCarousel').on('keydown', 'input', function(e) {
e.stopPropagation();
});
$("#refresh_workflow, #rerun_workflow, #reset_workflow, #run_workflow, #back_to_workflows_list").hide();
$("#close").show();
$('#availableWorkflows').html("wait");
......@@ -2028,6 +2032,10 @@ function addFileHandler( event ){
}
parameters["admin_login"] = $("#user_login").val();
$('#myCarousel').on('keydown', 'input', function(e) {
e.stopPropagation();
});
$("#close").show();
$('#wfForm').on("loaded.wfform", function(event, workflow) {
$('#setAndRunModalLabel').html(workflow["name"] + " <small>" + workflow["help"] + "</small>");
......@@ -2092,6 +2100,10 @@ function addAnalysisHandler(){
' </div>'
].join(''));
$('#myCarousel').on('keydown', 'input', function(e) {
e.stopPropagation();
});
$("#reset_workflow, #run_workflow, #refresh_workflow, #rerun_workflow").hide();
$("#close").show();
//
......
......@@ -3,4 +3,4 @@
l8_BARCODES:=CACGAT Undetermined CCAACA
l8_SAMPLEIDS:=Histone-1-3 lane8 Control-2-2
l8_SUBDIRS:=Project_REPDEV/Sample_Histone-1-3 Undetermined_indices/Sample_lane8 Project_REPDEV/Sample_Control-2-2
l8_SUBDIRS:=Project_Demo_project/Sample_Histone-1-3 Undetermined_indices/Sample_lane8 Project_Demo_project/Sample_Control-2-2
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment