Skip to content

Commit f046402

Browse files
committed
fix to error
1 parent e645ec7 commit f046402

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/SamSmithNZ.Web/Controllers/MandMCounterController.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,17 @@ public async Task<IActionResult> Index(string volumeUnit = null,
6565
{
6666
model.MandMResult = (float)mandMResult;
6767
}
68-
if (mandMResult != null)
68+
if (peanutMandMResult != null)
6969
{
7070
model.PeanutMandMResult = (float)peanutMandMResult;
7171
}
72-
if (mandMResult != null)
72+
if (skittlesResult != null)
7373
{
7474
model.SkittlesResult = (float)skittlesResult;
7575
}
76-
if (mandMResult != null)
76+
if (jellyBeansResult != null)
7777
{
78-
model.JellyBeans = (float)jellyBeansResult;
78+
model.JellyBeansResult = (float)jellyBeansResult;
7979
}
8080
//Select the target active tab
8181
model.ActiveTab = "0";

src/SamSmithNZ.Web/Models/MandMCounter/IndexViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public IndexViewModel(List<string> unitsForVolume, List<string> unitsForContaine
3131
public float MandMResult { get; set; }
3232
public float PeanutMandMResult { get; set; }
3333
public float SkittlesResult { get; set; }
34-
public float JellyBeans { get; set; }
34+
public float JellyBeansResult { get; set; }
3535
public string ActiveTab { get; set; }
3636
}
3737
}

src/SamSmithNZ.Web/Views/MandMCounter/Index.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@
5858
M&Ms: @Model.MandMResult.ToString("#,###,##0.0") <br />
5959
Peanut M&Ms: @Model.PeanutMandMResult.ToString("#,###,##0.0") <br />
6060
Skittles: @Model.SkittlesResult.ToString("#,###,##0.0") <br />
61-
Jelly Beans @Model.JellyBeans.ToString("#,###,##0.0") <br />
61+
Jelly Beans @Model.JellyBeansResult.ToString("#,###,##0.0") <br />
6262
</div>
6363
</div>

0 commit comments

Comments
 (0)