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

Implementing a fix to issue #277 #126

Merged
merged 2 commits into from
Jan 12, 2024
Merged

Implementing a fix to issue #277 #126

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d40bb38
Implementing a fix to issue #277
spond Dec 20, 2023
c9a6c92
Updating color schemes
spond Jan 4, 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
78 changes: 69 additions & 9 deletions src/clusternetwork.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,28 +112,42 @@ var _networkSequentialColor = {
],
};

/*
Sex/Transmission Risk

IDU= blue
Heterosexual= green
Perinatal, child= red
MMSC= orange
Other= grey (leave as-is)*/

var _networkPresetColorSchemes = {
sex_trans: {
"MSM-Male": "#1f78b4",
"MMSC-Male": "#FFBF00",
"MSM-Unknown sex": "#1f78b4",
"Heterosexual Contact-Male": "#e31a1c",
"Heterosexual Contact-Female": "#e31a1c",
"Heterosexual Contact-Unknown sex": "#e31a1c",
"IDU-Male": "#33a02c",
"MMSC-Unknown sex": "#FFBF00",
"Heterosexual Contact-Male": "#AAFF00",
"Heterosexual Contact-Female": "#AAFF00",
"Heterosexual Contact-Unknown sex": "#AAFF00",
"IDU-Male": "#0096FF",
"MSM & IDU-Male": "#33a02c",
"IDU-Female": "#33a02c",
"IDU-Unknown sex": "#33a02c",
"MMSC & IDU-Unknown sex": "#0096FF",
"MMSC & IDU-Male": "#FFBF00",
"IDU-Female": "#0096FF",
"IDU-Unknown sex": "#0096FF",
"Other/Unknown-Male": "#636363",
"Other/Unknown-Female": "#636363",
"Other-Male": "#636363",
"Other-Female": "#636363",
Missing: "#636363",
"": "#636363",
"Other/Unknown-Unknown sex": "#636363",
Perinatal: "#ff7f00",
"Other/Unknown-Child": "#ff7f00",
"Other-Child": "#ff7f00",
Perinatal: "#D2042D",
"Other/Unknown-Child": "#D2042D",
"Other-Child": "#D2042D",
},

race_cat: {
Asian: "#1f77b4",
"Black/African American": "#bcbd22",
Expand All @@ -147,6 +161,26 @@ var _networkPresetColorSchemes = {
missing: "#999",
White: "#d62728",
},
sex_birth: {
Male: "#FF6700",
Female: "#50c878",
Unknown: "#999",
},
birth_sex: {
Male: "#FF6700",
Female: "#50c878",
Unknown: "#999",
},

gender_identity: {
Woman: "#AAFF00",
"Transgender woman": "#228B22",
Man: "#FFBF00",
"Transgender man": "#FF5F1F",
"Declined to answer": "#FAFA33",
"Additional gender identity": "#D2042D",
Unknown: "#999",
},
};

var _networkPresetShapeSchemes = {
Expand All @@ -157,6 +191,23 @@ var _networkPresetShapeSchemes = {
missing: "diamond",
Unknown: "diamond",
},
sex_birth: {
Male: "square",
Female: "ellipse",
Missing: "diamond",
missing: "diamond",
Unknown: "diamond",
},
gender_identity: {
Man: "square",
Woman: "ellipse",
"Transgender man": "hexagon",
"Transgender woman": "circle",
"Additional gender identity": "pentagon",
Unknown: "diamond",
"Declined to answer": "diamond",
Unknown: "diamond",
},
race_cat: {
Asian: "hexagon",
"Black/African American": "square",
Expand Down Expand Up @@ -10272,9 +10323,18 @@ var hivtrace_cluster_network_graph = function (

if (cat_id) {
if (cat_id in self.networkColorScheme) {
let cat_data = graph_data[_networkGraphAttrbuteID][cat_id]["enum"];
if (cat_data) {
cat_data = new Set(_.map(cat_data, (d) => d.toLowerCase()));
}
var domain = [],
range = [];
_.each(self.networkColorScheme[cat_id], function (value, key) {
if (cat_data) {
if (!cat_data.has(key.toLowerCase())) {
return;
}
}
domain.push(key);
range.push(value);
});
Expand Down
Loading