From d5ab9d86adc3047f73d855cdb459b9968e608290 Mon Sep 17 00:00:00 2001 From: Lyndon Jetten Date: Wed, 20 Mar 2024 16:41:05 +0100 Subject: [PATCH] =?UTF-8?q?MoK:=20Eintr=C3=A4ge=20ohne=20Zeitangaben,=20ab?= =?UTF-8?q?er=20mit=20Dauer=20werden=20korrekt=20gespeichert.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWoPlanerMobil/Controllers/MainController.cs | 8 +++++++- Host/Host.csproj.user | 2 +- ReportImp/AutismusLeben/Properties/licenses.licx | 1 + ReportImp/ProHilfeGbR/InvoiceCustomerReport.Designer.cs | 2 +- ReportImp/ProHilfeGbR/ServiceInvoiceReport.Designer.cs | 2 +- ReportImp/ProHilfeGbR/SettlementReport.Designer.cs | 2 +- Service/Plugins/PluginLoader.cs | 6 +++--- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs index 3443e7734..5d9d4efd4 100644 --- a/BeWoPlanerMobil/Controllers/MainController.cs +++ b/BeWoPlanerMobil/Controllers/MainController.cs @@ -2480,12 +2480,18 @@ namespace BeWoPlanerMobil.Controllers Model.SelectedServiceRecord.DistanceInMeterDecimal = distanceInMeters; } - if(decimal.TryParse(durationRaw, out var duration) && + // Warum wird das alles abgefragt? + /* + if(decimal.TryParse(durationRaw, out var duration) && Model.SelectedServiceRecord != null && Model.SelectedServiceRecord.Start.HasValue && Model.SelectedServiceRecord.End.HasValue && (Model.SelectedServiceRecord.End-Model.SelectedServiceRecord.Start).Value.TotalMinutes > 0 && Model.SelectedServiceRecord.RoundedDuration == 0) + */ + if(decimal.TryParse(durationRaw, out var duration) && + Model.SelectedServiceRecord != null && + Model.SelectedServiceRecord.RoundedDuration == 0) { Model.SelectedServiceRecord.RoundedDuration = duration; } diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user index 769cd8b25..a0002e9f5 100644 --- a/Host/Host.csproj.user +++ b/Host/Host.csproj.user @@ -3,7 +3,7 @@ BeWo2.0 true - Release|Any CPU + Debug|Any CPU false diff --git a/ReportImp/AutismusLeben/Properties/licenses.licx b/ReportImp/AutismusLeben/Properties/licenses.licx index e69de29bb..d59547a61 100644 --- a/ReportImp/AutismusLeben/Properties/licenses.licx +++ b/ReportImp/AutismusLeben/Properties/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/ReportImp/ProHilfeGbR/InvoiceCustomerReport.Designer.cs b/ReportImp/ProHilfeGbR/InvoiceCustomerReport.Designer.cs index 28c5c5d51..849af9bcd 100644 --- a/ReportImp/ProHilfeGbR/InvoiceCustomerReport.Designer.cs +++ b/ReportImp/ProHilfeGbR/InvoiceCustomerReport.Designer.cs @@ -657,7 +657,7 @@ namespace ProHilfeGbR this.Margins = new System.Drawing.Printing.Margins(75, 75, 47, 100); this.PageHeight = 1169; this.PageWidth = 827; - this.PaperKind = System.Drawing.Printing.PaperKind.A4; + this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); diff --git a/ReportImp/ProHilfeGbR/ServiceInvoiceReport.Designer.cs b/ReportImp/ProHilfeGbR/ServiceInvoiceReport.Designer.cs index 7cf0e7aa7..2af0aa097 100644 --- a/ReportImp/ProHilfeGbR/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/ProHilfeGbR/ServiceInvoiceReport.Designer.cs @@ -765,7 +765,7 @@ namespace ProHilfeGbR this.Margins = new System.Drawing.Printing.Margins(75, 75, 46, 50); this.PageHeight = 1169; this.PageWidth = 827; - this.PaperKind = System.Drawing.Printing.PaperKind.A4; + this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); diff --git a/ReportImp/ProHilfeGbR/SettlementReport.Designer.cs b/ReportImp/ProHilfeGbR/SettlementReport.Designer.cs index efef58288..bf4dc975b 100644 --- a/ReportImp/ProHilfeGbR/SettlementReport.Designer.cs +++ b/ReportImp/ProHilfeGbR/SettlementReport.Designer.cs @@ -860,7 +860,7 @@ namespace ProHilfeGbR this.Margins = new System.Drawing.Printing.Margins(75, 74, 40, 100); this.PageHeight = 1169; this.PageWidth = 827; - this.PaperKind = System.Drawing.Printing.PaperKind.A4; + this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index 22d78e7a0..c81f393fa 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -153,7 +153,7 @@ namespace BeWo.Service.Plugins //t = "7381352241"; // Ressource e.V. //t = "3607551608"; // Betreuungsbüro Scholz //t = "3104936392"; // B.A.P. Bielefelder Ambulante Pflege - t = "1106039294"; // Hph Bersenbrück ATZ + //t = "1106039294"; // Hph Bersenbrück ATZ //t = "5562845955"; // Praunheimer Werkstätten //t = "4801617798"; // Severin //t = "1172092025"; // Flingern @@ -322,7 +322,7 @@ namespace BeWo.Service.Plugins //t = "9518001524"; // Sozialpädagogische Praxis Astrid Schnödewind //t = "1048483934"; // Frauenhaus e.V. EWFRA - Wohnprojekt für Frauen //t = "4293131072"; // ASB Rhein-Erft/Düren e.V. Schulbegleitung - //t = "2221228727"; // Autismus Leben gGmbH + t = "2221228727"; // Autismus Leben gGmbH //t = "5065709552"; // Biotop e.V. //t = "9094672461"; // Transkulturelles Betreuungsbüro (Toprak GmbH) //t = "9008813932"; // Aids Hilfe Giessen @@ -380,7 +380,7 @@ namespace BeWo.Service.Plugins //t = "2804185856"; // BEWO Pyramide GmbH (früher HSH Cologne / IFH Cologne) //t = "2661610871"; // Spitalstiftung Konstanz //t = "8641002030"; // PHÖNIX BeWo GbR - t = "3367947706"; // PaS - Praxis für angewandte Sozialarbeit (Ambulant betreutes Wohnen) + //t = "3367947706"; // PaS - Praxis für angewandte Sozialarbeit (Ambulant betreutes Wohnen) return t;