diff --git a/SqlSchemaCompare_Dev_to_DevRelease.scmp b/SqlSchemaCompare_Dev_to_DevRelease.scmp index ae44c336..9f6cd6fb 100644 --- a/SqlSchemaCompare_Dev_to_DevRelease.scmp +++ b/SqlSchemaCompare_Dev_to_DevRelease.scmp @@ -8,7 +8,7 @@ - Data Source=185.51.190.197;Initial Catalog=TIAM_PROD;Persist Security Info=True;User ID=Anata_Development_Team;Pooling=False;Multiple Active Result Sets=False;Connect Timeout=60;Encrypt=True;Trust Server Certificate=True;Command Timeout=0 + Data Source=185.51.190.197;Initial Catalog=TIAM_DEVRELEASE;Persist Security Info=True;User ID=Anata_Development_Team;Pooling=False;Multiple Active Result Sets=False;Connect Timeout=60;Encrypt=True;Trust Server Certificate=True;Command Timeout=0 @@ -345,11 +345,11 @@ TargetDatabaseName - TIAM_PROD + TIAM_DEVRELEASE TargetConnectionString - Data Source=185.51.190.197;Initial Catalog=TIAM_PROD;Persist Security Info=True;User ID=Anata_Development_Team;Pooling=False;Multiple Active Result Sets=False;Connect Timeout=60;Encrypt=True;Trust Server Certificate=True;Application Name="Microsoft SQL Server Data Tools, Schema Compare";Command Timeout=0 + Data Source=185.51.190.197;Initial Catalog=TIAM_DEVRELEASE;Persist Security Info=True;User ID=Anata_Development_Team;Pooling=False;Multiple Active Result Sets=False;Connect Timeout=60;Encrypt=True;Trust Server Certificate=True;Application Name="Microsoft SQL Server Data Tools, Schema Compare";Command Timeout=0 TreatVerificationErrorsAsWarnings diff --git a/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor b/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor index d84369a7..83559c3a 100644 --- a/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor @@ -140,8 +140,7 @@ CustomizeElement="Grid_CustomizeElement" ShowGroupPanel="true" CustomGroup="Grid_CustomGroup" - CustomizeGroupValueDisplayText="Grid_CustomizeGroupValueDisplayText" - EditMode="GridEditMode.EditForm" + CustomizeGroupValueDisplayText="Grid_CustomizeGroupValueDisplayText" ColumnResizeMode="GridColumnResizeMode.NextColumn" AllowSelectRowByClick="false" PageSize="13" diff --git a/TIAMSharedUI/Pages/User/Hotels/HotelComponent.razor b/TIAMSharedUI/Pages/User/Hotels/HotelComponent.razor index 521288e2..fad159cf 100644 --- a/TIAMSharedUI/Pages/User/Hotels/HotelComponent.razor +++ b/TIAMSharedUI/Pages/User/Hotels/HotelComponent.razor @@ -92,7 +92,7 @@ - + @{ var idKeyField = ((Transfer)context.DataItem).Id.ToString("N"); @@ -105,11 +105,7 @@ - - - - - + @@ -189,7 +185,7 @@

Subtitle

-
All details
+
All details
@@ -219,7 +215,17 @@ - + + + @{ + var idKeyField = ((Transfer)context.DataItem).Id.ToString("N"); + + + Eur @context.Value + + } + + diff --git a/TIAMSharedUI/Pages/User/Hotels/ManageIncome.razor b/TIAMSharedUI/Pages/User/Hotels/ManageIncome.razor new file mode 100644 index 00000000..0190d5da --- /dev/null +++ b/TIAMSharedUI/Pages/User/Hotels/ManageIncome.razor @@ -0,0 +1,190 @@ +@page "/user/income/{id:guid}" +@using BlazorAnimation +@using TIAM.Core.Enums +@using TIAM.Entities.Emails +@using TIAM.Entities.Transfers +@using TIAM.Resources +@using TIAM.Services +@using TIAMSharedUI.Pages.Components +@using TIAMSharedUI.Shared +@using TIAMWebApp.Shared.Application.Interfaces +@using TIAMWebApp.Shared.Application.Models.ClientSide.UI +@using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels +@using TIAMWebApp.Shared.Application.Models.PageModels +@using TIAMWebApp.Shared.Application.Utility +@using AyCode.Services.Loggers +@using TIAMWebApp.Shared.Application.Services +@using TIAMSharedUI.Shared.Components.Grids +@using AyCode.Core.Enums +@using AyCode.Core.Extensions +@using AyCode.Core.Consts +@using AyCode.Core +@using AyCode.Core.Helpers +@using DevExpress.Data.Filtering +@using TIAM.Entities.Emails +@layout AdminLayout +@inject IEnumerable LogWriters +@inject IStringLocalizer localizer +@inject IWizardProcessor wizardProcessor +@inject ITransferDataService transferDataService +@inject ISessionService sessionService +@inject AdminSignalRClient AdminSignalRClient; +Transfers + +
+

Income

+

Manage transfers here!

+
+ +
+
+
+ +
+ + + + + + + + + + @{ + var idKeyField = ((Transfer)context.DataItem).Id.ToString("N"); + var editUri = $"mytransfers/{idKeyField}"; + + @context.Value + + } + + + + + + @{ + var idKeyField = ((Transfer)context.DataItem).Id.ToString("N"); + + + Eur @context.Value + + } + + + + +
+ +
+ +
+
+ +
+
+ + +@code { + + + [Parameter] + public Guid Id { get; set; } + + private LoggerClient _logger; + + private TransferGrid _gridTransfer; + + private DxTagBox _filterTag; + + + 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"; + } + + if (e.ElementType != GridElementType.DataRow) return; + + var transferStatus = e.Grid?.GetRowValue(e.VisibleIndex, "TransferStatusType"); + if (transferStatus == null) return; + + 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 Grid_CustomGroup(GridCustomGroupEventArgs e) + { + if (e.FieldName == "Appointment") + { + e.SameGroup = Grid_CompareColumnValues(((DateTime)e.Value1), ((DateTime)e.Value2)); + e.Handled = true; + } + } + bool Grid_CompareColumnValues(DateTime value1, DateTime value2) + { + if (value1.Year == value2.Year && value1.Month == value2.Month) + return true; + else + return false; + } + void Grid_CustomizeGroupValueDisplayText(GridCustomizeGroupValueDisplayTextEventArgs e) + { + if (e.FieldName == "Appointment") + { + + string displayText = $"Month: {((DateTime)e.Value).Year.ToString()}.{((DateTime)e.Value).Month.ToString()}"; + e.DisplayText = displayText; + } + } + + + protected override Task OnInitializedAsync() + { + _logger = new LoggerClient(LogWriters.ToArray()); + + return base.OnInitializedAsync(); + } + + + protected override void OnAfterRender(bool firstRender) + { + if (firstRender) + { + //_gridTransfer.ExpandDetailRow(0); + } + } +} \ No newline at end of file