Skip to content

fix #2216 #2243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 17, 2017
Merged

fix #2216 #2243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions qiita_pet/handlers/artifact_handlers/base_handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ def artifact_summary_get_request(user, artifact_id):
'processing_jobs': processing_jobs,
'summary': summary,
'job': job_info,
'artifact_timestamp': artifact.timestamp.strftime(
"%Y-%m-%d %H:%m"),
'errored_jobs': errored_jobs}


Expand Down
7 changes: 7 additions & 0 deletions qiita_pet/handlers/artifact_handlers/tests/test_base_handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ def test_artifact_summary_get_request(self):
(2L, '1_s_G1_L001_sequences_barcodes.fastq.gz (raw barcodes)')]
exp = {'name': 'Raw data 1',
'artifact_id': 1,
'artifact_timestamp': '2012-10-01 09:10',
'visibility': 'private',
'editable': True,
'buttons': ('<button onclick="if (confirm(\'Are you sure you '
Expand Down Expand Up @@ -120,6 +121,7 @@ def test_artifact_summary_get_request(self):
obs = artifact_summary_get_request(user, 1)
exp = {'name': 'Raw data 1',
'artifact_id': 1,
'artifact_timestamp': '2012-10-01 09:10',
'visibility': 'private',
'editable': True,
'buttons': ('<button onclick="if (confirm(\'Are you sure you '
Expand Down Expand Up @@ -155,6 +157,7 @@ def test_artifact_summary_get_request(self):
obs = artifact_summary_get_request(user, 1)
exp = {'name': 'Raw data 1',
'artifact_id': 1,
'artifact_timestamp': '2012-10-01 09:10',
'visibility': 'private',
'editable': True,
'buttons': ('<button onclick="if (confirm(\'Are you sure you '
Expand Down Expand Up @@ -184,6 +187,7 @@ def test_artifact_summary_get_request(self):
obs = artifact_summary_get_request(demo_u, 1)
exp = {'name': 'Raw data 1',
'artifact_id': 1,
'artifact_timestamp': '2012-10-01 09:10',
'visibility': 'public',
'editable': False,
'buttons': '',
Expand All @@ -210,6 +214,7 @@ def test_artifact_summary_get_request(self):
(5L, '1_seqs.demux (preprocessed demux)')]
exp = {'name': 'Demultiplexed 1',
'artifact_id': 2,
'artifact_timestamp': '2012-10-01 10:10',
'visibility': 'private',
'editable': True,
'buttons': ('<button onclick="if (confirm(\'Are you sure you '
Expand Down Expand Up @@ -245,6 +250,8 @@ def test_artifact_summary_get_request(self):
obs = artifact_summary_get_request(user, 8)
exp = {'name': 'noname',
'artifact_id': 8,
# this value changes on build so copy from obs
'artifact_timestamp': obs['artifact_timestamp'],
'visibility': 'sandbox',
'editable': True,
'buttons': '',
Expand Down
1 change: 1 addition & 0 deletions qiita_pet/templates/artifact_ajax/artifact_summary.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ <h4>
</h4>
{% if processing_parameters %}
<p style="padding: 10px 10px 10px 10px; border-radius: 10px; background: #EEE;">
<b>Timestamp:</b> {{artifact_timestamp}} ||
<b>Processing parameters:</b>
{% for key in processing_parameters %}
<i>{% raw key %}</i>: <i>{% raw processing_parameters[key] %}</i>
Expand Down