diff --git a/CarParkValidationAPI/Controllers/ConcessionValidationController.cs b/CarParkValidationAPI/Controllers/ConcessionValidationController.cs index 29d22a3..a36fcd0 100644 --- a/CarParkValidationAPI/Controllers/ConcessionValidationController.cs +++ b/CarParkValidationAPI/Controllers/ConcessionValidationController.cs @@ -27,7 +27,6 @@ namespace CarParkValidationAPI.Controllers _concessionValidation = concessionValidation; } - [HttpPost] public async Task ConcessionValidation([FromBody] ConcessionValidationDto model) { @@ -38,7 +37,6 @@ namespace CarParkValidationAPI.Controllers var response = await _concessionValidation.SaveConcessionValidationAsync(model); return Ok(response); } - [HttpGet] public async Task ConcessionValidation(bool onlyActive=true) diff --git a/CarParkValidationAPI/Repository/ConcessionValidationReportRepository.cs b/CarParkValidationAPI/Repository/ConcessionValidationReportRepository.cs index 9c2962d..e92f1bd 100644 --- a/CarParkValidationAPI/Repository/ConcessionValidationReportRepository.cs +++ b/CarParkValidationAPI/Repository/ConcessionValidationReportRepository.cs @@ -118,13 +118,12 @@ namespace CarParkValidationAPI.Repository } */ ws.Close(); - } var result = new FileContent { Content = array, - FileName = "Report" +DateTime.Now.ToString("yyyy_MM_dd_HH_mm")+ ".xlsx", + FileName = "ConcessionValidation" + DateTime.Now.ToString("yyyy_MM_dd_HH_mm")+ ".xlsx", }; diff --git a/CarParkValidationAPI/Repository/ConcessionValidationRepository.cs b/CarParkValidationAPI/Repository/ConcessionValidationRepository.cs index 771e7d7..4d3dcb6 100644 --- a/CarParkValidationAPI/Repository/ConcessionValidationRepository.cs +++ b/CarParkValidationAPI/Repository/ConcessionValidationRepository.cs @@ -77,9 +77,9 @@ namespace CarParkValidationAPI.Repository model.ConcessionTypeID = dto.ConcessionTypeId; model.ValidationID = dto.Id; model.StafflinkNo = dto.StafflinkNo; - model.StaffFirstName = dto.StaffFirstName; - model.StaffLastName = dto.StaffLastName; - model.StaffEmail = dto.StaffEmail; + model.StaffFirstName = dto.StaffFirstName.Trim(); + model.StaffLastName = dto.StaffLastName.Trim(); + model.StaffEmail = dto.StaffEmail.Trim(); model.ValidateDate = dto.ValidateDate.ToLocalTime(); model.ValidationPointID = dto.ValidationPointId; return model; @@ -170,7 +170,7 @@ namespace CarParkValidationAPI.Repository string message = "warning you already add concession card on this date!"; try { - var anyRecord = await _context.SelectCheckConcessionValidationAsync(currentDate.ToLocalTime().Date, concessionCard, staffLinkNo); + var anyRecord = await _context.SelectCheckConcessionValidationAsync(currentDate.ToLocalTime().Date, concessionCard.Trim(), staffLinkNo.Trim()); if (anyRecord.Count > number) { @@ -203,12 +203,13 @@ namespace CarParkValidationAPI.Repository { int statuscode = 1; int result = 1; + string concard = concessionCard.Trim(); string message = "warning you already add concession card on this date!"; try { var anyRecord = await _context.ConcessionValidations.Where(x => x.StafflinkNo == staffLinkNo - && x.ConcessionCard == concessionCard + && x.ConcessionCard == concard && x.Active == true && x.ValidateDate.Date == currentDate.ToLocalTime().Date ).ToListAsync();