diff --git a/.gitignore b/.gitignore
index fdb746bfd..47e7a7b2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -622,6 +622,10 @@ obj
/CustomerDlls
/Dakota/bin
/Dakota/obj
+/DakotaSender/bin
+/DakotaSender/obj
+/DakotaUnitTest/bin
+/DakotaUnitTest/obj
/BeWoDatabaseTerminator/BeWoDatabaseTerminator/bin/Debug
/BeWoDatabaseTerminator/BeWoDatabaseTerminator/bin/Release
/ReportImp/TestLWV
diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index 82c471f1a..0d83cb1d0 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -39,16 +39,16 @@
false
true
false
- https://app.ownsoft.de/test/
+ https://app.ownsoft.de/
de-DE
BeWoPlaner
ownSoft GmbH
- 2.0.1.243
+ 2.0.1.248
true
publish.htm
false
true
- 244
+ 249
2.0.1.%2a
false
true
diff --git a/BeWo/BeWo.csproj.user b/BeWo/BeWo.csproj.user
index 5b9016668..3eff8c8d2 100644
--- a/BeWo/BeWo.csproj.user
+++ b/BeWo/BeWo.csproj.user
@@ -2,7 +2,7 @@
D:\Projects\beyondsoft\BeWoPlaner\Publish\|publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\
- https://app.ownsoft.de/test/|https://app.ownsoft.de/|https://app.ownsoft.de/dev/|http://app.ownsoft.de/dev/|http://app.beyondsoft.de/dev/
+ https://app.ownsoft.de/|https://app.ownsoft.de/test/|https://app.ownsoft.de/dev/|http://app.ownsoft.de/dev/|http://app.beyondsoft.de/dev/
https://app.ownsoft.de/|https://app.ownsoft.de/bewoplaner.application/
diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs
index 761d0808d..3df3b4cfb 100644
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -50,7 +50,7 @@ namespace BeWo
public static MainControl MainControl;
public static string ShortVersion = "3.21";
- public static string Version = "Version 3.21 (GKV Test)";
+ public static string Version = "Version 3.21.4";
public static int RenderTier = 0;
@@ -596,6 +596,7 @@ namespace BeWo
AppSettings.AllowStorno = true;
AppSettings.ShowAI = true;
AppSettings.ShowAIInternal = true;
+ AppSettings.ShowWorktime = true;
//showInfoButtonInCalender = true;
#endif
@@ -646,7 +647,7 @@ namespace BeWo
String url = "";
#if DEBUG
url = String.Format("http://localhost:3777/Host");
- //return new Uri("https://app5.bewoplaner.de/service");
+ //return new Uri("https://app4.bewoplaner.de/service");
//url = String.Format("app1.bewoplaner.de/service");
#endif
@@ -855,9 +856,6 @@ namespace BeWo
{
if (MainControl != null)
{
-
-
-
MainControl.Dispatcher.BeginInvoke(DispatcherPriority.Normal, (Action) (() =>
{
UserControl exControl = null;
@@ -924,7 +922,7 @@ namespace BeWo
base.OnStartup(e);
//AppDomain.CurrentDomain.UnhandledException += (s, ex) => ShowError(null, ex.ExceptionObject as Exception, true);
-
+
Dispatcher.UnhandledException += (s, ex)
=>
{
@@ -1158,7 +1156,11 @@ namespace BeWo
{
abc.Close();
}
- }
+ else if (abc.Title.IndexOf("Popup") >= 0)
+ {
+ abc.Close();
+ }
+ }
MainControl.HideCurrentModalViewWindows();
diff --git a/BeWo/Core/Service/Cache.cs b/BeWo/Core/Service/Cache.cs
index 837c44ef3..2b4b7c043 100644
--- a/BeWo/Core/Service/Cache.cs
+++ b/BeWo/Core/Service/Cache.cs
@@ -347,7 +347,8 @@ namespace BeWo.Core.Service
}
if (ve == null)
{
- return new ValueListEntryDC {TypeDescription = ""};
+ return new ValueListEntryDC {TypeDescription = "", ValueListEntryOid = oid };
+ //return new ValueListEntryDC { TypeDescription = "" };
}
return ve;
}
diff --git a/BeWo/LoginControl.xaml.cs b/BeWo/LoginControl.xaml.cs
index 166e1bb66..9bdac0380 100644
--- a/BeWo/LoginControl.xaml.cs
+++ b/BeWo/LoginControl.xaml.cs
@@ -242,12 +242,18 @@ namespace BeWo
ServicePointManager.ServerCertificateValidationCallback = PinPublicKey;
}
+ //!!!!Wenn hier neue Keys hinzugefügt werden, muss das auch in der Klasse ChatController.HauptKlassen.Chat und im DatabaseTerminator gemacht werden!!
+
private static String PUB_KEY_X3 = "3082010A02820101009CD30CF05AE52E47B7725D3783B3686330EAD735261925E1BDBE35F170922FB7B84B4105ABA99E350858ECB12AC468870BA3E375E4E6F3A76271BA7981601FD7919A9FF3D0786771C8690E9591CFFEE699E9603C48CC7ECA4D7712249D471B5AEBB9EC1E37001C9CAC7BA705EACE4AEBBD41E53698B9CBFD6D3C9668DF232A42900C867467C87FA59AB8526114133F65E98287CBDBFA0E56F68689F3853F9786AFB0DC1AEF6B0D95167DC42BA065B299043675806BAC4AF31B9049782FA2964F2A20252904C674C0D031CD8F31389516BAA833B843F1B11FC3307FA27931133D2D36F8E3FCF2336AB93931C5AFC48D0D1D641633AAFA8429B6D40BC0D87DC3930203010001";
private static String PUB_KEY_R3 = "3082010A0282010100BB021528CCF6A094D30F12EC8D5592C3F882F199A67A4288A75D26AAB52BB9C54CB1AF8E6BF975C8A3D70F4794145535578C9EA8A23919F5823C42A94E6EF53BC32EDB8DC0B05CF35938E7EDCF69F05A0B1BBEC094242587FA3771B313E71CACE19BEFDBE43B45524596A9C153CE34C852EEB5AEED8FDE6070E2A554ABB66D0E97A540346B2BD3BC66EB66347CFA6B8B8F572999F830175DBA726FFB81C5ADD286583D17C7E709BBF12BF786DCC1DA715DD446E3CCAD25C188BC60677566B3F118F7A25CE653FF3A88B647A5FF1318EA9809773F9D53F9CF01E5F5A6701714AF63A4FF99B3939DDC53A706FE48851DA169AE2575BB13CC5203F5ED51A18BDB150203010001";
private static String PUB_KEY_E1 = "04245C2DA22AFD1C4BA65D97732731ACB2A06962EF65E8A6B0F0AC4B9FFF1C0B700FD3982F4DFC0F009B37F074055732972E05EF2A4325A3FB6E342713F64F7E69D302995EEB244792C1249BE6B1218FC12481FC68CC1F69BA58F51922F774C616";
+ private static String PUB_KEY_R11 = "3082010A0282010100BA87BC5C1B0039CBCA0ACDD46710F9013CA54EA561CB26CA52FB1501B7B928F5281EED27B324183967090C08ECE03AB03B770EBDF3E53954410C4EAE41D69974DE51DBEF7BFF58BDA8B713F6DE31D5F272C9726A0B8374959C4600641499F3B1D922D9CDA892AA1C267A3FFEEF58057B089581DB710F8EFBE33109BB09BE504D5F8F91763D5A9D9E83F2E9C466B3E106664348188065A037189A9B843297B1B2BDC4F815009D2788FBE26317966C9B27674BC4DB285E69C279F0495CE02450E1C4BCA105AC7B406D00B4C2413FA758B82FC55C9BA5BB099EF1FEEBB08539FDA80AEF45C478EB652AC2CF5F3CDEE35C4D1BF70B272BAA0B4277534F796A1D87D90203010001";
+
+ private static String PUB_KEY_R10 = "3082010A0282010100CF57E5E6C45412EDB447FEC92758764650288C1D3E88DF059DD5B51829BDDDB55ABFFAF6CEA3BEAF00214B625A5A3C012FC55803F689FF8E1143EBC1B5E01407968F6F1FD7E7BA8139097565B7C2AF185B372628E7A3F4072B6D1AFFAB58BC95AE40FFE9CB57C4B55B7F780D1861BC17E754C6BB4991CD6E18D18085EEA66536BC74EABC504CEAFC21F338169394BAB0D36B3806CD16127ACA5275C8AD76B2C29C5D98455C6F617BC62DEE3C13528601D957E6381CDF8DB51F92919AE74A1CCC45A87255F0B0E6A307ECFDA71B669E3F488B71847158C93AFAEF5EF25B442B3C74E78FB247C1076ACD9AB70D96F712812651540AEC61F6F7F5E2F28AC8950D8D0203010001";
+
private bool PinPublicKey(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslpolicyerrors)
{
@@ -261,7 +267,11 @@ namespace BeWo
foreach (var element in chain.ChainElements)
{
String pk = element.Certificate.GetPublicKeyString();
- if (pk == PUB_KEY_X3 || pk == PUB_KEY_R3 || pk == PUB_KEY_E1)
+ String testx3 = PUB_KEY_X3;
+ String testr3 = PUB_KEY_R3;
+ String teste1 = PUB_KEY_E1;
+ String r11 = PUB_KEY_R11;
+ if (pk == PUB_KEY_X3 || pk == PUB_KEY_R3 || pk == PUB_KEY_E1 || pk == PUB_KEY_R11 || pk == PUB_KEY_R10)
{
chainContainsPk = true;
}
@@ -286,6 +296,58 @@ namespace BeWo
private bool CheckStatusMessage(String url)
{
+ //try
+ //{
+ // using (WebClient client = new WebClient())
+ // {
+ // //MessageBox.Show(hostAddress);
+ // byte[] response = client.UploadValues(url, "POST", new NameValueCollection());
+
+ // String message = System.Text.Encoding.UTF8.GetString(response);
+
+ // //zum testen:
+ // //using (var myFile = new StreamReader("C:\\temp\\testxaml.txt", Encoding.Default))
+ // //{
+ // // message = myFile.ReadToEnd();
+ // // myFile.Close();
+ // //}
+
+ // if (!String.IsNullOrWhiteSpace(message) && message.Trim().Length > 2)
+ // {
+ // String ende = message.Substring(message.Length - 2);
+
+ // message = message.Replace("\\n", "\n");
+ // message = message.Substring(0, message.Length - 2);
+ // MessageDialog dlg = new MessageDialog();
+
+ // if (message.Contains("<") && message.Contains(">"))
+ // {
+ // dlg.SetXaml(message);
+ // }
+ // else
+ // {
+ // dlg.Message = message;
+ // }
+
+
+
+ // dlg.ShowDialog();
+ // if (ende.EndsWith(";0"))
+ // {
+ // return false;
+ // }
+
+ // }
+
+ // }
+ //}
+ //catch (Exception ex)
+ //{
+ // //MessageBox.Show(String.Format("Fehler beim Prüfen der Kundennummer: {0}\n\n{1}", ex.Message, ex.StackTrace));
+
+ //}
+
+ //return true;
#if DEBUG
//String message = @"Sehr geehrte Kundin, sehr geehrter Kunde,
@@ -697,7 +759,7 @@ namespace BeWo
}
#if DEBUG
- if (!CheckStatusMessage(String.Format(GETSTATUSMESSAGE_URL, profile.Tenant, BeWoApp.ShortVersion)))
+ if (!CheckStatusMessage(String.Format(GETSTATUSMESSAGE_URL + "&pre", profile.Tenant, BeWoApp.ShortVersion)))
{
return;
}
@@ -1239,9 +1301,9 @@ namespace BeWo
#if DEBUG
//CB ZUM TESTEN
- //BeWoApp.Tenant = "9876543210";
- //BeWoApp.ServerName = "4";
- //BeWoApp.ServerAddress = "app4.bewoplaner.de";
+ //BeWoApp.Tenant = "6000000000";
+ //BeWoApp.ServerName = "6";
+ //BeWoApp.ServerAddress = "app6.bewoplaner.de";
#endif
SaveSelectedProfile(profile);
//button_login.IsEnabled = true;
@@ -1396,6 +1458,10 @@ namespace BeWo
Tenant = ptenant;
if (Name == null)
Name = String.Empty;
+ if (!String.IsNullOrEmpty(Tenant))
+ {
+ Tenant = Tenant.Trim();
+ }
}
public override string ToString()
diff --git a/BeWo/View/BeWoWindowBuilder.cs b/BeWo/View/BeWoWindowBuilder.cs
index c4f934be4..4ded5d01a 100644
--- a/BeWo/View/BeWoWindowBuilder.cs
+++ b/BeWo/View/BeWoWindowBuilder.cs
@@ -72,6 +72,7 @@ namespace BeWo.View
beWoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
beWoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
+ beWoWindow.Title = "Popup";
beWoWindow.rootGroupBox.Header = title;
return beWoWindow;
diff --git a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
index 2431501e6..94441d6a5 100644
--- a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
+++ b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
@@ -106,6 +106,8 @@ namespace BeWo.View.Detail.Accounting
CriteriaOperator.FromLambda(gkv => gkv.AbrechnungsZeitraumStart <= filter_start && filter_ende <= gkv.AbrechnungsZeitraumEnde));
}
}
+
+ gridView.BestFitColumns();
}
private void UpdateGkvAbrechnungList(IList dcList)
@@ -120,8 +122,6 @@ namespace BeWo.View.Detail.Accounting
datagrid_gkvAbrechnungen.Visibility = Visibility.Visible;
UpdateDataGridFilter();
-
- gridView.BestFitColumns();
});
@@ -206,6 +206,11 @@ namespace BeWo.View.Detail.Accounting
private void btn_force_send_Click(object sender, RoutedEventArgs e)
{
+#if DEBUG
+
+#else
+ return;
+#endif
var vm = datagrid_gkvAbrechnungen.GetCurrentValue();
@@ -228,7 +233,13 @@ namespace BeWo.View.Detail.Accounting
var state = dc.GetState();
- var can_send = state == GkvState.NoSend || state == GkvState.Error;
+ var can_send = false;
+
+ can_send |= state == GkvState.NoSend;
+ can_send |= state == GkvState.Error;
+#if DEBUG
+ can_send |= state == GkvState.ErrorFatal;
+#endif
if (!can_send)
{
@@ -321,7 +332,7 @@ namespace BeWo.View.Detail.Accounting
if (gkvAbrechnungVM is null)
return;
- if (!gkvAbrechnungVM.Bezahlt && DateTime.Now - gkvAbrechnungVM.ErstelltAm > TimeSpan.FromDays(28))
+ if (GkvAbrechnungVM.GetState(gkvAbrechnungVM) == GkvState.OldAndNoFeedback)
{
e.Result = Brushes.Orange;
e.Handled = true;
diff --git a/BeWo/View/Detail/Accounting/SettlementInvoiceItemEditView2.xaml b/BeWo/View/Detail/Accounting/SettlementInvoiceItemEditView2.xaml
index c8e922559..4fbd8bd12 100644
--- a/BeWo/View/Detail/Accounting/SettlementInvoiceItemEditView2.xaml
+++ b/BeWo/View/Detail/Accounting/SettlementInvoiceItemEditView2.xaml
@@ -205,7 +205,12 @@
-
+
+
+
+
+
+