Revert "Revert "TD-2469: Review comments implemented""

kevwhitt-hee · kevwhitt-hee · commit dc1d2f497f7f · 2023-09-15T11:40:05.000+01:00
This reverts commit cc3f05b.
diff --git a/DigitalLearningSolutions.Web/Controllers/SuperAdmin/Centres/CentresController.cs b/DigitalLearningSolutions.Web/Controllers/SuperAdmin/Centres/CentresController.cs
@@ -534,7 +534,7 @@ public IActionResult EditContractInfo(int centreId, int? day, int? month, int? y
         [HttpPost]
         public IActionResult EditContractInfo(ContractTypeViewModel contractTypeViewModel, int? day, int? month, int? year)
         {
-            if ((day != 0 && day != null) | (month != 0 && month != null) | (year != 0 && year != null))
+            if ((day.GetValueOrDefault() != 0) || (month.GetValueOrDefault() != 0) || (year.GetValueOrDefault() != 0))
             {
                 var validationResult = DateValidator.ValidateDate(day ?? 0, month ?? 0, year ?? 0);
                 if (validationResult.ErrorMessage != null)
@@ -573,8 +573,8 @@ public IActionResult EditContractInfo(ContractTypeViewModel contractTypeViewMode
                 return View(model);
             }
             DateTime? date = null;
-            if ((day != 0 && day != null) && (month != 0 && month != null) && (year != 0 && year != null))
-            {
+            if ((day.GetValueOrDefault() != 0) || (month.GetValueOrDefault() != 0) || (year.GetValueOrDefault() != 0))
+                {
                 date = new DateTime(year ?? 0, month ?? 0, day ?? 0);
             }
             this.centresDataService.UpdateContractTypeandCenter(contractTypeViewModel.CentreId,

Original file line number	Diff line number	Diff line change
`@@ -534,7 +534,7 @@ public IActionResult EditContractInfo(int centreId, int? day, int? month, int? y`
`534`	`534`	`[HttpPost]`
`535`	`535`	`public IActionResult EditContractInfo(ContractTypeViewModel contractTypeViewModel, int? day, int? month, int? year)`
`536`	`536`	`{`
`537`		`- if ((day != 0 && day != null) \| (month != 0 && month != null) \| (year != 0 && year != null))`
	`537`	`+ if ((day.GetValueOrDefault() != 0) \|\| (month.GetValueOrDefault() != 0) \|\| (year.GetValueOrDefault() != 0))`
`538`	`538`	`{`
`539`	`539`	`var validationResult = DateValidator.ValidateDate(day ?? 0, month ?? 0, year ?? 0);`
`540`	`540`	`if (validationResult.ErrorMessage != null)`
`@@ -573,8 +573,8 @@ public IActionResult EditContractInfo(ContractTypeViewModel contractTypeViewMode`
`573`	`573`	`return View(model);`
`574`	`574`	`}`
`575`	`575`	`DateTime? date = null;`
`576`		`- if ((day != 0 && day != null) && (month != 0 && month != null) && (year != 0 && year != null))`
`577`		`- {`
	`576`	`+ if ((day.GetValueOrDefault() != 0) \|\| (month.GetValueOrDefault() != 0) \|\| (year.GetValueOrDefault() != 0))`
	`577`	`+ {`
`578`	`578`	`date = new DateTime(year ?? 0, month ?? 0, day ?? 0);`
`579`	`579`	`}`
`580`	`580`	`this.centresDataService.UpdateContractTypeandCenter(contractTypeViewModel.CentreId,`