Skip to content

August 23rd Release Candidate #2248

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 27 commits into from
Aug 21, 2017
Merged

August 23rd Release Candidate #2248

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
79b232f
fix #2229
antgonza Aug 16, 2017
2d48a65
cleaning html
antgonza Aug 16, 2017
ee0deb4
fix #2225 and partial #2224
antgonza Aug 16, 2017
4dc760b
fix errors
antgonza Aug 16, 2017
868a9e0
fix #2224 and fix #2223
antgonza Aug 17, 2017
e5ff2c8
fixing comments/errors
antgonza Aug 17, 2017
24b7d8e
Remove race condition - Fixes 2143 (#2203)
josenavas Aug 17, 2017
51ff4f9
fixing error
antgonza Aug 17, 2017
adf98a3
fix #2216
antgonza Aug 17, 2017
4af4656
Merge pull request #2243 from antgonza/fix-2216
adswafford Aug 17, 2017
a450aeb
Merge pull request #2242 from antgonza/fix-2225
adswafford Aug 18, 2017
db0a4b6
Merge pull request #2241 from antgonza/fix-2229
adswafford Aug 18, 2017
899268a
delete-root-analysis-artifact
antgonza Aug 18, 2017
3e17876
fix errors
antgonza Aug 18, 2017
a369cad
Merge pull request #2244 from antgonza/delete-root-analysis-artifact
josenavas Aug 18, 2017
773c8da
fix #2210
antgonza Aug 20, 2017
4bf4e97
fix error
antgonza Aug 20, 2017
a5836b1
fixing test
antgonza Aug 21, 2017
c925756
fix errors
antgonza Aug 21, 2017
19b4fe3
fixes 1880
josenavas Aug 21, 2017
d1bbe46
Removing commented code
josenavas Aug 21, 2017
63ccfd9
Fixing test
josenavas Aug 21, 2017
acd27f5
fix #2211 (#2240)
antgonza Aug 21, 2017
eae20cc
DEBUG: adding prints to see the actual error
josenavas Aug 21, 2017
b7e2cc9
Fixing test and remove debug code
josenavas Aug 21, 2017
39b2b84
Merge pull request #2247 from josenavas/fix-1880
tanaes Aug 21, 2017
f94af55
Merge pull request #2246 from antgonza/fix-2210
tanaes Aug 21, 2017
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