Fixed slight interface issues

SouthGreenPlatform · Sep 23, 2024 · aeca156 · aeca156
1 parent b42363e
commit aeca156
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/main/webapp/js/common.js b/src/main/webapp/js/common.js
@@ -177,7 +177,7 @@ function abort(token) {
 
 function displayMessage(message, duration) {
     duration = duration === undefined ? 5000 : duration;
-    $(document.body).append('<div class="alert alert-info alert-dismissable fade in" style="z-index:2000; position:absolute; top:100px; left:' + (15 + $("div#searchPanel").width() / 4) + 'px; min-width:450px;"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a><div id="msg">' + message + '</div></div>');
+    $(document.body).append('<div class="alert alert-info alert-dismissable fade in" style="z-index:2000; position:absolute; top:200px; left:' + (15 + $("div#searchPanel").width() / 4) + 'px; min-width:450px;"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a><div id="msg">' + message + '</div></div>');
     if (duration !== null){
         window.setTimeout(function() {
             $(".alert").fadeTo(500, 0, function(){

diff --git a/src/main/webapp/js/main.js b/src/main/webapp/js/main.js
@@ -549,7 +549,7 @@ function groupNameChanged(n) {
 	let newName = $("input#group" + n).val();
 	for (var i = 1; i <= getGenotypeInvestigationMode(); i++)
    	   if (i != n) {
-		   $('#discriminate' + i + ` option[title='Group${n}']`).text(newName);
+		   $('#discriminate' + i + ` option[value='${n}']`).text(newName).attr('title', newName);
 		   $('#discriminate' + i).selectpicker('refresh');
 
 		   $("#igvGroupsMenu li input[value=group" + n + "]").parent().find("span").text(newName);
@@ -1118,10 +1118,9 @@ function menuAction(){
                 }
             });
         });
-
-    } else {
-        $submenu.css('display', 'none');
     }
+    else
+        $submenu.css('display', 'none');
 }
 
 //This function allow the user to save a query into the DB
@@ -1430,6 +1429,7 @@ function listQueries(){
 	                  $('#Genotypes'+ (i + 1)).trigger('change');
 	                  $('#discriminate' + (i + 1)).selectpicker('val', jsonResult['discriminate'][i]);
 	                  $('#discriminate'+ (i + 1)).trigger('change');
+	                  groupNameChanged(i + 1);
                 }
 
                 $('#queryManager').modal("hide");
@@ -1487,7 +1487,7 @@ function onFilterByIds(checked) {
         $('#uploadVariantIds').removeAttr('disabled').selectpicker('refresh');
 
         $('#GeneIds').val("").prop('disabled', true);
-        $('#geneIdsSelect').prop('disabled', true).selectpicker('deselectAll').selectpicker('refresh');
+        $('#geneIdsSelect').val(null).prop('disabled', true).selectpicker('deselectAll').selectpicker('refresh');
         $('#clearGeneIdSelection').hide();
         $('#GeneIds button').prop('disabled', true).removeClass('active');
 
@@ -1538,7 +1538,7 @@ function onFilterByIds(checked) {
 
 function onGeneSelectionMinusMode() {
     if (!$('#geneIdsSelect').prop('disabled')) {
-        $('#geneIdsSelect').prop('disabled', true).selectpicker('deselectAll').selectpicker('refresh');
+        $('#geneIdsSelect').val(null).prop('disabled', true).selectpicker('deselectAll').selectpicker('refresh');
     }
 
     if (!$("#minusMode").hasClass("active")) {
@@ -1554,7 +1554,7 @@ function onGeneSelectionMinusMode() {
 
 function onGeneSelectionPlusMode() {
     if (!$('#geneIdsSelect').prop('disabled')) {
-        $('#geneIdsSelect').prop('disabled', true).selectpicker('deselectAll').selectpicker('refresh');
+        $('#geneIdsSelect').val(null).prop('disabled', true).selectpicker('deselectAll').selectpicker('refresh');
     }
 
     if (!$("#plusMode").hasClass("active")) {
@@ -1579,7 +1579,7 @@ function onGeneSelectionEditMode() {
     }
     else {
 		$("#editMode.active").removeClass("active");
-		$('#geneIdsSelect').prop('disabled', true).selectpicker('refresh');
+		$('#geneIdsSelect').val(null).prop('disabled', true).selectpicker('refresh');
 	}
 
     $("#minusMode.active").removeClass("active");