From 1378e0199ea189d8c2665aa5da6a0758e72c02c4 Mon Sep 17 00:00:00 2001 From: Loretta Date: Fri, 11 Apr 2025 13:37:00 +0200 Subject: [PATCH] Show TransfreToDriver on rowclick; Fix Transfers FilterPanel; Implement RefreshTransferToDriversData to ManageTransfers; etc... --- .../SysAdmins/LogViewerGridComponent.razor | 8 +- .../User/SysAdmins/ManageTransfers.razor | 921 +++++++++--------- .../Shared/Components/Grids/TransferGrid.cs | 2 - TIAMWebApp/Server/appsettings.json | 4 +- .../Shared/Services/AdminSignalRClient.cs | 2 +- 5 files changed, 493 insertions(+), 444 deletions(-) diff --git a/TIAMSharedUI/Pages/User/SysAdmins/LogViewerGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/LogViewerGridComponent.razor index 7746ba15..2b068542 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/LogViewerGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/LogViewerGridComponent.razor @@ -129,7 +129,7 @@ private static DateTime _toDate = DateTime.Today; private static int _takeCount = 250; - private object[] _contextParams = new object[3] { _takeCount, _fromDate, _toDate }; + private object[] _contextParams = [_takeCount, _fromDate, _toDate]; private LoggerClient _logger; private static List _selectedLogLevels = [LogLevel.Error, LogLevel.Warning, LogLevel.Suggest]; @@ -154,12 +154,12 @@ if (_selectedLogLevels.Count > 0) { - filterCriteria = new InOperator(nameof(LogLevel), _selectedLogLevels); + filterCriteria = new InOperator(nameof(LogItemViewerModel.LogLevel), _selectedLogLevels); filterText = GetFilterText(_selectedLogLevels); } _filterText = filterText; - _logViewerGrid.SetFieldFilterCriteria(nameof(LogLevel), filterCriteria); + _logViewerGrid.SetFieldFilterCriteria(nameof(LogItemViewerModel.LogLevel), filterCriteria); } private async Task OnValueChangedTakeCount(int value) @@ -199,7 +199,7 @@ { if (e.ElementType != GridElementType.DataRow) return; - var logLevelObject = e.Grid?.GetRowValue(e.VisibleIndex, nameof(LogLevel)); + var logLevelObject = e.Grid?.GetRowValue(e.VisibleIndex, nameof(LogItemViewerModel.LogLevel)); if (logLevelObject == null) return; var levelObject = (LogLevel)logLevelObject; diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor index 550a8d91..956244a6 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor @@ -21,6 +21,7 @@ @using AyCode.Core @using AyCode.Core.Helpers @using DevExpress.Data.Filtering +@using TIAM.Entities.Drivers @using TIAM.Entities.Emails @using TIAMSharedUI.Shared.Components.BaseComponents @using TIAM.Services @@ -32,493 +33,543 @@ Transfers
-

Transfer management

-

Manage transfers here!

+

Transfer management

+

Manage transfers here!

- - - - -
- - - -
- + @bind-Visible="@_popupVisible" + ShowFooter="true" + CloseOnEscape="true" + CloseOnOutsideClick="false" + ShowCloseButton="false" + HeaderText="MessageBox" + Closing="EulaPopupClosing" + Closed="EulaPopupClosed"> + + + + +
+ + + +
+
-
-
- -
+
+
+ +
- + - -
-
- -
+ +
+
+ +
- + - - - - - - @{ - var idKeyField = ((Transfer)context.DataItem).Id.ToString("N"); - var editUri = $"mytransfers/{idKeyField}"; - - @context.Value - - } - - - - - - - - - - - - - - @{ - var keyField = context.Value; - var keyItem = (Transfer)context.DataItem; - - } - + + + + + + @{ + var idKeyField = ((Transfer)context.DataItem).Id.ToString("N"); + var editUri = $"mytransfers/{idKeyField}"; + + @context.Value + + } + + + + + + + + + + + + + + @{ + var keyItem = (Transfer)context.DataItem; + @(string.Join(", ", keyItem.TransferToDrivers.Select(x => x.UserProductMapping?.User?.Profile?.GetFullName()))) + } + - - - + + + - - - @{ - var keyField = context.Value; - var keyItem = (Transfer)context.DataItem; - string buttonText = "Contact"; - - } - - - - - - - @{ + + + @{ + var keyItem = (Transfer)context.DataItem; + var buttonText = "Contact"; + + } + + + + + + + @{ - TransferStatusModel keyField = TransferStatusModel.GetStatusModel((TransferStatusType)context.Value); - string transferStatusText = keyField.StatusName; - @transferStatusText - } - - - - - - - - - - - - - - - - - - @{ - var transfer2 = (Transfer)editFormContext.EditModel; - } - - - @editFormContext.GetEditor("FirstName") - - - @editFormContext.GetEditor("LastName") - - - @editFormContext.GetEditor("ContactEmail") - - - @editFormContext.GetEditor("ToAddress") - - - @editFormContext.GetEditor("FromAddress") - - + var keyField = TransferStatusModel.GetStatusModel((TransferStatusType)context.Value); + var transferStatusText = keyField.StatusName; + @transferStatusText + } + + + + + + + + + + + + + + + + + + @{ + var transfer2 = (Transfer)editFormContext.EditModel; + } + + + @editFormContext.GetEditor("FirstName") + + + @editFormContext.GetEditor("LastName") + + + @editFormContext.GetEditor("ContactEmail") + + + @editFormContext.GetEditor("ToAddress") + + + @editFormContext.GetEditor("FromAddress") + + - - + + - - - @editFormContext.GetEditor("PassengerCount") - + + + @editFormContext.GetEditor("PassengerCount") + - - @editFormContext.GetEditor("Payed") - + + @editFormContext.GetEditor("Payed") + - - @editFormContext.GetEditor("TransferStatusType") - - - @editFormContext.GetEditor("Price") - - - @editFormContext.GetEditor("Revenue") - + + @editFormContext.GetEditor("TransferStatusType") + + + @editFormContext.GetEditor("Price") + + + @editFormContext.GetEditor("Revenue") + - - + + - -
- -
- - -
- + +
+ - -
- - - - - - - - - - -
- - -
- -
+ @*//NE TÖRÖLD KI! - J. + *@ +
+ + +
+ -
-
+ +
+ + + + + + + + + + +
+ + +
+ +
-
+
+
+ +
@code { - private LoggerClient _logger; + private LoggerClient _logger; - private bool _popupVisible; - private TransferGrid _gridTransfer; + private bool _popupVisible; + private TransferGrid _gridTransfer; - private DxTagBox _filterTag; + private DxTagBox _filterTag; - public List IgnoreList = - [ - "ReceiverEmailAddress", - "ReceiverFullName", - "ReceiverId", - "SenderEmailAddress", - "SenderFullName", - "SenderId", - "ContextId", - "ContextType" - ]; + public List IgnoreList = + [ + "ReceiverEmailAddress", + "ReceiverFullName", + "ReceiverId", + "SenderEmailAddress", + "SenderFullName", + "SenderId", + "ContextId", + "ContextType" + ]; - private static List _selectedCategories = TransferStatusModel.AllStatuses.Values.Where(x => x.StatusValue != TransferStatusType.Finished && x.StatusValue != TransferStatusType.UserCanceled && x.StatusValue != TransferStatusType.AdminDenied).ToList(); - private string _filterText = GetFilterText(_selectedCategories.Select(x => x.StatusValue).ToList()); + private static List _selectedCategories = Enum.GetValues().Where(x => x != TransferStatusType.Finished && x != TransferStatusType.UserCanceled && x != TransferStatusType.AdminDenied).ToList(); + private string _filterText = GetFilterText(_selectedCategories); - private MessageWizardModel _messageWizardModel = new(); + // NE TÖRÖLD KI! - J. + // private static List _selectedCategories = TransferStatusModel.AllStatuses.Values.Where(x => x.StatusValue != TransferStatusType.Finished && x.StatusValue != TransferStatusType.UserCanceled && x.StatusValue != TransferStatusType.AdminDenied).ToList(); + // private string _filterText = GetFilterText(_selectedCategories.Select(x => x.StatusValue).ToList()); - public List AppointmentModels { get; set; } = null!; + private MessageWizardModel _messageWizardModel = new(); - DateTime StartDate { get; set; } = DateTime.Today; - DxSchedulerDataStorage _dataStorage = new(); + public List AppointmentModels { get; set; } = null!; - private Dictionary driverNamesByTransferId = []; + DateTime StartDate { get; set; } = DateTime.Today; + DxSchedulerDataStorage _dataStorage = new(); + + void SendMail(Transfer item) + { + _logger.Info($"Preparing mail to {item.ContactEmail}, {item.Id}"); + _messageWizardModel.Subject = $"[#{item.OrderId}] New message regarding your transfer"; + _messageWizardModel.ReceiverId = item.UserId; + _messageWizardModel.ContextId = item.Id; + _messageWizardModel.ContextType = MessageContextType.Transfer; + _messageWizardModel.SenderId = TiamConstClient.SysAccounts["SystemEmailSender"]; + _messageWizardModel.SenderEmailAddress = TiamConstClient.SystemEmailAddress; + _messageWizardModel.ReceiverEmailAddress = item.ContactEmail; + _messageWizardModel.ReceiverFullName = item.FullName; + _popupVisible = true; + } + + void CancelCreateClick() + { + + _popupVisible = false; + } + + void EulaPopupClosed() + { + //cancel clicked + + } + + void EulaPopupClosing(PopupClosingEventArgs args) + { + //myModel = new TransferWizardModel(); + _messageWizardModel = new MessageWizardModel(); + } + + //----------------------------------------------------------------------------------- + public async Task SubmitForm(object result) + { + var messageModel = (result as MessageWizardModel)!; + _logger.Info(messageModel.Content); + var email = await wizardProcessor.ProcessWizardAsync(result.GetType(), messageModel); + _logger.Info($"Submitted nested form: {result.GetType().FullName}"); + CancelCreateClick(); + } - void SendMail(Transfer item) - { - _logger.Info($"Preparing mail to {item.ContactEmail}, {item.Id}"); - _messageWizardModel.Subject = $"[#{item.OrderId}] New message regarding your transfer"; - _messageWizardModel.ReceiverId = item.UserId; - _messageWizardModel.ContextId = item.Id; - _messageWizardModel.ContextType = MessageContextType.Transfer; - _messageWizardModel.SenderId = TiamConstClient.SysAccounts["SystemEmailSender"]; - _messageWizardModel.SenderEmailAddress = TiamConstClient.SystemEmailAddress; - _messageWizardModel.ReceiverEmailAddress = item.ContactEmail; - _messageWizardModel.ReceiverFullName = item.FullName; - _popupVisible = true; - } + void Grid_CustomizeElement(GridCustomizeElementEventArgs e) + { + try + { + if (e.ElementType == GridElementType.HeaderCell) + { + e.Style = "background-color: rgba(0, 0, 0, 0.08)"; + e.CssClass = "header-bold"; + } - void CancelCreateClick() - { + if (e.ElementType != GridElementType.DataRow) return; - _popupVisible = false; - } + var transferStatus = e.Grid?.GetRowValue(e.VisibleIndex, "TransferStatusType"); + if (transferStatus == null) return; - void EulaPopupClosed() - { - //cancel clicked + var transferStatusByte = (byte)transferStatus; - } + switch (transferStatusByte) + { + case 5: + e.CssClass = "bg-important"; + break; + case > 5 and < 35: + e.CssClass = "bg-attention"; + break; + case 35: + e.CssClass = "bg-finished"; + break; + case > 35: + e.CssClass = "bg-cancel"; + break; + } + } + catch (Exception ex) + { + _logger.Error($"Grid_CustomizeElement; {ex.Message}", ex); + } + } - void EulaPopupClosing(PopupClosingEventArgs args) - { - //myModel = new TransferWizardModel(); - _messageWizardModel = new MessageWizardModel(); - } + void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e) + { + if (!e.IsNew) return; - //----------------------------------------------------------------------------------- + var transferEditModel = (Transfer)e.EditModel; //TODO not valid cast + transferEditModel.Id = Guid.NewGuid(); + transferEditModel.ToAddress = "Where to?"; + transferEditModel.FromAddress = "From where?"; + transferEditModel.Appointment = DateTime.UtcNow.AddDays(3); + transferEditModel.PassengerCount = 1; + transferEditModel.FirstName = "John"; + transferEditModel.LastName = "Doe"; + transferEditModel.ContactPhone = "+00000000000"; + transferEditModel.ContactEmail = "your@email.address"; + } + + private static string GetFilterText(ICollection selectedTransferStatuses) + => selectedTransferStatuses.Count == 0 ? string.Empty : CriteriaOperator.FromLambda(t => selectedTransferStatuses.Contains(t.TransferStatusType)).ToString(); + + void TagBox_ValuesChanged(IEnumerable newSelectedCategories) + { + var filterText = string.Empty; + InOperator? filterCriteria = null; + + _selectedCategories = newSelectedCategories.ToList(); + + if (_selectedCategories.Count > 0) + { + filterCriteria = new InOperator(nameof(Transfer.TransferStatusType), _selectedCategories); + filterText = GetFilterText(_selectedCategories); + } + + _filterText = filterText; + _gridTransfer.SetFieldFilterCriteria(nameof(Transfer.TransferStatusType), filterCriteria); + } + + // NE TÖRÖLD KI! - J. + // void TagBox_ValuesChanged(IEnumerable newSelectedCategories) + // { + // var filterText = string.Empty; + // InOperator? filterCriteria = null; + + // _selectedCategories = newSelectedCategories.ToList(); + // //_selectedCategories.Clear(); + // //_selectedCategories.AddRange(newSelectedCategories); + + // if (_selectedCategories.Count > 0) + // { + // filterCriteria = new InOperator(nameof(Transfer.TransferStatusType), _selectedCategories.Select(c => c.StatusValue)); + // filterText = GetFilterText(_selectedCategories.Select(x => (TransferStatusType)x.StatusValue).ToList()); + // } + + // _filterText = filterText; + // _gridTransfer.SetFieldFilterCriteria(nameof(Transfer.TransferStatusType), filterCriteria); + // } + + private void DataSourceChanged(IList transfers) + { + _logger.Info("DataSourceChanged called"); + + InitializeAppointments(transfers); + + if (_selectedCategories.Count > 0) + TagBox_ValuesChanged(_selectedCategories); + + // if(!SelectedCategories.Any()) + // SelectedCategories = [Statuses.FirstOrDefault(x => x.StatusValue == (byte)TransferStatusType.Finished)!]; + + // var filterTransferStatusType = Statuses.FirstOrDefault(x => x.StatusValue == (byte)TransferStatusType.Finished)!; + + // if (SelectedCategories.All(x => x.StatusValue != filterTransferStatusType.StatusValue)) + // SelectedCategories.Add(filterTransferStatusType); + } + + private void DataSourceItemChanging(GridDataItemChangingEventArgs args) + { + _logger.Info("DataSourceItemChanging called"); + } + + private void DataSourceItemChanged(GridDataItemChangedEventArgs args) + { + _logger.Info("DataSourceItemChanged called"); + + AppointmentModels.UpdateCollection(CreateAppointmentModel(args.DataItem), args.TrackingState == TrackingState.Remove); + } + + private void DataItemSaving(GridEditModelSavingEventArgs e) + { + _logger.Info("DataItemSaving called"); + } + + private void DataItemDeleting(GridDataItemDeletingEventArgs e) + { + _logger.Info($"DataItemDeleting OnItemDeleting"); + } + + protected override Task OnInitializedAsync() + { + _logger = new LoggerClient(_logWriters.ToArray()); + + //await AdminSignalRClient.GetAllCarsByProductIdAsync(TiamConstClient.TransferProductId, _cars, StateHasChanged); + + //await base.OnInitializedAsync(); + return base.OnInitializedAsync(); + } + + private void InitializeAppointments(ICollection transferDataList) + { + _logger.Info("InitializeAppointments called"); + + AppointmentModels = new List(transferDataList.Count); + + foreach (var transfer in transferDataList) + { + // var bnm = DataStorage.CreateAppointmentItem(); + // bnm.Start = transfer.Appointment; + // bnm.Description = $"{transfer.FullName}, {transfer.ToAddress}"; + // bnm.Location = transfer.FromAddress; + // bnm.Subject = "Simple transfer"; + + AppointmentModels.Add(CreateAppointmentModel(transfer)); + } + + _dataStorage = new DxSchedulerDataStorage + { + AppointmentMappings = new DxSchedulerAppointmentMappings() + { + Type = "AppointmentType", + Start = "StartDate", + End = "EndDate", + Subject = "Caption", + AllDay = "AllDay", + Location = "Location", + Description = "Description", + LabelId = "Label", + StatusId = "Status", + RecurrenceInfo = "Recurrence" + }, + + AppointmentsSource = AppointmentModels + }; + } + + public AppointmentModel CreateAppointmentModel(Transfer transfer) + { + return new AppointmentModel { Id = transfer.Id, StartDate = transfer.Appointment, EndDate = transfer.Appointment.AddMinutes(30), Description = $"{transfer.FullName}, {transfer.ToAddress}", Location = transfer.FromAddress, Caption = "Simple transfer" }; + } + + void ColumnChooserButton_Click() + { + _gridTransfer.ShowColumnChooser(); + } - public async Task SubmitForm(object result) - { - var messageModel = (result as MessageWizardModel)!; - _logger.Info(messageModel.Content); - var email = await wizardProcessor.ProcessWizardAsync(result.GetType(), messageModel); - _logger.Info($"Submitted nested form: {result.GetType().FullName}"); - CancelCreateClick(); - } + protected override void OnAfterRender(bool firstRender) + { + if (firstRender) + { + //_gridTransfer.ExpandDetailRow(0); + } + } - async void Grid_CustomizeElement(GridCustomizeElementEventArgs e) - { - try - { - if (e.ElementType == GridElementType.HeaderCell) - { - e.Style = "background-color: rgba(0, 0, 0, 0.08)"; - e.CssClass = "header-bold"; - } + private void OnSelectedDataItemChanged(object selectedRow) + { + if (selectedRow is not Transfer selectedTransfer) return; - + RefreshTransferToDriversData(selectedTransfer, () => { _gridTransfer.Reload(); }); + } - if (e.ElementType != GridElementType.DataRow) return; + private void RefreshTransferToDriversData(Transfer? transfer, Action? callback = null) + { + try + { + if (transfer == null || transfer.TransferToDrivers.Count != 0 || transfer.TransferStatusType < TransferStatusType.AssignedToDriver) + return; - var transferStatus = e.Grid?.GetRowValue(e.VisibleIndex, "TransferStatusType"); - if (transferStatus == null) return; + AdminSignalRClient.GetByIdAsync?>(SignalRTags.GetTransferDriversByTransferId, x => + { + if (x?.ResponseData == null) return Task.CompletedTask; - var transferStatusByte = (byte)transferStatus; + transfer.TransferToDrivers.UpdateCollection(x.ResponseData, false); + callback?.Invoke(); - switch (transferStatusByte) - { - case 5: - e.CssClass = "bg-important"; - break; - case > 5 and < 35: - e.CssClass = "bg-attention"; - break; - case 35: - e.CssClass = "bg-finished"; - break; - case > 35: - e.CssClass = "bg-cancel"; - break; - } - - - - - } - catch (Exception ex) - { - _logger.Error($"Grid_CustomizeElement; {ex.Message}", ex); - } - - } - - void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e) - { - if (!e.IsNew) return; - - var transferEditModel = (Transfer)e.EditModel; //TODO not valid cast - transferEditModel.Id = Guid.NewGuid(); - transferEditModel.ToAddress = "Where to?"; - transferEditModel.FromAddress = "From where?"; - transferEditModel.Appointment = DateTime.UtcNow.AddDays(3); - transferEditModel.PassengerCount = 1; - transferEditModel.FirstName = "John"; - transferEditModel.LastName = "Doe"; - transferEditModel.ContactPhone = "+00000000000"; - transferEditModel.ContactEmail = "your@email.address"; - } - - private static string GetFilterText(ICollection selectedTransferStatuses) - => selectedTransferStatuses.Count == 0 ? string.Empty : CriteriaOperator.FromLambda(t => selectedTransferStatuses.Contains(t.TransferStatusType)).ToString(); - - void TagBox_ValuesChanged(IEnumerable newSelectedCategories) - { - var filterText = string.Empty; - InOperator? filterCriteria = null; - - _selectedCategories = newSelectedCategories.ToList(); - - if (_selectedCategories.Count > 0) - { - filterCriteria = new InOperator("TransferStatusType", _selectedCategories.Select(c => c.StatusValue)); - filterText = GetFilterText(_selectedCategories.Select(x => (TransferStatusType)x.StatusValue).ToList()); - } - - _filterText = filterText; - _gridTransfer.SetFieldFilterCriteria("TransferStatusType", filterCriteria); - } - - private void DataSourceChanged(IList transfers) - { - _logger.Info("DataSourceChanged called"); - - InitializeAppointments(transfers); - - if (_selectedCategories.Count > 0) - TagBox_ValuesChanged(_selectedCategories); - - // if(!SelectedCategories.Any()) - // SelectedCategories = [Statuses.FirstOrDefault(x => x.StatusValue == (byte)TransferStatusType.Finished)!]; - - // var filterTransferStatusType = Statuses.FirstOrDefault(x => x.StatusValue == (byte)TransferStatusType.Finished)!; - - // if (SelectedCategories.All(x => x.StatusValue != filterTransferStatusType.StatusValue)) - // SelectedCategories.Add(filterTransferStatusType); - } - - private void DataSourceItemChanging(GridDataItemChangingEventArgs args) - { - _logger.Info("DataSourceItemChanging called"); - } - - private void DataSourceItemChanged(GridDataItemChangedEventArgs args) - { - _logger.Info("DataSourceItemChanged called"); - - AppointmentModels.UpdateCollection(CreateAppointmentModel(args.DataItem), args.TrackingState == TrackingState.Remove); - } - - private void DataItemSaving(GridEditModelSavingEventArgs e) - { - _logger.Info("DataItemSaving called"); - } - - private void DataItemDeleting(GridDataItemDeletingEventArgs e) - { - _logger.Info($"DataItemDeleting OnItemDeleting"); - } - - protected override Task OnInitializedAsync() - { - _logger = new LoggerClient(_logWriters.ToArray()); - // var result = AdminSignalRClient.GetTransferDrivers - return base.OnInitializedAsync(); - } - - private void InitializeAppointments(ICollection transferDataList) - { - _logger.Info("InitializeAppointments called"); - - AppointmentModels = new List(transferDataList.Count); - - foreach (var transfer in transferDataList) - { - // var bnm = DataStorage.CreateAppointmentItem(); - // bnm.Start = transfer.Appointment; - // bnm.Description = $"{transfer.FullName}, {transfer.ToAddress}"; - // bnm.Location = transfer.FromAddress; - // bnm.Subject = "Simple transfer"; - - AppointmentModels.Add(CreateAppointmentModel(transfer)); - } - - _dataStorage = new DxSchedulerDataStorage - { - AppointmentMappings = new DxSchedulerAppointmentMappings() - { - Type = "AppointmentType", - Start = "StartDate", - End = "EndDate", - Subject = "Caption", - AllDay = "AllDay", - Location = "Location", - Description = "Description", - LabelId = "Label", - StatusId = "Status", - RecurrenceInfo = "Recurrence" - }, - - AppointmentsSource = AppointmentModels - }; - } - - public AppointmentModel CreateAppointmentModel(Transfer transfer) - { - return new AppointmentModel { Id = transfer.Id, StartDate = transfer.Appointment, EndDate = transfer.Appointment.AddMinutes(30), Description = $"{transfer.FullName}, {transfer.ToAddress}", Location = transfer.FromAddress, Caption = "Simple transfer" }; - } - - void ColumnChooserButton_Click() - { - _gridTransfer.ShowColumnChooser(); - } - - - protected override void OnAfterRender(bool firstRender) - { - if (firstRender) - { - //_gridTransfer.ExpandDetailRow(0); - } - } + return Task.CompletedTask; + }, transfer.Id).Forget(); + } + catch (Exception ex) + { + _logger.Error($"RefreshTransferToDriversData error; transferId: {transfer?.Id}", ex); + } + } } \ No newline at end of file diff --git a/TIAMSharedUI/Shared/Components/Grids/TransferGrid.cs b/TIAMSharedUI/Shared/Components/Grids/TransferGrid.cs index b5422996..a94092f7 100644 --- a/TIAMSharedUI/Shared/Components/Grids/TransferGrid.cs +++ b/TIAMSharedUI/Shared/Components/Grids/TransferGrid.cs @@ -6,8 +6,6 @@ namespace TIAMSharedUI.Shared.Components.Grids; public class TransferGrid : TiamGrid { - - public TransferGrid() : base() { GetAllMessageTag = SignalRTags.GetTransfersByFilterText;//SignalRTags.GetTransfers; diff --git a/TIAMWebApp/Server/appsettings.json b/TIAMWebApp/Server/appsettings.json index 2c62cc83..06f5ddbd 100644 --- a/TIAMWebApp/Server/appsettings.json +++ b/TIAMWebApp/Server/appsettings.json @@ -2,8 +2,8 @@ "ConnectionStrings": { //"DeveloperDbConnection": "Data Source=185.51.190.197;Initial Catalog=TIAM_DEV;Trusted_Connection=false;Encrypt=false;TrustServerCertificate=True;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true" - "DeveloperDbConnection": "Data Source=194.164.235.47;Initial Catalog=TIAM_DEV;Trusted_Connection=false;Encrypt=false;TrustServerCertificate=True;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true" - //"DeveloperDbConnection": "Data Source=194.164.235.47;Initial Catalog=TIAM_DEVRELEASE;Trusted_Connection=false;Encrypt=false;TrustServerCertificate=True;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true" + //"DeveloperDbConnection": "Data Source=194.164.235.47;Initial Catalog=TIAM_DEV;Trusted_Connection=false;Encrypt=false;TrustServerCertificate=True;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true" + "DeveloperDbConnection": "Data Source=194.164.235.47;Initial Catalog=TIAM_DEVRELEASE;Trusted_Connection=false;Encrypt=false;TrustServerCertificate=True;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true" }, "Logging": { "LogLevel": { diff --git a/TIAMWebApp/Shared/Services/AdminSignalRClient.cs b/TIAMWebApp/Shared/Services/AdminSignalRClient.cs index 3bd35ada..6c2e9fb5 100644 --- a/TIAMWebApp/Shared/Services/AdminSignalRClient.cs +++ b/TIAMWebApp/Shared/Services/AdminSignalRClient.cs @@ -2,6 +2,7 @@ using AyCode.Core.Consts; using AyCode.Core.Helpers; using AyCode.Services.Loggers; +using AyCode.Services.SignalRs; using Microsoft.Extensions.DependencyInjection; using TIAM.Entities.Drivers; using TIAM.Entities.Transfers; @@ -109,7 +110,6 @@ namespace TIAMWebApp.Shared.Application.Services public async Task> GetTransferDrivers(Guid transferId) => await GetByIdAsync>(SignalRTags.GetTransferDriversByTransferId, transferId) ?? []; - public async Task AddTransferDriver(TransferToDriver transferToDriver) { throw new NotImplementedException();