From c30fdd56dd067b8d15724a24414fb4def5283ebd Mon Sep 17 00:00:00 2001
From: zsloan
Date: Mon, 5 Oct 2020 16:24:41 -0500
Subject: Replaced "+" with "and" in transform text

* wqflask/wqflask/static/new/javascript/show_trait.js - Replaced "+" with "and" when Invert and another transform are combined and capitalized "Transform"
---
 wqflask/wqflask/static/new/javascript/show_trait.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/wqflask/wqflask/static/new/javascript/show_trait.js b/wqflask/wqflask/static/new/javascript/show_trait.js
index 092c890f..eaad0a4c 100644
--- a/wqflask/wqflask/static/new/javascript/show_trait.js
+++ b/wqflask/wqflask/static/new/javascript/show_trait.js
@@ -806,12 +806,12 @@ normalize_data = function() {
     if ($('input[name="transform"]').val() != "log2" && $('#norm_method option:selected').val() == 'log2') {
       do_transform("log2")
       $('input[name="transform"]').val("log2")
-      $('span[name="transform_text"]').text(" - log2 transformed")
+      $('span[name="transform_text"]').text(" - log2 Transformed")
     } else {
       if ($('input[name="transform"]').val() != "log10" && $('#norm_method option:selected').val() == 'log10'){
         do_transform("log10")
         $('input[name="transform"]').val("log10")
-        $('span[name="transform_text"]').text(" - log10 transformed")
+        $('span[name="transform_text"]').text(" - log10 Transformed")
       }
     }
   }
@@ -819,7 +819,7 @@ normalize_data = function() {
     if ($('input[name="transform"]').val() != "sqrt") {
       do_transform("sqrt")
       $('input[name="transform"]').val("sqrt")
-      $('span[name="transform_text"]').text(" - Square Root transformed")
+      $('span[name="transform_text"]').text(" - Square Root Transformed")
     }
   }
   else if ($('#norm_method option:selected').val() == 'invert'){
@@ -827,7 +827,7 @@ normalize_data = function() {
     $('input[name="transform"]').val("inverted")
     if ($('span[name="transform_text"]:eq(0)').text() != ""){
       current_text = $('span[name="transform_text"]:eq(0)').text();
-      $('span[name="transform_text"]').text(current_text + " + Inverted");
+      $('span[name="transform_text"]').text(current_text + " and Inverted");
     } else {
       $('span[name="transform_text"]').text(" - Inverted")
     }
-- 
cgit v1.2.3