ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MH: Anpassung Ilka Link ivi

Browse Source
This commit is contained in:
Marcel Hirschle
2022-04-12 08:37:16 +02:00
parent 114fd3e56a
commit 2b376ac5d8
5 changed files with 1501 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
ReportImp/IlkaLinkAmbulanteHilfen/Quittierungsbeleg.Designer.cs generated
View File

@@ -69,7 +69,7 @@ namespace IlkaLinkAmbulanteHilfen
this.xrLabel31 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel32 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel();
this.lblBetreuungsart = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel();
@@ -155,6 +155,7 @@ namespace IlkaLinkAmbulanteHilfen
this.TotalFLSBillable = new DevExpress.XtraReports.UI.CalculatedField();
this.formattingRuleZwischensummeSichtbar = new DevExpress.XtraReports.UI.FormattingRule();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.pb_Link = new DevExpress.XtraReports.UI.XRPictureBox();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -289,7 +290,7 @@ namespace IlkaLinkAmbulanteHilfen
// xrTableCell15
//
this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerCity", "{0:0}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice", "{0:0}")});
this.xrTableCell15.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.StylePriority.UseBorders = false;
@@ -302,7 +303,7 @@ namespace IlkaLinkAmbulanteHilfen
// xrTableCell12
//
this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.CustomerCount", "{0:0.##}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice2", "{0:0.##}")});
this.xrTableCell12.Font = new System.Drawing.Font("Arial", 10F);
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.StylePriority.UseBorders = false;
@@ -641,7 +642,7 @@ namespace IlkaLinkAmbulanteHilfen
this.xrLabel31,
this.xrLabel32,
this.xrLabel29,
this.xrLabel30,
this.lblBetreuungsart,
this.xrLabel27,
this.xrLabel28,
this.xrLabel26,
@@ -659,7 +660,7 @@ namespace IlkaLinkAmbulanteHilfen
//
this.xrLabel31.Font = new System.Drawing.Font("Arial", 12F);
this.xrLabel31.ForeColor = System.Drawing.Color.Black;
this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 176.0417F);
this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(504.6806F, 176.0417F);
this.xrLabel31.Multiline = true;
this.xrLabel31.Name = "xrLabel31";
this.xrLabel31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -675,7 +676,7 @@ namespace IlkaLinkAmbulanteHilfen
this.xrLabel32.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel32.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.xrLabel32.ForeColor = System.Drawing.Color.Black;
this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(618.0139F, 176.0417F);
this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(648.2222F, 176.0417F);
this.xrLabel32.Multiline = true;
this.xrLabel32.Name = "xrLabel32";
this.xrLabel32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -702,26 +703,25 @@ namespace IlkaLinkAmbulanteHilfen
this.xrLabel29.Text = "Betreuungsart:";
this.xrLabel29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// xrLabel30
// lblBetreuungsart
//
this.xrLabel30.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.xrLabel30.ForeColor = System.Drawing.Color.Black;
this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(143.5417F, 176.0417F);
this.xrLabel30.Multiline = true;
this.xrLabel30.Name = "xrLabel30";
this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel30.SizeF = new System.Drawing.SizeF(271.4584F, 25F);
this.xrLabel30.StylePriority.UseFont = false;
this.xrLabel30.StylePriority.UseForeColor = false;
this.xrLabel30.StylePriority.UseTextAlignment = false;
this.xrLabel30.Text = "Sozialpädagogische Familienhilfe";
this.xrLabel30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
this.lblBetreuungsart.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.lblBetreuungsart.ForeColor = System.Drawing.Color.Black;
this.lblBetreuungsart.LocationFloat = new DevExpress.Utils.PointFloat(143.5417F, 176.0417F);
this.lblBetreuungsart.Multiline = true;
this.lblBetreuungsart.Name = "lblBetreuungsart";
this.lblBetreuungsart.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblBetreuungsart.SizeF = new System.Drawing.SizeF(322.3607F, 25F);
this.lblBetreuungsart.StylePriority.UseFont = false;
this.lblBetreuungsart.StylePriority.UseForeColor = false;
this.lblBetreuungsart.StylePriority.UseTextAlignment = false;
this.lblBetreuungsart.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// xrLabel27
//
this.xrLabel27.Font = new System.Drawing.Font("Arial", 12F);
this.xrLabel27.ForeColor = System.Drawing.Color.Black;
this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 132.2916F);
this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(504.6806F, 132.2916F);
this.xrLabel27.Multiline = true;
this.xrLabel27.Name = "xrLabel27";
this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -739,7 +739,7 @@ namespace IlkaLinkAmbulanteHilfen
new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainAttendant")});
this.xrLabel28.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.xrLabel28.ForeColor = System.Drawing.Color.Black;
this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(618.0139F, 132.2916F);
this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(648.2222F, 132.2916F);
this.xrLabel28.Multiline = true;
this.xrLabel28.Name = "xrLabel28";
this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -761,7 +761,7 @@ namespace IlkaLinkAmbulanteHilfen
this.xrLabel26.Multiline = true;
this.xrLabel26.Name = "xrLabel26";
this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel26.SizeF = new System.Drawing.SizeF(271.4584F, 25F);
this.xrLabel26.SizeF = new System.Drawing.SizeF(322.3607F, 25F);
this.xrLabel26.StylePriority.UseBorders = false;
this.xrLabel26.StylePriority.UseFont = false;
this.xrLabel26.StylePriority.UseForeColor = false;
@@ -838,13 +838,15 @@ namespace IlkaLinkAmbulanteHilfen
//
// xrLabel20
//
this.xrLabel20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Costbearer")});
this.xrLabel20.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold);
this.xrLabel20.ForeColor = System.Drawing.Color.Black;
this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 25F);
this.xrLabel20.Multiline = true;
this.xrLabel20.Name = "xrLabel20";
this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel20.SizeF = new System.Drawing.SizeF(320F, 25F);
this.xrLabel20.SizeF = new System.Drawing.SizeF(406.6902F, 25F);
this.xrLabel20.StylePriority.UseFont = false;
this.xrLabel20.StylePriority.UseForeColor = false;
this.xrLabel20.StylePriority.UseTextAlignment = false;
@@ -889,7 +891,7 @@ namespace IlkaLinkAmbulanteHilfen
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 100F;
this.topMarginBand1.HeightF = 37.50001F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
@@ -923,8 +925,9 @@ namespace IlkaLinkAmbulanteHilfen
this.xrTable7,
this.xrTable6,
this.xrTable5,
this.xrTable4});
this.GroupFooter1.HeightF = 318.1459F;
this.xrTable4,
this.pb_Link});
this.GroupFooter1.HeightF = 278.9302F;
this.GroupFooter1.KeepTogether = true;
this.GroupFooter1.Name = "GroupFooter1";
//
@@ -1014,7 +1017,7 @@ namespace IlkaLinkAmbulanteHilfen
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(549.7717F, 188.1459F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(149.0623F, 69.02275F);
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(149.0623F, 64.99997F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrTable15
@@ -1075,11 +1078,11 @@ namespace IlkaLinkAmbulanteHilfen
//
this.xrLabel2.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(535.1435F, 243.5854F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(535.1349F, 253.1459F);
this.xrLabel2.Multiline = true;
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(222.9027F, 24F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(222.9027F, 14.43945F);
this.xrLabel2.StylePriority.UseBorders = false;
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.StylePriority.UseTextAlignment = false;
@@ -1090,11 +1093,11 @@ namespace IlkaLinkAmbulanteHilfen
//
this.xrLabel12.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel12.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(242.9998F, 243.5853F);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(242.9998F, 253.1459F);
this.xrLabel12.Multiline = true;
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(222.9027F, 24F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(222.9027F, 14.43945F);
this.xrLabel12.StylePriority.UseBorders = false;
this.xrLabel12.StylePriority.UseFont = false;
this.xrLabel12.StylePriority.UseTextAlignment = false;
@@ -1105,11 +1108,11 @@ namespace IlkaLinkAmbulanteHilfen
//
this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel11.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 243.5854F);
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0.009448439F, 253.1459F);
this.xrLabel11.Multiline = true;
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(125F, 24F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(125F, 14.43945F);
this.xrLabel11.StylePriority.UseBorders = false;
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.StylePriority.UseTextAlignment = false;
@@ -1289,7 +1292,7 @@ namespace IlkaLinkAmbulanteHilfen
this.xrTableCell26.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrTableCell26.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold);
this.xrTableCell26.Name = "xrTableCell26";
this.xrTableCell26.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell26.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell26.StylePriority.UseBorders = false;
this.xrTableCell26.StylePriority.UseFont = false;
this.xrTableCell26.StylePriority.UsePadding = false;
@@ -1573,7 +1576,7 @@ namespace IlkaLinkAmbulanteHilfen
// xrTableCell16
//
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerMonth", "{0:0.00}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CostBearer2SupportConceptList.ApprovalPeriodList.ApprovedBEPerInterval", "{0:0.00}")});
this.xrTableCell16.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.StylePriority.UseFont = false;
@@ -1737,6 +1740,14 @@ namespace IlkaLinkAmbulanteHilfen
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// pb_Link
//
this.pb_Link.Image = ((System.Drawing.Image)(resources.GetObject("pb_Link.Image")));
this.pb_Link.LocationFloat = new DevExpress.Utils.PointFloat(0F, 188.1459F);
this.pb_Link.Name = "pb_Link";
this.pb_Link.SizeF = new System.Drawing.SizeF(140.7525F, 65F);
this.pb_Link.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// Quittierungsbeleg
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1759,7 +1770,7 @@ namespace IlkaLinkAmbulanteHilfen
this.formattingRuleCostBearer,
this.formattingRuleEmployeeName,
this.formattingRuleZwischensummeSichtbar});
this.Margins = new System.Drawing.Printing.Margins(50, 35, 100, 30);
this.Margins = new System.Drawing.Printing.Margins(50, 35, 38, 30);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = System.Drawing.Printing.PaperKind.A4Rotated;
@@ -1820,7 +1831,7 @@ namespace IlkaLinkAmbulanteHilfen
private DevExpress.XtraReports.UI.XRLabel xrLabel27;
private DevExpress.XtraReports.UI.XRLabel xrLabel28;
private DevExpress.XtraReports.UI.XRLabel xrLabel29;
private DevExpress.XtraReports.UI.XRLabel xrLabel30;
private DevExpress.XtraReports.UI.XRLabel lblBetreuungsart;
private DevExpress.XtraReports.UI.XRLabel xrLabel31;
private DevExpress.XtraReports.UI.XRLabel xrLabel32;
private DevExpress.XtraReports.UI.XRTable xrTable1;
@@ -1909,5 +1920,6 @@ namespace IlkaLinkAmbulanteHilfen
private DevExpress.XtraReports.UI.XRPictureBox pb_Jadczak;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRPictureBox pb_Link;
}
}

36
ReportImp/IlkaLinkAmbulanteHilfen/Quittierungsbeleg.cs
View File

@@ -26,7 +26,8 @@ namespace IlkaLinkAmbulanteHilfen
bool hatGruppen = false;
tc_Bemerkungen.Text = pRO.CostBearer2SupportConceptList[0]?.SupportConcept?.Notice;
if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0)
tc_Bemerkungen.Text = pRO.CostBearer2SupportConceptList[0].SupportConcept?.Notice;
if (pRO.Services != null)
{
@@ -39,7 +40,6 @@ namespace IlkaLinkAmbulanteHilfen
ServicesOverviewRO.CreateSignatureString(sd);
if (sd.IsGroup)
{
//sd.Notice5 = String.Format("{0} Teilnehmer", sd.CustomerCount);
hatGruppen = true;
}
@@ -50,6 +50,22 @@ namespace IlkaLinkAmbulanteHilfen
pRO.Services = servicesBillable;
}
foreach (var cb2sc in pRO.CostBearer2SupportConceptList)
{
if (cb2sc.CostBearer.Organisation.Name == pRO.Costbearer)
{
for (int i = 0; i < cb2sc.ApprovalPeriodList.Count; i++)
{
var item = cb2sc.ApprovalPeriodList[i];
lblBetreuungsart.Text += i != cb2sc.ApprovalPeriodList.Count - 1 ? item.ServiceCategory?.Name + ", " : item.ServiceCategory?.Name;
}
break;
}
}
decimal summeHauptbetreuerminuten = 0;
decimal summeVertretungsstunden = 0;
decimal summeGesamt = 0;
@@ -69,27 +85,39 @@ namespace IlkaLinkAmbulanteHilfen
summeGesamt += Convert.ToDecimal(item.Minutes) / 60;
}
//tc_Vertetungsauflistung.Text = alleVertretungen;
tc_Hauptbetreuerstunden.Text = string.Format("{0:0.00}", summeHauptbetreuerminuten);
tc_Vertretungsstunden.Text = string.Format("{0:0.00}", summeVertretungsstunden);
tc_MehrMinderStunden.Text = string.Format("{0:0.00}", Convert.ToDecimal(pRO.TotalFLS) - pRO.ApprovedFLSPerMonth);
tc_MehrMinderStunden.Text = pRO.CostBearer2SupportConceptList.Count == 0 ? string.Format("{0:0.00}", Convert.ToDecimal(pRO.TotalFLS) - pRO.ApprovedFLSPerMonth) :
string.Format("{0:0.00}", Convert.ToDecimal(pRO.TotalFLS) - pRO.CostBearer2SupportConceptList[0].ApprovalPeriodList[0].ApprovedBEPerInterval);
// Wenn es eine Vertretung gibt, wird wohl keine Unterschrift angezeigt.
if (pRO.MainAttendant != null)
{
if (pRO.MainAttendant.ToLower().Contains("herrera"))
{
pb_Herrera.Visible = true;
pb_Jadczak.Visible = false;
pb_Link.Visible = false;
}
else if (pRO.MainAttendant.ToLower().Contains("jadczak"))
{
pb_Jadczak.Visible = true;
pb_Herrera.Visible = false;
pb_Link.Visible = false;
}
else if (pRO.MainAttendant.ToLower().Contains("link"))
{
pb_Link.Visible = true;
pb_Jadczak.Visible = false;
pb_Herrera.Visible = false;
}
else
{
pb_Jadczak.Visible = false;
pb_Herrera.Visible = false;
pb_Link.Visible = false;
}
}

1400
ReportImp/IlkaLinkAmbulanteHilfen/Quittierungsbeleg.resx
View File

File diff suppressed because it is too large Load Diff

19
ReportImp/WegweiserBetreuungsdienstReports/LeistungsnachweisSoziotherapie.cs
View File

@@ -31,10 +31,29 @@ namespace BeWo.WegweiserBetreuungsdienstReports
s.Notice5 = "E";
else
s.Notice5 = "G";
//if (s.ServiceDescription.Contains("Video"))
//{
// s.ServiceDescription = "V";
//}
//else if (s.ServiceDescription.Contains("Telefon"))
//{
// s.ServiceDescription = "T";
//}
//else if (s.ServiceDescription.Contains("Einrichtung"))
//{
// s.ServiceDescription = "E";
//}
//else
//{
// s.ServiceDescription = "A";
//}
}
}
cellGesamt.Text = String.Format("{0:0.00}", gesamt / 60);
//SetzeAdresseUndIk(pRO);

2
Service/Plugins/PluginLoader.cs
View File

@@ -310,7 +310,7 @@ namespace BeWo.Service.Plugins
//t = "1344064965"; // ABW Klaßen
//t = "3625103678"; // Pro Hilfe GbR | MID
//t = "6028314513"; // Grundstein e.V.
//t = "6178735147"; // Ilka Link ivi. - ambulante Hilfen, Beratung &amp; Therapie
t = "6178735147"; // Ilka Link ivi. - ambulante Hilfen, Beratung &amp; Therapie
//t = "9416221963"; // Übergangshilfe Unna e.V.
//t = "1316958991"; // Aidshilfe Essen
//t = "3718732195"; // Diakonie Remscheid Lennep (Jobfit)