TD-988: 1. Issue when Date field is filled 0 has been resolved.

2. Dropdown value issue resolved
3. Not accepting current date issue resolved

Author: sarathlal-sarangadharan

DigitalLearningSolutions.Web.Tests/Controllers/SuperAdmin/CentresControllerTests.cs

@@ -221,7 +221,7 @@ public void Get_with_centreId_shows_EditContractInfo_page()
             A.CallTo(() => centresDataService.GetContractInfo(CenterId)).Returns(CentreContractAdminUsageTestHelper.GetDefaultEditContractInfo(CenterId));
 
             // When
-            var result = controller.EditContractInfo(centreId,28,8,2023);
+            var result = controller.EditContractInfo(centreId,28,8,2023,10024,10024,100024);
 
             // Then
             using (new AssertionScope())

DigitalLearningSolutions.Web/Controllers/SuperAdmin/Centres/CentresController.cs

@@ -450,7 +450,7 @@ public IActionResult AddCentre(AddCentreSuperAdminViewModel model)
         [HttpGet]
         [NoCaching]
         [Route("SuperAdmin/Centres/{centreId=0:int}/EditContractInfo")]
-        public IActionResult EditContractInfo(int centreId , int? day, int? month, int? year)
+        public IActionResult EditContractInfo(int centreId, int? day, int? month, int? year, int? ContractTypeID, long? ServerSpaceBytesInc, long? DelegateUploadSpace)
         {
             ContractInfo centre = this.centresDataService.GetContractInfo(centreId);
             var contractTypes = this.contractTypesDataService.GetContractTypes().ToList();
@@ -460,15 +460,15 @@ public IActionResult EditContractInfo(int centreId , int? day, int? month, int?
             var model = new ContractTypeViewModel(centre.CentreID, centre.CentreName,
             centre.ContractTypeID, centre.ContractType,
                 centre.ServerSpaceBytesInc, centre.DelegateUploadSpace,
-                centre.ContractReviewDate,day,month,year);
+                centre.ContractReviewDate, day, month, year);
             model.ServerSpaceOptions = SelectListHelper.MapLongOptionsToSelectListItems(
-                serverspace, centre.ServerSpaceBytesInc
+                serverspace, ServerSpaceBytesInc ?? centre.ServerSpaceBytesInc
             );
-            model.PerDelegateUploadSpaceOptions= SelectListHelper.MapLongOptionsToSelectListItems(
-                delegatespace, centre.DelegateUploadSpace
+            model.PerDelegateUploadSpaceOptions = SelectListHelper.MapLongOptionsToSelectListItems(
+                delegatespace, DelegateUploadSpace ?? centre.DelegateUploadSpace
             );
-            model.ContractTypeOptions= SelectListHelper.MapOptionsToSelectListItems(
-                contractTypes, centre.ContractTypeID
+            model.ContractTypeOptions = SelectListHelper.MapOptionsToSelectListItems(
+                contractTypes, ContractTypeID ?? centre.ContractTypeID
             );
             if (day != null && month != null && year != null)
             {
@@ -480,20 +480,38 @@ public IActionResult EditContractInfo(int centreId , int? day, int? month, int?
 
         [Route("SuperAdmin/Centres/{centreId=0:int}/EditContractInfo")]
         [HttpPost]
-        public IActionResult EditContractInfo(ContractTypeViewModel contractTypeViewModel,int? day,int? month,int? year)
+        public IActionResult EditContractInfo(ContractTypeViewModel contractTypeViewModel, int? day, int? month, int? year)
         {
-            if (day != 0 | month != 0 | year != 0)
+            if ((day != 0 && day != null) | (month != 0 && month != null) | (year != 0 && year != null))
             {
-                var validationResult = OldDateValidator.ValidateDate(day??0, month??0, year??0);
+                var validationResult = OldDateValidator.ValidateDate(day ?? 0, month ?? 0, year ?? 0);
+                if(day!=null&&month!=null&&year!=null)
+                {
+                    var today = new DateTime(year ?? 0, month ?? 0, day ?? 0);
+                    if (today == DateTime.Now.Date)
+                    {
+                        validationResult.DateValid = true;
+                        validationResult.ErrorMessage = "";
+                    }
+                }
                 if (!validationResult.DateValid)
                 {
                     if (day == null) day = 0;
-                    if(month == null) month = 0;
-                    if (year == null) year= 0;
-                    return RedirectToAction("EditContractInfo", new { contractTypeViewModel.CentreId, day, month, year });
+                    if (month == null) month = 0;
+                    if (year == null) year = 0;
+                    return RedirectToAction("EditContractInfo", new
+                    {
+                        contractTypeViewModel.CentreId,
+                        day,
+                        month,
+                        year,
+                        contractTypeViewModel.ContractTypeID,
+                        contractTypeViewModel.ServerSpaceBytesInc,
+                        contractTypeViewModel.DelegateUploadSpace
+                    });
                 }
             }
-                if (!ModelState.IsValid)
+            if (!ModelState.IsValid)
             {
                 ContractInfo centre = this.centresDataService.GetContractInfo(contractTypeViewModel.CentreId);
                 var contractTypes = this.contractTypesDataService.GetContractTypes().ToList();
@@ -503,7 +521,7 @@ public IActionResult EditContractInfo(ContractTypeViewModel contractTypeViewMode
                 var model = new ContractTypeViewModel(centre.CentreID, centre.CentreName,
                 centre.ContractTypeID, centre.ContractType,
                 centre.ServerSpaceBytesInc, centre.DelegateUploadSpace,
-                centre.ContractReviewDate, day,month,year);
+                centre.ContractReviewDate, day, month, year);
                 model.ServerSpaceOptions = SelectListHelper.MapLongOptionsToSelectListItems(
                serverspace, model.ServerSpaceBytesInc
            );
@@ -516,7 +534,7 @@ public IActionResult EditContractInfo(ContractTypeViewModel contractTypeViewMode
                 return View(model);
             }
             DateTime? date = null;
-            if(day!=null&&month!=null&year!=null)
+            if ((day != 0 && day != null) && (month != 0 && month != null) && (year != 0 && year != null))
             {
                 date = new DateTime(year ?? 0, month ?? 0, day ?? 0);
             }