From 4a11fe34d59e1b2db2244988102abb267df55f6e Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 5 Nov 2024 14:26:49 +0100 Subject: [PATCH] =?UTF-8?q?-=20Warnung=20beim=20L=C3=B6schen=20von=20Leist?= =?UTF-8?q?ungen=20und=20Leistungskategorie=20eingebaut=20-=20HPH=20Bersen?= =?UTF-8?q?br=C3=BCck=20Helferentgelt=20Auswertung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWo/ServiceProxy/Generated.cs | 13 + BeWo/View/Detail/ServiceCategoryView.xaml | 2 + BeWo/View/Detail/ServiceCategoryView.xaml.cs | 16 + .../Detail/ServiceDescriptionView.xaml.cs | 26 +- BeWoPlanerMobil/BeWoPlanerMobil.csproj.user | 2 +- Data/Access/SearchDAO.cs | 14 + ..._2024_11_04 InboiceNumber_Unique_Index.txt | 4 + ReportImp/HPHBersenbrueck/Finanzauswertung.cs | 38 +- .../AuswertungSelbstzahler.cs | 26 +- .../Helferentgelt.Designer.cs | 376 ++++++++++++++---- .../Helferentgelt.cs | 46 +-- .../Helferentgelt.resx | 3 - .../HelferentgeltRO.cs | 18 +- .../CustomServiceRecordValidator.cs | 12 + .../Invoicing/SettlementInvoiceCreation.cs | 17 +- Service/Plugins/OperationService.cs | 44 ++ .../ServiceContracts/IOperationsService.cs | 4 + .../OperationsServiceImp.cs | 16 + .../CheckObjectDeletionResultDC.cs | 17 + Shared/Shared.csproj | 1 + 20 files changed, 546 insertions(+), 149 deletions(-) create mode 100644 Model/Changes_2024_11_04 InboiceNumber_Unique_Index.txt create mode 100644 Shared/DataContracts/CheckObjectDeletionResultDC.cs diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs index 84a2ed882..1a9131af4 100644 --- a/BeWo/ServiceProxy/Generated.cs +++ b/BeWo/ServiceProxy/Generated.cs @@ -1755,6 +1755,7 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Priority))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Status))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.QBFilterEnum))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GkvVerfahrensstufe))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactWohnheimDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] @@ -1915,6 +1916,7 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SignatureDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AiChatDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AiSettingsDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CheckObjectDeletionResultDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ConfirmationReceiptSignatureDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] @@ -5521,6 +5523,10 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateAiSettingsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] BS.Shared.DataContracts.AiSettingsDC UpdateAiSettings(BS.Shared.DataContracts.AiSettingsDC settings); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CheckObjectDeletionAllowed", ReplyAction="http://tempuri.org/IOperationsService/CheckObjectDeletionAllowedResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CheckObjectDeletionAllowedBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + BS.Shared.DataContracts.CheckObjectDeletionResultDC CheckObjectDeletionAllowed(long objectoid, BS.Shared.TableID tableId); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeleteCertainDienstEintragOutOfTable", ReplyAction="http://tempuri.org/IOperationsService/DeleteCertainDienstEintragOutOfTableRespons" + "e")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeleteCertainDienstEintragOutOfTableBeWoFau" + @@ -5982,6 +5988,7 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Priority))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Status))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.QBFilterEnum))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GkvVerfahrensstufe))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactWohnheimDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] @@ -6142,6 +6149,7 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SignatureDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AiChatDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AiSettingsDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CheckObjectDeletionResultDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ConfirmationReceiptSignatureDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] @@ -7590,6 +7598,11 @@ namespace BeWo.ServiceProxy return base.Channel.UpdateAiSettings(settings); } + public BS.Shared.DataContracts.CheckObjectDeletionResultDC CheckObjectDeletionAllowed(long objectoid, BS.Shared.TableID tableId) + { + return base.Channel.CheckObjectDeletionAllowed(objectoid, tableId); + } + public void DeleteCertainDienstEintragOutOfTable(long dienstEintragOid) { base.Channel.DeleteCertainDienstEintragOutOfTable(dienstEintragOid); diff --git a/BeWo/View/Detail/ServiceCategoryView.xaml b/BeWo/View/Detail/ServiceCategoryView.xaml index 46c1eb10c..6d30f053c 100644 --- a/BeWo/View/Detail/ServiceCategoryView.xaml +++ b/BeWo/View/Detail/ServiceCategoryView.xaml @@ -22,6 +22,7 @@ + @@ -136,6 +137,7 @@ + diff --git a/BeWo/View/Detail/ServiceCategoryView.xaml.cs b/BeWo/View/Detail/ServiceCategoryView.xaml.cs index d7b013e9c..1cb9db6f7 100644 --- a/BeWo/View/Detail/ServiceCategoryView.xaml.cs +++ b/BeWo/View/Detail/ServiceCategoryView.xaml.cs @@ -84,6 +84,22 @@ namespace BeWo.View.Detail var lVM = datagrid_categories.GetCurrentValue(); if (lVM != null) { + if (!lVM.IsNew) + { + var result = ServiceFacade.DoOperationsServiceSync(s => s.CheckObjectDeletionAllowed(lVM.DataContract.ServiceCategoryOid.Value, BS.Shared.TableID.ServiceCategory)); + if (!result.DeletionAllowed) + { + if (!String.IsNullOrEmpty(result.Message)) + { + MessageBox.Show(result.Message, "Löschen", MessageBoxButton.OK, MessageBoxImage.Exclamation); + } + return; + } + else if (!String.IsNullOrEmpty(result.Message) && MessageBox.Show(result.Message, "Löschen", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No) + { + return; + } + } ViewModel.VMList.Remove(lVM); BeWoWpfUtils.RefreshDXGrid(datagrid_categories); } diff --git a/BeWo/View/Detail/ServiceDescriptionView.xaml.cs b/BeWo/View/Detail/ServiceDescriptionView.xaml.cs index e41b33fee..7661c3093 100644 --- a/BeWo/View/Detail/ServiceDescriptionView.xaml.cs +++ b/BeWo/View/Detail/ServiceDescriptionView.xaml.cs @@ -85,8 +85,30 @@ namespace BeWo.View.Detail private void DeleteButton_Click(object sender, RoutedEventArgs e) { - ViewModel.VMList.Remove(datagrid_descriptions.GetCurrentValue()); - BeWoWpfUtils.RefreshDXGrid(datagrid_descriptions); + var lVM = datagrid_descriptions.GetCurrentValue(); + if (lVM != null) + { + + if (!lVM.IsNew) + { + var result = ServiceFacade.DoOperationsServiceSync(s => s.CheckObjectDeletionAllowed(lVM.DataContract.ServiceDescriptionOid.Value, BS.Shared.TableID.ServiceDescription)); + if (!result.DeletionAllowed) + { + if (!String.IsNullOrEmpty(result.Message)) + { + MessageBox.Show(result.Message, "Löschen", MessageBoxButton.OK, MessageBoxImage.Exclamation); + } + return; + } + else if (!String.IsNullOrEmpty(result.Message) && MessageBox.Show(result.Message, "Löschen", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No) + { + return; + } + } + ViewModel.VMList.Remove(lVM); + BeWoWpfUtils.RefreshDXGrid(datagrid_descriptions); + } + } private void ReloadViewModel() diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user index 033eb78ef..2763ebb1b 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user @@ -8,7 +8,7 @@ - Release|Any CPU + Debug|Any CPU ShowAllFiles 600 MvcControllerEmptyScaffolder diff --git a/Data/Access/SearchDAO.cs b/Data/Access/SearchDAO.cs index 515685497..58cf003ed 100644 --- a/Data/Access/SearchDAO.cs +++ b/Data/Access/SearchDAO.cs @@ -5987,5 +5987,19 @@ namespace BeWo.Data.Access return criteria.List().ToList(); } + + public long GetServiceRecordCountForServiceCategory(long catOid) + { + var sql = $"SELECT COUNT(sr.oid) FROM ServiceRecord sr join ServiceDescription sd on sr.ServiceDescriptionOid = sd.Oid WHERE sd.ServiceCategoryOid = {catOid}"; + var q = Session.CreateSQLQuery(sql); + return q.List().First(); + } + + public long GetServiceRecordCountForServiceDescription(long descOid) + { + var sql = $"SELECT COUNT(sr.oid) FROM ServiceRecord sr WHERE sr.ServiceDescriptionOid = {descOid}"; + var q = Session.CreateSQLQuery(sql); + return q.List().First(); + } } } diff --git a/Model/Changes_2024_11_04 InboiceNumber_Unique_Index.txt b/Model/Changes_2024_11_04 InboiceNumber_Unique_Index.txt new file mode 100644 index 000000000..358763066 --- /dev/null +++ b/Model/Changes_2024_11_04 InboiceNumber_Unique_Index.txt @@ -0,0 +1,4 @@ +-- Falls benötigt, kann das auf Kundendatenbanken ausgeführt werden. Läuft nur durch, wenn nicht bereits doppelte Rechnungsnummern vergeben wurden + +ALTER TABLE `invoicebase` +ADD UNIQUE INDEX `UNIQUE_INVOICENUMBER` (`InvoiceNumber` ASC) ; \ No newline at end of file diff --git a/ReportImp/HPHBersenbrueck/Finanzauswertung.cs b/ReportImp/HPHBersenbrueck/Finanzauswertung.cs index 9f79a2edd..330593783 100644 --- a/ReportImp/HPHBersenbrueck/Finanzauswertung.cs +++ b/ReportImp/HPHBersenbrueck/Finanzauswertung.cs @@ -27,19 +27,34 @@ namespace HphBersenbrueck public void SetReportDataSource(FinanceRO pRO) { pRO.CalculatePaidAmountInReportTimeSpan(); - + if (pRO.SupportConceptFinanceList != null) { + var alleTeamBrueckenort = new List(); + foreach (var scRo in pRO.SupportConceptFinanceList) { if (scRo.Costbearer2Supportconcept != null) { CalculateBillableAmountInReportTimeSpan(scRo, pRO.ReportStartDate.Value, pRO.ReportEndDate.Value); + String teams = GetTeam(scRo.Costbearer2Supportconcept); + + if (!String.IsNullOrEmpty(teams) && teams.Contains("Brückenort")) + { + alleTeamBrueckenort.Add(scRo); + } } scRo.Custom1 = scRo.CostBearerName; } + + foreach (var item in alleTeamBrueckenort) + { + pRO.SupportConceptFinanceList.Remove(item); + } } + + if (pRO.ReportStartDate.HasValue && pRO.ReportEndDate.HasValue) { @@ -84,7 +99,26 @@ namespace HphBersenbrueck this.bindingSource1.DataSource = pRO; } - private void CalculateBillableAmountInReportTimeSpan(FinanceRO.SupportConceptFinanceRO scRo, DateTime start, DateTime end) + + private string GetTeam(SupportConceptCostBearerRelDC c2s) + { + //return c2s.SupportConcept.Customer.Teams; + + var c = DAOFactory.GenericDAO.LoadByID(c2s.SupportConcept.Customer.Oid.Value); + + String teams = ""; + foreach (var t2c in c.Team2CustomerList) + { + if (teams.Length > 0) + { + teams += ", "; + } + teams += t2c.Team.Name; + } + return teams; + } + + private void CalculateBillableAmountInReportTimeSpan(FinanceRO.SupportConceptFinanceRO scRo, DateTime start, DateTime end) { Dictionary> dict = new Dictionary>(); CompactSupportConceptDC sc = CreateCompactSupportConcept(scRo.Costbearer2Supportconcept); diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/AuswertungSelbstzahler.cs b/ReportImp/HphBersenbrueckFreizeitUndReisen/AuswertungSelbstzahler.cs index 581edf020..0ca2a4dd5 100644 --- a/ReportImp/HphBersenbrueckFreizeitUndReisen/AuswertungSelbstzahler.cs +++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/AuswertungSelbstzahler.cs @@ -268,23 +268,23 @@ namespace HphBersenbrueckFreizeitUndReisen } } - xrTableRowGesamt.Cells[(index * 2) + 7].Text = String.Format("{0:0.00}", gesamtEbnMonat); - xrTableRowGesamt.Cells[(index * 2) + 8].Text = String.Format("{0:0.00}", gesamtEbhMonat); - xrTableRowGesamt.Cells[(anzahlMonate * 2) + index + 9].Text = String.Format("{0:0.00}", gesamtFreiMonat); - xrTableRowGesamt.Cells[(anzahlMonate * 3) + index + 11].Text = String.Format("{0:0.00}", gesamtFundAMonat); + xrTableRowGesamt.Cells[(index * 2) + 7].Text = String.Format("{0:0.00}", gesamtEbnMonat); // 7 + xrTableRowGesamt.Cells[(index * 2) + 8].Text = String.Format("{0:0.00}", gesamtEbhMonat); // 8 + xrTableRowGesamt.Cells[(anzahlMonate * 2) + index + 9].Text = String.Format("{0:0.00}", gesamtFreiMonat); // 11 + xrTableRowGesamt.Cells[(anzahlMonate * 3) + index + 11].Text = String.Format("{0:0.00}", gesamtFundAMonat); // 14 } index++; datum = datum.AddMonths(1); } - xrTableRowGesamt.Cells[(anzahlMonate * 2) + 7].Text = String.Format("{0:0.00}", stundenGesamtEb); - xrTableRowGesamt.Cells[(anzahlMonate * 2) + 8].Text = String.Format("{0:c}", preisGesamtEb); - xrTableRowGesamt.Cells[(anzahlMonate * 3) + 10].Text = String.Format("{0:c}", preisGesamtFrei); - xrTableRowGesamt.Cells[(anzahlMonate * 4) + 12].Text = String.Format("{0:c}", preisGesamtFundA); - xrTableRowGesamt.Cells[(anzahlMonate * 4) + 13].Text = String.Format("{0:c}", preisGesamtEbFreiFundA); - xrTableRowGesamt.Cells[(anzahlMonate * 4) + 14].Text = String.Format("{0:0.##}", anzUebernachtungenGesamt); - xrTableRowGesamt.Cells[(anzahlMonate * 4) + 15].Text = String.Format("{0:c}", preisGesamtKurzpflege); - xrTableRowGesamt.Cells[(anzahlMonate * 4) + 16].Text = String.Format("{0:0.##}", anzTageReisenGesamt); - xrTableRowGesamt.Cells[(anzahlMonate * 4) + 19].Text = String.Format("{0:c}", preisGesamtReise); + xrTableRowGesamt.Cells[(anzahlMonate * 2) + 7].Text = String.Format("{0:0.00}", stundenGesamtEb); // 9 (Index, bei Anzahl Monat = 1) + xrTableRowGesamt.Cells[(anzahlMonate * 2) + 8].Text = String.Format("{0:c}", preisGesamtEb); // 10 + xrTableRowGesamt.Cells[(anzahlMonate * 3) + 10].Text = String.Format("{0:c}", preisGesamtFrei); // 13 + xrTableRowGesamt.Cells[(anzahlMonate * 4) + 12].Text = String.Format("{0:c}", preisGesamtFundA); // 16 + xrTableRowGesamt.Cells[(anzahlMonate * 5) + 15].Text = String.Format("{0:c}", preisGesamtEbFreiFundA); // 17 + xrTableRowGesamt.Cells[(anzahlMonate * 5) + 16].Text = String.Format("{0:0.##}", anzUebernachtungenGesamt); // 18 + xrTableRowGesamt.Cells[(anzahlMonate * 5) + 17].Text = String.Format("{0:c}", preisGesamtKurzpflege); // 19 + xrTableRowGesamt.Cells[(anzahlMonate * 5) + 18].Text = String.Format("{0:0.##}", anzTageReisenGesamt); // 20 + xrTableRowGesamt.Cells[(anzahlMonate * 5) + 21].Text = String.Format("{0:c}", preisGesamtReise); // 23 } private void CreateDataRows(AuswertungSelbstzahlerRO result, Dictionary dict) diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.Designer.cs b/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.Designer.cs index 3be1e68e0..4e0779c38 100644 --- a/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.Designer.cs +++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.Designer.cs @@ -30,6 +30,7 @@ namespace HphBersenbrueckFreizeitUndReisen private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable(); @@ -39,7 +40,7 @@ namespace HphBersenbrueckFreizeitUndReisen this.xrTableCell77 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell76 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell81 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell82 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell86 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell85 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -53,7 +54,7 @@ namespace HphBersenbrueckFreizeitUndReisen this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -64,7 +65,7 @@ namespace HphBersenbrueckFreizeitUndReisen this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -77,9 +78,29 @@ namespace HphBersenbrueckFreizeitUndReisen this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.fieldDifferenz = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -97,7 +118,8 @@ namespace HphBersenbrueckFreizeitUndReisen // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTableDetail}); - this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.Detail1.HeightF = 20F; this.Detail1.Name = "Detail1"; this.Detail1.StylePriority.UseFont = false; @@ -110,7 +132,7 @@ namespace HphBersenbrueckFreizeitUndReisen this.xrTableDetail.Name = "xrTableDetail"; this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRowDetail}); - this.xrTableDetail.SizeF = new System.Drawing.SizeF(1109F, 20F); + this.xrTableDetail.SizeF = new System.Drawing.SizeF(1439F, 20F); this.xrTableDetail.StylePriority.UseBorders = false; this.xrTableDetail.StylePriority.UsePadding = false; this.xrTableDetail.StylePriority.UseTextAlignment = false; @@ -124,10 +146,12 @@ namespace HphBersenbrueckFreizeitUndReisen this.xrTableCell77, this.xrTableCell22, this.xrTableCell76, - this.xrTableCell81, + this.xrTableCell40, this.xrTableCell25, this.xrTableCell82, this.xrTableCell86, + this.xrTableCell45, + this.xrTableCell41, this.xrTableCell85, this.xrTableCell87}); this.xrTableRowDetail.Name = "xrTableRowDetail"; @@ -169,23 +193,23 @@ namespace HphBersenbrueckFreizeitUndReisen // xrTableCell76 // this.xrTableCell76.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.StundenLoa53", "{0:0.00}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.StundenLoA53_35700", "{0:0.00}")}); this.xrTableCell76.Name = "xrTableCell76"; this.xrTableCell76.StylePriority.UseBackColor = false; this.xrTableCell76.Text = "xrTableCell76"; this.xrTableCell76.Weight = 0.0815179141617064D; // - // xrTableCell81 + // xrTableCell25 // - this.xrTableCell81.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell25.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell81.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.KilometerLoa54", "{0:0}")}); - this.xrTableCell81.Name = "xrTableCell81"; - this.xrTableCell81.StylePriority.UseBackColor = false; - this.xrTableCell81.StylePriority.UseBorders = false; - this.xrTableCell81.Text = "xrTableCell81"; - this.xrTableCell81.Weight = 0.081517916697451551D; + this.xrTableCell25.BorderWidth = 1F; + this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.StundenLoA44_35900", "{0:0.00}")}); + this.xrTableCell25.Name = "xrTableCell25"; + this.xrTableCell25.StylePriority.UseBorders = false; + this.xrTableCell25.StylePriority.UseBorderWidth = false; + this.xrTableCell25.Weight = 0.081517917066427539D; // // xrTableCell82 // @@ -193,17 +217,17 @@ namespace HphBersenbrueckFreizeitUndReisen | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell82.BorderWidth = 1F; this.xrTableCell82.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.KurzreisenLoa44", "{0:0.00}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.StundenLoA44_35950", "{0:0.00}")}); this.xrTableCell82.Name = "xrTableCell82"; this.xrTableCell82.StylePriority.UseBackColor = false; this.xrTableCell82.StylePriority.UseBorders = false; this.xrTableCell82.StylePriority.UseBorderWidth = false; - this.xrTableCell82.Weight = 0.081517917066427539D; + this.xrTableCell82.Weight = 0.12680564826597568D; // // xrTableCell86 // this.xrTableCell86.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.StundenMinijobLoa51", "{0:0.00}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.StundenLoa51_35800", "{0:0.00}")}); this.xrTableCell86.Name = "xrTableCell86"; this.xrTableCell86.StylePriority.UseBackColor = false; this.xrTableCell86.Text = "xrTableCell86"; @@ -212,7 +236,7 @@ namespace HphBersenbrueckFreizeitUndReisen // xrTableCell85 // this.xrTableCell85.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.KilometerMinijobLoa497", "{0:0}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.KilometerLoa497", "{0:0}")}); this.xrTableCell85.Name = "xrTableCell85"; this.xrTableCell85.StylePriority.UseBackColor = false; this.xrTableCell85.Text = "xrTableCell85"; @@ -221,11 +245,11 @@ namespace HphBersenbrueckFreizeitUndReisen // xrTableCell87 // this.xrTableCell87.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.FührungszeugnisseMinijobLoa494", "{0:c}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.FührungszeugnisseLoa494", "{0:c}")}); this.xrTableCell87.Name = "xrTableCell87"; this.xrTableCell87.StylePriority.UseBackColor = false; this.xrTableCell87.Text = "xrTableCell87"; - this.xrTableCell87.Weight = 0.12137111542174259D; + this.xrTableCell87.Weight = 0.12137100485599259D; // // DetailReport // @@ -241,8 +265,7 @@ namespace HphBersenbrueckFreizeitUndReisen // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable1}); - this.GroupHeader1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold); - this.GroupHeader1.HeightF = 40F; + this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Bold); this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.RepeatEveryPage = true; this.GroupHeader1.StylePriority.UseFont = false; @@ -257,8 +280,9 @@ namespace HphBersenbrueckFreizeitUndReisen this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow2, + this.xrTableRow3, this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(1109F, 40F); + this.xrTable1.SizeF = new System.Drawing.SizeF(1439F, 100F); this.xrTable1.StylePriority.UseBackColor = false; this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UsePadding = false; @@ -273,14 +297,16 @@ namespace HphBersenbrueckFreizeitUndReisen this.xrTableCell13, this.xrTableCell20, this.xrTableCell14, - this.xrTableCell15, + this.xrTableCell37, this.xrTableCell23, this.xrTableCell16, this.xrTableCell17, + this.xrTableCell42, + this.xrTableCell6, this.xrTableCell18, this.xrTableCell19}); this.xrTableRow2.Name = "xrTableRow2"; - this.xrTableRow2.Weight = 1D; + this.xrTableRow2.Weight = 2D; // // xrTableCell11 // @@ -308,17 +334,17 @@ namespace HphBersenbrueckFreizeitUndReisen this.xrTableCell14.Text = "LoA 53"; this.xrTableCell14.Weight = 0.081517914161706381D; // - // xrTableCell15 + // xrTableCell23 // - this.xrTableCell15.Name = "xrTableCell15"; - this.xrTableCell15.Text = "LoA 54"; - this.xrTableCell15.Weight = 0.081517916697451551D; + this.xrTableCell23.Name = "xrTableCell23"; + this.xrTableCell23.Text = "LoA 44 evtl. 53"; + this.xrTableCell23.Weight = 0.081517913611247855D; // // xrTableCell16 // this.xrTableCell16.Name = "xrTableCell16"; - this.xrTableCell16.Text = "LoA 44"; - this.xrTableCell16.Weight = 0.081517913611247855D; + this.xrTableCell16.Text = "LoA 44 evtl. 53"; + this.xrTableCell16.Weight = 0.12680564472465877D; // // xrTableCell17 // @@ -346,14 +372,16 @@ namespace HphBersenbrueckFreizeitUndReisen this.xrTableCell4, this.xrTableCell21, this.xrTableCell5, - this.xrTableCell6, + this.xrTableCell39, this.xrTableCell24, this.xrTableCell7, this.xrTableCell8, + this.xrTableCell44, + this.xrTableCell31, this.xrTableCell9, this.xrTableCell10}); this.xrTableRow1.Name = "xrTableRow1"; - this.xrTableRow1.Weight = 1D; + this.xrTableRow1.Weight = 2D; // // xrTableCell2 // @@ -385,18 +413,19 @@ namespace HphBersenbrueckFreizeitUndReisen // this.xrTableCell5.Name = "xrTableCell5"; this.xrTableCell5.StylePriority.UseBackColor = false; - this.xrTableCell5.Text = "Stunden"; + this.xrTableCell5.Text = "Stunden SGB XII"; this.xrTableCell5.Weight = 0.081517914161706381D; // - // xrTableCell6 + // xrTableCell24 // - this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell24.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.StylePriority.UseBackColor = false; - this.xrTableCell6.StylePriority.UseBorders = false; - this.xrTableCell6.Text = "Kilometer"; - this.xrTableCell6.Weight = 0.081517916697451551D; + this.xrTableCell24.BorderWidth = 1F; + this.xrTableCell24.Name = "xrTableCell24"; + this.xrTableCell24.StylePriority.UseBorders = false; + this.xrTableCell24.StylePriority.UseBorderWidth = false; + this.xrTableCell24.Text = "Stunden Reisen"; + this.xrTableCell24.Weight = 0.081517913611247855D; // // xrTableCell7 // @@ -407,21 +436,21 @@ namespace HphBersenbrueckFreizeitUndReisen this.xrTableCell7.StylePriority.UseBackColor = false; this.xrTableCell7.StylePriority.UseBorders = false; this.xrTableCell7.StylePriority.UseBorderWidth = false; - this.xrTableCell7.Text = "Kurzreisen"; - this.xrTableCell7.Weight = 0.081517913611247855D; + this.xrTableCell7.Text = "Stunden Freizeitangebote"; + this.xrTableCell7.Weight = 0.12680564472465877D; // // xrTableCell8 // this.xrTableCell8.Name = "xrTableCell8"; this.xrTableCell8.StylePriority.UseBackColor = false; - this.xrTableCell8.Text = "Minijob-Stunden"; + this.xrTableCell8.Text = "Minijob-Stunden SGB XI"; this.xrTableCell8.Weight = 0.12227688930979647D; // // xrTableCell9 // this.xrTableCell9.Name = "xrTableCell9"; this.xrTableCell9.StylePriority.UseBackColor = false; - this.xrTableCell9.Text = "Minijob-Kilometer"; + this.xrTableCell9.Text = "Kilometer"; this.xrTableCell9.Weight = 0.12680564675889139D; // // xrTableCell10 @@ -437,7 +466,7 @@ namespace HphBersenbrueckFreizeitUndReisen this.Title.BorderColor = System.Drawing.SystemColors.ControlText; this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None; this.Title.BorderWidth = 1F; - this.Title.Font = new System.Drawing.Font("Times New Roman", 24F); + this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F); this.Title.ForeColor = System.Drawing.Color.Black; this.Title.Name = "Title"; // @@ -447,7 +476,7 @@ namespace HphBersenbrueckFreizeitUndReisen this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText; this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None; this.FieldCaption.BorderWidth = 1F; - this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold); + this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.FieldCaption.ForeColor = System.Drawing.Color.Black; this.FieldCaption.Name = "FieldCaption"; // @@ -457,7 +486,7 @@ namespace HphBersenbrueckFreizeitUndReisen this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText; this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None; this.PageInfo.BorderWidth = 1F; - this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F); + this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); this.PageInfo.ForeColor = System.Drawing.Color.Black; this.PageInfo.Name = "PageInfo"; // @@ -467,7 +496,7 @@ namespace HphBersenbrueckFreizeitUndReisen this.DataField.BorderColor = System.Drawing.SystemColors.ControlText; this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None; this.DataField.BorderWidth = 1F; - this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F); + this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); this.DataField.ForeColor = System.Drawing.SystemColors.ControlText; this.DataField.Name = "DataField"; // @@ -495,34 +524,195 @@ namespace HphBersenbrueckFreizeitUndReisen this.fieldDifferenz.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldDifferenz.Name = "fieldDifferenz"; // - // xrTableCell23 + // xrTableRow3 // - this.xrTableCell23.Name = "xrTableCell23"; - this.xrTableCell23.Text = "LoA 44"; - this.xrTableCell23.Weight = 0.081517913611247855D; + this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell26, + this.xrTableCell27, + this.xrTableCell28, + this.xrTableCell29, + this.xrTableCell30, + this.xrTableCell38, + this.xrTableCell32, + this.xrTableCell33, + this.xrTableCell34, + this.xrTableCell43, + this.xrTableCell15, + this.xrTableCell35, + this.xrTableCell36}); + this.xrTableRow3.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.StylePriority.UseFont = false; + this.xrTableRow3.Weight = 1D; // - // xrTableCell24 + // xrTableCell26 // - this.xrTableCell24.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell26.Multiline = true; + this.xrTableCell26.Name = "xrTableCell26"; + this.xrTableCell26.Weight = 0.036230185029749659D; + // + // xrTableCell27 + // + this.xrTableCell27.Multiline = true; + this.xrTableCell27.Name = "xrTableCell27"; + this.xrTableCell27.Weight = 0.099633005329661475D; + // + // xrTableCell28 + // + this.xrTableCell28.Multiline = true; + this.xrTableCell28.Name = "xrTableCell28"; + this.xrTableCell28.Weight = 0.099633009013175441D; + // + // xrTableCell29 + // + this.xrTableCell29.Multiline = true; + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.Text = "Kostenstelle"; + this.xrTableCell29.Weight = 0.072460370260993376D; + // + // xrTableCell30 + // + this.xrTableCell30.Multiline = true; + this.xrTableCell30.Name = "xrTableCell30"; + this.xrTableCell30.Text = "35700"; + this.xrTableCell30.Weight = 0.081517914161706381D; + // + // xrTableCell32 + // + this.xrTableCell32.Multiline = true; + this.xrTableCell32.Name = "xrTableCell32"; + this.xrTableCell32.Text = "35900"; + this.xrTableCell32.Weight = 0.081517913611247855D; + // + // xrTableCell33 + // + this.xrTableCell33.Multiline = true; + this.xrTableCell33.Name = "xrTableCell33"; + this.xrTableCell33.Text = "35950"; + this.xrTableCell33.Weight = 0.12680564472465877D; + // + // xrTableCell34 + // + this.xrTableCell34.Multiline = true; + this.xrTableCell34.Name = "xrTableCell34"; + this.xrTableCell34.Text = "35800"; + this.xrTableCell34.Weight = 0.12227688930979647D; + // + // xrTableCell35 + // + this.xrTableCell35.Multiline = true; + this.xrTableCell35.Name = "xrTableCell35"; + this.xrTableCell35.Text = "Stamm-kostenstelle"; + this.xrTableCell35.Weight = 0.12680564675889139D; + // + // xrTableCell36 + // + this.xrTableCell36.Multiline = true; + this.xrTableCell36.Name = "xrTableCell36"; + this.xrTableCell36.Text = "Stamm-kostenstelle"; + this.xrTableCell36.Weight = 0.12137111542174259D; + // + // xrTableCell37 + // + this.xrTableCell37.Multiline = true; + this.xrTableCell37.Name = "xrTableCell37"; + this.xrTableCell37.Text = "LoA 53"; + this.xrTableCell37.Weight = 0.081517916697451551D; + // + // xrTableCell38 + // + this.xrTableCell38.Multiline = true; + this.xrTableCell38.Name = "xrTableCell38"; + this.xrTableCell38.Text = "35800"; + this.xrTableCell38.Weight = 0.081517916697451551D; + // + // xrTableCell39 + // + this.xrTableCell39.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell24.BorderWidth = 1F; - this.xrTableCell24.Name = "xrTableCell24"; - this.xrTableCell24.StylePriority.UseBorders = false; - this.xrTableCell24.StylePriority.UseBorderWidth = false; - this.xrTableCell24.Text = "Reisen"; - this.xrTableCell24.Weight = 0.081517913611247855D; + this.xrTableCell39.Multiline = true; + this.xrTableCell39.Name = "xrTableCell39"; + this.xrTableCell39.StylePriority.UseBackColor = false; + this.xrTableCell39.StylePriority.UseBorders = false; + this.xrTableCell39.Text = "Stunden SGB XI"; + this.xrTableCell39.Weight = 0.081517916697451551D; // - // xrTableCell25 + // xrTableCell40 // - this.xrTableCell25.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell40.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell25.BorderWidth = 1F; - this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.ReisenLoa44", "{0:0.00}")}); - this.xrTableCell25.Name = "xrTableCell25"; - this.xrTableCell25.StylePriority.UseBorders = false; - this.xrTableCell25.StylePriority.UseBorderWidth = false; - this.xrTableCell25.Weight = 0.081517917066427539D; + this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.StundenLoA53_35800")}); + this.xrTableCell40.Multiline = true; + this.xrTableCell40.Name = "xrTableCell40"; + this.xrTableCell40.StylePriority.UseBackColor = false; + this.xrTableCell40.StylePriority.UseBorders = false; + this.xrTableCell40.Text = "xrTableCell40"; + this.xrTableCell40.Weight = 0.081517916697451551D; + // + // xrTableCell6 + // + this.xrTableCell6.Multiline = true; + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Text = "LoA 51"; + this.xrTableCell6.Weight = 0.12680564675889139D; + // + // xrTableCell15 + // + this.xrTableCell15.Multiline = true; + this.xrTableCell15.Name = "xrTableCell15"; + this.xrTableCell15.Text = "35950"; + this.xrTableCell15.Weight = 0.12680564675889139D; + // + // xrTableCell31 + // + this.xrTableCell31.Multiline = true; + this.xrTableCell31.Name = "xrTableCell31"; + this.xrTableCell31.StylePriority.UseBackColor = false; + this.xrTableCell31.Text = "Minijob-Stunden Freizeitangebote"; + this.xrTableCell31.Weight = 0.12680564675889139D; + // + // xrTableCell41 + // + this.xrTableCell41.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.StundenLoa51_35950")}); + this.xrTableCell41.Multiline = true; + this.xrTableCell41.Name = "xrTableCell41"; + this.xrTableCell41.StylePriority.UseBackColor = false; + this.xrTableCell41.Text = "xrTableCell41"; + this.xrTableCell41.Weight = 0.12680564675889139D; + // + // xrTableCell42 + // + this.xrTableCell42.Multiline = true; + this.xrTableCell42.Name = "xrTableCell42"; + this.xrTableCell42.Text = "LoA 51"; + this.xrTableCell42.Weight = 0.12680564675889139D; + // + // xrTableCell43 + // + this.xrTableCell43.Multiline = true; + this.xrTableCell43.Name = "xrTableCell43"; + this.xrTableCell43.Text = "35900"; + this.xrTableCell43.Weight = 0.12680564675889139D; + // + // xrTableCell44 + // + this.xrTableCell44.Multiline = true; + this.xrTableCell44.Name = "xrTableCell44"; + this.xrTableCell44.StylePriority.UseBackColor = false; + this.xrTableCell44.Text = "Minijob-Stunden Reisen"; + this.xrTableCell44.Weight = 0.12680564675889139D; + // + // xrTableCell45 + // + this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.StundenLoa51_35900")}); + this.xrTableCell45.Multiline = true; + this.xrTableCell45.Name = "xrTableCell45"; + this.xrTableCell45.StylePriority.UseBackColor = false; + this.xrTableCell45.Text = "xrTableCell45"; + this.xrTableCell45.Weight = 0.12680564675889139D; // // bindingSource1 // @@ -540,16 +730,18 @@ namespace HphBersenbrueckFreizeitUndReisen this.fieldDifferenz}); this.DataSource = this.bindingSource1; this.Landscape = true; - this.Margins = new System.Drawing.Printing.Margins(30, 30, 50, 51); + this.Margins = new DevExpress.Drawing.DXMargins(30F, 30F, 50F, 51F); this.PageHeight = 827; - this.PageWidth = 1169; - this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; + this.PageWidth = 2000; + this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.Custom; this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] { this.Title, this.FieldCaption, this.PageInfo, this.DataField}); - this.Version = "17.1"; + this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); @@ -576,7 +768,6 @@ namespace HphBersenbrueckFreizeitUndReisen private DevExpress.XtraReports.UI.XRTableCell xrTableCell75; private DevExpress.XtraReports.UI.XRTableCell xrTableCell77; private DevExpress.XtraReports.UI.XRTableCell xrTableCell76; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell81; private DevExpress.XtraReports.UI.XRTableCell xrTableCell82; private DevExpress.XtraReports.UI.XRTableCell xrTableCell86; private DevExpress.XtraReports.UI.XRTableCell xrTableCell85; @@ -589,7 +780,6 @@ namespace HphBersenbrueckFreizeitUndReisen private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; @@ -599,7 +789,6 @@ namespace HphBersenbrueckFreizeitUndReisen private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; @@ -610,5 +799,28 @@ namespace HphBersenbrueckFreizeitUndReisen private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; private DevExpress.XtraReports.UI.XRTableCell xrTableCell25; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell26; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell27; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell28; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell32; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell35; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell40; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell45; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell41; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell42; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell38; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell43; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell39; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell44; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; } } diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.cs b/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.cs index e5237c3a3..92cb53af2 100644 --- a/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.cs +++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.cs @@ -121,10 +121,6 @@ namespace HphBersenbrueckFreizeitUndReisen span.StartDate = reportMonat; span.EndDate = reportMonat.AddMonths(1); - if (emp.Oid.Value == 380) - { - int test = 0; - } var serviceRecords = DAOFactory.SearchDAO.FindEmployeeServiceRecords(emp.Oid.Value, span, null, null); @@ -184,26 +180,22 @@ namespace HphBersenbrueckFreizeitUndReisen } if (cont) { - if (sr.ServiceDescription.Name.Contains("Einzelbetreuung") || - sr.ServiceDescription.Name.Contains("Freizeithelfer")) + if (sr.ServiceDescription.Name.Contains("Einzelbetreuung") || sr.ServiceDescription.Name.Contains("Freizeithelfer")) { add = true; if (isMinijobber) { - ro.StundenMinijobLoa51 = (ro.StundenMinijobLoa51 ?? 0) + sr.RoundedDuration/60; - if (sr.DistanceInMeter.HasValue) - { - ro.KilometerMinijobLoa497 = (ro.KilometerMinijobLoa497 ?? 0) + - sr.DistanceInMeter.Value; - } + ro.StundenLoa51_35800 = (ro.StundenLoa51_35800 ?? 0) + sr.RoundedDuration/60; } else { - ro.StundenLoa53 = (ro.StundenLoa53 ?? 0) + sr.RoundedDuration/60; - if (sr.DistanceInMeter.HasValue) - { - ro.KilometerLoa54 = (ro.KilometerLoa54 ?? 0) + sr.DistanceInMeter.Value; - } + ro.StundenLoA53_35700 = (ro.StundenLoA53_35700 ?? 0) + sr.RoundedDuration/60; + + } + + if (sr.DistanceInMeter.HasValue) + { + ro.KilometerLoa497 = (ro.KilometerLoa497 ?? 0) + sr.DistanceInMeter.Value; } } else if (sr.ServiceDescription.Name.Contains("Führungszeugnis")) @@ -213,7 +205,7 @@ namespace HphBersenbrueckFreizeitUndReisen var preis = GetPreisVonServiceDescription(sr.ServiceDescription, reportMonat); if (preis.HasValue) { - ro.FührungszeugnisseMinijobLoa494 = (ro.FührungszeugnisseMinijobLoa494 ?? 0) + preis; + ro.FührungszeugnisseLoa494 = (ro.FührungszeugnisseLoa494 ?? 0) + preis; } } else if (sr.ServiceDescription.ServiceCategory.Name.Contains("Helferentgelt")) @@ -222,18 +214,18 @@ namespace HphBersenbrueckFreizeitUndReisen if (sr.ServiceDescription.Name.Contains("Kurzreise")) { - ro.KurzreisenLoa44 = (ro.KurzreisenLoa44 ?? 0) + sr.RoundedDuration / 60; + ro.StundenLoA44_35900 = (ro.StundenLoa51_35900 ?? 0) + sr.RoundedDuration / 60; } else if (sr.ServiceDescription.Name.Contains("Reise")) { - ro.ReisenLoa44 = (ro.ReisenLoa44 ?? 0) + sr.RoundedDuration / 60; + ro.StundenLoA44_35900 = (ro.StundenLoA44_35900 ?? 0) + sr.RoundedDuration / 60; } else { var preis = GetPreisVonServiceDescription(sr.ServiceDescription, reportMonat); if (preis.HasValue) { - ro.FührungszeugnisseMinijobLoa494 = (ro.FührungszeugnisseMinijobLoa494 ?? 0) + preis; + //ro.FührungszeugnisseMinijobLoa494 = (ro.FührungszeugnisseMinijobLoa494 ?? 0) + preis; } } //var preis = GetPreisVonServiceDescription(sr.ServiceDescription, reportMonat); @@ -253,16 +245,8 @@ namespace HphBersenbrueckFreizeitUndReisen if (sr.DistanceInMeter.HasValue) { - if (isMinijobber) - { - - ro.KilometerMinijobLoa497 = (ro.KilometerMinijobLoa497 ?? 0) + - sr.DistanceInMeter.Value; - } - else - { - ro.KilometerLoa54 = (ro.KilometerLoa54 ?? 0) + sr.DistanceInMeter.Value; - } + ro.KilometerLoa497 = (ro.KilometerLoa497 ?? 0) + sr.DistanceInMeter.Value; + } } } diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.resx b/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.resx index d25f3eba2..d58980a38 100644 --- a/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.resx +++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.resx @@ -117,7 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - \ No newline at end of file diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/HelferentgeltRO.cs b/ReportImp/HphBersenbrueckFreizeitUndReisen/HelferentgeltRO.cs index ba67610c9..1281b3cd1 100644 --- a/ReportImp/HphBersenbrueckFreizeitUndReisen/HelferentgeltRO.cs +++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/HelferentgeltRO.cs @@ -19,19 +19,23 @@ namespace HphBersenbrueckFreizeitUndReisen public String Personalnummer { get; set; } - public decimal? StundenLoa53 { get; set; } + public decimal? StundenLoA53_35700 { get; set; } - public decimal? KilometerLoa54 { get; set; } + public decimal? StundenLoA53_35800 { get; set; } - public decimal? ReisenLoa44 { get; set; } + public decimal? StundenLoA44_35900 { get; set; } - public decimal? KurzreisenLoa44 { get; set; } + public decimal? StundenLoA44_35950 { get; set; } - public decimal? StundenMinijobLoa51 { get; set; } + public decimal? StundenLoa51_35800 { get; set; } - public decimal? KilometerMinijobLoa497 { get; set; } + public decimal? StundenLoa51_35900 { get; set; } - public decimal? FührungszeugnisseMinijobLoa494 { get; set; } + public decimal? StundenLoa51_35950 { get; set; } + + public decimal? KilometerLoa497 { get; set; } + + public decimal? FührungszeugnisseLoa494 { get; set; } } } \ No newline at end of file diff --git a/ReportImp/PflegedienstWessel/Validation/CustomServiceRecordValidator.cs b/ReportImp/PflegedienstWessel/Validation/CustomServiceRecordValidator.cs index e7ae48f33..8cb20b86e 100644 --- a/ReportImp/PflegedienstWessel/Validation/CustomServiceRecordValidator.cs +++ b/ReportImp/PflegedienstWessel/Validation/CustomServiceRecordValidator.cs @@ -20,6 +20,18 @@ namespace PflegedienstWessel.Validation public override List ValidateServiceRecord(ServiceRecordDC newServiceRecord, SupportConceptStatisticsDC statistics, int maxDaysEditServiceRecordsAllowed, IList employeeOids, IList cb2scOids) { + if (newServiceRecord.End.Value > DateTime.Now) + { + var list2 = new List(); + list2.Add(new ServiceRecordValidationResultDC + { + ResultType = ServiceRecordValidationResult.Custom, + Message = "Der gewählte Zeitraum darf nicht in der Zukunft liegen." + }); + + return list2; + } + var list = base.ValidateServiceRecord(newServiceRecord, statistics, maxDaysEditServiceRecordsAllowed, employeeOids, cb2scOids); if (newServiceRecord.ServiceDescription.Category.IsBillable && newServiceRecord.RoundedDuration == 0) diff --git a/Service/Invoicing/SettlementInvoiceCreation.cs b/Service/Invoicing/SettlementInvoiceCreation.cs index 1b1a47990..907751747 100644 --- a/Service/Invoicing/SettlementInvoiceCreation.cs +++ b/Service/Invoicing/SettlementInvoiceCreation.cs @@ -907,16 +907,17 @@ namespace BeWo.Service.Invoicing // dieser Abschnitt prüft und kappt ggf. Stunden bei Ãœberschreitung Budget - unter Berücksichtigung ProzentBudget in Leistung(skategorien) var unitCountBudget = Math.Round(ii.UnitCountBudget ?? ii.UnitCount ?? 0, 2, MidpointRounding.AwayFromZero); ii.UnitCount = Math.Round(ii.UnitCount.Value, 2, MidpointRounding.AwayFromZero); - - var relation = unitCountBudget / ii.UnitCount.Value; - var gewichteteStunden = ii.UnitCount * relation; - if (gewichteteStunden > flsBudgetGesamt - flsAufgebraucht) + if (ii.UnitCount.Value > 0) { - gewichteteStunden = flsBudgetGesamt - flsAufgebraucht; - ii.UnitCount = gewichteteStunden / relation; + var relation = unitCountBudget / ii.UnitCount.Value; + var gewichteteStunden = ii.UnitCount * relation; + if (gewichteteStunden > flsBudgetGesamt - flsAufgebraucht) + { + gewichteteStunden = flsBudgetGesamt - flsAufgebraucht; + ii.UnitCount = gewichteteStunden / relation; + } + flsAufgebraucht += ii.UnitCount.Value * relation; } - flsAufgebraucht += ii.UnitCount.Value * relation; - if (ii.AmountPerUnit.HasValue) { if (!String.IsNullOrEmpty(ii.ItemDescription) && ii.ItemDescription == "Fehlkontakte" && ii.ProzentAbrechenbar.HasValue) diff --git a/Service/Plugins/OperationService.cs b/Service/Plugins/OperationService.cs index 3114f2856..cae57829c 100644 --- a/Service/Plugins/OperationService.cs +++ b/Service/Plugins/OperationService.cs @@ -200,6 +200,48 @@ namespace BeWo.Service.Plugins return GetDefaultServiceDescription(); } + public virtual CheckObjectDeletionResultDC CheckObjectDeletionAllowed(long objectoid, TableID tableId) + { + var result = new CheckObjectDeletionResultDC(); + + if (tableId == TableID.ServiceCategory) + { + result.DeletionAllowed = true; + + var count = DAOFactory.SearchDAO.GetServiceRecordCountForServiceCategory(objectoid); + if (count > 0) + { + if (count == 1) + { + result.Message = String.Format("Es existiert ein Eintrag für die gewählte Kategorie. Vorhandene Einträge werden nicht verändert. Möchten Sie die Kategorie wirklich löschen?", count); + } + else + { + result.Message = String.Format("Es existieren {0} Einträge für die gewählte Kategorie. Vorhandene Einträge werden nicht verändert. Möchten Sie die Kategorie wirklich löschen?", count); + } + } + } + else if (tableId == TableID.ServiceDescription) + { + result.DeletionAllowed = true; + + var count = DAOFactory.SearchDAO.GetServiceRecordCountForServiceCategory(objectoid); + if (count > 0) + { + if (count == 1) + { + result.Message = String.Format("Es existiert ein Eintrag für die gewählte Leistung. Vorhandene Einträge werden nicht verändert. Möchten Sie die Leistung wirklich löschen?", count); + } + else + { + result.Message = String.Format("Es existieren {0} Einträge für die gewählte Leistung. Vorhandene Einträge werden nicht verändert. Möchten Sie die Leistung wirklich löschen?", count); + } + } + } + + return result; + } + public virtual ServiceDescription GetDefaultServiceDescription() { return null; @@ -274,5 +316,7 @@ namespace BeWo.Service.Plugins return null; } + + } } \ No newline at end of file diff --git a/Service/ServiceContracts/IOperationsService.cs b/Service/ServiceContracts/IOperationsService.cs index 60ae4cf91..fdfcb8117 100644 --- a/Service/ServiceContracts/IOperationsService.cs +++ b/Service/ServiceContracts/IOperationsService.cs @@ -1388,5 +1388,9 @@ namespace BeWo.Service.ServiceContracts [OperationContract] AiSettingsDC UpdateAiSettings(AiSettingsDC settings); + [FaultContract(typeof(BeWoFault))] + [OperationContract] + CheckObjectDeletionResultDC CheckObjectDeletionAllowed(long objectoid, TableID tableId); + } } \ No newline at end of file diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs index d5a9e63e1..839f3c26f 100644 --- a/Service/ServiceImplementations/OperationsServiceImp.cs +++ b/Service/ServiceImplementations/OperationsServiceImp.cs @@ -2719,6 +2719,22 @@ namespace BeWo.Service.ServiceImplementations return validator.CheckForExistingSignature(serviceRecord); } + public CheckObjectDeletionResultDC CheckObjectDeletionAllowed(long objectoid, TableID tableId) + { + + try + { + var s = PluginLoader.FindClass(); + return s.CheckObjectDeletionAllowed(objectoid, tableId); + + } + catch (Exception e) + { + throw Utils.CreateBeWoFaultException(e); + } + + } + public List CheckExistingSettlementInvoices(ServiceRecordDC pServiceRecord) { var result = new List(); diff --git a/Shared/DataContracts/CheckObjectDeletionResultDC.cs b/Shared/DataContracts/CheckObjectDeletionResultDC.cs new file mode 100644 index 000000000..51c22f184 --- /dev/null +++ b/Shared/DataContracts/CheckObjectDeletionResultDC.cs @@ -0,0 +1,17 @@ +using System; +using System.Diagnostics; +using System.Runtime.Serialization; + +namespace BS.Shared.DataContracts +{ + [DataContract] + public class CheckObjectDeletionResultDC : IDataContract + { + [DataMember] + public bool DeletionAllowed { get; set; } + + [DataMember] + public String Message { get; set; } + + } +} diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj index 20d8aff65..edd2b59f1 100644 --- a/Shared/Shared.csproj +++ b/Shared/Shared.csproj @@ -173,6 +173,7 @@ +