This commit is contained in:
Marcel Hirschle
2021-06-10 15:00:52 +02:00
parent a9d64eea1d
commit 891e36c14e
3 changed files with 153 additions and 56 deletions

View File

@@ -228,6 +228,7 @@
</Compile>
<Compile Include="BeWo.Master.cs">
<DependentUpon>BeWo.Master</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="BeWo.Master.designer.cs">
<DependentUpon>BeWo.Master</DependentUpon>
@@ -235,24 +236,28 @@
<Compile Include="ClientCallback.cs" />
<Compile Include="DocumentDownload.aspx.cs">
<DependentUpon>DocumentDownload.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="DocumentDownload.aspx.designer.cs">
<DependentUpon>DocumentDownload.aspx</DependentUpon>
</Compile>
<Compile Include="Download.aspx.cs">
<DependentUpon>Download.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Download.aspx.designer.cs">
<DependentUpon>Download.aspx</DependentUpon>
</Compile>
<Compile Include="DX.aspx.cs">
<DependentUpon>DX.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="DX.aspx.designer.cs">
<DependentUpon>DX.aspx</DependentUpon>
</Compile>
<Compile Include="Login.aspx.cs">
<DependentUpon>Login.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Login.aspx.designer.cs">
<DependentUpon>Login.aspx</DependentUpon>
@@ -260,24 +265,28 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ReportView.aspx.cs">
<DependentUpon>ReportView.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="ReportView.aspx.designer.cs">
<DependentUpon>ReportView.aspx</DependentUpon>
</Compile>
<Compile Include="ResetPassword.aspx.cs">
<DependentUpon>ResetPassword.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="ResetPassword.aspx.designer.cs">
<DependentUpon>ResetPassword.aspx</DependentUpon>
</Compile>
<Compile Include="ServiceRecordEditPage.aspx.cs">
<DependentUpon>ServiceRecordEditPage.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="ServiceRecordEditPage.aspx.designer.cs">
<DependentUpon>ServiceRecordEditPage.aspx</DependentUpon>
</Compile>
<Compile Include="ServiceRecordPage.aspx.cs">
<DependentUpon>ServiceRecordPage.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="ServiceRecordPage.aspx.designer.cs">
<DependentUpon>ServiceRecordPage.aspx</DependentUpon>

View File

@@ -229,175 +229,261 @@
<Compile Include="DefaultReports\BudgetnachweisAnhang.Designer.cs">
<DependentUpon>BudgetnachweisAnhang.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\VorlageReport.cs" />
<Compile Include="DefaultReports\VorlageReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\VorlageReport.Designer.cs">
<DependentUpon>VorlageReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\RosterReport.cs" />
<Compile Include="DefaultReports\RosterReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\RosterReport.Designer.cs">
<DependentUpon>RosterReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\Abwesenheiten.cs" />
<Compile Include="DefaultReports\Abwesenheiten.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\Abwesenheiten.designer.cs">
<DependentUpon>Abwesenheiten.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\AdditionalServiceBookingReport.cs" />
<Compile Include="DefaultReports\AdditionalServiceBookingReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\AdditionalServiceBookingReport.Designer.cs">
<DependentUpon>AdditionalServiceBookingReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\EmployeeKilometerauswertungsListReport.cs" />
<Compile Include="DefaultReports\EmployeeKilometerauswertungsListReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\EmployeeKilometerauswertungsListReport.Designer.cs">
<DependentUpon>EmployeeKilometerauswertungsListReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\KilometerauswertungsListReport.cs" />
<Compile Include="DefaultReports\KilometerauswertungsListReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\KilometerauswertungsListReport.Designer.cs">
<DependentUpon>KilometerauswertungsListReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\EmployeeKilometerauswertungsReport.cs" />
<Compile Include="DefaultReports\EmployeeKilometerauswertungsReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\EmployeeKilometerauswertungsReport.designer.cs">
<DependentUpon>EmployeeKilometerauswertungsReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\KilometerauswertungsReport.cs" />
<Compile Include="DefaultReports\KilometerauswertungsReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\KilometerauswertungsReport.designer.cs">
<DependentUpon>KilometerauswertungsReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\Mitarbeiterarbeitszeitkonto.cs" />
<Compile Include="DefaultReports\Mitarbeiterarbeitszeitkonto.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\Mitarbeiterarbeitszeitkonto.designer.cs">
<DependentUpon>Mitarbeiterarbeitszeitkonto.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\MitarbeiterstundenkontoJahr.cs" />
<Compile Include="DefaultReports\MitarbeiterstundenkontoJahr.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\MitarbeiterstundenkontoJahr.designer.cs">
<DependentUpon>MitarbeiterstundenkontoJahr.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\AbsenceReport.cs" />
<Compile Include="DefaultReports\AbsenceReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\AbsenceReport.Designer.cs">
<DependentUpon>AbsenceReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\SBDCharacteristicsReport.cs" />
<Compile Include="DefaultReports\SBDCharacteristicsReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\SBDCharacteristicsReport.Designer.cs">
<DependentUpon>SBDCharacteristicsReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\EmployeeDataReport.cs" />
<Compile Include="DefaultReports\EmployeeDataReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\EmployeeDataReport.Designer.cs">
<DependentUpon>EmployeeDataReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\Finanzauswertung.cs" />
<Compile Include="DefaultReports\Finanzauswertung.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\Finanzauswertung.designer.cs">
<DependentUpon>Finanzauswertung.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\Invoices\SbdLeistungsnachweisAbrechnung.cs" />
<Compile Include="DefaultReports\Invoices\SbdLeistungsnachweisAbrechnung.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\Invoices\SbdLeistungsnachweisAbrechnung.designer.cs">
<DependentUpon>SbdLeistungsnachweisAbrechnung.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\Invoices\SbdRechnung.cs" />
<Compile Include="DefaultReports\Invoices\SbdRechnung.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\Invoices\SbdRechnung.Designer.cs">
<DependentUpon>SbdRechnung.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\KassenbelegReport.cs" />
<Compile Include="DefaultReports\KassenbelegReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\KassenbelegReport.Designer.cs">
<DependentUpon>KassenbelegReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\NotizenReport.cs" />
<Compile Include="DefaultReports\NotizenReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\NotizenReport.Designer.cs">
<DependentUpon>NotizenReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\KassenbuchReport.cs" />
<Compile Include="DefaultReports\KassenbuchReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\KassenbuchReport.Designer.cs">
<DependentUpon>KassenbuchReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\KalenderMonatsformatReport.cs" />
<Compile Include="DefaultReports\KalenderMonatsformatReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\KalenderMonatsformatReport.Designer.cs">
<DependentUpon>KalenderMonatsformatReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\JahresReport.cs" />
<Compile Include="DefaultReports\JahresReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\JahresReport.designer.cs">
<DependentUpon>JahresReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\LeistungsnachweisSbd.cs" />
<Compile Include="DefaultReports\LeistungsnachweisSbd.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\LeistungsnachweisSbd.designer.cs">
<DependentUpon>LeistungsnachweisSbd.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\MedikamentenverordnungslistenReport.cs" />
<Compile Include="DefaultReports\MedikamentenverordnungslistenReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\MedikamentenverordnungslistenReport.Designer.cs">
<DependentUpon>MedikamentenverordnungslistenReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\QuittierungsbelegMitDatum.cs" />
<Compile Include="DefaultReports\QuittierungsbelegMitDatum.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\QuittierungsbelegMitDatum.Designer.cs">
<DependentUpon>QuittierungsbelegMitDatum.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\Quittierungsbeleg.cs" />
<Compile Include="DefaultReports\Quittierungsbeleg.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\Quittierungsbeleg.Designer.cs">
<DependentUpon>Quittierungsbeleg.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\Teamauslastung.cs" />
<Compile Include="DefaultReports\Teamauslastung.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\Teamauslastung.designer.cs">
<DependentUpon>Teamauslastung.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\Mitarbeiterauslastung.cs" />
<Compile Include="DefaultReports\Mitarbeiterauslastung.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\Mitarbeiterauslastung.designer.cs">
<DependentUpon>Mitarbeiterauslastung.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\Teamstundenkonto.cs" />
<Compile Include="DefaultReports\Teamstundenkonto.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\Teamstundenkonto.designer.cs">
<DependentUpon>Teamstundenkonto.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\SettlementReport.cs" />
<Compile Include="DefaultReports\SettlementReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\SettlementReport.Designer.cs">
<DependentUpon>SettlementReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\CollectiveBillingReport.cs" />
<Compile Include="DefaultReports\CollectiveBillingReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\CollectiveBillingReport.Designer.cs">
<DependentUpon>CollectiveBillingReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\AssessmentSheetReport.cs" />
<Compile Include="DefaultReports\AssessmentSheetReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\AssessmentSheetReport.Designer.cs">
<DependentUpon>AssessmentSheetReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\Mitarbeiterstundenkonto.cs" />
<Compile Include="DefaultReports\Mitarbeiterstundenkonto.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\Mitarbeiterstundenkonto.designer.cs">
<DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\SettlementReport2.cs" />
<Compile Include="DefaultReports\SettlementReport2.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\SettlementReport2.Designer.cs">
<DependentUpon>SettlementReport2.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\ServiceInvoiceReport.cs" />
<Compile Include="DefaultReports\ServiceInvoiceReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\ServiceInvoiceReport.Designer.cs">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\InvoiceCustomerReport.cs" />
<Compile Include="DefaultReports\InvoiceCustomerReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\InvoiceCustomerReport.Designer.cs">
<DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\CustomerDataReport.cs" />
<Compile Include="DefaultReports\CustomerDataReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\CustomerDataReport.Designer.cs">
<DependentUpon>CustomerDataReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\FLSGroupReport.cs" />
<Compile Include="DefaultReports\FLSGroupReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\FLSGroupReport.Designer.cs">
<DependentUpon>FLSGroupReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\FLSListReport.cs" />
<Compile Include="DefaultReports\FLSListReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\FLSListReport.Designer.cs">
<DependentUpon>FLSListReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\QueryListReport.cs" />
<Compile Include="DefaultReports\QueryListReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\QueryListReport.Designer.cs">
<DependentUpon>QueryListReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\ServiceRecordListReport.cs" />
<Compile Include="DefaultReports\ServiceRecordListReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\ServiceRecordListReport.Designer.cs">
<DependentUpon>ServiceRecordListReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\SupportConceptReport.cs" />
<Compile Include="DefaultReports\SupportConceptReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\SupportConceptReport.Designer.cs">
<DependentUpon>SupportConceptReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\DailyAppointmentReportKalender.cs" />
<Compile Include="DefaultReports\DailyAppointmentReportKalender.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\DailyAppointmentReportKalender.Designer.cs">
<DependentUpon>DailyAppointmentReportKalender.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\WeeklyAppointmentReport.cs" />
<Compile Include="DefaultReports\WeeklyAppointmentReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\WeeklyAppointmentReport.Designer.cs">
<DependentUpon>WeeklyAppointmentReport.cs</DependentUpon>
</Compile>
@@ -405,7 +491,9 @@
<Compile Include="AbstractBeWoReportObject.cs" />
<Compile Include="AbstractReportCreator.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="DefaultReports\ServicesOverviewReport.cs" />
<Compile Include="DefaultReports\ServicesOverviewReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\ServicesOverviewReport.Designer.cs">
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
</Compile>

View File

@@ -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;