Skip to content

Commit

Permalink
Fix for #16, #27 and #29
Browse files Browse the repository at this point in the history
  • Loading branch information
@YusufZiyaOzgul
YusufZiyaOzgul committed Aug 7, 2024
1 parent 0492aaa commit d8f83e3
Show file tree
Hide file tree
Showing 7 changed files with 9,232 additions and 613 deletions.
9,584 changes: 9,085 additions & 499 deletions package-lock.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"file-saver": "^2.0.5",
"jquery": "^3.6.0",
"jsdom": "^16.5.3",
"libsbgn.js": "^0.3.1",
"libsbgn.js": "github:sbgn/libsbgn.js#develop",
"nodemon": "^2.0.7",
"pretty-data": "^0.40.0",
"saxon-js": "^2.5.0",
Expand Down
95 changes: 75 additions & 20 deletions public/js/main.menu.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,20 @@ let applyErrorFix = async function () {
$('#errorsField').css({ width: errorWidth + 'px' });
$("#errorsArea").empty();
let numberOfUnsolvedErrors = 0;
$('.ui.radio.checkbox').on('click', event =>{

try {
console.log( "format or alternative" + " " + event.currentTarget.parentElement.id);
let errorId = event.currentTarget.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement.id;
errorId = errorId.replace("rec", "");
errorId = parseInt( errorId ) - 1;
errors[errorId].fixChoice = event.delegateTarget.firstChild.value;
}
catch{
event.currentTarget.style.checked = true;
}
event.currentTarget.style.checked = true;
; });
if (errors.length > 0) {
res.errors.forEach((error) => {
let imgSource = error.status === "solved" ? "img/check-mark.png" : "img/cross.png";
Expand Down Expand Up @@ -151,7 +165,7 @@ let applyErrorFix = async function () {
list.append(fixExplanation);
}
let accordion = $('<div id ="rec' + error.errorNo + '"class="ui vertical accordion menu" style = "min-height: 0px !important;">');
let item = $('<div id = "item' + error.errorNo + '" class="field"> <a class="title" style = "background: grey; padding : 0; width : inherit !important;display:block;"> <i class="dropdown icon"></i>Resolution Alternative</a><div class="content" style = "padding : 0"><div class="ui form"><div class="grouped fields" id ="solutionField' + error.errorNo + '"> </div></div></div></div>' );
let item = $('<div id = "item' + error.errorNo + '" class="field"> <a class="title" style = "background: #efefef; padding : 0; width : inherit !important;display:block;"> <i class="dropdown icon"></i>Resolution Alternative</a><div class="content" style = "padding : 0"><div class="ui form"><div class="grouped fields" id ="solutionField' + error.errorNo + '"> </div></div></div></div>' );
let option = $('<div class="field"><div onchange = "" class="ui radio checkbox"><input onclick = "" type="radio" name="test" value="ds"><label>Data Structure</label></div></div>');
let classItem = $('<a class="active title">');
let str = ("#solutionField" + error.errorNo ).toString();
Expand Down Expand Up @@ -189,21 +203,36 @@ let applyErrorFix = async function () {
$("#errorsArea").append(errorRectangle);
let resolutionAlternative;
if( showResolutionAlternatives && error.status !== "solved" && error.fixCandidate !== undefined && error.fixCandidate.length > 0){
for( let i = 0; i < error.fixCandidate.length; i++){
$( `#solutionField${error.errorNo}` ).append('<div class="field" style = "margin: 0.01em 0;"><div onchange = "" class="ui radio checkbox"><input onclick = "" type="radio" id = "' + 'resAlt' + error.errorNo + '-' + i + '"name="'+ 'fixFor' + error.errorNo + '" value="' + error.fixCandidate[i].id+ '"><label style = "font-size:1em !important;margin-top:0px">' + error.fixCandidate[i].label +'</label></div></div>');
if( (error.defaultOption ) === i){
console.log( error.errorNo + " " + error.defaultOption + " " + i)
$('#resAlt' + error.errorNo + '-' + i).click();

}
}
}
$('.ui.accordion').accordion();
$('.ui.radio.checkbox').checkbox();
$('.ui.checkbox').checkbox();
$('.ui.accordion').accordion();
$('.ui.radio.checkbox').checkbox();
$('.ui.checkbox').checkbox();
for( let i = 0; i < error.fixCandidate.length; i++){
$( `#solutionField${error.errorNo}` ).append('<div class="field" style = "margin: 0.01em 0;"><div onchange = "" class="ui radio checkbox"><input onclick = "" type="radio" id = "' + 'resAlt' + error.errorNo + '-' + i + '"name="'+ 'fixFor' + error.errorNo + '" value="' + error.fixCandidate[i].id+ '"><label style = "font-size:1em !important;margin-top:0px">' + error.fixCandidate[i].label +'</label></div></div>');
if( (error.defaultOption ) === i){
console.log( error.errorNo + " " + error.defaultOption + " " + i);
$('.ui.radio.checkbox').on('click', event =>{

try {
console.log( "format or alternative event " + " " + event.currentTarget.parentElement.id);
let errorId = event.currentTarget.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement.id;
errorId = errorId.replace("rec", "");
errorId = parseInt( errorId ) - 1;
errors[errorId].fixChoice = event.delegateTarget.firstChild.value;
}
catch{
event.currentTarget.style.checked = true;
}
event.currentTarget.style.checked = true;
; });
$('#resAlt' + error.errorNo + '-' + i).click();

}
}

let uiDivider = $('<div class="ui divider"></div>');
uiDivider.css({ 'margin': '0rem 0' });
$(errorString).css({
Expand All @@ -218,7 +247,7 @@ let applyErrorFix = async function () {
$('.ui.radio.checkbox').on('click', event =>{

try {
console.log( "format or alternative" + " " + event.currentTarget.parentElement.id);
console.log( "format or alternative event " + " " + event.currentTarget.parentElement.id);
let errorId = event.currentTarget.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement.id;
errorId = errorId.replace("rec", "");
errorId = parseInt( errorId ) - 1;
Expand All @@ -230,12 +259,18 @@ let applyErrorFix = async function () {
event.currentTarget.style.checked = true;
; });
}
else {
else if( res.message === undefined ){
$("#errorsArea").css('overflow', 'hidden');
document.getElementById("errorsArea").style.overflow = "hidden";

$("#errorsArea").text('Map is valid!');
}
else {
$("#errorsArea").css('overflow', 'hidden');
document.getElementById("errorsArea").style.overflow = "hidden";

$("#errorsArea").text(res.message);
}

// get image info
blobData = saveImage(res["image"], imageFormat, document.getElementById("file-name").innerHTML);
Expand Down Expand Up @@ -302,18 +337,20 @@ let processValidation = async function () {
return result;
})
.catch(e => {
console.log( "result error");
let errorContent = document.getElementById("errorContent");
errorContent.innerHTML = "<b>Sorry! Cannot process the given file!</b><br><br>Error detail:<br>" + e;
$('#errorModal').modal({ inverted: true }).modal('show');
});
console.log( res);
$("#applyValidation").removeClass("loading");
$("#applyValidation").css("background-color", "#d67664");
if (res.errors.length > 0) {
if (res.errors && res.errors.length > 0) {
$("#fixFormatErrors").prop('disabled', false);
}
aspectRatio = res.aspectRatio;
currentSbgn = res.sbgn;
if (!res.errorMessage && (res.errors !== undefined || res.image !== undefined)) {
aspectRatio = res.aspectRatio;
currentSbgn = res.sbgn;
let remainingErrors = 0;
errors = res.errors;
errors.forEach( error => {
Expand Down Expand Up @@ -390,7 +427,7 @@ let processValidation = async function () {
if( (error.defaultOption ) === i){
console.log( error.errorNo + " " + error.defaultOption + " " + i);
console.log( document.getElementById("resAlt" + error.errorNo + "-" + i));
//$('#resAlt' + errorNo + '-' + i).click();
$('#resAlt' + error.errorNo + '-' + i).click();

}
}
Expand All @@ -417,14 +454,29 @@ let processValidation = async function () {
}
event.currentTarget.style.checked = true;
; });
// get image info
blobData = saveImage(res["image"], imageFormat, document.getElementById("file-name").innerHTML);
let urlCreator = window.URL || window.webkitURL;
let imageUrl = urlCreator.createObjectURL(blobData);
var img = new Image();
img.src = imageUrl;
aspectRatio = img.naturalWidth / img.naturalHeight;
$("#resultImage").attr("src", imageUrl);
$("#resultImage1").attr("src", imageUrl);
}
else {
else if( res.message === undefined ){
/*$("#errorsArea").css('overflow', 'hidden');
document.getElementById("errorsArea").style.overflow = "hidden";*/

$("#errorsArea").text('Map is valid!');
}
errors.forEach( error => {
$('#resAlt' + error.errorNo + '-' + error.defaultOption).click();
})
// get image info
else {
/*$("#errorsArea").css('overflow', 'hidden');
document.getElementById("errorsArea").style.overflow = "hidden";*/

$("#errorsArea").text(res.message);
}
if( res["image"] ){
blobData = saveImage(res["image"], imageFormat, document.getElementById("file-name").innerHTML);
let urlCreator = window.URL || window.webkitURL;
let imageUrl = urlCreator.createObjectURL(blobData);
Expand All @@ -433,6 +485,9 @@ let processValidation = async function () {
aspectRatio = img.naturalWidth / img.naturalHeight;
$("#resultImage").attr("src", imageUrl);
$("#resultImage1").attr("src", imageUrl);
}


}
else {
if (res.errorMessage) {
Expand Down
Loading

0 comments on commit d8f83e3

Please sign in to comment.