ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Fenster schließt nicht richtig

Browse Source
This commit is contained in:
Rene Evertz
2026-06-24 11:19:30 +02:00
parent 89154c0223
commit 052040720e
3 changed files with 10 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BeWo/View/Controls/GkvAbrechnungDetailControl.xaml
View File

@@ -58,7 +58,7 @@
Grid.Column="2"
IsEnabled="False"
Style="{StaticResource TextEditNumber}"
Text="{Binding Oid}" />
Text="{Binding Oid, Mode=OneWay}" />
<Label
Grid.Row="1"
Grid.Column="0"
@@ -154,7 +154,7 @@
Grid.Column="2"
MaxLength="1024"
Style="{StaticResource TextBoxNoticeLarge}"
Text="{Binding Notice}"
Text="{Binding Notice, UpdateSourceTrigger=PropertyChanged}"
TextWrapping="Wrap" />
</Grid>
</TabItem>

15
BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
View File

@@ -75,8 +75,8 @@ namespace BeWo.View.Detail.Accounting
var filter = new GkvAbrechnungViewFilterDC();
filter.FilterTime = true;
filter.Start = _Viewmodel.DateTimeSpanFilter.StartDate;
filter.End = _Viewmodel.DateTimeSpanFilter.EndDate;
filter.Start = _Viewmodel.DateTimeSpanFilter?.StartDate;
filter.End = _Viewmodel.DateTimeSpanFilter?.EndDate;
filter.FilterForCreationDate = true;
ServiceFacade.DoGkvAccountingServiceAsync(
@@ -237,17 +237,12 @@ namespace BeWo.View.Detail.Accounting
private void Detail_Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
{
var bewo_window = sender as AnimatedBeWoWindow;
var detail_control = bewo_window.GroupBoxContent as GkvAbrechnungDetailControl;
var vm = detail_control.DataContext as GkvAbrechnungLightVM;
var dialog = sender as GkvAbrechnungDialogViewModel;
var vm = dialog.Abrechnung;
vm.CheckAllInvoiceBases();
var checkbox_checked = detail_control.Checkbox_Bezahlt.IsChecked;
var textbox_text = detail_control.txt_Notice.Text;
vm.Notice = textbox_text;
//vm.Notice = textbox_text;
if (vm.IsDirty)
{

34
BeWo/ViewModel/Light/GkvAbrechnungLightVM.cs
View File

@@ -26,8 +26,6 @@ namespace BeWo.ViewModel.Light
public static string PropertyName_ErstelltAm = "ErstelltAm";
private long _Oid;
private long _Version;
private string _Notice;
private long _OrganisationOid;
@@ -118,31 +116,11 @@ namespace BeWo.ViewModel.Light
public DateTime ErstelltAmDate => ErstelltAm.Date;
public long Oid
{
get { return this._Oid; }
set
{
if (this.AreDifferent(this._Oid, value))
{
this._Oid = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Oid, value), nameof(Oid));
this.FirePropertyChanged(nameof(Oid));
}
}
get => DataContract.Oid;
}
public long Version
{
get { return this._Version; }
set
{
if (this.AreDifferent(this._Version, value))
{
this._Version = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Version, value), nameof(Version));
this.FirePropertyChanged(nameof(Version));
}
}
get => DataContract.Version;
}
public string Notice
{
@@ -352,7 +330,7 @@ namespace BeWo.ViewModel.Light
public override void UpdateByDataContract(GkvAbrechnungLightDC pDataContract)
{
Version = pDataContract.Version;
DataContract = pDataContract;
Notice = pDataContract.Notice;
@@ -373,9 +351,6 @@ namespace BeWo.ViewModel.Light
_ErstelltAm = pDataContract.ErstelltAm;
_Oid = pDataContract.Oid;
_Version = pDataContract.Version;
_Notice = pDataContract.Notice;
_Betrag = pDataContract.Betrag;
@@ -402,8 +377,6 @@ namespace BeWo.ViewModel.Light
}
protected override GkvAbrechnungLightDC MapToDataContract(GkvAbrechnungLightDC pDataContract, bool doCommit)
{
pDataContract.Version = _Version;
pDataContract.Notice = _Notice;
pDataContract.Betrag = _Betrag;
pDataContract.Bezahlt = _Bezahlt;
@@ -421,7 +394,6 @@ namespace BeWo.ViewModel.Light
return;
}
Version = dc.Version;
Protokolle = dc.Protokolle.ToList();
IsReady2Send = dc.IsReady2Send;