Fixed bug with Observation red dot not showing on first load

CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CisStructure.cs

@@ -230,7 +230,7 @@ private void GetSubgroups(object oParent, int? parentId, int? filterId = null)
 
                     if (answer != null)
                     {
-                        question.HasObservations = _context.FINDING.Any(x => x.Answer_Id == answer.Answer_Id);
+                        question.HasObservation = _context.FINDING.Any(x => x.Answer_Id == answer.Answer_Id);
                     }
 
 
@@ -298,7 +298,7 @@ private void GetSubgroups(object oParent, int? parentId, int? filterId = null)
 
                 if (answer != null)
                 {
-                    question.HasObservations = _context.FINDING.Any(x => x.Answer_Id == answer.Answer_Id);
+                    question.HasObservation = _context.FINDING.Any(x => x.Answer_Id == answer.Answer_Id);
                 }
 
 
@@ -405,7 +405,7 @@ private List<Option> GetOptions(int questionId)
 
                     if (answer != null)
                     {
-                        question.HasObservations = _context.FINDING.Any(x => x.Answer_Id == answer.Answer_Id);
+                        question.HasObservation = _context.FINDING.Any(x => x.Answer_Id == answer.Answer_Id);
                     }
 
 

CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/MaturityBusiness.cs

@@ -1066,6 +1066,9 @@ public void BuildSubGroupings(MaturityGrouping g, int? parentID,
                     {
                         TinyMapper.Bind<VIEW_QUESTIONS_STATUS, QuestionAnswer>();
                         TinyMapper.Map(answer.b, qa);
+
+                        // db view still uses the term "HasDiscovery" - map to "HasObservation"
+                        qa.HasObservation = answer.b.HasDiscovery ?? false;
                     }
 
                     newGrouping.Questions.Add(qa);

CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ComponentQuestionBusiness.cs

@@ -202,6 +202,9 @@ private void AddResponseComponentOverride(QuestionResponse resp, List<Answer_Com
                 {
                     TinyMapper.Bind<VIEW_QUESTIONS_STATUS, QuestionAnswer>();
                     TinyMapper.Map(answer.b, qa);
+
+                    // db view still uses the term "HasDiscovery" - map to "HasObservation"
+                    qa.HasObservation = answer.b.HasDiscovery ?? false;
                 }
 
                 sc.Questions.Add(qa);
@@ -292,6 +295,9 @@ private void AddResponse(QuestionResponse resp, List<Answer_Components_Base> lis
                 {
                     TinyMapper.Bind<VIEW_QUESTIONS_STATUS, QuestionAnswer>();
                     TinyMapper.Map(answer.b, qa);
+
+                    // db view still uses the term "HasDiscovery" - map to "HasObservation"
+                    qa.HasObservation = answer.b.HasDiscovery ?? false;
                 }
 
                 sc.Questions.Add(qa);

CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/RequirementBusiness.cs

@@ -231,6 +231,9 @@ public QuestionResponse BuildResponse(List<RequirementPlus> requirements,
                 {
                     TinyMapper.Bind<VIEW_QUESTIONS_STATUS, QuestionAnswer>();
                     TinyMapper.Map<VIEW_QUESTIONS_STATUS, QuestionAnswer>(answer.b, qa);
+
+                    // db view still uses the term "HasDiscovery" - map to "HasObservation"
+                    qa.HasObservation = answer.b.HasDiscovery ?? false;
                 }
 
                 qa.ParmSubs = GetTokensForRequirement(qa.QuestionId, (answer != null) ? answer.a.Answer_Id : 0);
@@ -364,6 +367,9 @@ public QuestionResponse BuildResponseOLD(List<RequirementPlus> requirements,
                     if (answer != null)
                     {
                         TinyMapper.Map<VIEW_QUESTIONS_STATUS, QuestionAnswer>(answer.b, qa);
+
+                        // db view still uses the term "HasDiscovery" - map to "HasObservation"
+                        qa.HasObservation = answer.b.HasDiscovery ?? false;
                     }
 
                     qa.ParmSubs = GetTokensForRequirement(qa.QuestionId, (answer != null) ? answer.a.Answer_Id : 0);

CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Reports/ReportsDataBusiness.cs

@@ -765,6 +765,9 @@ public void BuildSubGroupings(MaturityGrouping g, int? parentID,
                     {
                         TinyMapper.Bind<VIEW_QUESTIONS_STATUS, QuestionAnswer>();
                         TinyMapper.Map(answer.b, qa);
+
+                        // db view still uses the term "HasDiscovery" - map to "HasObservation"
+                        qa.HasObservation = answer.b.HasDiscovery ?? false;
                     }
 
                     newGrouping.Questions.Add(qa);

CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Cis/CisModels.cs

@@ -91,7 +91,7 @@ public class Question
         public List<Question> Followups { get; set; } = new List<Question>();
 
         public string Comment { get; set; }
-        public bool HasObservations { get; set; }
+        public bool HasObservation { get; set; }
         public string Feedback { get; set; }
         public bool MarkForReview { get; set; }
         public List<int> DocumentIds { get; set; } = new List<int>();

CSETWebNg/src/app/assessment/prepare/sals/sals.component.ts

@@ -58,10 +58,10 @@ export class SalsComponent implements OnInit {
         this.salsSvc.selectedSAL = data;
         this.sal_Levels = data;
 
-        if (data.methodology.toLowerCase() === 'simple') {
+        if (!data.methodology) {
           data.methodology = 'Simple';
         }
-        if (!data.methodology) {
+        if (data.methodology.toLowerCase() === 'simple') {
           data.methodology = 'Simple';
         }
 

CSETWebNg/src/app/assessment/questions/question-extras/question-extras.component.ts

@@ -326,6 +326,7 @@ export class QuestionExtrasComponent implements OnInit {
         }
         return (this.extras && this.extras.observations && this.extras.observations.length > 0) ? 'inline' : 'none';
     }
+    return false;
   }
 
   /**