Update display of bottles to volume unit for analytics.

views/dashboardPage/js/classes/Ingredient.js

@@ -117,6 +117,7 @@ class Ingredient{
             case "volume": return ["ml", "l", "tsp", "tbsp", "ozfl", "cup", "pt", "qt", "gal"];
             case "length": return ["mm", "cm", "m", "in", "ft"];
             case "bottle": return ["ml", "l", "tsp", "tbsp", "ozfl", "cup", "pt", "qt", "gal"];
+            case "each": return ["each"];
         }
     }
 }

views/dashboardPage/js/dashboard.js

@@ -447,6 +447,7 @@ controller = {
             case "in": return "length";
             case "ft": return "length";
             case "bottle": return "bottle";
+            case "each": return "each";
         }
     },
 

views/dashboardPage/js/sidebars/editIngredient.js

@@ -180,6 +180,7 @@ let editIngredient = {
             case "mass": data.ingredient.convert.toMass = 1; break;
             case "volume": data.ingredient.convert.toVolume = 1; break;
             case "length": data.ingredient.convert.toLength = 1; break;
+            case "each":
             case "bottle":
                 data.ingredient.convert.toMass = controller.toBase(rightMass / leftMass, rightUnitMass);
                 data.ingredient.convert.toVolume = ingredient.ingredient.convert.toVolume;

views/dashboardPage/js/strands/analytics.js

@@ -200,7 +200,9 @@ let analytics = {
             }
         }
 
-        let yaxis = `QUANTITY (${this.ingredient.unit.toUpperCase()})`;
+        let unit = (this.ingredient.unit === "bottle") ? this.ingredient.altUnit : this.ingredient.unit;
+
+        let yaxis = `QUANTITY (${unit.toUpperCase()})`;
 
         let layout = {
             title: this.ingredient.name.toUpperCase(),
@@ -229,9 +231,9 @@ let analytics = {
             sum += quantities[i];
         }
 
-        document.getElementById("analMinUse").innerText = `${min.toFixed(2)} ${this.ingredient.unit.toUpperCase()}`;
-        document.getElementById("analAvgUse").innerText = `${(sum / quantities.length).toFixed(2)} ${this.ingredient.unit.toUpperCase()}`;
-        document.getElementById("analMaxUse").innerText = `${max.toFixed(2)} ${this.ingredient.unit.toUpperCase()}`;
+        document.getElementById("analMinUse").innerText = `${min.toFixed(2)} ${unit.toUpperCase()}`;
+        document.getElementById("analAvgUse").innerText = `${(sum / quantities.length).toFixed(2)} ${unit.toUpperCase()}`;
+        document.getElementById("analMaxUse").innerText = `${max.toFixed(2)} ${unit.toUpperCase()}`;
 
         //Create weekday averages
         let dayUse = [0, 0, 0, 0, 0, 0, 0];
@@ -241,13 +243,13 @@ let analytics = {
             dayCount[dates[i].getDay()]++;
         }
 
-        document.getElementById("analDayOne").innerText = `${(dayUse[0] / dayCount[0]).toFixed(2)} ${this.ingredient.unit.toUpperCase()}`;
-        document.getElementById("analDayTwo").innerText = `${(dayUse[1] / dayCount[1]).toFixed(2)} ${this.ingredient.unit.toUpperCase()}`;
-        document.getElementById("analDayThree").innerText = `${(dayUse[2] / dayCount[2]).toFixed(2)} ${this.ingredient.unit.toUpperCase()}`;
-        document.getElementById("analDayFour").innerText = `${(dayUse[3] / dayCount[3]).toFixed(2)} ${this.ingredient.unit.toUpperCase()}`;
-        document.getElementById("analDayFive").innerText = `${(dayUse[4] / dayCount[4]).toFixed(2)} ${this.ingredient.unit.toUpperCase()}`;
-        document.getElementById("analDaySix").innerText = `${(dayUse[5] / dayCount[5]).toFixed(2)} ${this.ingredient.unit.toUpperCase()}`;
-        document.getElementById("analDaySeven").innerText = `${(dayUse[6] / dayCount[6]).toFixed(2)} ${this.ingredient.unit.toUpperCase()}`;
+        document.getElementById("analDayOne").innerText = `${(dayUse[0] / dayCount[0]).toFixed(2)} ${unit.toUpperCase()}`;
+        document.getElementById("analDayTwo").innerText = `${(dayUse[1] / dayCount[1]).toFixed(2)} ${unit.toUpperCase()}`;
+        document.getElementById("analDayThree").innerText = `${(dayUse[2] / dayCount[2]).toFixed(2)} ${unit.toUpperCase()}`;
+        document.getElementById("analDayFour").innerText = `${(dayUse[3] / dayCount[3]).toFixed(2)} ${unit.toUpperCase()}`;
+        document.getElementById("analDayFive").innerText = `${(dayUse[4] / dayCount[4]).toFixed(2)} ${unit.toUpperCase()}`;
+        document.getElementById("analDaySix").innerText = `${(dayUse[5] / dayCount[5]).toFixed(2)} ${unit.toUpperCase()}`;
+        document.getElementById("analDaySeven").innerText = `${(dayUse[6] / dayCount[6]).toFixed(2)} ${unit.toUpperCase()}`;
     },
 
     displayIngredientCategory: function(){