diff --git a/Data/Access/SearchDAO.cs b/Data/Access/SearchDAO.cs index 5002cab2f..2fc7bab51 100644 --- a/Data/Access/SearchDAO.cs +++ b/Data/Access/SearchDAO.cs @@ -317,11 +317,32 @@ namespace BeWo.Data.Access return lCriteria.List(); } - public IList FindCustomerServiceRecords(long customerOid, DateTimeSpan pSpan, long? employeeOid, ServiceRecordTypeId? srTypeFilter) + public IList FindCustomerServiceRecords(long customerOid, DateTimeSpan pSpan, long? employeeOid, ServiceRecordTypeId? srTypeFilter, bool includeEndDateInSearch) { var lCriteria = CreateCriteria() - .Add(Restrictions.Between(ServiceRecord.PropertyName_Start, pSpan.StartDateTime, pSpan.EndDateTime)) - .Add(Restrictions.Eq(ServiceRecord.PropertyName_CustomerOid, customerOid)); + .Add(Restrictions.Eq(ServiceRecord.PropertyName_CustomerOid, customerOid)); + + + if (includeEndDateInSearch) + { + var orCriteria = Restrictions.Or( + Restrictions.Between(ServiceRecord.PropertyName_Start, pSpan.StartDateTime, pSpan.EndDateTime), + Restrictions.Between(ServiceRecord.PropertyName_End, pSpan.StartDateTime, pSpan.EndDateTime)); + + orCriteria = Restrictions.Or(orCriteria, + Restrictions.And( + Restrictions.Le(ServiceRecord.PropertyName_Start,pSpan.EndDateTime), + Restrictions.Ge(ServiceRecord.PropertyName_End, pSpan.StartDateTime))); + + + lCriteria.Add(orCriteria); + } + else + { + lCriteria.Add(Restrictions.Between(ServiceRecord.PropertyName_Start, pSpan.StartDateTime, pSpan.EndDateTime)); + } + + if (employeeOid != null) lCriteria.Add(Restrictions.Eq(ServiceRecord.PropertyName_EmployeeOid, employeeOid.Value)); diff --git a/Host/Web.config b/Host/Web.config index e4fd721b0..7411b0e7f 100644 --- a/Host/Web.config +++ b/Host/Web.config @@ -190,11 +190,11 @@ - - - - - + + + + + diff --git a/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs b/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs index 2ed6e8bdb..b21ca309f 100644 --- a/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs +++ b/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs @@ -104,14 +104,8 @@ namespace BeWo.Report.ReportObjects decimal bu = 0; int anzWochentage = ANZ_WOCHENTAGE; - Contract c = emp.GetValidContractForDate(ro.ReportStartDate); - - if (c == null) // Kein Vertrag vom 1. gefunden, gucken, ob es einen gibt, der mitten im Monat beginnt. - { - var c2 = GetNextValidContractForDate(ro.ReportStartDate, emp); - if (c2 != null && c2.EntryDate.HasValue && c2.EntryDate.Value < ro.ReportEndDate) - c = c2; - } + var c = GetContractForDate(emp, ro.ReportStartDate, ro.ReportEndDate); + if (c != null) { if (c.EntryDate.HasValue && c.EntryDate > monatsAnfang) @@ -294,7 +288,10 @@ namespace BeWo.Report.ReportObjects } else { - + if (c != null && c.WeeklyFLS.HasValue) + { + + } if (c != null && c.WeeklyFLS.HasValue && c.WeeklyTotalHours.HasValue && c.WeeklyTotalHours.Value != 0) flsSollImVertragsUndBerichtzeitraum *= c.WeeklyFLS.Value / c.WeeklyTotalHours.Value; } @@ -652,12 +649,68 @@ namespace BeWo.Report.ReportObjects } public virtual decimal? BerechneSollProMonat(Employee emp, DateTime start, DateTime ende) - { + { + Contract c = GetContractForDate(emp, start, ende); + + + if (c != null && c.MonthlyTotalHours.HasValue && c.MonthlyTotalHours.Value > 0) + { + return c.MonthlyTotalHours.Value; + + DateTime monatsAnfang = start; + DateTime monatsEnde = ende; + + if (c.EntryDate.HasValue && c.EntryDate > monatsAnfang) + { + monatsAnfang = c.EntryDate.Value; + } + if (c.ContractEndDate.HasValue && c.ContractEndDate < monatsEnde) + { + monatsEnde = c.ContractEndDate.Value.Date.AddDays(1); + } + + if (monatsAnfang < monatsEnde) + { + //if (monatsAnfang.Day == 1 && monatsEnde.Day == 1) + //{ + return c.MonthlyTotalHours.Value; + //} + } + } + return null; } public virtual decimal? BerechneFlsSollProMonat(Employee emp, DateTime start, DateTime ende) { + Contract c = GetContractForDate(emp, start, ende); + + + if (c != null && c.MonthlyFLS.HasValue && c.MonthlyFLS.Value > 0) + { + return c.MonthlyFLS.Value; + + DateTime monatsAnfang = start; + DateTime monatsEnde = ende; + + if (c.EntryDate.HasValue && c.EntryDate > monatsAnfang) + { + monatsAnfang = c.EntryDate.Value; + } + if (c.ContractEndDate.HasValue && c.ContractEndDate < monatsEnde) + { + monatsEnde = c.ContractEndDate.Value.Date.AddDays(1); + } + + if (monatsAnfang < monatsEnde) + { + //if (monatsAnfang.Day == 1 && monatsEnde.Day == 1) + //{ + return c.MonthlyFLS.Value; + //} + } + } + return null; } @@ -1550,8 +1603,20 @@ namespace BeWo.Report.ReportObjects } - //gibt 1 zurück wenn ganzer Feiertag und z.B. 0.5 bei halben etc. - public virtual decimal GetFeiertagsFaktor(DateTime start) + public virtual Contract GetContractForDate(Employee emp, DateTime start, DateTime ende) + { + Contract c = emp.GetValidContractForDate(start); + if (c == null) // Kein Vertrag vom 1. gefunden, gucken, ob es einen gibt, der mitten im Monat beginnt. + { + var c2 = GetNextValidContractForDate(start, emp); + if (c2 != null && c2.EntryDate.HasValue && c2.EntryDate.Value < ende) + c = c2; + } + return c; + } + + //gibt 1 zurück wenn ganzer Feiertag und z.B. 0.5 bei halben etc. + public virtual decimal GetFeiertagsFaktor(DateTime start) { if (IstFeiertag(start)) { diff --git a/Report/ReportObjects/ServicesOverviewRO.cs b/Report/ReportObjects/ServicesOverviewRO.cs index 317d6adfd..263647231 100644 --- a/Report/ReportObjects/ServicesOverviewRO.cs +++ b/Report/ReportObjects/ServicesOverviewRO.cs @@ -169,7 +169,15 @@ namespace BeWo.Report.ReportObjects // private CostBearer2SupportConceptData CostBearer2SupportConceptData { get; set; } - public static List Create(int pMonth, int pYear, long orgaOid, long empOid, int startDay, int endDay, long? serviceCategoryOid = null, bool disableEmptySupportConcepts = true) + public static List Create(int pMonth, int pYear, long orgaOid, long empOid, int startDay, + int endDay, long? serviceCategoryOid = null, bool disableEmptySupportConcepts = true) + { + return Create(pMonth, pYear, orgaOid, empOid, startDay, endDay, false, serviceCategoryOid, + disableEmptySupportConcepts); + } + + + public static List Create(int pMonth, int pYear, long orgaOid, long empOid, int startDay, int endDay, bool searchServiceRecordsByEndDate, long? serviceCategoryOid = null, bool disableEmptySupportConcepts = true) { var roList = new List(); @@ -220,7 +228,7 @@ namespace BeWo.Report.ReportObjects // IList customers = DAOFactory.SearchDAO.GetAllCustomerWithServiceRecordsInSpan(pSpan).OrderBy(ob => ob.Person.LastName + ", " + ob.Person.FirstName).ToList(); foreach (Customer customer in customers) { - ServicesOverviewRO ro = Create(customer, pSpan, disableEmptySupportConcepts, orgaOid, empOid, serviceCategoryOid); + ServicesOverviewRO ro = Create(customer, pSpan, disableEmptySupportConcepts, orgaOid, empOid, searchServiceRecordsByEndDate, serviceCategoryOid); if (ro != null) { roList.Add(ro); @@ -232,8 +240,9 @@ namespace BeWo.Report.ReportObjects // sc => Create(sc.Customer.Oid.Value, pMonth, pYear, true)).ToList(); } - - private static bool HasRight(ApplicationUser user, UserRightType right) + + + private static bool HasRight(ApplicationUser user, UserRightType right) { return GetGrantedRights(user).Contains(right); @@ -254,6 +263,11 @@ namespace BeWo.Report.ReportObjects } public static ServicesOverviewRO Create(long pCustomerOid, int pMonth, int pYear, bool disableEmptySupportConcepts, long orgaOid, long empOid, int start, int end, long? serviceCategoryOid = null) + { + return Create(pCustomerOid, pMonth, pYear, disableEmptySupportConcepts, orgaOid, empOid, start, end, false, + serviceCategoryOid); + } + public static ServicesOverviewRO Create(long pCustomerOid, int pMonth, int pYear, bool disableEmptySupportConcepts, long orgaOid, long empOid, int start, int end, bool searchServiceRecordsByEndDate, long? serviceCategoryOid = null) { var pSpan = new DateTimeSpan(); if (start > end) @@ -266,7 +280,7 @@ namespace BeWo.Report.ReportObjects pSpan.EndDateTime = pSpan.StartDateTime.AddDays(end - start + 1).AddTicks(-1); var lCustomer = DAOFactory.GenericDAO.LoadByID(pCustomerOid); - return Create(lCustomer, pSpan, disableEmptySupportConcepts, orgaOid, empOid, serviceCategoryOid); + return Create(lCustomer, pSpan, disableEmptySupportConcepts, orgaOid, empOid, searchServiceRecordsByEndDate, serviceCategoryOid); } public void CalculateFLSSollIst() @@ -329,11 +343,11 @@ namespace BeWo.Report.ReportObjects } } - private static ServicesOverviewRO Create(Customer customer, DateTimeSpan span, bool disableEmptySupportConcepts, long orgaOid, long empOid, long? serviceCategoryOid = null) + private static ServicesOverviewRO Create(Customer customer, DateTimeSpan span, bool disableEmptySupportConcepts, long orgaOid, long empOid, bool searchServiceRecordsByEndDate, long? serviceCategoryOid = null) { // IList lServiceRecords = pServiceRecords; // if (lServiceRecords == null) - IList lServiceRecords = DAOFactory.SearchDAO.FindCustomerServiceRecords(customer.Oid.Value, span, null, null); + IList lServiceRecords = DAOFactory.SearchDAO.FindCustomerServiceRecords(customer.Oid.Value, span, null, null, searchServiceRecordsByEndDate); var lResult = new ServicesOverviewRO(); diff --git a/ReportImp/BAPBielefelderAmbulantePflege/Properties/licenses.licx b/ReportImp/BAPBielefelderAmbulantePflege/Properties/licenses.licx index e69de29bb..bfe3c59aa 100644 --- a/ReportImp/BAPBielefelderAmbulantePflege/Properties/licenses.licx +++ b/ReportImp/BAPBielefelderAmbulantePflege/Properties/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/ReportImp/BUGeVReports/SettlementReport2.Designer.cs b/ReportImp/BUGeVReports/SettlementReport2.Designer.cs index 5fc5c68a3..6420532e9 100644 --- a/ReportImp/BUGeVReports/SettlementReport2.Designer.cs +++ b/ReportImp/BUGeVReports/SettlementReport2.Designer.cs @@ -130,13 +130,12 @@ namespace BeWo.BUGeVReports // xrLabel8 // this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate", "{0:dd.MM.yyyy}")}); this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(435.4167F, 210F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel8.SizeF = new System.Drawing.SizeF(191.6667F, 16.83345F); this.xrLabel8.StylePriority.UseTextAlignment = false; - this.xrLabel8.Text = "xrLabel8"; this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // xrTable1 diff --git a/ReportImp/BeWoAlsdorf/Properties/licenses.licx b/ReportImp/BeWoAlsdorf/Properties/licenses.licx index e69de29bb..bfe3c59aa 100644 --- a/ReportImp/BeWoAlsdorf/Properties/licenses.licx +++ b/ReportImp/BeWoAlsdorf/Properties/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/ReportImp/BetreuungsBueroScholzReport/Logos/BetreuungsbueroScholzLogo.png b/ReportImp/BetreuungsBueroScholzReport/Logos/BetreuungsbueroScholzLogo.png index 4d856b1ee..0494f315f 100644 Binary files a/ReportImp/BetreuungsBueroScholzReport/Logos/BetreuungsbueroScholzLogo.png and b/ReportImp/BetreuungsBueroScholzReport/Logos/BetreuungsbueroScholzLogo.png differ diff --git a/ReportImp/BetreuungsBueroScholzReport/Properties/licenses.licx b/ReportImp/BetreuungsBueroScholzReport/Properties/licenses.licx index e69de29bb..bfe3c59aa 100644 --- a/ReportImp/BetreuungsBueroScholzReport/Properties/licenses.licx +++ b/ReportImp/BetreuungsBueroScholzReport/Properties/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/ReportImp/BetreuungsBueroScholzReport/ServicesOverviewReport.Designer.cs b/ReportImp/BetreuungsBueroScholzReport/ServicesOverviewReport.Designer.cs index ad5ee016d..d16fd4f7d 100644 --- a/ReportImp/BetreuungsBueroScholzReport/ServicesOverviewReport.Designer.cs +++ b/ReportImp/BetreuungsBueroScholzReport/ServicesOverviewReport.Designer.cs @@ -38,7 +38,6 @@ namespace BetreuungsBueroScholz this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); @@ -100,12 +99,13 @@ namespace BetreuungsBueroScholz this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -193,10 +193,6 @@ namespace BetreuungsBueroScholz this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; this.formattingRuleStartDate.Name = "formattingRuleStartDate"; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // DetailReport1 // this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -808,6 +804,10 @@ namespace BetreuungsBueroScholz this.xrLabel2.Text = "Summe:"; this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // Stundenzettel // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -827,13 +827,13 @@ namespace BetreuungsBueroScholz this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; - this.Version = "13.1"; + this.Version = "13.2"; ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } diff --git a/ReportImp/BetreuungsBueroScholzReport/ServicesOverviewReport.resx b/ReportImp/BetreuungsBueroScholzReport/ServicesOverviewReport.resx index 9937ab737..8505ef1ca 100644 --- a/ReportImp/BetreuungsBueroScholzReport/ServicesOverviewReport.resx +++ b/ReportImp/BetreuungsBueroScholzReport/ServicesOverviewReport.resx @@ -117,143 +117,109 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 21, 17 - - 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 + + 21, 17 + \ No newline at end of file diff --git a/ReportImp/CaritasFrankfurt2Reports/CaritasFrankfurt2Reports.csproj b/ReportImp/CaritasFrankfurt2Reports/CaritasFrankfurt2Reports.csproj index 73b68bc35..bc61baf24 100644 --- a/ReportImp/CaritasFrankfurt2Reports/CaritasFrankfurt2Reports.csproj +++ b/ReportImp/CaritasFrankfurt2Reports/CaritasFrankfurt2Reports.csproj @@ -54,6 +54,7 @@ + Component diff --git a/ReportImp/CaritasFrankfurtReports/CaritasFrankfurtReports.csproj b/ReportImp/CaritasFrankfurtReports/CaritasFrankfurtReports.csproj index e2b38cea7..23ba4cefa 100644 --- a/ReportImp/CaritasFrankfurtReports/CaritasFrankfurtReports.csproj +++ b/ReportImp/CaritasFrankfurtReports/CaritasFrankfurtReports.csproj @@ -40,7 +40,6 @@ - @@ -56,6 +55,7 @@ + Component @@ -115,6 +115,10 @@ {40D8B312-EA64-49E3-A31A-5E57ED4D5654} Report + + {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF} + Service + {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4} Shared diff --git a/ReportImp/CaritasLeverkusen/CaritasLeverkusen.csproj b/ReportImp/CaritasLeverkusen/CaritasLeverkusen.csproj index a135ddb2b..6464c3460 100644 --- a/ReportImp/CaritasLeverkusen/CaritasLeverkusen.csproj +++ b/ReportImp/CaritasLeverkusen/CaritasLeverkusen.csproj @@ -17,7 +17,7 @@ true full false - bin\Debug\ + ..\..\Host\bin\ DEBUG;TRACE prompt 4 @@ -80,10 +80,22 @@ + + {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE} + Data + {40d8b312-ea64-49e3-a31a-5e57ed4d5654} Report + + {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF} + Service + + + {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4} + Shared +