diff --git a/AndroidChatServer/Serveranwendung/Serveranwendung/Serveranwendung.csproj b/AndroidChatServer/Serveranwendung/Serveranwendung/Serveranwendung.csproj
index 7e6da169a..0f7a84105 100644
--- a/AndroidChatServer/Serveranwendung/Serveranwendung/Serveranwendung.csproj
+++ b/AndroidChatServer/Serveranwendung/Serveranwendung/Serveranwendung.csproj
@@ -49,10 +49,12 @@
4
-
-
-
-
+
+
+
+
+
+
diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index a8881026e..221194b51 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -9,7 +9,7 @@
Properties
BeWo
BeWoPlaner
- v4.0
+ v4.5
512
{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
4
@@ -23,7 +23,8 @@
true
false
3.0.1927.0
- Client
+
+
3.5
@@ -65,6 +66,7 @@
x86
AllRules.ruleset
true
+ false
pdbonly
@@ -74,6 +76,7 @@
prompt
4
AllRules.ruleset
+ false
BeWoPlaner.ico
@@ -91,37 +94,43 @@
False
..\Lib\Blacklight.Wpf.Controls.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
True
@@ -262,6 +271,10 @@
MSBuild:Compile
Designer
+
+ Designer
+ MSBuild:Compile
+
MSBuild:Compile
Designer
@@ -718,6 +731,9 @@
ChatProgressBarView.xaml
+
+ ServiceRecordRTFWindowView.xaml
+
MessageDialog.xaml
@@ -1965,10 +1981,32 @@
+
+ Designer
+
+
+ Designer
+
+
+ Designer
+
+
+ Designer
+
+
+ Designer
+
+
+ Designer
+
+
+ Designer
+
+
@@ -2011,7 +2049,6 @@
-
WCF Proxy Generator
Reference.cs
@@ -2079,7 +2116,7 @@
True
Assembly
-
+
False
@@ -2089,7 +2126,7 @@
True
Assembly
-
+
False
@@ -2099,7 +2136,7 @@
True
Assembly
-
+
False
@@ -2109,7 +2146,7 @@
True
Assembly
-
+
False
@@ -2119,7 +2156,7 @@
True
Assembly
-
+
False
@@ -2129,7 +2166,7 @@
True
Assembly
-
+
False
@@ -2139,7 +2176,7 @@
True
Assembly
-
+
False
@@ -2149,7 +2186,7 @@
True
Assembly
-
+
False
@@ -2159,7 +2196,7 @@
True
Assembly
-
+
False
@@ -2169,7 +2206,7 @@
True
Assembly
-
+
False
@@ -2179,7 +2216,7 @@
True
Assembly
-
+
False
@@ -2189,7 +2226,7 @@
True
Assembly
-
+
False
@@ -2199,7 +2236,7 @@
True
Assembly
-
+
False
@@ -2209,7 +2246,7 @@
True
Assembly
-
+
False
@@ -2219,7 +2256,7 @@
True
Assembly
-
+
False
@@ -2229,7 +2266,7 @@
True
Assembly
-
+
False
@@ -2239,7 +2276,7 @@
True
Assembly
-
+
False
@@ -2249,7 +2286,7 @@
True
Assembly
-
+
False
@@ -2259,7 +2296,7 @@
True
Assembly
-
+
False
@@ -2269,7 +2306,7 @@
True
Assembly
-
+
False
@@ -2279,7 +2316,7 @@
True
Assembly
-
+
False
@@ -2289,7 +2326,7 @@
True
Assembly
-
+
False
@@ -2299,7 +2336,7 @@
True
Assembly
-
+
False
@@ -2309,7 +2346,7 @@
True
Assembly
-
+
False
@@ -2319,7 +2356,7 @@
True
Assembly
-
+
False
@@ -2329,7 +2366,7 @@
True
Assembly
-
+
False
@@ -2339,7 +2376,7 @@
True
Assembly
-
+
False
@@ -2349,7 +2386,7 @@
True
Assembly
-
+
False
@@ -2359,7 +2396,7 @@
True
Assembly
-
+
False
@@ -2369,7 +2406,7 @@
True
Assembly
-
+
False
@@ -2379,7 +2416,7 @@
True
Assembly
-
+
False
@@ -2389,7 +2426,7 @@
True
Assembly
-
+
False
@@ -2399,7 +2436,7 @@
True
Assembly
-
+
False
@@ -2409,7 +2446,7 @@
True
Assembly
-
+
False
@@ -2437,14 +2474,6 @@
-
-
-
-
-
-
-
-
@@ -2520,6 +2549,9 @@
+
+
+
diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs
index cb5132a8e..2496ee890 100644
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -203,6 +203,7 @@ namespace BeWo
bool isZeiterfassungInStdMin = false;
int lastSelectedStundenkontoIntervall = 3;
bool showSignatures = false;
+ bool showRtfTextfeld = false;
AppSettings.ShowAdvisedAttendedFlag = false;
@@ -377,6 +378,12 @@ namespace BeWo
showSignatures = true;
}
+ val = GetSettingValue(_Mandator.Settings, "ShowRtfTextfeld");
+ if (val != null && val.Equals("1"))
+ {
+ showRtfTextfeld = true;
+ }
+
switch (_Mandator.BeWoClientType)
{
@@ -443,6 +450,7 @@ namespace BeWo
AppSettings.ShowHilfeplanBezeichnung = showHilfeplanBezeichnung;
AppSettings.ShowArbeitszeiten = showArbeitszeiten;
AppSettings.ShowSignatures = showSignatures;
+ AppSettings.ShowRtfTextfeld = showRtfTextfeld;
AppSettings.ShowCustomerDistanceFields = showCustomerDistanceFields;
AppSettings.ShowAdditionalService = showAdditionalService;
AppSettings.ShowRoundedDurationInEmployeeAnalysis = showRoundedDurationInEmployeeAnalysis;
diff --git a/BeWo/Converter/EnumToDescriptionConverter.cs b/BeWo/Converter/EnumToDescriptionConverter.cs
index a39a17b46..1e0abb874 100644
--- a/BeWo/Converter/EnumToDescriptionConverter.cs
+++ b/BeWo/Converter/EnumToDescriptionConverter.cs
@@ -13,11 +13,12 @@ namespace BeWo.Converter
if (value == null)
return null;
- var EnVal = value as DevExpress.Xpf.Core.EnumHelper.EnumItem;
- var fi2 = EnVal.Id.GetType().GetField(EnVal.Id.ToString());
- var attrs = (DescriptionAttribute[])fi2.GetCustomAttributes(typeof(DescriptionAttribute), true);
+ throw new Exception("Hier muss noch was getestet werden");
+ //var EnVal = value as DevExpress.Xpf.Core.EnumHelper. EnumItem;
+ //var fi2 = EnVal.Id.GetType().GetField(EnVal.Id.ToString());
+ //var attrs = (DescriptionAttribute[])fi2.GetCustomAttributes(typeof(DescriptionAttribute), true);
- return !attrs.Any() ? value : attrs[0].Description;
+ //return !attrs.Any() ? value : attrs[0].Description;
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/BeWo/Core/Config/AppSettings.cs b/BeWo/Core/Config/AppSettings.cs
index 58c62218e..a67d40407 100644
--- a/BeWo/Core/Config/AppSettings.cs
+++ b/BeWo/Core/Config/AppSettings.cs
@@ -318,6 +318,8 @@ namespace BeWo.Core.Config
public bool ShowSignatures { get; set; }
+ public bool ShowRtfTextfeld { get; set; }
+
public bool ShowTeamNews { get; set; }
public bool ShowMarker { get; set; }
diff --git a/BeWo/Properties/Resources.Designer.cs b/BeWo/Properties/Resources.Designer.cs
index 53733be57..16aed7ba5 100644
--- a/BeWo/Properties/Resources.Designer.cs
+++ b/BeWo/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// Dieser Code wurde von einem Tool generiert.
-// Laufzeitversion:4.0.30319.17929
+// Laufzeitversion:4.0.30319.42000
//
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
// der Code erneut generiert wird.
diff --git a/BeWo/Properties/Settings.Designer.cs b/BeWo/Properties/Settings.Designer.cs
index c52edb2e0..9d1e82165 100644
--- a/BeWo/Properties/Settings.Designer.cs
+++ b/BeWo/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// Dieser Code wurde von einem Tool generiert.
-// Laufzeitversion:4.0.30319.17929
+// Laufzeitversion:4.0.30319.42000
//
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
// der Code erneut generiert wird.
@@ -12,7 +12,7 @@ namespace BeWo.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.1.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/BeWo/Properties/licenses.licx b/BeWo/Properties/licenses.licx
index 27ee5eef5..e69de29bb 100644
--- a/BeWo/Properties/licenses.licx
+++ b/BeWo/Properties/licenses.licx
@@ -1 +0,0 @@
-DevExpress.Xpf.RichEdit.RichEditControl, DevExpress.Xpf.RichEdit.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml b/BeWo/Scheduler/View/NewSchedulerView.xaml
index 0cdc38787..14ca74e82 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.2"
+ xmlns:dxschui="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v17.1"
xmlns:dxscht="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/themekeys"
xmlns:view="clr-namespace:BeWo.Scheduler.View"
xmlns:converter="clr-namespace:BeWo.Converter"
diff --git a/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs b/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs
index 487506e97..0c24ae278 100644
--- a/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs
+++ b/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs
@@ -305,10 +305,12 @@ namespace BeWo.Scheduler.View
if (Appointment.RecurrenceInfo != null)
{
- ViewModel.ApplyChangesToChangedOccurencyCustomFields(employees, customers, resources, originator, isPrivate, Appointment.RecurrenceIndex.ToString(), Appointment.RecurrenceInfo.Id);
- }
+ //###Lyndon testen!!!
+ ViewModel.ApplyChangesToChangedOccurencyCustomFields(employees, customers, resources, originator, isPrivate, Appointment.RecurrenceIndex.ToString(), new Guid(Appointment.RecurrenceInfo.Id.ToString()));
+ //ViewModel.ApplyChangesToChangedOccurencyCustomFields(employees, customers, resources, originator, isPrivate, Appointment.RecurrenceIndex.ToString(), Appointment.RecurrenceInfo.Id);
+ }
- if (Appointment.IsOccurrence && item == null)
+ if (Appointment.IsOccurrence && item == null)
{
((List)Appointment.CustomFields["EmployeeList"]).ForEach(each =>
{
diff --git a/BeWo/Scheduler/View/SchedulerView.xaml b/BeWo/Scheduler/View/SchedulerView.xaml
index 344c6b887..1ab97d2d2 100644
--- a/BeWo/Scheduler/View/SchedulerView.xaml
+++ b/BeWo/Scheduler/View/SchedulerView.xaml
@@ -7,8 +7,8 @@
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:dxschcore="clr-namespace:DevExpress.XtraScheduler;assembly=DevExpress.XtraScheduler.v13.1.Core"
- xmlns:dxschui="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v13.1"
+ xmlns:dxschcore="clr-namespace:DevExpress.XtraScheduler;assembly=DevExpress.XtraScheduler.v17.1.Core"
+ xmlns:dxschui="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v17.1"
xmlns:dxscht="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/themekeys"
xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:search="clr-namespace:BeWo.View.Search"
@@ -119,11 +119,13 @@
dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}">
-
-
+
@@ -132,7 +134,7 @@
-
+
@@ -149,7 +151,8 @@
+ Visibility="{Binding ViewInfo.View.AppointmentToolTipVisibility, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ToolTipVisibilityConverter}}">
-
+
@@ -238,7 +242,7 @@
-
+
@@ -261,9 +265,9 @@
+ DefaultBorderThickness="2" ViewInfo="{TemplateBinding ViewInfo}"
+ BorderBrush="Black"
+ Visibility="{Binding ViewInfo.Selected, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}" />
-
@@ -404,7 +409,8 @@
+ EditValueChanged="Filter1BoxEdit_EditValueChanged" VerticalAlignment="Bottom"
+ />
diff --git a/BeWo/Scheduler/View/ServiceRecordScheduler.xaml b/BeWo/Scheduler/View/ServiceRecordScheduler.xaml
index 5cb694564..44edd0378 100644
--- a/BeWo/Scheduler/View/ServiceRecordScheduler.xaml
+++ b/BeWo/Scheduler/View/ServiceRecordScheduler.xaml
@@ -6,7 +6,7 @@
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
- xmlns:dxschd="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v13.1"
+ xmlns:dxschd="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v17.1"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="600" dx:ThemeManager.ThemeName="Office2010Black">
diff --git a/BeWo/Scheduler/ViewModel/NewSchedulerViewModel.cs b/BeWo/Scheduler/ViewModel/NewSchedulerViewModel.cs
index c6b55ce6e..2934bd7e6 100644
--- a/BeWo/Scheduler/ViewModel/NewSchedulerViewModel.cs
+++ b/BeWo/Scheduler/ViewModel/NewSchedulerViewModel.cs
@@ -80,7 +80,9 @@ namespace BeWo.Scheduler.ViewModel
var prefilteredAppointments = appointments.Where(w => (w.EmployeeList.Count == 0 && w.Originator.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid) ||
w.EmployeeList.Count > 0 && w.EmployeeList.Any(a => a.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid)) ||
- BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderMitarbeitertermineAnsehen)) && (!w.EmployeeList.TrueForAll(e2a => e2a.ParticipationAnswer == ParticipationAnswer.Absage) || w.EmployeeList.IsEmpty()));
+ BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderMitarbeitertermineAnsehen)) && (!w.EmployeeList.TrueForAll(e2a => e2a.ParticipationAnswer == ParticipationAnswer.Absage) || (w.EmployeeList == null || w.EmployeeList.Count == 0)));
+ //###cb testen :w.EmployeeList.IsEmpty geht nicht mehr
+
var vm = new SchedulerAppointmentListVM(prefilteredAppointments.ToList(), allCust, allEmps, mAllCats2ResInDic);
diff --git a/BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs b/BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs
index 282d4ff34..fe61c13b0 100644
--- a/BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs
+++ b/BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs
@@ -339,9 +339,12 @@ namespace BeWo.Scheduler.ViewModel
if (app.RecurrenceInfo != null)
{
var index = app.RecurrenceIndex.ToString();
- var id = app.RecurrenceInfo.Id;
- if (changedOccurencyCustomFields.ContainsKey(app.RecurrenceInfo.Id) && changedOccurencyCustomFields[id].ContainsKey(index))
+ //###Lyndon testen!!!
+ //var id = app.RecurrenceInfo.Id;
+ var id = new Guid(app.RecurrenceInfo.Id.ToString());
+
+ if (changedOccurencyCustomFields.ContainsKey(id) && changedOccurencyCustomFields[id].ContainsKey(index))
{
if (app.Type.Equals(AppointmentType.ChangedOccurrence))
{
@@ -376,7 +379,10 @@ namespace BeWo.Scheduler.ViewModel
}
var index = appointment.RecurrenceIndex;
- var id = appointment.RecurrenceInfo.Id;
+ //###Lyndon testen!!!
+ //var id = app.RecurrenceInfo.Id;
+ var id = new Guid(appointment.RecurrenceInfo.Id.ToString());
+
if (changedOccurencyCustomFields.ContainsKey(id) && changedOccurencyCustomFields[id].ContainsKey(index.ToString()))
{
@@ -548,12 +554,16 @@ namespace BeWo.Scheduler.ViewModel
customFieldCollection[CF_ORIGINATOR] = termin.Originator;
customFieldCollection[CF_ISPRIVATE] = termin.IsPrivate;
- if (!changedOccurencyCustomFields.ContainsKey(ri.Id))
- changedOccurencyCustomFields.Add(ri.Id, new Dictionary> { { index, customFieldCollection } });
- else if (!changedOccurencyCustomFields[ri.Id].ContainsKey(index))
- changedOccurencyCustomFields[ri.Id].Add(index, customFieldCollection);
+ //###Lyndon testen!!!
+ //var id = app.RecurrenceInfo.Id;
+ var id = new Guid(ri.Id.ToString());
+
+ if (!changedOccurencyCustomFields.ContainsKey(id))
+ changedOccurencyCustomFields.Add(id, new Dictionary> { { index, customFieldCollection } });
+ else if (!changedOccurencyCustomFields[id].ContainsKey(index))
+ changedOccurencyCustomFields[id].Add(index, customFieldCollection);
else
- changedOccurencyCustomFields[ri.Id][index] = customFieldCollection;
+ changedOccurencyCustomFields[id][index] = customFieldCollection;
}
}
diff --git a/BeWo/Scheduler/ViewModel/SchedulerAppointmentVM.cs b/BeWo/Scheduler/ViewModel/SchedulerAppointmentVM.cs
index e68ede5c7..4feb61b45 100644
--- a/BeWo/Scheduler/ViewModel/SchedulerAppointmentVM.cs
+++ b/BeWo/Scheduler/ViewModel/SchedulerAppointmentVM.cs
@@ -8,6 +8,7 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using DevExpress.Data.Linq;
+using BS.Shared.Extensions;
namespace BeWo.Scheduler.ViewModel
{
diff --git a/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml b/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml
index ffe109fa6..fda9c3d5a 100644
--- a/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml
+++ b/BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml
@@ -308,7 +308,7 @@
-
diff --git a/BeWo/View/Detail/CustomerView.xaml.cs b/BeWo/View/Detail/CustomerView.xaml.cs
index 427afac97..a58666d85 100644
--- a/BeWo/View/Detail/CustomerView.xaml.cs
+++ b/BeWo/View/Detail/CustomerView.xaml.cs
@@ -28,17 +28,18 @@ using BS.Shared.Extensions;
using DevExpress.Utils;
using DevExpress.Xpf.Editors.Settings;
using DevExpress.Xpf.Grid;
-using DevExpress.XtraGrid;
using System.IO;
using System.Windows.Forms;
using System.Windows.Media.Imaging;
using System.Windows.Media;
+using DevExpress.XtraGrid;
using Binding = System.Windows.Data.Binding;
using Button = System.Windows.Controls.Button;
using CheckBox = System.Windows.Controls.CheckBox;
using ComboBox = System.Windows.Controls.ComboBox;
using Control = System.Windows.Controls.Control;
+using GridControl = DevExpress.Xpf.Grid.GridControl;
using GroupBox = System.Windows.Controls.GroupBox;
using HorizontalAlignment = System.Windows.HorizontalAlignment;
using Hyperlink = System.Windows.Documents.Hyperlink;
diff --git a/BeWo/View/Detail/ServiceRecordEditView.xaml b/BeWo/View/Detail/ServiceRecordEditView.xaml
index 099cce8d3..ab31f6464 100644
--- a/BeWo/View/Detail/ServiceRecordEditView.xaml
+++ b/BeWo/View/Detail/ServiceRecordEditView.xaml
@@ -8,6 +8,9 @@
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
+ xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
+ xmlns:dxre="http://schemas.devexpress.com/winfx/2008/xaml/richedit"
+ xmlns:dxr="http://schemas.devexpress.com/winfx/2008/xaml/ribbon"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
@@ -310,6 +313,35 @@
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BeWo/View/Detail/ServiceRecordEditView.xaml.cs b/BeWo/View/Detail/ServiceRecordEditView.xaml.cs
index 2f85ee3ce..ec21dc5da 100644
--- a/BeWo/View/Detail/ServiceRecordEditView.xaml.cs
+++ b/BeWo/View/Detail/ServiceRecordEditView.xaml.cs
@@ -166,7 +166,16 @@ namespace BeWo.View.Detail
ComboBoxTreeViewControl.Visibility = (_ServiceRecordVM.IsGoalTreeVisible) ? Visibility.Visible : Visibility.Collapsed;
Loaded += ServiceRecordEditView_Loaded;
- ConfigureDocTypes();
+
+ if(BeWoApp.AppSettings.ShowRtfTextfeld)
+ {
+ ConfigureRTFDocTypes();
+ LoadNoticeInRTFTxte();
+ }
+ else{
+ ConfigureDocTypes();
+ }
+
isEndDateVisible(pSCViewModel.ServiceRecordFormat, pSCViewModel.DurationInStunden.Value);
if (!pSCViewModel.EditAllowed)
@@ -351,6 +360,12 @@ namespace BeWo.View.Detail
// {
// _ServiceRecordVM.RoundedDuration = _ServiceRecordVM.Duration.Value;
// }
+
+ if (BeWoApp.AppSettings.ShowRtfTextfeld)
+ {
+ SetRTFDaten();
+ }
+
_ServiceRecordVM.RoundedDuration = _ServiceRecordVM.Duration.Value;
if (_SelectedEmployee != null)
_ServiceRecordVM.Employee = _SelectedEmployee;
@@ -375,6 +390,51 @@ namespace BeWo.View.Detail
}
}
+ private void SetRTFDaten()
+ {
+
+ if (richEditControl1.Text != "")
+ {
+ _ServiceRecordVM.Notice = richEditControl1.Text;
+ _ServiceRecordVM.RTFNotice = richEditControl1.RtfText;
+ }
+ if (richEditControl2.Text != "")
+ {
+ _ServiceRecordVM.Notice2 = richEditControl2.Text;
+ _ServiceRecordVM.RTFNotice2 = richEditControl2.RtfText;
+ }
+ if (richEditControl3.Text != "")
+ {
+ _ServiceRecordVM.Notice3 = richEditControl3.Text;
+ _ServiceRecordVM.RTFNotice3 = richEditControl3.RtfText;
+ }
+ if (richEditControl4.Text != "")
+ {
+ _ServiceRecordVM.Notice4 = richEditControl4.Text;
+ _ServiceRecordVM.RTFNotice4 = richEditControl4.RtfText;
+ }
+ if (richEditControl5.Text != "")
+ {
+ _ServiceRecordVM.Notice5 = richEditControl5.Text;
+ _ServiceRecordVM.RTFNotice5 = richEditControl5.RtfText;
+ }
+ }
+
+ private void LoadNoticeInRTFTxte()
+ {
+ richEditControl1.Text = _ServiceRecordVM.Notice;
+ richEditControl2.Text = _ServiceRecordVM.Notice2;
+ richEditControl3.Text = _ServiceRecordVM.Notice3;
+ richEditControl4.Text = _ServiceRecordVM.Notice4;
+ richEditControl5.Text = _ServiceRecordVM.Notice5;
+
+ richEditControl1.RtfText = _ServiceRecordVM.RTFNotice;
+ richEditControl2.RtfText = _ServiceRecordVM.RTFNotice2;
+ richEditControl3.RtfText = _ServiceRecordVM.RTFNotice3;
+ richEditControl4.RtfText = _ServiceRecordVM.RTFNotice4;
+ richEditControl5.RtfText = _ServiceRecordVM.RTFNotice5;
+ }
+
private void EmployeeSearchView_CustomerSelected(object sender, EventArgs e)
{
_ServiceRecordVM.Employee = e.Data;
@@ -444,6 +504,83 @@ namespace BeWo.View.Detail
))));
}
+
+ private void ConfigureRTFDocTypes()
+ {
+ //hier der Aufruf für die RTF GEdönse
+ TabitemRtf1Note.IsSelected = true;
+
+ TabItem1_Notice.Visibility = Visibility.Collapsed;
+ TabItem2_Notice.Visibility = Visibility.Collapsed;
+ TabItem3_Notice.Visibility = Visibility.Collapsed;
+ TabItem4_Notice.Visibility = Visibility.Collapsed;
+ TabItem5_Notice.Visibility = Visibility.Collapsed;
+
+ TabitemRtf1Note.Visibility = Visibility.Visible;
+ TabitemRtf2Note.Visibility = Visibility.Visible;
+ TabitemRtf3Note.Visibility = Visibility.Visible;
+ TabitemRtf4Note.Visibility = Visibility.Visible;
+ TabitemRtf5Note.Visibility = Visibility.Visible;
+
+ int i = ViewModel.AllDocTypes.Count;
+
+ if (i == 0)
+ {
+ TabitemRtf1Note.Header = "Dokumentation";
+
+ TabitemRtf2Note.Visibility = Visibility.Collapsed;
+ TabitemRtf3Note.Visibility = Visibility.Collapsed;
+ TabitemRtf4Note.Visibility = Visibility.Collapsed;
+ TabitemRtf5Note.Visibility = Visibility.Collapsed;
+ }
+ else if (i == 1)
+ {
+ TabitemRtf1Note.Header = ViewModel.AllDocTypes[0].ToString();
+
+ TabitemRtf2Note.Visibility = Visibility.Collapsed;
+ TabitemRtf3Note.Visibility = Visibility.Collapsed;
+ TabitemRtf4Note.Visibility = Visibility.Collapsed;
+ TabitemRtf5Note.Visibility = Visibility.Collapsed;
+ }
+ else if (i == 2)
+ {
+ TabitemRtf1Note.Header = ViewModel.AllDocTypes[0].ToString();
+ TabitemRtf2Note.Header = ViewModel.AllDocTypes[1].ToString();
+
+ TabitemRtf3Note.Visibility = Visibility.Collapsed;
+ TabitemRtf4Note.Visibility = Visibility.Collapsed;
+ TabitemRtf5Note.Visibility = Visibility.Collapsed;
+ }
+ else if (i == 3)
+ {
+ TabitemRtf1Note.Header = ViewModel.AllDocTypes[0].ToString();
+ TabitemRtf2Note.Header = ViewModel.AllDocTypes[1].ToString();
+ TabitemRtf2Note.Header = ViewModel.AllDocTypes[2].ToString();
+
+ TabitemRtf4Note.Visibility = Visibility.Collapsed;
+ TabitemRtf5Note.Visibility = Visibility.Collapsed;
+ }
+ else if (i == 4)
+ {
+ TabitemRtf1Note.Header = ViewModel.AllDocTypes[0].ToString();
+ TabitemRtf2Note.Header = ViewModel.AllDocTypes[1].ToString();
+ TabitemRtf3Note.Header = ViewModel.AllDocTypes[2].ToString();
+ TabitemRtf4Note.Header = ViewModel.AllDocTypes[3].ToString();
+
+ TabitemRtf5Note.Visibility = Visibility.Collapsed;
+ }
+ else if (i == 5)
+ {
+ TabitemRtf1Note.Header = ViewModel.AllDocTypes[0].ToString();
+ TabitemRtf2Note.Header = ViewModel.AllDocTypes[1].ToString();
+ TabitemRtf3Note.Header = ViewModel.AllDocTypes[2].ToString();
+ TabitemRtf4Note.Header = ViewModel.AllDocTypes[3].ToString();
+ TabitemRtf5Note.Header = ViewModel.AllDocTypes[4].ToString();
+ }
+ }
+
+
+
private void ConfigureDocTypes()
{
//Tabs und Tabelle
diff --git a/BeWo/View/Detail/ServiceRecordGroupEditView.xaml b/BeWo/View/Detail/ServiceRecordGroupEditView.xaml
index abd28b764..1dbb11676 100644
--- a/BeWo/View/Detail/ServiceRecordGroupEditView.xaml
+++ b/BeWo/View/Detail/ServiceRecordGroupEditView.xaml
@@ -7,6 +7,9 @@
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
+ xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
+ xmlns:dxre="http://schemas.devexpress.com/winfx/2008/xaml/richedit"
+ xmlns:dxr="http://schemas.devexpress.com/winfx/2008/xaml/ribbon"
Height="Auto" Width="Auto"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Focusable="True">
@@ -304,6 +307,35 @@
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BeWo/View/Detail/ServiceRecordGroupEditView.xaml.cs b/BeWo/View/Detail/ServiceRecordGroupEditView.xaml.cs
index c39f968d6..d65945fca 100644
--- a/BeWo/View/Detail/ServiceRecordGroupEditView.xaml.cs
+++ b/BeWo/View/Detail/ServiceRecordGroupEditView.xaml.cs
@@ -127,8 +127,20 @@ namespace BeWo.View.Detail
_ServiceRecordVM.Category = _OldCategory;
_ServiceRecordVM.ServiceDescription = _OldServiceDescription;
_ServiceRecordVM.SetDirty(false);
-
- ConfigureDocTypes();
+
+
+ if (BeWoApp.AppSettings.ShowRtfTextfeld)
+ {
+ ConfigureRTFDocTypes();
+ LoadNoticeInRTFTxte();
+ }
+ else
+ {
+ ConfigureDocTypes();
+ }
+
+
+
InitSelectionList();
ConfigureServiceRecordFormats(pSelectedViewModel.ServiceRecordFormat,pSelectedViewModel.DurationInStunden.Value);
@@ -145,6 +157,20 @@ namespace BeWo.View.Detail
}
}
+ private void LoadNoticeInRTFTxte()
+ {
+ richEditControl1.Text = _ServiceRecordVM.Notice;
+ richEditControl2.Text = _ServiceRecordVM.Notice2;
+ richEditControl3.Text = _ServiceRecordVM.Notice3;
+ richEditControl4.Text = _ServiceRecordVM.Notice4;
+ richEditControl5.Text = _ServiceRecordVM.Notice5;
+
+ richEditControl1.RtfText = _ServiceRecordVM.RTFNotice;
+ richEditControl2.RtfText = _ServiceRecordVM.RTFNotice2;
+ richEditControl3.RtfText = _ServiceRecordVM.RTFNotice3;
+ richEditControl4.RtfText = _ServiceRecordVM.RTFNotice4;
+ richEditControl5.RtfText = _ServiceRecordVM.RTFNotice5;
+ }
public bool IsCustomerChangeAllowed()
{
@@ -262,11 +288,46 @@ namespace BeWo.View.Detail
return true;
}
+ private void SetRTFDaten()
+ {
+
+ if (richEditControl1.Text != "")
+ {
+ _ServiceRecordVM.Notice = richEditControl1.Text;
+ _ServiceRecordVM.RTFNotice = richEditControl1.RtfText;
+ }
+ if (richEditControl2.Text != "")
+ {
+ _ServiceRecordVM.Notice2 = richEditControl2.Text;
+ _ServiceRecordVM.RTFNotice2 = richEditControl2.RtfText;
+ }
+ if (richEditControl3.Text != "")
+ {
+ _ServiceRecordVM.Notice3 = richEditControl3.Text;
+ _ServiceRecordVM.RTFNotice3 = richEditControl3.RtfText;
+ }
+ if (richEditControl4.Text != "")
+ {
+ _ServiceRecordVM.Notice4 = richEditControl4.Text;
+ _ServiceRecordVM.RTFNotice4 = richEditControl4.RtfText;
+ }
+ if (richEditControl5.Text != "")
+ {
+ _ServiceRecordVM.Notice5 = richEditControl5.Text;
+ _ServiceRecordVM.RTFNotice5 = richEditControl5.RtfText;
+ }
+ }
+
protected override void Save()
{
if (!IsDirty)
return;
+ if (BeWoApp.AppSettings.ShowRtfTextfeld)
+ {
+ SetRTFDaten();
+ }
+
UpdateServiceRecordGroup();
@@ -637,6 +698,84 @@ namespace BeWo.View.Detail
});
}
+
+ private void ConfigureRTFDocTypes()
+ {
+ //hier der Aufruf für die RTF GEdönse
+ TabitemRtf1Note.IsSelected = true;
+
+ TabItem1_Notice.Visibility = Visibility.Collapsed;
+ TabItem2_Notice.Visibility = Visibility.Collapsed;
+ TabItem3_Notice.Visibility = Visibility.Collapsed;
+ TabItem4_Notice.Visibility = Visibility.Collapsed;
+ TabItem5_Notice.Visibility = Visibility.Collapsed;
+
+ TabitemRtf1Note.Visibility = Visibility.Visible;
+ TabitemRtf2Note.Visibility = Visibility.Visible;
+ TabitemRtf3Note.Visibility = Visibility.Visible;
+ TabitemRtf4Note.Visibility = Visibility.Visible;
+ TabitemRtf5Note.Visibility = Visibility.Visible;
+
+ int i = ViewModel.AllDocTypes.Count;
+
+ if (i == 0)
+ {
+ TabitemRtf1Note.Header = "Dokumentation";
+
+ TabitemRtf2Note.Visibility = Visibility.Collapsed;
+ TabitemRtf3Note.Visibility = Visibility.Collapsed;
+ TabitemRtf4Note.Visibility = Visibility.Collapsed;
+ TabitemRtf5Note.Visibility = Visibility.Collapsed;
+ }
+ else if (i == 1)
+ {
+ TabitemRtf1Note.Header = ViewModel.AllDocTypes[0].ToString();
+
+ TabitemRtf2Note.Visibility = Visibility.Collapsed;
+ TabitemRtf3Note.Visibility = Visibility.Collapsed;
+ TabitemRtf4Note.Visibility = Visibility.Collapsed;
+ TabitemRtf5Note.Visibility = Visibility.Collapsed;
+ }
+ else if (i == 2)
+ {
+ TabitemRtf1Note.Header = ViewModel.AllDocTypes[0].ToString();
+ TabitemRtf2Note.Header = ViewModel.AllDocTypes[1].ToString();
+
+ TabitemRtf3Note.Visibility = Visibility.Collapsed;
+ TabitemRtf4Note.Visibility = Visibility.Collapsed;
+ TabitemRtf5Note.Visibility = Visibility.Collapsed;
+ }
+ else if (i == 3)
+ {
+ TabitemRtf1Note.Header = ViewModel.AllDocTypes[0].ToString();
+ TabitemRtf2Note.Header = ViewModel.AllDocTypes[1].ToString();
+ TabitemRtf2Note.Header = ViewModel.AllDocTypes[2].ToString();
+
+ TabitemRtf4Note.Visibility = Visibility.Collapsed;
+ TabitemRtf5Note.Visibility = Visibility.Collapsed;
+ }
+ else if (i == 4)
+ {
+ TabitemRtf1Note.Header = ViewModel.AllDocTypes[0].ToString();
+ TabitemRtf2Note.Header = ViewModel.AllDocTypes[1].ToString();
+ TabitemRtf3Note.Header = ViewModel.AllDocTypes[2].ToString();
+ TabitemRtf4Note.Header = ViewModel.AllDocTypes[3].ToString();
+
+ TabitemRtf5Note.Visibility = Visibility.Collapsed;
+ }
+ else if (i == 5)
+ {
+ TabitemRtf1Note.Header = ViewModel.AllDocTypes[0].ToString();
+ TabitemRtf2Note.Header = ViewModel.AllDocTypes[1].ToString();
+ TabitemRtf3Note.Header = ViewModel.AllDocTypes[2].ToString();
+ TabitemRtf4Note.Header = ViewModel.AllDocTypes[3].ToString();
+ TabitemRtf5Note.Header = ViewModel.AllDocTypes[4].ToString();
+ }
+
+
+ }
+
+
private void ConfigureDocTypes()
{
//Tabs und Tabelle
diff --git a/BeWo/View/Detail/ServiceRecordRTFWindowView.xaml b/BeWo/View/Detail/ServiceRecordRTFWindowView.xaml
new file mode 100644
index 000000000..026a37a79
--- /dev/null
+++ b/BeWo/View/Detail/ServiceRecordRTFWindowView.xaml
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BeWo/View/Detail/ServiceRecordRTFWindowView.xaml.cs b/BeWo/View/Detail/ServiceRecordRTFWindowView.xaml.cs
new file mode 100644
index 000000000..27ee1eb51
--- /dev/null
+++ b/BeWo/View/Detail/ServiceRecordRTFWindowView.xaml.cs
@@ -0,0 +1,208 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using BeWo.ViewModel;
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.Extensions;
+
+namespace BeWo.View.Detail
+{
+ ///
+ /// Interaktionslogik für ServiceRecordRTFWindowView.xaml
+ ///
+ public partial class ServiceRecordRTFWindowView : Window
+ {
+ public event EventHandler RaiseCustomEvent;
+
+
+
+ public ServiceRecordRTFWindowView(string titel,string text, string rtfText)
+ {
+ InitializeComponent();
+
+ RtfWindow.Title = titel;
+
+ richEditControl.Text = text;
+ richEditControl.RtfText = rtfText;
+
+ // höhe und breite vom Screen nehmen und durch 2 teilen
+ Width = SystemParameters.PrimaryScreenWidth / 2;
+ Height = SystemParameters.PrimaryScreenWidth / 2;
+
+ AddClose();
+ }
+
+ private void AddClose()
+ {
+ CommandBindings.Add(new CommandBinding(ApplicationCommands.Close, (s, e) => RtfRueckgabe()));
+ }
+
+ private void RtfRueckgabe()
+ {
+ RaiseCustomEvent(this, new CustomRTFWindowArgs(richEditControl.Text,richEditControl.RtfText));
+ Close();
+ }
+
+
+ //TextBausteine Bereich
+ private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
+ {
+ popup_textbausteine.IsOpen = true;
+ }
+
+ private void TextbausteineSearchView_OnItemSelected(object sender, EventArgs e)
+ {
+ if (string.IsNullOrEmpty(richEditControl.Text))
+ {
+ richEditControl.Text = e.Data.Text;
+ richEditControl.Document.CaretPosition = richEditControl.Document.Range.End;
+ }
+ else
+ {
+ if (richEditControl.Document.CaretPosition.ToInt() == 0)
+ {
+ richEditControl.Text = e.Data.Text + richEditControl.Text;
+ }
+ else if (richEditControl.Document.CaretPosition == richEditControl.Document.Range.End)
+ {
+ richEditControl.Text = richEditControl.Text + e.Data.Text;
+ }
+ else
+ {
+ var anzahlLeerzeichen = richEditControl.Document.CaretPosition.ToInt() - richEditControl.Text.Length;
+
+ var leerzeichen = String.Empty;
+ for (var i = 0; i < anzahlLeerzeichen; i++)
+ {
+ leerzeichen += " ";
+ }
+
+ var start = richEditControl.Text.Substring(0, (richEditControl.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
+ var ende = richEditControl.Text.Substring((richEditControl.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
+
+ richEditControl.Text = start + leerzeichen + e.Data.Text + ende;
+ }
+
+ richEditControl.Document.CaretPosition = richEditControl.Document.Range.End;
+
+ popup_textbausteine.IsOpen = false;
+ }
+ }
+
+ private void EditTextbausteineClick(object sender, RoutedEventArgs e)
+ {
+ VMFactory.CreateTextbausteinListVMAsync(
+ x => this.Dispatch(delegate
+ {
+ var tbv = new TextbausteinView(x) { Background = FindResource("ApplicationBackground") as LinearGradientBrush };
+
+ var rootGrid2 = (Grid)tbv.root.Content;
+ var zielGrid = (Grid)rootGrid2.Children[0];
+ var cb = new CheckBox
+ {
+ Content = "Nur für mich sichtbar",
+ Margin = new Thickness(3),
+ HorizontalAlignment = HorizontalAlignment.Left,
+ VerticalAlignment = VerticalAlignment.Center
+ };
+
+ if (BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneBearbeiten) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleBearbeiten))
+ {
+ cb.IsEnabled = false;
+ }
+
+ var IsOnlyForEmployeeBinding = new Binding("NewVM.IsOnlyForEmployee") { Source = tbv.ViewModel, UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged };
+ BindingOperations.SetBinding(cb, ToggleButton.IsCheckedProperty, IsOnlyForEmployeeBinding);
+
+ Grid.SetColumn(cb, 0);
+ Grid.SetRow(cb, 2);
+ Grid.SetColumnSpan(cb, 4);
+
+ zielGrid.Children.Add(cb);
+
+ var stackPanel = new StackPanel { Orientation = Orientation.Horizontal, HorizontalAlignment = HorizontalAlignment.Right };
+
+ var speichernBtn = new Button
+ {
+ Content = "Speichern und schließen",
+ HorizontalAlignment = HorizontalAlignment.Right,
+ Margin = new Thickness(3),
+ VerticalAlignment = VerticalAlignment.Center
+ };
+
+ var abbrechenBtn = new Button
+ {
+ Content = "Abbrechen",
+ HorizontalAlignment = HorizontalAlignment.Right,
+ Margin = new Thickness(3),
+ VerticalAlignment = VerticalAlignment.Center
+ };
+
+ stackPanel.Children.Add(speichernBtn);
+ stackPanel.Children.Add(abbrechenBtn);
+ Grid.SetRow(stackPanel, 2);
+
+ rootGrid2.Children.Add(stackPanel);
+ tbv.root.Header = string.Empty;
+ var window = new BeWoWindow(tbv) { Width = 514, Height = 400, rootGroupBox = { Header = "Textbausteine" } };
+
+ speichernBtn.Click += (o, args) =>
+ {
+ tbv.Focus();
+ if (x.IsDirty || x.VMList.Any(vm => vm.IsDirty))
+ tbv.Save(() => { textbausteineSearchView.ServiceCategoryOid = textbausteineSearchView.ServiceCategoryOid; });
+
+ window.Close();
+ };
+
+ abbrechenBtn.Click += (o, args) =>
+ {
+ tbv.Focus();
+ tbv.DoSaveCheck();
+
+ window.Close();
+ };
+
+ window.Show();
+ }));
+ }
+
+
+ }
+
+ public class CustomRTFWindowArgs : EventArgs
+ {
+ private string _text;
+ private string _rtfText;
+
+
+ public CustomRTFWindowArgs(string txt, string rtfTxt)
+ {
+ _text = txt;
+ _rtfText = rtfTxt;
+ }
+
+ public string Text
+ {
+ get { return _text; }
+ }
+
+ public string RtfText
+ {
+ get { return _rtfText;}
+ }
+ }
+}
diff --git a/BeWo/View/Detail/ServiceRecordView2.xaml b/BeWo/View/Detail/ServiceRecordView2.xaml
index fca1fa611..fa54fd44e 100644
--- a/BeWo/View/Detail/ServiceRecordView2.xaml
+++ b/BeWo/View/Detail/ServiceRecordView2.xaml
@@ -16,6 +16,7 @@
xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
xmlns:security="clr-namespace:BeWo.Security"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+ xmlns:dxr="http://schemas.devexpress.com/winfx/2008/xaml/ribbon"
Height="Auto" Width="Auto" VerticalAlignment="Stretch" Focusable="True" HorizontalAlignment="Stretch">
@@ -861,7 +862,7 @@
-
+
@@ -893,8 +894,65 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -925,8 +983,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -955,9 +1069,64 @@
HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap"
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -987,8 +1156,63 @@
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -1018,6 +1242,65 @@
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1106,7 +1389,7 @@
-
+
diff --git a/BeWo/View/Detail/ServiceRecordView2.xaml.cs b/BeWo/View/Detail/ServiceRecordView2.xaml.cs
index 9dbdd6fcc..5c076ae75 100644
--- a/BeWo/View/Detail/ServiceRecordView2.xaml.cs
+++ b/BeWo/View/Detail/ServiceRecordView2.xaml.cs
@@ -36,6 +36,7 @@ using DevExpress.Xpf.Core;
using DevExpress.Xpf.Docking;
using DevExpress.Xpf.Docking.Platform;
using DevExpress.Xpf.Editors;
+using DevExpress.Xpf.RichEdit;
using DevExpress.XtraPrinting.Native;
using DevExpress.XtraRichEdit;
using Microsoft.Win32;
@@ -261,7 +262,13 @@ namespace BeWo.View.Detail
SetStatisticsVisibility();
- ConfigureDocTypes();
+ if(BeWoApp.AppSettings.ShowRtfTextfeld){
+ ConfigureRTFDocTypes();
+ SetRTFFontSizeFromApp();
+ }
+ else{
+ ConfigureDocTypes();
+ }
ConfigureEndDate();
@@ -273,6 +280,16 @@ namespace BeWo.View.Detail
//richEdit.ActiveViewType = RichEditViewType.Simple;
}
+ private void SetRTFFontSizeFromApp()
+ {
+ var size = BeWoApp.AppSettings.DocumentationFontSize;
+ richEditControl1.FontSize = size;
+ richEditControl2.FontSize = size;
+ richEditControl3.FontSize = size;
+ richEditControl4.FontSize = size;
+ richEditControl5.FontSize = size;
+ }
+
private void ConfigureEndDate() {
var Settings = BeWoApp.AppSettings;
@@ -360,11 +377,136 @@ namespace BeWo.View.Detail
}
+ private void ConfigureRTFDocTypes()
+ {
+ //hier der Aufruf für die RTF GEdönse
+ TabitemRtf1Note.IsSelected = true;
+
+ TabItem1_Notice.Visibility = Visibility.Collapsed;
+ TabItem2_Notice.Visibility = Visibility.Collapsed;
+ TabItem3_Notice.Visibility = Visibility.Collapsed;
+ TabItem4_Notice.Visibility = Visibility.Collapsed;
+ TabItem5_Notice.Visibility = Visibility.Collapsed;
+
+ TabitemRtf1Note.Visibility = Visibility.Visible;
+ TabitemRtf2Note.Visibility = Visibility.Visible;
+ TabitemRtf3Note.Visibility = Visibility.Visible;
+ TabitemRtf4Note.Visibility = Visibility.Visible;
+ TabitemRtf5Note.Visibility = Visibility.Visible;
+
+ int i = _ViewModel.AllDocTypes.Count;
+ DokumentationLabel.Visibility = Visibility.Collapsed;
+
+
+ if (i == 0)
+ {
+ TabitemRtf1Note.Header = "Dokumentation";
+ head_Doku1.Header = "Dokumentation";
+ DokumentationLabel.Content = "";
+
+ TabitemRtf2Note.Visibility = Visibility.Collapsed;
+ TabitemRtf3Note.Visibility = Visibility.Collapsed;
+ TabitemRtf4Note.Visibility = Visibility.Collapsed;
+ TabitemRtf5Note.Visibility = Visibility.Collapsed;
+
+ head_Doku2.Visible = false;
+ head_Doku3.Visible = false;
+ head_Doku4.Visible = false;
+ head_Doku5.Visible = false;
+
+ }
+ else if (i == 1)
+ {
+ //DokumentationLabel.Content = "Dokumentation";
+ TabitemRtf1Note.Header = _ViewModel.AllDocTypes[0].ToString();
+ head_Doku1.Header = _ViewModel.AllDocTypes[0].ToString();
+
+ TabitemRtf2Note.Visibility = Visibility.Collapsed;
+ TabitemRtf3Note.Visibility = Visibility.Collapsed;
+ TabitemRtf4Note.Visibility = Visibility.Collapsed;
+ TabitemRtf5Note.Visibility = Visibility.Collapsed;
+
+ head_Doku2.Visible = false;
+ head_Doku3.Visible = false;
+ head_Doku4.Visible = false;
+ head_Doku5.Visible = false;
+ }
+ else if (i == 2)
+ {
+ DokumentationLabel.Content = "Dokumentation";
+ TabitemRtf1Note.Header = _ViewModel.AllDocTypes[0].ToString();
+ TabitemRtf2Note.Header = _ViewModel.AllDocTypes[1].ToString();
+ head_Doku1.Header = _ViewModel.AllDocTypes[0].ToString();
+ head_Doku2.Header = _ViewModel.AllDocTypes[1].ToString();
+
+ TabitemRtf3Note.Visibility = Visibility.Collapsed;
+ TabitemRtf4Note.Visibility = Visibility.Collapsed;
+ TabitemRtf5Note.Visibility = Visibility.Collapsed;
+
+ head_Doku3.Visible = false;
+ head_Doku4.Visible = false;
+ head_Doku5.Visible = false;
+ }
+ else if (i == 3)
+ {
+ DokumentationLabel.Content = "Dokumentation";
+ TabitemRtf1Note.Header = _ViewModel.AllDocTypes[0].ToString();
+ TabitemRtf2Note.Header = _ViewModel.AllDocTypes[1].ToString();
+ TabitemRtf2Note.Header = _ViewModel.AllDocTypes[2].ToString();
+ head_Doku1.Header = _ViewModel.AllDocTypes[0].ToString();
+ head_Doku2.Header = _ViewModel.AllDocTypes[1].ToString();
+ head_Doku3.Header = _ViewModel.AllDocTypes[2].ToString();
+
+ TabitemRtf4Note.Visibility = Visibility.Collapsed;
+ TabitemRtf5Note.Visibility = Visibility.Collapsed;
+
+ head_Doku4.Visible = false;
+ head_Doku5.Visible = false;
+ }
+ else if (i == 4)
+ {
+ DokumentationLabel.Content = "Dokumentation";
+
+ TabitemRtf1Note.Header = _ViewModel.AllDocTypes[0].ToString();
+ TabitemRtf2Note.Header = _ViewModel.AllDocTypes[1].ToString();
+ TabitemRtf3Note.Header = _ViewModel.AllDocTypes[2].ToString();
+ TabitemRtf4Note.Header = _ViewModel.AllDocTypes[3].ToString();
+
+ head_Doku1.Header = _ViewModel.AllDocTypes[0].ToString();
+ head_Doku2.Header = _ViewModel.AllDocTypes[1].ToString();
+ head_Doku3.Header = _ViewModel.AllDocTypes[2].ToString();
+ head_Doku4.Header = _ViewModel.AllDocTypes[3].ToString();
+
+ TabitemRtf5Note.Visibility = Visibility.Collapsed;
+
+ head_Doku5.Visible = false;
+ }
+ else if (i == 5)
+ {
+ DokumentationLabel.Content = "Dokumentation";
+
+ TabitemRtf1Note.Header = _ViewModel.AllDocTypes[0].ToString();
+ TabitemRtf2Note.Header = _ViewModel.AllDocTypes[1].ToString();
+ TabitemRtf3Note.Header = _ViewModel.AllDocTypes[2].ToString();
+ TabitemRtf4Note.Header = _ViewModel.AllDocTypes[3].ToString();
+ TabitemRtf5Note.Header = _ViewModel.AllDocTypes[4].ToString();
+
+ head_Doku1.Header = _ViewModel.AllDocTypes[0].ToString();
+ head_Doku2.Header = _ViewModel.AllDocTypes[1].ToString();
+ head_Doku3.Header = _ViewModel.AllDocTypes[2].ToString();
+ head_Doku4.Header = _ViewModel.AllDocTypes[3].ToString();
+ head_Doku5.Header = _ViewModel.AllDocTypes[4].ToString();
+ }
+
+
+ }
+
private void ConfigureDocTypes()
{
+ TabItem1_Notice.IsSelected = true;
//Tabs und Tabelle
int i = _ViewModel.AllDocTypes.Count;
- DokumentationLabel.Visibility = System.Windows.Visibility.Collapsed;
+ DokumentationLabel.Visibility = Visibility.Collapsed;
if(i == 0)
{
TabItem1_Notice.Header = "Dokumentation";
@@ -1793,6 +1935,10 @@ namespace BeWo.View.Detail
{
//var lValid = ValidationTrigger.Validate(root, new Collection { "BedarfsmedikationsGrid" });
+ if (BeWoApp.AppSettings.ShowRtfTextfeld) {
+ SetRTFDaten();
+ }
+
var lValid = ValidationTrigger.Validate(root);
if (lValid)
@@ -1817,6 +1963,36 @@ namespace BeWo.View.Detail
return lValid;
}
+ private void SetRTFDaten()
+ {
+
+ if (richEditControl1.Text != "")
+ {
+ ViewModel.PrototypeVM.Notice = richEditControl1.Text;
+ ViewModel.PrototypeVM.RTFNotice = richEditControl1.RtfText;
+ }
+ if (richEditControl2.Text != "")
+ {
+ ViewModel.PrototypeVM.Notice2 = richEditControl2.Text;
+ ViewModel.PrototypeVM.RTFNotice2 = richEditControl2.RtfText;
+ }
+ if (richEditControl3.Text != "")
+ {
+ ViewModel.PrototypeVM.Notice3 = richEditControl3.Text;
+ ViewModel.PrototypeVM.RTFNotice3 = richEditControl3.RtfText;
+ }
+ if (richEditControl4.Text != "")
+ {
+ ViewModel.PrototypeVM.Notice4 = richEditControl4.Text;
+ ViewModel.PrototypeVM.RTFNotice4 = richEditControl4.RtfText;
+ }
+ if (richEditControl5.Text != "")
+ {
+ ViewModel.PrototypeVM.Notice5 = richEditControl5.Text;
+ ViewModel.PrototypeVM.RTFNotice5 = richEditControl5.RtfText;
+ }
+ }
+
private void SetRebookingButtonVisibility()
{
if (Eintragumbuchunsbutton == null)
@@ -2955,9 +3131,9 @@ namespace BeWo.View.Detail
private void TextbausteineSearchView_OnItemSelected(object sender, EventArgs e)
{
+ #region Tabitems
if (TabItem1_Notice.IsSelected)
- {
-
+ {
var caretIndex = dokumentationsTextBox.CaretIndex;
if (string.IsNullOrEmpty(dokumentationsTextBox.Text))
@@ -3201,6 +3377,205 @@ namespace BeWo.View.Detail
}
}
}
+ #endregion
+
+ #region RTFTabItems
+ if (TabitemRtf1Note.IsSelected)
+ {
+ if (string.IsNullOrEmpty(richEditControl1.Text))
+ {
+ richEditControl1.Text = e.Data.Text;
+ richEditControl1.Document.CaretPosition = richEditControl1.Document.Range.End;
+ }
+ else
+ {
+ if (richEditControl1.Document.CaretPosition.ToInt() == 0)
+ {
+ richEditControl1.Text = e.Data.Text + richEditControl1.Text;
+ }
+ else if (richEditControl1.Document.CaretPosition == richEditControl1.Document.Range.End)
+ {
+ richEditControl1.Text = richEditControl1.Text + e.Data.Text;
+ }
+ else
+ {
+ var anzahlLeerzeichen = richEditControl1.Document.CaretPosition.ToInt() - richEditControl1.Text.Length;
+
+ var leerzeichen = String.Empty;
+ for (var i = 0; i < anzahlLeerzeichen; i++)
+ {
+ leerzeichen += " ";
+ }
+
+ var start = richEditControl1.Text.Substring(0, (richEditControl1.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
+ var ende = richEditControl1.Text.Substring((richEditControl1.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
+
+ richEditControl1.Text = start + leerzeichen + e.Data.Text + ende;
+ }
+
+ richEditControl1.Document.CaretPosition = richEditControl1.Document.Range.End;
+
+ popup_textbausteine.IsOpen = false;
+ }
+ }
+
+ if (TabitemRtf2Note.IsSelected)
+ {
+ if (string.IsNullOrEmpty(richEditControl2.Text))
+ {
+ richEditControl2.Text = e.Data.Text;
+ richEditControl2.Document.CaretPosition = richEditControl1.Document.Range.End;
+ }
+ else
+ {
+ if (richEditControl2.Document.CaretPosition.ToInt() == 0)
+ {
+ richEditControl2.Text = e.Data.Text + richEditControl2.Text;
+ }
+ else if (richEditControl2.Document.CaretPosition == richEditControl2.Document.Range.End)
+ {
+ richEditControl2.Text = richEditControl2.Text + e.Data.Text;
+ }
+ else
+ {
+ var anzahlLeerzeichen = richEditControl2.Document.CaretPosition.ToInt() - richEditControl2.Text.Length;
+
+ var leerzeichen = String.Empty;
+ for (var i = 0; i < anzahlLeerzeichen; i++)
+ {
+ leerzeichen += " ";
+ }
+
+ var start = richEditControl2.Text.Substring(0, (richEditControl2.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
+ var ende = richEditControl2.Text.Substring((richEditControl2.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
+
+ richEditControl2.Text = start + leerzeichen + e.Data.Text + ende;
+ }
+
+ richEditControl2.Document.CaretPosition = richEditControl2.Document.Range.End;
+
+ popup_textbausteine.IsOpen = false;
+ }
+ }
+
+ if (TabitemRtf3Note.IsSelected)
+ {
+ if (string.IsNullOrEmpty(richEditControl3.Text))
+ {
+ richEditControl3.Text = e.Data.Text;
+ richEditControl3.Document.CaretPosition = richEditControl3.Document.Range.End;
+ }
+ else
+ {
+ if (richEditControl3.Document.CaretPosition.ToInt() == 0)
+ {
+ richEditControl3.Text = e.Data.Text + richEditControl1.Text;
+ }
+ else if (richEditControl3.Document.CaretPosition == richEditControl3.Document.Range.End)
+ {
+ richEditControl3.Text = richEditControl3.Text + e.Data.Text;
+ }
+ else
+ {
+ var anzahlLeerzeichen = richEditControl3.Document.CaretPosition.ToInt() - richEditControl3.Text.Length;
+
+ var leerzeichen = String.Empty;
+ for (var i = 0; i < anzahlLeerzeichen; i++)
+ {
+ leerzeichen += " ";
+ }
+
+ var start = richEditControl3.Text.Substring(0, (richEditControl3.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
+ var ende = richEditControl3.Text.Substring((richEditControl3.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
+
+ richEditControl3.Text = start + leerzeichen + e.Data.Text + ende;
+ }
+
+ richEditControl3.Document.CaretPosition = richEditControl3.Document.Range.End;
+
+ popup_textbausteine.IsOpen = false;
+ }
+ }
+
+ if (TabitemRtf4Note.IsSelected)
+ {
+ if (string.IsNullOrEmpty(richEditControl4.Text))
+ {
+ richEditControl4.Text = e.Data.Text;
+ richEditControl4.Document.CaretPosition = richEditControl4.Document.Range.End;
+ }
+ else
+ {
+ if (richEditControl4.Document.CaretPosition.ToInt() == 0)
+ {
+ richEditControl4.Text = e.Data.Text + richEditControl1.Text;
+ }
+ else if (richEditControl4.Document.CaretPosition == richEditControl4.Document.Range.End)
+ {
+ richEditControl4.Text = richEditControl4.Text + e.Data.Text;
+ }
+ else
+ {
+ var anzahlLeerzeichen = richEditControl4.Document.CaretPosition.ToInt() - richEditControl4.Text.Length;
+
+ var leerzeichen = String.Empty;
+ for (var i = 0; i < anzahlLeerzeichen; i++)
+ {
+ leerzeichen += " ";
+ }
+
+ var start = richEditControl4.Text.Substring(0, (richEditControl4.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
+ var ende = richEditControl4.Text.Substring((richEditControl4.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
+
+ richEditControl4.Text = start + leerzeichen + e.Data.Text + ende;
+ }
+
+ richEditControl4.Document.CaretPosition = richEditControl4.Document.Range.End;
+
+ popup_textbausteine.IsOpen = false;
+ }
+ }
+
+ if (TabitemRtf5Note.IsSelected)
+ {
+ if (string.IsNullOrEmpty(richEditControl5.Text))
+ {
+ richEditControl5.Text = e.Data.Text;
+ richEditControl5.Document.CaretPosition = richEditControl5.Document.Range.End;
+ }
+ else
+ {
+ if (richEditControl5.Document.CaretPosition.ToInt() == 0)
+ {
+ richEditControl5.Text = e.Data.Text + richEditControl5.Text;
+ }
+ else if (richEditControl5.Document.CaretPosition == richEditControl5.Document.Range.End)
+ {
+ richEditControl5.Text = richEditControl5.Text + e.Data.Text;
+ }
+ else
+ {
+ var anzahlLeerzeichen = richEditControl5.Document.CaretPosition.ToInt() - richEditControl5.Text.Length;
+
+ var leerzeichen = String.Empty;
+ for (var i = 0; i < anzahlLeerzeichen; i++)
+ {
+ leerzeichen += " ";
+ }
+
+ var start = richEditControl5.Text.Substring(0, (richEditControl5.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
+ var ende = richEditControl5.Text.Substring((richEditControl5.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
+
+ richEditControl5.Text = start + leerzeichen + e.Data.Text + ende;
+ }
+
+ richEditControl5.Document.CaretPosition = richEditControl5.Document.Range.End;
+
+ popup_textbausteine.IsOpen = false;
+ }
+ }
+ #endregion
+
}
private void Combobox_category_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -3367,41 +3742,63 @@ namespace BeWo.View.Detail
private void IncreaseFontSizeBtn_Click(object sender, RoutedEventArgs e)
{
- dokumentationsTextBox.FontSize++;
- BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox.FontSize;
+ if (BeWoApp.AppSettings.ShowRtfTextfeld)
+ {
+ richEditControl1.FontSize++;
+ richEditControl2.FontSize++;
+ richEditControl3.FontSize++;
+ richEditControl4.FontSize++;
+ richEditControl5.FontSize++;
- //für notize 2-5
- dokumentationsTextBox2.FontSize++;
- BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox2.FontSize;
- dokumentationsTextBox3.FontSize++;
- BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox3.FontSize;
- dokumentationsTextBox4.FontSize++;
- BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox4.FontSize;
- dokumentationsTextBox5.FontSize++;
- BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox5.FontSize;
+ BeWoApp.AppSettings.DocumentationFontSize = richEditControl1.FontSize;
+ }
+ else
+ {
+ dokumentationsTextBox.FontSize++;
+ dokumentationsTextBox2.FontSize++;
+ dokumentationsTextBox3.FontSize++;
+ dokumentationsTextBox4.FontSize++;
+ dokumentationsTextBox5.FontSize++;
+
+ BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox.FontSize;
+ }
}
private void DecreaseFontSizeBtn_Click(object sender, RoutedEventArgs e)
{
- if (dokumentationsTextBox.FontSize <= 1 || dokumentationsTextBox2.FontSize <= 1 || dokumentationsTextBox3.FontSize <= 1 ||
- dokumentationsTextBox4.FontSize <= 1 || dokumentationsTextBox5.FontSize <= 1)
+ if (BeWoApp.AppSettings.ShowRtfTextfeld)
{
- return;
- }
+ if (richEditControl1.FontSize <= 1 || richEditControl2.FontSize <= 1 || richEditControl3.FontSize <= 1 ||
+ richEditControl4.FontSize <= 1 || richEditControl5.FontSize <= 1)
+ {
+ return;
+ }
- dokumentationsTextBox.FontSize--;
- BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox.FontSize;
- dokumentationsTextBox2.FontSize--;
- BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox2.FontSize;
- dokumentationsTextBox3.FontSize--;
- BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox3.FontSize;
- dokumentationsTextBox4.FontSize--;
- BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox4.FontSize;
- dokumentationsTextBox5.FontSize--;
- BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox5.FontSize;
-
-
- }
+ richEditControl1.FontSize++;
+ richEditControl2.FontSize++;
+ richEditControl3.FontSize++;
+ richEditControl4.FontSize++;
+ richEditControl5.FontSize++;
+
+ BeWoApp.AppSettings.DocumentationFontSize = richEditControl1.FontSize;
+ }
+ else
+ {
+ if (dokumentationsTextBox.FontSize <= 1 || dokumentationsTextBox2.FontSize <= 1 || dokumentationsTextBox3.FontSize <= 1 ||
+ dokumentationsTextBox4.FontSize <= 1 || dokumentationsTextBox5.FontSize <= 1)
+ {
+ return;
+ }
+
+ dokumentationsTextBox.FontSize--;
+ dokumentationsTextBox2.FontSize--;
+ dokumentationsTextBox3.FontSize--;
+ dokumentationsTextBox4.FontSize--;
+ dokumentationsTextBox5.FontSize--;
+
+ BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox.FontSize;
+ }
+ }
//private void ZeitraumauswahlwechselBtn_Click(object sender, RoutedEventArgs e)
//{
@@ -3782,11 +4179,92 @@ namespace BeWo.View.Detail
}
+ private ServiceRecordRTFWindowView _rtfWindowView;
+ private void RTFVollBildDokuButton_OnClick(object sender, RoutedEventArgs e)
+ {
+ string stringtheorie = "";
+ string rtfStringTheorie = "";
+
+ if (TabitemRtf1Note.IsSelected)
+ {
+ stringtheorie = richEditControl1.Text;
+ rtfStringTheorie = richEditControl1.RtfText;
+ }
+ else if (TabitemRtf2Note.IsSelected)
+ {
+ stringtheorie = richEditControl2.Text;
+ rtfStringTheorie = richEditControl2.RtfText;
+ }
+ else if (TabitemRtf3Note.IsSelected)
+ {
+ stringtheorie = richEditControl3.Text;
+ rtfStringTheorie = richEditControl3.RtfText;
+ }
+ else if (TabitemRtf4Note.IsSelected)
+ {
+ stringtheorie = richEditControl4.Text;
+ rtfStringTheorie = richEditControl4.RtfText;
+ }
+ else if (TabitemRtf5Note.IsSelected)
+ {
+ stringtheorie = richEditControl5.Text;
+ rtfStringTheorie = richEditControl5.RtfText;
+ }
+
+
+ if (_rtfWindowView == null)
+ {
+ _rtfWindowView = new ServiceRecordRTFWindowView("Dokumentation", stringtheorie, rtfStringTheorie);
+
+ _rtfWindowView.RaiseCustomEvent += new EventHandler(NewWindow_RaiseRTFEvent);
+ _rtfWindowView.ShowDialog();
+ }
+ else
+ {
+ _rtfWindowView.Close();
+ _rtfWindowView = new ServiceRecordRTFWindowView("Dokumentation", stringtheorie, rtfStringTheorie);
+
+ _rtfWindowView.RaiseCustomEvent += new EventHandler(NewWindow_RaiseRTFEvent);
+ _rtfWindowView.ShowDialog();
+ }
+
+ }
+
+ private void NewWindow_RaiseRTFEvent(object sender, CustomRTFWindowArgs e)
+ {
+ if (TabitemRtf1Note.IsSelected)
+ {
+ richEditControl1.Text = e.Text;
+ richEditControl1.RtfText = e.RtfText;
+ }
+ else if (TabitemRtf2Note.IsSelected)
+ {
+ richEditControl2.Text = e.Text;
+ richEditControl2.RtfText = e.RtfText;
+ }
+ else if (TabitemRtf3Note.IsSelected)
+ {
+ richEditControl3.Text = e.Text;
+ richEditControl3.RtfText = e.RtfText;
+ }
+ else if (TabitemRtf4Note.IsSelected)
+ {
+ richEditControl4.Text = e.Text;
+ richEditControl4.RtfText = e.RtfText;
+ }
+ else if (TabitemRtf5Note.IsSelected)
+ {
+ richEditControl5.Text = e.Text;
+ richEditControl5.RtfText = e.RtfText;
+ }
+
+ _rtfWindowView.Close();
+ }
// Bedarfsmedikation
-
+
private void ChkBedarfsmedikationChecked(object sender, RoutedEventArgs e)
{
@@ -4117,5 +4595,7 @@ namespace BeWo.View.Detail
BeWoApp.SaveAppSettings();
}
}
+
+
}
}
\ No newline at end of file
diff --git a/BeWo/View/Detail/WordDocumentTemplateView.xaml b/BeWo/View/Detail/WordDocumentTemplateView.xaml
index d0ec10e8f..ae209779b 100644
--- a/BeWo/View/Detail/WordDocumentTemplateView.xaml
+++ b/BeWo/View/Detail/WordDocumentTemplateView.xaml
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localView="clr-namespace:BeWo.View"
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:localViewModel="clr-namespace:BeWo.ViewModel"
- xmlns:dxg="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v13.2"
+ xmlns:dxg="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v17.1"
xmlns:diagnostics="clr-namespace:System.Diagnostics;assembly=WindowsBase"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" Focusable="True">
diff --git a/BeWo/View/Detail/backup/AdditionalServiceView.xaml b/BeWo/View/Detail/backup/AdditionalServiceView.xaml
index 3ade265af..6e3e0bae1 100644
--- a/BeWo/View/Detail/backup/AdditionalServiceView.xaml
+++ b/BeWo/View/Detail/backup/AdditionalServiceView.xaml
@@ -12,9 +12,9 @@
xmlns:ve="http://schemas.devexpress.com/winfx/2008/xaml/docking/visualelements"
xmlns:shared2="clr-namespace:BS.Shared;assembly=BS.Shared"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
- xmlns:dxg="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v12.1"
+ xmlns:dxg="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v17.1"
xmlns:dxgt="http://schemas.devexpress.com/winfx/2008/xaml/grid/themekeys"
- xmlns:grid="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v12.1.Core"
+ xmlns:grid="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v17.1.Core"
xmlns:converter="clr-namespace:BeWo.Converter"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True" x:Name="_this">
@@ -62,7 +62,8 @@
Margin="0,0,0,0"
x:Name="path2"
VerticalAlignment="Stretch"
- Fill="#FF555555">
+ Fill="#FF555555"
+ >
-
-
+ >
+
+
+ Height="1" />
+ Height="1" />
@@ -222,7 +224,7 @@
-
+
@@ -537,7 +539,7 @@
Visibility="{Binding Path=HasParent, Converter={StaticResource BoolVisibilityConverter}}"
Grid.Column="0" Margin="3 2" VerticalAlignment="Center" />
+ Text="{Binding Path=Name}" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="Black" TextAlignment="Left" />
@@ -565,11 +567,11 @@
-
+ x:Name="startTime" Height="23" Margin="3,0,3,3" />
-
@@ -582,9 +584,9 @@
+ Grid.Column="2" Height="23" Margin="3,0,3,3" />
-
+
@@ -608,7 +610,7 @@
-
+
-
-
+
+
-
+
diff --git a/BeWo/View/Report/FLSReport/FLSOverviewChart.xaml b/BeWo/View/Report/FLSReport/FLSOverviewChart.xaml
index fd401f460..a9b1998f1 100644
--- a/BeWo/View/Report/FLSReport/FLSOverviewChart.xaml
+++ b/BeWo/View/Report/FLSReport/FLSOverviewChart.xaml
@@ -1,4 +1,6 @@
-
+
@@ -15,7 +17,7 @@
-
+
diff --git a/BeWo/ViewModel/BargeldkassenVM.cs b/BeWo/ViewModel/BargeldkassenVM.cs
index 8d15bcc2f..351919bf4 100644
--- a/BeWo/ViewModel/BargeldkassenVM.cs
+++ b/BeWo/ViewModel/BargeldkassenVM.cs
@@ -7,7 +7,7 @@ using BeWo.ViewModel.ListViewModel;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
-
+using BS.Shared.Extensions;
using DevExpress.Xpf.Editors.Helpers;
namespace BeWo.ViewModel
@@ -121,8 +121,8 @@ namespace BeWo.ViewModel
public void RecalculateTransaktionsbestaende()
{
var liste = Bargeldtransaktionen.VMList.OrderBy(o => o.Zahlungsdatum).ThenBy(t => t.DataContract.BargeldtransaktionOid);
-
- liste.ForEach(f => f.Transaktionskassenbestand = 0);
+
+ liste.DoForEach(f => f.Transaktionskassenbestand = 0);
var vorherige = liste.FirstOrDefault();
if (vorherige != null)
diff --git a/BeWo/ViewModel/ServiceRecordVM.cs b/BeWo/ViewModel/ServiceRecordVM.cs
index 24e52e4ec..39ef883a5 100644
--- a/BeWo/ViewModel/ServiceRecordVM.cs
+++ b/BeWo/ViewModel/ServiceRecordVM.cs
@@ -66,6 +66,16 @@ namespace BeWo.ViewModel
public static string PropertyName_Notice5 = "Notice5";
+ public static string PropertyName_RTFNotice = "RTFNotice";
+
+ public static string PropertyName_RTFNotice2 = "RTFNotice2";
+
+ public static string PropertyName_RTFNotice3 = "RTFNotice3";
+
+ public static string PropertyName_RTFNotice4 = "RTFNotice4";
+
+ public static string PropertyName_RTFNotice5 = "RTFNotice5";
+
public static string PropertyName_PossibleCostBearers = "PossibleCostBearers";
public static string PropertyName_PossibleCustomers = "PossibleCustomers";
@@ -170,6 +180,16 @@ namespace BeWo.ViewModel
private string _Notice5;
+ private string _RTFNotice;
+
+ private string _RTFNotice2;
+
+ private string _RTFNotice3;
+
+ private string _RTFNotice4;
+
+ private string _RTFNotice5;
+
private decimal _RoundedDuration;
private ObservableSortCollection _SelectedGoals;
@@ -1300,6 +1320,81 @@ namespace BeWo.ViewModel
}
}
+ public string RTFNotice
+ {
+ get { return _RTFNotice; }
+
+ set
+ {
+ if (AreDifferent(_RTFNotice, value))
+ {
+ _RTFNotice = value;
+ StoreDirtyInformation(AreDifferent(DataContract.RTFNotice1, value), PropertyName_RTFNotice);
+ FirePropertyChanged(PropertyName_RTFNotice);
+ }
+ }
+ }
+
+ public string RTFNotice2
+ {
+ get { return _RTFNotice2; }
+
+ set
+ {
+ if (AreDifferent(_RTFNotice2, value))
+ {
+ _RTFNotice2 = value;
+ StoreDirtyInformation(AreDifferent(DataContract.RTFNotice2, value), PropertyName_RTFNotice2);
+ FirePropertyChanged(PropertyName_RTFNotice2);
+ }
+ }
+ }
+
+ public string RTFNotice3
+ {
+ get { return _RTFNotice3; }
+
+ set
+ {
+ if (AreDifferent(_RTFNotice3, value))
+ {
+ _RTFNotice3 = value;
+ StoreDirtyInformation(AreDifferent(DataContract.RTFNotice3, value), PropertyName_RTFNotice3);
+ FirePropertyChanged(PropertyName_RTFNotice3);
+ }
+ }
+ }
+
+ public string RTFNotice4
+ {
+ get { return _RTFNotice4; }
+
+ set
+ {
+ if (AreDifferent(_RTFNotice4, value))
+ {
+ _RTFNotice4 = value;
+ StoreDirtyInformation(AreDifferent(DataContract.RTFNotice4, value), PropertyName_RTFNotice4);
+ FirePropertyChanged(PropertyName_RTFNotice4);
+ }
+ }
+ }
+
+ public string RTFNotice5
+ {
+ get { return _RTFNotice5; }
+
+ set
+ {
+ if (AreDifferent(_RTFNotice5, value))
+ {
+ _RTFNotice5 = value;
+ StoreDirtyInformation(AreDifferent(DataContract.RTFNotice5, value), PropertyName_RTFNotice5);
+ FirePropertyChanged(PropertyName_RTFNotice5);
+ }
+ }
+ }
+
public List PossibleServiceDescriptions
{
get
@@ -1995,6 +2090,11 @@ namespace BeWo.ViewModel
copy.Notice3 = Notice3;
copy.Notice4 = Notice4;
copy.Notice5 = Notice5;
+ copy.RTFNotice = RTFNotice;
+ copy.RTFNotice2 = RTFNotice2;
+ copy.RTFNotice3 = RTFNotice3;
+ copy.RTFNotice4 = RTFNotice4;
+ copy.RTFNotice5 = RTFNotice5;
copy.StartTime = StartTime;
copy.EndTime = EndTime;
copy.Date = Date;
@@ -2113,6 +2213,11 @@ namespace BeWo.ViewModel
_Notice3 = pDataContract.Notice3;
_Notice4 = pDataContract.Notice4;
_Notice5 = pDataContract.Notice5;
+ _RTFNotice = pDataContract.RTFNotice1;
+ _RTFNotice2 = pDataContract.RTFNotice2;
+ _RTFNotice3 = pDataContract.RTFNotice3;
+ _RTFNotice4 = pDataContract.RTFNotice4;
+ _RTFNotice5 = pDataContract.RTFNotice5;
_ServiceDescription = pDataContract.ServiceDescription;
_Employee = pDataContract.Employee;
_Customer = pDataContract.Customer;
@@ -2279,6 +2384,13 @@ namespace BeWo.ViewModel
pDataContract.Notice3 = _Notice3;
pDataContract.Notice4 = _Notice4;
pDataContract.Notice5 = _Notice5;
+
+ pDataContract.RTFNotice1 = _RTFNotice;
+ pDataContract.RTFNotice2 = _RTFNotice2;
+ pDataContract.RTFNotice3 = _RTFNotice3;
+ pDataContract.RTFNotice4 = _RTFNotice4;
+ pDataContract.RTFNotice5 = _RTFNotice5;
+
pDataContract.ServiceRecordType = _ServiceRecordType;
pDataContract.DistanceInMeter = _DistanceInMeter;
diff --git a/BeWo/app.config b/BeWo/app.config
index 595031416..2baa0ecc6 100644
--- a/BeWo/app.config
+++ b/BeWo/app.config
@@ -6,48 +6,75 @@
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -57,5 +84,5 @@
-
+
diff --git a/BeWoChatServer/App.config b/BeWoChatServer/App.config
index 172b592b6..d8ca9c744 100644
--- a/BeWoChatServer/App.config
+++ b/BeWoChatServer/App.config
@@ -1,13 +1,13 @@
-
+
-
+
-
-
+
+
diff --git a/BeWoChatServer/BeWoChatServer.csproj b/BeWoChatServer/BeWoChatServer.csproj
index 256c74e92..f24508bd1 100644
--- a/BeWoChatServer/BeWoChatServer.csproj
+++ b/BeWoChatServer/BeWoChatServer.csproj
@@ -9,7 +9,7 @@
Properties
BeWoChatServer
BeWoChatServer
- v4.0
+ v4.5
512
@@ -22,6 +22,7 @@
DEBUG;TRACE
prompt
4
+ false
AnyCPU
@@ -31,6 +32,7 @@
TRACE
prompt
4
+ false
diff --git a/BeWoChatServer/packages.config b/BeWoChatServer/packages.config
index 3d97f0003..08dda0570 100644
--- a/BeWoChatServer/packages.config
+++ b/BeWoChatServer/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/BeWoPlanerAndroid/BeWoPlanerAndroid.csproj b/BeWoPlanerAndroid/BeWoPlanerAndroid.csproj
index 4321ad269..c505fda9f 100644
--- a/BeWoPlanerAndroid/BeWoPlanerAndroid.csproj
+++ b/BeWoPlanerAndroid/BeWoPlanerAndroid.csproj
@@ -13,7 +13,7 @@
Properties
BeWoPlanerAndroid
BeWoPlanerAndroid
- v4.0
+ v4.5
true
@@ -30,6 +30,7 @@
DEBUG;TRACE
prompt
4
+ false
pdbonly
@@ -38,6 +39,7 @@
TRACE
prompt
4
+ false
diff --git a/BeWoPlanerAndroid/Web.config b/BeWoPlanerAndroid/Web.config
index f0cab4d14..f65e2007d 100644
--- a/BeWoPlanerAndroid/Web.config
+++ b/BeWoPlanerAndroid/Web.config
@@ -1,17 +1,17 @@
-
+
-
+
-
+
-
+
@@ -19,117 +19,127 @@
-
-
-
-
-
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
-
+
-
+
+
-
-
+
+
diff --git a/BeWoPlanerAndroid/packages.config b/BeWoPlanerAndroid/packages.config
index 87f610c69..8e913a82c 100644
--- a/BeWoPlanerAndroid/packages.config
+++ b/BeWoPlanerAndroid/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj
index 202a472c0..25d706b19 100644
--- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj
+++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj
@@ -13,7 +13,7 @@
Properties
BeWoPlanerMobil
BeWoPlanerMobil
- v4.0
+ v4.5
false
true
@@ -21,6 +21,7 @@
+
true
@@ -31,6 +32,7 @@
prompt
4
AnyCPU
+ false
pdbonly
@@ -39,6 +41,7 @@
TRACE
prompt
4
+ false
@@ -60,6 +63,7 @@
+
@@ -67,11 +71,8 @@
-
-
-
-
+
@@ -132,6 +133,7 @@
True
..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll
+
True
..\packages\WebGrease.1.3.0\lib\WebGrease.dll
diff --git a/BeWoPlanerMobil/Web.config b/BeWoPlanerMobil/Web.config
index 5d3057b1c..f01066c5e 100644
--- a/BeWoPlanerMobil/Web.config
+++ b/BeWoPlanerMobil/Web.config
@@ -1,189 +1,186 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/BeWoPlanerMobil/packages.config b/BeWoPlanerMobil/packages.config
index 60058e9cf..050d6e139 100644
--- a/BeWoPlanerMobil/packages.config
+++ b/BeWoPlanerMobil/packages.config
@@ -1,6 +1,6 @@
-
+
@@ -18,9 +18,9 @@
-
+
-
+
\ No newline at end of file
diff --git a/Controls/Controls.csproj b/Controls/Controls.csproj
index 05cbe5e13..e1f88d3e2 100644
--- a/Controls/Controls.csproj
+++ b/Controls/Controls.csproj
@@ -10,11 +10,12 @@
Properties
BeWo.Controls
BeWo.Controls
- v4.0
+ v4.5
512
{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
4
- Client
+
+
3.5
@@ -44,6 +45,7 @@
prompt
4
AllRules.ruleset
+ false
pdbonly
@@ -53,6 +55,7 @@
prompt
4
AllRules.ruleset
+ false
true
@@ -69,15 +72,17 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
false
false
+ false
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
3.0
diff --git a/Controls/Properties/Resources.Designer.cs b/Controls/Properties/Resources.Designer.cs
index 198ff28e4..c5ef6cba9 100644
--- a/Controls/Properties/Resources.Designer.cs
+++ b/Controls/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// Dieser Code wurde von einem Tool generiert.
-// Laufzeitversion:4.0.30319.225
+// Laufzeitversion:4.0.30319.42000
//
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
// der Code erneut generiert wird.
diff --git a/Controls/Properties/Settings.Designer.cs b/Controls/Properties/Settings.Designer.cs
index a748091fd..13f902c1f 100644
--- a/Controls/Properties/Settings.Designer.cs
+++ b/Controls/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// Dieser Code wurde von einem Tool generiert.
-// Laufzeitversion:4.0.30319.225
+// Laufzeitversion:4.0.30319.42000
//
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
// der Code erneut generiert wird.
@@ -12,7 +12,7 @@ namespace BeWo.Controls.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.1.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/Data/Data.csproj b/Data/Data.csproj
index d36849eb8..77243338b 100644
--- a/Data/Data.csproj
+++ b/Data/Data.csproj
@@ -10,7 +10,7 @@
Properties
BeWo.Data
BeWo.Data
- v4.0
+ v4.5
512
@@ -42,6 +42,7 @@
prompt
4
AllRules.ruleset
+ false
pdbonly
@@ -51,6 +52,7 @@
prompt
4
AllRules.ruleset
+ false
true
@@ -68,6 +70,7 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
true
false
+ false
diff --git a/Data/Entities/BeWoEntityBase.cs b/Data/Entities/BeWoEntityBase.cs
index bb0856902..fbac694f7 100644
--- a/Data/Entities/BeWoEntityBase.cs
+++ b/Data/Entities/BeWoEntityBase.cs
@@ -12,15 +12,7 @@ namespace BeWo.Data.Entities
public static string PropertyName_IsActive = "IsActive";
- public static string PropertyName_Notice = "Notice";
-
- public static string PropertyName_Notice2 = "Notice2";
-
- public static string PropertyName_Notice3 = "Notice3";
-
- public static string PropertyName_Notice4 = "Notice4";
-
- public static string PropertyName_Notice5 = "Notice5";
+ public static string PropertyName_Notice = "Notice";
public static string PropertyName_Oid = "Oid";
@@ -35,14 +27,6 @@ namespace BeWo.Data.Entities
protected string _InsUser;
protected string _Notice;
-
- protected string _Notice2;
-
- protected string _Notice3;
-
- protected string _Notice4;
-
- protected string _Notice5;
protected long? _Oid;
@@ -120,70 +104,6 @@ namespace BeWo.Data.Entities
}
}
- public virtual string Notice2
- {
- get
- {
- return this._Notice2;
- }
-
- set
- {
- if (this.AreDifferent(this._Notice2, value))
- {
- this._Notice2 = value;
- }
- }
- }
-
- public virtual string Notice3
- {
- get
- {
- return this._Notice3;
- }
-
- set
- {
- if (this.AreDifferent(this._Notice3, value))
- {
- this._Notice3 = value;
- }
- }
- }
-
- public virtual string Notice4
- {
- get
- {
- return this._Notice4;
- }
-
- set
- {
- if (this.AreDifferent(this._Notice4, value))
- {
- this._Notice4 = value;
- }
- }
- }
-
- public virtual string Notice5
- {
- get
- {
- return this._Notice5;
- }
-
- set
- {
- if (this.AreDifferent(this._Notice5, value))
- {
- this._Notice5 = value;
- }
- }
- }
-
public virtual long? Oid
{
get
diff --git a/Data/Entities/SchedulerAppointment.cs b/Data/Entities/SchedulerAppointment.cs
index 57f5a561c..b70d3cdcb 100644
--- a/Data/Entities/SchedulerAppointment.cs
+++ b/Data/Entities/SchedulerAppointment.cs
@@ -22,15 +22,23 @@ namespace BeWo.Data.Entities
public static string PropertyName_Subject = "Subject";
public static string PropertyName_Type = "Type";
public static string PropertyName_FormerBookingSequenceOid = "FormerBookingSequenceOid";
+ public static string PropertyName_Notice2 = "Notice2";
+ public static string PropertyName_Notice3 = "Notice3";
+ public static string PropertyName_Notice4 = "Notice4";
+ public static string PropertyName_Notice5 = "Notice5";
- private IList _EmployeeList;
+ private IList _EmployeeList;
private IList _CustomerList;
private IList _ResourceList;
private bool _IsPrivate;
private Employee _Originator;
private long? _FormerBookingSequenceOid;
+ private string _Notice2;
+ private string _Notice3;
+ private string _Notice4;
+ private string _Notice5;
- public SchedulerAppointment()
+ public SchedulerAppointment()
{
_Tid = TableID.NewSchedulerAppointment;
}
@@ -104,5 +112,70 @@ namespace BeWo.Data.Entities
_FormerBookingSequenceOid = value;
}
}
- }
+
+ public virtual string Notice2
+ {
+ get
+ {
+ return this._Notice2;
+ }
+
+ set
+ {
+ if (this.AreDifferent(this._Notice2, value))
+ {
+ this._Notice2 = value;
+ }
+ }
+ }
+
+ public virtual string Notice3
+ {
+ get
+ {
+ return this._Notice3;
+ }
+
+ set
+ {
+ if (this.AreDifferent(this._Notice3, value))
+ {
+ this._Notice3 = value;
+ }
+ }
+ }
+
+ public virtual string Notice4
+ {
+ get
+ {
+ return this._Notice4;
+ }
+
+ set
+ {
+ if (this.AreDifferent(this._Notice4, value))
+ {
+ this._Notice4 = value;
+ }
+ }
+ }
+
+ public virtual string Notice5
+ {
+ get
+ {
+ return this._Notice5;
+ }
+
+ set
+ {
+ if (this.AreDifferent(this._Notice5, value))
+ {
+ this._Notice5 = value;
+ }
+ }
+ }
+
+ }
}
diff --git a/Data/Entities/ServiceRecord.cs b/Data/Entities/ServiceRecord.cs
index 732824c58..ecd2e1d86 100644
--- a/Data/Entities/ServiceRecord.cs
+++ b/Data/Entities/ServiceRecord.cs
@@ -50,6 +50,24 @@ namespace BeWo.Data.Entities
public static string PropertyName_ServiceRecordFormat = "ServiceRecordFormat";
+ public static string PropertyName_RTFNotice1 = "RTFNotice1";
+
+ public static string PropertyName_RTFNotice2 = "RTFNotice2";
+
+ public static string PropertyName_RTFNotice3 = "RTFNotice3";
+
+ public static string PropertyName_RTFNotice4 = "RTFNotice4";
+
+ public static string PropertyName_RTFNotice5 = "RTFNotice5";
+
+ public static string PropertyName_Notice2 = "Notice2";
+
+ public static string PropertyName_Notice3 = "Notice3";
+
+ public static string PropertyName_Notice4 = "Notice4";
+
+ public static string PropertyName_Notice5 = "Notice5";
+
private long? _WohnheimbuchungsOid;
private bool _isCreatedInMobileClient;
@@ -102,8 +120,26 @@ namespace BeWo.Data.Entities
private ServiceRecordFormate? _ServiceRecordFormat;
+ private string _RTFNotice1;
- public virtual bool IsCreatedInMobileClient
+ private string _RTFNotice2;
+
+ private string _RTFNotice3;
+
+ private string _RTFNotice4;
+
+ private string _RTFNotice5;
+
+ private string _Notice2;
+
+ private string _Notice3;
+
+ private string _Notice4;
+
+ private string _Notice5;
+
+
+ public virtual bool IsCreatedInMobileClient
{
get
{
@@ -587,7 +623,150 @@ namespace BeWo.Data.Entities
}
}
}
-
+
+ public virtual string RTFNotice1
+ {
+ get
+ {
+ return this._RTFNotice1;
+ }
+
+ set
+ {
+ if (this.AreDifferent(this._RTFNotice1, value))
+ {
+ this._RTFNotice1 = value;
+ }
+ }
+ }
+
+ public virtual string RTFNotice2
+ {
+ get
+ {
+ return this._RTFNotice2;
+ }
+
+ set
+ {
+ if (this.AreDifferent(this._RTFNotice2, value))
+ {
+ this._RTFNotice2 = value;
+ }
+ }
+ }
+
+ public virtual string RTFNotice3
+ {
+ get
+ {
+ return this._RTFNotice3;
+ }
+
+ set
+ {
+ if (this.AreDifferent(this._RTFNotice3, value))
+ {
+ this._RTFNotice3 = value;
+ }
+ }
+ }
+
+ public virtual string RTFNotice4
+ {
+ get
+ {
+ return this._RTFNotice4;
+ }
+
+ set
+ {
+ if (this.AreDifferent(this._RTFNotice4, value))
+ {
+ this._RTFNotice4 = value;
+ }
+ }
+ }
+
+ public virtual string RTFNotice5
+ {
+ get
+ {
+ return this._RTFNotice5;
+ }
+
+ set
+ {
+ if (this.AreDifferent(this._RTFNotice5, value))
+ {
+ this._RTFNotice5 = value;
+ }
+ }
+ }
+
+ public virtual string Notice2
+ {
+ get
+ {
+ return this._Notice2;
+ }
+
+ set
+ {
+ if (this.AreDifferent(this._Notice2, value))
+ {
+ this._Notice2 = value;
+ }
+ }
+ }
+
+ public virtual string Notice3
+ {
+ get
+ {
+ return this._Notice3;
+ }
+
+ set
+ {
+ if (this.AreDifferent(this._Notice3, value))
+ {
+ this._Notice3 = value;
+ }
+ }
+ }
+
+ public virtual string Notice4
+ {
+ get
+ {
+ return this._Notice4;
+ }
+
+ set
+ {
+ if (this.AreDifferent(this._Notice4, value))
+ {
+ this._Notice4 = value;
+ }
+ }
+ }
+
+ public virtual string Notice5
+ {
+ get
+ {
+ return this._Notice5;
+ }
+
+ set
+ {
+ if (this.AreDifferent(this._Notice5, value))
+ {
+ this._Notice5 = value;
+ }
+ }
+ }
}
}
\ No newline at end of file
diff --git a/Data/Entities/ServiceRecordGroup.cs b/Data/Entities/ServiceRecordGroup.cs
index 7499e6747..365672928 100644
--- a/Data/Entities/ServiceRecordGroup.cs
+++ b/Data/Entities/ServiceRecordGroup.cs
@@ -17,6 +17,14 @@ namespace BeWo.Data.Entities
public static string PropertyName_StartDate = "StartDate";
+ public static string PropertyName_Notice2 = "Notice2";
+
+ public static string PropertyName_Notice3 = "Notice3";
+
+ public static string PropertyName_Notice4 = "Notice4";
+
+ public static string PropertyName_Notice5 = "Notice5";
+
private int _CustomerCount;
private int _EmployeeCount;
@@ -29,6 +37,14 @@ namespace BeWo.Data.Entities
private DateTime? _StartDate;
+ private string _Notice2;
+
+ private string _Notice3;
+
+ private string _Notice4;
+
+ private string _Notice5;
+
public virtual int CustomerCount
{
get
@@ -124,5 +140,71 @@ namespace BeWo.Data.Entities
}
}
}
+
+ public virtual string Notice2
+ {
+ get
+ {
+ return this._Notice2;
+ }
+
+ set
+ {
+ if (this.AreDifferent(this._Notice2, value))
+ {
+ this._Notice2 = value;
+ }
+ }
+ }
+
+ public virtual string Notice3
+ {
+ get
+ {
+ return this._Notice3;
+ }
+
+ set
+ {
+ if (this.AreDifferent(this._Notice3, value))
+ {
+ this._Notice3 = value;
+ }
+ }
+ }
+
+ public virtual string Notice4
+ {
+ get
+ {
+ return this._Notice4;
+ }
+
+ set
+ {
+ if (this.AreDifferent(this._Notice4, value))
+ {
+ this._Notice4 = value;
+ }
+ }
+ }
+
+ public virtual string Notice5
+ {
+ get
+ {
+ return this._Notice5;
+ }
+
+ set
+ {
+ if (this.AreDifferent(this._Notice5, value))
+ {
+ this._Notice5 = value;
+ }
+ }
+ }
+
+
}
}
\ No newline at end of file
diff --git a/Data/Entities/ServiceRecordHistory.cs b/Data/Entities/ServiceRecordHistory.cs
index fbeaaaec0..1ab2e3769 100644
--- a/Data/Entities/ServiceRecordHistory.cs
+++ b/Data/Entities/ServiceRecordHistory.cs
@@ -57,8 +57,16 @@ namespace BeWo.Data.Entities
public static string PropertyName_IsCreatedInMobileClient = "IsCreatedInMobileClient";
+ public static string PropertyName_Notice2 = "Notice2";
- private bool _IsCreatedInMobileClient;
+ public static string PropertyName_Notice3 = "Notice3";
+
+ public static string PropertyName_Notice4 = "Notice4";
+
+ public static string PropertyName_Notice5 = "Notice5";
+
+
+ private bool _IsCreatedInMobileClient;
public virtual bool IsCreatedInMobileClient
{
@@ -126,6 +134,14 @@ namespace BeWo.Data.Entities
private long _ServiceRecordVersion;
+ private string _Notice2;
+
+ private string _Notice3;
+
+ private string _Notice4;
+
+ private string _Notice5;
+
public virtual CostBearer2SupportConcept CostBearer2SupportConcept
{
@@ -572,5 +588,70 @@ namespace BeWo.Data.Entities
{
this._Tid = TableID.ServiceRecordHistory;
}
+
+ public virtual string Notice2
+ {
+ get
+ {
+ return this._Notice2;
+ }
+
+ set
+ {
+ if (this.AreDifferent(this._Notice2, value))
+ {
+ this._Notice2 = value;
+ }
+ }
+ }
+
+ public virtual string Notice3
+ {
+ get
+ {
+ return this._Notice3;
+ }
+
+ set
+ {
+ if (this.AreDifferent(this._Notice3, value))
+ {
+ this._Notice3 = value;
+ }
+ }
+ }
+
+ public virtual string Notice4
+ {
+ get
+ {
+ return this._Notice4;
+ }
+
+ set
+ {
+ if (this.AreDifferent(this._Notice4, value))
+ {
+ this._Notice4 = value;
+ }
+ }
+ }
+
+ public virtual string Notice5
+ {
+ get
+ {
+ return this._Notice5;
+ }
+
+ set
+ {
+ if (this.AreDifferent(this._Notice5, value))
+ {
+ this._Notice5 = value;
+ }
+ }
+ }
+
}
}
\ No newline at end of file
diff --git a/Data/Mappings/ServiceRecord.hbm.xml b/Data/Mappings/ServiceRecord.hbm.xml
index 6a64736b7..58b995648 100644
--- a/Data/Mappings/ServiceRecord.hbm.xml
+++ b/Data/Mappings/ServiceRecord.hbm.xml
@@ -38,7 +38,11 @@
-
+
+
+
+
+
diff --git a/Host/DX.aspx b/Host/DX.aspx
index e140592c2..301fce386 100644
--- a/Host/DX.aspx
+++ b/Host/DX.aspx
@@ -1,15 +1,11 @@
<%@ Page Title="" Language="C#" AutoEventWireup="true" CodeBehind="DX.aspx.cs" Inherits="Host.DX" %>
-<%@ Register Assembly="DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a"
- Namespace="DevExpress.Web.ASPxRoundPanel" TagPrefix="dx" %>
-<%@ Register Assembly="DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a"
- Namespace="DevExpress.Web.ASPxPanel" TagPrefix="dx" %>
-<%@ Register Assembly="DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a"
- Namespace="DevExpress.Web.ASPxEditors" TagPrefix="dx" %>
-<%@ Register Assembly="DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a"
- Namespace="DevExpress.Web.ASPxLoadingPanel" TagPrefix="dx" %>
-<%@ Register Assembly="DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a"
- Namespace="DevExpress.Web.ASPxDataView" TagPrefix="dx" %>
+<%@ Register Assembly="DevExpress.Web.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a"
+ Namespace="DevExpress.Web" TagPrefix="dx" %>
+
+
+
+
diff --git a/Host/DX.aspx.cs b/Host/DX.aspx.cs
index 1419107b0..f0cfb0ef7 100644
--- a/Host/DX.aspx.cs
+++ b/Host/DX.aspx.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Threading;
using System.Web.UI;
-using DevExpress.Web.ASPxClasses;
+using DevExpress.Web;
namespace Host
{
diff --git a/Host/DX.aspx.designer.cs b/Host/DX.aspx.designer.cs
index c24a03cc7..63bdd2f26 100644
--- a/Host/DX.aspx.designer.cs
+++ b/Host/DX.aspx.designer.cs
@@ -38,7 +38,7 @@ namespace Host {
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::DevExpress.Web.ASPxRoundPanel.ASPxRoundPanel ASPxRoundPanel1;
+ protected global::DevExpress.Web.ASPxRoundPanel ASPxRoundPanel1;
///
/// ASPxComboBox1 control.
@@ -47,7 +47,7 @@ namespace Host {
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::DevExpress.Web.ASPxEditors.ASPxComboBox ASPxComboBox1;
+ protected global::DevExpress.Web.ASPxComboBox ASPxComboBox1;
///
/// ASPxComboBox2 control.
@@ -56,7 +56,7 @@ namespace Host {
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::DevExpress.Web.ASPxEditors.ASPxComboBox ASPxComboBox2;
+ protected global::DevExpress.Web.ASPxComboBox ASPxComboBox2;
///
/// ASPxDataView1 control.
@@ -65,7 +65,7 @@ namespace Host {
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::DevExpress.Web.ASPxDataView.ASPxDataView ASPxDataView1;
+ protected global::DevExpress.Web.ASPxDataView ASPxDataView1;
///
/// ASPxLoadingPanel1 control.
@@ -74,6 +74,6 @@ namespace Host {
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::DevExpress.Web.ASPxLoadingPanel.ASPxLoadingPanel ASPxLoadingPanel1;
+ protected global::DevExpress.Web.ASPxLoadingPanel ASPxLoadingPanel1;
}
}
diff --git a/Host/Host.csproj b/Host/Host.csproj
index 195cc4726..706049dc0 100644
--- a/Host/Host.csproj
+++ b/Host/Host.csproj
@@ -12,7 +12,7 @@
Properties
Host
Host
- v4.0
+ v4.5
4.0
@@ -35,6 +35,7 @@
prompt
4
AllRules.ruleset
+ false
pdbonly
@@ -47,24 +48,29 @@
false
false
OnlyFilesToRunTheApp
+ false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
False
..\Lib\MySql.Data.dll
@@ -82,9 +88,9 @@
-
+
diff --git a/Host/ReportView.aspx b/Host/ReportView.aspx
index 108bc540b..7638f536f 100644
--- a/Host/ReportView.aspx
+++ b/Host/ReportView.aspx
@@ -1,3 +1,3 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ReportView.aspx.cs" Inherits="Host.ReportView" %>
-<%@ Register assembly="DevExpress.XtraReports.v13.2.Web, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraReports.Web" tagprefix="dxxr" %>
+<%@ Register assembly="DevExpress.XtraReports.v17.1.Web, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraReports.Web" tagprefix="dxxr" %>
diff --git a/Host/Web.config b/Host/Web.config
index 7411b0e7f..c50bfd416 100644
--- a/Host/Web.config
+++ b/Host/Web.config
@@ -1,12 +1,12 @@
-
+
-
-
-
-
+
+
+
+
@@ -39,19 +39,27 @@
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -59,33 +67,34 @@
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
+
@@ -144,9 +153,9 @@
-
-
-
+
+
+
@@ -180,12 +189,12 @@
-
+
@@ -194,15 +203,15 @@
-
+
-
-
-
-
+
+
+
+
diff --git a/Model/Changes_2017_07_26.txt b/Model/Changes_2017_07_26.txt
new file mode 100644
index 000000000..1ddaccce1
--- /dev/null
+++ b/Model/Changes_2017_07_26.txt
@@ -0,0 +1,11 @@
+ALTER TABLE `1234567890`.`servicerecord`
+
+ADD COLUMN `RTFNotice1` MEDIUMTEXT NULL DEFAULT NULL COMMENT '' AFTER `ServiceRecordFormat`,
+
+ADD COLUMN `RTFNotice2` MEDIUMTEXT NULL DEFAULT NULL COMMENT '' AFTER `RTFNotice1`,
+
+ADD COLUMN `RTFNotice3` MEDIUMTEXT NULL DEFAULT NULL COMMENT '' AFTER `RTFNotice2`,
+
+ADD COLUMN `RTFNotice4` MEDIUMTEXT NULL DEFAULT NULL COMMENT '' AFTER `RTFNotice3`,
+
+ADD COLUMN `RTFNotice5` MEDIUMTEXT NULL DEFAULT NULL COMMENT '' AFTER `RTFNotice4`;
diff --git a/Report/Properties/licenses.licx b/Report/Properties/licenses.licx
index f45708b13..5f282702b 100644
--- a/Report/Properties/licenses.licx
+++ b/Report/Properties/licenses.licx
@@ -1 +1 @@
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
\ No newline at end of file
diff --git a/Report/Report.csproj b/Report/Report.csproj
index fd1e5bfcf..0d57020d1 100644
--- a/Report/Report.csproj
+++ b/Report/Report.csproj
@@ -10,7 +10,7 @@
Properties
BeWo.Report
BeWo.Report
- v4.0
+ v4.5
512
@@ -43,6 +43,7 @@
4
x86
AllRules.ruleset
+ false
pdbonly
@@ -53,6 +54,7 @@
4
x86
AllRules.ruleset
+ false
true
@@ -69,32 +71,38 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
false
false
+ false
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
False
-
+
False
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.0
diff --git a/Report/app.config b/Report/app.config
index 1b2fb6dd1..aec7b1548 100644
--- a/Report/app.config
+++ b/Report/app.config
@@ -1,11 +1,11 @@
-
+
-
-
+
+
-
\ No newline at end of file
+
diff --git a/ReportImp/ABCBetreuungenReports/ABCBetreuungenReports.csproj b/ReportImp/ABCBetreuungenReports/ABCBetreuungenReports.csproj
index e45d46d87..dd5bcdfed 100644
--- a/ReportImp/ABCBetreuungenReports/ABCBetreuungenReports.csproj
+++ b/ReportImp/ABCBetreuungenReports/ABCBetreuungenReports.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/ABWElsebrock/ABWElsebrock.csproj b/ReportImp/ABWElsebrock/ABWElsebrock.csproj
index a37ee0b9f..06ff417f4 100644
--- a/ReportImp/ABWElsebrock/ABWElsebrock.csproj
+++ b/ReportImp/ABWElsebrock/ABWElsebrock.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/ASBBergischGladbachReports/ASBBergischGladbachReports.csproj b/ReportImp/ASBBergischGladbachReports/ASBBergischGladbachReports.csproj
index c9f48860f..9d6db2d50 100644
--- a/ReportImp/ASBBergischGladbachReports/ASBBergischGladbachReports.csproj
+++ b/ReportImp/ASBBergischGladbachReports/ASBBergischGladbachReports.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/ASBHammReports/ASBHammReports.csproj b/ReportImp/ASBHammReports/ASBHammReports.csproj
index 2d47b8b7b..530d00e1a 100644
--- a/ReportImp/ASBHammReports/ASBHammReports.csproj
+++ b/ReportImp/ASBHammReports/ASBHammReports.csproj
@@ -31,19 +31,24 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/AachenerVereinReports/AachenerVereinReports.csproj b/ReportImp/AachenerVereinReports/AachenerVereinReports.csproj
index d53dacf3e..549f869bd 100644
--- a/ReportImp/AachenerVereinReports/AachenerVereinReports.csproj
+++ b/ReportImp/AachenerVereinReports/AachenerVereinReports.csproj
@@ -54,20 +54,25 @@
false
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/AdikKleve/AdikKleve.csproj b/ReportImp/AdikKleve/AdikKleve.csproj
index cf5574250..d6aeec4a4 100644
--- a/ReportImp/AdikKleve/AdikKleve.csproj
+++ b/ReportImp/AdikKleve/AdikKleve.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/AidsHilfeGiessen/AidsHilfeGiessen.csproj b/ReportImp/AidsHilfeGiessen/AidsHilfeGiessen.csproj
index 813a5cf99..1b5cd97e7 100644
--- a/ReportImp/AidsHilfeGiessen/AidsHilfeGiessen.csproj
+++ b/ReportImp/AidsHilfeGiessen/AidsHilfeGiessen.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/AidsInitiativeBonn/AidsInitiativeBonn.csproj b/ReportImp/AidsInitiativeBonn/AidsInitiativeBonn.csproj
index 98ec21c90..5ed189949 100644
--- a/ReportImp/AidsInitiativeBonn/AidsInitiativeBonn.csproj
+++ b/ReportImp/AidsInitiativeBonn/AidsInitiativeBonn.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/AidsUndDrogenberatung/AidsUndDrogenberatung.csproj b/ReportImp/AidsUndDrogenberatung/AidsUndDrogenberatung.csproj
index 0929bec13..dbf60402b 100644
--- a/ReportImp/AidsUndDrogenberatung/AidsUndDrogenberatung.csproj
+++ b/ReportImp/AidsUndDrogenberatung/AidsUndDrogenberatung.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/AidshilfeDortmund/AidshilfeDortmund.csproj b/ReportImp/AidshilfeDortmund/AidshilfeDortmund.csproj
index e179d2e31..592c4112d 100644
--- a/ReportImp/AidshilfeDortmund/AidshilfeDortmund.csproj
+++ b/ReportImp/AidshilfeDortmund/AidshilfeDortmund.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/AidshilfeKassel/AidshilfeKassel.csproj b/ReportImp/AidshilfeKassel/AidshilfeKassel.csproj
index 8ae65ffac..feadfb971 100644
--- a/ReportImp/AidshilfeKassel/AidshilfeKassel.csproj
+++ b/ReportImp/AidshilfeKassel/AidshilfeKassel.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/ApiBerlin/ApiBerlin.csproj b/ReportImp/ApiBerlin/ApiBerlin.csproj
index 776677009..14249c4fc 100644
--- a/ReportImp/ApiBerlin/ApiBerlin.csproj
+++ b/ReportImp/ApiBerlin/ApiBerlin.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/AssistenzaReports/AssistenzaReports.csproj b/ReportImp/AssistenzaReports/AssistenzaReports.csproj
index 333f15ec3..97396bf8f 100644
--- a/ReportImp/AssistenzaReports/AssistenzaReports.csproj
+++ b/ReportImp/AssistenzaReports/AssistenzaReports.csproj
@@ -68,19 +68,24 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/BAPBielefelderAmbulantePflege/BAPBielefelderAmbulantePflege.csproj b/ReportImp/BAPBielefelderAmbulantePflege/BAPBielefelderAmbulantePflege.csproj
index 93c90fc32..5f11ab341 100644
--- a/ReportImp/BAPBielefelderAmbulantePflege/BAPBielefelderAmbulantePflege.csproj
+++ b/ReportImp/BAPBielefelderAmbulantePflege/BAPBielefelderAmbulantePflege.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BAPBielefelderAmbulantePflege/Properties/licenses.licx b/ReportImp/BAPBielefelderAmbulantePflege/Properties/licenses.licx
index bfe3c59aa..e69de29bb 100644
--- a/ReportImp/BAPBielefelderAmbulantePflege/Properties/licenses.licx
+++ b/ReportImp/BAPBielefelderAmbulantePflege/Properties/licenses.licx
@@ -1 +0,0 @@
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/BUGeVReports/BUGeVReports.csproj b/ReportImp/BUGeVReports/BUGeVReports.csproj
index eee90bebe..2b927c794 100644
--- a/ReportImp/BUGeVReports/BUGeVReports.csproj
+++ b/ReportImp/BUGeVReports/BUGeVReports.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BUGeVReports/Properties/licenses.licx b/ReportImp/BUGeVReports/Properties/licenses.licx
index bfe3c59aa..e69de29bb 100644
--- a/ReportImp/BUGeVReports/Properties/licenses.licx
+++ b/ReportImp/BUGeVReports/Properties/licenses.licx
@@ -1 +0,0 @@
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/BWKGbR/BWKGbR.csproj b/ReportImp/BWKGbR/BWKGbR.csproj
index ecd812574..0f0a02bae 100644
--- a/ReportImp/BWKGbR/BWKGbR.csproj
+++ b/ReportImp/BWKGbR/BWKGbR.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BeWoAlsdorf/BeWoAlsdorf.csproj b/ReportImp/BeWoAlsdorf/BeWoAlsdorf.csproj
index 954b2116d..956136432 100644
--- a/ReportImp/BeWoAlsdorf/BeWoAlsdorf.csproj
+++ b/ReportImp/BeWoAlsdorf/BeWoAlsdorf.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BeWoAlsdorf/Properties/licenses.licx b/ReportImp/BeWoAlsdorf/Properties/licenses.licx
index bfe3c59aa..e69de29bb 100644
--- a/ReportImp/BeWoAlsdorf/Properties/licenses.licx
+++ b/ReportImp/BeWoAlsdorf/Properties/licenses.licx
@@ -1 +0,0 @@
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/BeWoAmrath/BeWoAmrath.csproj b/ReportImp/BeWoAmrath/BeWoAmrath.csproj
index 6af35f21e..1caf13e2f 100644
--- a/ReportImp/BeWoAmrath/BeWoAmrath.csproj
+++ b/ReportImp/BeWoAmrath/BeWoAmrath.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BeWoAuxilio/BeWoAuxilio.csproj b/ReportImp/BeWoAuxilio/BeWoAuxilio.csproj
index 2d7afa93d..27d94c3ac 100644
--- a/ReportImp/BeWoAuxilio/BeWoAuxilio.csproj
+++ b/ReportImp/BeWoAuxilio/BeWoAuxilio.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BeWoBiallas/BeWoBiallas.csproj b/ReportImp/BeWoBiallas/BeWoBiallas.csproj
index d82531c49..ee3c27dab 100644
--- a/ReportImp/BeWoBiallas/BeWoBiallas.csproj
+++ b/ReportImp/BeWoBiallas/BeWoBiallas.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BeWoColonia5Reports/BeWoColonia5Reports.csproj b/ReportImp/BeWoColonia5Reports/BeWoColonia5Reports.csproj
index 6beb86149..74fc7719a 100644
--- a/ReportImp/BeWoColonia5Reports/BeWoColonia5Reports.csproj
+++ b/ReportImp/BeWoColonia5Reports/BeWoColonia5Reports.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BeWoColoniaKalayci/BeWoColoniaKalayci.csproj b/ReportImp/BeWoColoniaKalayci/BeWoColoniaKalayci.csproj
index e791ea2aa..7f32d1f36 100644
--- a/ReportImp/BeWoColoniaKalayci/BeWoColoniaKalayci.csproj
+++ b/ReportImp/BeWoColoniaKalayci/BeWoColoniaKalayci.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BeWoColoniaMitarbeiter/BeWoColoniaMitarbeiter.csproj b/ReportImp/BeWoColoniaMitarbeiter/BeWoColoniaMitarbeiter.csproj
index f1f4543b0..ae980a9c9 100644
--- a/ReportImp/BeWoColoniaMitarbeiter/BeWoColoniaMitarbeiter.csproj
+++ b/ReportImp/BeWoColoniaMitarbeiter/BeWoColoniaMitarbeiter.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BeWoDellbrueck/BeWoDellbrueck.csproj b/ReportImp/BeWoDellbrueck/BeWoDellbrueck.csproj
index 1af8b6da6..0cc6a88c0 100644
--- a/ReportImp/BeWoDellbrueck/BeWoDellbrueck.csproj
+++ b/ReportImp/BeWoDellbrueck/BeWoDellbrueck.csproj
@@ -69,20 +69,25 @@
false
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/BeWoDirekt/BeWoDirekt.csproj b/ReportImp/BeWoDirekt/BeWoDirekt.csproj
index b03e3be34..f601c333c 100644
--- a/ReportImp/BeWoDirekt/BeWoDirekt.csproj
+++ b/ReportImp/BeWoDirekt/BeWoDirekt.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BeWoHeinsberg/BeWoHeinsberg.csproj b/ReportImp/BeWoHeinsberg/BeWoHeinsberg.csproj
index d2b08015c..1f8ca9cc4 100644
--- a/ReportImp/BeWoHeinsberg/BeWoHeinsberg.csproj
+++ b/ReportImp/BeWoHeinsberg/BeWoHeinsberg.csproj
@@ -70,19 +70,24 @@
false
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/BeWoKerpen/BeWoKerpen.csproj b/ReportImp/BeWoKerpen/BeWoKerpen.csproj
index f2993b31d..edfe28293 100644
--- a/ReportImp/BeWoKerpen/BeWoKerpen.csproj
+++ b/ReportImp/BeWoKerpen/BeWoKerpen.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BeWoLeverkusen/BeWoLeverkusen.csproj b/ReportImp/BeWoLeverkusen/BeWoLeverkusen.csproj
index 7bf1f56cb..2b4231302 100644
--- a/ReportImp/BeWoLeverkusen/BeWoLeverkusen.csproj
+++ b/ReportImp/BeWoLeverkusen/BeWoLeverkusen.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BeWoMarinReports/BeWoMarinReports.csproj b/ReportImp/BeWoMarinReports/BeWoMarinReports.csproj
index db9f3d45b..2a905bedb 100644
--- a/ReportImp/BeWoMarinReports/BeWoMarinReports.csproj
+++ b/ReportImp/BeWoMarinReports/BeWoMarinReports.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BeWoMobilReports/BeWoMobilReports.csproj b/ReportImp/BeWoMobilReports/BeWoMobilReports.csproj
index 2da151f0a..926ff1bef 100644
--- a/ReportImp/BeWoMobilReports/BeWoMobilReports.csproj
+++ b/ReportImp/BeWoMobilReports/BeWoMobilReports.csproj
@@ -70,19 +70,24 @@
false
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/BeWoNeuss/BeWoNeuss.csproj b/ReportImp/BeWoNeuss/BeWoNeuss.csproj
index 1c95f8446..c6555321b 100644
--- a/ReportImp/BeWoNeuss/BeWoNeuss.csproj
+++ b/ReportImp/BeWoNeuss/BeWoNeuss.csproj
@@ -70,19 +70,24 @@
false
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/BeWoPlusReports/BeWoPlusReports.csproj b/ReportImp/BeWoPlusReports/BeWoPlusReports.csproj
index ee823003c..e5c7381b5 100644
--- a/ReportImp/BeWoPlusReports/BeWoPlusReports.csproj
+++ b/ReportImp/BeWoPlusReports/BeWoPlusReports.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BeWoRichartz/BeWoRichartz.csproj b/ReportImp/BeWoRichartz/BeWoRichartz.csproj
index 9e42baef2..dfcdd29ad 100644
--- a/ReportImp/BeWoRichartz/BeWoRichartz.csproj
+++ b/ReportImp/BeWoRichartz/BeWoRichartz.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BeWoRueckenwind/BeWoRueckenwind.csproj b/ReportImp/BeWoRueckenwind/BeWoRueckenwind.csproj
index c6ccec338..5662323f7 100644
--- a/ReportImp/BeWoRueckenwind/BeWoRueckenwind.csproj
+++ b/ReportImp/BeWoRueckenwind/BeWoRueckenwind.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BeWoSchillingReports/BeWoSchillingReports.csproj b/ReportImp/BeWoSchillingReports/BeWoSchillingReports.csproj
index 7d5197f9d..baad3ae10 100644
--- a/ReportImp/BeWoSchillingReports/BeWoSchillingReports.csproj
+++ b/ReportImp/BeWoSchillingReports/BeWoSchillingReports.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BeWoViersen/BeWoViersen.csproj b/ReportImp/BeWoViersen/BeWoViersen.csproj
index d08837afe..e794837fc 100644
--- a/ReportImp/BeWoViersen/BeWoViersen.csproj
+++ b/ReportImp/BeWoViersen/BeWoViersen.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BetreuWoReports/BetreuWoReports.csproj b/ReportImp/BetreuWoReports/BetreuWoReports.csproj
index 9f3d99787..cf106b619 100644
--- a/ReportImp/BetreuWoReports/BetreuWoReports.csproj
+++ b/ReportImp/BetreuWoReports/BetreuWoReports.csproj
@@ -69,19 +69,24 @@
false
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/BetreutesWohnenAmRheinReports/BetreutesWohnenAmRheinReports.csproj b/ReportImp/BetreutesWohnenAmRheinReports/BetreutesWohnenAmRheinReports.csproj
index 73b1f79e4..39e51bbd0 100644
--- a/ReportImp/BetreutesWohnenAmRheinReports/BetreutesWohnenAmRheinReports.csproj
+++ b/ReportImp/BetreutesWohnenAmRheinReports/BetreutesWohnenAmRheinReports.csproj
@@ -67,19 +67,24 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/BetreutesWohnenStLudgerus/BetreutesWohnenStLudgerus.csproj b/ReportImp/BetreutesWohnenStLudgerus/BetreutesWohnenStLudgerus.csproj
index 41f19d2f5..6b173d8ae 100644
--- a/ReportImp/BetreutesWohnenStLudgerus/BetreutesWohnenStLudgerus.csproj
+++ b/ReportImp/BetreutesWohnenStLudgerus/BetreutesWohnenStLudgerus.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BetreutesWohnenStelzel/BetreutesWohnenStelzel.csproj b/ReportImp/BetreutesWohnenStelzel/BetreutesWohnenStelzel.csproj
index abff4ecd7..31fb5effb 100644
--- a/ReportImp/BetreutesWohnenStelzel/BetreutesWohnenStelzel.csproj
+++ b/ReportImp/BetreutesWohnenStelzel/BetreutesWohnenStelzel.csproj
@@ -69,20 +69,25 @@
false
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/BetreutesWohnenWoellReports/BetreutesWohnenWoellReports.csproj b/ReportImp/BetreutesWohnenWoellReports/BetreutesWohnenWoellReports.csproj
index 4379c93c7..3882b1710 100644
--- a/ReportImp/BetreutesWohnenWoellReports/BetreutesWohnenWoellReports.csproj
+++ b/ReportImp/BetreutesWohnenWoellReports/BetreutesWohnenWoellReports.csproj
@@ -31,19 +31,24 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BetreuungsBueroScholzReport/BetreuungsBueroScholzReport.csproj b/ReportImp/BetreuungsBueroScholzReport/BetreuungsBueroScholzReport.csproj
index ca07eea99..237a0038b 100644
--- a/ReportImp/BetreuungsBueroScholzReport/BetreuungsBueroScholzReport.csproj
+++ b/ReportImp/BetreuungsBueroScholzReport/BetreuungsBueroScholzReport.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BetreuungsBueroScholzReport/Properties/licenses.licx b/ReportImp/BetreuungsBueroScholzReport/Properties/licenses.licx
index bfe3c59aa..e69de29bb 100644
--- a/ReportImp/BetreuungsBueroScholzReport/Properties/licenses.licx
+++ b/ReportImp/BetreuungsBueroScholzReport/Properties/licenses.licx
@@ -1 +0,0 @@
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/BetreuungsbueroBaak/BetreuungsbueroBaak.csproj b/ReportImp/BetreuungsbueroBaak/BetreuungsbueroBaak.csproj
index a00b8505b..8f0238d8f 100644
--- a/ReportImp/BetreuungsbueroBaak/BetreuungsbueroBaak.csproj
+++ b/ReportImp/BetreuungsbueroBaak/BetreuungsbueroBaak.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BetreuwoWesel/BetreuwoWesel.csproj b/ReportImp/BetreuwoWesel/BetreuwoWesel.csproj
index 085ad4649..2e75eb20e 100644
--- a/ReportImp/BetreuwoWesel/BetreuwoWesel.csproj
+++ b/ReportImp/BetreuwoWesel/BetreuwoWesel.csproj
@@ -34,18 +34,23 @@
..\..\Host\Bin\BS.Shared.dll
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BleibImLeben/BleibImLeben.csproj b/ReportImp/BleibImLeben/BleibImLeben.csproj
index ebc2e6b4d..d6c3919be 100644
--- a/ReportImp/BleibImLeben/BleibImLeben.csproj
+++ b/ReportImp/BleibImLeben/BleibImLeben.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BloemelingUndTeckhaus/BloemelingUndTeckhaus.csproj b/ReportImp/BloemelingUndTeckhaus/BloemelingUndTeckhaus.csproj
index 8ab84eda3..266181a47 100644
--- a/ReportImp/BloemelingUndTeckhaus/BloemelingUndTeckhaus.csproj
+++ b/ReportImp/BloemelingUndTeckhaus/BloemelingUndTeckhaus.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BrueckeABW/BrueckeABW.csproj b/ReportImp/BrueckeABW/BrueckeABW.csproj
index 7397fd252..1b078449e 100644
--- a/ReportImp/BrueckeABW/BrueckeABW.csproj
+++ b/ReportImp/BrueckeABW/BrueckeABW.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/BundBBetreutesWohnen/BundBBetreutesWohnen.csproj b/ReportImp/BundBBetreutesWohnen/BundBBetreutesWohnen.csproj
index 4bd5015a1..3efedf4f1 100644
--- a/ReportImp/BundBBetreutesWohnen/BundBBetreutesWohnen.csproj
+++ b/ReportImp/BundBBetreutesWohnen/BundBBetreutesWohnen.csproj
@@ -35,18 +35,23 @@
False
..\..\Host\Bin\BS.Shared.dll
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/CaritasAachen/CaritasAachen.csproj b/ReportImp/CaritasAachen/CaritasAachen.csproj
index cb7b61032..5ac34e5e1 100644
--- a/ReportImp/CaritasAachen/CaritasAachen.csproj
+++ b/ReportImp/CaritasAachen/CaritasAachen.csproj
@@ -70,20 +70,25 @@
false
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/CaritasBottrop/CaritasBottrop.csproj b/ReportImp/CaritasBottrop/CaritasBottrop.csproj
index f6aabdcfa..877b03b79 100644
--- a/ReportImp/CaritasBottrop/CaritasBottrop.csproj
+++ b/ReportImp/CaritasBottrop/CaritasBottrop.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/CaritasFrankfurt2Reports/CaritasFrankfurt2Reports.csproj b/ReportImp/CaritasFrankfurt2Reports/CaritasFrankfurt2Reports.csproj
index bc61baf24..20b49443a 100644
--- a/ReportImp/CaritasFrankfurt2Reports/CaritasFrankfurt2Reports.csproj
+++ b/ReportImp/CaritasFrankfurt2Reports/CaritasFrankfurt2Reports.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/CaritasFrankfurtReports/CaritasFrankfurtReports.csproj b/ReportImp/CaritasFrankfurtReports/CaritasFrankfurtReports.csproj
index 23ba4cefa..42ded2730 100644
--- a/ReportImp/CaritasFrankfurtReports/CaritasFrankfurtReports.csproj
+++ b/ReportImp/CaritasFrankfurtReports/CaritasFrankfurtReports.csproj
@@ -31,19 +31,24 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/CaritasLeverkusen/CaritasLeverkusen.csproj b/ReportImp/CaritasLeverkusen/CaritasLeverkusen.csproj
index d016b8c1d..39ccb80e4 100644
--- a/ReportImp/CaritasLeverkusen/CaritasLeverkusen.csproj
+++ b/ReportImp/CaritasLeverkusen/CaritasLeverkusen.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/CaritasLeverkusen/Properties/licenses.licx b/ReportImp/CaritasLeverkusen/Properties/licenses.licx
index bfe3c59aa..e69de29bb 100644
--- a/ReportImp/CaritasLeverkusen/Properties/licenses.licx
+++ b/ReportImp/CaritasLeverkusen/Properties/licenses.licx
@@ -1 +0,0 @@
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/CaritasUnna/CaritasUnna.csproj b/ReportImp/CaritasUnna/CaritasUnna.csproj
index f36c89092..e4a7c28b1 100644
--- a/ReportImp/CaritasUnna/CaritasUnna.csproj
+++ b/ReportImp/CaritasUnna/CaritasUnna.csproj
@@ -32,18 +32,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/CaritasUnnaWohnungslosenhilfe/CaritasUnnaWohnungslosenhilfe.csproj b/ReportImp/CaritasUnnaWohnungslosenhilfe/CaritasUnnaWohnungslosenhilfe.csproj
index 0212ac67f..aaa52c339 100644
--- a/ReportImp/CaritasUnnaWohnungslosenhilfe/CaritasUnnaWohnungslosenhilfe.csproj
+++ b/ReportImp/CaritasUnnaWohnungslosenhilfe/CaritasUnnaWohnungslosenhilfe.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/CaritasWuppertalSolingen/CaritasWuppertalSolingen.csproj b/ReportImp/CaritasWuppertalSolingen/CaritasWuppertalSolingen.csproj
index d869799c8..8fc095ca0 100644
--- a/ReportImp/CaritasWuppertalSolingen/CaritasWuppertalSolingen.csproj
+++ b/ReportImp/CaritasWuppertalSolingen/CaritasWuppertalSolingen.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/ChristopherusHaus/ChristopherusHaus.csproj b/ReportImp/ChristopherusHaus/ChristopherusHaus.csproj
index 46262860c..28b817a8b 100644
--- a/ReportImp/ChristopherusHaus/ChristopherusHaus.csproj
+++ b/ReportImp/ChristopherusHaus/ChristopherusHaus.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/Club74/Club74.csproj b/ReportImp/Club74/Club74.csproj
index eb62ee2fd..97910cabb 100644
--- a/ReportImp/Club74/Club74.csproj
+++ b/ReportImp/Club74/Club74.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/Convoi/Convoi.csproj b/ReportImp/Convoi/Convoi.csproj
index beb5e41ed..bf2eaf5f7 100644
--- a/ReportImp/Convoi/Convoi.csproj
+++ b/ReportImp/Convoi/Convoi.csproj
@@ -30,18 +30,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/DerKarren/DerKarren.csproj b/ReportImp/DerKarren/DerKarren.csproj
index 3355c030c..d912899da 100644
--- a/ReportImp/DerKarren/DerKarren.csproj
+++ b/ReportImp/DerKarren/DerKarren.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/DiakonieKKKleve/DiakonieKKKleve.csproj b/ReportImp/DiakonieKKKleve/DiakonieKKKleve.csproj
index 6f147965e..16ecaa7b3 100644
--- a/ReportImp/DiakonieKKKleve/DiakonieKKKleve.csproj
+++ b/ReportImp/DiakonieKKKleve/DiakonieKKKleve.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/DiakonieLennepReports/DiakonieLennepReports.csproj b/ReportImp/DiakonieLennepReports/DiakonieLennepReports.csproj
index e1fbe44e5..38068a31b 100644
--- a/ReportImp/DiakonieLennepReports/DiakonieLennepReports.csproj
+++ b/ReportImp/DiakonieLennepReports/DiakonieLennepReports.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/DiakonieLennepReports/Properties/licenses.licx b/ReportImp/DiakonieLennepReports/Properties/licenses.licx
index bfe3c59aa..e69de29bb 100644
--- a/ReportImp/DiakonieLennepReports/Properties/licenses.licx
+++ b/ReportImp/DiakonieLennepReports/Properties/licenses.licx
@@ -1 +0,0 @@
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/DieDueneReports/DieDueneReports.csproj b/ReportImp/DieDueneReports/DieDueneReports.csproj
index 38fab5d99..38a522751 100644
--- a/ReportImp/DieDueneReports/DieDueneReports.csproj
+++ b/ReportImp/DieDueneReports/DieDueneReports.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/DieWohnhelferReports/DieWohnhelferReports.csproj b/ReportImp/DieWohnhelferReports/DieWohnhelferReports.csproj
index 975470db5..f77af3bc5 100644
--- a/ReportImp/DieWohnhelferReports/DieWohnhelferReports.csproj
+++ b/ReportImp/DieWohnhelferReports/DieWohnhelferReports.csproj
@@ -70,18 +70,23 @@
false
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/DieWohnhelferReports/Properties/licenses.licx b/ReportImp/DieWohnhelferReports/Properties/licenses.licx
index bfe3c59aa..e69de29bb 100644
--- a/ReportImp/DieWohnhelferReports/Properties/licenses.licx
+++ b/ReportImp/DieWohnhelferReports/Properties/licenses.licx
@@ -1 +0,0 @@
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/EigentstaendigHennef/EigentstaendigHennef.csproj b/ReportImp/EigentstaendigHennef/EigentstaendigHennef.csproj
index 5abc3e04e..211f186b2 100644
--- a/ReportImp/EigentstaendigHennef/EigentstaendigHennef.csproj
+++ b/ReportImp/EigentstaendigHennef/EigentstaendigHennef.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/FaerberReports/FaerberReports.csproj b/ReportImp/FaerberReports/FaerberReports.csproj
index 8de036937..1f8e58165 100644
--- a/ReportImp/FaerberReports/FaerberReports.csproj
+++ b/ReportImp/FaerberReports/FaerberReports.csproj
@@ -67,19 +67,24 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/FeidPartnerReports/FeidPartnerReports.csproj b/ReportImp/FeidPartnerReports/FeidPartnerReports.csproj
index e7f57da59..cd446942e 100644
--- a/ReportImp/FeidPartnerReports/FeidPartnerReports.csproj
+++ b/ReportImp/FeidPartnerReports/FeidPartnerReports.csproj
@@ -67,19 +67,24 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/FibMarburg/FibMarburg.csproj b/ReportImp/FibMarburg/FibMarburg.csproj
index 1ba12f5a5..cf6ca698b 100644
--- a/ReportImp/FibMarburg/FibMarburg.csproj
+++ b/ReportImp/FibMarburg/FibMarburg.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/Findus/Findus.csproj b/ReportImp/Findus/Findus.csproj
index 85231739f..370272cb7 100644
--- a/ReportImp/Findus/Findus.csproj
+++ b/ReportImp/Findus/Findus.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/FlingernMobilReports/FlingernMobilReports.csproj b/ReportImp/FlingernMobilReports/FlingernMobilReports.csproj
index 94428cbdf..dc9a956ed 100644
--- a/ReportImp/FlingernMobilReports/FlingernMobilReports.csproj
+++ b/ReportImp/FlingernMobilReports/FlingernMobilReports.csproj
@@ -35,18 +35,23 @@
False
..\..\Host\Bin\BS.Shared.dll
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/Fortis/Fortis.csproj b/ReportImp/Fortis/Fortis.csproj
index 4771a2773..1eb33e4da 100644
--- a/ReportImp/Fortis/Fortis.csproj
+++ b/ReportImp/Fortis/Fortis.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/FortschritteEV/FortschritteEV.csproj b/ReportImp/FortschritteEV/FortschritteEV.csproj
index 811093db1..5586f0379 100644
--- a/ReportImp/FortschritteEV/FortschritteEV.csproj
+++ b/ReportImp/FortschritteEV/FortschritteEV.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/FortschritteEV/FortschritteEV.csproj.bak b/ReportImp/FortschritteEV/FortschritteEV.csproj.bak
index 7e6641908..811093db1 100644
--- a/ReportImp/FortschritteEV/FortschritteEV.csproj.bak
+++ b/ReportImp/FortschritteEV/FortschritteEV.csproj.bak
@@ -31,11 +31,18 @@
4
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/GenderBeWoReports/GenderBeWoReports.csproj b/ReportImp/GenderBeWoReports/GenderBeWoReports.csproj
index 841baa135..52e515739 100644
--- a/ReportImp/GenderBeWoReports/GenderBeWoReports.csproj
+++ b/ReportImp/GenderBeWoReports/GenderBeWoReports.csproj
@@ -67,19 +67,24 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/GerdasPflegedienst/GerdasPflegedienst.csproj b/ReportImp/GerdasPflegedienst/GerdasPflegedienst.csproj
index 3b57ed3f2..92bf37b22 100644
--- a/ReportImp/GerdasPflegedienst/GerdasPflegedienst.csproj
+++ b/ReportImp/GerdasPflegedienst/GerdasPflegedienst.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/GpzBiberachReports/GpzBiberachReports.csproj b/ReportImp/GpzBiberachReports/GpzBiberachReports.csproj
index 074fb554e..6b3e6d9c3 100644
--- a/ReportImp/GpzBiberachReports/GpzBiberachReports.csproj
+++ b/ReportImp/GpzBiberachReports/GpzBiberachReports.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/HPHBersenbrueck/HPHBersenbrueck.csproj b/ReportImp/HPHBersenbrueck/HPHBersenbrueck.csproj
index 4034c96df..134c26574 100644
--- a/ReportImp/HPHBersenbrueck/HPHBersenbrueck.csproj
+++ b/ReportImp/HPHBersenbrueck/HPHBersenbrueck.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/HausTheresia/HausTheresia.csproj b/ReportImp/HausTheresia/HausTheresia.csproj
index bab7265d9..37ff294e3 100644
--- a/ReportImp/HausTheresia/HausTheresia.csproj
+++ b/ReportImp/HausTheresia/HausTheresia.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/HausschoppReports/HausschoppReports.csproj b/ReportImp/HausschoppReports/HausschoppReports.csproj
index eb892d4c3..a4a27aa3f 100644
--- a/ReportImp/HausschoppReports/HausschoppReports.csproj
+++ b/ReportImp/HausschoppReports/HausschoppReports.csproj
@@ -70,20 +70,25 @@
false
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/HolsingerReports/HolsingerReports.csproj b/ReportImp/HolsingerReports/HolsingerReports.csproj
index 73c36837d..852bf9990 100644
--- a/ReportImp/HolsingerReports/HolsingerReports.csproj
+++ b/ReportImp/HolsingerReports/HolsingerReports.csproj
@@ -69,19 +69,24 @@
false
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/HphBersenbrueckAph/HphBersenbrueckAph.csproj b/ReportImp/HphBersenbrueckAph/HphBersenbrueckAph.csproj
index 2d7168ab4..1ffe1d80f 100644
--- a/ReportImp/HphBersenbrueckAph/HphBersenbrueckAph.csproj
+++ b/ReportImp/HphBersenbrueckAph/HphBersenbrueckAph.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/HphBersenbrueckAtz/HphBersenbrueckAtz.csproj b/ReportImp/HphBersenbrueckAtz/HphBersenbrueckAtz.csproj
index 0683c11c9..22a18dfae 100644
--- a/ReportImp/HphBersenbrueckAtz/HphBersenbrueckAtz.csproj
+++ b/ReportImp/HphBersenbrueckAtz/HphBersenbrueckAtz.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/HphBersenbrueckAtz/Properties/licenses.licx b/ReportImp/HphBersenbrueckAtz/Properties/licenses.licx
index bfe3c59aa..e69de29bb 100644
--- a/ReportImp/HphBersenbrueckAtz/Properties/licenses.licx
+++ b/ReportImp/HphBersenbrueckAtz/Properties/licenses.licx
@@ -1 +0,0 @@
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/HphBersenbrueckFreizeitUndReisen.csproj b/ReportImp/HphBersenbrueckFreizeitUndReisen/HphBersenbrueckFreizeitUndReisen.csproj
index 310562163..590f946e8 100644
--- a/ReportImp/HphBersenbrueckFreizeitUndReisen/HphBersenbrueckFreizeitUndReisen.csproj
+++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/HphBersenbrueckFreizeitUndReisen.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/Properties/licenses.licx b/ReportImp/HphBersenbrueckFreizeitUndReisen/Properties/licenses.licx
index bfe3c59aa..e69de29bb 100644
--- a/ReportImp/HphBersenbrueckFreizeitUndReisen/Properties/licenses.licx
+++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/Properties/licenses.licx
@@ -1 +0,0 @@
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/IBPReports/IBPReports.csproj b/ReportImp/IBPReports/IBPReports.csproj
index e3ef4361b..e334f2609 100644
--- a/ReportImp/IBPReports/IBPReports.csproj
+++ b/ReportImp/IBPReports/IBPReports.csproj
@@ -31,19 +31,24 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/IbpEingliederungshilfe/IbpEingliederungshilfe.csproj b/ReportImp/IbpEingliederungshilfe/IbpEingliederungshilfe.csproj
index b6dd0080f..552a4d476 100644
--- a/ReportImp/IbpEingliederungshilfe/IbpEingliederungshilfe.csproj
+++ b/ReportImp/IbpEingliederungshilfe/IbpEingliederungshilfe.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/IndroABW/IndroABW.csproj b/ReportImp/IndroABW/IndroABW.csproj
index 12bb08fc4..1f0b001b2 100644
--- a/ReportImp/IndroABW/IndroABW.csproj
+++ b/ReportImp/IndroABW/IndroABW.csproj
@@ -30,18 +30,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/IntegraHeinsbergReports/IntegraHeinsbergReports.csproj b/ReportImp/IntegraHeinsbergReports/IntegraHeinsbergReports.csproj
index 48fdf52a4..00b9256f3 100644
--- a/ReportImp/IntegraHeinsbergReports/IntegraHeinsbergReports.csproj
+++ b/ReportImp/IntegraHeinsbergReports/IntegraHeinsbergReports.csproj
@@ -70,19 +70,24 @@
false
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/IntegraReports/IntegraReports.csproj b/ReportImp/IntegraReports/IntegraReports.csproj
index 9415d3ac1..036a395cd 100644
--- a/ReportImp/IntegraReports/IntegraReports.csproj
+++ b/ReportImp/IntegraReports/IntegraReports.csproj
@@ -69,19 +69,24 @@
false
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/IntegroReports/IntegroReports.csproj b/ReportImp/IntegroReports/IntegroReports.csproj
index 7bdfff822..9b1eaa605 100644
--- a/ReportImp/IntegroReports/IntegroReports.csproj
+++ b/ReportImp/IntegroReports/IntegroReports.csproj
@@ -31,19 +31,24 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/KOMO/KOMO.csproj b/ReportImp/KOMO/KOMO.csproj
index e1d131d5b..b57a51d4f 100644
--- a/ReportImp/KOMO/KOMO.csproj
+++ b/ReportImp/KOMO/KOMO.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/KetteReports/KetteReports.csproj b/ReportImp/KetteReports/KetteReports.csproj
index 62d8fc0bb..7b43c1941 100644
--- a/ReportImp/KetteReports/KetteReports.csproj
+++ b/ReportImp/KetteReports/KetteReports.csproj
@@ -67,19 +67,24 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/KetteReports/Properties/licenses.licx b/ReportImp/KetteReports/Properties/licenses.licx
index bfe3c59aa..e69de29bb 100644
--- a/ReportImp/KetteReports/Properties/licenses.licx
+++ b/ReportImp/KetteReports/Properties/licenses.licx
@@ -1 +0,0 @@
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/KocksReports/KocksReports.csproj b/ReportImp/KocksReports/KocksReports.csproj
index 49475ad95..6d5776b5e 100644
--- a/ReportImp/KocksReports/KocksReports.csproj
+++ b/ReportImp/KocksReports/KocksReports.csproj
@@ -31,20 +31,25 @@
4
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/ReportImp/KoelnRingReports/KoelnRingReports.csproj b/ReportImp/KoelnRingReports/KoelnRingReports.csproj
index 0e223c000..d8f02eef5 100644
--- a/ReportImp/KoelnRingReports/KoelnRingReports.csproj
+++ b/ReportImp/KoelnRingReports/KoelnRingReports.csproj
@@ -68,19 +68,24 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/KomMitBewo/KomMitBewo.csproj b/ReportImp/KomMitBewo/KomMitBewo.csproj
index 42872a8d1..571b7bb46 100644
--- a/ReportImp/KomMitBewo/KomMitBewo.csproj
+++ b/ReportImp/KomMitBewo/KomMitBewo.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/KontaktUndKrisenhilfeReports/KontaktUndKrisenhilfeReports.csproj b/ReportImp/KontaktUndKrisenhilfeReports/KontaktUndKrisenhilfeReports.csproj
index 8bb5c2b91..257d31792 100644
--- a/ReportImp/KontaktUndKrisenhilfeReports/KontaktUndKrisenhilfeReports.csproj
+++ b/ReportImp/KontaktUndKrisenhilfeReports/KontaktUndKrisenhilfeReports.csproj
@@ -71,19 +71,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/LWVEingliederungshilfe/LWVEingliederungshilfe.csproj b/ReportImp/LWVEingliederungshilfe/LWVEingliederungshilfe.csproj
index c93a3d18d..335d7a900 100644
--- a/ReportImp/LWVEingliederungshilfe/LWVEingliederungshilfe.csproj
+++ b/ReportImp/LWVEingliederungshilfe/LWVEingliederungshilfe.csproj
@@ -30,17 +30,22 @@
4
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/LebenshilfeAhrweiler/LebenshilfeAhrweiler.csproj b/ReportImp/LebenshilfeAhrweiler/LebenshilfeAhrweiler.csproj
index 759b17745..ba2b2a05e 100644
--- a/ReportImp/LebenshilfeAhrweiler/LebenshilfeAhrweiler.csproj
+++ b/ReportImp/LebenshilfeAhrweiler/LebenshilfeAhrweiler.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/LebenshilfeAhrweiler/Properties/licenses.licx b/ReportImp/LebenshilfeAhrweiler/Properties/licenses.licx
index bfe3c59aa..e69de29bb 100644
--- a/ReportImp/LebenshilfeAhrweiler/Properties/licenses.licx
+++ b/ReportImp/LebenshilfeAhrweiler/Properties/licenses.licx
@@ -1 +0,0 @@
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/LebenshilfeBorkenReports/LebenshilfeBorkenReports.csproj b/ReportImp/LebenshilfeBorkenReports/LebenshilfeBorkenReports.csproj
index 5b8bef69a..e4af669b2 100644
--- a/ReportImp/LebenshilfeBorkenReports/LebenshilfeBorkenReports.csproj
+++ b/ReportImp/LebenshilfeBorkenReports/LebenshilfeBorkenReports.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/LebenshilfeCoburg/LebenshilfeCoburg.csproj b/ReportImp/LebenshilfeCoburg/LebenshilfeCoburg.csproj
index 1e1bec55a..0f4fe768b 100644
--- a/ReportImp/LebenshilfeCoburg/LebenshilfeCoburg.csproj
+++ b/ReportImp/LebenshilfeCoburg/LebenshilfeCoburg.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/LebenshilfeDuisburgReports/LebenshilfeDuisburgReports.csproj b/ReportImp/LebenshilfeDuisburgReports/LebenshilfeDuisburgReports.csproj
index 9fa8ec48e..22b74e259 100644
--- a/ReportImp/LebenshilfeDuisburgReports/LebenshilfeDuisburgReports.csproj
+++ b/ReportImp/LebenshilfeDuisburgReports/LebenshilfeDuisburgReports.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/LebenshilfeDuisburgServicePlus/LebenshilfeDuisburgServicePlus.csproj b/ReportImp/LebenshilfeDuisburgServicePlus/LebenshilfeDuisburgServicePlus.csproj
index 29723b17b..734d3aab0 100644
--- a/ReportImp/LebenshilfeDuisburgServicePlus/LebenshilfeDuisburgServicePlus.csproj
+++ b/ReportImp/LebenshilfeDuisburgServicePlus/LebenshilfeDuisburgServicePlus.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/LebenshilfeEssenReports/LebenshilfeEssenReports.csproj b/ReportImp/LebenshilfeEssenReports/LebenshilfeEssenReports.csproj
index d9f5316c6..7647d3776 100644
--- a/ReportImp/LebenshilfeEssenReports/LebenshilfeEssenReports.csproj
+++ b/ReportImp/LebenshilfeEssenReports/LebenshilfeEssenReports.csproj
@@ -45,19 +45,24 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/LebenshilfeHannoverReports/LebenshilfeHannoverReports.csproj b/ReportImp/LebenshilfeHannoverReports/LebenshilfeHannoverReports.csproj
index fa0eb1a67..b05d20154 100644
--- a/ReportImp/LebenshilfeHannoverReports/LebenshilfeHannoverReports.csproj
+++ b/ReportImp/LebenshilfeHannoverReports/LebenshilfeHannoverReports.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/LebenshilfeKoblenz/LebenshilfeKoblenz.csproj b/ReportImp/LebenshilfeKoblenz/LebenshilfeKoblenz.csproj
index 5aeed5f4f..183128c46 100644
--- a/ReportImp/LebenshilfeKoblenz/LebenshilfeKoblenz.csproj
+++ b/ReportImp/LebenshilfeKoblenz/LebenshilfeKoblenz.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/LebenshilfeMannheimEV/LebenshilfeMannheimEV.csproj b/ReportImp/LebenshilfeMannheimEV/LebenshilfeMannheimEV.csproj
index 5569e5d56..e751a4e90 100644
--- a/ReportImp/LebenshilfeMannheimEV/LebenshilfeMannheimEV.csproj
+++ b/ReportImp/LebenshilfeMannheimEV/LebenshilfeMannheimEV.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/LebenshilfeMannheimEV/Properties/licenses.licx b/ReportImp/LebenshilfeMannheimEV/Properties/licenses.licx
index bfe3c59aa..e69de29bb 100644
--- a/ReportImp/LebenshilfeMannheimEV/Properties/licenses.licx
+++ b/ReportImp/LebenshilfeMannheimEV/Properties/licenses.licx
@@ -1 +0,0 @@
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/LebenshilfeRemscheid/LebenshilfeRemscheid.csproj b/ReportImp/LebenshilfeRemscheid/LebenshilfeRemscheid.csproj
index 0fd2ff294..94253e718 100644
--- a/ReportImp/LebenshilfeRemscheid/LebenshilfeRemscheid.csproj
+++ b/ReportImp/LebenshilfeRemscheid/LebenshilfeRemscheid.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/LebenshilfeRheinSiegReports/LebenshilfeRheinSiegReports.csproj b/ReportImp/LebenshilfeRheinSiegReports/LebenshilfeRheinSiegReports.csproj
index 0344c1148..bce58bc9d 100644
--- a/ReportImp/LebenshilfeRheinSiegReports/LebenshilfeRheinSiegReports.csproj
+++ b/ReportImp/LebenshilfeRheinSiegReports/LebenshilfeRheinSiegReports.csproj
@@ -69,19 +69,24 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/LebenshilfeRodenkirchenReports/LebenshilfeRodenkirchenReports.csproj b/ReportImp/LebenshilfeRodenkirchenReports/LebenshilfeRodenkirchenReports.csproj
index 22f033d84..abde0ac9c 100644
--- a/ReportImp/LebenshilfeRodenkirchenReports/LebenshilfeRodenkirchenReports.csproj
+++ b/ReportImp/LebenshilfeRodenkirchenReports/LebenshilfeRodenkirchenReports.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/LebenshilfeStade/LebenshilfeStade.csproj b/ReportImp/LebenshilfeStade/LebenshilfeStade.csproj
index 9fdb83ba1..26968444b 100644
--- a/ReportImp/LebenshilfeStade/LebenshilfeStade.csproj
+++ b/ReportImp/LebenshilfeStade/LebenshilfeStade.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/LebenshilfeWarendorf/LebenshilfeWarendorf.csproj b/ReportImp/LebenshilfeWarendorf/LebenshilfeWarendorf.csproj
index c8f442e4a..ec0d27073 100644
--- a/ReportImp/LebenshilfeWarendorf/LebenshilfeWarendorf.csproj
+++ b/ReportImp/LebenshilfeWarendorf/LebenshilfeWarendorf.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/LebenshilfeWetterau/LebenshilfeWetterau.csproj b/ReportImp/LebenshilfeWetterau/LebenshilfeWetterau.csproj
index eb31f1b9c..1433e75c6 100644
--- a/ReportImp/LebenshilfeWetterau/LebenshilfeWetterau.csproj
+++ b/ReportImp/LebenshilfeWetterau/LebenshilfeWetterau.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/LebenshilfeWuerzburgReports/LebenshilfeWuerzburgReports.csproj b/ReportImp/LebenshilfeWuerzburgReports/LebenshilfeWuerzburgReports.csproj
index 01aac1d8f..5ee04037d 100644
--- a/ReportImp/LebenshilfeWuerzburgReports/LebenshilfeWuerzburgReports.csproj
+++ b/ReportImp/LebenshilfeWuerzburgReports/LebenshilfeWuerzburgReports.csproj
@@ -65,19 +65,24 @@
false
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/LebensweltGabrielReports/LebensweltGabrielReports.csproj b/ReportImp/LebensweltGabrielReports/LebensweltGabrielReports.csproj
index 14fc6b768..be0b985d4 100644
--- a/ReportImp/LebensweltGabrielReports/LebensweltGabrielReports.csproj
+++ b/ReportImp/LebensweltGabrielReports/LebensweltGabrielReports.csproj
@@ -68,20 +68,25 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/LeiendeckerReports/LeiendeckerReports.csproj b/ReportImp/LeiendeckerReports/LeiendeckerReports.csproj
index eb8be5df4..78a57fa60 100644
--- a/ReportImp/LeiendeckerReports/LeiendeckerReports.csproj
+++ b/ReportImp/LeiendeckerReports/LeiendeckerReports.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/LoslebenReports/LoslebenReports.csproj b/ReportImp/LoslebenReports/LoslebenReports.csproj
index d33df5279..e0f7eb03a 100644
--- a/ReportImp/LoslebenReports/LoslebenReports.csproj
+++ b/ReportImp/LoslebenReports/LoslebenReports.csproj
@@ -68,20 +68,25 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/Marienhospital/Marienhospital.csproj b/ReportImp/Marienhospital/Marienhospital.csproj
index 15c3a3181..5e4023f9f 100644
--- a/ReportImp/Marienhospital/Marienhospital.csproj
+++ b/ReportImp/Marienhospital/Marienhospital.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/MeinBetreutesWohnen/MeinBetreutesWohnen.csproj b/ReportImp/MeinBetreutesWohnen/MeinBetreutesWohnen.csproj
index 485d3331f..0168d0ebb 100644
--- a/ReportImp/MeinBetreutesWohnen/MeinBetreutesWohnen.csproj
+++ b/ReportImp/MeinBetreutesWohnen/MeinBetreutesWohnen.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/MezMenzelReports/MezMenzelReports.csproj b/ReportImp/MezMenzelReports/MezMenzelReports.csproj
index 8c8555a52..b6da8fb0f 100644
--- a/ReportImp/MezMenzelReports/MezMenzelReports.csproj
+++ b/ReportImp/MezMenzelReports/MezMenzelReports.csproj
@@ -70,20 +70,25 @@
true
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/Mittendrin/Mittendrin.csproj b/ReportImp/Mittendrin/Mittendrin.csproj
index bfba4c619..e6812deb3 100644
--- a/ReportImp/Mittendrin/Mittendrin.csproj
+++ b/ReportImp/Mittendrin/Mittendrin.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/Monvita/Monvita.csproj b/ReportImp/Monvita/Monvita.csproj
index 2786867d5..dba3dd42e 100644
--- a/ReportImp/Monvita/Monvita.csproj
+++ b/ReportImp/Monvita/Monvita.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/MuellestumpeReports/MuellestumpeReports.csproj b/ReportImp/MuellestumpeReports/MuellestumpeReports.csproj
index 428ced332..7122d01ce 100644
--- a/ReportImp/MuellestumpeReports/MuellestumpeReports.csproj
+++ b/ReportImp/MuellestumpeReports/MuellestumpeReports.csproj
@@ -45,20 +45,25 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/ReportImp/PURReports/PURReports.csproj b/ReportImp/PURReports/PURReports.csproj
index f84fb4099..f2fbe2207 100644
--- a/ReportImp/PURReports/PURReports.csproj
+++ b/ReportImp/PURReports/PURReports.csproj
@@ -31,22 +31,25 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/PouginReports/PouginReports.csproj b/ReportImp/PouginReports/PouginReports.csproj
index 715a2279c..203ba0f7b 100644
--- a/ReportImp/PouginReports/PouginReports.csproj
+++ b/ReportImp/PouginReports/PouginReports.csproj
@@ -69,19 +69,24 @@
false
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/Praesentation/Praesentation.csproj b/ReportImp/Praesentation/Praesentation.csproj
index 78a29b460..57a7bc375 100644
--- a/ReportImp/Praesentation/Praesentation.csproj
+++ b/ReportImp/Praesentation/Praesentation.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/Praesentation/Properties/licenses.licx b/ReportImp/Praesentation/Properties/licenses.licx
index bfe3c59aa..e69de29bb 100644
--- a/ReportImp/Praesentation/Properties/licenses.licx
+++ b/ReportImp/Praesentation/Properties/licenses.licx
@@ -1 +0,0 @@
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/PraunheimerWerkstaettenGmbh/PraunheimerWerkstaettenGmbh.csproj b/ReportImp/PraunheimerWerkstaettenGmbh/PraunheimerWerkstaettenGmbh.csproj
index f9262fab8..7d2309492 100644
--- a/ReportImp/PraunheimerWerkstaettenGmbh/PraunheimerWerkstaettenGmbh.csproj
+++ b/ReportImp/PraunheimerWerkstaettenGmbh/PraunheimerWerkstaettenGmbh.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/ProfEggersStiftung/ProfEggersStiftung.csproj b/ReportImp/ProfEggersStiftung/ProfEggersStiftung.csproj
index 972bf4af9..eeb0b5ce6 100644
--- a/ReportImp/ProfEggersStiftung/ProfEggersStiftung.csproj
+++ b/ReportImp/ProfEggersStiftung/ProfEggersStiftung.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/PsychosozialerTraegervereinReports/PsychosozialerTraegervereinReports.csproj b/ReportImp/PsychosozialerTraegervereinReports/PsychosozialerTraegervereinReports.csproj
index 6f298ff2f..f4fa79ddb 100644
--- a/ReportImp/PsychosozialerTraegervereinReports/PsychosozialerTraegervereinReports.csproj
+++ b/ReportImp/PsychosozialerTraegervereinReports/PsychosozialerTraegervereinReports.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/RessourceEV/RessourceEV.csproj b/ReportImp/RessourceEV/RessourceEV.csproj
index 501319f7f..192f4fe77 100644
--- a/ReportImp/RessourceEV/RessourceEV.csproj
+++ b/ReportImp/RessourceEV/RessourceEV.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/SBBMainzReports/SBBMainzReports.csproj b/ReportImp/SBBMainzReports/SBBMainzReports.csproj
index 1ddba7fb4..893312469 100644
--- a/ReportImp/SBBMainzReports/SBBMainzReports.csproj
+++ b/ReportImp/SBBMainzReports/SBBMainzReports.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/SHGSchwerte/Properties/licenses.licx b/ReportImp/SHGSchwerte/Properties/licenses.licx
index bfe3c59aa..e69de29bb 100644
--- a/ReportImp/SHGSchwerte/Properties/licenses.licx
+++ b/ReportImp/SHGSchwerte/Properties/licenses.licx
@@ -1 +0,0 @@
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/SHGSchwerte/SHGSchwerte.csproj b/ReportImp/SHGSchwerte/SHGSchwerte.csproj
index 594e42384..2f0ba7c6c 100644
--- a/ReportImp/SHGSchwerte/SHGSchwerte.csproj
+++ b/ReportImp/SHGSchwerte/SHGSchwerte.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/SKFAlsdorf/Properties/licenses.licx b/ReportImp/SKFAlsdorf/Properties/licenses.licx
index bfe3c59aa..e69de29bb 100644
--- a/ReportImp/SKFAlsdorf/Properties/licenses.licx
+++ b/ReportImp/SKFAlsdorf/Properties/licenses.licx
@@ -1 +0,0 @@
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/SKFAlsdorf/SKFAlsdorf.csproj b/ReportImp/SKFAlsdorf/SKFAlsdorf.csproj
index 6730af337..cc13ef0d4 100644
--- a/ReportImp/SKFAlsdorf/SKFAlsdorf.csproj
+++ b/ReportImp/SKFAlsdorf/SKFAlsdorf.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/SPZLeverkusen/SPZLeverkusen.csproj b/ReportImp/SPZLeverkusen/SPZLeverkusen.csproj
index 67236c58a..5bf0d2c49 100644
--- a/ReportImp/SPZLeverkusen/SPZLeverkusen.csproj
+++ b/ReportImp/SPZLeverkusen/SPZLeverkusen.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/SPZRatingen/SPZRatingen.csproj b/ReportImp/SPZRatingen/SPZRatingen.csproj
index 4cf2c9f2f..19ceb2d7b 100644
--- a/ReportImp/SPZRatingen/SPZRatingen.csproj
+++ b/ReportImp/SPZRatingen/SPZRatingen.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/Salem/Salem.csproj b/ReportImp/Salem/Salem.csproj
index c5c4e38c5..e66924df3 100644
--- a/ReportImp/Salem/Salem.csproj
+++ b/ReportImp/Salem/Salem.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/SchillingerReports/SchillingerReports.csproj b/ReportImp/SchillingerReports/SchillingerReports.csproj
index 66138ec9e..5730d2fde 100644
--- a/ReportImp/SchillingerReports/SchillingerReports.csproj
+++ b/ReportImp/SchillingerReports/SchillingerReports.csproj
@@ -45,19 +45,24 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/SchoengeistReports/SchoengeistReports.csproj b/ReportImp/SchoengeistReports/SchoengeistReports.csproj
index 9618ff68d..59e8668e2 100644
--- a/ReportImp/SchoengeistReports/SchoengeistReports.csproj
+++ b/ReportImp/SchoengeistReports/SchoengeistReports.csproj
@@ -68,20 +68,25 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/SeWo/Properties/licenses.licx b/ReportImp/SeWo/Properties/licenses.licx
index bfe3c59aa..e69de29bb 100644
--- a/ReportImp/SeWo/Properties/licenses.licx
+++ b/ReportImp/SeWo/Properties/licenses.licx
@@ -1 +0,0 @@
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/SeWo/SeWo.csproj b/ReportImp/SeWo/SeWo.csproj
index 62d731c9c..09247b672 100644
--- a/ReportImp/SeWo/SeWo.csproj
+++ b/ReportImp/SeWo/SeWo.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/SelwoReports/SelwoReports.csproj b/ReportImp/SelwoReports/SelwoReports.csproj
index c1d7dfe73..4abf72f7d 100644
--- a/ReportImp/SelwoReports/SelwoReports.csproj
+++ b/ReportImp/SelwoReports/SelwoReports.csproj
@@ -69,19 +69,24 @@
false
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/SeverinReports/SeverinReports.csproj b/ReportImp/SeverinReports/SeverinReports.csproj
index 9dc93e96a..f0dada849 100644
--- a/ReportImp/SeverinReports/SeverinReports.csproj
+++ b/ReportImp/SeverinReports/SeverinReports.csproj
@@ -67,20 +67,25 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/SigncomReports/SigncomReports.csproj b/ReportImp/SigncomReports/SigncomReports.csproj
index 6e34a2c68..7a2707cbe 100644
--- a/ReportImp/SigncomReports/SigncomReports.csproj
+++ b/ReportImp/SigncomReports/SigncomReports.csproj
@@ -31,20 +31,25 @@
4
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/ReportImp/SkmMenden/SkmMenden.csproj b/ReportImp/SkmMenden/SkmMenden.csproj
index 4e5e45ac4..720f67042 100644
--- a/ReportImp/SkmMenden/SkmMenden.csproj
+++ b/ReportImp/SkmMenden/SkmMenden.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/Socia/SociaKoeln.csproj b/ReportImp/Socia/SociaKoeln.csproj
index 7d9870c3f..8d560a319 100644
--- a/ReportImp/Socia/SociaKoeln.csproj
+++ b/ReportImp/Socia/SociaKoeln.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/SozialeDiensteKathrinSchmidt/SozialeDiensteKathrinSchmidt.csproj b/ReportImp/SozialeDiensteKathrinSchmidt/SozialeDiensteKathrinSchmidt.csproj
index f504ff887..af1dc34de 100644
--- a/ReportImp/SozialeDiensteKathrinSchmidt/SozialeDiensteKathrinSchmidt.csproj
+++ b/ReportImp/SozialeDiensteKathrinSchmidt/SozialeDiensteKathrinSchmidt.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/SozialeDiensteNiederrhein/SozialeDiensteNiederrhein.csproj b/ReportImp/SozialeDiensteNiederrhein/SozialeDiensteNiederrhein.csproj
index f1b150155..b24093ab3 100644
--- a/ReportImp/SozialeDiensteNiederrhein/SozialeDiensteNiederrhein.csproj
+++ b/ReportImp/SozialeDiensteNiederrhein/SozialeDiensteNiederrhein.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/SozialeDienstleistungenBeckerReports/SozialeDienstleistungenBeckerReports.csproj b/ReportImp/SozialeDienstleistungenBeckerReports/SozialeDienstleistungenBeckerReports.csproj
index 13eb2259d..d43e7663f 100644
--- a/ReportImp/SozialeDienstleistungenBeckerReports/SozialeDienstleistungenBeckerReports.csproj
+++ b/ReportImp/SozialeDienstleistungenBeckerReports/SozialeDienstleistungenBeckerReports.csproj
@@ -31,19 +31,24 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/SozialeDienstleistungenGessnerReports/SozialeDienstleistungenGessnerReports.csproj b/ReportImp/SozialeDienstleistungenGessnerReports/SozialeDienstleistungenGessnerReports.csproj
index fa230c41c..dcaabb58e 100644
--- a/ReportImp/SozialeDienstleistungenGessnerReports/SozialeDienstleistungenGessnerReports.csproj
+++ b/ReportImp/SozialeDienstleistungenGessnerReports/SozialeDienstleistungenGessnerReports.csproj
@@ -30,18 +30,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/SozialeDienstleistungenSchoenberg/SozialeDienstleistungenSchoenberg.csproj b/ReportImp/SozialeDienstleistungenSchoenberg/SozialeDienstleistungenSchoenberg.csproj
index db1daa5ad..654a95489 100644
--- a/ReportImp/SozialeDienstleistungenSchoenberg/SozialeDienstleistungenSchoenberg.csproj
+++ b/ReportImp/SozialeDienstleistungenSchoenberg/SozialeDienstleistungenSchoenberg.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/SozialwirkstattSchmitz/SozialwirkstattSchmitz.csproj b/ReportImp/SozialwirkstattSchmitz/SozialwirkstattSchmitz.csproj
index 504a12c77..9a59281c9 100644
--- a/ReportImp/SozialwirkstattSchmitz/SozialwirkstattSchmitz.csproj
+++ b/ReportImp/SozialwirkstattSchmitz/SozialwirkstattSchmitz.csproj
@@ -68,20 +68,25 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/SpektrumGmbH/SpektrumGmbH.csproj b/ReportImp/SpektrumGmbH/SpektrumGmbH.csproj
index 9cb05cd07..707c1d4c4 100644
--- a/ReportImp/SpektrumGmbH/SpektrumGmbH.csproj
+++ b/ReportImp/SpektrumGmbH/SpektrumGmbH.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/SpektrumReports/SpektrumReports.csproj b/ReportImp/SpektrumReports/SpektrumReports.csproj
index 25ba1142c..ebbf6f7d0 100644
--- a/ReportImp/SpektrumReports/SpektrumReports.csproj
+++ b/ReportImp/SpektrumReports/SpektrumReports.csproj
@@ -31,19 +31,24 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/SprungbrettReports/SprungbrettReports.csproj b/ReportImp/SprungbrettReports/SprungbrettReports.csproj
index 031457aaa..42ea5c0ba 100644
--- a/ReportImp/SprungbrettReports/SprungbrettReports.csproj
+++ b/ReportImp/SprungbrettReports/SprungbrettReports.csproj
@@ -67,20 +67,25 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/SprungbrettTheresia/SprungbrettTheresia.csproj b/ReportImp/SprungbrettTheresia/SprungbrettTheresia.csproj
index db5225ad7..a48fdc0eb 100644
--- a/ReportImp/SprungbrettTheresia/SprungbrettTheresia.csproj
+++ b/ReportImp/SprungbrettTheresia/SprungbrettTheresia.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/SultanSahinReports/SultanSahinReports.csproj b/ReportImp/SultanSahinReports/SultanSahinReports.csproj
index 159795c9a..7b16f4de0 100644
--- a/ReportImp/SultanSahinReports/SultanSahinReports.csproj
+++ b/ReportImp/SultanSahinReports/SultanSahinReports.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/SynpraxReports/SynpraxReports.csproj b/ReportImp/SynpraxReports/SynpraxReports.csproj
index 9b550b4d4..ec1896fbc 100644
--- a/ReportImp/SynpraxReports/SynpraxReports.csproj
+++ b/ReportImp/SynpraxReports/SynpraxReports.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/TRIAS Ambulante Sozialarbeit/TRIASAmbulanteSozialarbeit.csproj b/ReportImp/TRIAS Ambulante Sozialarbeit/TRIASAmbulanteSozialarbeit.csproj
index 76317c28e..4fa8bc608 100644
--- a/ReportImp/TRIAS Ambulante Sozialarbeit/TRIASAmbulanteSozialarbeit.csproj
+++ b/ReportImp/TRIAS Ambulante Sozialarbeit/TRIASAmbulanteSozialarbeit.csproj
@@ -73,18 +73,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/TagwerkReports/Properties/licenses.licx b/ReportImp/TagwerkReports/Properties/licenses.licx
index bfe3c59aa..e69de29bb 100644
--- a/ReportImp/TagwerkReports/Properties/licenses.licx
+++ b/ReportImp/TagwerkReports/Properties/licenses.licx
@@ -1 +0,0 @@
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/TagwerkReports/TagwerkReports.csproj b/ReportImp/TagwerkReports/TagwerkReports.csproj
index db8722d5d..a092cb990 100644
--- a/ReportImp/TagwerkReports/TagwerkReports.csproj
+++ b/ReportImp/TagwerkReports/TagwerkReports.csproj
@@ -31,19 +31,24 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/TeamGSReports/TeamGSReports.csproj b/ReportImp/TeamGSReports/TeamGSReports.csproj
index 6a5056aef..1e70dfd1d 100644
--- a/ReportImp/TeamGSReports/TeamGSReports.csproj
+++ b/ReportImp/TeamGSReports/TeamGSReports.csproj
@@ -69,20 +69,25 @@
false
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/TranskulturellesBBBasaran/TranskulturellesBBBasaran.csproj b/ReportImp/TranskulturellesBBBasaran/TranskulturellesBBBasaran.csproj
index c377d2ffa..d780f6188 100644
--- a/ReportImp/TranskulturellesBBBasaran/TranskulturellesBBBasaran.csproj
+++ b/ReportImp/TranskulturellesBBBasaran/TranskulturellesBBBasaran.csproj
@@ -31,20 +31,25 @@
4
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/ReportImp/TranskulturellesBBPastor/TranskulturellesBBPastor.csproj b/ReportImp/TranskulturellesBBPastor/TranskulturellesBBPastor.csproj
index 2c159b670..50ab3aff5 100644
--- a/ReportImp/TranskulturellesBBPastor/TranskulturellesBBPastor.csproj
+++ b/ReportImp/TranskulturellesBBPastor/TranskulturellesBBPastor.csproj
@@ -31,20 +31,25 @@
4
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/ReportImp/TranskulturellesBetreuungsbuero/TranskulturellesBetreuungsbuero.csproj b/ReportImp/TranskulturellesBetreuungsbuero/TranskulturellesBetreuungsbuero.csproj
index 1740a35a1..35587a399 100644
--- a/ReportImp/TranskulturellesBetreuungsbuero/TranskulturellesBetreuungsbuero.csproj
+++ b/ReportImp/TranskulturellesBetreuungsbuero/TranskulturellesBetreuungsbuero.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/TrialogReports/TrialogReports.csproj b/ReportImp/TrialogReports/TrialogReports.csproj
index b985ce4a9..fab642822 100644
--- a/ReportImp/TrialogReports/TrialogReports.csproj
+++ b/ReportImp/TrialogReports/TrialogReports.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/VKMAachen/VKMAachen.csproj b/ReportImp/VKMAachen/VKMAachen.csproj
index 0bee5a926..c8b3970cc 100644
--- a/ReportImp/VKMAachen/VKMAachen.csproj
+++ b/ReportImp/VKMAachen/VKMAachen.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/VSDHammReports/VSDHammReports.csproj b/ReportImp/VSDHammReports/VSDHammReports.csproj
index e4518526a..c8698c546 100644
--- a/ReportImp/VSDHammReports/VSDHammReports.csproj
+++ b/ReportImp/VSDHammReports/VSDHammReports.csproj
@@ -34,18 +34,23 @@
True
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/VereinDuerenerChristenReports/VereinDuerenerChristenReports.csproj b/ReportImp/VereinDuerenerChristenReports/VereinDuerenerChristenReports.csproj
index 29ffaf1d8..efdc99388 100644
--- a/ReportImp/VereinDuerenerChristenReports/VereinDuerenerChristenReports.csproj
+++ b/ReportImp/VereinDuerenerChristenReports/VereinDuerenerChristenReports.csproj
@@ -31,19 +31,24 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/VereinLebensgestaltung/Properties/licenses.licx b/ReportImp/VereinLebensgestaltung/Properties/licenses.licx
index bfe3c59aa..e69de29bb 100644
--- a/ReportImp/VereinLebensgestaltung/Properties/licenses.licx
+++ b/ReportImp/VereinLebensgestaltung/Properties/licenses.licx
@@ -1 +0,0 @@
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/VereinLebensgestaltung/VereinLebensgestaltung.csproj b/ReportImp/VereinLebensgestaltung/VereinLebensgestaltung.csproj
index 07f260c10..a1e317d15 100644
--- a/ReportImp/VereinLebensgestaltung/VereinLebensgestaltung.csproj
+++ b/ReportImp/VereinLebensgestaltung/VereinLebensgestaltung.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/VibbEssenReports/VibbEssenReports.csproj b/ReportImp/VibbEssenReports/VibbEssenReports.csproj
index b96c4d116..b57acee23 100644
--- a/ReportImp/VibbEssenReports/VibbEssenReports.csproj
+++ b/ReportImp/VibbEssenReports/VibbEssenReports.csproj
@@ -31,19 +31,24 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/VisionReports/VisionReports.csproj b/ReportImp/VisionReports/VisionReports.csproj
index 75b99d540..cb27b85c3 100644
--- a/ReportImp/VisionReports/VisionReports.csproj
+++ b/ReportImp/VisionReports/VisionReports.csproj
@@ -69,20 +69,25 @@
false
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/VivaAVidaReports/VivaAVidaReports.csproj b/ReportImp/VivaAVidaReports/VivaAVidaReports.csproj
index 2d00a9342..05484cc39 100644
--- a/ReportImp/VivaAVidaReports/VivaAVidaReports.csproj
+++ b/ReportImp/VivaAVidaReports/VivaAVidaReports.csproj
@@ -69,19 +69,24 @@
false
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/VivatgGmbHReports/VivatgGmbHReports.csproj b/ReportImp/VivatgGmbHReports/VivatgGmbHReports.csproj
index 7e46ddfe7..12642c80e 100644
--- a/ReportImp/VivatgGmbHReports/VivatgGmbHReports.csproj
+++ b/ReportImp/VivatgGmbHReports/VivatgGmbHReports.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/VkmHamm/VkmHamm.csproj b/ReportImp/VkmHamm/VkmHamm.csproj
index dc6ae3070..9b7a4fc7a 100644
--- a/ReportImp/VkmHamm/VkmHamm.csproj
+++ b/ReportImp/VkmHamm/VkmHamm.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/WMB/WMB.csproj b/ReportImp/WMB/WMB.csproj
index c5315f4ed..6e1c82ad0 100644
--- a/ReportImp/WMB/WMB.csproj
+++ b/ReportImp/WMB/WMB.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/WegeReports/WegeReports.csproj b/ReportImp/WegeReports/WegeReports.csproj
index 6e39b323a..29c04a1ee 100644
--- a/ReportImp/WegeReports/WegeReports.csproj
+++ b/ReportImp/WegeReports/WegeReports.csproj
@@ -31,19 +31,24 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/WegweiserBetreuungsdienstReports/WegweiserBetreuungsdienstReports.csproj b/ReportImp/WegweiserBetreuungsdienstReports/WegweiserBetreuungsdienstReports.csproj
index 7f292634a..45e0f9126 100644
--- a/ReportImp/WegweiserBetreuungsdienstReports/WegweiserBetreuungsdienstReports.csproj
+++ b/ReportImp/WegweiserBetreuungsdienstReports/WegweiserBetreuungsdienstReports.csproj
@@ -45,19 +45,24 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/Weitblick-ambulantBeWo/Weitblick-ambulantBeWo.csproj b/ReportImp/Weitblick-ambulantBeWo/Weitblick-ambulantBeWo.csproj
index 5356d0b23..f8a5bf0be 100644
--- a/ReportImp/Weitblick-ambulantBeWo/Weitblick-ambulantBeWo.csproj
+++ b/ReportImp/Weitblick-ambulantBeWo/Weitblick-ambulantBeWo.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/WigonetzReports/WigonetzReports.csproj b/ReportImp/WigonetzReports/WigonetzReports.csproj
index 07d832065..3e0d72198 100644
--- a/ReportImp/WigonetzReports/WigonetzReports.csproj
+++ b/ReportImp/WigonetzReports/WigonetzReports.csproj
@@ -31,19 +31,24 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/WohnassistenzMuensterReports/WohnassistenzMuensterReports.csproj b/ReportImp/WohnassistenzMuensterReports/WohnassistenzMuensterReports.csproj
index ae0e20bb2..32b953044 100644
--- a/ReportImp/WohnassistenzMuensterReports/WohnassistenzMuensterReports.csproj
+++ b/ReportImp/WohnassistenzMuensterReports/WohnassistenzMuensterReports.csproj
@@ -68,18 +68,23 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/WohnhelferRemscheidReports/WohnhelferRemscheidReports.csproj b/ReportImp/WohnhelferRemscheidReports/WohnhelferRemscheidReports.csproj
index 5059c8a10..982cac18c 100644
--- a/ReportImp/WohnhelferRemscheidReports/WohnhelferRemscheidReports.csproj
+++ b/ReportImp/WohnhelferRemscheidReports/WohnhelferRemscheidReports.csproj
@@ -70,19 +70,24 @@
true
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/ZMDLengerichReports/ZMDLengerichReports.csproj b/ReportImp/ZMDLengerichReports/ZMDLengerichReports.csproj
index 8878e51a5..ee9216cd0 100644
--- a/ReportImp/ZMDLengerichReports/ZMDLengerichReports.csproj
+++ b/ReportImp/ZMDLengerichReports/ZMDLengerichReports.csproj
@@ -69,20 +69,25 @@
false
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/ZukunftWohnenReports/ZukunftWohnenReports.csproj b/ReportImp/ZukunftWohnenReports/ZukunftWohnenReports.csproj
index 3668509b1..18b506af9 100644
--- a/ReportImp/ZukunftWohnenReports/ZukunftWohnenReports.csproj
+++ b/ReportImp/ZukunftWohnenReports/ZukunftWohnenReports.csproj
@@ -31,18 +31,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportImp/demo_reports/demo_reports.csproj b/ReportImp/demo_reports/demo_reports.csproj
index dc0e6bbba..810394ad0 100644
--- a/ReportImp/demo_reports/demo_reports.csproj
+++ b/ReportImp/demo_reports/demo_reports.csproj
@@ -68,19 +68,24 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
3.5
diff --git a/ReportImp/skmRheydt/skmRheydt.csproj b/ReportImp/skmRheydt/skmRheydt.csproj
index 04603d740..ba120567a 100644
--- a/ReportImp/skmRheydt/skmRheydt.csproj
+++ b/ReportImp/skmRheydt/skmRheydt.csproj
@@ -32,18 +32,23 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportService/ReportingService.csproj b/ReportService/ReportingService.csproj
index f14b32ffc..f088c53bf 100644
--- a/ReportService/ReportingService.csproj
+++ b/ReportService/ReportingService.csproj
@@ -9,7 +9,7 @@
Properties
ReportingService
ReportingService
- v4.0
+ v4.5
512
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ false
pdbonly
@@ -29,19 +30,25 @@
TRACE
prompt
4
+ false
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ReportService/app.config b/ReportService/app.config
index 1b2fb6dd1..aec7b1548 100644
--- a/ReportService/app.config
+++ b/ReportService/app.config
@@ -1,11 +1,11 @@
-
+
-
-
+
+
-
\ No newline at end of file
+
diff --git a/ReportViewer/ReportViewer.csproj b/ReportViewer/ReportViewer.csproj
index d594755a0..801e013a9 100644
--- a/ReportViewer/ReportViewer.csproj
+++ b/ReportViewer/ReportViewer.csproj
@@ -38,20 +38,24 @@
4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Service/Configuration/AppSettings.cs b/Service/Configuration/AppSettings.cs
index 8987ed95c..902b85884 100644
--- a/Service/Configuration/AppSettings.cs
+++ b/Service/Configuration/AppSettings.cs
@@ -46,6 +46,8 @@ namespace BeWo.Service.Configuration
public bool ShowDistanceFields { get; set; }
public bool ShowSignatures { get; set; }
+
+ public bool ShowRtfTextfeld { get; set; }
public bool ShowCustomerDistanceFields { get; set; }
@@ -70,6 +72,7 @@ namespace BeWo.Service.Configuration
bool isZeiterfassungInStdMin = true;
bool showServiceRecordsDistanceFields = false;
bool showSignatures = false;
+ bool showRtfTextfeld = false;
bool showCustomerDistanceFields = false;
bool showAdditionalService = false;
bool showRoundedDurationInEmployeeAnalysis = true;
@@ -203,6 +206,12 @@ namespace BeWo.Service.Configuration
showSignatures = true;
}
+ val = GetSettingValue(mandator.Settings, "ShowRtfTextfeld");
+ if (val != null && val.Equals("1"))
+ {
+ showRtfTextfeld = true;
+ }
+
}
@@ -218,6 +227,7 @@ namespace BeWo.Service.Configuration
settings.ZeiterfassungsSchwellwert = zeiterfassungsSchwellwert;
settings.ShowDistanceFields = showServiceRecordsDistanceFields;
settings.ShowSignatures = showSignatures;
+ settings.ShowRtfTextfeld = showRtfTextfeld;
settings.ShowCustomerDistanceFields = showCustomerDistanceFields;
settings.ShowAdditionalService = showAdditionalService;
settings.ShowRoundedDurationInEmployeeAnalysis = showRoundedDurationInEmployeeAnalysis;
diff --git a/Service/DCEntityMapper/ServiceRecordDC_ServiceRecord.cs b/Service/DCEntityMapper/ServiceRecordDC_ServiceRecord.cs
index 621b2c8e1..30c3f73b6 100644
--- a/Service/DCEntityMapper/ServiceRecordDC_ServiceRecord.cs
+++ b/Service/DCEntityMapper/ServiceRecordDC_ServiceRecord.cs
@@ -22,6 +22,11 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.Notice3 = pEntity.Notice3;
pDataContract.Notice4 = pEntity.Notice4;
pDataContract.Notice5 = pEntity.Notice5;
+ pDataContract.RTFNotice1 = pEntity.RTFNotice1;
+ pDataContract.RTFNotice2 = pEntity.RTFNotice2;
+ pDataContract.RTFNotice3 = pEntity.RTFNotice3;
+ pDataContract.RTFNotice4 = pEntity.RTFNotice4;
+ pDataContract.RTFNotice5 = pEntity.RTFNotice5;
pDataContract.DistanceInMeter = pEntity.DistanceInMeter;
pDataContract.Relevance = pEntity.Relevance;
pDataContract.SignatureOid = pEntity.SignatureOid;
@@ -120,6 +125,13 @@ namespace BeWo.Service.DCEntityMapper
pEntity.Notice3 = pDataContract.Notice3;
pEntity.Notice4 = pDataContract.Notice4;
pEntity.Notice5 = pDataContract.Notice5;
+
+ pEntity.RTFNotice1 = pDataContract.RTFNotice1;
+ pEntity.RTFNotice2 = pDataContract.RTFNotice2;
+ pEntity.RTFNotice3 = pDataContract.RTFNotice3;
+ pEntity.RTFNotice4 = pDataContract.RTFNotice4;
+ pEntity.RTFNotice5 = pDataContract.RTFNotice5;
+
pEntity.Start = pDataContract.Start;
pEntity.End = pDataContract.End;
pEntity.RoundedDuration = pDataContract.RoundedDuration;
diff --git a/Service/Service.csproj b/Service/Service.csproj
index 75fe41589..c99aeaa4f 100644
--- a/Service/Service.csproj
+++ b/Service/Service.csproj
@@ -10,7 +10,7 @@
Properties
BeWo.Service
BeWo.Service
- v4.0
+ v4.5
512
@@ -43,6 +43,7 @@
4
x86
AllRules.ruleset
+ false
pdbonly
@@ -52,6 +53,7 @@
prompt
4
AllRules.ruleset
+ false
true
@@ -69,6 +71,7 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
true
false
+ false
@@ -77,18 +80,23 @@
..\Lib\Castle.DynamicProxy2.dll
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
False
..\Lib\MySql.Data.dll
diff --git a/Service/app.config b/Service/app.config
index 1b2fb6dd1..aec7b1548 100644
--- a/Service/app.config
+++ b/Service/app.config
@@ -1,11 +1,11 @@
-
+
-
-
+
+
-
\ No newline at end of file
+
diff --git a/Service/packages.config b/Service/packages.config
index 87f610c69..8e913a82c 100644
--- a/Service/packages.config
+++ b/Service/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/Shared/DataContracts/ServiceRecordDC.cs b/Shared/DataContracts/ServiceRecordDC.cs
index 6d84c97f7..e68d1b030 100644
--- a/Shared/DataContracts/ServiceRecordDC.cs
+++ b/Shared/DataContracts/ServiceRecordDC.cs
@@ -63,6 +63,21 @@ namespace BS.Shared.DataContracts
[DataMember]
public string Notice5 { get; set; }
+ [DataMember]
+ public string RTFNotice1 { get; set; }
+
+ [DataMember]
+ public string RTFNotice2 { get; set; }
+
+ [DataMember]
+ public string RTFNotice3 { get; set; }
+
+ [DataMember]
+ public string RTFNotice4 { get; set; }
+
+ [DataMember]
+ public string RTFNotice5 { get; set; }
+
[DataMember]
public decimal RoundedDuration { get; set; }
diff --git a/Shared/Extensions/ICollectionExtensions.cs b/Shared/Extensions/ICollectionExtensions.cs
index 3c62ab71b..38984dabd 100644
--- a/Shared/Extensions/ICollectionExtensions.cs
+++ b/Shared/Extensions/ICollectionExtensions.cs
@@ -41,5 +41,11 @@ namespace BS.Shared.Extensions
var lToDelete = pList.Where(t => pMatch(t)).ToHashSet();
pList.RemoveRange(lToDelete);
}
- }
+
+ public static bool AreEqual(this ICollection pCollection, ICollection pCollection2)
+ {
+ throw new Exception("Hier muss noch AddEqual implementiert werden");
+ }
+
+ }
}
\ No newline at end of file
diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj
index 28d05a3bf..557b382fa 100644
--- a/Shared/Shared.csproj
+++ b/Shared/Shared.csproj
@@ -10,9 +10,10 @@
Properties
BS.Shared
BS.Shared
- v4.0
+ v4.5
512
- Client
+
+
3.5
@@ -42,6 +43,7 @@
prompt
4
AllRules.ruleset
+ false
pdbonly
@@ -51,6 +53,7 @@
prompt
4
AllRules.ruleset
+ false
true
@@ -68,6 +71,7 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
true
false
+ false
false
@@ -77,14 +81,15 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
..\packages\Newtonsoft.Json.6.0.5\lib\net40\Newtonsoft.Json.dll
True
diff --git a/Shared/packages.config b/Shared/packages.config
index 3825c108d..02878541d 100644
--- a/Shared/packages.config
+++ b/Shared/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/ValidationLibrary/ValidationLibrary.csproj b/ValidationLibrary/ValidationLibrary.csproj
index b0188c4f2..79b201c99 100644
--- a/ValidationLibrary/ValidationLibrary.csproj
+++ b/ValidationLibrary/ValidationLibrary.csproj
@@ -31,12 +31,14 @@
4
-
-
-
-
-
-
+
+
+
+
+
+
+
+