From 4ddee2491486511ed177166725c45108c9652322 Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 9 Nov 2022 09:44:24 +0100 Subject: [PATCH 1/3] cb --- BeWo/BeWo.csproj | 25 - BeWo/BeWo.csproj.user | 4 +- BeWo/BeWoApp.xaml.cs | 4 +- .../AccountingTransactionBookingView.xaml.cs | 18 +- BeWo/View/Detail/EmployeeView.xaml | 4 +- .../Detail/Report/FlexibleReportView.xaml.cs | 2 +- BeWo/View/Detail/SupportConceptView.xaml | 8 +- BeWo/View/Detail/SupportConceptView.xaml.cs | 47 +- .../Zeiterfassung/ServiceRecordEditView.xaml | 4 +- .../ServiceRecordEditView.xaml.cs | 4 +- .../ServiceRecordGroupEditView.xaml | 4 +- .../ServiceRecordGroupEditView.xaml.cs | 1 + .../Zeiterfassung/ServiceRecordView2.xaml | 2 +- .../Search/TextModuleTreeSearchView.xaml.cs | 2 +- BeWo/ViewModel/ServiceRecordVM.cs | 12 +- BeWo/ownChat/ChatDokumentationsView.xaml.cs | 1 + BeWoAllReports.sln | 27 + BeWoPlanerMobil/BeWoPlanerMobil.csproj | 4 +- BeWoPlanerMobil/BeWoPlanerMobil.csproj.user | 4 +- BeWoPlanerMobil/Controllers/ChatController.cs | 164 + BeWoPlanerMobil/Web.config | 2 +- Data/Access/SearchDAO.cs | 8 +- Data/Entities/ServiceRecord.cs | 2 +- Data/Entities/ServiceRecordHistory.cs | 2 +- Data/Mappings/ServiceRecord.hbm.xml | 2 +- Data/Mappings/ServiceRecordHistory.hbm.xml | 2 +- .../EmployeeKilometerauswertungsListRO.cs | 10 +- .../EmployeeKilometerauswertungsRO.cs | 19 +- Report/ReportObjects/FLSReportRO.cs | 5 +- .../KilometerauswertungsListRO.cs | 11 +- .../ReportObjects/KilometerauswertungsRO.cs | 20 +- .../MitarbeiterstundenkontoBerechnung.cs | 4 +- Report/ReportObjects/ServiceRecordListRO.cs | 2 +- Report/ReportObjects/SupportConceptListRO.cs | 3 +- .../AbwMuenster/SettlementReport.Designer.cs | 29 +- ReportImp/AbwMuenster/SettlementReport.cs | 14 + ReportImp/BeWoNordeifel/BeWoNordeifel.csproj | 5 + .../MitarbeiterstundenkontoBerechnung.cs | 12 +- .../Service/CustomVacationService.cs | 22 + .../CaritasHeilbronnHohenlohe.csproj | 84 + .../JahresauswertungHelper.cs | 460 + ...ahresauswertungMissinglist2022.Designer.cs | 8412 +++++++++++++++++ .../JahresauswertungMissinglist2022.cs | 1742 ++++ .../JahresauswertungMissinglist2022.resx | 120 + .../Properties/AssemblyInfo.cs | 36 + .../CaritasLudwigsburgWaiblingenEnz.csproj | 84 + .../JahresauswertungHelper.cs | 460 + ...ahresauswertungMissinglist2022.Designer.cs | 8412 +++++++++++++++++ .../JahresauswertungMissinglist2022.cs | 1743 ++++ .../JahresauswertungMissinglist2022.resx | 120 + .../Properties/AssemblyInfo.cs | 36 + .../Abrechnung/CustomInvoiceCreation.cs | 313 +- .../Export/DatevExporter.cs | 39 +- .../Invoicing/FudInvoiceCreation.cs | 2 +- .../RechnungHortPrivat.Designer.cs | 38 +- .../RechnungHortPrivat.cs | 82 +- ReportImp/PflegedienstWessel/Fahrtkosten.cs | 2 +- .../PflegedienstWessel.csproj | 1 + .../Properties/licenses.licx | 1 + .../Invoicing/PflegeInvoiceCreation.cs | 36 + .../ProfEggersStiftung/RechnungPflege.cs | 35 +- ...KilometerauswertungsListReport.Designer.cs | 506 + .../SeWo/KilometerauswertungsListReport.cs | 18 + .../SeWo/KilometerauswertungsListReport.resx | 123 + ReportImp/SeWo/KilometerauswertungsReport.cs | 20 + .../KilometerauswertungsReport.designer.cs | 488 + .../SeWo/KilometerauswertungsReport.resx | 123 + ReportImp/SeWo/SeWo.csproj | 21 + ReportImp/SeWo/Zeitzuschlagsbeleg.cs | 2 +- .../HilfeplanKontingent.Designer.cs | 598 ++ .../HilfeplanKontingent.cs | 28 + .../HilfeplanKontingent.resx | 126 + .../HilfeplanKontingentRO.cs | 136 + .../Reporting/CustomReportCreator.cs | 64 +- .../UebergangshilfeUnnaEV.csproj | 11 + .../ServiceRecordDC_ServiceRecord.cs | 16 +- ...iceRecordHistoryDC_ServiceRecordHistory.cs | 3 +- Service/Plugins/FlexibleReportService.cs | 3 +- Service/Plugins/PluginLoader.cs | 6 +- .../Plugins/StundenuebersichtAuswertung.cs | 53 +- .../Plugins/SupportConceptAnalysisCreator.cs | 61 +- .../AnalysisServiceImp.cs | 3 +- .../CustomerServiceImp.cs | 9 + .../OperationsServiceImp.cs | 3 +- .../ResourceServiceImp.cs | 6 + Shared/DataContracts/FlexibleReportEntryDC.cs | 3 + Shared/DataContracts/ServiceRecordDC.cs | 6 +- .../ServiceRecordFLSOverviewDC.cs | 5 +- .../DataContracts/ServiceRecordHistoryDC.cs | 5 +- .../DataContracts/SupportConceptOverviewDC.cs | 2 + Shared/Services/Calculations.cs | 4 +- 91 files changed, 24813 insertions(+), 412 deletions(-) create mode 100644 ReportImp/BeWoNordeifel/Service/CustomVacationService.cs create mode 100644 ReportImp/CaritasHeilbronnHohenlohe/CaritasHeilbronnHohenlohe.csproj create mode 100644 ReportImp/CaritasHeilbronnHohenlohe/JahresauswertungHelper.cs create mode 100644 ReportImp/CaritasHeilbronnHohenlohe/JahresauswertungMissinglist2022.Designer.cs create mode 100644 ReportImp/CaritasHeilbronnHohenlohe/JahresauswertungMissinglist2022.cs create mode 100644 ReportImp/CaritasHeilbronnHohenlohe/JahresauswertungMissinglist2022.resx create mode 100644 ReportImp/CaritasHeilbronnHohenlohe/Properties/AssemblyInfo.cs create mode 100644 ReportImp/CaritasLudwigsburgWaiblingenEnz/CaritasLudwigsburgWaiblingenEnz.csproj create mode 100644 ReportImp/CaritasLudwigsburgWaiblingenEnz/JahresauswertungHelper.cs create mode 100644 ReportImp/CaritasLudwigsburgWaiblingenEnz/JahresauswertungMissinglist2022.Designer.cs create mode 100644 ReportImp/CaritasLudwigsburgWaiblingenEnz/JahresauswertungMissinglist2022.cs create mode 100644 ReportImp/CaritasLudwigsburgWaiblingenEnz/JahresauswertungMissinglist2022.resx create mode 100644 ReportImp/CaritasLudwigsburgWaiblingenEnz/Properties/AssemblyInfo.cs create mode 100644 ReportImp/PflegedienstWessel/Properties/licenses.licx create mode 100644 ReportImp/SeWo/KilometerauswertungsListReport.Designer.cs create mode 100644 ReportImp/SeWo/KilometerauswertungsListReport.cs create mode 100644 ReportImp/SeWo/KilometerauswertungsListReport.resx create mode 100644 ReportImp/SeWo/KilometerauswertungsReport.cs create mode 100644 ReportImp/SeWo/KilometerauswertungsReport.designer.cs create mode 100644 ReportImp/SeWo/KilometerauswertungsReport.resx create mode 100644 ReportImp/UebergangshilfeUnnaEV/HilfeplanKontingent.Designer.cs create mode 100644 ReportImp/UebergangshilfeUnnaEV/HilfeplanKontingent.cs create mode 100644 ReportImp/UebergangshilfeUnnaEV/HilfeplanKontingent.resx create mode 100644 ReportImp/UebergangshilfeUnnaEV/HilfeplanKontingentRO.cs diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 4a61fae4f..7d13b2a6b 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -29,31 +29,6 @@ 3.5 - D:\Projects\beyondsoft\BeWoPlaner\Publish\ - true - Web - true - Foreground - 7 - Days - false - true - false - http://app.beyondsoft.de/ - de-DE - BeWoPlaner - beyondSoft GmbH - 2.0.1.217 - true - publish.htm - false - true - 218 - 2.0.1.%2a - false - true - true - true true diff --git a/BeWo/BeWo.csproj.user b/BeWo/BeWo.csproj.user index 171fc3671..132b5415a 100644 --- a/BeWo/BeWo.csproj.user +++ b/BeWo/BeWo.csproj.user @@ -2,9 +2,9 @@ D:\Projects\beyondsoft\BeWoPlaner\Publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\|C:\Projects\beyondsoft\BeWoPlaner\Publish\ - http://app.beyondsoft.de/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/sbdtest/|http://app.beyondsoft.de/sbd/|http://app.beyondsoft.de/lha/ + http://app.beyondsoft.de/|http://app.beyondsoft.de/test/|https://app.ownsoft.de/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/sbdtest/ - + https://app.ownsoft.de/|https://app.ownsoft.de/bewoplaner.application/ de-DE diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index 3df89c1a5..17c4653db 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -48,8 +48,8 @@ namespace BeWo public static LoginControl LoginControl; public static MainControl MainControl; - public static string ShortVersion = "3.10"; - public static string Version = "Version 3.10"; + public static string ShortVersion = "3.11"; + public static string Version = "Version 3.11"; public static int RenderTier = 0; diff --git a/BeWo/View/Detail/AccountingTransactionBookingView.xaml.cs b/BeWo/View/Detail/AccountingTransactionBookingView.xaml.cs index 2b8854707..bb11a377c 100644 --- a/BeWo/View/Detail/AccountingTransactionBookingView.xaml.cs +++ b/BeWo/View/Detail/AccountingTransactionBookingView.xaml.cs @@ -28,6 +28,7 @@ namespace BeWo.View.Detail { public partial class AccountingTransactionBookingView { + private bool saveInProgress = false; public static Visibility InsertedOnAndByVisibility { get @@ -191,8 +192,11 @@ namespace BeWo.View.Detail accountingTransactionGrid.SelectedItem = vm; } + protected override void Save() { + saveInProgress = true; + var lToDos = new List>(); if (ViewModel.AddedCount > 0) @@ -203,7 +207,13 @@ namespace BeWo.View.Detail var oids = s.InsertNewAccountingTransactions(ViewModel.CommitAdded()); var idx = 0; - foreach (var vm in ViewModel.AccountingTransactionVMList.Where(vm => vm.IsNew)) + var newVms = ViewModel.AccountingTransactionVMList.Where(vm => vm.IsNew); + + if (newVms.Count() != oids.Count) + { + int test = 0; + } + foreach (var vm in newVms) { vm.IsNew = false; vm.DataContract.AccountingTransactionVersion = 1; @@ -378,6 +388,7 @@ namespace BeWo.View.Detail { ViewModel.PrototypeVM.Amount = null; ViewModel.PrototypeVM.Notice = string.Empty; + saveInProgress = false; } private void SelectedItemChanged(FlatSupportConceptTreeNodeDC selectedNode) @@ -445,6 +456,10 @@ namespace BeWo.View.Detail private void button_add_Click(object sender, RoutedEventArgs e) { + if (saveInProgress) + { + return; + } var lValid = ValidationTrigger.Validate(rootGrid); if (lValid) @@ -464,6 +479,7 @@ namespace BeWo.View.Detail ViewModel.AccountingTransactionVMList.Add(atvm); + Save(); ViewModel.RefreshAccountingTransactionsForSelectedTreeNode(); } diff --git a/BeWo/View/Detail/EmployeeView.xaml b/BeWo/View/Detail/EmployeeView.xaml index 6a0f0a042..890c47dfd 100644 --- a/BeWo/View/Detail/EmployeeView.xaml +++ b/BeWo/View/Detail/EmployeeView.xaml @@ -469,8 +469,8 @@ - - + + diff --git a/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs b/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs index d5e9dc236..60d57298d 100644 --- a/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs +++ b/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs @@ -714,7 +714,7 @@ namespace BeWo.View.Detail.Report public FlexibleReportEntryType Type { get; set; } - public int? Kilometer { get; set; } + public decimal? Kilometer { get; set; } public decimal? Betrag { get; set; } diff --git a/BeWo/View/Detail/SupportConceptView.xaml b/BeWo/View/Detail/SupportConceptView.xaml index 3900e01a2..9da3bf94b 100644 --- a/BeWo/View/Detail/SupportConceptView.xaml +++ b/BeWo/View/Detail/SupportConceptView.xaml @@ -88,10 +88,10 @@ - - - - + + + + Drucken diff --git a/BeWo/View/Detail/SupportConceptView.xaml.cs b/BeWo/View/Detail/SupportConceptView.xaml.cs index 077a9a938..7449f6657 100644 --- a/BeWo/View/Detail/SupportConceptView.xaml.cs +++ b/BeWo/View/Detail/SupportConceptView.xaml.cs @@ -1626,30 +1626,6 @@ namespace BeWo.View.Detail return newVm; } - private void LinkPrintRating_OnRequestNavigate(object sender, RequestNavigateEventArgs e) - { - var link = sender as Hyperlink; - if (link != null) - { - var rating = link.Tag as RatingVM; - - if (rating != null) - { - var url = BeWoApp.SiteOfOrigin + "/ReportView.aspx" - + "?scOid=" + this.ViewModel.DataContract.SupportConceptOid ?? 0 - + "rOid=" + rating.DataContract.RatingOid ?? 0 - + "&type=" + Utils.EnumName(ReportTypes.RatingReport); - url = BeWoWpfUtils.GetHTMLEncodedURL(url); - - link.NavigateUri = new Uri(url); - BeWoUtils.NavigateToReportUri((sender as System.Windows.Documents.Hyperlink).NavigateUri.ToString(), Translator.Translate("Bewertung")); - } - } - - - - //System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo((sender as System.Windows.Documents.Hyperlink).NavigateUri.ToString())); - } private void BtnDeleteRating_Click(object sender, RoutedEventArgs e) { @@ -1918,6 +1894,29 @@ namespace BeWo.View.Detail } + + + private void linkPdfExport_Click(object sender, RoutedEventArgs e) + { + var link = sender as Hyperlink; + if (link != null) + { + var rating = link.Tag as RatingVM; + + if (rating != null && rating.DataContract.RatingOid.HasValue) + { + var url = BeWoApp.SiteOfOrigin + "/ReportView.aspx" + + "?scOid=" + (this.ViewModel.DataContract.SupportConceptOid ?? 0) + + "&rOid=" + (rating.DataContract.RatingOid ?? 0) + + "&type=" + Utils.EnumName(ReportTypes.RatingReport); + url = BeWoWpfUtils.GetHTMLEncodedURL(url); + + link.NavigateUri = new Uri(url); + BeWoUtils.NavigateToReportUri((sender as System.Windows.Documents.Hyperlink).NavigateUri.ToString(), Translator.Translate("Bewertung")); + } + } + + } } public class ValueListEntryTypeToColorConverter : IValueConverter diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml b/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml index b901ade59..b93165d4c 100644 --- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml +++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml @@ -288,8 +288,8 @@