From 3702145d0220387c1d37ddfadfcf2b0251e23d6c Mon Sep 17 00:00:00 2001 From: mmrbnjd Date: Sun, 30 Jun 2024 19:57:32 +0330 Subject: [PATCH] ulr --- Back/Controllers/BaseController.cs | 22 +- .../Persistence/SqlDbContext.cs | 1 + Back/Data/Models/Ulr.cs | 12 + Back/Program.cs | 2 +- Shared/DTOs/UlrDto.cs | 13 + TaxPayerFull/FixedValues.cs | 7 + TaxPayerFull/Front.csproj | 1 - TaxPayerFull/Layout/MainLayout.razor | 10 +- TaxPayerFull/Layout/PanelLayout.razor | 2 + TaxPayerFull/Pages/InvoiceReport.razor | 288 +++++++++--------- TaxPayerFull/Program.cs | 6 +- 11 files changed, 214 insertions(+), 150 deletions(-) create mode 100644 Back/Data/Models/Ulr.cs create mode 100644 Shared/DTOs/UlrDto.cs diff --git a/Back/Controllers/BaseController.cs b/Back/Controllers/BaseController.cs index 605e4e7..9e008e6 100644 --- a/Back/Controllers/BaseController.cs +++ b/Back/Controllers/BaseController.cs @@ -1,4 +1,5 @@ using Back.Common; +using Back.Data.Contracts; using Back.Data.Models; using Back.Services; using Back.Validations; @@ -23,11 +24,14 @@ namespace Back.Controllers private readonly ServValidatinMsg _servValidatinMsg; private readonly servSendMsg _servSendMsg; private readonly CompanyRegistrationValidation _companyRegistrationValidation; + private readonly IAsyncRepository _ulrRepo; public BaseController(ServBase sBase, MobileValidation mobilevalidation , servCompany servCompany, servUser servUser , servPermission servPermission, ServValidatinMsg servValidatinMsg - , servSendMsg servSendMsg, CompanyRegistrationValidation companyRegistrationValidation) + , servSendMsg servSendMsg, CompanyRegistrationValidation companyRegistrationValidation + , IAsyncRepository ulrRepo) { + _ulrRepo = ulrRepo; _sBase = sBase; _mobilevalidation = mobilevalidation; _servCompany = servCompany; @@ -186,5 +190,21 @@ namespace Back.Controllers _servSendMsg.toContinue(modelvc.Code.ToString(),Item.Username, "فراموشی کلمه عبور"); return Ok(modelvc.ID); } + [HttpPost("Ulr")] + [AllowAnonymous] + public async Task Ulr(UlrDto Item) + { + if (Item.Type=="Panel" || Item.Type == "Main") + { + await _ulrRepo.AddBoolResultAsync(new Data.Models.Ulr + { + Type = Item.Type, + Date=DateTime.Now.ConvertMiladiToShamsi(), + Time=DateTime.Now.Hour.ToString("00")+ DateTime.Now.Minute.ToString("00"), + Ip= HttpContext.Connection.RemoteIpAddress?.ToString() + }); + } + return Ok(); + } } } diff --git a/Back/Data/Infrastructure/Persistence/SqlDbContext.cs b/Back/Data/Infrastructure/Persistence/SqlDbContext.cs index 8b50f42..286cdc8 100644 --- a/Back/Data/Infrastructure/Persistence/SqlDbContext.cs +++ b/Back/Data/Infrastructure/Persistence/SqlDbContext.cs @@ -45,6 +45,7 @@ namespace TaxPayer.Infrastructure.Persistence public DbSet SaleLeads { get; set; } public DbSet UserNotifis { get; set; } public DbSet Stuffs { get; set; } + public DbSet Ulrs { get; set; } #endregion //public override Task SaveChangesAsync(CancellationToken cancellationToken = new CancellationToken()) //{ diff --git a/Back/Data/Models/Ulr.cs b/Back/Data/Models/Ulr.cs new file mode 100644 index 0000000..fbe754f --- /dev/null +++ b/Back/Data/Models/Ulr.cs @@ -0,0 +1,12 @@ +namespace Back.Data.Models +{ + //User login report + public class Ulr + { + public int ID { get; set; } + public string Ip { get; set; } + public string Type { get; set; } //Panel or Main + public string Date { get; set; } + public string Time { get; set; } + } +} diff --git a/Back/Program.cs b/Back/Program.cs index 823322a..e64c53a 100644 --- a/Back/Program.cs +++ b/Back/Program.cs @@ -85,7 +85,7 @@ builder.Services.AddCors(options => options.AddPolicy(origins, policy => { - policy.WithOrigins("https://localhost:7224", "http://localhost:5107") + policy.WithOrigins("https://localhost:7224", "http://localhost:5107", "http://195.88.208.142") .AllowAnyHeader() .WithHeaders(HeaderNames.ContentType) .AllowAnyMethod(); diff --git a/Shared/DTOs/UlrDto.cs b/Shared/DTOs/UlrDto.cs new file mode 100644 index 0000000..543b675 --- /dev/null +++ b/Shared/DTOs/UlrDto.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Shared.DTOs +{ + public class UlrDto + { + public string Type { get; set; } + } +} diff --git a/TaxPayerFull/FixedValues.cs b/TaxPayerFull/FixedValues.cs index 7c9d380..2a9ab90 100644 --- a/TaxPayerFull/FixedValues.cs +++ b/TaxPayerFull/FixedValues.cs @@ -102,6 +102,13 @@ namespace Front } } return Units; + } + public async Task SetUlr(string Type) + { + await _hc.Post("Base/Ulr",new UlrDto { Type=Type}); + + + } } diff --git a/TaxPayerFull/Front.csproj b/TaxPayerFull/Front.csproj index ada1c95..7f214af 100644 --- a/TaxPayerFull/Front.csproj +++ b/TaxPayerFull/Front.csproj @@ -9,7 +9,6 @@ - diff --git a/TaxPayerFull/Layout/MainLayout.razor b/TaxPayerFull/Layout/MainLayout.razor index b4ea68c..e82d87c 100644 --- a/TaxPayerFull/Layout/MainLayout.razor +++ b/TaxPayerFull/Layout/MainLayout.razor @@ -1,5 +1,5 @@ @inherits LayoutComponentBase - +@inject Fixedvalues fv; @@ -27,5 +27,11 @@ - +@code{ + protected override async Task OnInitializedAsync() + { + await fv.SetUlr("Main"); + await base.OnInitializedAsync(); + } +} diff --git a/TaxPayerFull/Layout/PanelLayout.razor b/TaxPayerFull/Layout/PanelLayout.razor index 52473b1..69652ed 100644 --- a/TaxPayerFull/Layout/PanelLayout.razor +++ b/TaxPayerFull/Layout/PanelLayout.razor @@ -194,6 +194,8 @@ public DashBoardDTO? dashBoard { get; set; } protected override async Task OnInitializedAsync() { + await fv.SetUlr("Panel"); + if (!await localserv.OnlineUser()) nav.NavigateTo("/"); diff --git a/TaxPayerFull/Pages/InvoiceReport.razor b/TaxPayerFull/Pages/InvoiceReport.razor index 303ccb2..1311df8 100644 --- a/TaxPayerFull/Pages/InvoiceReport.razor +++ b/TaxPayerFull/Pages/InvoiceReport.razor @@ -1,186 +1,186 @@ صورتحساب -@using Front.Services +@* @using Front.Services @using Shared.DTOs @using Stimulsoft.Base @using Stimulsoft.Report @using Stimulsoft.Report.Blazor @inject Fixedvalues fv; @inject HttpClientController hc; -@layout EmptyLayout +@layout EmptyLayout *@ @page "/InvoiceReport/{InvoiceID:int}" - +@* *@ @code { - public CompanyDTO? company { get; set; } - private StiReport Report; - [Parameter] public int InvoiceID { get; set; } - private int[] NoArray = default; - private int[] ItemArray = new int[] { 1011, 1012 }; - private string[] ItemNArray = new string[] { "کالا 1", "کالا 2" }; - private int[] amArray = new int[] { 1, 2 }; - private string[] UnitNArray = new string[] { "1011", "1012" }; - private string[] feeArray = new string[] { "کالا 1", "کالا 2" }; - private string[] prdisArray = new string[] { "", "" }; - private string[] disArray = new string[] { "1011", "1012" }; - private string[] adisArray = new string[] { "کالا 1", "کالا 2" }; - private string[] vamArray = new string[] { " 1, 2" }; - private string[] tsstamArray = new string[] { "1011", "1012" }; - private string[] vraArray = new string[] { "کالا 1", "کالا 2" }; + // public CompanyDTO? company { get; set; } + // private StiReport Report; + // [Parameter] public int InvoiceID { get; set; } + // private int[] NoArray = default; + // private int[] ItemArray = new int[] { 1011, 1012 }; + // private string[] ItemNArray = new string[] { "کالا 1", "کالا 2" }; + // private int[] amArray = new int[] { 1, 2 }; + // private string[] UnitNArray = new string[] { "1011", "1012" }; + // private string[] feeArray = new string[] { "کالا 1", "کالا 2" }; + // private string[] prdisArray = new string[] { "", "" }; + // private string[] disArray = new string[] { "1011", "1012" }; + // private string[] adisArray = new string[] { "کالا 1", "کالا 2" }; + // private string[] vamArray = new string[] { " 1, 2" }; + // private string[] tsstamArray = new string[] { "1011", "1012" }; + // private string[] vraArray = new string[] { "کالا 1", "کالا 2" }; - protected async override Task OnParametersSetAsync() - { - if (fv.invoice==null) - { - hc._nav.NavigateTo($"InvoiceDetails/{InvoiceID}"); - } - string CustomerName = ""; - string CustomerEconomicCode = ""; - string CustomerPhone = ""; - string CompanyName = ""; - string CompanyEconomicCode = ""; - string CompanyPhone = ""; - var cus =await GetCus(); - if (cus!=null) - { - CustomerName = cus?.FullName; - CustomerEconomicCode = cus?.EconomicCode; - CustomerPhone = cus?.Phone; - } - var company =await GetCompany(); - if (company != null) - { - CompanyName = company?.Name; - CompanyEconomicCode = company?.EconomicCode; - CompanyPhone = company?.Phone; - } - //datasource - NoArray = Enumerable - .Repeat(1, (int)((fv.invoice.items.Count() - 1) / 1) + 1) - .Select((tr, ti) => Convert.ToInt32(tr + (1 * ti))) - .ToArray(); - ItemArray = fv.invoice.items.Select(s => s.CODID).ToArray(); - ItemNArray = fv.invoice.items.Select(s => s.sstt).ToArray(); - amArray = fv.invoice.items.Select(s => Convert.ToInt32(s.am)).ToArray(); - UnitNArray= fv.invoice.items.Select(s => s.mu).ToArray(); - feeArray = fv.invoice.items.Select(s => s.fee.ToString("N0")).ToArray(); - prdisArray = fv.invoice.items.Select(s => s.prdis?.ToString("N0")).ToArray(); - disArray = fv.invoice.items.Select(s => s.dis?.ToString("N0")).ToArray(); - adisArray = fv.invoice.items.Select(s => s.adis?.ToString("N0")).ToArray(); - vamArray = fv.invoice.items.Select(s => s.vam?.ToString("N0")).ToArray(); - tsstamArray = fv.invoice.items.Select(s => s.tsstam?.ToString("N0")).ToArray(); - vraArray = fv.invoice.items.Select(s => s.vra?.ToString("N0")).ToArray(); + // protected async override Task OnParametersSetAsync() + // { + // if (fv.invoice==null) + // { + // hc._nav.NavigateTo($"InvoiceDetails/{InvoiceID}"); + // } + // string CustomerName = ""; + // string CustomerEconomicCode = ""; + // string CustomerPhone = ""; + // string CompanyName = ""; + // string CompanyEconomicCode = ""; + // string CompanyPhone = ""; + // var cus =await GetCus(); + // if (cus!=null) + // { + // CustomerName = cus?.FullName; + // CustomerEconomicCode = cus?.EconomicCode; + // CustomerPhone = cus?.Phone; + // } + // var company =await GetCompany(); + // if (company != null) + // { + // CompanyName = company?.Name; + // CompanyEconomicCode = company?.EconomicCode; + // CompanyPhone = company?.Phone; + // } + // //datasource + // NoArray = Enumerable + // .Repeat(1, (int)((fv.invoice.items.Count() - 1) / 1) + 1) + // .Select((tr, ti) => Convert.ToInt32(tr + (1 * ti))) + // .ToArray(); + // ItemArray = fv.invoice.items.Select(s => s.CODID).ToArray(); + // ItemNArray = fv.invoice.items.Select(s => s.sstt).ToArray(); + // amArray = fv.invoice.items.Select(s => Convert.ToInt32(s.am)).ToArray(); + // UnitNArray= fv.invoice.items.Select(s => s.mu).ToArray(); + // feeArray = fv.invoice.items.Select(s => s.fee.ToString("N0")).ToArray(); + // prdisArray = fv.invoice.items.Select(s => s.prdis?.ToString("N0")).ToArray(); + // disArray = fv.invoice.items.Select(s => s.dis?.ToString("N0")).ToArray(); + // adisArray = fv.invoice.items.Select(s => s.adis?.ToString("N0")).ToArray(); + // vamArray = fv.invoice.items.Select(s => s.vam?.ToString("N0")).ToArray(); + // tsstamArray = fv.invoice.items.Select(s => s.tsstam?.ToString("N0")).ToArray(); + // vraArray = fv.invoice.items.Select(s => s.vra?.ToString("N0")).ToArray(); - // //How to activate - // Stimulsoft.Base.StiLicense.Key = - // "6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHn0s4gy0Fr5YoUZ9V00Y0igCSFQzwEqYBh/N77k" + - // "4f0fWXTHW5rqeBNLkaurJDenJ9o97TyqHs9HfvINK18Uwzsc/bG01Rq+x3H3Rf+g7AY92gvWmp7VA2Ux" + - // "a30Q97f61siWz2dE5kdBVcCnSFzC6awE74JzDcJMj8OuxplqB1CYcpoPcOjKy1PiATlC3UsBaLEXsok1" + - // "xxtRMQ283r282tkh8XQitsxtTczAJBxijuJNfziYhci2jResWXK51ygOOEbVAxmpflujkJ8oEVHkOA/C" + - // "jX6bGx05pNZ6oSIu9H8deF94MyqIwcdeirCe60GbIQByQtLimfxbIZnO35X3fs/94av0ODfELqrQEpLr" + - // "pU6FNeHttvlMc5UVrT4K+8lPbqR8Hq0PFWmFrbVIYSi7tAVFMMe2D1C59NWyLu3AkrD3No7YhLVh7LV0" + - // "Tttr/8FrcZ8xirBPcMZCIGrRIesrHxOsZH2V8t/t0GXCnLLAWX+TNvdNXkB8cF2y9ZXf1enI064yE5dw" + - // "Ms2fQ0yOUG/xornE"; - //var licenseStream = await Http.GetStreamAsync("Secret/license.key"); - //Stimulsoft.Base.StiLicense.LoadFromStream(licenseStream); + // // //How to activate + // // Stimulsoft.Base.StiLicense.Key = + // // "6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHn0s4gy0Fr5YoUZ9V00Y0igCSFQzwEqYBh/N77k" + + // // "4f0fWXTHW5rqeBNLkaurJDenJ9o97TyqHs9HfvINK18Uwzsc/bG01Rq+x3H3Rf+g7AY92gvWmp7VA2Ux" + + // // "a30Q97f61siWz2dE5kdBVcCnSFzC6awE74JzDcJMj8OuxplqB1CYcpoPcOjKy1PiATlC3UsBaLEXsok1" + + // // "xxtRMQ283r282tkh8XQitsxtTczAJBxijuJNfziYhci2jResWXK51ygOOEbVAxmpflujkJ8oEVHkOA/C" + + // // "jX6bGx05pNZ6oSIu9H8deF94MyqIwcdeirCe60GbIQByQtLimfxbIZnO35X3fs/94av0ODfELqrQEpLr" + + // // "pU6FNeHttvlMc5UVrT4K+8lPbqR8Hq0PFWmFrbVIYSi7tAVFMMe2D1C59NWyLu3AkrD3No7YhLVh7LV0" + + // // "Tttr/8FrcZ8xirBPcMZCIGrRIesrHxOsZH2V8t/t0GXCnLLAWX+TNvdNXkB8cF2y9ZXf1enI064yE5dw" + + // // "Ms2fQ0yOUG/xornE"; + // //var licenseStream = await Http.GetStreamAsync("Secret/license.key"); + // //Stimulsoft.Base.StiLicense.LoadFromStream(licenseStream); - //Create empty report object - this.Report = new StiReport(); + // //Create empty report object + // this.Report = new StiReport(); - //Load report template - var reportBytes = await hc._hc.GetByteArrayAsync($"Invoice/GetReport/{InvoiceID}"); + // //Load report template + // var reportBytes = await hc._hc.GetByteArrayAsync($"Invoice/GetReport/{InvoiceID}"); - //Set value - Report["InvoiceID"] = fv.invoice?.ID; - Report["invoicedate"] = fv.invoice?.InvoiceDate; - Report["CusName"] = CustomerName; - Report["CusEconomicCode"] = CustomerEconomicCode; - Report["CusPhone"] = CustomerPhone; - Report["CompanyName"] = CompanyName; - Report["CompanyEconomicCode"] = CompanyEconomicCode; - Report["CompanyPhone"] = CompanyPhone; + // //Set value + // Report["InvoiceID"] = fv.invoice?.ID; + // Report["invoicedate"] = fv.invoice?.InvoiceDate; + // Report["CusName"] = CustomerName; + // Report["CusEconomicCode"] = CustomerEconomicCode; + // Report["CusPhone"] = CustomerPhone; + // Report["CompanyName"] = CompanyName; + // Report["CompanyEconomicCode"] = CompanyEconomicCode; + // Report["CompanyPhone"] = CompanyPhone; - // var rspCustomer = await hc.Get($"Customer/GetCustomer/{fv.invoice?.CustomerID}"); - // if (rspCustomer.IsSuccessStatusCode) - // Cus = await rspCustomer.Content.ReadFromJsonAsync(); + // // var rspCustomer = await hc.Get($"Customer/GetCustomer/{fv.invoice?.CustomerID}"); + // // if (rspCustomer.IsSuccessStatusCode) + // // Cus = await rspCustomer.Content.ReadFromJsonAsync(); - // var rspCompany = await hc.Get($"Company/GetCompany"); - // if (rspCompany.IsSuccessStatusCode) - // company = await rspCompany.Content.ReadFromJsonAsync(); + // // var rspCompany = await hc.Get($"Company/GetCompany"); + // // if (rspCompany.IsSuccessStatusCode) + // // company = await rspCompany.Content.ReadFromJsonAsync(); - // Report["cusname"] = CustomerName; + // // Report["cusname"] = CustomerName; - this.Report.Load(reportBytes); + // this.Report.Load(reportBytes); - //Create User Data - var stiUserData1 = new Stimulsoft.Report.Dictionary.StiUserData(); - stiUserData1.Columns.AddRange(new Stimulsoft.Report.Dictionary.StiDataColumn[] { - new Stimulsoft.Report.Dictionary.StiDataColumn("No", "No", "No", typeof(int), null), - new Stimulsoft.Report.Dictionary.StiDataColumn("Item", "Item", "Item", typeof(int), null), - new Stimulsoft.Report.Dictionary.StiDataColumn("ItemN", "ItemN", "ItemN", typeof(string), null), - new Stimulsoft.Report.Dictionary.StiDataColumn("am", "am", "am", typeof(int), null), - new Stimulsoft.Report.Dictionary.StiDataColumn("UnitN", "UnitN", "UnitN", typeof(string), null), - new Stimulsoft.Report.Dictionary.StiDataColumn("fee", "fee", "fee", typeof(string), null), - new Stimulsoft.Report.Dictionary.StiDataColumn("prdis", "prdis", "prdis", typeof(string), null), - new Stimulsoft.Report.Dictionary.StiDataColumn("dis", "dis", "dis", typeof(string), null), - new Stimulsoft.Report.Dictionary.StiDataColumn("adis", "adis", "adis", typeof(string), null), - new Stimulsoft.Report.Dictionary.StiDataColumn("vam", "vam", "vam", typeof(string), null), - new Stimulsoft.Report.Dictionary.StiDataColumn("tsstam", "tsstam", "tsstam", typeof(string), null), - new Stimulsoft.Report.Dictionary.StiDataColumn("vra", "vra", "vra", typeof(string), null) + // //Create User Data + // var stiUserData1 = new Stimulsoft.Report.Dictionary.StiUserData(); + // stiUserData1.Columns.AddRange(new Stimulsoft.Report.Dictionary.StiDataColumn[] { + // new Stimulsoft.Report.Dictionary.StiDataColumn("No", "No", "No", typeof(int), null), + // new Stimulsoft.Report.Dictionary.StiDataColumn("Item", "Item", "Item", typeof(int), null), + // new Stimulsoft.Report.Dictionary.StiDataColumn("ItemN", "ItemN", "ItemN", typeof(string), null), + // new Stimulsoft.Report.Dictionary.StiDataColumn("am", "am", "am", typeof(int), null), + // new Stimulsoft.Report.Dictionary.StiDataColumn("UnitN", "UnitN", "UnitN", typeof(string), null), + // new Stimulsoft.Report.Dictionary.StiDataColumn("fee", "fee", "fee", typeof(string), null), + // new Stimulsoft.Report.Dictionary.StiDataColumn("prdis", "prdis", "prdis", typeof(string), null), + // new Stimulsoft.Report.Dictionary.StiDataColumn("dis", "dis", "dis", typeof(string), null), + // new Stimulsoft.Report.Dictionary.StiDataColumn("adis", "adis", "adis", typeof(string), null), + // new Stimulsoft.Report.Dictionary.StiDataColumn("vam", "vam", "vam", typeof(string), null), + // new Stimulsoft.Report.Dictionary.StiDataColumn("tsstam", "tsstam", "tsstam", typeof(string), null), + // new Stimulsoft.Report.Dictionary.StiDataColumn("vra", "vra", "vra", typeof(string), null) - }); - stiUserData1.Count = fv.invoice.items.Count(); - stiUserData1.GetData += new Stimulsoft.Report.Dictionary.StiUserGetDataEventHandler(stiUserData1_GetData); + // }); + // stiUserData1.Count = fv.invoice.items.Count(); + // stiUserData1.GetData += new Stimulsoft.Report.Dictionary.StiUserGetDataEventHandler(stiUserData1_GetData); - //Register new data in the report template - this.Report.RegData("Items", stiUserData1); + // //Register new data in the report template + // this.Report.RegData("Items", stiUserData1); - await base.OnParametersSetAsync(); - } + // await base.OnParametersSetAsync(); + // } - private void stiUserData1_GetData(object sender, Stimulsoft.Report.Dictionary.StiUserGetDataEventArgs e) - { - if (e.ColumnName == "No") e.Data = NoArray[e.Position]; - if (e.ColumnName == "Item") e.Data = ItemArray[e.Position]; - if (e.ColumnName == "ItemN") e.Data = ItemNArray[e.Position]; - if (e.ColumnName == "am") e.Data = amArray[e.Position]; - if (e.ColumnName == "UnitN") e.Data = UnitNArray[e.Position]; - if (e.ColumnName == "fee") e.Data = feeArray[e.Position]; - if (e.ColumnName == "prdis") e.Data = prdisArray[e.Position]; - if (e.ColumnName == "dis") e.Data = disArray[e.Position]; - if (e.ColumnName == "adis") e.Data = adisArray[e.Position]; - if (e.ColumnName == "vam") e.Data = vamArray[e.Position]; - if (e.ColumnName == "tsstam") e.Data = tsstamArray[e.Position]; - if (e.ColumnName == "vra") e.Data = vraArray[e.Position]; - } + // private void stiUserData1_GetData(object sender, Stimulsoft.Report.Dictionary.StiUserGetDataEventArgs e) + // { + // if (e.ColumnName == "No") e.Data = NoArray[e.Position]; + // if (e.ColumnName == "Item") e.Data = ItemArray[e.Position]; + // if (e.ColumnName == "ItemN") e.Data = ItemNArray[e.Position]; + // if (e.ColumnName == "am") e.Data = amArray[e.Position]; + // if (e.ColumnName == "UnitN") e.Data = UnitNArray[e.Position]; + // if (e.ColumnName == "fee") e.Data = feeArray[e.Position]; + // if (e.ColumnName == "prdis") e.Data = prdisArray[e.Position]; + // if (e.ColumnName == "dis") e.Data = disArray[e.Position]; + // if (e.ColumnName == "adis") e.Data = adisArray[e.Position]; + // if (e.ColumnName == "vam") e.Data = vamArray[e.Position]; + // if (e.ColumnName == "tsstam") e.Data = tsstamArray[e.Position]; + // if (e.ColumnName == "vra") e.Data = vraArray[e.Position]; + // } } @functions{ - private async Task GetCus() - { - var rspCustomer = await hc.Get($"Customer/GetCustomer/{fv.invoice?.CustomerID}"); - if (rspCustomer.IsSuccessStatusCode) - return await rspCustomer.Content.ReadFromJsonAsync(); - else return null; - } - private async Task GetCompany() - { - var rspCompany = await hc.Get($"Company/GetCompany"); - if (rspCompany.IsSuccessStatusCode) - return await rspCompany.Content.ReadFromJsonAsync(); - else return null; - } + // private async Task GetCus() + // { + // var rspCustomer = await hc.Get($"Customer/GetCustomer/{fv.invoice?.CustomerID}"); + // if (rspCustomer.IsSuccessStatusCode) + // return await rspCustomer.Content.ReadFromJsonAsync(); + // else return null; + // } + // private async Task GetCompany() + // { + // var rspCompany = await hc.Get($"Company/GetCompany"); + // if (rspCompany.IsSuccessStatusCode) + // return await rspCompany.Content.ReadFromJsonAsync(); + // else return null; + // } } diff --git a/TaxPayerFull/Program.cs b/TaxPayerFull/Program.cs index 628e6c3..b08b0de 100644 --- a/TaxPayerFull/Program.cs +++ b/TaxPayerFull/Program.cs @@ -33,9 +33,13 @@ builder.Services.AddScoped(sp => new UserAuthenticationDTO() exitDate = new DateTime(), }) ; +// Server +builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://195.88.208.142:7075/api/") }); -builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("https://localhost:7075/api/") }); +//Home +//builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("https://localhost:7075/api/") }); +//farzan //builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://localhost:5271/api/") }); CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("fa-Ir");