Made individual IDs consistent with GA4GH format

SouthGreenPlatform · Feb 28, 2019 · 232fe93 · 232fe93
1 parent 060112a
commit 232fe93
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
@@ -836,15 +836,15 @@
 	            "variantEffect": $('#variantEffects').val() === null ? "" : $('#variantEffects').val().join(","),
 	            "geneName": $('#geneName').val().trim().replace(new RegExp(' , ', 'g'), ','),
 
-	            "callSetIds": getSelectedIndividuals(1),
+	            "callSetIds": getSelectedIndividuals(1, true),
 	            "gtPattern": $('#Genotypes1').val(),
 	            "mostSameRatio": $('#mostSameRatio1').val(),
 	            "minmaf": $('#minmaf1').val() === null ? 0 : parseFloat($('#minmaf1').val()),
    	            "maxmaf": $('#maxmaf1').val() === null ? 50 : parseFloat($('#maxmaf1').val()),
  	            "missingData": $('#missingdata1').val() === null ? 100 : parseFloat($('#missingdata1').val()),
 				"annotationFieldThresholds": annotationFieldThresholds,
 
-	            "callSetIds2": getSelectedIndividuals(2),
+	            "callSetIds2": getSelectedIndividuals(2, true),
 	            "gtPattern2": $('#Genotypes2').val(),
 	            "mostSameRatio2": $('#mostSameRatio2').val(),
 	            "minmaf2": $('#minmaf2').val() === null ? 0 : parseFloat($('#minmaf2').val()),
@@ -1159,15 +1159,15 @@
             "variantEffects": $('#variantEffects').val() === null ? "" : $('#variantEffects').val().join(","),
             "geneName": $('#geneName').val().trim().replace(new RegExp(' , ', 'g'), ','),
 
-            "callSetIds": getSelectedIndividuals(1),
+            "callSetIds": getSelectedIndividuals(1, true),
             "gtPattern": $('#Genotypes1').val(),
             "mostSameRatio": $('#mostSameRatio1').val(),
             "minmaf": $('#minmaf1').val() === null ? 0 : parseFloat($('#minmaf1').val()),
 	        "maxmaf": $('#maxmaf1').val() === null ? 50 : parseFloat($('#maxmaf1').val()),
 	        "missingData": $('#missingdata1').val() === null ? 100 : parseFloat($('#missingdata1').val()),
             "annotationFieldThresholds": annotationFieldThresholds,
 
-            "callSetIds2": getSelectedIndividuals(2),
+            "callSetIds2": getSelectedIndividuals(2, true),
             "gtPattern2": $('#Genotypes2').val(),
             "mostSameRatio2": $('#mostSameRatio2').val(),
             "minmaf2": $('#minmaf2').val() === null ? 0 : parseFloat($('#minmaf2').val()),

diff --git a/src/main/webapp/js/main.js b/src/main/webapp/js/main.js
@@ -581,7 +581,7 @@ function markAsMissingData(individual) {
     });
 }
 
-function getSelectedIndividuals(groupNumber) {
+function getSelectedIndividuals(groupNumber, provideGa4ghId) {
     var selectedIndividuals = [];
     var groups = groupNumber == null ? [1, 2] : [groupNumber];
     for (var groupKey in groups)
@@ -591,7 +591,7 @@ function getSelectedIndividuals(groupNumber) {
         	groupIndividuals = $('#Individuals' + groups[groupKey]).selectmultiple('option')
     	for (var indKey in groupIndividuals)
     		if (!arrayContains(selectedIndividuals, groupIndividuals[indKey]))
-    			selectedIndividuals.push(groupIndividuals[indKey]);
+    			selectedIndividuals.push((provideGa4ghId ? $('#project :selected').data("id") + "§" : "") + groupIndividuals[indKey]);
     }
     return selectedIndividuals.length == indCount ? [] : selectedIndividuals;
 }