Number formatting, DateTime fix, new version number

Triky313 · Aug 9, 2019 · a1cc6c5 · a1cc6c5
1 parent 1ea2680
commit a1cc6c5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml b/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml
@@ -39,7 +39,7 @@
                             <DataTemplate>
                                 <Grid Style="{StaticResource ListView.Grid.Item.Price}">
                                     <StackPanel Style="{StaticResource ListView.Grid.StackPanel.Item.Price}">
-                                        <Label Style="{Binding SellPriceMinStyle}" Content="{Binding SellPriceMin}"/>
+                                        <Label Style="{Binding SellPriceMinStyle}" Content="{Binding SellPriceMinString}"/>
                                     </StackPanel>
                                     <StackPanel Style="{StaticResource ListView.Grid.StackPanel.Item.Icon}">
                                         <Image Style="{StaticResource ListView.Grid.StackPanel.Image.Price.Silver}"/>
@@ -62,7 +62,7 @@
                             <DataTemplate>
                                 <Grid Style="{StaticResource ListView.Grid.Item.Price}">
                                     <StackPanel Style="{StaticResource ListView.Grid.StackPanel.Item.Price}">
-                                        <Label Style="{StaticResource ListView.Grid.StackPanel.Label.Price}" Content="{Binding SellPriceMax}"/>
+                                        <Label Style="{StaticResource ListView.Grid.StackPanel.Label.Price}" Content="{Binding SellPriceMaxString}"/>
                                     </StackPanel>
                                     <StackPanel Style="{StaticResource ListView.Grid.StackPanel.Item.Icon}">
                                         <Image Style="{StaticResource ListView.Grid.StackPanel.Image.Price.Silver}"/>
@@ -85,7 +85,7 @@
                             <DataTemplate>
                                 <Grid Style="{StaticResource ListView.Grid.Item.Price}">
                                     <StackPanel Style="{StaticResource ListView.Grid.StackPanel.Item.Price}">
-                                        <Label Style="{StaticResource ListView.Grid.StackPanel.Label.Price}" Content="{Binding BuyPriceMin}"/>
+                                        <Label Style="{StaticResource ListView.Grid.StackPanel.Label.Price}" Content="{Binding BuyPriceMinString}"/>
                                     </StackPanel>
                                     <StackPanel Style="{StaticResource ListView.Grid.StackPanel.Item.Icon}">
                                         <Image Style="{StaticResource ListView.Grid.StackPanel.Image.Price.Silver}"/>
@@ -108,7 +108,7 @@
                             <DataTemplate>
                                 <Grid Style="{StaticResource ListView.Grid.Item.Price}">
                                     <StackPanel Style="{StaticResource ListView.Grid.StackPanel.Item.Price}">
-                                        <Label Style="{Binding BuyPriceMaxStyle}" Content="{Binding BuyPriceMax}"/>
+                                        <Label Style="{Binding BuyPriceMaxStyle}" Content="{Binding BuyPriceMaxString}"/>
                                     </StackPanel>
                                     <StackPanel Style="{StaticResource ListView.Grid.StackPanel.Item.Icon}">
                                         <Image Style="{StaticResource ListView.Grid.StackPanel.Image.Price.Silver}"/>

diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/Models/MarketOrder.cs b/StatisticsAnalysisTool/StatisticsAnalysisTool/Models/MarketOrder.cs
@@ -130,17 +130,21 @@ public MarketCurrentPricesItem(MarketResponseTotal marketResponseTotal)
         public Location City { get; set; }
         public byte QualityLevel { get; set; }
         public ulong SellPriceMin { get; set; }
+        public string SellPriceMinString => SellPriceMin.ToString("N0", new CultureInfo(LanguageController.CurrentLanguage));
         public DateTime SellPriceMinDate { get; set; }
         public string SellPriceMinDateString => SellPriceMinDate.ToString("G", new CultureInfo(LanguageController.CurrentLanguage));
         public ulong SellPriceMax { get; set; }
+        public string SellPriceMaxString => SellPriceMax.ToString("N0", new CultureInfo(LanguageController.CurrentLanguage));
         public DateTime SellPriceMaxDate { get; set; }
-        public string SellPriceMaxDateString => SellPriceMinDate.ToString("G", new CultureInfo(LanguageController.CurrentLanguage));
+        public string SellPriceMaxDateString => SellPriceMaxDate.ToString("G", new CultureInfo(LanguageController.CurrentLanguage));
         public ulong BuyPriceMin { get; set; }
+        public string BuyPriceMinString => BuyPriceMin.ToString("N0", new CultureInfo(LanguageController.CurrentLanguage));
         public DateTime BuyPriceMinDate { get; set; }
-        public string BuyPriceMinDateString => SellPriceMinDate.ToString("G", new CultureInfo(LanguageController.CurrentLanguage));
+        public string BuyPriceMinDateString => BuyPriceMinDate.ToString("G", new CultureInfo(LanguageController.CurrentLanguage));
         public ulong BuyPriceMax { get; set; }
+        public string BuyPriceMaxString => BuyPriceMax.ToString("N0", new CultureInfo(LanguageController.CurrentLanguage));
         public DateTime BuyPriceMaxDate { get; set; }
-        public string BuyPriceMaxDateString => SellPriceMinDate.ToString("G", new CultureInfo(LanguageController.CurrentLanguage));
+        public string BuyPriceMaxDateString => BuyPriceMaxDate.ToString("G", new CultureInfo(LanguageController.CurrentLanguage));
         public bool BestSellMinPrice { get; set; }
         public bool BestSellMaxPrice { get; set; }
         public bool BestBuyMinPrice { get; set; }

diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/Properties/AssemblyInfo.cs b/StatisticsAnalysisTool/StatisticsAnalysisTool/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.3.*")]
-[assembly: AssemblyFileVersion("1.1.3.0")]
+[assembly: AssemblyVersion("1.1.4.*")]
+[assembly: AssemblyFileVersion("1.1.4.0")]