This commit is contained in:
Christian
2021-11-22 16:15:15 +01:00
parent 02fdf19582
commit d42c932ef0
9 changed files with 171 additions and 57 deletions

View File

@@ -33,10 +33,12 @@ namespace BeWo.Data.ICF
_File = XDocument.Load(file);
Debug.WriteLine("Dokument geladen");
_Root = _File.Descendants("Class").Where(x => x.Attribute("code")?.Value == "b" /*|| x.Attribute("code")?.Value == "s" ||
_Root = _File.Descendants("Class").Where(x => x.Attribute("code")?.Value == "d" /*|| x.Attribute("code")?.Value == "s" ||
x.Attribute("code")?.Value == "d" || x.Attribute("code")?.Value == "e"*/).First(); // Entscheidet, welche Kapitel rein sollen
string[] codes = new string[] { "b", "s", "d", "e" };
//string[] codes = new string[] { "b", "d" };
_RootList = new List<XElement>();
foreach (var c in codes)
{
@@ -62,6 +64,13 @@ namespace BeWo.Data.ICF
}
public static List<List<ValueListEntryDC>> GetWholeIcf()
{
//var testList = new List<List<ValueListEntryDC>>();
//testList.Add(new List<ValueListEntryDC>);
//testList.Add(new List<ValueListEntryDC>);
//testList.Add(GetIcf().ToList());
//testList.Add(new List<ValueListEntryDC>);
//return testList;
if (_RootList == null)
return null;

View File

@@ -1,2 +1,2 @@
ALTER TABLE `bewodemo`.`valuelistentry`
ALTER TABLE `valuelistentry`
CHANGE COLUMN `Notice` `Notice` VARCHAR(2048) NULL DEFAULT NULL ;

View File

@@ -411,6 +411,15 @@ namespace AlphaEv
var std = Math.Round(Math.Round(diff, 2, MidpointRounding.AwayFromZero) * (4m / 3m), 2, MidpointRounding.AwayFromZero);
//std *= (4 / 3);
//if (ed.UeberstundenVormonat.HasValue && ed.UeberstundenVormonat.Value > 0)
//{
// int test = 0;
//}
decimal stunden = 0;
BerechneExtraUeberstunden(ed.Employee, start, ende, out stunden);
std += stunden;
return std + (ed.UeberstundenVormonat ?? 0);
}
}

View File

@@ -91,6 +91,8 @@ namespace AlphaEv
//Addiere Vorjahreswert im Januaer
summe += (ed.UeberstundenVormonat ?? 0);
}
summe += ed.UeberstundenAusbezahlt;
oid2Gesamt[ed.Employee.Oid.Value] += summe;
var em = new MitarbeiterstundenkontoMonateRO.EmployeeDetailMonat();

View File

@@ -44,6 +44,7 @@ namespace AlphaEv
DevExpress.XtraReports.UI.XRSummary xrSummary12 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary13 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary14 = new DevExpress.XtraReports.UI.XRSummary();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MitarbeiterstundenkontoJahr));
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
@@ -130,6 +131,9 @@ namespace AlphaEv
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
@@ -147,6 +151,7 @@ namespace AlphaEv
this.fieldKalkAz = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldKalkInd = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldSaldoKalkAz = new DevExpress.XtraReports.UI.CalculatedField();
this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -406,7 +411,8 @@ namespace AlphaEv
this.Detail2,
this.GroupHeader2,
this.GroupFooter2,
this.GroupHeader3});
this.GroupHeader3,
this.GroupFooter1});
this.DetailReport1.DataMember = "EmployeeInfoList.EmployeeDetails";
this.DetailReport1.DataSource = this.bindingSource1;
this.DetailReport1.Level = 0;
@@ -1056,6 +1062,35 @@ namespace AlphaEv
this.lblMonat.StylePriority.UseFont = false;
this.lblMonat.Text = "Arbeitszeitkonto [EmployeeInfoList.LastName], [EmployeeInfoList.FirstName]";
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel20,
this.xrLabel19,
this.xrLabel13});
this.GroupFooter1.HeightF = 224.1667F;
this.GroupFooter1.Level = 1;
this.GroupFooter1.Name = "GroupFooter1";
//
// xrLabel19
//
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(190F, 30F);
this.xrLabel19.Multiline = true;
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.SizeF = new System.Drawing.SizeF(908.3334F, 194.1667F);
this.xrLabel19.StylePriority.UseFont = false;
this.xrLabel19.Text = resources.GetString("xrLabel19.Text");
//
// xrLabel13
//
this.xrLabel13.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10F);
this.xrLabel13.Multiline = true;
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.SizeF = new System.Drawing.SizeF(190F, 20F);
this.xrLabel13.StylePriority.UseFont = false;
this.xrLabel13.Text = "Legende:";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoMonateRO);
@@ -1181,6 +1216,15 @@ namespace AlphaEv
this.fieldSaldoKalkAz.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldSaldoKalkAz.Name = "fieldSaldoKalkAz";
//
// xrLabel20
//
this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0F, 30F);
this.xrLabel20.Multiline = true;
this.xrLabel20.Name = "xrLabel20";
this.xrLabel20.SizeF = new System.Drawing.SizeF(190F, 194.1667F);
this.xrLabel20.StylePriority.UseFont = false;
this.xrLabel20.Text = resources.GetString("xrLabel20.Text");
//
// MitarbeiterstundenkontoJahr
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1324,5 +1368,9 @@ namespace AlphaEv
private DevExpress.XtraReports.UI.CalculatedField fieldKalkAz;
private DevExpress.XtraReports.UI.CalculatedField fieldKalkInd;
private DevExpress.XtraReports.UI.CalculatedField fieldSaldoKalkAz;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRLabel xrLabel13;
private DevExpress.XtraReports.UI.XRLabel xrLabel19;
private DevExpress.XtraReports.UI.XRLabel xrLabel20;
}
}

View File

@@ -117,6 +117,40 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="xrLabel20.Text" xml:space="preserve">
<value>Spalte "Reguläre Arbeitszeit"
Spalte "Zusätzliche Zeiten"
Spalte "Soll Arbeitszeit"
Spalte "FLS Soll"
Spalte "Indirekte Zeiten"
Spalte "FLS Fallverantwortliche"
Spalte "FLS in Vertretung"
Spalte "FLS gesamt"
Spalte "kalkulierte Indirekte Zeiten"
Spalte "FLS Quote"
Spalte "kalkulierte Arbeitszeit"
Spalte "Saldo kalkulierte Arbeitszeit"
Spalte "Arbeitszeiterfassung"
Spalte "tatsächliche indirekte Zeiten"
Spalte "Saldo Arbeitszeit"</value>
</data>
<data name="xrLabel19.Text" xml:space="preserve">
<value>Arbeitstage x tägliche Arbeitszeit
Zusätzliche Zeiten in Stunden
Reguläre Arbeitszeit abzgl. U, F, K + zusätzliche Zeiten = Soll Arbeitszeit
FLS Soll (75% von Soll Arbeitszeit)
Indirekte Zeiten (25% von Soll Arbeitszeit)
FLS Fallverantwortlicher
FLS in Vertretung
FLS gesamt aus Fallverantwortung und Vertretung
kalkulierte indirekte Zeiten
FLS Quote aus Sollarbeitszeit und FLS Gesamt
kalkulierte Arbeitszeit aus FLS Gesamt + kalkulierte indirekte Zeiten
Saldo kalk. Arbeitszeit Vormonat + kalk. Arbeitszeit lfdm. Monat - Soll Arbeitszeit
Arbeitszeiterfassungsstunden
tatsächliche indirekte Zeiten (Arbeitszeiterfassung - FLS Gesamt)
Saldo Arbeitszeit Vormonat (im Januar + Übertrag aus Vorjahr) + Zeiterfassung lfd. Monat - Soll Arbeitszeit lfd. Monat</value>
</data>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>

View File

@@ -64,40 +64,52 @@ namespace DiakonieKKKleve.Reporting
{
XtraReport report = null;
if (!String.IsNullOrWhiteSpace(ro.Costbearer) && (ro.Costbearer.ToLower().Contains("§67")))
if (ro.CustomerLastName.StartsWith("Aengen"))
{
report = new QuittierungsbelegDienstleistung();
((QuittierungsbelegDienstleistung)report).SetReportDataSource(ro);
return report as XtraReport;
int test = 0;
}
//if (!String.IsNullOrWhiteSpace(ro.Costbearer) && (ro.Costbearer.ToLower().Contains("§67")))
// {
// report = new QuittierungsbelegDienstleistung();
// ((QuittierungsbelegDienstleistung)report).SetReportDataSource(ro);
// return report as XtraReport;
// }
ServicesOverviewRO bewoRo = ServicesOverviewRO.CopyFromRO(ro);
ServicesOverviewRO soziRo = ServicesOverviewRO.CopyFromRO(ro);
ServicesOverviewRO dienstRo = ServicesOverviewRO.CopyFromRO(ro);
if (ro.Services != null)
if (ro.Services != null)
{
foreach (ServicesOverviewRO.ServiceDetail s in ro.Services)
{
if (s.ServiceCategory.Contains("Therapie"))
{
soziRo.Services.Add(s);
}
else
{
bewoRo.Services.Add(s);
}
//if (!s.ServiceCategory.StartsWith("Dienstleistung"))
//{
if (s.ServiceCategory.Contains("Therapie"))
{
soziRo.Services.Add(s);
}
else if (s.ServiceCategory.StartsWith("Dienstleistung"))
{
dienstRo.Services.Add(s);
}
else if (s.IsBillable)
{
bewoRo.Services.Add(s);
}
//}
}
}
report = AddSubServicesOverviewReportToReport(report, new LeistungsnachweisSoziotherapie(), soziRo);
report = AddSubServicesOverviewReportToReport(report, new Stundenzettel(), bewoRo);
report = AddSubServicesOverviewReportToReport(report, new QuittierungsbelegDienstleistung(), dienstRo);
if (report == null)
if (report == null)
report = new XtraReport();
return report as XtraReport;

View File

@@ -31,10 +31,10 @@ namespace BeWo.DieDueneReports
{
this.components = new System.ComponentModel.Container();
DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
@@ -42,6 +42,7 @@ namespace BeWo.DieDueneReports
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell67 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
@@ -53,6 +54,7 @@ namespace BeWo.DieDueneReports
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand();
@@ -74,6 +76,7 @@ namespace BeWo.DieDueneReports
this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell64 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSumMinutesTotalDecimal = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSumHoursSickDecimal = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSumHoursInVacationDecimal = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
@@ -98,7 +101,6 @@ namespace BeWo.DieDueneReports
this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
@@ -116,9 +118,7 @@ namespace BeWo.DieDueneReports
this.fieldSumHoliday2 = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldIstArbeitszeit = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldUeberstundenGesamt = new DevExpress.XtraReports.UI.CalculatedField();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
@@ -201,6 +201,15 @@ namespace BeWo.DieDueneReports
this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell31.Weight = 0.063119930442761957D;
//
// xrTableCell9
//
this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.PauseInMinuten", "{0:0.00}")});
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell9.Weight = 0.0631199300127915D;
//
// xrTableCell67
//
this.xrTableCell67.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -317,6 +326,14 @@ namespace BeWo.DieDueneReports
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell7.Weight = 0.063119928922238014D;
//
// xrTableCell4
//
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Pause";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell4.Weight = 0.063119931160787124D;
//
// xrTableCell8
//
this.xrTableCell8.Multiline = true;
@@ -553,6 +570,18 @@ namespace BeWo.DieDueneReports
this.cellSumMinutesTotalDecimal.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.cellSumMinutesTotalDecimal.Weight = 0.0631192496629693D;
//
// xrTableCell16
//
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.PauseInMinuten")});
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.StylePriority.UseTextAlignment = false;
xrSummary2.FormatString = "{0:0.00}";
xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell16.Summary = xrSummary2;
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell16.Weight = 0.063119254525531562D;
//
// cellSumHoursSickDecimal
//
this.cellSumHoursSickDecimal.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -747,7 +776,7 @@ namespace BeWo.DieDueneReports
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.StylePriority.UseBorders = false;
this.xrTableCell11.StylePriority.UseTextAlignment = false;
this.xrTableCell11.Text = "davon ausbezahlt:";
this.xrTableCell11.Text = "Sonstige Überstunden:";
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell11.Weight = 0.14389779185300228D;
//
@@ -846,10 +875,6 @@ namespace BeWo.DieDueneReports
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell14.Weight = 0.080942614161178317D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
//
// Title
//
this.Title.BackColor = System.Drawing.Color.White;
@@ -979,34 +1004,9 @@ namespace BeWo.DieDueneReports
this.fieldUeberstundenGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldUeberstundenGesamt.Name = "fieldUeberstundenGesamt";
//
// xrTableCell4
// bindingSource1
//
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Pause";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell4.Weight = 0.063119931160787124D;
//
// xrTableCell9
//
this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.PauseInMinuten", "{0:0.00}")});
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell9.Weight = 0.0631199300127915D;
//
// xrTableCell16
//
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.PauseInMinuten")});
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.StylePriority.UseTextAlignment = false;
xrSummary2.FormatString = "{0:0.00}";
xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell16.Summary = xrSummary2;
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell16.Weight = 0.063119254525531562D;
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
//
// Mitarbeiterarbeitszeitkonto
//

View File

@@ -48,7 +48,7 @@ namespace BeWo.Service.Plugins
//t = "2499262621"; // HPH Bersenbrück
//t = "4950382346"; // Holsinger
//t = "5973016645"; // Verein Lebensgestaltung Hanau
//t = "7375324044"; // Diakonie KK Kleve
t = "7375324044"; // Diakonie KK Kleve
//t = "1441747891"; // BeWo Mobil Köln
//t = "5120047701"; // Trialog
//t = "3629696651"; // Soziale Dienste Niederrhein