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

This commit is contained in:
2025-12-11 08:53:10 +01:00
40 changed files with 5616 additions and 980 deletions

View File

@@ -94,6 +94,7 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label
Grid.Row="0"
@@ -105,27 +106,36 @@
<Label
Grid.Row="1"
Grid.Column="0"
Content="AZ der Staatsanwaltschaft/des Gerichts" />
Content="Fallnummer" />
<TextBox
Grid.Row="1"
Grid.Column="1"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Text="{Binding Path=AktenzeichenGericht, UpdateSourceTrigger=PropertyChanged}" />
Text="{Binding Path=Fallnummer, UpdateSourceTrigger=PropertyChanged}" />
<Label
Grid.Row="2"
Grid.Column="0"
Content="Eigenes Aktenzeichen" />
Content="AZ der Staatsanwaltschaft/des Gerichts" />
<TextBox
Grid.Row="2"
Grid.Column="1"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Text="{Binding Path=EigenesAktenzeichen, UpdateSourceTrigger=PropertyChanged}" />
Text="{Binding Path=AktenzeichenGericht, UpdateSourceTrigger=PropertyChanged}" />
<Label
Grid.Row="3"
Grid.Column="0"
Content="Eigenes Aktenzeichen" />
<TextBox
Grid.Row="3"
Grid.Column="1"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Text="{Binding Path=EigenesAktenzeichen, UpdateSourceTrigger=PropertyChanged}" />
<Label
Grid.Row="4"
Grid.Column="0"
Content="Auftraggeber" />
<uc:PopUpEdit NewButtonVisibility="Collapsed"
Grid.Row="3"
Grid.Row="4"
Grid.Column="1"
Margin="3"
IsReadOnly="True"
@@ -137,11 +147,11 @@
Text="{Binding Path=Auftraggeber.Name, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
Cursor="Arrow" />
<Label
Grid.Row="4"
Grid.Row="5"
Grid.Column="0"
Content="Auftraggeber Kontaktperson" />
<uc:PopUpEdit NewButtonVisibility="Visible"
Grid.Row="4"
Grid.Row="5"
Grid.Column="1"
Margin="3"
NewClick="popupedit_AuftraggeberContactPersonSearch_NewClick"
@@ -154,11 +164,11 @@
Text="{Binding Path=AuftraggeberAnsprechpartner.FullName, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
Cursor="Arrow" />
<Label
Grid.Row="5"
Grid.Row="6"
Grid.Column="0"
Content="Einsatzstelle" />
<uc:PopUpEdit NewButtonVisibility="Collapsed"
Grid.Row="5"
Grid.Row="6"
Grid.Column="1"
Margin="3"
IsReadOnly="True"
@@ -170,11 +180,11 @@
Text="{Binding Path=Einsatzstelle.Name, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
Cursor="Arrow" />
<Label
Grid.Row="6"
Grid.Row="7"
Grid.Column="0"
Content="Einsatzstelle Kontaktperson" />
<uc:PopUpEdit NewButtonVisibility="Visible"
Grid.Row="6"
Grid.Row="7"
Grid.Column="1"
Margin="3"
NewClick="popupedit_EinsatzstelleContactPersonSearch_NewClick"
@@ -187,23 +197,23 @@
Text="{Binding Path=EinsatzstelleAnsprechpartner.FullName, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
Cursor="Arrow" />
<Label
Grid.Row="7"
Grid.Row="8"
Grid.Column="0"
Content="Auftragseingang" />
<dxe:DateEdit
Grid.Row="7"
Grid.Row="8"
Grid.Column="1"
EditValue="{Binding Path=Auftragseingang, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
ShowClearButton="False" />
<Label
Grid.Row="8"
Grid.Row="9"
Grid.Column="0"
Content="Auftragsherkunft" />
<uc:NullItemComboBox
x:Name="comboBox_Auftragsherkunft"
Grid.Row="8"
Grid.Row="9"
Grid.Column="1"
DisplayMemberPath="TypeDescription"
IsEnabled="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, ElementName=root}"
@@ -212,12 +222,12 @@
Style="{StaticResource PrimaryNullItemComboBox}" />
<Label
Grid.Row="9"
Grid.Row="10"
Grid.Column="0"
Content="Vermittlungsgrundlage" />
<uc:NullItemComboBox
x:Name="comboBox_Vermittlungsgrundlage"
Grid.Row="9"
Grid.Row="10"
Grid.Column="1"
DisplayMemberPath="TypeDescription"
IsEnabled="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, ElementName=root}"
@@ -225,55 +235,55 @@
SelectedValue="{Binding Path=Vermittlungsgrundlage, Mode=TwoWay}" />
<Label
Grid.Row="10"
Grid.Row="11"
Grid.Column="0"
Content="Tagessätze" />
<dxe:TextEdit
Grid.Row="10"
Grid.Row="11"
Grid.Column="1"
EditValue="{Binding Path=Tagessatze, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Style="{StaticResource TextEditNumberDecimalNullable}" />
<Label
Grid.Row="11"
Grid.Row="12"
Grid.Column="0"
Content="Tagessatzhöhe" />
<dxe:TextEdit
Grid.Row="11"
Grid.Row="12"
Grid.Column="1"
EditValue="{Binding Path=Tagessatzhohe, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Style="{StaticResource TextEditCurrency}" />
<Label
Grid.Row="12"
Grid.Row="13"
Grid.Column="0"
Content="Höhe der Geldstrafe" />
<dxe:TextEdit
Grid.Row="12"
Grid.Row="13"
Grid.Column="1"
EditValue="{Binding Path=HoheDerGeldstrafe, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="True"
Style="{StaticResource TextEditCurrency}" />
<Label
Grid.Row="13"
Grid.Row="14"
Grid.Column="0"
Content="Zu leistende Arbeitsstunden" />
<dxe:TextEdit
Grid.Row="13"
Grid.Row="14"
Grid.Column="1"
EditValue="{Binding Path=ZuLeistendeArbeitsstunden, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Style="{StaticResource TextEditHours}" />
<Label
Grid.Row="14"
Grid.Row="15"
Grid.Column="0"
Content="Hinweis" />
<TextBox
Grid.Row="14"
Grid.Row="15"
Grid.Column="1"
IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
Text="{Binding Path=Hinweis, UpdateSourceTrigger=PropertyChanged}" />
@@ -384,7 +394,7 @@
<TextBox
Grid.Row="8"
Grid.Column="3"
Grid.RowSpan="7"
Grid.RowSpan="8"
Height="190"
VerticalAlignment="Top"
VerticalContentAlignment="Stretch"

View File

@@ -13,6 +13,7 @@ namespace BeWo.ViewModel
public class CustomerVermittlungArbeitVM : AbstractDCMapperVM<CustomerVermittlungArbeitDC>
{
private VgaTypeEnum _VgaType;
private string _Fallnummer;
private string _AktenzeichenGericht;
private string _EigenesAktenzeichen;
private CompactOrganisationDC _Auftraggeber;
@@ -81,6 +82,21 @@ namespace BeWo.ViewModel
}
public string Displayname => $"AZ: {AktenzeichenGericht}";
public string Fallnummer
{
get { return _Fallnummer; }
set
{
if (!AreDifferent(_Fallnummer, value))
return;
_Fallnummer = value;
StoreDirtyInformation(AreDifferent(DataContract.Fallnummer, value), nameof(Fallnummer));
FirePropertyChanged(nameof(Fallnummer));
}
}
public string AktenzeichenGericht
{
get { return _AktenzeichenGericht; }
@@ -625,6 +641,7 @@ namespace BeWo.ViewModel
protected override void InitByDataContract(CustomerVermittlungArbeitDC pDataContract)
{
_VgaType = pDataContract.VgaType;
_Fallnummer = pDataContract.Fallnummer;
_AktenzeichenGericht = pDataContract.AktenzeichenGericht;
_EigenesAktenzeichen = pDataContract.EigenesAktenzeichen;
_Auftragseingang = pDataContract.Auftragseingang;
@@ -676,6 +693,7 @@ namespace BeWo.ViewModel
protected override CustomerVermittlungArbeitDC MapToDataContract(CustomerVermittlungArbeitDC pDataContract, bool doCommit)
{
pDataContract.VgaType = _VgaType;
pDataContract.Fallnummer = _Fallnummer;
pDataContract.AktenzeichenGericht = _AktenzeichenGericht;
pDataContract.EigenesAktenzeichen = _EigenesAktenzeichen;
pDataContract.Auftragseingang = _Auftragseingang;

View File

@@ -493,13 +493,13 @@ namespace BeWoPlanerMobil.Controllers
var applicationUser = DAOFactory.GenericDAO.GetAllActiveAndArchived<ApplicationUser>();
Dictionary<long?, ApplicationUser> appUserOid2AppUser = new Dictionary<long?, ApplicationUser>();
Dictionary<long?, ApplicationUser> employeeOid2AppUser = new Dictionary<long?, ApplicationUser>();
foreach (var au in applicationUser)
{
if (au.Employee != null && au.Employee.Oid.HasValue && !appUserOid2AppUser.ContainsKey(au.Employee.Oid))
if (au.Employee != null && au.Employee.Oid.HasValue && !employeeOid2AppUser.ContainsKey(au.Employee.Oid))
{
appUserOid2AppUser.Add(au.Employee.Oid, au);
employeeOid2AppUser.Add(au.Employee.Oid, au);
}
}
@@ -509,26 +509,51 @@ namespace BeWoPlanerMobil.Controllers
{
var mtInputList = new List<JsonRueckgabeTeamMitarbeiterInput2>();
foreach (var member in team.MemberList.Where(teamMember => teamMember.Oid.HasValue))
if (team.IsOwnChatTeam)
{
if (appUserOid2AppUser.ContainsKey(member.Oid))
foreach (var p2t in team.OwnChatMember)
{
var mtInput2 = new JsonRueckgabeTeamMitarbeiterInput2("1", member.Oid.ToString());
if (member.IsActive == ActivationTypeId.Deleted)
if (p2t.Person.Type == PersonType.Employee)
{
mtInput2.Status = "3";
}
if (member.IsActive == ActivationTypeId.Archived)
{
mtInput2.Status = "2";
}
var emp = DAOFactory.SearchDAO.FindEmployeeWithPersonOid(p2t.Person.Oid.Value);
var mtInput2 = new JsonRueckgabeTeamMitarbeiterInput2("1", emp.Oid.ToString());
mtInputList.Add(mtInput2);
if (emp.IsActive == ActivationTypeId.Deleted)
{
mtInput2.Status = "3";
}
if (emp.IsActive == ActivationTypeId.Archived)
{
mtInput2.Status = "2";
}
mtInputList.Add(mtInput2);
}
else
{
//var mtInput2 = new JsonRueckgabeTeamMitarbeiterInput2("1", member.Oid.ToString());
//if (member.IsActive == ActivationTypeId.Deleted)
//{
// mtInput2.Status = "3";
//}
//if (member.IsActive == ActivationTypeId.Archived)
//{
// mtInput2.Status = "2";
//}
//mtInputList.Add(mtInput2);
}
}
else
}
else
{
foreach (var member in team.MemberList.Where(teamMember => teamMember.Oid.HasValue))
{
var mtInput2 = new JsonRueckgabeTeamMitarbeiterInput2("1", member.Oid.ToString());
if (member.IsActive == ActivationTypeId.Deleted)
@@ -544,7 +569,7 @@ namespace BeWoPlanerMobil.Controllers
mtInputList.Add(mtInput2);
}
}
var mtInput1 = new JsonRueckgabeTeamMitarbeiterInput(team.Oid.ToString(),"1", team.Name, mtInputList);
if (team.IsActive == ActivationTypeId.Deleted)

View File

@@ -249,8 +249,7 @@ namespace BeWoPlanerMobil.Controllers
Model.SelectedSupportConceptListObject = Model.SupportConceptListObjects.FirstOrDefault(f => f.CostBearer2SupportConceptOid == -1) ?? Model.SupportConceptListObjects.First();
Model.SelectedCostBearerSupportConceptOid = -1;
Log.Info($"TEST Model.SupportConceptListObjects Oids = {Model.SelectedCostBearerSupportConceptOid}");
}
else
{
@@ -1180,6 +1179,8 @@ namespace BeWoPlanerMobil.Controllers
Zeitstempel = date,
ServiceRecordOid = objectOid
}).SignatureOid;
Log.Info(String.Format("Unterschrift (Oid {0}) erfolgreich gespeichert für ServiceRecord {1}", oid, objectOid));
}
if(oid is null)

View File

@@ -19,6 +19,7 @@ namespace BeWo.Data.Entities
public virtual Person AuftraggeberAnsprechpartner { get; set; }
public virtual Organisation Einsatzstelle { get; set; }
public virtual Person EinsatzstelleAnsprechpartner { get; set; }
public virtual string Fallnummer { get; set; }
public virtual string AktenzeichenGericht { get; set; }
public virtual string EigenesAktenzeichen { get; set; }
public virtual DateTime? Auftragseingang { get; set; }

View File

@@ -15,6 +15,7 @@
<property name="Notice"/>
<property name="VgaType" type="BS.Shared.VgaTypeEnum, BS.Shared" />
<many-to-one name="Customer" column="CustomerOid" class="BeWo.Data.Entities.Customer, BeWo.Data" cascade="none"/>
<property name="Fallnummer"/>
<property name="AktenzeichenGericht"/>
<property name="EigenesAktenzeichen"/>
<property name="Auftragseingang"/>

View File

@@ -287,12 +287,13 @@ namespace Host
Directory.CreateDirectory(root_path);
var finalpath = root_path + file_path;
var encoding = Encoding.GetEncoding("ISO-8859-1");
File.WriteAllText(finalpath, req.Nutzdatendatei);
var nutzdatendatei_encoded = encoding.GetBytes(req.Nutzdatendatei);
File.WriteAllBytes(finalpath, nutzdatendatei_encoded);
var auftragsdatei2 = Encoding.GetEncoding("ISO-8859-1").GetBytes(req.Auftragsdatei);
File.WriteAllBytes(finalpath + ".auf", auftragsdatei2);
var auftragsdatei_encoded = Encoding.GetEncoding("ISO-8859-1").GetBytes(req.Auftragsdatei);
File.WriteAllBytes(finalpath + ".auf", auftragsdatei_encoded);
return finalpath;
}

View File

@@ -0,0 +1 @@
ALTER TABLE `CustomerVermittlungArbeit` ADD COLUMN Fallnummer VARCHAR(256) NULL DEFAULT NULL;

View File

@@ -1771,4 +1771,10 @@ ADD COLUMN `Details6` VARCHAR(1024) NULL,
ADD COLUMN `Details7` VARCHAR(1024) NULL,
ADD COLUMN `Details8` VARCHAR(1024) NULL,
ADD COLUMN `Details9` VARCHAR(1024) NULL,
ADD COLUMN `Details10` VARCHAR(1024) NULL;
ADD COLUMN `Details10` VARCHAR(1024) NULL;
ALTER TABLE `assessmentsheetvalue`
CHANGE COLUMN `Sign` `Sign` VARCHAR(256) NULL DEFAULT NULL ;
ALTER TABLE `CustomerVermittlungArbeit` ADD COLUMN Fallnummer VARCHAR(256) NULL DEFAULT NULL;

View File

@@ -45,7 +45,7 @@ namespace BeWo.Report.DefaultReports
AddSpalten(i, false);
}
xrTableRowHeader1.Cells[xrTableRowHeader1.Cells.Count - 1].Text = String.Format("KW {0}", wochen[i].KalenderWoche);
xrTableRowHeader1.Cells[xrTableRowHeader1.Cells.Count - 1].Text = String.Format("KW {0}, {1:dd.MM.yy} - {2:dd.MM.yy}", wochen[i].KalenderWoche, wochen[i].WocheStart, wochen[i].WocheEnde);
}
//Add Gesamtsummen

View File

@@ -123,7 +123,7 @@ namespace BeWo.Report.ReportObjects
{
var grpRo = new FLSSollIstReportGroupRO();
grpRo.Name = item.DisplayName;
grpRo.WochenSummen = ErstelleWochensummen(config.StartDate, config.EndDate, root.SollFLSPerWeek);
grpRo.WochenSummen = ErstelleWochensummen(config.StartDate, config.EndDate, null);
foreach (var sc in item.SupportConcepts)
{
@@ -138,6 +138,11 @@ namespace BeWo.Report.ReportObjects
ws.IstStunden = 0;
}
ws.IstStunden += sr.RoundedDuration / 60;
if (!ws.SollStunden.HasValue)
{
ws.SollStunden = sr.SollFLSPerWeek;
}
}
grpRo.IstGesamt += sr.RoundedDuration;

View File

@@ -1764,7 +1764,7 @@ namespace BeWo.Report.ReportObjects
}
private double GetOverlappingMinutes(DateTime start1, DateTime end1, DateTime start2, DateTime end2)
public double GetOverlappingMinutes(DateTime start1, DateTime end1, DateTime start2, DateTime end2)
{
if (end1 > start2 && start1 < end2)
{

View File

@@ -41,7 +41,27 @@ namespace BetreuWoReports
{
dayDetail.Custom2 = sr.ServiceDescription.Name;
}
}
double samstagGesamt = 0;
foreach (var srs in dayDetail.ServiceRecords)
{
if (srs.Start.Value.DayOfWeek == DayOfWeek.Saturday)
{
//Berechne die Stunden, die Samstag zwischen 13 und 21 Uhr gearbeitet wurde
DateTime ende = srs.Start.Value.AddMinutes((int)srs.RoundedDuration);
if (srs.GroupOid.HasValue && srs.GroupRoundedDuration.HasValue)
{
ende = srs.Start.Value.AddMinutes((int)srs.GroupRoundedDuration);
}
samstagGesamt += GetOverlappingMinutes(srs.Start.Value, ende, sr.Start.Value.Date.AddHours(13), sr.Start.Value.Date.AddHours(21));
}
}
if (samstagGesamt > 0)
{
dayDetail.Custom10 = String.Format("{0:0.00}", samstagGesamt / 60);
}
}
if (dayDetail.StartDateTime1.HasValue || dayDetail.EndDateTime1.HasValue)
{
@@ -54,7 +74,29 @@ namespace BetreuWoReports
bindingSource1.DataSource = pRO;
}
private void xrLabel1_BeforePrint(object sender, System.ComponentModel.CancelEventArgs e)
private double GetOverlappingMinutes(DateTime start1, DateTime end1, DateTime start2, DateTime end2)
{
if (end1 > start2 && start1 < end2)
{
DateTime dtStart = start1;
if (dtStart < start2)
dtStart = start2;
DateTime dtEnd = end1;
if (dtEnd > end2)
dtEnd = end2;
TimeSpan ts = dtEnd.Subtract(dtStart);
return ts.TotalMinutes;
}
return 0;
}
private void xrLabel1_BeforePrint(object sender, System.ComponentModel.CancelEventArgs e)
{
var emp = DetailReport.GetCurrentRow() as MitarbeiterstundenkontoRO.EmployeeDetail;
@@ -132,5 +174,10 @@ namespace BetreuWoReports
return contract?.EmploymentType != null && contract.EmploymentType.Name.ToLower().Contains("gfb");
}
private void Mitarbeiterstundenkonto_BeforePrint(object sender, System.ComponentModel.CancelEventArgs e)
{
}
}
}

View File

@@ -31,8 +31,10 @@ namespace BetreuWoReports
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Mitarbeiterstundenkonto));
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 xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.ruleFeiertag = new DevExpress.XtraReports.UI.FormattingRule();
@@ -91,7 +93,6 @@ namespace BetreuWoReports
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
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();
@@ -112,6 +113,11 @@ namespace BetreuWoReports
this.fieldNightHours = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldSalaryDiff = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldMinutenGesamtIst = new DevExpress.XtraReports.UI.CalculatedField();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
@@ -128,7 +134,8 @@ namespace BetreuWoReports
//
// Detail1
//
this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.Detail1.HeightF = 0F;
this.Detail1.Name = "Detail1";
this.Detail1.StylePriority.UseFont = false;
@@ -207,6 +214,7 @@ namespace BetreuWoReports
this.xrTableCell17,
this.xrTableCell18,
this.xrTableCell20,
this.xrTableCell7,
this.xrTableCell21});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Weight = 1D;
@@ -226,20 +234,20 @@ namespace BetreuWoReports
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.Custom3")});
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.StylePriority.UseFont = false;
this.xrTableCell15.Weight = 0.99499568265097171D;
this.xrTableCell15.Weight = 0.895496112708052D;
//
// xrTableCell16
//
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.MinutesTotal", "{0:0.##}")});
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 5, 0, 0, 100F);
this.xrTableCell16.StylePriority.UseFont = false;
this.xrTableCell16.StylePriority.UsePadding = false;
this.xrTableCell16.StylePriority.UseTextAlignment = false;
this.xrTableCell16.Text = "xrTableCell9";
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell16.Weight = 0.74624681103657375D;
this.xrTableCell16.Weight = 0.49749788617927448D;
//
// xrTableCell17
//
@@ -248,7 +256,7 @@ namespace BetreuWoReports
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.StylePriority.UseFont = false;
this.xrTableCell17.Text = "xrTableCell11";
this.xrTableCell17.Weight = 1.1939948235062199D;
this.xrTableCell17.Weight = 1.19399482350622D;
//
// xrTableCell18
//
@@ -257,36 +265,45 @@ namespace BetreuWoReports
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.StylePriority.UseFont = false;
this.xrTableCell18.Text = "xrTableCell13";
this.xrTableCell18.Weight = 1.7909922521121247D;
this.xrTableCell18.Weight = 1.6914926821692049D;
//
// xrTableCell20
//
this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.fieldNightHours", "{0:0.00}")});
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell20.StylePriority.UseFont = false;
this.xrTableCell20.Weight = 0.72634685715309888D;
this.xrTableCell20.StylePriority.UsePadding = false;
this.xrTableCell20.StylePriority.UseTextAlignment = false;
this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell20.Weight = 0.49749784628438359D;
//
// xrTableCell21
//
this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.fieldSonnUndFeiertage", "{0:0.00}")});
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell21.StylePriority.UseFont = false;
this.xrTableCell21.Weight = 0.99499569599898208D;
this.xrTableCell21.StylePriority.UsePadding = false;
this.xrTableCell21.StylePriority.UseTextAlignment = false;
this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell21.Weight = 0.8755962137825859D;
//
// GroupHeader2
//
this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable2});
this.GroupHeader2.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.GroupHeader2.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.GroupHeader2.HeightF = 28F;
this.GroupHeader2.Name = "GroupHeader2";
this.GroupHeader2.StylePriority.UseFont = false;
//
// xrTable2
//
this.xrTable2.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable2.Name = "xrTable2";
this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
@@ -306,7 +323,8 @@ namespace BetreuWoReports
this.xrTableCell2,
this.xrTableCell12,
this.xrTableCell4,
this.xrTableCell10});
this.xrTableCell10,
this.xrTableCell3});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Weight = 1.12D;
//
@@ -320,17 +338,17 @@ namespace BetreuWoReports
//
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Text = "Uhrzeit";
this.xrTableCell6.Weight = 0.99499568265097171D;
this.xrTableCell6.Weight = 0.89549611270805207D;
//
// xrTableCell1
//
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 5, 0, 0, 100F);
this.xrTableCell1.StylePriority.UsePadding = false;
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "Minuten";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell1.Weight = 0.74624677308049991D;
this.xrTableCell1.Weight = 0.49749784822320059D;
//
// xrTableCell2
//
@@ -344,21 +362,29 @@ namespace BetreuWoReports
//
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Text = "Leistung";
this.xrTableCell12.Weight = 1.7909922521121249D;
this.xrTableCell12.Weight = 1.5919931122262856D;
//
// xrTableCell4
//
this.xrTableCell4.Multiline = true;
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Text = "Stunden\r\nN-Zuschlag";
this.xrTableCell4.Weight = 0.726346857153099D;
this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell4.StylePriority.UsePadding = false;
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Stunden\r\nN-Zuschl.";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell4.Weight = 0.59699741622730351D;
//
// xrTableCell10
//
this.xrTableCell10.Multiline = true;
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Text = "Stunden\r\nSO-/FT-Zuschlag";
this.xrTableCell10.Weight = 0.99499569599898208D;
this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell10.StylePriority.UsePadding = false;
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.Text = "Stunden\r\nSamstag";
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell10.Weight = 0.7959965578282503D;
//
// GroupHeader3
//
@@ -370,7 +396,8 @@ namespace BetreuWoReports
this.xrLabel16,
this.xrLabel1,
this.xrPictureBox1});
this.GroupHeader3.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.GroupHeader3.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.GroupHeader3.HeightF = 402F;
this.GroupHeader3.Level = 1;
this.GroupHeader3.Name = "GroupHeader3";
@@ -379,7 +406,7 @@ namespace BetreuWoReports
//
// xrPageInfo1
//
this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 10F);
this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(502.4165F, 302.29F);
this.xrPageInfo1.Name = "xrPageInfo1";
this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
@@ -391,7 +418,8 @@ namespace BetreuWoReports
//
// xrLabel10
//
this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(401.2049F, 136.29F);
this.xrLabel10.Multiline = true;
this.xrLabel10.Name = "xrLabel10";
@@ -405,7 +433,7 @@ namespace BetreuWoReports
//
// xrRichText1
//
this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 136.46F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
@@ -414,7 +442,7 @@ namespace BetreuWoReports
//
// xrLabel13
//
this.xrLabel13.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 328.29F);
this.xrLabel13.Multiline = true;
this.xrLabel13.Name = "xrLabel13";
@@ -429,7 +457,7 @@ namespace BetreuWoReports
//
this.xrLabel16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "{0:MMMM yyyy}")});
this.xrLabel16.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(0F, 350.29F);
this.xrLabel16.Multiline = true;
this.xrLabel16.Name = "xrLabel16";
@@ -453,7 +481,7 @@ namespace BetreuWoReports
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(502.4165F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(214.5833F, 116.6667F);
@@ -476,7 +504,7 @@ namespace BetreuWoReports
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.EmployeeSalaryByHours", "{0:c}")});
this.xrLabel9.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(350F, 20.00001F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
@@ -492,7 +520,7 @@ namespace BetreuWoReports
this.xrLabel28.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel28.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel28.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20F);
this.xrLabel28.Name = "xrLabel28";
this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
@@ -519,7 +547,7 @@ namespace BetreuWoReports
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenGesamtIst", "{0:0.00} Std")});
this.xrLabel18.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(452.0833F, 20.00001F);
this.xrLabel18.Name = "xrLabel18";
this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
@@ -536,7 +564,7 @@ namespace BetreuWoReports
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.fieldMinutenGesamtIst", "{0:0.##} Min")});
this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(350F, 20.00001F);
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
@@ -552,7 +580,7 @@ namespace BetreuWoReports
this.xrLabel25.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel25.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel25.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20F);
this.xrLabel25.Name = "xrLabel25";
this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
@@ -586,7 +614,7 @@ namespace BetreuWoReports
//
this.lblSaldo4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.lblSaldo4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.lblSaldo4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblSaldo4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 79.99998F);
this.lblSaldo4.Name = "lblSaldo4";
this.lblSaldo4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
@@ -601,7 +629,7 @@ namespace BetreuWoReports
// lblSaldoWert4
//
this.lblSaldoWert4.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.lblSaldoWert4.Font = new System.Drawing.Font("Arial", 10F);
this.lblSaldoWert4.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.lblSaldoWert4.LocationFloat = new DevExpress.Utils.PointFloat(350F, 79.99998F);
this.lblSaldoWert4.Name = "lblSaldoWert4";
this.lblSaldoWert4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
@@ -616,7 +644,7 @@ namespace BetreuWoReports
//
this.lblSaldo3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.lblSaldo3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.lblSaldo3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblSaldo3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 60.00004F);
this.lblSaldo3.Name = "lblSaldo3";
this.lblSaldo3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
@@ -633,7 +661,7 @@ namespace BetreuWoReports
this.lblSaldoWert3.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.lblSaldoWert3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenAusbezahlt", "{0:0.00}")});
this.lblSaldoWert3.Font = new System.Drawing.Font("Arial", 10F);
this.lblSaldoWert3.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.lblSaldoWert3.LocationFloat = new DevExpress.Utils.PointFloat(350F, 60.00004F);
this.lblSaldoWert3.Name = "lblSaldoWert3";
this.lblSaldoWert3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
@@ -650,7 +678,7 @@ namespace BetreuWoReports
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.lblSaldoWert1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")});
this.lblSaldoWert1.Font = new System.Drawing.Font("Arial", 10F);
this.lblSaldoWert1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.lblSaldoWert1.LocationFloat = new DevExpress.Utils.PointFloat(350F, 20.00014F);
this.lblSaldoWert1.Name = "lblSaldoWert1";
this.lblSaldoWert1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
@@ -666,7 +694,7 @@ namespace BetreuWoReports
this.lblSaldoWert2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.lblSaldoWert2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")});
this.lblSaldoWert2.Font = new System.Drawing.Font("Arial", 10F);
this.lblSaldoWert2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.lblSaldoWert2.LocationFloat = new DevExpress.Utils.PointFloat(350F, 40.00003F);
this.lblSaldoWert2.Name = "lblSaldoWert2";
this.lblSaldoWert2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
@@ -682,7 +710,7 @@ namespace BetreuWoReports
this.lblSaldoWert5.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.lblSaldoWert5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")});
this.lblSaldoWert5.Font = new System.Drawing.Font("Arial", 10F);
this.lblSaldoWert5.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.lblSaldoWert5.LocationFloat = new DevExpress.Utils.PointFloat(350F, 100F);
this.lblSaldoWert5.Name = "lblSaldoWert5";
this.lblSaldoWert5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
@@ -697,7 +725,7 @@ namespace BetreuWoReports
//
this.lblSaldo2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.lblSaldo2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.lblSaldo2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblSaldo2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 40.00003F);
this.lblSaldo2.Name = "lblSaldo2";
this.lblSaldo2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
@@ -713,7 +741,7 @@ namespace BetreuWoReports
//
this.lblSaldo5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.lblSaldo5.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.lblSaldo5.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblSaldo5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 100F);
this.lblSaldo5.Name = "lblSaldo5";
this.lblSaldo5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
@@ -730,7 +758,7 @@ namespace BetreuWoReports
this.lblSaldo1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.lblSaldo1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.lblSaldo1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblSaldo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.00001F);
this.lblSaldo1.Name = "lblSaldo1";
this.lblSaldo1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
@@ -745,11 +773,14 @@ namespace BetreuWoReports
// Footer2
//
this.Footer2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel2,
this.xrLabel3,
this.xrLabel15,
this.xrLabel17,
this.xrLabel8,
this.xrLabel7});
this.Footer2.HeightF = 60.00022F;
this.Footer2.HeightF = 80.00031F;
this.Footer2.KeepTogether = true;
this.Footer2.Level = 3;
this.Footer2.Name = "Footer2";
//
@@ -759,7 +790,7 @@ namespace BetreuWoReports
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.fieldSonnUndFeiertage")});
this.xrLabel15.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(350F, 20.00001F);
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
@@ -768,9 +799,9 @@ namespace BetreuWoReports
this.xrLabel15.StylePriority.UseFont = false;
this.xrLabel15.StylePriority.UsePadding = false;
this.xrLabel15.StylePriority.UseTextAlignment = false;
xrSummary1.FormatString = "{0:0.00}";
xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrLabel15.Summary = xrSummary1;
xrSummary2.FormatString = "{0:0.00}";
xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrLabel15.Summary = xrSummary2;
this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrLabel17
@@ -778,7 +809,7 @@ namespace BetreuWoReports
this.xrLabel17.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.fieldNightHours")});
this.xrLabel17.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(350F, 40.00022F);
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
@@ -787,16 +818,16 @@ namespace BetreuWoReports
this.xrLabel17.StylePriority.UseFont = false;
this.xrLabel17.StylePriority.UsePadding = false;
this.xrLabel17.StylePriority.UseTextAlignment = false;
xrSummary2.FormatString = "{0:0.00}";
xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrLabel17.Summary = xrSummary2;
xrSummary3.FormatString = "{0:0.00}";
xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrLabel17.Summary = xrSummary3;
this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrLabel8
//
this.xrLabel8.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel8.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 40.00009F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
@@ -813,7 +844,7 @@ namespace BetreuWoReports
this.xrLabel7.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.00001F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
@@ -825,17 +856,13 @@ namespace BetreuWoReports
this.xrLabel7.Text = "Su. Sonn-/Feiertagszuschläge / Leistungsmonat";
this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
//
// Title
//
this.Title.BackColor = System.Drawing.Color.White;
this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.Title.BorderWidth = 1F;
this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F);
this.Title.ForeColor = System.Drawing.Color.Black;
this.Title.Name = "Title";
//
@@ -845,7 +872,7 @@ namespace BetreuWoReports
this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.FieldCaption.BorderWidth = 1F;
this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.FieldCaption.ForeColor = System.Drawing.Color.Black;
this.FieldCaption.Name = "FieldCaption";
//
@@ -855,7 +882,7 @@ namespace BetreuWoReports
this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.PageInfo.BorderWidth = 1F;
this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
this.PageInfo.ForeColor = System.Drawing.Color.Black;
this.PageInfo.Name = "PageInfo";
//
@@ -865,7 +892,7 @@ namespace BetreuWoReports
this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.DataField.BorderWidth = 1F;
this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
this.DataField.Name = "DataField";
//
@@ -876,7 +903,7 @@ namespace BetreuWoReports
//
// bottomMarginBand1
//
this.bottomMarginBand1.Font = new System.Drawing.Font("Arial", 8F);
this.bottomMarginBand1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.bottomMarginBand1.HeightF = 50F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
this.bottomMarginBand1.StylePriority.UseFont = false;
@@ -979,6 +1006,70 @@ namespace BetreuWoReports
this.fieldMinutenGesamtIst.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldMinutenGesamtIst.Name = "fieldMinutenGesamtIst";
//
// xrTableCell3
//
this.xrTableCell3.Multiline = true;
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "Stunden\r\nSO-/FT-Zuschl.";
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell3.Weight = 0.8755962137825859D;
//
// xrTableCell7
//
this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.Custom10")});
this.xrTableCell7.Multiline = true;
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell7.StylePriority.UseFont = false;
this.xrTableCell7.StylePriority.UsePadding = false;
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "xrTableCell7";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell7.Weight = 0.79599655782825018D;
//
// xrLabel2
//
this.xrLabel2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 60.0002F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(350F, 20F);
this.xrLabel2.StylePriority.UseBorders = false;
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.StylePriority.UsePadding = false;
this.xrLabel2.StylePriority.UseTextAlignment = false;
this.xrLabel2.Text = "Su. Samstagszuschläge / Leistungsmonat";
this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrLabel3
//
this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.Custom10")});
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(350F, 60.00031F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(102.0833F, 20F);
this.xrLabel3.StylePriority.UseBorders = false;
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.StylePriority.UsePadding = false;
this.xrLabel3.StylePriority.UseTextAlignment = false;
xrSummary1.FormatString = "{0:0.00}";
xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrLabel3.Summary = xrSummary1;
this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
//
// Mitarbeiterstundenkonto
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1002,12 +1093,13 @@ namespace BetreuWoReports
this.fieldSalaryDiff,
this.fieldMinutenGesamtIst});
this.DataSource = this.bindingSource1;
this.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleFeiertag,
this.ruleWeekend,
this.ruleZwischenSumme});
this.Margins = new System.Drawing.Printing.Margins(60, 40, 40, 50);
this.Margins = new DevExpress.Drawing.DXMargins(60F, 40F, 40F, 50F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -1016,7 +1108,10 @@ namespace BetreuWoReports
this.FieldCaption,
this.PageInfo,
this.DataField});
this.Version = "17.1";
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
this.BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.Mitarbeiterstundenkonto_BeforePrint);
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
@@ -1106,5 +1201,9 @@ namespace BetreuWoReports
private DevExpress.XtraReports.UI.GroupFooterBand Footer1;
private DevExpress.XtraReports.UI.GroupFooterBand FooterVzTz;
private DevExpress.XtraReports.UI.GroupFooterBand Footer2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
}
}

File diff suppressed because one or more lines are too long

View File

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Linq;
using System.Text;
using BeWo.Data.Access;
using BeWo.Data.Entities;
@@ -26,9 +27,35 @@ namespace ChristopherusHausMID.Export
query.FileName = String.Format("BUCH_BO_{0:yyyyMM}.scs", dt);
query.QueryResult = GetAbrechnungenString(dt, table);
query.Attachments = CreateInvoiceFiles(table);
var oidList = GetInvoiceBaseOids(table);
SetInvoiceBaseIsExported(oidList);
return query;
}
private static void SetInvoiceBaseIsExported(List<long> oidList)
{
if (oidList.Count > 0)
{
DAOFactory.AdoDAO.ExecuteQuery(String.Format("update invoicebase set isexported = 1 where oid in ({0})", string.Join(",", oidList)));
}
}
private static List<long> GetInvoiceBaseOids(DataTable dt)
{
List<long> liste = new List<long>();
foreach (DataRow row in dt.Rows)
{
if (row[10] != null && long.TryParse(row[10].ToString(), out var oid))
{
liste.Add(oid);
}
}
return liste;
}
public static String GetAbrechnungenString(DateTime dt, DataTable table)
{
StringBuilder sb = new StringBuilder();

View File

@@ -90,9 +90,14 @@ namespace ChristopherusHausMID.Invoicing
InvoiceItem ii = CreateInvoiceItem(s, scap, calc);
if (ii != null && ii.UnitCount.HasValue && ii.UnitCount > 0)
{
maxBetreuteTage++;
items.Add(ii);
}
//Wenn es einen Stundenplan an diesem Tag gibt, dann erhöhe die max Anzahl der betreuten Tage
if (!String.IsNullOrEmpty(s.StundenplanUhrzeiten1))
{
maxBetreuteTage++;
}
}
}
decimal betreuteTage = maxBetreuteTage - fehltage;
@@ -155,7 +160,8 @@ namespace ChristopherusHausMID.Invoicing
if (rechnungsanteil < 1)
{
item.GrossAmountTotal = Math.Round((item.GrossAmountTotal ?? 0) * rechnungsanteil, 2, MidpointRounding.AwayFromZero);
//item.GrossAmountTotal = Math.Round((item.GrossAmountTotal ?? 0) * rechnungsanteil, 2, MidpointRounding.AwayFromZero);
item.GrossAmountTotal = (item.GrossAmountTotal ?? 0) * rechnungsanteil;
}
}
return summaryItems;

View File

@@ -142,7 +142,17 @@ namespace ChristopherusHausMID.Invoicing
public static void BerechnePoolFaktorenFuerQuittierungsbeleg(SbdStundenaufstellungRO pRO)
{
decimal defaultPoolFaktor = 1; // Faktor bei 1:1 Betreuung
var customerOid2Beleg = new Dictionary<long, SbdStundenaufstellungRO>();
var tag2ServiceRecord = new Dictionary<int, SbdStundenaufstellungRO.SbdServiceDetail>();
foreach (var item in pRO.Services)
{
if (!tag2ServiceRecord.ContainsKey(item.StartDate.Day))
{
tag2ServiceRecord.Add(item.StartDate.Day, item);
}
}
Customer mainCustomer = DAOFactory.GenericDAO.LoadByID<Customer>(pRO.CustomerOid);
Organisation schulEntity = null;
if (pRO.Schule != null)
@@ -200,6 +210,50 @@ namespace ChristopherusHausMID.Invoicing
//Bei Poolbetreuung muss die Abwesenheit der anderen Kinder auch noch geprüft werden
foreach (var c in weiterePoolKinder)
{
SbdStundenaufstellungRO belegFuerPoolKindRO = null;
if (customerOid2Beleg.ContainsKey(c.Oid.Value))
{
belegFuerPoolKindRO = customerOid2Beleg[c.Oid.Value];
}
else
{
belegFuerPoolKindRO = SbdStundenaufstellungRO.Create(c, new DateTimeSpan { StartDateTime = pRO.StartDate, EndDateTime = pRO.EndDate.AddDays(1).AddTicks(-1) }, 0, 0, 0, false, true, "NRW", false).FirstOrDefault();
if (belegFuerPoolKindRO != null)
{
customerOid2Beleg.Add(c.Oid.Value, belegFuerPoolKindRO);
//Prüfe, ob bei den Poolkindern gearbeitet wurde und beim Hauptkind nicht. Bei Poolkindern wird die Zeit auch beim jeweils anderen Beleg aufgelistet
foreach (var srPool in belegFuerPoolKindRO.Services)
{
if (tag2ServiceRecord.ContainsKey(srPool.StartDate.Day))
{
var srMain = tag2ServiceRecord[srPool.StartDate.Day];
if (String.IsNullOrEmpty(srMain.IstUhrzeiten1) && String.IsNullOrEmpty(srMain.IstUhrzeiten2) && srMain.Minutes == 0 && srPool.Minutes > 0)
{
srMain.Minutes = srPool.Minutes;
srMain.IstUhrzeiten1 = String.Format("{0:HH:mm}", srPool.StartDate);
srMain.IstUhrzeiten2 = String.Format("{0:HH:mm}", srPool.EndDate);
if (String.IsNullOrEmpty(srMain.ServiceCategory))
{
srMain.ServiceCategory = srPool.ServiceCategory;
}
if (String.IsNullOrEmpty(srMain.ServiceDescription))
{
srMain.ServiceDescription = srPool.ServiceDescription;
}
}
}
}
}
}
var at2 = PoolHelper.GetAbsenceTime(c, item.StartDate);
if (at2 != null && at != null)

View File

@@ -31,8 +31,8 @@ namespace ChristopherusHausMID
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.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Rechnung));
DevExpress.XtraPrinting.Drawing.Watermark watermark1 = new DevExpress.XtraPrinting.Drawing.Watermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
@@ -109,6 +109,9 @@ namespace ChristopherusHausMID
this.fieldSummeStunden = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldBetragAllerStunden = new DevExpress.XtraReports.UI.CalculatedField();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrCheckBox1 = new DevExpress.XtraReports.UI.XRCheckBox();
this.xrCheckBox2 = new DevExpress.XtraReports.UI.XRCheckBox();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAbrechenbareStunden = new DevExpress.XtraReports.UI.XRLabel();
@@ -141,14 +144,17 @@ namespace ChristopherusHausMID
this.xrTableCell56 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.fieldAbweichungIstSoll = new DevExpress.XtraReports.UI.CalculatedField();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrCheckBox1 = new DevExpress.XtraReports.UI.XRCheckBox();
this.xrCheckBox2 = new DevExpress.XtraReports.UI.XRCheckBox();
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -161,8 +167,13 @@ namespace ChristopherusHausMID
//
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel16,
this.xrLabel10,
this.lblAdresse,
this.xrRichText1});
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 0F;
this.ReportHeader.HeightF = 150F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
@@ -174,15 +185,13 @@ namespace ChristopherusHausMID
//
// topMarginBand1
//
this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.lblAdresse});
this.topMarginBand1.HeightF = 309.375F;
this.topMarginBand1.HeightF = 200F;
this.topMarginBand1.Name = "topMarginBand1";
//
// lblAdresse
//
this.lblAdresse.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(17.5F, 226F);
this.lblAdresse.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 36.3889F);
this.lblAdresse.Multiline = true;
this.lblAdresse.Name = "lblAdresse";
this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -193,7 +202,9 @@ namespace ChristopherusHausMID
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 132.9582F;
this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrRichText2});
this.bottomMarginBand1.HeightF = 90F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// GroupFooter
@@ -868,7 +879,7 @@ namespace ChristopherusHausMID
//
this.xrLabel6.BackColor = System.Drawing.Color.Transparent;
this.xrLabel6.CanShrink = true;
this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(490F, 39.99995F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -883,7 +894,7 @@ namespace ChristopherusHausMID
this.xrLabel8.BackColor = System.Drawing.Color.Transparent;
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoice.AccountingPeriodStart")});
this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(619.3317F, 39.99995F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -899,7 +910,7 @@ namespace ChristopherusHausMID
//
this.lblRechnungsnr.BackColor = System.Drawing.Color.Transparent;
this.lblRechnungsnr.CanShrink = true;
this.lblRechnungsnr.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblRechnungsnr.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblRechnungsnr.LocationFloat = new DevExpress.Utils.PointFloat(619.3312F, 0F);
this.lblRechnungsnr.Name = "lblRechnungsnr";
this.lblRechnungsnr.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -916,7 +927,7 @@ namespace ChristopherusHausMID
this.xrLabel5.CanShrink = true;
this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoice.InvoiceDate")});
this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(619.3312F, 19.9999F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -931,7 +942,7 @@ namespace ChristopherusHausMID
//
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(490F, 19.9999F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -945,7 +956,7 @@ namespace ChristopherusHausMID
//
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(490F, 0F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -1337,6 +1348,40 @@ namespace ChristopherusHausMID
this.ReportFooter.HeightF = 282.3737F;
this.ReportFooter.Name = "ReportFooter";
//
// xrCheckBox1
//
this.xrCheckBox1.LocationFloat = new DevExpress.Utils.PointFloat(242.6284F, 73.95834F);
this.xrCheckBox1.Name = "xrCheckBox1";
this.xrCheckBox1.SizeF = new System.Drawing.SizeF(63.49995F, 21.875F);
this.xrCheckBox1.StylePriority.UseFont = false;
this.xrCheckBox1.Text = "Ja";
//
// xrCheckBox2
//
this.xrCheckBox2.LocationFloat = new DevExpress.Utils.PointFloat(306.1283F, 73.95834F);
this.xrCheckBox2.Name = "xrCheckBox2";
this.xrCheckBox2.SizeF = new System.Drawing.SizeF(307.5598F, 21.875F);
this.xrCheckBox2.StylePriority.UseFont = false;
this.xrCheckBox2.Text = "Nein";
//
// xrLabel4
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(242.6284F, 21.66667F);
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(455.9977F, 52.29167F);
this.xrLabel4.StylePriority.UseBackColor = false;
this.xrLabel4.StylePriority.UseBorders = false;
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.StylePriority.UseTextAlignment = false;
this.xrLabel4.Text = "Die Betreuung wurde während der Pausenzeiten durch eine Schulbegleitung\r\nunseres " +
"Dienstes gewährleistet.";
this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrLabel4.TextTrimming = DevExpress.Drawing.DXStringTrimming.None;
this.xrLabel4.WordWrap = false;
//
// xrLabel9
//
this.xrLabel9.BackColor = System.Drawing.Color.Transparent;
@@ -1901,39 +1946,50 @@ namespace ChristopherusHausMID
"cePeriods].[ApprovedHours]))/Sum([ServiceInvoicePeriods].[ApprovedHours]) * 100";
this.fieldAbweichungIstSoll.Name = "fieldAbweichungIstSoll";
//
// xrLabel4
// xrRichText2
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(242.6284F, 21.66667F);
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(455.9977F, 52.29167F);
this.xrLabel4.StylePriority.UseBackColor = false;
this.xrLabel4.StylePriority.UseBorders = false;
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.StylePriority.UseTextAlignment = false;
this.xrLabel4.Text = "Die Betreuung wurde während der Pausenzeiten durch eine Schulbegleitung\r\nunseres " +
"Dienstes gewährleistet.";
this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrLabel4.TextTrimming = DevExpress.Drawing.DXStringTrimming.None;
this.xrLabel4.WordWrap = false;
this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(25.62642F, 10F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
this.xrRichText2.SizeF = new System.Drawing.SizeF(739.3734F, 68.05556F);
this.xrRichText2.StylePriority.UseFont = false;
//
// xrCheckBox1
// xrRichText1
//
this.xrCheckBox1.LocationFloat = new DevExpress.Utils.PointFloat(242.6284F, 73.95834F);
this.xrCheckBox1.Name = "xrCheckBox1";
this.xrCheckBox1.SizeF = new System.Drawing.SizeF(63.49995F, 21.875F);
this.xrCheckBox1.StylePriority.UseFont = false;
this.xrCheckBox1.Text = "Ja";
this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 0F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(419.3308F, 36.3889F);
this.xrRichText1.StylePriority.UseFont = false;
//
// xrCheckBox2
// xrLabel10
//
this.xrCheckBox2.LocationFloat = new DevExpress.Utils.PointFloat(306.1283F, 73.95834F);
this.xrCheckBox2.Name = "xrCheckBox2";
this.xrCheckBox2.SizeF = new System.Drawing.SizeF(307.5598F, 21.875F);
this.xrCheckBox2.StylePriority.UseFont = false;
this.xrCheckBox2.Text = "Nein";
this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(490.0002F, 36.3889F);
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(275F, 83.37503F);
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.Text = "Kreisstr. 55, \r\n44267 Dortmund \nTelefon 02304 98279-12\r\nj.genditzki@christopherus" +
"-haus.de";
//
// xrLabel16
//
this.xrLabel16.BackColor = System.Drawing.Color.Transparent;
this.xrLabel16.CanShrink = true;
this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(490.0002F, 0F);
this.xrLabel16.Multiline = true;
this.xrLabel16.Name = "xrLabel16";
this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel16.SizeF = new System.Drawing.SizeF(274.9996F, 36.3889F);
this.xrLabel16.StylePriority.UseBackColor = false;
this.xrLabel16.StylePriority.UseFont = false;
this.xrLabel16.Text = "Ambulante Dienste\r\nSchulbegleitender Dienst";
this.xrLabel16.WordWrap = false;
//
// Rechnung
//
@@ -1958,22 +2014,24 @@ namespace ChristopherusHausMID
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull,
this.ruleNoticeNull});
this.Margins = new DevExpress.Drawing.DXMargins(36F, 26F, 309.375F, 132.9582F);
this.Margins = new DevExpress.Drawing.DXMargins(36F, 26F, 200F, 90F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
xrWatermark1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrWatermark1.ImageSource"));
xrWatermark1.ImageViewMode = DevExpress.XtraPrinting.Drawing.ImageViewMode.Zoom;
xrWatermark1.PageRange = "1";
this.Watermarks.Add(xrWatermark1);
watermark1.Id = "Watermark1";
watermark1.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
watermark1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("watermark1.ImageSource"));
watermark1.ImageViewMode = DevExpress.XtraPrinting.Drawing.ImageViewMode.Zoom;
this.Watermarks.Add(watermark1);
this.AfterPrint += new System.EventHandler(this.Change_Name);
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -2090,5 +2148,9 @@ namespace ChristopherusHausMID
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRCheckBox xrCheckBox1;
private DevExpress.XtraReports.UI.XRCheckBox xrCheckBox2;
private DevExpress.XtraReports.UI.XRRichText xrRichText1;
private DevExpress.XtraReports.UI.XRRichText xrRichText2;
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
}
}

View File

@@ -153,7 +153,7 @@ namespace ChristopherusHausMID
var fehltage = PoolHelper.GetAbwesenheitsTage(customer, span);
ro.Fehltage = fehltage * -1;
}
ro.GesamtBetrag = GetBetragFromString(pRO.GrossClaim);
}
}

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 277 KiB

View File

@@ -37,7 +37,7 @@ namespace LebenshilfeBadKreuznachFUD.Reporting
start = new DateTime(start.Year, start.Month, 1);
DateTime dt = DateTime.Now;
if (DateTime.TryParse(qro.Rows[0].Field1.ToString(), out dt))
if (DateTime.TryParse(qro.Rows[0].Field1.ToString(), out dt) && dt > DateTime.MinValue)
{
start = dt;
@@ -45,13 +45,19 @@ namespace LebenshilfeBadKreuznachFUD.Reporting
DateTime ende = start.AddMonths(1).AddTicks(-1);
if (DateTime.TryParse(qro.Rows[0].Field2.ToString(), out dt) && dt < DateTime.MaxValue.Date)
{
ende = dt.AddTicks(-1);
}
var config = new FLSAnalysisConfigDC();
config.StartDate = start;
config.EndDate = ende;
config.FetchApprovedFLS = true;
config.ReportType = FLSReportType.Customer;
if (qro.Rows[0].Field2 != null && Int64.TryParse(qro.Rows[0].Field2.ToString(), out var catOid))
if (qro.Rows[0].Field3 != null && Int64.TryParse(qro.Rows[0].Field3.ToString(), out var catOid))
{
if (catOid > 0)
{

View File

@@ -30,6 +30,7 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AnwesenheitFerien));
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.TopMargin = new DevExpress.XtraReports.UI.TopMarginBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
@@ -110,8 +111,17 @@
this.xrTableCell62 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell63 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell64 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell79 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell80 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell83 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell84 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell81 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell82 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -147,21 +157,12 @@
this.cellSumme29 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSumme30 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSumme31 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell79 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell80 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell83 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell84 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell81 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell82 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -177,7 +178,6 @@
this.xrLabel1,
this.xrPictureBox1,
this.xrLabel8});
this.TopMargin.HeightF = 100F;
this.TopMargin.Name = "TopMargin";
this.TopMargin.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.TopMargin.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
@@ -186,7 +186,8 @@
//
this.xrLabel1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel1.CanGrow = false;
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 90.41667F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
@@ -199,7 +200,7 @@
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 30.83335F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(209.1667F, 59.58332F);
@@ -209,11 +210,11 @@
// xrLabel8
//
this.xrLabel8.CanGrow = false;
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(808.9373F, 30.83335F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(808.9372F, 30.83333F);
this.xrLabel8.Multiline = true;
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(143.9998F, 42.91666F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(188.9998F, 59.16666F);
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.StylePriority.UseTextAlignment = false;
this.xrLabel8.Text = "Frankfurt (Oder)\r\nHansastraße 3\r\n15234 Frankfurt (Oder)";
@@ -881,10 +882,6 @@
this.xrTableCell64.Text = "xrTableCell64";
this.xrTableCell64.Weight = 0.017513786439113284D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(LebenshilfeFrankfurtOder.AnwesenheitRO);
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -895,10 +892,94 @@
this.GroupFooter1.KeepTogether = true;
this.GroupFooter1.Name = "GroupFooter1";
//
// xrTable4
//
this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 61.87505F);
this.xrTable4.Name = "xrTable4";
this.xrTable4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow6,
this.xrTableRow8,
this.xrTableRow7});
this.xrTable4.SizeF = new System.Drawing.SizeF(275F, 60F);
this.xrTable4.StylePriority.UseBackColor = false;
this.xrTable4.StylePriority.UseBorders = false;
this.xrTable4.StylePriority.UseFont = false;
this.xrTable4.StylePriority.UsePadding = false;
this.xrTable4.StylePriority.UseTextAlignment = false;
//
// xrTableRow6
//
this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell79,
this.xrTableCell80});
this.xrTableRow6.Name = "xrTableRow6";
this.xrTableRow6.Weight = 0.95390268477989137D;
//
// xrTableCell79
//
this.xrTableCell79.CanGrow = false;
this.xrTableCell79.Name = "xrTableCell79";
this.xrTableCell79.StylePriority.UseTextAlignment = false;
this.xrTableCell79.Text = "K";
this.xrTableCell79.Weight = 0.019181406961602476D;
//
// xrTableCell80
//
this.xrTableCell80.CanGrow = false;
this.xrTableCell80.Name = "xrTableCell80";
this.xrTableCell80.StylePriority.UseTextAlignment = false;
this.xrTableCell80.Text = "krank";
this.xrTableCell80.Weight = 0.15664811984879934D;
//
// xrTableRow8
//
this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell83,
this.xrTableCell84});
this.xrTableRow8.Name = "xrTableRow8";
this.xrTableRow8.Weight = 0.95390268477989137D;
//
// xrTableCell83
//
this.xrTableCell83.Name = "xrTableCell83";
this.xrTableCell83.Text = "E";
this.xrTableCell83.Weight = 0.019181406961602476D;
//
// xrTableCell84
//
this.xrTableCell84.Name = "xrTableCell84";
this.xrTableCell84.Text = "entschuldigt - Nachweis erbracht";
this.xrTableCell84.Weight = 0.15664811984879934D;
//
// xrTableRow7
//
this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell81,
this.xrTableCell82});
this.xrTableRow7.Name = "xrTableRow7";
this.xrTableRow7.Weight = 0.95390268477989137D;
//
// xrTableCell81
//
this.xrTableCell81.Name = "xrTableCell81";
this.xrTableCell81.Text = "UE";
this.xrTableCell81.Weight = 0.019181406961602476D;
//
// xrTableCell82
//
this.xrTableCell82.Name = "xrTableCell82";
this.xrTableCell82.Text = "unentschuldigtes Fehlen";
this.xrTableCell82.Weight = 0.15664811984879934D;
//
// xrLabel7
//
this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(712.9399F, 128.5417F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -1189,88 +1270,9 @@
this.cellSumme31.StylePriority.UseFont = false;
this.cellSumme31.Weight = 0.017513786439113284D;
//
// xrTable4
// bindingSource1
//
this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 61.87505F);
this.xrTable4.Name = "xrTable4";
this.xrTable4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow6,
this.xrTableRow8,
this.xrTableRow7});
this.xrTable4.SizeF = new System.Drawing.SizeF(275F, 60F);
this.xrTable4.StylePriority.UseBackColor = false;
this.xrTable4.StylePriority.UseBorders = false;
this.xrTable4.StylePriority.UseFont = false;
this.xrTable4.StylePriority.UsePadding = false;
this.xrTable4.StylePriority.UseTextAlignment = false;
//
// xrTableRow6
//
this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell79,
this.xrTableCell80});
this.xrTableRow6.Name = "xrTableRow6";
this.xrTableRow6.Weight = 0.95390268477989137D;
//
// xrTableCell79
//
this.xrTableCell79.CanGrow = false;
this.xrTableCell79.Name = "xrTableCell79";
this.xrTableCell79.StylePriority.UseTextAlignment = false;
this.xrTableCell79.Text = "K";
this.xrTableCell79.Weight = 0.019181406961602476D;
//
// xrTableCell80
//
this.xrTableCell80.CanGrow = false;
this.xrTableCell80.Name = "xrTableCell80";
this.xrTableCell80.StylePriority.UseTextAlignment = false;
this.xrTableCell80.Text = "krank";
this.xrTableCell80.Weight = 0.15664811984879934D;
//
// xrTableRow8
//
this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell83,
this.xrTableCell84});
this.xrTableRow8.Name = "xrTableRow8";
this.xrTableRow8.Weight = 0.95390268477989137D;
//
// xrTableCell83
//
this.xrTableCell83.Name = "xrTableCell83";
this.xrTableCell83.Text = "E";
this.xrTableCell83.Weight = 0.019181406961602476D;
//
// xrTableCell84
//
this.xrTableCell84.Name = "xrTableCell84";
this.xrTableCell84.Text = "entschuldigt - Nachweis erbracht";
this.xrTableCell84.Weight = 0.15664811984879934D;
//
// xrTableRow7
//
this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell81,
this.xrTableCell82});
this.xrTableRow7.Name = "xrTableRow7";
this.xrTableRow7.Weight = 0.95390268477989137D;
//
// xrTableCell81
//
this.xrTableCell81.Name = "xrTableCell81";
this.xrTableCell81.Text = "UE";
this.xrTableCell81.Weight = 0.019181406961602476D;
//
// xrTableCell82
//
this.xrTableCell82.Name = "xrTableCell82";
this.xrTableCell82.Text = "unentschuldigtes Fehlen";
this.xrTableCell82.Weight = 0.15664811984879934D;
this.bindingSource1.DataSource = typeof(LebenshilfeFrankfurtOder.AnwesenheitRO);
//
// AnwesenheitFerien
//
@@ -1285,16 +1287,18 @@
this.DataSource = this.bindingSource1;
this.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.Landscape = true;
this.Margins = new DevExpress.Drawing.DXMargins(90, 40, 100, 20);
this.Margins = new DevExpress.Drawing.DXMargins(90F, 40F, 100F, 20F);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "17.1";
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,320 @@
using System;
using System.Drawing;
using BeWo.Report;
using BS.Shared;
using BeWo.Report.ReportObjects;
using BS.Shared.DataContracts;
using System.Collections.Generic;
using DevExpress.XtraReports.UI;
namespace LebenshilfeFrankfurtOder
{
public partial class AnwesenheitslisteFruehUndSpaetbetreuung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<AdditionalServiceBookingRO>
{
public AnwesenheitslisteFruehUndSpaetbetreuung()
{
InitializeComponent();
}
public void SetReportDataSource(AdditionalServiceBookingRO pRO)
{
//CalculateAbsenceTimes(pRO);
SetCellColor(pRO);
foreach (var row in pRO.Rows)
{
SetAnwesend(row);
}
BerechneSummenUndStaffelpreise(pRO);
bindingSource1.DataSource = pRO;
}
private void BerechneSummenUndStaffelpreise(AdditionalServiceBookingRO pRO)
{
foreach (XRTableRow row in xrTableStaffelpreise.Rows)
{
for (int i = 2; i < row.Cells.Count; i++)
{
row.Cells[i].Text = "";
}
}
}
private static void SetInfo(DateTime dt, AdditionalServiceBookingRow row, string val)
{
if (dt.Day == 1)
{
row.AttendanceOnDay1 = val;
}
else if (dt.Day == 2)
{
row.AttendanceOnDay2 = val;
}
else if (dt.Day == 3)
{
row.AttendanceOnDay3 = val;
}
else if (dt.Day == 4)
{
row.AttendanceOnDay4 = val;
}
else if (dt.Day == 5)
{
row.AttendanceOnDay5 = val;
}
else if (dt.Day == 6)
{
row.AttendanceOnDay6 = val;
}
else if (dt.Day == 7)
{
row.AttendanceOnDay7 = val;
}
else if (dt.Day == 8)
{
row.AttendanceOnDay8 = val;
}
else if (dt.Day == 9)
{
row.AttendanceOnDay9 = val;
}
else if (dt.Day == 10)
{
row.AttendanceOnDay10 = val;
}
else if (dt.Day == 11)
{
row.AttendanceOnDay11 = val;
}
else if (dt.Day == 12)
{
row.AttendanceOnDay12 = val;
}
else if (dt.Day == 13)
{
row.AttendanceOnDay13 = val;
}
else if (dt.Day == 14)
{
row.AttendanceOnDay14 = val;
}
else if (dt.Day == 15)
{
row.AttendanceOnDay15 = val;
}
else if (dt.Day == 16)
{
row.AttendanceOnDay16 = val;
}
else if (dt.Day == 17)
{
row.AttendanceOnDay17 = val;
}
else if (dt.Day == 18)
{
row.AttendanceOnDay18 = val;
}
else if (dt.Day == 19)
{
row.AttendanceOnDay19 = val;
}
else if (dt.Day == 20)
{
row.AttendanceOnDay20 = val;
}
else if (dt.Day == 21)
{
row.AttendanceOnDay21 = val;
}
else if (dt.Day == 22)
{
row.AttendanceOnDay22 = val;
}
else if (dt.Day == 23)
{
row.AttendanceOnDay23 = val;
}
else if (dt.Day == 24)
{
row.AttendanceOnDay24 = val;
}
else if (dt.Day == 25)
{
row.AttendanceOnDay25 = val;
}
else if (dt.Day == 26)
{
row.AttendanceOnDay26 = val;
}
else if (dt.Day == 27)
{
row.AttendanceOnDay27 = val;
}
else if (dt.Day == 28)
{
row.AttendanceOnDay28 = val;
}
else if (dt.Day == 29)
{
row.AttendanceOnDay29 = val;
}
else if (dt.Day == 30)
{
row.AttendanceOnDay30 = val;
}
else if (dt.Day == 31)
{
row.AttendanceOnDay31 = val;
}
}
private void SetCellColor(AdditionalServiceBookingRO pRo)
{
DateTime dt = new DateTime(pRo.Year, pRo.MonthInt, 1);
DateTime end = dt.AddMonths(1);
while (dt < end)
{
if (dt.DayOfWeek == DayOfWeek.Saturday || dt.DayOfWeek == DayOfWeek.Sunday)
{
rowHeader.Cells[dt.Day + 6].BackColor = Color.DarkGray;
rowDetail.Cells[dt.Day + 6].BackColor = Color.DarkGray;
}
dt = dt.AddDays(1);
}
}
private void SetAnwesend(AdditionalServiceBookingRow row)
{
String newval = "x";
if (row.AttendanceOnDay1 == "P")
{
row.AttendanceOnDay1 = newval;
}
if (row.AttendanceOnDay2 == "P")
{
row.AttendanceOnDay2 = newval;
}
if (row.AttendanceOnDay3 == "P")
{
row.AttendanceOnDay3 = newval;
}
if (row.AttendanceOnDay4 == "P")
{
row.AttendanceOnDay4 = newval;
}
if (row.AttendanceOnDay5 == "P")
{
row.AttendanceOnDay5 = newval;
}
if (row.AttendanceOnDay6 == "P")
{
row.AttendanceOnDay6 = newval;
}
if (row.AttendanceOnDay7 == "P")
{
row.AttendanceOnDay7 = newval;
}
if (row.AttendanceOnDay8 == "P")
{
row.AttendanceOnDay8 = newval;
}
if (row.AttendanceOnDay9 == "P")
{
row.AttendanceOnDay9 = newval;
}
if (row.AttendanceOnDay10 == "P")
{
row.AttendanceOnDay10 = newval;
}
if (row.AttendanceOnDay11 == "P")
{
row.AttendanceOnDay11 = newval;
}
if (row.AttendanceOnDay12 == "P")
{
row.AttendanceOnDay12 = newval;
}
if (row.AttendanceOnDay13 == "P")
{
row.AttendanceOnDay13 = newval;
}
if (row.AttendanceOnDay14 == "P")
{
row.AttendanceOnDay14 = newval;
}
if (row.AttendanceOnDay15 == "P")
{
row.AttendanceOnDay15 = newval;
}
if (row.AttendanceOnDay16 == "P")
{
row.AttendanceOnDay16 = newval;
}
if (row.AttendanceOnDay17 == "P")
{
row.AttendanceOnDay17 = newval;
}
if (row.AttendanceOnDay18 == "P")
{
row.AttendanceOnDay18 = newval;
}
if (row.AttendanceOnDay19 == "P")
{
row.AttendanceOnDay19 = newval;
}
if (row.AttendanceOnDay20 == "P")
{
row.AttendanceOnDay20 = newval;
}
if (row.AttendanceOnDay21 == "P")
{
row.AttendanceOnDay21 = newval;
}
if (row.AttendanceOnDay22 == "P")
{
row.AttendanceOnDay22 = newval;
}
if (row.AttendanceOnDay23 == "P")
{
row.AttendanceOnDay23 = newval;
}
if (row.AttendanceOnDay24 == "P")
{
row.AttendanceOnDay24 = newval;
}
if (row.AttendanceOnDay25 == "P")
{
row.AttendanceOnDay25 = newval;
}
if (row.AttendanceOnDay26 == "P")
{
row.AttendanceOnDay26 = newval;
}
if (row.AttendanceOnDay27 == "P")
{
row.AttendanceOnDay27 = newval;
}
if (row.AttendanceOnDay28 == "P")
{
row.AttendanceOnDay28 = newval;
}
if (row.AttendanceOnDay29 == "P")
{
row.AttendanceOnDay29 = newval;
}
if (row.AttendanceOnDay30 == "P")
{
row.AttendanceOnDay30 = newval;
}
if (row.AttendanceOnDay31 == "P")
{
row.AttendanceOnDay31 = newval;
}
}
}
}

File diff suppressed because one or more lines are too long

View File

@@ -20,6 +20,7 @@ using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using DevExpress.XtraReports.UI;
using LebenshilfeFrankfurtOder.Invoicing;
using LebenshilfeFrankfurtOder.Reporting;
namespace LebenshilfeFrankfurtOder
{
@@ -399,6 +400,11 @@ namespace LebenshilfeFrankfurtOder
{
report = new AnwesenheitSbdPool();
}
else if (region.AdditionalService.Name.Contains("aBA"))
{
return CreateAnwesenheitslisteFruehUndSpaetbetreuung(ro, true);
}
if (report == null)
{
@@ -410,7 +416,31 @@ namespace LebenshilfeFrankfurtOder
return report as XtraReport;
}
public override XtraReport CreateServiceInvoiceReport(string dcIds, long? invoiceBaseOid)
private XtraReport CreateAnwesenheitslisteFruehUndSpaetbetreuung(AdditionalServiceBookingRO asbRo, bool addEinzelnachweise)
{
var report = new AnwesenheitslisteFruehUndSpaetbetreuung();
report.SetReportDataSource(asbRo);
if (addEinzelnachweise)
{
report.CreateDocument();
foreach (var row in asbRo.Rows)
{
var lnRO = LeistungsnachweisSGBIXRO.Create(asbRo, row);
var leistungsnachweis = new LeistungsnachweisSGBIX();
leistungsnachweis.SetReportDataSource(lnRO);
leistungsnachweis.CreateDocument();
report.Pages.AddRange(leistungsnachweis.Pages);
}
}
return report as XtraReport;
}
public override XtraReport CreateServiceInvoiceReport(string dcIds, long? invoiceBaseOid)
{
if (invoiceBaseOid.HasValue)
{

View File

@@ -55,6 +55,12 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="AnwesenheitslisteFruehUndSpaetbetreuung.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="AnwesenheitslisteFruehUndSpaetbetreuung.Designer.cs">
<DependentUpon>AnwesenheitslisteFruehUndSpaetbetreuung.cs</DependentUpon>
</Compile>
<Compile Include="AnwesenheitSbdPool.cs">
<SubType>Component</SubType>
</Compile>
@@ -68,6 +74,12 @@
<Compile Include="AnwesenheitFerien.Designer.cs">
<DependentUpon>AnwesenheitFerien.cs</DependentUpon>
</Compile>
<Compile Include="LeistungsnachweisSGBIX.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="LeistungsnachweisSGBIX.Designer.cs">
<DependentUpon>LeistungsnachweisSGBIX.cs</DependentUpon>
</Compile>
<Compile Include="AnwesenheitVerpflegung.cs">
<SubType>Component</SubType>
</Compile>
@@ -257,12 +269,16 @@
<Compile Include="LeistungsnachweisVerhinderungspflege.Designer.cs">
<DependentUpon>LeistungsnachweisVerhinderungspflege.cs</DependentUpon>
</Compile>
<Compile Include="Reporting\LeistungsnachweisSGBIXRO.cs" />
<Compile Include="Service\CustomAccountingService.cs" />
<Compile Include="Service\QueryService.cs" />
<Compile Include="Statistics\CustomServiceRecordStatisticFactory.cs" />
<Compile Include="Utils\FrankfurtOderHelper.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="AnwesenheitslisteFruehUndSpaetbetreuung.resx">
<DependentUpon>AnwesenheitslisteFruehUndSpaetbetreuung.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="AnwesenheitSbdPool.resx">
<DependentUpon>AnwesenheitSbdPool.cs</DependentUpon>
</EmbeddedResource>
@@ -270,6 +286,10 @@
<DependentUpon>AnwesenheitFerien.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="LeistungsnachweisSGBIX.resx">
<DependentUpon>LeistungsnachweisSGBIX.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="AnwesenheitVerpflegung.resx">
<DependentUpon>AnwesenheitVerpflegung.cs</DependentUpon>
</EmbeddedResource>

View File

@@ -0,0 +1,580 @@
using BeWo.Report.ReportObjects;
namespace LebenshilfeFrankfurtOder
{
partial class LeistungsnachweisSGBIX
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.rule31 = new DevExpress.XtraReports.UI.FormattingRule();
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule();
this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule();
this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.fieldArtDerLeistung = new DevExpress.XtraReports.UI.CalculatedField();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.fieldStunden = new DevExpress.XtraReports.UI.CalculatedField();
this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
//
this.Detail.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.Detail.HeightF = 0F;
this.Detail.Name = "Detail";
this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.Detail.StylePriority.UseFont = false;
this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail1});
this.DetailReport.DataMember = "Rows";
this.DetailReport.DataSource = this.bindingSource1;
this.DetailReport.Level = 0;
this.DetailReport.Name = "DetailReport";
this.DetailReport.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.DetailReport.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// Detail1
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable3});
this.Detail1.HeightF = 22F;
this.Detail1.Name = "Detail1";
this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.Detail1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrTable3
//
this.xrTable3.BorderColor = System.Drawing.Color.Black;
this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow6});
this.xrTable3.SizeF = new System.Drawing.SizeF(600F, 22F);
this.xrTable3.StylePriority.UseFont = false;
this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrTableRow6
//
this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell13,
this.xrTableCell14,
this.xrTableCell16,
this.xrTableCell17});
this.xrTableRow6.Name = "xrTableRow6";
this.xrTableRow6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableRow6.Weight = 1.1D;
//
// xrTableCell13
//
this.xrTableCell13.CanGrow = false;
this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Datum")});
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.StylePriority.UseFont = false;
this.xrTableCell13.StylePriority.UsePadding = false;
this.xrTableCell13.StylePriority.UseTextAlignment = false;
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell13.TextFormatString = "{0:dd.}";
this.xrTableCell13.Weight = 0.0364416350657677D;
//
// xrTableCell14
//
this.xrTableCell14.CanGrow = false;
this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Anwesend")});
this.xrTableCell14.Multiline = true;
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.StylePriority.UseFont = false;
this.xrTableCell14.StylePriority.UsePadding = false;
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell14.Weight = 0.051018293371269424D;
//
// xrTableCell16
//
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.AnzahlKinder")});
this.xrTableCell16.Multiline = true;
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrTableCell16.StylePriority.UseFont = false;
this.xrTableCell16.StylePriority.UsePadding = false;
this.xrTableCell16.StylePriority.UseTextAlignment = false;
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell16.TextTrimming = DevExpress.Drawing.DXStringTrimming.Word;
this.xrTableCell16.Weight = 0.065594947152700867D;
//
// xrTableCell17
//
this.xrTableCell17.CanGrow = false;
this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.BetragNachStaffel")});
this.xrTableCell17.Multiline = true;
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.StylePriority.UseFont = false;
this.xrTableCell17.StylePriority.UsePadding = false;
this.xrTableCell17.StylePriority.UseTextAlignment = false;
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell17.TextFormatString = "{0:c}";
this.xrTableCell17.Weight = 0.06559495154230327D;
//
// rule31
//
this.rule31.Condition = "GetDay([StartDate]) < 31";
this.rule31.DataMember = "Services";
this.rule31.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.rule31.Name = "rule31";
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleStartDate.DataMember = "ServicesDouble";
this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleStartDate.Name = "formattingRuleStartDate";
//
// ReportHeader
//
this.ReportHeader.HeightF = 0F;
this.ReportHeader.Name = "ReportHeader";
//
// formattingRuleServiceDesc
//
this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleServiceDesc.DataMember = "ServicesDouble";
this.formattingRuleServiceDesc.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleServiceDesc.Name = "formattingRuleServiceDesc";
//
// formattingRuleCostBearer
//
this.formattingRuleCostBearer.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleCostBearer.DataMember = "ServicesDouble";
this.formattingRuleCostBearer.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleCostBearer.Name = "formattingRuleCostBearer";
//
// formattingRuleEmployeeName
//
this.formattingRuleEmployeeName.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleEmployeeName.DataMember = "ServicesDouble";
this.formattingRuleEmployeeName.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleEmployeeName.Name = "formattingRuleEmployeeName";
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 50F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 30F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// fieldArtDerLeistung
//
this.fieldArtDerLeistung.DataMember = "Services";
this.fieldArtDerLeistung.Expression = "Iif([IsGroup], \'G\', \'E\')";
this.fieldArtDerLeistung.Name = "fieldArtDerLeistung";
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel8,
this.xrLabel9,
this.xrTable1});
this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.GroupFooter1.HeightF = 123.3334F;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
//
// xrLabel8
//
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(420F, 103.3333F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(137.1875F, 20.00002F);
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.StylePriority.UseTextAlignment = false;
this.xrLabel8.Text = "Unterschrift";
this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel9
//
this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(420F, 83.33334F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(277.2083F, 20.00002F);
this.xrLabel9.StylePriority.UseBorders = false;
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.StylePriority.UseTextAlignment = false;
this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrTable1
//
this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(600F, 22F);
this.xrTable1.StylePriority.UseBackColor = false;
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.StylePriority.UseTextAlignment = false;
this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
//
// xrTableRow1
//
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell1,
this.xrTableCell2,
this.xrTableCell5,
this.xrTableCell6});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow1.StylePriority.UseTextAlignment = false;
this.xrTableRow1.Weight = 1.1D;
//
// xrTableCell1
//
this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.StylePriority.UseBorders = false;
this.xrTableCell1.StylePriority.UseFont = false;
this.xrTableCell1.StylePriority.UsePadding = false;
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell1.Weight = 0.097299372330913708D;
//
// xrTableCell2
//
this.xrTableCell2.Borders = DevExpress.XtraPrinting.BorderSide.Right;
this.xrTableCell2.Multiline = true;
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.StylePriority.UseBorders = false;
this.xrTableCell2.StylePriority.UseFont = false;
this.xrTableCell2.StylePriority.UsePadding = false;
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell2.Weight = 0.13621912121438584D;
//
// xrTableCell5
//
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrTableCell5.StylePriority.UseFont = false;
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Gesamtbetrag";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell5.Weight = 0.17513886130658599D;
//
// xrTableCell6
//
this.xrTableCell6.Multiline = true;
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.StylePriority.UsePadding = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell6.Weight = 0.17513886337834458D;
//
// fieldStunden
//
this.fieldStunden.DataMember = "Services";
this.fieldStunden.Expression = "[Minutes] / 60";
this.fieldStunden.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldStunden.Name = "fieldStunden";
//
// GroupHeader2
//
this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel4,
this.xrLabel3,
this.xrLabel1,
this.xrTableServiceRecords1,
this.xrLabel2});
this.GroupHeader2.HeightF = 143.6112F;
this.GroupHeader2.Name = "GroupHeader2";
//
// xrLabel4
//
this.xrLabel4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 59.00004F);
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(400F, 29.50002F);
this.xrLabel4.StylePriority.UseBorders = false;
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.StylePriority.UsePadding = false;
this.xrLabel4.StylePriority.UseTextAlignment = false;
this.xrLabel4.Text = "Name Kind: [Customer]";
this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrLabel3
//
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(297.2082F, 29.50002F);
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "Hortangebot (Früh-/Späthort)";
//
// xrLabel1
//
this.xrLabel1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(400F, 25F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(297.2082F, 29.50002F);
this.xrLabel1.StylePriority.UseBorders = false;
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.StylePriority.UsePadding = false;
this.xrLabel1.StylePriority.UseTextAlignment = false;
this.xrLabel1.Text = "Monat: [Month!MMMM yyyy]";
this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrTableServiceRecords1
//
this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 113.6112F);
this.xrTableServiceRecords1.Name = "xrTableServiceRecords1";
this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(600F, 30F);
this.xrTableServiceRecords1.StylePriority.UseBackColor = false;
this.xrTableServiceRecords1.StylePriority.UseFont = false;
this.xrTableServiceRecords1.StylePriority.UseTextAlignment = false;
this.xrTableServiceRecords1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
//
// xrTableRow2
//
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3,
this.xrTableCell4,
this.xrTableCell9,
this.xrTableCell8});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow2.StylePriority.UseTextAlignment = false;
this.xrTableRow2.Weight = 1.5D;
//
// xrTableCell3
//
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.StylePriority.UseFont = false;
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "Datum";
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell3.Weight = 0.097299372330913708D;
//
// xrTableCell4
//
this.xrTableCell4.Multiline = true;
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.StylePriority.UseFont = false;
this.xrTableCell4.StylePriority.UsePadding = false;
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Kind Anwesend";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell4.Weight = 0.13621912121438584D;
//
// xrTableCell9
//
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.StylePriority.UseFont = false;
this.xrTableCell9.StylePriority.UsePadding = false;
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.Text = "Kinder Gesamt/Tag";
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell9.Weight = 0.17513886130658599D;
//
// xrTableCell8
//
this.xrTableCell8.Multiline = true;
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.StylePriority.UsePadding = false;
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.Text = "Betrag nach Staffel";
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell8.Weight = 0.17513886337834458D;
//
// xrLabel2
//
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(297.21F, 25F);
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.Text = "Leistungsnachweis SGB IX";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(LebenshilfeFrankfurtOder.Reporting.LeistungsnachweisSGBIXRO);
//
// LeistungsnachweisSGBIX
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail,
this.DetailReport,
this.ReportHeader,
this.topMarginBand1,
this.bottomMarginBand1,
this.GroupFooter1,
this.GroupHeader2});
this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
this.fieldArtDerLeistung,
this.fieldStunden});
this.DataSource = this.bindingSource1;
this.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.formattingRuleStartDate,
this.formattingRuleServiceDesc,
this.formattingRuleCostBearer,
this.formattingRuleEmployeeName,
this.rule31});
this.Margins = new DevExpress.Drawing.DXMargins(50F, 49F, 50F, 30F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
#endregion
private DevExpress.XtraReports.UI.DetailBand Detail;
private System.Windows.Forms.BindingSource bindingSource1;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.DetailBand Detail1;
private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
private DevExpress.XtraReports.UI.FormattingRule formattingRuleStartDate;
private DevExpress.XtraReports.UI.FormattingRule formattingRuleServiceDesc;
private DevExpress.XtraReports.UI.FormattingRule formattingRuleCostBearer;
private DevExpress.XtraReports.UI.FormattingRule formattingRuleEmployeeName;
private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.CalculatedField fieldArtDerLeistung;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.CalculatedField fieldStunden;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRTable xrTableServiceRecords1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTable xrTable3;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.FormattingRule rule31;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
}
}

View File

@@ -0,0 +1,67 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BeWo.Service.DCEntityMapper;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.Extensions;
using DevExpress.Entity.Model.Metadata;
using DevExpress.XtraPrinting;
using DevExpress.XtraReports.UI;
using LebenshilfeFrankfurtOder.Reporting;
using LebenshilfeFrankfurtOder.Utils;
namespace LebenshilfeFrankfurtOder
{
public partial class LeistungsnachweisSGBIX : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<LeistungsnachweisSGBIXRO>
{
public LeistungsnachweisSGBIX()
{
InitializeComponent();
}
public void SetReportDataSource(LeistungsnachweisSGBIXRO pRO)
{
double betragGesamt = 0;
bindingSource1.DataSource = pRO;
}
public void SetzeDaten(ServicesOverviewRO pRO)
{
if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0)
{
var c2s = pRO.CostBearer2SupportConceptList[0];
Customer c = c2s.SupportConcept.Customer;
//String kvnummer = ""; // Oid = 4
//foreach (var vv in c.VarFieldValueList)
//{
// var varFieldValue =
// BS.Shared.Core.Utils.XMLDeserializeFromString(vv.SerializedValue, Type.GetType(vv.TypeName));
// if (varFieldValue != null)
// {
// if (vv.VarFieldDefOid.Value == 4)
// {
// kvnummer = varFieldValue.ToString();
// }
// }
//}
//lblKvNummer.Text = kvnummer;
}
}
}
}

View File

@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

View File

@@ -0,0 +1,214 @@
using System;
using System.Collections.Generic;
using System.Linq;
using BS.Shared;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BeWo.Report.ReportObjects;
namespace LebenshilfeFrankfurtOder.Reporting
{
public class LeistungsnachweisSGBIXRO
{
public DateTime Month { get; set; }
public CompactCustomerDC CustomerDC { get; set; }
public string Customer { get; set; }
public List<LeistungsnachweisSGBIXRow> Rows { get; set; } = new List<LeistungsnachweisSGBIXRow>();
public static LeistungsnachweisSGBIXRO Create(AdditionalServiceBookingRO ro, AdditionalServiceBookingRow asbRow)
{
DateTime month = new DateTime(ro.Year, ro.MonthInt, 1);
var result = new LeistungsnachweisSGBIXRO
{
Month = month,
CustomerDC = asbRow.CustomerDC,
Customer = asbRow.Customer
};
DateTime datum = new DateTime(month.Year, month.Month, 1);
while (datum < new DateTime(month.Year, month.Month, 1).AddMonths(1))
{
var row = new LeistungsnachweisSGBIXRow
{
Datum = datum
};
if (IstAnwesend(datum, asbRow))
{
row.Anwesend = "x";
}
foreach (var item in ro.Rows)
{
if (IstAnwesend(datum, item))
{
row.AnzahlKinder = (row.AnzahlKinder ?? 0) + 1;
}
}
result.Rows.Add(row);
datum = datum.AddDays(1);
}
return result;
}
private static bool IstAnwesend(DateTime dt, AdditionalServiceBookingRow row)
{
if (dt.Day == 1)
{
return row.AttendanceOnDay1 == "x";
}
else if (dt.Day == 2)
{
return row.AttendanceOnDay2 == "x";
}
else if (dt.Day == 3)
{
return row.AttendanceOnDay3 == "x";
}
else if (dt.Day == 4)
{
return row.AttendanceOnDay4 == "x";
}
else if (dt.Day == 5)
{
return row.AttendanceOnDay5 == "x";
}
else if (dt.Day == 6)
{
return row.AttendanceOnDay6 == "x";
}
else if (dt.Day == 7)
{
return row.AttendanceOnDay7 == "x";
}
else if (dt.Day == 8)
{
return row.AttendanceOnDay8 == "x";
}
else if (dt.Day == 9)
{
return row.AttendanceOnDay9 == "x";
}
else if (dt.Day == 10)
{
return row.AttendanceOnDay10 == "x";
}
else if (dt.Day == 11)
{
return row.AttendanceOnDay11 == "x";
}
else if (dt.Day == 12)
{
return row.AttendanceOnDay12 == "x";
}
else if (dt.Day == 13)
{
return row.AttendanceOnDay13 == "x";
}
else if (dt.Day == 14)
{
return row.AttendanceOnDay14 == "x";
}
else if (dt.Day == 15)
{
return row.AttendanceOnDay15 == "x";
}
else if (dt.Day == 16)
{
return row.AttendanceOnDay16 == "x";
}
else if (dt.Day == 17)
{
return row.AttendanceOnDay17 == "x";
}
else if (dt.Day == 18)
{
return row.AttendanceOnDay18 == "x";
}
else if (dt.Day == 19)
{
return row.AttendanceOnDay19 == "x";
}
else if (dt.Day == 20)
{
return row.AttendanceOnDay20 == "x";
}
else if (dt.Day == 21)
{
return row.AttendanceOnDay21 == "x";
}
else if (dt.Day == 22)
{
return row.AttendanceOnDay22 == "x";
}
else if (dt.Day == 23)
{
return row.AttendanceOnDay23 == "x";
}
else if (dt.Day == 24)
{
return row.AttendanceOnDay24 == "x";
}
else if (dt.Day == 25)
{
return row.AttendanceOnDay25 == "x";
}
else if (dt.Day == 26)
{
return row.AttendanceOnDay26 == "x";
}
else if (dt.Day == 27)
{
return row.AttendanceOnDay27 == "x";
}
else if (dt.Day == 28)
{
return row.AttendanceOnDay28 == "x";
}
else if (dt.Day == 29)
{
return row.AttendanceOnDay29 == "x";
}
else if (dt.Day == 30)
{
return row.AttendanceOnDay30 == "x";
}
else if (dt.Day == 31)
{
return row.AttendanceOnDay31 == "x";
}
return false;
}
}
public class LeistungsnachweisSGBIXRow
{
public DateTime Datum { get; set; }
public String Anwesend { get; set; }
public int? AnzahlKinder { get; set; }
public decimal? BetragNachStaffel { get; set; }
public string Notice { get; set; }
}
}

View File

@@ -19,6 +19,7 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.Version = pEntity.Version;
pDataContract.Notice = pEntity.Notice;
pDataContract.VgaType = pEntity.VgaType;
pDataContract.Fallnummer = pEntity.Fallnummer;
pDataContract.AktenzeichenGericht = pEntity.AktenzeichenGericht;
pDataContract.EigenesAktenzeichen = pEntity.EigenesAktenzeichen;
pDataContract.Auftragseingang = pEntity.Auftragseingang;
@@ -93,6 +94,7 @@ namespace BeWo.Service.DCEntityMapper
pEntity.Version = pDataContract.Version;
pEntity.Notice = pDataContract.Notice;
pEntity.VgaType = pDataContract.VgaType;
pEntity.Fallnummer = pDataContract.Fallnummer;
pEntity.AktenzeichenGericht = pDataContract.AktenzeichenGericht;
pEntity.EigenesAktenzeichen = pDataContract.EigenesAktenzeichen;
pEntity.Auftragseingang = pDataContract.Auftragseingang;

View File

@@ -31,7 +31,8 @@ namespace BeWo.Service.Dokumentverwaltung
Children = new List<PlatzhalterDC>(),
IconType = "BoyAndGirl"
};
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Fallnummer", Platzhalter = "Fallnummer", FieldName = "CustomerVermittlungArbeit.Fallnummer", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "AZ der Staatsanwaltschaft/des Gerichts", Platzhalter = "AktenzeichenGericht", FieldName = "CustomerVermittlungArbeit.AktenzeichenGericht", IconType = "AB"});
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Eigenes Aktenzeichen", Platzhalter = "EigenesAktenzeichen", FieldName = "CustomerVermittlungArbeit.EigenesAktenzeichen", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Auftragseingang", Platzhalter = "Auftragseingang", FieldName = "CustomerVermittlungArbeit.Auftragseingang", IconType = "AB", Format = "dd.MM.yyyy" });

View File

@@ -203,6 +203,12 @@ namespace BeWo.Service.Plugins
groupDC.SupportConcepts.Add(scDC);
}
if (config.FetchApprovedFLS)
{
var calc = PluginLoader.FindClass<Calculations>(scDC.CostbearerID) ?? Calculations.GetInstance(scDC.CostbearerID);
srDC.SollFLSPerWeek = calc.GetApprovedHoursPerWeek(scDC.SupportConcept2CostBearer, sr.Start.Value) ?? 0;
}
scDC.ServiceRecords.Add(srDC);
}
}
@@ -224,7 +230,7 @@ namespace BeWo.Service.Plugins
if (config.EmployeeOid != null)
{
allow = false;
foreach (ServiceRecord sr in serviceRecords)
foreach (var sr in serviceRecords)
{
if (sr.Employee != null && sr.Employee.Oid.Value == config.EmployeeOid.Value)
{

View File

@@ -73,7 +73,21 @@ namespace BeWo.ServiceUtils.History
}
}
}
CreateAbsenceTimeHistoryEntry(originalEmployee.AbsenceTimes, newEmployee.AbsenceTimes);
if (newEmployee.Overtimes != null)
{
foreach (var item in newEmployee.Overtimes)
{
if (!item.EmployeeOid.HasValue)
{
item.EmployeeOid = originalEmployee.Oid.Value;
}
}
}
CreateOvertimeHistoryEntry(originalEmployee.Overtimes, newEmployee.Overtimes);
@@ -482,7 +496,7 @@ namespace BeWo.ServiceUtils.History
//CostBearer2SupportConcept_ServiceRecords = originalC2S.ServiceRecords,
CostBearer2SupportConcept_Status = originalC2S.Status,
//CostBearer2SupportConcept_SupportConceptApprovalPeriodList = originalC2S.ApprovalPeriodList
CostBearer2SupportConcept_SupportConceptHistoryOid = lOriginal.Oid.Value,
CostBearer2SupportConcept_SupportConceptHistoryOid = lOriginal?.Oid,
ChangeType = statementType,
Notice = originalC2S.Notice
};
@@ -502,14 +516,14 @@ namespace BeWo.ServiceUtils.History
SupportConceptApprovalPeriod_BudgetOid = item.Budget?.Oid.Value,
SupportConceptApprovalPeriod_ContactCountInterval = item.ContactCountInterval,
SupportConceptApprovalPeriod_ContactCountPerInterval = item.ContactCountPerInterval,
SupportConceptApprovalPeriod_CostBearer2SupportConceptHistoryOid = originalC2S.Oid.Value,
SupportConceptApprovalPeriod_CostBearer2SupportConceptHistoryOid = originalC2S?.Oid,
SupportConceptApprovalPeriod_EndDate = item.EndDate,
SupportConceptApprovalPeriod_IsApprovedBEShifting = item.IsApprovedBEShifting,
SupportConceptApprovalPeriod_IsApprovedFixedAmountShifting = item.IsApprovedFixedAmountShifting,
SupportConceptApprovalPeriod_MonthlyPayment = item.MonthlyPayment,
SupportConceptApprovalPeriod_StartDate = item.StartDate,
SupportConceptApprovalPeriod_SupportConceptApprovalPeriod2Employee = item.SupportConceptApprovalPeriod2Employee,
SupportConceptApprovalPeriod_SupportConceptHistoryOid = supportConceptHistoryEntry.Oid.Value,
SupportConceptApprovalPeriod_SupportConceptHistoryOid = supportConceptHistoryEntry?.Oid,
Notice = item.Notice
};
DAOFactory.GenericDAO.Insert(scApprovalPeriodHistory);

View File

@@ -8,6 +8,7 @@ namespace BS.Shared.DataContracts
public class CustomerVermittlungArbeitDC : BeWoDataContract
{
[DataMember] public VgaTypeEnum VgaType { get; set; }
[DataMember] public string Fallnummer { get; set; }
[DataMember] public string AktenzeichenGericht { get; set; }
[DataMember] public string EigenesAktenzeichen { get; set; }
[DataMember] public DateTime? Auftragseingang { get; set; }

View File

@@ -77,5 +77,8 @@ namespace BS.Shared.DataContracts
[DataMember]
public string DateTimeRange { get; set; }
[DataMember]
public decimal SollFLSPerWeek { get; set; }
}
}