Add options to toggle numerator, denominator, and value in tooltips

AUS-DOH-Safety-and-Quality · Feb 5, 2024 · 758b203 · 758b203
1 parent f0c0b05
commit 758b203
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 10 deletions.
diff --git a/capabilities.json b/capabilities.json
@@ -83,6 +83,30 @@
         "ul_truncate": {
           "displayName": "Truncate Upper Limits at:",
           "type": { "numeric": true }
+        },
+        "ttip_show_numerator": {
+          "displayName": "Show Numerator in Tooltip",
+          "type" : { "bool" : true }
+        },
+        "ttip_label_numerator": {
+          "displayName": "Numerator Tooltip Label",
+          "type": { "text": true }
+        },
+        "ttip_show_denominator": {
+          "displayName": "Show Denominator in Tooltip",
+          "type" : { "bool" : true }
+        },
+        "ttip_label_denominator": {
+          "displayName": "Denominator Tooltip Label",
+          "type": { "text": true }
+        },
+        "ttip_show_value": {
+          "displayName": "Show Value in Tooltip",
+          "type" : { "bool" : true }
+        },
+        "ttip_label_value": {
+          "displayName": "Value Tooltip Label",
+          "type": { "text": true }
         }
       }
     },

diff --git a/src/Functions/buildTooltip.ts b/src/Functions/buildTooltip.ts
@@ -63,24 +63,27 @@ export default function buildTooltip(index: number,
     displayName: "Date",
     value: controlLimits.keys[index].label
   });
-  tooltip.push({
-    displayName: valueNames[chart_type],
-    value: (controlLimits.values[index]).toFixed(sig_figs) + suffix
-  })
-  if(numerator || !(numerator === null || numerator === undefined)) {
+  if (inputSettings.spc.ttip_show_value) {
+    const ttip_label_value: string = inputSettings.spc.ttip_label_value;
+    tooltip.push({
+      displayName: ttip_label_value === "Automatic" ? valueNames[chart_type] : ttip_label_value,
+      value: (controlLimits.values[index]).toFixed(sig_figs) + suffix
+    })
+  }
+  if(inputSettings.spc.ttip_show_numerator && !(numerator === null || numerator === undefined)) {
     tooltip.push({
-      displayName: "Numerator",
+      displayName: inputSettings.spc.ttip_label_numerator,
       value: (numerator).toFixed(intNumDen ? 0 : sig_figs)
     })
   }
-  if(denominator || !(denominator === null || denominator === undefined)) {
+  if(inputSettings.spc.ttip_show_denominator && !(denominator === null || denominator === undefined)) {
     tooltip.push({
-      displayName: "Denominator",
+      displayName: inputSettings.spc.ttip_label_denominator,
       value: (denominator).toFixed(intNumDen ? 0 : sig_figs)
     })
   }
   if (chart_type !== "run") {
-    ["68", "95", "99"].forEach(limit => { 
+    ["68", "95", "99"].forEach(limit => {
       if (inputSettings.lines[`ttip_show_${limit}`] && inputSettings.lines[`show_${limit}`]) {
         tooltip.push({
           displayName: `Upper ${inputSettings.lines[`ttip_label_${limit}`]}`,
@@ -102,7 +105,7 @@ export default function buildTooltip(index: number,
     })
   }
   if (chart_type !== "run") {
-    ["68", "95", "99"].forEach(limit => { 
+    ["68", "95", "99"].forEach(limit => {
       if (inputSettings.lines[`ttip_show_${limit}`] && inputSettings.lines[`show_${limit}`]) {
         tooltip.push({
           displayName: `Lower ${inputSettings.lines[`ttip_label_${limit}`]}`,

diff --git a/src/Outlier Flagging/twoInThree.ts b/src/Outlier Flagging/twoInThree.ts
@@ -24,6 +24,9 @@ export default function twoInThree(val: number[], ll95: number[], ul95: number[]
             two_in_three_detected[j] = two_in_three_detected[i];
           }
         }
+        if (outside95[i] === 0) {
+          two_in_three_detected[i] = "none";
+        }
       }
     }
   }

diff --git a/src/defaultSettings.ts b/src/defaultSettings.ts
@@ -13,6 +13,12 @@ const defaultSettings = {
     sig_figs: 2,
     perc_labels: "Automatic",
     split_on_click: false,
+    ttip_show_numerator: true,
+    ttip_label_numerator: "Numerator",
+    ttip_show_denominator: true,
+    ttip_label_denominator: "Denominator",
+    ttip_show_value: true,
+    ttip_label_value: "Automatic",
     ll_truncate: <number>(null),
     ul_truncate: <number>(null)
   },
@@ -164,6 +170,11 @@ export const settingsPaneGroupings = {
 }
 
 export const settingsPaneToggles = {
+  spc: {
+    "ttip_show_numerator": ["ttip_label_numerator"],
+    "ttip_show_denominator": ["ttip_label_denominator"],
+    "ttip_show_value": ["ttip_label_value"]
+  },
   outliers: {
     "Astronomical Points": {
       "astronomical": ["ast_colour_improvement", "ast_colour_deterioration", "ast_colour_neutral_low", "ast_colour_neutral_high"]