diff --git a/.gitignore b/.gitignore
index ce4dc378c..55ce342e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -259,3 +259,5 @@
/.vs/BeWoGit/v15
/ReportImp/DerKarrenSbd/obj/Debug
/ReportImp/DerKarrenSbd/obj/Release
+/.vs
+/BeWo/.vs/BeWo/v14/*.suo
diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index ba1910b95..cf2fb96de 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -287,6 +287,10 @@
Designer
MSBuild:Compile
+
+ MSBuild:Compile
+ Designer
+
MSBuild:Compile
Designer
@@ -751,6 +755,9 @@
ServiceRecordRTFWindowView.xaml
+
+ TextbausteinView.xaml
+
MessageDialog.xaml
@@ -895,6 +902,7 @@
MiniChatView.xaml
+
WohnheimNavigationView.xaml
diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs
index 3e74aa8bb..95945cce8 100644
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -18,6 +18,7 @@ using BeWo.Core.Config;
using BeWo.ServiceProxy;
using BeWo.View;
using BeWo.View.Navigation;
+using BeWo.View.Navigation.Filter;
using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
@@ -203,7 +204,7 @@ namespace BeWo
bool isZeiterfassungInStdMin = false;
int lastSelectedStundenkontoIntervall = 3;
bool showSignatures = false;
- bool showRtfTextfeld = false;
+ bool showRtfTextfield = false;
AppSettings.ShowAdvisedAttendedFlag = false;
@@ -378,10 +379,10 @@ namespace BeWo
showSignatures = true;
}
- val = GetSettingValue(_Mandator.Settings, "ShowRtfTextfeld");
+ val = GetSettingValue(_Mandator.Settings, "ShowRtfTextfield");
if (val != null && val.Equals("1"))
{
- showRtfTextfeld = true;
+ showRtfTextfield = true;
}
@@ -450,7 +451,7 @@ namespace BeWo
AppSettings.ShowHilfeplanBezeichnung = showHilfeplanBezeichnung;
AppSettings.ShowArbeitszeiten = showArbeitszeiten;
AppSettings.ShowSignatures = showSignatures;
- AppSettings.ShowRtfTextfeld = showRtfTextfeld;
+ AppSettings.ShowRtfTextfield = showRtfTextfield;
AppSettings.ShowCustomerDistanceFields = showCustomerDistanceFields;
AppSettings.ShowAdditionalService = showAdditionalService;
AppSettings.ShowRoundedDurationInEmployeeAnalysis = showRoundedDurationInEmployeeAnalysis;
@@ -678,11 +679,9 @@ namespace BeWo
_AppSettings.IsDirty = false;
SetSettingValue(SettingsType.ApplicationSettings, "WindowStateType", ((int) _AppSettings.WindowState).ToString());
SetSettingValue(SettingsType.ApplicationSettings, "LastSelectedServiceRecordTimeInterval", ((int) _AppSettings.LastSelectedServiceRecordTimeInterval).ToString());
- SetSettingValue(SettingsType.ApplicationSettings, "ShowAllClients", _AppSettings.ShowAllClients ? "1" : "0");
- SetSettingValue(SettingsType.ApplicationSettings, "ShowOnlyMySupportConcepts", _AppSettings.ShowOnlyMySupportConcepts ? "1" : "0");
- SetSettingValue(SettingsType.ApplicationSettings, "ShowOnlyTeamSupportConcepts", _AppSettings.ShowOnlyTeamSupportConcepts ? "1" : "0");
- SetSettingValue(SettingsType.ApplicationSettings, "ShowOnlyMyClients", _AppSettings.ShowOnlyMyClients ? "1" : "0");
- SetSettingValue(SettingsType.ApplicationSettings, "ShowOnlyTeamClients", _AppSettings.ShowOnlyTeamClients ? "1" : "0");
+ SetSettingValue(SettingsType.ApplicationSettings, "CustomerFilterInZeiterfassung", ((int)_AppSettings.CustomerFilterInZeiterfassung).ToString());
+ SetSettingValue(SettingsType.ApplicationSettings, "CustomerFilterSupportConcepts", ((int)_AppSettings.CustomerFilterSupportConcepts).ToString());
+ SetSettingValue(SettingsType.ApplicationSettings, "CustomerFilterCustomers", ((int)_AppSettings.CustomerFilterCustomers).ToString());
SetSettingValue(SettingsType.ApplicationSettings, "ShowExpiredSupportConcepts", _AppSettings.ShowExpiredSupportConcepts ? "1" : "0");
SetSettingValue(SettingsType.ApplicationSettings, "ShowServiceRecordGridControl", _AppSettings.ShowServiceRecordGridControl ? "1" : "0");
SetSettingValue(SettingsType.ApplicationSettings, "StartupPanelMaximized", _AppSettings.StartupPanelMaximized);
@@ -805,20 +804,21 @@ namespace BeWo
_AppSettings.LastSelectedServiceRecordTimeInterval = (ServiceRecordTimeInterval) result;
}
- val = GetSettingValue(SettingsType.ApplicationSettings, "ShowAllClients");
- _AppSettings.ShowAllClients = val == "1";
-
- val = GetSettingValue(SettingsType.ApplicationSettings, "ShowOnlyMySupportConcepts");
- _AppSettings.ShowOnlyMySupportConcepts = val != "0";
-
- val = GetSettingValue(SettingsType.ApplicationSettings, "ShowOnlyTeamSupportConcepts");
- _AppSettings.ShowOnlyTeamSupportConcepts = val != "0";
-
- val = GetSettingValue(SettingsType.ApplicationSettings, "ShowOnlyMyClients");
- _AppSettings.ShowOnlyMyClients = val == "1";
-
- val = GetSettingValue(SettingsType.ApplicationSettings, "ShowOnlyTeamClients");
- _AppSettings.ShowOnlyTeamClients = val == "1";
+ val = GetSettingValue(SettingsType.ApplicationSettings, "CustomerFilterInZeiterfassung");
+ if (Int32.TryParse(val, out result))
+ {
+ _AppSettings.CustomerFilterInZeiterfassung = (CustomerFilterEnum)result;
+ }
+ val = GetSettingValue(SettingsType.ApplicationSettings, "CustomerFilterSupportConcepts");
+ if (Int32.TryParse(val, out result))
+ {
+ _AppSettings.CustomerFilterSupportConcepts = (CustomerFilterEnum)result;
+ }
+ val = GetSettingValue(SettingsType.ApplicationSettings, "CustomerFilterCustomers");
+ if (Int32.TryParse(val, out result))
+ {
+ _AppSettings.CustomerFilterCustomers = (CustomerFilterEnum)result;
+ }
val = GetSettingValue(SettingsType.ApplicationSettings, "ShowServiceRecordGridControl");
_AppSettings.ShowServiceRecordGridControl = val == "1";
diff --git a/BeWo/Core/BeWoUtils.cs b/BeWo/Core/BeWoUtils.cs
index f25125d75..0a1a1fd25 100644
--- a/BeWo/Core/BeWoUtils.cs
+++ b/BeWo/Core/BeWoUtils.cs
@@ -1885,6 +1885,7 @@ namespace BeWo.Core
{
encoder.Frames.Add(BitmapFrame.Create((BitmapSource)imgg.Source));
encoder.Save(ms);
+
var img = System.Drawing.Image.FromStream(ms);
using (var imgbit = new Bitmap(img))
@@ -1892,7 +1893,7 @@ namespace BeWo.Core
form.StartPosition = FormStartPosition.CenterScreen;
form.Size = imgbit.Size;
form.FormBorderStyle = FormBorderStyle.Sizable;
-
+ form.ShowIcon = false;
using (var pb = new PictureBox())
{
pb.Dock = DockStyle.Fill;
diff --git a/BeWo/Core/Config/AppSettings.cs b/BeWo/Core/Config/AppSettings.cs
index d5aae2eb3..77e96eaaa 100644
--- a/BeWo/Core/Config/AppSettings.cs
+++ b/BeWo/Core/Config/AppSettings.cs
@@ -1,5 +1,5 @@
using System.Collections.Generic;
-
+using BeWo.View.Navigation.Filter;
using BS.Shared;
namespace BeWo.Core.Config
@@ -18,10 +18,13 @@ namespace BeWo.Core.Config
private bool misZeiterfassungInStdMin = true;
- private bool mShowOnlyMySupportConcepts = true;
-
- private bool mShowOnlyTeamSupportConcepts = true;
+ private CustomerFilterEnum _CustomerFilterInZeiterfassung = CustomerFilterEnum.All;
+ private CustomerFilterEnum _CustomerFilterSupportConcepts = CustomerFilterEnum.All;
+ private CustomerFilterEnum _CustomerFilterCustomers = CustomerFilterEnum.All;
+ private bool _showExpiredSupportConcepts = true;
+ private bool _showServiceRecordGridControl;
+
private WindowStateType mWindowStateType = WindowStateType.Default;
private ServiceRecordTimeInterval mLastSelectedServiceRecordTimeInterval = ServiceRecordTimeInterval.All;
@@ -35,6 +38,7 @@ namespace BeWo.Core.Config
Default,
Maximised
}
+
public bool IsServiceRecordNoticeMandatory
{
@@ -102,26 +106,50 @@ namespace BeWo.Core.Config
public bool HideServiceRecordInsertedByAndInsertedOn { get; set; }
public bool ShowAdvisedAttendedFlag { get; set; }
-
- private bool _showAllClients;
-
- public bool ShowAllClients
+
+ public CustomerFilterEnum CustomerFilterInZeiterfassung
{
- get { return _showAllClients; }
+ get { return _CustomerFilterInZeiterfassung; }
set
{
- if (_showAllClients != value)
+ if (_CustomerFilterInZeiterfassung != value)
{
- _showAllClients = value;
+ _CustomerFilterInZeiterfassung = value;
IsDirty = true;
}
}
}
+ public CustomerFilterEnum CustomerFilterSupportConcepts
+ {
+ get { return _CustomerFilterSupportConcepts; }
+ set
+ {
+ if (_CustomerFilterSupportConcepts != value)
+ {
+ _CustomerFilterSupportConcepts = value;
+ IsDirty = true;
+ }
+ }
+ }
+
+ public CustomerFilterEnum CustomerFilterCustomers
+ {
+ get { return _CustomerFilterCustomers; }
+
+ set
+ {
+ if (_CustomerFilterCustomers != value)
+ {
+ _CustomerFilterCustomers = value;
+ IsDirty = true;
+ }
+ }
+ }
+
+
public bool ShowDatevFields { get; set; }
-
- private bool _showExpiredSupportConcepts = true;
-
+
public bool ShowExpiredSupportConcepts
{
get { return _showExpiredSupportConcepts; }
@@ -135,37 +163,8 @@ namespace BeWo.Core.Config
}
}
- private bool _showOnlyMyClients;
-
- public bool ShowOnlyMyClients
- {
- get { return _showOnlyMyClients; }
- set
- {
- if (_showOnlyMyClients != value)
- {
- _showOnlyMyClients = value;
- IsDirty = true;
- }
- }
- }
-
- private bool _showOnlyTeamClients;
-
- public bool ShowOnlyTeamClients
- {
- get { return _showOnlyTeamClients; }
- set
- {
- if (_showOnlyTeamClients != value)
- {
- _showOnlyTeamClients = value;
- IsDirty = true;
- }
- }
- }
-
- private bool _showServiceRecordGridControl;
+
+
public bool ShowServiceRecordGridControl
{
@@ -182,34 +181,7 @@ namespace BeWo.Core.Config
public bool ShowLargeCustomerNotice { get; set; }
- public bool ShowOnlyMySupportConcepts
- {
- get { return mShowOnlyMySupportConcepts; }
-
- set
- {
- if (mShowOnlyMySupportConcepts != value)
- {
- mShowOnlyMySupportConcepts = value;
- IsDirty = true;
- }
- }
- }
-
- public bool ShowOnlyTeamSupportConcepts
- {
- get { return mShowOnlyTeamSupportConcepts; }
-
- set
- {
- if (mShowOnlyTeamSupportConcepts != value)
- {
- mShowOnlyTeamSupportConcepts = value;
- IsDirty = true;
- }
- }
- }
-
+
public bool ZeigeNurMeineTermine
{
get { return mZeigeNurMeineTermine; }
@@ -349,7 +321,7 @@ namespace BeWo.Core.Config
public bool ShowSignatures { get; set; }
- public bool ShowRtfTextfeld { get; set; }
+ public bool ShowRtfTextfield { get; set; }
public bool ShowTeamNews { get; set; }
diff --git a/BeWo/MainControl.xaml b/BeWo/MainControl.xaml
index 7756c250b..000c1068c 100644
--- a/BeWo/MainControl.xaml
+++ b/BeWo/MainControl.xaml
@@ -162,7 +162,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
\ No newline at end of file
diff --git a/BeWo/View/Detail/Report/ServicesReportView.xaml.cs b/BeWo/View/Detail/Report/ServicesReportView.xaml.cs
index 2fa17151b..a517ab16f 100644
--- a/BeWo/View/Detail/Report/ServicesReportView.xaml.cs
+++ b/BeWo/View/Detail/Report/ServicesReportView.xaml.cs
@@ -43,7 +43,7 @@ namespace BeWo.View.Detail.Report
public CompactOrganisationDC Organisation { get { return _Organisation; } set { _Organisation = value; } }
- private List _quittierungsCheck = new List();
+ //private List _quittierungsCheck = new List();
private Dictionary Dicdate = new Dictionary();
@@ -63,20 +63,19 @@ namespace BeWo.View.Detail.Report
// checkbox_all.IsChecked = false;
//}
- SetMonthCombobox();
- SetYearCombobox();
+ // SetMonthCombobox();
+ // SetYearCombobox();
- GridControlQuittierungsCheck.ItemsSource = _quittierungsCheck;
+ //GridControlQuittierungsCheck.ItemsSource = _quittierungsCheck;
- GetQuittierungsCheckCustomerList(DateTime.Now);
+ // GetQuittierungsCheckCustomerList(DateTime.Now);
combobox_month.SelectionChanged += combobox_month_SelectionChanged;
combobox_year.SelectionChanged += combobox_year_SelectionChanged;
ThemeManager.SetTheme(BeWoApp.CurrentBeWo.MainWindow, Theme.Office2010Black);
- //ThemeManager.SetTheme(docPrevControl, Theme.Office2010Black);
-
+
Unloaded += delegate
{
ThemeManager.SetTheme(BeWoApp.CurrentBeWo.MainWindow, null);
@@ -334,270 +333,270 @@ namespace BeWo.View.Detail.Report
}
//####################### Ãœbersicht bereich #############################################
- private void GetQuittierungsCheckCustomerList(DateTime monat)
- {
- List qbCheckList = new List();
+ //private void GetQuittierungsCheckCustomerList(DateTime monat)
+ //{
+ // List qbCheckList = new List();
- long? oid = null;
+ // long? oid = null;
- if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View))
- {
- oid = BeWoApp.LoggedOnUser.Employee.EmployeeOid;
- }
+ // if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View))
+ // {
+ // oid = BeWoApp.LoggedOnUser.Employee.EmployeeOid;
+ // }
- ServiceFacade.DoCustomerServiceAsync(
- s => s.GetAllActiveCustomersCompactWithQBCheckList(this.FetchReferenceNumbers, oid, monat),
- r =>
- {
- List list = r;
+ // ServiceFacade.DoCustomerServiceAsync(
+ // s => s.GetAllActiveCustomersCompactWithQBCheckList(this.FetchReferenceNumbers, oid, monat),
+ // r =>
+ // {
+ // List list = r;
- if (oid != null)
- {
- list = list.Where(c => c.Customer.IsRelatedToEmployee).ToList();
- }
+ // if (oid != null)
+ // {
+ // list = list.Where(c => c.Customer.IsRelatedToEmployee).ToList();
+ // }
- list.Sort((x, y) => (x.Customer.LastName + ", " + x.Customer.FirstName).CompareTo(y.Customer.LastName + ", " + y.Customer.FirstName));
+ // list.Sort((x, y) => (x.Customer.LastName + ", " + x.Customer.FirstName).CompareTo(y.Customer.LastName + ", " + y.Customer.FirstName));
- qbCheckList = list;
+ // qbCheckList = list;
- #region Dispatcher Refresh and add items to Grid
- this.Dispatch(delegate
- {
- AddQuittierungsCheckToGrid(qbCheckList);
- GridControlQuittierungsCheck.RefreshData();
- GridControlQuittierungsCheck.RefreshUI();
- });
- #endregion
- });
- }
+ // #region Dispatcher Refresh and add items to Grid
+ // this.Dispatch(delegate
+ // {
+ // AddQuittierungsCheckToGrid(qbCheckList);
+ // GridControlQuittierungsCheck.RefreshData();
+ // GridControlQuittierungsCheck.RefreshUI();
+ // });
+ // #endregion
+ // });
+ //}
- private void AddQuittierungsCheckToGrid(List customerListe)
- {
- _quittierungsCheck.Clear();
+ //private void AddQuittierungsCheckToGrid(List customerListe)
+ //{
+ // _quittierungsCheck.Clear();
- foreach (var list in customerListe)
- {
- QuittierungsCheckView x = new QuittierungsCheckView();
+ // foreach (var list in customerListe)
+ // {
+ // QuittierungsCheckView x = new QuittierungsCheckView();
- x.Klient = list.Customer.FullName;
+ // x.Klient = list.Customer.FullName;
- //############ Druck ####################
- if (list.QuittierungsbelegDruck.HasValue)
- x.QuittierungsbelegGedruckt = list.QuittierungsbelegDruck.Value;
+ // //############ Druck ####################
+ // if (list.QuittierungsbelegDruck.HasValue)
+ // x.QuittierungsbelegGedruckt = list.QuittierungsbelegDruck.Value;
- if (list.QuittierungsbelegDruckAm.HasValue)
- {
- x.QuittierungsbelegGedrucktAm = list.QuittierungsbelegDruckAm.Value.ToString("dd.MM.yyyy");
- x.IsQbUnterschriebenAvailable = true;
- }
- else
- {
- x.IsQbUnterschriebenAvailable = false;
- }
+ // if (list.QuittierungsbelegDruckAm.HasValue)
+ // {
+ // x.QuittierungsbelegGedrucktAm = list.QuittierungsbelegDruckAm.Value.ToString("dd.MM.yyyy");
+ // x.IsQbUnterschriebenAvailable = true;
+ // }
+ // else
+ // {
+ // x.IsQbUnterschriebenAvailable = false;
+ // }
- x.GedrucktAm = list.QuittierungsbelegDruckAm;
+ // x.GedrucktAm = list.QuittierungsbelegDruckAm;
- x.QuittierungsbelegGedrucktVonOid = list.QuittierungsbelegGedrucktVonOid;
+ // x.QuittierungsbelegGedrucktVonOid = list.QuittierungsbelegGedrucktVonOid;
- x.QuittierungsbelegGedrucktVon = list.QuittierungsbelegGedrucktVon;
+ // x.QuittierungsbelegGedrucktVon = list.QuittierungsbelegGedrucktVon;
- //######################################
+ // //######################################
- //############ Unterschrift ############
- if (list.QuittierungsbelegUnterschrift.HasValue)
- x.QuittierungsbelegUnterschrieben = list.QuittierungsbelegUnterschrift.Value;
+ // //############ Unterschrift ############
+ // if (list.QuittierungsbelegUnterschrift.HasValue)
+ // x.QuittierungsbelegUnterschrieben = list.QuittierungsbelegUnterschrift.Value;
- x.QuittierungsbelegUnterschriebenVonOid = list.QuittierungsbelegUnterschriftVonOid;
+ // x.QuittierungsbelegUnterschriebenVonOid = list.QuittierungsbelegUnterschriftVonOid;
- x.QuittierungsbelegUnterschriebenVon = list.QuittierungsbelegUnterschriftVon;
+ // x.QuittierungsbelegUnterschriebenVon = list.QuittierungsbelegUnterschriftVon;
- //######################################
+ // //######################################
- if (list.QuittierungsCheckOid.HasValue)
- x.QuittierungsCheckOid = list.QuittierungsCheckOid;
+ // if (list.QuittierungsCheckOid.HasValue)
+ // x.QuittierungsCheckOid = list.QuittierungsCheckOid;
- if (list.Monat.HasValue)
- x.Monat = list.Monat.Value;
+ // if (list.Monat.HasValue)
+ // x.Monat = list.Monat.Value;
- x.CompactCustomer = list.Customer;
+ // x.CompactCustomer = list.Customer;
- _quittierungsCheck.Add(x);
- }
- }
+ // _quittierungsCheck.Add(x);
+ // }
+ //}
- private void CheckBoxQBU_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
- {
- var qbChanges = (QuittierungsCheckView)GridControlQuittierungsCheck.SelectedItem;
+ //private void CheckBoxQBU_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
+ //{
+ // var qbChanges = (QuittierungsCheckView)GridControlQuittierungsCheck.SelectedItem;
- QuittierungsCheckDC qbCheck = new QuittierungsCheckDC()
- {
- CustomerOid = qbChanges.CompactCustomer.CustomerOid,
+ // QuittierungsCheckDC qbCheck = new QuittierungsCheckDC()
+ // {
+ // CustomerOid = qbChanges.CompactCustomer.CustomerOid,
- QuittierungsbelegGedruckt = qbChanges.QuittierungsbelegGedruckt,
- QuittierungsbelegGedrucktAm = qbChanges.GedrucktAm,
- QuittierungsbelegGedrucktVon = qbChanges.QuittierungsbelegGedrucktVonOid,
+ // QuittierungsbelegGedruckt = qbChanges.QuittierungsbelegGedruckt,
+ // QuittierungsbelegGedrucktAm = qbChanges.GedrucktAm,
+ // QuittierungsbelegGedrucktVon = qbChanges.QuittierungsbelegGedrucktVonOid,
- Monat = qbChanges.Monat
- };
+ // Monat = qbChanges.Monat
+ // };
- if ((bool)e.NewValue == true)
- {
- qbCheck.QuittierungsbelegUnterschriebenVon = BeWoApp.LoggedOnUser.Employee.EmployeeOid;
- qbCheck.QuittierungsbelegUnterschrieben = true;
- }
- else
- {
- qbCheck.QuittierungsbelegUnterschriebenVon = null;
- qbCheck.QuittierungsbelegUnterschrieben = false;
- }
+ // if ((bool)e.NewValue == true)
+ // {
+ // qbCheck.QuittierungsbelegUnterschriebenVon = BeWoApp.LoggedOnUser.Employee.EmployeeOid;
+ // qbCheck.QuittierungsbelegUnterschrieben = true;
+ // }
+ // else
+ // {
+ // qbCheck.QuittierungsbelegUnterschriebenVon = null;
+ // qbCheck.QuittierungsbelegUnterschrieben = false;
+ // }
- if (qbChanges.QuittierungsCheckOid.HasValue)
- {
- qbCheck.QuittierungsCheckOid = qbChanges.QuittierungsCheckOid;
- ServiceFacade.DoCustomerServiceSync(r => r.UpdateNewQuittierungsCheck(qbCheck));
- }
- else
- {
- ServiceFacade.DoCustomerServiceSync(r => r.SaveNewQuittierungsCheck(qbCheck));
- }
+ // if (qbChanges.QuittierungsCheckOid.HasValue)
+ // {
+ // qbCheck.QuittierungsCheckOid = qbChanges.QuittierungsCheckOid;
+ // ServiceFacade.DoCustomerServiceSync(r => r.UpdateNewQuittierungsCheck(qbCheck));
+ // }
+ // else
+ // {
+ // ServiceFacade.DoCustomerServiceSync(r => r.SaveNewQuittierungsCheck(qbCheck));
+ // }
- GetQuittierungsCheckCustomerList(Dicdate[(string)MonthCombobox.SelectedItem]);
- }
+ // GetQuittierungsCheckCustomerList(Dicdate[(string)MonthCombobox.SelectedItem]);
+ //}
- private void SetMonthCombobox()
- {
- List monate = new List();
+ //private void SetMonthCombobox()
+ //{
+ // List monate = new List();
- monate.Add(Monat.Januar.ToString());
- monate.Add(Monat.Februar.ToString());
- monate.Add(Monat.März.ToString());
- monate.Add(Monat.April.ToString());
- monate.Add(Monat.Mai.ToString());
- monate.Add(Monat.Juni.ToString());
- monate.Add(Monat.Juli.ToString());
- monate.Add(Monat.August.ToString());
- monate.Add(Monat.September.ToString());
- monate.Add(Monat.Oktober.ToString());
- monate.Add(Monat.November.ToString());
- monate.Add(Monat.Dezember.ToString());
+ // monate.Add(Monat.Januar.ToString());
+ // monate.Add(Monat.Februar.ToString());
+ // monate.Add(Monat.März.ToString());
+ // monate.Add(Monat.April.ToString());
+ // monate.Add(Monat.Mai.ToString());
+ // monate.Add(Monat.Juni.ToString());
+ // monate.Add(Monat.Juli.ToString());
+ // monate.Add(Monat.August.ToString());
+ // monate.Add(Monat.September.ToString());
+ // monate.Add(Monat.Oktober.ToString());
+ // monate.Add(Monat.November.ToString());
+ // monate.Add(Monat.Dezember.ToString());
- MonthCombobox.ItemsSource = monate;
+ // MonthCombobox.ItemsSource = monate;
- var dateTime = DateTime.Now;
+ // var dateTime = DateTime.Now;
- var editValue = "default";
+ // var editValue = "default";
- int i = 1;
- foreach (var mon in monate)
- {
- var x = new DateTime(dateTime.Year,i,1);
- Dicdate.Add(mon,x);
+ // int i = 1;
+ // foreach (var mon in monate)
+ // {
+ // var x = new DateTime(dateTime.Year,i,1);
+ // Dicdate.Add(mon,x);
- i++;
- }
+ // i++;
+ // }
- foreach (var key in Dicdate)
- {
- if (key.Value.Month == DateTime.Now.Month)
- {
- editValue = key.Key;
- }
- }
+ // foreach (var key in Dicdate)
+ // {
+ // if (key.Value.Month == DateTime.Now.Month)
+ // {
+ // editValue = key.Key;
+ // }
+ // }
- MonthCombobox.EditValue = editValue;
- }
+ // MonthCombobox.EditValue = editValue;
+ //}
- private void SetYearCombobox()
- {
- List year = new List();
+ //private void SetYearCombobox()
+ //{
+ // List year = new List();
- year.Add(DateTime.Now.AddYears(-5).Year.ToString());
- year.Add(DateTime.Now.AddYears(-4).Year.ToString());
- year.Add(DateTime.Now.AddYears(-3).Year.ToString());
- year.Add(DateTime.Now.AddYears(-2).Year.ToString());
- year.Add(DateTime.Now.AddYears(-1).Year.ToString());
- year.Add(DateTime.Now.Year.ToString());
+ // year.Add(DateTime.Now.AddYears(-5).Year.ToString());
+ // year.Add(DateTime.Now.AddYears(-4).Year.ToString());
+ // year.Add(DateTime.Now.AddYears(-3).Year.ToString());
+ // year.Add(DateTime.Now.AddYears(-2).Year.ToString());
+ // year.Add(DateTime.Now.AddYears(-1).Year.ToString());
+ // year.Add(DateTime.Now.Year.ToString());
- YearCombobox.ItemsSource = year;
+ // YearCombobox.ItemsSource = year;
- YearCombobox.EditValue = DateTime.Now.Year.ToString();
+ // YearCombobox.EditValue = DateTime.Now.Year.ToString();
- DictYear.Add(DateTime.Now.AddYears(-5).Year.ToString(), DateTime.Now.AddYears(-5));
- DictYear.Add(DateTime.Now.AddYears(-4).Year.ToString(), DateTime.Now.AddYears(-4));
- DictYear.Add(DateTime.Now.AddYears(-3).Year.ToString(), DateTime.Now.AddYears(-3));
- DictYear.Add(DateTime.Now.AddYears(-2).Year.ToString(), DateTime.Now.AddYears(-2));
- DictYear.Add(DateTime.Now.AddYears(-1).Year.ToString(), DateTime.Now.AddYears(-1));
- DictYear.Add(DateTime.Now.Year.ToString(), DateTime.Now);
+ // DictYear.Add(DateTime.Now.AddYears(-5).Year.ToString(), DateTime.Now.AddYears(-5));
+ // DictYear.Add(DateTime.Now.AddYears(-4).Year.ToString(), DateTime.Now.AddYears(-4));
+ // DictYear.Add(DateTime.Now.AddYears(-3).Year.ToString(), DateTime.Now.AddYears(-3));
+ // DictYear.Add(DateTime.Now.AddYears(-2).Year.ToString(), DateTime.Now.AddYears(-2));
+ // DictYear.Add(DateTime.Now.AddYears(-1).Year.ToString(), DateTime.Now.AddYears(-1));
+ // DictYear.Add(DateTime.Now.Year.ToString(), DateTime.Now);
- }
+ //}
- private void MonthCombobox_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
- {
- var monat = (string)e.NewValue;
+ //private void MonthCombobox_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
+ //{
+ // var monat = (string)e.NewValue;
- var year = (string) YearCombobox.SelectedItem;
+ // var year = (string) YearCombobox.SelectedItem;
- if (year == null)
- {
- year = DateTime.Now.Year.ToString();
- }
+ // if (year == null)
+ // {
+ // year = DateTime.Now.Year.ToString();
+ // }
- if (Dicdate.ContainsKey(monat))
- {
- if (DictYear.ContainsKey(year))
- {
- DateTime newDate = new DateTime(DictYear[year].Date.Year, Dicdate[monat].Date.Month, 1);
+ // if (Dicdate.ContainsKey(monat))
+ // {
+ // if (DictYear.ContainsKey(year))
+ // {
+ // DateTime newDate = new DateTime(DictYear[year].Date.Year, Dicdate[monat].Date.Month, 1);
- GetQuittierungsCheckCustomerList(newDate);
- }
- }
- }
+ // GetQuittierungsCheckCustomerList(newDate);
+ // }
+ // }
+ //}
- private void YearCombobox_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
- {
- var year = (string)e.NewValue;
+ //private void YearCombobox_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
+ //{
+ // var year = (string)e.NewValue;
- var month = (string) MonthCombobox.SelectedItem;
+ // var month = (string) MonthCombobox.SelectedItem;
- if (DictYear.ContainsKey(year))
- {
- if (Dicdate.ContainsKey(month))
- {
- DateTime newDate = new DateTime(DictYear[year].Date.Year, Dicdate[month].Date.Month, 1);
+ // if (DictYear.ContainsKey(year))
+ // {
+ // if (Dicdate.ContainsKey(month))
+ // {
+ // DateTime newDate = new DateTime(DictYear[year].Date.Year, Dicdate[month].Date.Month, 1);
- GetQuittierungsCheckCustomerList(newDate);
- }
- }
- }
+ // GetQuittierungsCheckCustomerList(newDate);
+ // }
+ // }
+ //}
}
- public class QuittierungsCheckView
- {
- public string Klient { get; set; }
+ //public class QuittierungsCheckView
+ //{
+ // public string Klient { get; set; }
- public bool QuittierungsbelegGedruckt { get; set; }
- public string QuittierungsbelegGedrucktAm { get; set; }
- public string QuittierungsbelegGedrucktVon { get; set; }
+ // public bool QuittierungsbelegGedruckt { get; set; }
+ // public string QuittierungsbelegGedrucktAm { get; set; }
+ // public string QuittierungsbelegGedrucktVon { get; set; }
- public bool QuittierungsbelegUnterschrieben { get; set; }
- public string QuittierungsbelegUnterschriebenVon { get; set; }
+ // public bool QuittierungsbelegUnterschrieben { get; set; }
+ // public string QuittierungsbelegUnterschriebenVon { get; set; }
- public long? QuittierungsCheckOid { get; set; }
- public long? QuittierungsbelegUnterschriebenVonOid { get; set; }
- public long? QuittierungsbelegGedrucktVonOid { get; set; }
+ // public long? QuittierungsCheckOid { get; set; }
+ // public long? QuittierungsbelegUnterschriebenVonOid { get; set; }
+ // public long? QuittierungsbelegGedrucktVonOid { get; set; }
- public bool IsQbUnterschriebenAvailable { get; set; }
+ // public bool IsQbUnterschriebenAvailable { get; set; }
- public CompactCustomerDC CompactCustomer { get; set; }
+ // public CompactCustomerDC CompactCustomer { get; set; }
- public DateTime Monat { get; set; }
- public DateTime? GedrucktAm { get; set; }
- }
+ // public DateTime Monat { get; set; }
+ // public DateTime? GedrucktAm { get; set; }
+ //}
}
\ No newline at end of file
diff --git a/BeWo/View/Detail/Report/SettlementView.xaml b/BeWo/View/Detail/Report/SettlementView.xaml
index c9532b280..6b11278b5 100644
--- a/BeWo/View/Detail/Report/SettlementView.xaml
+++ b/BeWo/View/Detail/Report/SettlementView.xaml
@@ -22,7 +22,7 @@
-
+
diff --git a/BeWo/View/Detail/ServiceRecordEditView.xaml b/BeWo/View/Detail/ServiceRecordEditView.xaml
index ac0366624..0cbc0b174 100644
--- a/BeWo/View/Detail/ServiceRecordEditView.xaml
+++ b/BeWo/View/Detail/ServiceRecordEditView.xaml
@@ -13,6 +13,7 @@
xmlns:dxr="http://schemas.devexpress.com/winfx/2008/xaml/ribbon"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
+
@@ -302,8 +303,541 @@
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -352,33 +864,8 @@
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -390,33 +877,8 @@
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -428,33 +890,8 @@
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -466,36 +903,12 @@
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 808ad862f..deab1b672 100644
--- a/BeWo/View/Detail/ServiceRecordEditView.xaml.cs
+++ b/BeWo/View/Detail/ServiceRecordEditView.xaml.cs
@@ -20,6 +20,7 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Services;
using BS.Shared.Translation;
+using DevExpress.Xpf.RichEdit;
namespace BeWo.View.Detail
{
@@ -35,6 +36,7 @@ namespace BeWo.View.Detail
private CompactEmployeeDC _SelectedEmployee;
+
private bool _HideCustomers;
public ServiceRecordEditView()
@@ -168,10 +170,11 @@ namespace BeWo.View.Detail
Loaded += ServiceRecordEditView_Loaded;
- if(BeWoApp.AppSettings.ShowRtfTextfeld)
+ if(BeWoApp.AppSettings.ShowRtfTextfield)
{
+
ConfigureRTFDocTypes();
- LoadNoticeInRTFTxte();
+ //LoadNoticeInRTFTxte();
}
else{
ConfigureDocTypes();
@@ -389,10 +392,10 @@ namespace BeWo.View.Detail
// _ServiceRecordVM.RoundedDuration = _ServiceRecordVM.Duration.Value;
// }
- if (BeWoApp.AppSettings.ShowRtfTextfeld)
- {
- SetRTFDaten();
- }
+ //if (BeWoApp.AppSettings.ShowRtfTextfield)
+ //{
+ // SetRTFDaten();
+ //}
_ServiceRecordVM.RoundedDuration = _ServiceRecordVM.Duration.Value;
if (_SelectedEmployee != null)
@@ -417,51 +420,7 @@ 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)
{
@@ -612,6 +571,9 @@ namespace BeWo.View.Detail
private void ConfigureDocTypes()
{
//Tabs und Tabelle
+ barManager.Visibility = Visibility.Collapsed;
+ TabBorder.Background = null;
+
int i = ViewModel.AllDocTypes.Count;
if (i == 0)
@@ -718,5 +680,145 @@ namespace BeWo.View.Detail
numeric_duration.Mask = "########0.00";
}
}
+
+ private void tabitem_RtfDokuSelected(object sender, RoutedEventArgs e)
+ {
+ RemoveBarManagerRef();
+ InitRichTextEdit(sender as TabItem);
+
+ }
+
+ private void InitRichTextEdit(TabItem tabItem)
+ {
+ RichEditControl re = null;
+ if (tabItem.Content == null)
+ {
+
+ var dp = new System.Windows.Controls.DockPanel();
+
+ re = new RichEditControl();
+
+ re.CommandBarStyle = CommandBarStyle.Empty;
+ re.HorizontalAlignment = HorizontalAlignment.Stretch;
+ re.VerticalAlignment = VerticalAlignment.Stretch;
+ re.Margin = new Thickness(0);
+
+ if (tabItem.Name == TabitemRtf1Note.Name)
+ {
+ InitTextForRichText(re, _ServiceRecordVM.Notice, _ServiceRecordVM.RTFNotice);
+ }
+ else if (tabItem.Name == TabitemRtf2Note.Name)
+ {
+ InitTextForRichText(re, _ServiceRecordVM.Notice2, _ServiceRecordVM.RTFNotice2);
+ }
+ else if (tabItem.Name == TabitemRtf3Note.Name)
+ {
+ InitTextForRichText(re, _ServiceRecordVM.Notice3, _ServiceRecordVM.RTFNotice3);
+ }
+ else if (tabItem.Name == TabitemRtf4Note.Name)
+ {
+ InitTextForRichText(re, _ServiceRecordVM.Notice4, _ServiceRecordVM.RTFNotice4);
+ }
+ else if (tabItem.Name == TabitemRtf5Note.Name)
+ {
+ InitTextForRichText(re, _ServiceRecordVM.Notice5, _ServiceRecordVM.RTFNotice5);
+ }
+ dp.Children.Add(re);
+ tabItem.Content = dp;
+
+ }
+ else
+ {
+ re = GetRichEditFromTabItem(tabItem);
+
+ }
+ re.BarManager = barManager;
+ re.ContentChanged += RichEdit_ContentChanged;
+
+ FontSizeComboBox.OfficeFontSizeProvider = re;
+ RichEditStyleComboBox.RichEditControl = re;
+ biPageLayoutSizeList.RichEditControl = re;
+ biMailMergeInsertFieldPlaceholder.RichEditControl = re;
+ biReviewReviewers.RichEditControl = re;
+ }
+
+ private void RichEdit_ContentChanged(object sender, EventArgs e)
+ {
+ RichEditControl rec = sender as RichEditControl;
+ if (rec != null)
+ {
+ if (TabitemRtf1Note.IsSelected)
+ {
+ _ServiceRecordVM.Notice = rec.Text;
+ _ServiceRecordVM.RTFNotice = rec.RtfText;
+ }
+ else if (TabitemRtf2Note.IsSelected)
+ {
+ _ServiceRecordVM.Notice2 = rec.Text;
+ _ServiceRecordVM.RTFNotice2 = rec.RtfText;
+ }
+ else if (TabitemRtf3Note.IsSelected)
+ {
+ _ServiceRecordVM.Notice3 = rec.Text;
+ _ServiceRecordVM.RTFNotice3 = rec.RtfText;
+ }
+ else if (TabitemRtf4Note.IsSelected)
+ {
+ _ServiceRecordVM.Notice4 = rec.Text;
+ _ServiceRecordVM.RTFNotice4 = rec.RtfText;
+ }
+ else if (TabitemRtf5Note.IsSelected)
+ {
+ _ServiceRecordVM.Notice5 = rec.Text;
+ _ServiceRecordVM.RTFNotice5 = rec.RtfText;
+ }
+ }
+ }
+
+ private void InitTextForRichText(RichEditControl re, string notice, string rtfNotice)
+ {
+ if (!String.IsNullOrWhiteSpace(rtfNotice))
+ {
+ re.RtfText = rtfNotice;
+ }
+ else if (!String.IsNullOrWhiteSpace(notice))
+ {
+ re.Text = notice;
+ }
+ }
+
+ private void RemoveBarManagerRef()
+ {
+ RemoveBarManagerFromTabItem(TabitemRtf1Note);
+ RemoveBarManagerFromTabItem(TabitemRtf2Note);
+ RemoveBarManagerFromTabItem(TabitemRtf3Note);
+ RemoveBarManagerFromTabItem(TabitemRtf4Note);
+ RemoveBarManagerFromTabItem(TabitemRtf5Note);
+ }
+
+ private void RemoveBarManagerFromTabItem(TabItem tabitem)
+ {
+ RichEditControl rec = GetRichEditFromTabItem(tabitem);
+
+ if (rec != null)
+ {
+ rec.ContentChanged -= RichEdit_ContentChanged;
+ rec.BarManager = null;
+ }
+
+ }
+
+ private RichEditControl GetRichEditFromTabItem(TabItem tabitemRtf1Note)
+ {
+ if (tabitemRtf1Note.Content != null)
+ {
+ var dp = tabitemRtf1Note.Content as System.Windows.Controls.DockPanel;
+ if (dp != null && dp.Children.Count > 0)
+ {
+ return dp.Children[0] as RichEditControl;
+ }
+ }
+ return null;
+ }
}
}
\ No newline at end of file
diff --git a/BeWo/View/Detail/ServiceRecordGroupEditView.xaml b/BeWo/View/Detail/ServiceRecordGroupEditView.xaml
index 1dbb11676..6428a13be 100644
--- a/BeWo/View/Detail/ServiceRecordGroupEditView.xaml
+++ b/BeWo/View/Detail/ServiceRecordGroupEditView.xaml
@@ -294,9 +294,541 @@
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -345,33 +852,8 @@
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -383,33 +865,8 @@
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -421,33 +878,8 @@
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -459,38 +891,13 @@
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 89cf2d1b8..a97d1172a 100644
--- a/BeWo/View/Detail/ServiceRecordGroupEditView.xaml.cs
+++ b/BeWo/View/Detail/ServiceRecordGroupEditView.xaml.cs
@@ -16,6 +16,7 @@ using BS.Shared.Services;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Translation;
+using DevExpress.Xpf.RichEdit;
namespace BeWo.View.Detail
{
@@ -136,10 +137,9 @@ namespace BeWo.View.Detail
_ServiceRecordVM.SetDirty(false);
- if (BeWoApp.AppSettings.ShowRtfTextfeld)
+ if (BeWoApp.AppSettings.ShowRtfTextfield)
{
ConfigureRTFDocTypes();
- LoadNoticeInRTFTxte();
}
else
{
@@ -163,21 +163,7 @@ 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()
{
@@ -327,47 +313,13 @@ namespace BeWo.View.Detail
return ServiceRecordDialogResult.ClosedWithoutSaving;
}
-
- 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();
@@ -818,6 +770,8 @@ namespace BeWo.View.Detail
private void ConfigureDocTypes()
{
+ barManager.Visibility = Visibility.Collapsed;
+ TabBorder.Background = null;
//Tabs und Tabelle
int i = ViewModel.AllDocTypes.Count;
@@ -984,5 +938,145 @@ namespace BeWo.View.Detail
numerictb_duration.Mask = "########0.00";
}
}
+
+ private void tabitem_RtfDokuSelected(object sender, RoutedEventArgs e)
+ {
+ RemoveBarManagerRef();
+ InitRichTextEdit(sender as TabItem);
+
+ }
+
+ private void InitRichTextEdit(TabItem tabItem)
+ {
+ RichEditControl re = null;
+ if (tabItem.Content == null)
+ {
+
+ var dp = new System.Windows.Controls.DockPanel();
+
+ re = new RichEditControl();
+
+ re.CommandBarStyle = CommandBarStyle.Empty;
+ re.HorizontalAlignment = HorizontalAlignment.Stretch;
+ re.VerticalAlignment = VerticalAlignment.Stretch;
+ re.Margin = new Thickness(0);
+
+ if (tabItem.Name == TabitemRtf1Note.Name)
+ {
+ InitTextForRichText(re, _ServiceRecordVM.Notice, _ServiceRecordVM.RTFNotice);
+ }
+ else if (tabItem.Name == TabitemRtf2Note.Name)
+ {
+ InitTextForRichText(re, _ServiceRecordVM.Notice2, _ServiceRecordVM.RTFNotice2);
+ }
+ else if (tabItem.Name == TabitemRtf3Note.Name)
+ {
+ InitTextForRichText(re, _ServiceRecordVM.Notice3, _ServiceRecordVM.RTFNotice3);
+ }
+ else if (tabItem.Name == TabitemRtf4Note.Name)
+ {
+ InitTextForRichText(re, _ServiceRecordVM.Notice4, _ServiceRecordVM.RTFNotice4);
+ }
+ else if (tabItem.Name == TabitemRtf5Note.Name)
+ {
+ InitTextForRichText(re, _ServiceRecordVM.Notice5, _ServiceRecordVM.RTFNotice5);
+ }
+ dp.Children.Add(re);
+ tabItem.Content = dp;
+
+ }
+ else
+ {
+ re = GetRichEditFromTabItem(tabItem);
+
+ }
+ re.BarManager = barManager;
+ re.ContentChanged += RichEdit_ContentChanged;
+
+ FontSizeComboBox.OfficeFontSizeProvider = re;
+ RichEditStyleComboBox.RichEditControl = re;
+ biPageLayoutSizeList.RichEditControl = re;
+ biMailMergeInsertFieldPlaceholder.RichEditControl = re;
+ biReviewReviewers.RichEditControl = re;
+ }
+
+ private void RichEdit_ContentChanged(object sender, EventArgs e)
+ {
+ RichEditControl rec = sender as RichEditControl;
+ if (rec != null)
+ {
+ if (TabitemRtf1Note.IsSelected)
+ {
+ _ServiceRecordVM.Notice = rec.Text;
+ _ServiceRecordVM.RTFNotice = rec.RtfText;
+ }
+ else if (TabitemRtf2Note.IsSelected)
+ {
+ _ServiceRecordVM.Notice2 = rec.Text;
+ _ServiceRecordVM.RTFNotice2 = rec.RtfText;
+ }
+ else if (TabitemRtf3Note.IsSelected)
+ {
+ _ServiceRecordVM.Notice3 = rec.Text;
+ _ServiceRecordVM.RTFNotice3 = rec.RtfText;
+ }
+ else if (TabitemRtf4Note.IsSelected)
+ {
+ _ServiceRecordVM.Notice4 = rec.Text;
+ _ServiceRecordVM.RTFNotice4 = rec.RtfText;
+ }
+ else if (TabitemRtf5Note.IsSelected)
+ {
+ _ServiceRecordVM.Notice5 = rec.Text;
+ _ServiceRecordVM.RTFNotice5 = rec.RtfText;
+ }
+ }
+ }
+
+ private void InitTextForRichText(RichEditControl re, string notice, string rtfNotice)
+ {
+ if (!String.IsNullOrWhiteSpace(rtfNotice))
+ {
+ re.RtfText = rtfNotice;
+ }
+ else if (!String.IsNullOrWhiteSpace(notice))
+ {
+ re.Text = notice;
+ }
+ }
+
+ private void RemoveBarManagerRef()
+ {
+ RemoveBarManagerFromTabItem(TabitemRtf1Note);
+ RemoveBarManagerFromTabItem(TabitemRtf2Note);
+ RemoveBarManagerFromTabItem(TabitemRtf3Note);
+ RemoveBarManagerFromTabItem(TabitemRtf4Note);
+ RemoveBarManagerFromTabItem(TabitemRtf5Note);
+ }
+
+ private void RemoveBarManagerFromTabItem(TabItem tabitem)
+ {
+ RichEditControl rec = GetRichEditFromTabItem(tabitem);
+
+ if (rec != null)
+ {
+ rec.ContentChanged -= RichEdit_ContentChanged;
+ rec.BarManager = null;
+ }
+
+ }
+
+ private RichEditControl GetRichEditFromTabItem(TabItem tabitemRtf1Note)
+ {
+ if (tabitemRtf1Note.Content != null)
+ {
+ var dp = tabitemRtf1Note.Content as System.Windows.Controls.DockPanel;
+ if (dp != null && dp.Children.Count > 0)
+ {
+ return dp.Children[0] as RichEditControl;
+ }
+ }
+ return null;
+ }
}
}
\ No newline at end of file
diff --git a/BeWo/View/Detail/ServiceRecordRTFWindowView.xaml b/BeWo/View/Detail/ServiceRecordRTFWindowView.xaml
index 44468f58c..12850e0cb 100644
--- a/BeWo/View/Detail/ServiceRecordRTFWindowView.xaml
+++ b/BeWo/View/Detail/ServiceRecordRTFWindowView.xaml
@@ -9,58 +9,572 @@
xmlns:dxr="http://schemas.devexpress.com/winfx/2008/xaml/ribbon"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:search="clr-namespace:BeWo.View.Search"
+ xmlns:controls="clr-namespace:BeWo.View.Controls"
mc:Ignorable="d"
- Height="900" Width="900" x:Name="RtfWindow" ResizeMode="CanResizeWithGrip" WindowStartupLocation="CenterScreen" >
-
-
-
-
-
-
-
-
-
-
-
-
+ WindowStyle="None"
+ AllowsTransparency="True"
+ Background="Transparent"
+ MinHeight="400" MinWidth="400" x:Name="RtfWindow" ResizeMode="CanResizeWithGrip" WindowStartupLocation="CenterScreen" >
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BeWo/View/Detail/ServiceRecordRTFWindowView.xaml.cs b/BeWo/View/Detail/ServiceRecordRTFWindowView.xaml.cs
index 87a34b2ef..0c0923e78 100644
--- a/BeWo/View/Detail/ServiceRecordRTFWindowView.xaml.cs
+++ b/BeWo/View/Detail/ServiceRecordRTFWindowView.xaml.cs
@@ -1,10 +1,11 @@
using System;
using System.Windows;
+using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
using BeWo.ViewModel;
-
+using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
@@ -19,14 +20,21 @@ namespace BeWo.View.Detail
{
InitializeComponent();
- RtfWindow.Title = titel;
+ this.Title = titel;
+ rootGroupBox.Header = titel;
richEditControl.Text = text;
richEditControl.RtfText = rtfText;
- Width = SystemParameters.PrimaryScreenWidth / 2;
- Height = SystemParameters.PrimaryScreenWidth / 2;
+ //Width = SystemParameters.PrimaryScreenWidth / 2;
+ //Height = SystemParameters.PrimaryScreenWidth / 2;
+ if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleAnsehen) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneAnsehen))
+ {
+ TextbausteineButton.Visibility = Visibility.Collapsed;
+ //TextModuleTreeViewControl.Visibility = Visibility.Collapsed;
+ }
+
AddClose();
}
@@ -41,70 +49,79 @@ namespace BeWo.View.Detail
Close();
}
+ private void TextModuleTreeViewControl_OnTextModuleSelected(object sender, EventArgs e)
+ {
+ var textToAdd = e.Data.Text;
+
+ if (!String.IsNullOrWhiteSpace(textToAdd))
+ {
+ var oldPos = richEditControl.Document.CaretPosition.ToInt();
+
+ var pos = richEditControl.Document.CaretPosition;
+ var doc = pos.BeginUpdateDocument();
+ doc.InsertText(pos, textToAdd);
+ richEditControl.Document.CaretPosition =
+ richEditControl.Document.CreatePosition(oldPos + textToAdd.Length);
+
+ pos.EndUpdateDocument(doc);
+ richEditControl.Focus();
+ }
+ }
+
+ private void RootGroupBox_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+ {
+ try
+ {
+ DragMove();
+ }
+ catch (Exception) { }
+ }
+
+ private void RootGroupBox_OnMouseDoubleClick(object sender, MouseButtonEventArgs e)
+ {
+ var pos = PointToScreen(Mouse.GetPosition(this));
+
+ if (!(e.OriginalSource is Border) && !(e.OriginalSource is TextBlock) || pos.Y > 200d || e.OriginalSource is TextBlock && Mouse.DirectlyOver is Button)
+ {
+ return;
+ }
+
+ if (WindowState == WindowState.Maximized)
+ {
+ WindowState = WindowState.Normal;
+ return;
+ }
+
+ if (WindowState == WindowState.Normal)
+ {
+ WindowState = WindowState.Maximized;
+ }
+ }
+
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.CreateTextModuleListVMAsync(
- textModules => this.Dispatch(delegate
- {
- var tbv = new TextModuleView(textModules) { Background = FindResource("ApplicationBackground") as LinearGradientBrush };
+ var textToAdd = e.Data.Text;
- var window = new BeWoWindow(tbv) { rootGroupBox = { Header = "Textbausteine" }, Width = 850, MinWidth = 850 };
+ if (!String.IsNullOrWhiteSpace(textToAdd))
+ {
+ var oldPos = richEditControl.Document.CaretPosition.ToInt();
- tbv.CancelButton.Click += (o, args) =>
- {
- tbv.Focus();
- tbv.DoSaveCheck();
+ var pos = richEditControl.Document.CaretPosition;
+ var doc = pos.BeginUpdateDocument();
+ doc.InsertText(pos, textToAdd);
+ richEditControl.Document.CaretPosition =
+ richEditControl.Document.CreatePosition(oldPos + textToAdd.Length);
- window.Close();
- };
-
- window.Show();
- }), false, true);
- }
+ pos.EndUpdateDocument(doc);
+ richEditControl.Focus();
+ }
+ popup_textbausteine.IsOpen = false;
+ }
}
public class CustomRTFWindowArgs : EventArgs
diff --git a/BeWo/View/Detail/ServiceRecordView2.xaml b/BeWo/View/Detail/ServiceRecordView2.xaml
index 16491ca94..43fee6013 100644
--- a/BeWo/View/Detail/ServiceRecordView2.xaml
+++ b/BeWo/View/Detail/ServiceRecordView2.xaml
@@ -849,8 +849,10 @@
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -927,8 +911,9 @@
-
-
+
+
+
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -1006,8 +973,9 @@
-
-
+
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -1086,8 +1035,9 @@
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -1165,8 +1096,9 @@
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -1670,7 +1583,7 @@
-
+
@@ -1731,10 +1644,13 @@
+
+
+
-
diff --git a/BeWo/View/Detail/ServiceRecordView2.xaml.cs b/BeWo/View/Detail/ServiceRecordView2.xaml.cs
index c6d7217cd..2dea3bfeb 100644
--- a/BeWo/View/Detail/ServiceRecordView2.xaml.cs
+++ b/BeWo/View/Detail/ServiceRecordView2.xaml.cs
@@ -52,7 +52,9 @@ namespace BeWo.View.Detail
{
get
{
- return BeWoApp.AppSettings.HideServiceRecordInsertedByAndInsertedOn ? Visibility.Collapsed : Visibility.Visible;
+ return BeWoApp.AppSettings.HideServiceRecordInsertedByAndInsertedOn
+ ? Visibility.Collapsed
+ : Visibility.Visible;
}
}
@@ -72,21 +74,19 @@ namespace BeWo.View.Detail
private AssessmentSheetEntryView assessmentSheet;
- private ServiceRecordVM lastSelectedVM;
+ private ServiceRecordVM lastSelectedVM;
- private readonly Dictionary> customerContainsAssessmentCategories = new Dictionary>();
+ private readonly Dictionary>
+ customerContainsAssessmentCategories = new Dictionary>();
private bool _IgnoreGroupMultiCheck;
private int lastPosition;
public static double DocumentationTextBoxFontSize
- {
- get
- {
- return BeWoApp.AppSettings.DocumentationFontSize;
- }
- }
+ {
+ get { return BeWoApp.AppSettings.DocumentationFontSize; }
+ }
public ServiceRecordView2(ServiceRecordListVM pViewModel, long? startSupportConceptOid)
{
@@ -102,7 +102,7 @@ namespace BeWo.View.Detail
_StartSupportConceptOid = startSupportConceptOid;
ViewModel = pViewModel;
-
+
//serviceRecordListContent.
// CheckMinStdSwitch.SelectedIndex = 0;
@@ -115,7 +115,7 @@ namespace BeWo.View.Detail
//}
if (ViewModel.ServiceRecordTimeInterval == ServiceRecordTimeInterval.XTage)
{
- NDays.Visibility = Visibility.Visible;
+ NDays.Visibility = Visibility.Visible;
}
else if (ViewModel.ServiceRecordTimeInterval == ServiceRecordTimeInterval.ZeitraumWaehlen)
{
@@ -132,7 +132,8 @@ namespace BeWo.View.Detail
if (!String.IsNullOrWhiteSpace(BeWoApp.AppSettings.TimeRecordingMenuName))
{
- chkWithClient.Content = BeWoApp.AppSettings.TimeRecordingMenuName + Translator.Translate(" für ausgewählten Klienten");
+ chkWithClient.Content = BeWoApp.AppSettings.TimeRecordingMenuName +
+ Translator.Translate(" für ausgewählten Klienten");
txtTimeRecording.Text = BeWoApp.AppSettings.TimeRecordingMenuName;
}
else
@@ -140,10 +141,11 @@ namespace BeWo.View.Detail
chkWithClient.Content = Translator.Translate("Zeiterfassung für ausgewählten Klienten");
txtTimeRecording.Text = Translator.Translate("Zeiterfassung");
}
- numerictb_distance.Visibility = BeWoApp.AppSettings.ShowDistanceFields ? Visibility.Visible : Visibility.Collapsed;
- lblDistance.Visibility = BeWoApp.AppSettings.ShowDistanceFields ? Visibility.Visible : Visibility.Collapsed;
+ numerictb_distance.Visibility =
+ BeWoApp.AppSettings.ShowDistanceFields ? Visibility.Visible : Visibility.Collapsed;
+ lblDistance.Visibility = BeWoApp.AppSettings.ShowDistanceFields ? Visibility.Visible : Visibility.Collapsed;
- DistanceGridColumn.Visible = BeWoApp.AppSettings.ShowDistanceFields;
+ DistanceGridColumn.Visible = BeWoApp.AppSettings.ShowDistanceFields;
//this.numerictb_duration.TextChanged += (s, e) =>
// {
@@ -154,12 +156,12 @@ namespace BeWo.View.Detail
// };
combobox_services.SelectionChanged += (s, e) =>
+ {
+ if (combobox_services.SelectedIndex == -1)
{
- if (combobox_services.SelectedIndex == -1)
- {
- combobox_services.SelectedIndex = 0;
- }
- };
+ combobox_services.SelectedIndex = 0;
+ }
+ };
//combobox_services_wohnheimbuchung.SelectionChanged += (s, e) =>
//{
@@ -169,7 +171,7 @@ namespace BeWo.View.Detail
// }
//};
- InitDayCheckBoxes();
+ InitDayCheckBoxes();
Loaded += ServiceRecordView2_Loaded;
@@ -181,7 +183,7 @@ namespace BeWo.View.Detail
punktebogenRootGrid.Children.Clear();
punktebogenRootGrid.Children.Add(assessmentSheet);
assessmentSheet.Visibility = Visibility.Collapsed;
- }
+ }
else
{
punktebogenRootGrid.Visibility = Visibility.Collapsed;
@@ -193,86 +195,125 @@ namespace BeWo.View.Detail
//srListBox.Visibility = Visibility.Hidden;
//srGridControl.Visibility = Visibility.Visible;
}
-
+
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreationForOtherEmployees))
{
employeeSearchView.SearchMode = SearchMode.OnlyTeamMember;
}
- if (BeWoApp.AppSettings.ShowMarker)
- {
- chkContentFilter.Content = "Nur Marker anzeigen";
- chkContentFilter.Visibility = Visibility.Visible;
-
- chkServiceRecordTypeContent.Content = "Marker";
- chkServiceRecordTypeContent.Visibility = Visibility.Visible;
-
- }
- else
- {
- if (BeWoApp.Mandator.BeWoClientType == 3)
- {
- //Köln Ring
- chkContentFilter.Visibility = Visibility.Visible;
- chkServiceRecordTypeContent.Visibility = Visibility.Visible;
- }
- else
- {
- chkContentFilter.Visibility = Visibility.Collapsed;
- chkServiceRecordTypeContent.Visibility = Visibility.Collapsed;
- }
- }
-
- if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreatingGroupBooking))
- {
- chkGroupBooking.Visibility = Visibility.Collapsed;
- }
- if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreatingMultiBooking))
- {
- chkMultiBooking.Visibility = Visibility.Collapsed;
- }
- if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleAnsehen) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneAnsehen))
+ if (BeWoApp.AppSettings.ShowMarker)
{
- TextModuleTreeViewControl1.Visibility = Visibility.Collapsed;
- TextbausteineBearbeitenButton1.Visibility = Visibility.Collapsed;
- TextModuleTreeViewControl2.Visibility = Visibility.Collapsed;
- TextbausteineBearbeitenButton2.Visibility = Visibility.Collapsed;
- TextModuleTreeViewControl3.Visibility = Visibility.Collapsed;
- TextbausteineBearbeitenButton3.Visibility = Visibility.Collapsed;
- TextModuleTreeViewControl4.Visibility = Visibility.Collapsed;
- TextbausteineBearbeitenButton4.Visibility = Visibility.Collapsed;
- TextModuleTreeViewControl5.Visibility = Visibility.Collapsed;
- TextbausteineBearbeitenButton5.Visibility = Visibility.Collapsed;
+ chkContentFilter.Content = "Nur Marker anzeigen";
+ chkContentFilter.Visibility = Visibility.Visible;
+
+ chkServiceRecordTypeContent.Content = "Marker";
+ chkServiceRecordTypeContent.Visibility = Visibility.Visible;
+
}
- if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleBearbeiten) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneBearbeiten))
+ else
+ {
+ if (BeWoApp.Mandator.BeWoClientType == 3)
+ {
+ //Köln Ring
+ chkContentFilter.Visibility = Visibility.Visible;
+ chkServiceRecordTypeContent.Visibility = Visibility.Visible;
+ }
+ else
+ {
+ chkContentFilter.Visibility = Visibility.Collapsed;
+ chkServiceRecordTypeContent.Visibility = Visibility.Collapsed;
+ }
+ }
+
+ if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreatingGroupBooking))
+ {
+ chkGroupBooking.Visibility = Visibility.Collapsed;
+ }
+ if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreatingMultiBooking))
+ {
+ chkMultiBooking.Visibility = Visibility.Collapsed;
+ }
+ if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleAnsehen) &&
+ !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneAnsehen))
+ {
+ TextbausteineButton1.Visibility = Visibility.Collapsed;
+ TextbausteineButtonRtf1.Visibility = Visibility.Collapsed;
+
+ TextbausteineButton2.Visibility = Visibility.Collapsed;
+ TextbausteineButtonRtf2.Visibility = Visibility.Collapsed;
+
+ TextbausteineButton3.Visibility = Visibility.Collapsed;
+ TextbausteineButtonRtf3.Visibility = Visibility.Collapsed;
+
+ TextbausteineButton4.Visibility = Visibility.Collapsed;
+ TextbausteineButtonRtf4.Visibility = Visibility.Collapsed;
+
+ TextbausteineButton5.Visibility = Visibility.Collapsed;
+ TextbausteineButtonRtf5.Visibility = Visibility.Collapsed;
+
+ //TextModuleTreeViewControl1.Visibility = Visibility.Collapsed;
+ TextbausteineBearbeitenButton1.Visibility = Visibility.Collapsed;
+ //TextModuleTreeViewControlRtf1.Visibility = Visibility.Collapsed;
+ TextbausteineBearbeitenButtonRTF1.Visibility = Visibility.Collapsed;
+
+ //TextModuleTreeViewControl2.Visibility = Visibility.Collapsed;
+ TextbausteineBearbeitenButton2.Visibility = Visibility.Collapsed;
+ //TextModuleTreeViewControlRtf1.Visibility = Visibility.Collapsed;
+ TextbausteineBearbeitenButtonRTF2.Visibility = Visibility.Collapsed;
+
+ //TextModuleTreeViewControl3.Visibility = Visibility.Collapsed;
+ TextbausteineBearbeitenButton3.Visibility = Visibility.Collapsed;
+ //TextModuleTreeViewControlRtf1.Visibility = Visibility.Collapsed;
+ TextbausteineBearbeitenButtonRTF3.Visibility = Visibility.Collapsed;
+
+ //TextModuleTreeViewControl4.Visibility = Visibility.Collapsed;
+ TextbausteineBearbeitenButton4.Visibility = Visibility.Collapsed;
+ //TextModuleTreeViewControlRtf1.Visibility = Visibility.Collapsed;
+ TextbausteineBearbeitenButtonRTF4.Visibility = Visibility.Collapsed;
+
+ //TextModuleTreeViewControl5.Visibility = Visibility.Collapsed;
+ TextbausteineBearbeitenButton5.Visibility = Visibility.Collapsed;
+ //TextModuleTreeViewControlRtf1.Visibility = Visibility.Collapsed;
+ TextbausteineBearbeitenButtonRTF5.Visibility = Visibility.Collapsed;
+ }
+ if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleBearbeiten) &&
+ !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneBearbeiten))
{
TextbausteineBearbeitenButton1.Visibility = Visibility.Collapsed;
- TextbausteineBearbeitenButton2.Visibility = Visibility.Collapsed;
- TextbausteineBearbeitenButton3.Visibility = Visibility.Collapsed;
- TextbausteineBearbeitenButton4.Visibility = Visibility.Collapsed;
- TextbausteineBearbeitenButton5.Visibility = Visibility.Collapsed;
- }
- // gridServiceRecordsSelection.DataSource = pViewModel.VMList;
+ TextbausteineBearbeitenButton2.Visibility = Visibility.Collapsed;
+ TextbausteineBearbeitenButton3.Visibility = Visibility.Collapsed;
+ TextbausteineBearbeitenButton4.Visibility = Visibility.Collapsed;
+ TextbausteineBearbeitenButton5.Visibility = Visibility.Collapsed;
- if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecordAllowRebooking))
- {
- Eintragumbuchunsbutton.Visibility = Visibility.Collapsed;
- }
+ TextbausteineBearbeitenButtonRTF1.Visibility = Visibility.Collapsed;
+ TextbausteineBearbeitenButtonRTF2.Visibility = Visibility.Collapsed;
+ TextbausteineBearbeitenButtonRTF3.Visibility = Visibility.Collapsed;
+ TextbausteineBearbeitenButtonRTF4.Visibility = Visibility.Collapsed;
+ TextbausteineBearbeitenButtonRTF5.Visibility = Visibility.Collapsed;
+ }
+ // gridServiceRecordsSelection.DataSource = pViewModel.VMList;
+
+ if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecordAllowRebooking))
+ {
+ Eintragumbuchunsbutton.Visibility = Visibility.Collapsed;
+ }
//ServiceFacade.DoCustomerServiceAsync(s => s.GetAllActiveWohnheimeCompact(), wohnheime => this.Dispatch(() =>
//{
// chkWohnheimBooking.Visibility = wohnheime.Any() ? Visibility.Visible : Visibility.Collapsed;
//}));
- SetStatisticsVisibility();
+ SetStatisticsVisibility();
- if(BeWoApp.AppSettings.ShowRtfTextfeld){
- ConfigureRTFDocTypes();
+ if (BeWoApp.AppSettings.ShowRtfTextfield)
+ {
+ ConfigureRTFDocTypes();
SetRTFFontSizeFromApp();
- }
- else{
+ }
+ else
+ {
ConfigureDocTypes();
- }
+ }
ConfigureEndDate();
@@ -282,21 +323,25 @@ namespace BeWo.View.Detail
//richEdit.VerticalRulerVisibility = Visibility.Collapsed;
//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;
+ //var size = BeWoApp.AppSettings.DocumentationFontSize;
+ //if (size > 0)
+ //{
+ // richEditControl1.FontSize = size;
+ // richEditControl2.FontSize = size;
+ // richEditControl3.FontSize = size;
+ // richEditControl4.FontSize = size;
+ // richEditControl5.FontSize = size;
+ //}
}
- private void ConfigureEndDate() {
-
+ private void ConfigureEndDate()
+ {
+
var Settings = BeWoApp.AppSettings;
if (Settings.IsOnlyYearMonthVisible)
@@ -307,7 +352,7 @@ namespace BeWo.View.Detail
EndDatumHeader.Visible = false;
- numerictb_distance.SetValue(WidthProperty, (double)105);
+ numerictb_distance.SetValue(WidthProperty, (double) 105);
numerictb_distance.SetValue(HorizontalAlignmentProperty, HorizontalAlignment.Right);
lblDistance.SetValue(HorizontalAlignmentProperty, HorizontalAlignment.Left);
}
@@ -324,7 +369,8 @@ namespace BeWo.View.Detail
MinStdDauerlbl.SetValue(Grid.ColumnProperty, 0);
numeric_duration.SetValue(Grid.ColumnProperty, 1);
- if (MinSTDMitEnd.Text == ZeiterfassungsDauer.Stunden.ToString()) {
+ if (MinSTDMitEnd.Text == ZeiterfassungsDauer.Stunden.ToString())
+ {
numeric_duration.IsFloatValue = true;
numeric_duration.Mask = "########0.00";
}
@@ -337,15 +383,15 @@ namespace BeWo.View.Detail
EndDatumHeader.Visible = true;
- numerictb_distance.SetValue(WidthProperty, (double)47);
+ numerictb_distance.SetValue(WidthProperty, (double) 47);
numerictb_distance.SetValue(HorizontalAlignmentProperty, HorizontalAlignment.Right);
}
else
{
- GridMitEnddatum.Visibility = Visibility.Collapsed;
- GridMitJahrMonat.Visibility = Visibility.Collapsed;
- GridOhneEnddatum.Visibility = Visibility.Visible;
+ GridMitEnddatum.Visibility = Visibility.Collapsed;
+ GridMitJahrMonat.Visibility = Visibility.Collapsed;
+ GridOhneEnddatum.Visibility = Visibility.Visible;
//Collapse Zeit art und ändere namen von Dauer aufs originale zurück.
RoundedDHeader.Header = "Minuten";
@@ -357,7 +403,7 @@ namespace BeWo.View.Detail
}
if (Settings.IsZeiterfassungInStdMin)
{
-
+
MinSTDOhneEnd.Visibility = Visibility.Visible;
MinStdDauerLabel.SetValue(Grid.ColumnProperty, 0);
@@ -382,140 +428,140 @@ namespace BeWo.View.Detail
}
- private void ConfigureRTFDocTypes()
- {
- //hier der Aufruf für die RTF GEdönse
- TabitemRtf1Note.IsSelected = true;
+ 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;
+ 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;
+ 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();
- }
+ 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;
+ TabItem1_Notice.IsSelected = true;
//Tabs und Tabelle
int i = _ViewModel.AllDocTypes.Count;
- DokumentationLabel.Visibility = Visibility.Collapsed;
- if(i == 0)
+ DokumentationLabel.Visibility = Visibility.Collapsed;
+ if (i == 0)
{
- TabItem1_Notice.Header = "Dokumentation";
- head_Doku1.Header = "Dokumentation";
+ TabItem1_Notice.Header = "Dokumentation";
+ head_Doku1.Header = "Dokumentation";
DokumentationLabel.Content = "";
TabItem2_Notice.Visibility = Visibility.Collapsed;
@@ -527,13 +573,13 @@ namespace BeWo.View.Detail
head_Doku3.Visible = false;
head_Doku4.Visible = false;
head_Doku5.Visible = false;
-
+
}
- else if (i == 1)
+ else if (i == 1)
{
//DokumentationLabel.Content = "Dokumentation";
- TabItem1_Notice.Header = _ViewModel.AllDocTypes[0].ToString();
- head_Doku1.Header = _ViewModel.AllDocTypes[0].ToString();
+ TabItem1_Notice.Header = _ViewModel.AllDocTypes[0].ToString();
+ head_Doku1.Header = _ViewModel.AllDocTypes[0].ToString();
TabItem2_Notice.Visibility = Visibility.Collapsed;
TabItem3_Notice.Visibility = Visibility.Collapsed;
@@ -545,12 +591,13 @@ namespace BeWo.View.Detail
head_Doku4.Visible = false;
head_Doku5.Visible = false;
}
- else if (i == 2) {
+ else if (i == 2)
+ {
DokumentationLabel.Content = "Dokumentation";
- TabItem1_Notice.Header = _ViewModel.AllDocTypes[0].ToString();
- TabItem2_Notice.Header = _ViewModel.AllDocTypes[1].ToString();
- head_Doku1.Header = _ViewModel.AllDocTypes[0].ToString();
- head_Doku2.Header = _ViewModel.AllDocTypes[1].ToString();
+ TabItem1_Notice.Header = _ViewModel.AllDocTypes[0].ToString();
+ TabItem2_Notice.Header = _ViewModel.AllDocTypes[1].ToString();
+ head_Doku1.Header = _ViewModel.AllDocTypes[0].ToString();
+ head_Doku2.Header = _ViewModel.AllDocTypes[1].ToString();
TabItem3_Notice.Visibility = Visibility.Collapsed;
TabItem4_Notice.Visibility = Visibility.Collapsed;
@@ -560,7 +607,7 @@ namespace BeWo.View.Detail
head_Doku4.Visible = false;
head_Doku5.Visible = false;
}
- else if (i == 3)
+ else if (i == 3)
{
DokumentationLabel.Content = "Dokumentation";
TabItem1_Notice.Header = _ViewModel.AllDocTypes[0].ToString();
@@ -576,7 +623,7 @@ namespace BeWo.View.Detail
head_Doku4.Visible = false;
head_Doku5.Visible = false;
}
- else if (i == 4)
+ else if (i == 4)
{
DokumentationLabel.Content = "Dokumentation";
@@ -612,134 +659,148 @@ namespace BeWo.View.Detail
}
}
- private void ViewModelOnStatisticInfosLoaded(object sender, EventArgs eventArgs)
- {
- var info = sender as ServiceRecordStatisticsInfoDC;
- if (info != null)
- {
- StatisticInfoGrid.Children.Clear();
- StatisticInfoGrid.ColumnDefinitions.Clear();
- StatisticInfoGrid.RowDefinitions.Clear();
+ private void ViewModelOnStatisticInfosLoaded(object sender, EventArgs eventArgs)
+ {
+ var info = sender as ServiceRecordStatisticsInfoDC;
+ if (info != null)
+ {
+ StatisticInfoGrid.Children.Clear();
+ StatisticInfoGrid.ColumnDefinitions.Clear();
+ StatisticInfoGrid.RowDefinitions.Clear();
- if (info.Header != null)
- {
- StatisticInfoGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Auto) });
-
-
- foreach (var header in info.Header)
- {
- StatisticInfoGrid.RowDefinitions.Add(new RowDefinition());
- }
- int rowIndex = 0;
- foreach (var header in info.Header)
- {
- var txt = new TextBlock();
- txt.SetValue(Grid.ColumnProperty, 0);
- txt.SetValue(Grid.RowProperty, rowIndex);
- txt.Foreground = new SolidColorBrush((Color) ColorConverter.ConvertFromString(info.ForegroundColor[rowIndex]));
- txt.Height = 14;
- txt.Text = header;
-
- StatisticInfoGrid.Children.Add(txt);
-
- rowIndex++;
- }
-
- if (info.PeriodStatisticInfos != null)
- {
- foreach (var periodInfo in info.PeriodStatisticInfos)
- {
- StatisticInfoGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Auto) });
- StatisticInfoGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Auto) });
- }
-
- int colIndex = 1;
- foreach (var periodInfo in info.PeriodStatisticInfos)
- {
- rowIndex = 0;
- foreach (var lv in periodInfo.LeftValues)
- {
- if (!String.IsNullOrEmpty(lv))
- {
- var txt = new TextBlock();
- txt.SetValue(Grid.ColumnProperty, colIndex);
- txt.SetValue(Grid.RowProperty, rowIndex);
- txt.Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString(periodInfo.LeftValueColors[rowIndex]));
- txt.Height = 12;
- txt.FontWeight = FontWeights.Bold;
- txt.Text = lv;
- txt.HorizontalAlignment = HorizontalAlignment.Right;
- txt.Margin = new Thickness(10,0,0,0);
- txt.Padding = new Thickness(1, 0, 1, 0);
- if (String.IsNullOrEmpty(periodInfo.RightValues[rowIndex]))
- {
- txt.SetValue(Grid.ColumnSpanProperty, 2);
- }
-
- StatisticInfoGrid.Children.Add(txt);
-
-
- //
- }
- if (!String.IsNullOrEmpty(periodInfo.RightValues[rowIndex]))
- {
- var txt = new TextBlock();
- txt.SetValue(Grid.ColumnProperty, colIndex + 1);
- txt.SetValue(Grid.RowProperty, rowIndex);
- txt.Foreground =
- new SolidColorBrush((Color) ColorConverter.ConvertFromString(periodInfo.RightValueColors[rowIndex]));
- txt.Height = 12;
- txt.FontWeight = FontWeights.Bold;
- txt.Text = periodInfo.RightValues[rowIndex];
- txt.HorizontalAlignment = HorizontalAlignment.Right;
- txt.Margin = new Thickness(10, 0, 0, 0);
- txt.Padding = new Thickness(1, 0, 1, 0);
- StatisticInfoGrid.Children.Add(txt);
+ if (info.Header != null)
+ {
+ StatisticInfoGrid.ColumnDefinitions.Add(new ColumnDefinition
+ {
+ Width = new GridLength(1, GridUnitType.Auto)
+ });
- //
- }
-
+ foreach (var header in info.Header)
+ {
+ StatisticInfoGrid.RowDefinitions.Add(new RowDefinition());
+ }
+ int rowIndex = 0;
+ foreach (var header in info.Header)
+ {
+ var txt = new TextBlock();
+ txt.SetValue(Grid.ColumnProperty, 0);
+ txt.SetValue(Grid.RowProperty, rowIndex);
+ txt.Foreground =
+ new SolidColorBrush(
+ (Color) ColorConverter.ConvertFromString(info.ForegroundColor[rowIndex]));
+ txt.Height = 14;
+ txt.Text = header;
- rowIndex++;
- }
+ StatisticInfoGrid.Children.Add(txt);
- colIndex += 2;
- }
- }
- }
- }
- }
+ rowIndex++;
+ }
- private void SetStatisticsVisibility()
- {
- String tenant = BeWoApp.Tenant;
+ if (info.PeriodStatisticInfos != null)
+ {
+ foreach (var periodInfo in info.PeriodStatisticInfos)
+ {
+ StatisticInfoGrid.ColumnDefinitions.Add(new ColumnDefinition
+ {
+ Width = new GridLength(1, GridUnitType.Auto)
+ });
+ StatisticInfoGrid.ColumnDefinitions.Add(new ColumnDefinition
+ {
+ Width = new GridLength(1, GridUnitType.Auto)
+ });
+ }
+
+ int colIndex = 1;
+ foreach (var periodInfo in info.PeriodStatisticInfos)
+ {
+ rowIndex = 0;
+ foreach (var lv in periodInfo.LeftValues)
+ {
+ if (!String.IsNullOrEmpty(lv))
+ {
+ var txt = new TextBlock();
+ txt.SetValue(Grid.ColumnProperty, colIndex);
+ txt.SetValue(Grid.RowProperty, rowIndex);
+ txt.Foreground = new SolidColorBrush(
+ (Color) ColorConverter.ConvertFromString(periodInfo.LeftValueColors[rowIndex]));
+ txt.Height = 12;
+ txt.FontWeight = FontWeights.Bold;
+ txt.Text = lv;
+ txt.HorizontalAlignment = HorizontalAlignment.Right;
+ txt.Margin = new Thickness(10, 0, 0, 0);
+ txt.Padding = new Thickness(1, 0, 1, 0);
+ if (String.IsNullOrEmpty(periodInfo.RightValues[rowIndex]))
+ {
+ txt.SetValue(Grid.ColumnSpanProperty, 2);
+ }
+
+ StatisticInfoGrid.Children.Add(txt);
+
+
+ //
+ }
+ if (!String.IsNullOrEmpty(periodInfo.RightValues[rowIndex]))
+ {
+ var txt = new TextBlock();
+ txt.SetValue(Grid.ColumnProperty, colIndex + 1);
+ txt.SetValue(Grid.RowProperty, rowIndex);
+ txt.Foreground =
+ new SolidColorBrush(
+ (Color) ColorConverter.ConvertFromString(
+ periodInfo.RightValueColors[rowIndex]));
+ txt.Height = 12;
+ txt.FontWeight = FontWeights.Bold;
+ txt.Text = periodInfo.RightValues[rowIndex];
+ txt.HorizontalAlignment = HorizontalAlignment.Right;
+ txt.Margin = new Thickness(10, 0, 0, 0);
+ txt.Padding = new Thickness(1, 0, 1, 0);
+ StatisticInfoGrid.Children.Add(txt);
+
+
+ //
+ }
+
+
+ rowIndex++;
+ }
+
+ colIndex += 2;
+ }
+ }
+ }
+ }
+ }
+
+ private void SetStatisticsVisibility()
+ {
+ String tenant = BeWoApp.Tenant;
#if DEBUG
- //tenant = "3057313346";
+ //tenant = "3057313346";
#endif
- if (tenant == "3057313346" || tenant == "2918696314")
- {
- lblStatisticInfo1.Text = "Geleistet/bewilligt Gesamt";
- lblStatisticInfo2.Text = "Geleistet/bewilligt pro Woche";
- lblStatisticInfo3.Text = "Geleistet/bewilligt pro Monat";
- lblStatisticInfo4.Text = "Ãœbertrag Monat";
- lblStatisticInfo4.Visibility = Visibility.Visible;
- lblStatisticInfo5.Visibility = Visibility.Collapsed;
- }
- else
- {
- lblStatisticInfo4.Visibility = Visibility.Collapsed;
- lblStatisticInfo5.Visibility = Visibility.Collapsed;
- }
- }
+ if (tenant == "3057313346" || tenant == "2918696314")
+ {
+ lblStatisticInfo1.Text = "Geleistet/bewilligt Gesamt";
+ lblStatisticInfo2.Text = "Geleistet/bewilligt pro Woche";
+ lblStatisticInfo3.Text = "Geleistet/bewilligt pro Monat";
+ lblStatisticInfo4.Text = "Ãœbertrag Monat";
+ lblStatisticInfo4.Visibility = Visibility.Visible;
+ lblStatisticInfo5.Visibility = Visibility.Collapsed;
+ }
+ else
+ {
+ lblStatisticInfo4.Visibility = Visibility.Collapsed;
+ lblStatisticInfo5.Visibility = Visibility.Collapsed;
+ }
+ }
- private void supportConceptSelectionControl_ControlInitialized(object sender, EventArgs e)
+ private void supportConceptSelectionControl_ControlInitialized(object sender, EventArgs e)
{
InitCustomerSelectedItem();
multiSupportConceptControl.SupportConceptList = supportConceptSelectionControl.SupportConceptList;
@@ -798,7 +859,8 @@ namespace BeWo.View.Detail
_ViewModel.ServiceRecordListChanged += ViewModel_ServiceRecordListChanged;
- if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecordView_Create) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.CreateAll))
+ if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecordView_Create) &&
+ !BeWoApp.LoggedOnUser.HasRight(UserRightType.CreateAll))
{
newObjectInfoGrid.IsEnabled = false;
button_add.IsEnabled = false;
@@ -813,11 +875,11 @@ namespace BeWo.View.Detail
// System.Windows.Media.TransformGroup group = this.DetailFrame.RenderTransform as System.Windows.Media.TransformGroup;
// System.Windows.Media.ScaleTransform scale = group.Children[0] as System.Windows.Media.ScaleTransform;
var lAnimation = new DoubleAnimation
- {
- From = detailContentGrid.Opacity,
- To = pOpacitiy,
- Duration = TimeSpan.FromMilliseconds(pDuration)
- };
+ {
+ From = detailContentGrid.Opacity,
+ To = pOpacitiy,
+ Duration = TimeSpan.FromMilliseconds(pDuration)
+ };
// lAnimation.From = scale.ScaleX;
// lAnimation.To = pOpacitiy;
@@ -869,7 +931,8 @@ namespace BeWo.View.Detail
var lDC = vm.CommitToDataContract();
ServiceFacade.DoOperationsServiceAsync(
- s => s.DeleteServiceRecord(lDC.ServiceRecordOid.Value, lDC.ServiceRecordVersion.Value), RefreshGrid);
+ s => s.DeleteServiceRecord(lDC.ServiceRecordOid.Value, lDC.ServiceRecordVersion.Value),
+ RefreshGrid);
}
// gridServiceRecordsSelection.UpdateLayout();
@@ -883,30 +946,31 @@ namespace BeWo.View.Detail
public void SetSelectedServiceRecordVM(ServiceRecordVM vm, bool isOnDelet)
{
- if (vm != null)
- {
- ServiceRecordVM existingVm = null;
+ if (vm != null)
+ {
+ ServiceRecordVM existingVm = null;
-
- if (!isOnDelet)
- {
- foreach (var serviceRecordVm in ViewModel.VMList)
- {
- if (serviceRecordVm.Id == vm.Id)
- {
- existingVm = serviceRecordVm;
- }
- }
- }
- else
- {
- foreach (var serviceRecordVm in ViewModel.VMList)
+
+ if (!isOnDelet)
+ {
+ foreach (var serviceRecordVm in ViewModel.VMList)
{
if (serviceRecordVm.Id == vm.Id)
{
- if(ViewModel.VMList.Count > 0 && lastPosition > 0) {
+ existingVm = serviceRecordVm;
+ }
+ }
+ }
+ else
+ {
+ foreach (var serviceRecordVm in ViewModel.VMList)
+ {
+ if (serviceRecordVm.Id == vm.Id)
+ {
+ if (ViewModel.VMList.Count > 0 && lastPosition > 0)
+ {
var a = ViewModel.VMList[lastPosition - 1];
-
+
existingVm = a;
}
else
@@ -915,12 +979,12 @@ namespace BeWo.View.Detail
}
}
}
- }
+ }
srListBox.SelectedItem = existingVm;
- srTableView.FocusedRow = existingVm;
-
- }
+ srTableView.FocusedRow = existingVm;
+
+ }
}
protected override void Save()
@@ -931,48 +995,48 @@ namespace BeWo.View.Detail
{
lToDos.Add(
s =>
+ {
+ var newItems = ViewModel.CommitAdded();
+ try
{
- var newItems = ViewModel.CommitAdded();
- try
+ var oids = s.InsertNewServiceRecords(newItems);
+ var idx = 0;
+
+ foreach (var vm in ViewModel.VMList)
{
- var oids = s.InsertNewServiceRecords(newItems);
- var idx = 0;
-
- foreach (var vm in ViewModel.VMList)
+ if (!vm.IsNew)
{
- if (!vm.IsNew)
- {
- continue;
- }
-
-
- vm.IsNew = false;
- vm.DataContract.ServiceRecordVersion = 1;
- vm.DataContract.ServiceRecordOid = oids[idx++];
- }
- }
- catch (Exception)
- {
- var newVMs = ViewModel.VMList.Where(vm => vm.IsNew).ToList();
-
- foreach (var serviceRecordVm in newVMs)
- {
- ViewModel.VMList.Remove(serviceRecordVm);
+ continue;
}
- this.Dispatch(() => ViewModel.RefreshServiceRecordsForSelectedTreeNode());
-
- throw;
+
+ vm.IsNew = false;
+ vm.DataContract.ServiceRecordVersion = 1;
+ vm.DataContract.ServiceRecordOid = oids[idx++];
}
+ }
+ catch (Exception)
+ {
+ var newVMs = ViewModel.VMList.Where(vm => vm.IsNew).ToList();
+
+ foreach (var serviceRecordVm in newVMs)
+ {
+ ViewModel.VMList.Remove(serviceRecordVm);
+ }
+
+ this.Dispatch(() => ViewModel.RefreshServiceRecordsForSelectedTreeNode());
+
+ throw;
+ }
});
}
ServiceFacade.DoMultipleOperationsServicesSync(lToDos);
- ReloadViewModel();
+ ReloadViewModel();
}
internal override bool DoSaveCheck()
{
- BeWoApp.SaveAppSettings();
+ BeWoApp.SaveAppSettings();
if (!String.IsNullOrEmpty(ViewModel.PrototypeVM.Notice))
{
@@ -1021,24 +1085,25 @@ namespace BeWo.View.Detail
serviceRecordEditView = new ServiceRecordEditView();
}
+
popup_content.Child = serviceRecordEditView;
-
- double height = 500;
- double width = 710;
- popup_content.Child = serviceRecordEditView;
- if (rootGrid.ActualWidth < width)
- {
- width = rootGrid.ActualWidth;
- }
- if (rootGrid.ActualHeight < height)
- {
- height = rootGrid.ActualHeight;
- }
-
- popup_content.Width = width;
- popup_content.Height = height;
+ double height = MainControl.ActualHeight * 0.8;
+ double width = 710;
+
+
+ if (MainControl.ActualWidth < width)
+ {
+ width = MainControl.ActualWidth;
+ }
+ if (height < 600)
+ {
+ height = 600;
+ }
+
+ popup_content.Width = width;
+ popup_content.Height = height;
if (serviceRecordEditView.CommandBindings.Count == 0)
{
@@ -1046,76 +1111,76 @@ namespace BeWo.View.Detail
new CommandBinding(
ApplicationCommands.Close,
(s, e) =>
+ {
+ ServiceRecordDialogResult result = ServiceRecordDialogResult.ClosedWithoutSaving;
+
+ if (vm.EditAllowed)
{
- ServiceRecordDialogResult result = ServiceRecordDialogResult.ClosedWithoutSaving;
+ if (serviceRecordEditView is ServiceRecordEditView)
+ {
+ result = ((ServiceRecordEditView) serviceRecordEditView).CloseAndDoSaveCheck();
+ }
+ else
+ {
+ result = ((ServiceRecordGroupEditView) serviceRecordEditView).CloseAndDoSaveCheck();
+ }
+ }
- if (vm.EditAllowed)
- {
- if (serviceRecordEditView is ServiceRecordEditView)
- {
- result = ((ServiceRecordEditView) serviceRecordEditView).CloseAndDoSaveCheck();
- }
- else
- {
- result = ((ServiceRecordGroupEditView) serviceRecordEditView).CloseAndDoSaveCheck();
- }
- }
-
- if (result == ServiceRecordDialogResult.ClosedWithSaving)
- {
- ClosePopupView();
- ViewModel.RefreshServiceRecordsForSelectedTreeNode();
- SetSelectedServiceRecordVM(vm, false);
- }
- else if (result == ServiceRecordDialogResult.ClosedWithoutSaving)
- {
- ClosePopupView();
- }
- }));
+ if (result == ServiceRecordDialogResult.ClosedWithSaving)
+ {
+ ClosePopupView();
+ ViewModel.RefreshServiceRecordsForSelectedTreeNode();
+ SetSelectedServiceRecordVM(vm, false);
+ }
+ else if (result == ServiceRecordDialogResult.ClosedWithoutSaving)
+ {
+ ClosePopupView();
+ }
+ }));
serviceRecordEditView.CommandBindings.Add(
new CommandBinding(
ApplicationCommands.Save,
(s, e) =>
+ {
+ if (vm.EditAllowed)
{
- if (vm.EditAllowed)
+ bool save;
+ if (serviceRecordEditView is ServiceRecordEditView)
{
- bool save;
- if (serviceRecordEditView is ServiceRecordEditView)
- {
- save = ((ServiceRecordEditView) serviceRecordEditView).IsValid() &&
- ((ServiceRecordEditView) serviceRecordEditView).IsCustomerChangeAllowed();
- }
- else
- {
- save = ((ServiceRecordGroupEditView) serviceRecordEditView).IsValid() &&
- ((ServiceRecordGroupEditView) serviceRecordEditView)
- .IsCustomerChangeAllowed();
- }
-
- if (!save)
- {
- return;
- }
-
- serviceRecordEditView.SaveData();
+ save = ((ServiceRecordEditView) serviceRecordEditView).IsValid() &&
+ ((ServiceRecordEditView) serviceRecordEditView).IsCustomerChangeAllowed();
+ }
+ else
+ {
+ save = ((ServiceRecordGroupEditView) serviceRecordEditView).IsValid() &&
+ ((ServiceRecordGroupEditView) serviceRecordEditView)
+ .IsCustomerChangeAllowed();
}
- ClosePopupView();
- if (!(serviceRecordEditView is ServiceRecordEditView))
+ if (!save)
{
return;
}
- ViewModel.BuildServiceRecordsForSelectedTreeNode(true, RefreshFinished);
- lastSelectedVM = vm;
+ serviceRecordEditView.SaveData();
+ }
+ ClosePopupView();
- }));
+ if (!(serviceRecordEditView is ServiceRecordEditView))
+ {
+ return;
+ }
+
+ ViewModel.BuildServiceRecordsForSelectedTreeNode(true, RefreshFinished);
+ lastSelectedVM = vm;
+
+ }));
}
if (serviceRecordEditView is ServiceRecordEditView)
{
- ((ServiceRecordEditView)serviceRecordEditView).InitView(ViewModel, vm, WithoutClient);
+ ((ServiceRecordEditView) serviceRecordEditView).InitView(ViewModel, vm, WithoutClient);
serviceRecordEditView.ParentView = this;
SetPopupViewVisible(true);
}
@@ -1125,19 +1190,19 @@ namespace BeWo.View.Detail
s => s.GetServiceRecordGroup(vm.GroupOid.Value),
r => this.Dispatch(
delegate
- {
- ((ServiceRecordGroupEditView)serviceRecordEditView).InitView(ViewModel, vm, r);
+ {
+ ((ServiceRecordGroupEditView) serviceRecordEditView).InitView(ViewModel, vm, r);
- serviceRecordEditView.ParentView = this;
- popup_content.Width += 190;
- SetPopupViewVisible(true);
- }));
+ serviceRecordEditView.ParentView = this;
+ popup_content.Width += 190;
+ SetPopupViewVisible(true);
+ }));
}
}
-
- private void RefreshFinished()
- {
- SetSelectedServiceRecordVM(lastSelectedVM,false);
+
+ private void RefreshFinished()
+ {
+ SetSelectedServiceRecordVM(lastSelectedVM, false);
}
private void ShowHistory(ServiceRecordVM vm)
@@ -1148,24 +1213,24 @@ namespace BeWo.View.Detail
}
double height = 600;
- double width = 1200;
+ double width = 1200;
var serviceRecordHistoryView = new ServiceRecordHistoryView();
popup_content.Child = serviceRecordHistoryView;
-
+
if (rootGrid.ActualHeight < height)
{
height = rootGrid.ActualHeight;
}
- if (rootGrid.ActualWidth < width)
- {
- width = rootGrid.ActualWidth;
- }
+ if (rootGrid.ActualWidth < width)
+ {
+ width = rootGrid.ActualWidth;
+ }
popup_content.Height = height;
- popup_content.Width = width;
+ popup_content.Width = width;
if (serviceRecordHistoryView.CommandBindings.Count == 0)
{
@@ -1180,19 +1245,19 @@ namespace BeWo.View.Detail
s => s.GetServiceRecordHistory(vm.DataContract.ServiceRecordOid.Value),
r => this.Dispatch(
delegate
- {
- serviceRecordHistoryView.InitView(r);
+ {
+ serviceRecordHistoryView.InitView(r);
- serviceRecordHistoryView.ParentView = this;
- SetPopupViewVisible(true);
- }));
+ serviceRecordHistoryView.ParentView = this;
+ SetPopupViewVisible(true);
+ }));
}
private void EmployeeSearchView_CustomerSelected(object sender, EventArgs e)
{
- _SelectedEmployee = e.Data;
+ _SelectedEmployee = e.Data;
popupedit_employee.Text = _SelectedEmployee.ToString();
- popup_employee.IsOpen = false;
+ popup_employee.IsOpen = false;
ViewModel.SelectedEmployee = _SelectedEmployee;
@@ -1209,7 +1274,7 @@ namespace BeWo.View.Detail
var child = VisualTreeHelper.GetChild(obj, i);
if (child != null && child is ChildItem)
{
- return (ChildItem)child;
+ return (ChildItem) child;
}
var childOfChild = FindVisualChild(child);
@@ -1237,18 +1302,19 @@ namespace BeWo.View.Detail
foreach (var iDay in Utils.GetDayOfWeeks(DayOfWeek.Monday))
{
var lCb = new CheckBox
- {
- Content = DateTimeFormatInfo.CurrentInfo.GetAbbreviatedDayName(iDay),
- Margin = new Thickness(3),
- IsHitTestVisible = DateTime.Now.DayOfWeek != iDay
- };
+ {
+ Content = DateTimeFormatInfo.CurrentInfo.GetAbbreviatedDayName(iDay),
+ Margin = new Thickness(3),
+ IsHitTestVisible = DateTime.Now.DayOfWeek != iDay
+ };
_DayBoxes[iDay] = lCb;
wrapPanel_days.Visibility = Visibility.Collapsed;
wrapPanel_days.Children.Add(lCb);
lCb.Checked += (s, e) => ViewModel.RecordingDays.Add(_DayBoxes.Single(entry => entry.Value == s).Key);
- lCb.Unchecked += (s, e) => ViewModel.RecordingDays.Remove(_DayBoxes.Single(entry => entry.Value == s).Key);
+ lCb.Unchecked += (s, e) =>
+ ViewModel.RecordingDays.Remove(_DayBoxes.Single(entry => entry.Value == s).Key);
lCb.IsChecked = DateTime.Now.DayOfWeek == iDay;
}
@@ -1257,11 +1323,12 @@ namespace BeWo.View.Detail
datepicker_newDate1,
(s, e) => _DayBoxes.DoForEach(
iCheck =>
- {
- iCheck.Value.IsChecked = datepicker_newDate1.EditValue != null && iCheck.Key == datepicker_newDate1.DateTime.DayOfWeek;
- iCheck.Value.IsHitTestVisible = !iCheck.Value.IsChecked.Value;
- iCheck.Value.IsEnabled = iCheck.Value.IsHitTestVisible;
- }));
+ {
+ iCheck.Value.IsChecked = datepicker_newDate1.EditValue != null &&
+ iCheck.Key == datepicker_newDate1.DateTime.DayOfWeek;
+ iCheck.Value.IsHitTestVisible = !iCheck.Value.IsChecked.Value;
+ iCheck.Value.IsEnabled = iCheck.Value.IsHitTestVisible;
+ }));
}
@@ -1285,61 +1352,64 @@ namespace BeWo.View.Detail
Dispatcher.BeginInvoke(
DispatcherPriority.Normal,
(Action) delegate
- {
- var selected = GetSelectedServiceRecordFromListBox();
- ViewModel.RefreshServiceRecordsForSelectedTreeNode();
- SetSelectedServiceRecordVM(selected,true);
+ {
+ var selected = GetSelectedServiceRecordFromListBox();
+ ViewModel.RefreshServiceRecordsForSelectedTreeNode();
+ SetSelectedServiceRecordVM(selected, true);
- });
+ });
}
- private void ReloadViewModel()
- {
- ViewModel.PrototypeVM.Notice = string.Empty;
- ViewModel.PrototypeVM.Notice2 = string.Empty;
- ViewModel.PrototypeVM.Notice3 = string.Empty;
- ViewModel.PrototypeVM.Notice4 = string.Empty;
- ViewModel.PrototypeVM.Notice5 = string.Empty;
+ private void ReloadViewModel()
+ {
+ ViewModel.PrototypeVM.Notice = string.Empty;
+ ViewModel.PrototypeVM.Notice2 = string.Empty;
+ ViewModel.PrototypeVM.Notice3 = string.Empty;
+ ViewModel.PrototypeVM.Notice4 = string.Empty;
+ ViewModel.PrototypeVM.Notice5 = string.Empty;
- SetDefaultCategory();
+ SetDefaultCategory();
- if (ViewModel.PrototypeVM.GoalTree != null && ViewModel.PrototypeVM.GoalTree.Count > 0)
- {
- foreach (var item in ViewModel.PrototypeVM.GoalTree)
- {
- item.IsChecked = false;
- }
- }
+ if (ViewModel.PrototypeVM.GoalTree != null && ViewModel.PrototypeVM.GoalTree.Count > 0)
+ {
+ foreach (var item in ViewModel.PrototypeVM.GoalTree)
+ {
+ item.IsChecked = false;
+ }
+ }
- ViewModel.PrototypeVM.DistanceInMeter = null;
- }
+ ViewModel.PrototypeVM.DistanceInMeter = null;
+ }
- private void SetDefaultCategory()
- {
- if (ViewModel.PrototypeVM.SortedCategories != null)
- {
- foreach (var cat in ViewModel.PrototypeVM.SortedCategories.Where(cat => cat.IsDefault))
- {
- ViewModel.PrototypeVM.Category = cat;
- }
- }
+ private void SetDefaultCategory()
+ {
+ if (ViewModel.PrototypeVM.SortedCategories != null)
+ {
+ foreach (var cat in ViewModel.PrototypeVM.SortedCategories.Where(cat => cat.IsDefault))
+ {
+ ViewModel.PrototypeVM.Category = cat;
+ }
+ }
- if (ViewModel.PrototypeVM.PossibleServiceDescriptions != null)
- {
- foreach (var sd in ViewModel.PrototypeVM.PossibleServiceDescriptions.Where(sd => sd.IsDefault))
- {
- ViewModel.PrototypeVM.ServiceDescription = sd;
- }
- }
- }
+ if (ViewModel.PrototypeVM.PossibleServiceDescriptions != null)
+ {
+ foreach (var sd in ViewModel.PrototypeVM.PossibleServiceDescriptions.Where(sd => sd.IsDefault))
+ {
+ ViewModel.PrototypeVM.ServiceDescription = sd;
+ }
+ }
+ }
- private bool SaveGroupBooking()
+ private bool SaveGroupBooking()
{
var lValid = true;
if (multiSupportConceptControl.SelectedSupportConcepts.Count == 0)
{
- MessageBox.Show(Translator.Translate("Bitte wählen Sie mindestens einen Klienten aus, für den Sie eine Gruppenbuchung anlegen möchten."), "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
+ MessageBox.Show(
+ Translator.Translate(
+ "Bitte wählen Sie mindestens einen Klienten aus, für den Sie eine Gruppenbuchung anlegen möchten."),
+ "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
lValid = false;
}
@@ -1347,18 +1417,27 @@ namespace BeWo.View.Detail
{
if (multiEmployeeControl.SelectedEmployees.Count == 0)
{
- MessageBox.Show(Translator.Translate("Bitte wählen Sie mindestens einen Mitarbeiter aus, für den Sie eine Gruppenbuchung anlegen möchten."), "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
+ MessageBox.Show(
+ Translator.Translate(
+ "Bitte wählen Sie mindestens einen Mitarbeiter aus, für den Sie eine Gruppenbuchung anlegen möchten."),
+ "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
lValid = false;
}
}
- var employeeOids = multiEmployeeControl.SelectedEmployees.Select(compactEmployeeDc => compactEmployeeDc.EmployeeOid).ToList();
+ var employeeOids = multiEmployeeControl.SelectedEmployees
+ .Select(compactEmployeeDc => compactEmployeeDc.EmployeeOid).ToList();
- var cb2scOids = (from scDc in multiSupportConceptControl.SelectedSupportConcepts where scDc.CostBearerRelOids != null && scDc.CostBearerRelOids.Count > 0 select scDc.CostBearerRelOids[0]).ToList();
+ var cb2scOids = (from scDc in multiSupportConceptControl.SelectedSupportConcepts
+ where scDc.CostBearerRelOids != null && scDc.CostBearerRelOids.Count > 0
+ select scDc.CostBearerRelOids[0]).ToList();
- foreach (var node in from dc in multiSupportConceptControl.SelectedSupportConcepts where lValid select SupportConceptService.CreateFlatSupportConceptItem(dc, null))
+ foreach (var node in from dc in multiSupportConceptControl.SelectedSupportConcepts
+ where lValid
+ select SupportConceptService.CreateFlatSupportConceptItem(dc, null))
{
- lValid = BeWoUtils.ValidateServiceRecordVM(ViewModel.PrototypeVM, null, node, WithoutClient, ViewModel.SelectedEmployee, employeeOids, cb2scOids);
+ lValid = BeWoUtils.ValidateServiceRecordVM(ViewModel.PrototypeVM, null, node, WithoutClient,
+ ViewModel.SelectedEmployee, employeeOids, cb2scOids);
}
if (lValid)
@@ -1379,86 +1458,89 @@ namespace BeWo.View.Detail
// Runden
var roundDuration = false;
var minuteInterval = 0;
- String calcId = null;
+ String calcId = null;
var lastMinuteInterval = -1;
- if (prototypeVM.ServiceDescription.Category.IsBillable)
- {
- roundDuration = true;
- foreach (var org in from dc in multiSupportConceptControl.SelectedSupportConcepts
- where dc.CostBearerList.Count > 0
- select dc.CostBearerList[0].Organisation)
- {
- if (org != null)
- {
- minuteInterval = org.ActualMinuteIntervall;
+ if (prototypeVM.ServiceDescription.Category.IsBillable)
+ {
+ roundDuration = true;
+ foreach (var org in from dc in multiSupportConceptControl.SelectedSupportConcepts
+ where dc.CostBearerList.Count > 0
+ select dc.CostBearerList[0].Organisation)
+ {
+ if (org != null)
+ {
+ minuteInterval = org.ActualMinuteIntervall;
- if (lastMinuteInterval == -1)
- {
- lastMinuteInterval = minuteInterval;
- calcId = org.CostBearerID;
- }
- else if (lastMinuteInterval != minuteInterval)
- {
- roundDuration = false;
- }
- }
- else if (minuteInterval >= 0)
- {
- roundDuration = false;
- }
- else
- {
- minuteInterval = 0;
- }
- }
- }
+ if (lastMinuteInterval == -1)
+ {
+ lastMinuteInterval = minuteInterval;
+ calcId = org.CostBearerID;
+ }
+ else if (lastMinuteInterval != minuteInterval)
+ {
+ roundDuration = false;
+ }
+ }
+ else if (minuteInterval >= 0)
+ {
+ roundDuration = false;
+ }
+ else
+ {
+ minuteInterval = 0;
+ }
+ }
+ }
- decimal duration = prototypeVM.RoundedDuration;
+ decimal duration = prototypeVM.RoundedDuration;
decimal totalDuration = duration;
- GroupDurationDC gd = ServiceRecordListVM.CalculateGroupDuration(personCount, employeeCount, totalDuration, cb2scOids);
+ GroupDurationDC gd =
+ ServiceRecordListVM.CalculateGroupDuration(personCount, employeeCount, totalDuration,
+ cb2scOids);
- if (gd != null)
- {
- prototypeVM.GroupRoundedDuration = gd.TotalDuration;
- prototypeVM.RoundedDuration = gd.SingleDuration;
- }
- else
- {
- //if (personCount > 2 && (BeWoApp.Tenant == "9893557471") || (BeWoApp.Tenant == "2918696314")) //Caritas Frankfurt
- //{
- // prototypeVM.GroupRoundedDuration = totalDuration;
- // prototypeVM.RoundedDuration = ((totalDuration * employeeCount) / personCount) + 10;
- //}
- //else if (personCount > 1 && BeWoApp.Tenant == "5653806613") //Feid&Kollegen
- //{
- // prototypeVM.GroupRoundedDuration = totalDuration;
- // prototypeVM.RoundedDuration = ((totalDuration * employeeCount) / personCount);
-
- //}
- //else
- //{
- if (minuteInterval > 0 && roundDuration)
- {
- Calculations calc = Calculations.GetInstance(calcId);
- totalDuration = calc.GetRoundedDuration(minuteInterval, duration);
- }
+ if (gd != null)
+ {
+ prototypeVM.GroupRoundedDuration = gd.TotalDuration;
+ prototypeVM.RoundedDuration = gd.SingleDuration;
+ }
+ else
+ {
+ //if (personCount > 2 && (BeWoApp.Tenant == "9893557471") || (BeWoApp.Tenant == "2918696314")) //Caritas Frankfurt
+ //{
+ // prototypeVM.GroupRoundedDuration = totalDuration;
+ // prototypeVM.RoundedDuration = ((totalDuration * employeeCount) / personCount) + 10;
+ //}
+ //else if (personCount > 1 && BeWoApp.Tenant == "5653806613") //Feid&Kollegen
+ //{
+ // prototypeVM.GroupRoundedDuration = totalDuration;
+ // prototypeVM.RoundedDuration = ((totalDuration * employeeCount) / personCount);
- prototypeVM.RoundedDuration = Math.Round(totalDuration / personCount, 0, MidpointRounding.AwayFromZero);
- prototypeVM.GroupRoundedDuration = totalDuration;
+ //}
+ //else
+ //{
+ if (minuteInterval > 0 && roundDuration)
+ {
+ Calculations calc = Calculations.GetInstance(calcId);
+ totalDuration = calc.GetRoundedDuration(minuteInterval, duration);
+ }
+
+ prototypeVM.RoundedDuration =
+ Math.Round(totalDuration / personCount, 0, MidpointRounding.AwayFromZero);
+ prototypeVM.GroupRoundedDuration = totalDuration;
+
+ //if (BeWoApp.Tenant == "0216265667") //Lebenshilfe Hannover
+ //{
+ // prototypeVM.RoundedDuration += 10;
+ //}
+
+ //}
+ }
- //if (BeWoApp.Tenant == "0216265667") //Lebenshilfe Hannover
- //{
- // prototypeVM.RoundedDuration += 10;
- //}
-
- //}
- }
-
ServiceRecordVM newVM;
var newVMList = new List();
@@ -1475,7 +1557,7 @@ namespace BeWo.View.Detail
newVM.SetInsertedOn(DateTime.Now);
newVMList.Add(newVM);
- if (!addToList)
+ if (!addToList)
continue;
// ###AddServiceRecord
@@ -1508,13 +1590,13 @@ namespace BeWo.View.Detail
else
{
var groupDC = new ServiceRecordGroupDC
- {
- CustomerCount = personCount,
- EmployeeCount = employeeCount,
- StartDate = prototypeVM.StartTime,
- EndDate = prototypeVM.EndTime,
- Notice = prototypeVM.Notice
- };
+ {
+ CustomerCount = personCount,
+ EmployeeCount = employeeCount,
+ StartDate = prototypeVM.StartTime,
+ EndDate = prototypeVM.EndTime,
+ Notice = prototypeVM.Notice
+ };
if (prototypeVM.GroupRoundedDuration != null)
groupDC.RoundedDuration = prototypeVM.GroupRoundedDuration.Value;
@@ -1542,7 +1624,8 @@ namespace BeWo.View.Detail
ServiceFacade.DoMultipleOperationsServicesAsync(lToDos, UpdateViewModel);
- MessageBox.Show("Die Gruppenbuchung wurde erfolgreich gespeichert.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
+ MessageBox.Show("Die Gruppenbuchung wurde erfolgreich gespeichert.", "Speichern",
+ MessageBoxButton.OK, MessageBoxImage.Information);
}
}
@@ -1555,7 +1638,10 @@ namespace BeWo.View.Detail
if (multiSupportConceptControl.SelectedSupportConcepts.Count == 0)
{
- MessageBox.Show(Translator.Translate("Bitte wählen Sie mindestens einen Hilfeplan aus, für den Sie eine Mehrfachbuchung anlegen möchten."), "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
+ MessageBox.Show(
+ Translator.Translate(
+ "Bitte wählen Sie mindestens einen Hilfeplan aus, für den Sie eine Mehrfachbuchung anlegen möchten."),
+ "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
lValid = false;
}
@@ -1563,30 +1649,36 @@ namespace BeWo.View.Detail
{
if (multiEmployeeControl.SelectedEmployees.Count == 0)
{
- MessageBox.Show(Translator.Translate("Bitte wählen Sie mindestens einen Mitarbeiter aus, für den Sie eine Mehrfachbuchung anlegen möchten."), "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
+ MessageBox.Show(
+ Translator.Translate(
+ "Bitte wählen Sie mindestens einen Mitarbeiter aus, für den Sie eine Mehrfachbuchung anlegen möchten."),
+ "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
lValid = false;
}
}
- List employeeOids = new List();
- foreach (var compactEmployeeDc in multiEmployeeControl.SelectedEmployees)
- {
- employeeOids.Add(compactEmployeeDc.EmployeeOid);
- }
+ List employeeOids = new List();
+ foreach (var compactEmployeeDc in multiEmployeeControl.SelectedEmployees)
+ {
+ employeeOids.Add(compactEmployeeDc.EmployeeOid);
+ }
- List cb2scOids = new List();
- foreach (var scDc in multiSupportConceptControl.SelectedSupportConcepts)
- {
- if (scDc.CostBearerRelOids != null && scDc.CostBearerRelOids.Count > 0)
- {
- cb2scOids.Add(scDc.CostBearerRelOids[0]);
- }
- }
+ List cb2scOids = new List();
+ foreach (var scDc in multiSupportConceptControl.SelectedSupportConcepts)
+ {
+ if (scDc.CostBearerRelOids != null && scDc.CostBearerRelOids.Count > 0)
+ {
+ cb2scOids.Add(scDc.CostBearerRelOids[0]);
+ }
+ }
+
+ foreach (FlatSupportConceptTreeNodeDC node in from dc in multiSupportConceptControl.SelectedSupportConcepts
+ where lValid
+ select SupportConceptService.CreateFlatSupportConceptItem(dc, null))
+ lValid = BeWoUtils.ValidateServiceRecordVM(ViewModel.PrototypeVM, null, node, true,
+ ViewModel.SelectedEmployee, employeeOids, cb2scOids);
+ //lValid = ValidateServiceRecordVMClientX(ViewModel.PrototypeVM, node, true);
- foreach (FlatSupportConceptTreeNodeDC node in from dc in multiSupportConceptControl.SelectedSupportConcepts where lValid select SupportConceptService.CreateFlatSupportConceptItem(dc, null))
- lValid = BeWoUtils.ValidateServiceRecordVM(ViewModel.PrototypeVM, null, node, true, ViewModel.SelectedEmployee, employeeOids, cb2scOids);
- //lValid = ValidateServiceRecordVMClientX(ViewModel.PrototypeVM, node, true);
-
if (lValid)
{
@@ -1599,21 +1691,21 @@ namespace BeWo.View.Detail
ServiceRecordVM newVM = null;
List newVMList = new List();
- var vmDuration = prototypeVM.RoundedDuration;
+ var vmDuration = prototypeVM.RoundedDuration;
foreach (CompactSupportConceptDC dc in this.multiSupportConceptControl.SelectedSupportConcepts)
{
- decimal duration = vmDuration;
-
- if (dc.CostBearerList.Count > 0)
- {
- var org = dc.CostBearerList[0].Organisation;
- if (org != null)
- {
- Calculations calc = Calculations.GetInstance(org.CostBearerID);
+ decimal duration = vmDuration;
- prototypeVM.RoundedDuration = calc.GetRoundedDuration(org, duration);
- }
- }
+ if (dc.CostBearerList.Count > 0)
+ {
+ var org = dc.CostBearerList[0].Organisation;
+ if (org != null)
+ {
+ Calculations calc = Calculations.GetInstance(org.CostBearerID);
+
+ prototypeVM.RoundedDuration = calc.GetRoundedDuration(org, duration);
+ }
+ }
bool addToList = true;
@@ -1643,23 +1735,24 @@ namespace BeWo.View.Detail
lToDos.Add(
s =>
+ {
+ List oids = s.InsertNewServiceRecords(dcList);
+ int idx = 0;
+ foreach (ServiceRecordVM vm in newVMList)
{
- List oids = s.InsertNewServiceRecords(dcList);
- int idx = 0;
- foreach (ServiceRecordVM vm in newVMList)
- {
- vm.IsNew = false;
- vm.DataContract.ServiceRecordVersion = 1;
- vm.DataContract.ServiceRecordOid = oids[idx++];
- }
- });
+ vm.IsNew = false;
+ vm.DataContract.ServiceRecordVersion = 1;
+ vm.DataContract.ServiceRecordOid = oids[idx++];
+ }
+ });
}
-
+
ServiceFacade.DoMultipleOperationsServicesAsync(lToDos, UpdateViewModel);
- MessageBox.Show("Die Dokumentationen wurde erfolgreich gespeichert.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
+ MessageBox.Show("Die Dokumentationen wurde erfolgreich gespeichert.", "Speichern",
+ MessageBoxButton.OK, MessageBoxImage.Information);
}
}
@@ -1676,13 +1769,17 @@ namespace BeWo.View.Detail
if (!WithoutClient && (selectedNode == null || selectedNode.SupportConceptTreeNodeDC == null))
{
- MessageBox.Show(Translator.Translate("Bitte wählen Sie zuerst einen Hilfeplan, für den Sie Leistungen dokumentieren möchten."), "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
+ MessageBox.Show(
+ Translator.Translate(
+ "Bitte wählen Sie zuerst einen Hilfeplan, für den Sie Leistungen dokumentieren möchten."),
+ "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
lValid = false;
}
if (lValid)
{
- lValid = BeWoUtils.ValidateServiceRecordVM(ViewModel.PrototypeVM, ViewModel.StatisticsDC, selectedNode, WithoutClient, ViewModel.SelectedEmployee, null, null);
+ lValid = BeWoUtils.ValidateServiceRecordVM(ViewModel.PrototypeVM, ViewModel.StatisticsDC, selectedNode,
+ WithoutClient, ViewModel.SelectedEmployee, null, null);
if (lValid)
{
@@ -1708,33 +1805,33 @@ namespace BeWo.View.Detail
private void SelectedItemChanged(FlatSupportConceptTreeNodeDC selectedNode)
{
- if (ViewModel == null)
+ if (ViewModel == null)
return;
UpdateAssessmentSheet(selectedNode);
ViewModel.ChangeTreeItemSelection(selectedNode);
srListBox.SelectedIndex = -1;
-
+
var sv = FindVisualChild(srListBox);
if (sv != null)
sv.ScrollToTop();
UpdateServiceRecordListReportUrl(selectedNode);
- SetDefaultCategory();
+ SetDefaultCategory();
}
private void ServiceRecordView2_Loaded(object sender, RoutedEventArgs e)
{
- ReloadViewModel();
+ ReloadViewModel();
- if (ActualHeight > 0)
- {
- ComboBoxTreeViewControl.ParentWindowHeight = ActualHeight;
- }
+ if (ActualHeight > 0)
+ {
+ ComboBoxTreeViewControl.ParentWindowHeight = ActualHeight;
+ }
- supportConceptSelectionControl.Focus();
+ supportConceptSelectionControl.Focus();
}
private static void ServiceRecordView2_Unloaded(object sender, RoutedEventArgs e)
@@ -1744,15 +1841,16 @@ namespace BeWo.View.Detail
private void SetEmployeeComboVisibility()
{
- if ((!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreationForOtherEmployees) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreationForOtherTeamMember))
+ if ((!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreationForOtherEmployees) &&
+ !BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreationForOtherTeamMember))
|| chkGroupBooking.IsChecked.Value || chkMultiBooking.IsChecked.Value)
{
- lblEmployee.Visibility = Visibility.Collapsed;
+ lblEmployee.Visibility = Visibility.Collapsed;
popupedit_employee.Visibility = Visibility.Collapsed;
}
else
{
- lblEmployee.Visibility = Visibility.Visible;
+ lblEmployee.Visibility = Visibility.Visible;
popupedit_employee.Visibility = Visibility.Visible;
}
}
@@ -1773,44 +1871,46 @@ namespace BeWo.View.Detail
private void TextBox_GotFocus(object sender, RoutedEventArgs e)
{
- var vm = ((TextBox)sender).Tag as ServiceRecordVM;
+ var vm = ((TextBox) sender).Tag as ServiceRecordVM;
if (vm != null)
srListBox.SelectedItem = vm;
}
private void UpdateServiceRecordListReportUrl(FlatSupportConceptTreeNodeDC selectedNode)
{
- long scOid = 0;
- long cOid = 0;
+ long scOid = 0;
+ long cOid = 0;
long cb2scOid = 0;
- var eOid = BeWoApp.LoggedOnUser.Employee.EmployeeOid;
+ var eOid = BeWoApp.LoggedOnUser.Employee.EmployeeOid;
- if (selectedNode != null && selectedNode.SupportConceptTreeNodeDC != null)
- {
- if (selectedNode.SupportConceptTreeNodeDC.SupportConcept != null)
- {
- scOid = selectedNode.SupportConceptTreeNodeDC.SupportConcept.SupportConceptOid;
- }
+ if (selectedNode != null && selectedNode.SupportConceptTreeNodeDC != null)
+ {
+ if (selectedNode.SupportConceptTreeNodeDC.SupportConcept != null)
+ {
+ scOid = selectedNode.SupportConceptTreeNodeDC.SupportConcept.SupportConceptOid;
+ }
- if (selectedNode.SupportConceptTreeNodeDC.Customer != null)
- {
- cOid = selectedNode.SupportConceptTreeNodeDC.Customer.CustomerOid;
- }
+ if (selectedNode.SupportConceptTreeNodeDC.Customer != null)
+ {
+ cOid = selectedNode.SupportConceptTreeNodeDC.Customer.CustomerOid;
+ }
- if (selectedNode.SupportConceptTreeNodeDC.SupportConceptCostBearerRelDC != null)
- {
- cb2scOid = selectedNode.SupportConceptTreeNodeDC.SupportConceptCostBearerRelDC.CostBearer2SupportConceptOid.Value;
- }
- }
- else
- {
- if (_SelectedEmployee != null)
- {
- eOid = _SelectedEmployee.EmployeeOid;
- }
- }
+ if (selectedNode.SupportConceptTreeNodeDC.SupportConceptCostBearerRelDC != null)
+ {
+ cb2scOid = selectedNode.SupportConceptTreeNodeDC.SupportConceptCostBearerRelDC
+ .CostBearer2SupportConceptOid.Value;
+ }
+ }
+ else
+ {
+ if (_SelectedEmployee != null)
+ {
+ eOid = _SelectedEmployee.EmployeeOid;
+ }
+ }
- var url = BeWoApp.SiteOfOrigin + "/ReportView.aspx" + "?eOid=" + eOid + "&scOid=" + scOid + "&cOid=" + cOid + "&cb2scOid=" + cb2scOid + "&type=" + Utils.EnumName(ReportTypes.ServiceRecordList);
+ var url = BeWoApp.SiteOfOrigin + "/ReportView.aspx" + "?eOid=" + eOid + "&scOid=" + scOid + "&cOid=" +
+ cOid + "&cb2scOid=" + cb2scOid + "&type=" + Utils.EnumName(ReportTypes.ServiceRecordList);
url = BeWoWpfUtils.GetHTMLEncodedURL(url);
linkPdfExport.NavigateUri = new Uri(url);
@@ -1825,13 +1925,14 @@ namespace BeWo.View.Detail
ViewModel.RefreshServiceRecordsForSelectedTreeNode();
});
}
-
- private void ViewModel_ServiceRecordListChanged(object sender, EventArgs e)
+
+ private void ViewModel_ServiceRecordListChanged(object sender, EventArgs e)
{
- var list = _ViewModel.ServiceRecordsForSelectedCustomer.OrderByDescending(srVM => srVM.DateAndTime).ToList();
+ var list = _ViewModel.ServiceRecordsForSelectedCustomer.OrderByDescending(srVM => srVM.DateAndTime)
+ .ToList();
- bool containsMinutenFormat = false;
+ bool containsMinutenFormat = false;
bool containsStundenFormat = false;
foreach (var a in list)
@@ -1860,12 +1961,12 @@ namespace BeWo.View.Detail
}
if (containsStundenFormat && containsMinutenFormat)
- {
+ {
RoundedDHeader.Header = "Dauer";
DutationInSTDHeader.Visible = true;
- DutationInSTDHeader.VisibleIndex = RoundedDHeader.VisibleIndex + 1;
+ DutationInSTDHeader.VisibleIndex = RoundedDHeader.VisibleIndex + 1;
- }
+ }
else if (containsMinutenFormat)
{
RoundedDHeader.Header = "Minuten";
@@ -1885,7 +1986,7 @@ namespace BeWo.View.Detail
private void BtnDelete_Click(object sender, RoutedEventArgs e)
{
- var vm = ((Button)sender).Tag as ServiceRecordVM;
+ var vm = ((Button) sender).Tag as ServiceRecordVM;
if (vm != null)
{
srListBox.SelectedItem = vm;
@@ -1903,7 +2004,7 @@ namespace BeWo.View.Detail
srListBox.SelectedItem = vm;
}
- StartEdit(GetSelectedServiceRecordFromListBox());
+ StartEdit(GetSelectedServiceRecordFromListBox());
}
private void ServiceRecordListBox_MouseDoubleClick(object sender, MouseButtonEventArgs e)
@@ -1913,28 +2014,30 @@ namespace BeWo.View.Detail
return;
}
- StartEdit(GetSelectedServiceRecordFromListBox());
+ StartEdit(GetSelectedServiceRecordFromListBox());
}
- private void StartEdit(ServiceRecordVM selectedRecord)
+ private void StartEdit(ServiceRecordVM selectedRecord)
{
- if (selectedRecord != null)
- {
- var serviceRecordOid = Convert.ToInt64(selectedRecord.Id);
+ if (selectedRecord != null)
+ {
+ var serviceRecordOid = Convert.ToInt64(selectedRecord.Id);
- var record = ServiceFacade.DoOperationsServiceSync(s => s.GetServiceRecordById(serviceRecordOid));
+ var record = ServiceFacade.DoOperationsServiceSync(s => s.GetServiceRecordById(serviceRecordOid));
- if (record == null)
- {
- MessageBox.Show("Der ausgewählte Eintrag wurde in der Zwischenzeit gelöscht.", "Editieren nicht möglich", MessageBoxButton.OK, MessageBoxImage.Error);
- ViewModel.RefreshServiceRecordsForSelectedTreeNode();
- return;
- }
+ if (record == null)
+ {
+ MessageBox.Show("Der ausgewählte Eintrag wurde in der Zwischenzeit gelöscht.",
+ "Editieren nicht möglich", MessageBoxButton.OK, MessageBoxImage.Error);
+ ViewModel.RefreshServiceRecordsForSelectedTreeNode();
+ return;
+ }
- var sr = new ServiceRecordVM(record, ViewModel.PrototypeVM.Category2Services, selectedRecord.AllGoalCategories, selectedRecord.AllGoals);
-
- Edit(sr);
- }
+ var sr = new ServiceRecordVM(record, ViewModel.PrototypeVM.Category2Services,
+ selectedRecord.AllGoalCategories, selectedRecord.AllGoals);
+
+ Edit(sr);
+ }
}
private void BtnShowHistory_Click(object sender, RoutedEventArgs e)
@@ -1957,7 +2060,8 @@ namespace BeWo.View.Detail
{
//var lValid = ValidationTrigger.Validate(root, new Collection { "BedarfsmedikationsGrid" });
- if (BeWoApp.AppSettings.ShowRtfTextfeld) {
+ if (BeWoApp.AppSettings.ShowRtfTextfield)
+ {
SetRTFDaten();
}
@@ -1988,48 +2092,37 @@ namespace BeWo.View.Detail
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;
- }
+ ViewModel.PrototypeVM.Notice = richEditControl1.Text;
+ ViewModel.PrototypeVM.RTFNotice = richEditControl1.RtfText;
+
+ ViewModel.PrototypeVM.Notice2 = richEditControl2.Text;
+ ViewModel.PrototypeVM.RTFNotice2 = richEditControl2.RtfText;
+
+ ViewModel.PrototypeVM.Notice3 = richEditControl3.Text;
+ ViewModel.PrototypeVM.RTFNotice3 = richEditControl3.RtfText;
+
+ ViewModel.PrototypeVM.Notice4 = richEditControl4.Text;
+ ViewModel.PrototypeVM.RTFNotice4 = richEditControl4.RtfText;
+
+ ViewModel.PrototypeVM.Notice5 = richEditControl5.Text;
+ ViewModel.PrototypeVM.RTFNotice5 = richEditControl5.RtfText;
+
}
- private void SetRebookingButtonVisibility()
- {
- if (Eintragumbuchunsbutton == null)
- {
- return;
- }
+ private void SetRebookingButtonVisibility()
+ {
+ if (Eintragumbuchunsbutton == null)
+ {
+ return;
+ }
- var erg = chkWithClient != null && chkWithClient.IsChecked != null && chkWithClient.IsChecked.Value &&
- chkGroupBooking != null && chkGroupBooking.IsChecked != null && !chkGroupBooking.IsChecked.Value &&
- chkMultiBooking != null && chkMultiBooking.IsChecked != null && !chkMultiBooking.IsChecked.Value;
+ var erg = chkWithClient != null && chkWithClient.IsChecked != null && chkWithClient.IsChecked.Value &&
+ chkGroupBooking != null && chkGroupBooking.IsChecked != null &&
+ !chkGroupBooking.IsChecked.Value &&
+ chkMultiBooking != null && chkMultiBooking.IsChecked != null && !chkMultiBooking.IsChecked.Value;
- Eintragumbuchunsbutton.Visibility = erg ?
- Visibility.Visible :
- Visibility.Collapsed;
- }
+ Eintragumbuchunsbutton.Visibility = erg ? Visibility.Visible : Visibility.Collapsed;
+ }
private void ChkGroupBooking_Checked(object sender, RoutedEventArgs e)
{
@@ -2044,14 +2137,14 @@ namespace BeWo.View.Detail
}
supportConceptSelectionControl.Visibility = Visibility.Collapsed;
- multiSupportConceptControl.Visibility = Visibility.Visible;
- multiEmployeeControl.Visibility = Visibility.Visible;
- panelGoalLabel.Visibility = Visibility.Collapsed;
- panelGoalTree.Visibility = Visibility.Collapsed;
+ multiSupportConceptControl.Visibility = Visibility.Visible;
+ multiEmployeeControl.Visibility = Visibility.Visible;
+ panelGoalLabel.Visibility = Visibility.Collapsed;
+ panelGoalTree.Visibility = Visibility.Collapsed;
SetEmployeeComboVisibility();
- SetRebookingButtonVisibility();
+ SetRebookingButtonVisibility();
if (chkWithClient != null)
{
@@ -2060,12 +2153,13 @@ namespace BeWo.View.Detail
if (chkMultiBooking != null)
{
- _IgnoreGroupMultiCheck = true;
+ _IgnoreGroupMultiCheck = true;
chkMultiBooking.IsChecked = false;
- _IgnoreGroupMultiCheck = false;
+ _IgnoreGroupMultiCheck = false;
}
- SelectedItemChanged(SupportConceptService.CreateFlatSupportConceptItem(multiSupportConceptControl.SelectedItem, null));
+ SelectedItemChanged(
+ SupportConceptService.CreateFlatSupportConceptItem(multiSupportConceptControl.SelectedItem, null));
}
private void ChkGroupBooking_Unchecked(object sender, RoutedEventArgs e)
@@ -2081,13 +2175,13 @@ namespace BeWo.View.Detail
}
supportConceptSelectionControl.Visibility = Visibility.Visible;
- multiSupportConceptControl.Visibility = Visibility.Collapsed;
- multiEmployeeControl.Visibility = Visibility.Collapsed;
- panelGoalLabel.Visibility = Visibility.Visible;
- panelGoalTree.Visibility = Visibility.Visible;
+ multiSupportConceptControl.Visibility = Visibility.Collapsed;
+ multiEmployeeControl.Visibility = Visibility.Collapsed;
+ panelGoalLabel.Visibility = Visibility.Visible;
+ panelGoalTree.Visibility = Visibility.Visible;
SetEmployeeComboVisibility();
- SetRebookingButtonVisibility();
+ SetRebookingButtonVisibility();
if (chkWithClient != null)
{
@@ -2110,13 +2204,13 @@ namespace BeWo.View.Detail
}
supportConceptSelectionControl.Visibility = Visibility.Collapsed;
- multiSupportConceptControl.Visibility = Visibility.Visible;
- multiEmployeeControl.Visibility = Visibility.Visible;
- panelGoalLabel.Visibility = Visibility.Collapsed;
- panelGoalTree.Visibility = Visibility.Collapsed;
+ multiSupportConceptControl.Visibility = Visibility.Visible;
+ multiEmployeeControl.Visibility = Visibility.Visible;
+ panelGoalLabel.Visibility = Visibility.Collapsed;
+ panelGoalTree.Visibility = Visibility.Collapsed;
SetEmployeeComboVisibility();
- SetRebookingButtonVisibility();
+ SetRebookingButtonVisibility();
if (chkWithClient != null)
{
@@ -2130,7 +2224,8 @@ namespace BeWo.View.Detail
_IgnoreGroupMultiCheck = false;
}
- SelectedItemChanged(SupportConceptService.CreateFlatSupportConceptItem(multiSupportConceptControl.SelectedItem, null));
+ SelectedItemChanged(
+ SupportConceptService.CreateFlatSupportConceptItem(multiSupportConceptControl.SelectedItem, null));
}
private void ChkMultiBooking_Unchecked(object sender, RoutedEventArgs e)
@@ -2146,13 +2241,13 @@ namespace BeWo.View.Detail
}
supportConceptSelectionControl.Visibility = Visibility.Visible;
- multiSupportConceptControl.Visibility = Visibility.Collapsed;
- multiEmployeeControl.Visibility = Visibility.Collapsed;
- panelGoalLabel.Visibility = Visibility.Visible;
- panelGoalTree.Visibility = Visibility.Visible;
+ multiSupportConceptControl.Visibility = Visibility.Collapsed;
+ multiEmployeeControl.Visibility = Visibility.Collapsed;
+ panelGoalLabel.Visibility = Visibility.Visible;
+ panelGoalTree.Visibility = Visibility.Visible;
SetEmployeeComboVisibility();
- SetRebookingButtonVisibility();
+ SetRebookingButtonVisibility();
if (chkWithClient != null)
{
@@ -2187,7 +2282,7 @@ namespace BeWo.View.Detail
chkMultiBooking.IsEnabled = true;
}
- SetRebookingButtonVisibility();
+ SetRebookingButtonVisibility();
}
private void ChkWithClient_Unchecked(object sender, RoutedEventArgs e)
@@ -2211,7 +2306,7 @@ namespace BeWo.View.Detail
chkMultiBooking.IsEnabled = false;
}
- SetRebookingButtonVisibility();
+ SetRebookingButtonVisibility();
}
//CB EINKOMMENTIEREN
@@ -2283,7 +2378,8 @@ namespace BeWo.View.Detail
// btnSaveWohnheimbuchung.Visibility = Visibility.Collapsed;
//}
- private void SupportConceptSelectionControl_ItemSelected(object sender, EventArgs e)
+ private void SupportConceptSelectionControl_ItemSelected(object sender,
+ EventArgs e)
{
if (chkGroupBooking.IsChecked.Value || chkMultiBooking.IsChecked.Value)
{
@@ -2310,18 +2406,18 @@ namespace BeWo.View.Detail
var lHeaderCaptions = new List();
var lContent = new List>();
- if (BeWoApp.AppSettings.IsEndDateVisible)
- {
- lHeaderCaptions.Add("Startdatum");
- lHeaderCaptions.Add("Enddatum");
- }
- else
- {
- lHeaderCaptions.Add("Datum");
- }
-
- lHeaderCaptions.Add("Von");
- lHeaderCaptions.Add("Bis");
+ if (BeWoApp.AppSettings.IsEndDateVisible)
+ {
+ lHeaderCaptions.Add("Startdatum");
+ lHeaderCaptions.Add("Enddatum");
+ }
+ else
+ {
+ lHeaderCaptions.Add("Datum");
+ }
+
+ lHeaderCaptions.Add("Von");
+ lHeaderCaptions.Add("Bis");
lHeaderCaptions.Add(Translator.Translate("FLM"));
lHeaderCaptions.Add(Translator.Translate("FLM gerundet"));
lHeaderCaptions.Add(Translator.Translate("Mitarbeiter"));
@@ -2330,101 +2426,109 @@ namespace BeWo.View.Detail
lHeaderCaptions.Add(Translator.Translate("Kostenträger"));
lHeaderCaptions.Add("Kategorie");
lHeaderCaptions.Add("Leistung");
- if (ViewModel.AllDocTypes != null && ViewModel.AllDocTypes.Count > 0)
- {
- foreach (var dt in ViewModel.AllDocTypes)
- {
- lHeaderCaptions.Add(dt.TypeDescription);
- }
- }
- else
- {
- lHeaderCaptions.Add("Dokumentation");
- }
-
+ if (ViewModel.AllDocTypes != null && ViewModel.AllDocTypes.Count > 0)
+ {
+ foreach (var dt in ViewModel.AllDocTypes)
+ {
+ lHeaderCaptions.Add(dt.TypeDescription);
+ }
+ }
+ else
+ {
+ lHeaderCaptions.Add("Dokumentation");
+ }
+
lHeaderCaptions.Add("Ziele");
lHeaderCaptions.Add("Angelegt von");
lHeaderCaptions.Add("Angelegt am");
if (list != null)
{
- foreach (var vm in list)
- {
- var row = new List();
+ foreach (var vm in list)
+ {
+ var row = new List();
- if (BeWoApp.AppSettings.IsEndDateVisible)
- {
- row.Add(String.Format("{0:dd.MM.yyyy}", vm.StartTime));
- row.Add(String.Format("{0:dd.MM.yyyy}", vm.EndDate));
- }
- else
- {
- row.Add(String.Format("{0:dd.MM.yyyy}", vm.Date));
- }
+ if (BeWoApp.AppSettings.IsEndDateVisible)
+ {
+ row.Add(String.Format("{0:dd.MM.yyyy}", vm.StartTime));
+ row.Add(String.Format("{0:dd.MM.yyyy}", vm.EndDate));
+ }
+ else
+ {
+ row.Add(String.Format("{0:dd.MM.yyyy}", vm.Date));
+ }
- row.Add(String.Format("{0:HH:mm}", vm.StartTime != null && vm.StartTime.Value.Second == 0 ? vm.StartTime : null));
- row.Add(String.Format("{0:HH:mm}", vm.EndTime != null && vm.EndTime.Value.Second == 0 ? vm.EndTime : null));
- row.Add(vm.AssistanceDuration.ToString());
- row.Add(vm.RoundedDuration.ToString());
- row.Add(vm.Employee != null ? vm.Employee.ToString() : string.Empty);
- row.Add(vm.Customer != null ? vm.Customer.ToString() : string.Empty);
- row.Add(vm.SupportConcept != null ? vm.SupportConcept.ToString() : string.Empty);
- row.Add(vm.CostBearer != null ? vm.CostBearer.ToString() : string.Empty);
- row.Add(vm.Category != null ? vm.Category.ToString() : string.Empty);
- row.Add(vm.ServiceDescription != null ? vm.ServiceDescription.ToString() : string.Empty);
+ row.Add(String.Format("{0:HH:mm}",
+ vm.StartTime != null && vm.StartTime.Value.Second == 0 ? vm.StartTime : null));
+ row.Add(String.Format("{0:HH:mm}",
+ vm.EndTime != null && vm.EndTime.Value.Second == 0 ? vm.EndTime : null));
+ row.Add(vm.AssistanceDuration.ToString());
+ row.Add(vm.RoundedDuration.ToString());
+ row.Add(vm.Employee != null ? vm.Employee.ToString() : string.Empty);
+ row.Add(vm.Customer != null ? vm.Customer.ToString() : string.Empty);
+ row.Add(vm.SupportConcept != null ? vm.SupportConcept.ToString() : string.Empty);
+ row.Add(vm.CostBearer != null ? vm.CostBearer.ToString() : string.Empty);
+ row.Add(vm.Category != null ? vm.Category.ToString() : string.Empty);
+ row.Add(vm.ServiceDescription != null ? vm.ServiceDescription.ToString() : string.Empty);
- row.Add(vm.Notice);
- if (ViewModel.AllDocTypes != null)
- {
- if (ViewModel.AllDocTypes.Count == 2)
- {
- row.Add(vm.Notice2);
- }
- if (ViewModel.AllDocTypes.Count == 3)
- {
- row.Add(vm.Notice3);
- }
- if (ViewModel.AllDocTypes.Count == 4)
- {
- row.Add(vm.Notice4);
- }
- if (ViewModel.AllDocTypes.Count == 5)
- {
- row.Add(vm.Notice5);
- }
- }
-
- row.Add(vm.GoalString);
- row.Add(vm.InsUser);
- row.Add(vm.InsertedOn);
+ row.Add(vm.Notice);
+ if (ViewModel.AllDocTypes != null)
+ {
+ if (ViewModel.AllDocTypes.Count == 2)
+ {
+ row.Add(vm.Notice2);
+ }
+ if (ViewModel.AllDocTypes.Count == 3)
+ {
+ row.Add(vm.Notice3);
+ }
+ if (ViewModel.AllDocTypes.Count == 4)
+ {
+ row.Add(vm.Notice4);
+ }
+ if (ViewModel.AllDocTypes.Count == 5)
+ {
+ row.Add(vm.Notice5);
+ }
+ }
- //lContent.AddRange(list.Select(vm => new List
- // {
- // String.Format("{0:dd.MM.yyyy}", vm.StartTime != null ? vm.Date : null),
- // String.Format("{0:HH:mm}", vm.StartTime != null && vm.StartTime.Value.Second == 0 ? vm.StartTime : null),
- // String.Format("{0:HH:mm}", vm.EndTime != null && vm.EndTime.Value.Second == 0 ? vm.EndTime : null),
- // vm.AssistanceDuration.ToString(),
- // vm.RoundedDuration.ToString(),
- // vm.Employee != null ? vm.Employee.ToString() : string.Empty,
- // vm.Customer != null ? vm.Customer.ToString() : string.Empty,
- // vm.SupportConcept != null ? vm.SupportConcept.ToString() : string.Empty,
- // vm.CostBearer != null ? vm.CostBearer.ToString() : string.Empty,
- // vm.Category != null ? vm.Category.ToString() : string.Empty,
- // vm.ServiceDescription != null ? vm.ServiceDescription.ToString() : string.Empty,
- // vm.Notice,vm.Notice2,vm.Notice3,vm.Notice4,vm.Notice5,
- // vm.GoalString
- // }));
- lContent.Add(row);
+ row.Add(vm.GoalString);
+ row.Add(vm.InsUser);
+ row.Add(vm.InsertedOn);
+
+ //lContent.AddRange(list.Select(vm => new List
+ // {
+ // String.Format("{0:dd.MM.yyyy}", vm.StartTime != null ? vm.Date : null),
+ // String.Format("{0:HH:mm}", vm.StartTime != null && vm.StartTime.Value.Second == 0 ? vm.StartTime : null),
+ // String.Format("{0:HH:mm}", vm.EndTime != null && vm.EndTime.Value.Second == 0 ? vm.EndTime : null),
+ // vm.AssistanceDuration.ToString(),
+ // vm.RoundedDuration.ToString(),
+ // vm.Employee != null ? vm.Employee.ToString() : string.Empty,
+ // vm.Customer != null ? vm.Customer.ToString() : string.Empty,
+ // vm.SupportConcept != null ? vm.SupportConcept.ToString() : string.Empty,
+ // vm.CostBearer != null ? vm.CostBearer.ToString() : string.Empty,
+ // vm.Category != null ? vm.Category.ToString() : string.Empty,
+ // vm.ServiceDescription != null ? vm.ServiceDescription.ToString() : string.Empty,
+ // vm.Notice,vm.Notice2,vm.Notice3,vm.Notice4,vm.Notice5,
+ // vm.GoalString
+ // }));
+ lContent.Add(row);
}
-
+
}
- var path = BeWoApp.GetAndCreateUserAppDataPath() + "\\Dokumentation.xls";
+ var path = BeWoApp.GetAndCreateUserAppDataPath() + "\\Dokumentation.xls";
- var sf = new SaveFileDialog { FileName = Path.GetFileName(path), Filter = "Microsoft Excel 97-2003-Arbeitsblatt|*.xls|Alle Dateien|*.*" };
+ var sf = new SaveFileDialog
+ {
+ FileName = Path.GetFileName(path),
+ Filter = "Microsoft Excel 97-2003-Arbeitsblatt|*.xls|Alle Dateien|*.*"
+ };
if (sf.ShowDialog() != true)
return;
- ServiceFacade.DoDownloadServiceSync(s => BeWoUtils.WriteExcelFile(s.PrepareExcelFile(DownloadLinkEngine.ExcelFileId, lHeaderCaptions, lContent), sf.FileName));
+ ServiceFacade.DoDownloadServiceSync(s =>
+ BeWoUtils.WriteExcelFile(s.PrepareExcelFile(DownloadLinkEngine.ExcelFileId, lHeaderCaptions, lContent),
+ sf.FileName));
}
private void MultiSupportConceptControl_ItemSelected(object sender, EventArgs e)
@@ -2441,7 +2545,7 @@ namespace BeWo.View.Detail
private void UpdateAssessmentSheet(FlatSupportConceptTreeNodeDC selectedNode)
{
- if (assessmentSheet == null)
+ if (assessmentSheet == null)
return;
if (selectedNode != null && selectedNode.SupportConceptTreeNodeDC != null)
@@ -2456,11 +2560,11 @@ namespace BeWo.View.Detail
cb => this.Dispatch(
delegate
- {
- customerContainsAssessmentCategories.Add(customer, cb);
+ {
+ customerContainsAssessmentCategories.Add(customer, cb);
- UpdateAssessmentSheet(selectedNode.SupportConceptTreeNodeDC.Customer, cb);
- }), false);
+ UpdateAssessmentSheet(selectedNode.SupportConceptTreeNodeDC.Customer, cb);
+ }), false);
}
else
{
@@ -2476,44 +2580,45 @@ namespace BeWo.View.Detail
}
private DockLayoutManager dockLayoutManager;
- private LayoutPanel layoutPanel1;
- private LayoutPanel layoutPanel2;
- private LayoutPanel layoutPanel3;
- private Grid panel1;
- private Grid panel2;
- private Grid panel3;
+ private LayoutPanel layoutPanel1;
+ private LayoutPanel layoutPanel2;
+ private LayoutPanel layoutPanel3;
+ private Grid panel1;
+ private Grid panel2;
+ private Grid panel3;
private void CreateLayoutManager()
{
dockLayoutManager = new DockLayoutManager();
dockLayoutManager.SetValue(Grid.RowProperty, 2);
- dockLayoutManager.SetValue(Grid.ColumnSpanProperty, 2);
+ dockLayoutManager.SetValue(Grid.ColumnSpanProperty, 2);
dockLayoutManager.Margin = new Thickness(0, 5, 0, 0);
dockLayoutManager.SetValue(ThemeManager.ThemeNameProperty, "LightGray");
dockLayoutManager.Background = Brushes.Transparent;
dockLayoutManager.Visibility = Visibility.Hidden;
dockLayoutManager.ShowingDockHints += dockLayoutManager_ShowingDockHints;
-
+
var group = new LayoutGroup();
dockLayoutManager.LayoutRoot = group;
layoutPanel1 = new LayoutPanel
- {
- Caption = "Neue Leistung hinzufügen",
- ItemWidth = GridLength.Auto, ShowCloseButton = false,
- ShowPinButton = false,
- AllowDrag = false,
- AllowMove = false,
- CaptionHorizontalAlignment = HorizontalAlignment.Stretch,
- CaptionTemplate = (DataTemplate) FindResource("LayoutPanelCaptionTemplate")
- };
+ {
+ Caption = "Neue Leistung hinzufügen",
+ ItemWidth = GridLength.Auto,
+ ShowCloseButton = false,
+ ShowPinButton = false,
+ AllowDrag = false,
+ AllowMove = false,
+ CaptionHorizontalAlignment = HorizontalAlignment.Stretch,
+ CaptionTemplate = (DataTemplate) FindResource("LayoutPanelCaptionTemplate")
+ };
var border = new Border
- {
- Background = new SolidColorBrush(Color.FromRgb(195, 203, 206)),
- BorderThickness = new Thickness(0),
- BorderBrush = Brushes.Gray
- };
+ {
+ Background = new SolidColorBrush(Color.FromRgb(195, 203, 206)),
+ BorderThickness = new Thickness(0),
+ BorderBrush = Brushes.Gray
+ };
panel1 = new Grid {Margin = new Thickness(4)};
border.Child = panel1;
@@ -2523,23 +2628,23 @@ namespace BeWo.View.Detail
group.Items.Add(layoutPanel1);
layoutPanel2 = new LayoutPanel
- {
- Caption = "Leistungen",
- ItemWidth = new GridLength(1, GridUnitType.Star),
- ShowCloseButton = false,
- ShowPinButton = false,
- AllowDrag = false,
- AllowMove = false,
- CaptionTemplate = (DataTemplate) FindResource("LayoutPanelCaptionTemplate"),
- CaptionHorizontalAlignment = HorizontalAlignment.Stretch
- };
+ {
+ Caption = "Leistungen",
+ ItemWidth = new GridLength(1, GridUnitType.Star),
+ ShowCloseButton = false,
+ ShowPinButton = false,
+ AllowDrag = false,
+ AllowMove = false,
+ CaptionTemplate = (DataTemplate) FindResource("LayoutPanelCaptionTemplate"),
+ CaptionHorizontalAlignment = HorizontalAlignment.Stretch
+ };
border = new Border
- {
- Background = new SolidColorBrush(Color.FromRgb(195, 203, 206)),
- BorderThickness = new Thickness(0),
- BorderBrush = Brushes.Gray
- };
+ {
+ Background = new SolidColorBrush(Color.FromRgb(195, 203, 206)),
+ BorderThickness = new Thickness(0),
+ BorderBrush = Brushes.Gray
+ };
panel2 = new Grid {Margin = new Thickness(0)};
border.Child = panel2;
@@ -2549,23 +2654,23 @@ namespace BeWo.View.Detail
group.Items.Add(layoutPanel2);
layoutPanel3 = new LayoutPanel
- {
- Caption = "Punktebogen",
- ItemWidth = new GridLength(400, GridUnitType.Pixel),
- ShowCloseButton = false,
- ShowPinButton = false,
- AllowDrag = false,
- AllowMove = false,
- CaptionTemplate = (DataTemplate) FindResource("LayoutPanelCaptionTemplate"),
- CaptionHorizontalAlignment = HorizontalAlignment.Stretch
- };
+ {
+ Caption = "Punktebogen",
+ ItemWidth = new GridLength(400, GridUnitType.Pixel),
+ ShowCloseButton = false,
+ ShowPinButton = false,
+ AllowDrag = false,
+ AllowMove = false,
+ CaptionTemplate = (DataTemplate) FindResource("LayoutPanelCaptionTemplate"),
+ CaptionHorizontalAlignment = HorizontalAlignment.Stretch
+ };
border = new Border
- {
- Background = new SolidColorBrush(Color.FromRgb(195, 203, 206)),
- BorderThickness = new Thickness(0),
- BorderBrush = Brushes.Gray
- };
+ {
+ Background = new SolidColorBrush(Color.FromRgb(195, 203, 206)),
+ BorderThickness = new Thickness(0),
+ BorderBrush = Brushes.Gray
+ };
panel3 = new Grid {Margin = new Thickness(0, 4, 0, 0)};
border.Child = panel3;
@@ -2581,7 +2686,8 @@ namespace BeWo.View.Detail
assessmentSheet.LayoutManager = dockLayoutManager;
}
- static void dockLayoutManager_ShowingDockHints(object sender, DevExpress.Xpf.Docking.Base.ShowingDockHintsEventArgs e)
+ static void dockLayoutManager_ShowingDockHints(object sender,
+ DevExpress.Xpf.Docking.Base.ShowingDockHintsEventArgs e)
{
e.DisableAll();
e.HideAll();
@@ -2594,11 +2700,11 @@ namespace BeWo.View.Detail
assessmentSheet.Visibility = Visibility.Collapsed;
customerDetailGrid.Visibility = Visibility.Visible;
-
+
if (dockLayoutManager != null)
dockLayoutManager.Visibility = Visibility.Collapsed;
- if (customerDetailGrid.Children.Count != 0)
+ if (customerDetailGrid.Children.Count != 0)
return;
if (panel1 != null)
@@ -2620,10 +2726,10 @@ namespace BeWo.View.Detail
{
if (dockLayoutManager == null)
CreateLayoutManager();
-
+
assessmentSheet.SetCustomer(customer, cats);
- if (assessmentSheet.Visibility == Visibility.Visible)
+ if (assessmentSheet.Visibility == Visibility.Visible)
return;
assessmentSheet.Visibility = Visibility.Visible;
@@ -2655,11 +2761,11 @@ namespace BeWo.View.Detail
}
private BaseLayoutItem lastPanel;
- private LayoutGroup lastParentGroup;
- private LayoutPanel emptyPanel;
- private int lastIndexWithinParent;
- private int lastIndexWithinRoot;
-
+ private LayoutGroup lastParentGroup;
+ private LayoutPanel emptyPanel;
+ private int lastIndexWithinParent;
+ private int lastIndexWithinRoot;
+
private void InitDockPanel()
{
if (assessmentSheet == null)
@@ -2683,7 +2789,8 @@ namespace BeWo.View.Detail
}
}
- foreach (var layoutPanel in dockLayoutManager.FloatGroups.SelectMany(floatGroup => floatGroup.Items.Cast()))
+ foreach (var layoutPanel in dockLayoutManager.FloatGroups.SelectMany(floatGroup =>
+ floatGroup.Items.Cast()))
{
AddMaximizeRestoreButtons(layoutPanel);
}
@@ -2703,14 +2810,14 @@ namespace BeWo.View.Detail
if (btn.Content.ToString() == "Maximieren")
{
- item.CaptionTemplate = (DataTemplate)FindResource("LayoutPanelCaptionTemplateMinimize");
+ item.CaptionTemplate = (DataTemplate) FindResource("LayoutPanelCaptionTemplateMinimize");
//btn.Content = "Wiederherstellen";
//btn.ToolTip = btn.Content;
//btn.Style = (Style) FindResource("DockPanelRestoreButtonStyle");
-
+
MaximizeButtonClickHandler(item);
-
+
if (Equals(item, layoutPanel1))
{
popupedit_employee.Focus();
@@ -2723,10 +2830,10 @@ namespace BeWo.View.Detail
{
assessmentSheet.Focus();
}
- }
+ }
else
{
- item.CaptionTemplate = (DataTemplate)FindResource("LayoutPanelCaptionTemplate");
+ item.CaptionTemplate = (DataTemplate) FindResource("LayoutPanelCaptionTemplate");
//btn.Content = "Maximieren";
//btn.ToolTip = btn.Content;
@@ -2756,13 +2863,13 @@ namespace BeWo.View.Detail
var controlBox = item.ControlBoxContent as StackPanel;
foreach (var child in controlBox.Children)
{
- if (child is Button && ((Button)child).Content.ToString() == "Maximieren")
+ if (child is Button && ((Button) child).Content.ToString() == "Maximieren")
{
- ((Button)child).Visibility = Visibility.Collapsed;
+ ((Button) child).Visibility = Visibility.Collapsed;
}
- else if (child is Button && ((Button)child).Content.ToString() == "Wiederherstellen")
+ else if (child is Button && ((Button) child).Content.ToString() == "Wiederherstellen")
{
- ((Button)child).Visibility = Visibility.Visible;
+ ((Button) child).Visibility = Visibility.Visible;
}
}
}
@@ -2793,13 +2900,13 @@ namespace BeWo.View.Detail
foreach (var child in controlBox.Children)
{
- if (child is Button && ((Button)child).Content.ToString() == "Maximieren")
+ if (child is Button && ((Button) child).Content.ToString() == "Maximieren")
{
- ((Button)child).Visibility = Visibility.Visible;
+ ((Button) child).Visibility = Visibility.Visible;
}
- else if (child is Button && ((Button)child).Content.ToString() == "Wiederherstellen")
+ else if (child is Button && ((Button) child).Content.ToString() == "Wiederherstellen")
{
- ((Button)child).Visibility = Visibility.Collapsed;
+ ((Button) child).Visibility = Visibility.Collapsed;
}
}
}
@@ -2812,14 +2919,14 @@ namespace BeWo.View.Detail
return;
}
- var parent = item.GetRoot() as FloatGroup;
+ var parent = item.GetRoot() as FloatGroup;
var restoreBounds = new Rect(parent.FloatLocation, parent.FloatSize);
- var bounds = CalcMaximizedBounds(restoreBounds);
+ var bounds = CalcMaximizedBounds(restoreBounds);
DocumentPanel.SetRestoreBounds(parent, restoreBounds);
parent.FloatLocation = new Point(bounds.X, bounds.Y);
- parent.FloatSize = new Size(bounds.Width, bounds.Height);
+ parent.FloatSize = new Size(bounds.Width, bounds.Height);
}
private static void RestoreFloatButtonClickHandler(BaseLayoutItem item)
@@ -2834,7 +2941,7 @@ namespace BeWo.View.Detail
var bounds = DocumentPanel.GetRestoreBounds(parent);
parent.FloatLocation = new Point(bounds.X, bounds.Y);
- parent.FloatSize = new Size(bounds.Width, bounds.Height);
+ parent.FloatSize = new Size(bounds.Width, bounds.Height);
}
private void MaximizeDockButtonClickHandler(BaseLayoutItem item)
@@ -2848,7 +2955,7 @@ namespace BeWo.View.Detail
if (lastParentGroup is TabbedGroup)
{
lastIndexWithinParent = lastParentGroup.Items.IndexOf(item);
- emptyPanel = new LayoutPanel();
+ emptyPanel = new LayoutPanel();
dockLayoutManager.DockController.Insert(lastParentGroup, emptyPanel, lastParentGroup.Items.Count);
}
@@ -2869,17 +2976,17 @@ namespace BeWo.View.Detail
//if (lp != null)
// lp.Background = Brushes.Transparent;
- var width = dockLayoutManager.ActualWidth + 5;
+ var width = dockLayoutManager.ActualWidth + 5;
var height = dockLayoutManager.ActualHeight + 5;
- var pos = new Point(-5, -5);
+ var pos = new Point(-5, -5);
var restoreBounds = new Rect(pos, new Point(width, height));
- var bounds = CalcMaximizedBounds(restoreBounds);
+ var bounds = CalcMaximizedBounds(restoreBounds);
DocumentPanel.SetRestoreBounds(parent, restoreBounds);
parent.FloatLocation = new Point(restoreBounds.X, restoreBounds.Y);
- parent.FloatSize = new Size(restoreBounds.Width, restoreBounds.Height);
+ parent.FloatSize = new Size(restoreBounds.Width, restoreBounds.Height);
}
@@ -2897,7 +3004,7 @@ namespace BeWo.View.Detail
dockLayoutManager.DockController.RemovePanel(emptyPanel);
dockLayoutManager.DockController.Activate(item);
- emptyPanel = null;
+ emptyPanel = null;
lastIndexWithinParent = -1;
return;
@@ -2934,7 +3041,7 @@ namespace BeWo.View.Detail
private void ChkRowView_Checked(object sender, RoutedEventArgs e)
{
- if (srListBox == null)
+ if (srListBox == null)
return;
srListBox.Visibility = Visibility.Visible;
@@ -2964,20 +3071,20 @@ namespace BeWo.View.Detail
BeWoApp.SaveAppSettings();
}
-
+
private void SrTableView_OnMouseDoubleClick(object sender, MouseButtonEventArgs e)
{
//###Bars
var hitInfo = srTableView.CalcHitInfo(e.OriginalSource as DependencyObject);
- if (!hitInfo.InRow)
+ if (!hitInfo.InRow)
return;
-
+
ServiceRecordVM vm = GetSelectedServiceRecordFromGrid();
if (vm != null)
StartEdit(vm);
-
+
lastPosition = ViewModel.VMList.IndexOf(vm);
}
@@ -2994,15 +3101,15 @@ namespace BeWo.View.Detail
{
ServiceRecordVM vm = GetSelectedServiceRecordFromGrid();
- if (vm != null)
- {
- if (vm.EditAllowed)
- StartEdit(vm);
- }
+ if (vm != null)
+ {
+ if (vm.EditAllowed)
+ StartEdit(vm);
+ }
}
private void DxDeleteButton_OnItemClick(object sender, ItemClickEventArgs e)
- {
+ {
ServiceRecordVM vm = GetSelectedServiceRecordFromGrid();
lastPosition = ViewModel.VMList.IndexOf(vm);
@@ -3011,13 +3118,13 @@ namespace BeWo.View.Detail
Delete(vm);
}
- private void DxHistoryButton_OnItemClick(object sender, ItemClickEventArgs e)
+ private void DxHistoryButton_OnItemClick(object sender, ItemClickEventArgs e)
{
ServiceRecordVM vm = GetSelectedServiceRecordFromGrid();
if (vm != null && ServiceRecordVM.IsHistoryAllowed)
- ShowHistory(vm);
+ ShowHistory(vm);
}
-
+
public override void ModalPopUpCloseInvoked()
{
MainControl.CloseCurrentPopUp();
@@ -3026,39 +3133,42 @@ namespace BeWo.View.Detail
public override void ModalPopUpSaveInvoked()
{
if (_GroupOfPeopleModalPopUp != null)
- _GroupOfPeopleModalPopUp.SaveData();
+ _GroupOfPeopleModalPopUp.SaveData();
}
- private void MultiSupportConceptControl_EditGroupButtonClicked(object sender, EventArgs e)
+ private void MultiSupportConceptControl_EditGroupButtonClicked(object sender, EventArgs e)
{
OpenGroupEditView();
}
-
+
private void OpenGroupEditView()
{
VMFactory.CreateGroupOfPeopleListVMAsync(
- cb => this.Dispatch(
- delegate
- {
- if (cb.VMList.Count > 0)
- cb.EditVM = cb.VMList[0];
+ cb => this.Dispatch(
+ delegate
+ {
+ if (cb.VMList.Count > 0)
+ cb.EditVM = cb.VMList[0];
- _GroupOfPeopleModalPopUp = new GroupOfPeopleView(cb) {MinWidth = 900, MaxWidth = 900, Height = 600};
- _GroupOfPeopleModalPopUp.CommandBindings.Add(
- new CommandBinding(
- ApplicationCommands.Close,
- (s, e) =>
- {
- if (_GroupOfPeopleModalPopUp.DoSaveCheck())
- BeWoApp.MainControl.CloseCurrentPopUp();
- }));
- _GroupOfPeopleModalPopUp.GroupOfPeopleSavedOrUpdated += GroupOfPeopleModalPopUp_GroupOfPeopleSavedOrUpdated;
- BeWoApp.MainControl.ShowControlAsModalPopUp(_GroupOfPeopleModalPopUp);
- _GroupOfPeopleModalPopUp.Focus();
- }));
+ _GroupOfPeopleModalPopUp =
+ new GroupOfPeopleView(cb) {MinWidth = 900, MaxWidth = 900, Height = 600};
+ _GroupOfPeopleModalPopUp.CommandBindings.Add(
+ new CommandBinding(
+ ApplicationCommands.Close,
+ (s, e) =>
+ {
+ if (_GroupOfPeopleModalPopUp.DoSaveCheck())
+ BeWoApp.MainControl.CloseCurrentPopUp();
+ }));
+ _GroupOfPeopleModalPopUp.GroupOfPeopleSavedOrUpdated +=
+ GroupOfPeopleModalPopUp_GroupOfPeopleSavedOrUpdated;
+ BeWoApp.MainControl.ShowControlAsModalPopUp(_GroupOfPeopleModalPopUp);
+ _GroupOfPeopleModalPopUp.Focus();
+ }));
}
- private static void GroupOfPeopleModalPopUp_GroupOfPeopleSavedOrUpdated(object sender, EventArgs e)
+ private static void GroupOfPeopleModalPopUp_GroupOfPeopleSavedOrUpdated(object sender,
+ EventArgs e)
{
//ServiceFacade.DoCustomerServiceAsync(
// s => s.LoadPersonCompact(e.Data.DataContract.PersonOid.Value),
@@ -3071,67 +3181,83 @@ namespace BeWo.View.Detail
private void LinkPdfExport_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
{
- if ((chkGroupBooking.IsChecked == null || chkGroupBooking.IsChecked != null && chkGroupBooking.IsChecked.Value) ||
- (chkMultiBooking.IsChecked == null || chkMultiBooking.IsChecked != null && chkMultiBooking.IsChecked.Value))
- {
- return;
- }
+ if ((chkGroupBooking.IsChecked == null ||
+ chkGroupBooking.IsChecked != null && chkGroupBooking.IsChecked.Value) ||
+ (chkMultiBooking.IsChecked == null ||
+ chkMultiBooking.IsChecked != null && chkMultiBooking.IsChecked.Value))
+ {
+ return;
+ }
- long scOid = 0;
- long cOid = 0;
- long cb2scOid = 0;
- var eOid = BeWoApp.LoggedOnUser.Employee.EmployeeOid;
+ long scOid = 0;
+ long cOid = 0;
+ long cb2scOid = 0;
+ var eOid = BeWoApp.LoggedOnUser.Employee.EmployeeOid;
- var selectedNode = ViewModel.SelectedCustomerNode;
+ var selectedNode = ViewModel.SelectedCustomerNode;
- if (selectedNode != null && selectedNode.SupportConceptTreeNodeDC != null)
- {
- if (selectedNode.SupportConceptTreeNodeDC.SupportConcept != null)
- scOid = selectedNode.SupportConceptTreeNodeDC.SupportConcept.SupportConceptOid;
+ if (selectedNode != null && selectedNode.SupportConceptTreeNodeDC != null)
+ {
+ if (selectedNode.SupportConceptTreeNodeDC.SupportConcept != null)
+ scOid = selectedNode.SupportConceptTreeNodeDC.SupportConcept.SupportConceptOid;
- if (selectedNode.SupportConceptTreeNodeDC.Customer != null)
- cOid = selectedNode.SupportConceptTreeNodeDC.Customer.CustomerOid;
+ if (selectedNode.SupportConceptTreeNodeDC.Customer != null)
+ cOid = selectedNode.SupportConceptTreeNodeDC.Customer.CustomerOid;
- if (selectedNode.SupportConceptTreeNodeDC.SupportConceptCostBearerRelDC != null)
- cb2scOid = selectedNode.SupportConceptTreeNodeDC.SupportConceptCostBearerRelDC.CostBearer2SupportConceptOid.Value;
- }
- else
- {
- if (_SelectedEmployee != null)
- {
- eOid = _SelectedEmployee.EmployeeOid;
- }
- }
+ if (selectedNode.SupportConceptTreeNodeDC.SupportConceptCostBearerRelDC != null)
+ cb2scOid = selectedNode.SupportConceptTreeNodeDC.SupportConceptCostBearerRelDC
+ .CostBearer2SupportConceptOid.Value;
+ }
+ else
+ {
+ if (_SelectedEmployee != null)
+ {
+ eOid = _SelectedEmployee.EmployeeOid;
+ }
+ }
- var sr = ViewModel.ServiceRecordsForSelectedCustomer;
+ var sr = ViewModel.ServiceRecordsForSelectedCustomer;
- var earliestStartDate = sr.Any() ? sr.OrderBy(o => o.StartDate).First().StartDate.Value : DateTime.Now;
- var latestEndDate = sr.Any() ? sr.OrderByDescending(o => o.EndDate).First().EndDate.Value : DateTime.Now.AddSeconds(1);
+ var earliestStartDate = sr.Any() ? sr.OrderBy(o => o.StartDate).First().StartDate.Value : DateTime.Now;
+ var latestEndDate = sr.Any()
+ ? sr.OrderByDescending(o => o.EndDate).First().EndDate.Value
+ : DateTime.Now.AddSeconds(1);
- if (latestEndDate.Hour == 0 && latestEndDate.Minute == 0 && latestEndDate.Second == 1)
- {
- latestEndDate = latestEndDate.AddHours(23);
- latestEndDate = latestEndDate.AddMinutes(59);
- }
+ if (latestEndDate.Hour == 0 && latestEndDate.Minute == 0 && latestEndDate.Second == 1)
+ {
+ latestEndDate = latestEndDate.AddHours(23);
+ latestEndDate = latestEndDate.AddMinutes(59);
+ }
- ServiceFacade.DoReportServiceAsync(s => s.CreateServiceRecordListReport(eOid, cOid, scOid, cb2scOid, false, new DateTimeSpan { StartDate = earliestStartDate, StartHours = earliestStartDate.Hour, StartMinutes = earliestStartDate.Minute, EndDate = latestEndDate, EndHours = latestEndDate.Hour, EndMinutes = latestEndDate.Minute }), cb => this.Dispatch(() => BeWoUtils.ShowReportWindow(cb, "Dokumentation")));
+ ServiceFacade.DoReportServiceAsync(
+ s => s.CreateServiceRecordListReport(eOid, cOid, scOid, cb2scOid, false,
+ new DateTimeSpan
+ {
+ StartDate = earliestStartDate,
+ StartHours = earliestStartDate.Hour,
+ StartMinutes = earliestStartDate.Minute,
+ EndDate = latestEndDate,
+ EndHours = latestEndDate.Hour,
+ EndMinutes = latestEndDate.Minute
+ }), cb => this.Dispatch(() => BeWoUtils.ShowReportWindow(cb, "Dokumentation")));
}
private void PopupInfo_OnOpened(object sender, EventArgs e)
{
ServiceRecordVM vm = GetSelectedServiceRecordFromGrid();
- if (vm != null)
- {
- dxEditButton.IsEnabled = vm.EditAllowed;
- dxDeleteButton.IsEnabled = vm.DeleteAllowed;
- dxHistoryButton.IsVisible = ServiceRecordVM.IsHistoryAllowed;
- }
+ if (vm != null)
+ {
+ dxEditButton.IsEnabled = vm.EditAllowed;
+ dxDeleteButton.IsEnabled = vm.DeleteAllowed;
+ dxHistoryButton.IsVisible = ServiceRecordVM.IsHistoryAllowed;
+ }
}
private void Popupedit_employee_OnPreviewMouseDoubleClick(object sender, MouseButtonEventArgs e)
{
- if (!BeWoUtils.CheckPopupEditClickableSpace((PopUpEdit)sender, e) || !BeWoApp.LoggedOnUser.HasRight(UserRightType.EmployeeView_View))
+ if (!BeWoUtils.CheckPopupEditClickableSpace((PopUpEdit) sender, e) ||
+ !BeWoApp.LoggedOnUser.HasRight(UserRightType.EmployeeView_View))
{
return;
}
@@ -3140,8 +3266,9 @@ namespace BeWo.View.Detail
VMFactory.CreateEmployeeVMAsync(employeeCompact.EmployeeOid,
cb => this.Dispatch(
- () => BeWoUtils.OpenModalViewWindow(cb, this, () => this.Dispatch(
- () => BeWoUtils.UpdateAllViews(employeeCompact)))));
+ () => BeWoUtils.OpenModalViewWindow(cb, this, () =>
+ this.Dispatch(
+ () => BeWoUtils.UpdateAllViews(employeeCompact)))));
}
private void ReloadButton_OnClick(object sender, RoutedEventArgs e)
@@ -3149,218 +3276,316 @@ namespace BeWo.View.Detail
ViewModel.BuildServiceRecordsForSelectedTreeNode(true);
}
- private void AddTextModuleToTextBox(string textToAdd, TextBox documentationTextBox)
- {
- var caretIndex = documentationTextBox.CaretIndex;
+ private void AddTextModuleToTextBox(string textToAdd, TextBox documentationTextBox)
+ {
+ if (!String.IsNullOrEmpty(textToAdd))
+ {
+ var caretIndex = documentationTextBox.CaretIndex;
- if(string.IsNullOrEmpty(documentationTextBox.Text))
- {
- documentationTextBox.Text = textToAdd;
- documentationTextBox.CaretIndex = documentationTextBox.Text.Length;
- }
- else
- {
- if(documentationTextBox.CaretIndex == 0)
- {
- documentationTextBox.Text = textToAdd + documentationTextBox.Text;
- }
- else if(documentationTextBox.CaretIndex == documentationTextBox.Text.Length)
- {
- documentationTextBox.Text = documentationTextBox.Text + textToAdd;
- }
- else
- {
- var anzahlLeerzeichen = documentationTextBox.CaretIndex - documentationTextBox.Text.Length;
+ if (string.IsNullOrEmpty(documentationTextBox.Text))
+ {
+ documentationTextBox.Text = textToAdd;
+ documentationTextBox.CaretIndex = documentationTextBox.Text.Length;
+ }
+ else
+ {
+ if (documentationTextBox.CaretIndex == 0)
+ {
+ documentationTextBox.Text = textToAdd + documentationTextBox.Text;
+ }
+ else if (documentationTextBox.CaretIndex == documentationTextBox.Text.Length)
+ {
+ documentationTextBox.Text = documentationTextBox.Text + textToAdd;
+ }
+ else
+ {
+ var anzahlLeerzeichen = documentationTextBox.CaretIndex - documentationTextBox.Text.Length;
- var leerzeichen = string.Empty;
- for(var i = 0; i < anzahlLeerzeichen; i++)
- {
- leerzeichen += " ";
- }
+ var leerzeichen = string.Empty;
+ for (var i = 0; i < anzahlLeerzeichen; i++)
+ {
+ leerzeichen += " ";
+ }
- var start = documentationTextBox.Text.Substring(0, documentationTextBox.CaretIndex - anzahlLeerzeichen);
- var ende = documentationTextBox.Text.Substring(documentationTextBox.CaretIndex - anzahlLeerzeichen);
+ var start = documentationTextBox.Text.Substring(0,
+ documentationTextBox.CaretIndex - anzahlLeerzeichen);
+ var ende = documentationTextBox.Text.Substring(
+ documentationTextBox.CaretIndex - anzahlLeerzeichen);
- documentationTextBox.Text = start + leerzeichen + textToAdd + ende;
- }
+ documentationTextBox.Text = start + leerzeichen + textToAdd + ende;
+ }
- documentationTextBox.CaretIndex = caretIndex + textToAdd.Length;
- }
+ documentationTextBox.CaretIndex = caretIndex + textToAdd.Length;
+ }
- if(grosseDokuTextBox == null)
- {
- documentationTextBox.Focus();
- }
- else
- {
- grosseDokuTextBox.Text = documentationTextBox.Text;
- }
- }
+ if (grosseDokuTextBox == null)
+ {
+ documentationTextBox.Focus();
+ }
+ else
+ {
+ grosseDokuTextBox.Text = documentationTextBox.Text;
+ }
+ }
+ }
- private static void AddTextModuleToRichEditControl(string textToAdd, IRichEditDocumentServer richEditControl)
- {
- if(string.IsNullOrEmpty(richEditControl.Text))
- {
- richEditControl.Text = textToAdd;
- richEditControl.Document.CaretPosition = richEditControl.Document.Range.End;
- }
- else
- {
- if(richEditControl.Document.CaretPosition.ToInt() == 0)
- {
- richEditControl.Text = textToAdd + richEditControl.Text;
- }
- else if(richEditControl.Document.CaretPosition == richEditControl.Document.Range.End)
- {
- richEditControl.Text = richEditControl.Text + textToAdd;
- }
- else
- {
- var anzahlLeerzeichen = richEditControl.Document.CaretPosition.ToInt() - richEditControl.Text.Length;
+ private static void AddTextModuleToRichEditControl(string textToAdd, RichEditControl richEditControl)
+ {
+ if (!String.IsNullOrWhiteSpace(textToAdd))
+ {
+ var oldPos = richEditControl.Document.CaretPosition.ToInt();
- var leerzeichen = string.Empty;
- for(var i = 0; i < anzahlLeerzeichen; i++)
- {
- leerzeichen += " ";
- }
+ var pos = richEditControl.Document.CaretPosition;
+ var doc = pos.BeginUpdateDocument();
+ doc.InsertText(pos, textToAdd);
+ richEditControl.Document.CaretPosition =
+ richEditControl.Document.CreatePosition(oldPos + textToAdd.Length);
- var start = richEditControl.Text.Substring(0, richEditControl.Document.CaretPosition.ToInt() - anzahlLeerzeichen);
- var ende = richEditControl.Text.Substring(richEditControl.Document.CaretPosition.ToInt() - anzahlLeerzeichen);
+ pos.EndUpdateDocument(doc);
- richEditControl.Text = start + leerzeichen + textToAdd + ende;
- }
-
- richEditControl.Document.CaretPosition = richEditControl.Document.Range.End;
- }
- }
+ richEditControl.Focus();
+ }
+ }
private void Combobox_category_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
{
var serviceCategoryComboBox = (ComboBox) sender;
- var category = (ServiceCategoryDC) serviceCategoryComboBox?.SelectedItem;
+ var category = (ServiceCategoryDC) serviceCategoryComboBox?.SelectedItem;
- if (category?.ServiceCategoryOid != null)
- {
- TextModuleTreeViewControl1.ServiceCategoryOid = category.ServiceCategoryOid;
- TextModuleTreeViewControl2.ServiceCategoryOid = category.ServiceCategoryOid;
- TextModuleTreeViewControl3.ServiceCategoryOid = category.ServiceCategoryOid;
- TextModuleTreeViewControl4.ServiceCategoryOid = category.ServiceCategoryOid;
- TextModuleTreeViewControl5.ServiceCategoryOid = category.ServiceCategoryOid;
+ if (category?.ServiceCategoryOid != null)
+ {
- TextModuleTreeViewControlRTF1.ServiceCategoryOid = category.ServiceCategoryOid;
- TextModuleTreeViewControlRTF2.ServiceCategoryOid = category.ServiceCategoryOid;
- TextModuleTreeViewControlRTF3.ServiceCategoryOid = category.ServiceCategoryOid;
- TextModuleTreeViewControlRTF4.ServiceCategoryOid = category.ServiceCategoryOid;
- TextModuleTreeViewControlRTF5.ServiceCategoryOid = category.ServiceCategoryOid;
- }
+ textbausteineSearchView.ServiceCategoryOid = category.ServiceCategoryOid.Value;
+
+ // TextModuleTreeViewControl1.ServiceCategoryOid = category.ServiceCategoryOid;
+ //TextModuleTreeViewControl2.ServiceCategoryOid = category.ServiceCategoryOid;
+ //TextModuleTreeViewControl3.ServiceCategoryOid = category.ServiceCategoryOid;
+ //TextModuleTreeViewControl4.ServiceCategoryOid = category.ServiceCategoryOid;
+ // TextModuleTreeViewControl5.ServiceCategoryOid = category.ServiceCategoryOid;
+
+ //TextModuleTreeViewControlRTF1.ServiceCategoryOid = category.ServiceCategoryOid;
+ //TextModuleTreeViewControlRTF2.ServiceCategoryOid = category.ServiceCategoryOid;
+ //TextModuleTreeViewControlRTF3.ServiceCategoryOid = category.ServiceCategoryOid;
+ //TextModuleTreeViewControlRTF4.ServiceCategoryOid = category.ServiceCategoryOid;
+ //TextModuleTreeViewControlRTF5.ServiceCategoryOid = category.ServiceCategoryOid;
+ }
}
private void EditTextbausteineClick(object sender, RoutedEventArgs e)
{
VMFactory.CreateTextModuleListVMAsync(
- textModules => this.Dispatch(delegate
+ x => this.Dispatch(delegate
{
- var tbv = new TextModuleView(textModules) {Background = FindResource("ApplicationBackground") as LinearGradientBrush};
+ var tbv = new TextbausteinView(x) { Background = FindResource("ApplicationBackground") as LinearGradientBrush };
- var window = new BeWoWindow(tbv) {rootGroupBox = {Header = "Textbausteine"}, Width = 850, MinWidth = 850 };
+ 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
+ };
- tbv.CancelButton.Click += (o, args) =>
- {
- tbv.Focus();
- tbv.DoSaveCheck();
+ if (BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneBearbeiten) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleBearbeiten))
+ {
+ cb.IsEnabled = false;
+ }
- window.Close();
- };
+ var IsOnlyForEmployeeBinding = new Binding("NewVM.IsOnlyForEmployee") { Source = tbv.ViewModel, UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged };
+ BindingOperations.SetBinding(cb, ToggleButton.IsCheckedProperty, IsOnlyForEmployeeBinding);
- window.Show();
- }), false, true);
+ 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();
+ }));
}
- private void EintraegeUmbuchenBtn_Click(object sender, RoutedEventArgs e)
- {
- var si = supportConceptSelectionControl.SelectedItem;
- if (si.SupportConceptTreeNodeDC == null)
- {
- MessageBox.Show(Translator.Translate("Bitte wählen Sie einen Hilfeplan zum Umbuchen von Einträgen aus."), Translator.Translate("Kein Hilfeplan gewählt"), MessageBoxButton.OK, MessageBoxImage.Exclamation);
- return;
- }
-
- var umbuchungsView = new ServiceRecordRebookingView(si.SupportConceptTreeNodeDC.SupportConceptCostBearerRelDC) { Background = FindResource("ApplicationBackground") as LinearGradientBrush };
- if (si.SupportConceptTreeNodeDC.Customer != null)
- {
- umbuchungsView.SetSearchText(si.SupportConceptTreeNodeDC.Customer.LastNameFirstName);
- }
- var rootGrid2 = (Grid) umbuchungsView.root.Content;
- var stackPanel = new StackPanel { Orientation = Orientation.Horizontal, HorizontalAlignment = HorizontalAlignment.Right, VerticalAlignment = VerticalAlignment.Bottom};
+ //private void EditTextbausteineClick(object sender, RoutedEventArgs e)
+ //{
+ // VMFactory.CreateTextModuleListVMAsync(
+ // textModules => this.Dispatch(delegate
+ // {
+ // var tbv = new TextModuleView(textModules)
+ // {
+ // Background = FindResource("ApplicationBackground") as LinearGradientBrush
+ // };
- var speichernBtn = new Button
- {
- Content = "Umbuchen und schließen",
- HorizontalAlignment = HorizontalAlignment.Right,
- Margin = new Thickness(3),
- VerticalAlignment = VerticalAlignment.Center
- };
+ // var window = new BeWoWindow(tbv)
+ // {
+ // rootGroupBox = {Header = "Textbausteine"},
+ // Width = 850,
+ // MinWidth = 850
+ // };
- var abbrechenBtn = new Button
- {
- Content = "Abbrechen",
- HorizontalAlignment = HorizontalAlignment.Right,
- Margin = new Thickness(3),
- VerticalAlignment = VerticalAlignment.Center
- };
+ // tbv.CancelButton.Click += (o, args) =>
+ // {
+ // tbv.Focus();
+ // tbv.DoSaveCheck();
- stackPanel.Children.Add(speichernBtn);
- stackPanel.Children.Add(abbrechenBtn);
- Grid.SetRow(stackPanel, 1);
- Grid.SetColumnSpan(stackPanel, 2);
+ // window.Close();
+ // };
- rootGrid2.Children.Add(stackPanel);
-
- var window = new BeWoWindow(umbuchungsView) { Width = 450, Height = 200, rootGroupBox = { Header = "Umbuchung" }, MinHeight = 170, ResizeMode = ResizeMode.NoResize};
-
- window.WindowStartupLocation = WindowStartupLocation.CenterOwner;
- window.Owner = Application.Current.MainWindow;
+ // window.Show();
+ // }), false, true);
+ //}
- speichernBtn.Click += (o, args) =>
- {
- if (umbuchungsView.Zielhilfeplan == null)
- {
- MessageBox.Show(Translator.Translate("Bitte wählen Sie einen Hilfeplan auf den die Einträge umgebucht werden sollen aus."), Translator.Translate("Kein Hilfeplan gewählt"), MessageBoxButton.OK, MessageBoxImage.Exclamation);
- return;
- }
+ private void EintraegeUmbuchenBtn_Click(object sender, RoutedEventArgs e)
+ {
+ var si = supportConceptSelectionControl.SelectedItem;
+ if (si.SupportConceptTreeNodeDC == null)
+ {
+ MessageBox.Show(
+ Translator.Translate("Bitte wählen Sie einen Hilfeplan zum Umbuchen von Einträgen aus."),
+ Translator.Translate("Kein Hilfeplan gewählt"), MessageBoxButton.OK, MessageBoxImage.Exclamation);
+ return;
+ }
- umbuchungsView.Focus();
-
- umbuchungsView.Save(records => this.Dispatch(() => ServiceFacade.DoOperationsServiceAsync(s => s.UpdateServiceRecords(records),
- () => this.Dispatch(() => ViewModel.BuildServiceRecordsForSelectedTreeNode(true)))));
+ var umbuchungsView =
+ new ServiceRecordRebookingView(si.SupportConceptTreeNodeDC.SupportConceptCostBearerRelDC)
+ {
+ Background = FindResource("ApplicationBackground") as LinearGradientBrush
+ };
+ if (si.SupportConceptTreeNodeDC.Customer != null)
+ {
+ umbuchungsView.SetSearchText(si.SupportConceptTreeNodeDC.Customer.LastNameFirstName);
+ }
+ var rootGrid2 = (Grid) umbuchungsView.root.Content;
+ var stackPanel = new StackPanel
+ {
+ Orientation = Orientation.Horizontal,
+ HorizontalAlignment = HorizontalAlignment.Right,
+ VerticalAlignment = VerticalAlignment.Bottom
+ };
- window.Close();
- };
+ var speichernBtn = new Button
+ {
+ Content = "Umbuchen und schließen",
+ HorizontalAlignment = HorizontalAlignment.Right,
+ Margin = new Thickness(3),
+ VerticalAlignment = VerticalAlignment.Center
+ };
- abbrechenBtn.Click += (o, args) =>
- {
- umbuchungsView.Focus();
+ var abbrechenBtn = new Button
+ {
+ Content = "Abbrechen",
+ HorizontalAlignment = HorizontalAlignment.Right,
+ Margin = new Thickness(3),
+ VerticalAlignment = VerticalAlignment.Center
+ };
- window.Close();
- };
+ stackPanel.Children.Add(speichernBtn);
+ stackPanel.Children.Add(abbrechenBtn);
+ Grid.SetRow(stackPanel, 1);
+ Grid.SetColumnSpan(stackPanel, 2);
- window.ShowDialog();
- }
+ rootGrid2.Children.Add(stackPanel);
- private void IncreaseFontSizeBtn_Click(object sender, RoutedEventArgs e)
- {
- if (BeWoApp.AppSettings.ShowRtfTextfeld)
- {
- richEditControl1.FontSize++;
- richEditControl2.FontSize++;
- richEditControl3.FontSize++;
- richEditControl4.FontSize++;
- richEditControl5.FontSize++;
+ var window = new BeWoWindow(umbuchungsView)
+ {
+ Width = 450,
+ Height = 200,
+ rootGroupBox = {Header = "Umbuchung"},
+ MinHeight = 170,
+ ResizeMode = ResizeMode.NoResize
+ };
- BeWoApp.AppSettings.DocumentationFontSize = richEditControl1.FontSize;
- }
- else
- {
+ window.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+ window.Owner = Application.Current.MainWindow;
+
+ speichernBtn.Click += (o, args) =>
+ {
+ if (umbuchungsView.Zielhilfeplan == null)
+ {
+ MessageBox.Show(
+ Translator.Translate(
+ "Bitte wählen Sie einen Hilfeplan auf den die Einträge umgebucht werden sollen aus."),
+ Translator.Translate("Kein Hilfeplan gewählt"), MessageBoxButton.OK,
+ MessageBoxImage.Exclamation);
+ return;
+ }
+
+ umbuchungsView.Focus();
+
+ umbuchungsView.Save(records => this.Dispatch(() => ServiceFacade.DoOperationsServiceAsync(
+ s => s.UpdateServiceRecords(records),
+ () => this.Dispatch(() => ViewModel.BuildServiceRecordsForSelectedTreeNode(true)))));
+
+ window.Close();
+ };
+
+ abbrechenBtn.Click += (o, args) =>
+ {
+ umbuchungsView.Focus();
+
+ window.Close();
+ };
+
+ window.ShowDialog();
+ }
+
+ private void IncreaseFontSizeBtn_Click(object sender, RoutedEventArgs e)
+ {
+ if (BeWoApp.AppSettings.ShowRtfTextfield)
+ {
+ //richEditControl1.FontSize++;
+ //richEditControl2.FontSize++;
+ //richEditControl3.FontSize++;
+ //richEditControl4.FontSize++;
+ //richEditControl5.FontSize++;
+
+ //BeWoApp.AppSettings.DocumentationFontSize = richEditControl1.FontSize;
+ }
+ else
+ {
dokumentationsTextBox.FontSize++;
dokumentationsTextBox2.FontSize++;
dokumentationsTextBox3.FontSize++;
@@ -3368,67 +3593,68 @@ namespace BeWo.View.Detail
dokumentationsTextBox5.FontSize++;
BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox.FontSize;
- }
- }
-
- private void DecreaseFontSizeBtn_Click(object sender, RoutedEventArgs e)
- {
- if (BeWoApp.AppSettings.ShowRtfTextfeld)
- {
- if (richEditControl1.FontSize <= 1 || richEditControl2.FontSize <= 1 || richEditControl3.FontSize <= 1 ||
- richEditControl4.FontSize <= 1 || richEditControl5.FontSize <= 1)
- {
- return;
- }
-
- 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 ||
+ }
+
+ private void DecreaseFontSizeBtn_Click(object sender, RoutedEventArgs e)
+ {
+ if (BeWoApp.AppSettings.ShowRtfTextfield)
+ {
+ //if (richEditControl1.FontSize <= 1 || richEditControl2.FontSize <= 1 || richEditControl3.FontSize <= 1 ||
+ // richEditControl4.FontSize <= 1 || richEditControl5.FontSize <= 1)
+ //{
+ // return;
+ //}
+
+ //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--;
+ dokumentationsTextBox.FontSize--;
+ dokumentationsTextBox2.FontSize--;
+ dokumentationsTextBox3.FontSize--;
+ dokumentationsTextBox4.FontSize--;
dokumentationsTextBox5.FontSize--;
BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox.FontSize;
}
}
- //private void ZeitraumauswahlwechselBtn_Click(object sender, RoutedEventArgs e)
- //{
- // var nAlt = NDayTextbox.Visibility;
- // NDayTextbox.Visibility = TimeIntervalComboBox.Visibility;
- // TimeIntervalComboBox.Visibility = nAlt;
- // NLadenBtn.Visibility = NDayTextbox.Visibility;
+ //private void ZeitraumauswahlwechselBtn_Click(object sender, RoutedEventArgs e)
+ //{
+ // var nAlt = NDayTextbox.Visibility;
+ // NDayTextbox.Visibility = TimeIntervalComboBox.Visibility;
+ // TimeIntervalComboBox.Visibility = nAlt;
+ // NLadenBtn.Visibility = NDayTextbox.Visibility;
- // if (TimeIntervalComboBox.Visibility == Visibility.Visible)
- // {
- // var s = (KeyValuePair)(TimeIntervalComboBox.SelectedItem ?? ((Dictionary) TimeIntervalComboBox.ItemsSource).First());
- // ViewModel.ServiceRecordTimeInterval = (ServiceRecordTimeInterval) s.Key;
- // }
- // else
- // {
- // ViewModel.ServiceRecordTimeInterval = ServiceRecordTimeInterval.LastNDays;
- // }
- //}
+ // if (TimeIntervalComboBox.Visibility == Visibility.Visible)
+ // {
+ // var s = (KeyValuePair)(TimeIntervalComboBox.SelectedItem ?? ((Dictionary) TimeIntervalComboBox.ItemsSource).First());
+ // ViewModel.ServiceRecordTimeInterval = (ServiceRecordTimeInterval) s.Key;
+ // }
+ // else
+ // {
+ // ViewModel.ServiceRecordTimeInterval = ServiceRecordTimeInterval.LastNDays;
+ // }
+ //}
- private void NLadenBtn_Click(object sender, RoutedEventArgs e)
- {
- ViewModel.BuildServiceRecordsForSelectedTreeNode(true);
- }
+ private void NLadenBtn_Click(object sender, RoutedEventArgs e)
+ {
+ ViewModel.BuildServiceRecordsForSelectedTreeNode(true);
+ }
private void btnAddEmployee2Wohnheimbuchung_Click(object sender, RoutedEventArgs e)
{
@@ -3628,52 +3854,87 @@ namespace BeWo.View.Detail
private void VollbildDokuButton_OnClick(object sender, RoutedEventArgs e)
{
- var stackPanel = new StackPanel {Orientation = Orientation.Horizontal, HorizontalAlignment = HorizontalAlignment.Left};
+ var stackPanel = new StackPanel
+ {
+ Orientation = Orientation.Horizontal,
+ HorizontalAlignment = HorizontalAlignment.Left
+ };
+
+ var schriftVergroessern = new Button
+ {
+ Margin = new Thickness(3),
+ HorizontalAlignment = HorizontalAlignment.Left,
+ Content = "A+"
+ };
+ var schriftVerkleinern = new Button
+ {
+ Margin = new Thickness(3),
+ HorizontalAlignment = HorizontalAlignment.Left,
+ Content = "A-"
+ };
+ var textbausteineOptionen = new Button
+ {
+ Margin = new Thickness(3),
+ HorizontalAlignment = HorizontalAlignment.Left,
+ Content = "@",
+ FontFamily = new FontFamily("Webdings")
+ };
+ //var textbausteine = new TextModuleTreeViewControl
+ //{
+ // Margin = new Thickness(3),
+ // HorizontalAlignment = HorizontalAlignment.Left
+ //};
+ var textbausteine = new Button { Margin = new Thickness(3), HorizontalAlignment = HorizontalAlignment.Left, Content = "Textbausteine" };
- var schriftVergroessern = new Button {Margin = new Thickness(3), HorizontalAlignment = HorizontalAlignment.Left, Content = "A+"};
- var schriftVerkleinern = new Button {Margin = new Thickness(3), HorizontalAlignment = HorizontalAlignment.Left, Content = "A-"};
- var textbausteineOptionen = new Button {Margin = new Thickness(3), HorizontalAlignment = HorizontalAlignment.Left, Content = "@", FontFamily = new FontFamily("Webdings")};
- var textbausteine = new TextModuleTreeViewControl { Margin = new Thickness(3), HorizontalAlignment = HorizontalAlignment.Left};
-
textbausteineOptionen.Click += EditTextbausteineClick;
- textbausteine.TextModuleSelected += TextModuleTreeViewControl_OnTextModuleSelected;
+ textbausteine.Click += ButtonBase_OnClick;
+ //textbausteine.TextModuleSelected += TextModuleTreeViewControl_OnTextModuleSelected;
- if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleAnsehen) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneAnsehen))
- {
- textbausteine.Visibility = Visibility.Collapsed;
- textbausteineOptionen.Visibility = Visibility.Collapsed;
- }
+ if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleAnsehen) &&
+ !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneAnsehen))
+ {
+ textbausteine.Visibility = Visibility.Collapsed;
+ textbausteineOptionen.Visibility = Visibility.Collapsed;
+ }
- if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleBearbeiten) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneBearbeiten))
- {
- textbausteineOptionen.Visibility = Visibility.Collapsed;
- }
+ if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleBearbeiten) &&
+ !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneBearbeiten))
+ {
+ textbausteineOptionen.Visibility = Visibility.Collapsed;
+ }
stackPanel.Children.Add(schriftVergroessern);
stackPanel.Children.Add(schriftVerkleinern);
stackPanel.Children.Add(textbausteineOptionen);
stackPanel.Children.Add(textbausteine);
+ String header = Translator.Translate("Dokumentation");
+
if (TabItem1_Notice.IsSelected)
{
- grosseDokuTextBox = InitMaximizedDocumentationTextBox(dokumentationsTextBox);
+ grosseDokuTextBox = InitMaximizedDocumentationTextBox(dokumentationsTextBox);
+ header = TabItem1_Notice.Header.ToString();
}
else if (TabItem2_Notice.IsSelected)
- {
- grosseDokuTextBox = InitMaximizedDocumentationTextBox(dokumentationsTextBox2);
- }
+ {
+ grosseDokuTextBox = InitMaximizedDocumentationTextBox(dokumentationsTextBox2);
+ header = TabItem2_Notice.Header.ToString();
+ }
else if (TabItem3_Notice.IsSelected)
{
- grosseDokuTextBox = InitMaximizedDocumentationTextBox(dokumentationsTextBox3);
- }
+ grosseDokuTextBox = InitMaximizedDocumentationTextBox(dokumentationsTextBox3);
+ header = TabItem3_Notice.Header.ToString();
+ }
else if (TabItem4_Notice.IsSelected)
{
- grosseDokuTextBox = InitMaximizedDocumentationTextBox(dokumentationsTextBox4);
- }
+ grosseDokuTextBox = InitMaximizedDocumentationTextBox(dokumentationsTextBox4);
+ header = TabItem4_Notice.Header.ToString();
+ }
else if (TabItem5_Notice.IsSelected)
{
- grosseDokuTextBox = InitMaximizedDocumentationTextBox(dokumentationsTextBox5);
- }
+ grosseDokuTextBox = InitMaximizedDocumentationTextBox(dokumentationsTextBox5);
+ header = TabItem5_Notice.Header.ToString();
+ }
schriftVergroessern.Click += delegate(object o, RoutedEventArgs args)
{
@@ -3698,86 +3959,99 @@ namespace BeWo.View.Detail
rootGrid2.Children.Add(stackPanel);
rootGrid2.Children.Add(grosseDokuTextBox);
- var neunzigProzentHoehe = MainControl.ActualHeight * .9;
- var neunzigProzentBreite = MainControl.ActualWidth * .9;
+ var neunzigProzentHoehe = MainControl.ActualHeight * .9;
+ var neunzigProzentBreite = MainControl.ActualWidth * .9;
- var beWoWindow = new BeWoWindow(rootGrid2, "MainContentGroupBoxWithMinimizeBtnStyle") { Width = neunzigProzentBreite, Height = neunzigProzentHoehe, rootGroupBox = { Header = "Dokumentation" }, WindowStartupLocation = WindowStartupLocation.CenterScreen};
+ var beWoWindow = new BeWoWindow(rootGrid2, "MainContentGroupBoxWithMinimizeBtnStyle")
+ {
+ Width = neunzigProzentBreite,
+ Height = neunzigProzentHoehe,
+ rootGroupBox = {Header = header},
+ WindowStartupLocation = WindowStartupLocation.CenterScreen
+ };
- beWoWindow.Closed += delegate {
+ beWoWindow.Closed += delegate
+ {
grosseDokuTextBox = null;
};
beWoWindow.ShowDialog();
}
- private TextBox InitMaximizedDocumentationTextBox(TextBox smallDocumentationTextBox)
- {
- grosseDokuTextBox = new TextBox
- {
- AcceptsReturn = true,
- VerticalScrollBarVisibility = ScrollBarVisibility.Auto,
- TextWrapping = TextWrapping.Wrap,
- Language = smallDocumentationTextBox.Language,
- HorizontalScrollBarVisibility = ScrollBarVisibility.Hidden,
- AutoWordSelection = true,
- FontSize = smallDocumentationTextBox.FontSize,
- Text = smallDocumentationTextBox.Text
- };
+ private TextBox InitMaximizedDocumentationTextBox(TextBox smallDocumentationTextBox)
+ {
+ grosseDokuTextBox = new TextBox
+ {
+ AcceptsReturn = true,
+ VerticalScrollBarVisibility = ScrollBarVisibility.Auto,
+ TextWrapping = TextWrapping.Wrap,
+ Language = smallDocumentationTextBox.Language,
+ HorizontalScrollBarVisibility = ScrollBarVisibility.Hidden,
+ AutoWordSelection = true,
+ FontSize = smallDocumentationTextBox.FontSize,
+ Text = smallDocumentationTextBox.Text
+ };
- grosseDokuTextBox.TextChanged += delegate { smallDocumentationTextBox.Text = grosseDokuTextBox.Text; };
+ grosseDokuTextBox.TextChanged += delegate { smallDocumentationTextBox.Text = grosseDokuTextBox.Text; };
- return grosseDokuTextBox;
- }
+ return grosseDokuTextBox;
+ }
private ServiceRecordRTFWindowView _rtfWindowView;
- private void RTFVollbildDokuButton_OnClick(object sender, RoutedEventArgs e)
- {
- var stringtheorie = "";
- var rtfStringTheorie = "";
+ private void RTFVollbildDokuButton_OnClick(object sender, RoutedEventArgs e)
+ {
+ var stringtheorie = "";
+ var rtfStringTheorie = "";
+ String header = Translator.Translate("Dokumentation");
if (TabitemRtf1Note.IsSelected)
{
stringtheorie = richEditControl1.Text;
rtfStringTheorie = richEditControl1.RtfText;
+ header = TabitemRtf1Note.Header.ToString();
}
else if (TabitemRtf2Note.IsSelected)
{
stringtheorie = richEditControl2.Text;
rtfStringTheorie = richEditControl2.RtfText;
+ header = TabitemRtf2Note.Header.ToString();
}
else if (TabitemRtf3Note.IsSelected)
{
stringtheorie = richEditControl3.Text;
rtfStringTheorie = richEditControl3.RtfText;
+ header = TabitemRtf3Note.Header.ToString();
}
else if (TabitemRtf4Note.IsSelected)
{
stringtheorie = richEditControl4.Text;
rtfStringTheorie = richEditControl4.RtfText;
+ header = TabitemRtf4Note.Header.ToString();
}
else if (TabitemRtf5Note.IsSelected)
{
stringtheorie = richEditControl5.Text;
rtfStringTheorie = richEditControl5.RtfText;
+ header = TabitemRtf5Note.Header.ToString();
}
+ var neunzigProzentHoehe = MainControl.ActualHeight * .8;
+ var neunzigProzentBreite = MainControl.ActualWidth * .6;
- if (_rtfWindowView == null)
- {
- _rtfWindowView = new ServiceRecordRTFWindowView("Dokumentation", stringtheorie, rtfStringTheorie);
-
- _rtfWindowView.RaiseCustomEvent += NewWindow_RaiseRTFEvent;
- _rtfWindowView.ShowDialog();
- }
- else
- {
+ if (_rtfWindowView != null)
+ {
+ neunzigProzentBreite = _rtfWindowView.Width;
+ neunzigProzentHoehe = _rtfWindowView.Height;
+ _rtfWindowView.RaiseCustomEvent -= NewWindow_RaiseRTFEvent;
_rtfWindowView.Close();
- _rtfWindowView = new ServiceRecordRTFWindowView("Dokumentation", stringtheorie, rtfStringTheorie);
-
- _rtfWindowView.RaiseCustomEvent += NewWindow_RaiseRTFEvent;
- _rtfWindowView.ShowDialog();
}
+
+ _rtfWindowView = new ServiceRecordRTFWindowView(header, stringtheorie, rtfStringTheorie);
+ _rtfWindowView.RaiseCustomEvent += NewWindow_RaiseRTFEvent;
+ _rtfWindowView.Width = neunzigProzentBreite;
+ _rtfWindowView.Height = neunzigProzentHoehe;
+ _rtfWindowView.ShowDialog();
}
private void NewWindow_RaiseRTFEvent(object sender, CustomRTFWindowArgs e)
@@ -3863,10 +4137,11 @@ namespace BeWo.View.Detail
{
VMFactory.CreateMedRecordVMAsync(e.Data.CustomerOid, medRecords => this.Dispatch(() =>
{
- ViewModel.BedarfsMedViewModel = medRecords;
+ ViewModel.BedarfsMedViewModel = medRecords;
ViewModel.BedarfsMedViewModel.NewVM.Customer = e.Data;
- ViewModel.BedarfsMedViewModel.NewVM.SetInitialDosageForm(ServiceRecordListVM.AllDosageForms.FirstOrDefault());
+ ViewModel.BedarfsMedViewModel.NewVM.SetInitialDosageForm(ServiceRecordListVM.AllDosageForms
+ .FirstOrDefault());
}));
}
@@ -3878,7 +4153,9 @@ namespace BeWo.View.Detail
private void Popupedit_employee_bedarfsmed_OnPreviewMouseDoubleClick(object sender, MouseButtonEventArgs e)
{
- if (!BeWoUtils.CheckPopupEditClickableSpace((PopUpEdit)sender, e) || !BeWoApp.LoggedOnUser.HasRight(UserRightType.EmployeeView_View) || ViewModel.BedarfsMedViewModel == null)
+ if (!BeWoUtils.CheckPopupEditClickableSpace((PopUpEdit) sender, e) ||
+ !BeWoApp.LoggedOnUser.HasRight(UserRightType.EmployeeView_View) ||
+ ViewModel.BedarfsMedViewModel == null)
{
return;
}
@@ -3887,20 +4164,22 @@ namespace BeWo.View.Detail
VMFactory.CreateEmployeeVMAsync(employeeCompact.EmployeeOid,
cb => this.Dispatch(
- () => BeWoUtils.OpenModalViewWindow(cb, this, () => this.Dispatch(
- () => BeWoUtils.UpdateAllViews(employeeCompact)))));
+ () => BeWoUtils.OpenModalViewWindow(cb, this, () =>
+ this.Dispatch(
+ () => BeWoUtils.UpdateAllViews(employeeCompact)))));
}
private void ButtonSaveMedRecord_Click(object sender, RoutedEventArgs e)
{
var newMedRecordIsValid = Validate(NewMedRecordGrid);
- if(ViewModel.BedarfsMedViewModel.NewVM.Employee == null)
+ if (ViewModel.BedarfsMedViewModel.NewVM.Employee == null)
{
- MessageBox.Show(Translator.Translate("Bitte wählen Sie einen Mitarbeiter aus."), "Fehler beim Anlegen", MessageBoxButton.OK, MessageBoxImage.Error);
+ MessageBox.Show(Translator.Translate("Bitte wählen Sie einen Mitarbeiter aus."), "Fehler beim Anlegen",
+ MessageBoxButton.OK, MessageBoxImage.Error);
return;
}
-
+
if (newMedRecordIsValid)
{
var currentDosageForm = ViewModel.BedarfsMedViewModel.NewVM.DosageForm;
@@ -3911,7 +4190,9 @@ namespace BeWo.View.Detail
ViewModel.BedarfsMedViewModel.AddNewVMToList();
ViewModel.BedarfsMedViewModel.NewVM.SetInitialDosageForm(currentDosageForm);
- ServiceFacade.DoCustomerServiceAsync(s => s.InsertMedRecords(ViewModel.BedarfsMedViewModel.CommitAdded()), x => this.Dispatch(() => ReloadMedRecordViewModel(currentCustomer, currentEmployee)));
+ ServiceFacade.DoCustomerServiceAsync(
+ s => s.InsertMedRecords(ViewModel.BedarfsMedViewModel.CommitAdded()),
+ x => this.Dispatch(() => ReloadMedRecordViewModel(currentCustomer, currentEmployee)));
}
}
@@ -3923,7 +4204,8 @@ namespace BeWo.View.Detail
ViewModel.BedarfsMedViewModel.NewVM.Customer = pCustomer;
ViewModel.BedarfsMedViewModel.NewVM.Employee = pEmployee;
- ViewModel.BedarfsMedViewModel.NewVM.SetInitialDosageForm(ServiceRecordListVM.AllDosageForms.FirstOrDefault());
+ ViewModel.BedarfsMedViewModel.NewVM.SetInitialDosageForm(ServiceRecordListVM.AllDosageForms
+ .FirstOrDefault());
}));
}
@@ -3943,13 +4225,13 @@ namespace BeWo.View.Detail
private void ShowMedRecordEditView()
{
- //CB EINKOMMENTIEREN
+ //CB EINKOMMENTIEREN
//if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.MedRecordsAendern) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.EditAll))
//{
// return;
//}
- var currentMedRecord = (MedRecordVM)MedRecordGridControl.CurrentItem;
+ var currentMedRecord = (MedRecordVM) MedRecordGridControl.CurrentItem;
var currentEmployee = currentMedRecord.Employee;
var currentCustomer = currentMedRecord.Customer;
var medRecord2Edit = new MedRecordVM(currentMedRecord.CommitToDataContract());
@@ -4001,7 +4283,10 @@ namespace BeWo.View.Detail
if (!medRecordEditView.ViewModel.Customer.Equals(currentCustomer))
{
- var messageBoxResult = MessageBox.Show(Translator.Translate("Möchten Sie diesen Eintrag wirklich auf Klient {0} umbuchen?", medRecordEditView.ViewModel.Customer.FullName), "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question);
+ var messageBoxResult = MessageBox.Show(
+ Translator.Translate("Möchten Sie diesen Eintrag wirklich auf Klient {0} umbuchen?",
+ medRecordEditView.ViewModel.Customer.FullName), "Speichern", MessageBoxButton.YesNo,
+ MessageBoxImage.Question);
if (messageBoxResult.Equals(MessageBoxResult.No))
{
@@ -4022,7 +4307,8 @@ namespace BeWo.View.Detail
private void Button_deleteMedRecordClick(object sender, RoutedEventArgs e)
{
- var messageBoxResult = MessageBox.Show("Sind Sie sicher, dass Sie diese Bedarfsmedikation löschen möchten?", "Eintrag löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning);
+ var messageBoxResult = MessageBox.Show("Sind Sie sicher, dass Sie diese Bedarfsmedikation löschen möchten?",
+ "Eintrag löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning);
if (messageBoxResult.Equals(MessageBoxResult.No))
{
@@ -4035,14 +4321,16 @@ namespace BeWo.View.Detail
var mrDC = medRecord2Delete.CommitToDataContract();
- ServiceFacade.DoCustomerServiceSync(s => s.DeleteMedRecord(mrDC.MedRecordOid.Value, mrDC.MedRecordVersion.Value));
+ ServiceFacade.DoCustomerServiceSync(s =>
+ s.DeleteMedRecord(mrDC.MedRecordOid.Value, mrDC.MedRecordVersion.Value));
- ReloadMedRecordViewModel(ViewModel.BedarfsMedViewModel.NewVM.Customer, ViewModel.BedarfsMedViewModel.NewVM.Employee);
+ ReloadMedRecordViewModel(ViewModel.BedarfsMedViewModel.NewVM.Customer,
+ ViewModel.BedarfsMedViewModel.NewVM.Employee);
}
private void PopupInfoMedRecord_OnOpened(object sender, EventArgs e)
{
- //CB EINKOMMENTIEREN
+ //CB EINKOMMENTIEREN
//dxDeleteButtonMedRecord.IsEnabled = BeWoApp.LoggedOnUser.HasRight(UserRightType.MedRecordsLoeschen) || BeWoApp.LoggedOnUser.HasRight(UserRightType.DeleteAll);
//dxEditButtonMedRecord.IsEnabled = BeWoApp.LoggedOnUser.HasRight(UserRightType.MedRecordsAendern) || BeWoApp.LoggedOnUser.HasRight(UserRightType.EditAll);
}
@@ -4054,26 +4342,29 @@ namespace BeWo.View.Detail
private void DxDeleteButtonMedRecord_OnItemClick(object sender, ItemClickEventArgs e)
{
- var messageBoxResult = MessageBox.Show("Sind Sie sicher, dass Sie diese Bedarfsmedikation löschen möchten?", "Eintrag löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning);
+ var messageBoxResult = MessageBox.Show("Sind Sie sicher, dass Sie diese Bedarfsmedikation löschen möchten?",
+ "Eintrag löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning);
if (messageBoxResult.Equals(MessageBoxResult.No))
{
return;
}
- var medRecord2Delete = (MedRecordVM)MedRecordGridControl.CurrentItem;
+ var medRecord2Delete = (MedRecordVM) MedRecordGridControl.CurrentItem;
ViewModel.BedarfsMedViewModel.VMList.Remove(medRecord2Delete);
var mrDC = medRecord2Delete.CommitToDataContract();
- ServiceFacade.DoCustomerServiceSync(s => s.DeleteMedRecord(mrDC.MedRecordOid.Value, mrDC.MedRecordVersion.Value));
+ ServiceFacade.DoCustomerServiceSync(s =>
+ s.DeleteMedRecord(mrDC.MedRecordOid.Value, mrDC.MedRecordVersion.Value));
- ReloadMedRecordViewModel(ViewModel.BedarfsMedViewModel.NewVM.Customer, ViewModel.BedarfsMedViewModel.NewVM.Employee);
+ ReloadMedRecordViewModel(ViewModel.BedarfsMedViewModel.NewVM.Customer,
+ ViewModel.BedarfsMedViewModel.NewVM.Employee);
}
private void TimeIntervalComboBox_OnSelectedIndexChanged(object sender, RoutedEventArgs e)
- {
+ {
if (ViewModel.ServiceRecordTimeInterval == ServiceRecordTimeInterval.XTage)
{
NDays.Visibility = Visibility.Visible;
@@ -4104,35 +4395,37 @@ namespace BeWo.View.Detail
{
//if (MinSTDMitEnd.Visibility == Visibility.Visible)
//{
- if (MinSTDOhneEnd.Text == ZeiterfassungsDauer.Minuten.ToString())
- {
- numerictb_duration.IsFloatValue = false;
- numerictb_duration.Mask = "########";
+ if (MinSTDOhneEnd.Text == ZeiterfassungsDauer.Minuten.ToString())
+ {
+ numerictb_duration.IsFloatValue = false;
+ numerictb_duration.Mask = "########";
- BeWoApp.AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Minuten;
- BeWoApp.SaveAppSettings();
- }
- else
- {
- numerictb_duration.IsFloatValue = true;
- numerictb_duration.Mask = "########0.00";
+ BeWoApp.AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Minuten;
+ BeWoApp.SaveAppSettings();
+ }
+ else
+ {
+ numerictb_duration.IsFloatValue = true;
+ numerictb_duration.Mask = "########0.00";
- BeWoApp.AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Stunden;
- BeWoApp.SaveAppSettings();
- }
+ BeWoApp.AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Stunden;
+ BeWoApp.SaveAppSettings();
+ }
//}
}
private void MinSTDMitEnd_OnSelectedIndexChanged(object sender, RoutedEventArgs e)
{
- if (MinSTDMitEnd.Text == ZeiterfassungsDauer.Minuten.ToString()) {
+ if (MinSTDMitEnd.Text == ZeiterfassungsDauer.Minuten.ToString())
+ {
numeric_duration.IsFloatValue = false;
numeric_duration.Mask = "########";
BeWoApp.AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Minuten;
BeWoApp.SaveAppSettings();
}
- else {
+ else
+ {
numeric_duration.IsFloatValue = true;
numeric_duration.Mask = "########0.00";
@@ -4141,49 +4434,49 @@ namespace BeWo.View.Detail
}
}
- private void TextModuleTreeViewControl_OnTextModuleSelected(object sender, EventArgs e)
- {
- if(TabItem1_Notice.IsSelected)
- {
- AddTextModuleToTextBox(e.Data.Text, dokumentationsTextBox);
- }
- else if(TabItem2_Notice.IsSelected)
- {
- AddTextModuleToTextBox(e.Data.Text, dokumentationsTextBox2);
- }
- else if(TabItem3_Notice.IsSelected)
- {
- AddTextModuleToTextBox(e.Data.Text, dokumentationsTextBox3);
- }
- else if(TabItem4_Notice.IsSelected)
- {
- AddTextModuleToTextBox(e.Data.Text, dokumentationsTextBox4);
- }
- else if(TabItem5_Notice.IsSelected)
- {
- AddTextModuleToTextBox(e.Data.Text, dokumentationsTextBox5);
- }
- else if(TabitemRtf1Note.IsSelected)
- {
- AddTextModuleToRichEditControl(e.Data.Text, richEditControl1);
- }
- else if(TabitemRtf2Note.IsSelected)
- {
- AddTextModuleToRichEditControl(e.Data.Text, richEditControl2);
- }
- else if(TabitemRtf3Note.IsSelected)
- {
- AddTextModuleToRichEditControl(e.Data.Text, richEditControl3);
- }
- else if(TabitemRtf4Note.IsSelected)
- {
- AddTextModuleToRichEditControl(e.Data.Text, richEditControl4);
- }
- else if(TabitemRtf5Note.IsSelected)
- {
- AddTextModuleToRichEditControl(e.Data.Text, richEditControl5);
- }
- }
+ private void TextModuleTreeViewControl_OnTextModuleSelected(object sender, EventArgs e)
+ {
+ if (TabItem1_Notice.IsSelected)
+ {
+ AddTextModuleToTextBox(e.Data.Text, dokumentationsTextBox);
+ }
+ else if (TabItem2_Notice.IsSelected)
+ {
+ AddTextModuleToTextBox(e.Data.Text, dokumentationsTextBox2);
+ }
+ else if (TabItem3_Notice.IsSelected)
+ {
+ AddTextModuleToTextBox(e.Data.Text, dokumentationsTextBox3);
+ }
+ else if (TabItem4_Notice.IsSelected)
+ {
+ AddTextModuleToTextBox(e.Data.Text, dokumentationsTextBox4);
+ }
+ else if (TabItem5_Notice.IsSelected)
+ {
+ AddTextModuleToTextBox(e.Data.Text, dokumentationsTextBox5);
+ }
+ else if (TabitemRtf1Note.IsSelected)
+ {
+ AddTextModuleToRichEditControl(e.Data.Text, richEditControl1);
+ }
+ else if (TabitemRtf2Note.IsSelected)
+ {
+ AddTextModuleToRichEditControl(e.Data.Text, richEditControl2);
+ }
+ else if (TabitemRtf3Note.IsSelected)
+ {
+ AddTextModuleToRichEditControl(e.Data.Text, richEditControl3);
+ }
+ else if (TabitemRtf4Note.IsSelected)
+ {
+ AddTextModuleToRichEditControl(e.Data.Text, richEditControl4);
+ }
+ else if (TabitemRtf5Note.IsSelected)
+ {
+ AddTextModuleToRichEditControl(e.Data.Text, richEditControl5);
+ }
+ }
private void ServiceRecordView2_OnKeyUp(object sender, KeyEventArgs e)
{
@@ -4192,5 +4485,85 @@ namespace BeWo.View.Detail
SaveServiceRecord();
}
}
+
+ private void RichEditControl1_OnContentChanged(object sender, EventArgs e)
+ {
+ ViewModel.PrototypeVM.Notice = richEditControl1.Text;
+ ViewModel.PrototypeVM.RTFNotice = richEditControl1.RtfText;
+ }
+
+ private void RichEditControl2_OnContentChanged(object sender, EventArgs e)
+ {
+ ViewModel.PrototypeVM.Notice2 = richEditControl1.Text;
+ ViewModel.PrototypeVM.RTFNotice2 = richEditControl1.RtfText;
+ }
+
+ private void RichEditControl3_OnContentChanged(object sender, EventArgs e)
+ {
+ ViewModel.PrototypeVM.Notice3 = richEditControl1.Text;
+ ViewModel.PrototypeVM.RTFNotice3 = richEditControl1.RtfText;
+ }
+
+ private void RichEditControl4_OnContentChanged(object sender, EventArgs e)
+ {
+ ViewModel.PrototypeVM.Notice4 = richEditControl1.Text;
+ ViewModel.PrototypeVM.RTFNotice4 = richEditControl1.RtfText;
+ }
+
+ private void RichEditControl5_OnContentChanged(object sender, EventArgs e)
+ {
+ ViewModel.PrototypeVM.Notice5 = richEditControl1.Text;
+ ViewModel.PrototypeVM.RTFNotice5 = richEditControl1.RtfText;
+ }
+
+ private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
+ {
+ popup_textbausteine.IsOpen = true;
+ }
+
+ private void TextbausteineSearchView_OnItemSelected(object sender, EventArgs e)
+ {
+ if (TabItem1_Notice.IsSelected)
+ {
+ AddTextModuleToTextBox(e.Data.Text, dokumentationsTextBox);
+ }
+ else if (TabItem2_Notice.IsSelected)
+ {
+ AddTextModuleToTextBox(e.Data.Text, dokumentationsTextBox2);
+ }
+ else if (TabItem3_Notice.IsSelected)
+ {
+ AddTextModuleToTextBox(e.Data.Text, dokumentationsTextBox3);
+ }
+ else if (TabItem4_Notice.IsSelected)
+ {
+ AddTextModuleToTextBox(e.Data.Text, dokumentationsTextBox4);
+ }
+ else if (TabItem5_Notice.IsSelected)
+ {
+ AddTextModuleToTextBox(e.Data.Text, dokumentationsTextBox5);
+ }
+ else if (TabitemRtf1Note.IsSelected)
+ {
+ AddTextModuleToRichEditControl(e.Data.Text, richEditControl1);
+ }
+ else if (TabitemRtf2Note.IsSelected)
+ {
+ AddTextModuleToRichEditControl(e.Data.Text, richEditControl2);
+ }
+ else if (TabitemRtf3Note.IsSelected)
+ {
+ AddTextModuleToRichEditControl(e.Data.Text, richEditControl3);
+ }
+ else if (TabitemRtf4Note.IsSelected)
+ {
+ AddTextModuleToRichEditControl(e.Data.Text, richEditControl4);
+ }
+ else if (TabitemRtf5Note.IsSelected)
+ {
+ AddTextModuleToRichEditControl(e.Data.Text, richEditControl5);
+ }
+ popup_textbausteine.IsOpen = false;
+ }
}
}
\ No newline at end of file
diff --git a/BeWo/View/Detail/TextModuleView.xaml.cs b/BeWo/View/Detail/TextModuleView.xaml.cs
index b4bdeda17..e7709110d 100644
--- a/BeWo/View/Detail/TextModuleView.xaml.cs
+++ b/BeWo/View/Detail/TextModuleView.xaml.cs
@@ -166,21 +166,21 @@ namespace BeWo.View.Detail
Save(ReloadViewModel);
}
}
+ //CBEINKOMMENTIEREN
+ //public class IsOnlyForEmployeeRightsConverter : IValueConverter
+ //{
+ // public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ // {
+ // var textModule = (TextModuleVM) value;
- public class IsOnlyForEmployeeRightsConverter : IValueConverter
- {
- public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
- {
- var textModule = (TextModuleVM) value;
+ // return textModule != null && TextModuleView.CheckEditorRights(textModule, parameter) && !textModule.IsParent;
+ // }
- return textModule != null && TextModuleView.CheckEditorRights(textModule, parameter) && !textModule.IsParent;
- }
-
- public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
- {
- throw new NotImplementedException();
- }
- }
+ // public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ // {
+ // throw new NotImplementedException();
+ // }
+ //}
public class TextModuleEditConverter : IMultiValueConverter
{
diff --git a/BeWo/View/Detail/TextbausteinView.xaml b/BeWo/View/Detail/TextbausteinView.xaml
new file mode 100644
index 000000000..55b7e6c60
--- /dev/null
+++ b/BeWo/View/Detail/TextbausteinView.xaml
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BeWo/View/Detail/TextbausteinView.xaml.cs b/BeWo/View/Detail/TextbausteinView.xaml.cs
new file mode 100644
index 000000000..301007a87
--- /dev/null
+++ b/BeWo/View/Detail/TextbausteinView.xaml.cs
@@ -0,0 +1,172 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Windows;
+using System.Windows.Data;
+
+using BeWo.Core;
+using BeWo.Core.Service;
+using BeWo.ServiceProxy;
+using BeWo.Validation;
+using BeWo.ViewModel;
+using BeWo.ViewModel.ListViewModel;
+
+using BS.Shared;
+using BS.Shared.Extensions;
+
+using DevExpress.Xpf.Grid;
+
+namespace BeWo.View.Detail
+{
+ public partial class TextbausteinView
+ {
+ private TextModuleListVM _ViewModel;
+
+ public TextModuleListVM ViewModel
+ {
+ get { return _ViewModel; }
+
+ set
+ {
+ _ViewModel = value;
+ root.DataContext = value;
+ }
+ }
+
+ public override bool IsDirty
+ {
+ get { return ViewModel != null && ViewModel.IsDirty; }
+ }
+
+ internal override DependencyObject ValidationOnSaveRootElement
+ {
+ get { return AddTextbausteinButton; }
+ }
+
+ private bool isInAdministrationView;
+
+ public TextbausteinView(TextModuleListVM pViewModel, bool pIsInAdministrationView = false)
+ {
+ InitializeComponent();
+
+ isInAdministrationView = pIsInAdministrationView;
+
+ EigenerTextbausteinSpalte.Visible = !isInAdministrationView;
+
+ ViewModel = pViewModel;
+ }
+
+ protected override void Save()
+ {
+ var lToDos = new List>();
+
+ if (ViewModel.AddedCount > 0)
+ {
+ lToDos.Add(s => s.InsertNewTextModules(ViewModel.CommitAdded()));
+ }
+
+ if (ViewModel.RemovedCount > 0)
+ {
+ lToDos.Add(s => s.DeleteTextModules(ViewModel.GetRemoved().ToDictionary(dc => dc.TextModuleOid.Value, dc => dc.TextModuleVersion.Value)));
+ }
+
+ if (ViewModel.ChangedCount > 0)
+ {
+ lToDos.Add(s => s.UpdateTextModules(ViewModel.CommitChanged()));
+ }
+
+ ServiceFacade.DoMultipleOperationsServicesAsync(lToDos, ReloadViewModel);
+ }
+
+ public void Save(Action pCallBack)
+ {
+ var lToDos = new List>();
+
+ if (ViewModel.AddedCount > 0)
+ {
+ lToDos.Add(s => s.InsertNewTextModules(ViewModel.CommitAdded()));
+ }
+
+ if (ViewModel.RemovedCount > 0)
+ {
+ lToDos.Add(s => s.DeleteTextModules(ViewModel.GetRemoved().ToDictionary(dc => dc.TextModuleOid.Value, dc => dc.TextModuleVersion.Value)));
+ }
+
+ if (ViewModel.ChangedCount > 0)
+ {
+ lToDos.Add(s => s.UpdateTextModules(ViewModel.CommitChanged()));
+ }
+
+ ServiceFacade.DoMultipleOperationsServicesAsync(lToDos, pCallBack);
+ }
+
+ private void ReloadViewModel()
+ {
+ Cache.GetInstance().ClearServiceCategoryDescriptions();
+ VMFactory.CreateTextModuleListVMAsync(r => this.Dispatch(delegate
+ {
+ ViewModel = r;
+ }), isInAdministrationView);
+ }
+
+ private void DeleteButton_Click(object sender, RoutedEventArgs e)
+ {
+ ViewModel.VMList.Remove(datagrid_textbausteine.GetCurrentValue());
+ BeWoWpfUtils.RefreshDXGrid(datagrid_textbausteine);
+ }
+
+ private void ButtonAddTextbaustein_Click(object sender, RoutedEventArgs e)
+ {
+ if (ValidationTrigger.Validate(this))
+ {
+ ViewModel.AddNewVMToList();
+ }
+ }
+
+ private void GridViewBase_OnShowingEditor(object sender, ShowingEditorEventArgs e)
+ {
+ if (e.Column.Header.Equals("Kategorie"))
+ {
+ var textbausteinVM = (TextModuleVM)e.Row;
+
+ e.Cancel = !CheckEditorRights(textbausteinVM, null);
+ }
+ }
+
+ public static bool CheckEditorRights(TextModuleVM textbausteinVM, object parameter)
+ {
+ if (textbausteinVM != null)
+ {
+ var isOwn = textbausteinVM.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid);
+
+ var hasRight2EditAll = BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleBearbeiten);
+ var hasRight2EditOwn = BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneBearbeiten);
+ var hasRight2Create4All = BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleBearbeiten);
+
+ if (parameter != null && parameter.ToString().Equals("IsOnlyForEmployeeCheckBox"))
+ {
+ return isOwn && hasRight2EditOwn && hasRight2Create4All || hasRight2EditAll;
+ }
+
+ return isOwn && hasRight2EditOwn || hasRight2EditAll;
+ }
+ return false;
+ }
+ }
+
+ public class IsOnlyForEmployeeRightsConverter : IValueConverter
+ {
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ var textbausteinVM = (TextModuleVM)value;
+
+ return TextbausteinView.CheckEditorRights(textbausteinVM, parameter);
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ throw new NotImplementedException();
+ }
+ }
+}
diff --git a/BeWo/View/Master/AdministrationView.xaml.cs b/BeWo/View/Master/AdministrationView.xaml.cs
index 7d3e21b1f..4ac57e370 100644
--- a/BeWo/View/Master/AdministrationView.xaml.cs
+++ b/BeWo/View/Master/AdministrationView.xaml.cs
@@ -411,7 +411,7 @@ namespace BeWo.View.Master
{
if (!_OpenViews.ContainsKey(tabitem_textbausteine) || _SavePerformed)
{
- VMFactory.CreateTextModuleListVMAsync(r => this.Dispatch(() => AddView(tabitem_textbausteine, new TextModuleView(r, true))), true, true);
+ VMFactory.CreateTextModuleListVMAsync(r => this.Dispatch(() => AddView(tabitem_textbausteine, new TextbausteinView(r, true))), true, true);
}
}
diff --git a/BeWo/View/Navigation/CustomerNavigationView.xaml.cs b/BeWo/View/Navigation/CustomerNavigationView.xaml.cs
index 35526603f..1cc3fd253 100644
--- a/BeWo/View/Navigation/CustomerNavigationView.xaml.cs
+++ b/BeWo/View/Navigation/CustomerNavigationView.xaml.cs
@@ -31,8 +31,9 @@ namespace BeWo.View.Navigation
///
public partial class CustomerNavigationView
{
- private readonly CheckBox chkShowOnlyMyCustomers;
- private readonly CheckBox chkShowOnlyTeamCustomers;
+ //private readonly CheckBox chkShowOnlyMyCustomers;
+ //private readonly CheckBox chkShowOnlyTeamCustomers;
+ private readonly ComboBox supportConceptFilterComboBox;
private IEnumerable objectList;
private IEnumerable recentList;
@@ -46,66 +47,146 @@ namespace BeWo.View.Navigation
BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_AllowArchiving);
mainNavigationView.ShowArchivedObjectsVisible = true;
- chkShowOnlyMyCustomers = new CheckBox
- {
- FontSize = 12,
- Margin = new Thickness(10, 0, 0, 0),
- Content = Translator.Translate("Meine Klienten"),
- VerticalAlignment = VerticalAlignment.Center
- };
- chkShowOnlyTeamCustomers = new CheckBox
- {
- FontSize = 12,
- Margin = new Thickness(10, 0, 0, 0),
- Content = Translator.Translate("Klienten meines Teams"),
- VerticalAlignment = VerticalAlignment.Center
- };
- var b = FindResource("MainGroupBoxForegroundBrush") as Brush;
- if (b != null)
+ supportConceptFilterComboBox = new ComboBox();
+ //supportConceptFilterComboBox.HorizontalAlignment = "Left";
+ //supportConceptFilterComboBox.FontFamily = "Microsoft Sans Serif";
+
+ //supportConceptFilterComboBox.Foreground = new SolidColorBrush(Color.FromRgb(210, 210, 210));
+ supportConceptFilterComboBox.FontSize = 12;
+ supportConceptFilterComboBox.Margin = new Thickness(10, 0, 0, 0);
+ supportConceptFilterComboBox.MinWidth = 100;
+ //supportConceptFilterComboBox.DisplayMemberPath = "DisplayName";
+ //supportConceptFilterComboBox.SelectionChanged = "sortCombo_SelectionChanged";
+ supportConceptFilterComboBox.Style = FindResource("SortComboBox") as Style;
+
+
+ if (BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View) ||
+ BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll))
{
- chkShowOnlyMyCustomers.Foreground = b;
- chkShowOnlyTeamCustomers.Foreground = b;
+ supportConceptFilterComboBox.Items.Add(new CustomerFilterItem(CustomerFilterEnum.All));
}
-
- if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View) &&
- !BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll))
+ if (BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_ViewMyTeams))
{
- chkShowOnlyMyCustomers.IsChecked = true;
- chkShowOnlyMyCustomers.IsEnabled = false;
+ supportConceptFilterComboBox.Items.Add(new CustomerFilterItem(CustomerFilterEnum.TeamCustomer));
}
- else
+ supportConceptFilterComboBox.Items.Add(new CustomerFilterItem(CustomerFilterEnum.MyCustomer));
+
+ CustomerFilterItem selectedItem = null;
+
+ switch (BeWoApp.AppSettings.CustomerFilterSupportConcepts)
{
- chkShowOnlyMyCustomers.IsChecked = BeWoApp.AppSettings.ShowOnlyMyClients;
- }
+ case CustomerFilterEnum.All:
+ if (BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View) || BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll))
+ {
+ selectedItem = new CustomerFilterItem(CustomerFilterEnum.All);
+ }
+ break;
+ case CustomerFilterEnum.TeamCustomer:
+ if (BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View) ||
+ BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll) ||
+ BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_ViewMyTeams))
+ {
- if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View) &&
- !BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll))
+ selectedItem = new CustomerFilterItem(CustomerFilterEnum.TeamCustomer);
+ }
+ break;
+ }
+ if (selectedItem == null)
{
- chkShowOnlyTeamCustomers.IsChecked = true;
- chkShowOnlyTeamCustomers.IsEnabled = false;
- }
- else
- {
- chkShowOnlyTeamCustomers.IsChecked = BeWoApp.AppSettings.ShowOnlyTeamClients;
+ selectedItem = new CustomerFilterItem(CustomerFilterEnum.MyCustomer);
}
+ supportConceptFilterComboBox.SelectedItem = selectedItem;
+ supportConceptFilterComboBox.SelectionChanged += SupportConceptFilterComboBoxOnSelectionChanged;
- chkShowOnlyMyCustomers.Click += chkShowOnlyMyCustomers_Click;
- chkShowOnlyTeamCustomers.Click += chkShowOnlyMyCustomers_Click;
+ //chkShowOnlyMyCustomers = new CheckBox
+ // {
+ // FontSize = 12,
+ // Margin = new Thickness(10, 0, 0, 0),
+ // Content = Translator.Translate("Meine Klienten"),
+ // VerticalAlignment = VerticalAlignment.Center
+ // };
+ //chkShowOnlyTeamCustomers = new CheckBox
+ //{
+ // FontSize = 12,
+ // Margin = new Thickness(10, 0, 0, 0),
+ // Content = Translator.Translate("Klienten meines Teams"),
+ // VerticalAlignment = VerticalAlignment.Center
+ //};
- mainNavigationView.AddControlToSortPanel(chkShowOnlyMyCustomers);
- mainNavigationView.AddControlToSortPanel(chkShowOnlyTeamCustomers);
+ //var b = FindResource("MainGroupBoxForegroundBrush") as Brush;
+ //if (b != null)
+ //{
+ // chkShowOnlyMyCustomers.Foreground = b;
+ // chkShowOnlyTeamCustomers.Foreground = b;
+ //}
+ //if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View) &&
+ // !BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll))
+ //{
+ // chkShowOnlyMyCustomers.IsChecked = true;
+ // chkShowOnlyMyCustomers.IsEnabled = false;
+ //}
+ //else
+ //{
+ // chkShowOnlyMyCustomers.IsChecked = BeWoApp.AppSettings.ShowOnlyMyClients;
+ //}
+
+ //if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View) &&
+ // !BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll))
+ //{
+ // chkShowOnlyTeamCustomers.IsChecked = true;
+ // chkShowOnlyTeamCustomers.IsEnabled = false;
+ //}
+ //else
+ //{
+ // chkShowOnlyTeamCustomers.IsChecked = BeWoApp.AppSettings.ShowOnlyTeamClients;
+ //}
+
+ //chkShowOnlyMyCustomers.Click += chkShowOnlyMyCustomers_Click;
+ //chkShowOnlyTeamCustomers.Click += chkShowOnlyMyCustomers_Click;
+
+ //mainNavigationView.AddControlToSortPanel(chkShowOnlyMyCustomers);
+ //mainNavigationView.AddControlToSortPanel(chkShowOnlyTeamCustomers);
+ TextBlock lbl = new TextBlock();
+ lbl.Text = "Filter:";
+ lbl.FontSize = 12;
+ lbl.Margin = new Thickness(8, 2, -3, 0);
+
+ this.mainNavigationView.sortPanel.Children.Insert(3, lbl);
+ this.mainNavigationView.sortPanel.Children.Insert(4, this.supportConceptFilterComboBox);
+
UpdateCustomFilter();
}
+ private void SupportConceptFilterComboBoxOnSelectionChanged(object o, SelectionChangedEventArgs selectionChangedEventArgs)
+ {
+ if (this.supportConceptFilterComboBox.SelectedItem != null)
+ {
+ BeWoApp.AppSettings.CustomerFilterSupportConcepts =
+ ((CustomerFilterItem)this.supportConceptFilterComboBox.SelectedItem).CustomerFilter;
+ }
+ else
+ {
+ BeWoApp.AppSettings.CustomerFilterSupportConcepts = CustomerFilterEnum.MyCustomer;
+ }
+ BeWoApp.SaveAppSettings();
+
+ this.UpdateCustomFilter();
+ }
+
private CustomFilter CreateNewCustomFilter()
{
- var filter = new CustomerNavigationFilter
+ CustomerNavigationFilter filter = new CustomerNavigationFilter();
+ if (this.supportConceptFilterComboBox.SelectedItem != null)
{
- ShowOnlyMyCustomers = chkShowOnlyMyCustomers.IsChecked != null && chkShowOnlyMyCustomers.IsChecked.Value,
- ShowOnlyTeamCustomers = chkShowOnlyTeamCustomers.IsChecked != null && chkShowOnlyTeamCustomers.IsChecked.Value,
- };
+ filter.CustomerFilter =
+ ((CustomerFilterItem)this.supportConceptFilterComboBox.SelectedItem).CustomerFilter;
+ }
+ else
+ {
+ filter.CustomerFilter = CustomerFilterEnum.MyCustomer;
+ }
return filter;
}
@@ -122,10 +203,10 @@ namespace BeWo.View.Navigation
private void chkShowOnlyMyCustomers_Click(object sender, RoutedEventArgs e)
{
- if (chkShowOnlyMyCustomers.IsChecked != null)
- BeWoApp.AppSettings.ShowOnlyMyClients = chkShowOnlyMyCustomers.IsChecked.Value;
- if (chkShowOnlyTeamCustomers.IsChecked != null)
- BeWoApp.AppSettings.ShowOnlyTeamClients = chkShowOnlyTeamCustomers.IsChecked.Value;
+ //if (chkShowOnlyMyCustomers.IsChecked != null)
+ // BeWoApp.AppSettings.ShowOnlyMyClients = chkShowOnlyMyCustomers.IsChecked.Value;
+ //if (chkShowOnlyTeamCustomers.IsChecked != null)
+ // BeWoApp.AppSettings.ShowOnlyTeamClients = chkShowOnlyTeamCustomers.IsChecked.Value;
BeWoApp.SaveAppSettings();
UpdateCustomFilter();
diff --git a/BeWo/View/Navigation/Filter/CustomerFilterEnum.cs b/BeWo/View/Navigation/Filter/CustomerFilterEnum.cs
new file mode 100644
index 000000000..6bf62ba69
--- /dev/null
+++ b/BeWo/View/Navigation/Filter/CustomerFilterEnum.cs
@@ -0,0 +1,58 @@
+using System;
+using BS.Shared.Translation;
+
+namespace BeWo.View.Navigation.Filter
+{
+ public enum CustomerFilterEnum
+ {
+ All,
+ MyCustomer,
+ TeamCustomer
+ }
+
+ public class CustomerFilterItem
+ {
+ public CustomerFilterItem(CustomerFilterEnum e)
+ {
+ CustomerFilter = e;
+ }
+
+ public CustomerFilterEnum CustomerFilter { get; }
+
+ public string CustomerFilterName
+ {
+ get
+ {
+ switch (CustomerFilter)
+ {
+ case CustomerFilterEnum.All:
+ return Translator.Translate("Alle Klienten anzeigen");
+ case CustomerFilterEnum.MyCustomer:
+ return Translator.Translate("Nur meine Klienten anzeigen");
+ case CustomerFilterEnum.TeamCustomer:
+ return Translator.Translate("Nur Klienten meiner Teams anzeigen");
+ default:
+ throw new ArgumentOutOfRangeException();
+ }
+ }
+
+ }
+
+ public override string ToString()
+ {
+ return CustomerFilterName;
+ }
+
+
+ public override bool Equals(object obj)
+ {
+ var item = obj as CustomerFilterItem;
+ return item != null && item.CustomerFilter == CustomerFilter;
+ }
+
+ public override int GetHashCode()
+ {
+ return CustomerFilter.GetHashCode();
+ }
+ }
+}
\ No newline at end of file
diff --git a/BeWo/View/Navigation/Filter/CustomerNavigationFilter.cs b/BeWo/View/Navigation/Filter/CustomerNavigationFilter.cs
index 7852a840d..2693ec7a9 100644
--- a/BeWo/View/Navigation/Filter/CustomerNavigationFilter.cs
+++ b/BeWo/View/Navigation/Filter/CustomerNavigationFilter.cs
@@ -5,39 +5,28 @@ namespace BeWo.View.Navigation.Filter
{
public class CustomerNavigationFilter : CustomFilter
{
- public bool ShowOnlyMyCustomers { get; set; }
- public bool ShowOnlyTeamCustomers { get; set; }
+ public CustomerFilterEnum CustomerFilter { get; set; }
+
public override bool IsValid(IFilterableDC dc)
{
var custDC = dc as CompactCustomerDC;
if (custDC != null)
{
- if (ShowOnlyMyCustomers)
+ if (CustomerFilter == CustomerFilterEnum.MyCustomer)
{
return custDC.IsRelatedToEmployee;
}
- if (ShowOnlyTeamCustomers)
+ if (CustomerFilter == CustomerFilterEnum.TeamCustomer)
{
- bool contains = false;
-
- if (BeWoApp.CompactLoggedOnEmployee.AllTeamMemberOids != null && custDC.RelatedTeamOids != null)
- {
-
- foreach (var teamOid in BeWoApp.CompactLoggedOnEmployee.AllTeamMemberOids)
- {
- if (custDC.RelatedTeamOids.Contains(teamOid))
- {
- contains = true;
- }
- }
- }
- //return custDC.RelatedTeamOids != null && custDC.RelatedTeamOids.Contains(BeWoApp.CompactLoggedOnEmployee.AllTeamMemberOids)
- return contains;
+ return custDC.IsRelatedToTeam;
}
}
+
return true;
}
+
}
-}
\ No newline at end of file
+}
+
diff --git a/BeWo/View/Navigation/Filter/SupportConceptNavigationFilter.cs b/BeWo/View/Navigation/Filter/SupportConceptNavigationFilter.cs
index 5a2d52dbf..ae6427a7d 100644
--- a/BeWo/View/Navigation/Filter/SupportConceptNavigationFilter.cs
+++ b/BeWo/View/Navigation/Filter/SupportConceptNavigationFilter.cs
@@ -1,13 +1,13 @@
-using BS.Shared.DataContracts;
+using BeWo.Core.Config;
+using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
namespace BeWo.View.Navigation.Filter
{
public class SupportConceptNavigationFilter : CustomFilter
{
- public bool ShowOnlyMySupportConcepts { get; set; }
-
- public bool ShowOnlyTeamSupportConcepts { get; set; }
+ public CustomerFilterEnum CustomerFilter { get; set; }
+
public override bool IsValid(IFilterableDC dc)
{
@@ -15,28 +15,14 @@ namespace BeWo.View.Navigation.Filter
if (scDC != null)
{
- if (this.ShowOnlyMySupportConcepts && scDC != null)
+ if (CustomerFilter == CustomerFilterEnum.MyCustomer)
{
- return scDC.IsRelatedToEmployee;
+ return scDC.Customer.IsRelatedToEmployee;
}
- if (this.ShowOnlyTeamSupportConcepts)
+ if (CustomerFilter == CustomerFilterEnum.TeamCustomer)
{
- bool contains = false;
-
- if (BeWoApp.CompactLoggedOnEmployee.AllTeamMemberOids != null && scDC.Customer.RelatedTeamOids != null)
- {
-
- foreach (var teamOid in BeWoApp.CompactLoggedOnEmployee.AllTeamMemberOids)
- {
- if (scDC.Customer.RelatedTeamOids.Contains(teamOid))
- {
- contains = true;
- }
- }
- }
-
- return contains;
+ return scDC.Customer.IsRelatedToTeam;
}
}
diff --git a/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs b/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs
index fa21d7ca9..89c432ade 100644
--- a/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs
+++ b/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using BeWo.Core;
+using BeWo.Core.Config;
using BeWo.ServiceProxy;
using BeWo.View.Detail;
using BeWo.View.Navigation.Filter;
@@ -28,9 +30,11 @@ namespace BeWo.View.Navigation
///
public partial class SupportConceptNavigationView : BeWoView
{
- private readonly CheckBox chkShowOnlyMySCs;
+ //private readonly CheckBox chkShowOnlyMySCs;
- private readonly CheckBox chkShowOnlyTeamSCs;
+ //private readonly CheckBox chkShowOnlyTeamSCs;
+
+ private readonly ComboBox supportConceptFilterComboBox;
private IEnumerable objectList = null;
private IEnumerable recentList = null;
@@ -43,61 +47,139 @@ namespace BeWo.View.Navigation
this.mainNavigationView.ArchiveButtonVisible = BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConceptView_AllowArchiving);
this.mainNavigationView.ShowArchivedObjectsVisible = true;
- this.chkShowOnlyMySCs = new CheckBox();
- this.chkShowOnlyMySCs.FontSize = 12;
- this.chkShowOnlyMySCs.Margin = new Thickness(10, 0, 0, 0);
- this.chkShowOnlyMySCs.Content = Translator.Translate("Meine Hilfepläne");
-
- this.chkShowOnlyTeamSCs = new CheckBox();
- this.chkShowOnlyTeamSCs.FontSize = 12;
- this.chkShowOnlyTeamSCs.Margin = new Thickness(10, 0, 0, 0);
- this.chkShowOnlyTeamSCs.Content = Translator.Translate("Hilfepläne meines Teams");
-
- this.chkShowOnlyMySCs.VerticalAlignment = VerticalAlignment.Center;
- this.chkShowOnlyTeamSCs.VerticalAlignment = VerticalAlignment.Center;
-
- Brush b = this.FindResource("MainGroupBoxForegroundBrush") as Brush;
- if (b != null)
- {
- this.chkShowOnlyMySCs.Foreground = b;
- this.chkShowOnlyTeamSCs.Foreground = b;
- }
-
- if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_ViewAllSupportConcepts) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll) && BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_View MyTeams))
- {
- this.chkShowOnlyMySCs.IsChecked = true;
- this.chkShowOnlyMySCs.IsEnabled = false;
- }
- else
- {
- this.chkShowOnlyTeamSCs.IsChecked = BeWoApp.AppSettings.ShowOnlyTeamSupportConcepts;
- }
-
- if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_ViewAllSupportConcepts) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll))
- {
- this.chkShowOnlyMySCs.IsChecked = true;
- this.chkShowOnlyMySCs.IsEnabled = false;
- }
- else
- {
- this.chkShowOnlyMySCs.IsChecked = BeWoApp.AppSettings.ShowOnlyMySupportConcepts;
- }
-
+ supportConceptFilterComboBox = new ComboBox();
+ supportConceptFilterComboBox.FontSize = 12;
+ supportConceptFilterComboBox.Margin = new Thickness(10, 0, 0, 0);
+ supportConceptFilterComboBox.MinWidth = 100;
+ supportConceptFilterComboBox.Style = FindResource("SortComboBox") as Style;
+ if (BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_ViewAllSupportConcepts) ||
+ BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll))
+ {
+ supportConceptFilterComboBox.Items.Add(new CustomerFilterItem(CustomerFilterEnum.All));
+ }
+ if (BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_ViewMyTeams))
+ {
+ supportConceptFilterComboBox.Items.Add(new CustomerFilterItem(CustomerFilterEnum.TeamCustomer));
+ }
+ supportConceptFilterComboBox.Items.Add(new CustomerFilterItem(CustomerFilterEnum.MyCustomer));
+
+ CustomerFilterItem selectedItem = null;
+
+ switch (BeWoApp.AppSettings.CustomerFilterSupportConcepts)
+ {
+ case CustomerFilterEnum.All:
+ if (BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_ViewAllSupportConcepts) || BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll))
+ {
+ selectedItem = new CustomerFilterItem(CustomerFilterEnum.All);
+ }
+ break;
+ case CustomerFilterEnum.TeamCustomer:
+ if (BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_ViewAllSupportConcepts) ||
+ BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll) ||
+ BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_ViewMyTeams))
+ {
+
+ selectedItem = new CustomerFilterItem(CustomerFilterEnum.TeamCustomer);
+ }
+ break;
+ }
+ if (selectedItem == null)
+ {
+ selectedItem = new CustomerFilterItem(CustomerFilterEnum.MyCustomer);
+ }
+ supportConceptFilterComboBox.SelectedItem = selectedItem;
+ supportConceptFilterComboBox.SelectionChanged += SupportConceptFilterComboBoxOnSelectionChanged;
+
+ //else
+ //{
+ // this.chkShowOnlyTeamSCs.IsChecked = BeWoApp.AppSettings.ShowOnlyTeamSupportConcepts;
+ //}
+
+ //if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_ViewAllSupportConcepts) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_ViewMyTeams))
+ //{
+ // this.chkShowOnlyMySCs.IsChecked = true;
+ // this.chkShowOnlyMySCs.IsEnabled = false;
+ // this.chkShowOnlyTeamSCs.IsChecked = false;
+ // this.chkShowOnlyTeamSCs.IsEnabled = false;
+ //}
+ //else
+ //{
+ // this.chkShowOnlyMySCs.IsChecked = BeWoApp.AppSettings.ShowOnlyMySupportConcepts;
+ //}
+
+
+
+
+ //this.chkShowOnlyMySCs = new CheckBox();
+ //this.chkShowOnlyMySCs.FontSize = 12;
+ //this.chkShowOnlyMySCs.Margin = new Thickness(10, 0, 0, 0);
+ //this.chkShowOnlyMySCs.Content = Translator.Translate("Meine Hilfepläne");
+
+ //this.chkShowOnlyTeamSCs = new CheckBox();
+ //this.chkShowOnlyTeamSCs.FontSize = 12;
+ //this.chkShowOnlyTeamSCs.Margin = new Thickness(10, 0, 0, 0);
+ //this.chkShowOnlyTeamSCs.Content = Translator.Translate("Hilfepläne meines Teams");
+
+ //this.chkShowOnlyMySCs.VerticalAlignment = VerticalAlignment.Center;
+ //this.chkShowOnlyTeamSCs.VerticalAlignment = VerticalAlignment.Center;
+
+ //Brush b = this.FindResource("MainGroupBoxForegroundBrush") as Brush;
+ //if (b != null)
+ //{
+ // this.chkShowOnlyMySCs.Foreground = b;
+ // this.chkShowOnlyTeamSCs.Foreground = b;
+ //}
+
+ //if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_ViewAllSupportConcepts) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll) && BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_ViewMyTeams))
+ //{
+ // this.chkShowOnlyTeamSCs.IsChecked = true;
+ // //this.chkShowOnlyMySCs.IsEnabled = false;
+ //}
+ //else
+ //{
+ // this.chkShowOnlyTeamSCs.IsChecked = BeWoApp.AppSettings.ShowOnlyTeamSupportConcepts;
+ //}
+
+ //if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_ViewAllSupportConcepts) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_ViewMyTeams))
+ //{
+ // this.chkShowOnlyMySCs.IsChecked = true;
+ // this.chkShowOnlyMySCs.IsEnabled = false;
+ // this.chkShowOnlyTeamSCs.IsChecked = false;
+ // this.chkShowOnlyTeamSCs.IsEnabled = false;
+ //}
+ //else
+ //{
+ // this.chkShowOnlyMySCs.IsChecked = BeWoApp.AppSettings.ShowOnlyMySupportConcepts;
+ //}
+
+
+
// if (BeWoApp.LoggedOnUser.Employee.IsTeamLeader)
// {
// chkShowOnlyTeamSCs.Visibility = Visibility.Visible;
// }
// else
// {
- this.chkShowOnlyTeamSCs.Visibility = Visibility.Collapsed;
+ //this.chkShowOnlyTeamSCs.Visibility = Visibility.Collapsed;
// }
- this.chkShowOnlyMySCs.Click += this.chkShowOnlySCs_Click;
- this.chkShowOnlyTeamSCs.Click += this.chkShowOnlySCs_Click;
- this.mainNavigationView.AddControlToSortPanel(this.chkShowOnlyMySCs);
- this.mainNavigationView.AddControlToSortPanel(this.chkShowOnlyTeamSCs);
+ //this.chkShowOnlyMySCs.Click += this.chkShowOnlySCs_Click;
+ //this.chkShowOnlyTeamSCs.Click += this.chkShowOnlySCs_Click;
+ //this.mainNavigationView.AddControlToSortPanel(this.chkShowOnlyMySCs);
+ //this.mainNavigationView.AddControlToSortPanel(this.chkShowOnlyTeamSCs);
+
+ //this.mainNavigationView.AddControlToSortPanel(this.supportConceptFilterComboBox);
+
+
+ TextBlock lbl = new TextBlock();
+ lbl.Text = "Filter:";
+ lbl.FontSize = 12;
+ lbl.Margin = new Thickness(8, 2, -3, 0);
+
+ this.mainNavigationView.sortPanel.Children.Insert(3, lbl);
+ this.mainNavigationView.sortPanel.Children.Insert(4, this.supportConceptFilterComboBox);
this.UpdateCustomFilter();
@@ -107,11 +189,38 @@ namespace BeWo.View.Navigation
}
}
+ private void SupportConceptFilterComboBoxOnSelectionChanged(object o, SelectionChangedEventArgs selectionChangedEventArgs)
+ {
+ //chkShowOnlyTeamSCs.IsChecked = false;
+ //BeWoApp.AppSettings.ShowOnlyMySupportConcepts = this.chkShowOnlyMySCs.IsChecked.Value;
+ if (this.supportConceptFilterComboBox.SelectedItem != null)
+ {
+ BeWoApp.AppSettings.CustomerFilterSupportConcepts =
+ ((CustomerFilterItem) this.supportConceptFilterComboBox.SelectedItem).CustomerFilter;
+ }
+ else
+ {
+ BeWoApp.AppSettings.CustomerFilterSupportConcepts = CustomerFilterEnum.MyCustomer;
+ }
+ BeWoApp.SaveAppSettings();
+
+ this.UpdateCustomFilter();
+ }
+
private CustomFilter CreateNewCustomFilter()
{
SupportConceptNavigationFilter filter = new SupportConceptNavigationFilter();
- filter.ShowOnlyMySupportConcepts = this.chkShowOnlyMySCs.IsChecked.Value;
- filter.ShowOnlyTeamSupportConcepts = this.chkShowOnlyTeamSCs.IsChecked.Value;
+ if (this.supportConceptFilterComboBox.SelectedItem != null)
+ {
+ filter.CustomerFilter =
+ ((CustomerFilterItem) this.supportConceptFilterComboBox.SelectedItem).CustomerFilter;
+ }
+ else
+ {
+ filter.CustomerFilter = CustomerFilterEnum.MyCustomer;
+ }
+ //filter.ShowOnlyMySupportConcepts = this.chkShowOnlyMySCs.IsChecked.Value;
+ //filter.ShowOnlyTeamSupportConcepts = this.chkShowOnlyTeamSCs.IsChecked.Value;
return filter;
}
@@ -124,17 +233,6 @@ namespace BeWo.View.Navigation
{
this.mainNavigationView.CustomFilter = this.CreateNewCustomFilter();
}
-
- private void chkShowOnlySCs_Click(object sender, RoutedEventArgs e)
- {
- // chkShowOnlyTeamSCs.IsChecked = false;
- BeWoApp.AppSettings.ShowOnlyMySupportConcepts = this.chkShowOnlyMySCs.IsChecked.Value;
- BeWoApp.AppSettings.ShowOnlyTeamSupportConcepts = this.chkShowOnlyTeamSCs.IsChecked.Value;
- BeWoApp.SaveAppSettings();
-
- this.UpdateCustomFilter();
- }
-
private bool mainNavigationView_ArchiveObject(IFilterableDC obj)
diff --git a/BeWo/View/Search/SupportConceptSearchView.cs b/BeWo/View/Search/SupportConceptSearchView.cs
index 56b1dfa62..e517f2f41 100644
--- a/BeWo/View/Search/SupportConceptSearchView.cs
+++ b/BeWo/View/Search/SupportConceptSearchView.cs
@@ -6,6 +6,7 @@ using System.Windows.Controls;
using System.Windows.Media;
using BeWo.Core.Service;
using BeWo.MultiLanguage;
+using BeWo.View.Navigation.Filter;
using BS.Shared;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Translation;
@@ -19,7 +20,7 @@ namespace BeWo.View.Search
private CheckBox mChkBoxShowExpiredSupportConcepts;
- private CheckBox mChkBoxShowOnlyMyClients;
+ private ComboBox supportConceptFilterComboBox;
private List mHiddenSupportConcepts;
@@ -85,23 +86,73 @@ namespace BeWo.View.Search
protected void CreateFilterPanel()
{
- if (BeWoApp.LoggedOnUser != null && mChkBoxShowOnlyMyClients == null)
+ if (BeWoApp.LoggedOnUser != null && supportConceptFilterComboBox == null)
{
mIgnoreFilterChange = true;
var sp = new StackPanel {Margin = new Thickness(3, 3, 3, 3), Orientation = Orientation.Horizontal};
- mChkBoxShowOnlyMyClients = new CheckBox {Content = "Nur eigene Klienten anzeigen"};
- mChkBoxShowOnlyMyClients.Checked += FilterCheckBoxChanged;
- mChkBoxShowOnlyMyClients.Unchecked += FilterCheckBoxChanged;
- mChkBoxShowOnlyMyClients.FontSize = 12;
- mChkBoxShowOnlyMyClients.VerticalAlignment = VerticalAlignment.Center;
+ //mChkBoxShowOnlyMyClients = new CheckBox {Content = "Nur eigene Klienten anzeigen"};
+ //mChkBoxShowOnlyMyClients.Checked += FilterCheckBoxChanged;
+ //mChkBoxShowOnlyMyClients.Unchecked += FilterCheckBoxChanged;
+ //mChkBoxShowOnlyMyClients.FontSize = 12;
+ //mChkBoxShowOnlyMyClients.VerticalAlignment = VerticalAlignment.Center;
var b = FindResource("MainGroupBoxForegroundBrush") as Brush;
- if (b != null)
- {
- mChkBoxShowOnlyMyClients.Foreground = b;
- }
+ //if (b != null)
+ //{
+ // mChkBoxShowOnlyMyClients.Foreground = b;
+ //}
+
+ //sp.Children.Add(mChkBoxShowOnlyMyClients);
+ supportConceptFilterComboBox = new ComboBox();
+ supportConceptFilterComboBox.FontSize = 12;
+ supportConceptFilterComboBox.Margin = new Thickness(10, 0, 0, 0);
+ supportConceptFilterComboBox.MinWidth = 100;
+ supportConceptFilterComboBox.Style = FindResource("SortComboBox") as Style;
+
+
+ if (BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_ViewAllSupportConcepts) ||
+ BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll))
+ {
+ supportConceptFilterComboBox.Items.Add(new CustomerFilterItem(CustomerFilterEnum.All));
+ }
+ if (BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_ViewMyTeams))
+ {
+ supportConceptFilterComboBox.Items.Add(new CustomerFilterItem(CustomerFilterEnum.TeamCustomer));
+ }
+ supportConceptFilterComboBox.Items.Add(new CustomerFilterItem(CustomerFilterEnum.MyCustomer));
+
+ CustomerFilterItem selectedItem = null;
+ switch (BeWoApp.AppSettings.CustomerFilterSupportConcepts)
+ {
+ case CustomerFilterEnum.All:
+ if (BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_ViewAllSupportConcepts) || BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll))
+ {
+ selectedItem = new CustomerFilterItem(CustomerFilterEnum.All);
+ }
+ break;
+ case CustomerFilterEnum.TeamCustomer:
+ if (BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_ViewAllSupportConcepts) ||
+ BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll) ||
+ BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_ViewMyTeams))
+ {
+
+ selectedItem = new CustomerFilterItem(CustomerFilterEnum.TeamCustomer);
+ }
+ break;
+ }
+ if (selectedItem == null)
+ {
+ selectedItem = new CustomerFilterItem(CustomerFilterEnum.MyCustomer);
+ }
+ supportConceptFilterComboBox.SelectedItem = selectedItem;
+ supportConceptFilterComboBox.SelectionChanged += SupportConceptFilterComboBoxOnSelectionChanged;
+
+ sp.Children.Add(supportConceptFilterComboBox);
+
+
+
+
- sp.Children.Add(mChkBoxShowOnlyMyClients);
mChkBoxShowExpiredSupportConcepts = new CheckBox {Content = Translator.Translate("Abgelaufene Hilfepläne anzeigen"), Margin = new Thickness(5, 0, 0, 0)};
mChkBoxShowExpiredSupportConcepts.Checked += FilterCheckBoxChanged;
@@ -114,15 +165,15 @@ namespace BeWo.View.Search
mChkBoxShowExpiredSupportConcepts.Foreground = b;
}
- if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll))
- {
- mChkBoxShowOnlyMyClients.IsChecked = true;
- mChkBoxShowOnlyMyClients.IsEnabled = false;
- }
- else
- {
- mChkBoxShowOnlyMyClients.IsChecked = !BeWoApp.AppSettings.ShowAllClients;
- }
+ //if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll))
+ //{
+ // mChkBoxShowOnlyMyClients.IsChecked = true;
+ // mChkBoxShowOnlyMyClients.IsEnabled = false;
+ //}
+ //else
+ //{
+ // mChkBoxShowOnlyMyClients.IsChecked = !BeWoApp.AppSettings.ShowAllClients;
+ //}
mChkBoxShowExpiredSupportConcepts.IsChecked = BeWoApp.AppSettings.ShowExpiredSupportConcepts;
@@ -173,9 +224,20 @@ namespace BeWo.View.Search
}
}
- if (show && mChkBoxShowOnlyMyClients.IsChecked.Value)
+ if (show && this.supportConceptFilterComboBox.SelectedItem != null)
{
- show = scDC.IsRelatedToEmployee;
+ var item = ((CustomerFilterItem) this.supportConceptFilterComboBox.SelectedItem).CustomerFilter;
+
+ switch (item)
+ {
+ case CustomerFilterEnum.MyCustomer:
+ show = scDC.IsRelatedToEmployee;
+ break;
+ case CustomerFilterEnum.TeamCustomer:
+ show = scDC.Customer.IsRelatedToTeam;
+ break;
+ }
+
}
}
@@ -194,11 +256,29 @@ namespace BeWo.View.Search
return show;
}
+ private void SupportConceptFilterComboBoxOnSelectionChanged(object o, SelectionChangedEventArgs selectionChangedEventArgs)
+ {
+ FilterChanged();
+ }
+
private void FilterCheckBoxChanged(object sender, RoutedEventArgs e)
+ {
+ FilterChanged();
+ }
+
+ private void FilterChanged()
{
if (!mIgnoreFilterChange)
{
- BeWoApp.AppSettings.ShowAllClients = !mChkBoxShowOnlyMyClients.IsChecked.Value;
+ if (this.supportConceptFilterComboBox.SelectedItem != null)
+ {
+ BeWoApp.AppSettings.CustomerFilterSupportConcepts =
+ ((CustomerFilterItem)this.supportConceptFilterComboBox.SelectedItem).CustomerFilter;
+ }
+ else
+ {
+ BeWoApp.AppSettings.CustomerFilterSupportConcepts = CustomerFilterEnum.MyCustomer;
+ }
BeWoApp.AppSettings.ShowExpiredSupportConcepts = mChkBoxShowExpiredSupportConcepts.IsChecked.Value;
BeWoApp.SaveAppSettings();
UpdateFilteredList();
diff --git a/BeWo/View/Search/TextModuleSearchView.cs b/BeWo/View/Search/TextModuleSearchView.cs
index 1a3aac911..180a2827e 100644
--- a/BeWo/View/Search/TextModuleSearchView.cs
+++ b/BeWo/View/Search/TextModuleSearchView.cs
@@ -25,7 +25,7 @@ namespace BeWo.View.Search
ServiceFacade.DoOperationsServiceAsync(s => s.GetTextModulesByServiceCategory(ServiceCategoryOid), r =>
{
- r = r.OrderBy(tb => tb.ServiceCategory != null).ThenBy(tb => tb.Position).ThenBy(tb => tb.Name).ToList();
+ r = r.OrderBy(tb => tb.Position).ThenBy(tb => tb.Name).ToList();
this.Dispatch(() => UpdateObjectList(r));
});
}
diff --git a/BeWo/ViewModel/AccountingTransactionVM.cs b/BeWo/ViewModel/AccountingTransactionVM.cs
index 1c1e4e75b..985ed852a 100644
--- a/BeWo/ViewModel/AccountingTransactionVM.cs
+++ b/BeWo/ViewModel/AccountingTransactionVM.cs
@@ -137,6 +137,18 @@ namespace BeWo.ViewModel
}
}
+ public String CostBearerName
+ {
+ get
+ {
+ if (CostBearer != null)
+ {
+ return CostBearer.Name;
+ }
+ return null;
+ }
+ }
+
public CompactOrganisationDC CostBearer
{
get
diff --git a/BeWo/ViewModel/UserGroupVM.cs b/BeWo/ViewModel/UserGroupVM.cs
index 073f1ef38..934ffcddf 100644
--- a/BeWo/ViewModel/UserGroupVM.cs
+++ b/BeWo/ViewModel/UserGroupVM.cs
@@ -122,7 +122,8 @@ namespace BeWo.ViewModel
private static bool IsResourceRight(UserRightType userRightType)
{
- if (userRightType == UserRightType.ResourceBookingView_AllowEditResourcesFromOtherEmployees
+ if (userRightType == UserRightType.
+ ResourceBookingView_AllowEditResourcesFromOtherEmployees
|| userRightType == UserRightType.ResourceBookingView_Create
|| userRightType == UserRightType.ResourceBookingView_View
|| userRightType == UserRightType.ResourceBookingView_Delete
diff --git a/Data/Access/SearchDAO.cs b/Data/Access/SearchDAO.cs
index caf8e8765..5190d6f64 100644
--- a/Data/Access/SearchDAO.cs
+++ b/Data/Access/SearchDAO.cs
@@ -295,7 +295,7 @@ namespace BeWo.Data.Access
.Add(Restrictions.Eq(ServiceRecord.PropertyName_EmployeeOid, pEmployeeOid))
.Add(Restrictions.IsNull(ServiceRecord.PropertyName_CostBearer2SupportConceptOid));
- var max = ende.AddDays(1);
+ var max = ende.Date.AddDays(1);
c.Add(Restrictions.Ge(ServiceRecord.PropertyName_Start, start.Date))
.Add(Restrictions.Lt(ServiceRecord.PropertyName_End, max.Date));
@@ -1449,7 +1449,7 @@ namespace BeWo.Data.Access
return c.List();
}
- public IEnumerable GetActiveTextbausteineByServiceCategory(long pServiceCategoryOid)
+ public IEnumerable GetActiveTextModuleByServiceCategory(long pServiceCategoryOid)
{
var c = CreateCriteriaIsActive();
@@ -1458,7 +1458,16 @@ namespace BeWo.Data.Access
return c.List();
}
- public IEnumerable GetAllActiveAppointmentsForEmployeeInInterval2(DateTime start, DateTime end, List pEmployeeOids)
+ public IEnumerable GetActiveTextbausteineByServiceCategory(long pServiceCategoryOid)
+ {
+ var c = CreateCriteriaIsActive();
+
+ c.Add(Restrictions.Or(Restrictions.Eq(Textbaustein.PropertyName_ServiceCategory + ".Oid", pServiceCategoryOid), Restrictions.IsNull(Textbaustein.PropertyName_ServiceCategory)));
+
+ return c.List();
+ }
+
+ public IEnumerable GetAllActiveAppointmentsForEmployeeInInterval2(DateTime start, DateTime end, List pEmployeeOids)
{
var detachedCriteria = DetachedCriteria.For()
.Add(Restrictions.And(Restrictions.In(Employee2SchedulerAppointment.PropertyName_Employee + ".Oid", pEmployeeOids),
diff --git a/Data/Data.csproj b/Data/Data.csproj
index 032deca3d..75209f879 100644
--- a/Data/Data.csproj
+++ b/Data/Data.csproj
@@ -170,6 +170,7 @@
+
@@ -570,6 +571,9 @@
+
+ Designer
+
Designer
diff --git a/Data/Entities/Textbaustein.cs b/Data/Entities/Textbaustein.cs
new file mode 100644
index 000000000..ffd010ed5
--- /dev/null
+++ b/Data/Entities/Textbaustein.cs
@@ -0,0 +1,113 @@
+using BS.Shared;
+
+namespace BeWo.Data.Entities
+{
+ public class Textbaustein : BeWoEntityBase
+ {
+ public static string PropertyName_Text = "Text";
+ public static string PropertyName_Position = "Position";
+ public static string PropertyName_ServiceCategory = "ServiceCategory";
+ public static string PropertyName_Name = "Name";
+ public static string PropertyName_Employee = "Employee";
+ public static string PropertyName_IsOnlyForEmployee = "IsOnlyForEmployee";
+
+ private string _Text;
+ private string _Name;
+ private int _Position;
+ private ServiceCategory _ServiceCategory;
+ private Employee _Employee;
+ private bool _IsOnlyForEmployee;
+
+ public Textbaustein()
+ {
+ _Tid = TableID.Textbaustein;
+ }
+
+ public virtual ServiceCategory ServiceCategory
+ {
+ get { return _ServiceCategory; }
+
+ set
+ {
+ if (AreDifferent(_ServiceCategory, value))
+ {
+ _ServiceCategory = value;
+ }
+ }
+ }
+
+ public virtual Employee Employee
+ {
+ get { return _Employee; }
+
+ set
+ {
+ if (AreDifferent(_Employee, value))
+ {
+ _Employee = value;
+ }
+ }
+ }
+
+ public virtual bool IsOnlyForEmployee
+ {
+ get { return _IsOnlyForEmployee; }
+
+ set
+ {
+ if (AreDifferent(_IsOnlyForEmployee, value))
+ {
+ _IsOnlyForEmployee = value;
+ }
+ }
+ }
+
+ public virtual string Text
+ {
+ get
+ {
+ return _Text;
+ }
+
+ set
+ {
+ if (AreDifferent(_Text, value))
+ {
+ _Text = value;
+ }
+ }
+ }
+
+ public virtual string Name
+ {
+ get
+ {
+ return _Name;
+ }
+
+ set
+ {
+ if (AreDifferent(_Name, value))
+ {
+ _Name = value;
+ }
+ }
+ }
+
+ public virtual int Position
+ {
+ get
+ {
+ return _Position;
+ }
+
+ set
+ {
+ if (AreDifferent(_Position, value))
+ {
+ _Position = value;
+ }
+ }
+ }
+ }
+}
diff --git a/Data/Mappings/Textbaustein.hbm.xml b/Data/Mappings/Textbaustein.hbm.xml
new file mode 100644
index 000000000..eba320ff2
--- /dev/null
+++ b/Data/Mappings/Textbaustein.hbm.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Report/ReportObjects/AuslastungBerechnung.cs b/Report/ReportObjects/AuslastungBerechnung.cs
index e480d014a..cb508c336 100644
--- a/Report/ReportObjects/AuslastungBerechnung.cs
+++ b/Report/ReportObjects/AuslastungBerechnung.cs
@@ -117,6 +117,7 @@ namespace BeWo.Report.ReportObjects
}
+
public virtual void CreateEmployeeDetails(MitarbeiterauslastungRO ro)
{
foreach (var empDetail in ro.EmployeeDetailList)
@@ -394,6 +395,10 @@ namespace BeWo.Report.ReportObjects
}
else
{
+ if (customer.Oid.Value == 277)
+ {
+ int test = 0;
+ }
key = String.Format("c{0}_{1}", customer.Oid.Value, scap.Oid.Value);
}
if (betreuungDict.ContainsKey(key))
@@ -470,7 +475,7 @@ namespace BeWo.Report.ReportObjects
}
else
{
- scDc.ApprovedHoursPerWeek = anteil.AnteilAnBetreuung / 60;
+ scDc.ApprovedHoursPerWeek = (anteil.AnteilAnBetreuung / 60) * (scDc.ApprovedHoursPerWeek / scDc.ApprovedHoursPerWeekWithRateFactor);
scDc.ApprovedHoursPerWeekWithRateFactor = anteil.AnteilAnBetreuung / 60;
}
}
@@ -789,8 +794,8 @@ namespace BeWo.Report.ReportObjects
var minutes = GetBillableDurationInMinutes(sr);
if (sr.ServiceDescription != null &&
- sr.ServiceDescription.ServiceCategory != null &&
- sr.ServiceDescription.ServiceCategory.IsBillable)
+ sr.ServiceDescription.ServiceCategory != null &&
+ sr.ServiceDescription.ServiceCategory.IsBillable)
scDC.DirectIst += minutes;
else
scDC.MittelbarIst += minutes;
diff --git a/ReportImp/AdikKleve/AdikKleve.csproj b/ReportImp/AdikKleve/AdikKleve.csproj
index b46259a27..28fa2d6db 100644
--- a/ReportImp/AdikKleve/AdikKleve.csproj
+++ b/ReportImp/AdikKleve/AdikKleve.csproj
@@ -63,6 +63,7 @@
+
Component
diff --git a/ReportImp/AdikKleve/Calculations/GroupDurationCalculator.cs b/ReportImp/AdikKleve/Calculations/GroupDurationCalculator.cs
new file mode 100644
index 000000000..c498b920b
--- /dev/null
+++ b/ReportImp/AdikKleve/Calculations/GroupDurationCalculator.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Service.Plugins;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+
+namespace AdikKleve.Calculations
+{
+ public class DieDueneGroupDurationCalculator : GroupDurationCalculator
+ {
+
+ public override GroupDurationDC CalculateGroupDuration(int personCount, int employeeCount, decimal totalDuration)
+ {
+ return new GroupDurationDC()
+ {
+ SingleDuration = ((totalDuration*employeeCount)/personCount),
+ TotalDuration = totalDuration
+ };
+ }
+ }
+}
diff --git a/ReportImp/AdikKleve/Validation/ServiceRecordValidator.cs b/ReportImp/AdikKleve/Validation/ServiceRecordValidator.cs
index 2edadd3ba..685bc4c8e 100644
--- a/ReportImp/AdikKleve/Validation/ServiceRecordValidator.cs
+++ b/ReportImp/AdikKleve/Validation/ServiceRecordValidator.cs
@@ -39,7 +39,11 @@ namespace AdikKleve.Validation
{
empRecords = empRecords.Where(r => r.ServiceDescription.ServiceCategory.Name != "Arbeitszeit").ToList();
}
- try
+ if (newServiceRecord.GroupOid.HasValue)
+ {
+ empRecords = empRecords.Where(r => !r.GroupOid.HasValue || r.GroupOid != newServiceRecord.GroupOid).ToList();
+ }
+ try
{
ServiceRecord overlappingRecord =
empRecords.FirstOrDefault(
diff --git a/ReportImp/ApiBerlin/Translation/TranslationDictionary.cs b/ReportImp/ApiBerlin/Translation/TranslationDictionary.cs
index 314da5c49..ba4029b34 100644
--- a/ReportImp/ApiBerlin/Translation/TranslationDictionary.cs
+++ b/ReportImp/ApiBerlin/Translation/TranslationDictionary.cs
@@ -30,7 +30,7 @@ namespace ApiBerlin.Translation
AddOrReplaceTranslation(dict, "Kostenträger", "Kostenübernahme");
AddOrReplaceTranslation(dict, "Klienten", "KlientInnen");
- AddOrReplaceTranslation(dict, "Mitarbeiter", "MitarbeiterIn");
+ AddOrReplaceTranslation(dict, "Mitarbeiter", "MA");
AddOrReplaceTranslation(dict, "MitarbeiterSingular", "MitarbeiterIn");
AddOrReplaceTranslation(dict, "MitarbeiterPlural", "MitarbeiterInnen");
diff --git a/ReportImp/SHGSchwerte/Properties/licenses.licx b/ReportImp/SHGSchwerte/Properties/licenses.licx
index e69de29bb..c7fd819d5 100644
--- a/ReportImp/SHGSchwerte/Properties/licenses.licx
+++ b/ReportImp/SHGSchwerte/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/SHGSchwerte/SettlementReport.cs b/ReportImp/SHGSchwerte/SettlementReport.cs
index 3b2c42324..dd386803d 100644
--- a/ReportImp/SHGSchwerte/SettlementReport.cs
+++ b/ReportImp/SHGSchwerte/SettlementReport.cs
@@ -30,20 +30,18 @@ namespace BeWo.SHGSchwerte
pRO.SenderContactPersonMail = pRO.SenderContactPersonMail.Replace("E-Mail:", "").Trim();
}
- ErstelleRechnungspositionen(pRO);
-
-
-
-
ortDatum.Text = string.Format("Schwerte, {0}", DateTime.Now.ToShortDateString());
xrCheckBox2.Checked = true;
+ DateTime? terminationDate = null;
+
if (pRO.CostBearer2SupportConceptOid > 0)
{
var c2s = DAOFactory.GenericDAO.LoadByID(pRO.CostBearer2SupportConceptOid);
if (c2s.SupportConcept.Customer.TerminationDate.HasValue)
{
+ terminationDate = c2s.SupportConcept.Customer.TerminationDate;
xrCheckBox1.Text = String.Format(" Die Betreuung wurde am {0:dd.MM.yyyy} beendet.",
c2s.SupportConcept.Customer.TerminationDate);
xrCheckBox2.Checked = false;
@@ -51,13 +49,28 @@ namespace BeWo.SHGSchwerte
}
}
+
+
+ ErstelleRechnungspositionen(pRO, terminationDate);
+
+
+
+
+
bindingSource1.DataSource = pRO;
}
- private void ErstelleRechnungspositionen(SettlementRO pRO)
+ private void ErstelleRechnungspositionen(SettlementRO pRO, DateTime? terminationDate)
{
if (pRO.InvoiceItems != null && pRO.InvoiceItems.Count > 0)
{
+ if (terminationDate.HasValue)
+ {
+ if (terminationDate < pRO.InvoiceItems[pRO.InvoiceItems.Count - 1].ItemPeriodEnd)
+ {
+ pRO.InvoiceItems[pRO.InvoiceItems.Count - 1].ItemPeriodEnd = terminationDate;
+ }
+ }
if (pRO.InvoiceItems.Count == 3)
{
SetzeRechnungsTexte(pRO.InvoiceItems[0], cellStart1, cellEnd1, cellHourlyRate1, cellFLS1);
@@ -76,7 +89,7 @@ namespace BeWo.SHGSchwerte
}
else
{
- ErstelleStandardRechnungspositionen(pRO);
+ ErstelleStandardRechnungspositionen(pRO, terminationDate);
}
}
@@ -88,8 +101,11 @@ namespace BeWo.SHGSchwerte
cellFLS.Text = String.Format("{0:0.00}", ii.UnitCount);
}
- private void ErstelleStandardRechnungspositionen(SettlementRO pRO)
+ private void ErstelleStandardRechnungspositionen(SettlementRO pRO, DateTime? terminationDate)
{
+
+ pRO.AccountingEndDateString = CorrectPossibleTerminationEndDate(pRO.AccountingEndDateString, terminationDate);
+
if (pRO.DifferentHourlyRateCount == 3)
{
//Erbrachte Leistungen (FLS) - bis [HourlyRateOldEndDateString] à [HourlyRateOldString] €
@@ -111,7 +127,7 @@ namespace BeWo.SHGSchwerte
pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld);
pRO.Betrag2 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAlt * (decimal)pRO.RateFactor * pRO.HourlyRateOld);
-
+
pRO.Abrechnungstext3 = String.Format("{0} bis {1}",
pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString);
@@ -181,5 +197,23 @@ namespace BeWo.SHGSchwerte
pRO.Betrag3 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAktuell * (decimal)pRO.RateFactor * pRO.HourlyRateNew);
}
}
+
+ private string CorrectPossibleTerminationEndDate(string dateString, DateTime? terminationDate)
+ {
+ if (terminationDate.HasValue)
+ {
+ DateTime dt = DateTime.MinValue;
+ if (DateTime.TryParse(dateString, out dt))
+ {
+ if (terminationDate < dt)
+ {
+ return String.Format("{0:dd.MM.yyyy}", terminationDate);
+ }
+ }
+
+ }
+
+ return dateString;
+ }
}
}
diff --git a/ReportImp/SeWo/Mitarbeiterstundenkonto.designer.cs b/ReportImp/SeWo/Mitarbeiterstundenkonto.designer.cs
index 59650551e..3ffe734b0 100644
--- a/ReportImp/SeWo/Mitarbeiterstundenkonto.designer.cs
+++ b/ReportImp/SeWo/Mitarbeiterstundenkonto.designer.cs
@@ -77,6 +77,7 @@ namespace BeWo.SeWo
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
@@ -89,7 +90,6 @@ namespace BeWo.SeWo
this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -367,21 +367,24 @@ namespace BeWo.SeWo
//
// xrTableCell13
//
+ this.xrTableCell13.Multiline = true;
this.xrTableCell13.Name = "xrTableCell13";
- this.xrTableCell13.Text = "Überstd. neu";
+ this.xrTableCell13.Text = "Plus/Minus\r\nneu";
this.xrTableCell13.Weight = 0.063119928687401447D;
//
// xrTableCell14
//
+ this.xrTableCell14.Multiline = true;
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.StylePriority.UseBackColor = false;
- this.xrTableCell14.Text = "Überstd. Vormonat";
+ this.xrTableCell14.Text = "Plus/Minus\r\nVormonat";
this.xrTableCell14.Weight = 0.063119928275170531D;
//
// xrTableCell15
//
+ this.xrTableCell15.Multiline = true;
this.xrTableCell15.Name = "xrTableCell15";
- this.xrTableCell15.Text = "Überstd. Gesamt";
+ this.xrTableCell15.Text = "Stunden\r\nGesamt";
this.xrTableCell15.Weight = 0.0631199213956443D;
//
// GroupFooter1
@@ -510,6 +513,10 @@ namespace BeWo.SeWo
this.xrTableCell51.Name = "xrTableCell51";
this.xrTableCell51.Weight = 0.063119927862939573D;
//
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
+ //
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -564,7 +571,7 @@ namespace BeWo.SeWo
this.Title.BackColor = System.Drawing.Color.White;
this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.Title.BorderWidth = 1;
+ this.Title.BorderWidth = 1F;
this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
this.Title.ForeColor = System.Drawing.Color.Black;
this.Title.Name = "Title";
@@ -574,7 +581,7 @@ namespace BeWo.SeWo
this.FieldCaption.BackColor = System.Drawing.Color.White;
this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.FieldCaption.BorderWidth = 1;
+ this.FieldCaption.BorderWidth = 1F;
this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
this.FieldCaption.ForeColor = System.Drawing.Color.Black;
this.FieldCaption.Name = "FieldCaption";
@@ -584,7 +591,7 @@ namespace BeWo.SeWo
this.PageInfo.BackColor = System.Drawing.Color.White;
this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.PageInfo.BorderWidth = 1;
+ this.PageInfo.BorderWidth = 1F;
this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
this.PageInfo.ForeColor = System.Drawing.Color.Black;
this.PageInfo.Name = "PageInfo";
@@ -594,7 +601,7 @@ namespace BeWo.SeWo
this.DataField.BackColor = System.Drawing.Color.White;
this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.DataField.BorderWidth = 1;
+ this.DataField.BorderWidth = 1F;
this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
this.DataField.Name = "DataField";
@@ -616,10 +623,6 @@ namespace BeWo.SeWo
this.bottomMarginBand1.HeightF = 30F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
- //
// Mitarbeiterstundenkonto
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -642,7 +645,7 @@ namespace BeWo.SeWo
this.FieldCaption,
this.PageInfo,
this.DataField});
- this.Version = "13.1";
+ this.Version = "13.2";
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
diff --git a/ReportImp/VivaAVidaReports/FLSGroupReport.Designer.cs b/ReportImp/VivaAVidaReports/FLSGroupReport.Designer.cs
new file mode 100644
index 000000000..34db1439f
--- /dev/null
+++ b/ReportImp/VivaAVidaReports/FLSGroupReport.Designer.cs
@@ -0,0 +1,702 @@
+using BeWo.Report.ReportObjects;
+namespace BeWo.VivaAVidaReports
+{
+ partial class FLSAuswertung
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+ this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+ this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+ this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
+ this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+ this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
+ this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
+ this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand();
+ this.Detail3 = new DevExpress.XtraReports.UI.DetailBand();
+ this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+ this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+ this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+ this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
+ this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
+ this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
+ this.fieldGroupFLS = new DevExpress.XtraReports.UI.CalculatedField();
+ this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+ this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+ //
+ // Detail
+ //
+ this.Detail.HeightF = 0F;
+ this.Detail.Name = "Detail";
+ this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+ this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
+ // xrTableCell1
+ //
+ this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.Name", "{0:dd/MM/yyyy}")});
+ this.xrTableCell1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
+ this.xrTableCell1.Name = "xrTableCell1";
+ this.xrTableCell1.StylePriority.UseBorderColor = false;
+ this.xrTableCell1.StylePriority.UseBorders = false;
+ this.xrTableCell1.StylePriority.UseFont = false;
+ this.xrTableCell1.Text = "xrTableCell1";
+ this.xrTableCell1.Weight = 6.9183673469387754D;
+ //
+ // xrTableRow1
+ //
+ this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell1});
+ this.xrTableRow1.Name = "xrTableRow1";
+ this.xrTableRow1.Weight = 1D;
+ //
+ // xrTable1
+ //
+ this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 33F);
+ this.xrTable1.Name = "xrTable1";
+ this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow1});
+ this.xrTable1.SizeF = new System.Drawing.SizeF(1017F, 25F);
+ this.xrTable1.StylePriority.UseBorders = false;
+ this.xrTable1.StylePriority.UsePadding = false;
+ //
+ // Detail1
+ //
+ this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel13,
+ this.xrLabel12,
+ this.xrLabel11,
+ this.xrLabel10,
+ this.xrTable1});
+ this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.Detail1.HeightF = 92F;
+ this.Detail1.Name = "Detail1";
+ this.Detail1.StylePriority.UseFont = false;
+ //
+ // xrLabel13
+ //
+ this.xrLabel13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.TotalFLM", "{0:0.##}")});
+ this.xrLabel13.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(110.0001F, 57.99999F);
+ this.xrLabel13.Name = "xrLabel13";
+ this.xrLabel13.SizeF = new System.Drawing.SizeF(77.08332F, 25F);
+ this.xrLabel13.StylePriority.UseFont = false;
+ this.xrLabel13.StylePriority.UsePadding = false;
+ this.xrLabel13.StylePriority.UseTextAlignment = false;
+ this.xrLabel13.Text = "xrLabel13";
+ this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // xrLabel12
+ //
+ this.xrLabel12.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 58F);
+ this.xrLabel12.Name = "xrLabel12";
+ this.xrLabel12.SizeF = new System.Drawing.SizeF(110F, 25F);
+ this.xrLabel12.StylePriority.UseFont = false;
+ this.xrLabel12.StylePriority.UsePadding = false;
+ this.xrLabel12.Text = "Minuten gesamt:";
+ //
+ // xrLabel11
+ //
+ this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.fieldGroupFLS", "{0:0.00} FLS")});
+ this.xrLabel11.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(265F, 57.99999F);
+ this.xrLabel11.Name = "xrLabel11";
+ this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel11.SizeF = new System.Drawing.SizeF(232.1667F, 25F);
+ this.xrLabel11.StylePriority.UseFont = false;
+ this.xrLabel11.Text = "xrLabel11";
+ //
+ // xrLabel10
+ //
+ this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(187.0834F, 57.99999F);
+ this.xrLabel10.Name = "xrLabel10";
+ this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel10.SizeF = new System.Drawing.SizeF(70F, 25F);
+ this.xrLabel10.StylePriority.UseFont = false;
+ this.xrLabel10.StylePriority.UseTextAlignment = false;
+ this.xrLabel10.Text = "entspricht";
+ this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // DetailReport
+ //
+ this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail1,
+ this.DetailReport1});
+ this.DetailReport.DataMember = "FLSReportGroups";
+ this.DetailReport.DataSource = this.bindingSource1;
+ this.DetailReport.Level = 0;
+ this.DetailReport.Name = "DetailReport";
+ //
+ // DetailReport1
+ //
+ this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail2,
+ this.DetailReport2,
+ this.GroupFooter1});
+ this.DetailReport1.DataMember = "FLSReportGroups.FLSReportDetails";
+ this.DetailReport1.DataSource = this.bindingSource1;
+ this.DetailReport1.Level = 0;
+ this.DetailReport1.Name = "DetailReport1";
+ //
+ // Detail2
+ //
+ this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel8,
+ this.xrLabel9,
+ this.xrLabel6,
+ this.xrLabel7,
+ this.xrTable3});
+ this.Detail2.HeightF = 77F;
+ this.Detail2.KeepTogether = true;
+ this.Detail2.KeepTogetherWithDetailReports = true;
+ this.Detail2.Name = "Detail2";
+ //
+ // xrLabel8
+ //
+ this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.FLSReportDetails.fieldFLS", "{0:0.00} FLS")});
+ this.xrLabel8.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(265F, 50F);
+ this.xrLabel8.Name = "xrLabel8";
+ this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel8.SizeF = new System.Drawing.SizeF(203F, 25F);
+ this.xrLabel8.StylePriority.UseFont = false;
+ this.xrLabel8.Text = "xrLabel8";
+ //
+ // xrLabel9
+ //
+ this.xrLabel9.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(187.0834F, 50F);
+ this.xrLabel9.Name = "xrLabel9";
+ this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel9.SizeF = new System.Drawing.SizeF(69.99997F, 25F);
+ this.xrLabel9.StylePriority.UseFont = false;
+ this.xrLabel9.StylePriority.UseTextAlignment = false;
+ this.xrLabel9.Text = "entspricht";
+ this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // xrLabel6
+ //
+ this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.FLSReportDetails.TotalFLM", "{0:0.##}")});
+ this.xrLabel6.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(110.0001F, 50F);
+ this.xrLabel6.Name = "xrLabel6";
+ this.xrLabel6.SizeF = new System.Drawing.SizeF(73.99989F, 25F);
+ this.xrLabel6.StylePriority.UseFont = false;
+ this.xrLabel6.StylePriority.UsePadding = false;
+ this.xrLabel6.StylePriority.UseTextAlignment = false;
+ this.xrLabel6.Text = "xrLabel6";
+ this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // xrLabel7
+ //
+ this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50F);
+ this.xrLabel7.Name = "xrLabel7";
+ this.xrLabel7.SizeF = new System.Drawing.SizeF(110F, 25F);
+ this.xrLabel7.StylePriority.UseFont = false;
+ this.xrLabel7.StylePriority.UsePadding = false;
+ this.xrLabel7.Text = "Minuten gesamt:";
+ //
+ // xrTable3
+ //
+ this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
+ this.xrTable3.Name = "xrTable3";
+ this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow3});
+ this.xrTable3.SizeF = new System.Drawing.SizeF(1017F, 25F);
+ this.xrTable3.StylePriority.UseBorders = false;
+ this.xrTable3.StylePriority.UsePadding = false;
+ //
+ // xrTableRow3
+ //
+ this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell2});
+ this.xrTableRow3.Name = "xrTableRow3";
+ this.xrTableRow3.Weight = 1D;
+ //
+ // xrTableCell2
+ //
+ this.xrTableCell2.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.FLSReportDetails.Name", "{0:dd/MM/yyyy}")});
+ this.xrTableCell2.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold);
+ this.xrTableCell2.Name = "xrTableCell2";
+ this.xrTableCell2.StylePriority.UseBorders = false;
+ this.xrTableCell2.StylePriority.UseFont = false;
+ this.xrTableCell2.Text = "xrTableCell2";
+ this.xrTableCell2.Weight = 6.9183673469387754D;
+ //
+ // DetailReport2
+ //
+ this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail3,
+ this.GroupHeader1});
+ this.DetailReport2.DataMember = "FLSReportGroups.FLSReportDetails.ServiceRecords";
+ this.DetailReport2.DataSource = this.bindingSource1;
+ this.DetailReport2.Level = 0;
+ this.DetailReport2.Name = "DetailReport2";
+ //
+ // Detail3
+ //
+ this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable4});
+ this.Detail3.HeightF = 25F;
+ this.Detail3.Name = "Detail3";
+ //
+ // xrTable4
+ //
+ this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTable4.Name = "xrTable4";
+ this.xrTable4.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+ this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow4});
+ this.xrTable4.SizeF = new System.Drawing.SizeF(1017F, 25F);
+ this.xrTable4.StylePriority.UseBorders = false;
+ this.xrTable4.StylePriority.UsePadding = false;
+ //
+ // xrTableRow4
+ //
+ this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell3,
+ this.xrTableCell4,
+ this.xrTableCell9,
+ this.xrTableCell10});
+ this.xrTableRow4.Name = "xrTableRow4";
+ this.xrTableRow4.Weight = 1D;
+ //
+ // xrTableCell3
+ //
+ this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.FLSReportDetails.ServiceRecords.Start", "{0:dd/MM/yyyy}")});
+ this.xrTableCell3.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell3.Name = "xrTableCell3";
+ this.xrTableCell3.StylePriority.UseFont = false;
+ this.xrTableCell3.Text = "xrTableCell3";
+ this.xrTableCell3.Weight = 0.68027210884353728D;
+ //
+ // xrTableCell4
+ //
+ this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.FLSReportDetails.ServiceRecords.TimeRange")});
+ this.xrTableCell4.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell4.Name = "xrTableCell4";
+ this.xrTableCell4.StylePriority.UseFont = false;
+ this.xrTableCell4.Text = "xrTableCell4";
+ this.xrTableCell4.Weight = 0.68027210884353717D;
+ //
+ // xrTableCell9
+ //
+ this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.FLSReportDetails.ServiceRecords.RoundedDuration", "{0:0.##}")});
+ this.xrTableCell9.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell9.Name = "xrTableCell9";
+ this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
+ this.xrTableCell9.StylePriority.UseFont = false;
+ this.xrTableCell9.StylePriority.UsePadding = false;
+ this.xrTableCell9.StylePriority.UseTextAlignment = false;
+ this.xrTableCell9.Text = "xrTableCell9";
+ this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrTableCell9.Weight = 0.54761904761904756D;
+ //
+ // xrTableCell10
+ //
+ this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.FLSReportDetails.ServiceRecords.Notice")});
+ this.xrTableCell10.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell10.Multiline = true;
+ this.xrTableCell10.Name = "xrTableCell10";
+ this.xrTableCell10.StylePriority.UseFont = false;
+ this.xrTableCell10.Text = "xrTableCell10";
+ this.xrTableCell10.Weight = 5.0102040816326534D;
+ //
+ // GroupHeader1
+ //
+ this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable2});
+ this.GroupHeader1.HeightF = 25F;
+ this.GroupHeader1.Name = "GroupHeader1";
+ this.GroupHeader1.RepeatEveryPage = true;
+ //
+ // xrTable2
+ //
+ this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTable2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTable2.Name = "xrTable2";
+ this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+ this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow2});
+ this.xrTable2.SizeF = new System.Drawing.SizeF(1017F, 25F);
+ this.xrTable2.StylePriority.UseBorders = false;
+ this.xrTable2.StylePriority.UseFont = false;
+ this.xrTable2.StylePriority.UsePadding = false;
+ //
+ // xrTableRow2
+ //
+ this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell5,
+ this.xrTableCell6,
+ this.xrTableCell7,
+ this.xrTableCell8});
+ this.xrTableRow2.Name = "xrTableRow2";
+ this.xrTableRow2.Weight = 1D;
+ //
+ // xrTableCell5
+ //
+ this.xrTableCell5.Name = "xrTableCell5";
+ this.xrTableCell5.Text = "Datum";
+ this.xrTableCell5.Weight = 0.68027210884353728D;
+ //
+ // xrTableCell6
+ //
+ this.xrTableCell6.Name = "xrTableCell6";
+ this.xrTableCell6.Text = "Uhrzeit";
+ this.xrTableCell6.Weight = 0.68027210884353717D;
+ //
+ // xrTableCell7
+ //
+ this.xrTableCell7.Name = "xrTableCell7";
+ this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
+ this.xrTableCell7.StylePriority.UsePadding = false;
+ this.xrTableCell7.StylePriority.UseTextAlignment = false;
+ this.xrTableCell7.Text = "Minuten";
+ this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrTableCell7.Weight = 0.54761904761904756D;
+ //
+ // xrTableCell8
+ //
+ this.xrTableCell8.Name = "xrTableCell8";
+ this.xrTableCell8.Text = "Dokumentation";
+ this.xrTableCell8.Weight = 5.0102040816326534D;
+ //
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FLSReportRO);
+ //
+ // GroupFooter1
+ //
+ this.GroupFooter1.HeightF = 0F;
+ this.GroupFooter1.Name = "GroupFooter1";
+ this.GroupFooter1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand;
+ //
+ // ReportHeader
+ //
+ this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel5,
+ this.xrLabel4,
+ this.xrLabel3,
+ this.xrLabel2,
+ this.xrLabel1});
+ this.ReportHeader.HeightF = 50F;
+ this.ReportHeader.Name = "ReportHeader";
+ //
+ // xrLabel5
+ //
+ this.xrLabel5.Font = new System.Drawing.Font("Arial", 12F);
+ this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(184F, 25F);
+ this.xrLabel5.Name = "xrLabel5";
+ this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel5.SizeF = new System.Drawing.SizeF(17F, 25F);
+ this.xrLabel5.StylePriority.UseFont = false;
+ this.xrLabel5.StylePriority.UseTextAlignment = false;
+ this.xrLabel5.Text = "-";
+ this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+ //
+ // xrLabel4
+ //
+ this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportEndDate", "{0:dd/MM/yyyy}")});
+ this.xrLabel4.Font = new System.Drawing.Font("Arial", 12F);
+ this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(201F, 25F);
+ this.xrLabel4.Name = "xrLabel4";
+ this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel4.SizeF = new System.Drawing.SizeF(100F, 25F);
+ this.xrLabel4.StylePriority.UseFont = false;
+ this.xrLabel4.Text = "xrLabel4";
+ //
+ // xrLabel3
+ //
+ this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "{0:dd/MM/yyyy}")});
+ this.xrLabel3.Font = new System.Drawing.Font("Arial", 12F);
+ this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(92F, 25F);
+ this.xrLabel3.Name = "xrLabel3";
+ this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel3.SizeF = new System.Drawing.SizeF(92F, 25F);
+ this.xrLabel3.StylePriority.UseFont = false;
+ this.xrLabel3.StylePriority.UseTextAlignment = false;
+ this.xrLabel3.Text = "xrLabel3";
+ this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // xrLabel2
+ //
+ this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F);
+ this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
+ this.xrLabel2.Name = "xrLabel2";
+ this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel2.SizeF = new System.Drawing.SizeF(83F, 25F);
+ this.xrLabel2.StylePriority.UseFont = false;
+ this.xrLabel2.Text = "Zeitraum:";
+ //
+ // xrLabel1
+ //
+ this.xrLabel1.Font = new System.Drawing.Font("Arial", 14F);
+ this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrLabel1.Multiline = true;
+ this.xrLabel1.Name = "xrLabel1";
+ this.xrLabel1.SizeF = new System.Drawing.SizeF(1007F, 25F);
+ this.xrLabel1.StyleName = "Title";
+ this.xrLabel1.StylePriority.UseFont = false;
+ this.xrLabel1.Text = "Auswertung über geleistete Fachleistungsstunden";
+ //
+ // pageFooterBand1
+ //
+ this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrPageInfo2});
+ this.pageFooterBand1.HeightF = 48F;
+ this.pageFooterBand1.Name = "pageFooterBand1";
+ //
+ // xrPageInfo2
+ //
+ this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
+ this.xrPageInfo2.Format = "Seite {0} von {1}";
+ this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(517F, 25F);
+ this.xrPageInfo2.Name = "xrPageInfo2";
+ this.xrPageInfo2.SizeF = new System.Drawing.SizeF(497F, 23F);
+ this.xrPageInfo2.StyleName = "PageInfo";
+ this.xrPageInfo2.StylePriority.UseFont = false;
+ this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // Title
+ //
+ this.Title.BackColor = System.Drawing.Color.White;
+ this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.Title.BorderWidth = 1F;
+ this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
+ this.Title.ForeColor = System.Drawing.Color.Black;
+ this.Title.Name = "Title";
+ //
+ // FieldCaption
+ //
+ this.FieldCaption.BackColor = System.Drawing.Color.White;
+ this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.FieldCaption.BorderWidth = 1F;
+ this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
+ this.FieldCaption.ForeColor = System.Drawing.Color.Black;
+ this.FieldCaption.Name = "FieldCaption";
+ //
+ // PageInfo
+ //
+ this.PageInfo.BackColor = System.Drawing.Color.White;
+ this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.PageInfo.BorderWidth = 1F;
+ this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.PageInfo.ForeColor = System.Drawing.Color.Black;
+ this.PageInfo.Name = "PageInfo";
+ //
+ // DataField
+ //
+ this.DataField.BackColor = System.Drawing.Color.White;
+ this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.DataField.BorderWidth = 1F;
+ this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
+ this.DataField.Name = "DataField";
+ //
+ // fieldFLS
+ //
+ this.fieldFLS.DataMember = "FLSReportGroups.FLSReportDetails";
+ this.fieldFLS.Expression = "[TotalFLM] / 60\r\n";
+ this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+ this.fieldFLS.Name = "fieldFLS";
+ //
+ // fieldGroupFLS
+ //
+ this.fieldGroupFLS.DataMember = "FLSReportGroups";
+ this.fieldGroupFLS.Expression = "[TotalFLM]/60";
+ this.fieldGroupFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+ this.fieldGroupFLS.Name = "fieldGroupFLS";
+ //
+ // topMarginBand1
+ //
+ this.topMarginBand1.HeightF = 50F;
+ this.topMarginBand1.Name = "topMarginBand1";
+ //
+ // bottomMarginBand1
+ //
+ this.bottomMarginBand1.HeightF = 50F;
+ this.bottomMarginBand1.Name = "bottomMarginBand1";
+ //
+ // FLSAuswertung
+ //
+ this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail,
+ this.DetailReport,
+ this.ReportHeader,
+ this.pageFooterBand1,
+ this.topMarginBand1,
+ this.bottomMarginBand1});
+ this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
+ this.fieldFLS,
+ this.fieldGroupFLS});
+ this.DataSource = this.bindingSource1;
+ this.Landscape = true;
+ this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 50);
+ this.PageHeight = 827;
+ this.PageWidth = 1169;
+ this.PaperKind = System.Drawing.Printing.PaperKind.A4;
+ this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
+ this.Title,
+ this.FieldCaption,
+ this.PageInfo,
+ this.DataField});
+ this.Version = "13.2";
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraReports.UI.DetailBand Detail;
+ private System.Windows.Forms.BindingSource bindingSource1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+ private DevExpress.XtraReports.UI.XRTable xrTable1;
+ private DevExpress.XtraReports.UI.DetailBand Detail1;
+ private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+ private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+ private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1;
+ private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
+ private DevExpress.XtraReports.UI.XRControlStyle Title;
+ private DevExpress.XtraReports.UI.XRControlStyle FieldCaption;
+ private DevExpress.XtraReports.UI.XRControlStyle PageInfo;
+ private DevExpress.XtraReports.UI.XRControlStyle DataField;
+ private DevExpress.XtraReports.UI.XRTable xrTable2;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+ private DevExpress.XtraReports.UI.DetailReportBand DetailReport1;
+ private DevExpress.XtraReports.UI.DetailBand Detail2;
+ private DevExpress.XtraReports.UI.XRTable xrTable3;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+ private DevExpress.XtraReports.UI.DetailReportBand DetailReport2;
+ private DevExpress.XtraReports.UI.DetailBand Detail3;
+ private DevExpress.XtraReports.UI.XRTable xrTable4;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
+ private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel5;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel4;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel3;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel13;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel12;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel11;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel10;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel8;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel9;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel6;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel7;
+ private DevExpress.XtraReports.UI.CalculatedField fieldFLS;
+ private DevExpress.XtraReports.UI.CalculatedField fieldGroupFLS;
+ private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+ private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+ private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+ }
+}
diff --git a/ReportImp/VivaAVidaReports/FLSGroupReport.cs b/ReportImp/VivaAVidaReports/FLSGroupReport.cs
new file mode 100644
index 000000000..34f8d35cd
--- /dev/null
+++ b/ReportImp/VivaAVidaReports/FLSGroupReport.cs
@@ -0,0 +1,41 @@
+using System;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Report.ReportObjects;
+using BeWo.Report;
+
+using DevExpress.XtraReports.UI;
+using BS.Shared.Core;
+namespace BeWo.VivaAVidaReports
+{
+ [IDSpecificClass(Identifier = "FLSAuswertung")]
+ public partial class FLSAuswertung : XtraReport, IBeWoReport
+ {
+ public FLSAuswertung()
+ {
+ InitializeComponent();
+ }
+
+ public void SetReportDataSource(FLSReportRO pRO)
+ {
+ //foreach (var group in pRO.FLSReportGroups)
+ //{
+ // foreach (var detail in group.FLSReportDetails)
+ // {
+ // foreach (var sr in detail.ServiceRecords)
+ // {
+ // if (!sr.DistanceInMeter.HasValue && sr.ServiceRecordOid.HasValue)
+ // {
+ // var srBO = DAOFactory.GenericDAO.LoadByID(sr.ServiceRecordOid.Value);
+ // sr.DistanceInMeter = srBO.DistanceInMeter;
+ // }
+ // }
+ // }
+
+ //}
+
+ this.bindingSource1.DataSource = pRO;
+ }
+
+ }
+}
diff --git a/ReportImp/VivaAVidaReports/FLSGroupReport.resx b/ReportImp/VivaAVidaReports/FLSGroupReport.resx
new file mode 100644
index 000000000..d25f3eba2
--- /dev/null
+++ b/ReportImp/VivaAVidaReports/FLSGroupReport.resx
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 17, 17
+
+
\ No newline at end of file
diff --git a/ReportImp/VivaAVidaReports/FLSListReport.Designer.cs b/ReportImp/VivaAVidaReports/FLSListReport.Designer.cs
new file mode 100644
index 000000000..42d91c3d5
--- /dev/null
+++ b/ReportImp/VivaAVidaReports/FLSListReport.Designer.cs
@@ -0,0 +1,594 @@
+using BeWo.Report.ReportObjects;
+namespace BeWo.VivaAVidaReports
+{
+ partial class Leistungsdokumentation
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+ this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+ this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+ this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+ this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+ this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
+ this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
+ this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+ this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+ this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+ this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
+ this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
+ this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
+ this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+ this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+ //
+ // Detail
+ //
+ this.Detail.HeightF = 0F;
+ this.Detail.Name = "Detail";
+ this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+ this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
+ // xrTableCell1
+ //
+ this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.Name")});
+ this.xrTableCell1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
+ this.xrTableCell1.Name = "xrTableCell1";
+ this.xrTableCell1.StylePriority.UseBorderColor = false;
+ this.xrTableCell1.StylePriority.UseBorders = false;
+ this.xrTableCell1.StylePriority.UseFont = false;
+ this.xrTableCell1.Text = "xrTableCell1";
+ this.xrTableCell1.Weight = 6.9183673469387754D;
+ //
+ // xrTableRow1
+ //
+ this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell1});
+ this.xrTableRow1.Name = "xrTableRow1";
+ this.xrTableRow1.Weight = 1D;
+ //
+ // xrTable1
+ //
+ this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
+ this.xrTable1.Name = "xrTable1";
+ this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow1});
+ this.xrTable1.SizeF = new System.Drawing.SizeF(1017F, 25F);
+ this.xrTable1.StylePriority.UseBorders = false;
+ this.xrTable1.StylePriority.UsePadding = false;
+ //
+ // Detail1
+ //
+ this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel9,
+ this.xrLabel8,
+ this.xrLabel7,
+ this.xrLabel6,
+ this.xrTable1});
+ this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.Detail1.HeightF = 83F;
+ this.Detail1.Name = "Detail1";
+ this.Detail1.StylePriority.UseFont = false;
+ //
+ // xrLabel9
+ //
+ this.xrLabel9.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(174.5833F, 50F);
+ this.xrLabel9.Name = "xrLabel9";
+ this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel9.SizeF = new System.Drawing.SizeF(70F, 25F);
+ this.xrLabel9.StylePriority.UseFont = false;
+ this.xrLabel9.StylePriority.UseTextAlignment = false;
+ this.xrLabel9.Text = "entspricht";
+ this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // xrLabel8
+ //
+ this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.fieldFLS", "{0:0.00} FLS")});
+ this.xrLabel8.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(244.5834F, 50F);
+ this.xrLabel8.Name = "xrLabel8";
+ this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel8.SizeF = new System.Drawing.SizeF(235.4167F, 25F);
+ this.xrLabel8.StylePriority.UseFont = false;
+ this.xrLabel8.Text = "xrLabel8";
+ //
+ // xrLabel7
+ //
+ this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50F);
+ this.xrLabel7.Name = "xrLabel7";
+ this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel7.SizeF = new System.Drawing.SizeF(110F, 25F);
+ this.xrLabel7.StylePriority.UseFont = false;
+ this.xrLabel7.Text = "Minuten gesamt:";
+ //
+ // xrLabel6
+ //
+ this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.TotalFLM", "{0:0.##}")});
+ this.xrLabel6.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(110F, 50F);
+ this.xrLabel6.Name = "xrLabel6";
+ this.xrLabel6.SizeF = new System.Drawing.SizeF(64.58335F, 25F);
+ this.xrLabel6.StylePriority.UseFont = false;
+ this.xrLabel6.StylePriority.UsePadding = false;
+ this.xrLabel6.StylePriority.UseTextAlignment = false;
+ this.xrLabel6.Text = "xrLabel6";
+ this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // DetailReport
+ //
+ this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail1,
+ this.DetailReport1});
+ this.DetailReport.DataMember = "FLSReportGroups";
+ this.DetailReport.DataSource = this.bindingSource1;
+ this.DetailReport.Level = 0;
+ this.DetailReport.Name = "DetailReport";
+ //
+ // DetailReport1
+ //
+ this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail2,
+ this.GroupHeader2,
+ this.GroupFooter1});
+ this.DetailReport1.DataMember = "FLSReportGroups.ServiceRecords";
+ this.DetailReport1.DataSource = this.bindingSource1;
+ this.DetailReport1.Level = 0;
+ this.DetailReport1.Name = "DetailReport1";
+ //
+ // Detail2
+ //
+ this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable4});
+ this.Detail2.HeightF = 25F;
+ this.Detail2.Name = "Detail2";
+ //
+ // xrTable4
+ //
+ this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTable4.Name = "xrTable4";
+ this.xrTable4.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+ this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow4});
+ this.xrTable4.SizeF = new System.Drawing.SizeF(1018F, 25F);
+ this.xrTable4.StylePriority.UseBorders = false;
+ this.xrTable4.StylePriority.UsePadding = false;
+ //
+ // xrTableRow4
+ //
+ this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell3,
+ this.xrTableCell4,
+ this.xrTableCell9,
+ this.xrTableCell11,
+ this.xrTableCell10});
+ this.xrTableRow4.Name = "xrTableRow4";
+ this.xrTableRow4.Weight = 1D;
+ //
+ // xrTableCell3
+ //
+ this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.ServiceRecords.Start", "{0:dd/MM/yyyy}")});
+ this.xrTableCell3.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell3.Name = "xrTableCell3";
+ this.xrTableCell3.StylePriority.UseFont = false;
+ this.xrTableCell3.Text = "xrTableCell3";
+ this.xrTableCell3.Weight = 0.68027210884353728D;
+ //
+ // xrTableCell4
+ //
+ this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.ServiceRecords.TimeRange")});
+ this.xrTableCell4.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell4.Name = "xrTableCell4";
+ this.xrTableCell4.StylePriority.UseFont = false;
+ this.xrTableCell4.Text = "xrTableCell4";
+ this.xrTableCell4.Weight = 0.68027210884353717D;
+ //
+ // xrTableCell9
+ //
+ this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.ServiceRecords.RoundedDuration", "{0:0.##}")});
+ this.xrTableCell9.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell9.Name = "xrTableCell9";
+ this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
+ this.xrTableCell9.StylePriority.UseFont = false;
+ this.xrTableCell9.StylePriority.UsePadding = false;
+ this.xrTableCell9.StylePriority.UseTextAlignment = false;
+ this.xrTableCell9.Text = "xrTableCell9";
+ this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrTableCell9.Weight = 0.54421768707483D;
+ //
+ // xrTableCell11
+ //
+ this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.ServiceRecords.GroupName")});
+ this.xrTableCell11.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell11.Name = "xrTableCell11";
+ this.xrTableCell11.StylePriority.UseFont = false;
+ this.xrTableCell11.Text = "xrTableCell11";
+ this.xrTableCell11.Weight = 1.360544217687075D;
+ //
+ // xrTableCell10
+ //
+ this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.ServiceRecords.Notice")});
+ this.xrTableCell10.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell10.Multiline = true;
+ this.xrTableCell10.Name = "xrTableCell10";
+ this.xrTableCell10.StylePriority.UseFont = false;
+ this.xrTableCell10.Text = "xrTableCell10";
+ this.xrTableCell10.Weight = 3.6598639455782309D;
+ //
+ // GroupHeader2
+ //
+ this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable2});
+ this.GroupHeader2.HeightF = 25F;
+ this.GroupHeader2.Name = "GroupHeader2";
+ this.GroupHeader2.RepeatEveryPage = true;
+ //
+ // xrTable2
+ //
+ this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTable2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTable2.Name = "xrTable2";
+ this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+ this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow2});
+ this.xrTable2.SizeF = new System.Drawing.SizeF(1018F, 25F);
+ this.xrTable2.StylePriority.UseBorders = false;
+ this.xrTable2.StylePriority.UseFont = false;
+ this.xrTable2.StylePriority.UsePadding = false;
+ //
+ // xrTableRow2
+ //
+ this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell5,
+ this.xrTableCell6,
+ this.xrTableCell7,
+ this.xrTableCell2,
+ this.xrTableCell8});
+ this.xrTableRow2.Name = "xrTableRow2";
+ this.xrTableRow2.Weight = 1D;
+ //
+ // xrTableCell5
+ //
+ this.xrTableCell5.Name = "xrTableCell5";
+ this.xrTableCell5.Text = "Datum";
+ this.xrTableCell5.Weight = 0.68027210884353728D;
+ //
+ // xrTableCell6
+ //
+ this.xrTableCell6.Name = "xrTableCell6";
+ this.xrTableCell6.Text = "Uhrzeit";
+ this.xrTableCell6.Weight = 0.68027210884353717D;
+ //
+ // xrTableCell7
+ //
+ this.xrTableCell7.Name = "xrTableCell7";
+ this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
+ this.xrTableCell7.StylePriority.UsePadding = false;
+ this.xrTableCell7.StylePriority.UseTextAlignment = false;
+ this.xrTableCell7.Text = "Minuten";
+ this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrTableCell7.Weight = 0.54421768707483D;
+ //
+ // xrTableCell2
+ //
+ this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "GroupTypeHeader")});
+ this.xrTableCell2.Name = "xrTableCell2";
+ this.xrTableCell2.Text = "xrTableCell2";
+ this.xrTableCell2.Weight = 1.360544217687075D;
+ //
+ // xrTableCell8
+ //
+ this.xrTableCell8.Name = "xrTableCell8";
+ this.xrTableCell8.Text = "Dokumentation";
+ this.xrTableCell8.Weight = 3.6598639455782314D;
+ //
+ // GroupFooter1
+ //
+ this.GroupFooter1.HeightF = 0F;
+ this.GroupFooter1.Name = "GroupFooter1";
+ this.GroupFooter1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand;
+ //
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FLSReportRO);
+ //
+ // ReportHeader
+ //
+ this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel5,
+ this.xrLabel4,
+ this.xrLabel3,
+ this.xrLabel2,
+ this.xrLabel1});
+ this.ReportHeader.HeightF = 50F;
+ this.ReportHeader.Name = "ReportHeader";
+ //
+ // xrLabel5
+ //
+ this.xrLabel5.Font = new System.Drawing.Font("Arial", 12F);
+ this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(175F, 25F);
+ this.xrLabel5.Name = "xrLabel5";
+ this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel5.SizeF = new System.Drawing.SizeF(17F, 25F);
+ this.xrLabel5.StylePriority.UseFont = false;
+ this.xrLabel5.StylePriority.UseTextAlignment = false;
+ this.xrLabel5.Text = "-";
+ this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+ //
+ // xrLabel4
+ //
+ this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportEndDate", "{0:dd/MM/yyyy}")});
+ this.xrLabel4.Font = new System.Drawing.Font("Arial", 12F);
+ this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(192.0001F, 25F);
+ this.xrLabel4.Name = "xrLabel4";
+ this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel4.SizeF = new System.Drawing.SizeF(288F, 25F);
+ this.xrLabel4.StylePriority.UseFont = false;
+ this.xrLabel4.Text = "xrLabel4";
+ //
+ // xrLabel3
+ //
+ this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "{0:dd/MM/yyyy}")});
+ this.xrLabel3.Font = new System.Drawing.Font("Arial", 12F);
+ this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(83F, 25F);
+ this.xrLabel3.Name = "xrLabel3";
+ this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel3.SizeF = new System.Drawing.SizeF(92F, 25F);
+ this.xrLabel3.StylePriority.UseFont = false;
+ this.xrLabel3.StylePriority.UseTextAlignment = false;
+ this.xrLabel3.Text = "xrLabel3";
+ this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // xrLabel2
+ //
+ this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F);
+ this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
+ this.xrLabel2.Name = "xrLabel2";
+ this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel2.SizeF = new System.Drawing.SizeF(83F, 25F);
+ this.xrLabel2.StylePriority.UseFont = false;
+ this.xrLabel2.Text = "Zeitraum:";
+ //
+ // xrLabel1
+ //
+ this.xrLabel1.Font = new System.Drawing.Font("Arial", 14F);
+ this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrLabel1.Multiline = true;
+ this.xrLabel1.Name = "xrLabel1";
+ this.xrLabel1.SizeF = new System.Drawing.SizeF(1017F, 25F);
+ this.xrLabel1.StyleName = "Title";
+ this.xrLabel1.StylePriority.UseFont = false;
+ this.xrLabel1.Text = "Auswertung über geleistete Fachleistungsstunden";
+ //
+ // pageFooterBand1
+ //
+ this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrPageInfo2});
+ this.pageFooterBand1.HeightF = 48F;
+ this.pageFooterBand1.Name = "pageFooterBand1";
+ //
+ // xrPageInfo2
+ //
+ this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
+ this.xrPageInfo2.Format = "Seite {0} von {1}";
+ this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(480.0001F, 25F);
+ this.xrPageInfo2.Name = "xrPageInfo2";
+ this.xrPageInfo2.SizeF = new System.Drawing.SizeF(536.9999F, 23F);
+ this.xrPageInfo2.StyleName = "PageInfo";
+ this.xrPageInfo2.StylePriority.UseFont = false;
+ this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // Title
+ //
+ this.Title.BackColor = System.Drawing.Color.White;
+ this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.Title.BorderWidth = 1F;
+ this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
+ this.Title.ForeColor = System.Drawing.Color.Black;
+ this.Title.Name = "Title";
+ //
+ // FieldCaption
+ //
+ this.FieldCaption.BackColor = System.Drawing.Color.White;
+ this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.FieldCaption.BorderWidth = 1F;
+ this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
+ this.FieldCaption.ForeColor = System.Drawing.Color.Black;
+ this.FieldCaption.Name = "FieldCaption";
+ //
+ // PageInfo
+ //
+ this.PageInfo.BackColor = System.Drawing.Color.White;
+ this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.PageInfo.BorderWidth = 1F;
+ this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.PageInfo.ForeColor = System.Drawing.Color.Black;
+ this.PageInfo.Name = "PageInfo";
+ //
+ // DataField
+ //
+ this.DataField.BackColor = System.Drawing.Color.White;
+ this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.DataField.BorderWidth = 1F;
+ this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
+ this.DataField.Name = "DataField";
+ //
+ // fieldFLS
+ //
+ this.fieldFLS.DataMember = "FLSReportGroups";
+ this.fieldFLS.Expression = "[TotalFLM] / 60";
+ this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+ this.fieldFLS.Name = "fieldFLS";
+ //
+ // topMarginBand1
+ //
+ this.topMarginBand1.HeightF = 50F;
+ this.topMarginBand1.Name = "topMarginBand1";
+ //
+ // bottomMarginBand1
+ //
+ this.bottomMarginBand1.HeightF = 50F;
+ this.bottomMarginBand1.Name = "bottomMarginBand1";
+ //
+ // Leistungsdokumentation
+ //
+ this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail,
+ this.DetailReport,
+ this.ReportHeader,
+ this.pageFooterBand1,
+ this.topMarginBand1,
+ this.bottomMarginBand1});
+ this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
+ this.fieldFLS});
+ this.DataSource = this.bindingSource1;
+ this.Landscape = true;
+ this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 50);
+ this.PageHeight = 827;
+ this.PageWidth = 1169;
+ this.PaperKind = System.Drawing.Printing.PaperKind.A4;
+ this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
+ this.Title,
+ this.FieldCaption,
+ this.PageInfo,
+ this.DataField});
+ this.Version = "13.2";
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraReports.UI.DetailBand Detail;
+ private System.Windows.Forms.BindingSource bindingSource1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+ private DevExpress.XtraReports.UI.XRTable xrTable1;
+ private DevExpress.XtraReports.UI.DetailBand Detail1;
+ private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+ private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+ private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1;
+ private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
+ private DevExpress.XtraReports.UI.XRControlStyle Title;
+ private DevExpress.XtraReports.UI.XRControlStyle FieldCaption;
+ private DevExpress.XtraReports.UI.XRControlStyle PageInfo;
+ private DevExpress.XtraReports.UI.XRControlStyle DataField;
+ private DevExpress.XtraReports.UI.XRTable xrTable2;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+ private DevExpress.XtraReports.UI.DetailReportBand DetailReport1;
+ private DevExpress.XtraReports.UI.DetailBand Detail2;
+ private DevExpress.XtraReports.UI.XRTable xrTable4;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel5;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel4;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel3;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+ private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel7;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel6;
+ private DevExpress.XtraReports.UI.CalculatedField fieldFLS;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel8;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel9;
+ private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+ private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+ private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+ }
+}
diff --git a/ReportImp/VivaAVidaReports/FLSListReport.cs b/ReportImp/VivaAVidaReports/FLSListReport.cs
new file mode 100644
index 000000000..c1dbde5b1
--- /dev/null
+++ b/ReportImp/VivaAVidaReports/FLSListReport.cs
@@ -0,0 +1,33 @@
+using System;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Report.ReportObjects;
+using BeWo.Report;
+
+namespace BeWo.VivaAVidaReports
+{
+ public partial class Leistungsdokumentation : DevExpress.XtraReports.UI.XtraReport, IBeWoReport
+ {
+ public Leistungsdokumentation()
+ {
+ InitializeComponent();
+ }
+
+ public void SetReportDataSource(FLSReportRO pRO)
+ {
+ //foreach (var group in pRO.FLSReportGroups)
+ //{
+ // foreach (var sr in group.ServiceRecords)
+ // {
+ // if (!sr.DistanceInMeter.HasValue && sr.ServiceRecordOid.HasValue)
+ // {
+ // var srBO = DAOFactory.GenericDAO.LoadByID(sr.ServiceRecordOid.Value);
+ // sr.DistanceInMeter = srBO.DistanceInMeter;
+ // }
+ // }
+ //}
+ this.bindingSource1.DataSource = pRO;
+ }
+
+ }
+}
diff --git a/ReportImp/VivaAVidaReports/FLSListReport.resx b/ReportImp/VivaAVidaReports/FLSListReport.resx
new file mode 100644
index 000000000..d25f3eba2
--- /dev/null
+++ b/ReportImp/VivaAVidaReports/FLSListReport.resx
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 17, 17
+
+
\ No newline at end of file
diff --git a/ReportImp/VivaAVidaReports/VivaAVidaReports.csproj b/ReportImp/VivaAVidaReports/VivaAVidaReports.csproj
index 1c5ff5899..b2b52a4f6 100644
--- a/ReportImp/VivaAVidaReports/VivaAVidaReports.csproj
+++ b/ReportImp/VivaAVidaReports/VivaAVidaReports.csproj
@@ -106,6 +106,18 @@
+
+ Component
+
+
+ FLSGroupReport.cs
+
+
+ Component
+
+
+ FLSListReport.cs
+
Component
@@ -139,6 +151,14 @@
+
+ FLSGroupReport.cs
+ Designer
+
+
+ FLSListReport.cs
+ Designer
+
InvoiceCustomerReport.cs
diff --git a/Service/DCEntityMapper/CompactCustomerDC_Customer.cs b/Service/DCEntityMapper/CompactCustomerDC_Customer.cs
index 2fa65d961..78c8f41c8 100644
--- a/Service/DCEntityMapper/CompactCustomerDC_Customer.cs
+++ b/Service/DCEntityMapper/CompactCustomerDC_Customer.cs
@@ -30,7 +30,7 @@ namespace BeWo.Service.DCEntityMapper
}
else if (pEntity.TerminationDate.HasValue)
{
- pDataContract.TerminationReason = String.Format("Betreuung vorzeigt beendet am {0:dd.MM.yyyy}", pEntity.TerminationDate);
+ pDataContract.TerminationReason = String.Format("Betreuung vorzeitig beendet am {0:dd.MM.yyyy}", pEntity.TerminationDate);
}
pDataContract.AssistanceBegin = pEntity.AssistanceBegin;
diff --git a/Service/DCEntityMapper/MapperFactory.cs b/Service/DCEntityMapper/MapperFactory.cs
index 00b3c404a..cb8315408 100644
--- a/Service/DCEntityMapper/MapperFactory.cs
+++ b/Service/DCEntityMapper/MapperFactory.cs
@@ -269,7 +269,9 @@ namespace BeWo.Service.DCEntityMapper
private static TextModuleDC_TextModule _TextModuleDC_TextModule;
- private static BargeldtransaktionDC_Bargeldtransaktion _BargeldtransaktionDC_Bargeldtransaktion;
+ private static TextbausteinDC_Textbaustein _TextbausteinDC_Textbaustein;
+
+ private static BargeldtransaktionDC_Bargeldtransaktion _BargeldtransaktionDC_Bargeldtransaktion;
private static BargeldkassenDC_Bargeldkasse _bargeldkassenDCBargeldkasseDCBargeldkassenDCBargeldkasse;
@@ -294,7 +296,15 @@ namespace BeWo.Service.DCEntityMapper
}
}
- public static DepotRhythmusDC_DepotRhythmus DepotRhythmusDC_DepotRhythmus
+ public static TextbausteinDC_Textbaustein TextbausteinDC_Textbaustein
+ {
+ get
+ {
+ return _TextbausteinDC_Textbaustein ?? (_TextbausteinDC_Textbaustein = new TextbausteinDC_Textbaustein());
+ }
+ }
+
+ public static DepotRhythmusDC_DepotRhythmus DepotRhythmusDC_DepotRhythmus
{
get
{
diff --git a/Service/DCEntityMapper/TextbausteinDC_Textbaustein.cs b/Service/DCEntityMapper/TextbausteinDC_Textbaustein.cs
new file mode 100644
index 000000000..5810eb5f9
--- /dev/null
+++ b/Service/DCEntityMapper/TextbausteinDC_Textbaustein.cs
@@ -0,0 +1,58 @@
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+
+using BS.Shared.DataContracts;
+
+namespace BeWo.Service.DCEntityMapper
+{
+ public class TextbausteinDC_Textbaustein : AbstractIDCEntityMapper
+ {
+ public override TextbausteinDC MergeWithDC(Textbaustein pEntity, TextbausteinDC pDataContract)
+ {
+ pDataContract.Position = pEntity.Position;
+ pDataContract.TextbausteinVersion = pEntity.Version.Value;
+ pDataContract.TextbausteinOid = pEntity.Oid.Value;
+ pDataContract.Text = pEntity.Text;
+ pDataContract.Name = pEntity.Name;
+ pDataContract.IsOnlyForEmployee = pEntity.IsOnlyForEmployee;
+
+ if (pEntity.ServiceCategory != null)
+ pDataContract.ServiceCategory = MapperFactory.ServiceCategoryDC_ServiceCategory.MapToNewDC(pEntity.ServiceCategory);
+
+ if (pEntity.Employee != null)
+ pDataContract.Employee = MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(pEntity.Employee);
+
+ return pDataContract;
+ }
+
+ public override Textbaustein MergeWithEntity(TextbausteinDC pDataContract, Textbaustein pEntity)
+ {
+ ConcurrencyCheck(pDataContract.TextbausteinVersion, pEntity);
+
+ pEntity.Position = pDataContract.Position;
+ pEntity.Oid = pDataContract.TextbausteinOid;
+ pEntity.Text = pDataContract.Text;
+ pEntity.Name = pDataContract.Name;
+ pEntity.IsOnlyForEmployee = pDataContract.IsOnlyForEmployee;
+
+ if (pDataContract.ServiceCategory != null)
+ {
+ pEntity.ServiceCategory = pDataContract.ServiceCategory.ServiceCategoryOid.HasValue ?
+ DAOFactory.GenericDAO.LoadByID(pDataContract.ServiceCategory.ServiceCategoryOid.Value) :
+ MapperFactory.ServiceCategoryDC_ServiceCategory.MapToNewEntity(pDataContract.ServiceCategory);
+ }
+
+ if (pDataContract.Employee != null)
+ {
+ pEntity.Employee = DAOFactory.GenericDAO.LoadByID(pDataContract.Employee.EmployeeOid);
+ }
+
+ return pEntity;
+ }
+
+ protected override bool AreDCAndEntityEqual(TextbausteinDC pDC, Textbaustein pEntity)
+ {
+ return pDC.TextbausteinOid == pEntity.Oid;
+ }
+ }
+}
diff --git a/Service/Plugins/CustomerService.cs b/Service/Plugins/CustomerService.cs
index 6a9368028..7dba3f57e 100644
--- a/Service/Plugins/CustomerService.cs
+++ b/Service/Plugins/CustomerService.cs
@@ -11,6 +11,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
+using Castle.Components.DictionaryAdapter;
namespace BeWo.Service.Plugins
{
@@ -154,9 +155,8 @@ namespace BeWo.Service.Plugins
pEntity.Customer2CostBearerList.DoForEach(c2cb => dc.CostBearerReferenceNumbers[c2cb.CostBearer.Oid.Value] = c2cb.ReferenceNumber);
}
- dc.IsRelatedToEmployee = IsRelatedToEmployee(currentEmployeeOid, pEntity, teamOids);
-
-
+ SetTeamAndEmployeeRelation(dc, currentEmployeeOid, pEntity, teamOids);
+
if (fetchEmployees)
{
foreach (Employee2Customer e2c in pEntity.Employee2CustomerList)
@@ -201,10 +201,10 @@ namespace BeWo.Service.Plugins
var scProcessed = new Dictionary();
var teamOids = new Dictionary();
- if (FetchTeamsForSupportConcepts())
- {
+ //if (FetchTeamsForSupportConcepts())
+ //{
teamOids = CreateTeamOidDict(currentEmployeeOid);
- }
+ //}
foreach (var item in list)
{
@@ -245,7 +245,7 @@ namespace BeWo.Service.Plugins
customerDC.TerminationReason = cust.TerminationReason.Value;
} else if (cust.TerminationDate.HasValue)
{
- customerDC.TerminationReason = String.Format("Betreuung vorzeigt beendet am {0:dd.MM.yyyy}", cust.TerminationDate);
+ customerDC.TerminationReason = String.Format("Betreuung vorzeitig beendet am {0:dd.MM.yyyy}", cust.TerminationDate);
}
if (cust.Person.Address != null)
{
@@ -296,22 +296,8 @@ namespace BeWo.Service.Plugins
dc.CostBearerRelOids.Add(iCBRel.Oid.Value);
}
}
-
- dc.IsRelatedToEmployee = IsRelatedToEmployee(currentEmployeeOid, cust, teamOids);
- //if (currentEmployeeOid != null)
- //{
- // foreach (Employee2Customer e2c in cust.Employee2CustomerList)
- // {
- // if (!dc.IsRelatedToEmployee)
- // {
- // if (currentEmployeeOid.Value == e2c.EmployeeOid.Value)
- // {
- // dc.IsRelatedToEmployee = true;
- // }
- // }
- // }
- //}
-
+ SetTeamAndEmployeeRelation(dc.Customer, currentEmployeeOid, cust, teamOids);
+ dc.IsRelatedToEmployee = dc.Customer.IsRelatedToEmployee;
return dc;
}
@@ -341,7 +327,7 @@ namespace BeWo.Service.Plugins
return teamOids;
}
- private bool IsRelatedToEmployee(long? employeeOid, Customer customer, Dictionary teamOids)
+ private void SetTeamAndEmployeeRelation(CompactCustomerDC customerDc, long? employeeOid, Customer customer, Dictionary teamOids)
{
if (employeeOid != null)
{
@@ -349,30 +335,34 @@ namespace BeWo.Service.Plugins
{
if (employeeOid == e2c.EmployeeOid.Value)
{
- return true;
+ customerDc.IsRelatedToEmployee = true;
}
}
-
- if (teamOids != null && teamOids.Count > 0)
- {
-
-
- foreach (var t2c in customer.Team2CustomerList)
- {
- if (teamOids.ContainsKey(t2c.TeamOid.Value))
- {
- return true;
- }
-
- }
- }
-
}
- return false;
- }
+
+ if (teamOids != null && teamOids.Count > 0)
+ {
- private List CreateFlatSupportConceptCostBearerDCList(IEnumerable pEntityList, bool onlyWithAssignedCostbearer, long? employeeOid)
+ foreach (var t2c in customer.Team2CustomerList)
+ {
+ if (customerDc.RelatedTeamOids == null)
+ {
+ customerDc.RelatedTeamOids = new List();
+ }
+ customerDc.RelatedTeamOids.Add(t2c.TeamOid.Value);
+
+ if (teamOids.ContainsKey(t2c.TeamOid.Value))
+ {
+ customerDc.IsRelatedToTeam = true;
+ }
+
+ }
+ }
+ }
+
+
+ private List CreateFlatSupportConceptCostBearerDCList(IEnumerable pEntityList, bool onlyWithAssignedCostbearer, long? employeeOid)
{
var list = new List();
var customerOIDs = new Dictionary();
@@ -392,10 +382,10 @@ namespace BeWo.Service.Plugins
}
}
- if (FetchTeamsForSupportConcepts())
- {
+ //if (FetchTeamsForSupportConcepts())
+ //{
teamOids = CreateTeamOidDict(employeeOid.Value);
- }
+ //}
}
//var t = new List();
var c2sOids = new Dictionary();
@@ -414,17 +404,27 @@ namespace BeWo.Service.Plugins
dc.IsRelatedToEmployee = true;
dc.Customer.IsRelatedToEmployee = true;
}
- else if (teamOids.Count > 0)
+
+ if (teamOids != null && teamOids.Count > 0)
{
+
foreach (var t2c in sc.Customer.Team2CustomerList)
{
+ if (dc.Customer.RelatedTeamOids == null)
+ {
+ dc.Customer.RelatedTeamOids = new List();
+ }
+ dc.Customer.RelatedTeamOids.Add(t2c.TeamOid.Value);
+
if (teamOids.ContainsKey(t2c.TeamOid.Value))
{
- dc.IsRelatedToEmployee = true;
- dc.Customer.IsRelatedToEmployee = true;
+ dc.Customer.IsRelatedToTeam = true;
}
+
}
}
+
+
list.Add(dc);
c2sOids.Add(cb2sc.Oid.Value, true);
}
@@ -535,7 +535,7 @@ namespace BeWo.Service.Plugins
}
else
{
- dc.TerminationReason = String.Format("Betreuung vorzeigt beendet am {0:dd.MM.yyyy}", pEntity.TerminationDate);
+ dc.TerminationReason = String.Format("Betreuung vorzeitig beendet am {0:dd.MM.yyyy}", pEntity.TerminationDate);
}
}
dc.Sex = pEntity.Person.Sex;
diff --git a/Service/Plugins/GroupDurationCalculator.cs b/Service/Plugins/GroupDurationCalculator.cs
index b3fbfa4e4..a80669b20 100644
--- a/Service/Plugins/GroupDurationCalculator.cs
+++ b/Service/Plugins/GroupDurationCalculator.cs
@@ -58,7 +58,7 @@ namespace BeWo.Service.Plugins
}
else
{
- durationForSingleRecord = Math.Round(durationForGroup /group.CustomerCount, MidpointRounding.AwayFromZero);
+ durationForSingleRecord = Math.Round(durationForGroup /group.CustomerCount, 2, MidpointRounding.AwayFromZero);
}
foreach (var sr in group.ServiceRecordList)
diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs
index e19f33956..7c5238a21 100644
--- a/Service/Plugins/PluginLoader.cs
+++ b/Service/Plugins/PluginLoader.cs
@@ -40,7 +40,7 @@ namespace BeWo.Service.Plugins
//t = "5805202339"; // Wegweiser Betreuungsdienst
//t = "2301474784"; // Hauskrankenpflege Leiendecker
//t = "8243565510"; // Der Karren
- //t = "7709306800"; // Der Karren SBD
+ //t = "7709306800"; // Der Karren SBD
//t = "2499262621"; // HPH Bersenbrück
//t = "4950382346"; // Holsinger
//t = "5973016645"; // Verein Lebensgestaltung Hanau
@@ -139,7 +139,7 @@ namespace BeWo.Service.Plugins
//t = "8828216586"; // Caritas Aachen
//t = "7062943632"; // ABW Elsebrock
//t = "3956369664"; // LH Wetterau
- t = "3984525482"; // API Berlin
+ //t = "3984525482"; // API Berlin
//t = "9975231461"; // Selwo
//t = "8181286349"; // BeWo am Rhein
//t = "4595275645"; // Eigenständig
diff --git a/Service/Plugins/TranslationDictionary.cs b/Service/Plugins/TranslationDictionary.cs
index bb5675bc4..aa070954c 100644
--- a/Service/Plugins/TranslationDictionary.cs
+++ b/Service/Plugins/TranslationDictionary.cs
@@ -21,6 +21,29 @@ namespace BeWo.Service.Plugins
AddOrReplaceTranslation(dict, "MitarbeiterSingular", "Mitarbeiter");
AddOrReplaceTranslation(dict, "MitarbeiterPlural", "Mitarbeiter");
+
+ AddOrReplaceTranslation(dict, "ZeiterfassungMenuItem", "Zeiterfassung");
+ AddOrReplaceTranslation(dict, "Ergänzende DiensteMenuItem", "Ergänzende Dienste");
+ AddOrReplaceTranslation(dict, "VertretungenMenuItem", "Vertretungen");
+ AddOrReplaceTranslation(dict, "FinanzenMenuItem", "Finanzen");
+ AddOrReplaceTranslation(dict, "KalenderMenuItem", "Kalender");
+ AddOrReplaceTranslation(dict, "RessourcenMenuItem", "Ressourcen");
+ AddOrReplaceTranslation(dict, "AuswertungenMenuItem", "Auswertungen");
+ AddOrReplaceTranslation(dict, "HilfepläneMenuItem", "Hilfepläne");
+ AddOrReplaceTranslation(dict, "KlientenMenuItem", "Klienten");
+ AddOrReplaceTranslation(dict, "KliententeamsMenuItem", "Kliententeams");
+ AddOrReplaceTranslation(dict, "WohnheimeMenuItem", "Wohnheime");
+ AddOrReplaceTranslation(dict, "OrganisationenMenuItem", "Organisationen");
+ AddOrReplaceTranslation(dict, "PersonenMenuItem", "Personen");
+ AddOrReplaceTranslation(dict, "MitarbeiterMenuItem", "Mitarbeiter");
+ AddOrReplaceTranslation(dict, "TeamsMenuItem", "Teams");
+ AddOrReplaceTranslation(dict, "BenutzerMenuItem", "Benutzer");
+ AddOrReplaceTranslation(dict, "BenutzergruppenMenuItem", "Benutzergruppen");
+ AddOrReplaceTranslation(dict, "VerwaltungMenuItem", "Verwaltung");
+ AddOrReplaceTranslation(dict, "SupportMenuItem", "Support");
+
+
+
return dict;
}
diff --git a/Service/Service.csproj b/Service/Service.csproj
index c03464ec6..eb0994477 100644
--- a/Service/Service.csproj
+++ b/Service/Service.csproj
@@ -232,6 +232,7 @@
+
diff --git a/Service/ServiceContracts/IOperationsService.cs b/Service/ServiceContracts/IOperationsService.cs
index 2fd7c4d5f..a06fa6e3e 100644
--- a/Service/ServiceContracts/IOperationsService.cs
+++ b/Service/ServiceContracts/IOperationsService.cs
@@ -707,5 +707,25 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
Dictionary GetTranslationDictionary();
+
+ [FaultContract(typeof(BeWoFault))]
+ [OperationContract]
+ IList GetAllTextbausteine();
+
+ [FaultContract(typeof(BeWoFault))]
+ [OperationContract]
+ IList InsertNewTextbausteine(IEnumerable pTextbausteine);
+
+ [FaultContract(typeof(BeWoFault))]
+ [OperationContract]
+ void UpdateTextbausteine(List pTextbausteine);
+
+ [FaultContract(typeof(BeWoFault))]
+ [OperationContract]
+ void DeleteTextbausteine(Dictionary pOid2Version);
+
+ [FaultContract(typeof(BeWoFault))]
+ [OperationContract]
+ IList GetTextbausteineByServiceCategory(long pServiceCategoryOid);
}
}
\ No newline at end of file
diff --git a/Service/ServiceImplementations/CustomerServiceImp.cs b/Service/ServiceImplementations/CustomerServiceImp.cs
index 2c6748af6..c02889a78 100644
--- a/Service/ServiceImplementations/CustomerServiceImp.cs
+++ b/Service/ServiceImplementations/CustomerServiceImp.cs
@@ -2000,7 +2000,7 @@ namespace BeWo.Service.ServiceImplementations
}
else if (cust.TerminationDate.HasValue)
{
- customerDC.TerminationReason = String.Format("Betreuung vorzeigt beendet am {0:dd.MM.yyyy}", cust.TerminationDate);
+ customerDC.TerminationReason = String.Format("Betreuung vorzeitig beendet am {0:dd.MM.yyyy}", cust.TerminationDate);
}
if (cust.Person.Address != null)
diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs
index 8d8e8bb3a..0b147b3bc 100644
--- a/Service/ServiceImplementations/OperationsServiceImp.cs
+++ b/Service/ServiceImplementations/OperationsServiceImp.cs
@@ -3072,7 +3072,7 @@ namespace BeWo.Service.ServiceImplementations
{
try
{
- return MapperFactory.TextModuleDC_TextModule.MapToNewDCs(DAOFactory.SearchDAO.GetActiveTextbausteineByServiceCategory(pServiceCategoryOid));
+ return MapperFactory.TextModuleDC_TextModule.MapToNewDCs(DAOFactory.SearchDAO.GetActiveTextModuleByServiceCategory(pServiceCategoryOid));
}
catch (Exception e)
{
@@ -4859,6 +4859,76 @@ namespace BeWo.Service.ServiceImplementations
return null;
}
+ public IList GetAllTextbausteine()
+ {
+ try
+ {
+ return MapperFactory.TextbausteinDC_Textbaustein.MapToNewDCs(DAOFactory.GenericDAO.GetAllActive());
+ }
+ catch (Exception e)
+ {
+ throw Utils.CreateBeWoFaultException(e);
+ }
+ }
+
+ public IList GetTextbausteineByServiceCategory(long pServiceCategoryOid)
+ {
+ try
+ {
+ return MapperFactory.TextbausteinDC_Textbaustein.MapToNewDCs(DAOFactory.SearchDAO.GetActiveTextbausteineByServiceCategory(pServiceCategoryOid));
+ }
+ catch (Exception e)
+ {
+ throw Utils.CreateBeWoFaultException(e);
+ }
+ }
+
+ public IList InsertNewTextbausteine(IEnumerable pTextbausteine)
+ {
+ try
+ {
+ var lTextbausteine = MapperFactory.TextbausteinDC_Textbaustein.MapToNewEntities(pTextbausteine);
+ DAOFactory.GenericDAO.Insert(lTextbausteine);
+
+ return lTextbausteine.Select(asb => asb.Oid.Value).ToList();
+ }
+ catch (Exception e)
+ {
+ throw Utils.CreateBeWoFaultException(e);
+ }
+ }
+
+ public void UpdateTextbausteine(List pTextbausteine)
+ {
+ try
+ {
+ var lOriginals = DAOFactory.GenericDAO.LoadByIDs(pTextbausteine.Select(sc => sc.TextbausteinOid.Value));
+
+ MapperFactory.TextbausteinDC_Textbaustein.MergeWithEntitys(pTextbausteine, lOriginals);
+
+ DAOFactory.GenericDAO.Update(lOriginals);
+ }
+ catch (Exception e)
+ {
+ throw Utils.CreateBeWoFaultException(e);
+ }
+ }
+
+ public void DeleteTextbausteine(Dictionary pOid2Version)
+ {
+ try
+ {
+ List lOriginals = DAOFactory.GenericDAO.LoadByIDs(pOid2Version.Select(e => e.Key));
+ lOriginals.DoForEach(or => MapperFactory.TextbausteinDC_Textbaustein.ConcurrencyCheck(pOid2Version[or.Oid.Value], or));
+
+ DAOFactory.GenericDAO.Delete(lOriginals);
+ }
+ catch (Exception e)
+ {
+ throw Utils.CreateBeWoFaultException(e);
+ }
+ }
+
#endregion
}
}
\ No newline at end of file
diff --git a/Shared/Core/EnumTranslations.cs b/Shared/Core/EnumTranslations.cs
index 0a9d5a3f2..bf1cad38f 100644
--- a/Shared/Core/EnumTranslations.cs
+++ b/Shared/Core/EnumTranslations.cs
@@ -96,10 +96,10 @@ namespace BS.Shared.Core
UserRightType.CustomerView_View, Translator.Translate("Klienten ansehen (alle)")
},
{
- UserRightType.Customer_ViewMyCustomers, Translator.Translate("Klienten ansehen (Nur vom Mitarbeiter betreute)")
+ UserRightType.Customer_ViewMyCustomers, Translator.Translate("Klienten ansehen (von Mitarbeiter betreut)")
},
{
- UserRightType.Customer_ViewMyTeams, Translator.Translate("Klienten meines Teams ansehen")
+ UserRightType.Customer_ViewMyTeams, Translator.Translate("Klienten ansehen (von Teams betreut)")
},
{
UserRightType.DeleteAll, Translator.Translate("Alles löschen")
@@ -330,7 +330,7 @@ namespace BS.Shared.Core
UserRightType.SupportConceptView_Edit, Translator.Translate("Hilfepläne ändern")
},
{
- UserRightType.SupportConceptView_View, Translator.Translate("Hilfepläne von betreuten Klienten ansehen")
+ UserRightType.SupportConceptView_View, Translator.Translate("Hilfepläne ansehen (von Mitarbeiter betreut)")
},
{
UserRightType.SupportConcept_AllowEditGoals, Translator.Translate("Hilfepläne Ziele bearbeiten")
@@ -342,7 +342,7 @@ namespace BS.Shared.Core
UserRightType.SupportConcept_ViewAllSupportConcepts, Translator.Translate("Hilfepläne ansehen (alle)")
},
{
- UserRightType.SupportConcept_ViewMyTeams, Translator.Translate("Hilfepläne meines Teams ansehen")
+ UserRightType.SupportConcept_ViewMyTeams, Translator.Translate("Hilfepläne ansehen (von Teams betreut)")
},
{
UserRightType.SupportConcept_AllowGoalOrientedSupportConcepts, Translator.Translate("Hilfepläne zielorientiert planen")
diff --git a/Shared/DataContracts/ClientPartials/TextbausteinDC.cs b/Shared/DataContracts/ClientPartials/TextbausteinDC.cs
new file mode 100644
index 000000000..1b5ff40d9
--- /dev/null
+++ b/Shared/DataContracts/ClientPartials/TextbausteinDC.cs
@@ -0,0 +1,51 @@
+using System.Windows.Media;
+
+namespace BS.Shared.DataContracts
+{
+ public partial class TextbausteinDC : IFilterableDC
+ {
+ public override bool Equals(object obj)
+ {
+ if (obj is TextbausteinDC)
+ {
+ var y = (TextbausteinDC)obj;
+ if (TextbausteinOid == null && y.TextbausteinOid == null)
+ {
+ return GetHashCode() == y.GetHashCode();
+ }
+
+ if (TextbausteinOid != null && y.TextbausteinOid != null)
+ {
+ return TextbausteinOid == y.TextbausteinOid;
+ }
+ }
+
+ return false;
+ }
+
+ public override int GetHashCode()
+ {
+ return GetType().Name.GetHashCode() ^ TextbausteinOid.GetHashCode();
+ }
+
+ public override string ToString()
+ {
+ return Name;
+ }
+
+ public ActivationTypeId ActivationType { get; set; }
+ public string DetailDescription { get { return Text; } }
+ public string FilterRelevants { get { return Name + Text; } }
+ public string IconPath { get; private set; }
+ public string SimpleDescription { get { return Name; } }
+ public bool SupportsActivationType { get; private set; }
+
+ public long Version
+ {
+ get { return TextbausteinVersion == null ? 0 : TextbausteinVersion.Value; }
+ set { TextbausteinVersion = value; }
+ }
+
+ public SolidColorBrush FilterableBrush { get { return new SolidColorBrush(Colors.Transparent); } }
+ }
+}
\ No newline at end of file
diff --git a/Shared/DataContracts/Compact/CompactCustomerDC.cs b/Shared/DataContracts/Compact/CompactCustomerDC.cs
index 46e34fed4..e3786accf 100644
--- a/Shared/DataContracts/Compact/CompactCustomerDC.cs
+++ b/Shared/DataContracts/Compact/CompactCustomerDC.cs
@@ -133,5 +133,8 @@ namespace BS.Shared.DataContracts.Compact
[DataMember]
public string TerminationReason { get; set; }
+
+ [DataMember]
+ public bool IsRelatedToTeam { get; set; }
}
}
\ No newline at end of file
diff --git a/Shared/DataContracts/Compact/CompactSupportConceptDC.cs b/Shared/DataContracts/Compact/CompactSupportConceptDC.cs
index fbbeb1de6..f52f42155 100644
--- a/Shared/DataContracts/Compact/CompactSupportConceptDC.cs
+++ b/Shared/DataContracts/Compact/CompactSupportConceptDC.cs
@@ -64,7 +64,7 @@ namespace BS.Shared.DataContracts.Compact
[DataMember]
public bool IsRelatedToEmployee { get; set; }
-
+
[DataMember]
public long SupportConceptOid { get; set; }
diff --git a/Shared/DataContracts/TextbausteinDC.cs b/Shared/DataContracts/TextbausteinDC.cs
new file mode 100644
index 000000000..7be5d3d5a
--- /dev/null
+++ b/Shared/DataContracts/TextbausteinDC.cs
@@ -0,0 +1,34 @@
+using System.Runtime.Serialization;
+
+using BS.Shared.DataContracts.Compact;
+
+namespace BS.Shared.DataContracts
+{
+ [DataContract]
+ public partial class TextbausteinDC : IDataContract
+ {
+ [DataMember]
+ public long? TextbausteinOid { get; set; }
+
+ [DataMember]
+ public long? TextbausteinVersion { get; set; }
+
+ [DataMember]
+ public string Text { get; set; }
+
+ [DataMember]
+ public ServiceCategoryDC ServiceCategory { get; set; }
+
+ [DataMember]
+ public int Position { get; set; }
+
+ [DataMember]
+ public string Name { get; set; }
+
+ [DataMember]
+ public CompactEmployeeDC Employee { get; set; }
+
+ [DataMember]
+ public bool IsOnlyForEmployee { get; set; }
+ }
+}
diff --git a/Shared/Services/Calculations.cs b/Shared/Services/Calculations.cs
index bb54a026a..1a0dd8ab1 100644
--- a/Shared/Services/Calculations.cs
+++ b/Shared/Services/Calculations.cs
@@ -43,11 +43,11 @@ namespace BS.Shared.Services
public virtual decimal? GetApprovedAmount(SupportConceptApprovalPeriodDC scap, List costRatePeriods)
{
- decimal t1;
- decimal t2;
+ decimal t1;
+ decimal t2;
return scap.ApprovedFixedAmount.HasValue
- ? this.GetApprovedFixedAmount(scap, out t1 , out t2)
+ ? this.GetApprovedFixedAmount(scap, out t1, out t2)
: this.GetApprovedAmountDefaultHourlyRate(scap, costRatePeriods);
}
@@ -66,27 +66,27 @@ namespace BS.Shared.Services
return null;
}
- if (scap.ApprovedBEInterval.HasValue && scap.ApprovedBEPerInterval.HasValue)
- {
- if (scap.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Monthly && !scap.IsApprovedBEShifting)
- {
- var totalMonths = GetTotalMonths(start.Value, end.Value);
- var approvedHours = totalMonths*scap.ApprovedBEPerInterval.Value;
+ if (scap.ApprovedBEInterval.HasValue && scap.ApprovedBEPerInterval.HasValue)
+ {
+ if (scap.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Monthly && !scap.IsApprovedBEShifting)
+ {
+ var totalMonths = GetTotalMonths(start.Value, end.Value);
+ var approvedHours = totalMonths * scap.ApprovedBEPerInterval.Value;
-
- var hourlyRate = costRatePeriods.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, start.Value);
- var rateFactor = costRatePeriods.GetCostRatePeriodForDate(CostRatePeriodType.RateFactor, start.Value);
- decimal amount = 0;
- if (hourlyRate != null && hourlyRate.CostRateValue.HasValue)
- amount = approvedHours * hourlyRate.CostRateValue.Value;
- if (rateFactor != null && rateFactor.CostRateValue.HasValue)
- {
- amount = amount + (amount * rateFactor.CostRateValue.Value / 100);
- }
- return amount;
- }
- }
+ var hourlyRate = costRatePeriods.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, start.Value);
+ var rateFactor = costRatePeriods.GetCostRatePeriodForDate(CostRatePeriodType.RateFactor, start.Value);
+ decimal amount = 0;
+ if (hourlyRate != null && hourlyRate.CostRateValue.HasValue)
+ amount = approvedHours * hourlyRate.CostRateValue.Value;
+ if (rateFactor != null && rateFactor.CostRateValue.HasValue)
+ {
+ amount = amount + (amount * rateFactor.CostRateValue.Value / 100);
+ }
+
+ return amount;
+ }
+ }
var approvedHoursPerDay = this.GetApprovedHoursPerDay(scap, costRatePeriods);
@@ -252,15 +252,15 @@ namespace BS.Shared.Services
.GetHoursInBE(this.GetApprovedHoursTotal(scap, costRatePeriods));
}
- public virtual decimal? GetApprovedFixedAmount(SupportConceptApprovalPeriodDC scap, out decimal amountPerUnit, out decimal unitCount)
+ public virtual decimal? GetApprovedFixedAmount(SupportConceptApprovalPeriodDC scap, out decimal amountPerUnit, out decimal unitCount)
{
return this.GetApprovedFixedAmountForPeriod(scap, scap.StartDate, scap.EndDate, out amountPerUnit, out unitCount);
}
public virtual decimal? GetApprovedFixedAmountForPeriod(SupportConceptApprovalPeriodDC scap, DateTime? pStart, DateTime? pEnd, out decimal amountPerUnit, out decimal unitCount)
{
- amountPerUnit = 0;
- unitCount = 0;
+ amountPerUnit = 0;
+ unitCount = 0;
if (!pStart.HasValue || !pEnd.HasValue || !scap.ApprovedFixedAmount.HasValue || !scap.ApprovedFixedAmountInterval.HasValue)
{
@@ -301,8 +301,8 @@ namespace BS.Shared.Services
DateTimeUnit du = pStart.Value.Date.GetDateTimeUnit(pEnd.Value.Date, tu);
amount = scap.ApprovedFixedAmount.Value * du.UnitCount;
- amountPerUnit = scap.ApprovedFixedAmount.Value;
- unitCount = du.UnitCount;
+ amountPerUnit = scap.ApprovedFixedAmount.Value;
+ unitCount = du.UnitCount;
if (du.RestDays > 0)
{
@@ -386,13 +386,13 @@ namespace BS.Shared.Services
{
return null;
}
- if (scap.ApprovedBEInterval.HasValue && scap.ApprovedBEPerInterval.HasValue)
- {
- if (scap.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Monthly)
- {
- var months = GetTotalMonths(pStart.Value, pEnd.Value);
- return months*scap.ApprovedBEPerInterval.Value;
- }
+ if (scap.ApprovedBEInterval.HasValue && scap.ApprovedBEPerInterval.HasValue)
+ {
+ if (scap.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Monthly)
+ {
+ var months = GetTotalMonths(pStart.Value, pEnd.Value);
+ return months * scap.ApprovedBEPerInterval.Value;
+ }
else if (scap.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Quarterly)
{
var qs = GetTotalQuarters(pStart.Value, pEnd.Value);
@@ -405,8 +405,8 @@ namespace BS.Shared.Services
return this.GetApprovedHoursPerDay(scap, costRatePeriods) * periodInDays;
}
- public virtual decimal GetTotalMonths(DateTime start, DateTime end)
- {
+ public virtual decimal GetTotalMonths(DateTime start, DateTime end)
+ {
var am = DateTimeUtils.GetTotalMonths(start, end);
return am.AnzahlMonateGesamt;
@@ -438,7 +438,7 @@ namespace BS.Shared.Services
while (startDt <= endDt)
{
startDt = startDt.AddMonths(3);
-
+
if (startDt <= endDt.AddDays(1))
{
startTemp = startDt;
@@ -486,39 +486,39 @@ namespace BS.Shared.Services
}
else if (scap.ApprovedBEPerInterval.HasValue)
{
- decimal approvedBEPerDay = 0;
- if (scap.ApprovedBEInterval.HasValue)
- {
- if (scap.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Yearly)
- {
- var totalDays = (scap.EndDate.Value - scap.StartDate.Value).Days + 1;
+ decimal approvedBEPerDay = 0;
+ if (scap.ApprovedBEInterval.HasValue)
+ {
+ if (scap.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Yearly)
+ {
+ var totalDays = (scap.EndDate.Value - scap.StartDate.Value).Days + 1;
- int totalYears = 0;
- DateTime start = scap.StartDate.Value.AddYears(1);
+ int totalYears = 0;
+ DateTime start = scap.StartDate.Value.AddYears(1);
- //Anzahl Jahre ausrechnen. Nur wenn das Enddatum genau auf das Datum eines Jahres fällt
- while (start <= scap.EndDate.Value.AddDays(1))
- {
- totalYears++;
+ //Anzahl Jahre ausrechnen. Nur wenn das Enddatum genau auf das Datum eines Jahres fällt
+ while (start <= scap.EndDate.Value.AddDays(1))
+ {
+ totalYears++;
- start = start.AddYears(1);
- if (start > scap.EndDate.Value.AddDays(1) && start != scap.EndDate.Value.AddDays(1).AddYears(1))
- totalYears = 0;
+ start = start.AddYears(1);
+ if (start > scap.EndDate.Value.AddDays(1) && start != scap.EndDate.Value.AddDays(1).AddYears(1))
+ totalYears = 0;
- }
+ }
- if (totalYears > 0)
- {
- approvedBEPerDay = (scap.ApprovedBEPerInterval.Value*totalYears)/totalDays;
+ if (totalYears > 0)
+ {
+ approvedBEPerDay = (scap.ApprovedBEPerInterval.Value * totalYears) / totalDays;
- return serviceUnit.GetBEInMinutes(approvedBEPerDay) / 60m;
- }
- }
-
- approvedBEPerDay = this.ConvertPerIntervall2PerDay(scap.ApprovedBEPerInterval.Value,
- scap.ApprovedBEInterval.Value);
- }
- return serviceUnit.GetBEInMinutes(approvedBEPerDay) / 60m;
+ return serviceUnit.GetBEInMinutes(approvedBEPerDay) / 60m;
+ }
+ }
+
+ approvedBEPerDay = this.ConvertPerIntervall2PerDay(scap.ApprovedBEPerInterval.Value,
+ scap.ApprovedBEInterval.Value);
+ }
+ return serviceUnit.GetBEInMinutes(approvedBEPerDay) / 60m;
}
return null;
@@ -723,16 +723,16 @@ namespace BS.Shared.Services
if (flatRate != null)
{
- if (record.DistanceInMeter.HasValue && record.DistanceInMeter.Value > 0)
- {
- data.UnitCount = record.DistanceInMeter.Value;
- }
- else
- {
- data.UnitCount = 1;
- }
- data.AmountPerUnit = flatRate.CostRateValue;
- data.AmountTotal = data.UnitCount * data.AmountPerUnit;
+ if (record.DistanceInMeter.HasValue && record.DistanceInMeter.Value > 0)
+ {
+ data.UnitCount = record.DistanceInMeter.Value;
+ }
+ else
+ {
+ data.UnitCount = 1;
+ }
+ data.AmountPerUnit = flatRate.CostRateValue;
+ data.AmountTotal = data.UnitCount * data.AmountPerUnit;
data.AccountingInterval = AccountingIntervalType.FlatRate;
}
else
@@ -740,16 +740,16 @@ namespace BS.Shared.Services
if (hourlyRate == null)
hourlyRate = this.GetHourlyRatePeriodForServiceRecord(record);
- decimal rdMinutes = this.GetBillableDurationInMinutes(record);
- data.UnitCount = rdMinutes / 60m;
+ decimal rdMinutes = this.GetBillableDurationInMinutes(record);
+ data.UnitCount = rdMinutes / 60m;
- if (hourlyRate != null)
- data.AmountPerUnit = hourlyRate.CostRateValue;
+ if (hourlyRate != null)
+ data.AmountPerUnit = hourlyRate.CostRateValue;
+
+ data.AmountTotal = data.AmountPerUnit * data.UnitCount;
+ data.AccountingInterval = AccountingIntervalType.Hourly;
- data.AmountTotal = data.AmountPerUnit * data.UnitCount;
- data.AccountingInterval = AccountingIntervalType.Hourly;
-
}
if (useRatefactor)
@@ -932,10 +932,10 @@ namespace BS.Shared.Services
var minuteInterval = costRates.GetCostRatePeriodForDate(CostRatePeriodType.MinutesIntervall, iRecord.Start.Value);
var duration = Convert.ToDecimal((iRecord.End - iRecord.Start).Value.TotalMinutes);
- //###CB 5min
+ //###CB 5min
if (minuteInterval != null && minuteInterval.CostRateValue.HasValue && minuteInterval.CostRateValue.Value > 0)
{
- iRecord.RoundedDuration = GetRoundedDuration((int)minuteInterval.CostRateValue.Value, duration);
+ iRecord.RoundedDuration = GetRoundedDuration((int)minuteInterval.CostRateValue.Value, duration);
}
absenceTimes[absenceSpan] = 0;
@@ -1087,7 +1087,7 @@ namespace BS.Shared.Services
decimal days = Convert.ToDecimal((endDate - period.StartDate.Value).Days + 1);
if (relDC.CostBearer.IsCalculatingWithFactor && relDC.CostBearer.CostRatePeriods != null)
- {
+ {
var rateFactorsInSpan = relDC.CostBearer.CostRatePeriods.GetSpans(CostRatePeriodType.RateFactor, period.StartDate.Value.Date, endDate).ToList();
if (rateFactorsInSpan.Count > 1)
@@ -1126,44 +1126,44 @@ namespace BS.Shared.Services
return totalApproved;
}
- public virtual decimal? GetApprovedHoursTillNow(SupportConceptApprovalPeriodDC scap, List costRates, DateTime? appointedDate, bool excludeRateFactor)
- {
+ public virtual decimal? GetApprovedHoursTillNow(SupportConceptApprovalPeriodDC scap, List costRates, DateTime? appointedDate, bool excludeRateFactor)
+ {
- decimal? totalApproved = null;
+ decimal? totalApproved = null;
- DateTime calcDate = (appointedDate.HasValue && appointedDate.Value < DateTime.Now.Date)
- ? appointedDate.Value
- : DateTime.Now.Date;
+ DateTime calcDate = (appointedDate.HasValue && appointedDate.Value < DateTime.Now.Date)
+ ? appointedDate.Value
+ : DateTime.Now.Date;
- if (scap.StartDate.HasValue && scap.EndDate.HasValue && calcDate >= scap.StartDate)
- {
- decimal days;
- var approvedHoursPerDay =
- GetApprovedHoursPerDay(scap, costRates) ?? 0;
+ if (scap.StartDate.HasValue && scap.EndDate.HasValue && calcDate >= scap.StartDate)
+ {
+ decimal days;
+ var approvedHoursPerDay =
+ GetApprovedHoursPerDay(scap, costRates) ?? 0;
- if (excludeRateFactor)
- {
- decimal? rateFactor = costRates.GetCurrentlyValidRateValue(CostRatePeriodType.RateFactor);
- if (rateFactor.HasValue && rateFactor.Value > 0)
- approvedHoursPerDay = (approvedHoursPerDay * 100) / (rateFactor.Value + 100);
- }
+ if (excludeRateFactor)
+ {
+ decimal? rateFactor = costRates.GetCurrentlyValidRateValue(CostRatePeriodType.RateFactor);
+ if (rateFactor.HasValue && rateFactor.Value > 0)
+ approvedHoursPerDay = (approvedHoursPerDay * 100) / (rateFactor.Value + 100);
+ }
- if (calcDate >= scap.EndDate.Value)
- {
- days = Convert.ToDecimal((scap.EndDate.Value - scap.StartDate.Value).Days + 1);
- }
- else
- {
- days = Convert.ToDecimal((calcDate - scap.StartDate.Value).Days + 1);
- }
+ if (calcDate >= scap.EndDate.Value)
+ {
+ days = Convert.ToDecimal((scap.EndDate.Value - scap.StartDate.Value).Days + 1);
+ }
+ else
+ {
+ days = Convert.ToDecimal((calcDate - scap.StartDate.Value).Days + 1);
+ }
- totalApproved = (days * approvedHoursPerDay);
- }
-
+ totalApproved = (days * approvedHoursPerDay);
+ }
- return totalApproved;
- }
+
+ return totalApproved;
+ }
#endregion
@@ -1177,7 +1177,7 @@ namespace BS.Shared.Services
return null;
}
-
+
public virtual decimal? GetDurationInWeeksTillNow(SupportConceptCostBearerRelDC relDC, DateTime? appointedDate)
{
@@ -1204,23 +1204,23 @@ namespace BS.Shared.Services
if (dtStart.HasValue && dtEnd.HasValue)
{
- decimal amountPerUnit;
- decimal unitCount;
+ decimal amountPerUnit;
+ decimal unitCount;
- decimal? approvalPeriodFixedAmount = GetApprovedFixedAmountForPeriod(supportConceptApprovalPeriod, dtStart, dtEnd, out amountPerUnit, out unitCount);
+ decimal? approvalPeriodFixedAmount = GetApprovedFixedAmountForPeriod(supportConceptApprovalPeriod, dtStart, dtEnd, out amountPerUnit, out unitCount);
if (approvalPeriodFixedAmount.HasValue)
{
billingDatas.Add(new BillingData()
- {
- AmountTotal = approvalPeriodFixedAmount,
- GrossAmountTotal = approvalPeriodFixedAmount,
- BillingPeriodStart = dtStart,
- BillingPeriodEnd = dtEnd,
- AccountingInterval = AccountingIntervalType.FlatRate,
- AmountPerUnit = amountPerUnit,
- UnitCount = unitCount
+ {
+ AmountTotal = approvalPeriodFixedAmount,
+ GrossAmountTotal = approvalPeriodFixedAmount,
+ BillingPeriodStart = dtStart,
+ BillingPeriodEnd = dtEnd,
+ AccountingInterval = AccountingIntervalType.FlatRate,
+ AmountPerUnit = amountPerUnit,
+ UnitCount = unitCount
- });
+ });
}
else if (supportConceptApprovalPeriod.ServiceCategory != null)
{
@@ -1232,7 +1232,7 @@ namespace BS.Shared.Services
DateTime intervalEnd = dtStart.Value;
while (intervalStart < dtEnd)
{
-
+
switch (ai.Value)
{
case AccountingIntervalType.Daily:
@@ -1259,9 +1259,9 @@ namespace BS.Shared.Services
case AccountingIntervalType.FlatRate:
intervalEnd = dtEnd.Value;
break;
- default:
- intervalEnd = dtEnd.Value;
- break;
+ default:
+ intervalEnd = dtEnd.Value;
+ break;
}
@@ -1286,48 +1286,48 @@ namespace BS.Shared.Services
}
}
-
+
return billingDatas;
}
public virtual List GetAccountingPeriods(SupportConceptCostBearerRelDC relDC, List recordDCS, DateTimeSpan span)
{
- Dictionary groupBookingDict = new Dictionary();
+ Dictionary groupBookingDict = new Dictionary();
List apList = new List();
- Dictionary ap2apDict = new Dictionary();
+ Dictionary ap2apDict = new Dictionary();
- foreach (var sr in recordDCS)
- {
- if (sr.ServiceDescription.Category.IsBillable && sr.Start.HasValue)
- {
- if (sr.GroupOid == null || !groupBookingDict.ContainsKey(sr.GroupOid.Value))
- {
- if (sr.Start.Value >= new DateTime(2015, 1, 1))
- {
- int test = 0;
- }
- AccountingPeriod ap = GetAccountingPeriodForServiceRecord(relDC, sr, span);
-
- if (ap != null)
- {
- if (ap2apDict.ContainsKey(ap))
- {
- ap2apDict[ap].ServiceRecordsInPeriod.Add(sr);
- }
- else
- {
- ap2apDict.Add(ap, ap);
- apList.Add(ap);
- }
- }
- if (sr.GroupOid != null && !groupBookingDict.ContainsKey(sr.GroupOid.Value))
- {
- groupBookingDict.Add(sr.GroupOid.Value, true);
- }
- }
- }
- }
- return apList;
+ foreach (var sr in recordDCS)
+ {
+ if (sr.ServiceDescription.Category.IsBillable && sr.Start.HasValue)
+ {
+ if (sr.GroupOid == null || !groupBookingDict.ContainsKey(sr.GroupOid.Value))
+ {
+ if (sr.Start.Value >= new DateTime(2015, 1, 1))
+ {
+ int test = 0;
+ }
+ AccountingPeriod ap = GetAccountingPeriodForServiceRecord(relDC, sr, span);
+
+ if (ap != null)
+ {
+ if (ap2apDict.ContainsKey(ap))
+ {
+ ap2apDict[ap].ServiceRecordsInPeriod.Add(sr);
+ }
+ else
+ {
+ ap2apDict.Add(ap, ap);
+ apList.Add(ap);
+ }
+ }
+ if (sr.GroupOid != null && !groupBookingDict.ContainsKey(sr.GroupOid.Value))
+ {
+ groupBookingDict.Add(sr.GroupOid.Value, true);
+ }
+ }
+ }
+ }
+ return apList;
}
public virtual AccountingPeriod GetAccountingPeriodForServiceRecord(SupportConceptCostBearerRelDC relDC, ServiceRecordDC sr, DateTimeSpan span)
@@ -1458,17 +1458,17 @@ namespace BS.Shared.Services
private CostRatePeriodDC GetPreviousCrp(CostRatePeriodDC crp, List allCrpList)
{
var oldList = allCrpList.GetOldRates(crp.CostRateType).OrderBy(i => i.EndDate);
-
+
if (!crp.EndDate.HasValue)
return oldList.LastOrDefault(c => c.EndDate.HasValue);
else
return oldList.LastOrDefault(c => c.EndDate < crp.EndDate);
-
+
}
public virtual void CalculateApprovedAmounts(AccountingPeriod ap, SupportConceptApprovalPeriodDC scap)
{
- ap.SupportConceptApprovalPeriod = scap;
+ ap.SupportConceptApprovalPeriod = scap;
if (scap.ApprovedBETotal.HasValue)
{
@@ -1519,8 +1519,8 @@ namespace BS.Shared.Services
public virtual decimal? GetApprovedAmount(AccountingPeriod ap, SupportConceptApprovalPeriodDC scap)
{
- decimal t1, t2;
-
+ decimal t1, t2;
+
return scap.ApprovedFixedAmount.HasValue
? this.GetApprovedFixedAmountForPeriod(scap, ap.PeriodStart, ap.PeriodEnd, out t1, out t2)
: this.GetApprovedAmountDefaultHourlyRateForPeriod(scap, ap.CostRatesInPeriod, ap.PeriodStart, ap.PeriodEnd);
@@ -1537,46 +1537,46 @@ namespace BS.Shared.Services
- public virtual int GetRoundedDuration(DataContracts.Compact.CompactOrganisationDC org, decimal durationInMinutes)
- {
- int minuteInterval = org.ActualMinuteIntervall;
- return GetRoundedDuration(minuteInterval, durationInMinutes);
- }
+ public virtual int GetRoundedDuration(DataContracts.Compact.CompactOrganisationDC org, decimal durationInMinutes)
+ {
+ int minuteInterval = org.ActualMinuteIntervall;
+ return GetRoundedDuration(minuteInterval, durationInMinutes);
+ }
- public virtual int GetRoundedDuration(int minuteInterval, decimal durationInMinutes)
- {
- decimal lRoundedDuration = durationInMinutes;
+ public virtual int GetRoundedDuration(int minuteInterval, decimal durationInMinutes)
+ {
+ decimal lRoundedDuration = durationInMinutes;
- if (minuteInterval > 0)
- {
- lRoundedDuration = durationInMinutes % minuteInterval != 0
- ? durationInMinutes + (minuteInterval - (durationInMinutes % minuteInterval))
- : durationInMinutes;
- }
+ if (minuteInterval > 0)
+ {
+ lRoundedDuration = durationInMinutes % minuteInterval != 0
+ ? durationInMinutes + (minuteInterval - (durationInMinutes % minuteInterval))
+ : durationInMinutes;
+ }
- return (int)Math.Round(lRoundedDuration, 0, MidpointRounding.AwayFromZero);
- }
+ return (int)Math.Round(lRoundedDuration, 0, MidpointRounding.AwayFromZero);
+ }
- public static AccountingIntervalType ConvertApprovalToAccountingIntervalType(SupportConceptApprovalInterval supportConceptApprovalInterval)
- {
- switch (supportConceptApprovalInterval)
- {
- case SupportConceptApprovalInterval.Daily:
- return AccountingIntervalType.Daily;
- case SupportConceptApprovalInterval.Weekly:
- return AccountingIntervalType.Weekly;
- case SupportConceptApprovalInterval.Fortnightly:
- return AccountingIntervalType.Fortnightly;
- case SupportConceptApprovalInterval.Monthly:
- return AccountingIntervalType.Monthly;
- case SupportConceptApprovalInterval.Quarterly:
- return AccountingIntervalType.Quarterly;
- case SupportConceptApprovalInterval.HalfYearly:
- return AccountingIntervalType.HalfYearly;
- default:
- return AccountingIntervalType.Yearly;
- }
- }
+ public static AccountingIntervalType ConvertApprovalToAccountingIntervalType(SupportConceptApprovalInterval supportConceptApprovalInterval)
+ {
+ switch (supportConceptApprovalInterval)
+ {
+ case SupportConceptApprovalInterval.Daily:
+ return AccountingIntervalType.Daily;
+ case SupportConceptApprovalInterval.Weekly:
+ return AccountingIntervalType.Weekly;
+ case SupportConceptApprovalInterval.Fortnightly:
+ return AccountingIntervalType.Fortnightly;
+ case SupportConceptApprovalInterval.Monthly:
+ return AccountingIntervalType.Monthly;
+ case SupportConceptApprovalInterval.Quarterly:
+ return AccountingIntervalType.Quarterly;
+ case SupportConceptApprovalInterval.HalfYearly:
+ return AccountingIntervalType.HalfYearly;
+ default:
+ return AccountingIntervalType.Yearly;
+ }
+ }
public virtual Dictionary GetAbsencesTimesNotBillable(IList absenceTimeDcs)
{
@@ -1585,11 +1585,11 @@ namespace BS.Shared.Services
{
DateTimeSpan span = new DateTimeSpan();
- if (at.Start.HasValue)
+ if (at.Start.HasValue && at.Start.Value <= DateTime.MaxValue.AddDays(-1))
{
span.StartDateTime = at.Start.Value.AddDays(1).Date;
}
- if (at.End.HasValue)
+ if (at.End.HasValue && at.End.Value > DateTime.MinValue.AddDays(1))
{
span.EndDateTime = at.End.Value.AddDays(-1).Date;
}
@@ -1618,13 +1618,17 @@ namespace BS.Shared.Services
var lResult = new List();
DateTime startDate = span.StartDate;
- DateTime endDate = span.StartDate.AddDays(6);
+ DateTime endDate = span.StartDate;
+ if (span.StartDate < DateTime.MaxValue.AddDays(-6))
+ {
+ endDate = span.StartDate.AddDays(6);
+ }
DateTime totalEnddate = span.EndDate;
- if (totalEnddate == DateTime.MaxValue.Date)
+ if (totalEnddate == DateTime.MaxValue.Date && span.StartDate < DateTime.MaxValue.AddYears(-1))
totalEnddate = span.StartDate.AddYears(1);
- while (startDate <= totalEnddate)
+ while (startDate <= totalEnddate && startDate < DateTime.MaxValue)
{
var lCurrentWorkWeek = new DateTimeSpan
{
@@ -1637,8 +1641,16 @@ namespace BS.Shared.Services
}
lResult.Add(lCurrentWorkWeek);
- startDate = endDate.AddDays(1);
- endDate = startDate.AddDays(6);
+ if (endDate < DateTime.MaxValue.Date.AddDays(-7))
+ {
+ startDate = endDate.AddDays(1);
+ endDate = startDate.AddDays(6);
+ }
+ else
+ {
+ startDate = DateTime.MaxValue;
+ }
+
}
return lResult;
diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj
index 14885db06..e1e23b0e3 100644
--- a/Shared/Shared.csproj
+++ b/Shared/Shared.csproj
@@ -158,6 +158,7 @@
+
@@ -188,6 +189,7 @@
+