Skip to content

HEEDLS-505 All delegates - Bulk upload journey - fix 2 #598

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
merged 2 commits into from
Sep 16, 2021
Merged

HEEDLS-505 All delegates - Bulk upload journey - fix 2 #598

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
c4d35c2
HEEDLS-505 Change max filesize for bulk upload to 5MiB (but call it 5MB)
ibrahimmunir14 Sep 15, 2021
17cda69
HEEDLS-505 Use excel sheet header names in bulk upload error messages
ibrahimmunir14 Sep 15, 2021
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
28 changes: 14 additions & 14 deletions ...alLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/BulkUploadResultsViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System.Collections.Generic;
using System.Linq;
using DigitalLearningSolutions.Data.Models.DelegateUpload;
using DigitalLearningSolutions.Web.Helpers;

public class BulkUploadResultsViewModel
{
Expand All @@ -29,38 +28,39 @@ private string MapReasonToErrorMessage(BulkUploadResult.ErrorReason reason)
return reason switch
{
BulkUploadResult.ErrorReason.InvalidJobGroupId =>
"Job group ID was not valid, please ensure a valid Job Group ID number is provided (use the 'Job Groups' worksheet in the downloaded template for a list of valid IDs)",
"JobGroupID was not valid, please ensure a valid JobGroupID number is provided (use the 'Job Groups' worksheet in the downloaded template for a list of valid IDs)",
BulkUploadResult.ErrorReason.MissingLastName =>
"Last name was not provided. Last name is a required field and cannot be left blank",
"LastName was not provided. LastName is a required field and cannot be left blank",
BulkUploadResult.ErrorReason.MissingFirstName =>
"First name was not provided. First name is a required field and cannot be left blank",
"FirstName was not provided. FirstName is a required field and cannot be left blank",
BulkUploadResult.ErrorReason.MissingEmail =>
"Email was not provided. Email is a required field and cannot be left blank",
"EmailAddress was not provided. EmailAddress is a required field and cannot be left blank",
BulkUploadResult.ErrorReason.InvalidActive =>
"Active field could not be read. The Active field should contain 'TRUE' or 'FALSE'",
BulkUploadResult.ErrorReason.NoRecordForDelegateId =>
"No existing delegate record was found with the Delegate ID provided",
"No existing delegate record was found with the DelegateID provided",
BulkUploadResult.ErrorReason.UnexpectedErrorForCreate =>
"Unexpected error when creating delegate",
BulkUploadResult.ErrorReason.UnexpectedErrorForUpdate =>
"Unexpected error when updating delegate details",
BulkUploadResult.ErrorReason.ParameterError => "Parameter error when updating delegate details",
BulkUploadResult.ErrorReason.AliasIdInUse => "The Alias ID is already in use by another delegate",
BulkUploadResult.ErrorReason.AliasIdInUse => "The AliasID is already in use by another delegate",
BulkUploadResult.ErrorReason.EmailAddressInUse =>
"The Email address is already in use by another delegate",
BulkUploadResult.ErrorReason.TooLongFirstName => CommonValidationErrorMessages.TooLongFirstName,
BulkUploadResult.ErrorReason.TooLongLastName => CommonValidationErrorMessages.TooLongLastName,
BulkUploadResult.ErrorReason.TooLongEmail => "Email address must be 250 characters or fewer",
BulkUploadResult.ErrorReason.TooLongAliasId => CommonValidationErrorMessages.TooLongAlias,
"The EmailAddress is already in use by another delegate",
BulkUploadResult.ErrorReason.TooLongFirstName => "FirstName must be 250 characters or fewer",
BulkUploadResult.ErrorReason.TooLongLastName => "LastName must be 250 characters or fewer",
BulkUploadResult.ErrorReason.TooLongEmail => "EmailAddress must be 250 characters or fewer",
BulkUploadResult.ErrorReason.TooLongAliasId => "AliasID must be 250 characters or fewer",
BulkUploadResult.ErrorReason.TooLongAnswer1 => "Answer1 must be 100 characters or fewer",
BulkUploadResult.ErrorReason.TooLongAnswer2 => "Answer2 must be 100 characters or fewer",
BulkUploadResult.ErrorReason.TooLongAnswer3 => "Answer3 must be 100 characters or fewer",
BulkUploadResult.ErrorReason.TooLongAnswer4 => "Answer4 must be 100 characters or fewer",
BulkUploadResult.ErrorReason.TooLongAnswer5 => "Answer5 must be 100 characters or fewer",
BulkUploadResult.ErrorReason.TooLongAnswer6 => "Answer6 must be 100 characters or fewer",
BulkUploadResult.ErrorReason.BadFormatEmail =>
"Email address must be in the correct format, like name@example.com",
BulkUploadResult.ErrorReason.WhitespaceInEmail => CommonValidationErrorMessages.WhitespaceInEmail,
"EmailAddress must be in the correct format, like name@example.com",
BulkUploadResult.ErrorReason.WhitespaceInEmail =>
"EmailAddress must not contain any whitespace characters",
_ => throw new ArgumentOutOfRangeException(nameof(reason), reason, null)
};
}
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/UploadDelegatesViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public UploadDelegatesViewModel(DateTime welcomeEmailDate)

[Required(ErrorMessage = "Delegates update file is required")]
[AllowedExtensions(new[] { ".xlsx" }, "Delegates update file must be in xlsx format")]
[MaxFileSize(5*1000*1000, "Maximum allowed file size is 5000KB")]
[MaxFileSize(5*1024*1024, "Maximum allowed file size is 5MB")]
public IFormFile? DelegatesFile { get; set; }

public DateTime? GetWelcomeEmailDate()
Expand Down