Commit 45cad7c3 authored by Mathieu Giraud's avatar Mathieu Giraud Committed by Vidjil

views/*: multi-upload, bikeshedding text and button placement

parent cd9c1f90
Pipeline #19874 passed with stages
in 42 seconds
......@@ -12,8 +12,10 @@
<p></p>
{{pass}}
<div {{if source_module_active:}} hidden {{pass}}>
<h3>Pre-process scenario</h3>
If you have two R1/R2 files per sample, please select an appropriate pre-process :
<select id="pre_process" name="pre_process" onChange="db.pre_process_onChange(this)" {{if source_module_active:}} disabled {{pass}}>
<option required_files="1" value="0">no pre-process (1 file)</option>
<option required_files="1" value="0">no pre-process (1 file per sample)</option>
{{for row in pre_process_list :}}
<option title="{{=row["info"]}}" required_files="{{=row["file"]}}" value="{{=row["id"]}}"
{{if 'file_id' in request.vars and row["id"]==files[0].pre_process_id :}}selected{{pass}}>
......@@ -23,14 +25,18 @@
</select>
</div>
<div>
Samples have to be associated with at least one patient, run or set.<br>You can also associate them with any combination of the three.
<h3>Patient, run or set association</h3>
Samples have to be associated with at least one patient, run or set.
You can also associate them with any combination of the three.
All the samples added here will be associated to the "common sets".
Moreover, in the sample list, you can associate individually some samples to some specific patient, run or set.
</div>
&nbsp;
<div class="field_div">
{{ if len(errors) > 0: }}
<div class="error">{{=", ".join(errors)}}</div>
{{ pass }}
<label for="set_ids" id="set_ids__label">sets: </label>
<label for="set_ids" id="set_ids__label">Common sets: </label>
<div class="token_div form-control" onclick="$('#token_input').focus()">
<input
hidden
......@@ -60,13 +66,19 @@
</div>
</div>
<div class="clear"></div>
<div>
<h3>Sample list</h3>
</div>
<div class="buttons_add_elements">
<span class="button"
Click on
<span class="button2"
onclick="add_file('fieldset_container', this.dataset.index++, {{=group_ids}})"
id="file_button"
data-index="{{=len(files)}}">add other sample</span>
<div class="clear"></div>
to add at once more than one sample.
</div>
<div class="clear"></div>
<div id="fieldset_container">
{{ for i, file in enumerate(files): }}
<div class="clear"></div>
......@@ -74,7 +86,7 @@
{{ pass }}
</div>
<div class="clear"></div>
<input type="submit" value="submit" class="btn">
<input type="submit" value="Submit all sample(s)" class="button2">
</form>
<div id="jstree_container" class="modal jstree-container">
......
......@@ -21,7 +21,7 @@
disabled
{{pass}}
onchange="db.upload_file_onChange('file_filename_{{=i}}', this.value)"
title="(.fa, .fastq, .fa.gz, .fastq.gz, .clntab)"
title="first file for this sample (.fa, .fastq, .fa.gz, .fastq.gz, .clntab)"
>
</div>
<div id="file_2_{{=i}}" class="field_div file_2" style="display: none">
......@@ -29,7 +29,7 @@
{{if source_module_active:}}
disabled
{{pass}}
title="(.fa, .fastq, .fa.gz, .fastq.gz, .clntab)"
title="second file for this sample (.fa, .fastq, .fa.gz, .fastq.gz)"
>
</div>
<div id="jstree_field_{{=i}}"
......@@ -47,14 +47,14 @@
placeholder="yyyy-mm-dd" pattern="(?:19|20)[0-9]{2}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-9])|(?:(?!02)(?:0[1-9]|1[0-2])-(?:30))|(?:(?:0[13578]|1[02])-31))">
</div>
<div class="field_div">
<textarea id="file_info_{{=i}}"
<input id="file_info_{{=i}}"
onfocus="new VidjilAutoComplete().setupTags(this);"
data-needs-atwho="true"
data-keys="{{=group_ids}}"
class="text form-control"
name="file[{{=i}}][info]"
rows="1"
placeholder="Info">{{if 'info' in file and file['info'] is not None:}}{{=file['info']}}{{pass}}</textarea>
placeholder="sample information">{{if 'info' in file and file['info'] is not None:}}{{=file['info']}}{{pass}}</input>
</div>
<div class="field_div">
<div class="token_div form-control" onclick="$('#token_input_{{=i}}').focus()">
......@@ -82,7 +82,7 @@
data-needs-tokeniser="true"
data-group-ids="{{=upload_group_ids}}"
data-keys='["generic", "patient", "run"]'
placeholder="Sets"
placeholder="specific sets"
type="text">
</div>
</div>
......
......@@ -188,7 +188,7 @@
<div class="db_block_left">
{{if can_upload: }}
<span class="button2" onclick="db.call('file/form', { 'sample_set_id' : '{{=request.vars["id"]}}' } )"> + add sample </span>
<span class="button2" onclick="db.call('file/form', { 'sample_set_id' : '{{=request.vars["id"]}}' } )"> + add samples </span>
{{pass}}
<span class="button2" onclick="db.call('sample_set/custom', {'id': '{{=request.vars['id']}}', 'filter': ''} )">compare some of these samples</span>
......
Markdown is supported
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