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
9b45689f
Commit
9b45689f
authored
Oct 22, 2014
by
Marc Duez
Browse files
server : keep old results_file
-display only most recent results_file -use only most recent result file for fuse
parent
038e4146
Changes
2
Hide whitespace changes
Inline
Side-by-side
server/web2py/applications/vidjil/models/task.py
View file @
9b45689f
...
...
@@ -13,11 +13,10 @@ def schedule_run(id_sequence, id_config):
(
db
.
results_file
.
sequence_file_id
==
id_sequence
)
).
select
()
if
len
(
row
)
>
0
:
## update
data_id
=
row
[
0
].
id
else
:
## create
data_id
=
db
.
results_file
.
insert
(
sequence_file_id
=
id_sequence
,
config_id
=
id_config
)
ts
=
time
.
time
()
data_id
=
db
.
results_file
.
insert
(
sequence_file_id
=
id_sequence
,
run_date
=
datetime
.
datetime
.
fromtimestamp
(
ts
).
strftime
(
'%Y-%m-%d %H:%M:%S'
),
config_id
=
id_config
)
## check fused_file
row2
=
db
(
(
db
.
fused_file
.
config_id
==
id_config
)
&
...
...
@@ -117,7 +116,7 @@ def run_vidjil(id_file, id_config, id_data, id_fuse):
&
(
db
.
results_file
.
sequence_file_id
==
db
.
sequence_file
.
id
)
&
(
db
.
patient
.
id
==
id_patient
)
&
(
db
.
results_file
.
config_id
==
id_config
)
).
select
(
orderby
=
db
.
sequence_file
.
sampling_date
)
).
select
(
orderby
=
db
.
results_file
.
sequence_file_id
|
db
.
results_file
.
run_date
,
groupby
=
db
.
results_file
.
sequence_file_id
)
for
row
in
query
:
if
row
.
results_file
.
data_file
is
not
None
:
files
+=
os
.
path
.
abspath
(
os
.
path
.
dirname
(
sys
.
argv
[
0
]))
+
"/applications/vidjil/uploads/"
+
row
.
results_file
.
data_file
+
" "
...
...
server/web2py/applications/vidjil/views/patient/info.html
View file @
9b45689f
...
...
@@ -36,8 +36,23 @@
{{pass}}
{{if config :}}
{{
query = db(
query = db(
(db.sequence_file.patient_id==db.patient.id)
&
(db.patient.id==request.vars["id"])
).select(
left=db.results_file.on(
(db.results_file.sequence_file_id==db.sequence_file.id)
&
(db.results_file.config_id==str(config_id) )
),
orderby = db.results_file.sequence_file_id|db.results_file.run_date,
groupby = db.results_file.sequence_file_id
)
}}
{{else:}}
{{
query = db(
(db.sequence_file.patient_id==db.patient.id)
&
(db.patient.id==request.vars["id"])
).select(
...
...
@@ -47,6 +62,7 @@ query = db(
)
)
}}
{{pass}}
<div>
...
...
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