Minor changes

Stats now disable when there is nothing to select instead of disappearing. Currency changed to standard from legacy league.
DanielWieder · Aug 4, 2017 · 5b74e45 · 5b74e45
1 parent 7ae43b0
commit 5b74e45
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 22 deletions.
diff --git a/PoeCrafting/PoeCrafting.Domain/CurrencyFactory.cs b/PoeCrafting/PoeCrafting.Domain/CurrencyFactory.cs
@@ -48,7 +48,7 @@ public class CurrencyFactory
                 vaal
             };
 
-            currencyValueFetch.League = "Legacy";
+            currencyValueFetch.League = "Standard";
             var data = currencyValueFetch.Execute();
             foreach (var currency in Currency)
             {

diff --git a/PoeCrafting/PoeCrafting.Test/App.config b/PoeCrafting/PoeCrafting.Test/App.config
@@ -4,6 +4,6 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
   </startup>
   <connectionStrings>
-    <add name="PoeSimCraft" connectionString="Server=localhost;Database=PoeSimCraft;Trusted_Connection=Yes;" providerName="SqlServerDatabaseProvider"/>
+    <add name="PoeSimCraft" connectionString="Persist Security Info=False;User ID=PoeSimCraftUser;Password=poepassword;Initial Catalog=PoeSimCraft;Server=poesimcraftitem.czqfmqxgizhc.us-west-2.rds.amazonaws.com,1433"/>
   </connectionStrings>
 </configuration>
diff --git a/PoeCrafting/PoeCrafting/Controls/Subcontrols/SubconditionAffixControl.xaml b/PoeCrafting/PoeCrafting/Controls/Subcontrols/SubconditionAffixControl.xaml
@@ -18,11 +18,11 @@
             <ColumnDefinition Width="50" />
         </Grid.ColumnDefinitions>
         <ComboBox Grid.Row="0" Grid.Column="0" SelectedValue="{Binding AffixName}" ItemsSource="{Binding ValidAffixes}"/>
-        <TextBox Grid.Row="0" Grid.Column="2" Text="{Binding FirstStatMin}" Visibility="{Binding FirstStatSelectionVisibility}"/>
-        <TextBox Grid.Row="0" Grid.Column="4" Text="{Binding FirstStatMax}" Visibility="{Binding FirstStatSelectionVisibility}"/>
+        <TextBox Grid.Row="0" Grid.Column="2" Text="{Binding FirstStatMin}" Visibility="{Binding FirstStatSelectionVisibility}" IsEnabled="{Binding IsFirstStatEnabled}"/>
+        <TextBox Grid.Row="0" Grid.Column="4" Text="{Binding FirstStatMax}" Visibility="{Binding FirstStatSelectionVisibility}" IsEnabled="{Binding IsFirstStatEnabled}"/>
 
-        <TextBox Grid.Row="0" Grid.Column="2" Text="{Binding SecondStatMin}" Visibility="{Binding SecondStatSelectionVisibility}"/>
-        <TextBox Grid.Row="0" Grid.Column="4" Text="{Binding SecondStatMax}" Visibility="{Binding SecondStatSelectionVisibility}"/>
+        <TextBox Grid.Row="0" Grid.Column="2" Text="{Binding SecondStatMin}" Visibility="{Binding SecondStatSelectionVisibility}" IsEnabled="{Binding IsSecondStatEnabled}"/>
+        <TextBox Grid.Row="0" Grid.Column="4" Text="{Binding SecondStatMax}" Visibility="{Binding SecondStatSelectionVisibility}" IsEnabled="{Binding IsSecondStatEnabled}"/>
 
         <Grid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="5" Visibility="{Binding DoubleStatSelectionVisibility}">
             <Grid.RowDefinitions>
@@ -37,12 +37,12 @@
                 <ColumnDefinition Width="50" />
             </Grid.ColumnDefinitions>
             <Label Grid.Row="0" Grid.Column="0" Content="{Binding FirstStatName}"/>
-            <TextBox Grid.Row="0" Grid.Column="2" Text="{Binding FirstStatMin}"/>
-            <TextBox Grid.Row="0" Grid.Column="4" Text="{Binding FirstStatMax}"/>
+            <TextBox Grid.Row="0" Grid.Column="2" Text="{Binding FirstStatMin}" IsEnabled="{Binding IsFirstStatEnabled}"/>
+            <TextBox Grid.Row="0" Grid.Column="4" Text="{Binding FirstStatMax}" IsEnabled="{Binding IsFirstStatEnabled}"/>
 
             <Label Grid.Row="1" Grid.Column="0" Content="{Binding SecondStatName}"/>
-            <TextBox Grid.Row="1" Grid.Column="2" Text="{Binding SecondStatMin}"/>
-            <TextBox Grid.Row="1" Grid.Column="4" Text="{Binding SecondStatMax}"/>
+            <TextBox Grid.Row="1" Grid.Column="2" Text="{Binding SecondStatMin}" IsEnabled="{Binding IsSecondStatEnabled}"/>
+            <TextBox Grid.Row="1" Grid.Column="4" Text="{Binding SecondStatMax}" IsEnabled="{Binding IsSecondStatEnabled}"/>
         </Grid>
     </Grid>
 </UserControl>
diff --git a/PoeCrafting/PoeCrafting/Controls/Subcontrols/SubconditionAffixControl.xaml.cs b/PoeCrafting/PoeCrafting/Controls/Subcontrols/SubconditionAffixControl.xaml.cs
@@ -1,21 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using PoeCrafting.Domain.Condition;
 using PoeCrafting.Entities;
 using PoeCrafting.UI.Annotations;
@@ -55,8 +45,8 @@ public partial class SubconditionAffixControl : UserControl, INotifyPropertyChan
 
         // There are no relevant third stats. All of them have their min/max values as equal
 
-        public bool HasFirstStat => !string.IsNullOrEmpty(AffixName) && !string.IsNullOrEmpty(FirstStatName) && _statOneMin != _statOneMax;
-        public bool HasSecondStat => !string.IsNullOrEmpty(AffixName) && !IsTier && !string.IsNullOrEmpty(SecondStatName) && _statTwoMin != _statTwoMax;
+        public bool HasFirstStat => !string.IsNullOrEmpty(AffixName) && !string.IsNullOrEmpty(FirstStatName) && !(_statOneMin == _statOneMax && _statOneMin == 0);
+        public bool HasSecondStat => !string.IsNullOrEmpty(AffixName) && !IsTier && !string.IsNullOrEmpty(SecondStatName) && !(_statTwoMin == _statTwoMax && _statTwoMin == 0);
 
         public bool HasOneStat => (HasFirstStat && !HasSecondStat) || (!HasFirstStat && HasSecondStat);
         private bool IsMetaAffix => !string.IsNullOrEmpty(AffixName) && _affixType == AffixType.Meta;
@@ -66,6 +56,9 @@ public partial class SubconditionAffixControl : UserControl, INotifyPropertyChan
         public Visibility FirstStatSelectionVisibility => BoolToVisibility(IsMetaAffix || (HasOneStat && HasFirstStat));
         public Visibility SecondStatSelectionVisibility => BoolToVisibility(!IsMetaAffix && (HasOneStat && HasSecondStat));
 
+        public bool IsFirstStatEnabled => HasFirstStat && _statOneMin != _statOneMax;
+        public bool IsSecondStatEnabled => HasSecondStat && _statTwoMin != _statTwoMax;
+
         public List<string> ValidAffixes => GetValidAffixes();
 
         public StatValueType StatValueType {
@@ -165,6 +158,8 @@ private void ClearStats()
             OnPropertyChanged(nameof(SecondStatMax));
             OnPropertyChanged(nameof(ThirdStatMin));
             OnPropertyChanged(nameof(ThirdStatMax));
+            OnPropertyChanged(nameof(IsFirstStatEnabled));
+            OnPropertyChanged(nameof(IsSecondStatEnabled));
         }
 
         public SubconditionAffixControl(ConditionAffix condition, List<Affix> affixes, StatValueType statValueType, AffixType affixType, ItemBase itemBase)
@@ -303,6 +298,9 @@ private void UpdateModMinMax()
             OnPropertyChanged(nameof(FirstStatSelectionVisibility));
             OnPropertyChanged(nameof(SecondStatSelectionVisibility));
             OnPropertyChanged(nameof(DoubleStatSelectionVisibility));
+
+            OnPropertyChanged(nameof(IsFirstStatEnabled));
+            OnPropertyChanged(nameof(IsSecondStatEnabled));
         }
 
         public List<string> GetValidAffixes()