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

Bugfix beim Speichern der Einstellungen in der Stundenübersicht

Browse Source
This commit is contained in:
Christian
2025-12-19 13:00:27 +01:00
parent ebdeb8aa6d
commit 135a2037a7
2 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
BeWo/View/Report/FLSReport/FLSReportView.xaml.cs
View File

@@ -79,10 +79,7 @@ namespace BeWo.View.Report.FLSReport
_SelectedEmployee = empDcs.FirstOrDefault(e => e.EmployeeOid == config.EmployeeOid);
}
if (_SelectedEmployee != null)
{
popupedit_employee.Text = _SelectedEmployee.ToString();
}
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.Analysis_EmployeeOverviewAll_View) && _SelectedEmployee == null)
{
@@ -93,9 +90,14 @@ namespace BeWo.View.Report.FLSReport
else if (_SelectedEmployee == null)
{
checkbox_all.IsChecked = true;
}
checkbox_archivierte_mitarbeiter.IsChecked = config.ShouldAnalyzeArchivedEmployees;
}
if (_SelectedEmployee != null)
{
popupedit_employee.Text = _SelectedEmployee.ToString();
}
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.Analysis_AllowFLSOverviewForCostbearer))
{
@@ -757,6 +759,21 @@ namespace BeWo.View.Report.FLSReport
}
}
var defaultConfig = CreateDefaultConfig();
if (configDc.StartDate.HasValue)
{
configDc.StartDate = configDc.StartDate.Value.Date;
}
if (configDc.EndDate.HasValue)
{
configDc.EndDate = configDc.EndDate.Value.Date;
}
if (defaultConfig.StartDate.Value.Date == configDc.StartDate && defaultConfig.EndDate.Value.Date == configDc.EndDate)
{
configDc.StartDate = null;
configDc.EndDate = null;
}
BeWoApp.AppSettings.DefaultFlsAnalysisConfig = configDc;
BeWoApp.SaveAppSettings();

21
Shared/Core/UserSettingsUtils.cs
View File

@@ -161,10 +161,11 @@ namespace BS.Shared.Core
SetSettingValue(SettingsType.FlsDefaultFilterSettings, "ShowOnlyMarker", config.ShowOnlyMarker ? "1" : "0", settings);
SetSettingValue(SettingsType.FlsDefaultFilterSettings, "ShowEinheitInMinuten", config.ShowEinheitInMinuten ? "1" : "0", settings);
SetSettingValue(SettingsType.FlsDefaultFilterSettings, "ShowOnlyDeleted", config.ShowOnlyDeleted ? "1" : "0", settings);
SetSettingValue(SettingsType.FlsDefaultFilterSettings, "ShowArchivedEmployees", config.ShouldAnalyzeArchivedEmployees ? "1" : "0", settings);
SetSettingValue(SettingsType.FlsDefaultFilterSettings, "DateInterval", config.DateInterval.HasValue ? config.DateInterval.Value.ToString() : "", settings);
SetSettingValue(SettingsType.FlsDefaultFilterSettings, "ReportType", ((int)config.ReportType).ToString(), settings);
SetSettingValue(SettingsType.FlsDefaultFilterSettings, "EmployeeOid", config.EmployeeOid.HasValue ? config.EmployeeOid.Value.ToString() : "", settings);
SetSettingValue(SettingsType.FlsDefaultFilterSettings, "CustomerOid", config.CustomerOid.HasValue ? config.CustomerOid.Value.ToString() : "", settings);
SetSettingValue(SettingsType.FlsDefaultFilterSettings, "EmployeeOid", config.EmployeeOid.HasValue ? config.EmployeeOid.Value.ToString() : "0", settings);
SetSettingValue(SettingsType.FlsDefaultFilterSettings, "CustomerOid", config.CustomerOid.HasValue ? config.CustomerOid.Value.ToString() : "0", settings);
if (config.ServiceDescriptionOids == null)
{
@@ -209,6 +210,9 @@ namespace BS.Shared.Core
val = GetSettingValue(SettingsType.FlsDefaultFilterSettings, "ShowOnlyDeleted", settings);
config.ShowOnlyDeleted = "1".Equals(val);
val = GetSettingValue(SettingsType.FlsDefaultFilterSettings, "ShowArchivedEmployees", settings);
config.ShouldAnalyzeArchivedEmployees = "1".Equals(val);
val = GetSettingValue(SettingsType.FlsDefaultFilterSettings, "DateInterval", settings);
if (val != null && Int32.TryParse(val, out var di))
{
@@ -223,15 +227,20 @@ namespace BS.Shared.Core
if (val != null && Int64.TryParse(val, out var eoid))
{
config.EmployeeOid = eoid;
if (eoid == 0)
{
config.EmployeeOid = null;
}
}
else
{
config.EmployeeOid = null;
}
val = GetSettingValue(SettingsType.FlsDefaultFilterSettings, "CustomerOid", settings);
if (val != null && Int64.TryParse(val, out var coid))
{
config.CustomerOid = coid;
if (coid == 0)
{
config.CustomerOid = null;
}
}
val = GetSettingValue(SettingsType.FlsDefaultFilterSettings, "ServiceDescriptionOids", settings);
if (val != null)