Merge pull request #240 from asherpasha/dev

Added eFP Rice.

Author: asherpasha

api/resources/efp_image.py

@@ -25,6 +25,7 @@ def get(self):
             "efp_arachis",
             "efp_cannabis",
             "efp_maize",
+            "efp_rice",
             "efp_sorghum",
             "efp_soybean",
         ]

api/utils/efp_utils.py

@@ -37,6 +37,7 @@ def is_efp_input_valid(efp, view, mode, gene_1, gene_2=None):
             "efp_arachis",
             "efp_cannabis",
             "efp_maize",
+            "efp_rice",
             "efp_sorghum",
             "efp_soybean",
         ]
@@ -90,6 +91,15 @@ def is_efp_input_valid(efp, view, mode, gene_1, gene_2=None):
                 if not BARUtils.is_maize_gene_valid(gene_2):
                     return False, "Gene 2 is invalid."
 
+        if efp == "efp_rice":
+            # Validate gene ids
+            if not BARUtils.is_rice_gene_valid(gene_1):
+                return False, "Gene 1 is invalid."
+
+            if mode == "Compare":
+                if not BARUtils.is_rice_gene_valid(gene_2):
+                    return False, "Gene 2 is invalid."
+
         if efp == "efp_sorghum":
             # Validate gene ids
             if not BARUtils.is_sorghum_gene_valid(gene_1):

tests/resources/test_efp_image.py

@@ -18,6 +18,7 @@ def test_get_efp_image_list(self):
                 "efp_arachis",
                 "efp_cannabis",
                 "efp_maize",
+                "efp_rice",
                 "efp_sorghum",
                 "efp_soybean",
             ],