diff --git a/public/curation/conflict/index.html b/public/curation/conflict/index.html new file mode 100644 index 0000000..620b3eb --- /dev/null +++ b/public/curation/conflict/index.html @@ -0,0 +1,95 @@ + + + + + + + + + + Software CaRD + + + + + + + + + +

Curation Conflict

+ + +
+

See the conflict in the folling tables:

+
+ + + + + + + + + + + + + + + + +
CITATION.cff
@id + https://orcid.org/0000-0001-6372-3853 +
+ + + + + + + + + + + + + + + +
codemeta.md
@id + https://orcid.org/0000-0001-2345-6789 +
+
+
+

+ + +

+
+

Add comment to conflict

+ + +
+ + + diff --git a/public/curation/extract.js b/public/curation/extract.js index 88d9123..51246ae 100644 --- a/public/curation/extract.js +++ b/public/curation/extract.js @@ -8,6 +8,8 @@ function extract_info(cell, obj, tag, colorPolicies){ element.style.color = colorPolicies[obj[2]["conflict"]]; element.appendChild(document.createTextNode(` ${obj[0]}`)); cell.appendChild(element); + console.log("parent: "+cell.parentNode) + //cell.parentNode.style.background = colorPolicies[obj[2]["conflict"]]; }else{ cell.appendChild(document.createTextNode(` ${obj[0]}`)); } @@ -16,8 +18,11 @@ function extract_info(cell, obj, tag, colorPolicies){ else if(!Array.isArray(obj[0]) && Object.keys(obj[0]).includes("familyName")){ obj.forEach(e =>{ const element = document.createElement("div"); - extract_person(e, element, tag, colorPolicies); + const hasConfict = extract_person(e, element, tag, colorPolicies); cell.appendChild(element); + /*if (hasConfict){ + cell.classList.add("table-warning"); + }*/ })} else if(Array.isArray(obj[0])){ @@ -53,12 +58,13 @@ function extract_info(cell, obj, tag, colorPolicies){ } function extract_person(e, element, tag, colorPolicies){ + let hasConfict = false; const tooltip = document.createElement("div"); const tooltiptag = document.createElement("div"); - tooltip.classList.add("tooltip"); + tooltip.classList.add("swc-tooltip"); tooltip.onclick = function(){link_to_person(e)}; const tooltiptext = document.createElement("div"); - tooltiptext.classList.add("tooltiptext"); + tooltiptext.classList.add("swc-tooltiptext"); const text = document.createTextNode(`${e.familyName[0]}, ${e.givenName[0]} `); tooltiptag.appendChild(document.createTextNode("See Details")); tooltiptag.appendChild(document.createElement("br")); @@ -77,8 +83,8 @@ function extract_info(cell, obj, tag, colorPolicies){ if(e[k][key][2] && e[k][key][2]["conflict"]){ pair_in_list.style.color = colorPolicies[e[k][key][2]["conflict"]]; tooltiptag.style.color = colorPolicies[e[k][key][2]["conflict"]]; - /*pair_in_list.className += " error"; - tooltiptag.className += " error";*/ + hasConfict = true; + } pair.appendChild(pair_in_list); } @@ -89,8 +95,7 @@ function extract_info(cell, obj, tag, colorPolicies){ if(e[k][2] && e[k][2]["conflict"]){ pair.style.color = colorPolicies[e[k][2]["conflict"]]; tooltiptag.style.color = colorPolicies[e[k][2]["conflict"]]; - //pair.className += " error"; - //tooltiptag.className += " error"; + hasConfict = true; } } tooltiptext.appendChild(pair); @@ -99,6 +104,7 @@ function extract_info(cell, obj, tag, colorPolicies){ tooltip.appendChild(tooltiptext); tooltip.appendChild(text); element.appendChild(tooltip); + return hasConfict; } function link_to_person(data){ diff --git a/public/curation/index.html b/public/curation/index.html index 09118ce..a374223 100644 --- a/public/curation/index.html +++ b/public/curation/index.html @@ -5,11 +5,10 @@ - + Software CaRD - @@ -19,6 +18,24 @@

Software CaRD +
+
+ ✍ +

Start to gather curation notes

+ +
+
+ 📃 +

Send Issue Report to GitLab/GitHub

+ +
+ + +

Metadata

@@ -26,7 +43,7 @@

Software CaRD
- +
✔ Select all @@ -36,14 +53,15 @@

Software CaRD

- - -
+
+ +
+

- +
@@ -54,6 +72,9 @@

Software CaRD

diff --git a/public/style.css b/public/style.css index b2627fd..581721d 100644 --- a/public/style.css +++ b/public/style.css @@ -52,20 +52,46 @@ button{ justify-content: center; } -.conflict-operators{ - display: flex; - flex-direction: row; - align-items: center; - justify-content: flex-end; +.operators{ + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; +} + +.navigation{ + position: absolute; + font-size: larger; + top:5%; + right:3%; + display: flex; + flex-direction: row; +} + +.notes{ + right: 5%; + cursor: pointer; +} +.notes:hover .notes-desc{ + visibility: visible; +} +.notes-desc{ + font-size: medium; + position: absolute; + width: 300px; + padding: 0px; + right: 1px; + text-align: end; + visibility: hidden; } -.tooltip { +.swc-tooltip { position: relative; border-bottom: 1px dotted black; white-space:pre-wrap; } -.tooltip .tooltiptext { +.swc-tooltip .swc-tooltiptext { visibility: hidden; background-color: #555; color: #fff; @@ -80,12 +106,12 @@ opacity: 0; transition: opacity 0.3s; border-radius: 12px; } -.tooltip .tooltiptext p{ +.swc-tooltip .swc-tooltiptext p{ font-size: large; margin: 0px; } -.tooltip .tooltiptext::after { +.swc-tooltip .swc-tooltiptext::after { content: ""; position: absolute; top: 100%; @@ -97,7 +123,7 @@ border-style: solid; border-color: #555 transparent transparent transparent; } -.tooltip:hover .tooltiptext { +.swc-tooltip:hover .swc-tooltiptext { visibility: visible; opacity: 1; } @@ -137,7 +163,8 @@ button{ text-align: center; background-image: none; background-color: #ddd; - color:black + color:black; + padding: 0px; } @@ -164,8 +191,8 @@ button{ .dropdown { position: relative; display: inline-block; - left: 41%; - top: -15px; + left: 36%; + top: 10px; } /* Dropdown Content (Hidden by Default) */ @@ -191,4 +218,50 @@ button{ .dropdown-content a:hover {background-color: #f1f1f1} /* Show the dropdown menu (use JS to add this class to the .dropdown-content container when the user clicks on the dropdown button) */ -.show {display:block;} \ No newline at end of file +.show {display:block;} + +tr:hover .single-line-comment{ + visibility: visible; +} +.single-line-comment{ + position:absolute; + right: 20%; + visibility: hidden; +} +.single-line-comment:hover .hover-text{ + visibility: visible; +} + +.hover-text{ + visibility: hidden; + position: relative; + background-color: #555; + color: #fff; + text-align: center; + padding: 2px; + border-radius: 6px; + z-index: 1; +} +.hover-text::after { +content: ""; +position: absolute; +bottom: 100%; +left: 50%; +margin-left: -5px; +margin-right: 5px; +border-width: 5px; +border-style: solid; +border-color: transparent transparent #555 transparent; +} + +#conflict{ + display: flex; + flex-direction: row; +} + +.comment{ + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +}
+
+ +

Comment on this row

+