brandxtech/frontend
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added the new corn types for the other equations, also renamed the other oats and rye to include the equation names

Browse source
This commit is contained in:
csawatzky 2025-11-17 11:59:30 -06:00
parent 5093573ba7
commit 37d87d062a
3 changed files with 44 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package-lock.json generated
View file

@ -10953,7 +10953,7 @@
}, },
"node_modules/protobuf-ts": { "node_modules/protobuf-ts": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#31866a5a4ebad3770b82f4687bec2fd4c3b8417e", "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#da863c196ce4fc03beab6099752bbda67d203274",
"dependencies": { "dependencies": {
"protobufjs": "^6.8.8" "protobufjs": "^6.8.8"
} }

2
package.json
View file

@ -54,7 +54,7 @@
"mui-tel-input": "^7.0.0", "mui-tel-input": "^7.0.0",
"notistack": "^3.0.1", "notistack": "^3.0.1",
"openweathermap-ts": "^1.2.10", "openweathermap-ts": "^1.2.10",
"protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#master", "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#staging",
"query-string": "^9.2.1", "query-string": "^9.2.1",
"react": "^18.3.1", "react": "^18.3.1",
"react-beautiful-dnd": "^13.1.1", "react-beautiful-dnd": "^13.1.1",

50
src/grain/GrainDescriber.ts
View file

@ -139,7 +139,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
[ [
pond.Grain.GRAIN_CORN, pond.Grain.GRAIN_CORN,
{ {
name: "Corn", name: "Corn (Henderson)",
group: "Corn", group: "Corn",
equation: Equation.henderson, equation: Equation.henderson,
a: 0.000066612, a: 0.000066612,
@ -153,6 +153,40 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
bushelsPerTonne: 39.368 bushelsPerTonne: 39.368
} }
], ],
[
pond.Grain.GRAIN_CORN_B,
{
name: "Corn (Chung-Pfost)",
group: "Corn",
equation: Equation.chungPfost,
a: 374.34,
b: 0.18662,
c: 31.696,
setTempC: 38.0,
targetMC: 15.6,
img: CornImg,
colour: "#ffef62",
weightConversionKg: 25.4014333665971,
bushelsPerTonne: 39.368
}
],
[
pond.Grain.GRAIN_CORN_C,
{
name: "Corn (Oswin)",
group: "Corn",
equation: Equation.oswin,
a: 15.303,
b: -0.10164,
c: 3.0358,
setTempC: 38.0,
targetMC: 15.6,
img: CornImg,
colour: "#ffef62",
weightConversionKg: 25.4014333665971,
bushelsPerTonne: 39.368
}
],
[ [
pond.Grain.GRAIN_MAIZE_WHITE, pond.Grain.GRAIN_MAIZE_WHITE,
{ {
@ -190,7 +224,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
[ [
pond.Grain.GRAIN_OATS, pond.Grain.GRAIN_OATS,
{ {
name: "Oats a", name: "Oats (Henderson)",
group: "Oats", group: "Oats",
equation: Equation.henderson, equation: Equation.henderson,
a: 0.000085511, a: 0.000085511,
@ -207,7 +241,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
[ [
pond.Grain.GRAIN_OATS_B, pond.Grain.GRAIN_OATS_B,
{ {
name: "Oats b", name: "Oats (Chung-Pfost)",
group: "Oats", group: "Oats",
equation: Equation.chungPfost, equation: Equation.chungPfost,
a: 442.85, a: 442.85,
@ -224,7 +258,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
[ [
pond.Grain.GRAIN_OATS_C, pond.Grain.GRAIN_OATS_C,
{ {
name: "Oats c", name: "Oats (Oswin)",
group: "Oats", group: "Oats",
equation: Equation.oswin, equation: Equation.oswin,
a: 12.412, a: 12.412,
@ -543,7 +577,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
],[ ],[
pond.Grain.GRAIN_RYE_A, pond.Grain.GRAIN_RYE_A,
{ {
name: "Rye a", name: "Rye (Henderson)",
group: "Rye", group: "Rye",
equation: Equation.henderson, equation: Equation.henderson,
a: 0.00006343, a: 0.00006343,
@ -558,7 +592,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
],[ ],[
pond.Grain.GRAIN_RYE_B, pond.Grain.GRAIN_RYE_B,
{ {
name: "Rye b", name: "Rye (Chung-Pfost)",
group: "Rye", group: "Rye",
equation: Equation.chungPfost, equation: Equation.chungPfost,
a: 461.0230, a: 461.0230,
@ -573,7 +607,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
],[ ],[
pond.Grain.GRAIN_RYE_C, pond.Grain.GRAIN_RYE_C,
{ {
name: "Rye c", name: "Rye (Halsey)",
group: "Rye", group: "Rye",
equation: Equation.halsey, equation: Equation.halsey,
a: 4.2970, a: 4.2970,
@ -588,7 +622,7 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
],[ ],[
pond.Grain.GRAIN_RYE_D, pond.Grain.GRAIN_RYE_D,
{ {
name: "Rye d", name: "Rye (Oswin)",
group: "Rye", group: "Rye",
equation: Equation.oswin, equation: Equation.oswin,
a: 11.8870, a: 11.8870,