Skip to content

fix #2601 #2617

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 4 commits into from
Jul 6, 2018
Merged

fix #2601 #2617

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de4a51e
fix #2601
antgonza Jul 5, 2018
e1aea11
sphere->circle
antgonza Jul 5, 2018
01154ef
addressing @ElDeveloper comment
antgonza Jul 5, 2018
59446f1
circle_name -> var circle_name
antgonza Jul 5, 2018
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Version 062018

* We haven't updated the ChangeLog for a while (since circa 2015). Anyway, we will ask developers to add an entry for any new features in Qiita.
* Now you can select or unselect all files in the upload folder.
* Added circle color explanation in the processing network
* Fixed error in the sample info category summary (https://github.com/biocore/qiita/issues/2610)

Version 0.2.0-dev
Expand Down
26 changes: 25 additions & 1 deletion qiita_pet/static/js/networkVue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Vue.component('processing-graph', {
'</div>' +
'<div class="row">' +
'<div class="col-md-12">' +
'<b>Click on the graph to navigate through it. Click circles for more information. This graph will refresh in <span id="countdown-span"></span> seconds or reload <a href="#" id="refresh-now-link">now</a></b>' +
'<b>Click on the graph to navigate through it. Click circles for more information. This graph will refresh in <span id="countdown-span"></span> seconds or reload <a href="#" id="refresh-now-link">now</a><br/><span id="circle-explanation"></span></b>' +
'</div>' +
'</div>' +
'</div>' +
Expand Down Expand Up @@ -1076,6 +1076,7 @@ Vue.component('processing-graph', {
'artifact': {border: '#BBBBBB', background: '#FFFFFF', highlight: {border: '#999999', background: '#FFFFFF'}},
'type': {border: '#BBBBBB', background: '#CCCCCC', highlight: {border: '#999999', background: '#DDDDDD'}},
'deleting': {border: '#ff3333', background: '#ff6347', highlight: {border: '#ff3333', background: '#ff6347'}}};

show_loading('processing-network-div');
$("#processing-network-div").hide();

Expand All @@ -1087,6 +1088,29 @@ Vue.component('processing-graph', {
vm.update_job_status();
});

var circle_statuses = [];
var circle_types = [];
for (circle_name in vm.colorScheme) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

circle_name -> var circle_name

var text = '<td style="padding: 5px; background-color:' + vm.colorScheme[circle_name]['background'] +
';"><small>' + circle_name + '</small></td>';
if (circle_name === 'artifact' || circle_name === 'type'){
circle_types.push(text);
} else {
circle_statuses.push(text);
}
}
var full_text = '<table style="border-spacing: 3px;border-collapse: separate;">' +
'<tr>' +
'<td><small>Circle status:</small></td>' +
'<td>' + circle_statuses.join('') + '</td>' +
'</tr>' +
'<tr>' +
'<td><small>Circle types:</small>' +
'<td>' + circle_types.join('') + '</td>' +
'</tr>' +
'</table>';
$('#circle-explanation').html(full_text);

// This call to udpate graph will take care of updating the jobs
// if the graph is not available
vm.updateGraph();
Expand Down