Skip to content

HEEDLS-820 - trimmed custom prompts so JS filtering functions correctly #1091

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
May 9, 2022
Merged

HEEDLS-820 - trimmed custom prompts so JS filtering functions correctly #1091

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
bd619c2
HEEDLS-820 - trimmed custom prompts so JS filtering functions correctly
DanBloxham-sw Apr 29, 2022
13412d8
HEEDLS-820 - run formatter
DanBloxham-sw Apr 29, 2022
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 DigitalLearningSolutions.Data/DataServices/CourseDelegatesDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ public IEnumerable<CourseDelegate> GetDelegatesOnCourse(int customisationId, int
p.RemovedDate,
p.Completed,
p.CustomisationId,
p.Answer1,
p.Answer2,
p.Answer3,
TRIM(p.Answer1) AS Answer1,
TRIM(p.Answer2) AS Answer2,
TRIM(p.Answer3) AS Answer3,
{AllAttemptsQuery},
{AttemptsPassedQuery}
FROM Candidates AS c
Expand Down
12 changes: 6 additions & 6 deletions DigitalLearningSolutions.Data/DataServices/UserDataService/DelegateUserCardDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ public partial class UserDataService
cd.LastName,
cd.Password,
cd.Approved,
cd.Answer1,
cd.Answer2,
cd.Answer3,
cd.Answer4,
cd.Answer5,
cd.Answer6,
TRIM(cd.Answer1) AS Answer1,
TRIM(cd.Answer2) AS Answer2,
TRIM(cd.Answer3) AS Answer3,
TRIM(cd.Answer4) AS Answer4,
TRIM(cd.Answer5) AS Answer5,
TRIM(cd.Answer6) AS Answer6,
cd.JobGroupId,
jg.JobGroupName,
cd.SelfReg,
Expand Down
6 changes: 3 additions & 3 deletions DigitalLearningSolutions.Data/Helpers/FilteringHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public static class FilteringHelper

public static string BuildFilterValueString(string group, string propertyName, string propertyValue)
{
return group + Separator + propertyName + Separator + propertyValue;
return group + Separator + propertyName + Separator + propertyValue.Trim();
}

public static string? AddNewFilterToFilterString(string? existingFilterString, string? newFilterToAdd)
Expand Down Expand Up @@ -178,8 +178,8 @@ private static IEnumerable<FilterOptionModel> GetFilterOptionsForPromptWithOptio

var options = prompt.Options.Select(
option => new FilterOptionModel(
option,
BuildFilterValueString(group, group.Split('(')[0], option),
option.Trim(),
BuildFilterValueString(group, group.Split('(')[0], option.Trim()),
FilterStatus.Default
)
).ToList();
Expand Down
16 changes: 6 additions & 10 deletions ...gSolutions.Web.Tests/Controllers/TrackingSystem/CourseSetup/AdminFieldsControllerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ public void Setup()
public void AdminFields_returns_AdminFields_page_when_appropriate_course_found_and_clears_TempData()
{
// Given
var courseAdminField1 = PromptsTestHelper.GetDefaultCourseAdminField(1, "System Access Granted", "Yes\r\nNo");
var courseAdminField1 =
PromptsTestHelper.GetDefaultCourseAdminField(1, "System Access Granted", "Yes\r\nNo");
var courseAdminFields = new List<CourseAdminField> { courseAdminField1 };
A.CallTo(() => courseAdminFieldsService.GetCourseAdminFieldsForCourse(A<int>._))
.Returns(PromptsTestHelper.GetDefaultCourseAdminFields(courseAdminFields));
Expand Down Expand Up @@ -114,17 +115,12 @@ public void PostEditAdminField_save_calls_correct_methods()
public void PostEditAdminField_add_configures_new_answer()
{
// Given
var model = new EditAdminFieldViewModel(1, "Test", "Options");
var model = new EditAdminFieldViewModel(1, "Test", "Options")
{
Answer = "new option",
};
const string action = "addPrompt";

A.CallTo(
() => courseAdminFieldsService.UpdateAdminFieldForCourse(
1,
1,
"Test"
)
).DoesNothing();

// When
var result = controller.EditAdminField(1, model, action);

Expand Down
30 changes: 30 additions & 0 deletions DigitalLearningSolutions.Web.Tests/Helpers/NewlineSeparatedStringListHelperTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public class NewlineSeparatedStringListHelperTests
private const string Item1 = "item1";
private const string Item2 = "item2";
private const string ItemList = "item1\r\nitem2";
private const string ItemListWithWhitespaceInAnswers = " item1 \r\n item2 ";
private const string ItemListWithWhitespaceItems = "item1\r\nitem2\r\n\r\n ";
private readonly List<string> items = new List<string> { Item1, Item2 };

Expand All @@ -34,6 +35,20 @@ public void AddStringToNewlineSeparatedList_returns_expected_values()
resultString.Should().BeEquivalentTo(ItemList);
}

[Test]
public void AddStringToNewlineSeparatedList_trims_answers_and_returns_expected_values()
{
// When
var resultString =
NewlineSeparatedStringListHelper.AddStringToNewlineSeparatedList(
" " + Item1 + " \n",
" " + Item2 + " \r"
);

// Then
resultString.Should().BeEquivalentTo(ItemList);
}

[Test]
public void JoinNewlineSeparatedList_returns_expected_values()
{
Expand All @@ -58,6 +73,21 @@ public void SplitNewlineSeparatedList_returns_expected_values()
}
}

[Test]
public void SplitNewlineSeparatedList_trims_answers_and_returns_expected_values()
{
// When
var resultList =
NewlineSeparatedStringListHelper.SplitNewlineSeparatedList(ItemListWithWhitespaceInAnswers);

// Then
using (new AssertionScope())
{
resultList.Count.Should().Be(2);
resultList.Should().BeEquivalentTo(items);
}
}

[Test]
public void RemoveEmptyOptions_removes_expected_entries()
{
Expand Down
4 changes: 2 additions & 2 deletions DigitalLearningSolutions.Web/Helpers/NewlineSeparatedStringListHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ public static string RemoveStringFromNewlineSeparatedList(string list, int index
public static string AddStringToNewlineSeparatedList(string? list, string newItem)
{
var options = list != null ? SplitNewlineSeparatedList(list) : new List<string>();
options.Add(newItem);
options.Add(newItem.Trim());
return JoinNewlineSeparatedList(options);
}

public static List<string> SplitNewlineSeparatedList(string? list)
{
return list == null ? new List<string>() : list.Split(Separator).ToList();
return list == null ? new List<string>() : list.Split(Separator).Select(value => value.Trim()).ToList();
}

public static string JoinNewlineSeparatedList(IEnumerable<string> strings)
Expand Down