From a28694d388c1a14bf1f66a9ea0545681cc685993 Mon Sep 17 00:00:00 2001
From: JLdgu <jonathan.linstead@devon.gov.uk>
Date: Thu, 25 Jun 2026 14:39:36 +0100
Subject: [PATCH] Include eSIM on import

Correct BaseReport horizontal alignment
---
 PhoneAssistant.Cli/EECommand/EE.cs            | 10 +++-
 .../BaseReport/BaseReportMainView.xaml        | 52 ++++++++++++++++---
 2 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/PhoneAssistant.Cli/EECommand/EE.cs b/PhoneAssistant.Cli/EECommand/EE.cs
index 1ec700f8..72bf745d 100644
--- a/PhoneAssistant.Cli/EECommand/EE.cs
+++ b/PhoneAssistant.Cli/EECommand/EE.cs
@@ -123,8 +123,15 @@ private static void Execute(DirectoryInfo? directory)
         foreach (var phoneSummary in phoneSummariesResult.Value)
         {
             string simNumber = "Unknown";
+            bool eSIM = false;
             if (simDetailsResult.Value.TryGetValue(phoneSummary.Key, out var simDetail))
+            {
                 simNumber = simDetail.SimNumber;
+                if (string.Equals(simDetail.SimType, "eSIM", StringComparison.InvariantCultureIgnoreCase))
+                {
+                    eSIM = true;
+                }
+            }
 
             var sim = new Sim
             {
@@ -134,7 +141,8 @@ private static void Execute(DirectoryInfo? directory)
                 BroadbandData = phoneSummary.Value.BroadbandData,
                 TextMessages = phoneSummary.Value.TextMessageCount,
                 UserName = phoneSummary.Value.UserName,
-                VoiceCalls = phoneSummary.Value.VoiceCallCount
+                VoiceCalls = phoneSummary.Value.VoiceCallCount,
+                Esim = eSIM
             };
 
             lineCount++;
diff --git a/PhoneAssistant.WPF/Features/BaseReport/BaseReportMainView.xaml b/PhoneAssistant.WPF/Features/BaseReport/BaseReportMainView.xaml
index 656afeba..8225c18c 100644
--- a/PhoneAssistant.WPF/Features/BaseReport/BaseReportMainView.xaml
+++ b/PhoneAssistant.WPF/Features/BaseReport/BaseReportMainView.xaml
@@ -67,13 +67,37 @@
             <DataGrid.Columns>
                 <DataGridTextColumn Width="120"
                                     Binding="{Binding PhoneNumber}"
-                                    Header="Phone Number" />
-                <DataGridTextColumn Binding="{Binding BillingPeriod}" Header="Billing Period" />
-                <DataGridTextColumn Binding="{Binding SIMNumber}" Header="SIM Number" />
+                                    Header="Phone Number"
+                                    IsReadOnly="True">
+                    <DataGridTextColumn.ElementStyle>
+                        <Style TargetType="TextBlock">
+                            <Setter Property="VerticalAlignment" Value="Center" />
+                        </Style>
+                    </DataGridTextColumn.ElementStyle>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding BillingPeriod}"
+                                    Header="Billing Period"
+                                    IsReadOnly="True" />
+                <DataGridTextColumn Binding="{Binding SIMNumber}" Header="SIM Number">
+                    <DataGridTextColumn.ElementStyle>
+                        <Style TargetType="TextBlock">
+                            <Setter Property="VerticalAlignment" Value="Center" />
+                        </Style>
+                    </DataGridTextColumn.ElementStyle>
+                </DataGridTextColumn>
                 <DataGridCheckBoxColumn Binding="{Binding Esim, UpdateSourceTrigger=PropertyChanged, TargetNullValue=False}"
                                         Header="eSIM"
+                                        IsReadOnly="True"
                                         IsThreeState="False" />
-                <DataGridTextColumn Binding="{Binding UserName}" Header="User Name" />
+                <DataGridTextColumn Binding="{Binding UserName}"
+                                    Header="User Name"
+                                    IsReadOnly="True">
+                    <DataGridTextColumn.ElementStyle>
+                        <Style TargetType="TextBlock">
+                            <Setter Property="VerticalAlignment" Value="Center" />
+                        </Style>
+                    </DataGridTextColumn.ElementStyle>
+                </DataGridTextColumn>
                 <DataGridTemplateColumn Header="Broadband Data">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
@@ -93,8 +117,24 @@
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
-                <DataGridTextColumn Binding="{Binding TextMessages}" Header="Text Messages" />
-                <DataGridTextColumn Binding="{Binding VoiceCalls}" Header="Voice Calls" />
+                <DataGridTextColumn Binding="{Binding TextMessages}"
+                                    Header="Text Messages"
+                                    IsReadOnly="True">
+                    <DataGridTextColumn.ElementStyle>
+                        <Style TargetType="TextBlock">
+                            <Setter Property="VerticalAlignment" Value="Center" />
+                        </Style>
+                    </DataGridTextColumn.ElementStyle>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding VoiceCalls}"
+                                    Header="Voice Calls"
+                                    IsReadOnly="True">
+                    <DataGridTextColumn.ElementStyle>
+                        <Style TargetType="TextBlock">
+                            <Setter Property="VerticalAlignment" Value="Center" />
+                        </Style>
+                    </DataGridTextColumn.ElementStyle>
+                </DataGridTextColumn>
             </DataGrid.Columns>
         </DataGrid>
     </Grid>