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

Merge branch 'master' into feature_rene_18_ai

Browse Source 
# Conflicts:
#	BeWo/BeWo.csproj
#	BeWo/BeWoApp.xaml.cs
#	BeWo/View/Detail/EmployeeView.xaml
#	Report/app.config
#	ReportService/app.config
#	Service/ServiceImplementations/EmployeeServiceImp.cs
#	Service/app.config
#	Shared/BeWoEntityEnums.cs
#	Shared/Core/EnumTranslations.cs
This commit is contained in:
Rene Evertz
2025-09-18 14:26:33 +02:00
parent 81c04fbc0a 17ac34a242
commit 68866e8f28
978 changed files with 103693 additions and 57198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
BeWo/BeWoApp.xaml.cs
View File

@@ -56,9 +56,8 @@ namespace BeWo
public static LoginControl LoginControl;
public static MainControl MainControl;
public static string ShortVersion = "3.26";
public static string ShortVersion = "3.27.2";
public static string Version => BeWoAppInfo.BeWoAppVersion.ToString();
public static int RenderTier = 0;
internal static string IpAddress = string.Empty;
@@ -308,6 +307,12 @@ namespace BeWo
anzTageZeiterfassErfolgt = resultzeitplan;
}
val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.AnzTageUnterschriftErfolgt);
if (Int32.TryParse(val, out resultzeitplan))
{
AppSettings.AnzTageUnterschriftErfolgt = resultzeitplan;
}
val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ZeiterfassungsSchwellwert);
int resultschwell;
if (Int32.TryParse(val, out resultschwell))
@@ -538,6 +543,12 @@ namespace BeWo
val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowWohnhilfe);
AppSettings.ShowWohnhilfe = val != null && val.Equals("1");
val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowVorlagen);
AppSettings.ShowVorlagen = val != null && val.Equals("1");
val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowMitarbeiterSchwerbehindertenInfos);
AppSettings.ShowMitarbeiterSchwerbehindertenInfos = val != null && val.Equals("1");
val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowImportAbschlagszahlungen);
AppSettings.ShowImportAbschlagszahlungen = val != null && val.Equals("1");