Merge pull request #2094 from TechnologyEnhancedLearning/Develop/Fixes/TD-1766-RemovedHyphenFromAllClasses

rshrirohit · web-flow · commit 6354cf14140f · 2023-08-30T14:36:40.000+01:00
TD-1766 Added the condition to check the customisation name everywhere in the application
diff --git a/DigitalLearningSolutions.Data/Models/CourseCompletion/CourseCompletion.cs b/DigitalLearningSolutions.Data/Models/CourseCompletion/CourseCompletion.cs
@@ -38,7 +38,7 @@ int sectionCount
         )
         {
             Id = id;
-            CourseTitle = $"{applicationName} - {customisationName}";
+            CourseTitle = !String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName;
             Completed = completed;
             Evaluated = evaluated;
             MaxPostLearningAssessmentAttempts = maxPostLearningAssessmentAttempts;
diff --git a/DigitalLearningSolutions.Data/Models/CourseContent/CourseContent.cs b/DigitalLearningSolutions.Data/Models/CourseContent/CourseContent.cs
@@ -44,7 +44,7 @@ bool passwordSubmitted
         )
         {
             Id = id;
-            Title = $"{applicationName} - {customisationName}";
+            Title = !String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName;
             Description = applicationInfo;
             AverageDuration = averageDuration;
             CentreName = centreName;
diff --git a/DigitalLearningSolutions.Data/Models/DiagnosticAssessment/DiagnosticAssessment.cs b/DigitalLearningSolutions.Data/Models/DiagnosticAssessment/DiagnosticAssessment.cs
@@ -55,7 +55,7 @@ public DiagnosticAssessment(
             bool passwordSubmitted
         )
         {
-            CourseTitle = $"{applicationName} - {customisationName}";
+            CourseTitle = !String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName;
             CourseDescription = applicationInfo;
             SectionName = sectionName;
             DiagnosticAttempts = diagAttempts;
diff --git a/DigitalLearningSolutions.Data/Models/DiagnosticAssessment/DiagnosticContent.cs b/DigitalLearningSolutions.Data/Models/DiagnosticAssessment/DiagnosticContent.cs
@@ -1,5 +1,6 @@
 ﻿namespace DigitalLearningSolutions.Data.Models.DiagnosticAssessment
 {
+    using System;
     using System.Collections.Generic;
 
     public class DiagnosticContent
@@ -22,7 +23,7 @@ public DiagnosticContent(
             int currentVersion
         )
         {
-            CourseTitle = $"{applicationName} - {customisationName}";
+            CourseTitle = !String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName;
             SectionName = sectionName;
             DiagnosticAssessmentPath = diagAssessPath;
             CanSelectTutorials = diagObjSelect;
diff --git a/DigitalLearningSolutions.Data/Models/PostLearningAssessment/PostLearningAssessment.cs b/DigitalLearningSolutions.Data/Models/PostLearningAssessment/PostLearningAssessment.cs
@@ -47,7 +47,7 @@ public PostLearningAssessment(
             bool passwordSubmitted
         )
         {
-            CourseTitle = $"{applicationName} - {customisationName}";
+            CourseTitle = !String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName;
             CourseDescription = applicationInfo;
             SectionName = sectionName;
             PostLearningScore = bestScore;
diff --git a/DigitalLearningSolutions.Data/Models/PostLearningAssessment/PostLearningContent.cs b/DigitalLearningSolutions.Data/Models/PostLearningAssessment/PostLearningContent.cs
@@ -1,5 +1,6 @@
 ﻿namespace DigitalLearningSolutions.Data.Models.PostLearningAssessment
 {
+    using System;
     using System.Collections.Generic;
 
     public class PostLearningContent
@@ -20,7 +21,7 @@ public PostLearningContent(
             int currentVersion
         )
         {
-            CourseTitle = $"{applicationName} - {customisationName}";
+            CourseTitle = !String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName;
             SectionName = sectionName;
             PostLearningAssessmentPath = plAssessPath;
             PassThreshold = plaPassThreshold;
diff --git a/DigitalLearningSolutions.Data/Models/TutorialContent/TutorialVideo.cs b/DigitalLearningSolutions.Data/Models/TutorialContent/TutorialVideo.cs
@@ -1,6 +1,7 @@
 ﻿namespace DigitalLearningSolutions.Data.Models.TutorialContent
 {
     using DigitalLearningSolutions.Data.Exceptions;
+    using System;
 
     public class TutorialVideo
     {
@@ -19,7 +20,7 @@ public TutorialVideo(
         {
             TutorialName = tutorialName;
             SectionName = sectionName;
-            CourseTitle = $"{applicationName} - {customisationName}";
+            CourseTitle = !String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName;
 
             VideoPath = videoPath ?? throw new VideoNotFoundException();
         }
diff --git a/DigitalLearningSolutions.Web.Tests/ViewModels/LearningMenu/ContentViewerViewModelTests.cs b/DigitalLearningSolutions.Web.Tests/ViewModels/LearningMenu/ContentViewerViewModelTests.cs
@@ -6,6 +6,7 @@
     using FluentAssertions;
     using Microsoft.Extensions.Configuration;
     using NUnit.Framework;
+    using System;
 
     public class ContentViewerViewModelTests
     {
@@ -213,7 +214,7 @@ public void Content_viewer_should_have_courseTitle()
             );
 
             // Then
-            var courseTitle = $"{applicationName} - {customisationName}";
+            var courseTitle = !String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName;
             contentViewerViewModel.CourseTitle.Should().BeEquivalentTo(courseTitle);
         }
 
diff --git a/DigitalLearningSolutions.Web.Tests/ViewModels/LearningMenu/CourseCompletionViewModelTests.cs b/DigitalLearningSolutions.Web.Tests/ViewModels/LearningMenu/CourseCompletionViewModelTests.cs
@@ -51,7 +51,7 @@ public void CourseCompletion_should_have_courseTitle()
             var courseCompletionViewModel = new CourseCompletionViewModel(config, expectedCourseCompletion, ProgressId);
 
             // Then
-            var courseTitle = $"{applicationName} - {customisationName}";
+            var courseTitle = !String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName;
             courseCompletionViewModel.CourseTitle.Should().BeEquivalentTo(courseTitle);
         }
 
diff --git a/DigitalLearningSolutions.Web.Tests/ViewModels/LearningMenu/DiagnosticAssessmentViewModelTests.cs b/DigitalLearningSolutions.Web.Tests/ViewModels/LearningMenu/DiagnosticAssessmentViewModelTests.cs
@@ -29,7 +29,7 @@ public void Diagnostic_assessment_should_have_title()
                 new DiagnosticAssessmentViewModel(diagnosticAssessment, CustomisationId, SectionId);
 
             // Then
-            diagnosticAssessmentViewModel.CourseTitle.Should().Be($"{applicationName} - {customisationName}");
+            diagnosticAssessmentViewModel.CourseTitle.Should().Be(!String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName);
         }
 
         [Test]
diff --git a/DigitalLearningSolutions.Web.Tests/ViewModels/LearningMenu/DiagnosticContentViewModelTests.cs b/DigitalLearningSolutions.Web.Tests/ViewModels/LearningMenu/DiagnosticContentViewModelTests.cs
@@ -1,5 +1,6 @@
 ﻿namespace DigitalLearningSolutions.Web.Tests.ViewModels.LearningMenu
 {
+    using System;
     using System.Collections.Generic;
     using DigitalLearningSolutions.Data.Tests.TestHelpers;
     using DigitalLearningSolutions.Web.ViewModels.LearningMenu;
@@ -53,7 +54,7 @@ public void Diagnostic_content_should_have_title()
             );
 
             // Then
-            diagnosticContentViewModel.CourseTitle.Should().Be($"{applicationName} - {customisationName}");
+            diagnosticContentViewModel.CourseTitle.Should().Be(!String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName);
         }
 
         [Test]
diff --git a/DigitalLearningSolutions.Web.Tests/ViewModels/LearningMenu/IntitialMenuViewModelTests.cs b/DigitalLearningSolutions.Web.Tests/ViewModels/LearningMenu/IntitialMenuViewModelTests.cs
@@ -24,7 +24,7 @@ public void Initial_menu_should_have_name()
             var initialMenuViewModel = new InitialMenuViewModel(expectedCourseContent);
 
             // Then
-            initialMenuViewModel.Title.Should().Be($"{applicationName} - {customisationName}");
+            initialMenuViewModel.Title.Should().Be(!String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName);
         }
 
         [Test]
diff --git a/DigitalLearningSolutions.Web.Tests/ViewModels/LearningMenu/PostLearningAssessmentViewModelTests.cs b/DigitalLearningSolutions.Web.Tests/ViewModels/LearningMenu/PostLearningAssessmentViewModelTests.cs
@@ -27,7 +27,7 @@ public void Post_learning_assessment_should_have_title()
                 new PostLearningAssessmentViewModel(postLearningAssessment, CustomisationId, SectionId);
 
             // Then
-            postLearningAssessmentViewModel.CourseTitle.Should().Be($"{applicationName} - {customisationName}");
+            postLearningAssessmentViewModel.CourseTitle.Should().Be(!String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName);
         }
 
         [Test]
diff --git a/DigitalLearningSolutions.Web.Tests/ViewModels/LearningMenu/PostLearningContentViewModelTests.cs b/DigitalLearningSolutions.Web.Tests/ViewModels/LearningMenu/PostLearningContentViewModelTests.cs
@@ -6,6 +6,7 @@
     using FluentAssertions;
     using Microsoft.Extensions.Configuration;
     using NUnit.Framework;
+    using System;
 
     public class PostLearningContentViewModelTests
     {
@@ -50,7 +51,7 @@ public void Post_learning_content_should_have_title()
             );
 
             // Then
-            postLearningContentViewModel.CourseTitle.Should().Be($"{applicationName} - {customisationName}");
+            postLearningContentViewModel.CourseTitle.Should().Be(!String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName);
         }
 
         [Test]
diff --git a/DigitalLearningSolutions.Web.Tests/ViewModels/LearningMenu/SectionContentViewModelTests.cs b/DigitalLearningSolutions.Web.Tests/ViewModels/LearningMenu/SectionContentViewModelTests.cs
@@ -38,7 +38,7 @@ public void Section_content_should_have_title()
             var sectionContentViewModel = new SectionContentViewModel(config, sectionContent, CustomisationId, SectionId);
 
             // Then
-            sectionContentViewModel.CourseTitle.Should().Be($"{applicationName} - {customisationName}");
+            sectionContentViewModel.CourseTitle.Should().Be(!String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName);
         }
 
         [Test]
diff --git a/DigitalLearningSolutions.Web.Tests/ViewModels/LearningMenu/TutorialVideoViewModelTests.cs b/DigitalLearningSolutions.Web.Tests/ViewModels/LearningMenu/TutorialVideoViewModelTests.cs
@@ -7,6 +7,7 @@
     using FluentAssertions;
     using Microsoft.Extensions.Configuration;
     using NUnit.Framework;
+    using System;
 
     class TutorialVideoViewModelTests
     {
@@ -145,7 +146,7 @@ public void TutorialVideo_should_have_courseTitle()
             );
 
             // Then
-            var courseTitle = $"{applicationName} - {customisationName}";
+            var courseTitle = !String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName;
             tutorialVideoViewModel.CourseTitle.Should().BeEquivalentTo(courseTitle);
         }
 
diff --git a/DigitalLearningSolutions.Web.Tests/ViewModels/LearningMenu/TutorialViewModelTests.cs b/DigitalLearningSolutions.Web.Tests/ViewModels/LearningMenu/TutorialViewModelTests.cs
@@ -72,7 +72,7 @@ public void Tutorial_should_have_courseTitle()
             // Given
             const string applicationName = "Application";
             const string customisationName = "Customisation";
-            var courseTitle = $"{applicationName} - {customisationName}";
+            var courseTitle = !String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName;
 
             var expectedTutorialInformation = TutorialContentHelper.CreateDefaultTutorialInformation(
                 applicationName: applicationName,

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ int sectionCount`
`38`	`38`	`)`
`39`	`39`	`{`
`40`	`40`	`Id = id;`
`41`		`- CourseTitle = $"{applicationName} - {customisationName}";`
	`41`	`+ CourseTitle = !String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName;`
`42`	`42`	`Completed = completed;`
`43`	`43`	`Evaluated = evaluated;`
`44`	`44`	`MaxPostLearningAssessmentAttempts = maxPostLearningAssessmentAttempts;`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ bool passwordSubmitted`
`44`	`44`	`)`
`45`	`45`	`{`
`46`	`46`	`Id = id;`
`47`		`- Title = $"{applicationName} - {customisationName}";`
	`47`	`+ Title = !String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName;`
`48`	`48`	`Description = applicationInfo;`
`49`	`49`	`AverageDuration = averageDuration;`
`50`	`50`	`CentreName = centreName;`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public DiagnosticAssessment(`
`55`	`55`	`bool passwordSubmitted`
`56`	`56`	`)`
`57`	`57`	`{`
`58`		`- CourseTitle = $"{applicationName} - {customisationName}";`
	`58`	`+ CourseTitle = !String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName;`
`59`	`59`	`CourseDescription = applicationInfo;`
`60`	`60`	`SectionName = sectionName;`
`61`	`61`	`DiagnosticAttempts = diagAttempts;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`namespace DigitalLearningSolutions.Data.Models.DiagnosticAssessment`
`2`	`2`	`{`
	`3`	`+ using System;`
`3`	`4`	`using System.Collections.Generic;`
`4`	`5`
`5`	`6`	`public class DiagnosticContent`
`@@ -22,7 +23,7 @@ public DiagnosticContent(`
`22`	`23`	`int currentVersion`
`23`	`24`	`)`
`24`	`25`	`{`
`25`		`- CourseTitle = $"{applicationName} - {customisationName}";`
	`26`	`+ CourseTitle = !String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName;`
`26`	`27`	`SectionName = sectionName;`
`27`	`28`	`DiagnosticAssessmentPath = diagAssessPath;`
`28`	`29`	`CanSelectTutorials = diagObjSelect;`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public PostLearningAssessment(`
`47`	`47`	`bool passwordSubmitted`
`48`	`48`	`)`
`49`	`49`	`{`
`50`		`- CourseTitle = $"{applicationName} - {customisationName}";`
	`50`	`+ CourseTitle = !String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName;`
`51`	`51`	`CourseDescription = applicationInfo;`
`52`	`52`	`SectionName = sectionName;`
`53`	`53`	`PostLearningScore = bestScore;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`namespace DigitalLearningSolutions.Data.Models.TutorialContent`
`2`	`2`	`{`
`3`	`3`	`using DigitalLearningSolutions.Data.Exceptions;`
	`4`	`+ using System;`
`4`	`5`
`5`	`6`	`public class TutorialVideo`
`6`	`7`	`{`
`@@ -19,7 +20,7 @@ public TutorialVideo(`
`19`	`20`	`{`
`20`	`21`	`TutorialName = tutorialName;`
`21`	`22`	`SectionName = sectionName;`
`22`		`- CourseTitle = $"{applicationName} - {customisationName}";`
	`23`	`+ CourseTitle = !String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName;`
`23`	`24`
`24`	`25`	`VideoPath = videoPath ?? throw new VideoNotFoundException();`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using FluentAssertions;`
`7`	`7`	`using Microsoft.Extensions.Configuration;`
`8`	`8`	`using NUnit.Framework;`
	`9`	`+ using System;`
`9`	`10`
`10`	`11`	`public class ContentViewerViewModelTests`
`11`	`12`	`{`
`@@ -213,7 +214,7 @@ public void Content_viewer_should_have_courseTitle()`
`213`	`214`	`);`
`214`	`215`
`215`	`216`	`// Then`
`216`		`- var courseTitle = $"{applicationName} - {customisationName}";`
	`217`	`+ var courseTitle = !String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName;`
`217`	`218`	`contentViewerViewModel.CourseTitle.Should().BeEquivalentTo(courseTitle);`
`218`	`219`	`}`
`219`	`220`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public void CourseCompletion_should_have_courseTitle()`
`51`	`51`	`var courseCompletionViewModel = new CourseCompletionViewModel(config, expectedCourseCompletion, ProgressId);`
`52`	`52`
`53`	`53`	`// Then`
`54`		`- var courseTitle = $"{applicationName} - {customisationName}";`
	`54`	`+ var courseTitle = !String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName;`
`55`	`55`	`courseCompletionViewModel.CourseTitle.Should().BeEquivalentTo(courseTitle);`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public void Diagnostic_assessment_should_have_title()`
`29`	`29`	`new DiagnosticAssessmentViewModel(diagnosticAssessment, CustomisationId, SectionId);`
`30`	`30`
`31`	`31`	`// Then`
`32`		`- diagnosticAssessmentViewModel.CourseTitle.Should().Be($"{applicationName} - {customisationName}");`
	`32`	`+ diagnosticAssessmentViewModel.CourseTitle.Should().Be(!String.IsNullOrEmpty(customisationName) ? $"{applicationName} - {customisationName}" : applicationName);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`[Test]`