Skip to content
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

Hotfix/network error msg #217

Merged
merged 3 commits into from
Nov 28, 2024
Merged

Hotfix/network error msg #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6fcaabe
clarify close button
nlouwen Nov 28, 2024
bc36c25
default to most recent finished run and clarify no network error
nlouwen Nov 28, 2024
ab49263
Update big_scape/output/html_template/output/index.html
nlouwen Nov 28, 2024
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
5 changes: 3 additions & 2 deletions big_scape/output/html_template/output/html_content/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,12 +220,13 @@ a.anchor {
height: 10px;
width: 10px;
display: block;
border: 1px solid black;
border: 1px solid var(--text-color-tooltip);
background: green;
}

.showhide-btn.active {
background: red;
background: -webkit-linear-gradient(-45deg, transparent 0%, transparent 45%, black 45%, black 55%, transparent 55%, transparent 100%), -webkit-linear-gradient(45deg, transparent 0%, transparent 45%, black 46%, black 56%, transparent 56%, transparent 100%);
background-color: red;
}

.navtext-container {
Expand Down
10 changes: 8 additions & 2 deletions big_scape/output/html_template/output/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,8 +468,14 @@ <h3>Network</h3>
}
$("#bigscape-runs").html("")
for (var [run_id, data] of Object.entries(run_data)) {
var inc = data["end_time"] ? "" : "(Unfinished) " // label runs that did not finish
for (var cutoff of data["cutoffs"].split(",")) {
$("#bigscape-runs").append("<option value='" + run_id + "," + cutoff + "'>" + data["label"] + "_c" + cutoff + "</option>");
var val = run_id + "," + cutoff
$("#bigscape-runs").append("<option value='" + val + "'>" + inc + data["label"] + "_c" + cutoff + "</option>");
}
// set default loaded run to the most recent finished run
if (!inc) {
$("#bigscape-runs").val(val)
}
}
$("#bigscape-runs").off().on("change", function () {
Expand Down Expand Up @@ -899,7 +905,7 @@ <h3>Network</h3>
WHERE family.run_id==${run_id} AND family.cutoff==${cutoff}
GROUP BY gbk.organism`)[0]
if (gbk_org_data === undefined) {
throw Error("There were no networks created in this run")
throw Error("There were no networks created in this run;\nPlease select another run from the dropdown menu")
}
var pieLabels = []
var pieData = []
Expand Down
Loading