From b7794395e9a9d6b28e4dbcddf75278a429523c54 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Thu, 31 Aug 2023 17:55:33 +0000
Subject: Don't show decimal places when all values are integers

---
 wqflask/wqflask/show_trait/show_trait.py                            | 6 ++++--
 .../wqflask/static/new/javascript/initialize_show_trait_tables.js   | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/wqflask/wqflask/show_trait/show_trait.py b/wqflask/wqflask/show_trait/show_trait.py
index 0fbd1a32..d695dec3 100644
--- a/wqflask/wqflask/show_trait/show_trait.py
+++ b/wqflask/wqflask/show_trait/show_trait.py
@@ -27,6 +27,7 @@ from gn3.authentication import get_highest_user_access_role
 Redis = get_redis_conn()
 ONE_YEAR = 60 * 60 * 24 * 365
 
+
 ###############################################
 #
 # Todo: Put in security to ensure that user has permission to access
@@ -174,7 +175,7 @@ class ShowTrait:
         for sample_type in self.sample_groups:
             trait_vals_by_group.append(get_trait_vals(sample_type.sample_list))
 
-        self.max_digits_by_group = get_max_digits(trait_vals_by_group)
+        self.max_digits_by_group, self.no_decimal_place = get_max_digits(trait_vals_by_group)
 
         self.qnorm_vals = quantile_normalize_vals(self.sample_groups, trait_vals_by_group)
         self.z_scores = get_z_scores(self.sample_groups, trait_vals_by_group)
@@ -326,6 +327,7 @@ class ShowTrait:
         js_data = dict(trait_id=self.trait_id,
                        trait_symbol=trait_symbol,
                        max_digits = self.max_digits_by_group,
+                       no_decimal_place = self.no_decimal_place,
                        short_description=short_description,
                        unit_type=trait_units,
                        dataset_type=self.dataset.type,
@@ -564,7 +566,7 @@ def get_max_digits(trait_vals):
             return None
         return len(str(max(these_vals))) - 1
 
-    return [__max_digits__(val) for val in trait_vals]
+    return [__max_digits__(val) for val in trait_vals], all([val.is_integer() for val in sum(trait_vals, [])])
 
 def normf(trait_vals):
     ranked_vals = ss.rankdata(trait_vals)
diff --git a/wqflask/wqflask/static/new/javascript/initialize_show_trait_tables.js b/wqflask/wqflask/static/new/javascript/initialize_show_trait_tables.js
index 614b3e8a..44076c17 100644
--- a/wqflask/wqflask/static/new/javascript/initialize_show_trait_tables.js
+++ b/wqflask/wqflask/static/new/javascript/initialize_show_trait_tables.js
@@ -50,7 +50,11 @@ buildColumns = function() {
         if (data.value == null) {
             return '<input type="text" data-value="x" data-qnorm="x" data-zscore="x" name="value:' + data.name + '" style="text-align: right;" class="trait_value_input edit_sample_value" value="x" size=' + js_data.max_digits[0] + '>'
         } else {
+          if (js_data.no_decimal_place == false) {
             return '<input type="text" data-value="' + data.value.toFixed(3) + '" data-qnorm="' + js_data['qnorm_values'][0][parseInt(data.this_id) - 1] + '" data-zscore="' + js_data['zscore_values'][0][parseInt(data.this_id) - 1] + '" name="value:' + data.name + '" class="trait_value_input edit_sample_value" value="' + data.value.toFixed(3) + '" size=' + js_data.max_digits[0] + '>'
+          } else {
+            return '<input type="text" data-value="' + data.value + '" data-qnorm="' + js_data['qnorm_values'][0][parseInt(data.this_id) - 1] + '" data-zscore="' + js_data['zscore_values'][0][parseInt(data.this_id) - 1] + '" name="value:' + data.name + '" class="trait_value_input edit_sample_value" value="' + data.value + '" size=' + js_data.max_digits[0] + '>'
+          }
         }
       }
     }
-- 
cgit v1.2.3