Merge pull request #323 from TechnologyEnhancedLearning/Develop/Fixes/TD-4106-Issue-with-Formal-assessments-learning-record-showing-as-0%-for-completed,-passed-&-failed-assessments-and-showing-date-incorrect

sarathlal-sarangadharan · web-flow · commit 1b3eafd2afa6 · 2024-04-29T11:58:55.000+01:00
TD-4106: Issue with Formal assessments learning record showing as '0%' for completed, passed &amp; failed assessments and showing date incorrect
diff --git a/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs b/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs
@@ -226,7 +226,7 @@ public static string GetActivityStatusText(this ActivityDetailedItemViewModel ac
         /// <returns>The <see cref="bool"/>.</returns>
         public static bool CanShowScore(this ActivityDetailedItemViewModel activityDetailedItemViewModel)
         {
-            if ((activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Scorm && (activityDetailedItemViewModel.MasteryScore > 0 || activityDetailedItemViewModel.MasteryScore == null) && ((activityDetailedItemViewModel.ScorePercentage > 0 && activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Passed) || activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Failed)) || ((activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Assessment || activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Case) && activityDetailedItemViewModel.Complete))
+            if ((activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Scorm && (activityDetailedItemViewModel.MasteryScore > 0 || activityDetailedItemViewModel.MasteryScore == null) && ((activityDetailedItemViewModel.ScorePercentage > 0 && activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Passed) || activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Failed)) || (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Assessment && (activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed || activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Passed || activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Failed)) || (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Case && activityDetailedItemViewModel.Complete))
             {
                 return true;
             }
@@ -241,7 +241,7 @@ public static bool CanShowScore(this ActivityDetailedItemViewModel activityDetai
         /// <returns>The <see cref="bool"/>bool.</returns>
         public static bool CanViewPercentage(this ActivityDetailedItemViewModel activityDetailedItemViewModel)
         {
-            if (((activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Video || activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Audio) && activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.InProgress) || (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Assessment && activityDetailedItemViewModel.Complete == false))
+            if (((activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Video || activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Audio) && activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.InProgress) || (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Assessment && activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.InProgress))
             {
                 return true;
             }
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLatestActivityCheck.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLatestActivityCheck.sql
@@ -162,7 +162,7 @@ FROM (
 					EXISTS
 					(
 							SELECT 1	FROM   [activity].[ResourceActivity] AS [ResAct2]
-							WHERE  [ResAct2].[Deleted] = 0 AND  [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND  [ResAct2].[ActivityStatusId] in (3,7)
+							WHERE  [ResAct2].[Deleted] = 0 AND  [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND  [ResAct2].[ActivityStatusId] in (3,7,5)
 					)
 					
 				)
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql
@@ -230,7 +230,7 @@ FROM (
 					EXISTS
 					(
 							SELECT 1	FROM   [activity].[ResourceActivity] AS [ResAct2]
-							WHERE  [ResAct2].[Deleted] = 0 AND  [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND  [ResAct2].[ActivityStatusId] in (3,7)
+							WHERE  [ResAct2].[Deleted] = 0 AND  [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND  [ResAct2].[ActivityStatusId] in (3,7,5)
 					)
 					
 				)
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql
@@ -145,7 +145,7 @@ FROM (
 					EXISTS
 					(
 							SELECT 1	FROM   [activity].[ResourceActivity] AS [ResAct2]
-							WHERE  [ResAct2].[Deleted] = 0 AND  [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND  [ResAct2].[ActivityStatusId] in (3,7)
+							WHERE  [ResAct2].[Deleted] = 0 AND  [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND  [ResAct2].[ActivityStatusId] in (3,7,5)
 					)
 					
 				)

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ public static string GetActivityStatusText(this ActivityDetailedItemViewModel ac`
`226`	`226`	`/// <returns>The <see cref="bool"/>.</returns>`
`227`	`227`	`public static bool CanShowScore(this ActivityDetailedItemViewModel activityDetailedItemViewModel)`
`228`	`228`	`{`
`229`		- if ((activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Scorm && (activityDetailedItemViewModel.MasteryScore > 0 \|\| activityDetailedItemViewModel.MasteryScore == null) && ((activityDetailedItemViewModel.ScorePercentage > 0 && activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Passed) \|\| activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Failed)) \|\| ((activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Assessment \|\| activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Case) && activityDetailedItemViewModel.Complete))
	`229`	+ if ((activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Scorm && (activityDetailedItemViewModel.MasteryScore > 0 \|\| activityDetailedItemViewModel.MasteryScore == null) && ((activityDetailedItemViewModel.ScorePercentage > 0 && activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Passed) \|\| activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Failed)) \|\| (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Assessment && (activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed \|\| activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Passed \|\| activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Failed)) \|\| (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Case && activityDetailedItemViewModel.Complete))
`230`	`230`	`{`
`231`	`231`	`return true;`
`232`	`232`	`}`
`@@ -241,7 +241,7 @@ public static bool CanShowScore(this ActivityDetailedItemViewModel activityDetai`
`241`	`241`	`/// <returns>The <see cref="bool"/>bool.</returns>`
`242`	`242`	`public static bool CanViewPercentage(this ActivityDetailedItemViewModel activityDetailedItemViewModel)`
`243`	`243`	`{`
`244`		`- if (((activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Video \|\| activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Audio) && activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.InProgress) \|\| (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Assessment && activityDetailedItemViewModel.Complete == false))`
	`244`	`+ if (((activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Video \|\| activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Audio) && activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.InProgress) \|\| (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Assessment && activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.InProgress))`
`245`	`245`	`{`
`246`	`246`	`return true;`
`247`	`247`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ FROM (`
`162`	`162`	`EXISTS`
`163`	`163`	`(`
`164`	`164`	`SELECT 1 FROM [activity].[ResourceActivity] AS [ResAct2]`
`165`		`- WHERE [ResAct2].[Deleted] = 0 AND [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND [ResAct2].[ActivityStatusId] in (3,7)`
	`165`	`+ WHERE [ResAct2].[Deleted] = 0 AND [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND [ResAct2].[ActivityStatusId] in (3,7,5)`
`166`	`166`	`)`
`167`	`167`
`168`	`168`	`)`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ FROM (`
`230`	`230`	`EXISTS`
`231`	`231`	`(`
`232`	`232`	`SELECT 1 FROM [activity].[ResourceActivity] AS [ResAct2]`
`233`		`- WHERE [ResAct2].[Deleted] = 0 AND [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND [ResAct2].[ActivityStatusId] in (3,7)`
	`233`	`+ WHERE [ResAct2].[Deleted] = 0 AND [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND [ResAct2].[ActivityStatusId] in (3,7,5)`
`234`	`234`	`)`
`235`	`235`
`236`	`236`	`)`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ FROM (`
`145`	`145`	`EXISTS`
`146`	`146`	`(`
`147`	`147`	`SELECT 1 FROM [activity].[ResourceActivity] AS [ResAct2]`
`148`		`- WHERE [ResAct2].[Deleted] = 0 AND [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND [ResAct2].[ActivityStatusId] in (3,7)`
	`148`	`+ WHERE [ResAct2].[Deleted] = 0 AND [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND [ResAct2].[ActivityStatusId] in (3,7,5)`
`149`	`149`	`)`
`150`	`150`
`151`	`151`	`)`