winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 46 Activity

Small fixes

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-05-25 19:31:43 +02:00
parent fb077bc557
commit ad47aa2a79
3 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Elwig/Helpers/Utils.cs
View File

@ -160,7 +160,7 @@ namespace Elwig.Helpers {
} }
if (selectedId != null && source != null) if (selectedId != null && source != null)
dataGrid.SelectedItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(getId(i))); dataGrid.SelectedItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(getId(i)));
if (dataGrid.SelectedItem != null) if (dataGrid.SelectedItem != null && column != null)
dataGrid.CurrentCell = new(dataGrid.SelectedItem, column); dataGrid.CurrentCell = new(dataGrid.SelectedItem, column);
} }

18
Elwig/Windows/AreaComAdminWindow.xaml
View File

@ -144,13 +144,13 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label Content="Gemeinde:" Margin="10,10,0,0" Grid.Column="0"/> <Label Content="Gemeinde:" Margin="10,10,0,0" Grid.Column="0"/>
<ComboBox x:Name="KgInput" ItemTemplate="{StaticResource KgTemplate}" TextSearch.TextPath="Name" <ComboBox x:Name="KgInput" ItemTemplate="{StaticResource KgNrTemplate}" TextSearch.TextPath="Name"
Width="200" HorizontalAlignment="Left" SelectionChanged="KgInput_SelectionChanged" Width="200" HorizontalAlignment="Left" SelectionChanged="KgInput_SelectionChanged"
Margin="0,10,10,0" Grid.Column="1"/> Margin="0,10,10,0" Grid.Column="1"/>
<Label Content="Ried:" Margin="10,40,0,0" Grid.Column="0"/> <Label Content="Ried:" Margin="10,40,0,0" Grid.Column="0"/>
<ComboBox x:Name="RdInput" ItemTemplate="{StaticResource KgTemplate}" TextSearch.TextPath="Name" <ComboBox x:Name="RdInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
Width="200" HorizontalAlignment="Left" SelectionChanged="ComboBox_SelectionChanged" Width="200" HorizontalAlignment="Left"
Margin="0,40,0,0" Grid.Column="1"/> Margin="0,40,0,0" Grid.Column="1"/>
<Label Content="Parzelle:" Margin="10,70,0,0" Grid.Column="0"/> <Label Content="Parzelle:" Margin="10,70,0,0" Grid.Column="0"/>
@ -172,18 +172,18 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label Content="Sorte:" Margin="10,10,0,0" Grid.Column="0"/> <Label Content="Sorte:" Margin="10,10,0,0" Grid.Column="0"/>
<ComboBox x:Name="SortInput" ItemTemplate="{StaticResource KgTemplate}" TextSearch.TextPath="Name" <ComboBox x:Name="SortInput" ItemTemplate="{StaticResource WineVarietyTemplate}" TextSearch.TextPath="Name"
Width="200" HorizontalAlignment="Left" SelectionChanged="ComboBox_SelectionChanged" Width="200" HorizontalAlignment="Left"
Margin="0,10,10,0" Grid.Column="1"/> Margin="0,10,10,0" Grid.Column="1"/>
<Label Content="Attribut:" Margin="10,40,0,0" Grid.Column="0"/> <Label Content="Attribut:" Margin="10,40,0,0" Grid.Column="0"/>
<ComboBox x:Name="AttrInput" ItemTemplate="{StaticResource KgTemplate}" TextSearch.TextPath="Name" <ComboBox x:Name="AttrInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
Width="200" HorizontalAlignment="Left" SelectionChanged="ComboBox_SelectionChanged" Width="200" HorizontalAlignment="Left"
Margin="0,40,10,0" Grid.Column="1"/> Margin="0,40,10,0" Grid.Column="1"/>
<Label Content="Bewirt. Art:" Margin="10,70,0,0" Grid.Column="0"/> <Label Content="Bewirt. Art:" Margin="10,70,0,0" Grid.Column="0"/>
<ComboBox x:Name="CultInput" ItemTemplate="{StaticResource KgTemplate}" TextSearch.TextPath="Name" <ComboBox x:Name="CultInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
Width="200" HorizontalAlignment="Left" SelectionChanged="ComboBox_SelectionChanged" Width="200" HorizontalAlignment="Left"
Margin="0,70,10,0" Grid.Column="1"/> Margin="0,70,10,0" Grid.Column="1"/>
</Grid> </Grid>

11
Elwig/Windows/AreaComAdminWindow.xaml.cs
View File

@ -1,24 +1,19 @@
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using Elwig.Helpers; using Elwig.Helpers;
using Elwig.Models; using Elwig.Models;
using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore.ChangeTracking;
namespace Elwig.Windows { namespace Elwig.Windows {
public partial class AreaComAdminWindow : AdministrationWindow { public partial class AreaComAdminWindow : AdministrationWindow {
private readonly Member member; private readonly Member Member;
private bool IsEditing = false;
private bool IsCreating = false;
public AreaComAdminWindow(Member member) { public AreaComAdminWindow(Member member) {
InitializeComponent(); InitializeComponent();
this.member = member; Member = member;
Title = $"Flächenbindungen - {member.AdministrativeName} - Elwig"; Title = $"Flächenbindungen - {Member.AdministrativeName} - Elwig";
ExemptInputs = new Control[] { ExemptInputs = new Control[] {
MgNrInput, ContractList, AreaCommitmentList, NewContractButton, DeleteContractButton, MgNrInput, ContractList, AreaCommitmentList, NewContractButton, DeleteContractButton,
ContractSaveButton, ContractCancelButton, NewAreaCommitmentButton, ContractSaveButton, ContractCancelButton, NewAreaCommitmentButton,