From 891e36c14e31202c59dd23bbc12b9797485987b4 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Thu, 10 Jun 2021 15:00:52 +0200 Subject: [PATCH] MH --- Host/Host.csproj | 9 + Report/Report.csproj | 176 +++++++++++++----- .../ServiceInvoiceReport.Designer.cs | 24 +-- 3 files changed, 153 insertions(+), 56 deletions(-) diff --git a/Host/Host.csproj b/Host/Host.csproj index 0b5613b10..1391288ee 100644 --- a/Host/Host.csproj +++ b/Host/Host.csproj @@ -228,6 +228,7 @@ BeWo.Master + ASPXCodeBehind BeWo.Master @@ -235,24 +236,28 @@ DocumentDownload.aspx + ASPXCodeBehind DocumentDownload.aspx Download.aspx + ASPXCodeBehind Download.aspx DX.aspx + ASPXCodeBehind DX.aspx Login.aspx + ASPXCodeBehind Login.aspx @@ -260,24 +265,28 @@ ReportView.aspx + ASPXCodeBehind ReportView.aspx ResetPassword.aspx + ASPXCodeBehind ResetPassword.aspx ServiceRecordEditPage.aspx + ASPXCodeBehind ServiceRecordEditPage.aspx ServiceRecordPage.aspx + ASPXCodeBehind ServiceRecordPage.aspx diff --git a/Report/Report.csproj b/Report/Report.csproj index fbf00c549..5393e9663 100644 --- a/Report/Report.csproj +++ b/Report/Report.csproj @@ -229,175 +229,261 @@ BudgetnachweisAnhang.cs - + + Component + VorlageReport.cs - + + Component + RosterReport.cs - + + Component + Abwesenheiten.cs - + + Component + AdditionalServiceBookingReport.cs - + + Component + EmployeeKilometerauswertungsListReport.cs - + + Component + KilometerauswertungsListReport.cs - + + Component + EmployeeKilometerauswertungsReport.cs - + + Component + KilometerauswertungsReport.cs - + + Component + Mitarbeiterarbeitszeitkonto.cs - + + Component + MitarbeiterstundenkontoJahr.cs - + + Component + AbsenceReport.cs - + + Component + SBDCharacteristicsReport.cs - + + Component + EmployeeDataReport.cs - + + Component + Finanzauswertung.cs - + + Component + SbdLeistungsnachweisAbrechnung.cs - + + Component + SbdRechnung.cs - + + Component + KassenbelegReport.cs - + + Component + NotizenReport.cs - + + Component + KassenbuchReport.cs - + + Component + KalenderMonatsformatReport.cs - + + Component + JahresReport.cs - + + Component + LeistungsnachweisSbd.cs - + + Component + MedikamentenverordnungslistenReport.cs - + + Component + QuittierungsbelegMitDatum.cs - + + Component + Quittierungsbeleg.cs - + + Component + Teamauslastung.cs - + + Component + Mitarbeiterauslastung.cs - + + Component + Teamstundenkonto.cs - + + Component + SettlementReport.cs - + + Component + CollectiveBillingReport.cs - + + Component + AssessmentSheetReport.cs - + + Component + Mitarbeiterstundenkonto.cs - + + Component + SettlementReport2.cs - + + Component + ServiceInvoiceReport.cs - + + Component + InvoiceCustomerReport.cs - + + Component + CustomerDataReport.cs - + + Component + FLSGroupReport.cs - + + Component + FLSListReport.cs - + + Component + QueryListReport.cs - + + Component + ServiceRecordListReport.cs - + + Component + SupportConceptReport.cs - + + Component + DailyAppointmentReportKalender.cs - + + Component + WeeklyAppointmentReport.cs @@ -405,7 +491,9 @@ - + + Component + ServicesOverviewReport.cs diff --git a/ReportImp/AmbulantBetreutesWohnenAstridPulm/ServiceInvoiceReport.Designer.cs b/ReportImp/AmbulantBetreutesWohnenAstridPulm/ServiceInvoiceReport.Designer.cs index e5e8e9d9a..2acb32774 100644 --- a/ReportImp/AmbulantBetreutesWohnenAstridPulm/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/AmbulantBetreutesWohnenAstridPulm/ServiceInvoiceReport.Designer.cs @@ -32,6 +32,7 @@ namespace AmbulantBetreutesWohnenAstridPulm System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport)); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); @@ -91,7 +92,6 @@ namespace AmbulantBetreutesWohnenAstridPulm this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); @@ -111,10 +111,18 @@ namespace AmbulantBetreutesWohnenAstridPulm this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrPictureBox1}); this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F); - this.ReportHeader.HeightF = 95.83334F; + this.ReportHeader.HeightF = 120F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // + // xrPictureBox1 + // + this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(313.0832F, 0F); + this.xrPictureBox1.Name = "xrPictureBox1"; + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(363.75F, 82.50002F); + this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // // ruleRateFactorNull // this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?"; @@ -123,7 +131,7 @@ namespace AmbulantBetreutesWohnenAstridPulm // // topMarginBand1 // - this.topMarginBand1.HeightF = 97.08333F; + this.topMarginBand1.HeightF = 90F; this.topMarginBand1.Name = "topMarginBand1"; // // bottomMarginBand1 @@ -795,14 +803,6 @@ namespace AmbulantBetreutesWohnenAstridPulm // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // - // xrPictureBox1 - // - this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(313.0832F, 0F); - this.xrPictureBox1.Name = "xrPictureBox1"; - this.xrPictureBox1.SizeF = new System.Drawing.SizeF(363.75F, 82.50002F); - this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - // // ServiceInvoiceReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -817,7 +817,7 @@ namespace AmbulantBetreutesWohnenAstridPulm this.Font = new System.Drawing.Font("Verdana", 10F); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(75, 75, 97, 50); + this.Margins = new System.Drawing.Printing.Margins(75, 75, 90, 50); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4;