kham/carparkvalidation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add trim and can report name

Browse Source
This commit is contained in:
Kham
2021-09-03 15:52:49 +10:00
parent da0b1337eb
commit 7a28a0fc3b
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CarParkValidationAPI/Controllers/ConcessionValidationController.cs
-2
View File
@@ -27,7 +27,6 @@ namespace CarParkValidationAPI.Controllers
_concessionValidation = concessionValidation; _concessionValidation = concessionValidation;
} }
[HttpPost] [HttpPost]
public async Task<IActionResult> ConcessionValidation([FromBody] ConcessionValidationDto model) public async Task<IActionResult> ConcessionValidation([FromBody] ConcessionValidationDto model)
{ {
@@ -38,7 +37,6 @@ namespace CarParkValidationAPI.Controllers
var response = await _concessionValidation.SaveConcessionValidationAsync(model); var response = await _concessionValidation.SaveConcessionValidationAsync(model);
return Ok(response); return Ok(response);
} }
[HttpGet] [HttpGet]
public async Task<IActionResult> ConcessionValidation(bool onlyActive=true) public async Task<IActionResult> ConcessionValidation(bool onlyActive=true)
CarParkValidationAPI/Repository/ConcessionValidationReportRepository.cs
+1 -2
View File
@@ -118,13 +118,12 @@ namespace CarParkValidationAPI.Repository
} }
*/ */
ws.Close(); ws.Close();
} }
var result = new FileContent var result = new FileContent
{ {
Content = array, Content = array,
FileName = "Report" +DateTime.Now.ToString("yyyy_MM_dd_HH_mm")+ ".xlsx", FileName = "ConcessionValidation" + DateTime.Now.ToString("yyyy_MM_dd_HH_mm")+ ".xlsx",
}; };
CarParkValidationAPI/Repository/ConcessionValidationRepository.cs
+6 -5
View File
@@ -77,9 +77,9 @@ namespace CarParkValidationAPI.Repository
model.ConcessionTypeID = dto.ConcessionTypeId; model.ConcessionTypeID = dto.ConcessionTypeId;
model.ValidationID = dto.Id; model.ValidationID = dto.Id;
model.StafflinkNo = dto.StafflinkNo; model.StafflinkNo = dto.StafflinkNo;
model.StaffFirstName = dto.StaffFirstName; model.StaffFirstName = dto.StaffFirstName.Trim();
model.StaffLastName = dto.StaffLastName; model.StaffLastName = dto.StaffLastName.Trim();
model.StaffEmail = dto.StaffEmail; model.StaffEmail = dto.StaffEmail.Trim();
model.ValidateDate = dto.ValidateDate.ToLocalTime(); model.ValidateDate = dto.ValidateDate.ToLocalTime();
model.ValidationPointID = dto.ValidationPointId; model.ValidationPointID = dto.ValidationPointId;
return model; return model;
@@ -170,7 +170,7 @@ namespace CarParkValidationAPI.Repository
string message = "warning you already add concession card on this date!"; string message = "warning you already add concession card on this date!";
try 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) if (anyRecord.Count > number)
{ {
@@ -203,12 +203,13 @@ namespace CarParkValidationAPI.Repository
{ {
int statuscode = 1; int statuscode = 1;
int result = 1; int result = 1;
string concard = concessionCard.Trim();
string message = "warning you already add concession card on this date!"; string message = "warning you already add concession card on this date!";
try try
{ {
var anyRecord = await _context.ConcessionValidations.Where(x => var anyRecord = await _context.ConcessionValidations.Where(x =>
x.StafflinkNo == staffLinkNo x.StafflinkNo == staffLinkNo
&& x.ConcessionCard == concessionCard && x.ConcessionCard == concard
&& x.Active == true && x.Active == true
&& x.ValidateDate.Date == currentDate.ToLocalTime().Date && x.ValidateDate.Date == currentDate.ToLocalTime().Date
).ToListAsync(); ).ToListAsync();