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

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

Browse Source
This commit is contained in:
HirschleM
2025-06-17 11:48:25 +02:00
parent 55ad6e5169 6699e6c196
commit 13290ac272
89 changed files with 4304 additions and 35673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
BeWo/Core/BeWoUtils.cs
View File

@@ -1669,9 +1669,10 @@ namespace BeWo.Core
}
if(vm.GoalTree != null && vm.GoalTree.Count > 0 && groupIndex == 1/* && (cb2ScOids == null || cb2ScOids.Count < 2)*/)
{
//Nur für abrechenbare Leistungen
if (vm.SelectedGoals.Count == 0)
{
if (BeWoApp.AppSettings.IsServiceRecordGoalMandatory)
if (BeWoApp.AppSettings.IsServiceRecordGoalMandatory && vm.ServiceDescription.ProzentAbrechnung.HasValue && vm.ServiceDescription.ProzentAbrechnung >= 100 && vm.ServiceDescription.Category.IsBillable)
{
MessageBox.Show(Translator.Translate("Sie müssen mindestens ein Ziel auswählen, bevor Sie speichern können."), "Speichern", MessageBoxButton.OK, MessageBoxImage.Exclamation);
return false;
@@ -1691,12 +1692,9 @@ namespace BeWo.Core
{
MessageBox.Show(String.Format("Das Ziel '{0}' wurde nicht bewertet.\nSpeichern nicht möglich.", goal.DisplayName), "Speichern", MessageBoxButton.OK, MessageBoxImage.Exclamation);
return false;
}
}
}
}
}
}
}

2115
BeWo/ServiceProxy/Generated.cs
View File

File diff suppressed because it is too large Load Diff

3
BeWo/Styles/ControlStyles/TextEditStyles.xaml
View File

@@ -40,8 +40,7 @@
x:Key="TextEditCurrency"
BasedOn="{StaticResource BaseNumberMaskTextEdit}"
TargetType="{x:Type dxe:TextEdit}">
<Setter Property="Mask" Value="######0.## $" />
<Setter Property="dxe:NumericMaskOptions.AlwaysShowDecimalSeparator" Value="False" />
<Setter Property="Mask" Value="######0.00 $" />
</Style>
<Style
x:Key="TextEditHours"

14
BeWo/View/Controls/GkvAbrechnungDetailControl.xaml
View File

@@ -8,8 +8,8 @@
xmlns:local="clr-namespace:BeWo.View.Controls"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:viewmodel="clr-namespace:BeWo.ViewModel"
d:DataContext="{d:DesignInstance Type=viewmodel:GkvAbrechnungVM}"
xmlns:viewmodel="clr-namespace:BeWo.ViewModel.Light"
d:DataContext="{d:DesignInstance Type=viewmodel:GkvAbrechnungLightVM}"
mc:Ignorable="d">
<UserControl.Resources>
<ResourceDictionary>
@@ -58,7 +58,7 @@
Grid.Column="2"
IsEnabled="False"
Style="{StaticResource TextEditNumber}"
Text="{Binding GkvAbrechnungOid}" />
Text="{Binding Oid}" />
<Label
Grid.Row="1"
Grid.Column="0"
@@ -169,7 +169,7 @@
Margin="0,0,0,3"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
DataSource="{Binding InvoiceBases2}">
ItemsSource="{Binding InvoiceBases}">
<dxg:GridControl.Columns>
<dxg:GridColumn
x:Name="ColumnChecked"
@@ -327,17 +327,17 @@
Margin="0,0,0,3"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
DataSource="{Binding TransferProtokolle}">
ItemsSource="{Binding TransferProtokolle}">
<dxg:GridControl.Columns>
<dxg:GridColumn
AllowEditing="False"
FieldName="GkvTransferProtokollOid"
FieldName="Oid"
Header="Oid"
ReadOnly="True"
Tag="Debug" />
<dxg:GridColumn
AllowEditing="False"
FieldName="GkvTransferProtokollVersion"
FieldName="Version"
Header="Version"
ReadOnly="True"
Tag="Debug" />

12
BeWo/View/Controls/GkvAbrechnungDetailControl.xaml.cs
View File

@@ -2,8 +2,10 @@
using BeWo.ServiceProxy;
using BeWo.View.Windows;
using BeWo.ViewModel;
using BeWo.ViewModel.Light;
using BeWo.ViewModel.ListViewModel;
using BS.Shared.DataContracts.GkvAbrechnung;
using BS.Shared.DataContracts.Light;
using BS.Shared.Extensions;
using DevExpress.Xpf.Grid;
using System;
@@ -28,15 +30,15 @@ namespace BeWo.View.Controls
/// </summary>
public partial class GkvAbrechnungDetailControl : UserControl
{
public GkvAbrechnungVM GkvAbrechnungVM { get; set; }
public GkvAbrechnungLightVM GkvAbrechnungLightVM { get; set; }
public Window Window { get; private set; }
public GkvAbrechnungDetailControl(GkvAbrechnungVM vm, Window window)
public GkvAbrechnungDetailControl(GkvAbrechnungLightVM vm, Window window)
{
InitializeComponent();
GkvAbrechnungVM = vm;
GkvAbrechnungLightVM = vm;
DataContext = vm;
Window = window;
@@ -61,7 +63,7 @@ namespace BeWo.View.Controls
private void btn_auftragsdatei_Click(object sender, RoutedEventArgs e)
{
var protokoll = datagrid_transfer.GetCurrentValue<GkvTransferProtokollDC>();
var protokoll = datagrid_transfer.GetCurrentValue<GkvTransferProtokollLightDC>();
var oid = protokoll.Oid.Value;
@@ -72,7 +74,7 @@ namespace BeWo.View.Controls
private void btn_nutzdatendatei_Click(object sender, RoutedEventArgs e)
{
var protokoll = datagrid_transfer.GetCurrentValue<GkvTransferProtokollDC>();
var protokoll = datagrid_transfer.GetCurrentValue<GkvTransferProtokollLightDC>();
var oid = protokoll.Oid.Value;

6
BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
View File

@@ -78,7 +78,9 @@ namespace BeWo.View.Detail.Accounting
{
_IsRequesting = true;
ServiceFacade.DoGkvAccountingServiceAsync(s => s.GetFilteredGkvAbrechnungen(null), UpdateGkvAbrechnungList);
var gkv = ServiceFacade.DoGkvAccountingServiceSync(x => x.GetAllGkvAbrechnungen());
UpdateGkvAbrechnungList(gkv);
}
catch (Exception e)
{
@@ -213,7 +215,7 @@ namespace BeWo.View.Detail.Accounting
private void btn_details_Click(object sender, RoutedEventArgs e)
{
var vm = this.datagrid_gkvAbrechnungen.GetCurrentValue<GkvAbrechnungVM>();
var vm = this.datagrid_gkvAbrechnungen.GetCurrentValue<GkvAbrechnungLightVM>();
var window = BeWoWindowBuilder.GetGkvAbrechnungDetailWindow(vm);

125
BeWo/View/Detail/CustomerView.xaml
View File

@@ -2131,6 +2131,7 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<GroupBox
@@ -2139,6 +2140,8 @@
Style="{StaticResource ObjectEditGroupBox}">
<Grid IsSharedSizeScope="True">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
@@ -2149,6 +2152,8 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
@@ -2173,9 +2178,24 @@
<Label
Grid.Row="1"
Grid.Column="0"
Content="Erstaufnahme" />
<uc:NullItemComboBox
x:Name="comboBox_Erstaufnahme"
Grid.Row="1"
Grid.Column="1"
Width="200"
Height="23"
Margin="3"
HorizontalAlignment="Left"
ItemsSource="{Binding Path=ErstaufnahmeTypen, Mode=OneWay}"
SelectedValue="{Binding Path=ErstaufnahmeType, Mode=TwoWay}" />
<Label
Grid.Row="2"
Grid.Column="0"
Content="Betreuung beendet am" />
<dxe:DateEdit
Grid.Row="1"
Grid.Row="2"
Grid.Column="1"
Width="100"
Height="23"
@@ -2188,12 +2208,12 @@
MaskType="DateTimeAdvancingCaret" />
<Label
Grid.Row="2"
Grid.Row="3"
Grid.Column="0"
Content="Grund für Beendigung" />
<uc:NullItemComboBox
x:Name="comboBox_TerminationReason"
Grid.Row="2"
Grid.Row="3"
Grid.Column="1"
Width="200"
Height="23"
@@ -2202,6 +2222,21 @@
ItemsSource="{Binding Path=TerminationReasons, Mode=OneWay}"
SelectedValue="{Binding Path=TerminationReason, Mode=TwoWay}" />
<Label
Grid.Row="4"
Grid.Column="0"
Name="lblFremdHilfe" Content="{markup:Translate Fremde Hilfen}" />
<uc:NullItemComboBox
x:Name="comboBox_Fremdhilfe"
Grid.Row="4"
Grid.Column="1"
Width="200"
Height="23"
Margin="3"
HorizontalAlignment="Left"
ItemsSource="{Binding Path=FremdHilfeTypen, Mode=OneWay}"
SelectedValue="{Binding Path=FremdHilfeType, Mode=TwoWay}" />
<Grid
x:Name="ctrlAdvisedAttended"
Grid.Row="3"
@@ -2229,21 +2264,93 @@
IsChecked="{Binding Path=IsAttended, UpdateSourceTrigger=PropertyChanged}" />
</Grid>
<Label
Grid.Row="0"
Grid.Column="2"
Name="lblEinkommenBeginn" Content="{markup:Translate Einkommensart zu Beginn}" />
<uc:NullItemComboBox
x:Name="comboBox_EinkommenBeginn"
Grid.Row="0"
Grid.Column="3"
Width="200"
Height="23"
Margin="3"
HorizontalAlignment="Left"
ItemsSource="{Binding Path=EinkommenBeginnTypen, Mode=OneWay}"
SelectedValue="{Binding Path=EinkommenBeginnType, Mode=TwoWay}" />
<Label
Grid.Row="1"
Grid.Column="2"
Name="lblEinkommenEnde" Content="{markup:Translate Einkommensart zum Ende}" />
<uc:NullItemComboBox
x:Name="comboBox_EinkommenEnde"
Grid.Row="1"
Grid.Column="3"
Width="200"
Height="23"
Margin="3"
HorizontalAlignment="Left"
ItemsSource="{Binding Path=EinkommenEndeTypen, Mode=OneWay}"
SelectedValue="{Binding Path=EinkommenEndeType, Mode=TwoWay}" />
<Label
Grid.Row="2"
Grid.Column="2"
Name="lblHilfenRegion" Content="{markup:Translate Region der Hilfe}" />
<uc:NullItemComboBox
x:Name="comboBox_HilfenRegion"
Grid.Row="2"
Grid.Column="3"
Width="200"
Height="23"
Margin="3"
HorizontalAlignment="Left"
ItemsSource="{Binding Path=RegionTypen, Mode=OneWay}"
SelectedValue="{Binding Path=RegionType, Mode=TwoWay}" />
<Label
Grid.Row="3"
Grid.Column="2"
Name="lblSozSchwierigkeiten" Content="{markup:Translate Soziale Schwierigkeiten}" />
<uc:NullItemComboBox
x:Name="comboBox_SozSchwierigkeiten"
Grid.Row="3"
Grid.Column="3"
Width="200"
Height="23"
Margin="3"
HorizontalAlignment="Left"
ItemsSource="{Binding Path=SozSchwierigkeitenTypen, Mode=OneWay}"
SelectedValue="{Binding Path=SozSchwierigkeitenType, Mode=TwoWay}" />
<Label
Grid.Row="4"
Grid.Column="2"
Name="lblSozBeziehungen" Content="{markup:Translate Soziale Beziehungen}" />
<uc:NullItemComboBox
x:Name="SozBeziehungen"
Grid.Row="4"
Grid.Column="3"
Width="200"
Height="23"
Margin="3"
HorizontalAlignment="Left"
ItemsSource="{Binding Path=SozBeziehungenTypen, Mode=OneWay}"
SelectedValue="{Binding Path=SozBeziehungenType, Mode=TwoWay}" />
<Label
Grid.Row="0"
Grid.Column="4"
Content="Betreuungsart" />
<ListBox
x:Name="customerCareTypeList"
Grid.Row="1"
Grid.RowSpan="4"
Grid.Column="2"
Grid.Column="4"
Width="Auto"
Height="Auto"
MinWidth="200"
MinHeight="52"
MaxHeight="65"
MinHeight="110"
MaxHeight="200"
Margin="3"
Padding="3,3,3,3"
HorizontalAlignment="Left"
@@ -2252,7 +2359,7 @@
<StackPanel
Grid.Row="0"
Grid.Column="3"
Grid.Column="5"
Orientation="Horizontal">
<Label Content="Vermittlung" />
<Button
@@ -2305,7 +2412,7 @@
x:Name="placementListBox"
Grid.Row="1"
Grid.RowSpan="4"
Grid.Column="3"
Grid.Column="5"
Width="Auto"
Height="Auto"
MinWidth="200"

3
BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml
View File

@@ -617,6 +617,9 @@
</Hyperlink>
</TextBlock>
<StackPanel Margin="3">
<StackPanel.Resources>
<ResourceDictionary Source="..\..\..\Styles\ModernOrangeBlack.xaml" />
</StackPanel.Resources>
<Button
Margin="3"
HorizontalAlignment="Stretch"

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

@@ -99,10 +99,50 @@
Header="{markup:Translate Betreuungsarten}"
Selected="Tabitem_Selected" />
<dxa:AccordionItem
Name="TabitemTerminationReasons"
Name="TabitemStatDaten"
Foreground="Black"
Header="{markup:Translate Gründe für Beendigung der Betreuung}"
Selected="Tabitem_Selected" />
Header="{t:Translate Statistikdaten Betreuung}">
<dxa:AccordionItem
Name="TabitemTerminationReasons"
Foreground="Black"
Header="{markup:Translate Gründe für Beendigung der Betreuung}"
Selected="Tabitem_Selected" />
<dxa:AccordionItem
Name="TabitemEinkommenBeginn"
Foreground="Black"
Header="{markup:Translate Einkommensart zu Beginn}"
Selected="Tabitem_Selected" />
<dxa:AccordionItem
Name="TabitemEinkommenEnde"
Foreground="Black"
Header="{markup:Translate Einkommensart zum Ende}"
Selected="Tabitem_Selected" />
<dxa:AccordionItem
Name="TabitemFremdHilfe"
Foreground="Black"
Header="{markup:Translate Anspruchnahme fremder Hilfen}"
Selected="Tabitem_Selected" />
<dxa:AccordionItem
Name="TabitemSozSchwierigkeiten"
Foreground="Black"
Header="{markup:Translate Soziale Schwierigkeiten}"
Selected="Tabitem_Selected" />
<dxa:AccordionItem
Name="TabitemSozBeziehungen"
Foreground="Black"
Header="{markup:Translate Soziale Beziehungen}"
Selected="Tabitem_Selected" />
<dxa:AccordionItem
Name="TabitemErstaufnahme"
Foreground="Black"
Header="{markup:Translate Erstaufnahme}"
Selected="Tabitem_Selected" />
<dxa:AccordionItem
Name="TabitemRegion"
Foreground="Black"
Header="{markup:Translate Region der Hilfe}"
Selected="Tabitem_Selected" />
</dxa:AccordionItem>
<dxa:AccordionItem
Name="TabitemMedikamentenarten"
Foreground="Black"

28
BeWo/View/Master/AdministrationView.xaml.cs
View File

@@ -386,6 +386,34 @@ namespace BeWo.View.Master
VMFactory.CreateValueListVMAsync(ValueListEntryType.TerminationReasonType,
r => this.Dispatch(() => AddView(TabitemTerminationReasons, new ValueListView(r))));
return;
case nameof(TabitemEinkommenBeginn):
VMFactory.CreateValueListVMAsync(ValueListEntryType.EinkommenBeginnType,
r => this.Dispatch(() => AddView(TabitemEinkommenBeginn, new ValueListView(r))));
return;
case nameof(TabitemEinkommenEnde):
VMFactory.CreateValueListVMAsync(ValueListEntryType.EinkommenEndeType,
r => this.Dispatch(() => AddView(TabitemEinkommenEnde, new ValueListView(r))));
return;
case nameof(TabitemFremdHilfe):
VMFactory.CreateValueListVMAsync(ValueListEntryType.FremdHilfeType,
r => this.Dispatch(() => AddView(TabitemFremdHilfe, new ValueListView(r))));
return;
case nameof(TabitemSozSchwierigkeiten):
VMFactory.CreateValueListVMAsync(ValueListEntryType.SozSchwierigkeitenType,
r => this.Dispatch(() => AddView(TabitemSozSchwierigkeiten, new ValueListView(r))));
return;
case nameof(TabitemSozBeziehungen):
VMFactory.CreateValueListVMAsync(ValueListEntryType.SozBeziehungenType,
r => this.Dispatch(() => AddView(TabitemSozBeziehungen, new ValueListView(r))));
return;
case nameof(TabitemErstaufnahme):
VMFactory.CreateValueListVMAsync(ValueListEntryType.ErstaufnahmeType,
r => this.Dispatch(() => AddView(TabitemErstaufnahme, new ValueListView(r))));
return;
case nameof(TabitemRegion):
VMFactory.CreateValueListVMAsync(ValueListEntryType.RegionType,
r => this.Dispatch(() => AddView(TabitemErstaufnahme, new ValueListView(r))));
return;
case nameof(TabitemPlacementObjectives):
VMFactory.CreateValueListVMAsync(ValueListEntryType.PlacementObjectiveType,
r => this.Dispatch(() => AddView(TabitemPlacementObjectives, new ValueListView(r))));

5
BeWo/View/Windows/BeWoWindowBuilder.cs
View File

@@ -2,6 +2,7 @@
using BeWo.View.Detail;
using BeWo.View.Detail.AI;
using BeWo.ViewModel;
using BeWo.ViewModel.Light;
using BS.Shared.Extensions;
using System;
using System.Collections.Generic;
@@ -39,9 +40,9 @@ namespace BeWo.View.Windows
return beWoWindow;
}
public static BeWoWindow GetGkvAbrechnungDetailWindow(GkvAbrechnungVM vM, double height = 600, double width = 900)
public static BeWoWindow GetGkvAbrechnungDetailWindow(GkvAbrechnungLightVM vM, double height = 600, double width = 900)
{
var beWoWindow = GetGenericBeWoWindow("GKV-Abrechnung Nr. " + vM.GkvAbrechnungOid + ": Details", 100, height, 1000, 400, width, 1600);
var beWoWindow = GetGenericBeWoWindow("GKV-Abrechnung Nr. " + vM.Oid + ": Details", 100, height, 1000, 400, width, 1600);
var detail = new GkvAbrechnungDetailControl(vM, beWoWindow);

214
BeWo/ViewModel/CustomerVM.cs
View File

@@ -79,7 +79,14 @@ namespace BeWo.ViewModel
public static string PropertyName_Street = "Street";
public static string PropertyName_TerminationDate = "TerminationDate";
public static string PropertyName_TerminationReason = "TerminationReason";
public static string PropertyName_Town = "Town";
public static string PropertyName_EinkommenBeginnType = "EinkommenBeginnType";
public static string PropertyName_EinkommenEndeType = "EinkommenEndeType";
public static string PropertyName_FremdHilfeType = "FremdHilfeType";
public static string PropertyName_SozSchwierigkeitenType = "SozSchwierigkeitenType";
public static string PropertyName_SozBeziehungenType = "SozBeziehungenType";
public static string PropertyName_ErstaufnahmeType = "ErstaufnahmeType";
public static string PropertyName_RegionType = "RegionType";
public static string PropertyName_Town = "Town";
public static string PropertyName_VarFields = "VarFields";
public static string PropertyName_Kindesmutter = "Kindesmutter";
public static string PropertyName_Kindesvater = "Kindesvater";
@@ -167,7 +174,7 @@ namespace BeWo.ViewModel
private bool _IsAttended;
private bool _IsFemale;
private bool _IsMale;
private bool _IsDivers;
private bool _IsDivers;
private CompactOrganisationDC _Jugendamt;
private string _Kindesmutter;
private string _Kindesvater;
@@ -214,30 +221,51 @@ namespace BeWo.ViewModel
private bool _Aggressiv;
private bool _Hygienebelehrung;
private String _Schutzstufe;
private String _Uebernahmeort;
private String _Verhalten;
private String _Betreuungsbedarf;
private String _BemerkungenSbd;
private String _HealthInsurance;
private String _InsuranceNumber;
private string _VersichertenStatus;
private String _Uebernahmeort;
private String _Verhalten;
private String _Betreuungsbedarf;
private String _BemerkungenSbd;
private String _HealthInsurance;
private String _InsuranceNumber;
private string _VersichertenStatus;
private ActivationTypeId _ActivationType;
private ArbeitszeitListVM _Arbeitszeiten;
private DateTime? _AufenthaltGueltigBis;
private DateTime? _AufenthaltGueltigBis;
private ValueListEntryDC _Nationalitaet;
private ObservableSortCollection<ValueListEntryDC> _Nationalitaeten;
private ValueListEntryDC _AufenthaltsStatus;
private ObservableSortCollection<ValueListEntryDC> _AufenthaltsStatuse;
private ValueListEntryDC _EinkommenBeginnType;
private ObservableSortCollection<ValueListEntryDC> _EinkommenBeginnTypen;
private ValueListEntryDC _EinkommenEndeType;
private ObservableSortCollection<ValueListEntryDC> _EinkommenEndeTypen;
private ValueListEntryDC _FremdHilfeType;
private ObservableSortCollection<ValueListEntryDC> _FremdHilfeTypen;
private ValueListEntryDC _SozSchwierigkeitenType;
private ObservableSortCollection<ValueListEntryDC> _SozSchwierigkeitenTypen;
private ValueListEntryDC _SozBeziehungenType;
private ObservableSortCollection<ValueListEntryDC> _SozBeziehungenTypen;
private ValueListEntryDC _ErstaufnahmeType;
private ObservableSortCollection<ValueListEntryDC> _ErstaufnahmeTypen;
private ValueListEntryDC _RegionType;
private ObservableSortCollection<ValueListEntryDC> _RegionTypen;
private ObservableSortCollection<ValueListEntryDC> _RoleInFamilys;
private ObservableSortCollection<ValueListEntryDC> _EintragKategorien;
private SubstitutionNeed _SubstitutionNeed;
private CustomerWohnhilfeListVM _CustomerWohnhilfeListVM;
private CustomerVermittlungArbeitListVM _CustomerGemeinnutzigeArbeitListVM;
private SubstitutionNeed _SubstitutionNeed;
private CustomerWohnhilfeListVM _CustomerWohnhilfeListVM;
private CustomerVermittlungArbeitListVM _CustomerGemeinnutzigeArbeitListVM;
public CustomerVM()
{
@@ -255,6 +283,14 @@ namespace BeWo.ViewModel
var possibleEintragKategorien = pValueList.Where(vle => vle.Type == ValueListEntryType.NotizenKategorieCustomer);
var possibleauftragsherkunfte = pValueList.Where(vle => vle.Type == ValueListEntryType.Auftragsherkunft);
var possiblevermittlungsgrundlage = pValueList.Where(vle => vle.Type == ValueListEntryType.Vermittlungsgrundlage);
var possibleEinkommenBeginnTypen = pValueList.Where(vle => vle.Type == ValueListEntryType.EinkommenBeginnType);
var possibleEinkommenEndeTypen = pValueList.Where(vle => vle.Type == ValueListEntryType.EinkommenEndeType);
var possibleFremdHilfeTypen = pValueList.Where(vle => vle.Type == ValueListEntryType.FremdHilfeType);
var possibleSozSchwierigkeitenTypen = pValueList.Where(vle => vle.Type == ValueListEntryType.SozSchwierigkeitenType);
var possibleSozBeziehungenTypen = pValueList.Where(vle => vle.Type == ValueListEntryType.SozBeziehungenType);
var possibleErstaufnahmeTypen = pValueList.Where(vle => vle.Type == ValueListEntryType.ErstaufnahmeType);
var possibleRegionTypen = pValueList.Where(vle => vle.Type == ValueListEntryType.RegionType);
_PossibleDisabilities = pDataContract.Disabilities != null
? new ObservableSortCollection<ValueListEntryDC>(possibleDisabilities.Except(pDataContract.Disabilities), Comparer.ValueListEntryDCComparer)
@@ -267,9 +303,17 @@ namespace BeWo.ViewModel
_AufenthaltsStatuse = new ObservableSortCollection<ValueListEntryDC>(possibleAufenthaltsStatuse, Comparer.ValueListEntryDCComparer);
_RoleInFamilys = new ObservableSortCollection<ValueListEntryDC>(possibleFamilyStatuse,Comparer.ValueListEntryDCComparer);
_EintragKategorien = new ObservableSortCollection<ValueListEntryDC>(possibleEintragKategorien, Comparer.ValueListEntryDCComparer);
var auftragsherkunfte = new ObservableSortCollection<ValueListEntryDC>(possibleauftragsherkunfte, Comparer.ValueListEntryDCComparer);
_EinkommenBeginnTypen = new ObservableSortCollection<ValueListEntryDC>(possibleEinkommenBeginnTypen, Comparer.ValueListEntryDCComparer);
_EinkommenEndeTypen = new ObservableSortCollection<ValueListEntryDC>(possibleEinkommenEndeTypen, Comparer.ValueListEntryDCComparer);
_FremdHilfeTypen = new ObservableSortCollection<ValueListEntryDC>(possibleFremdHilfeTypen, Comparer.ValueListEntryDCComparer);
_SozSchwierigkeitenTypen = new ObservableSortCollection<ValueListEntryDC>(possibleSozSchwierigkeitenTypen, Comparer.ValueListEntryDCComparer);
_SozBeziehungenTypen = new ObservableSortCollection<ValueListEntryDC>(possibleSozBeziehungenTypen, Comparer.ValueListEntryDCComparer);
_ErstaufnahmeTypen = new ObservableSortCollection<ValueListEntryDC>(possibleErstaufnahmeTypen, Comparer.ValueListEntryDCComparer);
_RegionTypen = new ObservableSortCollection<ValueListEntryDC>(possibleRegionTypen, Comparer.ValueListEntryDCComparer);
var auftragsherkunfte = new ObservableSortCollection<ValueListEntryDC>(possibleauftragsherkunfte, Comparer.ValueListEntryDCComparer);
var vermittlungsgrundlage = new ObservableSortCollection<ValueListEntryDC>(possiblevermittlungsgrundlage, Comparer.ValueListEntryDCComparer);
_CustomerGemeinnutzigeArbeitListVM.InitValueListEntrys(auftragsherkunfte, vermittlungsgrundlage);
_MedArten = new BindingList<MedArtDC>(pPossibleMedArten);
@@ -1274,15 +1318,12 @@ namespace BeWo.ViewModel
public ValueListEntryDC TerminationReason
{
get { return _TerminationReason; }
set
{
if (AreDifferent(_TerminationReason, value))
{
_TerminationReason = value;
StoreDirtyInformation(AreDifferent(DataContract.TerminationReason, value), PropertyName_TerminationReason);
FirePropertyChanged(PropertyName_TerminationReason);
}
}
@@ -1291,6 +1332,125 @@ namespace BeWo.ViewModel
{
get { return _TerminationReasons ?? (_TerminationReasons = new ObservableSortCollection<ValueListEntryDC>()); }
}
public ValueListEntryDC EinkommenBeginnType
{
get { return _EinkommenBeginnType; }
set
{
if (AreDifferent(_EinkommenBeginnType, value))
{
_EinkommenBeginnType = value;
StoreDirtyInformation(AreDifferent(DataContract.EinkommenBeginnType, value), PropertyName_EinkommenBeginnType);
FirePropertyChanged(PropertyName_EinkommenBeginnType);
}
}
}
public ObservableSortCollection<ValueListEntryDC> EinkommenBeginnTypen
{
get { return _EinkommenBeginnTypen ?? (_EinkommenBeginnTypen = new ObservableSortCollection<ValueListEntryDC>()); }
}
public ValueListEntryDC EinkommenEndeType
{
get { return _EinkommenEndeType; }
set
{
if (AreDifferent(_EinkommenEndeType, value))
{
_EinkommenEndeType = value;
StoreDirtyInformation(AreDifferent(DataContract.EinkommenEndeType, value), PropertyName_EinkommenEndeType);
FirePropertyChanged(PropertyName_EinkommenEndeType);
}
}
}
public ObservableSortCollection<ValueListEntryDC> EinkommenEndeTypen
{
get { return _EinkommenEndeTypen ?? (_EinkommenEndeTypen = new ObservableSortCollection<ValueListEntryDC>()); }
}
public ValueListEntryDC FremdHilfeType
{
get { return _FremdHilfeType; }
set
{
if (AreDifferent(_FremdHilfeType, value))
{
_FremdHilfeType = value;
StoreDirtyInformation(AreDifferent(DataContract.FremdHilfeType, value), PropertyName_FremdHilfeType);
FirePropertyChanged(PropertyName_FremdHilfeType);
}
}
}
public ObservableSortCollection<ValueListEntryDC> FremdHilfeTypen
{
get { return _FremdHilfeTypen ?? (_FremdHilfeTypen = new ObservableSortCollection<ValueListEntryDC>()); }
}
public ValueListEntryDC SozSchwierigkeitenType
{
get { return _SozSchwierigkeitenType; }
set
{
if (AreDifferent(_SozSchwierigkeitenType, value))
{
_SozSchwierigkeitenType = value;
StoreDirtyInformation(AreDifferent(DataContract.SozSchwierigkeitenType, value), PropertyName_SozSchwierigkeitenType);
FirePropertyChanged(PropertyName_SozSchwierigkeitenType);
}
}
}
public ObservableSortCollection<ValueListEntryDC> SozSchwierigkeitenTypen
{
get { return _SozSchwierigkeitenTypen ?? (_SozSchwierigkeitenTypen = new ObservableSortCollection<ValueListEntryDC>()); }
}
public ValueListEntryDC SozBeziehungenType
{
get { return _SozBeziehungenType; }
set
{
if (AreDifferent(_SozBeziehungenType, value))
{
_SozBeziehungenType = value;
StoreDirtyInformation(AreDifferent(DataContract.SozBeziehungenType, value), PropertyName_SozBeziehungenType);
FirePropertyChanged(PropertyName_SozBeziehungenType);
}
}
}
public ObservableSortCollection<ValueListEntryDC> SozBeziehungenTypen
{
get { return _SozBeziehungenTypen ?? (_SozBeziehungenTypen = new ObservableSortCollection<ValueListEntryDC>()); }
}
public ValueListEntryDC ErstaufnahmeType
{
get { return _ErstaufnahmeType; }
set
{
if (AreDifferent(_ErstaufnahmeType, value))
{
_ErstaufnahmeType = value;
StoreDirtyInformation(AreDifferent(DataContract.ErstaufnahmeType, value), PropertyName_ErstaufnahmeType);
FirePropertyChanged(PropertyName_ErstaufnahmeType);
}
}
}
public ObservableSortCollection<ValueListEntryDC> ErstaufnahmeTypen
{
get { return _ErstaufnahmeTypen ?? (_ErstaufnahmeTypen = new ObservableSortCollection<ValueListEntryDC>()); }
}
public ValueListEntryDC RegionType
{
get { return _RegionType; }
set
{
if (AreDifferent(_RegionType, value))
{
_RegionType = value;
StoreDirtyInformation(AreDifferent(DataContract.RegionType, value), PropertyName_RegionType);
FirePropertyChanged(PropertyName_RegionType);
}
}
}
public ObservableSortCollection<ValueListEntryDC> RegionTypen
{
get { return _RegionTypen ?? (_RegionTypen = new ObservableSortCollection<ValueListEntryDC>()); }
}
public string Town
{
get { return _Town; }
@@ -1927,8 +2087,15 @@ namespace BeWo.ViewModel
_AssistanceBegin = pDataContract.AssistanceBegin;
_TerminationDate = pDataContract.TerminationDate;
_TerminationReason = pDataContract.TerminationReason;
_EinkommenBeginnType = pDataContract.EinkommenBeginnType;
_EinkommenEndeType = pDataContract.EinkommenEndeType;
_FremdHilfeType = pDataContract.FremdHilfeType;
_SozSchwierigkeitenType = pDataContract.SozSchwierigkeitenType;
_SozBeziehungenType = pDataContract.SozBeziehungenType;
_ErstaufnahmeType = pDataContract.ErstaufnahmeType;
_RegionType = pDataContract.RegionType;
_AusstVersAmt = pDataContract.AusstVersAmt;
_AusstVersAmt = pDataContract.AusstVersAmt;
_AusweisGueltigVon = pDataContract.AusweisGueltigVon;
_AusweisGueltigBis = pDataContract.AusweisGueltigBis;
_AusweisAktenzeichen = pDataContract.AusweisAktenzeichen;
@@ -2158,7 +2325,14 @@ namespace BeWo.ViewModel
pDataContract.AssistanceBegin = _AssistanceBegin;
pDataContract.TerminationDate = _TerminationDate;
pDataContract.TerminationReason = _TerminationReason;
pDataContract.DebitorNumber = _DebitorNumber;
pDataContract.EinkommenBeginnType = _EinkommenBeginnType;
pDataContract.EinkommenEndeType = _EinkommenEndeType;
pDataContract.FremdHilfeType = _FremdHilfeType;
pDataContract.SozSchwierigkeitenType = _SozSchwierigkeitenType;
pDataContract.SozBeziehungenType = _SozBeziehungenType;
pDataContract.ErstaufnahmeType = _ErstaufnahmeType;
pDataContract.RegionType = _RegionType;
pDataContract.DebitorNumber = _DebitorNumber;
pDataContract.CostCenter = _CostCenter;
pDataContract.ICD10DiagnosisCodes = ICD10Codes.ToList();
pDataContract.Medication = _Medication;

58
BeWo/ViewModel/Light/GkvAbrechnungLightVM.cs
View File

@@ -54,7 +54,8 @@ namespace BeWo.ViewModel.Light
public GkvAbrechnungLightVM(GkvAbrechnungLightDC pDC) : base(pDC, false)
{
InvoiceBases = new BindingList<InvoiceBaseLightVM>();
if(InvoiceBases is null)
InvoiceBases = new BindingList<InvoiceBaseVM>();
CheckAllInvoiceBasesCommand = new DelegateCommand(CheckAllInvoiceBases, HasAnyInvoiceBases);
UncheckAllInvoiceBasesCommand = new DelegateCommand(UncheckAllInvoicesBases, HasAnyInvoiceBases);
@@ -223,7 +224,7 @@ namespace BeWo.ViewModel.Light
}
}
public BindingList<InvoiceBaseLightVM> InvoiceBases { get; set; }
public BindingList<InvoiceBaseVM> InvoiceBases { get; set; }
public List<GkvTransferProtokollLightDC> Protokolle
{
@@ -237,34 +238,6 @@ namespace BeWo.ViewModel.Light
FirePropertyChanged(nameof(LastTransferDateTime));
}
}
public long OrganisationOid
{
get { return _OrganisationOid; }
set
{
if (!AreDifferent(_OrganisationOid, value))
return;
_OrganisationOid = value;
StoreDirtyInformation(this.AreDifferent(this.DataContract.OrganisationOid, value), nameof(OrganisationOid));
FirePropertyChanged(nameof(OrganisationOid));
}
}
public string OrganisationName
{
get { return _OrganisationName; }
set
{
if (!AreDifferent(_OrganisationName, value))
return;
_OrganisationName = value;
StoreDirtyInformation(this.AreDifferent(this.DataContract.OrganisationName, value), nameof(OrganisationName));
FirePropertyChanged(nameof(OrganisationName));
}
}
public GkvVerfahrensstufe Verfahrensstufe
{
get { return this._Verfahrensstufe; }
@@ -274,7 +247,7 @@ namespace BeWo.ViewModel.Light
if (this.AreDifferent(this._Verfahrensstufe, value))
{
this._Verfahrensstufe = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Verfahrensstufe, value), nameof(Verfahrensstufe));
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Verfahrensstufe, (int)value), nameof(Verfahrensstufe));
this.FirePropertyChanged(nameof(Verfahrensstufe));
}
}
@@ -303,14 +276,14 @@ namespace BeWo.ViewModel.Light
return InvoiceBases.First().RecipientOrganisation;
}
return string.Empty;
return "Fehler";
}
}
public string Fehlermeldung
{
get
{
if (!(LastTransferProtokoll is GkvTransferProtokollDC last))
if (!(LastTransferProtokoll is GkvTransferProtokollLightDC last))
return null;
if (string.IsNullOrWhiteSpace(last.Fehlernachricht))
@@ -326,7 +299,7 @@ namespace BeWo.ViewModel.Light
{
get
{
if (LastTransferProtokoll is GkvTransferProtokollDC last)
if (LastTransferProtokoll is GkvTransferProtokollLightDC last)
return last.ErstelltAm?.Date;
return null;
@@ -390,8 +363,9 @@ namespace BeWo.ViewModel.Light
if (pDataContract.InvoiceBases != null)
{
var l = pDataContract.InvoiceBases.Select(x => new InvoiceBaseLightVM(x, true)).ToList();
InvoiceBases = new BindingList<InvoiceBaseLightVM>(l);
var l = pDataContract.InvoiceBases.Select(x => new InvoiceBaseVM(x, true)).ToList();
InvoiceBases.Clear();
InvoiceBases.AddRange(l);
}
}
protected override void InitByDataContract(GkvAbrechnungLightDC pDataContract)
@@ -409,12 +383,12 @@ namespace BeWo.ViewModel.Light
_Betrag = pDataContract.Betrag;
_Bezahlt = pDataContract.Bezahlt;
_UrbelegeGesendet = pDataContract.UrbelegeGesendet;
_Verfahrensstufe = pDataContract.Verfahrensstufe;
_Verfahrensstufe = (GkvVerfahrensstufe)pDataContract.Verfahrensstufe;
if (pDataContract.InvoiceBases != null)
{
var l = pDataContract.InvoiceBases.Select(x => new InvoiceBaseLightVM(x, true)).ToList();
InvoiceBases = new BindingList<InvoiceBaseLightVM>(l);
var l = pDataContract.InvoiceBases.Select(x => new InvoiceBaseVM(x, true)).ToList();
InvoiceBases = new BindingList<InvoiceBaseVM>(l);
}
if (pDataContract.Protokolle != null)
@@ -422,8 +396,8 @@ namespace BeWo.ViewModel.Light
_Protokolle = new List<GkvTransferProtokollLightDC>(pDataContract.Protokolle);
}
_OrganisationOid = pDataContract.OrganisationOid;
_OrganisationName = pDataContract.OrganisationName;
_OrganisationOid = pDataContract.Organisation.Oid;
_OrganisationName = pDataContract.Organisation.Name;
_IsReady2Send = pDataContract.IsReady2Send;
_SendTooltip = pDataContract.SendTooltip;
@@ -515,7 +489,7 @@ namespace BeWo.ViewModel.Light
private IEnumerable<long> getSelectedInvoiceBases()
{
return InvoiceBases.Where(x => x.IsChecked).Select(x => x.DataContract.Oid.Value);
return InvoiceBases.Where(x => x.IsChecked).Select(x => x.DataContract.InvoiceBaseOid.Value);
}
}
}

9
BeWo/ViewModel/VMFactory.cs
View File

@@ -714,7 +714,14 @@ namespace BeWo.ViewModel
ValueListEntryType.RoleInFamily,
ValueListEntryType.NotizenKategorieCustomer,
ValueListEntryType.Auftragsherkunft,
ValueListEntryType.Vermittlungsgrundlage
ValueListEntryType.Vermittlungsgrundlage,
ValueListEntryType.EinkommenBeginnType,
ValueListEntryType.EinkommenEndeType,
ValueListEntryType.FremdHilfeType,
ValueListEntryType.SozSchwierigkeitenType,
ValueListEntryType.SozBeziehungenType,
ValueListEntryType.ErstaufnahmeType,
ValueListEntryType.RegionType
};
ServiceFacade.DoValueListServiceAsync(

27
BeWoAllReports.sln
View File

@@ -907,8 +907,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InklusioElmarBauer", "Repor
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuswegHeikePuetz", "ReportImp\AuswegHeikePuetz\AuswegHeikePuetz.csproj", "{1154ACF1-E4B3-4040-AFB3-750A871A8004}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeikePuetz", "ReportImp\HeikePuetzBewoAusweg\HeikePuetz.csproj", "{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_TemplateNeuKunde", "ReportImp\_TemplateNeuKunde\_TemplateNeuKunde.csproj", "{669D2874-57A2-4811-80DD-EFF78EC079B7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LebenshilfeBadKreuznachFUD", "ReportImp\LebenshilfeBadKreuznachFUD\LebenshilfeBadKreuznachFUD.csproj", "{5A3315F2-4976-4C88-B95E-D897BF61EF1C}"
@@ -11178,30 +11176,6 @@ Global
{1154ACF1-E4B3-4040-AFB3-750A871A8004}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{1154ACF1-E4B3-4040-AFB3-750A871A8004}.Release|x86.ActiveCfg = Release|Any CPU
{1154ACF1-E4B3-4040-AFB3-750A871A8004}.Release|x86.Build.0 = Release|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.Debug|.NET.ActiveCfg = Debug|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.Debug|.NET.Build.0 = Debug|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.Debug|x86.ActiveCfg = Debug|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.Debug|x86.Build.0 = Debug|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.DebugRemote|.NET.Build.0 = Debug|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.DebugRemote|x86.Build.0 = Debug|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.Release|.NET.ActiveCfg = Release|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.Release|.NET.Build.0 = Release|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.Release|Any CPU.Build.0 = Release|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.Release|x86.ActiveCfg = Release|Any CPU
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}.Release|x86.Build.0 = Release|Any CPU
{669D2874-57A2-4811-80DD-EFF78EC079B7}.Debug|.NET.ActiveCfg = Debug|Any CPU
{669D2874-57A2-4811-80DD-EFF78EC079B7}.Debug|.NET.Build.0 = Debug|Any CPU
{669D2874-57A2-4811-80DD-EFF78EC079B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -11773,7 +11747,6 @@ Global
{D8898ACE-241C-4F3E-9378-C37BAC8370FE} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{D36B27F2-88E6-41BF-B52C-B4520D506DFA} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{1154ACF1-E4B3-4040-AFB3-750A871A8004} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{669D2874-57A2-4811-80DD-EFF78EC079B7} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{5A3315F2-4976-4C88-B95E-D897BF61EF1C} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{7398111F-8F04-438A-A2A5-AF046C39E3F7} = {D8A691C5-146D-4613-86CC-438F02FE9106}

8
Data/Data.csproj
View File

@@ -819,6 +819,14 @@
<EmbeddedResource Include="Mappings\AiConversationMessage.hbm.xml" />
<EmbeddedResource Include="Mappings\AiModel.hbm.xml" />
<EmbeddedResource Include="Mappings\AiConfig.hbm.xml" />
<EmbeddedResource Include="Mappings\GkvAbrechnungLight.hbm.xml" />
<EmbeddedResource Include="Mappings\GkvTransferProtokollLight.hbm.xml" />
<EmbeddedResource Include="Mappings\InvoiceBaseLight.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Mappings\OrganisationLight.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
<Content Include="Mappings\Timesheet2Mail.hbm.xml" />
<EmbeddedResource Include="Mappings\ContactHistory.hbm.xml">
<SubType>Designer</SubType>

100
Data/Entities/Customer.cs
View File

@@ -35,6 +35,13 @@ namespace BeWo.Data.Entities
public static string PropertyName_SupportConcepts = "SupportConcepts";
public static string PropertyName_TerminationDate = "TerminationDate";
public static string PropertyName_TerminationReason = "TerminationReason";
public static string PropertyName_EinkommenBeginnType = "EinkommenBeginnType";
public static string PropertyName_EinkommenEndeType = "EinkommenEndeType";
public static string PropertyName_FremdHilfeType = "FremdHilfeType";
public static string PropertyName_SozSchwierigkeitenType = "SozSchwierigkeitenType";
public static string PropertyName_SozBeziehungenType = "SozBeziehungenType";
public static string PropertyName_ErstaufnahmeType = "ErstaufnahmeType";
public static string PropertyName_RegionType = "RegionType";
public static string PropertyName_ValueList = "ValueList";
public static string PropertyName_VarFieldValueList = "VarFieldValueList";
public static string PropertyName_Medikamentenverordnungslisten = "Medikamentenverordnungslisten";
@@ -89,6 +96,13 @@ namespace BeWo.Data.Entities
private IList<Team2Customer> _Team2CustomerList;
private DateTime? _TerminationDate;
private ValueListEntry _TerminationReason;
private ValueListEntry _EinkommenBeginnType;
private ValueListEntry _EinkommenEndeType;
private ValueListEntry _FremdHilfeType;
private ValueListEntry _SozSchwierigkeitenType;
private ValueListEntry _SozBeziehungenType;
private ValueListEntry _ErstaufnahmeType;
private ValueListEntry _RegionType;
private IList<ValueListEntry2Object> _ValueList;
private IList<VarFieldValue> _VarFieldValueList;
private DateTime? _AssistanceBegin;
@@ -485,7 +499,6 @@ namespace BeWo.Data.Entities
}
}
}
public virtual ValueListEntry TerminationReason
{
get { return _TerminationReason; }
@@ -499,6 +512,91 @@ namespace BeWo.Data.Entities
}
}
public virtual ValueListEntry EinkommenBeginnType
{
get { return _EinkommenBeginnType; }
set
{
if (AreDifferent(_EinkommenBeginnType, value))
{
_EinkommenBeginnType = value;
}
}
}
public virtual ValueListEntry EinkommenEndeType
{
get { return _EinkommenEndeType; }
set
{
if (AreDifferent(_EinkommenEndeType, value))
{
_EinkommenEndeType = value;
}
}
}
public virtual ValueListEntry FremdHilfeType
{
get { return _FremdHilfeType; }
set
{
if (AreDifferent(_FremdHilfeType, value))
{
_FremdHilfeType = value;
}
}
}
public virtual ValueListEntry SozSchwierigkeitenType
{
get { return _SozSchwierigkeitenType; }
set
{
if (AreDifferent(_SozSchwierigkeitenType, value))
{
_SozSchwierigkeitenType = value;
}
}
}
public virtual ValueListEntry SozBeziehungenType
{
get { return _SozBeziehungenType; }
set
{
if (AreDifferent(_SozBeziehungenType, value))
{
_SozBeziehungenType = value;
}
}
}
public virtual ValueListEntry ErstaufnahmeType
{
get { return _ErstaufnahmeType; }
set
{
if (AreDifferent(_ErstaufnahmeType, value))
{
_ErstaufnahmeType = value;
}
}
}
public virtual ValueListEntry RegionType
{
get { return _RegionType; }
set
{
if (AreDifferent(_RegionType, value))
{
_RegionType = value;
}
}
}
public virtual IList<ValueListEntry2Object> ValueList
{
get { return _ValueList ?? (_ValueList = new List<ValueListEntry2Object>()); }

122
Data/Entities/CustomerHistory.cs
View File

@@ -33,6 +33,20 @@ namespace BeWo.Data.Entities
public static string PropertyName_TerminationReason = "TerminationReason";
public static string PropertyName_EinkommenBeginnType = "EinkommenBeginnType";
public static string PropertyName_EinkommenEndeType = "EinkommenEndeType";
public static string PropertyName_FremdHilfeType = "FremdHilfeType";
public static string PropertyName_SozSchwierigkeitenType = "SozSchwierigkeitenType";
public static string PropertyName_SozBeziehungenType = "SozBeziehungenType";
public static string PropertyName_ErstaufnahmeType = "ErstaufnahmeType";
public static string PropertyName_RegionType = "RegionType";
public static string PropertyName_CustomerOid = "CustomerOid";
public static string PropertyName_CustomerInsTs = "CustomerInsTs";
@@ -89,6 +103,20 @@ namespace BeWo.Data.Entities
private ValueListEntry _TerminationReason;
private ValueListEntry _EinkommenBeginnType;
private ValueListEntry _EinkommenEndeType;
private ValueListEntry _FremdHilfeType;
private ValueListEntry _SozSchwierigkeitenType;
private ValueListEntry _SozBeziehungenType;
private ValueListEntry _ErstaufnahmeType;
private ValueListEntry _RegionType;
private string _Environment;
private StatementType _ChangeType;
@@ -330,16 +358,98 @@ namespace BeWo.Data.Entities
public virtual ValueListEntry TerminationReason
{
get
{
return this._TerminationReason;
}
get { return _TerminationReason; }
set
{
if (this.AreDifferent(this._TerminationReason, value))
if (AreDifferent(_TerminationReason, value))
{
this._TerminationReason = value;
_TerminationReason = value;
}
}
}
public virtual ValueListEntry EinkommenBeginnType
{
get { return _EinkommenBeginnType; }
set
{
if (AreDifferent(_EinkommenBeginnType, value))
{
_EinkommenBeginnType = value;
}
}
}
public virtual ValueListEntry EinkommenEndeType
{
get { return _EinkommenEndeType; }
set
{
if (AreDifferent(_EinkommenEndeType, value))
{
_EinkommenEndeType = value;
}
}
}
public virtual ValueListEntry FremdHilfeType
{
get { return _FremdHilfeType; }
set
{
if (AreDifferent(_FremdHilfeType, value))
{
_FremdHilfeType = value;
}
}
}
public virtual ValueListEntry SozSchwierigkeitenType
{
get { return _SozSchwierigkeitenType; }
set
{
if (AreDifferent(_SozSchwierigkeitenType, value))
{
_SozSchwierigkeitenType = value;
}
}
}
public virtual ValueListEntry SozBeziehungenType
{
get { return _SozBeziehungenType; }
set
{
if (AreDifferent(_SozBeziehungenType, value))
{
_SozBeziehungenType = value;
}
}
}
public virtual ValueListEntry ErstaufnahmeType
{
get { return _ErstaufnahmeType; }
set
{
if (AreDifferent(_ErstaufnahmeType, value))
{
_ErstaufnahmeType = value;
}
}
}
public virtual ValueListEntry RegionType
{
get { return _RegionType; }
set
{
if (AreDifferent(_RegionType, value))
{
_RegionType = value;
}
}
}

5
Data/Entities/Light/GkvAbrechnungLight.cs
View File

@@ -15,14 +15,13 @@ namespace BeWo.Data.Entities.Light
{
public virtual DateTime ErstelltAm { get; set; }
public virtual decimal Betrag { get; set; }
public virtual long OrganisationOid { get; set; }
public virtual string OrganisationName { get; set; }
public virtual DateTime? AbrechnungsZeitraumStart { get; set; }
public virtual DateTime? AbrechnungsZeitraumEnde { get; set; }
public virtual bool UrbelegeGesendet { get; set; }
public virtual bool Bezahlt { get; set; }
public virtual GkvVerfahrensstufe Verfahrensstufe { get; set; }
public virtual IList<InvoiceBaseLight> InvoiceBases { get; set; }
public virtual OrganisationLight Organisation { get; set; }
public virtual IList<InvoiceBase> InvoiceBases { get; set; }
public virtual IList<GkvTransferProtokollLight> Protokolle { get; set; }
public virtual IEnumerable<IGkvTransferProtokoll> TransferProtokolle => Protokolle;

2
Data/Entities/Light/GkvTransferProtokollLight.cs
View File

@@ -33,6 +33,6 @@ namespace BeWo.Data.Entities.Light
public virtual DateTime? Fehlerdatum { get; set; }
public virtual string Fehlernachricht { get; set; }
public string BezDatenannahmestelle => EmpfangerBezeichnung;
public virtual string BezDatenannahmestelle => EmpfangerBezeichnung;
}
}

2
Data/Entities/Light/OrganisationLight.cs
View File

@@ -8,8 +8,6 @@ namespace BeWo.Data.Entities.Light
[DebuggerDisplay("{Name}")]
public class OrganisationLight : LightEntity, IOrganisation
{
public virtual long OrganisationOid { get; set; }
public virtual long OrganisationVersion { get; set; }
public virtual string Name { get; set; }
public virtual string IKKrankenkasse { get; set; }
public virtual string IKKostentrager { get; set; }

7
Data/Mappings/Customer.hbm.xml
View File

@@ -29,6 +29,13 @@
<property column="DistanceInMeter" type="Int32" name="DistanceInMeter" />
<many-to-one name="TerminationReason" column="TerminationValueListEntryOid" class="BeWo.Data.Entities.ValueListEntry,BeWo.Data" cascade="none" />
<many-to-one name="EinkommenBeginnType" column="EinkommenBeginnValueListEntryOid" class="BeWo.Data.Entities.ValueListEntry,BeWo.Data" cascade="none" />
<many-to-one name="EinkommenEndeType" column="EinkommenEndeValueListEntryOid" class="BeWo.Data.Entities.ValueListEntry,BeWo.Data" cascade="none" />
<many-to-one name="FremdHilfeType" column="FremdHilfeValueListEntryOid" class="BeWo.Data.Entities.ValueListEntry,BeWo.Data" cascade="none" />
<many-to-one name="SozSchwierigkeitenType" column="SozSchwierigkeitenValueListEntryOid" class="BeWo.Data.Entities.ValueListEntry,BeWo.Data" cascade="none" />
<many-to-one name="SozBeziehungenType" column="SozBeziehungenValueListEntryOid" class="BeWo.Data.Entities.ValueListEntry,BeWo.Data" cascade="none" />
<many-to-one name="ErstaufnahmeType" column="ErstaufnahmeValueListEntryOid" class="BeWo.Data.Entities.ValueListEntry,BeWo.Data" cascade="none" />
<many-to-one name="RegionType" column="RegionValueListEntryOid" class="BeWo.Data.Entities.ValueListEntry,BeWo.Data" cascade="none" />
<many-to-one name="Person" column="PersonOid" class="BeWo.Data.Entities.Person,BeWo.Data" cascade="all-delete-orphan" fetch="join"/>
<property column="CustomerAlias" type="String" name="CustomerAlias" length="256" />

39
Data/Mappings/GkvAbrechnungLight.hbm.xml Normal file
View File

@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
<class name="BeWo.Data.Entities.Light.GkvAbrechnungLight, BeWo.Data" table="GkvAbrechnung">
<id name="Oid" column="Oid" type="Int64" unsaved-value="null">
<generator class="identity" />
</id>
<version type="Int64" column="Version" name="Version" />
<property column="Tid" type="BS.Shared.TableID, BS.Shared" name="_Tid" access="field" />
<property column="AbrechnungsZeitraumStart" type="DateTime" name="AbrechnungsZeitraumStart" />
<property column="AbrechnungsZeitraumEnde" type="DateTime" name="AbrechnungsZeitraumEnde" />
<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" />
<property column="UdpUser" type="String" name="UdpUser" length="256" />
<property column="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" name="IsActive" />
<property column="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="SystemEntryID" />
<property column="Betrag" type="decimal" name="Betrag" />
<property column="Bezahlt" type="bool" name="Bezahlt" />
<property column="UrbelegeGesendet" type="bool" name="UrbelegeGesendet" />
<property column="ErstelltAm" type="DateTime" name="ErstelltAm" />
<property column="Verfahrensstufe" type="BS.Shared.GkvVerfahrensstufe, BS.Shared" name="Verfahrensstufe"/>
<many-to-one name="Organisation" column="OrganisationOid" class="BeWo.Data.Entities.Light.OrganisationLight,BeWo.Data" cascade="none" fetch="join"/>
<bag name="InvoiceBases" table="gkvabrechnung2invoicebase" generic="true" cascade="none" batch-size="250">
<key column="gkvabrechnungoid" />
<many-to-many column="invoicebaseoid" class="BeWo.Data.Entities.InvoiceBase, BeWo.Data" />
</bag>
<bag name="Protokolle" table="gkvtransferprotokoll" generic="true" cascade="all-delete-orphan" batch-size="250">
<key column="gkvabrechnungoid" />
<one-to-many class="BeWo.Data.Entities.Light.GkvTransferProtokollLight, BeWo.Data" />
</bag>
</class>
</hibernate-mapping>

41
Data/Mappings/GkvTransferProtokollLight.hbm.xml Normal file
View File

@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
<class name="BeWo.Data.Entities.Light.GkvTransferProtokollLight, BeWo.Data" table="GkvTransferProtokoll">
<id name="Oid" column="Oid" type="Int64" unsaved-value="null">
<generator class="identity" />
</id>
<version type="Int64" column="Version" name="Version" />
<property column="Tid" type="BS.Shared.TableID, BS.Shared" name="_Tid" access="field" />
<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" />
<property column="UdpUser" type="String" name="UdpUser" length="256" />
<property column="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" name="IsActive" />
<property column="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="SystemEntryID" />
<property column="GkvAbrechnungOid" type="Int64" name="GkvAbrechnungOid" />
<property column="AbsenderBezeichnung" type="string" name="AbsenderBezeichnung" />
<property column="EmpfangerBezeichnung" type="string" name="EmpfangerBezeichnung" />
<property column="Dateityp" type="string" name="Dateityp" />
<property column="Dateiname" type="string" name="Dateiname" />
<property column="IKLeistungserbringer" type="string" name="IKLeistungserbringer" />
<property column="IKKrankenkasse" type="string" name="IKKrankenkasse" />
<property column="IKKostentrager" type="string" name="IKKostentrager" />
<property column="IKDatenannahmestelle" type="string" name="IKDatenannahmestelle" />
<property column="Rechnungsnummer" type="string" name="Rechnungsnummer" />
<property column="Transfername" type="string" name="Transfername" />
<property column="Dateigrosse" type="int" name="Dateigrosse" />
<property column="Datenaustauschreferenz" type="int" name="Datenaustauschreferenz" />
<property column="Transfernummer" type="int" name="Transfernummer" />
<property column="ErstelltAm" type="DateTime" name="ErstelltAm" />
<property column="SentApp8Success" type="Boolean" name="SentApp8Success" />
<property column="SentDakotaSuccess" type="Boolean" name="SentDakotaSuccess" />
<property column="ResultType" type="BS.Shared.GkvTransferResultType, BS.Shared" name="ResultType" />
<property column="Fehlertitel" type="string" name="Fehlertitel" />
<property column="Fehlerdatum" type="DateTime" name="Fehlerdatum" />
<property column="Fehlernachricht" type="string" name="Fehlernachricht" />
</class>
</hibernate-mapping>

42
Data/Mappings/InvoiceBaseLight.hbm.xml Normal file
View File

@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
<class name="BeWo.Data.Entities.Light.InvoiceBaseLight,BeWo.Data" table="InvoiceBase">
<id name="Oid" column="Oid" type="Int64" unsaved-value="null">
<generator class="identity" />
</id>
<version type="Int64" column="Version" name="Version" />
<!--<property column="Tid" type="BS.Shared.TableID, BS.Shared" name="_Tid" access="field" />
<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" />
<property column="UdpUser" type="String" name="UdpUser" length="256" />
<property column="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" name="IsActive" />
<property column="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="SystemEntryID" />
<property column="Type" type="BS.Shared.InvoiceType, BS.Shared" name="Type" />
<property column="AccountingPeriodStart" type="DateTime" name="AccountingPeriodStart" />
<property column="AccountingPeriodEnd" type="DateTime" name="AccountingPeriodEnd" />
<property column="InvoiceDate" type="DateTime" name="InvoiceDate" />
<property column="InvoiceNumber" type="String" name="InvoiceNumber" unique-key="InvoiceNumber"/>
<property column="InvoiceId" type="String" name="InvoiceId" />
<property column="InvoiceTypeText" type="String" name="InvoiceTypeText" />
<property column="IsReviewed" type="Boolean" name="IsReviewed" />
<property column="IsSent" type="Boolean" name="IsSent" />
<property column="IsExported" type="Boolean" name="IsExported" />
<property column="IsPaid" type="Boolean" name="IsPaid" />
<property column="RecipientOrganisation" type="String" name="RecipientOrganisation" />
<property column="RecipientOrganisationOid" type="Int64" name="RecipientOrganisationOid" />
<property column="RecipientPersonFirstName" type="String" name="RecipientPersonFirstName" />
<property column="RecipientPersonLastName" type="String" name="RecipientPersonLastName" />
<property column="RecipientPersonOid" type="Int64" name="RecipientPersonOid" />
<property column="DunningLetterCount" type="Int32" name="DunningLetterCount" />
<property column="SenderDivision" type="String" name="SenderDivision" />
<property column="SenderFirstName" type="String" name="SenderFirstName" />
<property column="SenderLastName" type="String" name="SenderLastName" />
<property column="SenderOrganisation" type="String" name="SenderOrganisation" />
<property column="SupportConceptOid" type="Int64" name="SupportConceptOid" />
<property column="StornoInvoiceBaseOid" type="Int64" name="StornoInvoiceBaseOid" />
<property column="CostBearer2SupportConceptOid" type="Int64" name="CostBearer2SupportConceptOid" update="false" insert="false"/>
<property column="CustomerReferenceNumber" type="String" name="CustomerReferenceNumber" />-->
</class>
</hibernate-mapping>

21
Data/Mappings/OrganisationLight.hbm.xml Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
<class name="BeWo.Data.Entities.Light.OrganisationLight,BeWo.Data" table="Organisation">
<id name="Oid" column="Oid" type="Int64" unsaved-value="null">
<generator class="identity" />
</id>
<version type="Int64" column="Version" name="Version" />
<property column="Name" type="String" name="Name" not-null="true" length="256" />
<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" />
<property column="UdpUser" type="String" name="UdpUser" length="256" />
<property column="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" name="IsActive" />
<property column="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="SystemEntryID" />
<property column="IKKrankenkasse" type="String" name="IKKrankenkasse" length="256" />
<property column="IKKostentrager" type="String" name="IKKostentrager" length="256" />
<property column="IKDatenannahmestelle" type="String" name="IKDatenannahmestelle" length="256" />
<property column="BezDatenannahmestelle" type="String" name="BezDatenannahmestelle" length="256" />
</class>
</hibernate-mapping>

8
Model/Changes_2025-06-13_Customer_StatistikAngaben.txt Normal file
View File

@@ -0,0 +1,8 @@
ALTER TABLE `customer`
ADD COLUMN `EinkommenBeginnValueListEntryOid` BIGINT NULL DEFAULT NULL AFTER `CustomerFalldatenOid`,
ADD COLUMN `EinkommenEndeValueListEntryOid` BIGINT NULL DEFAULT NULL AFTER `EinkommenBeginnValueListEntryOid`,
ADD COLUMN `FremdHilfeValueListEntryOid` BIGINT NULL DEFAULT NULL AFTER `EinkommenEndeValueListEntryOid`,
ADD COLUMN `SozSchwierigkeitenValueListEntryOid` BIGINT NULL DEFAULT NULL AFTER `FremdHilfeValueListEntryOid`,
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`;

33
Model/Changes_alle_fuer_neue_db.txt
View File

@@ -1562,28 +1562,11 @@ CHANGE COLUMN `Text` `Text` LONGBLOB NULL DEFAULT NULL ;
ALTER TABLE `dokumentvorlage`
CHANGE COLUMN `RTFText` `RTFText` LONGBLOB NULL DEFAULT NULL ;
ALTER TABLE `organisation`
ADD COLUMN `HausanschriftAddressOid` BIGINT NULL DEFAULT NULL AFTER `CostBearerOid`,
ADD COLUMN `PostfachanschriftAddressOid` BIGINT NULL DEFAULT NULL AFTER `HausanschriftAddressOid`,
ADD COLUMN `GroßkundenanschriftAddressOid` BIGINT NULL DEFAULT NULL AFTER `PostfachanschriftAddressOid`,
ADD INDEX `FK_ORGANISA_HAUSADD_idx` (`HausanschriftAddressOid` ASC) VISIBLE,
ADD INDEX `FK_ORGANISA_POSTADD_idx` (`PostfachanschriftAddressOid` ASC) VISIBLE,
ADD INDEX `FK_ORGANISA_GROSADD_idx` (`GroßkundenanschriftAddressOid` ASC) VISIBLE;
;
ALTER TABLE `organisation`
ADD CONSTRAINT `FK_ORGANISA_HAUSADD`
FOREIGN KEY (`HausanschriftAddressOid`)
REFERENCES `address` (`Oid`)
ON DELETE CASCADE
ON UPDATE CASCADE,
ADD CONSTRAINT `FK_ORGANISA_POSTADD`
FOREIGN KEY (`PostfachanschriftAddressOid`)
REFERENCES `address` (`Oid`)
ON DELETE CASCADE
ON UPDATE CASCADE,
ADD CONSTRAINT `FK_ORGANISA_GROSADD`
FOREIGN KEY (`GroßkundenanschriftAddressOid`)
REFERENCES `address` (`Oid`)
ON DELETE CASCADE
ON UPDATE CASCADE;
ALTER TABLE `customer`
ADD COLUMN `EinkommenBeginnValueListEntryOid` BIGINT NULL DEFAULT NULL AFTER `CustomerFalldatenOid`,
ADD COLUMN `EinkommenEndeValueListEntryOid` BIGINT NULL DEFAULT NULL AFTER `EinkommenBeginnValueListEntryOid`,
ADD COLUMN `FremdHilfeValueListEntryOid` BIGINT NULL DEFAULT NULL AFTER `EinkommenEndeValueListEntryOid`,
ADD COLUMN `SozSchwierigkeitenValueListEntryOid` BIGINT NULL DEFAULT NULL AFTER `FremdHilfeValueListEntryOid`,
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`;

192
ReportImp/AlzeyTeilhabe/StundenzettelWo - Kopie.cs Normal file
View File

@@ -0,0 +1,192 @@
using System;
using System.Collections;
using System.ComponentModel;
using DevExpress.XtraReports.UI;
using BeWo.Report.ReportObjects;
using BeWo.Report;
using System.Collections.Generic;
using BeWo.Service.DCEntityMapper;
using BS.Shared;
using BS.Shared.Extensions;
using BeWo.Service.ServiceImplementations;
using BS.Shared.Core;
using System.Linq;
using BS.Shared.DataContracts;
using System.Text.RegularExpressions;
using System.IO;
using System.Drawing;
using BeWo.Data.Access;
using BeWo.Data.Entities;
namespace AlzeyTeilhabe
{
public partial class StundenzettelWo : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<ServicesOverviewRO>
{
public StundenzettelWo()
{
InitializeComponent();
}
public void SetReportDataSource(ServicesOverviewRO pRO)
{
decimal stundensatz = GetStundensatz(pRO);
decimal pauschale = 0;
pRO.RateFactor = stundensatz;
pRO.TotalFLSQualified = 0;
pRO.TotalFLSUnqualified = 0;
if (pRO.Services != null)
{
List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services)
{
s.FLSQualified = 0;
s.FLSUnqualified = 0;
if (s.IsBillable)
{
ServicesOverviewRO.CreateSignatureString(s);
if (s.ServiceDescription == "Wegepauschale")
{
s.FLSUnqualified = 1;
pRO.TotalFLSUnqualified += 1;
}
else
{
s.FLSQualified = s.Minutes / 60;
pRO.TotalFLSQualified += s.FLSQualified;
}
servicesBillable.Add(s);
}
}
if (pRO.Services.Count > 0)
{
pauschale = GetWegepauschale(pRO.Services[0].ServiceRecordOid);
}
pRO.Services = servicesBillable;
var sumFLS = Math.Round((decimal)pRO.TotalFLSQualified * stundensatz, 2, MidpointRounding.AwayFromZero);
var sumPausch = Math.Round((decimal)pRO.TotalFLSUnqualified * pauschale, 2, MidpointRounding.AwayFromZero);
lblSumFls.Text = String.Format("{0:0.00} €", sumFLS);
if (pRO.StartDate > new DateTime(2025, 04, 30))
{
lblPauschale.Text = String.Format("{0:0.00} €", pauschale);
lblSumPauschale.Text = String.Format("{0:0.00} €", sumPausch);
lblSum.Text = String.Format("{0:0.00} €", sumPausch + sumFLS);
lblPauschale.Visible = true;
lblSumPauschale.Visible = true;
lblSum.Visible = true;
xrLabel27.Visible = true;
xrLabel28.Visible = true;
xrLabel30.Visible = true;
}
}
decimal uebertragFLS = 0;
if (pRO.SupportConceptCostBearer != null)
{
var sc = pRO.SupportConceptCostBearer.SupportConcept;
var span = new DateTimeSpan();
foreach (var cb2sc in pRO.CostBearer2SupportConceptList)
{
if (cb2sc.CostBearer.Organisation.Name == pRO.Costbearer)
{
foreach (var scap in cb2sc.ApprovalPeriodList)
{
if (scap.StartDate.HasValue)
{
DateTime enddate;
if (scap.EndDate.HasValue)
enddate = scap.EndDate.Value;
else
enddate = pRO.EndDate;
if (pRO.StartDate.Date >= scap.StartDate.Value.Date && pRO.EndDate.Date <= enddate)
{
span.StartDate = scap.StartDate.Value;
span.EndDate = enddate;
}
}
}
}
}
var analysisService = new AnalysisServiceImp();
var analyse = analysisService.GetSupportConceptAnalysis4(null, null, null, span.StartDate, span.EndDate, null, false).Where(a => a.SupportConceptOid == sc.SupportConceptOid).ToList();
if (analyse != null && analyse.Count > 0)
{
SupportConceptOverviewDC richtigeAnalyse = null;
foreach (var a in analyse)
if (sc.AllCostBearerNames.Contains(a.CostBearer))
richtigeAnalyse = a;
if (richtigeAnalyse != null)
uebertragFLS = richtigeAnalyse.BEDifferenceApprovedRecordedTillNow;
}
lblUebertragFLS.Text = string.Format("{0:0.00}", uebertragFLS);
}
this.bindingSource1.DataSource = pRO;
}
private decimal GetWegepauschale(long serviceRecordOid)
{
var sr = DAOFactory.GenericDAO.LoadByID<ServiceRecord>(serviceRecordOid);
var srDC = MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDC(sr);
if (srDC.ServiceDescription.CostRatePeriods != null)
{
var crp = srDC.ServiceDescription.CostRatePeriods.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, sr.Start.Value);
if (crp != null)
{
return crp.CostRateValue ?? 0;
}
}
return 0;
}
private decimal GetStundensatz(ServicesOverviewRO pRO)
{
if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0)
{
var c2s = pRO.CostBearer2SupportConceptList[0];
var crpList = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(c2s.CostBearer.CostRatePeriods);
var cp = crpList.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, pRO.StartDate);
if (cp != null && cp.CostRateValue.HasValue)
{
return cp.CostRateValue.Value;
}
}
return 0;
}
private void picSignature_BeforePrint(object sender, 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);
System.Drawing.Image img = ByteArrayToImage(binData);
xrBox.Image = Utils.CropImage(img);
}
else
{
xrBox.Image = null;
}
}
public System.Drawing.Image ByteArrayToImage(byte[] byteArrayIn)
{
using (var memoryStream = new MemoryStream(byteArrayIn))
{
return System.Drawing.Image.FromStream(memoryStream);
}
}
}
}

977
ReportImp/AlzeyTeilhabe/StundenzettelWo.Designer - Kopie.cs Normal file
View File

@@ -0,0 +1,977 @@
using BeWo.Report.ReportObjects;
namespace AlzeyTeilhabe
{
partial class StundenzettelWo
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule();
this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule();
this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.lblSum = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel();
this.lblSumPauschale = new DevExpress.XtraReports.UI.XRLabel();
this.lblPauschale = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.lblSumFls = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
this.lblUebertragFLS = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldStunden = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldTotalSum = new DevExpress.XtraReports.UI.CalculatedField();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
//
this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableServiceRecords1});
this.Detail.HeightF = 40F;
this.Detail.Name = "Detail";
this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.Detail.StylePriority.UseFont = false;
this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrTableServiceRecords1
//
this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableServiceRecords1.Name = "xrTableServiceRecords1";
this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(697F, 40F);
this.xrTableServiceRecords1.StylePriority.UseBackColor = false;
this.xrTableServiceRecords1.StylePriority.UseBorders = false;
this.xrTableServiceRecords1.StylePriority.UseFont = false;
this.xrTableServiceRecords1.StylePriority.UseTextAlignment = false;
this.xrTableServiceRecords1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRow2
//
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3,
this.xrTableCell4,
this.xrTableCell7,
this.xrTableCell1,
this.xrTableCell11});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow2.StylePriority.UseTextAlignment = false;
this.xrTableRow2.Weight = 1.25D;
//
// xrTableCell3
//
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell3.StylePriority.UseBorders = false;
this.xrTableCell3.StylePriority.UseFont = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "Datum";
this.xrTableCell3.Weight = 0.24385918004234181D;
//
// xrTableCell4
//
this.xrTableCell4.Multiline = true;
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell4.StylePriority.UseFont = false;
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Erbrachte\r\nFLStd.";
this.xrTableCell4.Weight = 0.21481273405276788D;
//
// xrTableCell7
//
this.xrTableCell7.Multiline = true;
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell7.StylePriority.UseFont = false;
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "Wege-pauschale";
this.xrTableCell7.Weight = 0.24386962540395146D;
//
// xrTableCell1
//
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell1.StylePriority.UsePadding = false;
this.xrTableCell1.Text = "Inhaltliche Beschreibung der erbrachten Leistung *)";
this.xrTableCell1.Weight = 0.87720343217205243D;
//
// xrTableCell11
//
this.xrTableCell11.Multiline = true;
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell11.StylePriority.UseFont = false;
this.xrTableCell11.StylePriority.UseTextAlignment = false;
this.xrTableCell11.Text = "Unterschrift\r\nFachkraft";
this.xrTableCell11.Weight = 0.36381269988521975D;
//
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail1});
this.DetailReport.DataMember = "Services";
this.DetailReport.DataSource = this.bindingSource1;
this.DetailReport.Level = 0;
this.DetailReport.Name = "DetailReport";
this.DetailReport.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.DetailReport.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// Detail1
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable3});
this.Detail1.HeightF = 20F;
this.Detail1.Name = "Detail1";
this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.Detail1.StylePriority.UseFont = false;
this.Detail1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrTable3
//
this.xrTable3.BorderColor = System.Drawing.Color.Black;
this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow6});
this.xrTable3.SizeF = new System.Drawing.SizeF(697F, 20F);
this.xrTable3.StylePriority.UseFont = false;
this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrTableRow6
//
this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell13,
this.xrTableCell14,
this.xrTableCell8,
this.xrTableCell2,
this.xrTableCell15});
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;
//
// xrTableCell13
//
this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate", "{0:dd.MM.yyyy}")});
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.StylePriority.UseFont = false;
this.xrTableCell13.StylePriority.UsePadding = false;
this.xrTableCell13.StylePriority.UseTextAlignment = false;
this.xrTableCell13.Text = "xrTableCell13";
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell13.Weight = 0.12626259807949769D;
//
// xrTableCell14
//
this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.FLSQualified", "{0:0.00}")});
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.StylePriority.UseFont = false;
this.xrTableCell14.StylePriority.UsePadding = false;
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell14.Weight = 0.11122325929996779D;
//
// xrTableCell8
//
this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.FLSUnqualified")});
this.xrTableCell8.Multiline = true;
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.StylePriority.UseFont = false;
this.xrTableCell8.StylePriority.UsePadding = false;
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell8.Weight = 0.12626800070973748D;
//
// xrTableCell2
//
this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice")});
this.xrTableCell2.Multiline = true;
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrTableCell2.StylePriority.UsePadding = false;
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.Text = "xrTableCell2";
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell2.Weight = 0.45418823789637497D;
//
// xrTableCell15
//
this.xrTableCell15.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.picSignature});
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
this.xrTableCell15.StylePriority.UseFont = false;
this.xrTableCell15.StylePriority.UsePadding = false;
this.xrTableCell15.StylePriority.UseTextAlignment = false;
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell15.Weight = 0.18837073459697215D;
//
// 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(126.9999F, 20F);
this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
this.picSignature.StylePriority.UseBorders = false;
this.picSignature.BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.picSignature_BeforePrint);
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleStartDate.DataMember = "ServicesDouble";
this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleStartDate.Name = "formattingRuleStartDate";
//
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel22,
this.xrLabel19,
this.xrLabel17,
this.xrLabel16,
this.xrLabel29,
this.xrLabel26,
this.xrLabel25,
this.xrLabel24,
this.xrLabel23,
this.xrLabel18,
this.xrLabel15,
this.xrLabel14,
this.xrLabel13,
this.xrLabel12,
this.xrLabel1});
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
this.ReportHeader.HeightF = 240F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// xrLabel22
//
this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(150F, 55F);
this.xrLabel22.Name = "xrLabel22";
this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel22.SizeF = new System.Drawing.SizeF(387.5F, 18F);
this.xrLabel22.StylePriority.UseFont = false;
this.xrLabel22.Text = "Verein für Integration und Teilhabe am Leben e. V. ";
//
// xrLabel19
//
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 55F);
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel19.SizeF = new System.Drawing.SizeF(150F, 25F);
this.xrLabel19.StylePriority.UseFont = false;
this.xrLabel19.Text = "Leistungsanbieter:";
//
// xrLabel17
//
this.xrLabel17.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainAttendant")});
this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(288F, 205F);
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.SizeF = new System.Drawing.SizeF(282F, 18F);
this.xrLabel17.StylePriority.UseBorders = false;
this.xrLabel17.StylePriority.UseFont = false;
//
// xrLabel16
//
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(0F, 205F);
this.xrLabel16.Name = "xrLabel16";
this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel16.SizeF = new System.Drawing.SizeF(288F, 18F);
this.xrLabel16.StylePriority.UseFont = false;
this.xrLabel16.Text = "Zusätzliche Fachkraft:";
//
// xrLabel29
//
this.xrLabel29.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerMonthTotal", "{0:0.00}")});
this.xrLabel29.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(288F, 180F);
this.xrLabel29.Name = "xrLabel29";
this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel29.SizeF = new System.Drawing.SizeF(282F, 18F);
this.xrLabel29.StylePriority.UseBorders = false;
this.xrLabel29.StylePriority.UseFont = false;
//
// xrLabel26
//
this.xrLabel26.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSTotal", "{0:0.00}")});
this.xrLabel26.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(288F, 155F);
this.xrLabel26.Name = "xrLabel26";
this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel26.SizeF = new System.Drawing.SizeF(282F, 18F);
this.xrLabel26.StylePriority.UseBorders = false;
this.xrLabel26.StylePriority.UseFont = false;
//
// xrLabel25
//
this.xrLabel25.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel25.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(200F, 130F);
this.xrLabel25.Name = "xrLabel25";
this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel25.SizeF = new System.Drawing.SizeF(369.9999F, 18F);
this.xrLabel25.StylePriority.UseBorders = false;
this.xrLabel25.StylePriority.UseFont = false;
this.xrLabel25.Text = "[ApprovedStartDate] - [ApprovedEndDate]";
//
// xrLabel24
//
this.xrLabel24.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerFirstName")});
this.xrLabel24.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(200F, 105F);
this.xrLabel24.Name = "xrLabel24";
this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel24.SizeF = new System.Drawing.SizeF(369.9999F, 18F);
this.xrLabel24.StylePriority.UseBorders = false;
this.xrLabel24.StylePriority.UseFont = false;
//
// xrLabel23
//
this.xrLabel23.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerLastName")});
this.xrLabel23.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(200F, 79.99998F);
this.xrLabel23.Name = "xrLabel23";
this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel23.SizeF = new System.Drawing.SizeF(369.9999F, 18F);
this.xrLabel23.StylePriority.UseBorders = false;
this.xrLabel23.StylePriority.UseFont = false;
//
// xrLabel18
//
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 180F);
this.xrLabel18.Name = "xrLabel18";
this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel18.SizeF = new System.Drawing.SizeF(288F, 25F);
this.xrLabel18.StylePriority.UseFont = false;
this.xrLabel18.Text = "Fachleistungsstunden pro Monat:";
//
// xrLabel15
//
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 155F);
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel15.SizeF = new System.Drawing.SizeF(288F, 25F);
this.xrLabel15.StylePriority.UseFont = false;
this.xrLabel15.Text = "Bewilligte Fachleistungsstunden gesamt:";
//
// xrLabel14
//
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 130F);
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.SizeF = new System.Drawing.SizeF(200F, 25F);
this.xrLabel14.StylePriority.UseFont = false;
this.xrLabel14.Text = "Bewilligungszeitraum:";
//
// xrLabel13
//
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 105F);
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(200F, 25F);
this.xrLabel13.StylePriority.UseFont = false;
this.xrLabel13.Text = "Vorname Klient/in:";
//
// xrLabel12
//
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 79.99998F);
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(200F, 25F);
this.xrLabel12.StylePriority.UseFont = false;
this.xrLabel12.Text = "Name Klient/in:";
//
// xrLabel1
//
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline))));
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(667F, 43.75F);
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.StylePriority.UseTextAlignment = false;
this.xrLabel1.Text = "Leistungsnachweis / Quittungsbeleg ambulante Eingliederungshilfe\r\n[Month] [Year]";
this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
//
// formattingRuleServiceDesc
//
this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleServiceDesc.DataMember = "ServicesDouble";
this.formattingRuleServiceDesc.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleServiceDesc.Name = "formattingRuleServiceDesc";
//
// formattingRuleCostBearer
//
this.formattingRuleCostBearer.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleCostBearer.DataMember = "ServicesDouble";
this.formattingRuleCostBearer.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleCostBearer.Name = "formattingRuleCostBearer";
//
// formattingRuleEmployeeName
//
this.formattingRuleEmployeeName.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleEmployeeName.DataMember = "ServicesDouble";
this.formattingRuleEmployeeName.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleEmployeeName.Name = "formattingRuleEmployeeName";
//
// topMarginBand1
//
this.topMarginBand1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F);
this.topMarginBand1.HeightF = 50F;
this.topMarginBand1.Name = "topMarginBand1";
this.topMarginBand1.StylePriority.UseFont = false;
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 30F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// ReportFooter
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.lblSum,
this.xrLabel30,
this.lblSumPauschale,
this.lblPauschale,
this.xrLabel27,
this.xrLabel28,
this.xrLabel4,
this.xrLabel6,
this.xrLabel7,
this.xrLabel8,
this.lblSumFls,
this.xrLabel11,
this.xrLabel10,
this.xrLabel20,
this.lblUebertragFLS,
this.xrLabel3,
this.xrTable1,
this.xrLabel2,
this.xrLabel5});
this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
this.ReportFooter.HeightF = 268.125F;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
// lblSum
//
this.lblSum.LocationFloat = new DevExpress.Utils.PointFloat(518.1666F, 162.2605F);
this.lblSum.Name = "lblSum";
this.lblSum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblSum.SizeF = new System.Drawing.SizeF(125.5F, 19.79172F);
this.lblSum.StylePriority.UseFont = false;
this.lblSum.StylePriority.UseTextAlignment = false;
this.lblSum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.lblSum.Visible = false;
//
// xrLabel30
//
this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(518.1666F, 122.6772F);
this.xrLabel30.Name = "xrLabel30";
this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel30.SizeF = new System.Drawing.SizeF(125.5F, 19.79172F);
this.xrLabel30.StylePriority.UseFont = false;
this.xrLabel30.StylePriority.UseTextAlignment = false;
this.xrLabel30.Text = "Rechnungsbetrag";
this.xrLabel30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrLabel30.Visible = false;
//
// lblSumPauschale
//
this.lblSumPauschale.LocationFloat = new DevExpress.Utils.PointFloat(392.6666F, 162.2605F);
this.lblSumPauschale.Name = "lblSumPauschale";
this.lblSumPauschale.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblSumPauschale.SizeF = new System.Drawing.SizeF(125.5F, 19.79172F);
this.lblSumPauschale.StylePriority.UseFont = false;
this.lblSumPauschale.StylePriority.UseTextAlignment = false;
this.lblSumPauschale.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.lblSumPauschale.Visible = false;
//
// lblPauschale
//
this.lblPauschale.LocationFloat = new DevExpress.Utils.PointFloat(267.1669F, 162.2605F);
this.lblPauschale.Name = "lblPauschale";
this.lblPauschale.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblPauschale.SizeF = new System.Drawing.SizeF(125.5F, 19.79172F);
this.lblPauschale.StylePriority.UseFont = false;
this.lblPauschale.StylePriority.UseTextAlignment = false;
this.lblPauschale.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.lblPauschale.Visible = false;
//
// xrLabel27
//
this.xrLabel27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSUnqualified", "{0:0.00}")});
this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(194.7917F, 162.2605F);
this.xrLabel27.Name = "xrLabel27";
this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel27.SizeF = new System.Drawing.SizeF(72.37503F, 19.79172F);
this.xrLabel27.StylePriority.UseFont = false;
this.xrLabel27.Text = "Zusätzliche Fachkraft:";
this.xrLabel27.Visible = false;
//
// xrLabel28
//
this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(0F, 162.2606F);
this.xrLabel28.Name = "xrLabel28";
this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel28.SizeF = new System.Drawing.SizeF(194.7917F, 19.79166F);
this.xrLabel28.StylePriority.UseFont = false;
this.xrLabel28.Text = "Anzahl Wegepauschalen";
this.xrLabel28.Visible = false;
//
// xrLabel4
//
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 11.25F, 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(9.536743E-05F, 92.84382F);
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(686.9999F, 18F);
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.Text = "Berechnung der erbrachten Fachleistungsstunden";
//
// xrLabel6
//
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(9.536743E-05F, 142.4689F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(194.7917F, 19.79166F);
this.xrLabel6.StylePriority.UseFont = false;
this.xrLabel6.Text = "Anzahl FLStd.";
//
// xrLabel7
//
this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSQualified", "{0:0.00}")});
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(194.7918F, 142.4688F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(72.37503F, 19.79172F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "Zusätzliche Fachkraft:";
//
// xrLabel8
//
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "RateFactor", "{0:0.00} €")});
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(267.1668F, 142.4688F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(125.5F, 19.79172F);
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.StylePriority.UseTextAlignment = false;
this.xrLabel8.Text = "Zusätzliche Fachkraft:";
this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
//
// lblSumFls
//
this.lblSumFls.LocationFloat = new DevExpress.Utils.PointFloat(392.6666F, 142.4688F);
this.lblSumFls.Name = "lblSumFls";
this.lblSumFls.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblSumFls.SizeF = new System.Drawing.SizeF(125.5F, 19.79172F);
this.lblSumFls.StylePriority.UseFont = false;
this.lblSumFls.StylePriority.UseTextAlignment = false;
this.lblSumFls.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
//
// xrLabel11
//
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(392.6666F, 122.6772F);
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(125.5F, 19.79172F);
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.StylePriority.UseTextAlignment = false;
this.xrLabel11.Text = "Betrag";
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
//
// xrLabel10
//
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(267.1668F, 122.6772F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(125.5F, 19.79172F);
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.StylePriority.UseTextAlignment = false;
this.xrLabel10.Text = "Vergütungssatz";
this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
//
// xrLabel20
//
this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0F, 200.2813F);
this.xrLabel20.Name = "xrLabel20";
this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel20.SizeF = new System.Drawing.SizeF(392.6667F, 19.79166F);
this.xrLabel20.StylePriority.UseFont = false;
this.xrLabel20.Text = "Übertrag Folgemonat (noch verfügbare FLStd.)";
this.xrLabel20.Visible = false;
//
// lblUebertragFLS
//
this.lblUebertragFLS.LocationFloat = new DevExpress.Utils.PointFloat(392.6664F, 200.2811F);
this.lblUebertragFLS.Name = "lblUebertragFLS";
this.lblUebertragFLS.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblUebertragFLS.SizeF = new System.Drawing.SizeF(130.7083F, 19.79172F);
this.lblUebertragFLS.StylePriority.UseFont = false;
this.lblUebertragFLS.StylePriority.UseTextAlignment = false;
this.lblUebertragFLS.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.lblUebertragFLS.Visible = false;
//
// xrLabel3
//
this.xrLabel3.CanShrink = true;
this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")});
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 59.33335F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(689.9999F, 23F);
this.xrLabel3.Text = "xrLabel3";
//
// xrTable1
//
this.xrTable1.BorderColor = System.Drawing.Color.Black;
this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(251.946F, 40F);
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrTableRow1
//
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell5,
this.xrTableCell6,
this.xrTableCell9});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableRow1.Weight = 2D;
//
// xrTableCell5
//
this.xrTableCell5.Multiline = true;
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.StylePriority.UseFont = false;
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Summe\r\nFLStd.";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell5.Weight = 0.11042036583932854D;
//
// xrTableCell6
//
this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.FLSQualified")});
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.StylePriority.UseFont = false;
this.xrTableCell6.StylePriority.UsePadding = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.xrTableCell6.Summary = xrSummary1;
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell6.TextFormatString = "{0:0.00}";
this.xrTableCell6.Weight = 0.097268106718236408D;
//
// xrTableCell9
//
this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.FLSUnqualified")});
this.xrTableCell9.Multiline = true;
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.StylePriority.UseFont = false;
this.xrTableCell9.StylePriority.UsePadding = false;
this.xrTableCell9.StylePriority.UseTextAlignment = false;
xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.xrTableCell9.Summary = xrSummary2;
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell9.TextFormatString = "{0:0.00}";
this.xrTableCell9.Weight = 0.11042503315100208D;
//
// xrLabel2
//
this.xrLabel2.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(356.1666F, 247.0001F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(340.8333F, 17.99997F);
this.xrLabel2.StylePriority.UseBorders = false;
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.Text = "Unterschrift Rechnungsstelle / Fachkraft";
//
// xrLabel5
//
this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 247.0001F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(117.2917F, 17.99997F);
this.xrLabel5.StylePriority.UseBorders = false;
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.Text = "Datum";
//
// fieldAbrechenbareMinuten
//
this.fieldAbrechenbareMinuten.DataMember = "Services";
this.fieldAbrechenbareMinuten.Expression = "Iif([IsBillable], [Minutes], 0)";
this.fieldAbrechenbareMinuten.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldAbrechenbareMinuten.Name = "fieldAbrechenbareMinuten";
//
// fieldBillableFLS
//
this.fieldBillableFLS.Expression = "[TotalFLMBillable] / 60";
this.fieldBillableFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldBillableFLS.Name = "fieldBillableFLS";
//
// fieldAbrechenbareFLS
//
this.fieldAbrechenbareFLS.Expression = "([TotalFLMBillable] / 60) * 1.2";
this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS";
//
// fieldStunden
//
this.fieldStunden.DataMember = "Services";
this.fieldStunden.Expression = "[Minutes] / 60";
this.fieldStunden.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldStunden.Name = "fieldStunden";
//
// fieldTotalSum
//
this.fieldTotalSum.Expression = "Round([TotalFLMBillable] / 60, 2) * [RateFactor]";
this.fieldTotalSum.Name = "fieldTotalSum";
//
// StundenzettelWo
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail,
this.DetailReport,
this.ReportHeader,
this.topMarginBand1,
this.bottomMarginBand1,
this.ReportFooter});
this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
this.fieldAbrechenbareMinuten,
this.fieldBillableFLS,
this.fieldAbrechenbareFLS,
this.fieldStunden,
this.fieldTotalSum});
this.DataSource = this.bindingSource1;
this.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.formattingRuleStartDate,
this.formattingRuleServiceDesc,
this.formattingRuleCostBearer,
this.formattingRuleEmployeeName});
this.Margins = new DevExpress.Drawing.DXMargins(70F, 60F, 50F, 30F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.SnapGridSize = 9F;
this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
#endregion
private DevExpress.XtraReports.UI.DetailBand Detail;
private System.Windows.Forms.BindingSource bindingSource1;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.DetailBand Detail1;
private DevExpress.XtraReports.UI.XRTable xrTable3;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRTable xrTableServiceRecords1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
private DevExpress.XtraReports.UI.FormattingRule formattingRuleStartDate;
private DevExpress.XtraReports.UI.FormattingRule formattingRuleServiceDesc;
private DevExpress.XtraReports.UI.FormattingRule formattingRuleCostBearer;
private DevExpress.XtraReports.UI.FormattingRule formattingRuleEmployeeName;
private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.XRLabel xrLabel12;
private DevExpress.XtraReports.UI.XRLabel xrLabel18;
private DevExpress.XtraReports.UI.XRLabel xrLabel15;
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
private DevExpress.XtraReports.UI.XRLabel xrLabel13;
private DevExpress.XtraReports.UI.XRLabel xrLabel29;
private DevExpress.XtraReports.UI.XRLabel xrLabel26;
private DevExpress.XtraReports.UI.XRLabel xrLabel25;
private DevExpress.XtraReports.UI.XRLabel xrLabel24;
private DevExpress.XtraReports.UI.XRLabel xrLabel23;
private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareMinuten;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.CalculatedField fieldBillableFLS;
private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareFLS;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRLabel xrLabel17;
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
private DevExpress.XtraReports.UI.XRLabel xrLabel22;
private DevExpress.XtraReports.UI.XRLabel xrLabel19;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.CalculatedField fieldStunden;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRLabel lblSumFls;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.XRLabel xrLabel20;
private DevExpress.XtraReports.UI.XRLabel lblUebertragFLS;
private DevExpress.XtraReports.UI.CalculatedField fieldTotalSum;
private DevExpress.XtraReports.UI.XRPictureBox picSignature;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRLabel lblSum;
private DevExpress.XtraReports.UI.XRLabel xrLabel30;
private DevExpress.XtraReports.UI.XRLabel lblSumPauschale;
private DevExpress.XtraReports.UI.XRLabel lblPauschale;
private DevExpress.XtraReports.UI.XRLabel xrLabel27;
private DevExpress.XtraReports.UI.XRLabel xrLabel28;
}
}

10
ReportImp/AuswegHeikePuetz/AuswegHeikePuetz.csproj
View File

@@ -65,6 +65,12 @@
<Compile Include="QuittierungsbelegMitDatum.Designer.cs">
<DependentUpon>QuittierungsbelegMitDatum.cs</DependentUpon>
</Compile>
<Compile Include="ServiceInvoiceReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ServiceInvoiceReport.Designer.cs">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
</Compile>
<Compile Include="SettlementReport2.cs">
<SubType>Component</SubType>
</Compile>
@@ -97,6 +103,10 @@
<DependentUpon>QuittierungsbelegMitDatum.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="ServiceInvoiceReport.resx">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="SettlementReport2.resx">
<DependentUpon>SettlementReport2.cs</DependentUpon>
<SubType>Designer</SubType>

0
ReportImp/HeikePuetzBewoAusweg/Logo_Ausweg.JPG → ReportImp/AuswegHeikePuetz/Logo_Ausweg.JPG
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

2
ReportImp/HeikePuetzBewoAusweg/ServiceInvoiceReport.Designer.cs → ReportImp/AuswegHeikePuetz/ServiceInvoiceReport.Designer.cs generated
View File

@@ -1,5 +1,5 @@
using BeWo.Report.ReportObjects;
namespace HeikePuetz
namespace Ausweg
{
partial class ServiceInvoiceReport
{

2
ReportImp/HeikePuetzBewoAusweg/ServiceInvoiceReport.cs → ReportImp/AuswegHeikePuetz/ServiceInvoiceReport.cs
View File

@@ -5,7 +5,7 @@ using BeWo.Report.ReportObjects;
using BS.Shared.Extensions;
using DevExpress.XtraReports.UI;
namespace HeikePuetz
namespace Ausweg
{
public partial class ServiceInvoiceReport : XtraReport, IBeWoReport<ServiceInvoiceRO>
{

0
ReportImp/HeikePuetzBewoAusweg/ServiceInvoiceReport.resx → ReportImp/AuswegHeikePuetz/ServiceInvoiceReport.resx
View File

0
ReportImp/HeikePuetzBewoAusweg/Unterschrift.jpg → ReportImp/AuswegHeikePuetz/Unterschrift.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
ReportImp/AutismusKoelnBonn/Briefpapier.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 MiB

BIN
ReportImp/AutismusKoelnBonn/Hintergrund.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 MiB

69
ReportImp/ChristopherusHaus/CustomReportCreator.cs
View File

@@ -5,6 +5,7 @@ using System.Text;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report;
using BeWo.Report.DefaultReports;
using BeWo.Report.ReportObjects;
using BeWo.Service.DCEntityMapper;
using BS.Shared.Core;
@@ -16,6 +17,74 @@ namespace ChristopherusHaus
{
public class CustomReportCreator : DefaultReportCreator
{
public override XtraReport CreateQueryReport(long queryOid, string queryReportId)
{
if (queryOid == 500)
{
return CreateLwlPruefliste(CreateQueryRO(queryOid, queryReportId));
}
return base.CreateQueryReport(queryOid, queryReportId);
}
private LwlPruefliste CreateLwlPruefliste(QueryRO queryRo)
{
var liste = new LwlPruefliste();
if (queryRo.Rows.Count > 0)
{
DateTime start = DateTime.MaxValue;
DateTime end = DateTime.MinValue;
if (queryRo.Rows[0].Field1 != null)
{
DateTime.TryParse(queryRo.Rows[0].Field1.ToString(), out start);
}
if (queryRo.Rows[0].Field2 != null)
{
DateTime.TryParse(queryRo.Rows[0].Field2.ToString(), out end);
}
long? customerOid = null;
if (queryRo.Rows[0].Field3.ToString() == "0")
{
var masterReport = new LwlPruefliste();
var customerList = DAOFactory.GenericDAO.GetAllActive<Customer>();
var customerListOrd = customerList.OrderBy(c => c.Person.LastNameFirstName).ToList();
foreach (var c in customerListOrd)
{
var ro = LwlPrueflisteRO.Create(start, end, "9011053", c.Oid);
if (ro.ServiceRecords != null && ro.ServiceRecords.Count > 0)
{
try
{
liste = new LwlPruefliste();
liste.SetReportDataSource(ro);
liste.CreateDocument();
masterReport.Pages.AddRange(liste.Pages);
}
catch
{
// ignore - z.B. kein Hilfeplan
}
}
}
return (LwlPruefliste)masterReport;
}
if (queryRo.Rows[0].Field3 != null)
{
if (Int64.TryParse(queryRo.Rows[0].Field3.ToString(), out var oidOut))
{
customerOid = oidOut;
}
var ro = LwlPrueflisteRO.Create(start, end, "9011053", customerOid);
liste.SetReportDataSource(ro);
return liste;
}
}
return liste;
}
public override XtraReport CreateSettlementReport(string dcId, long? invoiceBaseOid)
{
long result;

80
ReportImp/ChristopherusHaus/Export/SimbaExporter.cs
View File

@@ -65,8 +65,8 @@ namespace BeWo.ChristopherusHaus.Export
{
sb.AppendLine();
}
DateTime lastDate = new DateTime(date.Year, date.Month, 1);
lastDate = lastDate.AddMonths(1).AddDays(-1);
DateTime start = new DateTime(date.Year, date.Month, 1);
DateTime lastDate = start.AddMonths(1).AddDays(-1);
string orgaName = "";
if (row[5] != null)
{
@@ -74,7 +74,41 @@ namespace BeWo.ChristopherusHaus.Export
}
sb.Append(String.Format("\"{0}\"", row[0]));
sb.Append(";");
sb.Append(String.Format("{0:0.00}", row[1]));
long scapOid = 0;
if (row[10] != null)
{
long.TryParse(row[10].ToString(), out scapOid);
}
if (scapOid == 0)
{
sb.Append(String.Format("{0:0.00}", row[1]));
}
else
{
double betrag = 0.00;
Double.TryParse(row[1].ToString(), out betrag);
var scap = DAOFactory.GenericDAO.LoadByID<SupportConceptApprovalPeriod>(scapOid);
TimeSpan spanOrg = new TimeSpan((long)(lastDate - start).TotalDays);
TimeSpan span = spanOrg;
if (scap.StartDate.HasValue && scap.StartDate.Value.Date > start.Date)
{
span = new TimeSpan((long)(lastDate - scap.StartDate.Value).TotalDays);
}
if (scap.EndDate.HasValue && scap.EndDate.Value.Date < lastDate.Date)
{
span = new TimeSpan((long)(scap.EndDate.Value.Date - start).TotalDays);
}
if (span < spanOrg)
{
var betragTag = (double)row[1] / 7;
betrag = betragTag * span.TotalDays;
}
else
{
betrag = betrag * 4.33;
}
sb.Append(String.Format("{0:0.00}", Math.Round(betrag, 2, MidpointRounding.AwayFromZero)));
}
sb.Append(";;;");
string gKonto = GetErlöskonto(orgaName);
sb.Append(String.Format("{0}", gKonto)); //Gegenkonto
@@ -124,7 +158,8 @@ namespace BeWo.ChristopherusHaus.Export
qry.Verwendung,
qry.Oid,
sum(qry.FLS) AS FLS,
qry.Preis
qry.Preis,
qry.BewOid
FROM
(
(SELECT
@@ -136,9 +171,11 @@ namespace BeWo.ChristopherusHaus.Export
CONCAT(org.Name,', ', p.`LastName`, ', ', p.`FirstName`) as 'Verwendung',
cb2sc.Oid,
ROUND(sr.`GeleisteteFLM` / 60, 2) as 'FLS',
ROUND((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 ), 2) as 'Preis'
ROUND((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 ), 2) as 'Preis',
null as BewOid
FROM `supportconcept` sc
INNER JOIN `costbearer2supportconcept` cb2sc ON sc.`Oid` = cb2sc.`SupportConceptOid`
INNER JOIN `supportconceptapprovalperiod` scap on cb2sc.`Oid` = scap.`CostBearer2SupportConceptOid`
INNER JOIN `costbearer` cb ON cb2sc.`CostBearerOid` = cb.`Oid`
LEFT JOIN
(SELECT crp.`ObjectOid`, crp.`CostRateValue` FROM `costrateperiod` crp
@@ -153,7 +190,7 @@ namespace BeWo.ChristopherusHaus.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 (sr.`GeleisteteFLM` is not null) and (org.Name = 'LVR' OR org.Name = 'LWL'))
WHERE c.`IsActive` = 1 AND sc.`IsActive` = 1 and (sr.`GeleisteteFLM` is not null) and (org.Name = 'LVR' OR org.Name = 'LWL') AND (scap.Notice is null OR scap.Notice <> 'Pooling'))
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',
@@ -163,9 +200,11 @@ namespace BeWo.ChristopherusHaus.Export
CONCAT(org.Name,', ', p.`LastName`, ', ', p.`FirstName`) as 'Verwendung',
cb2sc.Oid,
ROUND(0.8 * sr.`GeleisteteFLM` / 60, 2) as 'FLS',
ROUND((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 ), 2) as 'Preis'
ROUND((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 ), 2) as 'Preis',
null as BewOid
FROM `supportconcept` sc
INNER JOIN `costbearer2supportconcept` cb2sc ON sc.`Oid` = cb2sc.`SupportConceptOid`
INNER JOIN `supportconceptapprovalperiod` scap on cb2sc.`Oid` = scap.`CostBearer2SupportConceptOid`
INNER JOIN `costbearer` cb ON cb2sc.`CostBearerOid` = cb.`Oid`
INNER JOIN `organisation` org ON org.`CostBearerOid` = cb.`Oid`
INNER JOIN `customer` c ON sc.`CustomerOid` = c.`Oid`
@@ -176,7 +215,32 @@ namespace BeWo.ChristopherusHaus.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 (sr.`GeleisteteFLM` is not null) and (org.Name = 'LVR' OR org.Name = 'LWL'))
WHERE c.`IsActive` = 1 AND sc.`IsActive` <> 0 and (sr.`GeleisteteFLM` is not null) and (org.Name = 'LVR' OR org.Name = 'LWL') AND (scap.Notice is null OR scap.Notice <> 'Pooling'))
UNION
(SELECT
IF(crpRateFactor.`CostRateValue` is null, ROUND(scap.ApprovedBEPerInterval * (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(scap.ApprovedBEPerInterval * (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,
org.Name,
CONCAT(org.Name,', ', p.`LastName`, ', ', p.`FirstName`) as 'Verwendung',
cb2sc.Oid,
ROUND(scap.ApprovedBEPerInterval, 2) as 'FLS',
ROUND((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 ), 2) as 'Preis',
scap.Oid as BewOid
FROM `supportconcept` sc
INNER JOIN `costbearer2supportconcept` cb2sc ON sc.`Oid` = cb2sc.`SupportConceptOid`
INNER JOIN `supportconceptapprovalperiod` scap on cb2sc.`Oid` = scap.`CostBearer2SupportConceptOid`
INNER JOIN `costbearer` cb ON cb2sc.`CostBearerOid` = cb.`Oid`
LEFT JOIN
(SELECT crp.`ObjectOid`, crp.`CostRateValue` FROM `costrateperiod` crp
WHERE crp.`ObjectTid` = 22 AND crp.`CostRateType` = 2 AND (crp.`EndDate` is null or crp.`EndDate` > NOW()))
AS crpRateFactor ON crpRateFactor.`ObjectOid` = cb.`Oid`
INNER JOIN `organisation` org ON org.`CostBearerOid` = cb.`Oid`
INNER JOIN `customer` c ON sc.`CustomerOid` = c.`Oid`
INNER JOIN `person` p on c.`PersonOid` = p.`Oid`
WHERE c.`IsActive` = 1 AND sc.`IsActive` <> 0 and (org.Name = 'LVR' OR org.Name = 'LWL')
AND scap.Notice = 'Pooling' AND scap.EndDate >= ':Monat_Start' AND scap.Start <= ':Monat_End' and (org.Name = 'LVR' OR org.Name = 'LWL'))
)qry
GROUP BY qry.OID
ORDER BY qry.Verwendung

122
ReportImp/HeikePuetzBewoAusweg/HeikePuetz.csproj
View File

@@ -1,122 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{6CA91C58-23BC-4DA4-823D-B88F3E7CC9EA}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>HeikePuetz</RootNamespace>
<AssemblyName>6451336202_Reports</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\CustomerDlls\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\CustomerDlls\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.Drawing.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Office.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.RichEdit.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.RichEdit.v23.2.Export, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Printing.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.Desktop.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Utils.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraPrinting.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<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="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Invoicing\SettlementInvoiceCreation.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="QuittierungsbelegMitDatum.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="QuittierungsbelegMitDatum.Designer.cs">
<DependentUpon>QuittierungsbelegMitDatum.cs</DependentUpon>
</Compile>
<Compile Include="ServiceInvoiceReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ServiceInvoiceReport.Designer.cs">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
</Compile>
<Compile Include="SettlementReport2.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="SettlementReport2.Designer.cs">
<DependentUpon>SettlementReport2.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Data\Data.csproj">
<Project>{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}</Project>
<Name>Data</Name>
</ProjectReference>
<ProjectReference Include="..\..\Report\Report.csproj">
<Project>{40d8b312-ea64-49e3-a31a-5e57ed4d5654}</Project>
<Name>Report</Name>
</ProjectReference>
<ProjectReference Include="..\..\Service\Service.csproj">
<Project>{094331c3-ecee-4c89-bbfd-4c9ded89f0ef}</Project>
<Name>Service</Name>
</ProjectReference>
<ProjectReference Include="..\..\Shared\Shared.csproj">
<Project>{2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4}</Project>
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="QuittierungsbelegMitDatum.resx">
<DependentUpon>QuittierungsbelegMitDatum.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="ServiceInvoiceReport.resx">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="SettlementReport2.resx">
<DependentUpon>SettlementReport2.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

18
ReportImp/HeikePuetzBewoAusweg/Invoicing/SettlementInvoiceCreation.cs
View File

@@ -1,18 +0,0 @@
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 HeikePuetz
{
public class CustomSettlementInvoiceCreation : SettlementInvoiceCreation
{
public override bool CanCreateInvoiceTheOldWay(Settlement2DC si, CostBearer2SupportConcept c2s)
{
return false;
}
}
}

36
ReportImp/HeikePuetzBewoAusweg/Properties/AssemblyInfo.cs
View File

@@ -1,36 +0,0 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// Allgemeine Informationen über eine Assembly werden über die folgenden
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
// die einer Assembly zugeordnet sind.
[assembly: AssemblyTitle("KundeXyz")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("KundeXyz")]
[assembly: AssemblyCopyright("Copyright © 2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von
// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
[assembly: ComVisible(false)]
// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
[assembly: Guid("c1fed668-adb9-47e0-b589-1389618e1b6e")]
// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
//
// Hauptversion
// Nebenversion
// Buildnummer
// Revision
//
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
// indem Sie "*" wie unten gezeigt eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

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

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

1446
ReportImp/HeikePuetzBewoAusweg/QuittierungsbelegMitDatum.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

148
ReportImp/HeikePuetzBewoAusweg/QuittierungsbelegMitDatum.cs
View File

@@ -1,148 +0,0 @@
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 BS.Shared.Extensions;
using DevExpress.XtraReports.UI;
namespace HeikePuetz
{
public partial class Quittierungsbeleg2 : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<ServicesOverviewRO>
{
public Quittierungsbeleg2()
{
InitializeComponent();
}
public void SetReportDataSource(ServicesOverviewRO pRO)
{
bool hatGruppen = false;
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"))
{
if (sd.ServiceDescription.ToLower().Contains("fehlkontakt") || sd.ServiceCategory.ToLower().Contains("fehlkontakt") || (sd.ProzentAbrechenbar < 100))
sd.Notice5 = "F";
else if (sd.IsGroup)
sd.Notice5 = "GR";
else if (!sd.IsGroup)
sd.Notice5 = "E";
ServicesOverviewRO.CreateSignatureString(sd);
if (sd.IsGroup)
{
hatGruppen = true;
}
if (sd.SignatureDate.HasValue && sd.SignatureDate.Value.Date == sd.StartDate.Date)
{
sd.SignatureDate = null;
}
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)
{
if (at.AbsenceReason.BillableMinutes.HasValue && at.AbsenceReason.BillableMinutes.Value > 0)
{
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;
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)
{
Image returnImage = null;
MemoryStream ms = new System.IO.MemoryStream(byteArrayIn);
returnImage = Image.FromStream(ms);
return returnImage;
}
}
}

129
ReportImp/HeikePuetzBewoAusweg/QuittierungsbelegMitDatum.resx
View File

File diff suppressed because one or more lines are too long

1158
ReportImp/HeikePuetzBewoAusweg/SettlementReport2.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

51
ReportImp/HeikePuetzBewoAusweg/SettlementReport2.cs
View File

@@ -1,51 +0,0 @@
using System;
using System.Drawing;
using System.Collections;
using System.ComponentModel;
using DevExpress.XtraReports.UI;
using BeWo.Report.ReportObjects;
using BeWo.Report;
using System.Text.RegularExpressions;
using BS.Shared.Extensions;
namespace HeikePuetz
{
public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<Settlement2RO>
{
public Spitzabrechnung()
{
InitializeComponent();
}
public void SetReportDataSource(Settlement2RO pRO)
{
decimal rateFactor = 1;
foreach (var ii in pRO.InvoiceItems)
{
if (ii.RateFactor.HasValue)
{
rateFactor = (100 + ii.RateFactor.Value) / 100;
}
if (!pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0)
{
Zwischensumme.Visible = true;
//if (!ii.ItemDescription.IsNullOrEmpty())
//{
//ii.AbrechnungsText = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte");
//}
ii.AbrechnungsText = ii.AbrechnungsText.Replace("FLS", "Std.");
ii.ItemDescription = "Fehlkontakte";
}
else if (ii.ItemDescription.IsNullOrEmpty())
{
ii.ItemDescription = "Fachleistungsstunden";
}
}
pRO.RateFactor = (double)rateFactor;
this.bindingSource1.DataSource = pRO;
}
}
}

129
ReportImp/HeikePuetzBewoAusweg/SettlementReport2.resx
View File

File diff suppressed because one or more lines are too long

1
ReportImp/KcmGmbH/KcmGmbH.csproj
View File

@@ -85,6 +85,7 @@
<Compile Include="ServiceInvoiceReport.Designer.cs">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
</Compile>
<Compile Include="Service\ServiceRecordValidator.cs" />
<Compile Include="SettlementReport.cs">
<SubType>Component</SubType>
</Compile>

29
ReportImp/KcmGmbH/Service/ServiceRecordValidator.cs Normal file
View File

@@ -0,0 +1,29 @@
using BeWo.Service.Plugins;
using BS.Shared;
using BS.Shared.DataContracts;
using System;
using System.Collections.Generic;
using System.Linq;
namespace KcmGmbH.Service
{
public class CustomServiceRecordValidator : ServiceRecordValidator
{
public override List<ServiceRecordValidationResultDC> ValidateServiceRecord(ServiceRecordDC newServiceRecord, SupportConceptStatisticsDC statistics, int maxDaysEditServiceRecordsAllowed, IList<long> employeeOids, IList<long> cb2scOids)
{
var list = base.ValidateServiceRecord(newServiceRecord, statistics, maxDaysEditServiceRecordsAllowed, employeeOids, cb2scOids);
DateTime start = newServiceRecord.Start.Value;
bool noTime = (start.Hour == 0 && start.Minute == 0 && start.Second == 1); //Keine Zeit angegeben
var duration = (decimal)newServiceRecord.End.Value.Subtract(newServiceRecord.Start.Value).TotalMinutes;
if (noTime && duration != 0 && newServiceRecord.ServiceDescription.Category.IsBillable)
{
list.Add(new ServiceRecordValidationResultDC
{
ResultType = ServiceRecordValidationResult.Custom,
Message = "Der Zeiterfassungseintrag muss eine Startzeit haben."
});
}
return list;
}
}
}

1008
ReportImp/KomMitBewo/InvoiceCustomerReport.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

9659
ReportImp/KomMitBewo/InvoiceCustomerReport.resx
View File

File diff suppressed because one or more lines are too long

405
ReportImp/KomMitBewo/KommMitBewo.csproj
View File

@@ -1,205 +1,214 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{1A585E99-09AB-4924-8FB9-9C9D1FE48044}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>KomMitBewo</RootNamespace>
<AssemblyName>4271389563_Reports</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\CustomerDlls\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\CustomerDlls\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.Drawing.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Pdf.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Printing.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.Desktop.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Utils.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraPrinting.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Charts.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraCharts.v23.2.Wizard, 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.PivotGrid.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Sparkline.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Utils.v23.2.UI, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraReports.v23.2.Extensions, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.CodeParser.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Office.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.RichEdit.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.RichEdit.v23.2.Export, 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="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="CustomMitarbeiterstundenkontoBerechnung.cs" />
<Compile Include="CustomMitarbeiterstundenkontoBerechnungMonate.cs" />
<Compile Include="CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs" />
<Compile Include="InvoiceCustomerReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="InvoiceCustomerReport.Designer.cs">
<DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
</Compile>
<Compile Include="Jahresabgrenzung.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Jahresabgrenzung.designer.cs">
<DependentUpon>Jahresabgrenzung.cs</DependentUpon>
</Compile>
<Compile Include="Mitarbeiterarbeitszeitkonto.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Mitarbeiterarbeitszeitkonto.designer.cs">
<DependentUpon>Mitarbeiterarbeitszeitkonto.cs</DependentUpon>
</Compile>
<Compile Include="Mitarbeiterstundenkonto.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Mitarbeiterstundenkonto.designer.cs">
<DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
</Compile>
<Compile Include="MitarbeiterstundenkontoJahr.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="MitarbeiterstundenkontoJahr.designer.cs">
<DependentUpon>MitarbeiterstundenkontoJahr.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ServiceInvoiceReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ServiceInvoiceReport.Designer.cs">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
</Compile>
<Compile Include="ServicesOverviewReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ServicesOverviewReport.Designer.cs">
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
</Compile>
<Compile Include="Service\CustomVacationService.cs" />
<Compile Include="SettlementReport2.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="SettlementReport2.Designer.cs">
<DependentUpon>SettlementReport2.cs</DependentUpon>
</Compile>
<Compile Include="SettlementReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="SettlementReport.Designer.cs">
<DependentUpon>SettlementReport.cs</DependentUpon>
</Compile>
<Compile Include="Teamstundenkonto.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Teamstundenkonto.designer.cs">
<DependentUpon>Teamstundenkonto.cs</DependentUpon>
</Compile>
<Compile Include="CustomReportCreator.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="InvoiceCustomerReport.resx">
<DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Jahresabgrenzung.resx">
<DependentUpon>Jahresabgrenzung.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Mitarbeiterarbeitszeitkonto.resx">
<DependentUpon>Mitarbeiterarbeitszeitkonto.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Mitarbeiterstundenkonto.resx">
<DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="MitarbeiterstundenkontoJahr.resx">
<DependentUpon>MitarbeiterstundenkontoJahr.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="ServiceInvoiceReport.resx">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="ServicesOverviewReport.resx">
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="SettlementReport2.resx">
<DependentUpon>SettlementReport2.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="SettlementReport.resx">
<DependentUpon>SettlementReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Teamstundenkonto.resx">
<DependentUpon>Teamstundenkonto.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Data\Data.csproj">
<Project>{b0d73e3d-4ae7-4024-93a6-db1f46d7ccee}</Project>
<Name>Data</Name>
</ProjectReference>
<ProjectReference Include="..\..\Report\Report.csproj">
<Project>{40d8b312-ea64-49e3-a31a-5e57ed4d5654}</Project>
<Name>Report</Name>
</ProjectReference>
<ProjectReference Include="..\..\Service\Service.csproj">
<Project>{094331c3-ecee-4c89-bbfd-4c9ded89f0ef}</Project>
<Name>Service</Name>
</ProjectReference>
<ProjectReference Include="..\..\Shared\Shared.csproj">
<Project>{2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4}</Project>
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
<Folder Include="Invoicing\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{1A585E99-09AB-4924-8FB9-9C9D1FE48044}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>KomMitBewo</RootNamespace>
<AssemblyName>4271389563_Reports</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\CustomerDlls\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\CustomerDlls\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.Drawing.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Pdf.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Printing.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.Desktop.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Utils.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraPrinting.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Charts.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraCharts.v23.2.Wizard, 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.PivotGrid.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Sparkline.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Utils.v23.2.UI, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraReports.v23.2.Extensions, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.CodeParser.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Office.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.RichEdit.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.RichEdit.v23.2.Export, 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="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="CustomMitarbeiterstundenkontoBerechnung.cs" />
<Compile Include="CustomMitarbeiterstundenkontoBerechnungMonate.cs" />
<Compile Include="CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs" />
<Compile Include="InvoiceCustomerReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="InvoiceCustomerReport.Designer.cs">
<DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
</Compile>
<Compile Include="Jahresabgrenzung.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Jahresabgrenzung.designer.cs">
<DependentUpon>Jahresabgrenzung.cs</DependentUpon>
</Compile>
<Compile Include="Mitarbeiterarbeitszeitkonto.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Mitarbeiterarbeitszeitkonto.designer.cs">
<DependentUpon>Mitarbeiterarbeitszeitkonto.cs</DependentUpon>
</Compile>
<Compile Include="Mitarbeiterstundenkonto.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Mitarbeiterstundenkonto.designer.cs">
<DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
</Compile>
<Compile Include="MitarbeiterstundenkontoJahr.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="MitarbeiterstundenkontoJahr.designer.cs">
<DependentUpon>MitarbeiterstundenkontoJahr.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="ServiceInvoiceReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ServiceInvoiceReport.Designer.cs">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
</Compile>
<Compile Include="ServicesOverviewReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ServicesOverviewReport.Designer.cs">
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
</Compile>
<Compile Include="Service\CustomVacationService.cs" />
<Compile Include="SettlementReport2.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="SettlementReport2.Designer.cs">
<DependentUpon>SettlementReport2.cs</DependentUpon>
</Compile>
<Compile Include="SettlementReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="SettlementReport.Designer.cs">
<DependentUpon>SettlementReport.cs</DependentUpon>
</Compile>
<Compile Include="Teamstundenkonto.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Teamstundenkonto.designer.cs">
<DependentUpon>Teamstundenkonto.cs</DependentUpon>
</Compile>
<Compile Include="CustomReportCreator.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="InvoiceCustomerReport.resx">
<DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Jahresabgrenzung.resx">
<DependentUpon>Jahresabgrenzung.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Mitarbeiterarbeitszeitkonto.resx">
<DependentUpon>Mitarbeiterarbeitszeitkonto.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Mitarbeiterstundenkonto.resx">
<DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="MitarbeiterstundenkontoJahr.resx">
<DependentUpon>MitarbeiterstundenkontoJahr.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="ServiceInvoiceReport.resx">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="ServicesOverviewReport.resx">
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="SettlementReport2.resx">
<DependentUpon>SettlementReport2.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="SettlementReport.resx">
<DependentUpon>SettlementReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Teamstundenkonto.resx">
<DependentUpon>Teamstundenkonto.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Data\Data.csproj">
<Project>{b0d73e3d-4ae7-4024-93a6-db1f46d7ccee}</Project>
<Name>Data</Name>
</ProjectReference>
<ProjectReference Include="..\..\Report\Report.csproj">
<Project>{40d8b312-ea64-49e3-a31a-5e57ed4d5654}</Project>
<Name>Report</Name>
</ProjectReference>
<ProjectReference Include="..\..\Service\Service.csproj">
<Project>{094331c3-ecee-4c89-bbfd-4c9ded89f0ef}</Project>
<Name>Service</Name>
</ProjectReference>
<ProjectReference Include="..\..\Shared\Shared.csproj">
<Project>{2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4}</Project>
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
<Folder Include="Invoicing\" />
</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.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
-->
</Project>

BIN
ReportImp/KomMitBewo/KommMitBriefpapier2025.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 112 KiB

BIN
ReportImp/KomMitBewo/Logo.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 61 KiB

126
ReportImp/HeikePuetzBewoAusweg/Properties/Resources.Designer.cs → ReportImp/KomMitBewo/Properties/Resources.Designer.cs generated
View File

@@ -1,63 +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 HeikePuetz.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("HeikePuetz.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;
}
}
}
}
//------------------------------------------------------------------------------
// <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 KomMitBewo.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("KomMitBewo.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;
}
}
}
}

238
ReportImp/HeikePuetzBewoAusweg/Properties/Resources.resx → ReportImp/KomMitBewo/Properties/Resources.resx
View File

@@ -1,120 +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>
<?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>

1221
ReportImp/KomMitBewo/ServiceInvoiceReport.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

9659
ReportImp/KomMitBewo/ServiceInvoiceReport.resx
View File

File diff suppressed because one or more lines are too long

17
ReportImp/KomMitBewo/SettlementReport.Designer.cs generated
View File

@@ -30,6 +30,7 @@ namespace KommMit.Alt
{
this.components = new System.ComponentModel.Container();
DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
@@ -151,7 +152,7 @@ namespace KommMit.Alt
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel9});
this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 150F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
@@ -310,7 +311,6 @@ namespace KommMit.Alt
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 100F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
@@ -1126,16 +1126,19 @@ namespace KommMit.Alt
this.GroupFooter1});
this.DataSource = this.bindingSource1;
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, 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(95, 50, 100, 123);
this.Margins = new DevExpress.Drawing.DXMargins(95F, 50F, 100F, 123F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "17.1";
this.Watermark.Image = ((System.Drawing.Image)(resources.GetObject("Spitzabrechnung.Watermark.Image")));
this.Watermark.ImageViewMode = DevExpress.XtraPrinting.Drawing.ImageViewMode.Zoom;
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
xrWatermark1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrWatermark1.ImageSource"));
xrWatermark1.ImageViewMode = DevExpress.XtraPrinting.Drawing.ImageViewMode.Zoom;
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();

9419
ReportImp/KomMitBewo/SettlementReport.resx
View File

File diff suppressed because one or more lines are too long

190
ReportImp/KomMitBewo/SettlementReport2.Designer.cs generated
View File

@@ -59,6 +59,13 @@ namespace KommMit
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTable7 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -111,13 +118,6 @@ namespace KommMit
this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTable7 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
this.Zwischensumme = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable8 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow17 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -126,6 +126,7 @@ namespace KommMit
this.xrTableRow18 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -142,16 +143,15 @@ namespace KommMit
this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable8)).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
@@ -377,6 +377,85 @@ namespace KommMit
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
// xrTable7
//
this.xrTable7.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 327.7916F);
this.xrTable7.Name = "xrTable7";
this.xrTable7.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow12});
this.xrTable7.SizeF = new System.Drawing.SizeF(677.5583F, 20F);
this.xrTable7.StylePriority.UseBorderColor = false;
this.xrTable7.StylePriority.UseBorders = false;
this.xrTable7.StylePriority.UseTextAlignment = false;
this.xrTable7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// xrTableRow12
//
this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell16,
this.xrTableCell20,
this.xrTableCell28,
this.xrTableCell30,
this.xrTableCell31});
this.xrTableRow12.Name = "xrTableRow12";
this.xrTableRow12.Weight = 0.083039317476454683D;
//
// xrTableCell16
//
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell16.StylePriority.UseBorderColor = false;
this.xrTableCell16.StylePriority.UseBorders = false;
this.xrTableCell16.StylePriority.UseFont = false;
this.xrTableCell16.StylePriority.UsePadding = false;
this.xrTableCell16.StylePriority.UseTextAlignment = false;
this.xrTableCell16.Text = "Von";
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell16.Weight = 0.07995485782695444D;
//
// xrTableCell20
//
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.StylePriority.UseBorders = false;
this.xrTableCell20.StylePriority.UseTextAlignment = false;
this.xrTableCell20.Text = "Bis";
this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell20.Weight = 0.079954853410013654D;
//
// xrTableCell28
//
this.xrTableCell28.Name = "xrTableCell28";
this.xrTableCell28.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F);
this.xrTableCell28.StylePriority.UseBorderColor = false;
this.xrTableCell28.StylePriority.UseBorders = false;
this.xrTableCell28.StylePriority.UseFont = false;
this.xrTableCell28.StylePriority.UsePadding = false;
this.xrTableCell28.StylePriority.UseTextAlignment = false;
this.xrTableCell28.Text = "Anzahl FLS";
this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell28.Weight = 0.11549034859391105D;
//
// xrTableCell30
//
this.xrTableCell30.Name = "xrTableCell30";
this.xrTableCell30.StylePriority.UseBorders = false;
this.xrTableCell30.StylePriority.UseTextAlignment = false;
this.xrTableCell30.Text = "Einzelpreis";
this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell30.Weight = 0.14214196217270578D;
//
// xrTableCell31
//
this.xrTableCell31.Name = "xrTableCell31";
this.xrTableCell31.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F);
this.xrTableCell31.StylePriority.UseBorders = false;
this.xrTableCell31.StylePriority.UsePadding = false;
this.xrTableCell31.StylePriority.UseTextAlignment = false;
this.xrTableCell31.Text = "Gesamtpreis Stunden";
this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell31.Weight = 0.18439219485560091D;
//
// xrTable1
//
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 269.2083F);
@@ -892,85 +971,6 @@ namespace KommMit
this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell39.Weight = 0.18439219485560091D;
//
// xrTable7
//
this.xrTable7.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 327.7916F);
this.xrTable7.Name = "xrTable7";
this.xrTable7.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow12});
this.xrTable7.SizeF = new System.Drawing.SizeF(677.5583F, 20F);
this.xrTable7.StylePriority.UseBorderColor = false;
this.xrTable7.StylePriority.UseBorders = false;
this.xrTable7.StylePriority.UseTextAlignment = false;
this.xrTable7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// xrTableRow12
//
this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell16,
this.xrTableCell20,
this.xrTableCell28,
this.xrTableCell30,
this.xrTableCell31});
this.xrTableRow12.Name = "xrTableRow12";
this.xrTableRow12.Weight = 0.083039317476454683D;
//
// xrTableCell16
//
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell16.StylePriority.UseBorderColor = false;
this.xrTableCell16.StylePriority.UseBorders = false;
this.xrTableCell16.StylePriority.UseFont = false;
this.xrTableCell16.StylePriority.UsePadding = false;
this.xrTableCell16.StylePriority.UseTextAlignment = false;
this.xrTableCell16.Text = "Von";
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell16.Weight = 0.07995485782695444D;
//
// xrTableCell20
//
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.StylePriority.UseBorders = false;
this.xrTableCell20.StylePriority.UseTextAlignment = false;
this.xrTableCell20.Text = "Bis";
this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell20.Weight = 0.079954853410013654D;
//
// xrTableCell28
//
this.xrTableCell28.Name = "xrTableCell28";
this.xrTableCell28.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F);
this.xrTableCell28.StylePriority.UseBorderColor = false;
this.xrTableCell28.StylePriority.UseBorders = false;
this.xrTableCell28.StylePriority.UseFont = false;
this.xrTableCell28.StylePriority.UsePadding = false;
this.xrTableCell28.StylePriority.UseTextAlignment = false;
this.xrTableCell28.Text = "Anzahl FLS";
this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell28.Weight = 0.11549034859391105D;
//
// xrTableCell30
//
this.xrTableCell30.Name = "xrTableCell30";
this.xrTableCell30.StylePriority.UseBorders = false;
this.xrTableCell30.StylePriority.UseTextAlignment = false;
this.xrTableCell30.Text = "Einzelpreis";
this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell30.Weight = 0.14214196217270578D;
//
// xrTableCell31
//
this.xrTableCell31.Name = "xrTableCell31";
this.xrTableCell31.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F);
this.xrTableCell31.StylePriority.UseBorders = false;
this.xrTableCell31.StylePriority.UsePadding = false;
this.xrTableCell31.StylePriority.UseTextAlignment = false;
this.xrTableCell31.Text = "Gesamtpreis Stunden";
this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell31.Weight = 0.18439219485560091D;
//
// Zwischensumme
//
this.Zwischensumme.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -1062,6 +1062,10 @@ namespace KommMit
this.GroupHeader3.Level = 1;
this.GroupHeader3.Name = "GroupHeader3";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -1238,10 +1242,6 @@ namespace KommMit
this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell58.Weight = 0.30633278705788769D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1269,14 +1269,14 @@ namespace KommMit
xrWatermark1.ImageViewMode = DevExpress.XtraPrinting.Drawing.ImageViewMode.Zoom;
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}

2
ReportImp/KomMitBewo/SettlementReport2.resx
View File

File diff suppressed because one or more lines are too long

7
Service/ServiceUtils/ServiceHelper.cs → Service/Core/ServiceHelper.cs
View File

@@ -1,17 +1,22 @@
using System;
using System.Collections.Generic;
using System.IdentityModel.Claims;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.Serialization;
using System.ServiceModel.Channels;
using System.Text;
using System.Threading.Tasks;
using BeWo.Service.ServiceContracts;
using BS.Shared.Attributes;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Light;
using BS.Shared.Extensions;
using NHibernate.Hql.Ast.ANTLR.Tree;
using BeWo.Service.ServiceUtils;
namespace BeWo.Service.ServiceUtils
namespace BeWo.Service.Core
{
public static class ServiceHelper
{

38
Service/Core/ServiceValidator.cs Normal file
View File

@@ -0,0 +1,38 @@
using BS.Shared.DataContracts;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.Serialization;
using System.Text;
using System.Threading.Tasks;
namespace BeWo.Service.Core
{
public static class ServiceValidator
{
public static void CheckSerializationError<T>(T data)
{
var serializer = new DataContractSerializer(typeof(T));
using (var ms = new MemoryStream())
{
serializer.WriteObject(ms, data);
}
}
public static bool TryCheckSerializationError<T>(T data)
{
try
{
CheckSerializationError(data);
}
catch (Exception ex)
{
File.WriteAllText("C:\\temp\\wcf-serialisierungsfehler.txt", ex.ToString());
return false;
}
return true;
}
}
}

85
Service/DCEntityMapper/CustomerDC_Customer.cs
View File

@@ -116,6 +116,34 @@ namespace BeWo.Service.DCEntityMapper
{
pDataContract.TerminationReason = MapperFactory.ValueListEntryDC_ValueListEntry.MapToNewDC(pEntity.TerminationReason);
}
if (pEntity.EinkommenBeginnType != null)
{
pDataContract.EinkommenBeginnType = MapperFactory.ValueListEntryDC_ValueListEntry.MapToNewDC(pEntity.EinkommenBeginnType);
}
if (pEntity.EinkommenEndeType != null)
{
pDataContract.EinkommenEndeType = MapperFactory.ValueListEntryDC_ValueListEntry.MapToNewDC(pEntity.EinkommenEndeType);
}
if (pEntity.FremdHilfeType != null)
{
pDataContract.FremdHilfeType = MapperFactory.ValueListEntryDC_ValueListEntry.MapToNewDC(pEntity.FremdHilfeType);
}
if (pEntity.SozSchwierigkeitenType != null)
{
pDataContract.SozSchwierigkeitenType = MapperFactory.ValueListEntryDC_ValueListEntry.MapToNewDC(pEntity.SozSchwierigkeitenType);
}
if (pEntity.SozBeziehungenType != null)
{
pDataContract.SozBeziehungenType = MapperFactory.ValueListEntryDC_ValueListEntry.MapToNewDC(pEntity.SozBeziehungenType);
}
if (pEntity.ErstaufnahmeType != null)
{
pDataContract.ErstaufnahmeType = MapperFactory.ValueListEntryDC_ValueListEntry.MapToNewDC(pEntity.ErstaufnahmeType);
}
if (pEntity.RegionType != null)
{
pDataContract.RegionType = MapperFactory.ValueListEntryDC_ValueListEntry.MapToNewDC(pEntity.RegionType);
}
pDataContract.PlacementList = MapperFactory.PlacementDC_Placement.MapToNewDCs(pEntity.PlacementList);
@@ -241,6 +269,63 @@ namespace BeWo.Service.DCEntityMapper
pEntity.TerminationReason = DAOFactory.GenericDAO.LoadByID<ValueListEntry>(pDataContract.TerminationReason.ValueListEntryOid.Value);
}
if (pDataContract.EinkommenBeginnType == null)
{
pEntity.EinkommenBeginnType = null;
}
else if (pEntity.EinkommenBeginnType == null || pEntity.EinkommenBeginnType.Oid != pDataContract.EinkommenBeginnType.ValueListEntryOid)
{
pEntity.EinkommenBeginnType = DAOFactory.GenericDAO.LoadByID<ValueListEntry>(pDataContract.EinkommenBeginnType.ValueListEntryOid.Value);
}
if (pDataContract.EinkommenEndeType == null)
{
pEntity.EinkommenEndeType = null;
}
else if (pEntity.EinkommenEndeType == null || pEntity.EinkommenEndeType.Oid != pDataContract.EinkommenEndeType.ValueListEntryOid)
{
pEntity.EinkommenEndeType = DAOFactory.GenericDAO.LoadByID<ValueListEntry>(pDataContract.EinkommenEndeType.ValueListEntryOid.Value);
}
if (pDataContract.FremdHilfeType == null)
{
pEntity.FremdHilfeType = null;
}
else if (pEntity.FremdHilfeType == null || pEntity.FremdHilfeType.Oid != pDataContract.FremdHilfeType.ValueListEntryOid)
{
pEntity.FremdHilfeType = DAOFactory.GenericDAO.LoadByID<ValueListEntry>(pDataContract.FremdHilfeType.ValueListEntryOid.Value);
}
if (pDataContract.SozSchwierigkeitenType == null)
{
pEntity.SozSchwierigkeitenType = null;
}
else if (pEntity.SozSchwierigkeitenType == null || pEntity.SozSchwierigkeitenType.Oid != pDataContract.SozSchwierigkeitenType.ValueListEntryOid)
{
pEntity.SozSchwierigkeitenType = DAOFactory.GenericDAO.LoadByID<ValueListEntry>(pDataContract.SozSchwierigkeitenType.ValueListEntryOid.Value);
}
if (pDataContract.SozBeziehungenType == null)
{
pEntity.SozBeziehungenType = null;
}
else if (pEntity.SozBeziehungenType == null || pEntity.SozBeziehungenType.Oid != pDataContract.SozBeziehungenType.ValueListEntryOid)
{
pEntity.SozBeziehungenType = DAOFactory.GenericDAO.LoadByID<ValueListEntry>(pDataContract.SozBeziehungenType.ValueListEntryOid.Value);
}
if (pDataContract.ErstaufnahmeType == null)
{
pEntity.ErstaufnahmeType = null;
}
else if (pEntity.ErstaufnahmeType == null || pEntity.ErstaufnahmeType.Oid != pDataContract.ErstaufnahmeType.ValueListEntryOid)
{
pEntity.ErstaufnahmeType = DAOFactory.GenericDAO.LoadByID<ValueListEntry>(pDataContract.ErstaufnahmeType.ValueListEntryOid.Value);
}
if (pDataContract.RegionType == null)
{
pEntity.RegionType = null;
}
else if (pEntity.RegionType == null || pEntity.RegionType.Oid != pDataContract.RegionType.ValueListEntryOid)
{
pEntity.RegionType = DAOFactory.GenericDAO.LoadByID<ValueListEntry>(pDataContract.RegionType.ValueListEntryOid.Value);
}
pEntity.DebitorNumber = pDataContract.DebitorNumber;
pEntity.CostCenter = pDataContract.CostCenter;
pEntity.IsAdvisedOrAttended = pDataContract.IsAdvisedOrAttended;

1
Service/DCEntityMapper/InvoiceBaseDC_InvoiceBase.cs
View File

@@ -117,7 +117,6 @@ namespace BeWo.Service.DCEntityMapper
{
pDataContract.TotalAmount = pDataContract.InvoiceItems.Sum(i => i.AmountTotal);
}
}
else
{

11
Service/DCEntityMapper/Light/GkvAbrechnungLightDC_GkvAbrechnungLight.cs
View File

@@ -23,18 +23,17 @@ namespace BeWo.Service.DCEntityMapper.Light
to.Notice = from.Notice;
to.ErstelltAm = from.ErstelltAm;
to.Betrag = from.Betrag;
to.OrganisationOid = from.OrganisationOid;
to.OrganisationName = from.OrganisationName;
to.AbrechnungsZeitraumStart = from.AbrechnungsZeitraumStart;
to.AbrechnungsZeitraumEnde = from.AbrechnungsZeitraumEnde;
to.UrbelegeGesendet = from.UrbelegeGesendet;
to.Bezahlt = from.Bezahlt;
to.Verfahrensstufe = from.Verfahrensstufe;
to.Verfahrensstufe = (int)from.Verfahrensstufe;
to.InvoiceBases = MapperFactory.InvoiceBaseLightDC_InvoiceBaseLight.MapToNewDCs(from.InvoiceBases);
to.Protokolle = MapperFactory.GkvTransferProtokollLightDC_GkvTransferprotokollLight.MapToNewDCs(from.Protokolle);
to.InvoiceBases = MapperFactory.InvoiceBaseDC_InvoiceBase.MapToNewDCs(from.InvoiceBases);
to.Protokolle = MapperFactory.GkvTransferprotokollLight.MapToNewDCs(from.Protokolle);
to.Organisation = MapperFactory.OrganisationLight.MapToNewDC(from.Organisation);
var (isReady, tooltip) = GkvAbrechnungDC_GkvAbrechnung.GetValidation(from, from.GetState(), from.OrganisationOid);
var (isReady, tooltip) = GkvAbrechnungDC_GkvAbrechnung.GetValidation(from, from.GetState(), from.Organisation.Oid.Value);
to.IsReady2Send = isReady;
to.SendTooltip = tooltip;

4
Service/DCEntityMapper/Light/InvoiceBaseLightDC_InvoiceBaseLight.cs
View File

@@ -16,7 +16,9 @@ namespace BeWo.Service.DCEntityMapper.Light
{
public override InvoiceBaseLightDC MergeWithDC(InvoiceBaseLight pEntity, InvoiceBaseLightDC pDataContract)
{
pDataContract.Oid = pEntity.Oid.Value;
throw new NotImplementedException();
pDataContract.Oid = pEntity.Oid.Value;
pDataContract.Version = pEntity.Version.Value;
pDataContract.Notice = pEntity.Notice;
pDataContract.AccountingPeriodEnd = pEntity.AccountingPeriodEnd;

18
Service/DCEntityMapper/MapperFactory.cs
View File

@@ -1,4 +1,5 @@
using BeWo.Service.DCEntityMapper.Light;
using BeWo.Data.Entities.Light;
using BeWo.Service.DCEntityMapper.Light;
namespace BeWo.Service.DCEntityMapper
{
@@ -795,19 +796,9 @@ namespace BeWo.Service.DCEntityMapper
public static AiSettingsDC_AiSettings AiSettingsDC_AiSettings =>
_AiSettingsDC_AiSettings ?? (_AiSettingsDC_AiSettings = new AiSettingsDC_AiSettings());
public static GkvAbrechnungLightDC_GkvAbrechnungLight GkvAbrechnungLightDC_GkvAbrechnungLight =>
_GkvAbrechnungLightDC_GkvAbrechnungLight ?? (_GkvAbrechnungLightDC_GkvAbrechnungLight = new GkvAbrechnungLightDC_GkvAbrechnungLight());
public static GkvTransferProtokollLightDC_GkvTransferprotokollLight GkvTransferProtokollLightDC_GkvTransferprotokollLight =>
_GkvTransferProtokollLightDC_GkvTransferprotokollLight ?? (_GkvTransferProtokollLightDC_GkvTransferprotokollLight = new GkvTransferProtokollLightDC_GkvTransferprotokollLight());
public static CompactOrganisationDC_Organisation OrganisationLightDC_OrganisationLight =>
_OrganisationLightDC_OrganisationLight ?? (_OrganisationLightDC_OrganisationLight = new CompactOrganisationDC_Organisation());
public static InvoiceBaseLightDC_InvoiceBaseLight InvoiceBaseLightDC_InvoiceBaseLight =>
_InvoiceBaseLightDC_InvoiceBaseLight ?? (_InvoiceBaseLightDC_InvoiceBaseLight = new InvoiceBaseLightDC_InvoiceBaseLight());
// REFACTOR
// Neuer Style
// Kürzer, wird nur bei Bedarf geladen :)
@@ -816,6 +807,9 @@ namespace BeWo.Service.DCEntityMapper
public static AiConversationMessageDC_AiConversationMessage AiConversationMessage { get; } = new AiConversationMessageDC_AiConversationMessage();
public static AiModelDC_AiModel AiModel { get; } = new AiModelDC_AiModel();
public static AiConfigDC_AiConfig AiConfig { get; } = new AiConfigDC_AiConfig();
public static AddressDC_Address Address { get; set; } = new AddressDC_Address();
public static AddressDC_Address Address { get; } = new AddressDC_Address();
public static GkvAbrechnungLightDC_GkvAbrechnungLight GkvAbrechnungLight { get; } = new GkvAbrechnungLightDC_GkvAbrechnungLight();
public static GkvTransferProtokollLightDC_GkvTransferprotokollLight GkvTransferprotokollLight { get; } = new GkvTransferProtokollLightDC_GkvTransferprotokollLight();
public static OrganisationLightDC_OrganisationLight OrganisationLight { get; } = new OrganisationLightDC_OrganisationLight();
}
}

1
Service/Security/SecurityContextInitializer.cs
View File

@@ -13,7 +13,6 @@ using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.Core;
using BeWo.Service.ServiceContracts;
using BeWo.Service.ServiceUtils;
using BS.Shared.Attributes;
using BS.Shared.Extensions;
using NHibernate.Hql.Ast.ANTLR.Tree;

3
Service/Service.csproj
View File

@@ -562,7 +562,8 @@
<Compile Include="ServiceUtils\DistanceCalculator\OpenrouteServiceAPI.cs" />
<Compile Include="ServiceProxy\ServiceFacade.cs" />
<Compile Include="ServiceUtils\ServiceTranslator.cs" />
<Compile Include="ServiceUtils\ServiceHelper.cs" />
<Compile Include="Core\ServiceHelper.cs" />
<Compile Include="Core\ServiceValidator.cs" />
<Compile Include="ServiceUtils\UriTemplateResolver.cs" />
<Compile Include="UnitOfWork\HibernateSessionEndpointBehavior.cs" />
<Compile Include="UnitOfWork\HibernateSessionBehaviorExtension.cs" />

1
Service/ServiceBehavior/AdminMultitenancyContextInitializer.cs
View File

@@ -11,7 +11,6 @@ using System.Xml;
using System.ServiceModel.Dispatcher;
using BeWo.Service.Core;
using BS.Shared.Extensions;
using BeWo.Service.ServiceUtils;
using BS.Shared.Attributes;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;

3
Service/ServiceContracts/IGkvAccountingService.cs
View File

@@ -16,7 +16,6 @@ namespace BeWo.Service.ServiceContracts
[ServiceContract]
public interface IGkvAccountingService
{
[FaultContract(typeof(BeWoFault))]
[OperationContract]
[RequirePermission(UserRightType.Finance_Gkv_View)]
@@ -30,7 +29,7 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
[RequirePermission(UserRightType.Finance_Gkv_View)]
List<GkvAbrechnungLightDC> GetFilteredGkvAbrechnungen(GkvAbrechnungViewFilterDC gkvAbrechnungViewFilter);
List<GkvAbrechnungLightDC> GetAllGkvAbrechnungenBy(GkvAbrechnungViewFilterDC gkvAbrechnungViewFilter);
[FaultContract(typeof(BeWoFault))]
[OperationContract]

1
Service/ServiceImplementations/AiEnhancedServiceImp.cs
View File

@@ -6,7 +6,6 @@ using BeWo.Service.AI;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.ServiceContracts;
using BeWo.Service.ServiceProxy;
using BeWo.Service.ServiceUtils;
using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Feature.AI;

1
Service/ServiceImplementations/DownloadServiceImp.cs
View File

@@ -19,7 +19,6 @@ using BS.Shared.Extensions;
using BS.Shared.RSS;
using BeWo.Data;
using Utils = BeWo.Service.Core.Utils;
using BeWo.Service.ServiceUtils;
using BS.Shared.Translation;
using BeWo.Service.Reporting;

1
Service/ServiceImplementations/EmployeeServiceImp.cs
View File

@@ -13,7 +13,6 @@ using BeWo.Service.SBD;
using BeWo.Service.Security;
using BeWo.Service.ServiceContracts;
using BeWo.Service.Urlaubsplanung;
using BeWo.Service.ServiceUtils.DistanceCalculator;
using BeWo.View.Navigation.Filter;
using BS.Shared;
using BS.Shared.DataContracts;

64
Service/ServiceImplementations/GkvAccountingServiceImp.cs
View File

@@ -8,6 +8,7 @@ using BeWo.Service.Plugins;
using BeWo.Service.ServiceContracts;
using BS.Shared;
using BS.Shared.AppSender;
using BS.Shared.Attributes;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
@@ -18,9 +19,12 @@ using BS.Shared.Extensions;
using BS.Shared.Interface;
using Dakota;
using Dakota.Logic;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.Serialization;
using System.ServiceModel;
using System.Text;
using System.Threading.Tasks;
@@ -40,7 +44,7 @@ namespace BeWo.Service.ServiceImplementations
{
var gkv = DAOFactory.GenericDAO.GetByID<GkvAbrechnungLight>(oid);
var dc = MapperFactory.GkvAbrechnungLightDC_GkvAbrechnungLight.MapToNewDC(gkv);
var dc = MapperFactory.GkvAbrechnungLight.MapToNewDC(gkv);
return dc;
}
@@ -50,24 +54,6 @@ namespace BeWo.Service.ServiceImplementations
}
}
public List<GkvAbrechnungLightDC> GetFilteredGkvAbrechnungen(GkvAbrechnungViewFilterDC gkvAbrechnungViewFilter)
{
try
{
if (gkvAbrechnungViewFilter == null || !gkvAbrechnungViewFilter.FilterTime)
return GetAllGkvAbrechnungen();
var start = gkvAbrechnungViewFilter.Start;
var end = gkvAbrechnungViewFilter.End;
var filter = gkvAbrechnungViewFilter.FilterForInvoiceDate;
return GetGkvAbrechnungen(() => DAOFactory.FinanceDAO.GetGkvAbrechnungen(start, end, filter));
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public List<GkvAbrechnungLightDC> GetAllGkvAbrechnungen()
{
try
@@ -79,11 +65,37 @@ namespace BeWo.Service.ServiceImplementations
throw Utils.CreateBeWoFaultException(e);
}
}
public List<GkvAbrechnungLightDC> GetAllGkvAbrechnungenBy(GkvAbrechnungViewFilterDC gkvAbrechnungViewFilter)
{
if (gkvAbrechnungViewFilter == null || !gkvAbrechnungViewFilter.FilterTime)
{
var dcs = GetAllGkvAbrechnungen();
ServiceValidator.CheckSerializationError(dcs);
return dcs;
}
try
{
var start = gkvAbrechnungViewFilter.Start;
var end = gkvAbrechnungViewFilter.End;
var filter = gkvAbrechnungViewFilter.FilterForInvoiceDate;
return GetGkvAbrechnungen(() => DAOFactory.FinanceDAO.GetGkvAbrechnungen(start, end, filter));
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
private List<GkvAbrechnungLightDC> GetGkvAbrechnungen(Func<IEnumerable<GkvAbrechnungLight>> get_entities)
{
var entities = get_entities();
var dcs = MapperFactory.GkvAbrechnungLightDC_GkvAbrechnungLight.MapToNewDCs(entities);
var dcs = MapperFactory.GkvAbrechnungLight.MapToNewDCs(entities);
var updateables = dcs.Where(x => x.IsWaiting()).ToArray();
@@ -97,7 +109,7 @@ namespace BeWo.Service.ServiceImplementations
entities = get_entities();
dcs = MapperFactory.GkvAbrechnungLightDC_GkvAbrechnungLight.MapToNewDCs(entities);
dcs = MapperFactory.GkvAbrechnungLight.MapToNewDCs(entities);
return dcs;
}
@@ -164,7 +176,7 @@ namespace BeWo.Service.ServiceImplementations
var gkv_light = DAOFactory.GenericDAO.LoadByID<GkvAbrechnungLight>(gkv_abrechnung.Oid.Value);
var gkv_abrechnung_dc = MapperFactory.GkvAbrechnungLightDC_GkvAbrechnungLight.MapToNewDC(gkv_light);
var gkv_abrechnung_dc = MapperFactory.GkvAbrechnungLight.MapToNewDC(gkv_light);
response.Success = true;
response.GkvAbrechnungLightDC = gkv_abrechnung_dc;
@@ -192,11 +204,11 @@ namespace BeWo.Service.ServiceImplementations
{
var entity = DAOFactory.GenericDAO.GetByID<GkvAbrechnungLight>(abrechnung.Oid);
MapperFactory.GkvAbrechnungLightDC_GkvAbrechnungLight.MergeWithEntity(abrechnung, entity);
MapperFactory.GkvAbrechnungLight.MergeWithEntity(abrechnung, entity);
DAOFactory.GenericDAO.Update(entity);
var dc = MapperFactory.GkvAbrechnungLightDC_GkvAbrechnungLight.MapToNewDC(entity);
var dc = MapperFactory.GkvAbrechnungLight.MapToNewDC(entity);
return dc;
}
@@ -287,8 +299,8 @@ namespace BeWo.Service.ServiceImplementations
var entity_light = DAOFactory.GenericDAO.LoadByID<GkvAbrechnungLight>(entity.Oid.Value);
var protokoll_light = DAOFactory.GenericDAO.LoadByID<GkvTransferProtokollLight>(protokoll.Oid.Value);
response.GkvAbrechnungDC = MapperFactory.GkvAbrechnungLightDC_GkvAbrechnungLight.MapToNewDC(entity_light);
response.TransferProtokoll = MapperFactory.GkvTransferProtokollLightDC_GkvTransferprotokollLight.MapToNewDC(protokoll_light);
response.GkvAbrechnungDC = MapperFactory.GkvAbrechnungLight.MapToNewDC(entity_light);
response.TransferProtokoll = MapperFactory.GkvTransferprotokollLight.MapToNewDC(protokoll_light);
return response;
}

1
Service/ServiceImplementations/OperationsEnhancedServiceImp.cs
View File

@@ -5,7 +5,6 @@ using BeWo.Data.Security;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.ServiceContracts;
using BeWo.Service.ServiceProxy;
using BeWo.Service.ServiceUtils;
using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Feature.AI;

7
Service/ServiceImplementations/OperationsServiceImp.cs
View File

@@ -5752,6 +5752,13 @@ namespace BeWo.Service.ServiceImplementations
customer.Team2CustomerList?.Clear();
customer.TerminationDate = null;
customer.TerminationReason = null;
customer.EinkommenBeginnType = null;
customer.EinkommenEndeType = null;
customer.FremdHilfeType = null;
customer.SozSchwierigkeitenType = null;
customer.SozBeziehungenType = null;
customer.ErstaufnahmeType = null;
customer.RegionType = null;
customer.UdpUser = anonimyzedName;
customer.ValueList?.Clear();
customer.VertretungDringendErforderlich = false;

18
Shared/BeWoEntityEnums.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.ComponentModel;
using System.Runtime.Serialization;
using DevExpress.Xpo;
namespace BS.Shared
@@ -709,7 +710,14 @@ namespace BS.Shared
NotizenKategorieEmployee = 31,
MassnahmenKatalog = 32,
Auftragsherkunft,
Vermittlungsgrundlage
Vermittlungsgrundlage,
EinkommenBeginnType = 35,
EinkommenEndeType = 36,
FremdHilfeType = 37,
SozSchwierigkeitenType = 38,
SozBeziehungenType = 39,
ErstaufnahmeType = 40,
RegionType = 41
}
public enum ContactType
@@ -1314,11 +1322,11 @@ namespace BS.Shared
WaitingForUrbelege,
}
public enum GkvVerfahrensstufe
public enum GkvVerfahrensstufe
{
Test,
Erprobung,
Echt
Test,
Erprobung,
Echt
}
public enum ValidationType

39
Shared/Core/EnumTranslations.cs
View File

@@ -408,15 +408,36 @@ namespace BS.Shared.Core
{
ValueListEntryType.NotizenKategorieEmployee, Translator.Translate("MitarbeiterPlural") + " Notiz Kategorie"
},
{
ValueListEntryType.MassnahmenKatalog, Translator.Translate("Maßnahmenkatalog")
},
{
ValueListEntryType.Auftragsherkunft, "Auftragsherkunft"
},
{
ValueListEntryType.Vermittlungsgrundlage, "Vermittlungsgrundlage"
},
{
ValueListEntryType.MassnahmenKatalog, Translator.Translate("Maßnahmenkatalog")
},
{
ValueListEntryType.Auftragsherkunft, "Auftragsherkunft"
},
{
ValueListEntryType.Vermittlungsgrundlage, "Vermittlungsgrundlage"
},
{
ValueListEntryType.EinkommenBeginnType, Translator.Translate("Einkommensart zu Beginn")
},
{
ValueListEntryType.EinkommenEndeType, Translator.Translate("Einkommensart zum Ende")
},
{
ValueListEntryType.FremdHilfeType, Translator.Translate("Anspruchnahme fremder Hilfen")
},
{
ValueListEntryType.SozSchwierigkeitenType, Translator.Translate("Soziale Schwierigkeiten")
},
{
ValueListEntryType.SozBeziehungenType, Translator.Translate("Soziale Beziehungen")
},
{
ValueListEntryType.ErstaufnahmeType, Translator.Translate("Erstaufnahme")
},
{
ValueListEntryType.RegionType, Translator.Translate("Region der Hilfe")
},
};
#endregion

7
Shared/DataContracts/CustomerDC.cs
View File

@@ -41,6 +41,13 @@ namespace BS.Shared.DataContracts
[DataMember] public DateTime? AssistanceBegin { get; set; }
[DataMember] public DateTime? TerminationDate { get; set; }
[DataMember] public ValueListEntryDC TerminationReason { get; set; }
[DataMember] public ValueListEntryDC EinkommenBeginnType { get; set; }
[DataMember] public ValueListEntryDC EinkommenEndeType { get; set; }
[DataMember] public ValueListEntryDC FremdHilfeType { get; set; }
[DataMember] public ValueListEntryDC SozSchwierigkeitenType { get; set; }
[DataMember] public ValueListEntryDC SozBeziehungenType { get; set; }
[DataMember] public ValueListEntryDC ErstaufnahmeType { get; set; }
[DataMember] public ValueListEntryDC RegionType { get; set; }
[DataMember] public long? FamilyDataOid { get; set; }
[DataMember] public long? FamilyDataVersion { get; set; }
[DataMember] public String Kindesmutter { get; set; }

14
Shared/DataContracts/Light/GkvAbrechnungLightDC.cs
View File

@@ -10,6 +10,7 @@ using System.Threading.Tasks;
namespace BS.Shared.DataContracts.Light
{
[DataContract]
public class GkvAbrechnungLightDC : ILightDataContract, IGkvAbrechnung
{
[DataMember] public long Oid { get; set; }
@@ -17,19 +18,18 @@ namespace BS.Shared.DataContracts.Light
[DataMember] public string Notice { get; set; }
[DataMember] public DateTime ErstelltAm { get; set; }
[DataMember] public decimal Betrag { get; set; }
[DataMember] public long OrganisationOid { get; set; }
[DataMember] public string OrganisationName { get; set; }
[DataMember] public DateTime? AbrechnungsZeitraumStart { get; set; }
[DataMember] public DateTime? AbrechnungsZeitraumEnde { get; set; }
[DataMember] public bool UrbelegeGesendet { get; set; }
[DataMember] public bool Bezahlt { get; set; }
[DataMember] public GkvVerfahrensstufe Verfahrensstufe { get; set; }
[DataMember] public IList<InvoiceBaseLightDC> InvoiceBases { get; set; }
[DataMember] public IList<GkvTransferProtokollLightDC> Protokolle { get; set; }
[DataMember] public int Verfahrensstufe { get; set; }
[DataMember] public OrganisationLightDC Organisation { get; set; }
[DataMember] public List<InvoiceBaseDC> InvoiceBases { get; set; }
[DataMember] public List<GkvTransferProtokollLightDC> Protokolle { get; set; }
[DataMember] public bool IsReady2Send { get; set; }
[DataMember] public string SendTooltip { get; set; }
public virtual IEnumerable<IGkvTransferProtokoll> TransferProtokolle => Protokolle;
public virtual IGkvTransferProtokoll LastTransferProtokoll => Protokolle?.LastOrDefault();
public IEnumerable<IGkvTransferProtokoll> TransferProtokolle => Protokolle;
public IGkvTransferProtokoll LastTransferProtokoll => Protokolle?.LastOrDefault();
}
}

1
Shared/DataContracts/Light/GkvTransferProtokollLightDC.cs
View File

@@ -8,6 +8,7 @@ using System.Threading.Tasks;
namespace BS.Shared.DataContracts.Light
{
[DataContract]
public class GkvTransferProtokollLightDC : ILightDataContract, IGkvTransferProtokoll
{
[DataMember] public long? Oid { get; set; }

1
Shared/DataContracts/Light/InvoiceBaseLightDC.cs
View File

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
namespace BS.Shared.DataContracts.Light
{
[DataContract]
public class InvoiceBaseLightDC : ILightDataContract
{
[DataMember] public long? Oid { get; set; }

1
Shared/DataContracts/Light/OrganisationLightDC.cs
View File

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
namespace BS.Shared.DataContracts.Light
{
[DataContract]
public class OrganisationLightDC : ILightDataContract
{
[DataMember] public long Oid { get; set; }