Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/HealthTracker.Api/HealthTracker.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<ReleaseVersion>1.32.0.0</ReleaseVersion>
<FileVersion>1.32.0.0</FileVersion>
<ProductVersion>1.32.0</ProductVersion>
<ReleaseVersion>1.33.0.0</ReleaseVersion>
<FileVersion>1.33.0.0</FileVersion>
<ProductVersion>1.33.0</ProductVersion>
<ImplicitUsings>enable</ImplicitUsings>
<IsPackable>false</IsPackable>
<NoWarn>$(NoWarn);NU1900;NU1902;NU1904</NoWarn>
Expand Down
4 changes: 2 additions & 2 deletions src/HealthTracker.Client/HealthTracker.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<PackageId>HealthTracker.Client</PackageId>
<PackageVersion>1.32.0.0</PackageVersion>
<PackageVersion>1.33.0.0</PackageVersion>
<Authors>Dave Walker</Authors>
<Copyright>Copyright (c) 2024, 2025 Dave Walker</Copyright>
<Owners>Dave Walker</Owners>
Expand All @@ -16,7 +16,7 @@
<PackageProjectUrl>https://github.com/davewalker5/HealthTracker</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<ReleaseVersion>1.32.0.0</ReleaseVersion>
<ReleaseVersion>1.33.0.0</ReleaseVersion>
<NoWarn>$(NoWarn);NU1900;NU1902;NU1904</NoWarn>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<PackageId>HealthTracker.Configuration</PackageId>
<PackageVersion>1.32.0.0</PackageVersion>
<PackageVersion>1.33.0.0</PackageVersion>
<Authors>Dave Walker</Authors>
<Copyright>Copyright (c) 2024, 2025 Dave Walker</Copyright>
<Owners>Dave Walker</Owners>
Expand All @@ -16,7 +16,7 @@
<PackageProjectUrl>https://github.com/davewalker5/HealthTracker</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<ReleaseVersion>1.32.0.0</ReleaseVersion>
<ReleaseVersion>1.33.0.0</ReleaseVersion>
<NoWarn>$(NoWarn);NU1900;NU1902;NU1904</NoWarn>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/HealthTracker.Data/HealthTracker.Data.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<PackageId>HealthTracker.Data</PackageId>
<PackageVersion>1.32.0.0</PackageVersion>
<PackageVersion>1.33.0.0</PackageVersion>
<Authors>Dave Walker</Authors>
<Copyright>Copyright (c) 2024, 2025 Dave Walker</Copyright>
<Owners>Dave Walker</Owners>
Expand All @@ -16,7 +16,7 @@
<PackageProjectUrl>https://github.com/davewalker5/HealthTracker</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<ReleaseVersion>1.32.0.0</ReleaseVersion>
<ReleaseVersion>1.33.0.0</ReleaseVersion>
<NoWarn>$(NoWarn);NU1900;NU1902;NU1904</NoWarn>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<PackageId>HealthTracker.DataExchange</PackageId>
<PackageVersion>1.32.0.0</PackageVersion>
<PackageVersion>1.33.0.0</PackageVersion>
<Authors>Dave Walker</Authors>
<Copyright>Copyright (c) 2024, 2025 Dave Walker</Copyright>
<Owners>Dave Walker</Owners>
Expand All @@ -16,7 +16,7 @@
<PackageProjectUrl>https://github.com/davewalker5/HealthTracker</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<ReleaseVersion>1.32.0.0</ReleaseVersion>
<ReleaseVersion>1.33.0.0</ReleaseVersion>
<NoWarn>$(NoWarn);NU1900;NU1902;NU1904</NoWarn>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/HealthTracker.Entities/HealthTracker.Entities.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<PackageId>HealthTracker.Entities</PackageId>
<PackageVersion>1.32.0.0</PackageVersion>
<PackageVersion>1.33.0.0</PackageVersion>
<Authors>Dave Walker</Authors>
<Copyright>Copyright (c) 2024, 2025 Dave Walker</Copyright>
<Owners>Dave Walker</Owners>
Expand All @@ -16,7 +16,7 @@
<PackageProjectUrl>https://github.com/davewalker5/HealthTracker</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<ReleaseVersion>1.32.0.0</ReleaseVersion>
<ReleaseVersion>1.33.0.0</ReleaseVersion>
<NoWarn>$(NoWarn);NU1900;NU1902;NU1904</NoWarn>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<PackageId>HealthTracker.Enumerations</PackageId>
<PackageVersion>1.32.0.0</PackageVersion>
<PackageVersion>1.33.0.0</PackageVersion>
<Authors>Dave Walker</Authors>
<Copyright>Copyright (c) 2024, 2025 Dave Walker</Copyright>
<Owners>Dave Walker</Owners>
Expand All @@ -16,7 +16,7 @@
<PackageProjectUrl>https://github.com/davewalker5/HealthTracker</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<ReleaseVersion>1.32.0.0</ReleaseVersion>
<ReleaseVersion>1.33.0.0</ReleaseVersion>
<NoWarn>$(NoWarn);NU1900;NU1902;NU1904</NoWarn>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/HealthTracker.Logic/HealthTracker.Logic.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<PackageId>HealthTracker.Logic</PackageId>
<PackageVersion>1.32.0.0</PackageVersion>
<PackageVersion>1.33.0.0</PackageVersion>
<Authors>Dave Walker</Authors>
<Copyright>Copyright (c) 2024, 2025 Dave Walker</Copyright>
<Owners>Dave Walker</Owners>
Expand All @@ -17,7 +17,7 @@
<PackageProjectUrl>https://github.com/davewalker5/HealthTracker</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<ReleaseVersion>1.32.0.0</ReleaseVersion>
<ReleaseVersion>1.33.0.0</ReleaseVersion>
<NoWarn>$(NoWarn);NU1900;NU1902;NU1904</NoWarn>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions src/HealthTracker.Manager/HealthTracker.Manager.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<ReleaseVersion>1.32.0.0</ReleaseVersion>
<FileVersion>1.32.0.0</FileVersion>
<ProductVersion>1.32.0.0</ProductVersion>
<ReleaseVersion>1.33.0.0</ReleaseVersion>
<FileVersion>1.33.0.0</FileVersion>
<ProductVersion>1.33.0.0</ProductVersion>
<Configurations>Release;Debug</Configurations>
<NoWarn>$(NoWarn);NU1900;NU1902;NU1904</NoWarn>
</PropertyGroup>
Expand Down
16 changes: 16 additions & 0 deletions src/HealthTracker.Mvc/Controllers/HealthTrackerControllerBase.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@
using System.Reflection;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;

namespace HealthTracker.Mvc.Controllers
{
public abstract class HealthTrackerControllerBase : Controller
{
public static readonly string Version = Assembly.GetExecutingAssembly()
.GetCustomAttribute<AssemblyFileVersionAttribute>()?
.Version;

/// <summary>
/// Add the version to the view data on each request
/// </summary>
/// <param name="context"></param>
public override void OnActionExecuting(ActionExecutingContext context)
{
base.OnActionExecuting(context);
ViewData["Version"] = Version;
}

/// <summary>
/// Log model state errors
/// </summary>
Expand Down
1 change: 1 addition & 0 deletions src/HealthTracker.Mvc/Entities/ControllerActions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ public static class ControllerActions
public const string ActionNextPage = "Next";
public const string ActionSearch = "Search";
public const string ActionAdd = "Add";
public const string ActionSave = "Save";
public const string ActionCancel = "Cancel";
public const string ActionTakeAll = "TakeAll";
public const string ActionUnTakeAll = "UnTakeAll";
Expand Down
6 changes: 3 additions & 3 deletions src/HealthTracker.Mvc/HealthTracker.Mvc.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<ReleaseVersion>1.32.0.0</ReleaseVersion>
<FileVersion>1.32.0.0</FileVersion>
<ProductVersion>1.32.0</ProductVersion>
<ReleaseVersion>1.33.0.0</ReleaseVersion>
<FileVersion>1.33.0.0</FileVersion>
<ProductVersion>1.33.0</ProductVersion>
<ImplicitUsings>enable</ImplicitUsings>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
11 changes: 11 additions & 0 deletions src/HealthTracker.Mvc/Views/ActivityType/ActivityType.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,14 @@
</div>
</div>
</div>

<script type="text/javascript">
$(document).ready(function() {
$(document).on("keydown", function (e) {
if (e.key === "Enter") {
e.preventDefault();
$('#Save').click();
}
});
});
</script>
2 changes: 1 addition & 1 deletion src/HealthTracker.Mvc/Views/ActivityType/Add.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<div class="col-md">
<div class="input-group">
<button type="submit" name="Action" value="@ControllerActions.ActionCancel" class="btn btn-secondary" style="margin-right:10px">Cancel</button>
<button name="save" id="save" type="submit" class="btn btn-primary">Save</button>
<button type="submit" name="Action" id="Save" value="@ControllerActions.ActionSave" class="btn btn-primary">Save</button>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/HealthTracker.Mvc/Views/ActivityType/Edit.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<div class="col-md">
<div class="input-group">
<button type="submit" name="Action" value="@ControllerActions.ActionCancel" class="btn btn-secondary" style="margin-right:10px">Cancel</button>
<button type="submit" class="btn btn-primary">Save</button>
<button type="submit" name="Action" id="Save" value="@ControllerActions.ActionSave" class="btn btn-primary">Save</button>
</div>
</div>
</div>
Expand Down
9 changes: 8 additions & 1 deletion src/HealthTracker.Mvc/Views/Alcohol/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
}

<p class="text-right">
<button type="submit" class="btn btn-primary">Calculate</button>
<button type="submit" id="Calculate" class="btn btn-primary">Calculate</button>
</p>
</div>
}
Expand All @@ -102,5 +102,12 @@
$("#Volume").on("keydown", function() {
$("#Measure").val("0");
});

$(document).on("keydown", function (e) {
if (e.key === "Enter") {
e.preventDefault();
$('#Calculate').click();
}
});
});
</script>
2 changes: 1 addition & 1 deletion src/HealthTracker.Mvc/Views/Beverage/Add.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<div class="col-md">
<div class="input-group">
<button type="submit" name="Action" value="@ControllerActions.ActionCancel" class="btn btn-secondary" style="margin-right:10px">Cancel</button>
<button name="save" id="save" type="submit" class="btn btn-primary">Save</button>
<button type="submit" name="Action" id="Save" value="@ControllerActions.ActionSave" class="btn btn-primary">Save</button>
</div>
</div>
</div>
Expand Down
11 changes: 11 additions & 0 deletions src/HealthTracker.Mvc/Views/Beverage/Beverage.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,14 @@
</div>
</div>
</div>

<script type="text/javascript">
$(document).ready(function() {
$(document).on("keydown", function (e) {
if (e.key === "Enter") {
e.preventDefault();
$('#Save').click();
}
});
});
</script>
2 changes: 1 addition & 1 deletion src/HealthTracker.Mvc/Views/Beverage/Edit.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<div class="col-md">
<div class="input-group">
<button type="submit" name="Action" value="@ControllerActions.ActionCancel" class="btn btn-secondary" style="margin-right:10px">Cancel</button>
<button type="submit" class="btn btn-primary">Save</button>
<button type="submit" name="Action" id="Save" value="@ControllerActions.ActionSave" class="btn btn-primary">Save</button>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/HealthTracker.Mvc/Views/BeverageConsumption/Add.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<div class="col-md">
<div class="input-group">
<button type="submit" name="Action" value="@ControllerActions.ActionCancel" class="btn btn-secondary" style="margin-right:10px">Cancel</button>
<button type="submit" class="btn btn-primary">Save</button>
<button type="submit" name="Action" id="Save" value="@ControllerActions.ActionSave" class="btn btn-primary">Save</button>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,5 +120,12 @@
$("#Measurement_Volume").on("keydown", function() {
$("#Measure").val("0");
});

$(document).on("keydown", function (e) {
if (e.key === "Enter") {
e.preventDefault();
$('#Save').click();
}
});
});
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<div class="col-md">
<div class="input-group">
<button type="submit" name="Action" value="@ControllerActions.ActionCancel" class="btn btn-secondary" style="margin-right:10px">Cancel</button>
<button type="submit" class="btn btn-primary">Save</button>
<button type="submit" name="Action" id="Save" value="@ControllerActions.ActionSave" class="btn btn-primary">Save</button>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/HealthTracker.Mvc/Views/BeverageMeasure/Add.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<div class="col-md">
<div class="input-group">
<button type="submit" name="Action" value="@ControllerActions.ActionCancel" class="btn btn-secondary" style="margin-right:10px">Cancel</button>
<button name="save" id="save" type="submit" class="btn btn-primary">Save</button>
<button type="submit" name="Action" id="Save" value="@ControllerActions.ActionSave" class="btn btn-primary">Save</button>
</div>
</div>
</div>
Expand Down
11 changes: 11 additions & 0 deletions src/HealthTracker.Mvc/Views/BeverageMeasure/BeverageMeasure.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,14 @@
</div>
</div>
</div>

<script type="text/javascript">
$(document).ready(function() {
$(document).on("keydown", function (e) {
if (e.key === "Enter") {
e.preventDefault();
$('#Save').click();
}
});
});
</script>
2 changes: 1 addition & 1 deletion src/HealthTracker.Mvc/Views/BeverageMeasure/Edit.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<div class="col-md">
<div class="input-group">
<button type="submit" name="Action" value="@ControllerActions.ActionCancel" class="btn btn-secondary" style="margin-right:10px">Cancel</button>
<button type="submit" class="btn btn-primary">Save</button>
<button type="submit" name="Action" id="Save" value="@ControllerActions.ActionSave" class="btn btn-primary">Save</button>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/HealthTracker.Mvc/Views/BloodGlucose/Add.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<div class="col-md">
<div class="input-group">
<button type="submit" name="Action" value="@ControllerActions.ActionCancel" class="btn btn-secondary" style="margin-right:10px">Cancel</button>
<button type="submit" class="btn btn-primary">Save</button>
<button type="submit" name="Action" id="Save" value="@ControllerActions.ActionSave" class="btn btn-primary">Save</button>
</div>
</div>
</div>
Expand Down
10 changes: 10 additions & 0 deletions src/HealthTracker.Mvc/Views/BloodGlucose/BloodGlucose.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,13 @@
</div>
</div>

<script type="text/javascript">
$(document).ready(function() {
$(document).on("keydown", function (e) {
if (e.key === "Enter") {
e.preventDefault();
$('#Save').click();
}
});
});
</script>
2 changes: 1 addition & 1 deletion src/HealthTracker.Mvc/Views/BloodGlucose/Edit.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<div class="col-md">
<div class="input-group">
<button type="submit" name="Action" value="@ControllerActions.ActionCancel" class="btn btn-secondary" style="margin-right:10px">Cancel</button>
<button type="submit" class="btn btn-primary">Save</button>
<button type="submit" name="Action" id="Save" value="@ControllerActions.ActionSave" class="btn btn-primary">Save</button>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<div class="col-md">
<div class="input-group">
<button type="submit" name="Action" value="@ControllerActions.ActionCancel" class="btn btn-secondary" style="margin-right:10px">Cancel</button>
<button type="submit" class="btn btn-primary">Save</button>
<button type="submit" name="Action" id="Save" value="@ControllerActions.ActionSave" class="btn btn-primary">Save</button>
</div>
</div>
</div>
Expand Down
Loading