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
85bd3383
Commit
85bd3383
authored
Apr 07, 2017
by
Ryan Herbert
Browse files
Merge branch 'hotfix-s/update_pre_process_status_edit_sample' into dev
parents
1ec9b137
0a9168d7
Changes
2
Hide whitespace changes
Inline
Side-by-side
server/web2py/applications/vidjil/views/pre_process/info.html
View file @
85bd3383
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
sequence_file_id = request.vars["sequence_file_id"]
sequence_file_id = request.vars["sequence_file_id"]
sequence_file = db.sequence_file[sequence_file_id]
sequence_file = db.sequence_file[sequence_file_id]
run = db(db.scheduler_run.task_id == sequence_file.pre_process_scheduler_task_id).select().first()
run = db(db.scheduler_run.task_id == sequence_file.pre_process_scheduler_task_id).select(
orderby=~db.scheduler_run.stop_time
).first()
}}
}}
...
...
server/web2py/applications/vidjil/views/sample_set/index.html
View file @
85bd3383
...
@@ -83,9 +83,10 @@
...
@@ -83,9 +83,10 @@
<td>
{{=row.sequence_file.info}}
</td>
<td>
{{=row.sequence_file.info}}
</td>
<td
{{
if
row.sequence_file.data_file =
=
None
:
}}
{{=
XML
("
class=
'inactive'
title=
'file is missing'
")}}
{{
pass
}}
>
<td
{{
if
row.sequence_file.data_file =
=
None
:
}}
{{=
XML
("
class=
'inactive'
title=
'file is missing'
")}}
{{
pass
}}
>
{{=vidjil_utils.format_size(row.sequence_file.size_file)}}
</td>
{{=vidjil_utils.format_size(row.sequence_file.size_file)}}
</td>
<td
{{
if
row.sequence_file.pre_process_id
!=
None:
}}
class=
"pointer"
{{ has_pre_process = row.sequence_file.pre_process_id != None}}
<td
{{
if
has_pre_process:
}}
class=
"pointer"
title=
"View more information on the pre-process {{=pre_process_list[row.sequence_file.pre_process_id]}}"
{{
pass
}}
title=
"View more information on the pre-process {{=pre_process_list[row.sequence_file.pre_process_id]}}"
{{
pass
}}
onclick=
"db.call('pre_process/info', {'sequence_file_id' :'{{=row.sequence_file.id }}', 'sample_set_id' : '{{=request.vars["
id
"]}}'}
)"
{{
if
has_pre_process:
}}
onclick=
"db.call('pre_process/info', {'sequence_file_id' :'{{=row.sequence_file.id }}', 'sample_set_id' : '{{=request.vars["
id
"]}}'}
)"
{{
pass
}}
>
>
{{if row.sequence_file.pre_process_flag == "RUN" :}}
<i
class=
"icon-spin4"
style=
"animation: spin 2s 1000 linear;
{{if row.sequence_file.pre_process_flag == "RUN" :}}
<i
class=
"icon-spin4"
style=
"animation: spin 2s 1000 linear;
display: inline-block;"
title=
"running pre_processs"
></i>
{{pass}}
display: inline-block;"
title=
"running pre_processs"
></i>
{{pass}}
...
...
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