Browse Source

report fixation

feature/19315_Customer-Registration-new
shakun 10 months ago
parent
commit
ff4e816348
  1. 1
      CustomerOnlineV2/CustomerOnlineV2.Common/Models/DocumentModel/CustomerDocumentModel.cs
  2. 3
      CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/DocumentRepository/DocumentRepository.cs
  3. 17
      CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs
  4. 7
      CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionReportController.cs
  5. 5
      CustomerOnlineV2/CustomerOnlineV2/Views/TransactionReport/TranReport.cshtml

1
CustomerOnlineV2/CustomerOnlineV2.Common/Models/DocumentModel/CustomerDocumentModel.cs

@ -14,6 +14,7 @@ namespace CustomerOnlineV2.Common.Models.DocumentModel
public string? fileName { get; set;} public string? fileName { get; set;}
public string? description { get; set; } public string? description { get; set; }
public string? fileType { get; set; } public string? fileType { get; set; }
public string? IdType { get; set; }
public string? documentType { get; set; } public string? documentType { get; set; }
public string? user { get; set;} public string? user { get; set;}
public string? sessionId { get; set; } public string? sessionId { get; set; }

3
CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/DocumentRepository/DocumentRepository.cs

@ -103,7 +103,8 @@ namespace CustomerOnlineV2.Repository.Repository.DocumentRepository
sql += ",@fileType =" + _connHelper.FilterString(doc.fileType); sql += ",@fileType =" + _connHelper.FilterString(doc.fileType);
sql += ",@documentType =" + _connHelper.FilterString(doc.documentType); sql += ",@documentType =" + _connHelper.FilterString(doc.documentType);
sql += ",@rowIdField =" + _connHelper.FilterString(doc.sessionId); sql += ",@rowIdField =" + _connHelper.FilterString(doc.sessionId);
sql += ",@isCustomerId =" + _connHelper.FilterString("Y");
sql += ",@idType =" + _connHelper.FilterString(doc.IdType);
var dt = _connHelper.ExecuteDataTable(sql); var dt = _connHelper.ExecuteDataTable(sql);
if (dt == null || dt.Rows.Count <= 0) if (dt == null || dt.Rows.Count <= 0)
{ {

17
CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs

@ -356,13 +356,13 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository
CustomerTransactionList _response = new CustomerTransactionList(); CustomerTransactionList _response = new CustomerTransactionList();
try try
{ {
var sql = "Exec mobile_proc_TranHistory @flag='tran-history'";
var sql = "Exec mobile_proc_TranHistory @flag='tran-history-v2'";
sql += ", @customerId=" + _connHelper.FilterString(loginDetails.UserId); sql += ", @customerId=" + _connHelper.FilterString(loginDetails.UserId);
sql += ", @fromDate=" + _connHelper.FilterString(model.FromDate); sql += ", @fromDate=" + _connHelper.FilterString(model.FromDate);
sql += ", @toDate=" + _connHelper.FilterString(model.ToDate); sql += ", @toDate=" + _connHelper.FilterString(model.ToDate);
_logger.LogDebug("TRANSACTIONREPOSITORY | GETTRANSACTIONREPORTLIST | SQL | " + sql); _logger.LogDebug("TRANSACTIONREPOSITORY | GETTRANSACTIONREPORTLIST | SQL | " + sql);
var dt = _connHelper.ExecuteDataTable(sql);
if (dt == null || dt.Rows.Count <= 0)
var ds = _connHelper.ExecuteDataset(sql);
if (ds == null || ds.Tables.Count <= 0)
{ {
_response.ResponseCode = ResponseHelper.NORECORD; _response.ResponseCode = ResponseHelper.NORECORD;
_response.ResponseMessage = "No Transaction History Found!"; _response.ResponseMessage = "No Transaction History Found!";
@ -372,6 +372,9 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository
} }
else else
{ {
var dt = ds.Tables[1];
if (dt.Rows.Count > 0)
{
_response.ResponseCode = Convert.ToInt16(dt.Rows[0]["errorCode"]); _response.ResponseCode = Convert.ToInt16(dt.Rows[0]["errorCode"]);
//_response.ResponseMessage = Convert.ToString(dt.Rows[0]["msg"]); //_response.ResponseMessage = Convert.ToString(dt.Rows[0]["msg"]);
@ -395,7 +398,15 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository
DisplayActions = item["DisplayActions"].ToString() DisplayActions = item["DisplayActions"].ToString()
}); });
} }
_response.CustomerTransaction = obj; _response.CustomerTransaction = obj;
}
else
{
_response.ResponseCode = ResponseHelper.NORECORD;
_response.ResponseMessage = "No Transaction History Found!";
}
} }
} }
catch (Exception ex) catch (Exception ex)

7
CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionReportController.cs

@ -20,8 +20,11 @@ namespace CustomerOnlineV2.Controllers
public IActionResult TranReport() public IActionResult TranReport()
{ {
@ViewBag.ResponseCode = "0";
if (TempData["ResponseCode"]==null || string.IsNullOrEmpty(TempData["ResponseCode"].ToString()))
{
TempData["ResponseCode"] = "0";
}
return View(); return View();
@ -31,7 +34,7 @@ namespace CustomerOnlineV2.Controllers
[Authorization("GetTransactionReportList")] [Authorization("GetTransactionReportList")]
public async Task<CustomerTransactionList> GetTransactionReportList(CustomerTransaction model) public async Task<CustomerTransactionList> GetTransactionReportList(CustomerTransaction model)
{ {
@ViewBag.ResponseCode = "1";
TempData["ResponseCode"] = "1";
var loginDetails = HttpContext.GetLoginDetails(); var loginDetails = HttpContext.GetLoginDetails();
return await _transactionBusiness.GetTransactionReportList(loginDetails, model); return await _transactionBusiness.GetTransactionReportList(loginDetails, model);
} }

5
CustomerOnlineV2/CustomerOnlineV2/Views/TransactionReport/TranReport.cshtml

@ -43,7 +43,7 @@
<button type="submit" onclick="GetTransactionList()">Search</button>
<button type="button" onclick="GetTransactionList()">Search</button>
</form> </form>
@ -169,7 +169,7 @@
<script> <script>
$(document).ready(function () { $(document).ready(function () {
if ('@ViewBag.ResponseCode' == '0') {
if ('@TempData["ResponseCode"]' == '0') {
GetTransactionList(); GetTransactionList();
} }
}); });
@ -195,6 +195,7 @@
ShowAlertMessage(response.responseCode, response.responseMessage); ShowAlertMessage(response.responseCode, response.responseMessage);
} }
PopulateTransactionReportData(response); PopulateTransactionReportData(response);
return;
}, },
error: function () { error: function () {
return null; return null;

Loading…
Cancel
Save