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

Altes laden für Frau Schulten in AdministrationView

Browse Source
This commit is contained in:
Rene Evertz
2024-12-02 13:37:55 +01:00
parent 57962a92b5
commit c4c970983f
2 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
BeWo/ServiceProxy/ServiceFacade.cs
View File

@@ -884,38 +884,38 @@ namespace BeWo.ServiceProxy
Monitor.Exit(_Lock);
}
public static bool IsWaiting()
{
return _RunningAsyncs != 0;
}
public static void WaitUntilAsyncIsFinished(Action<bool> callback = null)
{
if (!IsWaiting())
{
callback(true);
return;
}
//public static bool IsWaiting()
//{
// return _RunningAsyncs != 0;
//}
//public static void WaitUntilAsyncIsFinished(Action<bool> callback = null)
//{
// if (!IsWaiting())
// {
// callback(true);
// return;
// }
try
{
Task.Run(() => WaitUntil(() => !IsWaiting(), callback));
}
catch(Exception)
{
callback(false);
}
}
private static async Task WaitUntil(Func<bool> condition, Action<bool> callback, int frequency = 25, int timeout = -1)
{
var waitTask = Task.Run(async () =>
{
while (!condition()) await Task.Delay(frequency);
callback(true);
});
// try
// {
// Task.Run(() => WaitUntil(() => !IsWaiting(), callback));
// }
// catch(Exception)
// {
// callback(false);
// }
//}
//private static async Task WaitUntil(Func<bool> condition, Action<bool> callback, int frequency = 25, int timeout = -1)
//{
// var waitTask = Task.Run(async () =>
// {
// while (!condition()) await Task.Delay(frequency);
// callback(true);
// });
if (waitTask != await Task.WhenAny(waitTask,
Task.Delay(timeout)))
throw new TimeoutException();
}
// if (waitTask != await Task.WhenAny(waitTask,
// Task.Delay(timeout)))
// throw new TimeoutException();
//}
}
}

11
BeWo/View/Master/AdministrationView.xaml.cs
View File

@@ -243,10 +243,10 @@ namespace BeWo.View.Master
return true;
// Asynchrones speichern
if (ServiceFacade.IsWaiting())
//if (ServiceFacade.IsWaiting())
if(false)
{
Task.Run(() => ServiceFacade.WaitUntilAsyncIsFinished((s) => DoSaveCheckCallback(s, selected, header)));
//ServiceFacade.WaitUntilAsyncIsFinished((s) => DoSaveCheckCallback(s, header)).Wait();
//Task.Run(() => ServiceFacade.WaitUntilAsyncIsFinished((s) => DoSaveCheckCallback(s, selected, header)));
}
// Verwerfen
else
@@ -267,7 +267,7 @@ namespace BeWo.View.Master
_OpenViews.Remove(TabitemMandator.Header.ToString());
_OpenViews.Remove(TabitemSozioTherapie.Header.ToString());
MandatorVM = null;
_MandatorVM = null;
}
else
{
@@ -333,7 +333,8 @@ namespace BeWo.View.Master
if (ContentBorder.Child == null || DoSaveCheck())
{
ServiceFacade.WaitUntilAsyncIsFinished((s) => Dispatcher.Invoke(() => SelectedView = newView));
SelectedView = newView;
//ServiceFacade.WaitUntilAsyncIsFinished((s) => Dispatcher.Invoke(() => SelectedView = newView));
}
}
private void GenerateNewView(AccordionItem accordionItem)