fixes #2123

GMOD · Apr 10, 2019 · 8713a05 · 8713a05
1 parent 5b1412c
commit 8713a05
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/client/apollo/css/annotation_info_editor.css b/client/apollo/css/annotation_info_editor.css
@@ -152,16 +152,17 @@
 	border-style: solid;
 	border-color: lightgray;
 	padding: 0.5em;
-	overflow-y: auto;
-	max-height: 2em;
+	/*overflow-y: auto;*/
+	/*max-height: 2em;*/
 }
 
 .annotation_info_editor_radio {
 /*	padding-right: 1em; */
-	display: inline-block;
+	display: block;
 }
 
 .annotation_info_editor_radio_label {
+	display: inline;
 }
 
 .ui-autocomplete {

diff --git a/client/apollo/js/View/Track/AnnotTrack.js b/client/apollo/js/View/Track/AnnotTrack.js
@@ -4696,8 +4696,7 @@ define([
                         }
                         for (var i = 0; i < status.length; ++i) {
                             var statusRadioDiv = dojo.create("span", {
-                                'class': "annotation_info_editor_radio",
-                                style: "width:" + (maxLength * 0.75) + "em; display: inline;"
+                                'class': "annotation_info_editor_radio"
                             }, statusFlags);
                             var statusRadio = new dijitRadioButton({
                                 value: status[i],

diff --git a/grails-app/controllers/org/bbop/apollo/AnnotationEditorController.groovy b/grails-app/controllers/org/bbop/apollo/AnnotationEditorController.groovy
@@ -1076,7 +1076,6 @@ class AnnotationEditorController extends AbstractApolloController implements Ann
             log.debug "input json feature ${jsonFeature}"
             String uniqueName = jsonFeature.get(FeatureStringEnum.UNIQUENAME.value)
             Feature feature = Feature.findByUniqueName(uniqueName)
-//            JSONObject newFeature = featureService.convertFeatureToJSON(feature, false)
             JSONObject newFeature = new JSONObject()
 
             if (feature.symbol) {
@@ -1104,12 +1103,6 @@ class AnnotationEditorController extends AbstractApolloController implements Ann
                 for (Allele allele : feature.alleles) {
                     JSONObject alleleObject = new JSONObject()
                     alleleObject.put(FeatureStringEnum.BASES.value, allele.bases)
-//                    if (allele.alleleFrequency) {
-//                        alternateAlleleObject.put(FeatureStringEnum.ALLELE_FREQUENCY.value, String.valueOf(allele.alleleFrequency))
-//                    }
-//                    if (allele.provenance) {
-//                        alternateAlleleObject.put(FeatureStringEnum.PROVENANCE.value, allele.provenance)
-//                    }
                     if (allele.alleleInfo) {
                         JSONArray alleleInfoArray = new JSONArray()
                         allele.alleleInfo.each { alleleInfo ->
@@ -1159,9 +1152,9 @@ class AnnotationEditorController extends AbstractApolloController implements Ann
 
                 List<AvailableStatus> availableStatusList = new ArrayList<>()
                 if (featureTypeList) {
-                    availableStatusList.addAll(AvailableStatus.executeQuery("select cc from AvailableStatus cc join cc.featureTypes ft where ft in (:featureTypeList)", [featureTypeList: featureTypeList]))
+                    availableStatusList.addAll(AvailableStatus.executeQuery("select cc from AvailableStatus cc join cc.featureTypes ft where ft in (:featureTypeList) order by cc.value asc", [featureTypeList: featureTypeList]))
                 }
-                availableStatusList.addAll(AvailableStatus.executeQuery("select cc from AvailableStatus cc where cc.featureTypes is empty"))
+                availableStatusList.addAll(AvailableStatus.executeQuery("select cc from AvailableStatus cc where cc.featureTypes is empty order by cc.value asc"))
 
 //                // if there are organism filters for these statuses for this organism, then apply them
                 List<AvailableStatusOrganismFilter> availableStatusOrganismFilters = AvailableStatusOrganismFilter.findAllByAvailableStatusInList(availableStatusList)