Merge branch 'rye_grain' into staging_environment

src/bin/BinCardV2.tsx

@@ -490,7 +490,7 @@ export default function BinCard(props: Props) {
 
   return (
     <Card style={{ cursor: "pointer" }}>
-      {user.hasFeature("admin") && (
+      {user.hasFeature("installer") && (
         <IconButton
           style={{
             height: 35,

src/bin/BinDuplication.tsx

@@ -34,7 +34,7 @@ export default function BinDuplication(props: Props) {
     binAPI
       .addBin(settings)
       .then(resp => {
-        openSnack("Successfully duplicated bin");
+        openSnack("Successfully duplicated bin"); 
       })
       .catch(err => {
         openSnack("Failed to duplicate bin");

src/grain/GrainDescriber.ts

@@ -190,7 +190,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
   [
     pond.Grain.GRAIN_OATS,
     {
-      name: "Oats",
+      name: "Oats a",
       group: "Oats",
       equation: Equation.henderson,
       a: 0.000085511,
@@ -203,6 +203,40 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
       weightConversionKg: 15.4222988297197,
       bushelsPerTonne: 64.842
     }
+  ],
+    [
+    pond.Grain.GRAIN_OATS_B,
+    {
+      name: "Oats b",
+      group: "Oats",
+      equation: Equation.chungPfost,
+      a: 442.85,
+      b: 0.21228,
+      c: 35.803,
+      setTempC: 32.0,
+      targetMC: 13.6,
+      img: OatImg,
+      colour: "#79955a",
+      weightConversionKg: 15.4222988297197,
+      bushelsPerTonne: 64.842 
+    }
+  ],
+    [
+    pond.Grain.GRAIN_OATS_C,
+    {
+      name: "Oats c",
+      group: "Oats",
+      equation: Equation.oswin,
+      a: 12.412,
+      b: -0.060707,
+      c: 2.9397,
+      setTempC: 32.0,
+      targetMC: 13.6,
+      img: OatImg,
+      colour: "#79955a",
+      weightConversionKg: 15.4222988297197,
+      bushelsPerTonne: 64.842
+    }
   ],
   [
     pond.Grain.GRAIN_PEANUTS,
@@ -506,6 +540,66 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
       weightConversionKg: 27.2155,
       bushelsPerTonne: 36.744
     }
+  ],[
+    pond.Grain.GRAIN_RYE_A,
+    {
+      name: "Rye a",
+      group: "Rye",
+      equation: Equation.henderson,
+      a: 0.00006343,
+      b: 2.2060,
+      c: 13.1810,
+      setTempC: defaultSetTemp,
+      targetMC: 15.0,
+      colour: "grey",
+      weightConversionKg: 25.4,
+      bushelsPerTonne: 39.368
+    }
+  ],[
+        pond.Grain.GRAIN_RYE_B,
+    {
+      name: "Rye b",
+      group: "Rye",
+      equation: Equation.chungPfost,
+      a: 461.0230,
+      b: 0.1840,
+      c: 36.7410,
+      setTempC: defaultSetTemp,
+      targetMC: 15.0,
+      colour: "grey",
+      weightConversionKg: 25.4,
+      bushelsPerTonne: 39.368
+    },
+  ],[
+        pond.Grain.GRAIN_RYE_C,
+    {
+      name: "Rye c",
+      group: "Rye",
+      equation: Equation.halsey,
+      a: 4.2970,
+      b: 0.380,
+      c: 2.2710,
+      setTempC: defaultSetTemp,
+      targetMC: 15.0,
+      colour: "grey",
+      weightConversionKg: 25.4,
+      bushelsPerTonne: 39.368
+    },
+  ],[
+        pond.Grain.GRAIN_RYE_D,
+    {
+      name: "Rye d",
+      group: "Rye",
+      equation: Equation.oswin,
+      a: 11.8870,
+      b: 0.0210,
+      c: 3.2620,
+      setTempC: defaultSetTemp,
+      targetMC: 15.0,
+      colour: "grey",
+      weightConversionKg: 25.4,
+      bushelsPerTonne: 39.368
+    }
   ]
 ]);
 

src/pages/Devices.tsx

@@ -472,7 +472,7 @@ export default function Devices() {
     ]
     if (hasPlenums) {
       columns.push({
-        title: "Plenum",
+        title: "Temp/Humidity",
         // sortKey: "hi",
         // disableSort: true,
         render: (device: Device) => {