Merge branch 'dev'

Triky313 · Jul 26, 2024 · 641da4b · 641da4b
2 parents 6bf3c33 + 42f4168
commit 641da4b
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 16 deletions.
diff --git a/src/StatisticsAnalysisTool/EstimatedMarketValue/EstimatedMarketValueController.cs b/src/StatisticsAnalysisTool/EstimatedMarketValue/EstimatedMarketValueController.cs
@@ -13,7 +13,7 @@ namespace StatisticsAnalysisTool.EstimatedMarketValue;
 public static class EstimatedMarketValueController
 {
     private static ObservableCollection<EstimatedMarketValueObject> _estimatedMarketValueObjects = new();
-
+    
     public static void Add(int itemId, long estimatedMarketValueInternal, ItemQuality quality = ItemQuality.Unknown)
     {
         if (itemId <= 0 || estimatedMarketValueInternal <= 0)

diff --git a/src/StatisticsAnalysisTool/EventLogging/Notification/OtherGrabbedLootNotificationFragment.cs b/src/StatisticsAnalysisTool/EventLogging/Notification/OtherGrabbedLootNotificationFragment.cs
@@ -1,6 +1,7 @@
 using StatisticsAnalysisTool.Localization;
 using StatisticsAnalysisTool.Models;
 using System.Windows.Media.Imaging;
+using StatisticsAnalysisTool.Common;
 
 namespace StatisticsAnalysisTool.EventLogging.Notification;
 
@@ -15,6 +16,7 @@ public OtherGrabbedLootNotificationFragment(string lootedByName, string lootedFr
         LocalizedName = item.LocalizedName;
         Icon = item.Icon;
         Quantity = quantity;
+        AverageEstMarketValue = item.AverageEstMarketValue;
     }
 
     public string LootedByName { get; }
@@ -23,6 +25,8 @@ public OtherGrabbedLootNotificationFragment(string lootedByName, string lootedFr
     public string LocalizedName { get; }
     public BitmapImage Icon { get; }
     public int Quantity { get; }
+    public long AverageEstMarketValue { get; set; }
+    public string AverageEstMarketValueShortString => AverageEstMarketValue.ToShortNumberString();
     public string LootedFromName { get; }
     public string LootedFromGuild { get; }
     public bool IsLootedFromGuildEmpty => string.IsNullOrEmpty(LootedFromGuild);
@@ -31,4 +35,5 @@ public OtherGrabbedLootNotificationFragment(string lootedByName, string lootedFr
     public static string FromTranslation => LocalizationController.Translation("FROM");
     public static string LootedTranslation => LocalizationController.Translation("LOOTED");
     public static string TranslationGuild => LocalizationController.Translation("GUILD_CAP");
+    public static string TranslationAverageEstMarketValue => LocalizationController.Translation("AVERAGE_EST_MARKET_VALUE");
 }
diff --git a/src/StatisticsAnalysisTool/Localization/localization.json b/src/StatisticsAnalysisTool/Localization/localization.json
@@ -37261,6 +37261,19 @@
           "seg": "Damage suffered"
         }
       ]
+    },
+    {
+      "tuid": "AVERAGE_EST_MARKET_VALUE",
+      "tuv": [
+        {
+          "lang": "de-DE",
+          "seg": "Geschätzte durchschnittlicher Markltwert"
+        },
+        {
+          "lang": "en-US",
+          "seg": "Average est. Market value"
+        }
+      ]
     }
   ]
 }
diff --git a/src/StatisticsAnalysisTool/Models/Item.cs b/src/StatisticsAnalysisTool/Models/Item.cs
@@ -53,7 +53,7 @@ public string TierLevelString
     public List<EstQualityValue> EstimatedMarketValues { get; set; }
 
     [JsonIgnore]
-    public long AverageEstQualityValue => EstimatedMarketValueController.CalculateNearestToAverage(EstimatedMarketValues).MarketValue.IntegerValue;
+    public long AverageEstMarketValue => EstimatedMarketValueController.CalculateNearestToAverage(EstimatedMarketValues).MarketValue.IntegerValue;
     [JsonIgnore]
     public string LastEstimatedUpdateTimeString =>
         $"{LocalizationController.Translation("LAST_ESTIMATED_VALUE_UPDATE")}: {EstimatedMarketValueController.CalculateNearestToAverage(EstimatedMarketValues).Timestamp.DateTimeToLastUpdateTime()}";

diff --git a/src/StatisticsAnalysisTool/Models/LootLoggerObject.cs b/src/StatisticsAnalysisTool/Models/LootLoggerObject.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Globalization;
 using StatisticsAnalysisTool.Common;
+using StatisticsAnalysisTool.EstimatedMarketValue;
 
 namespace StatisticsAnalysisTool.Models;
 
@@ -21,6 +22,7 @@ public LootLoggerObject()
     public string LootedByName { get; set; }
     public string LootedByGuild { get; set; }
     public string LootedByAlliance { get; set; }
+    public long AverageEstMarketValue { get; set; }
 
     public string CsvOutput => GetCsvOutputStringWithRealItemName();
 

diff --git a/src/StatisticsAnalysisTool/Network/Manager/LootController.cs b/src/StatisticsAnalysisTool/Network/Manager/LootController.cs
@@ -93,6 +93,7 @@ public async Task AddLootAsync(Loot loot)
             Quantity = loot.Quantity,
             ItemId = item.Index,
             UniqueItemName = item.UniqueName,
+            AverageEstMarketValue = item.AverageEstMarketValue,
         });
 
         OnAddLoot?.Invoke(loot.LootedByName, loot.Quantity);
@@ -243,7 +244,7 @@ await AddLootAsync(new Loot()
             ItemIndex = lootedItem.ItemIndex,
             LootedByName = _trackingController?.EntityController?.LocalUserData?.Username,
             LootedFromName = MobController.IsMob(identifiedBody.Name) ? LocalizationController.Translation("MOB") : identifiedBody.Name,
-            Quantity = lootedItem.Quantity
+            Quantity = lootedItem.Quantity,
         });
     }
 

diff --git a/src/StatisticsAnalysisTool/Properties/AssemblyInfo.cs b/src/StatisticsAnalysisTool/Properties/AssemblyInfo.cs
@@ -53,5 +53,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("7.7.0.*")]
-[assembly: AssemblyFileVersion("7.7.0.0")]
+[assembly: AssemblyVersion("7.7.1.*")]
+[assembly: AssemblyFileVersion("7.7.1.0")]
diff --git a/src/StatisticsAnalysisTool/Styles/GuildStyles.xaml b/src/StatisticsAnalysisTool/Styles/GuildStyles.xaml
@@ -28,9 +28,9 @@
 
     <DataTemplate x:Key="ManuallySiphonedEnergy.Template" DataType="{x:Type guild:ManuallySiphonedEnergy}">
         <Grid>
-            <StackPanel Orientation="Vertical" Margin="10,0,0,0">
+            <StackPanel Orientation="Vertical" Margin="0">
                 <Separator Background="{StaticResource SolidColorBrush.Background.2}" Height="4" Margin="0,0,0,0" VerticalAlignment="Top"/>
-                <StackPanel>
+                <StackPanel Margin="10,0,0,0">
                     <Label Content="{Binding TranslationAddOrRemoveManually, FallbackValue=ADD_OR_REMOVE_MANUALLY}" Style="{StaticResource HeaderStyle.Tracking.Title}" 
                            Margin="2,5,0,0" Foreground="{StaticResource SolidColorBrush.Accent.Blue.2}" />
 
@@ -52,7 +52,6 @@
                             <MouseBinding MouseAction="LeftClick" Command="{Binding AddManualEntryCommand}" />
                         </Button.InputBindings>
                     </Button>
-                    <Separator Background="{StaticResource SolidColorBrush.Background.2}" Height="4" VerticalAlignment="Top"/>
                 </StackPanel>
             </StackPanel>
         </Grid>

diff --git a/src/StatisticsAnalysisTool/Styles/ItemSearchStyles.xaml b/src/StatisticsAnalysisTool/Styles/ItemSearchStyles.xaml
@@ -26,7 +26,7 @@
                 <TextBlock TextWrapping="Wrap" Text="{Binding LocalizedNameAndEnglish}" />
                 <StackPanel Orientation="Horizontal">
                     <Image Source="../Resources/silver.png" Width="12" Height="12" ToolTip="{Binding TranslationEstMarketValue, IsAsync=True, Mode=OneWay}" />
-                    <Label Content="{Binding AverageEstQualityValue, IsAsync=True, Mode=OneWay, StringFormat=N0, ConverterCulture={x:Static glob:CultureInfo.CurrentCulture}}" 
+                    <Label Content="{Binding AverageEstMarketValue, IsAsync=True, Mode=OneWay, StringFormat=N0, ConverterCulture={x:Static glob:CultureInfo.CurrentCulture}}" 
                            ToolTip="{Binding LastEstimatedUpdateTimeString, IsAsync=True, Mode=OneWay}">
                         <Label.Style>
                             <Style TargetType="{x:Type Label}">

diff --git a/src/StatisticsAnalysisTool/Styles/TrackingStyles.xaml b/src/StatisticsAnalysisTool/Styles/TrackingStyles.xaml
@@ -378,6 +378,10 @@
 
             <TextBlock Text="{Binding FromTranslation, IsAsync=True, StringFormat='{}{0} '}" Foreground="{StaticResource SolidColorBrush.Text.1}"/>
             <TextBlock Text="{Binding LootedFromName, IsAsync=True, StringFormat='{}{0} '}" Foreground="{StaticResource SolidColorBrush.Accent.Red.3}"/>
+            <StackPanel Orientation="Horizontal">
+                <Image Source="../Resources/silver.png" Height="14" Width="14" Margin="10,-10,5,0" ToolTip="{Binding TranslationAverageEstMarketValue}" />
+                <TextBlock Text="{Binding AverageEstMarketValueShortString, IsAsync=True, StringFormat='{}{0}'}" Foreground="{StaticResource SolidColorBrush.Text.1}"/>
+            </StackPanel>
             <TextBlock Text="{Binding LootedFromGuild, IsAsync=True, StringFormat='{}({0}) '}" Foreground="{StaticResource SolidColorBrush.Accent.Red.3}"
                        ToolTip="{Binding TranslationGuild}">
                 <TextBlock.Style>

diff --git a/src/StatisticsAnalysisTool/UserControls/GuildControl.xaml b/src/StatisticsAnalysisTool/UserControls/GuildControl.xaml
@@ -68,24 +68,31 @@
                         </Grid>
 
                         <Separator Background="{StaticResource SolidColorBrush.Background.2}" Height="4" Margin="0,66,0,0" VerticalAlignment="Top"/>
-                        <StackPanel Orientation="Vertical" Margin="0,68,0,0">
-                            <vwp:VirtualizingItemsControl ItemsSource="{Binding GuildBindings.SiphonedEnergyOverviewList, IsAsync=True, Mode=OneWay}" Height="240"
-                                                          ItemTemplate="{StaticResource SiphonedEnergyOverviewItemTemplate}" Background="{StaticResource SolidColorBrush.Accent.Blue.Transparent.5}"
+                        <Grid Margin="0,68,0,153" VerticalAlignment="Stretch">
+                            <vwp:VirtualizingItemsControl ItemsSource="{Binding GuildBindings.SiphonedEnergyOverviewList, IsAsync=True, Mode=OneWay}" 
+                                                          MinHeight="240" 
+                                                          Height="auto"
+                                                          VerticalContentAlignment="Stretch"
+                                                          VerticalAlignment="Stretch"
+                                                          ItemTemplate="{StaticResource SiphonedEnergyOverviewItemTemplate}" 
+                                                          Background="{StaticResource SolidColorBrush.Accent.Blue.Transparent.5}"
                                                           VirtualizingPanel.CacheLengthUnit="Item"
                                                           VirtualizingPanel.CacheLength="10,10"
                                                           VirtualizingPanel.ScrollUnit="Pixel"
                                                           VirtualizingPanel.VirtualizationMode="Recycling"
                                                           ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                                           ScrollViewer.VerticalScrollBarVisibility="Visible" />
+                        </Grid>
 
-                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Top" Height="24" Margin="20,0">
+                        <StackPanel Orientation="Vertical" VerticalAlignment="Bottom">
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Height="28" Margin="0,0,20,0">
                                 <TextBlock Text="{Binding GuildBindings.TranslationTotal, StringFormat='{}{0:N0}: ', FallbackValue='TOTAL: '}" FontSize="12" 
                                            Foreground="{StaticResource SolidColorBrush.Text.4}" VerticalAlignment="Center" />
                                 <TextBlock Text="{Binding GuildBindings.TotalSiphonedEnergyQuantity, StringFormat='{}{0} ', FallbackValue=0}" FontSize="12" 
                                            Foreground="{StaticResource SolidColorBrush.Text.4}" VerticalAlignment="Center" />
                             </StackPanel>
-
-                            <ContentControl ContentTemplate="{StaticResource ManuallySiphonedEnergy.Template}" Content="{Binding GuildBindings.ManuallySiphonedEnergy}" />
+                            <ContentControl ContentTemplate="{StaticResource ManuallySiphonedEnergy.Template}" 
+                                            Content="{Binding GuildBindings.ManuallySiphonedEnergy}" VerticalAlignment="Bottom" />
                         </StackPanel>
                     </Grid>
                     <Grid Row="2">

diff --git a/src/StatisticsAnalysisTool/UserControls/LoggingControl.xaml b/src/StatisticsAnalysisTool/UserControls/LoggingControl.xaml
@@ -62,7 +62,8 @@
             </StackPanel>
         </Grid>
         <Separator Background="{StaticResource SolidColorBrush.Background.3}" Height="4" Margin="0,100,0,0" VerticalAlignment="Top"/>
-        <vwp:VirtualizingItemsControl Margin="0,104,0,40" ItemsSource="{Binding LoggingBindings.GameLoggingCollectionView, IsAsync=True, Mode=OneWay}" ItemTemplate="{StaticResource NotificationTemplate}"              
+        <vwp:VirtualizingItemsControl Margin="0,104,0,40" ItemsSource="{Binding LoggingBindings.GameLoggingCollectionView, IsAsync=True, Mode=OneWay}" 
+                                      ItemTemplate="{StaticResource NotificationTemplate}"              
                                       VirtualizingPanel.CacheLengthUnit="Item"
                                       VirtualizingPanel.CacheLength="10,10"
                                       VirtualizingPanel.ScrollUnit="Pixel"