Narvaling
/
OliviaAddInPro
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avances recogida

ConfiguracionSimplificada
Elena 2021-11-28 13:46:03 +01:00
parent a00cf8f276
commit 3003ce7cfd
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
View/Recogida/PaneRecogidaSub1.xaml
View File

@ -39,7 +39,7 @@
SelectedIndex="{Binding Path=TipoFrac, Mode = TwoWay}" SelectionChanged="comboBox_frac_SelectionChanged"> SelectedIndex="{Binding Path=TipoFrac, Mode = TwoWay}" SelectionChanged="comboBox_frac_SelectionChanged">
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<ComboBoxItem IsEnabled="{Binding IsEnabled}"/> <ComboBoxItem IsEnabled="{Binding IsEnabled}" Content="{Binding Path=Item}"/>
</DataTemplate> </DataTemplate>
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
@ -53,7 +53,13 @@
</Grid.ColumnDefinitions> </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" <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" 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" <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" VerticalAlignment="Top" Width="90"
SelectedIndex="{Binding Path=TipoLate, Mode = TwoWay}" SelectionChanged="comboBox_tipoLat_SelectionChanged"/> SelectedIndex="{Binding Path=TipoLate, Mode = TwoWay}" SelectionChanged="comboBox_tipoLat_SelectionChanged"/>

2
ViewModel/Limpieza/PaneLimpiezaSub1ViewModel.cs
View File

@ -148,7 +148,7 @@ namespace OliviaAddInPro
set set
{ {
ambitos = value; ambitos = value;
base.NotifyPropertyChanged("OpsAmbs"); base.NotifyPropertyChanged("Ambitos");
} }
} }
public bool[] AmbitosSel public bool[] AmbitosSel

11
ViewModel/Recogida/PaneRecogidaSub1ViewModel.cs
View File

@ -202,14 +202,15 @@ namespace OliviaAddInPro
base.NotifyPropertyChanged("EnabComboCapac"); base.NotifyPropertyChanged("EnabComboCapac");
} }
} }
private bool enabComboCapacFrac private bool enabComboCapacFrac = true;
public bool EnabComboCapacFrac
{ {
get { return enabComboCapacFrac; } get { return enabComboCapacFrac; }
set set
{ {
enabComboCapacFrac = value; enabComboCapacFrac = value;
base.NotifyPropertyChanged("EnabComboCapac");
base.NotifyPropertyChanged("EnabComboCapacFrac"); base.NotifyPropertyChanged("EnabComboCapacFrac");
base.NotifyPropertyChanged("EnabComboCapac");
} }
} }
/** /**
@ -337,7 +338,8 @@ namespace OliviaAddInPro
} }
for(i=0;i< RecogidaDef.tipos_fracc_str.Length;i++) 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) public void rellenaCarg(ObservableCollection<string> valores)
@ -376,7 +378,8 @@ namespace OliviaAddInPro
} }
for (i = 0; i < RecogidaDef.tipos_carg_str.Length; i++) 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];
} }
} }
/** /**