From 7a0c53facc39a963933cae794b0004172fcc75e1 Mon Sep 17 00:00:00 2001 From: Kham Date: Fri, 17 Sep 2021 08:31:29 +1000 Subject: [PATCH] Release with this version 1.0.0 --- .../Controllers/ConcessionValidationController.cs | 4 ++-- CarParkValidationAPI/Datas/DataContext.cs | 2 +- CarParkValidationAPI/Interface/IConcessionValidation.cs | 2 +- CarParkValidationAPI/Repository/AdminUserRepository.cs | 5 +++-- .../Repository/ConcessionTypeRepository.cs | 4 ++-- .../Repository/ConcessionValidationReportRepository.cs | 9 +++++---- .../Repository/ConcessionValidationRepository.cs | 9 ++++----- CarParkValidationAPI/Repository/LookupCodeRepository.cs | 1 + .../Repository/ValidationPointRepository.cs | 4 ++-- CarParkValidationAPI/appsettings.Development.json | 2 +- CarParkValidationAPI/appsettings.json | 3 ++- 11 files changed, 24 insertions(+), 21 deletions(-) diff --git a/CarParkValidationAPI/Controllers/ConcessionValidationController.cs b/CarParkValidationAPI/Controllers/ConcessionValidationController.cs index a36fcd0..5459c6f 100644 --- a/CarParkValidationAPI/Controllers/ConcessionValidationController.cs +++ b/CarParkValidationAPI/Controllers/ConcessionValidationController.cs @@ -46,9 +46,9 @@ namespace CarParkValidationAPI.Controllers } [HttpGet("[action]")] - public async Task ConcessionValidationByStaff(string staffLinkNo, DateTime currentDate) + public async Task ConcessionValidationByStaff(string staffLinkNo, DateTime fromDate, DateTime toDate) { - var retval = await _concessionValidation.LoadConcessionValidationStaffLinkNoAsync(staffLinkNo, currentDate); + var retval = await _concessionValidation.LoadConcessionValidationStaffLinkNoAsync(staffLinkNo, fromDate, toDate); return Ok(retval); } diff --git a/CarParkValidationAPI/Datas/DataContext.cs b/CarParkValidationAPI/Datas/DataContext.cs index 9058207..c32c778 100644 --- a/CarParkValidationAPI/Datas/DataContext.cs +++ b/CarParkValidationAPI/Datas/DataContext.cs @@ -113,7 +113,7 @@ namespace CarParkValidationAPI.Datas var pStaffLink = new SqlParameter { ParameterName = "StafflinkNo", - Value = stafflinkNo + Value = string.IsNullOrEmpty(stafflinkNo) ? "" : stafflinkNo, }; var pToDate = new SqlParameter diff --git a/CarParkValidationAPI/Interface/IConcessionValidation.cs b/CarParkValidationAPI/Interface/IConcessionValidation.cs index 2357fef..ccf00f8 100644 --- a/CarParkValidationAPI/Interface/IConcessionValidation.cs +++ b/CarParkValidationAPI/Interface/IConcessionValidation.cs @@ -11,7 +11,7 @@ namespace CarParkValidationAPI.Interface public interface IConcessionValidation { Task>> LoadConcessionValidationAsync(bool OnlyActive); - Task>> LoadConcessionValidationStaffLinkNoAsync(string staffLinkNo, DateTime currentDate); + Task>> LoadConcessionValidationStaffLinkNoAsync(string staffLinkNo, DateTime currentDate, DateTime toDate); Task> CheckConcessionValidationStaffLinkNoAsync(string staffLinkNo, string concessionCard, DateTime currentDate, int id); Task> SaveConcessionValidationAsync(ConcessionValidationDto item); Task> LoadConcessionValidationByIdAsync(int id); diff --git a/CarParkValidationAPI/Repository/AdminUserRepository.cs b/CarParkValidationAPI/Repository/AdminUserRepository.cs index 6b72c93..c799975 100644 --- a/CarParkValidationAPI/Repository/AdminUserRepository.cs +++ b/CarParkValidationAPI/Repository/AdminUserRepository.cs @@ -77,7 +77,7 @@ namespace CarParkValidationAPI.Repository model.StafflinkNo = dto.StafflinkNo; model.Active = dto.Active; model.AddedBy = dto.AddedBy; - model.AddedOn = dto.AddedOn; + model.AddedOn = dto.AddedOn.ToLocalTime(); model.ValidationPointID = dto.ValidationPointId; return model; } @@ -162,6 +162,7 @@ namespace CarParkValidationAPI.Repository model.LastModified = DateTime.Now; model.LastModifiedId = _currentUser; await _context.SaveChangesAsync(); + } else { @@ -170,7 +171,7 @@ namespace CarParkValidationAPI.Repository _context.AdminUsers.Add(model); await _context.SaveChangesAsync(); } - result = 1; + result = model.UserID; statuscode = 1; } catch (Exception ex) diff --git a/CarParkValidationAPI/Repository/ConcessionTypeRepository.cs b/CarParkValidationAPI/Repository/ConcessionTypeRepository.cs index efe1f6d..2eeb75b 100644 --- a/CarParkValidationAPI/Repository/ConcessionTypeRepository.cs +++ b/CarParkValidationAPI/Repository/ConcessionTypeRepository.cs @@ -135,8 +135,8 @@ namespace CarParkValidationAPI.Repository model.LastModifiedId = _currentUser; _context.ConcessionTypes.Add(model); var id = await _context.SaveChangesAsync(); - result = id; - item.Id = id; + result = model.ConcessionTypeID; + } statuscode = 1; } diff --git a/CarParkValidationAPI/Repository/ConcessionValidationReportRepository.cs b/CarParkValidationAPI/Repository/ConcessionValidationReportRepository.cs index cd92a9a..b64c564 100644 --- a/CarParkValidationAPI/Repository/ConcessionValidationReportRepository.cs +++ b/CarParkValidationAPI/Repository/ConcessionValidationReportRepository.cs @@ -16,6 +16,7 @@ namespace CarParkValidationAPI.Repository private readonly DataContext _context; private readonly IOptions _appSettings; const string DateFormat = "dd-MM-yyyy HH:mm"; + const string dateFormat = "dd-MM-yyyyy"; public ConcessionValidationReportRepository( DataContext context, IOptions appSettings) { @@ -42,8 +43,8 @@ namespace CarParkValidationAPI.Repository sl.SetCellStyle(1, 5, style); sl.SetRowHeight(1, 1, 25); sl.SetCellValue(row++, 5, "The ConssionValidation Report"); - - sl.SetCellValue(1, 8, " " + DateTime.Now.ToString("ddd dd/MM/yyyy HH:mm")); + sl.SetCellValue(row, 3, "Date Range: " + fromDate.ToString(dateFormat) + " - " + toDate.ToString(dateFormat) ); + sl.SetCellValue(1, 6, " " + DateTime.Now.ToString("ddd dd/MM/yyyy HH:mm")); int startTitleRow = 3; row = startTitleRow; @@ -55,8 +56,8 @@ namespace CarParkValidationAPI.Repository sl.SetRowHeight(startTitleRow, startTitleRow, 25); // add the title first sl.SetCellValue(row, col++, "Date"); - sl.SetCellValue(row, col++, "Concession Card"); - sl.SetCellValue(row, col++, "Concession Holder"); + sl.SetCellValue(row, col++, "Concession Card Number"); + sl.SetCellValue(row, col++, "Concession Holder Name"); sl.SetCellValue(row, col++, "Expiry date checked"); sl.SetCellValue(row, col++, "ConcessionType"); sl.SetCellValue(row, col++, "Validation Piont"); diff --git a/CarParkValidationAPI/Repository/ConcessionValidationRepository.cs b/CarParkValidationAPI/Repository/ConcessionValidationRepository.cs index 4d3dcb6..9fda313 100644 --- a/CarParkValidationAPI/Repository/ConcessionValidationRepository.cs +++ b/CarParkValidationAPI/Repository/ConcessionValidationRepository.cs @@ -118,7 +118,7 @@ namespace CarParkValidationAPI.Repository }; } - public async Task>> LoadConcessionValidationStaffLinkNoAsync(string staffLinkNo, DateTime currentDate) + public async Task>> LoadConcessionValidationStaffLinkNoAsync(string staffLinkNo, DateTime fromDate, DateTime toDate) { List result = new List(); // ConcessionValidationExtDto dto; @@ -127,13 +127,12 @@ namespace CarParkValidationAPI.Repository string error = ""; try { - //List clist = await _context.ConcessionValidations.Where(x => // x.Active == true // && x.StafflinkNo == staffLinkNo // && x.ValidateDate.Date == currentDate.Date //).ToListAsync(); - result = await _context.SelectConcessionValidationByStaffId(true, staffLinkNo, currentDate, currentDate); + result = await _context.SelectConcessionValidationByStaffId(true, staffLinkNo, fromDate, toDate); /* //var clist = await _context.SPSelectValidation(true, staffLinkNo, currentDate); for (int i = 0; i < clist.Count; i++) @@ -141,11 +140,10 @@ namespace CarParkValidationAPI.Repository model = clist[i]; dto = FillConcessionValidationExtDto(model); result.Add(dto); - } */ statuscode = 1; - + result.Sort((x, y) => x.ValidateDate.CompareTo(y.ValidateDate)); } catch (Exception ex) { @@ -295,6 +293,7 @@ namespace CarParkValidationAPI.Repository model.CreatedId = _currentUser; _context.ConcessionValidations.Add(model); result = await _context.SaveChangesAsync(); + result = model.ValidationID; } statuscode = 1; } diff --git a/CarParkValidationAPI/Repository/LookupCodeRepository.cs b/CarParkValidationAPI/Repository/LookupCodeRepository.cs index 8b7eb8c..be205b3 100644 --- a/CarParkValidationAPI/Repository/LookupCodeRepository.cs +++ b/CarParkValidationAPI/Repository/LookupCodeRepository.cs @@ -67,6 +67,7 @@ namespace CarParkValidationAPI.Repository string error = ""; try { + result = await _context.Validations.Where(x => x.Active == onlyActive).Select( x => new LookupCodeDto() { diff --git a/CarParkValidationAPI/Repository/ValidationPointRepository.cs b/CarParkValidationAPI/Repository/ValidationPointRepository.cs index 8d30c3c..27d0477 100644 --- a/CarParkValidationAPI/Repository/ValidationPointRepository.cs +++ b/CarParkValidationAPI/Repository/ValidationPointRepository.cs @@ -132,8 +132,8 @@ namespace CarParkValidationAPI.Repository model = FillValidationModel(item, model); _context.Validations.Add(model); var id = await _context.SaveChangesAsync(); - result = id; - item.Id = id; + result = model.ValidationPointID; + } statuscode = 1; } diff --git a/CarParkValidationAPI/appsettings.Development.json b/CarParkValidationAPI/appsettings.Development.json index adfde93..b6c155b 100644 --- a/CarParkValidationAPI/appsettings.Development.json +++ b/CarParkValidationAPI/appsettings.Development.json @@ -1,7 +1,7 @@ { "AppSettings": { "Secret": "Nepean Blue Mountain Super Secret SIGN AND VERIFY JWT TOKENS, BEARER TOKEN USE WHEN CALLING THIS API.", - "SQLConnectionString": "Server=NEPHMDB-SQL007;Initial Catalog=CarParkValidation;Persist Security Info=False;User ID=bids_admin;Password=Password4BI;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;", + "SQLConnectionString": "Server=NEPHICT-040931L;Initial Catalog=CarParkValidation;Persist Security Info=False;User ID=bids_admin;Password=Password4BI;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;", "LDAPPath": "LDAP://ldap.nswhealth.net:389/OU=Accounts,DC=nswhealth,DC=net", "LDAPUser": "SRV-NBMS-BIDSPMS", "LDAPPassword": "42Ytp2AE3nN16eBoyia86UZH6", diff --git a/CarParkValidationAPI/appsettings.json b/CarParkValidationAPI/appsettings.json index 867f5d6..6d37de4 100644 --- a/CarParkValidationAPI/appsettings.json +++ b/CarParkValidationAPI/appsettings.json @@ -1,7 +1,7 @@ { "AppSettings": { "Secret": "Nepean Blue Mountain Super Secret SIGN AND VERIFY JWT TOKENS, BEARER TOKEN USE WHEN CALLING THIS API.", - "SQLConnectionString": "Server=NEPHMDB-SQL007;Initial Catalog=CarParkValidation;Persist Security Info=False;User ID=bids_admin;Password=Password4BI;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;", + "SQLConnectionString": "Server=NEPHICT-040931L;Initial Catalog=CarParkValidation;Persist Security Info=False;User ID=bids_admin;Password=Password4BI;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;", "LDAPPath": "LDAP://ldap.nswhealth.net:389/OU=Accounts,DC=nswhealth,DC=net", "LDAPUser": "SRV-NBMS-BIDSPMS", "LDAPPassword": "42Ytp2AE3nN16eBoyia86UZH6", @@ -19,5 +19,6 @@ "OLDLoginWebAPI": "http://virtapp-mdb048/CommonAPI/api/AD/", "LADP": "http://NEPHMDB-SQL007/CommonWebApiAD/api/AD/", "AllowedHosts": "*", + "SQLConnectionString": "Server=NEPHMDB-SQL007;Initial Catalog=CarParkValidation;Persist Security Info=False;User ID=bids_admin;Password=Password4BI;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;", "SQLConnectionStringold": "Server=tcp:10.60.207.82,1433;Initial Catalog=CarParkValidation;Persist Security Info=False;User ID=bids_admin;Password=Password4BI;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;" }