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

Update Klient Umfeld

Browse Source
This commit is contained in:
Waldi
2017-03-03 12:54:06 +01:00
parent 1ef70ae587
commit 61a82c8c3d
6 changed files with 966 additions and 905 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
BeWo/View/Detail/ServiceRecordView2.xaml.cs
View File

@@ -76,7 +76,7 @@ namespace BeWo.View.Detail
private bool _IgnoreGroupMultiCheck;
private int i = 0;
private int lastPosition = 0;
public static double DocumentationTextBoxFontSize
{
@@ -692,23 +692,45 @@ namespace BeWo.View.Detail
return (ServiceRecordVM) srListBox.SelectedItem;
}
public void SetSelectedServiceRecordVM(ServiceRecordVM vm)
public void SetSelectedServiceRecordVM(ServiceRecordVM vm, bool isOnDelet)
{
if (vm != null)
{
ServiceRecordVM existingVm = null;
foreach (var serviceRecordVm in ViewModel.VMList)
{
if (serviceRecordVm.Id == vm.Id)
{
existingVm = serviceRecordVm;
}
}
if (!isOnDelet)
{
foreach (var serviceRecordVm in ViewModel.VMList) //Originbal Fassung
{
if (serviceRecordVm.Id == vm.Id)
{
existingVm = serviceRecordVm;
}
}
}
else
{
foreach (var serviceRecordVm in ViewModel.VMList) // Nicht Originbal Fassung | lohnt trotzdem nicht
{
if (serviceRecordVm.Id == vm.Id)
{
if(ViewModel.VMList.Count > 0 && lastPosition > 0) {
var a = ViewModel.VMList[lastPosition - 1];
existingVm = a;
}
else
{
existingVm = serviceRecordVm;
}
}
}
}
srListBox.SelectedItem = existingVm;
srListBox.SelectedItem = existingVm;
srTableView.FocusedRow = existingVm;
}
}
@@ -844,7 +866,7 @@ namespace BeWo.View.Detail
ClosePopupView();
// ViewModel.RefreshServiceRecordsForSelectedTreeNode();
SetSelectedServiceRecordVM(vm);
SetSelectedServiceRecordVM(vm,false);
}));
@@ -906,7 +928,7 @@ namespace BeWo.View.Detail
private void RefreshFinished()
{
SetSelectedServiceRecordVM(lastSelectedVM);
SetSelectedServiceRecordVM(lastSelectedVM,false);
}
private void ShowHistory(ServiceRecordVM vm)
@@ -1057,7 +1079,7 @@ namespace BeWo.View.Detail
{
var selected = GetSelectedServiceRecordFromListBox();
ViewModel.RefreshServiceRecordsForSelectedTreeNode();
SetSelectedServiceRecordVM(selected);
SetSelectedServiceRecordVM(selected,true);
});
}
@@ -2665,14 +2687,13 @@ namespace BeWo.View.Detail
var hitInfo = srTableView.CalcHitInfo(e.OriginalSource as DependencyObject);
if (!hitInfo.InRow)
return;
i = hitInfo.RowHandle;
ServiceRecordVM vm = GetSelectedServiceRecordFromGrid();
if (vm != null && vm.EditAllowed)
StartEdit(vm);
lastPosition = ViewModel.VMList.IndexOf(vm);
}
private ServiceRecordVM GetSelectedServiceRecordFromGrid()
@@ -2696,8 +2717,11 @@ namespace BeWo.View.Detail
}
private void DxDeleteButton_OnItemClick(object sender, ItemClickEventArgs e)
{
{
ServiceRecordVM vm = GetSelectedServiceRecordFromGrid();
lastPosition = ViewModel.VMList.IndexOf(vm);
if (vm != null && vm.DeleteAllowed)
Delete(vm);
}