diff --git a/K-AnoTool/generalization/static/css/main.css b/K-AnoTool/generalization/static/css/main.css
index bb508a3..d5f86d8 100644
--- a/K-AnoTool/generalization/static/css/main.css
+++ b/K-AnoTool/generalization/static/css/main.css
@@ -151,11 +151,12 @@ button:hover{
line-height: 1.5;
font-size: 1rem;
padding: 2px 7px;
+ cursor: pointer;
}
.fileupload:hover {
- background-color: white;
- color: green;
+ background-color: rgb(161, 162, 161);
+ color: black;
}
.fileupload input {
diff --git a/K-AnoTool/generalization/templates/generalization.html b/K-AnoTool/generalization/templates/generalization.html
index 874bbc3..dd266f8 100644
--- a/K-AnoTool/generalization/templates/generalization.html
+++ b/K-AnoTool/generalization/templates/generalization.html
@@ -319,12 +319,22 @@
})
.remove();
- link.enter().insert("text", "g")
- .attr("x", function(d) { return ((d.target.depth -1)*105); })
- .attr("y", function(d) { return (50); })
- .text(function(d) { return ("Step " + (d.target.depth -1) + " to " + d.target.depth); })
- .style('fill', 'rgb(87, 183, 215)')
- .attr("font-weight", '800');
+ if(localStorage.getItem("type_" + localStorage.getItem("qid").replace("hiera_",'')) === "int"){
+ link.enter().insert("text", "g")
+ .attr("x", function(d) { return ((d.target.depth -1)*105); })
+ .attr("y", function(d) { return (50); })
+ .text(function(d) { return ("Step " + (d.target.depth -1) + " to " + d.target.depth); })
+ .style('fill', 'rgb(87, 183, 215)')
+ .attr("font-weight", '800');
+ }
+ else{
+ link.enter().insert("text", "g")
+ .attr("x", function(d) { return ((d.target.depth -1)*105); })
+ .attr("y", function(d) { return (200); })
+ .text(function(d) { return ("Step " + (d.target.depth -1) + " to " + d.target.depth); })
+ .style('fill', 'rgb(87, 183, 215)')
+ .attr("font-weight", '800');
+ }
// Stash the old positions for transition.
nodes.forEach(function(d) {
@@ -515,7 +525,7 @@
}
else{
p.classList.remove("plaw");
- p.style.color = "black";
+ p.style.color = "rgb(87, 183, 215)";
p.style.fontStyle = "normal";
}
}
@@ -585,8 +595,6 @@
}
else{
let allchildren = document.getElementById("original").children;
- //TO DO
-
let namel = "Other";
let allselected = document.querySelectorAll('#original p');
let tabselect = [];
@@ -596,18 +604,20 @@
}
});
console.log(tabselect)
- if(diccatfinal[namel] === undefined){
- let stringlaw = "";
- diccatfinal[namel] = tabselect;
- stringlaw = "'" + namel + "' : [";
- for(elem in tabselect){
- stringlaw += tabselect[elem] + ", "
+ if(tabselect.length > 0){
+ if(diccatfinal[namel] === undefined){
+ let stringlaw = "";
+ diccatfinal[namel] = tabselect;
+ stringlaw = "'" + namel + "' : [";
+ for(elem in tabselect){
+ stringlaw += tabselect[elem] + ", "
+ }
+ let div3 = document.getElementById("printlaw");
+ div3.innerHTML += stringlaw.slice(0, -2) + "]
";
+ }
+ else{
+ alert("This category has already been defined !")
}
- let div3 = document.getElementById("printlaw");
- div3.innerHTML += stringlaw.slice(0, -2) + "]
";
- }
- else{
- alert("This category has already been defined !")
}
//
@@ -722,6 +732,46 @@
localStorage.setItem("weights_" + localStorage.getItem("qid").replace("hiera_",''),tabweight);
}
+function savejson(){
+ let blob;
+ if(localStorage.getItem("diccategories_" + localStorage.getItem("qid").replace("hiera_",'')) != null){
+ let full = localStorage.getItem("diccategories_" + localStorage.getItem("qid").replace("hiera_",'')).replaceAll(";",",").split("|");
+ let dictojson = {}
+ for(elem in full){
+ dictojson[(parseInt(elem)+1).toString()] = [JSON.parse(full[elem])];
+ }
+ console.log(dictojson)
+ blob = new Blob([JSON.stringify(dictojson).replaceAll("}],","}],\n")], {type: 'text'});
+ }
+ else if(localStorage.getItem("tabfinalstr_" + localStorage.getItem("qid").replace("hiera_",'')) != null){
+ let full = localStorage.getItem("tabfinalstr_" + localStorage.getItem("qid").replace("hiera_",'')).replaceAll("[[","[").replaceAll("]]","]").replaceAll("],[","];[").split(";");
+ let dictojson = {}
+ for(elem in full){
+ dictojson[(parseInt(elem)+1).toString()] = JSON.parse(full[elem]);
+ }
+ console.log(dictojson)
+ blob = new Blob([JSON.stringify(dictojson).replaceAll("],","],\n")], {type: 'text'});
+ }
+ else{
+ let full = localStorage.getItem("dictint_" + localStorage.getItem("qid").replace("hiera_",'')).replaceAll("],","];;\n").split(";;");
+ blob = new Blob([full], {type: 'text'});
+ console.log(full)
+ }
+
+ if(window.navigator.msSaveOrOpenBlob) {
+ window.navigator.msSaveBlob(blob, "test.json");
+ }
+ else{
+ const elem = window.document.createElement('a');
+ elem.href = window.URL.createObjectURL(blob);
+ elem.download = "test.json";
+ document.body.appendChild(elem);
+ elem.click();
+ document.body.removeChild(elem);
+ }
+}
+
+
var sub = (function(){
var savenodes = tree.nodes(root).reverse(),links = tree.links(savenodes);
allnodes = savenodes.reverse()
@@ -822,6 +872,7 @@
Import VGH
+