From d0a11d62bb393b67c61df953778070f3838ac03d Mon Sep 17 00:00:00 2001 From: Loretta Date: Tue, 20 Aug 2024 14:17:29 +0200 Subject: [PATCH 1/4] fixes, improvements, etc... --- .../User/Drivers/DriverManageTransfers.razor | 49 +++++++++-------- TIAMSharedUI/Pages/User/Messages.razor | 12 ++++- .../MessageDetailGridComponent.razor | 52 +++++++++++-------- 3 files changed, 68 insertions(+), 45 deletions(-) diff --git a/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor b/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor index 082f0415..ce26539b 100644 --- a/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor @@ -82,7 +82,7 @@ @foreach (var transfer in PageModel.Upcomings) { - +
@@ -108,7 +108,7 @@ @foreach (var transfer in PageModel.Problems) { - +
@@ -147,8 +147,6 @@ ContextIds="new object[] {driverId}" CustomizeElement="Grid_CustomizeElement" ShowGroupPanel="true" - CustomGroup="Grid_CustomGroup" - CustomizeGroupValueDisplayText="Grid_CustomizeGroupValueDisplayText" ColumnResizeMode="GridColumnResizeMode.NextColumn" AllowSelectRowByClick="false" PageSize="13" @@ -156,8 +154,16 @@ - + + + + @{ + var appointment = (Transfer)context.DataItem; + @appointment.Appointment.ToString("t") + } + + @@ -259,14 +265,14 @@ } } - void Grid_CustomGroup(GridCustomGroupEventArgs e) - { - if (e.FieldName == "Appointment") - { - e.SameGroup = Grid_CompareColumnValues(((DateTime)e.Value1).Date, ((DateTime)e.Value2).Date); - e.Handled = true; - } - } + // void Grid_CustomGroup(GridCustomGroupEventArgs e) + // { + // if (e.FieldName == "Appointment") + // { + // e.SameGroup = Grid_CompareColumnValues(((DateTime)e.Value1).Date, ((DateTime)e.Value2).Date); + // e.Handled = true; + // } + // } bool Grid_CompareColumnValues(DateTime value1, DateTime value2) { if (value1 == value2) @@ -274,15 +280,14 @@ else return false; } - void Grid_CustomizeGroupValueDisplayText(GridCustomizeGroupValueDisplayTextEventArgs e) - { - if (e.FieldName == "Appointment") - { - - string displayText = ((DateTime)e.Value).Date.ToString(); - e.DisplayText = displayText; - } - } + // void Grid_CustomizeGroupValueDisplayText(GridCustomizeGroupValueDisplayTextEventArgs e) + // { + // if (e.FieldName == "Appointment") + // { + // string displayText = ((DateTime)e.Value).Date.ToString(); + // e.DisplayText = displayText; + // } + // } private void RefreshComponent() diff --git a/TIAMSharedUI/Pages/User/Messages.razor b/TIAMSharedUI/Pages/User/Messages.razor index 4cd109fa..7e422a7a 100644 --- a/TIAMSharedUI/Pages/User/Messages.razor +++ b/TIAMSharedUI/Pages/User/Messages.razor @@ -16,7 +16,7 @@
- +
@@ -38,7 +38,15 @@ // var upmId = sessionService.User.UserModelDto.UserProductMappings.Select(x => x.Id).FirstOrDefault(); // if(!upmId.IsNullOrEmpty()) _contextParams.Add(upmId); - _isMobile = await jsRuntime.InvokeAsync("isDevice"); + try + { + _isMobile = await jsRuntime.InvokeAsync("isDevice"); + } + catch (Exception ex) + { + Console.WriteLine(ex); + } + await base.OnInitializedAsync(); } } diff --git a/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor index 80b77f9b..3dd21625 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor @@ -31,25 +31,14 @@ SignalRClient="AdminSignalRClient" GetAllMessageTag="GetAllMessageTag" ContextIds="@(ContextId.IsNullOrEmpty() ? throw new InvalidDataException($"ContextId.IsNullOrEmpty(); ContextId: {ContextId}") : [ContextId.Value])" - CustomizeElement="CustomizeElement"> + CustomizeElement="CustomizeElement" + ShowFilterRow="ShowFilterRow"> - - - - - - @{ - var Date = ((EmailMessage)context.DataItem).Created.Date; - var Time = ((EmailMessage)context.DataItem).Created; -

@Date.ToString("yy.MM.dd")

-

@Time.ToString("HH:mm")

- } - - + @{ - bool isOutgoing = ((EmailMessage)context.DataItem).SenderId == myUserId; + var isOutgoing = ((EmailMessage)context.DataItem).SenderId == myUserId; if (isOutgoing) { @@ -61,8 +50,8 @@ } | @{ - MessageContextType a = ((EmailMessage)context.DataItem).ContextType; - switch (a) + var contextType = ((EmailMessage)context.DataItem).ContextType; + switch (contextType) { case MessageContextType.Transfer: { @@ -94,12 +83,32 @@ } - + + + + + @{ + var created = ((EmailMessage)context.DataItem).Created; + + if (!IsMessageTextVisible) + { +

@created.ToString("yy.MM.dd")

+

@created.ToString("HH:mm")

+ } + else + { + @created.ToString("g") + } + } + + + + @{ - string subjectString = ((EmailMessage)context.DataItem).Subject; -

@subjectString

+ var subjectString = ((EmailMessage)context.DataItem).Subject; +

@subjectString

} @@ -108,7 +117,7 @@ @System.Text.RegularExpressions.Regex.Replace((displayTextContext.Value as string)!, "<(.|\n)*?>", string.Empty) - + @@ -134,6 +143,7 @@ [Parameter] public bool IsSenderEmailVisible { get; set; } = true; [Parameter] public int GetAllMessageTag { get; set; } = SignalRTags.GetMessagesByContextId; + [Parameter] public bool ShowFilterRow { get; set; } = false; private MessageGrid _messageGrid = null!; private LoggerClient _logger = null!; From 7d56e6202e4aad3f7919440fdb5adbae3b71f4aa Mon Sep 17 00:00:00 2001 From: Loretta Date: Tue, 20 Aug 2024 14:23:53 +0200 Subject: [PATCH 2/4] fix --- .../Pages/User/SysAdmins/MessageDetailGridComponent.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor index 3dd21625..ec641889 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor @@ -35,7 +35,7 @@ ShowFilterRow="ShowFilterRow"> - + @{ var isOutgoing = ((EmailMessage)context.DataItem).SenderId == myUserId; From f9feff0bf52c160ab0ae6ae7dce720bb5d1b96bb Mon Sep 17 00:00:00 2001 From: Loretta Date: Tue, 20 Aug 2024 14:55:20 +0200 Subject: [PATCH 3/4] MessageGrid improvements, fixes... --- .../SysAdmins/MessageDetailGridComponent.razor | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor index ec641889..df77b68b 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor @@ -85,19 +85,19 @@ - + @{ var created = ((EmailMessage)context.DataItem).Created; - if (!IsMessageTextVisible) + if (IsMessageTextVisible) { -

@created.ToString("yy.MM.dd")

-

@created.ToString("HH:mm")

+ @created.ToString("g") } else { - @created.ToString("g") +
@created.ToString("d").Replace(" ", string.Empty)
+
@created.ToString("t").Replace(" ", string.Empty)
} } @@ -109,6 +109,12 @@ @{ var subjectString = ((EmailMessage)context.DataItem).Subject;

@subjectString

+ + if (!IsMessageTextVisible) + { + var textString = System.Text.RegularExpressions.Regex.Replace(((EmailMessage)context.DataItem).Text!, "<(.|\n)*?>", string.Empty); +
@textString
+ } } From 04f44fab68ed97e03c232842f2caa3222800ff9b Mon Sep 17 00:00:00 2001 From: Loretta Date: Tue, 20 Aug 2024 15:20:25 +0200 Subject: [PATCH 4/4] fix --- .../SysAdmins/MessageDetailGridComponent.razor | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor index df77b68b..63d5d9c4 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor @@ -34,7 +34,7 @@ CustomizeElement="CustomizeElement" ShowFilterRow="ShowFilterRow"> - + @{ @@ -83,8 +83,8 @@ } - - + + @{ @@ -103,17 +103,19 @@ - + @{ var subjectString = ((EmailMessage)context.DataItem).Subject;

@subjectString

- + if (!IsMessageTextVisible) { var textString = System.Text.RegularExpressions.Regex.Replace(((EmailMessage)context.DataItem).Text!, "<(.|\n)*?>", string.Empty); -
@textString
+ if (textString.Length > 80) textString = textString[..80] + "..."; + +
@textString
} } @@ -123,7 +125,7 @@ @System.Text.RegularExpressions.Regex.Replace((displayTextContext.Value as string)!, "<(.|\n)*?>", string.Empty) - +