VkmHamm und DiakonieKKKleve

This commit is contained in:
2022-12-05 15:38:39 +01:00
parent db95a53020
commit f7aed35e9f
3 changed files with 112 additions and 108 deletions

View File

@@ -28,9 +28,14 @@ namespace BeWo.DiakonieKKKleve
foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services)
{
var serviceRecord = DAOFactory.GenericDAO.LoadByID<ServiceRecord>(s.ServiceRecordOid);
pRO.ReferenceNumber = serviceRecord.CostBearer2SupportConcept.CustomerReferenceNumber;
if (serviceRecord.CostBearer2SupportConcept.ApprovedStartDate != null)
pRO.ApprovedStartDate = String.Format("{0:dd.MM.yyyy}", serviceRecord.CostBearer2SupportConcept.ApprovedStartDate);
if (serviceRecord.CostBearer2SupportConcept.ApprovedEndDate != null)
pRO.ApprovedEndDate = String.Format("{0:dd.MM.yyyy}", serviceRecord.CostBearer2SupportConcept.ApprovedEndDate);
var srDc = MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDC(serviceRecord);
s.GoalList = String.Empty;
if (srDc.Goals != null && srDc.Goals.Count > 0)
{

View File

@@ -41,6 +41,7 @@ namespace BeWo.DiakonieKKKleve
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
@@ -54,10 +55,15 @@ namespace BeWo.DiakonieKKKleve
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.cellGesamt = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule();
this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule();
@@ -65,10 +71,9 @@ namespace BeWo.DiakonieKKKleve
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.cellGesamt = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldEinzel = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
@@ -88,12 +93,7 @@ namespace BeWo.DiakonieKKKleve
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldArt = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldGroup = new DevExpress.XtraReports.UI.CalculatedField();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -194,6 +194,12 @@ namespace BeWo.DiakonieKKKleve
this.xrTableCell16.Text = "Leistungsform";
this.xrTableCell16.Weight = 0.280438005341767D;
//
// xrTableCell19
//
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Text = "Schlüssel";
this.xrTableCell19.Weight = 0.19508730895313436D;
//
// xrTableCell14
//
this.xrTableCell14.Name = "xrTableCell14";
@@ -330,6 +336,16 @@ namespace BeWo.DiakonieKKKleve
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Weight = 0.14520203233717263D;
//
// xrTableCell20
//
this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.GoalList")});
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.StylePriority.UseTextAlignment = false;
this.xrTableCell20.Text = "xrTableCell20";
this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell20.Weight = 0.10101011051826002D;
//
// xrTableCell18
//
this.xrTableCell18.Name = "xrTableCell18";
@@ -370,6 +386,57 @@ namespace BeWo.DiakonieKKKleve
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
//
// cellGesamt
//
this.cellGesamt.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.cellGesamt.BorderWidth = 1F;
this.cellGesamt.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.cellGesamt.LocationFloat = new DevExpress.Utils.PointFloat(449.9998F, 0F);
this.cellGesamt.Name = "cellGesamt";
this.cellGesamt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.cellGesamt.SizeF = new System.Drawing.SizeF(85F, 24.25F);
this.cellGesamt.StylePriority.UseBorders = false;
this.cellGesamt.StylePriority.UseBorderWidth = false;
this.cellGesamt.StylePriority.UseFont = false;
this.cellGesamt.StylePriority.UsePadding = false;
this.cellGesamt.StylePriority.UseTextAlignment = false;
this.cellGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrLabel8
//
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(630.0004F, 36.41668F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(386.3333F, 17.99997F);
this.xrLabel8.StylePriority.UseBorders = false;
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.Text = "Datum, Unterschrift Leistungserbringer";
//
// xrLabel6
//
this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(630F, 82.02082F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(467.4581F, 17.99997F);
this.xrLabel6.StylePriority.UseBorders = false;
this.xrLabel6.StylePriority.UseFont = false;
//
// xrLabel11
//
this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.Right;
this.xrLabel11.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(200F, 0F);
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(249.9996F, 24.24997F);
this.xrLabel11.StylePriority.UseBorders = false;
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.StylePriority.UsePadding = false;
this.xrLabel11.StylePriority.UseTextAlignment = false;
this.xrLabel11.Text = "Einheiten gesamt:";
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -421,56 +488,39 @@ namespace BeWo.DiakonieKKKleve
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
// xrLabel11
// xrLabel10
//
this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.Right;
this.xrLabel11.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(200F, 0F);
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(249.9996F, 24.24997F);
this.xrLabel11.StylePriority.UseBorders = false;
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.StylePriority.UsePadding = false;
this.xrLabel11.StylePriority.UseTextAlignment = false;
this.xrLabel11.Text = "Einheiten gesamt:";
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(570.1245F, 0F);
this.xrLabel10.Multiline = true;
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(538.8751F, 77.97917F);
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.Text = resources.GetString("xrLabel10.Text");
//
// xrLabel8
// xrLabel7
//
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(630.0004F, 36.41668F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(386.3333F, 17.99997F);
this.xrLabel8.StylePriority.UseBorders = false;
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.Text = "Datum, Unterschrift Leistungserbringer";
this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(100F, 20F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "Schlüssel:";
//
// xrLabel6
// xrLabel4
//
this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(630F, 82.02082F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(467.4581F, 17.99997F);
this.xrLabel6.StylePriority.UseBorders = false;
this.xrLabel6.StylePriority.UseFont = false;
//
// cellGesamt
//
this.cellGesamt.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.cellGesamt.BorderWidth = 1F;
this.cellGesamt.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.cellGesamt.LocationFloat = new DevExpress.Utils.PointFloat(449.9998F, 0F);
this.cellGesamt.Name = "cellGesamt";
this.cellGesamt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.cellGesamt.SizeF = new System.Drawing.SizeF(85F, 24.25F);
this.cellGesamt.StylePriority.UseBorders = false;
this.cellGesamt.StylePriority.UseBorderWidth = false;
this.cellGesamt.StylePriority.UseFont = false;
this.cellGesamt.StylePriority.UsePadding = false;
this.cellGesamt.StylePriority.UseTextAlignment = false;
this.cellGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(100.4163F, 0F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(413.1665F, 77.97917F);
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.Text = "1 Soziotherapeutische Dokumentation\r\n2 Verordnung Formular 26 & 27, Erstellung So" +
"ziotherapieplan\r\n3 Arbeiten im sozialen Umfeld\r\n4 Motivation- (Antrieb) relevant" +
"es Training";
//
// fieldEinzel
//
@@ -599,7 +649,7 @@ namespace BeWo.DiakonieKKKleve
// xrLabel14
//
this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Costbearer")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.CostBearer")});
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(774.396F, 70.00002F);
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -649,60 +699,10 @@ namespace BeWo.DiakonieKKKleve
this.fieldGroup.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldGroup.Name = "fieldGroup";
//
// xrLabel4
//
this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(100.4163F, 0F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(413.1665F, 77.97917F);
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.Text = "1 Soziotherapeutische Dokumentation\r\n2 Verordnung Formular 26 & 27, Erstellung So" +
"ziotherapieplan\r\n3 Arbeiten im sozialen Umfeld\r\n4 Motivation- (Antrieb) relevant" +
"es Training";
//
// xrLabel7
//
this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(100F, 20F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "Schlüssel:";
//
// xrLabel10
//
this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(570.1245F, 0F);
this.xrLabel10.Multiline = true;
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(538.8751F, 77.97917F);
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.Text = resources.GetString("xrLabel10.Text");
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// xrTableCell19
//
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Text = "Schlüssel";
this.xrTableCell19.Weight = 0.19508730895313436D;
//
// xrTableCell20
//
this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.GoalList")});
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.StylePriority.UseTextAlignment = false;
this.xrTableCell20.Text = "xrTableCell20";
this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell20.Weight = 0.10101011051826002D;
//
// LeistungsnachweisSoziotherapie
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {

View File

@@ -39,10 +39,9 @@ namespace VkmHamm
if (v2o.Entry.Type == ValueListEntryType.StaffRoleType)
{
if (v2o.Entry.Value.Contains("Bezugsbetreuer"))
{
if (e2c.Employee != null && e2c.Employee.Person != null)
scd.Custom3 = e2c.Employee.Person.LastName + ", " + scd.Customer.Employee2CustomerList[0].Employee.Person.FirstName;
scd.Custom3 = e2c.Employee.Person.LastName + ", " + e2c.Employee.Person.FirstName;
if (e2c.Employee.Contracts != null && e2c.Employee.Contracts.Count != 0)
{
var contract = e2c.Employee.Contracts.FirstOrDefault(x => (!x.EntryDate.HasValue ||