Merge pull request #91 from UK-SBCoA/A2-Form-UI-Behavior

A2 form UI Behavior and Finalization

src/UDS.Net.Forms/Extensions/DomainToViewModelMapper.cs

@@ -231,6 +231,7 @@ public static A2 ToVM(this A2FormFields fields, int formId)
                 INBIRMO = fields.INBIRMO,
                 INBIRYR = fields.INBIRYR,
                 INSEX = fields.INSEX,
+                NEWINF = fields.NEWINF,
                 INHISP = fields.INHISP,
                 INHISPOR = fields.INHISPOR,
                 INHISPOX = fields.INHISPOX,

src/UDS.Net.Forms/Extensions/ViewModelToDomainMapper.cs

@@ -115,6 +115,7 @@ public static Form ToEntity(this A2 vm)
                 INBIRMO = vm.INBIRMO,
                 INBIRYR = vm.INBIRYR,
                 INSEX = vm.INSEX,
+                NEWINF = vm.NEWINF,
                 INHISP = vm.INHISP,
                 INHISPOR = vm.INHISPOR,
                 INHISPOX = vm.INHISPOX,

src/UDS.Net.Forms/Models/UDS3/A2.cs

@@ -5,6 +5,7 @@
 using System.Xml.Linq;
 using UDS.Net.Forms.DataAnnotations;
 using UDS.Net.Forms.TagHelpers;
+using UDS.Net.Services.Enums;
 
 namespace UDS.Net.Forms.Models.UDS3
 {
@@ -22,71 +23,107 @@ public class A2 : FormModel
         public int? INBIRYR { get; set; }
 
         [Display(Name = "Co-participant's sex")]
+        [RequiredOnComplete(ErrorMessage = "Response required")]
         public int? INSEX { get; set; }
 
         [Display(Name = "Is this a new co-participant - i.e., one who was not a co-participant at any past UDS visit?")]
         public int? NEWINF { get; set; }
 
         [Display(Name = "Does the co-participant report being of Hispanic/Latino ethnicity  (i.e., having origins from a mainly Spanish-speaking Latin American country), regardless of race?")]
+        [RequiredIf(nameof(NEWINF), "1", ErrorMessage = "Does the co-participant report being of Hispanic/Latino ethnicity?")]
         public int? INHISP { get; set; }
 
         [Display(Name = "If yes, what are the co-participant's reported origins?")]
+        [RequiredIf(nameof(INHISP), "2", ErrorMessage = "What are the co-participant's reported origins?")]
         public int? INHISPOR { get; set; }
 
         [Display(Name = "Other (SPECIFY)")]
         [MaxLength(60)]
         [ProhibitedCharacters]
+        [RequiredIf(nameof(INHISPOR), "50", ErrorMessage = "Indicate other additional origin")]
         public string? INHISPOX { get; set; }
 
         [Display(Name = "What does the co-participant report as his or her race?")]
+        [RequiredIf(nameof(NEWINF), "1", ErrorMessage = "Indicate co-participants race")]
         public int? INRACE { get; set; }
 
         [Display(Name = "Other (SPECIFY)")]
         [MaxLength(60)]
+        [RequiredIf(nameof(INRACE), "50", ErrorMessage = "Indicate other additional race")]
         [ProhibitedCharacters]
         public string? INRACEX { get; set; }
 
         [Display(Name = "What additional race does the co-participant report?")]
+        [RequiredIf(nameof(NEWINF), "1", ErrorMessage = "Indicate additional race")]
         public int? INRASEC { get; set; }
 
         [Display(Name = "Other (SPECIFY)")]
         [MaxLength(60)]
+        [RequiredIf(nameof(INRASEC), "50", ErrorMessage = "Indicate other additional race")]
         [ProhibitedCharacters]
         public string? INRASECX { get; set; }
 
         [Display(Name = "What additional race, beyond those reported in Questions 4 and 5, does the co-participant report?")]
+        [RequiredIf(nameof(NEWINF), "1", ErrorMessage = "Indicate additional race")]
         public int? INRATER { get; set; }
 
         [Display(Name = "Other (SPECIFY)")]
         [MaxLength(60)]
+        [RequiredIf(nameof(INRATER), "50", ErrorMessage = "Indicate other additional race")]
         [ProhibitedCharacters]
         public string? INRATERX { get; set; }
 
-        [Display(Name = "Co-participant's years of education — use the codes below to report the level achieved; if an attempted level is not completed, enter the number of years completed")]
-        [Range(0, 99, ErrorMessage = "Co-participants years of education must be within 0 and 99")]
+        [Display(Name = "Co-participant's years of education — use the codes below to report the level achieved; if an attempted level is not completed, enter the number of years completed" +
+         "<br /><br /> 12 = high school or GED<br />  16 = bachelor's degree<br /> 18 = master's degree<br /> 20 = doctorate<br /> 99 = unknown")]
+        [RegularExpression(@"^(99|[0-9]|[1-2][0-9]|3[0-6])$", ErrorMessage = "Co-participants years of education must be within 0 and 36 or 99.")]
+        [RequiredIf(nameof(NEWINF), "1", ErrorMessage = "Indicate years of education")]
         public int? INEDUC { get; set; }
 
         [Display(Name = "What is the co-participant's relationship to the participant?")]
+        [RequiredOnComplete(ErrorMessage = "Response required")]
         public int? INRELTO { get; set; }
 
         [Display(Name = "How long has the co-participant known the participant?")]
-        [Range(0, 999, ErrorMessage = "Years known must be within 0 and 999")]
+        [RegularExpression(@"^(0|[1-9]\d?|120|999)$", ErrorMessage = "Years known must be within 0-120 or 999")]
+        [RequiredOnComplete(ErrorMessage = "Response required")]
         public int? INKNOWN { get; set; }
 
         [Display(Name = "Does the co-participant live with the subject?")]
+        [RequiredOnComplete(ErrorMessage = "Response required")]
         public int? INLIVWTH { get; set; }
 
         [Display(Name = "If no, approximate frequency of in-person visits?")]
+        [RequiredIf(nameof(INLIVWTH), "0", ErrorMessage = "Indicate frequency of visits")]
         public int? INVISITS { get; set; }
 
         [Display(Name = "If no, approximate frequency of telephone contact?")]
+        [RequiredIf(nameof(INLIVWTH), "0", ErrorMessage = "Indicate frequency of telephone calls")]
         public int? INCALLS { get; set; }
 
         [Display(Name = "Is there a question about the co-participant's reliability?")]
+        [RequiredOnComplete(ErrorMessage = "Response required")]
         public int? INRELY { get; set; }
 
         public override IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
         {
+
+            if (Status == FormStatus.Complete)
+            {
+                var visitValue = validationContext.Items.FirstOrDefault(v => v.Key.ToString() == "Visit").Value;
+                if (visitValue is VisitModel)
+                {
+                    VisitModel visit = (VisitModel)visitValue;
+
+                    if (visit != null)
+                    {
+                        if (visit.Kind == VisitKind.FVP || visit.Kind == VisitKind.TFP)
+                        {
+                            if (!NEWINF.HasValue)
+                                yield return new ValidationResult("Response required", new[] { nameof(NEWINF) });
+                        }
+                    }
+                }
+            }
             foreach (var result in base.Validate(validationContext))
             {
                 yield return result;