From 3003ce7cfdb287297a7645fda00b14d6c0cd6036 Mon Sep 17 00:00:00 2001
From: Elena <Elena@narvaling.com>
Date: Sun, 28 Nov 2021 13:46:03 +0100
Subject: [PATCH] Avances recogida

---
 View/Limpieza/PaneLimpiezaSub1.xaml             |  4 ++--
 View/Recogida/PaneRecogidaSub1.xaml             | 10 ++++++++--
 ViewModel/Limpieza/PaneLimpiezaSub1ViewModel.cs |  2 +-
 ViewModel/Recogida/PaneRecogidaSub1ViewModel.cs | 11 +++++++----
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/View/Limpieza/PaneLimpiezaSub1.xaml b/View/Limpieza/PaneLimpiezaSub1.xaml
index 43a1703..79788b8 100644
--- a/View/Limpieza/PaneLimpiezaSub1.xaml
+++ b/View/Limpieza/PaneLimpiezaSub1.xaml
@@ -36,11 +36,11 @@
             <ComboBox x:Name="comboBox_ambitos" IsEnabled="{Binding Path=CapaAbierta, Mode = TwoWay}" ItemsSource="{Binding Path=OpsAmbs, Mode = TwoWay}" HorizontalAlignment="Left" Margin="20,0,0,0" 
                       VerticalAlignment="Top" Width="260" SelectionChanged="comboBox_ambitos_SelectionChanged"
                       SelectedIndex="{Binding Path=SelOpAmb, Mode = TwoWay}"/>
-            <ListBox x:Name="listBox_ambitos" IsEnabled="{Binding Path=CapaAbierta, Mode = TwoWay}" ItemsSource="{Binding Path=Ambitos, Mode = TwoWay}" HorizontalAlignment="Left" Height="100" 
+        <ListBox x:Name="listBox_ambitos" IsEnabled="{Binding Path=CapaAbierta, Mode = TwoWay}" ItemsSource="{Binding Path=Ambitos, Mode = TwoWay}" HorizontalAlignment="Left" Height="100" 
             ItemContainerStyle="{DynamicResource Esri_ListBoxItemHighlightBrush}" Margin="20,10,0,0" VerticalAlignment="Top" Width="260">
             <ListBox.ItemTemplate>
             <DataTemplate>
-                    <ListBoxItem IsEnabled="{Binding IsEnabled}">
+                    <ListBoxItem IsEnabled="{Binding IsEnabled}" >
                         <CheckBox IsChecked="{Binding IsChecked}" Content="{Binding Path=Item}" />
                     </ListBoxItem>
                 </DataTemplate>
diff --git a/View/Recogida/PaneRecogidaSub1.xaml b/View/Recogida/PaneRecogidaSub1.xaml
index 281d05d..4682e18 100644
--- a/View/Recogida/PaneRecogidaSub1.xaml
+++ b/View/Recogida/PaneRecogidaSub1.xaml
@@ -39,7 +39,7 @@
                       SelectedIndex="{Binding Path=TipoFrac, Mode = TwoWay}" SelectionChanged="comboBox_frac_SelectionChanged">
                 <ComboBox.ItemTemplate>
                     <DataTemplate>
-                        <ComboBoxItem IsEnabled="{Binding IsEnabled}"/>
+                        <ComboBoxItem IsEnabled="{Binding IsEnabled}" Content="{Binding Path=Item}"/>
                     </DataTemplate>
                 </ComboBox.ItemTemplate>
             </ComboBox>
@@ -53,7 +53,13 @@
             </Grid.ColumnDefinitions>
             <ComboBox x:Name="comboBox_tipoCarg" IsEnabled="{Binding Path=CapaAbierta, Mode = TwoWay}" ItemsSource="{Binding Path=TiposCarg, Mode = TwoWay}" HorizontalAlignment="Left" Margin="0,0,0,0" 
                       VerticalAlignment="Top" Width="150"
-                      SelectedIndex="{Binding Path=TipoCarg, Mode = TwoWay}" SelectionChanged="comboBox_tipoCarg_SelectionChanged"/>
+                      SelectedIndex="{Binding Path=TipoCarg, Mode = TwoWay}" SelectionChanged="comboBox_tipoCarg_SelectionChanged">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <ComboBoxItem IsEnabled="{Binding IsEnabled}" Content="{Binding Path=Item}"/>
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
             <ComboBox x:Name="comboBox_tipoLat" IsEnabled="{Binding Path=CapaAbierta, Mode = TwoWay}" Visibility="{Binding Path=VisCombLate, Mode = TwoWay}" Grid.Column="1" ItemsSource="{Binding Path=TiposLate, Mode = TwoWay}" HorizontalAlignment="Left" Margin="10,0,0,0" 
                       VerticalAlignment="Top" Width="90"
                       SelectedIndex="{Binding Path=TipoLate, Mode = TwoWay}" SelectionChanged="comboBox_tipoLat_SelectionChanged"/>
diff --git a/ViewModel/Limpieza/PaneLimpiezaSub1ViewModel.cs b/ViewModel/Limpieza/PaneLimpiezaSub1ViewModel.cs
index 2e4cbfb..2c274b5 100644
--- a/ViewModel/Limpieza/PaneLimpiezaSub1ViewModel.cs
+++ b/ViewModel/Limpieza/PaneLimpiezaSub1ViewModel.cs
@@ -148,7 +148,7 @@ namespace OliviaAddInPro
             set
             {
                 ambitos = value;
-                base.NotifyPropertyChanged("OpsAmbs");
+                base.NotifyPropertyChanged("Ambitos");
             }
         }
         public bool[] AmbitosSel
diff --git a/ViewModel/Recogida/PaneRecogidaSub1ViewModel.cs b/ViewModel/Recogida/PaneRecogidaSub1ViewModel.cs
index e7a012d..34aa1d3 100644
--- a/ViewModel/Recogida/PaneRecogidaSub1ViewModel.cs
+++ b/ViewModel/Recogida/PaneRecogidaSub1ViewModel.cs
@@ -202,14 +202,15 @@ namespace OliviaAddInPro
                 base.NotifyPropertyChanged("EnabComboCapac");
             }
         }
-        private bool enabComboCapacFrac 
+        private bool enabComboCapacFrac = true;
+        public bool EnabComboCapacFrac  
         {
             get { return enabComboCapacFrac; }
             set
             {
                 enabComboCapacFrac = value;
-                base.NotifyPropertyChanged("EnabComboCapac");
                 base.NotifyPropertyChanged("EnabComboCapacFrac");
+                base.NotifyPropertyChanged("EnabComboCapac");
             }
         }
         /**
@@ -337,7 +338,8 @@ namespace OliviaAddInPro
             }
             for(i=0;i< RecogidaDef.tipos_fracc_str.Length;i++)
             {
-                TiposFrac.Add(new EnabledComboBoxItem<string>(RecogidaDef.tipos_fracc_str[i], tipos_fracc_bool[i]));
+                TiposFrac.Add(new EnabledComboBoxItem<string>(RecogidaDef.tipos_fracc_str[i]));
+                TiposFrac.ElementAt(i).IsEnabled= tipos_fracc_bool[i];
             }
         }
         public void rellenaCarg(ObservableCollection<string> valores)
@@ -376,7 +378,8 @@ namespace OliviaAddInPro
             }
             for (i = 0; i < RecogidaDef.tipos_carg_str.Length; i++)
             {
-                TiposCarg.Add(new EnabledComboBoxItem<string>(RecogidaDef.tipos_carg_str[i], tipos_carg_bool[i]));
+                TiposCarg.Add(new EnabledComboBoxItem<string>(RecogidaDef.tipos_carg_str[i]));
+                TiposCarg.ElementAt(i).IsEnabled =tipos_carg_bool[i];
             }
         }
         /**