From bbe1308c38339a5012737c3af9677f287708595f Mon Sep 17 00:00:00 2001 From: JLdgu Date: Wed, 24 Jun 2026 13:30:33 +0100 Subject: [PATCH 1/2] Add eSIM to Sim and Base Report --- DbUtil/SqlScripts.cs | 1 + PhoneAssistant.Model/Entities/Sim.cs | 1 + PhoneAssistant.Model/PhoneAssistantDbContext.cs | 8 ++++++-- .../Features/BaseReport/BaseReportMainView.xaml | 3 +++ .../Features/BaseReport/BaseReportMainViewModel.cs | 4 ++++ 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/DbUtil/SqlScripts.cs b/DbUtil/SqlScripts.cs index 9e30878e..79ae174c 100644 --- a/DbUtil/SqlScripts.cs +++ b/DbUtil/SqlScripts.cs @@ -14,6 +14,7 @@ public SqlScripts() new Script("Restructure Locations",RestructureLocations), new Script("Add 3 columns to Phones", Add3ColumnsToPhones), new Script("Create SIMs Table", CreateSIMsTable), + new Script("Add eSIM to SIMs Table", "ALTER TABLE Sims ADD COLUMN eSIM INTEGER;") ]; } diff --git a/PhoneAssistant.Model/Entities/Sim.cs b/PhoneAssistant.Model/Entities/Sim.cs index 32cb6756..333beaa1 100644 --- a/PhoneAssistant.Model/Entities/Sim.cs +++ b/PhoneAssistant.Model/Entities/Sim.cs @@ -9,4 +9,5 @@ public class Sim public required ulong BroadbandData { get; set; } public required uint TextMessages { get; set; } public required uint VoiceCalls { get; set; } + public bool? Esim { get; set; } } diff --git a/PhoneAssistant.Model/PhoneAssistantDbContext.cs b/PhoneAssistant.Model/PhoneAssistantDbContext.cs index 77ca27d5..9d99f32e 100644 --- a/PhoneAssistant.Model/PhoneAssistantDbContext.cs +++ b/PhoneAssistant.Model/PhoneAssistantDbContext.cs @@ -72,8 +72,12 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) entity.HasIndex(e => e.ScriptName, "IX_SchemaVersion_ScriptName").IsUnique(); }); - modelBuilder.Entity() - .HasKey(s => new { s.PhoneNumber, s.BillingPeriod}); + modelBuilder.Entity( s => + { + s.HasKey(s => new { s.PhoneNumber, s.BillingPeriod}); + + s.Property(s => s.Esim).HasColumnName("eSIM"); + }); OnModelCreatingPartial(modelBuilder); } diff --git a/PhoneAssistant.WPF/Features/BaseReport/BaseReportMainView.xaml b/PhoneAssistant.WPF/Features/BaseReport/BaseReportMainView.xaml index 554209ab..656afeba 100644 --- a/PhoneAssistant.WPF/Features/BaseReport/BaseReportMainView.xaml +++ b/PhoneAssistant.WPF/Features/BaseReport/BaseReportMainView.xaml @@ -70,6 +70,9 @@ Header="Phone Number" /> + diff --git a/PhoneAssistant.WPF/Features/BaseReport/BaseReportMainViewModel.cs b/PhoneAssistant.WPF/Features/BaseReport/BaseReportMainViewModel.cs index 211eee32..7f634c73 100644 --- a/PhoneAssistant.WPF/Features/BaseReport/BaseReportMainViewModel.cs +++ b/PhoneAssistant.WPF/Features/BaseReport/BaseReportMainViewModel.cs @@ -16,6 +16,9 @@ public partial class BaseReportMainViewModel(ISimRepository repository) : ViewMo public ObservableCollection BaseReportSims { get; } = []; + [ObservableProperty] + public partial bool? Esim { get; set; } + [ObservableProperty] public partial string LatestImport { get; set; } = string.Empty; @@ -65,6 +68,7 @@ public BaseReportSim(Sim sim, ulong maxBroadbandData) BroadbandData = sim.BroadbandData; TextMessages = sim.TextMessages; VoiceCalls = sim.VoiceCalls; + Esim = sim.Esim; BroadbandDataText = FormatBytes(sim.BroadbandData); if (BroadbandData == 0) From 050fb26b69915927ccf642520c83873d19efb982 Mon Sep 17 00:00:00 2001 From: JLdgu Date: Thu, 25 Jun 2026 08:28:35 +0100 Subject: [PATCH 2/2] Add AuthenticationType to DirectoryEntry Stop COM exception on some devices --- .../Features/Users/UsersMainViewModel.cs | 19 +++++++++++-------- PhoneAssistant.WPF/PhoneAssistant.WPF.csproj | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/PhoneAssistant.WPF/Features/Users/UsersMainViewModel.cs b/PhoneAssistant.WPF/Features/Users/UsersMainViewModel.cs index 82dec568..6a0aec74 100644 --- a/PhoneAssistant.WPF/Features/Users/UsersMainViewModel.cs +++ b/PhoneAssistant.WPF/Features/Users/UsersMainViewModel.cs @@ -71,11 +71,14 @@ await Task.Run(() => ProgressVisibility = Visibility.Collapsed; } - private SearchResultCollection PersonSearch(string name) + private static SearchResultCollection PersonSearch(string name) { - using DirectoryEntry entry = new DirectoryEntry("LDAP://DC=ds2,DC=devon,DC=gov,DC=uk"); - DirectorySearcher searcher = new DirectorySearcher(entry); - searcher.Filter = $"(&(objectClass=user)(objectCategory=person)(CN=*{name}*))"; + using DirectoryEntry entry = new("LDAP://ds2.devon.gov.uk"); + entry.AuthenticationType = AuthenticationTypes.Secure; + DirectorySearcher searcher = new(entry) + { + Filter = $"(&(objectClass=user)(objectCategory=person)(CN=*{name}*))" + }; searcher.PropertiesToLoad.Add("displayName"); searcher.PropertiesToLoad.Add("description"); searcher.PropertiesToLoad.Add("lastLogon"); @@ -90,19 +93,19 @@ private SearchResultCollection PersonSearch(string name) } [ObservableProperty] - private Visibility _progressVisibility = Visibility.Collapsed; + public partial Visibility ProgressVisibility { get; set; } = Visibility.Collapsed; [ObservableProperty] - private bool _noResultsFound; + public partial bool NoResultsFound { get; set; } - private string ParsePropertyString(ResultPropertyValueCollection resultPropertyValueCollection) + private static string ParsePropertyString(ResultPropertyValueCollection resultPropertyValueCollection) { if (resultPropertyValueCollection is null) return string.Empty; if (resultPropertyValueCollection.Count == 0) return string.Empty; return resultPropertyValueCollection[0].ToString() ?? string.Empty; } - private string ParsePropertyDateTime(ResultPropertyValueCollection resultPropertyValueCollection) + private static string ParsePropertyDateTime(ResultPropertyValueCollection resultPropertyValueCollection) { if (resultPropertyValueCollection is null) return string.Empty; if (resultPropertyValueCollection.Count == 0) return string.Empty; diff --git a/PhoneAssistant.WPF/PhoneAssistant.WPF.csproj b/PhoneAssistant.WPF/PhoneAssistant.WPF.csproj index d338f26e..294dae9a 100644 --- a/PhoneAssistant.WPF/PhoneAssistant.WPF.csproj +++ b/PhoneAssistant.WPF/PhoneAssistant.WPF.csproj @@ -13,7 +13,7 @@ PhoneAssistant.WPF.App net10.0-windows true - 1.606.23 + 1.606.24 false