Konflikte gelöst

BeWoDatabaseUpdater-Projekt hinzugefügt
This commit is contained in:
2025-08-08 15:26:32 +02:00
238 changed files with 26420 additions and 12177 deletions

View File

@@ -336,6 +336,8 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -396,39 +398,53 @@
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Staatsangehörigkeit
Anzahl Kinder
</Label>
<Label
Grid.Row="8"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Krankenkasse
Staatsangehörigkeit
</Label>
<Label
Grid.Row="9"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Steuernummer
Krankenkasse
</Label>
<Label
Grid.Row="10"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Steuernummer
</Label>
<Label
Grid.Row="11"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Steuerklasse
</Label>
<Label
Grid.Row="12"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Versicherungs Nr.
</Label>
<Label
x:Name="lblArchiviert"
Grid.Row="11"
Grid.Row="13"
Grid.Column="0"
Margin="3,0,3,3"
VerticalAlignment="Center">
Archiviert
</Label>
<Label
Grid.Row="12"
Grid.Row="14"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center"
@@ -436,7 +452,7 @@
<ComboBox
Name="combobox_brush"
Grid.Row="12"
Grid.Row="14"
Grid.Column="1"
Height="23"
Margin="3"
@@ -538,9 +554,15 @@
SelectedValue="{Binding Path=FamilyStatus}"
SelectedValuePath="Key"
Style="{DynamicResource {x:Type uc:NullItemComboBox}}" />
<TextBox
Grid.Row="7"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=ChildCount, UpdateSourceTrigger=PropertyChanged}" />
<uc:NullItemComboBox
x:Name="comboBox_Nationalitaet"
Grid.Row="7"
Grid.Row="8"
Grid.Column="1"
Height="23"
MinWidth="189"
@@ -551,27 +573,32 @@
<TextBox
Grid.Row="8"
Grid.Row="9"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=HealthInsurance, UpdateSourceTrigger=PropertyChanged}" />
<TextBox
Grid.Row="9"
Grid.Row="10"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=TaxNumber, UpdateSourceTrigger=PropertyChanged}" />
<TextBox
Grid.Row="10"
Grid.Row="11"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=TaxClass, UpdateSourceTrigger=PropertyChanged}" />
<TextBox
Grid.Row="12"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=InsuranceNumber, UpdateSourceTrigger=PropertyChanged}" />
<CheckBox
x:Name="chkArchiviert"
Grid.Row="11"
Grid.Row="13"
Grid.Column="1"
Height="23"
Margin="3,6,3,3"
@@ -986,6 +1013,7 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label
Grid.Row="0"
@@ -1078,6 +1106,12 @@
Margin="3"
VerticalAlignment="Center"
Content="{markup:Translate Künd.-frist (Tage)}" />
<Label
Grid.Row="14"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center"
Content="{markup:Translate Bruttogehalt}" />
<Label
Grid.Row="0"
@@ -1154,10 +1188,19 @@
<dxe:SpinEdit MinValue="0" IsFloatValue="False" Grid.Column="1" Grid.Row="11" Margin="3" Height="23" EditValue="{Binding Path=ProbationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" IsFloatValue="True" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="12" Margin="3" Height="23" EditValue="{Binding Path=ProbationPeriod2, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" IsFloatValue="False" Grid.Column="1" Grid.Row="13" Margin="3" Height="23" EditValue="{Binding Path=CancellationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit
Grid.Row="14"
Grid.Column="1"
Height="23"
Margin="3"
EditValue="{Binding Path=GrossSalary, UpdateSourceTrigger=PropertyChanged}"
Mask="c"
MaskType="Numeric"
MaskUseAsDisplayFormat="True" />
<TextBox
Grid.Row="1"
Grid.RowSpan="13"
Grid.RowSpan="14"
Grid.Column="3"
Margin="3"
HorizontalAlignment="Stretch"
@@ -1172,7 +1215,7 @@
TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto" />
<TextBlock
Grid.Row="14"
Grid.Row="15"
Grid.Column="0"
Grid.ColumnSpan="2"
Margin="3,15,3,3"

View File

@@ -449,7 +449,8 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="1"
Text="{markup:Translate Bezeichnung}" Visibility="{Binding Path=ShowHilfeplanBezeichnung, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type view:SupportConceptView}}, Converter={StaticResource BoolVisibilityConverter}}"/>
@@ -490,7 +491,7 @@
Text="{Binding Path=Notice, UpdateSourceTrigger=PropertyChanged}" Grid.Row="7" Margin="3"
Height="23"
Grid.Column="1" />
<TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="8"
<TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="8"
Text="{markup:Translate Kostenträger Kontakt}" />
<uc:PopUpEdit NewButtonVisibility="Visible"
NewClick="popupedit_costBearerContactPersonSearch_NewClick"
@@ -502,8 +503,17 @@
PopUpClick="popupedit_costBearerContactPersonSearch_PopUpClick"
Text="{Binding Path=CostBearerContactPerson.FullName, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
Cursor="Arrow" PreviewMouseDoubleClick="Popupedit_costBearerContactPersonSearch_OnPreviewMouseDoubleClick"/>
</Grid>
<TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="9" Visibility="{Binding Path=ShowDatevFields, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type view:SupportConceptView}}, Converter={StaticResource BoolVisibilityConverter}}"
Text="{markup:Translate KontoHilfeplan}"/>
<TextBox Grid.Column="1" Grid.Row="9" Margin="3" Visibility="{Binding Path=ShowDatevFields, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type view:SupportConceptView}}, Converter={StaticResource BoolVisibilityConverter}}"
Height="23"
Text="{val:ValidationBinding Path=KontoHilfeplan, UpdateSourceTrigger=PropertyChanged}"/>
<TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="10" Visibility="{Binding Path=ShowDatevFields, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type view:SupportConceptView}}, Converter={StaticResource BoolVisibilityConverter}}"
Text="{markup:Translate KostenstelleHilfeplan}" />
<TextBox Grid.Column="1" Grid.Row="10" Margin="3" Visibility="{Binding Path=ShowDatevFields, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type view:SupportConceptView}}, Converter={StaticResource BoolVisibilityConverter}}"
Height="23" Text="{val:ValidationBinding Path=KostenstelleHilfeplan, UpdateSourceTrigger=PropertyChanged}"/>
</Grid>
</GroupBox>
<GroupBox Grid.Column="1" Margin="5"
Style="{DynamicResource ObjectEditGroupBox}">

View File

@@ -198,6 +198,8 @@ namespace BeWo.View.Detail
public bool ShowHilfeplanBezeichnung => BeWoApp.AppSettings.ShowHilfeplanBezeichnung;
public bool ShowDatevFields => BeWoApp.AppSettings.ShowDatevFields;
public override bool IsDirty => ViewModel != null && ViewModel.IsDirty;
public override string Title => Translator.Translate("Hilfepläne");

View File

@@ -518,6 +518,8 @@ namespace BeWo.View.Navigation
CostBearerContactPerson = kt.CostBearerContactPerson,
CustomerReferenceNumber = kt.CustomerReferenceNumber,
Notice = kt.Notice,
KontoHilfeplan = kt.KontoHilfeplan,
KostenstelleHilfeplan = kt.KostenstelleHilfeplan,
Status = CostBearer2SupportConceptStatus.Created,
SupportConcept = kt.SupportConcept
};

View File

@@ -21,6 +21,7 @@ namespace BeWo.ViewModel
public static string PropertyName_CancellationPeriod = "CancellationPeriod";
public static string PropertyName_EntryDate = "EntryDate";
public static string PropertyName_ContractEndDate = "ContractEndDate";
public static string PropertyName_GrossSalary = "GrossSalary";
public static string PropertyName_HourlyRate = "HourlyRate";
public static string PropertyName_HourlyRateCostRatePeriod = "HourlyRateCostRatePeriod";
public static string PropertyName_WeeklyFLS = "WeeklyFLS";
@@ -40,6 +41,7 @@ namespace BeWo.ViewModel
private decimal? _WeeklyFLS;
private decimal? _MonthlyFLS;
private decimal? _HourlyRate;
private decimal? _GrossSalary;
private CostRatePeriodDC _HourlyRateCostRatePeriod;
private DateTime? _EntryDate;
private DateTime? _ContractEndDate;
@@ -330,6 +332,22 @@ namespace BeWo.ViewModel
{
get { return !IsHourlyRateTextfieldVisible; }
}
public decimal? GrossSalary
{
get { return this._GrossSalary; }
set
{
if (this.AreDifferent(this._GrossSalary, value))
{
this._GrossSalary = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.GrossSalary, value), PropertyName_GrossSalary);
this.FirePropertyChanged(PropertyName_GrossSalary);
}
}
}
public decimal? HourlyRate
{
get { return this._HourlyRate; }
@@ -485,6 +503,7 @@ namespace BeWo.ViewModel
this._CancellationPeriod = pDataContract.CancellationPeriod;
this._ContractEndDate = pDataContract.ContractEndDate;
this._EntryDate = pDataContract.EntryDate;
this._GrossSalary = pDataContract.GrossSalary;
this._HourlyRate = pDataContract.HourlyRate;
this._HourlyRateCostRatePeriod = pDataContract.HourlyRateCostRateValue;
this._LeaveDays = pDataContract.LeaveDays;
@@ -507,6 +526,7 @@ namespace BeWo.ViewModel
pDataContract.CancellationPeriod = this._CancellationPeriod;
pDataContract.ContractEndDate = this._ContractEndDate;
pDataContract.EntryDate = this._EntryDate;
pDataContract.GrossSalary = this._GrossSalary;
pDataContract.HourlyRate = this._HourlyRate;
pDataContract.HourlyRateCostRateValue = this._HourlyRateCostRatePeriod;
pDataContract.LeaveDays = this._LeaveDays;

View File

@@ -27,6 +27,7 @@ namespace BeWo.ViewModel
public static string PropertyName_BankName = "BankName";
public static string PropertyName_Bic = "Bic";
public static string PropertyName_CancellationPeriod = "CancellationPeriod";
public static string PropertyName_ChildCount = "ChildCount";
public static string PropertyName_Contracts = "Contracts";
public static string PropertyName_CustomerRelations = "CustomerRelations";
public static string PropertyName_DateOfBirth = "DateOfBirth";
@@ -65,6 +66,7 @@ namespace BeWo.ViewModel
public static string PropertyName_Profession = "Profession";
public static string PropertyName_Qualifications = "Qualifications";
public static string PropertyName_Street = "Street";
public static string PropertyName_TaxClass = "TaxClass";
public static string PropertyName_TaxNumber = "TaxNumber";
public static string PropertyName_Text1 = "Text1";
public static string PropertyName_Text2 = "Text2";
@@ -97,6 +99,7 @@ namespace BeWo.ViewModel
private string _BankCode;
private string _BankName;
private string _Bic;
private string _ChildCount;
private ContractListVM _Contracts;
private CustomerEmployeeRelationListVM _CustomerRelations;
private DateTime? _DateOfBirth;
@@ -127,6 +130,7 @@ namespace BeWo.ViewModel
private ObservableSortCollection<ValueListEntryDC> _Qualifications;
private Sex? _Sex;
private string _Street;
private string _TaxClass;
private string _TaxNumber;
private string _Text1;
private string _Text2;
@@ -425,6 +429,23 @@ namespace BeWo.ViewModel
// }
//}
public string ChildCount
{
get { return _ChildCount; }
set
{
if (AreDifferent(_ChildCount, value))
{
_ChildCount = value;
StoreDirtyInformation(AreDifferent(DataContract.ChildCount, value), PropertyName_ChildCount);
FirePropertyChanged(PropertyName_ChildCount);
}
}
}
public CustomerEmployeeRelationListVM CustomerRelations
{
get { return _CustomerRelations; }
@@ -980,6 +1001,23 @@ namespace BeWo.ViewModel
}
}
public string TaxClass
{
get { return _TaxClass; }
set
{
if (AreDifferent(_TaxClass, value))
{
_TaxClass = value;
StoreDirtyInformation(AreDifferent(DataContract.TaxClass, value), PropertyName_TaxClass);
FirePropertyChanged(PropertyName_TaxClass);
}
}
}
public string TaxNumber
{
get { return _TaxNumber; }
@@ -1288,6 +1326,8 @@ namespace BeWo.ViewModel
_Profession = pDataContract.Profession;
_Street = pDataContract.Street;
_TaxNumber = pDataContract.TaxNumber;
_TaxClass = pDataContract.TaxClass;
_ChildCount = pDataContract.ChildCount;
_Town = pDataContract.Town;
_BankName = pDataContract.BankName;
_AccountNumber = pDataContract.AccountNumber;
@@ -1402,6 +1442,8 @@ namespace BeWo.ViewModel
pDataContract.Profession = _Profession;
pDataContract.Street = _Street;
pDataContract.TaxNumber = _TaxNumber;
pDataContract.TaxClass = _TaxClass;
pDataContract.ChildCount = _ChildCount;
pDataContract.Town = _Town;
pDataContract.BankName = _BankName;
pDataContract.AccountNumber = _AccountNumber;

View File

@@ -37,6 +37,10 @@ namespace BeWo.ViewModel
public static string PropertyName_AuswahlBezeichnung = "AuswahlBezeichnung";
public static string PropertyName_KontoHilfeplan = "KontoHilfeplan";
public static string PropertyName_KostenstelleHilfeplan = "KostenstelleHilfeplan";
public static string PropertyName_HourlyRate = "HourlyRate";
public static string PropertyName_MonthlyPayment = "MonthlyPayment";
@@ -67,6 +71,10 @@ namespace BeWo.ViewModel
private string _AuswahlBezeichnung;
private string _KontoHilfeplan;
private string _KostenstelleHilfeplan;
private decimal? _MonthlyPayment;
private string _Notice;
@@ -421,6 +429,41 @@ namespace BeWo.ViewModel
}
}
public string KontoHilfeplan
{
get
{
return this._KontoHilfeplan;
}
set
{
if (this.AreDifferent(this._KontoHilfeplan, value))
{
this._KontoHilfeplan = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.KontoHilfeplan, value), PropertyName_KontoHilfeplan);
this.FirePropertyChanged(PropertyName_KontoHilfeplan);
}
}
}
public string KostenstelleHilfeplan
{
get
{
return this._KostenstelleHilfeplan;
}
set
{
if (this.AreDifferent(this._KostenstelleHilfeplan, value))
{
this._KostenstelleHilfeplan = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.KostenstelleHilfeplan, value), PropertyName_KostenstelleHilfeplan);
this.FirePropertyChanged(PropertyName_KostenstelleHilfeplan);
}
}
}
public override bool IsDirty
@@ -666,7 +709,8 @@ namespace BeWo.ViewModel
this.CostBearer = pDataContract.CostBearer;
this._CustomerReferenceNumber = pDataContract.CustomerReferenceNumber;
this._AuswahlBezeichnung = pDataContract.AuswahlBezeichnung;
this.KontoHilfeplan = pDataContract.KontoHilfeplan;
this.KostenstelleHilfeplan = pDataContract.KostenstelleHilfeplan;
// _HourlyRate = pDataContract.HourlyRate;
this._Notice = pDataContract.Notice;
this._RequestedEndDate = pDataContract.RequestedEndDate;
@@ -692,6 +736,8 @@ namespace BeWo.ViewModel
// DataContract.HourlyRate = _HourlyRate;
pDataContract.Notice = this._Notice;
pDataContract.KontoHilfeplan = this.KontoHilfeplan;
pDataContract.KostenstelleHilfeplan = this.KostenstelleHilfeplan;
// DataContract.RateFactor = _RateFactor;
pDataContract.RequestedStartDate = this._RequestedStartDate;

View File

@@ -8,6 +8,9 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{FEB0336B-F053-40B6-92DD-7DE56AB9408A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReportImp", "ReportImp", "{D8A691C5-146D-4613-86CC-438F02FE9106}"
ProjectSection(SolutionItems) = preProject
ReportImp\LebenszentrumKönigsborn\LebenszentrumKoenigsborn.csproj = ReportImp\LebenszentrumKönigsborn\LebenszentrumKoenigsborn.csproj
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWo", "BeWo\BeWo.csproj", "{3FEBB560-9275-413A-9767-BB68C44EEBC3}"
ProjectSection(ProjectDependencies) = postProject
@@ -917,6 +920,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AbwIlseFretz", "ReportImp\A
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DrobDrogenhilfe", "ReportImp\DrobDrogenhilfe\DrobDrogenhilfe.csproj", "{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PariSozialGzMigranten", "ReportImp\PariSozialGzMigranten\PariSozialGzMigranten.csproj", "{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LebenszentrumKoenigsborn", "ReportImp\LebenszentrumKönigsborn\LebenszentrumKoenigsborn.csproj", "{56555705-2801-45DE-8979-93A403873D6D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StefanKnauerBeWoHeinsberg", "ReportImp\StefanKnauerBeWoHeinsberg\StefanKnauerBeWoHeinsberg.csproj", "{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -11296,6 +11305,79 @@ Global
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.Release|x86.ActiveCfg = Release|Any CPU
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB}.Release|x86.Build.0 = Release|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Debug|.NET.ActiveCfg = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Debug|.NET.Build.0 = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Debug|x86.ActiveCfg = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Debug|x86.Build.0 = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.DebugRemote|.NET.Build.0 = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.DebugRemote|x86.Build.0 = Debug|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Release|.NET.ActiveCfg = Release|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Release|.NET.Build.0 = Release|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Release|Any CPU.Build.0 = Release|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Release|x86.ActiveCfg = Release|Any CPU
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Release|x86.Build.0 = Release|Any CPU
<<<<<<< HEAD
{56555705-2801-45DE-8979-93A403873D6D}.Debug|.NET.ActiveCfg = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Debug|.NET.Build.0 = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Debug|x86.ActiveCfg = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Debug|x86.Build.0 = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.DebugRemote|.NET.Build.0 = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.DebugRemote|x86.Build.0 = Debug|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Release|.NET.ActiveCfg = Release|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Release|.NET.Build.0 = Release|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Release|Any CPU.Build.0 = Release|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Release|x86.ActiveCfg = Release|Any CPU
{56555705-2801-45DE-8979-93A403873D6D}.Release|x86.Build.0 = Release|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Debug|.NET.ActiveCfg = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Debug|.NET.Build.0 = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Debug|x86.ActiveCfg = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Debug|x86.Build.0 = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.DebugRemote|.NET.Build.0 = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.DebugRemote|x86.Build.0 = Debug|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Release|.NET.ActiveCfg = Release|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Release|.NET.Build.0 = Release|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Release|Any CPU.Build.0 = Release|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Release|x86.ActiveCfg = Release|Any CPU
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -11752,6 +11834,9 @@ Global
{6FF7C735-AA4B-4ED9-937D-E573220C05E9} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{F835A0CD-B417-4988-9FA2-1CA54DABCFF3} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{2F0B2249-CF36-4BEF-9DC2-B4889EC86BCB} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{56555705-2801-45DE-8979-93A403873D6D} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666} = {D8A691C5-146D-4613-86CC-438F02FE9106}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}

View File

@@ -23,6 +23,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SynpraxReports", "ReportImp
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HausDuelken", "ReportImp\HausDuelken\HausDuelken.csproj", "{ED3DBD24-B774-41E5-A856-99FF78D828A8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FeidPartnerReports", "ReportImp\FeidPartnerReports\FeidPartnerReports.csproj", "{36E7D251-2F15-4589-81C2-6BDDC67F16AE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -84,6 +86,12 @@ Global
{ED3DBD24-B774-41E5-A856-99FF78D828A8}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
{ED3DBD24-B774-41E5-A856-99FF78D828A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ED3DBD24-B774-41E5-A856-99FF78D828A8}.Release|Any CPU.Build.0 = Release|Any CPU
{36E7D251-2F15-4589-81C2-6BDDC67F16AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{36E7D251-2F15-4589-81C2-6BDDC67F16AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{36E7D251-2F15-4589-81C2-6BDDC67F16AE}.DebugRemote|Any CPU.ActiveCfg = DebugRemote|Any CPU
{36E7D251-2F15-4589-81C2-6BDDC67F16AE}.DebugRemote|Any CPU.Build.0 = DebugRemote|Any CPU
{36E7D251-2F15-4589-81C2-6BDDC67F16AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{36E7D251-2F15-4589-81C2-6BDDC67F16AE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -91,6 +99,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{FC9F4E38-977B-4877-9E05-D04068D3C807} = {30DD24EE-2ED9-4E31-BCB5-AD995E8541BD}
{ED3DBD24-B774-41E5-A856-99FF78D828A8} = {30DD24EE-2ED9-4E31-BCB5-AD995E8541BD}
{36E7D251-2F15-4589-81C2-6BDDC67F16AE} = {30DD24EE-2ED9-4E31-BCB5-AD995E8541BD}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {75267284-7070-4045-9FC8-0FC3C56C1AD3}

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<UseIISExpress>false</UseIISExpress>

View File

@@ -510,6 +510,14 @@ namespace BeWoPlanerMobil.Controllers
parent?.Children.AddIfNotIn(item);
}
foreach (var item in textModuleDisplayItems)
{
if (item.Children != null)
{
item.Children = item.Children.OrderBy(c => c.Name).ToList();
}
}
Model.TextModules = textModuleDisplayItems.Where(item => item.ParentOid is null).OrderBy(item => item.Name).ToList();
}
}

View File

@@ -350,7 +350,13 @@ function beiDaueraenderung(idPrefix) {
const startTimeCondition = startTimeInput.val().length > 0;
const endTimeCondition = endTimeInput.val().length > 0;
let duration = parseFloat(durationInput.val().replace(",", "."));
var dauerString = durationInput.val();
if (dauerString.indexOf(".") >= 0) {
dauerString = dauerString.replace(".", ",");
durationInput.val(dauerString);
}
let duration = parseFloat(dauerString.replace(",", "."));
const durationCondition = false === isNaN(duration);

View File

@@ -46,34 +46,34 @@
<link type="text/css" rel="stylesheet" href="@Url.Content("~/Content/style.css")" />
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/dateUtils.js?v=1.3")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/dateUtils.js?v=1.4")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/moment/moment.min.js")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/moment/locale/de.js")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/mobileUtils.js?v=1.3")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/mobileUtils.js?v=1.4")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/view-scripts/main.js?v=1.5")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/signature.js?v=1.3")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/view-scripts/main.js?v=1.6")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/signature.js?v=1.4")"></script>
<link type="text/css" rel="stylesheet" href="@Url.Content("~/Scripts/bootstrap/bootstrap4-modal-fullscreen.min.css")" />
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/support-concept-statistics.js?v=1.3")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/view-scripts/customer.js?v=1.3")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/view-scripts/scheduler.js?v=1.3")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/support-concept-statistics.js?v=1.4")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/view-scripts/customer.js?v=1.4")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/view-scripts/scheduler.js?v=1.4")"></script>
<script type="text/javascript" src="@Url.Content("~/Scripts/ownSoft-Scripts/view-scripts/report.js?v=1.3")"></script>
<script type="text/javascript" src="@Url.Content("~/Scripts/ownSoft-Scripts/view-scripts/report.js?v=1.4")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/signature-pad.min.js")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/trimCanvas.js?v=1.3")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/resources-list-utils.js?v=1.3")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/list-utils.js?v=1.3")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/service-record-time-calc.js?v=1.41")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/js-helper.js?v=1.3")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/logging.js?v=1.3")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/MoKPasswordSecurity.js?v=1.3")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/trimCanvas.js?v=1.4")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/resources-list-utils.js?v=1.4")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/list-utils.js?v=1.4")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/service-record-time-calc.js?v=1.43")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/js-helper.js?v=1.4")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/logging.js?v=1.4")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/MoKPasswordSecurity.js?v=1.4")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/bs-custom-file-input.min.js")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/dropdown-search.js?v=1.3")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/dropdown-search.js?v=1.4")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/devexpress-dependencies/devextreme/dx.all.js")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/devexpress-dependencies/devextreme/dx.all.js?v=1.4")"></script>
<link type="text/css" rel="stylesheet" href="@Url.Content("~/Content/dx.common.css")" />
<link type="text/css" rel="stylesheet" href="@Url.Content("~/Content/dx.light.css")" />

View File

@@ -17,6 +17,7 @@ namespace BeWo.Data.Entities
public static string PropertyName_EntryDate = "EntryDate";
public static string PropertyName_ContractEndDate = "ContractEndDate";
public static string PropertyName_HourlyRate = "HourlyRate";
public static string PropertyName_GrossSalary = "GrossSalary";
public static string PropertyName_WeeklyFLS = "WeeklyFLS";
public static string PropertyName_MonthlyFLS = "MonthlyFLS";
public static string PropertyName_WeeklyTotalHours = "WeeklyTotalHours";
@@ -31,6 +32,7 @@ namespace BeWo.Data.Entities
private decimal? _WeeklyFLS;
private decimal? _MonthlyFLS;
private decimal? _HourlyRate;
private decimal? _GrossSalary;
private DateTime? _EntryDate;
private DateTime? _ContractEndDate;
private int _CancellationPeriod;
@@ -170,6 +172,16 @@ namespace BeWo.Data.Entities
}
}
public virtual decimal? GrossSalary
{
get { return _GrossSalary; }
set
{
if (base.AreDifferent(_GrossSalary, value))
_GrossSalary = value;
}
}
public virtual long EmployeeOid
{
get { return _EmployeeOid; }

View File

@@ -15,6 +15,7 @@ namespace BeWo.Data.Entities
public static string PropertyName_ContractHistoryEntryDate = "ContractHistoryEntryDate";
public static string PropertyName_ContractHistoryContractEndDate = "ContractHistoryContractEndDate";
public static string PropertyName_ContractHistoryHourlyRate = "ContractHistoryHourlyRate";
public static string PropertyName_ContractHistoryGrossSalary = "ContractHistoryGrossSalary";
public static string PropertyName_ContractHistoryWeeklyFLS = "ContractHistoryWeeklyFLS";
public static string PropertyName_ContractHistoryMonthlyFLS = "ContractHistoryMonthlyFLS";
public static string PropertyName_ContractHistoryWeeklyTotalHours = "ContractHistoryWeeklyTotalHours";
@@ -31,6 +32,7 @@ namespace BeWo.Data.Entities
private decimal? _WeeklyFLS;
private decimal? _MonthlyFLS;
private decimal? _HourlyRate;
private decimal? _GrossSalary;
private DateTime? _EntryDate;
private DateTime? _ContractEndDate;
private int _CancellationPeriod;
@@ -173,6 +175,16 @@ namespace BeWo.Data.Entities
}
}
public virtual decimal? ContractHistoryGrossSalary
{
get { return _GrossSalary; }
set
{
if (base.AreDifferent(_GrossSalary, value))
_GrossSalary = value;
}
}
public virtual long ContractHistoryEmployeeOid
{
get { return _EmployeeOid; }

View File

@@ -62,6 +62,10 @@ namespace BeWo.Data.Entities
private string _AuswahlBezeichnung;
private string _KontoHilfeplan;
private string _KostenstelleHilfeplan;
private decimal? _MonthlyPayment;
private DateTime? _RequestedEndDate;
@@ -247,6 +251,38 @@ namespace BeWo.Data.Entities
}
}
public virtual string KontoHilfeplan
{
get
{
return this._KontoHilfeplan;
}
set
{
if (this.AreDifferent(this._KontoHilfeplan, value))
{
this._KontoHilfeplan = value;
}
}
}
public virtual string KostenstelleHilfeplan
{
get
{
return this._KostenstelleHilfeplan;
}
set
{
if (this.AreDifferent(this._KostenstelleHilfeplan, value))
{
this._KostenstelleHilfeplan = value;
}
}
}
public virtual decimal? MonthlyPayment
{
get

View File

@@ -17,6 +17,8 @@ namespace BeWo.Data.Entities
private long? _CostBearer2SupportConcept_CostBearerContactPersonOid;
private string _CostBearer2SupportConcept_CustomerReferenceNumber;
private string _CostBearer2SupportConcept_AuswahlBezeichnung;
private string _CostBearer2SupportConcept_KontoHilfeplan;
private string _CostBearer2SupportConcept_KostenstelleHilfeplan;
private decimal? _CostBearer2SupportConcept_MonthlyPayment;
private DateTime? _CostBearer2SupportConcept_RequestedEndDate;
private DateTime? _CostBearer2SupportConcept_RequestedStartDate;
@@ -110,8 +112,28 @@ namespace BeWo.Data.Entities
if (AreDifferent(_CostBearer2SupportConcept_AuswahlBezeichnung, value))
_CostBearer2SupportConcept_AuswahlBezeichnung = value;
}
}
}
public string CostBearer2SupportConcept_KontoHilfeplan
{
get { return _CostBearer2SupportConcept_KontoHilfeplan; }
set
{
if (AreDifferent(_CostBearer2SupportConcept_KontoHilfeplan, value))
_CostBearer2SupportConcept_KontoHilfeplan = value;
}
}
public string CostBearer2SupportConcept_KostenstelleHilfeplan
{
get { return _CostBearer2SupportConcept_KostenstelleHilfeplan; }
set
{
if (AreDifferent(_CostBearer2SupportConcept_KostenstelleHilfeplan, value))
_CostBearer2SupportConcept_KostenstelleHilfeplan = value;
}
}
public decimal? CostBearer2SupportConcept_MonthlyPayment
{
get { return _CostBearer2SupportConcept_MonthlyPayment; }

View File

@@ -11,6 +11,8 @@ namespace BeWo.Data.Entities
{
public static string PropertyName_AbsenceTimes = "AbsenceTimes";
public static string PropertyName_ChildCount = "ChildCount";
public static string PropertyName_Employee2CustomerList = "Employee2CustomerList";
public static string PropertyName_HealthInsurance = "HealthInsurance";
@@ -31,6 +33,8 @@ namespace BeWo.Data.Entities
public static string PropertyName_ServiceRecordList = "ServiceRecordList";
public static string PropertyName_TaxClass = "TaxClass";
public static string PropertyName_TaxNumber = "TaxNumber";
public static string PropertyName_ValueList = "ValueList";
@@ -61,7 +65,9 @@ namespace BeWo.Data.Entities
private IList<Contract> _Contracts;
private IList<Arbeitszeit> _Arbeitszeiten;
private string _ChildCount;
private IList<Arbeitszeit> _Arbeitszeiten;
private IList<Employee2Customer> _Employee2CustomerList;
@@ -87,6 +93,8 @@ namespace BeWo.Data.Entities
private IList<ServiceRecord> _ServiceRecordList;
private string _TaxClass;
private string _TaxNumber;
private string _Text1;
@@ -175,6 +183,19 @@ namespace BeWo.Data.Entities
}
}
public virtual string ChildCount
{
get { return _ChildCount; }
set
{
if (AreDifferent(_ChildCount, value))
{
_ChildCount = value;
}
}
}
public virtual IList<Employee2Customer> Employee2CustomerList
{
get { return _Employee2CustomerList ?? (_Employee2CustomerList = new List<Employee2Customer>()); }
@@ -307,6 +328,19 @@ namespace BeWo.Data.Entities
}
}
public virtual string TaxClass
{
get { return _TaxClass; }
set
{
if (AreDifferent(_TaxClass, value))
{
_TaxClass = value;
}
}
}
public virtual string TaxNumber
{
get { return _TaxNumber; }

View File

@@ -17,6 +17,8 @@ namespace BeWo.Data.Entities
private TableID _Employee_Tid;
private string _Employee_PersonnelNumber;
private string _Employee_TaxNumber;
private string _Employee_TaxClass;
private string _Employee_ChildCount;
private string _Employee_HealthInsurance;
private string _Employee_InsuranceNumber;
private decimal _Employee_HourlyRate;
@@ -158,6 +160,36 @@ namespace BeWo.Data.Entities
}
}
public virtual string Employee_TaxClass
{
get
{
return _Employee_TaxClass;
}
set
{
if (AreDifferent(_Employee_TaxClass, value))
{
_Employee_TaxClass = value;
}
}
}
public virtual string Employee_ChildCount
{
get
{
return _Employee_ChildCount;
}
set
{
if (AreDifferent(_Employee_ChildCount, value))
{
_Employee_ChildCount = value;
}
}
}
public virtual string Employee_HealthInsurance
{
get

View File

@@ -15,6 +15,7 @@
<property column="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="SystemEntryID" />
<property column="EmployeeOid" type="Int64" name="EmployeeOid" update="false" insert="false"/>
<property column="HourlyRate" type="Decimal" name="HourlyRate" />
<property column="GrossSalary" type="Decimal" name="GrossSalary" />
<property column="WeeklyFLS" type="Decimal" name="WeeklyFLS" />
<property column="MonthlyFLS" type="Decimal" name="MonthlyFLS" />
<property column="WeeklyTotalHours" type="Decimal" name="WeeklyTotalHours" />

View File

@@ -17,6 +17,7 @@
<property column="ChangeType" type="BS.Shared.StatementType, BS.Shared" name="ChangeType" />
<property column="ContractHistoryEmployeeOid" type="Int64" name="ContractHistoryEmployeeOid"/>
<property column="ContractHistoryHourlyRate" type="Decimal" name="ContractHistoryHourlyRate" />
<property column="ContractHistoryGrossSalary" type="Decimal" name="ContractHistoryGrossSalary" />
<property column="ContractHistoryWeeklyFLS" type="Decimal" name="ContractHistoryWeeklyFLS" />
<property column="ContractHistoryMonthlyFLS" type="Decimal" name="ContractHistoryMonthlyFLS" />
<property column="ContractHistoryWeeklyTotalHours" type="Decimal" name="ContractHistoryWeeklyTotalHours" />

View File

@@ -17,6 +17,8 @@
<property column="ApprovedEndDate" type="DateTime" name="ApprovedEndDate" />
<property column="CustomerRefenrenceNumber" type="String" name="CustomerReferenceNumber" length="512" />
<property column="AuswahlBezeichnung" type="String" name="AuswahlBezeichnung" length="512" />
<property column="KontoHilfeplan" type="String" name="KontoHilfeplan" length="512" />
<property column="KostenstelleHilfeplan" type="String" name="KostenstelleHilfeplan" length="512" />
<property column="Notice" type="String" name="Notice" length="1024" />
<property column="InsTs" type="DateTime" name="InsTs" />
<property column="InsUser" type="String" name="InsUser" length="256" />

View File

@@ -25,6 +25,8 @@
<property name="CostBearer2SupportConcept_MonthlyPayment" type="System.Decimal"/>
<property name="CostBearer2SupportConcept_CostBearerContactPersonOid" type="System.Decimal"/>
<property name="CostBearer2SupportConcept_AuswahlBezeichnung" type="String"/>
<property name="CostBearer2SupportConcept_KontoHilfeplan" type="String"/>
<property name="CostBearer2SupportConcept_KostenstelleHilfeplan" type="String"/>
</class>
</hibernate-mapping>

View File

@@ -9,6 +9,8 @@
<property column="Tid" type="BS.Shared.TableID, BS.Shared" name="_Tid" access="field" />
<property column="PersonnelNumber" type="String" name="PersonnelNumber" length="128" />
<property column="TaxNumber" type="String" name="TaxNumber" length="128" />
<property column="TaxClass" type="String" name="TaxClass" />
<property column="ChildCount" type="String" name="ChildCount" />
<property column="HealthInsurance" type="String" name="HealthInsurance" length="128" />
<property column="InsuranceNumber" type="String" name="InsuranceNumber" length="128" />
<property column="IsQualified" type="Boolean" name="IsQualified" />

View File

@@ -22,6 +22,8 @@
<property column="Employee_Tid" type="BS.Shared.TableID, BS.Shared" name="Employee_Tid" />
<property column="Employee_PersonnelNumber" type="string" name="Employee_PersonnelNumber" />
<property column="Employee_TaxNumber" type="string" name="Employee_TaxNumber" />
<property column="Employee_TaxClass" type="string" name="Employee_TaxClass" />
<property column="Employee_ChildCount" type="string" name="Employee_ChildCount" />
<property column="Employee_HealthInsurance" type="string" name="Employee_HealthInsurance" />
<property column="Employee_InsuranceNumber" type="string" name="Employee_InsuranceNumber" />
<property column="Employee_HourlyRate" type="decimal" name="Employee_HourlyRate" />

View File

@@ -0,0 +1,7 @@
ALTER TABLE `costbearer2supportconcept`
ADD COLUMN `KontoHilfeplan` varchar(512) NULL DEFAULT NULL AFTER `Auswahlbezeichnung`,
ADD COLUMN `KostenstelleHilfeplan` varchar(512) NULL DEFAULT NULL AFTER `KontoHilfeplan`;
ALTER TABLE `costbearer2supportconcepthistory`
ADD COLUMN `Costbearer2supportconcept_KontoHilfeplan` varchar(512) NULL DEFAULT NULL AFTER `Costbearer2supportconcept_Auswahlbezeichnung`,
ADD COLUMN `Costbearer2supportconcept_KostenstelleHilfeplan` varchar(512) NULL DEFAULT NULL AFTER `Costbearer2supportconcept_KontoHilfeplan`;

View File

@@ -0,0 +1,13 @@
ALTER TABLE `Employee`
ADD COLUMN `TaxClass` varchar(256) NULL DEFAULT NULL AFTER `TaxNumber`,
ADD COLUMN `ChildCount` varchar(256) NULL DEFAULT NULL AFTER `TaxClass`;
ALTER TABLE `EmployeeHistory`
ADD COLUMN `Employee_TaxClass` varchar(256) NULL DEFAULT NULL AFTER `Employee_TaxNumber`,
ADD COLUMN `Employee_ChildCount` varchar(256) NULL DEFAULT NULL AFTER `Employee_TaxClass`;
ALTER TABLE `Contract`
ADD COLUMN `GrossSalary` decimal(18,10) NULL DEFAULT NULL AFTER `CancellationPeriod`;
ALTER TABLE `ContractHistory`
ADD COLUMN `ContractHistoryGrossSalary` decimal(18,10) NULL DEFAULT NULL AFTER `ContractHistoryCancellationPeriod`;

View File

@@ -1601,3 +1601,27 @@ ADD COLUMN `SozSchwierigkeitenValueListEntryOid` BIGINT NULL DEFAULT NULL AFTER
ADD COLUMN `SozBeziehungenValueListEntryOid` BIGINT NULL DEFAULT NULL AFTER `SozSchwierigkeitenValueListEntryOid`,
ADD COLUMN `ErstaufnahmeValueListEntryOid` BIGINT NULL DEFAULT NULL AFTER `SozBeziehungenValueListEntryOid`,
ADD COLUMN `RegionValueListEntryOid` BIGINT NULL DEFAULT NULL AFTER `ErstaufnahmeValueListEntryOid`;
ALTER TABLE `Employee`
ADD COLUMN `TaxClass` varchar(256) NULL DEFAULT NULL AFTER `TaxNumber`,
ADD COLUMN `ChildCount` varchar(256) NULL DEFAULT NULL AFTER `TaxClass`;
ALTER TABLE `EmployeeHistory`
ADD COLUMN `Employee_TaxClass` varchar(256) NULL DEFAULT NULL AFTER `Employee_TaxNumber`,
ADD COLUMN `Employee_ChildCount` varchar(256) NULL DEFAULT NULL AFTER `Employee_TaxClass`;
ALTER TABLE `Contract`
ADD COLUMN `GrossSalary` decimal(18,10) NULL DEFAULT NULL AFTER `CancellationPeriod`;
ALTER TABLE `ContractHistory`
ADD COLUMN `ContractHistoryGrossSalary` decimal(18,10) NULL DEFAULT NULL AFTER `ContractHistoryCancellationPeriod`;
ALTER TABLE `costbearer2supportconcept`
ADD COLUMN `KontoHilfeplan` varchar(512) NULL DEFAULT NULL AFTER `Auswahlbezeichnung`,
ADD COLUMN `KostenstelleHilfeplan` varchar(512) NULL DEFAULT NULL AFTER `KontoHilfeplan`;
ALTER TABLE `costbearer2supportconcepthistory`
ADD COLUMN `Costbearer2supportconcept_KontoHilfeplan` varchar(512) NULL DEFAULT NULL AFTER `Costbearer2supportconcept_Auswahlbezeichnung`,
ADD COLUMN `Costbearer2supportconcept_KostenstelleHilfeplan` varchar(512) NULL DEFAULT NULL AFTER `Costbearer2supportconcept_KontoHilfeplan`;

View File

@@ -0,0 +1,27 @@
-- Anzahl Termine nach Leistung einer bestimmten Leistungskategorie im Jahr
-- Bei Kette e.V. 9383760246 (APP2)
-- Leider lassen sich die Spaltenüberschriften nicht flexibel setzen, wenn neue Leistungen dazu kommen. Aber "Restspalte" fängt es auf
SELECT
org.Name AS Jugendamt,
YEAR(':Jahr_Start') AS Jahr,
COUNT(CASE WHEN sd.ServiceCategoryOid = 47 THEN 1 END) AS 'Termine insgesamt',
COUNT(CASE WHEN sr.ServiceDescriptionOid = 136 THEN 1 END) AS Ketteräume,
COUNT(CASE WHEN sr.ServiceDescriptionOid = 135 THEN 1 END) AS aufsuchend,
COUNT(CASE WHEN sr.ServiceDescriptionOid = 125 THEN 1 END) AS Video,
COUNT(CASE WHEN sr.ServiceDescriptionOid = 109 THEN 1 END) AS Telefonkontakt,
COUNT(CASE WHEN sr.ServiceDescriptionOid = 112 THEN 1 END) AS Hilfeplangespräch,
COUNT(CASE WHEN sr.ServiceDescriptionOid = 137 THEN 1 END) AS 'E-Mail',
COUNT(CASE WHEN sr.ServiceDescriptionOid = 138 THEN 1 END) AS Fahrtzeit,
COUNT(CASE WHEN sr.ServiceDescriptionOid = 140 THEN 1 END) AS 'Terminabsage (<24h)',
COUNT(CASE WHEN sd.ServiceCategoryOid = 47 AND sr.ServiceDescriptionOid NOT IN (109, 112, 125, 135, 136, 137, 138, 140) THEN 1 END) AS 'Weitere Leistungen',
(COUNT(CASE WHEN sr.ServiceDescriptionOid = 135 THEN 1 END) /
(COUNT(CASE WHEN sr.ServiceDescriptionOid = 136 THEN 1 END) + COUNT(CASE WHEN sr.ServiceDescriptionOid = 125 THEN 1 END))) AS 'aufsuchend / Ketteräume + Video'
FROM servicerecord sr
JOIN costbearer2supportconcept cb2sc ON sr.CostBearer2SupportconceptOid = cb2sc.Oid
JOIN organisation org ON cb2sc.CostBearerOid = org.Oid
JOIN servicedescription sd ON sr.ServiceDescriptionOid = sd.Oid
WHERE StartDate >= ':Jahr_Start' and EndDate <= ':Jahr_End'
GROUP BY org.Name
ORDER BY org.Name;
-- SELECT * FROM `9383760246`.servicedescription where ServiceCategoryOid = 47;

View File

@@ -36,6 +36,7 @@ namespace BeWo.Report.DefaultReports
DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary();
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.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
@@ -55,6 +56,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell56 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -79,6 +81,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell55 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -105,7 +108,8 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
this.FkQuoteGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -135,20 +139,20 @@ namespace BeWo.Report.DefaultReports
//
// xrPageInfo1
//
this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F);
this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 32.99999F);
this.xrPageInfo1.Name = "xrPageInfo1";
this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
this.xrPageInfo1.SizeF = new System.Drawing.SizeF(1109F, 23F);
this.xrPageInfo1.SizeF = new System.Drawing.SizeF(1072F, 23F);
this.xrPageInfo1.StylePriority.UseFont = false;
//
// xrLabel1
//
this.xrLabel1.Font = new System.Drawing.Font("Arial", 14F);
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 14F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 7.999992F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.SizeF = new System.Drawing.SizeF(1109F, 25F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(1072F, 25F);
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.Text = "Hilfeplanübersicht";
//
@@ -173,13 +177,13 @@ namespace BeWo.Report.DefaultReports
this.xrTable2.BackColor = System.Drawing.Color.Transparent;
this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable2.Font = new System.Drawing.Font("Arial", 7F);
this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 7F);
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable2.Name = "xrTable2";
this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 0, 100F);
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
this.xrTable2.SizeF = new System.Drawing.SizeF(1109F, 20F);
this.xrTable2.SizeF = new System.Drawing.SizeF(1069F, 20F);
this.xrTable2.StylePriority.UseBackColor = false;
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.StylePriority.UseFont = false;
@@ -199,6 +203,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell25,
this.xrTableCell26,
this.xrTableCell27,
this.xrTableCell56,
this.xrTableCell28,
this.xrTableCell29,
this.xrTableCell30,
@@ -215,23 +220,23 @@ namespace BeWo.Report.DefaultReports
//
this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.CustomerLastName")});
this.xrTableCell18.Font = new System.Drawing.Font("Arial", 7F, System.Drawing.FontStyle.Bold);
this.xrTableCell18.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.StylePriority.UseBorders = false;
this.xrTableCell18.StylePriority.UseFont = false;
this.xrTableCell18.Text = "Name";
this.xrTableCell18.Weight = 0.1947700715855491D;
this.xrTableCell18.Weight = 0.19930774754965561D;
this.xrTableCell18.WordWrap = false;
//
// xrTableCell19
//
this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.CustomerFirstName")});
this.xrTableCell19.Font = new System.Drawing.Font("Arial", 7F, System.Drawing.FontStyle.Bold);
this.xrTableCell19.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.StylePriority.UseFont = false;
this.xrTableCell19.Text = "Vorname";
this.xrTableCell19.Weight = 0.19477006735273841D;
this.xrTableCell19.Weight = 0.19930774536403145D;
this.xrTableCell19.WordWrap = false;
//
// xrTableCell36
@@ -240,7 +245,7 @@ namespace BeWo.Report.DefaultReports
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.Costbearer")});
this.xrTableCell36.Name = "xrTableCell36";
this.xrTableCell36.Text = "xrTableCell36";
this.xrTableCell36.Weight = 0.17583408899385655D;
this.xrTableCell36.Weight = 0.17993059157678859D;
//
// xrTableCell20
//
@@ -250,7 +255,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell20.StylePriority.UseTextAlignment = false;
this.xrTableCell20.Text = "xrTableCell20";
this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell20.Weight = 0.16230839191659136D;
this.xrTableCell20.Weight = 0.16608989744095626D;
//
// xrTableCell21
//
@@ -260,7 +265,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell21.StylePriority.UseTextAlignment = false;
this.xrTableCell21.Text = "xrTableCell21";
this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell21.Weight = 0.16230838391519292D;
this.xrTableCell21.Weight = 0.16608960252795707D;
//
// xrTableCell22
//
@@ -270,7 +275,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell22.StylePriority.UseTextAlignment = false;
this.xrTableCell22.Text = "xrTableCell22";
this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell22.Weight = 0.13525698632089914D;
this.xrTableCell22.Weight = 0.13840828520101817D;
//
// xrTableCell23
//
@@ -280,7 +285,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell23.StylePriority.UseTextAlignment = false;
this.xrTableCell23.Text = "xrTableCell23";
this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell23.Weight = 0.21641118213734861D;
this.xrTableCell23.Weight = 0.22145292030216038D;
//
// xrTableCell24
//
@@ -290,7 +295,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell24.StylePriority.UseTextAlignment = false;
this.xrTableCell24.Text = "xrTableCell24";
this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell24.Weight = 0.135256986233857D;
this.xrTableCell24.Weight = 0.13840828511397604D;
//
// xrTableCell25
//
@@ -300,7 +305,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell25.StylePriority.UseTextAlignment = false;
this.xrTableCell25.Text = "xrTableCell25";
this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell25.Weight = 0.15689810126025036D;
this.xrTableCell25.Weight = 0.16055352507561488D;
//
// xrTableCell26
//
@@ -310,19 +315,31 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell26.StylePriority.UseTextAlignment = false;
this.xrTableCell26.Text = "xrTableCell26";
this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell26.Weight = 0.15689811071234514D;
this.xrTableCell26.Weight = 0.16055352390135408D;
//
// xrTableCell27
//
this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.DurationPercentage", "{0:0}%")});
this.xrTableCell27.Font = new System.Drawing.Font("Arial", 7F, System.Drawing.FontStyle.Bold);
this.xrTableCell27.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell27.Name = "xrTableCell27";
this.xrTableCell27.StylePriority.UseFont = false;
this.xrTableCell27.StylePriority.UseTextAlignment = false;
this.xrTableCell27.Text = "xrTableCell27";
this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell27.Weight = 0.089269612164975D;
this.xrTableCell27.Weight = 0.091349423732524554D;
//
// xrTableCell56
//
this.xrTableCell56.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.Custom1")});
this.xrTableCell56.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell56.Multiline = true;
this.xrTableCell56.Name = "xrTableCell56";
this.xrTableCell56.StylePriority.UseFont = false;
this.xrTableCell56.StylePriority.UseTextAlignment = false;
this.xrTableCell56.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell56.Weight = 0.11142558457825544D;
//
// xrTableCell28
//
@@ -332,7 +349,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell28.StylePriority.UseTextAlignment = false;
this.xrTableCell28.Text = "xrTableCell28";
this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell28.Weight = 0.1352569855617011D;
this.xrTableCell28.Weight = 0.13371033013285166D;
//
// xrTableCell29
//
@@ -342,7 +359,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell29.StylePriority.UseTextAlignment = false;
this.xrTableCell29.Text = "xrTableCell29";
this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell29.Weight = 0.15689810350399458D;
this.xrTableCell29.Weight = 0.14485320383437927D;
//
// xrTableCell30
//
@@ -352,7 +369,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell30.StylePriority.UseTextAlignment = false;
this.xrTableCell30.Text = "xrTableCell30";
this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell30.Weight = 0.17853922903987909D;
this.xrTableCell30.Weight = 0.11142506929098851D;
//
// xrTableCell31
//
@@ -362,7 +379,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell31.StylePriority.UseTextAlignment = false;
this.xrTableCell31.Text = "xrTableCell31";
this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell31.Weight = 0.1893597790271834D;
this.xrTableCell31.Weight = 0.11142558773774194D;
//
// xrTableCell32
//
@@ -372,14 +389,14 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell32.StylePriority.UseTextAlignment = false;
this.xrTableCell32.Text = "xrTableCell32";
this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell32.Weight = 0.20288547666860882D;
this.xrTableCell32.Weight = 0.20195873094544464D;
//
// xrTableCell33
//
this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.approvedText")});
this.xrTableCell33.Name = "xrTableCell33";
this.xrTableCell33.Weight = 0.22182145262578162D;
this.xrTableCell33.Weight = 0.20318645914561173D;
//
// xrTableCell34
//
@@ -390,15 +407,12 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell34.StylePriority.UseTextAlignment = false;
this.xrTableCell34.Text = "xrTableCell34";
this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell34.Weight = 0.13525699097924734D;
this.xrTableCell34.Weight = 0.13840751413540875D;
//
// ruleNotApprovedAndExpiringNext4Months
//
this.ruleNotApprovedAndExpiringNext4Months.Condition = "[IsApproved] == False And [OpenMonths] < 4";
this.ruleNotApprovedAndExpiringNext4Months.DataMember = "SupportConceptDetailList";
//
//
//
this.ruleNotApprovedAndExpiringNext4Months.Formatting.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
this.ruleNotApprovedAndExpiringNext4Months.Name = "ruleNotApprovedAndExpiringNext4Months";
//
@@ -406,9 +420,6 @@ namespace BeWo.Report.DefaultReports
//
this.ruleNotApprovedAndExpiringNext8Months.Condition = "[IsApproved] == False And [OpenMonths] < 8 And [OpenMonths] >= 4";
this.ruleNotApprovedAndExpiringNext8Months.DataMember = "SupportConceptDetailList";
//
//
//
this.ruleNotApprovedAndExpiringNext8Months.Formatting.BackColor = System.Drawing.Color.LightBlue;
this.ruleNotApprovedAndExpiringNext8Months.Name = "ruleNotApprovedAndExpiringNext8Months";
//
@@ -430,12 +441,12 @@ namespace BeWo.Report.DefaultReports
//
this.xrTable1.BackColor = System.Drawing.Color.LightSteelBlue;
this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable1.Font = new System.Drawing.Font("Arial", 7F, System.Drawing.FontStyle.Bold);
this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(1109F, 42F);
this.xrTable1.SizeF = new System.Drawing.SizeF(1069F, 42F);
this.xrTable1.StylePriority.UseBackColor = false;
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
@@ -456,6 +467,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell8,
this.xrTableCell9,
this.xrTableCell10,
this.xrTableCell55,
this.xrTableCell11,
this.xrTableCell12,
this.xrTableCell13,
@@ -473,103 +485,110 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.StylePriority.UseBorders = false;
this.xrTableCell1.Text = "Name";
this.xrTableCell1.Weight = 0.1947700715855491D;
this.xrTableCell1.Weight = 0.20691758683915815D;
//
// xrTableCell2
//
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Text = "Vorname";
this.xrTableCell2.Weight = 0.19477006735273836D;
this.xrTableCell2.Weight = 0.20691758260634741D;
//
// xrTableCell35
//
this.xrTableCell35.Name = "xrTableCell35";
this.xrTableCell35.Text = "Kostenträger";
this.xrTableCell35.Weight = 0.17583408383421184D;
this.xrTableCell35.Weight = 0.18680057043490053D;
//
// xrTableCell3
//
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Text = "Start";
this.xrTableCell3.Weight = 0.1623083867569467D;
this.xrTableCell3.Weight = 0.17243141542370455D;
//
// xrTableCell4
//
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Text = "Ende";
this.xrTableCell4.Weight = 0.16230838391519292D;
this.xrTableCell4.Weight = 0.17243111471569983D;
//
// xrTableCell5
//
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Text = "gesamte FLS";
this.xrTableCell5.Weight = 0.13525698632089916D;
this.xrTableCell5.Weight = 0.14369288399416974D;
//
// xrTableCell6
//
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Text = "geleistete FLS abrechenbar";
this.xrTableCell6.Weight = 0.21641118213734856D;
this.xrTableCell6.Weight = 0.22990826869753872D;
//
// xrTableCell7
//
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Text = "restliche FLS";
this.xrTableCell7.Weight = 0.135256986233857D;
this.xrTableCell7.Weight = 0.14369288390712756D;
//
// xrTableCell8
//
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Text = "restl. FLS pro Woche";
this.xrTableCell8.Weight = 0.15689810126025036D;
this.xrTableCell8.Weight = 0.1666834764673934D;
//
// xrTableCell9
//
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Text = "Restzeit in Wochen";
this.xrTableCell9.Weight = 0.15689811071234514D;
this.xrTableCell9.Weight = 0.16668378930178079D;
//
// xrTableCell10
//
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Text = "Heute";
this.xrTableCell10.Weight = 0.089269612164975D;
this.xrTableCell10.Weight = 0.094837614961838734D;
//
// xrTableCell55
//
this.xrTableCell55.Multiline = true;
this.xrTableCell55.Name = "xrTableCell55";
this.xrTableCell55.Text = "Assis-tenz / FK";
this.xrTableCell55.Weight = 0.11567960225585545D;
//
// xrTableCell11
//
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.Text = "Wochen gesamt";
this.xrTableCell11.Weight = 0.1352569855617011D;
this.xrTableCell11.Weight = 0.13881573569020297D;
//
// xrTableCell12
//
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Text = "Wochen bisher";
this.xrTableCell12.Weight = 0.15689810350399458D;
this.xrTableCell12.Weight = 0.15038371660205024D;
//
// xrTableCell13
//
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Text = "FLS/Woche Soll";
this.xrTableCell13.Weight = 0.17853922903987912D;
this.xrTableCell13.Text = "FLS/ Woche Soll";
this.xrTableCell13.Weight = 0.11567977822133573D;
//
// xrTableCell14
//
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.Text = "FLS/Woche Ist";
this.xrTableCell14.Weight = 0.18935977902718335D;
this.xrTableCell14.Text = "FLS/ Woche Ist";
this.xrTableCell14.Weight = 0.11567978009240243D;
//
// xrTableCell15
//
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Text = "Differenz pro Woche x €/Std";
this.xrTableCell15.Weight = 0.20288548698789807D;
this.xrTableCell15.Weight = 0.20966958943071037D;
//
// xrTableCell16
//
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Text = "bewilligt oder nicht bewilligt";
this.xrTableCell16.Weight = 0.22182145262578162D;
this.xrTableCell16.Weight = 0.21003638543915781D;
//
// xrTableCell17
//
@@ -578,7 +597,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.StylePriority.UseBorders = false;
this.xrTableCell17.Text = "Restzeit (Monate)";
this.xrTableCell17.Weight = 0.13525699097924734D;
this.xrTableCell17.Weight = 0.14460030508977698D;
//
// PageFooter
//
@@ -589,13 +608,13 @@ namespace BeWo.Report.DefaultReports
//
// xrPageInfo2
//
this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
this.xrPageInfo2.Format = "Seite {0} von {1}";
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(976.9999F, 17.00001F);
this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(936.9997F, 17.00001F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(131.9999F, 18F);
this.xrPageInfo2.StylePriority.UseFont = false;
this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrPageInfo2.TextFormatString = "Seite {0} von {1}";
//
// approvedText
//
@@ -625,13 +644,13 @@ namespace BeWo.Report.DefaultReports
this.xrTable3.BackColor = System.Drawing.Color.Transparent;
this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable3.Font = new System.Drawing.Font("Arial", 7F, System.Drawing.FontStyle.Bold);
this.xrTable3.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 0, 100F);
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow3});
this.xrTable3.SizeF = new System.Drawing.SizeF(1109F, 20F);
this.xrTable3.SizeF = new System.Drawing.SizeF(1069F, 20F);
this.xrTable3.StylePriority.UseBackColor = false;
this.xrTable3.StylePriority.UseBorders = false;
this.xrTable3.StylePriority.UseFont = false;
@@ -651,7 +670,8 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell45,
this.xrTableCell46,
this.xrTableCell47,
this.xrTableCell48,
this.FkQuoteGesamt,
this.xrTableCell57,
this.xrTableCell49,
this.xrTableCell50,
this.xrTableCell51,
@@ -664,21 +684,21 @@ namespace BeWo.Report.DefaultReports
// xrTableCell37
//
this.xrTableCell37.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell37.Font = new System.Drawing.Font("Arial", 7F, System.Drawing.FontStyle.Bold);
this.xrTableCell37.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell37.Name = "xrTableCell37";
this.xrTableCell37.StylePriority.UseBorders = false;
this.xrTableCell37.StylePriority.UseFont = false;
this.xrTableCell37.Weight = 0.1947700715855491D;
this.xrTableCell37.Weight = 0.19354843284498891D;
this.xrTableCell37.WordWrap = false;
//
// xrTableCell38
//
this.xrTableCell38.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell38.Font = new System.Drawing.Font("Arial", 7F, System.Drawing.FontStyle.Bold);
this.xrTableCell38.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell38.Name = "xrTableCell38";
this.xrTableCell38.StylePriority.UseBorders = false;
this.xrTableCell38.StylePriority.UseFont = false;
this.xrTableCell38.Weight = 0.19477006735273841D;
this.xrTableCell38.Weight = 0.19354842861217822D;
this.xrTableCell38.WordWrap = false;
//
// xrTableCell39
@@ -686,7 +706,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell39.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell39.Name = "xrTableCell39";
this.xrTableCell39.StylePriority.UseBorders = false;
this.xrTableCell39.Weight = 0.17583408899385655D;
this.xrTableCell39.Weight = 0.17473120463417866D;
//
// xrTableCell40
//
@@ -695,7 +715,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell40.StylePriority.UseBorders = false;
this.xrTableCell40.StylePriority.UseTextAlignment = false;
this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell40.Weight = 0.16230839191659136D;
this.xrTableCell40.Weight = 0.1612904456268684D;
//
// xrTableCell41
//
@@ -704,7 +724,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell41.StylePriority.UseBorders = false;
this.xrTableCell41.StylePriority.UseTextAlignment = false;
this.xrTableCell41.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell41.Weight = 0.16230838391519292D;
this.xrTableCell41.Weight = 0.16129015900465979D;
//
// xrTableCell42
//
@@ -718,7 +738,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell42.Summary = xrSummary1;
this.xrTableCell42.Text = "xrTableCell42";
this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell42.Weight = 0.13525698632089914D;
this.xrTableCell42.Weight = 0.13440874074316864D;
//
// xrTableCell43
//
@@ -732,7 +752,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell43.Summary = xrSummary2;
this.xrTableCell43.Text = "xrTableCell43";
this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell43.Weight = 0.21641118213734861D;
this.xrTableCell43.Weight = 0.215053648676434D;
//
// xrTableCell44
//
@@ -746,7 +766,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell44.Summary = xrSummary3;
this.xrTableCell44.Text = "xrTableCell44";
this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell44.Weight = 0.135256986233857D;
this.xrTableCell44.Weight = 0.13440874065612651D;
//
// xrTableCell45
//
@@ -760,7 +780,7 @@ namespace BeWo.Report.DefaultReports
xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.xrTableCell45.Summary = xrSummary4;
this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell45.Weight = 0.15689810126025036D;
this.xrTableCell45.Weight = 0.1559138887271406D;
//
// xrTableCell46
//
@@ -769,27 +789,40 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell46.StylePriority.UseBorders = false;
this.xrTableCell46.StylePriority.UseTextAlignment = false;
this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell46.Weight = 0.15689811071234514D;
this.xrTableCell46.Weight = 0.15591422839649188D;
//
// xrTableCell47
//
this.xrTableCell47.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell47.Font = new System.Drawing.Font("Arial", 7F, System.Drawing.FontStyle.Bold);
this.xrTableCell47.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell47.Name = "xrTableCell47";
this.xrTableCell47.StylePriority.UseBorders = false;
this.xrTableCell47.StylePriority.UseFont = false;
this.xrTableCell47.StylePriority.UseTextAlignment = false;
this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell47.Weight = 0.089269612164975D;
this.xrTableCell47.Weight = 0.098457504925009959D;
//
// xrTableCell48
// FkQuoteGesamt
//
this.xrTableCell48.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell48.Name = "xrTableCell48";
this.xrTableCell48.StylePriority.UseBorders = false;
this.xrTableCell48.StylePriority.UseTextAlignment = false;
this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell48.Weight = 0.1352569855617011D;
this.FkQuoteGesamt.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.FkQuoteGesamt.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold);
this.FkQuoteGesamt.Multiline = true;
this.FkQuoteGesamt.Name = "FkQuoteGesamt";
this.FkQuoteGesamt.StylePriority.UseBorders = false;
this.FkQuoteGesamt.StylePriority.UseFont = false;
this.FkQuoteGesamt.StylePriority.UseTextAlignment = false;
this.FkQuoteGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.FkQuoteGesamt.Weight = 0.098457504925009959D;
//
// xrTableCell57
//
this.xrTableCell57.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell57.Multiline = true;
this.xrTableCell57.Name = "xrTableCell57";
this.xrTableCell57.StylePriority.UseBorders = false;
this.xrTableCell57.StylePriority.UseTextAlignment = false;
this.xrTableCell57.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell57.Weight = 0.12984621206272043D;
//
// xrTableCell49
//
@@ -798,7 +831,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell49.StylePriority.UseBorders = false;
this.xrTableCell49.StylePriority.UseTextAlignment = false;
this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell49.Weight = 0.15689810350399458D;
this.xrTableCell49.Weight = 0.14066743001929555D;
//
// xrTableCell50
//
@@ -812,7 +845,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell50.Summary = xrSummary5;
this.xrTableCell50.Text = "xrTableCell50";
this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell50.Weight = 0.17853922903987909D;
this.xrTableCell50.Weight = 0.10820526491820415D;
//
// xrTableCell51
//
@@ -826,7 +859,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell51.Summary = xrSummary6;
this.xrTableCell51.Text = "xrTableCell51";
this.xrTableCell51.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell51.Weight = 0.1893597790271834D;
this.xrTableCell51.Weight = 0.10820575116917507D;
//
// xrTableCell52
//
@@ -835,14 +868,14 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell52.StylePriority.UseBorders = false;
this.xrTableCell52.StylePriority.UseTextAlignment = false;
this.xrTableCell52.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell52.Weight = 0.20288547666860882D;
this.xrTableCell52.Weight = 0.1961227923633507D;
//
// xrTableCell53
//
this.xrTableCell53.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell53.Name = "xrTableCell53";
this.xrTableCell53.StylePriority.UseBorders = false;
this.xrTableCell53.Weight = 0.22182145262578162D;
this.xrTableCell53.Weight = 0.19646605079981228D;
//
// xrTableCell54
//
@@ -871,11 +904,13 @@ namespace BeWo.Report.DefaultReports
this.ruleNotApprovedAndExpiringNext8Months,
this.ruleNotApprovedAndExpiringNext4Months});
this.Landscape = true;
this.Margins = new System.Drawing.Printing.Margins(30, 30, 50, 20);
this.Margins = new DevExpress.Drawing.DXMargins(30F, 67F, 50F, 20F);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "13.2";
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
@@ -955,12 +990,15 @@ namespace BeWo.Report.DefaultReports
private DevExpress.XtraReports.UI.XRTableCell xrTableCell45;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell46;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell49;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell50;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell51;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell52;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell53;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell54;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell56;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell55;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell57;
private DevExpress.XtraReports.UI.XRTableCell FkQuoteGesamt;
}
}

View File

@@ -6,6 +6,7 @@ using DevExpress.XtraReports.UI;
using BS.Shared.Extensions;
using BeWo.Report.ReportObjects;
using BeWo.Report;
using BeWo.Data.Access;
namespace BeWo.Report.DefaultReports
{
@@ -22,6 +23,44 @@ namespace BeWo.Report.DefaultReports
{
xrLabel1.Text = String.Format("Hilfeplanübersicht Stand {0:dd.MM.yyyy}", pRO.AppointedDate);
}
decimal zeitFkGesamt = 0;
decimal zeitNFkGesamt = 0;
foreach (var sc in pRO.SupportConceptDetailList)
{
var servicerecords = DAOFactory.SearchDAO.FindServiceRecords(null, sc.CostBearer2SupportConceptOid);
decimal zeitFk = 0;
decimal zeitNFk = 0;
decimal quote = 1;
decimal quoteNFk = 1;
foreach (var sr in servicerecords)
{
if (sr.ServiceDescription.ServiceCategory.IsBillable)
{
if (sr.Employee.IsQualified.HasValue && sr.Employee.IsQualified.Value)
{
zeitFk += sr.RoundedDuration;
zeitFkGesamt += sr.RoundedDuration;
}
else
{
zeitNFk += sr.RoundedDuration;
zeitNFkGesamt += sr.RoundedDuration;
}
}
}
if (zeitFk > 0 || zeitNFk > 0)
{
quote = Math.Round(zeitFk / (zeitNFk + zeitFk), 3, MidpointRounding.AwayFromZero);
sc.Custom1 = String.Format("{0:0.0}%", (100 * quote));
}
}
if (zeitNFkGesamt > 0 || zeitFkGesamt > 0)
{
var quoteGesamt = Math.Round(zeitFkGesamt / (zeitNFkGesamt + zeitFkGesamt), 3, MidpointRounding.AwayFromZero);
FkQuoteGesamt.Text = String.Format("{0:0.0}%", (100 * quoteGesamt));
}
this.bindingSource1.DataSource = pRO;
}
}

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>

View File

@@ -56,6 +56,12 @@
</ItemGroup>
<ItemGroup>
<Compile Include="CustomReportCreator.cs" />
<Compile Include="Mitarbeiterstundenkonto.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Mitarbeiterstundenkonto.designer.cs">
<DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
</Compile>
<Compile Include="RechnungEigenanteil.cs">
<SubType>Component</SubType>
</Compile>
@@ -123,6 +129,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Mitarbeiterstundenkonto.resx">
<DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="RechnungEigenanteil.resx">
<DependentUpon>RechnungEigenanteil.cs</DependentUpon>
<SubType>Designer</SubType>

View File

@@ -0,0 +1,30 @@
using System;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BeWo.Service.Plugins;
using BS.Shared.Core;
namespace AachenerLaienhelfer
{
[IDSpecificClass(Identifier = "Mitarbeiterstundenkonto")]
public partial class Mitarbeiterstundenkonto : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<MitarbeiterstundenkontoRO>
{
public Mitarbeiterstundenkonto()
{
InitializeComponent();
}
public void SetReportDataSource(MitarbeiterstundenkontoRO pRO)
{
//var msb = new MitarbeiterstundenkontoBerechnung();
var msb = PluginLoader.FindClass<MitarbeiterstundenkontoBerechnung>();
msb.CreateReport(pRO);
this.bindingSource1.DataSource = pRO;
}
}
}

View File

@@ -0,0 +1,802 @@
using BeWo.Report.ReportObjects;
namespace AachenerLaienhelfer
{
partial class Mitarbeiterstundenkonto
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <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.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellRelationGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
//
this.Detail.HeightF = 0F;
this.Detail.Name = "Detail";
this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// Detail1
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableDetail});
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 = 25F;
this.Detail1.Name = "Detail1";
this.Detail1.StylePriority.UseFont = false;
//
// xrTableDetail
//
this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableDetail.Font = new DevExpress.Drawing.DXFont("Arial", 8F, 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(0F, 0F);
this.xrTableDetail.Name = "xrTableDetail";
this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowDetail});
this.xrTableDetail.SizeF = new System.Drawing.SizeF(1071F, 25F);
this.xrTableDetail.StylePriority.UseBorders = false;
this.xrTableDetail.StylePriority.UseFont = false;
this.xrTableDetail.StylePriority.UsePadding = false;
this.xrTableDetail.StylePriority.UseTextAlignment = false;
this.xrTableDetail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRowDetail
//
this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3,
this.xrTableCell19,
this.xrTableCell20,
this.xrTableCell28,
this.xrTableCell16,
this.xrTableCell27,
this.xrTableCell22,
this.xrTableCell23,
this.xrTableCell21,
this.xrTableCell25,
this.xrTableCell24,
this.xrTableCell29,
this.xrTableCell26,
this.xrTableCell6});
this.xrTableRowDetail.Name = "xrTableRowDetail";
this.xrTableRowDetail.Weight = 1D;
//
// xrTableCell3
//
this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FullName")});
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell3.StylePriority.UseFont = 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.15329125338142471D;
//
// xrTableCell19
//
this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollMax", "{0:0.00}")});
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Text = "xrTableCell19";
this.xrTableCell19.Weight = 0.081154151689479551D;
//
// xrTableCell20
//
this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UrlaubUndKrankheit", "{0:0.00}")});
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Text = "xrTableCell20";
this.xrTableCell20.Weight = 0.094679933071566441D;
//
// xrTableCell28
//
this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollOhneUrlaubKrankheit", "{0:0.00}")});
this.xrTableCell28.Name = "xrTableCell28";
this.xrTableCell28.Text = "xrTableCell28";
this.xrTableCell28.Weight = 0.0721370604147881D;
//
// xrTableCell16
//
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsSoll", "{0:0.00}")});
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Text = "xrTableCell16";
this.xrTableCell16.Weight = 0.063119927862939587D;
//
// xrTableCell27
//
this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsIst", "{0:0.00}")});
this.xrTableCell27.Name = "xrTableCell27";
this.xrTableCell27.Text = "xrTableCell27";
this.xrTableCell27.Weight = 0.063119927862939615D;
//
// xrTableCell22
//
this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsDiff", "{0:0.00}")});
this.xrTableCell22.Name = "xrTableCell22";
this.xrTableCell22.Text = "xrTableCell22";
this.xrTableCell22.Weight = 0.063119927862939587D;
//
// xrTableCell23
//
this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenGesamtIst", "{0:0.00}")});
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.Text = "xrTableCell23";
this.xrTableCell23.Weight = 0.063119927862939559D;
//
// xrTableCell21
//
this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.RelationFlsZuMittelbar", "{0:0.00}")});
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Text = "xrTableCell21";
this.xrTableCell21.Weight = 0.063119927862939615D;
//
// xrTableCell25
//
this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")});
this.xrTableCell25.Name = "xrTableCell25";
this.xrTableCell25.Text = "xrTableCell25";
this.xrTableCell25.Weight = 0.063119927862939587D;
//
// xrTableCell24
//
this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")});
this.xrTableCell24.Name = "xrTableCell24";
this.xrTableCell24.Text = "xrTableCell24";
this.xrTableCell24.Weight = 0.0631199278629396D;
//
// xrTableCell29
//
this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenAusbezahlt")});
this.xrTableCell29.Multiline = true;
this.xrTableCell29.Name = "xrTableCell29";
this.xrTableCell29.TextFormatString = "{0:0.00}";
this.xrTableCell29.Weight = 0.0631199278629396D;
//
// xrTableCell26
//
this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")});
this.xrTableCell26.Name = "xrTableCell26";
this.xrTableCell26.Text = "xrTableCell26";
this.xrTableCell26.Weight = 0.063119927862939573D;
//
// xrTableCell6
//
this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Resturlaub")});
this.xrTableCell6.Multiline = true;
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.TextFormatString = "{0:0.00}";
this.xrTableCell6.Weight = 0.063119927862939573D;
//
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail1,
this.GroupHeader1,
this.GroupFooter1});
this.DetailReport.DataMember = "EmployeeDetailList";
this.DetailReport.DataSource = this.bindingSource1;
this.DetailReport.Level = 0;
this.DetailReport.Name = "DetailReport";
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableHeader});
this.GroupHeader1.HeightF = 70F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.RepeatEveryPage = true;
//
// xrTableHeader
//
this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableHeader.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableHeader.Name = "xrTableHeader";
this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowHeader});
this.xrTableHeader.SizeF = new System.Drawing.SizeF(1071F, 70F);
this.xrTableHeader.StylePriority.UseBorders = false;
this.xrTableHeader.StylePriority.UseFont = false;
this.xrTableHeader.StylePriority.UsePadding = false;
this.xrTableHeader.StylePriority.UseTextAlignment = false;
this.xrTableHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRowHeader
//
this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell5,
this.xrTableCell4,
this.xrTableCell2,
this.xrTableCell9,
this.xrTableCell8,
this.xrTableCell10,
this.xrTableCell7,
this.xrTableCell11,
this.xrTableCell12,
this.xrTableCell13,
this.xrTableCell14,
this.xrTableCell18,
this.xrTableCell15,
this.xrTableCell1});
this.xrTableRowHeader.Name = "xrTableRowHeader";
this.xrTableRowHeader.Weight = 2.8D;
//
// xrTableCell5
//
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Name";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell5.Weight = 0.15329125016467182D;
//
// xrTableCell4
//
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Text = "Reguläre SOLL Stunden";
this.xrTableCell4.Weight = 0.081154192324637608D;
//
// xrTableCell2
//
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Text = "Fehlzeiten Urlaub Krankheit(Tage)";
this.xrTableCell2.Weight = 0.094679896646570338D;
//
// xrTableCell9
//
this.xrTableCell9.Multiline = true;
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Text = "Tatsächliche SOLL Stunden";
this.xrTableCell9.Weight = 0.072137063712635591D;
//
// xrTableCell8
//
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Text = "FLS Stunden SOLL";
this.xrTableCell8.Weight = 0.063119927721024038D;
//
// xrTableCell10
//
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.StylePriority.UseBackColor = false;
this.xrTableCell10.Text = "FLS IST lfd. Monat";
this.xrTableCell10.Weight = 0.063119927721024D;
//
// xrTableCell7
//
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Text = "FLS Plus/Minus lfd. Monat";
this.xrTableCell7.Weight = 0.06311992757910842D;
//
// xrTableCell11
//
this.xrTableCell11.Multiline = true;
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.StylePriority.UseBackColor = false;
this.xrTableCell11.Text = "Gesamt-\r\nstunden lfd. Monat";
this.xrTableCell11.Weight = 0.063119927721024011D;
//
// xrTableCell12
//
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Text = "Relation FLS IST zu Mittelbare IST (in %)";
this.xrTableCell12.Weight = 0.063119929511863376D;
//
// xrTableCell13
//
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Text = "Überstd. neu";
this.xrTableCell13.Weight = 0.063119928687401447D;
//
// xrTableCell14
//
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.StylePriority.UseBackColor = false;
this.xrTableCell14.Text = "Überstd. Vormonat";
this.xrTableCell14.Weight = 0.063119928275170531D;
//
// xrTableCell18
//
this.xrTableCell18.Multiline = true;
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.StylePriority.UseBackColor = false;
this.xrTableCell18.Text = "Anpas-sung Über-stunden";
this.xrTableCell18.Weight = 0.063119928275170531D;
//
// xrTableCell15
//
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Text = "Überstd. Gesamt";
this.xrTableCell15.Weight = 0.0631199213956443D;
//
// xrTableCell1
//
this.xrTableCell1.Multiline = true;
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Text = "Resturlaub";
this.xrTableCell1.Weight = 0.0631199213956443D;
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1});
this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.GroupFooter1.HeightF = 48.95833F;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
//
// xrTable1
//
this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(1071F, 25F);
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.StylePriority.UsePadding = false;
this.xrTable1.StylePriority.UseTextAlignment = false;
this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRow1
//
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell35,
this.xrTableCell37,
this.xrTableCell39,
this.cellSollGesamt,
this.cellFLSSollGesamt,
this.cellFLSIstGesamt,
this.cellFLSPlusMinusGesamt,
this.cellGesamtGesamt,
this.cellRelationGesamt,
this.xrTableCell47,
this.xrTableCell48,
this.xrTableCell30,
this.xrTableCell51,
this.xrTableCell17});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 1D;
//
// xrTableCell35
//
this.xrTableCell35.Name = "xrTableCell35";
this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell35.StylePriority.UseFont = false;
this.xrTableCell35.StylePriority.UsePadding = false;
this.xrTableCell35.StylePriority.UseTextAlignment = false;
this.xrTableCell35.Text = "Gesamt";
this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell35.Weight = 0.1527208718660181D;
//
// xrTableCell37
//
this.xrTableCell37.Name = "xrTableCell37";
this.xrTableCell37.Weight = 0.08085216800837608D;
//
// xrTableCell39
//
this.xrTableCell39.Name = "xrTableCell39";
this.xrTableCell39.Weight = 0.0943276875722075D;
//
// cellSollGesamt
//
this.cellSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SollGesamt", "{0:0.00}")});
this.cellSollGesamt.Name = "cellSollGesamt";
this.cellSollGesamt.Text = "cellSollGesamt";
this.cellSollGesamt.Weight = 0.071868593785223173D;
//
// cellFLSSollGesamt
//
this.cellFLSSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsSollGesamt", "{0:0.00}")});
this.cellFLSSollGesamt.Name = "cellFLSSollGesamt";
this.cellFLSSollGesamt.Text = "cellFLSSollGesamt";
this.cellFLSSollGesamt.Weight = 0.062885088357332058D;
//
// cellFLSIstGesamt
//
this.cellFLSIstGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsIstGesamt", "{0:0.00}")});
this.cellFLSIstGesamt.Name = "cellFLSIstGesamt";
this.cellFLSIstGesamt.Text = "cellFLSIstGesamt";
this.cellFLSIstGesamt.Weight = 0.062885033321122663D;
//
// cellFLSPlusMinusGesamt
//
this.cellFLSPlusMinusGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsDiffGesamt", "{0:0.00}")});
this.cellFLSPlusMinusGesamt.Name = "cellFLSPlusMinusGesamt";
this.cellFLSPlusMinusGesamt.Text = "cellFLSPlusMinusGesamt";
this.cellFLSPlusMinusGesamt.Weight = 0.062885088357332058D;
//
// cellGesamtGesamt
//
this.cellGesamtGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "StundenGesamt", "{0:0.00}")});
this.cellGesamtGesamt.Name = "cellGesamtGesamt";
this.cellGesamtGesamt.Text = "cellGesamtGesamt";
this.cellGesamtGesamt.Weight = 0.0628849782849132D;
//
// cellRelationGesamt
//
this.cellRelationGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "RelationFlsZuMittelbar", "{0:0.00}")});
this.cellRelationGesamt.Name = "cellRelationGesamt";
this.cellRelationGesamt.Text = "cellRelationGesamt";
this.cellRelationGesamt.Weight = 0.062884978284913226D;
//
// xrTableCell47
//
this.xrTableCell47.Name = "xrTableCell47";
this.xrTableCell47.Weight = 0.062885088357332058D;
//
// xrTableCell48
//
this.xrTableCell48.Name = "xrTableCell48";
this.xrTableCell48.Weight = 0.062884978284913212D;
//
// xrTableCell30
//
this.xrTableCell30.Multiline = true;
this.xrTableCell30.Name = "xrTableCell30";
this.xrTableCell30.Weight = 0.062884978284913212D;
//
// xrTableCell51
//
this.xrTableCell51.Name = "xrTableCell51";
this.xrTableCell51.Weight = 0.062885088357332045D;
//
// xrTableCell17
//
this.xrTableCell17.Multiline = true;
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.Weight = 0.062885253465960314D;
//
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel1,
this.lblMonat});
this.ReportHeader.HeightF = 86.04167F;
this.ReportHeader.Name = "ReportHeader";
//
// xrLabel1
//
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceNotice")});
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 42.29167F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.SizeF = new System.Drawing.SizeF(1007F, 25F);
this.xrLabel1.StyleName = "Title";
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.StylePriority.UseForeColor = false;
//
// lblMonat
//
this.lblMonat.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "Stundenkonto {0:MMMM yyyy}")});
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";
this.lblMonat.SizeF = new System.Drawing.SizeF(1007F, 25F);
this.lblMonat.StyleName = "Title";
this.lblMonat.StylePriority.UseFont = false;
//
// pageFooterBand1
//
this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPageInfo2,
this.xrPageInfo1});
this.pageFooterBand1.HeightF = 48F;
this.pageFooterBand1.Name = "pageFooterBand1";
//
// xrPageInfo2
//
this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(931F, 25F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(139.9999F, 23F);
this.xrPageInfo2.StyleName = "PageInfo";
this.xrPageInfo2.StylePriority.UseFont = false;
this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrPageInfo2.TextFormatString = "Seite {0} von {1}";
//
// xrPageInfo1
//
this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
this.xrPageInfo1.Name = "xrPageInfo1";
this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
this.xrPageInfo1.SizeF = new System.Drawing.SizeF(260.0001F, 23F);
this.xrPageInfo1.StyleName = "PageInfo";
this.xrPageInfo1.StylePriority.UseFont = false;
//
// 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 DevExpress.Drawing.DXFont("Times New Roman", 24F);
this.Title.ForeColor = System.Drawing.Color.Black;
this.Title.Name = "Title";
//
// FieldCaption
//
this.FieldCaption.BackColor = System.Drawing.Color.White;
this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.FieldCaption.BorderWidth = 1F;
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";
//
// PageInfo
//
this.PageInfo.BackColor = System.Drawing.Color.White;
this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.PageInfo.BorderWidth = 1F;
this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
this.PageInfo.ForeColor = System.Drawing.Color.Black;
this.PageInfo.Name = "PageInfo";
//
// DataField
//
this.DataField.BackColor = System.Drawing.Color.White;
this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.DataField.BorderWidth = 1F;
this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
this.DataField.Name = "DataField";
//
// fieldFLS
//
this.fieldFLS.DataMember = "FLSReportGroups";
this.fieldFLS.Expression = "[TotalFLM] / 60";
this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldFLS.Name = "fieldFLS";
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 50F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 30F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
//
// Mitarbeiterstundenkonto
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail,
this.DetailReport,
this.ReportHeader,
this.pageFooterBand1,
this.topMarginBand1,
this.bottomMarginBand1});
this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
this.fieldFLS});
this.DataSource = this.bindingSource1;
this.Landscape = true;
this.Margins = new DevExpress.Drawing.DXMargins(75F, 23F, 50F, 30F);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
this.Title,
this.FieldCaption,
this.PageInfo,
this.DataField});
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).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.DetailBand Detail1;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
private DevExpress.XtraReports.UI.XRLabel lblMonat;
private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1;
private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1;
private DevExpress.XtraReports.UI.XRControlStyle Title;
private DevExpress.XtraReports.UI.XRControlStyle FieldCaption;
private DevExpress.XtraReports.UI.XRControlStyle PageInfo;
private DevExpress.XtraReports.UI.XRControlStyle DataField;
private DevExpress.XtraReports.UI.CalculatedField fieldFLS;
private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
private DevExpress.XtraReports.UI.XRTableCell cellSollGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSSollGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSIstGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSPlusMinusGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellGesamtGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellRelationGesamt;
private DevExpress.XtraReports.UI.XRTable xrTableDetail;
private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
private DevExpress.XtraReports.UI.XRTable xrTableHeader;
private DevExpress.XtraReports.UI.XRTableRow xrTableRowHeader;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell39;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell51;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
}
}

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

@@ -68,7 +68,7 @@ namespace Akkurat.Export
public static String GetAbrechnungenString(DateTime date)
{
StringBuilder sb = new StringBuilder();
sb.AppendLine("B;Mandant;Monat;Buchungsdatum;Rechnungsnummer;Buchungstext;Betrag;Konto;Gegenkonto;Debitor;Beleg1");
sb.AppendLine("B;Mandant;Monat;Buchungsdatum;Rechnungsnummer;Buchungstext;Betrag;Konto;Gegenkonto;Debitor;Beleg1;Kostenstelle");
var s = GetMonatlicheBetraegeString(date, true);
if (!String.IsNullOrWhiteSpace(s))
@@ -102,7 +102,7 @@ namespace Akkurat.Export
string sql = "";
if (umsaetze)
{
sql = GetMonatlicheBetraegeLvrSql(date);
sql = GetMonatlicheBetraegeSql(date);
return BuildExportString(date, umsaetze, sql);
}
else
@@ -177,7 +177,16 @@ namespace Akkurat.Export
sb.Append(";");
sb.Append(String.Format("{0}", row[1])); //Debitor als Konto
sb.Append(";");
sb.Append("8273"); // String.Format("{0}", row[2])); // Erlöskonto
bool kostenstelle = false;
if (GetKontoUndKostenstelle(row[2].ToString(), out var konto, out var kStelle))
{
sb.Append(konto); // Erlöskonto
kostenstelle = true;
}
else
{
sb.Append("9999"); // Erlöskonto
}
sb.Append(";");
sb.Append(String.Format("{0}", row[1])); //Debitor
sb.Append(";");
@@ -190,10 +199,35 @@ namespace Akkurat.Export
sb.Append(String.Format("{0}", row[4])); //Hilfeplanbez - Vertragsnr.
}
sb.Append(";");
if (kostenstelle)
{
sb.Append(kStelle); // Kostenstelle
}
else
{
sb.Append(""); // Kostenstelle
}
sb.Append(";");
}
return sb.ToString();
}
public static bool GetKontoUndKostenstelle(string notice, out string konto, out string kStelle)
{
var teile = notice.Split(',');
if (teile.Length == 2)
{
konto = teile[0].Trim();
kStelle = teile[1].Trim();
return true;
}
else
{
konto = kStelle = string.Empty;
return false;
}
}
private static String GetDebitorenSql(DateTime date)
{
String sql = @"
@@ -218,7 +252,7 @@ namespace Akkurat.Export
SELECT
Round(si.Claim, 2),
c.DebitorNumber,
c.CostCenter,
c2s.Notice,
CONCAT('Abrechnung ', p.`LastName`, ' ', p.`FirstName`),
ib.InvoiceNumber,
ib.InvoiceDate,
@@ -242,7 +276,7 @@ namespace Akkurat.Export
select
sip.Claim,
c.DebitorNumber,
c.CostCenter,
c2s.Notice,
CONCAT('Abrechnung ', p.`LastName`, ' ', p.`FirstName`),
ib.invoicenumber,
ib.InvoiceDate,
@@ -262,13 +296,13 @@ namespace Akkurat.Export
return sql;
}
private static String GetMonatlicheBetraegeLvrSql(DateTime date)
private static String GetMonatlicheBetraegeSql(DateTime date)
{
String sql = @"
SELECT
sum(qry.Betrag) AS Betrag,
qry.DebitorNumber,
qry.CostCenter,
qry.Kostenstelle,
qry.Verwendung,
qry.Auswahlbezeichnung,
qry.Oid
@@ -278,7 +312,7 @@ namespace Akkurat.Export
IF(crpRateFactor.`CostRateValue` is null, ROUND((sr.`GeleisteteFLM` / 60) * (SELECT crp.`CostRateValue` FROM `costrateperiod` crp WHERE crp.`ObjectTid` = 22 AND crp.`CostRateType` = 0 AND crp.`ObjectOid` = cb2sc.`CostBearerOid` AND(crp.`EndDate` is null or crp.`EndDate` > ':Monat_Start') order by IF(crp.`EndDate` is null, MAKEDATE(9999, 365), crp.`EndDate`) LIMIT 1)),
ROUND(ROUND((sr.`GeleisteteFLM` / 60), 2) * (SELECT crp.`CostRateValue` FROM `costrateperiod` crp WHERE crp.`ObjectTid` = 22 AND crp.`CostRateType` = 0 AND crp.`ObjectOid` = cb2sc.`CostBearerOid` AND(crp.`EndDate` is null or crp.`EndDate` > ':Monat_Start') order by IF(crp.`EndDate` is null, MAKEDATE(9999, 365), crp.`EndDate`) LIMIT 1 ) *((100 + crpRateFactor.`CostRateValue`)/ 100), 2)) AS 'Betrag',
c.DebitorNumber,
c.CostCenter,
cb2sc.Notice AS 'Kostenstelle',
CONCAT(p.`LastName`, ', ', p.`FirstName`) as 'Verwendung',
cb2sc.Auswahlbezeichnung,
cb2sc.Oid
@@ -298,12 +332,12 @@ namespace Akkurat.Export
INNER JOIN `servicecategory` sc ON sd.`ServiceCategoryOid` = sc.`Oid`
WHERE sr2.`StartDate` >= ':Monat_Start' AND sr2.`StartDate` < ':Monat_End' AND sc.`Billable` = 1 and sd.Name <> 'Fehlkontakt' GROUP BY sr2.`CostBearer2SupportConceptOid`)
AS sr ON sr.`CostBearer2SupportConceptOid` = cb2sc.`Oid`
WHERE c.`IsActive` = 1 AND sc.`IsActive` = 1 and org.Name = 'LVR' and(sr.`GeleisteteFLM` is not null))
WHERE c.`IsActive` <> 0 AND sc.`IsActive` <> 0 and(sr.`GeleisteteFLM` is not null))
UNION
(SELECT
ROUND(0.8 * (sr.`GeleisteteFLM` / 60) * (SELECT crp.`CostRateValue` FROM `costrateperiod` crp WHERE crp.`ObjectTid` = 22 AND crp.`CostRateType` = 0 AND crp.`ObjectOid` = cb2sc.`CostBearerOid` AND (crp.`EndDate` is null or crp.`EndDate` > ':Monat_Start') order by IF(crp.`EndDate` is null, MAKEDATE(9999,365),crp.`EndDate`) LIMIT 1 )) AS 'Betrag',
c.DebitorNumber,
c.CostCenter,
c.DebitorNumber,
cb2sc.Notice AS 'Kostenstelle',
CONCAT(p.`LastName`, ', ', p.`FirstName`) as 'Verwendung',
cb2sc.Auswahlbezeichnung,
cb2sc.Oid
@@ -319,7 +353,7 @@ namespace Akkurat.Export
INNER JOIN `servicecategory` sc ON sd.`ServiceCategoryOid` = sc.`Oid`
WHERE sr2.`StartDate` >= ':Monat_Start' AND sr2.`StartDate` < ':Monat_End' AND sc.`Billable` = 1 and sd.Name = 'Fehlkontakt' GROUP BY sr2.`CostBearer2SupportConceptOid`)
AS sr ON sr.`CostBearer2SupportConceptOid` = cb2sc.`Oid`
WHERE c.`IsActive` <> 0 AND sc.`IsActive` <> 0 and org.Name = 'LVR' and (sr.`GeleisteteFLM` is not null)))qry
WHERE c.`IsActive` <> 0 AND sc.`IsActive` <> 0 and (sr.`GeleisteteFLM` is not null)))qry
GROUP BY qry.OID
ORDER BY qry.Verwendung
";
@@ -330,7 +364,7 @@ namespace Akkurat.Export
public static String GetAviseString(DateTime date)
{
StringBuilder sb = new StringBuilder();
sb.AppendLine("B;Mandant;Monat;Buchungsdatum;Rechnungsnummer;Buchungstext;Betrag;Konto;Gegenkonto;Debitor;Beleg1");
sb.AppendLine("B;Mandant;Monat;Buchungsdatum;Rechnungsnummer;Buchungstext;Betrag;Konto;Gegenkonto;Debitor;Beleg1;Kostenstelle");
string export;
var sql = GetAbschlagszahlungenSql(date);
export = BuildAviseString(date, sql);
@@ -375,13 +409,20 @@ namespace Akkurat.Export
sb.Append(";");
sb.Append(String.Format("{0}", row[1])); //Debitor als Konto
sb.Append(";");
sb.Append("1409"); // String.Format("{0}", row[2])); // Erlöskonto
sb.Append("1691"); // String.Format("{0}", row[2])); // Gegenkonot
sb.Append(";");
sb.Append(String.Format("{0}", row[1])); //Debitor
sb.Append(";");
sb.Append(String.Format("{0}", row[6])); //Hilfeplanbez - Vertragsnr.
sb.Append(";");
if (GetKontoUndKostenstelle(row[2].ToString(), out var konto, out var kStelle))
{
sb.Append(kStelle); // Kostenstelle
}
else
{
sb.Append(""); // Kostenstelle
}
}
return sb.ToString();
}
@@ -392,7 +433,7 @@ namespace Akkurat.Export
SELECT
Round(at.Amount, 2) as 'Betrag',
c.DebitorNumber,
c.CostCenter,
c2s.Notice AS 'Kostenstelle',
CONCAT('Abschlagszahlung ', p.FirstName, ' ', p.LastName) as 'Buchungstext',
c.DebitorNumber,
at.BookingDate,

View File

@@ -19,6 +19,7 @@ namespace Akkurat.Translation
{
var dict = base.GetTranslationDictionary();
AddOrReplaceTranslation(dict, "Bezeichnung", "Vertragsnummer");
AddOrReplaceTranslation(dict, "HilfeplanNotiz", "Erlöskto,KostenSt.");
return dict;
}
}

View File

@@ -45,6 +45,8 @@
<Reference Include="DevExpress.Charts.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraCharts.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
@@ -83,6 +85,7 @@
</Compile>
<Compile Include="Service\CustomAccountingService.cs" />
<Compile Include="Service\CustomSaveInterceptor.cs" />
<Compile Include="Service\CustomServiceRecordStatisticFactory.cs" />
<Compile Include="SettlementReport.cs">
<SubType>Component</SubType>
</Compile>
@@ -101,12 +104,6 @@
<Compile Include="StundenzettelBi2.Designer.cs">
<DependentUpon>StundenzettelBi2.cs</DependentUpon>
</Compile>
<Compile Include="StundenzettelBi.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="StundenzettelBi.Designer.cs">
<DependentUpon>StundenzettelBi.cs</DependentUpon>
</Compile>
<Compile Include="StundenzettelSoziotherapie.cs">
<SubType>Component</SubType>
</Compile>
@@ -170,9 +167,6 @@
<EmbeddedResource Include="StundenzettelBi2.resx">
<DependentUpon>StundenzettelBi2.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="StundenzettelBi.resx">
<DependentUpon>StundenzettelBi.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="StundenzettelSoziotherapie.resx">
<DependentUpon>StundenzettelSoziotherapie.cs</DependentUpon>
</EmbeddedResource>

View File

@@ -108,7 +108,7 @@ namespace AlzeyTeilhabe
}
}
if (kt == "Kreisverwaltung Mainz-Bingen")
if (kt == "Kreisverwaltung Mainz-Bingen" && ro.StartDate.Date <= new DateTime(2025, 07, 31))
report = new AlzeyTeilhabe.StundenzettelBi2();
if (report == null && function == "Kostenträger Soziotherapie")

View File

@@ -31,6 +31,7 @@ namespace AlzeyTeilhabe
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InvoiceCustomerReport));
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -222,14 +223,14 @@ namespace AlzeyTeilhabe
this.xrLabel3,
this.xrLabel2,
this.xrTable2});
this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 518.875F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// 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(400F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(250F, 107.25F);
@@ -387,7 +388,8 @@ namespace AlzeyTeilhabe
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, 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, 363.875F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
@@ -402,7 +404,8 @@ namespace AlzeyTeilhabe
//
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, 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, 346.875F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -416,7 +419,8 @@ namespace AlzeyTeilhabe
//
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, 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, 321.875F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -561,7 +565,7 @@ namespace AlzeyTeilhabe
this.xrLabel12,
this.lblNotice,
this.xrTable4});
this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportFooter.HeightF = 247.5417F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
@@ -599,7 +603,7 @@ namespace AlzeyTeilhabe
// lblNotice
//
this.lblNotice.CanShrink = true;
this.lblNotice.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic);
this.lblNotice.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Italic);
this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 46.54166F);
this.lblNotice.Name = "lblNotice";
this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -628,7 +632,7 @@ namespace AlzeyTeilhabe
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell23.BorderWidth = 2F;
this.xrTableCell23.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold);
this.xrTableCell23.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F);
this.xrTableCell23.StylePriority.UseBorders = false;
@@ -642,12 +646,10 @@ namespace AlzeyTeilhabe
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 100F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 100F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// DetailReport
@@ -663,7 +665,7 @@ namespace AlzeyTeilhabe
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1});
this.Detail1.Font = new System.Drawing.Font("Verdana", 9.75F);
this.Detail1.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F);
this.Detail1.HeightF = 25F;
this.Detail1.Name = "Detail1";
this.Detail1.StylePriority.UseFont = false;
@@ -685,11 +687,13 @@ namespace AlzeyTeilhabe
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(75, 75, 100, 100);
this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 100F, 100F);
this.PageHeight = 1169;
this.PageWidth = 827;
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.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();

File diff suppressed because one or more lines are too long

View File

@@ -64,8 +64,11 @@ namespace AlzeyTeilhabe
}
else
{
sd.Notice5 = string.Format("{0:0}", sd.Minutes);
summeEinzelleistung += sd.Minutes;
if (!sd.ServiceDescription.ToLower().Contains("wegepauschale"))
{
sd.Notice5 = string.Format("{0:0}", sd.Minutes);
summeEinzelleistung += sd.Minutes;
}
}
servicesBillable.Add(sd);
@@ -89,12 +92,12 @@ namespace AlzeyTeilhabe
{
// Varfield 1 an lblUnterschriftBehinderung binden
var vf1 = varfields.FirstOrDefault(v => v.VarFieldDefOid == 1);
if (vf1 != null)
if (vf1 != null && vf1.VarFieldValue != null)
lblUnterschriftBehinderung.Text = vf1.VarFieldValue.ToString();
// Varfield 2 an lblUnterschriftDritte binden
var vf2 = varfields.FirstOrDefault(v => v.VarFieldDefOid == 2);
if (vf2 != null)
if (vf2 != null && vf2.VarFieldValue != null)
{
lblUnterschriftDritte.Text = vf2.VarFieldValue.ToString();
if (vf2.VarFieldValue.ToString() == "Ja")

View File

@@ -29,10 +29,10 @@ namespace AlzeyTeilhabe
sb.AppendLine(pRO.RecipientOrganisation);
}
if (!String.IsNullOrEmpty(pRO.RecipientContactPerson))
{
sb.AppendLine(pRO.RecipientContactPerson);
}
//if (!String.IsNullOrEmpty(pRO.RecipientContactPerson))
//{
// sb.AppendLine(pRO.RecipientContactPerson);
//}
if (!String.IsNullOrEmpty(pRO.RecipientDivision))
{
sb.AppendLine(pRO.RecipientDivision);
@@ -55,15 +55,7 @@ namespace AlzeyTeilhabe
DateTime start = pRO.AccountingPeriodStart;
DateTime end = pRO.AccountingPeriodEnd;
var salutation = "Guten Tag " + pRO.RecipientContactPerson + ",";
if (pRO.InvoiceBase != null && pRO.InvoiceBase.RecipientPersonOid.HasValue)
{
var person = DAOFactory.GenericDAO.GetByID<Person>(pRO.InvoiceBase.RecipientPersonOid.Value);
if (person != null && person.Sex != null && person.Sex == BS.Shared.Sex.Male)
salutation = "Sehr geehrter Herr " + person.LastName + ",";
else if (person != null && person.Sex != null && person.Sex == BS.Shared.Sex.Female)
salutation = "Sehr geehrte Frau " + person.LastName + ",";
}
var salutation = "Sehr geehrte Damen und Herren,";
if (pRO.CustomerSalutation == "Herr")
lblAbrechnungstext.Text = string.Format("{0}\n\nfür die Betreuung unseres Klienten Herr {1}, geboren am {2:dd.MM.yyyy}," +

View File

@@ -0,0 +1,24 @@
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.Plugins;
using BS.Shared.Extensions;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AlzeyTeilhabe.Service
{
public class CustomServiceRecordStatisticFactory : ServiceRecordStatisticFactory
{
protected override IEnumerable<ServiceRecord> GetServiceRecordsForStatistic(long costBearer2SupportConceptOid)
{
var list = DAOFactory.SearchDAO.FindServiceRecordsDetailsForLastDays(costBearer2SupportConceptOid, null);
list.RemoveRange(list.Where(sr => sr.ServiceDescription.Name.ToLower().Contains("wegepauschale (wp)")).ToList());
return list;
}
}
}

View File

@@ -32,6 +32,7 @@ namespace AlzeyTeilhabe.Alt
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -68,7 +69,6 @@ namespace AlzeyTeilhabe.Alt
this.RecipientPostCodeAndTown = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel_RecipientStreet = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel_RecipientDivision = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
@@ -120,7 +120,6 @@ namespace AlzeyTeilhabe.Alt
this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -140,11 +139,19 @@ namespace AlzeyTeilhabe.Alt
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPictureBox1});
this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 120F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// xrPictureBox1
//
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(396.9596F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(253.0407F, 107.25F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLabel8
//
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -196,7 +203,7 @@ namespace AlzeyTeilhabe.Alt
this.xrTableCell6.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell6.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell6.StylePriority.UseBorderColor = false;
@@ -239,7 +246,7 @@ namespace AlzeyTeilhabe.Alt
//
this.xrTableCell7.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell7.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell7.FormattingRules.Add(this.ruleRateFactorNull);
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -312,7 +319,7 @@ namespace AlzeyTeilhabe.Alt
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0.0001907349F, 202.0833F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
@@ -327,7 +334,7 @@ namespace AlzeyTeilhabe.Alt
//
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0.0001907349F, 186.0833F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -341,7 +348,7 @@ namespace AlzeyTeilhabe.Alt
//
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0.0001907349F, 169.0833F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -495,7 +502,7 @@ namespace AlzeyTeilhabe.Alt
// RecipientPostCodeAndTown
//
this.RecipientPostCodeAndTown.CanShrink = true;
this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.00003F);
this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51.00002F);
this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown";
this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.RecipientPostCodeAndTown.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -506,7 +513,7 @@ namespace AlzeyTeilhabe.Alt
// xrLabel_RecipientStreet
//
this.xrLabel_RecipientStreet.CanShrink = true;
this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51.00002F);
this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 34.00002F);
this.xrLabel_RecipientStreet.Name = "xrLabel_RecipientStreet";
this.xrLabel_RecipientStreet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel_RecipientStreet.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -517,7 +524,7 @@ namespace AlzeyTeilhabe.Alt
// xrLabel_RecipientDivision
//
this.xrLabel_RecipientDivision.CanShrink = true;
this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 34.00002F);
this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17.00001F);
this.xrLabel_RecipientDivision.Name = "xrLabel_RecipientDivision";
this.xrLabel_RecipientDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel_RecipientDivision.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -525,17 +532,6 @@ namespace AlzeyTeilhabe.Alt
this.xrLabel_RecipientDivision.StylePriority.UseFont = false;
this.xrLabel_RecipientDivision.Text = "[RecipientDivision]";
//
// xrLabel_RecipientContactPerson
//
this.xrLabel_RecipientContactPerson.CanShrink = true;
this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17.00001F);
this.xrLabel_RecipientContactPerson.Name = "xrLabel_RecipientContactPerson";
this.xrLabel_RecipientContactPerson.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel_RecipientContactPerson.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel_RecipientContactPerson.SizeF = new System.Drawing.SizeF(292F, 17F);
this.xrLabel_RecipientContactPerson.StylePriority.UseFont = false;
this.xrLabel_RecipientContactPerson.Text = "[RecipientContactPerson]";
//
// xrLabel1
//
this.xrLabel1.CanShrink = true;
@@ -555,7 +551,7 @@ namespace AlzeyTeilhabe.Alt
this.xrLabel12,
this.xrLabel11,
this.lblNotice});
this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportFooter.HeightF = 209F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
@@ -713,7 +709,7 @@ namespace AlzeyTeilhabe.Alt
// lblNotice
//
this.lblNotice.CanShrink = true;
this.lblNotice.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic);
this.lblNotice.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Italic);
this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 7.999992F);
this.lblNotice.Name = "lblNotice";
this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -723,7 +719,6 @@ namespace AlzeyTeilhabe.Alt
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 100F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
@@ -735,7 +730,6 @@ namespace AlzeyTeilhabe.Alt
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel1,
this.xrLabel_RecipientContactPerson,
this.xrLabel_RecipientDivision,
this.xrLabel_RecipientStreet,
this.RecipientPostCodeAndTown,
@@ -747,7 +741,7 @@ namespace AlzeyTeilhabe.Alt
this.xrLabel6,
this.xrTable1,
this.xrLabel8});
this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F);
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.GroupHeader1.HeightF = 420.4166F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
@@ -765,7 +759,7 @@ namespace AlzeyTeilhabe.Alt
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable5});
this.Detail1.Font = new System.Drawing.Font("Verdana", 10F);
this.Detail1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.Detail1.HeightF = 17F;
this.Detail1.Name = "Detail1";
this.Detail1.StylePriority.UseFont = false;
@@ -830,7 +824,7 @@ namespace AlzeyTeilhabe.Alt
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable4});
this.GroupFooter1.Font = new System.Drawing.Font("Verdana", 10F);
this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.GroupFooter1.HeightF = 132F;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
@@ -1030,7 +1024,7 @@ namespace AlzeyTeilhabe.Alt
this.xrTableCell58.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell58.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell58.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell58.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell58.Name = "xrTableCell58";
this.xrTableCell58.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell58.StylePriority.UseBorderColor = false;
@@ -1041,14 +1035,6 @@ namespace AlzeyTeilhabe.Alt
this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell58.Weight = 0.21685899000901443D;
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(396.9596F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(253.0407F, 107.25F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1064,11 +1050,11 @@ namespace AlzeyTeilhabe.Alt
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(75, 74, 100, 39);
this.Margins = new DevExpress.Drawing.DXMargins(75F, 74F, 100F, 38.91665F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "17.1";
this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
@@ -1107,7 +1093,6 @@ namespace AlzeyTeilhabe.Alt
private DevExpress.XtraReports.UI.XRLabel RecipientPostCodeAndTown;
private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientStreet;
private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientDivision;
private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientContactPerson;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
private DevExpress.XtraReports.UI.XRLabel lblNotice;

File diff suppressed because one or more lines are too long

View File

@@ -30,10 +30,11 @@ namespace AlzeyTeilhabe
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.rowErbrachteLeistung = new DevExpress.XtraReports.UI.XRTableRow();
@@ -62,7 +63,6 @@ namespace AlzeyTeilhabe
this.RecipientPostCodeAndTown = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel_RecipientStreet = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel_RecipientDivision = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
@@ -121,7 +121,6 @@ namespace AlzeyTeilhabe
this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -142,11 +141,19 @@ namespace AlzeyTeilhabe
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPictureBox1});
this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 120F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// xrPictureBox1
//
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(396.9592F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(253.0407F, 107.25F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLabel8
//
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -221,7 +228,7 @@ namespace AlzeyTeilhabe
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 203.125F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
@@ -236,7 +243,7 @@ namespace AlzeyTeilhabe
//
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 187.125F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -251,7 +258,7 @@ namespace AlzeyTeilhabe
//
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 170.125F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -405,7 +412,7 @@ namespace AlzeyTeilhabe
// RecipientPostCodeAndTown
//
this.RecipientPostCodeAndTown.CanShrink = true;
this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.00003F);
this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51.00002F);
this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown";
this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.RecipientPostCodeAndTown.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -416,7 +423,7 @@ namespace AlzeyTeilhabe
// xrLabel_RecipientStreet
//
this.xrLabel_RecipientStreet.CanShrink = true;
this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51.00002F);
this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 34.00002F);
this.xrLabel_RecipientStreet.Name = "xrLabel_RecipientStreet";
this.xrLabel_RecipientStreet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel_RecipientStreet.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -427,7 +434,7 @@ namespace AlzeyTeilhabe
// xrLabel_RecipientDivision
//
this.xrLabel_RecipientDivision.CanShrink = true;
this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 34.00002F);
this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17.00001F);
this.xrLabel_RecipientDivision.Name = "xrLabel_RecipientDivision";
this.xrLabel_RecipientDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel_RecipientDivision.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -435,17 +442,6 @@ namespace AlzeyTeilhabe
this.xrLabel_RecipientDivision.StylePriority.UseFont = false;
this.xrLabel_RecipientDivision.Text = "[RecipientDivision]";
//
// xrLabel_RecipientContactPerson
//
this.xrLabel_RecipientContactPerson.CanShrink = true;
this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17.00001F);
this.xrLabel_RecipientContactPerson.Name = "xrLabel_RecipientContactPerson";
this.xrLabel_RecipientContactPerson.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel_RecipientContactPerson.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel_RecipientContactPerson.SizeF = new System.Drawing.SizeF(292F, 17F);
this.xrLabel_RecipientContactPerson.StylePriority.UseFont = false;
this.xrLabel_RecipientContactPerson.Text = "[RecipientContactPerson]";
//
// xrLabel1
//
this.xrLabel1.CanShrink = true;
@@ -465,7 +461,7 @@ namespace AlzeyTeilhabe
this.xrLabel12,
this.xrLabel11,
this.lblNotice});
this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportFooter.HeightF = 209F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
@@ -623,7 +619,7 @@ namespace AlzeyTeilhabe
// lblNotice
//
this.lblNotice.CanShrink = true;
this.lblNotice.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic);
this.lblNotice.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Italic);
this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 7.999992F);
this.lblNotice.Name = "lblNotice";
this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -633,7 +629,6 @@ namespace AlzeyTeilhabe
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 100F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
@@ -645,7 +640,6 @@ namespace AlzeyTeilhabe
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel1,
this.xrLabel_RecipientContactPerson,
this.xrLabel_RecipientDivision,
this.xrLabel_RecipientStreet,
this.RecipientPostCodeAndTown,
@@ -657,7 +651,7 @@ namespace AlzeyTeilhabe
this.xrLabel6,
this.xrTable1,
this.xrLabel8});
this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F);
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.GroupHeader1.HeightF = 370.4583F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
@@ -683,7 +677,8 @@ namespace AlzeyTeilhabe
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable4});
this.Detail1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Detail1.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.Detail1.HeightF = 17F;
this.Detail1.Name = "Detail1";
this.Detail1.SortFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
@@ -779,7 +774,8 @@ namespace AlzeyTeilhabe
//
this.xrTableCell9.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell9.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell9.StylePriority.UseBorderColor = false;
@@ -796,7 +792,8 @@ namespace AlzeyTeilhabe
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal")});
this.xrTableCell10.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell10.StylePriority.UseBorderColor = false;
@@ -822,7 +819,8 @@ namespace AlzeyTeilhabe
this.xrTableCell7.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell7.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell7.StylePriority.UseBorderColor = false;
@@ -839,7 +837,8 @@ namespace AlzeyTeilhabe
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable5});
this.GroupFooter1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.GroupFooter1.HeightF = 115F;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
@@ -1023,7 +1022,7 @@ namespace AlzeyTeilhabe
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell60.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Claim", "{0:c}")});
this.xrTableCell60.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell60.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell60.Name = "xrTableCell60";
this.xrTableCell60.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell60.StylePriority.UseBorderColor = false;
@@ -1034,14 +1033,6 @@ namespace AlzeyTeilhabe
this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell60.Weight = 0.16397432767427886D;
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(396.9592F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(253.0407F, 107.25F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1059,11 +1050,11 @@ namespace AlzeyTeilhabe
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(75, 74, 100, 43);
this.Margins = new DevExpress.Drawing.DXMargins(75F, 74F, 100F, 43F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "17.1";
this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
@@ -1103,7 +1094,6 @@ namespace AlzeyTeilhabe
private DevExpress.XtraReports.UI.XRLabel RecipientPostCodeAndTown;
private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientStreet;
private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientDivision;
private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientContactPerson;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
private DevExpress.XtraReports.UI.XRLabel lblNotice;

File diff suppressed because one or more lines are too long

View File

@@ -148,7 +148,7 @@ namespace AlzeyTeilhabe
{
var list = DAOFactory.GenericDAO.GetAllActive<ServiceDescription>();
var wegepauschale = list.FirstOrDefault(s => s.ServiceCategory.Name == "EGH_2025 neuer LRV" && s.Name == "Wegepauschale" ||
s.ServiceCategory.Name == "EGH_2025 neuer LVR" && s.Name == "Wegepauschale");
s.ServiceCategory.Name == "Eingliederungshilfe" && s.Name == "Wegepauschale (WP)");
if (wegepauschale != null && wegepauschale.CostRatePeriods != null && wegepauschale.CostRatePeriods.Count > 0)
{
var crpList = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(wegepauschale.CostRatePeriods);

View File

@@ -51,8 +51,10 @@ namespace BeWo.BeWoAmrath
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel();
@@ -88,8 +90,12 @@ namespace BeWo.BeWoAmrath
this.MinutesAsHours = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldTotalFSLBillable = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldAbrechenbarFK = new DevExpress.XtraReports.UI.CalculatedField();
this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
@@ -110,10 +116,10 @@ namespace BeWo.BeWoAmrath
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel20.CanGrow = false;
this.xrLabel20.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(512.5F, 3.178914E-05F);
this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(477.9167F, 3.178914E-05F);
this.xrLabel20.Name = "xrLabel20";
this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel20.SizeF = new System.Drawing.SizeF(100F, 42F);
this.xrLabel20.SizeF = new System.Drawing.SizeF(65F, 42F);
this.xrLabel20.StylePriority.UseBackColor = false;
this.xrLabel20.StylePriority.UseBorders = false;
this.xrLabel20.StylePriority.UseFont = false;
@@ -130,7 +136,7 @@ namespace BeWo.BeWoAmrath
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(100F, 3.178914E-05F);
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel19.SizeF = new System.Drawing.SizeF(140F, 21F);
this.xrLabel19.SizeF = new System.Drawing.SizeF(120F, 21F);
this.xrLabel19.StylePriority.UseBackColor = false;
this.xrLabel19.StylePriority.UseBorders = false;
this.xrLabel19.StylePriority.UseFont = false;
@@ -146,7 +152,7 @@ namespace BeWo.BeWoAmrath
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel18.CanGrow = false;
this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(240F, 0F);
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(220F, 0F);
this.xrLabel18.Name = "xrLabel18";
this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel18.SizeF = new System.Drawing.SizeF(72.49997F, 42F);
@@ -163,10 +169,10 @@ namespace BeWo.BeWoAmrath
this.xrLabel17.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel17.CanGrow = false;
this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(170F, 21.00004F);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(160F, 21.00004F);
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.SizeF = new System.Drawing.SizeF(70F, 21F);
this.xrLabel17.SizeF = new System.Drawing.SizeF(60F, 21F);
this.xrLabel17.StylePriority.UseBackColor = false;
this.xrLabel17.StylePriority.UseBorders = false;
this.xrLabel17.StylePriority.UseFont = false;
@@ -185,7 +191,7 @@ namespace BeWo.BeWoAmrath
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(100F, 21.00004F);
this.xrLabel16.Name = "xrLabel16";
this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel16.SizeF = new System.Drawing.SizeF(70F, 21F);
this.xrLabel16.SizeF = new System.Drawing.SizeF(60F, 21F);
this.xrLabel16.StylePriority.UseBackColor = false;
this.xrLabel16.StylePriority.UseBorders = false;
this.xrLabel16.StylePriority.UseFont = false;
@@ -227,7 +233,7 @@ namespace BeWo.BeWoAmrath
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable3});
this.Detail1.HeightF = 21F;
this.Detail1.HeightF = 25F;
this.Detail1.Name = "Detail1";
this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.Detail1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
@@ -243,7 +249,7 @@ namespace BeWo.BeWoAmrath
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(712.5F, 21F);
this.xrTable3.SizeF = new System.Drawing.SizeF(738F, 25F);
this.xrTable3.StylePriority.UseFont = false;
this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
@@ -256,11 +262,12 @@ namespace BeWo.BeWoAmrath
this.xrTableCell16,
this.xrTableCell3,
this.xrTableCell1,
this.xrTableCell4});
this.xrTableCell4,
this.xrTableCell5});
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 = 1D;
this.xrTableRow6.Weight = 1.1904761904761905D;
//
// xrTableCell13
//
@@ -287,7 +294,7 @@ namespace BeWo.BeWoAmrath
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.Text = "xrTableCell6";
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell6.Weight = 0.08812273458573569D;
this.xrTableCell6.Weight = 0.076875603585621177D;
this.xrTableCell6.XlsxFormatString = "{0:HH:mm}";
//
// xrTableCell2
@@ -302,7 +309,7 @@ namespace BeWo.BeWoAmrath
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.Text = "xrTableCell2";
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell2.Weight = 0.088122734813400536D;
this.xrTableCell2.Weight = 0.076037065310627053D;
this.xrTableCell2.XlsxFormatString = "{0:HH:mm}";
//
// xrTableCell16
@@ -319,7 +326,7 @@ namespace BeWo.BeWoAmrath
this.xrTableCell16.StylePriority.UseTextAlignment = false;
this.xrTableCell16.Text = "xrTableCell16";
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell16.Weight = 0.091269913483684545D;
this.xrTableCell16.Weight = 0.091877951785187068D;
//
// xrTableCell3
//
@@ -332,7 +339,7 @@ namespace BeWo.BeWoAmrath
this.xrTableCell3.StylePriority.UseFont = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell3.Weight = 0.2517791805305446D;
this.xrTableCell3.Weight = 0.23497526039325309D;
//
// xrTableCell1
//
@@ -346,7 +353,7 @@ namespace BeWo.BeWoAmrath
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "xrTableCell1";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell1.Weight = 0.12588958947378576D;
this.xrTableCell1.Weight = 0.082373421142158593D;
//
// xrTableCell4
//
@@ -358,11 +365,12 @@ namespace BeWo.BeWoAmrath
this.xrTableCell4.StylePriority.UseFont = false;
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell4.Weight = 0.12588958947378576D;
this.xrTableCell4.Weight = 0.12672827771177711D;
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel27,
this.xrLabel26,
this.xrLabel21,
this.xrLabel15,
@@ -380,12 +388,11 @@ namespace BeWo.BeWoAmrath
// xrLabel26
//
this.xrLabel26.BackColor = System.Drawing.Color.Silver;
this.xrLabel26.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
this.xrLabel26.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel26.CanGrow = false;
this.xrLabel26.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(612.5F, 0F);
this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(542.9166F, 3.178914E-05F);
this.xrLabel26.Name = "xrLabel26";
this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel26.SizeF = new System.Drawing.SizeF(100F, 42F);
@@ -402,10 +409,10 @@ namespace BeWo.BeWoAmrath
this.xrLabel21.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel21.CanGrow = false;
this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(312.5F, 0F);
this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(292.5F, 0F);
this.xrLabel21.Name = "xrLabel21";
this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel21.SizeF = new System.Drawing.SizeF(200F, 42F);
this.xrLabel21.SizeF = new System.Drawing.SizeF(185.4167F, 42F);
this.xrLabel21.StylePriority.UseBackColor = false;
this.xrLabel21.StylePriority.UseBorders = false;
this.xrLabel21.StylePriority.UseFont = false;
@@ -413,6 +420,10 @@ namespace BeWo.BeWoAmrath
this.xrLabel21.Text = "Fehlkontakt";
this.xrLabel21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -439,6 +450,22 @@ namespace BeWo.BeWoAmrath
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// xrLabel24
//
this.xrLabel24.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CostBearer2SupportConceptList.CostBearer.Organisation.BusinessPartnerId")});
this.xrLabel24.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(501.9583F, 78.125F);
this.xrLabel24.Name = "xrLabel24";
this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel24.SizeF = new System.Drawing.SizeF(210.5415F, 22.625F);
this.xrLabel24.StylePriority.UseBorders = false;
this.xrLabel24.StylePriority.UseFont = false;
this.xrLabel24.StylePriority.UseTextAlignment = false;
this.xrLabel24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrLabel24.TextFormatString = "GP-Nr.: {0}";
//
// xrLabel13
//
this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
@@ -612,6 +639,9 @@ namespace BeWo.BeWoAmrath
// ReportFooter
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPictureBox1,
this.xrLabel25,
this.xrPictureBox2,
this.xrLabel22,
this.xrLabel23,
this.xrLabel14,
@@ -635,7 +665,7 @@ namespace BeWo.BeWoAmrath
this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(0F, 120.625F);
this.xrLabel22.Multiline = true;
this.xrLabel22.Name = "xrLabel22";
this.xrLabel22.SizeF = new System.Drawing.SizeF(240F, 25F);
this.xrLabel22.SizeF = new System.Drawing.SizeF(220F, 25F);
this.xrLabel22.StylePriority.UseBorders = false;
this.xrLabel22.StylePriority.UseFont = false;
this.xrLabel22.StylePriority.UsePadding = false;
@@ -652,7 +682,7 @@ namespace BeWo.BeWoAmrath
this.xrLabel23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSFehlkontakte", "{0:0.00}")});
this.xrLabel23.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(239.9998F, 120.625F);
this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(219.9998F, 120.625F);
this.xrLabel23.Multiline = true;
this.xrLabel23.Name = "xrLabel23";
this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 5, 0, 0, 100F);
@@ -693,7 +723,7 @@ namespace BeWo.BeWoAmrath
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(6.357829E-05F, 59.99997F);
this.xrLabel8.Multiline = true;
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.SizeF = new System.Drawing.SizeF(240F, 60.62501F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(220F, 60.62501F);
this.xrLabel8.StylePriority.UseBorders = false;
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.StylePriority.UsePadding = false;
@@ -707,7 +737,7 @@ namespace BeWo.BeWoAmrath
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrLabel2.BorderWidth = 1F;
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(240F, 59.99997F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(220F, 59.99997F);
this.xrLabel2.Multiline = true;
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 5, 0, 0, 100F);
@@ -738,7 +768,7 @@ namespace BeWo.BeWoAmrath
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel3.Multiline = true;
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.SizeF = new System.Drawing.SizeF(240F, 60F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(220F, 60F);
this.xrLabel3.StylePriority.UseBorders = false;
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.StylePriority.UsePadding = false;
@@ -752,7 +782,7 @@ namespace BeWo.BeWoAmrath
this.xrLabel4.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrLabel4.BorderWidth = 1F;
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(240F, 0F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(220F, 0F);
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 5, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(72.49997F, 59.99997F);
@@ -831,25 +861,78 @@ namespace BeWo.BeWoAmrath
this.fieldAbrechenbarFK.Expression = "Round([TotalFLSFehlkontakte]*0.8,2)";
this.fieldAbrechenbarFK.Name = "fieldAbrechenbarFK";
//
// xrLabel24
// xrPictureBox1
//
this.xrLabel24.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CostBearer2SupportConceptList.CostBearer.Organisation.BusinessPartnerId")});
this.xrLabel24.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(501.9583F, 78.125F);
this.xrLabel24.Name = "xrLabel24";
this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel24.SizeF = new System.Drawing.SizeF(210.5415F, 22.625F);
this.xrLabel24.StylePriority.UseBorders = false;
this.xrLabel24.StylePriority.UseFont = false;
this.xrLabel24.StylePriority.UseTextAlignment = false;
this.xrLabel24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrLabel24.TextFormatString = "GP-Nr.: {0}";
this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")});
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(122.2612F, 197.7085F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(174.0721F, 31.95833F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// bindingSource1
// xrLabel25
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
this.xrLabel25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy}")});
this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(6.357829E-05F, 197.7085F);
this.xrLabel25.Name = "xrLabel25";
this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel25.SizeF = new System.Drawing.SizeF(79.49995F, 31.95833F);
this.xrLabel25.StylePriority.UseTextAlignment = false;
this.xrLabel25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
//
// xrPictureBox2
//
this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")});
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(349.8748F, 197.7085F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(174.0834F, 31.95833F);
this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLabel27
//
this.xrLabel27.BackColor = System.Drawing.Color.Silver;
this.xrLabel27.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel27.CanGrow = false;
this.xrLabel27.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(642.9166F, 3.178914E-05F);
this.xrLabel27.Multiline = true;
this.xrLabel27.Name = "xrLabel27";
this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel27.SizeF = new System.Drawing.SizeF(95.08337F, 42F);
this.xrLabel27.StylePriority.UseBackColor = false;
this.xrLabel27.StylePriority.UseBorders = false;
this.xrLabel27.StylePriority.UseFont = false;
this.xrLabel27.StylePriority.UseTextAlignment = false;
this.xrLabel27.Text = "Unterschrift\r\nKlient/-in";
this.xrLabel27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
//
// xrTableCell5
//
this.xrTableCell5.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.picSignature});
this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTableCell5.Multiline = true;
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.StylePriority.UseFont = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell5.Weight = 0.12049752705909265D;
//
// picSignature
//
this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")});
this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.picSignature.Name = "picSignature";
this.picSignature.SizeF = new System.Drawing.SizeF(95.08337F, 25F);
this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
this.picSignature.StylePriority.UseBorders = false;
this.picSignature.BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.picSignature_BeforePrint);
//
// Stundenzettel
//
@@ -876,7 +959,7 @@ namespace BeWo.BeWoAmrath
this.formattingRuleServiceDesc,
this.formattingRuleCostBearer,
this.formattingRuleEmployeeName});
this.Margins = new DevExpress.Drawing.DXMargins(73F, 39F, 99F, 36.41669F);
this.Margins = new DevExpress.Drawing.DXMargins(50F, 39F, 99F, 36.41669F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -952,5 +1035,11 @@ namespace BeWo.BeWoAmrath
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.XRLabel xrLabel26;
private DevExpress.XtraReports.UI.XRLabel xrLabel24;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRLabel xrLabel25;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
private DevExpress.XtraReports.UI.XRLabel xrLabel27;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRPictureBox picSignature;
}
}

View File

@@ -1,7 +1,13 @@
using System.Linq;
using BeWo.Report;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Text.RegularExpressions;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
using DevExpress.XtraReports.UI;
using BeWo.Report;
namespace BeWo.BeWoAmrath
{
@@ -20,7 +26,8 @@ namespace BeWo.BeWoAmrath
foreach (var sd in servicesBillable)
{
if(sd.ServiceDescription.ToLower().Contains("fehlkontakt"))
ServicesOverviewRO.CreateSignatureString(sd);
if (sd.ServiceDescription.ToLower().Contains("fehlkontakt"))
{
sd.Notice5 = "F - " + sd.Notice;
}
@@ -31,5 +38,31 @@ namespace BeWo.BeWoAmrath
bindingSource1.DataSource = pRO;
}
private void picSignature_BeforePrint(object sender, System.ComponentModel.CancelEventArgs e)
{
XRPictureBox xrBox = sender as XRPictureBox;
//var test = this.GetCurrent
string base64String = xrBox.Tag as string;
if (!String.IsNullOrWhiteSpace(base64String))
{
var base64Data = Regex.Match(base64String, @"data:image/(?<type>.+?),(?<data>.+)").Groups["data"].Value;
var binData = Convert.FromBase64String(base64Data);
Image img = ByteArrayToImage(binData);
xrBox.Image = Utils.CropImage(img);
}
else
{
xrBox.Image = null;
}
}
public Image ByteArrayToImage(byte[] byteArrayIn)
{
using (var memoryStream = new MemoryStream(byteArrayIn))
{
return Image.FromStream(memoryStream);
}
}
}
}

View File

@@ -81,6 +81,8 @@
<Compile Include="InvoiceCustomerReport.Designer.cs">
<DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
</Compile>
<Compile Include="Invoicing\CustomInvoiceFactory.cs" />
<Compile Include="Invoicing\CustomSettlementInvoiceCreation.cs" />
<Compile Include="Mitarbeiterarbeitszeitkonto.cs">
<SubType>Component</SubType>
</Compile>

View File

@@ -0,0 +1,18 @@
using BeWo.Data.Entities;
using BeWo.Service.Invoicing;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BeWoDirekt.Invoicing
{
class CustomInvoiceFactory : InvoiceFactory
{
public override SettlementInvoiceCreation CreateSettlementInvoiceCreator(string costbearerId, string tenant, CostBearer2SupportConcept lCb2Sc)
{
return new CustomSettlementInvoiceCreation();
}
}
}

View File

@@ -0,0 +1,19 @@
using BeWo.Data.Entities;
using BeWo.Service.Invoicing;
using BS.Shared.DataContracts;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BeWoDirekt.Invoicing
{
class CustomSettlementInvoiceCreation : SettlementInvoiceCreation
{
public override bool CanCreateInvoiceTheOldWay(Settlement2DC si, CostBearer2SupportConcept c2s)
{
return false;
}
}
}

View File

@@ -205,14 +205,14 @@ namespace BeWo.BeWoMobilReports
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPictureBox1});
this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 166F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// 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, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(214.5833F, 135.4167F);
@@ -222,10 +222,10 @@ namespace BeWo.BeWoMobilReports
//
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(418.67F, 210F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(429.0002F, 210F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(201.0417F, 23.95834F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(220.9998F, 23.95834F);
this.xrLabel1.StylePriority.UseTextAlignment = false;
this.xrLabel1.Text = "xrLabel1";
this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
@@ -371,7 +371,8 @@ namespace BeWo.BeWoMobilReports
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, 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, 270.125F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
@@ -386,7 +387,8 @@ namespace BeWo.BeWoMobilReports
//
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, 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, 253.125F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -400,7 +402,8 @@ namespace BeWo.BeWoMobilReports
//
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, 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, 236.125F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -424,7 +427,7 @@ namespace BeWo.BeWoMobilReports
this.xrLabel12,
this.xrLabel7,
this.xrTable4});
this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportFooter.HeightF = 247.5417F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
@@ -459,7 +462,7 @@ namespace BeWo.BeWoMobilReports
//
// xrLabel7
//
this.xrLabel7.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic);
this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Italic);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 46.54166F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -488,7 +491,7 @@ namespace BeWo.BeWoMobilReports
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell23.BorderWidth = 2F;
this.xrTableCell23.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold);
this.xrTableCell23.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell23.StylePriority.UseBorders = false;
@@ -515,7 +518,7 @@ namespace BeWo.BeWoMobilReports
//
// xrPictureBox2
//
this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image")));
this.xrPictureBox2.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox2.ImageSource"));
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 0F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(627F, 38F);
@@ -523,7 +526,7 @@ namespace BeWo.BeWoMobilReports
//
// xrRichText1
//
this.xrRichText1.Font = new System.Drawing.Font("Times New Roman", 9.75F);
this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 37.99998F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
@@ -542,7 +545,7 @@ namespace BeWo.BeWoMobilReports
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1});
this.Detail1.Font = new System.Drawing.Font("Verdana", 9.75F);
this.Detail1.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F);
this.Detail1.HeightF = 25F;
this.Detail1.Name = "Detail1";
this.Detail1.StylePriority.UseFont = false;
@@ -564,14 +567,14 @@ namespace BeWo.BeWoMobilReports
this.xrLabel6,
this.xrLabel2,
this.xrLabel9});
this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 9.75F);
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F);
this.GroupHeader1.HeightF = 420.8333F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
// xrLabel11
//
this.xrLabel11.Font = new System.Drawing.Font("Verdana", 7F);
this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Verdana", 7F);
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -581,12 +584,12 @@ namespace BeWo.BeWoMobilReports
//
// xrLabel13
//
this.xrLabel13.Font = new System.Drawing.Font("Verdana", 9F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(418.6701F, 35.00001F);
this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Verdana", 9F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(429.0002F, 35.00001F);
this.xrLabel13.Multiline = true;
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(258.3298F, 163.875F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(220.9998F, 163.875F);
this.xrLabel13.StylePriority.UseFont = false;
this.xrLabel13.Text = resources.GetString("xrLabel13.Text");
//
@@ -604,11 +607,11 @@ namespace BeWo.BeWoMobilReports
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(100, 50, 30, 95);
this.Margins = new DevExpress.Drawing.DXMargins(100F, 50F, 30F, 95F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "17.1";
this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();

File diff suppressed because one or more lines are too long

View File

@@ -102,14 +102,14 @@ namespace BeWo.BeWoMobilReports
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPictureBox1});
this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 166F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// 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, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(214.5833F, 135.4167F);
@@ -136,7 +136,7 @@ namespace BeWo.BeWoMobilReports
//
// xrRichText1
//
this.xrRichText1.Font = new System.Drawing.Font("Times New Roman", 9.75F);
this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 38F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
@@ -144,7 +144,7 @@ namespace BeWo.BeWoMobilReports
//
// xrPictureBox2
//
this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image")));
this.xrPictureBox2.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox2.ImageSource"));
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(627F, 38F);
@@ -167,7 +167,7 @@ namespace BeWo.BeWoMobilReports
this.xrLabel8,
this.xrTable1,
this.xrLabel6});
this.Page1.Font = new System.Drawing.Font("Verdana", 10F);
this.Page1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.Page1.HeightF = 818F;
this.Page1.Name = "Page1";
this.Page1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand;
@@ -175,7 +175,7 @@ namespace BeWo.BeWoMobilReports
//
// xrLabel1
//
this.xrLabel1.Font = new System.Drawing.Font("Verdana", 7F);
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Verdana", 7F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -185,12 +185,12 @@ namespace BeWo.BeWoMobilReports
//
// xrLabel13
//
this.xrLabel13.Font = new System.Drawing.Font("Verdana", 9F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(418.6696F, 35.00001F);
this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Verdana", 9F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(433.666F, 35.00001F);
this.xrLabel13.Multiline = true;
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(258.3303F, 163.875F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(217.3337F, 163.875F);
this.xrLabel13.StylePriority.UseFont = false;
this.xrLabel13.Text = resources.GetString("xrLabel13.Text");
//
@@ -207,7 +207,7 @@ namespace BeWo.BeWoMobilReports
//
// xrLabel15
//
this.xrLabel15.Font = new System.Drawing.Font("Verdana", 10F);
this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 726F);
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -217,7 +217,7 @@ namespace BeWo.BeWoMobilReports
//
// xrTable4
//
this.xrTable4.Font = new System.Drawing.Font("Verdana", 10F);
this.xrTable4.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 638.4999F);
this.xrTable4.Name = "xrTable4";
this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -286,7 +286,7 @@ namespace BeWo.BeWoMobilReports
//
// xrLabel14
//
this.xrLabel14.Font = new System.Drawing.Font("Verdana", 10F);
this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 801F);
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -296,7 +296,7 @@ namespace BeWo.BeWoMobilReports
//
// xrLabel9
//
this.xrLabel9.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic);
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Italic);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 613.4999F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -308,12 +308,13 @@ namespace BeWo.BeWoMobilReports
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, 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(1.003011F, 263.5F);
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(640.997F, 17F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(649.9967F, 16.99997F);
this.xrLabel4.StylePriority.UseBackColor = false;
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.Text = "[CustomerReferenceNumber]";
@@ -323,11 +324,12 @@ namespace BeWo.BeWoMobilReports
//
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, 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(1.003011F, 247.5F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(644.497F, 16F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(649.9967F, 16F);
this.xrLabel3.StylePriority.UseBackColor = false;
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [CustomerSalutation] [CustomerName]";
@@ -337,7 +339,8 @@ namespace BeWo.BeWoMobilReports
//
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, 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(1.003011F, 230.5F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -360,10 +363,10 @@ namespace BeWo.BeWoMobilReports
//
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(418.6699F, 210F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(433.666F, 213.5F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(232.3298F, 17.00005F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(217.3337F, 17.00005F);
this.xrLabel8.StylePriority.UseTextAlignment = false;
this.xrLabel8.Text = "xrLabel8";
this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
@@ -382,7 +385,7 @@ namespace BeWo.BeWoMobilReports
this.xrTableRow15,
this.xrTableRow16,
this.xrTableRow17});
this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 166F);
this.xrTable1.SizeF = new System.Drawing.SizeF(650.9997F, 166F);
//
// xrTableRow9
//
@@ -412,7 +415,7 @@ namespace BeWo.BeWoMobilReports
this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell6.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell6.StylePriority.UseBorderColor = false;
@@ -635,7 +638,7 @@ namespace BeWo.BeWoMobilReports
this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell17.Font = new System.Drawing.Font("Verdana", 10F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))));
this.xrTableCell17.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline))));
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell17.StylePriority.UseBorderColor = false;
@@ -652,7 +655,7 @@ namespace BeWo.BeWoMobilReports
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(642F, 67F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(650.9997F, 67F);
this.xrLabel6.StylePriority.UseFont = false;
this.xrLabel6.Text = resources.GetString("xrLabel6.Text");
//
@@ -670,14 +673,14 @@ namespace BeWo.BeWoMobilReports
this.Page1});
this.DataSource = this.bindingSource1;
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.Font = new System.Drawing.Font("Verdana", 10F);
this.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(100, 50, 30, 95);
this.Margins = new DevExpress.Drawing.DXMargins(100F, 50F, 30F, 95F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "17.1";
this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();

File diff suppressed because one or more lines are too long

View File

@@ -87,9 +87,7 @@ namespace BeWo.BeWoMobilReports.Alt
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.lblGruppe = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
@@ -114,9 +112,9 @@ namespace BeWo.BeWoMobilReports.Alt
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
@@ -746,16 +744,14 @@ namespace BeWo.BeWoMobilReports.Alt
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.lblGruppe,
this.xrLabel16,
this.xrLabel17,
this.xrLabel18,
this.xrLabel19,
this.xrLabel14,
this.xrLabel11,
this.xrLabel10,
this.xrTable3,
this.xrLabel7});
this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportFooter.HeightF = 359.0417F;
this.ReportFooter.HeightF = 278.0833F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
@@ -774,7 +770,7 @@ namespace BeWo.BeWoMobilReports.Alt
// xrLabel16
//
this.xrLabel16.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(0F, 325.0417F);
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(332.9133F, 244.0834F);
this.xrLabel16.Name = "xrLabel16";
this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel16.SizeF = new System.Drawing.SizeF(250F, 16.99998F);
@@ -782,37 +778,16 @@ namespace BeWo.BeWoMobilReports.Alt
this.xrLabel16.StylePriority.UseFont = false;
this.xrLabel16.Text = "Ernst Kaplan";
//
// xrLabel17
//
this.xrLabel17.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(332.9133F, 325.0417F);
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.SizeF = new System.Drawing.SizeF(250F, 16.99998F);
this.xrLabel17.StylePriority.UseBorders = false;
this.xrLabel17.StylePriority.UseFont = false;
this.xrLabel17.Text = "Hüseyin Çiçek";
//
// xrLabel18
//
this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Verdana", 8F);
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 342.0417F);
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(332.9133F, 261.0833F);
this.xrLabel18.Name = "xrLabel18";
this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel18.SizeF = new System.Drawing.SizeF(175F, 17F);
this.xrLabel18.StylePriority.UseFont = false;
this.xrLabel18.Text = "Geschäftsführer";
//
// xrLabel19
//
this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Verdana", 8F);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(332.9133F, 342.0417F);
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel19.SizeF = new System.Drawing.SizeF(175F, 17F);
this.xrLabel19.StylePriority.UseFont = false;
this.xrLabel19.Text = "Geschäftsführer";
//
// xrLabel14
//
this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Verdana", 8F);
@@ -1032,6 +1007,20 @@ namespace BeWo.BeWoMobilReports.Alt
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
// xrLabel12
//
this.xrLabel12.BackColor = System.Drawing.Color.Transparent;
this.xrLabel12.CanShrink = true;
this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 185.3332F);
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(403.4583F, 17F);
this.xrLabel12.StylePriority.UseBackColor = false;
this.xrLabel12.StylePriority.UseFont = false;
this.xrLabel12.Text = "GP: 2000088135 /13883";
this.xrLabel12.WordWrap = false;
//
// xrLabel13
//
this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Verdana", 9F);
@@ -1047,20 +1036,6 @@ namespace BeWo.BeWoMobilReports.Alt
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
//
// xrLabel12
//
this.xrLabel12.BackColor = System.Drawing.Color.Transparent;
this.xrLabel12.CanShrink = true;
this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 185.3332F);
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(403.4583F, 17F);
this.xrLabel12.StylePriority.UseBackColor = false;
this.xrLabel12.StylePriority.UseFont = false;
this.xrLabel12.Text = "GP: 2000088135 /13883";
this.xrLabel12.WordWrap = false;
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1167,9 +1142,7 @@ namespace BeWo.BeWoMobilReports.Alt
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
private DevExpress.XtraReports.UI.XRLabel xrLabel17;
private DevExpress.XtraReports.UI.XRLabel xrLabel18;
private DevExpress.XtraReports.UI.XRLabel xrLabel19;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;

File diff suppressed because one or more lines are too long

View File

@@ -77,9 +77,7 @@ namespace BeWo.BeWoMobilReports
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
@@ -88,6 +86,7 @@ namespace BeWo.BeWoMobilReports
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -95,6 +94,7 @@ namespace BeWo.BeWoMobilReports
this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell26 = 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.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -116,14 +116,12 @@ namespace BeWo.BeWoMobilReports
this.xrTableCell73 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell74 = new DevExpress.XtraReports.UI.XRTableCell();
this.fieldApprovedWithFactor = new DevExpress.XtraReports.UI.CalculatedField();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -436,14 +434,12 @@ namespace BeWo.BeWoMobilReports
this.xrTable5,
this.xrLabel11,
this.xrLabel14,
this.xrLabel19,
this.xrLabel18,
this.xrLabel17,
this.xrLabel16,
this.xrLabel10,
this.xrLabel7});
this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportFooter.HeightF = 353.875F;
this.ReportFooter.HeightF = 272.9167F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
@@ -607,41 +603,20 @@ namespace BeWo.BeWoMobilReports
this.xrLabel14.StylePriority.UseFont = false;
this.xrLabel14.Text = "Geschäftsführerin";
//
// xrLabel19
//
this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Verdana", 8F);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(339.5798F, 336.875F);
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel19.SizeF = new System.Drawing.SizeF(175F, 17F);
this.xrLabel19.StylePriority.UseFont = false;
this.xrLabel19.Text = "Geschäftsführer";
//
// xrLabel18
//
this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Verdana", 8F);
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 336.875F);
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(339.5799F, 255.9167F);
this.xrLabel18.Name = "xrLabel18";
this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel18.SizeF = new System.Drawing.SizeF(175F, 17F);
this.xrLabel18.StylePriority.UseFont = false;
this.xrLabel18.Text = "Geschäftsführer";
//
// xrLabel17
//
this.xrLabel17.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(339.5798F, 319.8751F);
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.SizeF = new System.Drawing.SizeF(250F, 16.99998F);
this.xrLabel17.StylePriority.UseBorders = false;
this.xrLabel17.StylePriority.UseFont = false;
this.xrLabel17.Text = "Hüseyin Çiçek";
//
// xrLabel16
//
this.xrLabel16.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(0F, 319.8751F);
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(339.5799F, 238.9167F);
this.xrLabel16.Name = "xrLabel16";
this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel16.SizeF = new System.Drawing.SizeF(250F, 16.99998F);
@@ -720,6 +695,20 @@ namespace BeWo.BeWoMobilReports
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
// xrLabel12
//
this.xrLabel12.BackColor = System.Drawing.Color.Transparent;
this.xrLabel12.CanShrink = true;
this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 185.3332F);
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(403.4583F, 17F);
this.xrLabel12.StylePriority.UseBackColor = false;
this.xrLabel12.StylePriority.UseFont = false;
this.xrLabel12.Text = "GP: 2000088135 /13883";
this.xrLabel12.WordWrap = false;
//
// xrLabel13
//
this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Verdana", 9F);
@@ -801,6 +790,10 @@ namespace BeWo.BeWoMobilReports
this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell26.Weight = 0.21685899000901443D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -1026,24 +1019,6 @@ namespace BeWo.BeWoMobilReports
this.fieldApprovedWithFactor.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldApprovedWithFactor.Name = "fieldApprovedWithFactor";
//
// xrLabel12
//
this.xrLabel12.BackColor = System.Drawing.Color.Transparent;
this.xrLabel12.CanShrink = true;
this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 185.3332F);
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(403.4583F, 17F);
this.xrLabel12.StylePriority.UseBackColor = false;
this.xrLabel12.StylePriority.UseFont = false;
this.xrLabel12.Text = "GP: 2000088135 /13883";
this.xrLabel12.WordWrap = false;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1072,8 +1047,8 @@ namespace BeWo.BeWoMobilReports
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -1146,9 +1121,7 @@ namespace BeWo.BeWoMobilReports
private DevExpress.XtraReports.UI.CalculatedField fieldApprovedWithFactor;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
private DevExpress.XtraReports.UI.XRLabel xrLabel19;
private DevExpress.XtraReports.UI.XRLabel xrLabel18;
private DevExpress.XtraReports.UI.XRLabel xrLabel17;
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
private DevExpress.XtraReports.UI.XRTable xrTable5;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;

File diff suppressed because one or more lines are too long

View File

@@ -48,6 +48,11 @@ namespace BetreuWoReports
dd.NightStart = 22;
dd.NightEnd = 6;
}
if (date.Date >= new DateTime(2025, 10, 01))
{
dd.NightStart = 22;
dd.NightEnd = 6;
}
return dd;
}

View File

@@ -110,18 +110,22 @@ namespace BeWo.BetreutesWohnenWoellReports
if (s.ServiceCategory.ToLower().Contains("direkte leistung"))
{
flsRo.Services.Add(s);
flsRo.Costbearer = s.CostBearer;
}
else if (s.ServiceCategory.ToLower().Contains("eb niedrigschwelliges angebot") || s.ServiceCategory.ToLower().Contains("entlastungsbetrag"))
{
pflegeRo.Services.Add(s);
pflegeRo.Costbearer = s.CostBearer;
}
else if (s.ServiceCategory.ToLower().Contains("pflegesachleistung"))
{
entlastungRo.Services.Add(s);
entlastungRo.Costbearer = s.CostBearer;
}
else
{
aslRo.Services.Add(s);
aslRo.Costbearer = s.CostBearer;
}
}
}

View File

@@ -86,7 +86,8 @@ namespace BeWo.BetreutesWohnenWoellReports
foreach (var ps in stats.PeriodStatistics)
{
if (ps.SupportConceptApprovalPeriod != null && ps.SupportConceptApprovalPeriod.ServiceCategory != null &&
ps.SupportConceptApprovalPeriod.ServiceCategory.Name.StartsWith(name))
ps.SupportConceptApprovalPeriod.ServiceCategory.Name.StartsWith(name) ||
cb2sc.CostBearer.Organisation.Name == ro.Costbearer)
{
return ps;
}

View File

@@ -38,6 +38,7 @@ namespace BeWo.BetreutesWohnenWoellReports
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -47,6 +48,7 @@ namespace BeWo.BetreutesWohnenWoellReports
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
@@ -58,6 +60,7 @@ namespace BeWo.BetreutesWohnenWoellReports
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
@@ -84,9 +87,6 @@ namespace BeWo.BetreutesWohnenWoellReports
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldFLSBillable = new DevExpress.XtraReports.UI.CalculatedField();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -106,7 +106,7 @@ namespace BeWo.BetreutesWohnenWoellReports
this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableServiceRecords1.Font = new System.Drawing.Font("Arial", 8F);
this.xrTableServiceRecords1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableServiceRecords1.Name = "xrTableServiceRecords1";
this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -127,7 +127,8 @@ namespace BeWo.BetreutesWohnenWoellReports
this.xrTableCell12,
this.xrTableCell5,
this.xrTableCell1});
this.xrTableRow2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableRow2.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.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow2.StylePriority.UseFont = false;
@@ -172,6 +173,14 @@ namespace BeWo.BetreutesWohnenWoellReports
this.xrTableCell12.Text = "Minuten";
this.xrTableCell12.Weight = 0.2194732989063812D;
//
// xrTableCell5
//
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.Text = "Datum der Unterschrift";
this.xrTableCell5.Weight = 0.31241921688608376D;
//
// xrTableCell1
//
this.xrTableCell1.Name = "xrTableCell1";
@@ -206,7 +215,8 @@ namespace BeWo.BetreutesWohnenWoellReports
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.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTable3.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.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -281,6 +291,17 @@ namespace BeWo.BetreutesWohnenWoellReports
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell17.Weight = 0.10570707236348702D;
//
// xrTableCell6
//
this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.SignatureDate", "{0:dd.MM.yyyy}")});
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
this.xrTableCell6.StylePriority.UsePadding = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell6.Weight = 0.15047979871237002D;
//
// xrTableCell2
//
this.xrTableCell2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -316,7 +337,7 @@ namespace BeWo.BetreutesWohnenWoellReports
this.xrLabel5,
this.xrLabel4,
this.xrLabel3});
this.GroupFooter1.Font = new System.Drawing.Font("Arial", 9.75F);
this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F);
this.GroupFooter1.HeightF = 130F;
this.GroupFooter1.KeepTogether = true;
this.GroupFooter1.Name = "GroupFooter1";
@@ -337,11 +358,11 @@ namespace BeWo.BetreutesWohnenWoellReports
//
this.xrLabel10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "fieldFLSBillable", "{0:0.##}")});
this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(396F, 36F);
this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(342F, 36F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 5, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(135.0001F, 18.00003F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(81.00003F, 18.00003F);
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.StylePriority.UsePadding = false;
this.xrLabel10.StylePriority.UseTextAlignment = false;
@@ -353,7 +374,7 @@ namespace BeWo.BetreutesWohnenWoellReports
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 36F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(351F, 18.00003F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(342F, 18.00003F);
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.Text = "Summe unmittelbarer Betreuungsleistungen in Stunden";
//
@@ -394,11 +415,11 @@ namespace BeWo.BetreutesWohnenWoellReports
//
this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMBillable", "{0:0.##}")});
this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(396F, 0F);
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(342F, 0F);
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 5, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(135.0001F, 18.00003F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(81.00003F, 18.00003F);
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.StylePriority.UsePadding = false;
this.xrLabel4.StylePriority.UseTextAlignment = false;
@@ -410,10 +431,14 @@ namespace BeWo.BetreutesWohnenWoellReports
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(351F, 18.00003F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(342F, 18.00003F);
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "Summe unmittelbarer Betreuungsleistungen in Minuten";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -441,14 +466,15 @@ namespace BeWo.BetreutesWohnenWoellReports
this.xrLabel13,
this.xrLabel12,
this.xrLabel1});
this.ReportHeader.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.ReportHeader.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.ReportHeader.HeightF = 340F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// 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(441.0001F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(233.9999F, 170F);
@@ -607,7 +633,7 @@ namespace BeWo.BetreutesWohnenWoellReports
//
// xrLabel1
//
this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 18F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
@@ -641,7 +667,7 @@ namespace BeWo.BetreutesWohnenWoellReports
//
// topMarginBand1
//
this.topMarginBand1.Font = new System.Drawing.Font("Times New Roman", 9.75F);
this.topMarginBand1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F);
this.topMarginBand1.HeightF = 50F;
this.topMarginBand1.Name = "topMarginBand1";
this.topMarginBand1.StylePriority.UseFont = false;
@@ -664,29 +690,6 @@ namespace BeWo.BetreutesWohnenWoellReports
this.fieldFLSBillable.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldFLSBillable.Name = "fieldFLSBillable";
//
// xrTableCell5
//
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.Text = "Datum der Unterschrift";
this.xrTableCell5.Weight = 0.31241921688608376D;
//
// xrTableCell6
//
this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.SignatureDate", "{0:dd.MM.yyyy}")});
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
this.xrTableCell6.StylePriority.UsePadding = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell6.Weight = 0.15047979871237002D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// QuittierungsbelegASL
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -704,13 +707,13 @@ namespace BeWo.BetreutesWohnenWoellReports
this.formattingRuleServiceDesc,
this.formattingRuleCostBearer,
this.formattingRuleEmployeeName});
this.Margins = new System.Drawing.Printing.Margins(29, 75, 50, 30);
this.Margins = new DevExpress.Drawing.DXMargins(29F, 75F, 50F, 30F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.SnapGridSize = 9F;
this.SnappingMode = DevExpress.XtraReports.UI.SnappingMode.SnapToGrid;
this.Version = "17.1";
this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();

File diff suppressed because one or more lines are too long

View File

@@ -85,7 +85,8 @@ namespace BeWo.BetreutesWohnenWoellReports
foreach (var ps in stats.PeriodStatistics)
{
if (ps.SupportConceptApprovalPeriod != null && ps.SupportConceptApprovalPeriod.ServiceCategory != null &&
ps.SupportConceptApprovalPeriod.ServiceCategory.Name.StartsWith(name))
ps.SupportConceptApprovalPeriod.ServiceCategory.Name.StartsWith(name) ||
cb2sc.CostBearer.Organisation.Name == ro.Costbearer)
{
return ps;
}

View File

@@ -38,6 +38,7 @@ namespace BeWo.BetreutesWohnenWoellReports
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -47,9 +48,11 @@ namespace BeWo.BetreutesWohnenWoellReports
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
@@ -84,9 +87,6 @@ namespace BeWo.BetreutesWohnenWoellReports
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldFLSBillable = new DevExpress.XtraReports.UI.CalculatedField();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -106,7 +106,7 @@ namespace BeWo.BetreutesWohnenWoellReports
this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableServiceRecords1.Font = new System.Drawing.Font("Arial", 8F);
this.xrTableServiceRecords1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableServiceRecords1.Name = "xrTableServiceRecords1";
this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -127,7 +127,8 @@ namespace BeWo.BetreutesWohnenWoellReports
this.xrTableCell12,
this.xrTableCell5,
this.xrTableCell2});
this.xrTableRow2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableRow2.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.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow2.StylePriority.UseFont = false;
@@ -172,6 +173,14 @@ namespace BeWo.BetreutesWohnenWoellReports
this.xrTableCell12.Text = "Minuten";
this.xrTableCell12.Weight = 0.20415892383241957D;
//
// xrTableCell5
//
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.Text = "Datum der Unterschrift";
this.xrTableCell5.Weight = 0.29063139487824013D;
//
// xrTableCell2
//
this.xrTableCell2.Name = "xrTableCell2";
@@ -206,7 +215,8 @@ namespace BeWo.BetreutesWohnenWoellReports
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.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTable3.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.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -281,6 +291,17 @@ namespace BeWo.BetreutesWohnenWoellReports
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell17.Weight = 0.10570706559889112D;
//
// xrTableCell6
//
this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.SignatureDate", "{0:dd.MM.yyyy}")});
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
this.xrTableCell6.StylePriority.UsePadding = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell6.Weight = 0.15047978618305308D;
//
// xrTableCell1
//
this.xrTableCell1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -315,21 +336,32 @@ namespace BeWo.BetreutesWohnenWoellReports
this.xrLabel5,
this.xrLabel4,
this.xrLabel3});
this.GroupFooter1.Font = new System.Drawing.Font("Arial", 9.75F);
this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F);
this.GroupFooter1.HeightF = 130F;
this.GroupFooter1.KeepTogether = true;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
//
// xrLabel11
//
this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy}")});
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(413.9999F, 71.99999F);
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(189F, 35.50002F);
this.xrLabel11.StylePriority.UseTextAlignment = false;
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
//
// xrLabel10
//
this.xrLabel10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "fieldFLSBillable", "{0:0.##}")});
this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(414F, 36F);
this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(342F, 36F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 5, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(117F, 18.00003F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(81.00003F, 18.00003F);
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.StylePriority.UsePadding = false;
this.xrLabel10.StylePriority.UseTextAlignment = false;
@@ -341,7 +373,7 @@ namespace BeWo.BetreutesWohnenWoellReports
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 36F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(360F, 18.00003F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(342F, 18.00003F);
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.Text = "Summe unmittelbarer Betreuungsleistungen in Stunden";
//
@@ -382,11 +414,11 @@ namespace BeWo.BetreutesWohnenWoellReports
//
this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMBillable", "{0:0.##}")});
this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(414F, 0F);
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(342F, 0F);
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 5, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(117F, 18.00003F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(81.00003F, 18.00003F);
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.StylePriority.UsePadding = false;
this.xrLabel4.StylePriority.UseTextAlignment = false;
@@ -398,7 +430,7 @@ namespace BeWo.BetreutesWohnenWoellReports
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(360F, 18.00003F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(342F, 18.00003F);
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "Summe unmittelbarer Betreuungsleistungen in Minuten";
//
@@ -433,14 +465,15 @@ namespace BeWo.BetreutesWohnenWoellReports
this.xrLabel13,
this.xrLabel12,
this.xrLabel1});
this.ReportHeader.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.ReportHeader.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.ReportHeader.HeightF = 340F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// 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(441.0001F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(233.9999F, 170F);
@@ -599,7 +632,7 @@ namespace BeWo.BetreutesWohnenWoellReports
//
// xrLabel1
//
this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 18F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
@@ -633,7 +666,7 @@ namespace BeWo.BetreutesWohnenWoellReports
//
// topMarginBand1
//
this.topMarginBand1.Font = new System.Drawing.Font("Times New Roman", 9.75F);
this.topMarginBand1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F);
this.topMarginBand1.HeightF = 50F;
this.topMarginBand1.Name = "topMarginBand1";
this.topMarginBand1.StylePriority.UseFont = false;
@@ -656,36 +689,6 @@ namespace BeWo.BetreutesWohnenWoellReports
this.fieldFLSBillable.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldFLSBillable.Name = "fieldFLSBillable";
//
// xrTableCell5
//
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.Text = "Datum der Unterschrift";
this.xrTableCell5.Weight = 0.29063139487824013D;
//
// xrTableCell6
//
this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.SignatureDate", "{0:dd.MM.yyyy}")});
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
this.xrTableCell6.StylePriority.UsePadding = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell6.Weight = 0.15047978618305308D;
//
// xrLabel11
//
this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy}")});
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(413.9999F, 71.99999F);
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(189F, 35.50002F);
this.xrLabel11.StylePriority.UseTextAlignment = false;
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
//
// QuittierungsbelegFLS
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -703,13 +706,13 @@ namespace BeWo.BetreutesWohnenWoellReports
this.formattingRuleServiceDesc,
this.formattingRuleCostBearer,
this.formattingRuleEmployeeName});
this.Margins = new System.Drawing.Printing.Margins(31, 75, 50, 30);
this.Margins = new DevExpress.Drawing.DXMargins(31F, 75F, 50F, 30F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.SnapGridSize = 9F;
this.SnappingMode = DevExpress.XtraReports.UI.SnappingMode.SnapToGrid;
this.Version = "17.1";
this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();

File diff suppressed because one or more lines are too long

View File

@@ -76,7 +76,8 @@ namespace BeWo.BetreutesWohnenWoellReports
foreach (var ps in stats.PeriodStatistics)
{
if (ps.SupportConceptApprovalPeriod != null && ps.SupportConceptApprovalPeriod.ServiceCategory != null &&
ps.SupportConceptApprovalPeriod.ServiceCategory.Name.StartsWith(name))
ps.SupportConceptApprovalPeriod.ServiceCategory.Name.StartsWith(name) ||
cb2sc.CostBearer.Organisation.Name == ro.Costbearer)
{
return ps;
}

View File

@@ -55,6 +55,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Invoicing\SettlementInvoiceCreation.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="AllgemeineRechnung.cs">
<SubType>Component</SubType>

View File

@@ -0,0 +1,18 @@
using BeWo.Data.Entities;
using BeWo.Service.Invoicing;
using BS.Shared.DataContracts;
using BS.Shared.Services;
using System;
using System.Collections.Generic;
using System.Linq;
namespace BetreuungsbueroFrankRoehrig
{
public class CustomSettlementInvoiceCreation : SettlementInvoiceCreation
{
public override bool CanCreateInvoiceTheOldWay(Settlement2DC si, CostBearer2SupportConcept c2s)
{
return false;
}
}
}

View File

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

View File

@@ -78,6 +78,7 @@ namespace BetreuungsbueroFrankRoehrig
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
@@ -115,7 +116,7 @@ namespace BetreuungsbueroFrankRoehrig
// xrRichText2
//
this.xrRichText2.BorderColor = System.Drawing.Color.Black;
this.xrRichText2.Font = new System.Drawing.Font("Verdana", 9F);
this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Verdana", 9F);
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 147.9167F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
@@ -126,7 +127,7 @@ namespace BetreuungsbueroFrankRoehrig
// xrRichText1
//
this.xrRichText1.BorderColor = System.Drawing.Color.Black;
this.xrRichText1.Font = new System.Drawing.Font("Verdana", 9F);
this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Verdana", 9F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(481.9163F, 0F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
@@ -153,6 +154,7 @@ namespace BetreuungsbueroFrankRoehrig
// Page1
//
this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel17,
this.xrLabel4,
this.xrLabel3,
this.xrLabel2,
@@ -167,7 +169,8 @@ namespace BetreuungsbueroFrankRoehrig
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Times New Roman", 11F, 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(2.119276E-05F, 96.80557F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
@@ -182,7 +185,8 @@ namespace BetreuungsbueroFrankRoehrig
//
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Times New Roman", 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(2.119276E-05F, 76.80554F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -196,7 +200,8 @@ namespace BetreuungsbueroFrankRoehrig
//
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Times New Roman", 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(2.119276E-05F, 56.80555F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -288,7 +293,8 @@ namespace BetreuungsbueroFrankRoehrig
//
// xrLabel9
//
this.xrLabel9.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Times New Roman", 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);
@@ -480,7 +486,8 @@ namespace BetreuungsbueroFrankRoehrig
//
// xrTable6
//
this.xrTable6.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTable6.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, 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(0F, 0F);
this.xrTable6.Name = "xrTable6";
this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -629,7 +636,8 @@ namespace BetreuungsbueroFrankRoehrig
//
// xrLabel6
//
this.xrLabel6.Font = new System.Drawing.Font("Tahoma", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Tahoma", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 217.0833F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -641,7 +649,8 @@ namespace BetreuungsbueroFrankRoehrig
//
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "Gesamtsumme: {0}")});
this.xrLabel1.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 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(420.9999F, 0F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
@@ -656,6 +665,20 @@ namespace BetreuungsbueroFrankRoehrig
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// xrLabel17
//
this.xrLabel17.BackColor = System.Drawing.Color.Transparent;
this.xrLabel17.CanShrink = true;
this.xrLabel17.Font = new DevExpress.Drawing.DXFont("times New Roman", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.80554F);
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.SizeF = new System.Drawing.SizeF(650F, 17F);
this.xrLabel17.StylePriority.UseBackColor = false;
this.xrLabel17.StylePriority.UseFont = false;
this.xrLabel17.Text = "GP Nr. [BusinessPartnerId]";
this.xrLabel17.WordWrap = false;
//
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -667,14 +690,15 @@ namespace BetreuungsbueroFrankRoehrig
this.DetailReport});
this.DataSource = this.bindingSource1;
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Font = new DevExpress.Drawing.DXFont("Times New Roman", 11F, 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.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(80, 50, 50, 50);
this.Margins = new DevExpress.Drawing.DXMargins(80F, 50F, 50F, 50F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "17.1";
this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
@@ -734,5 +758,6 @@ namespace BetreuungsbueroFrankRoehrig
private DevExpress.XtraReports.UI.XRRichText xrRichText1;
private DevExpress.XtraReports.UI.XRRichText xrRichText2;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel17;
}
}

File diff suppressed because one or more lines are too long

View File

@@ -32,6 +32,7 @@ namespace BetreuungsbueroFrankRoehrig
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
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.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
@@ -90,7 +91,6 @@ namespace BetreuungsbueroFrankRoehrig
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -109,14 +109,17 @@ namespace BetreuungsbueroFrankRoehrig
this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -137,7 +140,7 @@ namespace BetreuungsbueroFrankRoehrig
this.xrLabel15,
this.xrLabel16,
this.xrLabel9});
this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 291.875F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
@@ -145,7 +148,7 @@ namespace BetreuungsbueroFrankRoehrig
// xrRichText1
//
this.xrRichText1.BorderColor = System.Drawing.Color.Black;
this.xrRichText1.Font = new System.Drawing.Font("Verdana", 9F);
this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Verdana", 9F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(445.083F, 0F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
@@ -156,7 +159,7 @@ namespace BetreuungsbueroFrankRoehrig
// xrRichText2
//
this.xrRichText2.BorderColor = System.Drawing.Color.Black;
this.xrRichText2.Font = new System.Drawing.Font("Verdana", 9F);
this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Verdana", 9F);
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 143.75F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
@@ -245,7 +248,7 @@ namespace BetreuungsbueroFrankRoehrig
// xrTable1
//
this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 206.3333F);
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 251.125F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.rowErbrachteLeistung});
@@ -282,7 +285,7 @@ namespace BetreuungsbueroFrankRoehrig
// xrLabel6
//
this.xrLabel6.BackColor = System.Drawing.Color.Transparent;
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 131.3333F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 176.125F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -293,7 +296,7 @@ namespace BetreuungsbueroFrankRoehrig
//
// xrLabel5
//
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 98.3333F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 143.125F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F);
@@ -304,8 +307,8 @@ namespace BetreuungsbueroFrankRoehrig
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 56.00001F);
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 100.7917F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -319,8 +322,8 @@ namespace BetreuungsbueroFrankRoehrig
//
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 40.00003F);
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 84.79169F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 16F);
@@ -334,8 +337,8 @@ namespace BetreuungsbueroFrankRoehrig
//
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 23.00002F);
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 39.99999F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 17F);
@@ -352,7 +355,7 @@ namespace BetreuungsbueroFrankRoehrig
this.xrLabel12,
this.xrLabel11,
this.lblNotice});
this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportFooter.HeightF = 209F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
@@ -510,7 +513,7 @@ namespace BetreuungsbueroFrankRoehrig
// lblNotice
//
this.lblNotice.CanShrink = true;
this.lblNotice.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic);
this.lblNotice.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Italic);
this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 7.999992F);
this.lblNotice.Name = "lblNotice";
this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -520,7 +523,6 @@ namespace BetreuungsbueroFrankRoehrig
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 100F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
@@ -531,6 +533,8 @@ namespace BetreuungsbueroFrankRoehrig
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel17,
this.xrLabel1,
this.xrLabel2,
this.xrLabel3,
this.xrLabel4,
@@ -538,8 +542,8 @@ namespace BetreuungsbueroFrankRoehrig
this.xrLabel6,
this.xrTable1,
this.xrLabel8});
this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F);
this.GroupHeader1.HeightF = 223.3333F;
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.GroupHeader1.HeightF = 268.1249F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
@@ -564,7 +568,8 @@ namespace BetreuungsbueroFrankRoehrig
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable4});
this.Detail1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Detail1.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.Detail1.HeightF = 17F;
this.Detail1.Name = "Detail1";
this.Detail1.StylePriority.UseFont = false;
@@ -657,7 +662,8 @@ namespace BetreuungsbueroFrankRoehrig
//
this.xrTableCell9.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell9.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell9.StylePriority.UseBorderColor = false;
@@ -674,7 +680,8 @@ namespace BetreuungsbueroFrankRoehrig
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal")});
this.xrTableCell10.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell10.StylePriority.UseBorderColor = false;
@@ -700,7 +707,8 @@ namespace BetreuungsbueroFrankRoehrig
this.xrTableCell7.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell7.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell7.StylePriority.UseBorderColor = false;
@@ -709,15 +717,12 @@ namespace BetreuungsbueroFrankRoehrig
this.xrTableCell7.StylePriority.UsePadding = false;
this.xrTableCell7.Weight = 3D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable5});
this.GroupFooter1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.GroupFooter1.HeightF = 115F;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
@@ -901,7 +906,7 @@ namespace BetreuungsbueroFrankRoehrig
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell60.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Claim", "{0:c}")});
this.xrTableCell60.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell60.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell60.Name = "xrTableCell60";
this.xrTableCell60.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell60.StylePriority.UseBorderColor = false;
@@ -912,6 +917,38 @@ namespace BetreuungsbueroFrankRoehrig
this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell60.Weight = 0.16397432767427886D;
//
// xrLabel1
//
this.xrLabel1.BackColor = System.Drawing.Color.Transparent;
this.xrLabel1.CanShrink = true;
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 57F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(650F, 16F);
this.xrLabel1.StylePriority.UseBackColor = false;
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.Text = "Debitoren Nr. [DebitorNumber]";
this.xrLabel1.WordWrap = false;
//
// xrLabel17
//
this.xrLabel17.BackColor = System.Drawing.Color.Transparent;
this.xrLabel17.CanShrink = true;
this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 22.99999F);
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.SizeF = new System.Drawing.SizeF(650F, 17F);
this.xrLabel17.StylePriority.UseBackColor = false;
this.xrLabel17.StylePriority.UseFont = false;
this.xrLabel17.Text = "GP Nr. [BusinessPartnerId]";
this.xrLabel17.WordWrap = false;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -929,19 +966,21 @@ namespace BetreuungsbueroFrankRoehrig
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(75, 74, 100, 43);
this.Margins = new DevExpress.Drawing.DXMargins(75F, 74F, 100F, 43F);
this.PageHeight = 1169;
this.PageWidth = 827;
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.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -1025,5 +1064,7 @@ namespace BetreuungsbueroFrankRoehrig
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
private DevExpress.XtraReports.UI.XRLabel xrLabel15;
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
private DevExpress.XtraReports.UI.XRLabel xrLabel17;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
}
}

View File

@@ -127,7 +127,4 @@
<value>anbei sende ich Ihnen die unterschriebenen Nachweise über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerFirstName] [CustomerLastName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus:
</value>
</data>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

View File

@@ -234,7 +234,7 @@ namespace BzhEssenGGmbH
this.xrLabel2});
this.ReportHeader.Dpi = 254F;
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 1048.981F;
this.ReportHeader.HeightF = 1108.322F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
@@ -242,7 +242,7 @@ namespace BzhEssenGGmbH
//
this.xrLabel13.Dpi = 254F;
this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(914.9494F, 86.36007F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(914.9499F, 236.0614F);
this.xrLabel13.Multiline = true;
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
@@ -257,7 +257,7 @@ namespace BzhEssenGGmbH
//
this.xrLabel7.Dpi = 254F;
this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(914.9494F, 0F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(914.9499F, 149.7013F);
this.xrLabel7.Multiline = true;
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
@@ -271,7 +271,7 @@ namespace BzhEssenGGmbH
//
this.xrLabel9.Dpi = 254F;
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(914.9494F, 329.9882F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(914.9499F, 479.6895F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(654.0503F, 58.41992F);
@@ -284,7 +284,7 @@ namespace BzhEssenGGmbH
//
this.xrRichText1.Dpi = 254F;
this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Calibri", 8F, DevExpress.Drawing.DXFontStyle.Italic);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0.0004182445F, 43.18003F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 149.7013F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(832.5331F, 43.18001F);
@@ -296,7 +296,7 @@ namespace BzhEssenGGmbH
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
this.xrLabel1.Dpi = 254F;
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Calibri", 11F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(1058.354F, 487.747F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(1058.354F, 547.0883F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(510.6459F, 60.85419F);
@@ -309,11 +309,11 @@ namespace BzhEssenGGmbH
//
this.lblAddress.Dpi = 254F;
this.lblAddress.Font = new DevExpress.Drawing.DXFont("Calibri", 11F);
this.lblAddress.LocationFloat = new DevExpress.Utils.PointFloat(0.0004182445F, 86.36007F);
this.lblAddress.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192.8813F);
this.lblAddress.Multiline = true;
this.lblAddress.Name = "lblAddress";
this.lblAddress.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.lblAddress.SizeF = new System.Drawing.SizeF(832.5331F, 332.74F);
this.lblAddress.SizeF = new System.Drawing.SizeF(832.5331F, 300.99F);
this.lblAddress.StylePriority.UseFont = false;
this.lblAddress.Text = "[RecipientOrganisation]\r\n[RecipientDivision]\r\n[RecipientFirstName] [RecipientLast" +
"Name]\r\n[RecipientStreet]\r\n[RecipientPostCode] [RecipientTown]";
@@ -322,7 +322,7 @@ namespace BzhEssenGGmbH
//
this.xrTable3.Dpi = 254F;
this.xrTable3.Font = new DevExpress.Drawing.DXFont("Calibri", 11F);
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0.0004182445F, 985.4809F);
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0.0002618738F, 1044.822F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow10});
@@ -436,7 +436,7 @@ namespace BzhEssenGGmbH
//
this.xrLabel6.Dpi = 254F;
this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0.0004182445F, 866.1011F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0.0002618738F, 925.4422F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
@@ -448,7 +448,7 @@ namespace BzhEssenGGmbH
//
this.xrLabel5.Dpi = 254F;
this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0.0004182445F, 782.2812F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0.0002618738F, 841.6224F);
this.xrLabel5.Multiline = true;
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
@@ -462,7 +462,7 @@ namespace BzhEssenGGmbH
this.xrLabel4.CanShrink = true;
this.xrLabel4.Dpi = 254F;
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0.0004182445F, 655.2811F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0.0002618738F, 714.6224F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
@@ -478,7 +478,7 @@ namespace BzhEssenGGmbH
this.xrLabel3.CanShrink = true;
this.xrLabel3.Dpi = 254F;
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0.0004182445F, 612.1011F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0.0002618738F, 671.4423F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(1569F, 40.64008F);
@@ -493,7 +493,7 @@ namespace BzhEssenGGmbH
this.xrLabel2.CanShrink = true;
this.xrLabel2.Dpi = 254F;
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Calibri", 14F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0.0004182445F, 548.6012F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0.0002618738F, 607.9424F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(1569F, 63.49994F);

View File

@@ -142,7 +142,7 @@ namespace BzhEssenGGmbH
this.lblAbrechnungszeitraum});
this.Page1.Dpi = 254F;
this.Page1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.Page1.HeightF = 1113.417F;
this.Page1.HeightF = 1176.079F;
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
//
@@ -152,7 +152,7 @@ namespace BzhEssenGGmbH
this.xrLabel2.CanShrink = true;
this.xrLabel2.Dpi = 254F;
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 1062.617F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 1125.279F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(1570F, 50.79993F);
@@ -165,7 +165,7 @@ namespace BzhEssenGGmbH
//
this.xrLabel6.Dpi = 254F;
this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(915.9494F, 329.9881F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(915.9495F, 483.0104F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(654.0502F, 58.41998F);
@@ -178,7 +178,7 @@ namespace BzhEssenGGmbH
//
this.xrLabel7.Dpi = 254F;
this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(915.9494F, 0F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(915.9495F, 153.0223F);
this.xrLabel7.Multiline = true;
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
@@ -192,7 +192,7 @@ namespace BzhEssenGGmbH
//
this.xrLabel13.Dpi = 254F;
this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(915.9494F, 86.36002F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(915.9495F, 239.3823F);
this.xrLabel13.Multiline = true;
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
@@ -207,7 +207,7 @@ namespace BzhEssenGGmbH
//
this.xrRichText1.Dpi = 254F;
this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Calibri", 8F, DevExpress.Drawing.DXFontStyle.Italic);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.18003F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 153.0223F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(805.18F, 43.18F);
@@ -217,7 +217,7 @@ namespace BzhEssenGGmbH
//
this.lblAdresse.Dpi = 254F;
this.lblAdresse.Font = new DevExpress.Drawing.DXFont("Calibri", 12F);
this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 86.36007F);
this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 196.2023F);
this.lblAdresse.Multiline = true;
this.lblAdresse.Name = "lblAdresse";
this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
@@ -232,7 +232,7 @@ namespace BzhEssenGGmbH
this.xrLabel4.CanShrink = true;
this.xrLabel4.Dpi = 254F;
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 961.0174F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 1023.68F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
@@ -248,7 +248,7 @@ namespace BzhEssenGGmbH
this.xrLabel3.CanShrink = true;
this.xrLabel3.Dpi = 254F;
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 1011.817F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 1074.479F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(1570F, 50.79999F);
@@ -263,7 +263,7 @@ namespace BzhEssenGGmbH
this.lblRechnung.CanShrink = true;
this.lblRechnung.Dpi = 254F;
this.lblRechnung.Font = new DevExpress.Drawing.DXFont("Calibri", 14F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblRechnung.LocationFloat = new DevExpress.Utils.PointFloat(0F, 562.7785F);
this.lblRechnung.LocationFloat = new DevExpress.Utils.PointFloat(0F, 625.4408F);
this.lblRechnung.Name = "lblRechnung";
this.lblRechnung.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.lblRechnung.SizeF = new System.Drawing.SizeF(1570F, 62.79199F);
@@ -276,7 +276,7 @@ namespace BzhEssenGGmbH
//
this.lblAnrede.Dpi = 254F;
this.lblAnrede.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F);
this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 758.0293F);
this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 820.6916F);
this.lblAnrede.Name = "lblAnrede";
this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.lblAnrede.SizeF = new System.Drawing.SizeF(805.18F, 43.18005F);
@@ -289,7 +289,7 @@ namespace BzhEssenGGmbH
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
this.xrLabel8.Dpi = 254F;
this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Calibri", 12F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(851.1801F, 462.1772F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(851.1799F, 545.8394F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(718.8199F, 58.41998F);
@@ -302,7 +302,7 @@ namespace BzhEssenGGmbH
//
this.lblAbrechnungszeitraum.Dpi = 254F;
this.lblAbrechnungszeitraum.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F);
this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 821.5292F);
this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 884.1915F);
this.lblAbrechnungszeitraum.Multiline = true;
this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum";
this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);

View File

@@ -140,7 +140,7 @@ namespace BzhEssenGGmbH.Alt
//
this.xrRichText1.Dpi = 254F;
this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Calibri", 8.5F, DevExpress.Drawing.DXFontStyle.Italic);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 15.24005F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0.0008384998F, 155.1036F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(849.7213F, 43.17999F);
@@ -152,10 +152,10 @@ namespace BzhEssenGGmbH.Alt
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate", "{0:dd.MM.yyyy}")});
this.xrLabel8.Dpi = 254F;
this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Calibri", 12F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(990.0331F, 394.4682F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(990.0327F, 521.5718F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(579.9668F, 58.42001F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(579.9669F, 57.53113F);
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.StylePriority.UseTextAlignment = false;
this.xrLabel8.Text = "xrLabel8";
@@ -165,7 +165,7 @@ namespace BzhEssenGGmbH.Alt
//
this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTable1.Dpi = 254F;
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 958.9675F);
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 1038.471F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow9,
@@ -311,7 +311,7 @@ namespace BzhEssenGGmbH.Alt
//
this.xrLabel6.Dpi = 254F;
this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 799.9257F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 879.4293F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
@@ -325,7 +325,7 @@ namespace BzhEssenGGmbH.Alt
//
this.xrLabel5.Dpi = 254F;
this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 726.1059F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 805.6095F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(805.18F, 43.17999F);
@@ -337,7 +337,7 @@ namespace BzhEssenGGmbH.Alt
this.RecipientPostCodeAndTown.CanShrink = true;
this.RecipientPostCodeAndTown.Dpi = 254F;
this.RecipientPostCodeAndTown.Font = new DevExpress.Drawing.DXFont("Calibri", 11F);
this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 231.1401F);
this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0.0008384998F, 371.0037F);
this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown";
this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.RecipientPostCodeAndTown.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -350,7 +350,7 @@ namespace BzhEssenGGmbH.Alt
this.xrLabel_RecipientStreet.CanShrink = true;
this.xrLabel_RecipientStreet.Dpi = 254F;
this.xrLabel_RecipientStreet.Font = new DevExpress.Drawing.DXFont("Calibri", 11F);
this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 187.96F);
this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0.0008384998F, 327.8235F);
this.xrLabel_RecipientStreet.Name = "xrLabel_RecipientStreet";
this.xrLabel_RecipientStreet.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel_RecipientStreet.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -363,7 +363,7 @@ namespace BzhEssenGGmbH.Alt
this.xrLabel_RecipientDivision.CanShrink = true;
this.xrLabel_RecipientDivision.Dpi = 254F;
this.xrLabel_RecipientDivision.Font = new DevExpress.Drawing.DXFont("Calibri", 11F);
this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 144.78F);
this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0.0008384998F, 284.6435F);
this.xrLabel_RecipientDivision.Name = "xrLabel_RecipientDivision";
this.xrLabel_RecipientDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel_RecipientDivision.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -376,7 +376,7 @@ namespace BzhEssenGGmbH.Alt
this.xrLabel_RecipientContactPerson.CanShrink = true;
this.xrLabel_RecipientContactPerson.Dpi = 254F;
this.xrLabel_RecipientContactPerson.Font = new DevExpress.Drawing.DXFont("Calibri", 11F);
this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 101.6F);
this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0.0008384998F, 241.4635F);
this.xrLabel_RecipientContactPerson.Name = "xrLabel_RecipientContactPerson";
this.xrLabel_RecipientContactPerson.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel_RecipientContactPerson.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -389,7 +389,7 @@ namespace BzhEssenGGmbH.Alt
this.xrLabel1.CanShrink = true;
this.xrLabel1.Dpi = 254F;
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Calibri", 11F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 58.41998F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0.0008384998F, 198.2835F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -490,7 +490,7 @@ namespace BzhEssenGGmbH.Alt
this.xrLabel13});
this.GroupHeader1.Dpi = 254F;
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.GroupHeader1.HeightF = 1131.688F;
this.GroupHeader1.HeightF = 1211.191F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
@@ -500,7 +500,7 @@ namespace BzhEssenGGmbH.Alt
this.xrLabel17.CanShrink = true;
this.xrLabel17.Dpi = 254F;
this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Calibri", 14F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0.0004182445F, 499.5994F);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0.0002794999F, 579.1029F);
this.xrLabel17.Multiline = true;
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
@@ -517,7 +517,7 @@ namespace BzhEssenGGmbH.Alt
this.xrLabel18.CanShrink = true;
this.xrLabel18.Dpi = 254F;
this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0.0004182445F, 559.9435F);
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0.0002794999F, 639.4471F);
this.xrLabel18.Name = "xrLabel18";
this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel18.SizeF = new System.Drawing.SizeF(1569.999F, 43.18002F);
@@ -532,7 +532,7 @@ namespace BzhEssenGGmbH.Alt
this.xrLabel19.CanShrink = true;
this.xrLabel19.Dpi = 254F;
this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0.000836489F, 603.1232F);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0.0008384998F, 682.6267F);
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel19.SizeF = new System.Drawing.SizeF(1569.999F, 43.17999F);
@@ -548,7 +548,7 @@ namespace BzhEssenGGmbH.Alt
this.xrLabel20.CanShrink = true;
this.xrLabel20.Dpi = 254F;
this.xrLabel20.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0.000836489F, 646.3032F);
this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0.0008384998F, 725.8068F);
this.xrLabel20.Name = "xrLabel20";
this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel20.SizeF = new System.Drawing.SizeF(1569.999F, 43.17999F);
@@ -561,7 +561,7 @@ namespace BzhEssenGGmbH.Alt
//
this.xrLabel14.Dpi = 254F;
this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(990.0331F, 302.0483F);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(990.0327F, 457.1519F);
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel14.SizeF = new System.Drawing.SizeF(579.9668F, 58.41998F);
@@ -572,7 +572,7 @@ namespace BzhEssenGGmbH.Alt
//
this.xrLabel7.Dpi = 254F;
this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(990.0331F, 5.228056E-05F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(990.0327F, 155.1036F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(579.9668F, 58.42F);
@@ -583,7 +583,7 @@ namespace BzhEssenGGmbH.Alt
//
this.xrLabel13.Dpi = 254F;
this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Calibri", 11F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(990.0331F, 58.42003F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(990.0327F, 213.5236F);
this.xrLabel13.Multiline = true;
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);

View File

@@ -140,7 +140,7 @@ namespace BzhEssenGGmbH
//
this.xrRichText1.Dpi = 254F;
this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Calibri", 8F, DevExpress.Drawing.DXFontStyle.Italic);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.18003F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 155.9226F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(805.1801F, 43.18F);
@@ -157,7 +157,7 @@ namespace BzhEssenGGmbH
this.xrLabel6.BackColor = System.Drawing.Color.Transparent;
this.xrLabel6.Dpi = 254F;
this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 847.0967F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 912.6592F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
@@ -171,7 +171,7 @@ namespace BzhEssenGGmbH
//
this.lblAnrede.Dpi = 254F;
this.lblAnrede.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F);
this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 783.5966F);
this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 849.1592F);
this.lblAnrede.Name = "lblAnrede";
this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.lblAnrede.SizeF = new System.Drawing.SizeF(805.18F, 43.17999F);
@@ -272,7 +272,7 @@ namespace BzhEssenGGmbH
this.xrLabel6});
this.GroupHeader1.Dpi = 254F;
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.GroupHeader1.HeightF = 976.1006F;
this.GroupHeader1.HeightF = 1020.609F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
@@ -282,7 +282,7 @@ namespace BzhEssenGGmbH
this.xrLabel20.CanShrink = true;
this.xrLabel20.Dpi = 254F;
this.xrLabel20.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0.0004182445F, 699.2474F);
this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0F, 764.8101F);
this.xrLabel20.Name = "xrLabel20";
this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel20.SizeF = new System.Drawing.SizeF(1572F, 43.18005F);
@@ -297,7 +297,7 @@ namespace BzhEssenGGmbH
this.xrLabel19.CanShrink = true;
this.xrLabel19.Dpi = 254F;
this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0.0004182445F, 656.0674F);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 721.6299F);
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel19.SizeF = new System.Drawing.SizeF(1572F, 43.17999F);
@@ -312,7 +312,7 @@ namespace BzhEssenGGmbH
this.xrLabel18.CanShrink = true;
this.xrLabel18.Dpi = 254F;
this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0.0006273668F, 612.8875F);
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 678.45F);
this.xrLabel18.Name = "xrLabel18";
this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel18.SizeF = new System.Drawing.SizeF(1572F, 43.17999F);
@@ -327,7 +327,7 @@ namespace BzhEssenGGmbH
this.xrLabel17.CanShrink = true;
this.xrLabel17.Dpi = 254F;
this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Calibri", 14F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0.0006273668F, 547.4368F);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 612.9993F);
this.xrLabel17.Multiline = true;
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
@@ -344,7 +344,7 @@ namespace BzhEssenGGmbH
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate", "{0:dd.MM.yyyy}")});
this.xrLabel8.Dpi = 254F;
this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Calibri", 11F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(917.9497F, 465.7765F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(917.9492F, 554.339F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(654.0502F, 58.42001F);
@@ -357,7 +357,7 @@ namespace BzhEssenGGmbH
//
this.xrLabel13.Dpi = 254F;
this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(917.9497F, 86.36007F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(917.9495F, 242.2826F);
this.xrLabel13.Multiline = true;
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
@@ -372,7 +372,7 @@ namespace BzhEssenGGmbH
//
this.xrLabel7.Dpi = 254F;
this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(917.9497F, 0F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(917.9495F, 155.9226F);
this.xrLabel7.Multiline = true;
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
@@ -387,7 +387,7 @@ namespace BzhEssenGGmbH
this.RecipientPostCodeAndTown.CanShrink = true;
this.RecipientPostCodeAndTown.Dpi = 254F;
this.RecipientPostCodeAndTown.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F);
this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 259.08F);
this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 371.8226F);
this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown";
this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.RecipientPostCodeAndTown.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -400,7 +400,7 @@ namespace BzhEssenGGmbH
this.xrLabel_RecipientStreet.CanShrink = true;
this.xrLabel_RecipientStreet.Dpi = 254F;
this.xrLabel_RecipientStreet.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F);
this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 215.9001F);
this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 328.6426F);
this.xrLabel_RecipientStreet.Name = "xrLabel_RecipientStreet";
this.xrLabel_RecipientStreet.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel_RecipientStreet.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -413,7 +413,7 @@ namespace BzhEssenGGmbH
this.xrLabel_RecipientDivision.CanShrink = true;
this.xrLabel_RecipientDivision.Dpi = 254F;
this.xrLabel_RecipientDivision.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F);
this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 129.5401F);
this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 242.2827F);
this.xrLabel_RecipientDivision.Name = "xrLabel_RecipientDivision";
this.xrLabel_RecipientDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel_RecipientDivision.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -426,7 +426,7 @@ namespace BzhEssenGGmbH
this.xrLabel_RecipientContactPerson.CanShrink = true;
this.xrLabel_RecipientContactPerson.Dpi = 254F;
this.xrLabel_RecipientContactPerson.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F);
this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 172.7201F);
this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 285.4627F);
this.xrLabel_RecipientContactPerson.Name = "xrLabel_RecipientContactPerson";
this.xrLabel_RecipientContactPerson.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel_RecipientContactPerson.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -439,7 +439,7 @@ namespace BzhEssenGGmbH
this.xrLabel1.CanShrink = true;
this.xrLabel1.Dpi = 254F;
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Calibri", 11.5F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 86.36007F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 199.1027F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
@@ -451,7 +451,7 @@ namespace BzhEssenGGmbH
//
this.xrLabel14.Dpi = 254F;
this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(917.9497F, 329.9881F);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(917.9495F, 485.9107F);
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F);
this.xrLabel14.SizeF = new System.Drawing.SizeF(654.0502F, 58.41995F);

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 MiB

View File

@@ -60,10 +60,20 @@
<Compile Include="Calculations\CustomGroupDurationCalculator.cs" />
<Compile Include="Invoicing\CustomInvoiceCreation.cs" />
<Compile Include="Invoicing\CustomInvoiceFactory.cs" />
<Compile Include="Invoicing\CustomSettlementInvoiceCreation.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Reporting\CustomMitarbeiterstundenkontoBerechnung.cs" />
<Compile Include="Reporting\CustomReportCreator.cs" />
<Compile Include="Reporting\Reports\Quittierungsbeleg.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Reporting\Reports\Quittierungsbeleg.Designer.cs">
<DependentUpon>Quittierungsbeleg.cs</DependentUpon>
</Compile>
<Compile Include="Reporting\Reports\ServiceRecordListReport.cs">
<SubType>Component</SubType>
</Compile>
@@ -109,6 +119,14 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Reporting\Reports\Quittierungsbeleg.resx">
<DependentUpon>Quittierungsbeleg.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Reporting\Reports\ServiceRecordListReport.resx">
<DependentUpon>ServiceRecordListReport.cs</DependentUpon>
</EmbeddedResource>

View File

@@ -15,104 +15,5 @@ namespace DrobDrogenhilfe
internal class CustomSettlementInvoiceCreation : LWLSettlementInvoiceCreation
{
// nur für Bugfix vorübergehend, kann wieder raus
public override List<InvoiceItemDC> CreateInvoiceItems(Settlement2DC si, IList<ApprovalPeriod> apList, bool schneideBeiMaxAb)
{
List<InvoiceItemDC> iiList = new List<InvoiceItemDC>();
var apsByHourlyRate = new Dictionary<String, IList<ApprovalPeriod>>();
foreach (var ap in apList)
{
IList<ApprovalPeriod> list = null;
String key = String.Format("{0}_{1}_{2:ddMMyyy}", ap.AmountPerUnit, ap.RateFactor, ap.PeriodStartDate);
if (apsByHourlyRate.ContainsKey(key))
{
list = apsByHourlyRate[key];
}
else
{
list = new List<ApprovalPeriod>();
apsByHourlyRate[key] = list;
}
list.Add(ap);
}
decimal maxApprovedFls = si.ApprovedFLS ?? 0;
decimal totalHours = 0;
foreach (var key in apsByHourlyRate.Keys)
{
IList<ApprovalPeriod> list = apsByHourlyRate[key];
var ii = new InvoiceItemDC();
decimal minutesTotal = 0;
decimal minutesTotalBudget = 0;
DateTime start = DateTime.MaxValue;
DateTime end = DateTime.MinValue;
decimal rf = si.RateFactor ?? 0;
decimal hr = 0;
foreach (var approvalPeriod in list)
{
minutesTotal += approvalPeriod.RecordedMinutes;
minutesTotalBudget += approvalPeriod.BudgetMinutes;
if (approvalPeriod.PeriodStartDate < start)
start = approvalPeriod.PeriodStartDate;
if (approvalPeriod.PeriodEndDate > end)
end = approvalPeriod.PeriodEndDate;
hr = approvalPeriod.AmountPerUnit;
if (approvalPeriod.RateFactor.HasValue)
{
rf = approvalPeriod.RateFactor.Value;
}
if (!String.IsNullOrEmpty(approvalPeriod.Notice) && approvalPeriod.Notice == "Fehlkontakte")
{
hr *= 0.8m;
ii.ItemDescription = "Fehlkontakte";
}
}
ii.ItemPeriodStart = start;
ii.ItemPeriodEnd = end;
ii.RateFactor = rf;
ii.AmountPerUnit = hr;
decimal hours = Math.Round(minutesTotal / 60m, 2, MidpointRounding.AwayFromZero);
hours *= (100 + rf) / 100;
hours = Math.Round(hours, 2, MidpointRounding.AwayFromZero);
decimal hoursBudget = Math.Round(minutesTotalBudget / 60m, 2, MidpointRounding.AwayFromZero);
hoursBudget *= (100 + rf) / 100;
hoursBudget = Math.Round(hoursBudget, 2, MidpointRounding.AwayFromZero);
//if (schneideBeiMaxAb)
//{
// if (totalHours + hoursBudget > maxApprovedFls)
// {
// hoursBudget = maxApprovedFls - totalHours;
// if (hoursBudget < 0)
// {
// hoursBudget = 0;
// }
// if (hours > hoursBudget)
// {
// hours = hoursBudget;
// }
// }
//}
totalHours += hoursBudget;
ii.UnitCount = hours;
ii.UnitCountBudget = hoursBudget;
ii.AmountTotal = Math.Round(hr * hours, 2, MidpointRounding.AwayFromZero);
ii.GrossAmountTotal = ii.AmountTotal;
iiList.Add(ii);
}
return iiList.OrderBy(ii => ii.ItemPeriodStart).ToList();
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 221 KiB

View File

@@ -0,0 +1,63 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Dieser Code wurde von einem Tool generiert.
// Laufzeitversion:4.0.30319.42000
//
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
// der Code erneut generiert wird.
// </auto-generated>
//------------------------------------------------------------------------------
namespace DrobDrogenhilfe.Properties {
using System;
/// <summary>
/// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
/// </summary>
// Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
// -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
// Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
// mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() {
}
/// <summary>
/// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DrobDrogenhilfe.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
/// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set {
resourceCulture = value;
}
}
}
}

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>

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,145 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Text.RegularExpressions;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
using DevExpress.XtraReports.UI;
namespace DrobDrogenhilfe
{
public partial class Quittierungsbeleg : XtraReport, IBeWoReport<ServicesOverviewRO>
{
public Quittierungsbeleg()
{
InitializeComponent();
}
public void SetReportDataSource(ServicesOverviewRO pRO)
{
// Get calling method name
//StackTrace stackTrace = new StackTrace();
//Debug.WriteLine(stackTrace.GetFrame(1).GetMethod().Name);
bool hatGruppen = false;
//if (pRO == null)
// return;
if (pRO.Services != null)
{
List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
foreach (var sd in pRO.Services)
{
if (sd.IsBillable || sd.ServiceDescription.ToLower().Contains("fehlkontakt") || sd.ServiceCategory.ToLower().Contains("fehlkontakt"))
{
ServicesOverviewRO.CreateSignatureString(sd);
sd.Notice5 = "E";
if (sd.IsGroup)
{
//sd.Notice5 = String.Format("{0} Teilnehmer", sd.CustomerCount);
sd.Notice5 = "GR";
hatGruppen = true;
}
if (sd.ServiceDescription.ToLower().Contains("fehlkontakt") || sd.ServiceCategory.ToLower().Contains("fehlkontakt") || (sd.ProzentAbrechenbar < 100))
{
sd.Notice5 = "F";
}
servicesBillable.Add(sd);
}
}
pRO.Services = servicesBillable;
}
if (String.IsNullOrWhiteSpace(pRO.AbsenceTimes))
{
lblHatAbwesenheiten.Text = "X";
}
if (!hatGruppen)
{
lblHatGruppen.Text = "X";
}
ErstelleAbwesenheitenTabelle(pRO);
bindingSource1.DataSource = pRO;
}
private void ErstelleAbwesenheitenTabelle(ServicesOverviewRO pRo)
{
if (pRo.Abwesenheiten != null)
{
int newRows = 0;
int index = 1;
foreach (var at in pRo.Abwesenheiten)
{
DevExpress.XtraReports.UI.XRTableRow row = null;
if (index < xrTableAbwesenheiten.Rows.Count)
{
row = xrTableAbwesenheiten.Rows[index];
}
else
{
row = xrTableAbwesenheiten.InsertRowBelow(xrTableAbwesenheiten.Rows[xrTableAbwesenheiten.Rows.Count - 1]);
newRows++;
}
row.Cells[0].Text = String.Format("{0:dd.MM.yyyy}", at.Start);
int? days = null;
if (at.End.HasValue)
{
row.Cells[1].Text = String.Format("{0:dd.MM.yyyy}", at.End);
days = (int)at.End.Value.Subtract(at.Start.Value).TotalDays + 1;
}
else
{
row.Cells[1].Text = "unbekannt";
}
row.Cells[2].Text = String.Format("{0:0}", days);
index++;
}
if (newRows > 0)
{
lblUnterschriftKlient.Top += newRows * 20;
lblUnterschriftMitarbeiter.Top += newRows * 20;
}
}
}
private void picSignature_BeforePrint(object sender, System.ComponentModel.CancelEventArgs e)
{
XRPictureBox xrBox = sender as XRPictureBox;
//var test = this.GetCurrent
string base64String = xrBox.Tag as string;
if (!String.IsNullOrWhiteSpace(base64String))
{
var base64Data = Regex.Match(base64String, @"data:image/(?<type>.+?),(?<data>.+)").Groups["data"].Value;
var binData = Convert.FromBase64String(base64Data);
Image img = ByteArrayToImage(binData);
xrBox.Image = Utils.CropImage(img);
}
else
{
xrBox.Image = null;
}
}
public Image ByteArrayToImage(byte[] byteArrayIn)
{
using(var memoryStream = new MemoryStream(byteArrayIn))
{
return Image.FromStream(memoryStream);
}
}
}
}

File diff suppressed because one or more lines are too long

View File

@@ -53,22 +53,10 @@ namespace DrobDrogenhilfe.Alt
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.RecipientPostCodeAndTown = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel_RecipientStreet = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel_RecipientDivision = new DevExpress.XtraReports.UI.XRLabel();
@@ -97,6 +85,7 @@ namespace DrobDrogenhilfe.Alt
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
@@ -162,19 +151,21 @@ namespace DrobDrogenhilfe.Alt
// xrLabel8
//
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(367.0001F, 163.7916F);
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDateTime")});
this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Verdana", 9F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(563.8333F, 123.8749F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(283F, 23F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(86.16699F, 22.99999F);
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.StylePriority.UseTextAlignment = false;
this.xrLabel8.Text = "xrLabel8";
this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrLabel8.TextFormatString = "{0:dd.MM.yyyy}";
//
// xrTable1
//
this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 370.1249F);
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 380.5415F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow9,
@@ -305,7 +296,7 @@ namespace DrobDrogenhilfe.Alt
//
// xrLabel6
//
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 295.1249F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 305.5415F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -315,7 +306,7 @@ namespace DrobDrogenhilfe.Alt
//
// lblAnrede
//
this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 262.125F);
this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 272.5417F);
this.lblAnrede.Name = "lblAnrede";
this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblAnrede.SizeF = new System.Drawing.SizeF(317F, 17F);
@@ -327,11 +318,11 @@ namespace DrobDrogenhilfe.Alt
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 219.7916F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 224.25F);
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(650F, 17F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(699.9999F, 17.00003F);
this.xrLabel4.StylePriority.UseBackColor = false;
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.Text = "[CustomerReferenceNumberAndDate]";
@@ -342,14 +333,15 @@ namespace DrobDrogenhilfe.Alt
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 203.7916F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 190.25F);
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(650F, 16F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(700F, 34F);
this.xrLabel3.StylePriority.UseBackColor = false;
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerName], geb. [CustomerB" +
"irthdayString]";
this.xrLabel3.Text = "Abrechnung Betreuungsleistungen \r\nfür [Salutation2] [CustomerName], geb. [Custome" +
"rBirthdayString]";
this.xrLabel3.WordWrap = false;
//
// xrLabel2
@@ -357,10 +349,10 @@ namespace DrobDrogenhilfe.Alt
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 186.7916F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 173.2499F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 17F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(400F, 17.00002F);
this.xrLabel2.StylePriority.UseBackColor = false;
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]";
@@ -368,37 +360,14 @@ namespace DrobDrogenhilfe.Alt
//
// xrTable2
//
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(367.0001F, 0F);
this.xrTable2.Font = new DevExpress.Drawing.DXFont("Verdana", 9F);
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(563.8333F, 45.00001F);
this.xrTable2.Name = "xrTable2";
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2,
this.xrTableRow5,
this.xrTableRow4,
this.xrTableRow3,
this.xrTableRow1,
this.xrTableRow6,
this.xrTableRow8,
this.xrTableRow13});
this.xrTable2.SizeF = new System.Drawing.SizeF(283F, 151F);
//
// xrTableRow2
//
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell4});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Weight = 0.13245033112582783D;
//
// xrTableCell4
//
this.xrTableCell4.CanShrink = true;
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell4.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrTableCell4.StylePriority.UseFont = false;
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Ihr(e) Ansprechpartner(in):";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell4.Weight = 1D;
this.xrTableRow3});
this.xrTable2.SizeF = new System.Drawing.SizeF(172.1251F, 40F);
this.xrTable2.StylePriority.UseFont = false;
//
// xrTableRow5
//
@@ -410,34 +379,17 @@ namespace DrobDrogenhilfe.Alt
// xrTableCell13
//
this.xrTableCell13.CanShrink = true;
this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPerson")});
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell13.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrTableCell13.StylePriority.UseFont = false;
this.xrTableCell13.StylePriority.UseTextAlignment = false;
this.xrTableCell13.Text = "[SenderContactPerson]";
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell13.Text = "Frederic Wortmann";
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell13.Weight = 1D;
//
// xrTableRow4
//
this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell11});
this.xrTableRow4.Name = "xrTableRow4";
this.xrTableRow4.Weight = 0.13245033112582783D;
//
// xrTableCell11
//
this.xrTableCell11.CanShrink = true;
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell11.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrTableCell11.StylePriority.UseFont = false;
this.xrTableCell11.StylePriority.UseTextAlignment = false;
this.xrTableCell11.Text = "[SenderContactPersonDivision]";
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell11.Weight = 1D;
//
// xrTableRow3
//
this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
@@ -448,85 +400,17 @@ namespace DrobDrogenhilfe.Alt
// xrTableCell8
//
this.xrTableCell8.CanShrink = true;
this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonMail")});
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell8.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrTableCell8.StylePriority.UseFont = false;
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.Text = "[SenderContactPersonMail]";
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell8.Text = "wortmann@drob-re.de";
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell8.Weight = 1D;
//
// xrTableRow1
//
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell1});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 0.13245033112582783D;
//
// xrTableCell1
//
this.xrTableCell1.CanShrink = true;
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrTableCell1.StylePriority.UseFont = false;
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "[SenderContactPersonPhone]";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell1.Weight = 1D;
//
// xrTableRow6
//
this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell2});
this.xrTableRow6.Name = "xrTableRow6";
this.xrTableRow6.Weight = 0.11258278145695365D;
//
// xrTableCell2
//
this.xrTableCell2.CanShrink = true;
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell2.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrTableCell2.StylePriority.UseFont = false;
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.Text = "[SenderContactPersonFax]";
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell2.Weight = 1D;
//
// xrTableRow8
//
this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell5});
this.xrTableRow8.Name = "xrTableRow8";
this.xrTableRow8.Weight = 0.11258278145695365D;
//
// xrTableCell5
//
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell5.Weight = 1D;
//
// xrTableRow13
//
this.xrTableRow13.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell10});
this.xrTableRow13.Name = "xrTableRow13";
this.xrTableRow13.Weight = 0.11258278145695365D;
//
// xrTableCell10
//
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")});
this.xrTableCell10.Multiline = true;
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell10.TextFormatString = "GP-Nr.: {0}";
this.xrTableCell10.Weight = 1D;
//
// RecipientPostCodeAndTown
//
this.RecipientPostCodeAndTown.CanShrink = true;
@@ -620,6 +504,7 @@ namespace DrobDrogenhilfe.Alt
//
// xrTableCell16
//
this.xrTableCell16.CanShrink = true;
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")});
this.xrTableCell16.Name = "xrTableCell16";
@@ -651,6 +536,7 @@ namespace DrobDrogenhilfe.Alt
//
// xrTableCell9
//
this.xrTableCell9.CanShrink = true;
this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")});
this.xrTableCell9.Name = "xrTableCell9";
@@ -679,6 +565,7 @@ namespace DrobDrogenhilfe.Alt
//
// xrTableCell29
//
this.xrTableCell29.CanShrink = true;
this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")});
this.xrTableCell29.Name = "xrTableCell29";
@@ -708,6 +595,7 @@ namespace DrobDrogenhilfe.Alt
//
// xrTableCell31
//
this.xrTableCell31.CanShrink = true;
this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FinalSentence")});
this.xrTableCell31.Name = "xrTableCell31";
@@ -736,7 +624,7 @@ namespace DrobDrogenhilfe.Alt
//
// xrLabel11
//
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(582.9999F, 192F);
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(459.0415F, 192F);
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(67F, 17F);
@@ -762,12 +650,13 @@ namespace DrobDrogenhilfe.Alt
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 38.91665F;
this.bottomMarginBand1.HeightF = 86.51287F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel5,
this.xrLabel1,
this.xrLabel_RecipientContactPerson,
this.xrLabel_RecipientDivision,
@@ -782,10 +671,24 @@ namespace DrobDrogenhilfe.Alt
this.xrTable1,
this.xrLabel8});
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.GroupHeader1.HeightF = 438.1249F;
this.GroupHeader1.HeightF = 448.5415F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
// xrLabel5
//
this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")});
this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 156.25F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(400F, 17F);
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.StylePriority.UseTextAlignment = false;
this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrLabel5.TextFormatString = "{0}";
//
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1090,12 +993,14 @@ namespace DrobDrogenhilfe.Alt
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new DevExpress.Drawing.DXMargins(75F, 74F, 100F, 38.91665F);
this.Margins = new DevExpress.Drawing.DXMargins(90.04166F, 1F, 100F, 86.51287F);
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.PageRange = "1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
@@ -1118,20 +1023,10 @@ namespace DrobDrogenhilfe.Alt
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRTable xrTable2;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRLabel RecipientPostCodeAndTown;
private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientStreet;
private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientDivision;
@@ -1200,7 +1095,6 @@ namespace DrobDrogenhilfe.Alt
private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow24;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow13;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
}
}

View File

@@ -18,7 +18,12 @@ namespace DrobDrogenhilfe.Alt
public void SetReportDataSource(SettlementRO pRO)
{
bool isDefaultSpitzabrechnung = false;
if (!String.IsNullOrEmpty(pRO.SenderContactPersonMail))
{
pRO.SenderContactPersonMail = pRO.SenderContactPersonMail.Replace("E-Mail:", "").Trim();
}
bool isDefaultSpitzabrechnung = false;
if (String.IsNullOrEmpty(pRO.Notice))
{

File diff suppressed because one or more lines are too long

View File

@@ -64,18 +64,18 @@ namespace FeidPartnerReports.Invoicing
DateTime start = accountingPeriodStart.Value;
DateTime end = accountingPeriodEnd.Value;
bool teilmonat = false;
if (supportConceptApprovalPeriod.StartDate > start)
if (supportConceptApprovalPeriod.StartDate != null && supportConceptApprovalPeriod.StartDate > start)
{
start = supportConceptApprovalPeriod.StartDate.Value;
teilmonat = true;
}
if (supportConceptApprovalPeriod.EndDate < end)
if (supportConceptApprovalPeriod.EndDate != null && supportConceptApprovalPeriod.EndDate < end)
{
end = supportConceptApprovalPeriod.EndDate.Value;
teilmonat = true;
}
if (supportConceptApprovalPeriod.ServiceCategory != null)
if (supportConceptApprovalPeriod.ServiceCategory != null && data != null && data.Count > 0)
{
var ii = new InvoiceItem
{

View File

@@ -18,105 +18,125 @@ namespace FeidPartnerReports.Statistics
public override SupportConceptStatisticsDC CreateSupportConceptStatisticsImpl(long costBearer2SupportConceptOid, DateTime statisticsDate, long? ignoreServiceRecordOid)
{
var stat = base.CreateSupportConceptStatisticsImpl(costBearer2SupportConceptOid, statisticsDate, null);
// Fahrtzeiten nicht in Ministatistik nur für Abrechnung
stat.PeriodStatistics = stat.PeriodStatistics.Where(p => p.SupportConceptApprovalPeriod.ServiceCategory == null || String.IsNullOrEmpty(p.SupportConceptApprovalPeriod.ServiceCategory.Abbreviation) ||
!p.SupportConceptApprovalPeriod.ServiceCategory.Abbreviation.Contains("FZQA")).ToList();
var cb2sc = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(costBearer2SupportConceptOid);
try
{
// Fahrtzeiten nicht in Ministatistik nur für Abrechnung
stat.PeriodStatistics = stat.PeriodStatistics.Where(p => p.SupportConceptApprovalPeriod.ServiceCategory == null || String.IsNullOrEmpty(p.SupportConceptApprovalPeriod.ServiceCategory.Abbreviation) ||
!p.SupportConceptApprovalPeriod.ServiceCategory.Abbreviation.Contains("FZQA")).ToList();
foreach (var item in stat.PeriodStatistics)
{
DateTime start = item.SupportConceptApprovalPeriod.StartDate ?? DateTime.MinValue;
DateTime end = item.SupportConceptApprovalPeriod.EndDate ?? DateTime.MaxValue;
DateTime bewStart = item.SupportConceptApprovalPeriod.StartDate ?? DateTime.MinValue;
DateTime bewEnd = item.SupportConceptApprovalPeriod.EndDate ?? DateTime.MaxValue;
var cb2sc = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(costBearer2SupportConceptOid);
if (statisticsDate < end)
foreach (var item in stat.PeriodStatistics)
{
end = statisticsDate;
}
DateTime start = item.SupportConceptApprovalPeriod.StartDate ?? DateTime.MinValue;
DateTime end = item.SupportConceptApprovalPeriod.EndDate ?? DateTime.MaxValue;
DateTime bewStart = item.SupportConceptApprovalPeriod.StartDate ?? DateTime.MinValue;
DateTime bewEnd = item.SupportConceptApprovalPeriod.EndDate ?? DateTime.MaxValue;
if(bewStart <= DateTime.Now && bewEnd >= DateTime.Now && item.MinutesProvidedThisWeek == 0)
{
item.MinutesProvidedThisWeek = item.MinutesApprovedPerWeek;
stat.MinutesProvidedThisWeek = item.MinutesApprovedPerWeek;
}
while (start < end.Date)
{
if (start > new DateTime(2024,02,29) && !EnthaeltEintraege(start, start.AddDays(7), item.ServiceRecords))
if (statisticsDate < end)
{
if (bewStart.DayOfWeek != DayOfWeek.Monday && start >= bewStart && start <= bewStart.GetNext(DayOfWeek.Sunday).Date)
{
DateTime sundayDt = bewStart.GetNext(DayOfWeek.Sunday).Date;
var days = sundayDt.Day - start.Day + 1;
var firstAppr = item.MinutesApprovedPerWeek / 7 * days;
item.MinutesProvidedTotal += firstAppr;
item.MinutesProvidedTotalRounded += firstAppr;
stat.MinutesProvidedTotal += firstAppr;
stat.MinutesProvidedTotalRounded += firstAppr;
}
else if (bewEnd.DayOfWeek != DayOfWeek.Sunday && start < bewEnd && start >= bewEnd.GetLast(DayOfWeek.Monday).Date)
{
DateTime mondayDt = bewEnd.GetLast(DayOfWeek.Monday).Date;
var days = start.Day - mondayDt.Day + 1;
var lastAppr = item.MinutesApprovedPerWeek / 7 * days;
item.MinutesProvidedTotal += lastAppr;
item.MinutesProvidedTotalRounded += lastAppr;
stat.MinutesProvidedTotal += lastAppr;
stat.MinutesProvidedTotalRounded += lastAppr;
}
else
{
item.MinutesProvidedTotal += item.MinutesApprovedPerWeek;
item.MinutesProvidedTotalRounded += item.MinutesApprovedPerWeek;
stat.MinutesProvidedTotal += item.MinutesApprovedPerWeek;
stat.MinutesProvidedTotalRounded += item.MinutesApprovedPerWeek;
}
end = statisticsDate;
}
start = start.AddDays(7);
}
if (!cb2sc.CostBearer.Organisation.Name.ToLower().Contains("alt"))
{
item.MinutesApprovedTotal /= 60;
}
SetMinutesFreePerWeek(stat, item);
if (bewStart <= DateTime.Now && bewEnd >= DateTime.Now && item.MinutesProvidedThisWeek == 0)
{
item.MinutesProvidedThisWeek = item.MinutesApprovedPerWeek;
stat.MinutesProvidedThisWeek = item.MinutesApprovedPerWeek;
}
while (start < end.Date)
{
if (start > new DateTime(2024, 02, 29) && !EnthaeltEintraege(start, start.AddDays(7), item.ServiceRecords))
{
if (bewStart.DayOfWeek != DayOfWeek.Monday && start >= bewStart && start <= bewStart.GetNext(DayOfWeek.Sunday).Date)
{
DateTime sundayDt = bewStart.GetNext(DayOfWeek.Sunday).Date;
var days = sundayDt.Day - start.Day + 1;
var firstAppr = item.MinutesApprovedPerWeek / 7 * days;
item.MinutesProvidedTotal += firstAppr;
item.MinutesProvidedTotalRounded += firstAppr;
stat.MinutesProvidedTotal += firstAppr;
stat.MinutesProvidedTotalRounded += firstAppr;
}
else if (bewEnd.DayOfWeek != DayOfWeek.Sunday && start < bewEnd && start >= bewEnd.GetLast(DayOfWeek.Monday).Date)
{
DateTime mondayDt = bewEnd.GetLast(DayOfWeek.Monday).Date;
var days = start.Day - mondayDt.Day + 1;
var lastAppr = item.MinutesApprovedPerWeek / 7 * days;
item.MinutesProvidedTotal += lastAppr;
item.MinutesProvidedTotalRounded += lastAppr;
stat.MinutesProvidedTotal += lastAppr;
stat.MinutesProvidedTotalRounded += lastAppr;
}
else
{
item.MinutesProvidedTotal += item.MinutesApprovedPerWeek;
item.MinutesProvidedTotalRounded += item.MinutesApprovedPerWeek;
stat.MinutesProvidedTotal += item.MinutesApprovedPerWeek;
stat.MinutesProvidedTotalRounded += item.MinutesApprovedPerWeek;
}
}
start = start.AddDays(7);
}
if (!cb2sc.CostBearer.Organisation.Name.ToLower().Contains("alt"))
{
item.MinutesApprovedTotal /= 60;
}
SetMinutesFreePerWeek(stat, item);
}
}
catch (Exception)
{
//
}
return stat;
}
private void SetMinutesFreePerWeek(SupportConceptStatisticsDC stat, SupportConceptPeriodStatisticsDC ps)
{
DateTime dtPeriod = stat.DateOfCreation.Date;
if (ps.SupportConceptApprovalPeriod.StartDate.HasValue && ps.SupportConceptApprovalPeriod.EndDate.HasValue)
{
if (ps.SupportConceptApprovalPeriod.StartDate.HasValue && ps.SupportConceptApprovalPeriod.StartDate > dtPeriod)
try
{
DateTime dtPeriod = stat.DateOfCreation.Date;
if (ps.SupportConceptApprovalPeriod.StartDate.HasValue && ps.SupportConceptApprovalPeriod.EndDate.HasValue)
{
dtPeriod = ps.SupportConceptApprovalPeriod.StartDate.Value;
}
TimeSpan tsPeriod = ps.SupportConceptApprovalPeriod.EndDate.Value.Subtract(dtPeriod);
int daysPeriod = tsPeriod.Days + 1;
if (daysPeriod < 0)
{
daysPeriod = 0;
}
if (daysPeriod != 0)
{
ps.MinutesFreePerWeek = (ps.MinutesApprovedTotal - ps.MinutesProvidedTotalRounded) / (daysPeriod / 7m);
ps.MinutesFreePerWeekStatisticDate = (ps.MinutesApprovedTotal - ps.IstTotalUntilThisMonth - ps.MinutesProvidedThisMonth) / (daysPeriod / 7m);
ps.MinutesFreePerMonth = (ps.MinutesApprovedTotal - ps.MinutesProvidedTotalRounded) / (daysPeriod / 7m) * (365m / 84m);
ps.MinutesFreePerMonthStatisticDate = (ps.MinutesApprovedTotal - ps.IstTotalUntilThisMonth - ps.MinutesProvidedThisMonth) / (daysPeriod / 7m) * (365m / 84m);
}
else // Bewilligung ist abgelaufen
{
ps.MinutesFreePerWeek = ps.MinutesApprovedTotal - ps.MinutesProvidedTotalRounded;
ps.MinutesFreePerWeekStatisticDate = ps.MinutesApprovedTotal - ps.MinutesProvidedTotalRounded;
ps.MinutesFreePerMonth = ps.MinutesApprovedTotal - ps.MinutesProvidedTotalRounded;
ps.MinutesFreePerMonthStatisticDate = ps.MinutesApprovedTotal - ps.MinutesProvidedTotalRounded;
if (ps.SupportConceptApprovalPeriod.StartDate.HasValue && ps.SupportConceptApprovalPeriod.StartDate > dtPeriod)
{
dtPeriod = ps.SupportConceptApprovalPeriod.StartDate.Value;
}
TimeSpan tsPeriod = ps.SupportConceptApprovalPeriod.EndDate.Value.Subtract(dtPeriod);
int daysPeriod = tsPeriod.Days + 1;
if (daysPeriod < 0)
{
daysPeriod = 0;
}
if (daysPeriod != 0)
{
ps.MinutesFreePerWeek = (ps.MinutesApprovedTotal - ps.MinutesProvidedTotalRounded) / (daysPeriod / 7m);
ps.MinutesFreePerWeekStatisticDate = (ps.MinutesApprovedTotal - ps.IstTotalUntilThisMonth - ps.MinutesProvidedThisMonth) / (daysPeriod / 7m);
ps.MinutesFreePerMonth = (ps.MinutesApprovedTotal - ps.MinutesProvidedTotalRounded) / (daysPeriod / 7m) * (365m / 84m);
ps.MinutesFreePerMonthStatisticDate = (ps.MinutesApprovedTotal - ps.IstTotalUntilThisMonth - ps.MinutesProvidedThisMonth) / (daysPeriod / 7m) * (365m / 84m);
}
else // Bewilligung ist abgelaufen
{
ps.MinutesFreePerWeek = ps.MinutesApprovedTotal - ps.MinutesProvidedTotalRounded;
ps.MinutesFreePerWeekStatisticDate = ps.MinutesApprovedTotal - ps.MinutesProvidedTotalRounded;
ps.MinutesFreePerMonth = ps.MinutesApprovedTotal - ps.MinutesProvidedTotalRounded;
ps.MinutesFreePerMonthStatisticDate = ps.MinutesApprovedTotal - ps.MinutesProvidedTotalRounded;
}
}
}
catch (Exception)
{
//Mach nichts. Das ist für den alten Mok bei dem die Felder MinutesFreePerWeekStatisticDate noch nicht in der alten Shared.dll existieren
}
}
protected override IEnumerable<ServiceRecord> GetServiceRecordsForStatistic(long costBearer2SupportConceptOid)

View File

@@ -66,6 +66,7 @@
<Compile Include="CustomMitarbeiterstundenkontoBerechnungMonate.cs" />
<Compile Include="CustomReportCreator.cs" />
<Compile Include="GerdasMitarbeiterstundenkontoBerechnung.cs" />
<Compile Include="Invoicing\CustomSettlementInvoiceCreation.cs" />
<Compile Include="JahresReport.cs">
<SubType>Component</SubType>
</Compile>
@@ -142,6 +143,7 @@
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

View File

@@ -0,0 +1,79 @@
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Invoicing;
using BeWo.Service.Plugins;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using BS.Shared.Services;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace GerdasPflegedienst.Invoicing
{
[IgnoreAutoPlugin]
public class CustomSettlementInvoiceCreation : SettlementInvoiceCreation
{
public override bool CheckMaxApprovedHours()
{
return false;
}
// AB: 31.07.2025: nur zur Überbrückung bis Server ausgeliefert ist - kann wieder weg - oben reicht
public override void CalculateInvoiceItemAmounts(Settlement2DC si)
{
decimal flsAufgebraucht = 0;
decimal flsBudgetGesamt = si.ApprovedFLS ?? 0;
if (!CheckMaxApprovedHours())
{
flsBudgetGesamt = Decimal.MaxValue;
}
foreach (var ii in si.InvoiceItems)
{
if (ii.UnitCount.HasValue)
{
if (ii.UnitCount > 0)
{
// dieser Abschnitt prüft und kappt ggf. Stunden bei Überschreitung Budget - unter Berücksichtigung ProzentBudget in Leistung(skategorien)
var unitCountBudget = Math.Round(ii.UnitCountBudget ?? ii.UnitCount ?? 0, 2, MidpointRounding.AwayFromZero);
ii.UnitCount = Math.Round(ii.UnitCount.Value, 2, MidpointRounding.AwayFromZero);
var relation = unitCountBudget / ii.UnitCount.Value;
var gewichteteStunden = ii.UnitCount * relation;
if (gewichteteStunden > flsBudgetGesamt - flsAufgebraucht)
{
gewichteteStunden = flsBudgetGesamt - flsAufgebraucht;
ii.UnitCount = gewichteteStunden / relation;
}
flsAufgebraucht += ii.UnitCount.Value * relation;
}
if (ii.AmountPerUnit.HasValue)
{
if (!String.IsNullOrEmpty(ii.ItemDescription) && ii.ItemDescription.ToLower().Contains("fehlkontakt") && ii.ProzentAbrechenbar.HasValue)
{
ii.AmountPerUnit = ii.AmountPerUnit * ii.ProzentAbrechenbar / 100;
}
ii.AmountTotal = ii.UnitCount.Value * ii.AmountPerUnit.Value;
if (ii.RateFactor.HasValue && ii.RateFactor.Value != 0)
{
ii.GrossAmountTotal = Math.Round(ii.AmountTotal.Value * ((100m + ii.RateFactor.Value) / 100m), 2, MidpointRounding.AwayFromZero);
}
else
{
ii.GrossAmountTotal = ii.AmountTotal;
}
}
if (ii.MaxApprovedUnitCount < ii.UnitCount)
{
ii.MaxApprovedUnitCount = ii.UnitCount;
}
}
}
}
}
}

View File

@@ -13,11 +13,11 @@ namespace BeWo.Report.DefaultReports
public void SetReportDataSource(InvoiceCustomerRO pRO)
{
if (String.IsNullOrWhiteSpace(pRO.RecipientOrganisation) ||
!pRO.RecipientOrganisation.ToLower().Contains("landratsamt biberach"))
{
this.Watermark.Image = null;
}
//if (String.IsNullOrWhiteSpace(pRO.RecipientOrganisation) ||
// !pRO.RecipientOrganisation.ToLower().Contains("landratsamt biberach"))
//{
// this.Watermark.Image = null;
//}
StringBuilder sb = new StringBuilder();
if (!String.IsNullOrEmpty(pRO.RecipientOrganisation))

Some files were not shown because too many files have changed in this diff Show More