From 35ad407b296508bd60eebd34e52e5e1d2ebfbcfb Mon Sep 17 00:00:00 2001 From: Roberto Francesconi Date: Thu, 31 Aug 2023 12:58:39 +1000 Subject: [PATCH 1/2] PF-1525 GWM - Planned Specimens Instantiator fails with Object not set to an instance of an object --- .../DotNetSdk/SamplesPlannedSpecimenInstantiator/MainForm.cs | 2 +- .../Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Samples/DotNetSdk/SamplesPlannedSpecimenInstantiator/MainForm.cs b/Samples/DotNetSdk/SamplesPlannedSpecimenInstantiator/MainForm.cs index 620dbce7..6e5e76e6 100644 --- a/Samples/DotNetSdk/SamplesPlannedSpecimenInstantiator/MainForm.cs +++ b/Samples/DotNetSdk/SamplesPlannedSpecimenInstantiator/MainForm.cs @@ -252,7 +252,7 @@ private void LoadTripsWithPlannedVisits() .ToDictionary( tripId => tripId, tripId => plannedVisitsWithStartTimes - .Where(v => tripId == v.FieldTrip.Id && IsCandidateVisit(v)) + .Where(v => IsCandidateVisit(v) && tripId == v.FieldTrip.Id) .ToList()); var items = tripsWithPlannedVisits diff --git a/Samples/DotNetSdk/SamplesPlannedSpecimenInstantiator/Properties/AssemblyInfo.cs b/Samples/DotNetSdk/SamplesPlannedSpecimenInstantiator/Properties/AssemblyInfo.cs index dc4a6995..839fae85 100644 --- a/Samples/DotNetSdk/SamplesPlannedSpecimenInstantiator/Properties/AssemblyInfo.cs +++ b/Samples/DotNetSdk/SamplesPlannedSpecimenInstantiator/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.0.1.0")] +[assembly: AssemblyFileVersion("1.0.1.0")] From b3561cbd7a7a61220e77ef2dbd8607ad7054d459 Mon Sep 17 00:00:00 2001 From: Roberto Francesconi Date: Thu, 31 Aug 2023 13:06:20 +1000 Subject: [PATCH 2/2] No need for version number change --- .../Properties/AssemblyInfo.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Samples/DotNetSdk/SamplesPlannedSpecimenInstantiator/Properties/AssemblyInfo.cs b/Samples/DotNetSdk/SamplesPlannedSpecimenInstantiator/Properties/AssemblyInfo.cs index 839fae85..dc4a6995 100644 --- a/Samples/DotNetSdk/SamplesPlannedSpecimenInstantiator/Properties/AssemblyInfo.cs +++ b/Samples/DotNetSdk/SamplesPlannedSpecimenInstantiator/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.1.0")] -[assembly: AssemblyFileVersion("1.0.1.0")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")]