MH: Lebenshilfe Stade MID QB + Abrechnung
This commit is contained in:
@@ -50,7 +50,7 @@ namespace LebenshilfeStadeMID.Invoicing
|
||||
var ende = scap.EndDate.HasValue ? scap.EndDate.Value : invoicePeriod.EndDate;
|
||||
var serviceRecordsImSchuljahr = DAOFactory.SearchDAO.FindServiceRecordsInSpan(scap.CostBearer2SupportConcept.Oid.Value, new DateTimeSpan(start, ende));
|
||||
int maxKrankheitstage = GetMaximalAbrechenbareKrankheitstage(scap, serviceRecordsImSchuljahr);
|
||||
int nochUebrigeKrankheitstage = GetUebrigeAbrechenbareKrankheitstage(maxKrankheitstage, serviceRecordsImSchuljahr.Where(s => s.Start < start).ToList());
|
||||
int nochUebrigeKrankheitstage = GetUebrigeAbrechenbareKrankheitstage(maxKrankheitstage, serviceRecordsImSchuljahr.Where(s => s.Start < invoicePeriod.StartDate).ToList());
|
||||
|
||||
foreach (ServiceRecordDC iServiceRecord in serviceRecordsInPeriod)
|
||||
{
|
||||
|
||||
@@ -67,7 +67,7 @@ namespace LebenshilfeStadeMID
|
||||
verfuegungszeiten.Remove(vz);
|
||||
}
|
||||
// Zusatzleistung in eigentlichen ServiceRecord eintragen und aus Liste entfernen, dass der nicht mehrfach übertragen wird
|
||||
else if (zl != null)
|
||||
if (zl != null)
|
||||
{
|
||||
sd.Notice2 = string.Format("{0:0}", zl.Minutes);
|
||||
sd.Minutes += zl.Minutes;
|
||||
|
||||
@@ -51,8 +51,6 @@ namespace LebenshilfeStadeMID
|
||||
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
|
||||
@@ -329,38 +327,12 @@ namespace LebenshilfeStadeMID
|
||||
this.xrLabel11.Text = "Betreute(r):";
|
||||
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
|
||||
//
|
||||
// xrLabel10
|
||||
//
|
||||
this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
|
||||
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(206.917F, 389.4479F);
|
||||
this.xrLabel10.Name = "xrLabel10";
|
||||
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrLabel10.SizeF = new System.Drawing.SizeF(470.54F, 20F);
|
||||
this.xrLabel10.StylePriority.UseBorders = false;
|
||||
this.xrLabel10.StylePriority.UseFont = false;
|
||||
this.xrLabel10.StylePriority.UseTextAlignment = false;
|
||||
this.xrLabel10.Text = "[CustomerStreet], [CustomerPostalCode] [CustomerTown]";
|
||||
this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
|
||||
//
|
||||
// xrLabel4
|
||||
//
|
||||
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
|
||||
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0.4585266F, 389.4479F);
|
||||
this.xrLabel4.Name = "xrLabel4";
|
||||
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrLabel4.SizeF = new System.Drawing.SizeF(206.4585F, 20F);
|
||||
this.xrLabel4.StylePriority.UseBorders = false;
|
||||
this.xrLabel4.StylePriority.UseFont = false;
|
||||
this.xrLabel4.StylePriority.UseTextAlignment = false;
|
||||
this.xrLabel4.Text = "wohnhaft:";
|
||||
this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
|
||||
//
|
||||
// xrLabel5
|
||||
//
|
||||
this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerReferenceNumber")});
|
||||
this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
|
||||
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(206.917F, 409.4481F);
|
||||
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(206.4585F, 389.4479F);
|
||||
this.xrLabel5.Name = "xrLabel5";
|
||||
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrLabel5.SizeF = new System.Drawing.SizeF(281.25F, 20F);
|
||||
@@ -372,7 +344,7 @@ namespace LebenshilfeStadeMID
|
||||
// xrLabel13
|
||||
//
|
||||
this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
|
||||
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0.4585266F, 409.4481F);
|
||||
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 389.4479F);
|
||||
this.xrLabel13.Name = "xrLabel13";
|
||||
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.xrLabel13.SizeF = new System.Drawing.SizeF(206.4585F, 20F);
|
||||
@@ -494,13 +466,11 @@ namespace LebenshilfeStadeMID
|
||||
this.xrLabel3,
|
||||
this.xrLabel12,
|
||||
this.xrLabel11,
|
||||
this.xrLabel10,
|
||||
this.xrLabel4,
|
||||
this.xrLabel5,
|
||||
this.xrLabel13,
|
||||
this.lblAdresse});
|
||||
this.GroupHeader2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
|
||||
this.GroupHeader2.HeightF = 429.4481F;
|
||||
this.GroupHeader2.HeightF = 419.2878F;
|
||||
this.GroupHeader2.Level = 1;
|
||||
this.GroupHeader2.Name = "GroupHeader2";
|
||||
this.GroupHeader2.StylePriority.UseFont = false;
|
||||
@@ -767,8 +737,6 @@ namespace LebenshilfeStadeMID
|
||||
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
|
||||
private DevExpress.XtraReports.UI.XRLabel xrLabel12;
|
||||
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
|
||||
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
|
||||
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
|
||||
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
|
||||
private DevExpress.XtraReports.UI.XRLabel xrLabel13;
|
||||
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -125,6 +125,8 @@ namespace LebenshilfeStadeMID.Service
|
||||
verfuegungszeit.ServiceDescription = DAOFactory.SearchDAO.FindServiceDescriptionForCategory(serviceRecord.ServiceDescription.ServiceCategory.Oid.Value).FirstOrDefault(sr => sr.Name.ToLower().Contains("verfügungszeit einfache schulassistenz(jas)"));
|
||||
else if (serviceRecord.ServiceDescription.Name.ToLower().Contains("qualifizierte schulassistenz (jas)") || serviceRecord.ServiceDescription.Name.ToLower().Contains("kind krank qualifiziert (jas)")|| serviceRecord.ServiceDescription.Name.ToLower().Contains("kind krank (jas)"))
|
||||
verfuegungszeit.ServiceDescription = DAOFactory.SearchDAO.FindServiceDescriptionForCategory(serviceRecord.ServiceDescription.ServiceCategory.Oid.Value).FirstOrDefault(sr => sr.Name.ToLower().Contains("verfügungszeit fachlich (jas)"));
|
||||
else if (serviceRecord.ServiceDescription.Name.ToLower().Contains("75%-fachliche schulassistenz jas") || serviceRecord.ServiceDescription.Name.ToLower().Contains("75%-kind krank qualifiziert jas") )
|
||||
verfuegungszeit.ServiceDescription = DAOFactory.SearchDAO.FindServiceDescriptionForCategory(serviceRecord.ServiceDescription.ServiceCategory.Oid.Value).FirstOrDefault(sr => sr.Name.ToLower().Contains("75%-verfügungszeit fachlich jas"));
|
||||
|
||||
return verfuegungszeit;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user