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

Release with this version 1.0.0

Browse Source
This commit is contained in:
Kham
2021-09-17 08:31:29 +10:00
parent cd38e7a644
commit 7a0c53facc
11 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CarParkValidationAPI/Controllers/ConcessionValidationController.cs
+2 -2
View File
@@ -46,9 +46,9 @@ namespace CarParkValidationAPI.Controllers
} }
[HttpGet("[action]")] [HttpGet("[action]")]
public async Task<IActionResult> ConcessionValidationByStaff(string staffLinkNo, DateTime currentDate) public async Task<IActionResult> 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); return Ok(retval);
} }
CarParkValidationAPI/Datas/DataContext.cs
+1 -1
View File
@@ -113,7 +113,7 @@ namespace CarParkValidationAPI.Datas
var pStaffLink = new SqlParameter var pStaffLink = new SqlParameter
{ {
ParameterName = "StafflinkNo", ParameterName = "StafflinkNo",
Value = stafflinkNo Value = string.IsNullOrEmpty(stafflinkNo) ? "" : stafflinkNo,
}; };
var pToDate = new SqlParameter var pToDate = new SqlParameter
CarParkValidationAPI/Interface/IConcessionValidation.cs
+1 -1
View File
@@ -11,7 +11,7 @@ namespace CarParkValidationAPI.Interface
public interface IConcessionValidation public interface IConcessionValidation
{ {
Task<ResultModel<List<ConcessionValidationExtDto>>> LoadConcessionValidationAsync(bool OnlyActive); Task<ResultModel<List<ConcessionValidationExtDto>>> LoadConcessionValidationAsync(bool OnlyActive);
Task<ResultModel<List<ConcessionValidationExtDto>>> LoadConcessionValidationStaffLinkNoAsync(string staffLinkNo, DateTime currentDate); Task<ResultModel<List<ConcessionValidationExtDto>>> LoadConcessionValidationStaffLinkNoAsync(string staffLinkNo, DateTime currentDate, DateTime toDate);
Task<ResultModel<int>> CheckConcessionValidationStaffLinkNoAsync(string staffLinkNo, string concessionCard, DateTime currentDate, int id); Task<ResultModel<int>> CheckConcessionValidationStaffLinkNoAsync(string staffLinkNo, string concessionCard, DateTime currentDate, int id);
Task<ResultModel<int>> SaveConcessionValidationAsync(ConcessionValidationDto item); Task<ResultModel<int>> SaveConcessionValidationAsync(ConcessionValidationDto item);
Task<ResultModel<ConcessionValidationDto>> LoadConcessionValidationByIdAsync(int id); Task<ResultModel<ConcessionValidationDto>> LoadConcessionValidationByIdAsync(int id);
CarParkValidationAPI/Repository/AdminUserRepository.cs
+3 -2
View File
@@ -77,7 +77,7 @@ namespace CarParkValidationAPI.Repository
model.StafflinkNo = dto.StafflinkNo; model.StafflinkNo = dto.StafflinkNo;
model.Active = dto.Active; model.Active = dto.Active;
model.AddedBy = dto.AddedBy; model.AddedBy = dto.AddedBy;
model.AddedOn = dto.AddedOn; model.AddedOn = dto.AddedOn.ToLocalTime();
model.ValidationPointID = dto.ValidationPointId; model.ValidationPointID = dto.ValidationPointId;
return model; return model;
} }
@@ -162,6 +162,7 @@ namespace CarParkValidationAPI.Repository
model.LastModified = DateTime.Now; model.LastModified = DateTime.Now;
model.LastModifiedId = _currentUser; model.LastModifiedId = _currentUser;
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
} }
else else
{ {
@@ -170,7 +171,7 @@ namespace CarParkValidationAPI.Repository
_context.AdminUsers.Add(model); _context.AdminUsers.Add(model);
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
} }
result = 1; result = model.UserID;
statuscode = 1; statuscode = 1;
} }
catch (Exception ex) catch (Exception ex)
CarParkValidationAPI/Repository/ConcessionTypeRepository.cs
+2 -2
View File
@@ -135,8 +135,8 @@ namespace CarParkValidationAPI.Repository
model.LastModifiedId = _currentUser; model.LastModifiedId = _currentUser;
_context.ConcessionTypes.Add(model); _context.ConcessionTypes.Add(model);
var id = await _context.SaveChangesAsync(); var id = await _context.SaveChangesAsync();
result = id; result = model.ConcessionTypeID;
item.Id = id;
} }
statuscode = 1; statuscode = 1;
} }
CarParkValidationAPI/Repository/ConcessionValidationReportRepository.cs
+5 -4
View File
@@ -16,6 +16,7 @@ namespace CarParkValidationAPI.Repository
private readonly DataContext _context; private readonly DataContext _context;
private readonly IOptions<AppSettings> _appSettings; private readonly IOptions<AppSettings> _appSettings;
const string DateFormat = "dd-MM-yyyy HH:mm"; const string DateFormat = "dd-MM-yyyy HH:mm";
const string dateFormat = "dd-MM-yyyyy";
public ConcessionValidationReportRepository( public ConcessionValidationReportRepository(
DataContext context, IOptions<AppSettings> appSettings) DataContext context, IOptions<AppSettings> appSettings)
{ {
@@ -42,8 +43,8 @@ namespace CarParkValidationAPI.Repository
sl.SetCellStyle(1, 5, style); sl.SetCellStyle(1, 5, style);
sl.SetRowHeight(1, 1, 25); sl.SetRowHeight(1, 1, 25);
sl.SetCellValue(row++, 5, "The ConssionValidation Report"); sl.SetCellValue(row++, 5, "The ConssionValidation Report");
sl.SetCellValue(row, 3, "Date Range: " + fromDate.ToString(dateFormat) + " - " + toDate.ToString(dateFormat) );
sl.SetCellValue(1, 8, " " + DateTime.Now.ToString("ddd dd/MM/yyyy HH:mm")); sl.SetCellValue(1, 6, " " + DateTime.Now.ToString("ddd dd/MM/yyyy HH:mm"));
int startTitleRow = 3; int startTitleRow = 3;
row = startTitleRow; row = startTitleRow;
@@ -55,8 +56,8 @@ namespace CarParkValidationAPI.Repository
sl.SetRowHeight(startTitleRow, startTitleRow, 25); sl.SetRowHeight(startTitleRow, startTitleRow, 25);
// add the title first // add the title first
sl.SetCellValue(row, col++, "Date"); sl.SetCellValue(row, col++, "Date");
sl.SetCellValue(row, col++, "Concession Card"); sl.SetCellValue(row, col++, "Concession Card Number");
sl.SetCellValue(row, col++, "Concession Holder"); sl.SetCellValue(row, col++, "Concession Holder Name");
sl.SetCellValue(row, col++, "Expiry date checked"); sl.SetCellValue(row, col++, "Expiry date checked");
sl.SetCellValue(row, col++, "ConcessionType"); sl.SetCellValue(row, col++, "ConcessionType");
sl.SetCellValue(row, col++, "Validation Piont"); sl.SetCellValue(row, col++, "Validation Piont");
CarParkValidationAPI/Repository/ConcessionValidationRepository.cs
+4 -5
View File
@@ -118,7 +118,7 @@ namespace CarParkValidationAPI.Repository
}; };
} }
public async Task<ResultModel<List<ConcessionValidationExtDto>>> LoadConcessionValidationStaffLinkNoAsync(string staffLinkNo, DateTime currentDate) public async Task<ResultModel<List<ConcessionValidationExtDto>>> LoadConcessionValidationStaffLinkNoAsync(string staffLinkNo, DateTime fromDate, DateTime toDate)
{ {
List<ConcessionValidationExtDto> result = new List<ConcessionValidationExtDto>(); List<ConcessionValidationExtDto> result = new List<ConcessionValidationExtDto>();
// ConcessionValidationExtDto dto; // ConcessionValidationExtDto dto;
@@ -127,13 +127,12 @@ namespace CarParkValidationAPI.Repository
string error = ""; string error = "";
try try
{ {
//List<ConcessionValidation> clist = await _context.ConcessionValidations.Where(x => //List<ConcessionValidation> clist = await _context.ConcessionValidations.Where(x =>
// x.Active == true // x.Active == true
// && x.StafflinkNo == staffLinkNo // && x.StafflinkNo == staffLinkNo
// && x.ValidateDate.Date == currentDate.Date // && x.ValidateDate.Date == currentDate.Date
//).ToListAsync(); //).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); //var clist = await _context.SPSelectValidation(true, staffLinkNo, currentDate);
for (int i = 0; i < clist.Count; i++) for (int i = 0; i < clist.Count; i++)
@@ -141,11 +140,10 @@ namespace CarParkValidationAPI.Repository
model = clist[i]; model = clist[i];
dto = FillConcessionValidationExtDto(model); dto = FillConcessionValidationExtDto(model);
result.Add(dto); result.Add(dto);
} }
*/ */
statuscode = 1; statuscode = 1;
result.Sort((x, y) => x.ValidateDate.CompareTo(y.ValidateDate));
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -295,6 +293,7 @@ namespace CarParkValidationAPI.Repository
model.CreatedId = _currentUser; model.CreatedId = _currentUser;
_context.ConcessionValidations.Add(model); _context.ConcessionValidations.Add(model);
result = await _context.SaveChangesAsync(); result = await _context.SaveChangesAsync();
result = model.ValidationID;
} }
statuscode = 1; statuscode = 1;
} }
CarParkValidationAPI/Repository/LookupCodeRepository.cs
+1
View File
@@ -67,6 +67,7 @@ namespace CarParkValidationAPI.Repository
string error = ""; string error = "";
try try
{ {
result = await _context.Validations.Where(x => x.Active == onlyActive).Select( result = await _context.Validations.Where(x => x.Active == onlyActive).Select(
x => new LookupCodeDto() x => new LookupCodeDto()
{ {
CarParkValidationAPI/Repository/ValidationPointRepository.cs
+2 -2
View File
@@ -132,8 +132,8 @@ namespace CarParkValidationAPI.Repository
model = FillValidationModel(item, model); model = FillValidationModel(item, model);
_context.Validations.Add(model); _context.Validations.Add(model);
var id = await _context.SaveChangesAsync(); var id = await _context.SaveChangesAsync();
result = id; result = model.ValidationPointID;
item.Id = id;
} }
statuscode = 1; statuscode = 1;
} }
CarParkValidationAPI/appsettings.Development.json
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
"AppSettings": { "AppSettings": {
"Secret": "Nepean Blue Mountain Super Secret SIGN AND VERIFY JWT TOKENS, BEARER TOKEN USE WHEN CALLING THIS API.", "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", "LDAPPath": "LDAP://ldap.nswhealth.net:389/OU=Accounts,DC=nswhealth,DC=net",
"LDAPUser": "SRV-NBMS-BIDSPMS", "LDAPUser": "SRV-NBMS-BIDSPMS",
"LDAPPassword": "42Ytp2AE3nN16eBoyia86UZH6", "LDAPPassword": "42Ytp2AE3nN16eBoyia86UZH6",
CarParkValidationAPI/appsettings.json
+2 -1
View File
@@ -1,7 +1,7 @@
{ {
"AppSettings": { "AppSettings": {
"Secret": "Nepean Blue Mountain Super Secret SIGN AND VERIFY JWT TOKENS, BEARER TOKEN USE WHEN CALLING THIS API.", "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", "LDAPPath": "LDAP://ldap.nswhealth.net:389/OU=Accounts,DC=nswhealth,DC=net",
"LDAPUser": "SRV-NBMS-BIDSPMS", "LDAPUser": "SRV-NBMS-BIDSPMS",
"LDAPPassword": "42Ytp2AE3nN16eBoyia86UZH6", "LDAPPassword": "42Ytp2AE3nN16eBoyia86UZH6",
@@ -19,5 +19,6 @@
"OLDLoginWebAPI": "http://virtapp-mdb048/CommonAPI/api/AD/", "OLDLoginWebAPI": "http://virtapp-mdb048/CommonAPI/api/AD/",
"LADP": "http://NEPHMDB-SQL007/CommonWebApiAD/api/AD/", "LADP": "http://NEPHMDB-SQL007/CommonWebApiAD/api/AD/",
"AllowedHosts": "*", "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;" "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;"
} }