Skip to content

Test #2207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aurelio-aot merged 2 commits into from
Mar 31, 2026
Merged

Test #2207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
610e7b4
AB#32524: Allow non-numeric inputs for Year
aurelio-aot Mar 31, 2026
9c582e7
Merge pull request #2206 from bcgov/hotfix/AB#32524-Funding-History-I…
JamesPasta Mar 31, 2026
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
7 changes: 1 addition & 6 deletions ...anager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateFundingHistoryModal.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<div class="mb-3">
<label class="form-label" for="FundingHistoryForm_FundingYear">Funding Year</label>
<input type="text" id="FundingHistoryForm_FundingYear" name="FundingHistoryForm.FundingYear"
class="form-control" inputmode="numeric" maxlength="4"
class="form-control"
value="@Model.FundingHistoryForm?.FundingYear" />
</div>

Expand Down Expand Up @@ -93,11 +93,6 @@
}
});

var $fundingYear = $('#FundingHistoryForm_FundingYear');

$fundingYear.on('input', function () {
$(this).val($(this).val().replace(/\D/g, '').slice(0, 4));
});
}
})();
</script>
11 changes: 1 addition & 10 deletions ...Manager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateIssueTrackingModal.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<div class="mb-3">
<label class="form-label" for="IssueTrackingForm_Year">Year</label>
<input type="text" id="IssueTrackingForm_Year" name="IssueTrackingForm.Year"
class="form-control" inputmode="numeric" maxlength="4"
class="form-control"
value="@Model.IssueTrackingForm?.Year" />
</div>

Expand Down Expand Up @@ -55,12 +55,3 @@
</abp-modal>
</form>

<script defer>
(function () {
if (window.jQuery) {
$('#IssueTrackingForm_Year').on('input', function () {
$(this).val($(this).val().replace(/\D/g, '').slice(0, 4));
});
}
})();
</script>
7 changes: 1 addition & 6 deletions ...tManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditFundingHistoryModal.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div class="mb-3">
<label class="form-label" for="FundingHistoryForm_FundingYear">Funding Year</label>
<input type="text" id="FundingHistoryForm_FundingYear" name="FundingHistoryForm.FundingYear"
class="form-control" inputmode="numeric" maxlength="4"
class="form-control"
value="@Model.FundingHistoryForm?.FundingYear" />
</div>

Expand Down Expand Up @@ -94,11 +94,6 @@
}
});

var $fundingYear = $('#FundingHistoryForm_FundingYear');

$fundingYear.on('input', function () {
$(this).val($(this).val().replace(/\D/g, '').slice(0, 4));
});
}
})();
</script>
11 changes: 1 addition & 10 deletions ...ntManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditIssueTrackingModal.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div class="mb-3">
<label class="form-label" for="IssueTrackingForm_Year">Year</label>
<input type="text" id="IssueTrackingForm_Year" name="IssueTrackingForm.Year"
class="form-control" inputmode="numeric" maxlength="4"
class="form-control"
value="@Model.IssueTrackingForm?.Year" />
</div>

Expand Down Expand Up @@ -56,12 +56,3 @@
</abp-modal>
</form>

<script defer>
(function () {
if (window.jQuery) {
$('#IssueTrackingForm_Year').on('input', function () {
$(this).val($(this).val().replace(/\D/g, '').slice(0, 4));
});
}
})();
</script>
1 change: 0 additions & 1 deletion ...Manager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/FundingHistoryModalViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ public class FundingHistoryModalViewModel
public string? GrantCategory { get; set; }

[DisplayName("Funding Year")]
[RegularExpression(@"^\d{4}$", ErrorMessage = "Funding Year must be a 4-digit number.")]
public string? FundingYear { get; set; }

[DisplayName("Renewed Funding")]
Expand Down
2 changes: 0 additions & 2 deletions ...tManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/IssueTrackingModalViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using Microsoft.AspNetCore.Mvc;

namespace Unity.GrantManager.Web.Pages.ApplicantHistory;
Expand All @@ -11,7 +10,6 @@ public class IssueTrackingModalViewModel
public Guid ApplicantId { get; set; }

[DisplayName("Year")]
[RegularExpression(@"^\d{4}$", ErrorMessage = "Year must be a 4-digit number.")]
public string? Year { get; set; }

[DisplayName("Issue Heading")]
Expand Down
Loading