diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index 702658535..0174efb4c 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -43,12 +43,12 @@
de-DE
BeWoPlaner
ownSoft GmbH
- 2.0.1.274
+ 2.0.1.277
true
publish.htm
false
true
- 275
+ 278
2.0.1.%2a
false
true
diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs
index e46464ded..94827f71e 100644
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -58,7 +58,7 @@ namespace BeWo
public static string ShortVersion = "3.27";
- public static string Version = "Version 3.27";
+ public static string Version = "Version 3.27.2";
public static int RenderTier = 0;
public static bool IsInDesignMode = DesignerProperties.GetIsInDesignMode(new DependencyObject());
diff --git a/BeWo/LoginControl.xaml.cs b/BeWo/LoginControl.xaml.cs
index 6d5149f3b..dc44a9bc1 100644
--- a/BeWo/LoginControl.xaml.cs
+++ b/BeWo/LoginControl.xaml.cs
@@ -264,6 +264,10 @@ namespace BeWo
private static String PUB_KEY_R11 = "BA87BC5C1B0039CBCA0ACDD46710F9013CA54EA561CB26CA52FB1501B7B928F5281EED27B324183967090C08ECE03AB03B770EBDF3E53954410C4EAE41D69974DE51DBEF7BFF58BDA8B713F6DE31D5F272C9726A0B8374959C4600641499F3B1D922D9CDA892AA1C267A3FFEEF58057B089581DB710F8EFBE33109BB09BE504D5F8F91763D5A9D9E83F2E9C466B3E106664348188065A037189A9B843297B1B2BDC4F815009D2788FBE26317966C9B27674BC4DB285E69C279F0495CE02450E1C4BCA105AC7B406D00B4C2413FA758B82FC55C9BA5BB099EF1FEEBB08539FDA80AEF45C478EB652AC2CF5F3CDEE35C4D1BF70B272BAA0B4277534F796A1D87D90203010001";
+ private static String PUB_KEY_R12 = "da982874adbe94fe3be01ee2e54b75ab2c127feda703327e3697ece8318fa5138d0b992e1ecd01513d4ce5286e095531aaa5225d72f42d07c24d403cdf0123b97837f51a653234e686719d04ef84085bbd021a99eba601009a73906d8fa207a0d097d3da456181353d14f9c4c05f6adc0b961ab09fe32aeabd2ad698c79b71ab3b740f3cdbb260be5a4b4e18e9db2a735c8961659efeed3ca6cb4e6fe49ef90046b3ff194d2a63b38e66c6188570c750656f3b74e548830f08585d2d239d5ea3fee8db00a1d2f4e3194df2ee7af6279ee5cd9c2da2f27f9c17adef133739d1b4c82c41d686c0e9ec21f8591b7fb93a7c9f5c019d6204c228bd0aad3cca10ec1b0203010001";
+
+ private static String PUB_KEY_R13 = "a567708dd0568164151761cdb906d4ad19908c2650379816639254dbd9cc840593ecd3ec081ba0605143487d2bc748969eb42dda9dc8273b57a19fabf0d60ed40e30ca6f9bb1d1d6a49d323e584e356f4558687117fc3ed85d82a02fb2516cb01a5db859ce3565c88ba1af1037ffe39c5dc2491734ff8c2b8b8df0bc712c930c1d05c4bac7cdaac95e7cd1c901f79c03f6fc0a5df4da7be6db764270ebf44d22da00776fd6c95f17fdda752ea5570cf6ea5cb6e073a568cfa174e275827e109fc1f5a2eb01e938b10a44ccd3c289f54935820a34b31ce988c2474e820e0a36f0474f8af1290475dacde19a5cff5e9d9895ba9a43d04aa21705010430d332b38f0203010001";
+
private bool PinPublicKey(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslpolicyerrors)
{
@@ -284,7 +288,9 @@ namespace BeWo
pk.Contains(PUB_KEY_E5.ToLower()) ||
pk.Contains(PUB_KEY_E6.ToLower()) ||
pk.Contains(PUB_KEY_R10.ToLower()) ||
- pk.Contains(PUB_KEY_R11.ToLower()))
+ pk.Contains(PUB_KEY_R11.ToLower()) ||
+ pk.Contains(PUB_KEY_R12.ToLower()) ||
+ pk.Contains(PUB_KEY_R13.ToLower()))
{
chainContainsPk = true;
}
diff --git a/BeWo/Scheduler/ViewModel/CustomFieldStorage.cs b/BeWo/Scheduler/ViewModel/CustomFieldStorage.cs
index d190fa5a9..a79124f08 100644
--- a/BeWo/Scheduler/ViewModel/CustomFieldStorage.cs
+++ b/BeWo/Scheduler/ViewModel/CustomFieldStorage.cs
@@ -141,10 +141,7 @@ namespace BeWo.Scheduler.ViewModel
_AbsenceTimeEnd = pAppointment.AbsenceTimeEnd;
HasServiceRecordEntry = pAppointment.HasServiceRecordEntry;
- if (Subject.Contains("Flingern"))
- {
- int test = 0;
- }
+
CanBeEdited = pAppointment.CanBeEdited;
AbsenceTimeOid = pAppointment.AbsenceTimeOid;
diff --git a/BeWoDatabaseTerminator/BeWoDatabaseTerminator/Program.cs b/BeWoDatabaseTerminator/BeWoDatabaseTerminator/Program.cs
index 94377747e..d751b2355 100644
--- a/BeWoDatabaseTerminator/BeWoDatabaseTerminator/Program.cs
+++ b/BeWoDatabaseTerminator/BeWoDatabaseTerminator/Program.cs
@@ -57,13 +57,18 @@ namespace BeWoDatabaseTerminator
private const String PUB_KEY_R11 = "BA87BC5C1B0039CBCA0ACDD46710F9013CA54EA561CB26CA52FB1501B7B928F5281EED27B324183967090C08ECE03AB03B770EBDF3E53954410C4EAE41D69974DE51DBEF7BFF58BDA8B713F6DE31D5F272C9726A0B8374959C4600641499F3B1D922D9CDA892AA1C267A3FFEEF58057B089581DB710F8EFBE33109BB09BE504D5F8F91763D5A9D9E83F2E9C466B3E106664348188065A037189A9B843297B1B2BDC4F815009D2788FBE26317966C9B27674BC4DB285E69C279F0495CE02450E1C4BCA105AC7B406D00B4C2413FA758B82FC55C9BA5BB099EF1FEEBB08539FDA80AEF45C478EB652AC2CF5F3CDEE35C4D1BF70B272BAA0B4277534F796A1D87D90203010001";
+ private const String PUB_KEY_R12 = "da982874adbe94fe3be01ee2e54b75ab2c127feda703327e3697ece8318fa5138d0b992e1ecd01513d4ce5286e095531aaa5225d72f42d07c24d403cdf0123b97837f51a653234e686719d04ef84085bbd021a99eba601009a73906d8fa207a0d097d3da456181353d14f9c4c05f6adc0b961ab09fe32aeabd2ad698c79b71ab3b740f3cdbb260be5a4b4e18e9db2a735c8961659efeed3ca6cb4e6fe49ef90046b3ff194d2a63b38e66c6188570c750656f3b74e548830f08585d2d239d5ea3fee8db00a1d2f4e3194df2ee7af6279ee5cd9c2da2f27f9c17adef133739d1b4c82c41d686c0e9ec21f8591b7fb93a7c9f5c019d6204c228bd0aad3cca10ec1b0203010001";
+
+ private const String PUB_KEY_R13 = "a567708dd0568164151761cdb906d4ad19908c2650379816639254dbd9cc840593ecd3ec081ba0605143487d2bc748969eb42dda9dc8273b57a19fabf0d60ed40e30ca6f9bb1d1d6a49d323e584e356f4558687117fc3ed85d82a02fb2516cb01a5db859ce3565c88ba1af1037ffe39c5dc2491734ff8c2b8b8df0bc712c930c1d05c4bac7cdaac95e7cd1c901f79c03f6fc0a5df4da7be6db764270ebf44d22da00776fd6c95f17fdda752ea5570cf6ea5cb6e073a568cfa174e275827e109fc1f5a2eb01e938b10a44ccd3c289f54935820a34b31ce988c2474e820e0a36f0474f8af1290475dacde19a5cff5e9d9895ba9a43d04aa21705010430d332b38f0203010001";
+
+
private static bool PinPublicKey(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslpolicyerrors)
{
try
{
if (certificate == null || chain == null)
- return false;
+ return false;
bool chainContainsPk = false;
@@ -77,7 +82,9 @@ namespace BeWoDatabaseTerminator
pk.Contains(PUB_KEY_E5.ToLower()) ||
pk.Contains(PUB_KEY_E6.ToLower()) ||
pk.Contains(PUB_KEY_R10.ToLower()) ||
- pk.Contains(PUB_KEY_R11.ToLower()))
+ pk.Contains(PUB_KEY_R11.ToLower()) ||
+ pk.Contains(PUB_KEY_R12.ToLower()) ||
+ pk.Contains(PUB_KEY_R13.ToLower()))
{
chainContainsPk = true;
}
diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
index f635accd0..04bb23357 100644
--- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
+++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
@@ -8,7 +8,7 @@
- Release|Any CPU
+ Debug|Any CPU
ProjectFiles
600
MvcControllerEmptyScaffolder
diff --git a/BeWoPlanerMobil/Service/ASPHibernateSessionManager.cs b/BeWoPlanerMobil/Service/ASPHibernateSessionManager.cs
index 102139bd2..eafddf53c 100644
--- a/BeWoPlanerMobil/Service/ASPHibernateSessionManager.cs
+++ b/BeWoPlanerMobil/Service/ASPHibernateSessionManager.cs
@@ -149,16 +149,16 @@ namespace BeWoPlanerMobil.Service
private static bool ConfigureHibernateSession()
{
var tenant = MobileSessionFacade.Tenant;
-
- if(string.IsNullOrEmpty(tenant))
+ var newTenant = HttpContext.Current.Request.Params["tb_tenant"];
+ if (!String.IsNullOrEmpty(newTenant))
+ {
+ newTenant = newTenant.Trim();
+ }
+ if (string.IsNullOrEmpty(tenant) || (!String.IsNullOrEmpty(newTenant) && !newTenant.Equals(tenant)))
{
//TODO: ist bei showPin=1 null!
- tenant = HttpContext.Current.Request.Params["tb_tenant"];
- if (!String.IsNullOrEmpty(tenant))
- {
- tenant = tenant.Trim();
- }
- MobileSessionFacade.Tenant = tenant;
+ tenant = newTenant;
+ MobileSessionFacade.Tenant = newTenant;
}
if(string.IsNullOrEmpty(tenant))
diff --git a/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnung.cs
index cfc02a784..6ee05ac58 100644
--- a/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnung.cs
+++ b/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnung.cs
@@ -242,10 +242,6 @@ namespace SHKServiceSBD
DateTime dt = start;
while (dt <= ende)
{
- if (dt == new DateTime(2024, 6, 18))
- {
- int test = 0;
- }
String key = String.Format("{0}_{1:yyyyMMdd}", empDetail.Employee.Oid, dt);
if (!_SollStundenProTagDict.ContainsKey(key))
{
@@ -300,7 +296,7 @@ namespace SHKServiceSBD
protected override decimal? GetSollNachArbeitszeiten(Employee emp, DateTime start, DateTime ende)
{
var soll = base.GetSollNachArbeitszeiten(emp, start, ende);
-
+ return soll;
if (soll == null)
{
DateTime startTemp = start;
@@ -322,7 +318,6 @@ namespace SHKServiceSBD
return soll;
}
-
public virtual bool IstSchule(String name)
{
if (!String.IsNullOrEmpty(name))
@@ -721,15 +716,63 @@ namespace SHKServiceSBD
}
else
{
- foreach (var at in emp.AbsenceTimes)
+ var istArbeitstag = true;
+
+ if (arbeitstageProWoche < 5)
{
- if (at.AbsenceReason.Description.ToLower().Contains("unbezahlter urlaub") || at.AbsenceReason.Description.ToLower().Contains("krankengeld") || at.AbsenceReason.Description.ToLower().Contains("elternzeit"))
+ //Wenn Tage < 5 hole die zu arbeitenden Wochentage aus dem Stundenplan des betreuten Kindes
+
+ decimal stundenAnDiesemTag = 0;
+ foreach (var e2c in emp.Employee2CustomerList)
{
- if (at.Start.Value <= start && (!at.End.HasValue || at.End.Value >= start))
+ if ((!e2c.StartDate.HasValue || e2c.StartDate.Value.Date <= start.Date) && (!e2c.EndDate.HasValue || e2c.EndDate.Value.Date >= start.Date))
{
- if (maxDays >= 1)
+ var kind = e2c.Customer;
+
+ foreach (var az in kind.Arbeitszeiten)
{
- maxDays--;
+ if ((!az.GueltigVon.HasValue || az.GueltigVon.Value.Date <= start.Date) && (!az.GueltigBis.HasValue || az.GueltigBis.Value.Date >= start.Date))
+ {
+ istArbeitstag = false;
+ foreach (var ae in az.ArbeitszeitEintraege)
+ {
+ if (ae.Customer == null || ae.Customer.Oid == kind.Oid)
+ {
+ if (ae.IstAmGleichenWochentag(start))
+ {
+ stundenAnDiesemTag += ae.BerechneStunden();
+ }
+ }
+ }
+
+ if (stundenAnDiesemTag > 0)
+ {
+ istArbeitstag = true;
+ }
+ }
+
+ }
+ }
+
+ }
+ if (!istArbeitstag)
+ {
+ maxDays--; // Kein Arbeitstag, also Anzahl um eins verringern
+ }
+ }
+
+ if (istArbeitstag)
+ {
+ foreach (var at in emp.AbsenceTimes)
+ {
+ if (at.AbsenceReason.Description.ToLower().Contains("unbezahlter urlaub") || at.AbsenceReason.Description.ToLower().Contains("krankengeld") || at.AbsenceReason.Description.ToLower().Contains("elternzeit"))
+ {
+ if (at.Start.Value <= start && (!at.End.HasValue || at.End.Value >= start))
+ {
+ if (maxDays >= 1)
+ {
+ maxDays--;
+ }
}
}
}
diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs
index 730eed9d3..29021986b 100644
--- a/Service/Plugins/PluginLoader.cs
+++ b/Service/Plugins/PluginLoader.cs
@@ -32,7 +32,7 @@ namespace BeWo.Service.Plugins
//t = "0216265667"; // LH Hannover
//t = "1774789565"; // LH Essen
//t = "9342168675"; // ABC Betreuungen - jetzt Schubkraft
- //t = "1193188501"; // Aids Hilfe Dortmund
+ t = "1193188501"; // Aids Hilfe Dortmund
//t = "7860351957"; // SKF Alsdorf
//t = "3311520228"; // Die Düne
//t = "1352143437"; // Sewo
@@ -120,7 +120,7 @@ namespace BeWo.Service.Plugins
//t = "3536719736"; // BeWo Stefanie Schäfer (BeWoKerpen)
//t = "7739670213"; // SPZ Leverkusen
//t = "3341456098"; // Hilfe Daheim (früher BeWo Schillinger)
- t = "4271389563"; // Komm Mit
+ //t = "4271389563"; // Komm Mit
//t = "5430005891"; // Marienhospital Eickel
//t = "3265049248"; // Gerdas Pflegedienst
//t = "1549622397"; // Kontakt und Krisenhilfe
@@ -232,7 +232,7 @@ namespace BeWo.Service.Plugins
//t = "6782533512"; // LH Dorsten
//t = "5890882255"; // Fortis Nova
//t = "2422863972"; // Diakonisches Werk Mülheim (Therapeutische Wohngemeinschaft)
- t = "2141858509"; // INKOMM GmbH
+ //t = "2141858509"; // INKOMM GmbH
//t = "8975059766"; // Quer-Fällt-Ein
//t = "8928179244"; // ASB Ruhr e.V. Regionalverband
//t = "4423043131"; // Die Perspektive e.V.
@@ -352,7 +352,7 @@ namespace BeWo.Service.Plugins
//t = "3226307161"; // Roman Roger Puth
//t = "3522103738"; // AWO Münsterland-Recklinghausen
//t = "5592509446"; // Kontakt Verein für psychosoziale Hilfen e.V
- //t = "5344902949"; // SHK Service GmbH SBD
+ t = "5344902949"; // SHK Service GmbH SBD
//t = "1422963536"; // Malteser-Johanniter-Johanneshaus gGmbH
//t = "5433105975"; // aha e.V.
//t = "1701920223"; // SKFM Monheim
@@ -416,7 +416,7 @@ namespace BeWo.Service.Plugins
//t = "1654847818"; // Endart Fabrik (Dürener Verein zur Förderung der Drogen- und Jugendarbeit e.V.)
//t = "1564446804"; // Phoenix Dürener Verein e.V.
//t = "4149326792"; // AWO-Integrations gGmbH
- t = "2463764327"; // Löwenzahn Betreutes Wohnen gGmbH
+ //t = "2463764327"; // Löwenzahn Betreutes Wohnen gGmbH
return t;
#else
diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj
index e3f51a2c9..c3e6108f1 100644
--- a/Shared/Shared.csproj
+++ b/Shared/Shared.csproj
@@ -56,7 +56,7 @@
4
AllRules.ruleset
false
- x64
+ AnyCPU
true