Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion PhoneAssistant.Cli/EECommand/EE.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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++;
Expand Down
52 changes: 46 additions & 6 deletions PhoneAssistant.WPF/Features/BaseReport/BaseReportMainView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
Loading