diff --git a/AndroidChatServer/Serveranwendung/Serveranwendung/Properties/Licenses.licx b/AndroidChatServer/Serveranwendung/Serveranwendung/Properties/Licenses.licx
index b6d8d37e5..e69de29bb 100644
--- a/AndroidChatServer/Serveranwendung/Serveranwendung/Properties/Licenses.licx
+++ b/AndroidChatServer/Serveranwendung/Serveranwendung/Properties/Licenses.licx
@@ -1 +0,0 @@
-DevExpress.Xpf.LayoutControl.ScrollBox, DevExpress.Xpf.LayoutControl.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/AndroidChatServer/Serveranwendung/Serveranwendung/Serveranwendung.csproj b/AndroidChatServer/Serveranwendung/Serveranwendung/Serveranwendung.csproj
index 93f189324..7e6da169a 100644
--- a/AndroidChatServer/Serveranwendung/Serveranwendung/Serveranwendung.csproj
+++ b/AndroidChatServer/Serveranwendung/Serveranwendung/Serveranwendung.csproj
@@ -49,9 +49,10 @@
4
-
-
-
+
+
+
+
diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index ee6eb83aa..c572b591d 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -16,10 +16,10 @@
true
Internet
true
- false
+ true
- 64EE47D8851B4F38E5242B6A4D6FBA33D8B493BA
+ D9ACF3EBC5E47956B8D786361F7061E3F6D6F286
true
false
3.0.1927.0
@@ -42,12 +42,12 @@
de-DE
BeWoPlaner
beyondSoft GmbH
- 2.0.1.122
+ 2.0.1.124
true
publish.htm
false
true
- 123
+ 125
2.0.1.%2a
false
true
@@ -91,32 +91,35 @@
False
..\Lib\Blacklight.Wpf.Controls.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
True
@@ -2017,352 +2020,352 @@
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
-
+
False
- Include
- True
+ Include
+ True
Assembly
@@ -2469,15 +2472,15 @@
-
+
+
\ No newline at end of file
diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs
index b6c054db0..3728b762e 100644
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -451,7 +451,7 @@ namespace BeWo
String url = ServerAddress.ToLower();
#if DEBUG
- url = String.Format("http://localhost/Host");
+ url = String.Format("http://localhost:3777/Host");
//url = String.Format("app1.bewoplaner.de/service");
#endif
diff --git a/BeWo/Core/BeWoUtils.cs b/BeWo/Core/BeWoUtils.cs
index 3ad61dfaf..803a25caf 100644
--- a/BeWo/Core/BeWoUtils.cs
+++ b/BeWo/Core/BeWoUtils.cs
@@ -1658,24 +1658,39 @@ namespace BeWo.Core
}
break;
case ServiceRecordValidationResult.ApprovedFLSOverspending:
+ String klient = "diesen Hilfeplan";
+ if (!String.IsNullOrEmpty(result.CustomerName))
+ {
+ klient = "Klient/in " + result.CustomerName;
+ }
+ String msg =
+ String.Format(
+ "Die für {2} genehmigten FLS ({0:N}) werden mit diesem Eintrag überschritten. ({1:N}).",
+ result.ApprovedHours, result.HoursNew, klient);
+
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreateMoreFLSThanApproved))
{
- MessageBox.Show("Die für diesen Hilfeplan genehmigten FLS (" + (result.ApprovedHours).ToString("N") + ") werden mit diesem Eintrag überschritten. (" + (result.HoursNew).ToString("N") + ").\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
+ MessageBox.Show(msg + ").\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
lValid = false;
}
- else if (MessageBox.Show("Die für diesen Hilfeplan genehmigten FLS (" + (result.ApprovedHours).ToString("N") + ") werden mit diesem Eintrag überschritten. (" + (result.HoursNew).ToString("N") + ").\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
+ else if (MessageBox.Show(msg + ").\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
{
lValid = false;
exitLoop = true;
}
break;
case ServiceRecordValidationResult.SettlementInvoiceAlreadyExisting:
+ String klient2 = "diesen Hilfeplan";
+ if (!String.IsNullOrEmpty(result.CustomerName))
+ {
+ klient2 = "Klient/in " + result.CustomerName;
+ }
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.BookServiceRecordAfterSettlementInvoice))
{
- MessageBox.Show("Sie können den Eintrag nicht bearbeiten, da bereits eine Spitzabrechnung für diesen Hilfeplan erstellt wurde.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Warning);
+ MessageBox.Show(String.Format("Sie können den Eintrag nicht bearbeiten, da bereits eine Spitzabrechnung für {0} erstellt wurde.", klient2), "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Warning);
lValid = false;
}
- else if (MessageBox.Show("Es existiert bereits eine Spitzabrechnung. Um diesen Eintrag zu berücksichtigen, muss eventuell eine neue Spitzabrechnung erstellt werden.\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Warning).Equals(MessageBoxResult.No))
+ else if (MessageBox.Show(String.Format("Es existiert bereits eine Spitzabrechnung für {0}. Um diesen Eintrag zu berücksichtigen, muss eventuell eine neue Spitzabrechnung erstellt werden.\nMöchten Sie trotzdem speichern?", klient2), "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Warning).Equals(MessageBoxResult.No))
{
lValid = false;
exitLoop = true;
diff --git a/BeWo/Core/Service/SupportConceptService.cs b/BeWo/Core/Service/SupportConceptService.cs
index a2c434209..e3a5d25e4 100644
--- a/BeWo/Core/Service/SupportConceptService.cs
+++ b/BeWo/Core/Service/SupportConceptService.cs
@@ -315,6 +315,7 @@ namespace BeWo.Core.Service
relDC.RequestedStartDate = cbDC.RequestedStartDate;
relDC.Status = cbDC.SupportConceptStatus;
relDC.SupportConcept = dc;
+ relDC.AuswahlBezeichnung = cbDC.Bezeichnung;
treeNode.SupportConceptCostBearerRelDC = relDC;
treeNode.CostBearer = orgDC;
diff --git a/BeWo/Properties/licenses.licx b/BeWo/Properties/licenses.licx
index 47c5ed583..e69de29bb 100644
--- a/BeWo/Properties/licenses.licx
+++ b/BeWo/Properties/licenses.licx
@@ -1 +0,0 @@
-DevExpress.Xpf.Editors.SpinEdit, DevExpress.Xpf.Core.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml b/BeWo/Scheduler/View/NewSchedulerView.xaml
index 9ee721a31..e5132c3a0 100644
--- a/BeWo/Scheduler/View/NewSchedulerView.xaml
+++ b/BeWo/Scheduler/View/NewSchedulerView.xaml
@@ -7,7 +7,7 @@
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler"
xmlns:dxschint="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/internal"
- xmlns:dxschui="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v13.1"
+ xmlns:dxschui="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v13.2"
xmlns:dxscht="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/themekeys"
xmlns:view="clr-namespace:BeWo.Scheduler.View"
xmlns:converter="clr-namespace:BeWo.Converter"
@@ -80,7 +80,7 @@
-
+
@@ -133,7 +133,8 @@
-
+
@@ -146,17 +147,17 @@
-
-
+
+
-
+
-
+
@@ -168,7 +169,8 @@
-
+
@@ -214,7 +216,7 @@
-
+
@@ -250,7 +252,8 @@
Visibility="{Binding ViewInfo.View.AppointmentToolTipVisibility, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ToolTipVisibilityConverter}}">
-
+
@@ -263,17 +266,17 @@
-
-
+
+
-
+
-
+
@@ -285,18 +288,21 @@
+ Visibility="{Binding ViewInfo.Selected, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}" />
+ IsHitTestVisible="True"
+ dxsch:SchedulerControl.HitTestType="AppointmentResizingLeftEdge"
+ dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}"
+ Cursor="SizeWE">
+ dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}"
+ Cursor="SizeWE">
@@ -383,7 +389,7 @@
-
+
-
-
+
+