1.84_0.19_1

* fix invalid cast from EDCommoditiesExt to int (thx to zericco) * test: changes to sorting of datevalues in Commanders Log
Duke-Jones · May 4, 2015 · a55075c · a55075c
1 parent c007fbe
commit a55075c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/RegulatedNoise/CommandersLog.cs b/RegulatedNoise/CommandersLog.cs
@@ -40,7 +40,7 @@ public string CreateEvent()
                 CargoAction =_callingForm.cbCargoModifier.Text,
                 CargoVolume =int.Parse(_callingForm.cbLogQuantity.Text),
                 Notes =_callingForm.tbLogNotes.Text,
-                EventDate =DateTime.Parse(_callingForm.dtpLogEventDate.Text),
+                EventDate =DateTime.Parse(_callingForm.dtpLogEventDate.Text, CultureInfo.CurrentUICulture , DateTimeStyles.None),
                 EventID = newEventID
             });
 

diff --git a/RegulatedNoise/Enums and Utility Classes/ListViewItemComparer.cs b/RegulatedNoise/Enums and Utility Classes/ListViewItemComparer.cs
@@ -1,7 +1,8 @@
 using System.Collections;
 using System.Windows.Forms;
 using System.Diagnostics;
-using System;
+using System;
+using System.Globalization;
 
 /// <summary>
 /// This class is an implementation of the 'IComparer' interface.
@@ -150,8 +151,8 @@ public int Compare(object x, object y)
             {
                 case 0:
                     DateTime  Date_a = DateTime.MinValue, Date_b = DateTime.MinValue;
-                    DateTime.TryParse(listviewX.SubItems[ColumnToSort].Text, out Date_a);
-                    DateTime.TryParse(listviewY.SubItems[ColumnToSort].Text, out Date_b);
+                    DateTime.TryParse(listviewX.SubItems[ColumnToSort].Text, CultureInfo.CurrentUICulture , DateTimeStyles.None, out Date_a);
+                    DateTime.TryParse(listviewY.SubItems[ColumnToSort].Text, CultureInfo.CurrentUICulture , DateTimeStyles.None, out Date_b);
                     compareResult = ObjectCompare.Compare(Date_a, Date_b);
                     break;
                 case 1:

diff --git a/RegulatedNoise/Form1.Designer.cs b/RegulatedNoise/Form1.Designer.cs