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

Bugfixing Dokument Vorlagen, Anpassungen Herr Kloss, Bfp Dus, HPH Bersenbrück, LH Frankfurt Oder

Browse Source
This commit is contained in:
Christian
2024-10-08 19:30:58 +02:00
parent 9fb43859a1
commit f13f2ae828
32 changed files with 691 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml.cs
View File

@@ -90,7 +90,7 @@ namespace BeWo.View.Controls.Wohnhilfe
}
else
{
IsLarge = false;
//IsLarge = false;
}
}
}

2
BeWo/View/Detail/CustomerWohnhilfeView.xaml
View File

@@ -56,7 +56,7 @@
</Button>
</StackPanel>
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
<CheckBox x:Name="checkbox_size" IsChecked="{Binding Path=IsLarge, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">Groß</CheckBox>
<CheckBox x:Name="checkbox_size" IsChecked="{Binding Path=IsLarge, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Visibility="Hidden">Groß</CheckBox>
</StackPanel>
<TabControl
x:Name="tabcontrol_NotizenKategorien"

2
BeWo/View/Detail/EmployeeView.xaml
View File

@@ -34,6 +34,8 @@
</dxg:GridColumn>-->
<dxg:GridColumn FieldName="Customer.LastNameFirstName" AllowEditing="False" Header="{markup:Translate Klient(in)}" Width="180" AllowSorting="True" SortOrder="Ascending" />
<dxg:GridColumn FieldName="Role" x:Name="column_role" Header="Rolle" Width="180" AllowSorting="True"/>
<dxg:GridColumn FieldName="StartDate" Width="100" Header="{markup:Translate Startdatum}" />
<dxg:GridColumn FieldName="EndDate" Width="100" Header="{markup:Translate Enddatum}" />
<dxg:GridColumn FieldName="Notice" Header="Erläuterung" Width="180" AllowSorting="True"/>
</dxg:GridControl.Columns>
<dxg:GridControl.View>

2
BeWo/View/Detail/SupportConceptView.xaml.cs
View File

@@ -157,7 +157,7 @@ namespace BeWo.View.Detail
private void OnLoaded(object sender, RoutedEventArgs routedEventArgs)
{
if (taskToEdit != null && ViewModel != null)
if (taskToEdit != null && ViewModel != null && ViewModel.Tasks != null)
{
tabitem_tasks.IsSelected = true;

6
BeWo/View/HilfeplanImportView.xaml
View File

@@ -59,7 +59,7 @@
<Button x:Name="ButtonImport" Grid.Column="2" Margin="5,0,0,0" Height="22" Content="Datei auslesen" Click="ButtonImport_Click" HorizontalAlignment="Left" VerticalAlignment="Center" Visibility="Visible" ></Button>
</Grid>
<GroupBox x:Name="GroupBoxMain" Grid.Row="1" Margin="5" Header="{t:Translate Inhalt des Dokuments}" Style="{StaticResource ObjectEditGroupBox}" Visibility="Hidden">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Hidden">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"></RowDefinition>
@@ -77,10 +77,10 @@
<Label HorizontalAlignment="Left" VerticalAlignment="Center" Content="{t:Translate Zielplanung}" FontSize="14" Margin="0" />
</Grid>
</Expander.Header>
<TreeView x:Name="treeview_Goals" Margin="3 3 7 3" Padding="5 5 10 5"
<TreeView x:Name="treeview_Goals" Margin="3 3 7 3" Padding="5 5 10 5" BorderBrush="Black" BorderThickness="1"
ItemContainerStyle="{DynamicResource goal_treeitemstyle}"
ItemTemplate="{DynamicResource goal_treeitemtemplate}" Grid.RowSpan="1" MinHeight="100"
VirtualizingStackPanel.IsVirtualizing="False">
VirtualizingStackPanel.IsVirtualizing="False" >
<TreeView.Resources>
<Style x:Key="goal_treeitemstyle" TargetType="TreeViewItem">
<Setter Property="IsExpanded" Value="{Binding Path=IsExpanded, Mode=TwoWay}" />

2
BeWo/View/Master/AdministrationView.xaml
View File

@@ -57,7 +57,7 @@
<dxa:AccordionItem Header="{markup:Translate Medikamentenarten}" Name="TabitemMedikamentenarten" Selected="Tabitem_Selected" Foreground="Black"/>
<dxa:AccordionItem Header="{markup:Translate Rollen des Umfeldes}" Name="TabitemEnvironmentRoles" Selected="Tabitem_Selected" Foreground="Black"/>
<dxa:AccordionItem Header="{markup:Translate Vermittlung}" Name="TabitemPlacementObjectives" Selected="Tabitem_Selected" Foreground="Black"/>
<dxa:AccordionItem Header="{t:Translate Falldaten}" Foreground="{StaticResource TabItemTextBrush}">
<dxa:AccordionItem Header="{t:Translate Falldaten}" Foreground="Black" >
<dxa:AccordionItem Header="{markup:Translate Auftragsherkunft}" Name="TabitemAuftragsherkunft" Selected="Tabitem_Selected" Foreground="Black"/>
<dxa:AccordionItem Header="{markup:Translate Vermittlungsgrundlage}" Name="TabitemVermittlungsgrundlage" Selected="Tabitem_Selected" Foreground="Black"/>
</dxa:AccordionItem>

13
BeWo/View/Master/DokumenteView.xaml.cs
View File

@@ -1282,6 +1282,7 @@ namespace BeWo.View.Master
Name = table.Tabellenname,
Table = TableID.Vorlagentabelle,
ObjectOid = table.VorlagentabelleOid,
Node = node,
BeWoFolderDC = new BeWoFolderDC { Name = "RootFolder", SubFolders = new List<BeWoFolderDC>() }
};
DocumentTreeItemVM vm = new DocumentTreeItemVM(dc);
@@ -1430,6 +1431,7 @@ namespace BeWo.View.Master
DocumentTreeItemVM vm = new DocumentTreeItemVM(dc);
dc.Node.Content = vm;
row.DataContract.Node.Nodes.Add(dc.Node);
row.DataContract.Node.IsExpanded = true;
}
else if (twi.Header.Equals("Umbenennen"))
{
@@ -1452,8 +1454,8 @@ namespace BeWo.View.Master
{
if(savedTemplate.IsDirty)
{
SaveInDatabase(savedTemplate);
var savedDC = SaveInDatabase(savedTemplate);
savedTemplate = new DokumentvorlageVM(savedDC);
var tableitems = datagrid_templates.ItemsSource as List<DokumentvorlageVM>;
datagrid_templates.ItemsSource = new List<DokumentvorlageVM>();
@@ -1511,8 +1513,11 @@ namespace BeWo.View.Master
private DokumentvorlageDC SaveInDatabase(DokumentvorlageVM savedTemplate)
{
var dc = savedTemplate.CommitToDataContract();
var textasbytes = Encoding.ASCII.GetBytes(dc.RTFText);
dc.Data = textasbytes;
if (!String.IsNullOrEmpty(dc.RTFText))
{
var textasbytes = Encoding.ASCII.GetBytes(dc.RTFText);
dc.Data = textasbytes;
}
var updatedDC = ServiceFacade.DoOperationsServiceSync(s => s.InsertTemplate(dc));
return updatedDC;

1
Model/Changes_alle_fuer_neue_db.txt
View File

@@ -1075,7 +1075,6 @@ ALTER TABLE `servicerecordhistory`
ADD INDEX `cb2scIdx` (`CostBearer2SupportConceptOid` ASC);
ALTER TABLE `vorlagentabelle`
ADD COLUMN `ImageName` VARCHAR(128) NULL AFTER `Tabellenname`;

2
ReportImp/AkggMid/LeistungsnachweisHelper.cs
View File

@@ -676,7 +676,7 @@ where scap2e.EmployeeOid = {0} and scap.Start <= '{1:yyyy-MM-dd}' and scap.EndDa
}
if (at.AbsenceReason.Description.Contains("<24h_SA"))
if (at.AbsenceReason.Description.Contains("<24h_SA") || at.AbsenceReason.Description.Contains("unter 24"))
{
info.AbwesenheitsNotiz = "Abwesenheit gem. § 8 Ziff. 3 LV";
}

76
ReportImp/AkggMid/Mitarbeiterarbeitszeitkonto.designer.cs generated
View File

@@ -86,6 +86,7 @@ namespace AkggMid
this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell64 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSumHoursInVacationDecimal = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
@@ -103,7 +104,6 @@ namespace AkggMid
this.fieldSumHoliday2 = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldIstArbeitszeit = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldUeberstundenGesamt = new DevExpress.XtraReports.UI.CalculatedField();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
@@ -120,7 +120,8 @@ namespace AkggMid
//
// 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;
@@ -151,7 +152,7 @@ namespace AkggMid
//
this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableDetail});
this.Detail2.Font = new System.Drawing.Font("Arial", 8F);
this.Detail2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.Detail2.HeightF = 22F;
this.Detail2.Name = "Detail2";
this.Detail2.StylePriority.UseFont = false;
@@ -160,7 +161,8 @@ namespace AkggMid
//
this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableDetail.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableDetail.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.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(9.536743E-05F, 0F);
this.xrTableDetail.Name = "xrTableDetail";
this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -246,7 +248,7 @@ namespace AkggMid
//
this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable3});
this.GroupHeader2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.GroupHeader2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.GroupHeader2.HeightF = 51.87499F;
this.GroupHeader2.Name = "GroupHeader2";
this.GroupHeader2.StylePriority.UseFont = false;
@@ -347,7 +349,7 @@ namespace AkggMid
this.xrLabel2,
this.xrLabel1,
this.lblMonat});
this.GroupHeader3.Font = new System.Drawing.Font("Arial", 10F);
this.GroupHeader3.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.GroupHeader3.HeightF = 135.625F;
this.GroupHeader3.Level = 1;
this.GroupHeader3.Name = "GroupHeader3";
@@ -358,7 +360,7 @@ namespace AkggMid
//
this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FullName")});
this.xrLabel6.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(228.0374F, 47.91667F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
@@ -370,7 +372,7 @@ namespace AkggMid
//
this.lblRegelarbeitszeit.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Regelarbeitszeit")});
this.lblRegelarbeitszeit.Font = new System.Drawing.Font("Arial", 10F);
this.lblRegelarbeitszeit.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.lblRegelarbeitszeit.LocationFloat = new DevExpress.Utils.PointFloat(228.0374F, 67.70834F);
this.lblRegelarbeitszeit.Multiline = true;
this.lblRegelarbeitszeit.Name = "lblRegelarbeitszeit";
@@ -382,7 +384,7 @@ namespace AkggMid
//
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollMax", "{0:0.00}")});
this.xrLabel8.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(228.0374F, 87.5F);
this.xrLabel8.Multiline = true;
this.xrLabel8.Name = "xrLabel8";
@@ -394,7 +396,7 @@ namespace AkggMid
//
this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.ArbeitstageImBerichtszeitraum")});
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(228.0374F, 107.2917F);
this.xrLabel9.Multiline = true;
this.xrLabel9.Name = "xrLabel9";
@@ -404,7 +406,7 @@ namespace AkggMid
//
// xrLabel5
//
this.xrLabel5.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 107.2917F);
this.xrLabel5.Multiline = true;
this.xrLabel5.Name = "xrLabel5";
@@ -415,7 +417,7 @@ namespace AkggMid
//
// xrLabel4
//
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(0F, 87.5F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
@@ -426,7 +428,7 @@ namespace AkggMid
//
// xrLabel3
//
this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 67.70834F);
this.xrLabel3.Multiline = true;
this.xrLabel3.Name = "xrLabel3";
@@ -437,7 +439,7 @@ namespace AkggMid
//
// xrLabel2
//
this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 47.91667F);
this.xrLabel2.Multiline = true;
this.xrLabel2.Name = "xrLabel2";
@@ -450,7 +452,7 @@ namespace AkggMid
//
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "{0:MMM yyyy}")});
this.xrLabel1.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(489.5621F, 0F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
@@ -462,7 +464,7 @@ namespace AkggMid
//
// lblMonat
//
this.lblMonat.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold);
this.lblMonat.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.lblMonat.Multiline = true;
this.lblMonat.Name = "lblMonat";
@@ -476,7 +478,7 @@ namespace AkggMid
this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable5,
this.xrTable4});
this.GroupFooter2.Font = new System.Drawing.Font("Arial", 10F);
this.GroupFooter2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.GroupFooter2.HeightF = 132.5F;
this.GroupFooter2.KeepTogether = true;
this.GroupFooter2.Name = "GroupFooter2";
@@ -647,7 +649,7 @@ namespace AkggMid
this.xrTableCell32,
this.xrTableCell35,
this.xrTableCell39});
this.xrTableRow11.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTableRow11.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableRow11.Name = "xrTableRow11";
this.xrTableRow11.StylePriority.UseFont = false;
this.xrTableRow11.Weight = 1.6D;
@@ -655,7 +657,7 @@ namespace AkggMid
// xrTableCell37
//
this.xrTableCell37.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell37.Font = new System.Drawing.Font("Arial", 10F);
this.xrTableCell37.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTableCell37.Multiline = true;
this.xrTableCell37.Name = "xrTableCell37";
this.xrTableCell37.StylePriority.UseBorders = false;
@@ -670,7 +672,7 @@ namespace AkggMid
this.xrTableCell8.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")});
this.xrTableCell8.Font = new System.Drawing.Font("Arial", 10F);
this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.StylePriority.UseBorders = false;
this.xrTableCell8.StylePriority.UseFont = false;
@@ -682,7 +684,7 @@ namespace AkggMid
// xrTableCell32
//
this.xrTableCell32.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrTableCell32.Font = new System.Drawing.Font("Arial", 10F);
this.xrTableCell32.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTableCell32.Name = "xrTableCell32";
this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(20, 2, 0, 0, 100F);
this.xrTableCell32.StylePriority.UseBorders = false;
@@ -696,7 +698,7 @@ namespace AkggMid
// xrTableCell35
//
this.xrTableCell35.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrTableCell35.Font = new System.Drawing.Font("Arial", 10F);
this.xrTableCell35.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTableCell35.Name = "xrTableCell35";
this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(20, 2, 0, 0, 100F);
this.xrTableCell35.StylePriority.UseBorders = false;
@@ -711,7 +713,7 @@ namespace AkggMid
this.xrTableCell39.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell39.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")});
this.xrTableCell39.Font = new System.Drawing.Font("Arial", 10F);
this.xrTableCell39.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTableCell39.Name = "xrTableCell39";
this.xrTableCell39.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell39.StylePriority.UseBorders = false;
@@ -748,7 +750,8 @@ namespace AkggMid
// xrTableCell40
//
this.xrTableCell40.Borders = DevExpress.XtraPrinting.BorderSide.Right;
this.xrTableCell40.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell40.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableCell40.Name = "xrTableCell40";
this.xrTableCell40.StylePriority.UseBorders = false;
this.xrTableCell40.StylePriority.UseFont = false;
@@ -760,7 +763,8 @@ namespace AkggMid
//
this.xrTableCell64.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell64.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell64.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableCell64.Name = "xrTableCell64";
this.xrTableCell64.StylePriority.UseBorders = false;
this.xrTableCell64.StylePriority.UseFont = false;
@@ -783,13 +787,17 @@ namespace AkggMid
this.cellSumHoursInVacationDecimal.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.cellSumHoursInVacationDecimal.Weight = 0.085029315396800059D;
//
// 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";
//
@@ -799,7 +807,7 @@ namespace AkggMid
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";
//
@@ -809,7 +817,7 @@ namespace AkggMid
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";
//
@@ -819,7 +827,7 @@ namespace AkggMid
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";
//
@@ -912,10 +920,6 @@ namespace AkggMid
this.fieldUeberstundenGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldUeberstundenGesamt.Name = "fieldUeberstundenGesamt";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
//
// Mitarbeiterarbeitszeitkonto
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -937,8 +941,8 @@ namespace AkggMid
this.fieldUeberstundenGesamt});
this.DataSource = this.bindingSource1;
this.DisplayName = "Mitarbeiterstundenkonto";
this.Font = new System.Drawing.Font("Arial", 8F);
this.Margins = new System.Drawing.Printing.Margins(75, 50, 50, 50);
this.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.Margins = new DevExpress.Drawing.DXMargins(75F, 50F, 50F, 50F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -947,7 +951,7 @@ namespace AkggMid
this.FieldCaption,
this.PageInfo,
this.DataField});
this.Version = "17.1";
this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();

3
ReportImp/AkggMid/Mitarbeiterarbeitszeitkonto.resx
View File

@@ -117,7 +117,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

1
ReportImp/BeWoNeuss/Properties/licenses.licx
View File

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

2
ReportImp/BfpDus/BfpDus.csproj
View File

@@ -70,6 +70,8 @@
<Compile Include="InvoiceCustomerReport.Designer.cs">
<DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
</Compile>
<Compile Include="Invoicing\CustomInvoiceCreation.cs" />
<Compile Include="Invoicing\CustomInvoiceFactory.cs" />
<Compile Include="Invoicing\SettlementInvoiceCreation.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ServiceInvoiceReport.cs">

161
ReportImp/BfpDus/CustomReportCreator.cs
View File

@@ -31,11 +31,10 @@ namespace BfpDus
{
ansprechpartner.AppendLine(treport.SettlementRo.InvoiceDate);
ansprechpartner.AppendLine();
ansprechpartner.AppendLine("Frau Aust");
ansprechpartner.AppendLine("Tel.: 0211/88 000 99");
ansprechpartner.AppendLine("Fax.: 0211/88 000 97");
ansprechpartner.Append("aust@bfp-dus.de");
ansprechpartner.AppendLine("Frau Jondral");
ansprechpartner.AppendLine("Tel.: 0211/962 90 200");
ansprechpartner.AppendLine("Fax.: 0211/962 90 207");
ansprechpartner.Append("jondral@bfp-dus.de");
if (!String.IsNullOrEmpty(treport.SettlementRo.RecipientOrganisation))
{
anschrift.AppendLine(treport.SettlementRo.RecipientOrganisation);
@@ -69,10 +68,10 @@ namespace BfpDus
{
ansprechpartner.AppendLine(String.Format("{0:dd.MM.yyyy}", treport.SettlementRo.InvoiceDate));
ansprechpartner.AppendLine();
ansprechpartner.AppendLine("Frau Aust");
ansprechpartner.AppendLine("Tel.: 0211/88 000 99");
ansprechpartner.AppendLine("Fax.: 0211/88 000 97");
ansprechpartner.Append("aust@bfp-dus.de");
ansprechpartner.AppendLine("Frau Jondral");
ansprechpartner.AppendLine("Tel.: 0211/962 90 200");
ansprechpartner.AppendLine("Fax.: 0211/962 90 207");
ansprechpartner.Append("jondral@bfp-dus.de");
if (!String.IsNullOrEmpty(treport.SettlementRo.RecipientOrganisation))
{
@@ -155,96 +154,96 @@ namespace BfpDus
return report;
}
public override XtraReport CreateServiceInvoiceReport(string dcIds, long? invoiceBaseOid)
{
XtraReport allReports = null;
//public override XtraReport CreateServiceInvoiceReport(string dcIds, long? invoiceBaseOid)
//{
// XtraReport allReports = null;
if (String.IsNullOrEmpty(dcIds) && invoiceBaseOid.HasValue)
{
var serviceInvoice = DAOFactory.SearchDAO.GetServiceInvoiceByInvoiceBaseOid(invoiceBaseOid.Value);
dcIds = String.Format("{0}", serviceInvoice.Oid);
}
// if (String.IsNullOrEmpty(dcIds) && invoiceBaseOid.HasValue)
// {
// var serviceInvoice = DAOFactory.SearchDAO.GetServiceInvoiceByInvoiceBaseOid(invoiceBaseOid.Value);
// dcIds = String.Format("{0}", serviceInvoice.Oid);
// }
if (!string.IsNullOrEmpty(dcIds))
{
var serviceInvoiceOid2CostbearerId = new Dictionary<long, string>();
var dcList = new List<ServiceInvoiceDC>();
// if (!string.IsNullOrEmpty(dcIds))
// {
// var serviceInvoiceOid2CostbearerId = new Dictionary<long, string>();
// var dcList = new List<ServiceInvoiceDC>();
var dcidStrs = dcIds.Split(';');
foreach (var oidStr in dcidStrs)
{
var oid = long.Parse(oidStr);
var invoice = DAOFactory.GenericDAO.LoadByID<ServiceInvoice>(oid);
var dc = MapperFactory.ServiceInvoiceDC_ServiceInvoice.MapToNewDC(invoice);
dcList.Add(dc);
// var dcidStrs = dcIds.Split(';');
// foreach (var oidStr in dcidStrs)
// {
// var oid = long.Parse(oidStr);
// var invoice = DAOFactory.GenericDAO.LoadByID<ServiceInvoice>(oid);
// var dc = MapperFactory.ServiceInvoiceDC_ServiceInvoice.MapToNewDC(invoice);
// dcList.Add(dc);
if (serviceInvoiceOid2CostbearerId.ContainsKey(oid))
continue;
// if (serviceInvoiceOid2CostbearerId.ContainsKey(oid))
// continue;
if (!String.IsNullOrEmpty(invoice.InvoiceBase.InvoiceId))
serviceInvoiceOid2CostbearerId.Add(oid, invoice.InvoiceBase.InvoiceId);
else
{
foreach (var period in invoice.ServiceInvoicePeriodList)
{
try
{
if (period.SupportConceptApprovalPeriod != null)
{
AddCostBearerIdToDict(oid, serviceInvoiceOid2CostbearerId,
period.SupportConceptApprovalPeriod.CostBearer2SupportConcept);
// if (!String.IsNullOrEmpty(invoice.InvoiceBase.InvoiceId))
// serviceInvoiceOid2CostbearerId.Add(oid, invoice.InvoiceBase.InvoiceId);
// else
// {
// foreach (var period in invoice.ServiceInvoicePeriodList)
// {
// try
// {
// if (period.SupportConceptApprovalPeriod != null)
// {
// AddCostBearerIdToDict(oid, serviceInvoiceOid2CostbearerId,
// period.SupportConceptApprovalPeriod.CostBearer2SupportConcept);
}
foreach (var item in period.InvoiceItemList)
{
if (item.SupportConceptApprovalPeriodOid.HasValue)
{
var approvalPeriod =
DAOFactory.GenericDAO.LoadByID<SupportConceptApprovalPeriod>(item.SupportConceptApprovalPeriodOid.Value);
if (approvalPeriod.CostBearer2SupportConcept != null)
{
AddCostBearerIdToDict(oid, serviceInvoiceOid2CostbearerId, approvalPeriod.CostBearer2SupportConcept);
}
}
}
}
catch (Exception)
{
//ignore
}
// }
// foreach (var item in period.InvoiceItemList)
// {
// if (item.SupportConceptApprovalPeriodOid.HasValue)
// {
// var approvalPeriod =
// DAOFactory.GenericDAO.LoadByID<SupportConceptApprovalPeriod>(item.SupportConceptApprovalPeriodOid.Value);
// if (approvalPeriod.CostBearer2SupportConcept != null)
// {
// AddCostBearerIdToDict(oid, serviceInvoiceOid2CostbearerId, approvalPeriod.CostBearer2SupportConcept);
// }
// }
// }
// }
// catch (Exception)
// {
// //ignore
// }
}
}
}
// }
// }
// }
foreach (var iDC in dcList)
{
String reportId = null;
if (serviceInvoiceOid2CostbearerId.ContainsKey(iDC.ServiceInvoiceOid.Value))
reportId = serviceInvoiceOid2CostbearerId[iDC.ServiceInvoiceOid.Value];
// foreach (var iDC in dcList)
// {
// String reportId = null;
// if (serviceInvoiceOid2CostbearerId.ContainsKey(iDC.ServiceInvoiceOid.Value))
// reportId = serviceInvoiceOid2CostbearerId[iDC.ServiceInvoiceOid.Value];
IBeWoReport<ServiceInvoiceRO> singleReport = FindReportImp<ServiceInvoiceRO>(reportId);
// IBeWoReport<ServiceInvoiceRO> singleReport = FindReportImp<ServiceInvoiceRO>(reportId);
singleReport.SetReportDataSource(ServiceInvoiceRO.Create(iDC));
// singleReport.SetReportDataSource(ServiceInvoiceRO.Create(iDC));
var briefkopf = CreateReportMitBriefkopf(singleReport);
// var briefkopf = CreateReportMitBriefkopf(singleReport);
if (allReports == null)
allReports = briefkopf;
else
allReports.Pages.AddRange(briefkopf.Pages);
}
// if (allReports == null)
// allReports = briefkopf;
// else
// allReports.Pages.AddRange(briefkopf.Pages);
// }
}
// }
allReports.DisplayName = "Rechnung";
allReports.CreateDocument();
return allReports;
// allReports.DisplayName = "Rechnung";
// allReports.CreateDocument();
// return allReports;
}
//}
private Briefkopf CreateReportMitBriefkopf(IBeWoReport<ServiceInvoiceRO> subreport)
{

49
ReportImp/BfpDus/Invoicing/CustomInvoiceCreation.cs Normal file
View File

@@ -0,0 +1,49 @@
using System;
using System.Collections.Generic;
using System.Linq;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report.ReportObjects;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Invoicing;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using BS.Shared.Services;
using Service.Invoicing;
namespace BfpDus.Invoicing
{
public class CustomInvoiceCreation : InvoiceCreation
{
public override void SetRecipientInformation(ServiceInvoice serviceInvoice, CostBearer costBearer)
{
if (costBearer.Organisation.Name == "Privat")
{
serviceInvoice.InvoiceBase.RecipientOrganisationOid = costBearer.Organisation.Oid;
serviceInvoice.InvoiceBase.RecipientOrganisation = costBearer.Organisation.Name;
//serviceInvoice.InvoiceBase.RecipientContacts = costBearer.Organisation.Contacts.Select(i => i.CopyToNew()).ToList();
serviceInvoice.InvoiceBase.RecipientCostBearerOid = costBearer.Oid;
if (serviceInvoice.InvoiceBase.CostBearer2SupportConcept != null)
{
var cust = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.SupportConcept.Customer;
if (cust.Person.InvoiceAddress != null)
{
serviceInvoice.InvoiceBase.RecipientAddress = cust.Person.InvoiceAddress.CopyToNew();
}
else if (cust.Person.Address != null)
{
serviceInvoice.InvoiceBase.RecipientAddress = cust.Person.Address.CopyToNew();
}
serviceInvoice.InvoiceBase.RecipientPersonFirstName = cust.Person.FirstName;
serviceInvoice.InvoiceBase.RecipientPersonLastName = cust.Person.LastName;
serviceInvoice.InvoiceBase.RecipientCustomerOid = cust.Oid;
}
}
}
}
}

17
ReportImp/BfpDus/Invoicing/CustomInvoiceFactory.cs Normal file
View File

@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using BeWo.Data.Entities;
using BeWo.Service.Invoicing;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
namespace BfpDus.Invoicing
{
public class CustomInvoiceFactory : InvoiceFactory
{
public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
{
return new CustomInvoiceCreation();
}
}
}

404
ReportImp/BfpDus/ServiceInvoiceReport.Designer.cs generated
View File

@@ -29,18 +29,16 @@ namespace BfpDus
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport));
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -57,10 +55,25 @@ namespace BfpDus
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAnschrift = 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.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
@@ -73,8 +86,16 @@ namespace BfpDus
//
// ReportHeader
//
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 0F;
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1,
this.xrRichText2,
this.xrPictureBox2,
this.lblMonat,
this.xrLabel4,
this.xrLabel5,
this.xrLabel6,
this.lblAnschrift});
this.ReportHeader.HeightF = 398.3333F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
@@ -86,7 +107,7 @@ namespace BfpDus
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 157.5F;
this.topMarginBand1.HeightF = 50F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
@@ -97,15 +118,30 @@ namespace BfpDus
// Page1
//
this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel3,
this.xrLabel2,
this.lblAbrechnungszeitraum});
this.Page1.HeightF = 107.4166F;
this.Page1.HeightF = 148.2499F;
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
//
// xrLabel2
//
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold);
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(536.0416F, 28.33333F);
this.xrLabel2.StylePriority.UseBackColor = false;
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.Text = "Rechnung";
this.xrLabel2.WordWrap = false;
//
// lblAbrechnungszeitraum
//
this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.33333F);
this.lblAbrechnungszeitraum.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 94.16666F);
this.lblAbrechnungszeitraum.Multiline = true;
this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum";
this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -113,55 +149,14 @@ namespace BfpDus
this.lblAbrechnungszeitraum.StylePriority.UseFont = false;
this.lblAbrechnungszeitraum.Text = "Für die von uns geleistete Betreuungsarbeit berechnen wir:";
//
// xrTable4
//
this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.75F);
this.xrTable4.Name = "xrTable4";
this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow10,
this.xrTableRow14});
this.xrTable4.SizeF = new System.Drawing.SizeF(536.0416F, 26F);
this.xrTable4.StylePriority.UseFont = false;
//
// xrTableRow10
//
this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell9});
this.xrTableRow10.Name = "xrTableRow10";
this.xrTableRow10.Weight = 0.38095238095238093D;
//
// xrTableCell9
//
this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")});
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell9.StylePriority.UsePadding = false;
this.xrTableCell9.Text = "xrTableCell1";
this.xrTableCell9.Weight = 3D;
//
// xrTableRow14
//
this.xrTableRow14.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell12});
this.xrTableRow14.Name = "xrTableRow14";
this.xrTableRow14.Weight = 0.23809523809523808D;
//
// xrTableCell12
//
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Weight = 3D;
//
// xrLabel9
//
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Tahoma", 11F, DevExpress.Drawing.DXFontStyle.Italic, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.75F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(250F, 17F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(464F, 17F);
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.Text = "Abschließende Bemerkungen:";
this.xrLabel9.Text = "Zahlbar innerhalb 14 Tagen ab Rechnungsdatum ohne Abzug";
//
// DetailReport
//
@@ -175,7 +170,7 @@ namespace BfpDus
//
// Detail1
//
this.Detail1.HeightF = 25F;
this.Detail1.HeightF = 0F;
this.Detail1.Name = "Detail1";
//
// DetailReport2
@@ -197,13 +192,11 @@ namespace BfpDus
//
// xrTable6
//
this.xrTable6.Font = new DevExpress.Drawing.DXFont("Verdana", 8.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(1.059638E-05F, 0F);
this.xrTable6.Name = "xrTable6";
this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow25});
this.xrTable6.SizeF = new System.Drawing.SizeF(536.0416F, 25F);
this.xrTable6.SizeF = new System.Drawing.SizeF(666.9999F, 25F);
this.xrTable6.StylePriority.UseFont = false;
//
// xrTableRow25
@@ -221,43 +214,39 @@ namespace BfpDus
// xrTableCell42
//
this.xrTableCell42.BorderColor = System.Drawing.Color.DarkGray;
this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")});
this.xrTableCell42.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell42.Name = "xrTableCell42";
this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell42.StylePriority.UseBorderColor = false;
this.xrTableCell42.StylePriority.UseBorders = false;
this.xrTableCell42.StylePriority.UseFont = false;
this.xrTableCell42.StylePriority.UsePadding = false;
this.xrTableCell42.StylePriority.UseTextAlignment = false;
this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell42.Weight = 0.85081229498678679D;
this.xrTableCell42.Weight = 1.0096009226264111D;
//
// xrTableCell43
//
this.xrTableCell43.BorderColor = System.Drawing.Color.DarkGray;
this.xrTableCell43.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell43.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate", "{0:0.00}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Hours", "{0:0.00}")});
this.xrTableCell43.Name = "xrTableCell43";
this.xrTableCell43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
this.xrTableCell43.StylePriority.UseBorderColor = false;
this.xrTableCell43.StylePriority.UseBorders = false;
this.xrTableCell43.StylePriority.UsePadding = false;
this.xrTableCell43.StylePriority.UseTextAlignment = false;
this.xrTableCell43.Text = "xrTableCell43";
this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell43.Weight = 0.23245943032832414D;
this.xrTableCell43.Weight = 0.28785140803176246D;
//
// xrTableCell44
//
this.xrTableCell44.BorderColor = System.Drawing.Color.DarkGray;
this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Hours", "{0:0.##}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitDescription")});
this.xrTableCell44.Name = "xrTableCell44";
this.xrTableCell44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell44.StylePriority.UseBorderColor = false;
@@ -265,33 +254,27 @@ namespace BfpDus
this.xrTableCell44.StylePriority.UsePadding = false;
this.xrTableCell44.StylePriority.UseTextAlignment = false;
this.xrTableCell44.Text = "xrTableCell44";
this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell44.Weight = 0.2893277257020575D;
this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell44.Weight = 0.47765820502594919D;
//
// xrTableCell45
//
this.xrTableCell45.BorderColor = System.Drawing.Color.DarkGray;
this.xrTableCell45.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.NetAmount", "{0:0.00}")});
this.xrTableCell45.Name = "xrTableCell45";
this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell45.StylePriority.UseBorderColor = false;
this.xrTableCell45.StylePriority.UseBorders = false;
this.xrTableCell45.StylePriority.UsePadding = false;
this.xrTableCell45.StylePriority.UseTextAlignment = false;
this.xrTableCell45.Text = "xrTableCell45";
this.xrTableCell45.Text = "à";
this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell45.Weight = 0.26310971709438763D;
this.xrTableCell45.Weight = 0.13386361730403046D;
//
// xrTableCell46
//
this.xrTableCell46.BorderColor = System.Drawing.Color.DarkGray;
this.xrTableCell46.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell46.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.RateFactor")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate")});
this.xrTableCell46.Name = "xrTableCell46";
this.xrTableCell46.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell46.StylePriority.UseBorderColor = false;
@@ -299,79 +282,248 @@ namespace BfpDus
this.xrTableCell46.StylePriority.UsePadding = false;
this.xrTableCell46.StylePriority.UseTextAlignment = false;
this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell46.Weight = 0.42042083402151886D;
this.xrTableCell46.TextFormatString = "{0:c}";
this.xrTableCell46.Weight = 0.37980001881796405D;
//
// xrTableCell47
//
this.xrTableCell47.BorderColor = System.Drawing.Color.DarkGray;
this.xrTableCell47.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell47.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.GrossAmount")});
this.xrTableCell47.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell47.Name = "xrTableCell47";
this.xrTableCell47.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell47.StylePriority.UseBorderColor = false;
this.xrTableCell47.StylePriority.UseBorders = false;
this.xrTableCell47.StylePriority.UseFont = false;
this.xrTableCell47.StylePriority.UsePadding = false;
this.xrTableCell47.StylePriority.UseTextAlignment = false;
this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell47.Weight = 0.31923915575667006D;
this.xrTableCell47.Weight = 0.6669123533858502D;
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel10,
this.xrLabel1,
this.xrLabel9,
this.xrTable4});
this.GroupFooter1.HeightF = 218.0417F;
this.xrLabel9});
this.GroupFooter1.HeightF = 167.2084F;
this.GroupFooter1.Name = "GroupFooter1";
//
// xrLabel10
//
this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 114.9306F);
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(262.5F, 103.1111F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(262.5F, 52.27778F);
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.Text = "Mit freundlichen Grüßen\r\n\r\n\r\nChristine Aust\r\nSozialpädagogin M.A.\r\n";
this.xrLabel10.Text = "Leistungen der ambulanten\r\nEingliederungshilfe sind von der\r\nUmsatzsteuerpflicht " +
"befreit.";
//
// xrLabel1
//
this.xrLabel1.BorderColor = System.Drawing.Color.DarkGray;
this.xrLabel1.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "Gesamtsumme: {0}")});
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Tahoma", 11F, 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(280.2083F, 0F);
new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim")});
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(255.8333F, 25F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(666.9999F, 25F);
this.xrLabel1.StylePriority.UseBorderColor = false;
this.xrLabel1.StylePriority.UseBorders = false;
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.StylePriority.UsePadding = false;
this.xrLabel1.StylePriority.UseTextAlignment = false;
this.xrLabel1.Text = "xrLabel1";
this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrLabel1.TextFormatString = "Rechnungsbetrag: {0}";
//
// xrLabel3
//
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 42.5F);
this.xrLabel3.Multiline = true;
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(536.0416F, 31.58334F);
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "Für die von uns geleistete Betreuungsarbeit berechnen wir:";
//
// xrRichText2
//
this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Arial", 7F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline))));
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 142.9792F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
this.xrRichText2.SizeF = new System.Drawing.SizeF(397.6249F, 24.81248F);
this.xrRichText2.StylePriority.UseFont = false;
//
// xrPictureBox2
//
this.xrPictureBox2.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox2.ImageSource"));
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(210F, 3F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(52.75116F, 78.00001F);
this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// lblMonat
//
this.lblMonat.Font = new DevExpress.Drawing.DXFont("Tahoma", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(268F, 0F);
this.lblMonat.Multiline = true;
this.lblMonat.Name = "lblMonat";
this.lblMonat.SizeF = new System.Drawing.SizeF(337.2131F, 25F);
this.lblMonat.StylePriority.UseFont = false;
this.lblMonat.StylePriority.UseTextAlignment = false;
this.lblMonat.Text = "Freie gemeinnützige";
this.lblMonat.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// xrLabel4
//
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Tahoma", 16F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(265.3559F, 25F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.SizeF = new System.Drawing.SizeF(337.21F, 28F);
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.Text = "eratungsstelle";
//
// xrLabel5
//
this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Tahoma", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(268F, 55F);
this.xrLabel5.Multiline = true;
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.SizeF = new System.Drawing.SizeF(337.2131F, 25F);
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.Text = "für Psychotherapie e.V.";
//
// xrLabel6
//
this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Tahoma", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 100.5207F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.SizeF = new System.Drawing.SizeF(676.9999F, 25F);
this.xrLabel6.StylePriority.UseFont = false;
this.xrLabel6.StylePriority.UseTextAlignment = false;
this.xrLabel6.Text = "Selbstbestimmt Leben mit Unterstützung in Einzelwohnungen und Wohngemeinschaften";
this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
//
// lblAnschrift
//
this.lblAnschrift.LocationFloat = new DevExpress.Utils.PointFloat(0F, 167.7917F);
this.lblAnschrift.Multiline = true;
this.lblAnschrift.Name = "lblAnschrift";
this.lblAnschrift.SizeF = new System.Drawing.SizeF(422.625F, 142.1874F);
this.lblAnschrift.StylePriority.UseFont = false;
this.lblAnschrift.StylePriority.UseTextAlignment = false;
this.lblAnschrift.Text = "Frau\r\nMaria Mustermann\r\nMusterstr. 1\r\n\r\n40212 Düsseldorf\r\n";
this.lblAnschrift.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrTable1
//
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(504.2082F, 274.1666F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1,
this.xrTableRow2,
this.xrTableRow3});
this.xrTable1.SizeF = new System.Drawing.SizeF(162.7917F, 75F);
this.xrTable1.StylePriority.UseFont = false;
//
// xrTableRow1
//
this.xrTableRow1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell1});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.StylePriority.UseBorders = false;
this.xrTableRow1.Weight = 1D;
//
// xrTableCell1
//
this.xrTableCell1.BorderColor = System.Drawing.Color.DarkGray;
this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell1.StylePriority.UseBorderColor = false;
this.xrTableCell1.StylePriority.UseBorders = false;
this.xrTableCell1.StylePriority.UseFont = false;
this.xrTableCell1.StylePriority.UsePadding = false;
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "Bei Zahlung bitte angeben";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell1.Weight = 0.85081229498678679D;
//
// xrTableRow2
//
this.xrTableRow2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell2});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.StylePriority.UseBorders = false;
this.xrTableRow2.Weight = 1D;
//
// xrTableCell2
//
this.xrTableCell2.BorderColor = System.Drawing.Color.DarkGray;
this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
this.xrTableCell2.Multiline = true;
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 2, 2, 100F);
this.xrTableCell2.StylePriority.UseBorderColor = false;
this.xrTableCell2.StylePriority.UseBorders = false;
this.xrTableCell2.StylePriority.UsePadding = false;
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.Text = "xrTableCell2";
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell2.Weight = 0.85081229498678679D;
//
// xrTableRow3
//
this.xrTableRow3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.StylePriority.UseBorders = false;
this.xrTableRow3.Weight = 1D;
//
// xrTableCell3
//
this.xrTableCell3.BorderColor = System.Drawing.Color.DarkGray;
this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "DebitorNumber")});
this.xrTableCell3.Multiline = true;
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 2, 2, 100F);
this.xrTableCell3.StylePriority.UseBorderColor = false;
this.xrTableCell3.StylePriority.UseBorders = false;
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "xrTableCell3";
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell3.Weight = 0.85081229498678679D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// xrLabel2
//
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Tahoma", 11F, 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(536.0416F, 20F);
this.xrLabel2.StylePriority.UseBackColor = false;
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.Text = "Rechnung";
this.xrLabel2.WordWrap = false;
//
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -383,17 +535,19 @@ namespace BfpDus
this.DetailReport});
this.DataSource = this.bindingSource1;
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.Font = new DevExpress.Drawing.DXFont("Tahoma", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 157.5F, 50F);
this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 50F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
@@ -408,11 +562,6 @@ namespace BfpDus
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.GroupHeaderBand Page1;
private DevExpress.XtraReports.UI.XRLabel lblAbrechnungszeitraum;
private DevExpress.XtraReports.UI.XRTable xrTable4;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.DetailBand Detail1;
@@ -430,5 +579,20 @@ namespace BfpDus
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.XRRichText xrRichText2;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
private DevExpress.XtraReports.UI.XRLabel lblMonat;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel lblAnschrift;
}
}

82
ReportImp/BfpDus/ServiceInvoiceReport.cs
View File

@@ -1,4 +1,6 @@
using System;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report;
using BeWo.Report.ReportObjects;
@@ -24,15 +26,77 @@ namespace BfpDus
{
ro = pRO;
DateTime start = pRO.AccountingPeriodStart;
DateTime end = pRO.AccountingPeriodEnd;
if (start.Month == end.Month && start.Year == end.Year)
{
lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Monat {0:MMMM yyyy} folgende erbrachte Tätigkeiten:", start);
}
else
{
lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end);
}
DateTime end = pRO.AccountingPeriodEnd;
if (pRO.InvoiceBase != null && pRO.InvoiceBase.SupportConceptCostBearerRelDc != null)
{
if (pRO.InvoiceBase.SupportConceptCostBearerRelDc.StartDate.HasValue)
{
start = pRO.InvoiceBase.SupportConceptCostBearerRelDc.StartDate.Value;
}
if (pRO.InvoiceBase.SupportConceptCostBearerRelDc.EndDate.HasValue)
{
end = pRO.InvoiceBase.SupportConceptCostBearerRelDc.EndDate.Value;
}
}
if (pRO.RecipientOrganisation == "Privat")
{
pRO.RecipientOrganisation = "";
if (pRO.InvoiceBase != null)
{
var cOid = pRO.InvoiceBase?.RecipientCustomerOid;
if (cOid.HasValue)
{
var c = DAOFactory.GenericDAO.LoadByID<Customer>(cOid.Value);
if (c.Person.Sex.HasValue)
{
if (c.Person.Sex.Value == BS.Shared.Sex.Male)
{
pRO.RecipientOrganisation = "Herr";
}
else if (c.Person.Sex.Value == BS.Shared.Sex.Female)
{
pRO.RecipientOrganisation = "Frau";
}
}
}
}
}
foreach (var sip in pRO.ServiceInvoicePeriods)
{
int index = 1;
foreach (var item in sip.ServiceInvoiceItems)
{
if (item.ServiceDescription.Contains("Fehl"))
{
item.UnitDescription = item.ServiceDescription;
}
else
{
item.UnitDescription = "Stunden";
}
if (index++ == 1)
{
item.ServiceDescription = String.Format("Monat {0:yyyy.MM}", pRO.AccountingPeriodStart);
}
else
{
item.ServiceDescription = "";
}
}
}
//if (start.Month == end.Month && start.Year == end.Year)
//{
// lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Monat {0:MMMM yyyy} folgende erbrachte Tätigkeiten:", start);
//}
//else
//{
lblAbrechnungszeitraum.Text = String.Format("Zeitraum von {0:MMMM yyyy} bis {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end);
//}
this.bindingSource1.DataSource = pRO;
}

6
ReportImp/BfpDus/ServiceInvoiceReport.resx
View File

@@ -117,4 +117,10 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="xrRichText2.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAKgBcAGQAZQBmAHAAYQBwACAAXAB3AGkAZABjAHQAbABwAGEAcgB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAGYAMQBcAGYAcwAyADQAXAB1AGwAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABoAHQAbQBhAHUAdABzAHAAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgAyAFwAZgBzADEANABcAGIAXAB1AGwAXABjAGYAMQAgAEIAZQByAGEAdAB1AG4AZwBzAHMAdABlAGwAbABlACAAfQB7AFwAZgAyAFwAZgBzADEANABcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABiAFwAdQBsAFwAYwBmADEAIABmAFwAdQAyADUAMgBcACcAZgBjAHIAIAB9AHsAXABmADIAXABmAHMAMQA0AFwAYgBcAHUAbABcAGMAZgAxACAAUABzAHkAYwBoAG8AdABoAGUAcgBhAHAAaQBlACAAZQAuAFYALgAgACAAQgBlAHIAbABpAG4AZQByACAAQQBsAGwAZQBlACAAMwAyACAAIAAgACAANAAwADIAMQAyACAARABcAHUAMgA1ADIAXAAnAGYAYwBzAHMAZQBsAGQAbwByAGYAfQBcAGYAMgBcAGYAcwAxADQAXABiAFwAdQBsAFwAYwBmADEAXABwAGEAcgB9AA==</value>
</data>
<data name="xrPictureBox2.ImageSource" xml:space="preserve">
<value>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</value>
</data>
</root>

4
ReportImp/BfpDus/SettlementReport.Designer.cs generated
View File

@@ -253,10 +253,10 @@ namespace BfpDus.Alt
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Tahoma", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17.00001F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17.00002F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(539.0416F, 16F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(539.0416F, 21.83334F);
this.xrLabel3.StylePriority.UseBackColor = false;
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "Leistungsabrechnung";

57
ReportImp/BfpDus/SettlementReport2.cs
View File

@@ -76,36 +76,39 @@ namespace BfpDus
int index = 2;
foreach (var at in customer.AbsenceTimes)
{
if (at.AbsenceReason.BillableMinutes.HasValue && at.AbsenceReason.BillableMinutes.Value > 0)
if ((!at.Start.HasValue || at.Start <= pRO.AccountingEndDate) && (!at.End.HasValue || at.End >= pRO.AccountingStartDate))
{
DevExpress.XtraReports.UI.XRTableRow row = null;
if (index == 2)
if (at.AbsenceReason.BillableMinutes.HasValue && at.AbsenceReason.BillableMinutes.Value > 0)
{
row = tableRowKHAufenthalte;
DevExpress.XtraReports.UI.XRTableRow row = null;
if (index == 2)
{
row = tableRowKHAufenthalte;
}
else
{
row = tableCustomer.InsertRowBelow(tableCustomer.Rows[tableCustomer.Rows.Count - 3]);
}
String text = String.Format("{0:dd.MM.yyyy} - ", at.Start);
int? days = null;
if (at.End.HasValue)
{
days = (int)at.End.Value.Subtract(at.Start.Value).TotalDays + 1;
text += String.Format("{0:dd.MM.yyyy} = {1:0.#} Tage", at.End, days);
}
else
{
text += "unbekannt";
}
row.Cells[1].Text = text;
index++;
}
else
{
row = tableCustomer.InsertRowBelow(tableCustomer.Rows[tableCustomer.Rows.Count - 3]);
}
String text = String.Format("{0:dd.MM.yyyy} - ", at.Start);
int? days = null;
if (at.End.HasValue)
{
days = (int)at.End.Value.Subtract(at.Start.Value).TotalDays + 1;
text += String.Format("{0:dd.MM.yyyy} = {1:0.#} Tage", at.End, days);
}
else
{
text += "unbekannt";
}
row.Cells[1].Text = text;
index++;
}
}

19
ReportImp/HPHBersenbrueck/Invoicing/NeueAssistenzInvoiceCreation.cs
View File

@@ -17,6 +17,7 @@ namespace HPHBersenbrueck.Invoicing
public class NeueAssistenzInvoiceCreation : InvoiceCreation
{
private bool fahrtkostenWurdenBerechnet = false;
protected DateTime? accountingPeriodStart = null;
protected DateTime? accountingPeriodEnd = null;
private Dictionary<long, bool> groupOidDict = null;
@@ -49,6 +50,11 @@ namespace HPHBersenbrueck.Invoicing
return invoices;
}
public override ServiceInvoice CreateSingleInvoice(int invoiceCounter, CostBearer costBearer, DateTimeSpan invoicePeriod, CompactSupportConceptDC supportConcept, List<ServiceRecordDC> serviceRecords)
{
fahrtkostenWurdenBerechnet = false;
return base.CreateSingleInvoice(invoiceCounter, costBearer, invoicePeriod, supportConcept, serviceRecords);
}
public override void SetInvoiceBaseData(int invoiceCounter, ServiceInvoice invoice, CostBearer costBearer, DateTimeSpan invoicePeriod,
IList<CompactSupportConceptDC> supportConceptList)
{
@@ -104,13 +110,16 @@ namespace HPHBersenbrueck.Invoicing
item.GrossAmountTotal = item.AmountTotal;
}
}
var fahrzeitItem = CreateFahrzeitenInvoiceItem(serviceRecordsInPeriod, invoicePeriod, scap, calc);
if (fahrzeitItem != null)
if (!fahrtkostenWurdenBerechnet)
{
items.Add(fahrzeitItem);
}
var fahrzeitItem = CreateFahrzeitenInvoiceItem(serviceRecordsInPeriod, invoicePeriod, scap, calc);
if (fahrzeitItem != null)
{
items.Add(fahrzeitItem);
}
fahrtkostenWurdenBerechnet = true;
}
return items;
}

31
ReportImp/LebenshilfeFrankfurtOder/Invoicing/TagesstrukturInvoiceCreation.cs
View File

@@ -186,7 +186,8 @@ namespace LebenshilfeFrankfurtOder.Invoicing
{
foreach (var ii in sip.InvoiceItemList)
{
if (ii.UnitDescription == "I" || ii.UnitDescription == "UE")
//if (ii.UnitDescription == "I" || ii.UnitDescription == "UE")
if (ii.Notice == "Mittag gegessen")
{
ii.AmountPerUnit = verpflegungspauschale;
ii.AmountTotal = verpflegungspauschale;
@@ -386,8 +387,10 @@ namespace LebenshilfeFrankfurtOder.Invoicing
{
var invoiceItem = new InvoiceItem();
bool hatTagesstruktur = false;
bool hatVerpflegung = false;
HasBookings(dt, bookings, c, out hatTagesstruktur, out hatVerpflegung);
var hasBookings = HasBookings(dt, bookings, c);
decimal ts = 0;
if (dt.DayOfWeek != DayOfWeek.Saturday && dt.DayOfWeek != DayOfWeek.Sunday)
@@ -428,11 +431,15 @@ namespace LebenshilfeFrankfurtOder.Invoicing
}
}
if (hasBookings && String.IsNullOrEmpty(invoiceItem.UnitDescription))
if (hatTagesstruktur && String.IsNullOrEmpty(invoiceItem.UnitDescription))
{
ts = GetTagessatz(dt, scap) ?? 0;
invoiceItem.UnitDescription = "I";
}
if (hatVerpflegung)
{
invoiceItem.Notice = "Mittag gegessen";
}
invoiceItem.AmountPerUnit = ts;
invoiceItem.UnitCount = 1;
@@ -459,15 +466,17 @@ namespace LebenshilfeFrankfurtOder.Invoicing
return true;
}
private bool HasBookings(DateTime dt, IEnumerable<AdditionalServiceBooking> bookings, Customer c)
private void HasBookings(DateTime dt, IEnumerable<AdditionalServiceBooking> bookings, Customer c, out bool hatTagesstruktur, out bool hatVerpflegung)
{
hatTagesstruktur = false;
hatVerpflegung = false;
foreach (var b in bookings)
{
if (b.AdditionalServiceRegion.IsActive != ActivationTypeId.Deleted &&
b.AdditionalServiceRegion.AdditionalService.IsActive != ActivationTypeId.Deleted)
{
var angebot = b.AdditionalServiceRegion.AdditionalService;
if (angebot.Name == "Tagesstruktur")
if (angebot.Name == "Tagesstruktur" || angebot.Name == "Tagesstruktur Mittagsverpflegung")
{
if (b.Datum.Value.Date == dt.Date)
{
@@ -475,15 +484,21 @@ namespace LebenshilfeFrankfurtOder.Invoicing
{
if (c2a.CustomerOid == c.Oid.Value && c2a.Participated)
{
return true;
if (angebot.Name == "Tagesstruktur")
{
hatTagesstruktur = true;
}
else if (angebot.Name == "Tagesstruktur Mittagsverpflegung")
{
hatVerpflegung = true;
}
}
}
}
}
}
}
return false;
}
private AbsenceTime GetAbsenceTimes(DateTime dt, IList<AbsenceTime> absenceTimes)

2
ReportImp/LebenshilfeFrankfurtOder/RechnungTagesstrukturAnhangKlient.cs
View File

@@ -80,7 +80,7 @@ namespace LebenshilfeFrankfurtOder
else if (ii.UnitDescription == "I")
{
ii.ServiceDescription = "X";
ii.Notice = "Mittag gegessen";
//ii.Notice = "Mittag gegessen"; // Schreibt schon die TagesstrukturInvoiceCreation in das Item
}
}

17
ReportImp/LebenshilfeFrankfurtOder/RechnungTagesstrukturVerpflegung.cs
View File

@@ -82,7 +82,6 @@ namespace LebenshilfeFrankfurtOder
foreach (var sip in pRO.ServiceInvoicePeriods)
{
int count = 0;
int countAbwesend = 0;
decimal tagessatz = 0;
String schluessel = "";
@@ -95,27 +94,17 @@ namespace LebenshilfeFrankfurtOder
schluessel = ii.ServiceDescription;
}
if (ii.UnitDescription == "I")
{
count++;
}
else
{
if (ii.AmountPerUnit.HasValue && ii.AmountPerUnit > 0)
{
countAbwesend++;
}
}
if (ii.AmountPerUnit.HasValue && ii.AmountPerUnit.Value > 0)
{
tagessatz = ii.AmountPerUnit.Value;
count++;
tagessatz = ii.AmountPerUnit.Value;
}
}
}
sip.ApprovedHours = count + countAbwesend;
sip.ApprovedHours = count;
sip.ApprovedAmount = String.Format("{0:c}", tagessatz);
sip.NotBillableString = schluessel;

10
Service/Import/Perseh/PersehReader.cs
View File

@@ -131,10 +131,20 @@ namespace BeWo.Service.Import.Perseh
}
}
ErstelleMassnahmen(pdfText, startIdx, ziele);
return ziele;
}
private void ErstelleMassnahmen(string pdfText, int endIndex, List<HilfeplanImportZielDC> ziele)
{
foreach (var item in ziele)
{
item.Massnahmen = new List<HilfeplanImportZielDC>();
}
}
private IList<HilfeplanImportZielDC> ErstelleBereichMitZielen(string[] zeilen, TextAbschnitt ta)
{
var ziele = new List<HilfeplanImportZielDC>();

2
Service/Plugins/CustomerService.cs
View File

@@ -1321,8 +1321,6 @@ namespace BeWo.Service.Plugins
Employee = MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(lEmployee),
Customer = CreateCustomerForSupportConceptTree(iCustomer)
// MapperFactory.CompactCustomerDC_Customer.MapToNewDC(iCustomer)
};
if (customerOIDs.ContainsKey(iCustomer.Oid.Value))

6
Service/Plugins/PluginLoader.cs
View File

@@ -51,7 +51,7 @@ namespace BeWo.Service.Plugins
//t = "4950382346"; // Holsinger
//t = "5973016645"; // Verein Lebensgestaltung Hanau
//t = "7375324044"; // Diakonie KK Kleve
//t = "1441747891"; // BeWo Mobil Köln
t = "1441747891"; // BeWo Mobil Köln
//t = "5120047701"; // Trialog
//t = "3629696651"; // Soziale Dienste Niederrhein (SDN)
//t = "9893557471"; // Caritas Frankfurt
@@ -99,7 +99,7 @@ namespace BeWo.Service.Plugins
//t = "5653806613"; // Feid und Kollegen
//t = "3830114427"; // FiZ Familie im Zentrum Hof
//t = "7138297573"; // Tagwerk betreutes wohnen
t = "1008896531"; // BeWo Auxilio
//t = "1008896531"; // BeWo Auxilio
//t = "9383760246"; // Die Kette
//t = "5915565037"; // Lebenshilfe Remscheid
//t = "3350425974"; // BeWo Rückenwind
@@ -302,7 +302,7 @@ namespace BeWo.Service.Plugins
//t = "8251343124"; // Rat Plus Tat
//t = "6819347851"; // Awo Kreisverband Plön
//t = "2385915144"; // AKGG GmbHd
t = "8002913382"; // AKGG GmbH (MID)
//t = "8002913382"; // AKGG GmbH (MID)
//t = "5155880294"; // BHV Bergische Hauspflege
//t = "8366649557"; // Münchner Aids-Hilfe e.V.
//t = "2976949196"; // WHB Refrath gGmbH

16
Service/SBD/VertretungsManager.cs
View File

@@ -159,7 +159,7 @@ namespace BeWo.Service.SBD
{
var customer = customers.FirstOrDefault(first => first.Oid.HasValue && first.Oid.Equals(absenceTime.CustomerOid)) ?? DAOFactory.GenericDAO.LoadByID<Customer>(absenceTime.CustomerOid.Value);
if (customer.Person.LastName.Contains("Dragou"))
if (customer.Person.LastName.Contains("Platz"))
{
}
@@ -308,6 +308,19 @@ namespace BeWo.Service.SBD
}
}
//prüfe auch noch, ob zugeordneter Employee krank ist
if (newVertretungsItem.VertretungsStatus == VertretungsStatus.KlientKrank)
{
if (newVertretungsItem.Employee != null)
{
if (employeeAbsenceTimes.Any(a => a.EmployeeOid == newVertretungsItem.Employee.EmployeeOid))
{
newVertretungsItem.VertretungsStatus = VertretungsStatus.KlientUndMitarbeiterKrank;
}
}
//newVertretungsItem.VertretungsStatus = VertretungsStatus.KlientUndMitarbeiterKrank;
}
SetSubstitutionColor(newVertretungsItem);
Organisation schule = null;
@@ -447,7 +460,6 @@ namespace BeWo.Service.SBD
schule = c2oList[0].Organisation;
}
var assistanceTimeEntries = GetAssistanceTimesForCustomer(customer, employee, absenceTime, start, end);
var dateTime = start;

16
Service/Vorlagen/VorlagenManager.cs
View File

@@ -25,23 +25,23 @@ namespace BeWo.Service.Vorlagen
}
public static DokumentvorlageDC InsertTemplate(DokumentvorlageDC dc)
{
Dokumentvorlage entity = null;
if (dc.DokumentvorlageOid == null)
{
var entity = MapperFactory.DokumentvorlageDC_Dokumentvorlage.MapToNewEntity(dc);
entity = MapperFactory.DokumentvorlageDC_Dokumentvorlage.MapToNewEntity(dc);
DAOFactory.GenericDAO.Insert(entity);
return dc;
}
else
{
var origTemplate = DAOFactory.GenericDAO.LoadByID<Dokumentvorlage>((long)dc.DokumentvorlageOid);
MapperFactory.DokumentvorlageDC_Dokumentvorlage.MergeWithEntity(dc, origTemplate);
DAOFactory.GenericDAO.Update(origTemplate);
entity = DAOFactory.GenericDAO.LoadByID<Dokumentvorlage>((long)dc.DokumentvorlageOid);
MapperFactory.DokumentvorlageDC_Dokumentvorlage.MergeWithEntity(dc, entity);
DAOFactory.GenericDAO.Update(entity);
var updatedTemplateDC = MapperFactory.DokumentvorlageDC_Dokumentvorlage.MapToNewDC(origTemplate);
return updatedTemplateDC;
}
var updatedTemplateDC = MapperFactory.DokumentvorlageDC_Dokumentvorlage.MapToNewDC(entity);
return updatedTemplateDC;
}
public static List<PlatzhalterDC> GetPlatzhalterForCustomer()
{

3
Shared/DataContracts/HilfeplanImportZielDC.cs
View File

@@ -1,3 +1,4 @@
using System.Collections.Generic;
using System.Runtime.Serialization;
namespace BS.Shared.DataContracts
@@ -14,6 +15,8 @@ namespace BS.Shared.DataContracts
[DataMember]
public string ZielBeschreibung { get; set; }
[DataMember]
public IList<HilfeplanImportZielDC> Massnahmen { get; set; }
}
}

12
Shared/Services/Calculations.cs
View File

@@ -1076,12 +1076,12 @@ namespace BS.Shared.Services
}
decimal rdMinutes = record.RoundedDuration;
var prozent = record.ServiceDescription.Category.ProzentBudget ?? record.ServiceDescription.Category.Percentage;
if (record.ServiceDescription.ProzentBudget.HasValue)
{
prozent = record.ServiceDescription.ProzentBudget.Value;
}
//var prozent = record.ServiceDescription.Category.ProzentBudget ?? record.ServiceDescription.Category.Percentage;
//if (record.ServiceDescription.ProzentBudget.HasValue)
//{
// prozent = record.ServiceDescription.ProzentBudget.Value;
//}
decimal prozent = 100;
if (useProzentAbrechenbar)
{
if (record.ServiceDescription.ProzentAbrechnung.HasValue)