TD-5401 Resolving merge conflict issue

Author: sherif-olaboye

DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs

@@ -118,9 +118,8 @@ public class CompetencyAssessmentDataService : ICompetencyAssessmentDataService
                  sa.SupervisorResultsReview,
                  sa.SupervisorSelfAssessmentReview,
                  sa.SignOffSupervisorStatement,
-                 sa.SignOffRequestorStatement";
-            sa.IncludeLearnerDeclarationPrompt, sa.IncludesSignposting, sa.LinearNavigation, sa.UseDescriptionExpanders, sa.QuestionLabel, sa.ReviewerCommentsLabel,
-                sa.SupervisorSelfAssessmentReview, sa.SupervisorResultsReview ";
+                 sa.SignOffRequestorStatement,
+            sa.IncludeLearnerDeclarationPrompt, sa.IncludesSignposting, sa.LinearNavigation, sa.UseDescriptionExpanders, sa.QuestionLabel, sa.ReviewerCommentsLabel ";
 
         private const string SelfAssessmentFields =
             @", sa.CategoryID, sa.CreatedDate,
@@ -1139,7 +1138,7 @@ UPDATE SelfAssessments
                 leanerDeclarationValue,
                 leanerCustomText
             }
-        );
+             );
 
             if ((affectedRows < 1))
             {
@@ -1148,6 +1147,11 @@ UPDATE SelfAssessments
                     $"competencyAssessmentId: {competencyAssessmentId}, supervised: {supervised}" +
                     $"signoff: {signoff}, confirm: {confirm}, supervisorDeclarationValue: {supervisorDeclarationValue} " +
                     $"supervisorCustomText: {supervisorCustomText}, leanerDeclarationValue: {leanerDeclarationValue}, leanerCustomText: {leanerCustomText} "
+                    );
+                return false;
+            }
+            return true;
+        }
 
         public bool HasCompetencyWithSignpostedLearning(int competencyAssessmentId)
         {

DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessmentBase.cs

@@ -19,8 +19,6 @@ public class CompetencyAssessmentBase
         public int? NRPRoleID { get; set; }
         public int PublishStatusID { get; set; }
         public int UserRole { get; set; }
-        public int SupervisorResultsReview { get; set; }
-        public int SupervisorSelfAssessmentReview { get; set; }
         public string? SignOffRequestorStatement { get; set; }
         public string? SignOffSupervisorStatement { get; set; }
         public string? Vocabulary { get; set; }

DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs

@@ -1047,7 +1047,7 @@ public IActionResult SupervisorSignoffDeclaration(int competencyAssessmentId, st
             }
             var model = new SupervisorSignoffDeclarationViewModel(competencyAssessmentId);
             model.CompetencyAssessmentName = data.CompetencyAssessmentName;
-            model.DefaultText = this.config.GetSupervisorDefaultText();
+            model.DefaultText = this.config.GetSupervisorDefaultText().Replace("{{CompetencyAssessmentName}}", model.CompetencyAssessmentName); ;
             return View(model);
         }
 
@@ -1063,6 +1063,7 @@ public IActionResult SupervisorSignoffDeclaration(SupervisorSignoffDeclarationVi
             }
             var data = GetManagesupervisionData();
             var model = new ManagesupervisionViewModel(data.LearnerDeclaration, viewModel, data.Signoff);
+            model.CompetencyAssessmentName = viewModel.CompetencyAssessmentName;
             SetManagesupervisionData(model);
             if (viewModel.ActionName != null) return RedirectToAction("LearnerSignoffDeclaration", "CompetencyAssessments",
                 new
@@ -1087,7 +1088,7 @@ public IActionResult LearnerSignoffDeclaration(int competencyAssessmentId, strin
             }
             var model = new LearnerSignoffDeclarationViewModel(competencyAssessmentId);
             model.CompetencyAssessmentName = data.CompetencyAssessmentName;
-            model.DefaultText = this.config.GetLearnerDefaultText();
+            model.DefaultText = this.config.GetLearnerDefaultText().Replace("{{CompetencyAssessmentName}}", model.CompetencyAssessmentName);
             return View(model);
         }
 
@@ -1103,6 +1104,7 @@ public IActionResult LearnerSignoffDeclaration(LearnerSignoffDeclarationViewMode
             }
             var data = GetManagesupervisionData();
             var model = new ManagesupervisionViewModel(viewModel, data.SupervisorDeclaration, data.Signoff);
+            model.CompetencyAssessmentName = viewModel.CompetencyAssessmentName;
             SetManagesupervisionData(model);
             return RedirectToAction("ManageSupervisionSettings", "CompetencyAssessments", new { viewModel.CompetencyAssessmentId });
         }
@@ -1127,7 +1129,8 @@ public IActionResult ManageSupervisionSettings(int competencyAssessmentId, strin
                 return View(model);
             }
             var data = GetManagesupervisionData();
-            return View(data);
+            var dataModel = new ManagesupervisionViewModel(competencyAssessmentId, data, this.config.GetLearnerDefaultText(), this.config.GetSupervisorDefaultText());
+            return View(dataModel);
 
         }
 
@@ -1186,7 +1189,10 @@ private ManagesupervisionViewModel GetManagesupervisionData()
         {
             var data = multiPageFormService.GetMultiPageFormData<ManagesupervisionViewModel>(
                MultiPageFormDataFeature.AddCustomWebForm("ManagesupervisionDataCWF"),
-
+                TempData
+             ).GetAwaiter().GetResult();
+            return data;
+        }
         private void SetOptionsLabelsData(OptionsLabelsViewModel data)
         {
             multiPageFormService.SetMultiPageFormData(

DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/ManagesupervisionViewModel.cs

@@ -23,9 +23,22 @@ public ManagesupervisionViewModel(LearnerSignoffDeclarationViewModel learnerDecl
             SupervisorDeclaration = supervisorDeclaration;
             Signoff = signoff;
         }
+        public ManagesupervisionViewModel(int competencyAssessmentId,
+            ManagesupervisionViewModel model,
+            string learnerDefaultText,
+             string supervisorDefaultText)
+        {
+            CompetencyAssessmentId = competencyAssessmentId;
+            CompetencyAssessmentName = model.CompetencyAssessmentName;
+            Signoff = model.Signoff;
+            SupervisorDeclaration = model.SupervisorDeclaration;
+            SupervisorDeclaration.DefaultText = supervisorDefaultText.Replace("{{CompetencyAssessmentName}}", CompetencyAssessmentName);
+            LearnerDeclaration = model.LearnerDeclaration;
+            LearnerDeclaration.DefaultText = learnerDefaultText.Replace("{{CompetencyAssessmentName}}", CompetencyAssessmentName);
+        }
         public ManagesupervisionViewModel(int competencyAssessmentId, string competencyAssessmentName,
-            int supervisorResultsReview,
-            int SupervisorSelfAssessmentReview,
+            bool supervisorResultsReview,
+            bool SupervisorSelfAssessmentReview,
             string? signOffSupervisorStatement,
             string? signOffRequestorStatement,
             string learnerDefaultText,
@@ -34,9 +47,9 @@ public ManagesupervisionViewModel(int competencyAssessmentId, string competencyA
             CompetencyAssessmentId = competencyAssessmentId;
             CompetencyAssessmentName = competencyAssessmentName;
             Signoff.CompetencyAssessmentId = competencyAssessmentId;
-            Signoff.Supervised = supervisorResultsReview;
-            Signoff.Signoff = supervisorResultsReview;
-            Signoff.Confirm = SupervisorSelfAssessmentReview;
+            Signoff.Supervised = supervisorResultsReview == true ? 1 : 0;
+            Signoff.Signoff = supervisorResultsReview == true ? 1 : 0;
+            Signoff.Confirm = SupervisorSelfAssessmentReview == true ? 1 : 0;
             SupervisorDeclaration.CompetencyAssessmentName = competencyAssessmentName;
             SupervisorDeclaration.CompetencyAssessmentId = competencyAssessmentId;
             SupervisorDeclaration.DeclarationValue = signOffSupervisorStatement == null ? 0 : 1;