Skip to content

Commit

Permalink
Merge pull request #61 from carlst99/develop
Browse files Browse the repository at this point in the history
Release 1.0.0 fixes
  • Loading branch information
carlst99 committed Mar 19, 2020
2 parents 8b56a2e + aa50de0 commit 1f3f2a5
Show file tree
Hide file tree
Showing 23 changed files with 840 additions and 199 deletions.
12 changes: 6 additions & 6 deletions TrialManager.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29609.76
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrialManager", "TrialManager\TrialManager.csproj", "{FF449DB8-1163-49BC-BED8-BD63889CF28B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINZCsvConverter", "LINZCsvConverter\LINZCsvConverter.csproj", "{9964F80F-C192-4A10-84A4-8605B0FE62C1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrialManager", "TrialManager\TrialManager.csproj", "{59577F24-C282-45DC-9CC7-552FD0E4E061}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{FF449DB8-1163-49BC-BED8-BD63889CF28B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FF449DB8-1163-49BC-BED8-BD63889CF28B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FF449DB8-1163-49BC-BED8-BD63889CF28B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FF449DB8-1163-49BC-BED8-BD63889CF28B}.Release|Any CPU.Build.0 = Release|Any CPU
{9964F80F-C192-4A10-84A4-8605B0FE62C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9964F80F-C192-4A10-84A4-8605B0FE62C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9964F80F-C192-4A10-84A4-8605B0FE62C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9964F80F-C192-4A10-84A4-8605B0FE62C1}.Release|Any CPU.Build.0 = Release|Any CPU
{59577F24-C282-45DC-9CC7-552FD0E4E061}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{59577F24-C282-45DC-9CC7-552FD0E4E061}.Debug|Any CPU.Build.0 = Debug|Any CPU
{59577F24-C282-45DC-9CC7-552FD0E4E061}.Release|Any CPU.ActiveCfg = Release|Any CPU
{59577F24-C282-45DC-9CC7-552FD0E4E061}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
34 changes: 34 additions & 0 deletions TrialManager/App.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
10 changes: 0 additions & 10 deletions TrialManager/AssemblyInfo.cs

This file was deleted.

1 change: 1 addition & 0 deletions TrialManager/Bootstrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ protected override void OnStart()
if (_preferences.IsDiagnosticsEnabled)
AppCenter.Start("{Your App Secret}", typeof(Analytics), typeof(Crashes));
#endif

base.OnStart();
}

Expand Down
47 changes: 22 additions & 25 deletions TrialManager/Model/Csv/MappedTrialist.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,36 +47,33 @@ public MappedTrialist()
/// Converts this <see cref="MappedTrialist"/> to a <see cref="Trialist"/>. Does not fill <see cref="Trialist.TravellingPartner"/>
/// </summary>
/// <returns></returns>
public async Task<Trialist> ToTrialist(ILocationService locationService, IList<PreferredDayDateTimePair> preferredDayMappings)
public Trialist ToTrialist(ILocationService locationService, IList<PreferredDayDateTimePair> preferredDayMappings)
{
return await Task.Run(() =>
Trialist trialist = new Trialist
{
Trialist trialist = new Trialist
{
Name = FullName,
Status = Status,
Address = Address,
PreferredDay = preferredDayMappings.First(t => t.PreferredDay == PreferredDayString).Day
};
Name = FullName,
Status = Status,
Address = Address,
PreferredDay = preferredDayMappings.First(t => t.PreferredDay == PreferredDayString).Day
};

// Add dogs
if (!string.IsNullOrWhiteSpace(DogOneName))
trialist.Dogs.Add(new Dog(DogOneName, DogOneStatus));
if (!string.IsNullOrWhiteSpace(DogTwoName))
trialist.Dogs.Add(new Dog(DogTwoName, DogTwoStatus));
if (!string.IsNullOrWhiteSpace(DogThreeName))
trialist.Dogs.Add(new Dog(DogThreeName, DogThreeStatus));
if (!string.IsNullOrWhiteSpace(DogFourName))
trialist.Dogs.Add(new Dog(DogFourName, DogFourStatus));
if (!string.IsNullOrWhiteSpace(DogFiveName))
trialist.Dogs.Add(new Dog(DogFiveName, DogFiveStatus));
// Add dogs
if (!string.IsNullOrWhiteSpace(DogOneName))
trialist.Dogs.Add(new Dog(DogOneName, DogOneStatus));
if (!string.IsNullOrWhiteSpace(DogTwoName))
trialist.Dogs.Add(new Dog(DogTwoName, DogTwoStatus));
if (!string.IsNullOrWhiteSpace(DogThreeName))
trialist.Dogs.Add(new Dog(DogThreeName, DogThreeStatus));
if (!string.IsNullOrWhiteSpace(DogFourName))
trialist.Dogs.Add(new Dog(DogFourName, DogFourStatus));
if (!string.IsNullOrWhiteSpace(DogFiveName))
trialist.Dogs.Add(new Dog(DogFiveName, DogFiveStatus));

// Setup location
if (locationService.TryResolve(Address, out ILocation location))
trialist.CoordinatePoint = location.Location;
// Setup location
if (locationService.TryResolve(Address, out ILocation location))
trialist.CoordinatePoint = location.Location;

return trialist;
}).ConfigureAwait(false);
return trialist;
}

#region Object Overrides
Expand Down
4 changes: 2 additions & 2 deletions TrialManager/Model/DrawDisplayParams.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ namespace TrialManager.Model
{
public struct DrawDisplayParams
{
public IAsyncEnumerable<Trialist> Trialists { get; }
public List<Trialist> Trialists { get; }
public bool LocationSortingEnabled { get; }

public DrawDisplayParams(IAsyncEnumerable<Trialist> trialists, bool locationSortingEnabled)
public DrawDisplayParams(List<Trialist> trialists, bool locationSortingEnabled)
{
Trialists = trialists;
LocationSortingEnabled = locationSortingEnabled;
Expand Down
56 changes: 56 additions & 0 deletions TrialManager/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Windows;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("TrialManager")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("TrialManager")]
[assembly: AssemblyCopyright("Copyright © Carl Stephens 2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

//In order to begin building localizable applications, set
//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
//inside a <PropertyGroup>. For example, if you are using US english
//in your source files, set the <UICulture> to en-US. Then uncomment
//the NeutralResourceLanguage attribute below. Update the "en-US" in
//the line below to match the UICulture setting in the project file.

//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]


[assembly: ThemeInfo(
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
//(used if a resource is not found in the page,
// or application resource dictionaries)
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
//(used if a resource is not found in the page,
// app, or any theme specific resource dictionaries)
)]


// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// 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")]
[assembly: AssemblyFileVersion("1.0.0")]
[assembly: NeutralResourcesLanguage("en-NZ")]
71 changes: 71 additions & 0 deletions TrialManager/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 1f3f2a5

Please sign in to comment.