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

Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo into master

Browse Source
This commit is contained in:
Marcel Hirschle
2023-09-25 17:16:12 +02:00
parent cf9b1dff61 158041c0f1
commit cfb5b29e3f
9 changed files with 47 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ReportImp/AkggMid/LeistungsnachweisHelper.cs
View File

@@ -163,7 +163,7 @@ namespace AkggMid
newSr.Notice = "Wochensumme";
newSr.IstFerien = true;
newSr.TimeRangeString = String.Format("{0:00}z", i);
newSr.Minutes = Rundeauf15Minuten(wochensumme);
newSr.Minutes = wochensumme; //Rundung am 25.09.2023 entfernt // Rundeauf15Minuten(wochensumme);
wochensumme = 0;
result.Add(newSr);
}
@@ -171,7 +171,7 @@ namespace AkggMid
}
double minutenGesamt = 0;
double stdGesamt = 0;
foreach (var record in result)
{
if (record.StartDate.DayOfWeek != DayOfWeek.Saturday && record.StartDate.DayOfWeek != DayOfWeek.Sunday && IstAbwesend(record.StartDate))
@@ -184,7 +184,7 @@ namespace AkggMid
}
if (record.IstFerien) // Wochensumme
{
minutenGesamt += record.Minutes;
stdGesamt += Math.Round(record.Minutes / 60, 2, MidpointRounding.AwayFromZero); //Anpassung, das Wochensumme nicht mehr gerundet auf 15 min
}
@@ -197,7 +197,7 @@ namespace AkggMid
record.IstSonntag = true;
}
}
pRO.TotalFLM = minutenGesamt;
pRO.TotalFLS = stdGesamt;
return result.OrderBy(r => r.TimeRangeString).ToList();
}

12
ReportImp/AkggMid/LeistungsnachweisSozialamt.designer.cs generated
View File

@@ -73,9 +73,9 @@ namespace AkggMid
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.fieldStd = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldTotalStd = new DevExpress.XtraReports.UI.CalculatedField();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
@@ -561,13 +561,9 @@ namespace AkggMid
this.xrLabel1.StylePriority.UseBorders = false;
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.StylePriority.UseTextAlignment = false;
this.xrLabel1.Text = "Summe der gel. Stunden: [fieldTotalStd!0.00]";
this.xrLabel1.Text = "Summe der gel. Stunden: [TotalFLS!0.00]";
this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// fieldStd
//
this.fieldStd.DataMember = "Services";
@@ -581,6 +577,10 @@ namespace AkggMid
this.fieldTotalStd.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldTotalStd.Name = "fieldTotalStd";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// LeistungsnachweisSozialamt
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {

2
ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzucker.designer.cs generated
View File

@@ -587,7 +587,7 @@ namespace AkggMid
this.xrLabel1.StylePriority.UseBorders = false;
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.StylePriority.UseTextAlignment = false;
this.xrLabel1.Text = "Summe der gel. Stunden: [fieldTotalStd!0.00]";
this.xrLabel1.Text = "Summe der gel. Stunden: [TotalFLS!0.00]";
this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// bindingSource1

2
ReportImp/AkggMid/LeistungsnachweisSozialamtMitBlutzuckerPumpe.designer.cs generated
View File

@@ -611,7 +611,7 @@ namespace AkggMid
this.xrLabel1.StylePriority.UseBorders = false;
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.StylePriority.UseTextAlignment = false;
this.xrLabel1.Text = "Summe der gel. Stunden: [fieldTotalStd!0.00]";
this.xrLabel1.Text = "Summe der gel. Stunden: [TotalFLS!0.00]";
this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// bindingSource1

1
ReportImp/KompassBeWoWesel/KompassBeWoWesel.csproj
View File

@@ -121,7 +121,6 @@
<Compile Include="Teamstundenkonto.designer.cs">
<DependentUpon>Teamstundenkonto.cs</DependentUpon>
</Compile>
<Compile Include="Validation\CustomServiceRecordValidator.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Data\Data.csproj">

14
ReportImp/KompassBeWoWesel/Validation/CustomServiceRecordValidator.cs
View File

@@ -2,11 +2,11 @@
namespace KompassBeWoWesel.Validation
{
public class CustomServiceRecordValidator : ServiceRecordValidator
{
public override bool CheckZukunft()
{
return false;
}
}
//public class CustomServiceRecordValidator : ServiceRecordValidator
//{
// public override bool CheckZukunft()
// {
// return false;
// }
//}
}

10
ReportImp/SPZRatingen/SoziotherapieLeistungsnachweis.cs
View File

@@ -36,13 +36,16 @@ namespace SpzRatingen
s.Minutes = s.Minutes * (double)pRO.RateFactor;
gesamt += s.Minutes;
}
s.Notice5 = "E"; //Einzel
if (s.ServiceDescription.Contains("Probation") || s.ServiceDescription.Contains("(P)"))
{
s.Notice5 = "P";
else if (s.Minutes == s.GroupMinutes)
s.Notice5 = "E";
else if (s.Minutes != s.GroupMinutes)
}
else if (s.ServiceDescription.Contains("(G)"))
{
s.Notice5 = "G";
}
if (s.ServiceDescription.Contains("(A)"))
{
@@ -61,6 +64,7 @@ namespace SpzRatingen
s.ServiceDescription = "(E)";
}
ServicesOverviewRO.CreateSignatureString(s);
}

41
ReportImp/SPZRatingen/SoziotherapieLeistungsnachweis.designer.cs generated
View File

@@ -74,7 +74,6 @@ namespace SpzRatingen
this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
@@ -104,6 +103,7 @@ namespace SpzRatingen
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldArt = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldGroup = new DevExpress.XtraReports.UI.CalculatedField();
this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -613,33 +613,20 @@ namespace SpzRatingen
//
// bottomMarginBand1
//
this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel5});
this.bottomMarginBand1.HeightF = 54.95828F;
this.bottomMarginBand1.HeightF = 35.66659F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// xrLabel5
//
this.xrLabel5.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(1109F, 30.29169F);
this.xrLabel5.StylePriority.UseBorders = false;
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.Text = resources.GetString("xrLabel5.Text");
this.xrLabel5.Visible = false;
//
// ReportFooter
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel20,
this.xrLabel3,
this.xrLabel11,
this.xrLabel8,
this.xrLabel6,
this.cellGesamt});
this.ReportFooter.Font = new System.Drawing.Font("Arial", 11F);
this.ReportFooter.HeightF = 140.125F;
this.ReportFooter.HeightF = 178.6667F;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
@@ -794,7 +781,7 @@ namespace SpzRatingen
//
this.xrLabel19.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedEndDate", "{0:dd.MM.yyyy}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EndDate", "{0:dd.MM.yyyy}")});
this.xrLabel19.Font = new System.Drawing.Font("Arial", 11F);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(378.4589F, 184.1667F);
this.xrLabel19.Name = "xrLabel19";
@@ -807,7 +794,7 @@ namespace SpzRatingen
//
this.xrLabel10.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedStartDate", "{0:dd.MM.yyyy}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "StartDate", "{0:dd.MM.yyyy}")});
this.xrLabel10.Font = new System.Drawing.Font("Arial", 11F);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(124.8126F, 184.1667F);
this.xrLabel10.Name = "xrLabel10";
@@ -944,6 +931,18 @@ namespace SpzRatingen
this.fieldGroup.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldGroup.Name = "fieldGroup";
//
// xrLabel20
//
this.xrLabel20.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0.001049042F, 148.375F);
this.xrLabel20.Name = "xrLabel20";
this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel20.SizeF = new System.Drawing.SizeF(1085.229F, 30.29169F);
this.xrLabel20.StylePriority.UseBorders = false;
this.xrLabel20.StylePriority.UseFont = false;
this.xrLabel20.Text = resources.GetString("xrLabel20.Text");
this.xrLabel20.Visible = false;
//
// LeistungsnachweisSoziotherapie
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -966,7 +965,7 @@ namespace SpzRatingen
this.formattingRuleCostBearer,
this.formattingRuleEmployeeName});
this.Landscape = true;
this.Margins = new System.Drawing.Printing.Margins(30, 30, 50, 55);
this.Margins = new System.Drawing.Printing.Margins(30, 30, 50, 36);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
@@ -1052,7 +1051,7 @@ namespace SpzRatingen
private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRPictureBox picSignature;
private DevExpress.XtraReports.UI.XRLabel xrLabel20;
}
}

2
ReportImp/SPZRatingen/SoziotherapieLeistungsnachweis.resx
View File

@@ -120,7 +120,7 @@
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>21, 17</value>
</metadata>
<data name="xrLabel5.Text" xml:space="preserve">
<data name="xrLabel20.Text" xml:space="preserve">
<value>Die Daten werden von der gesetzlichen Krankenkasse zur Erfüllung der Aufgaben nach § 284 Abs. 1 Nr. 8 SGB V erhoben und verarbeitet. Nach dem Vertrag nach 132b SGB V in Verbindung mit § 37a SGB V zur Versorgung mit Soziotherapie sind Sie verpflichtet, die erforderlichen Angaben zu machen.</value>
</data>
</root>