Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
vidjil
vidjil
Commits
66f976e5
Commit
66f976e5
authored
Oct 05, 2018
by
Mathieu Giraud
Browse files
Merge remote-tracking branch 'origin/feature-s/stats-bikeshedding' into dev
parents
bc364a73
32de0d24
Pipeline
#42592
failed with stages
in 36 seconds
Changes
4
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
server/web2py/applications/vidjil/controllers/sample_set.py
View file @
66f976e5
...
...
@@ -665,7 +665,7 @@ def getStatHeaders():
lbc
=
LabeledBarChartDecorator
()
g
=
GenescanDecorator
()
l
=
LociListDecorator
()
return
[(
'
sample_
sets'
,
'db'
,
s
),
return
[(
'sets'
,
'db'
,
s
),
#('reads', 'parser', m),
(
'mapped reads'
,
'parser'
,
m
),
#('mapped_percent', 'parser', p),
...
...
@@ -797,7 +797,7 @@ def getStatData(results_file_ids):
set_type
=
res
[
'sample_type'
]
if
res
.
results_file_id
not
in
tmp_data
:
tmp
=
res
.
copy
()
tmp
[
'
sample_
sets'
]
=
[]
tmp
[
'sets'
]
=
[]
tmp_data
[
tmp
[
'results_file_id'
]]
=
tmp
tmp
.
pop
(
'set_id'
,
None
)
tmp
.
pop
(
set_type
,
None
)
...
...
@@ -810,7 +810,7 @@ def getStatData(results_file_ids):
sample_set
[
'name'
]
=
helpers
[
set_type
].
get_name
(
res
[
set_type
])
sample_set
[
'info'
]
=
res
[
'set_info'
]
sample_set
[
'type'
]
=
set_type
tmp
[
'
sample_
sets'
].
append
(
sample_set
)
tmp
[
'sets'
].
append
(
sample_set
)
data
=
[]
...
...
server/web2py/applications/vidjil/views/sample_set/all.html
View file @
66f976e5
...
...
@@ -68,7 +68,7 @@
{{else:}}
<!-- <span class="button2 inactive" onclick="db.call('sample_set/add')" title="you don't have permission to create new {{=helper.get_type_display()}}s"> add sample_set </span> -->
{{pass}}
<span
class=
"button2 devel-mode"
onclick=
"db.call('sample_set/stats', {'type': '{{=helper.get_type()}}', 'filter': '{{=request.vars['filter']}}'})"
>
stats
</span>
<span
class=
"button2 devel-mode"
onclick=
"db.call('sample_set/stats', {'type': '{{=helper.get_type()}}', 'filter': '{{=request.vars['filter']}}'})"
>
preview / quality control
</span>
</div>
<div
class=
"db_block_right"
>
...
...
server/web2py/applications/vidjil/views/sample_set/custom.html
View file @
66f976e5
...
...
@@ -6,9 +6,9 @@
<div>
{{ if request.vars['id']: }}
<h3>
C
ompare samples from {{=helper.get_type_display()}} {{=get_sample_name(request.vars["id"])}}
</h3>
<h3>
Preview or c
ompare samples from {{=helper.get_type_display()}} {{=get_sample_name(request.vars["id"])}}
</h3>
{{ else: }}
<h3>
C
ompare samples
</h3>
<h3>
Preview or c
ompare samples
</h3>
{{pass}}
<p>
Select up to 10 samples to be compared.
</p>
...
...
@@ -102,8 +102,8 @@
</div>
<div
class=
"db_block_right"
>
<span
class=
"devel-mode button2"
onclick=
"db.call('sample_set/multi_sample_stats', {'custom_result': db.getListInput('custom_result[]') })"
>
preview / quality control
</span>
<span
class=
"button2"
onclick=
"myUrl.loadCustomUrl(db)"
>
see results
</span>
<span
class=
"devel-mode button2"
onclick=
"db.call('sample_set/multi_sample_stats', {'custom_result': db.getListInput('custom_result[]') })"
>
stats
</span>
</div>
</div>
...
...
server/web2py/applications/vidjil/views/sample_set/multi_sample_stats.html
View file @
66f976e5
{{extend 'db_layout.html'}}
<h3></h3>
<div
id=
"db_table_container"
>
<table
class=
"db_table"
id=
"table"
>
<thead>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment