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

# Conflicts:
#	BeWo/View/Detail/Report/FlexibleReportView.xaml
#	BeWo/View/Detail/Report/FlexibleReportView.xaml.cs
#	Data/Data.csproj
#	Service/ServiceContracts/IOperationsService.cs
#	Service/ServiceImplementations/OperationsServiceImp.cs
#	Shared/BeWoEntityEnums.cs
This commit is contained in:
rene
2019-07-15 11:24:48 +02:00
644 changed files with 205210 additions and 25810 deletions

12
.gitignore vendored
View File

@@ -363,3 +363,15 @@
/ReportImp/NahDran/obj/Release
/ReportImp/WohnstaettenEssen/obj/Debug
/ReportImp/WohnstaettenEssen/obj/Release
/ReportImp/AsbRheinErftDueren/obj/Debug
/ReportImp/AsbRheinErftDueren/obj/Release
/ReportImp/BeWoKleefeld/obj/Debug
/ReportImp/BeWoKleefeld/obj/Release
/ReportImp/FortisNova/obj/Debug
/ReportImp/FortisNova/obj/Release
/ReportImp/LandshuterNetzwerk/obj/Debug
/ReportImp/LebenshilfeTrier/obj/Debug
/ReportImp/LandshuterNetzwerk/obj/Release
/ReportImp/LebenshilfeTrier/obj/Release
/ReportImp/TabulaRasa/obj/Debug
/ReportImp/TabulaRasa/obj/Release

View File

@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.329
VisualStudioVersion = 15.0.27130.2010
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{E7543C39-A44C-40C9-82C9-E7FAA2D9A852}"
EndProject
@@ -343,8 +343,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FizHof", "ReportImp\FizHof\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WMB", "ReportImp\WMB\WMB.csproj", "{9D5A3145-0161-42CC-B122-E759C81C4246}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWoPlanerAndroid", "BeWoPlanerAndroid\BeWoPlanerAndroid.csproj", "{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LebenshilfeDuisburgServicePlus", "ReportImp\LebenshilfeDuisburgServicePlus\LebenshilfeDuisburgServicePlus.csproj", "{E11E1D7B-3B05-417A-8A87-EC6CD7BAB0B8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ABWElsebrock", "ReportImp\ABWElsebrock\ABWElsebrock.csproj", "{3FEB9C4A-BB7C-48DD-A7AE-BC9D5D00E466}"
@@ -2548,18 +2546,6 @@ Global
{9D5A3145-0161-42CC-B122-E759C81C4246}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{9D5A3145-0161-42CC-B122-E759C81C4246}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{9D5A3145-0161-42CC-B122-E759C81C4246}.Release|x86.ActiveCfg = Release|Any CPU
{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}.Debug|.NET.ActiveCfg = Debug|Any CPU
{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}.Debug|x86.ActiveCfg = Debug|Any CPU
{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}.Release|.NET.ActiveCfg = Release|Any CPU
{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}.Release|Any CPU.Build.0 = Release|Any CPU
{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}.Release|x86.ActiveCfg = Release|Any CPU
{E11E1D7B-3B05-417A-8A87-EC6CD7BAB0B8}.Debug|.NET.ActiveCfg = Debug|Any CPU
{E11E1D7B-3B05-417A-8A87-EC6CD7BAB0B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E11E1D7B-3B05-417A-8A87-EC6CD7BAB0B8}.Debug|Any CPU.Build.0 = Debug|Any CPU

View File

@@ -278,10 +278,26 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Detail\Report\EMailStatusLogControl.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Detail\Report\FlexibleReportView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Detail\Report\FlexibleReportLayoutSave.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Detail\Report\TestEMailControl.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Detail\Report\TimeSheetMailView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\StundenplanView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -612,6 +628,7 @@
<DependentUpon>ProxyLoginView.xaml</DependentUpon>
</Compile>
<Compile Include="Scheduler\Utils\AppointmentExtensions.cs" />
<Compile Include="Scheduler\Utils\Utils.cs" />
<Compile Include="Scheduler\ViewModel\CustomFieldStorage.cs" />
<Compile Include="SchulbegleitenderDienst\SchulbegleitenderDienstEmployeeView.xaml.cs">
<DependentUpon>SchulbegleitenderDienstEmployeeView.xaml</DependentUpon>
@@ -799,9 +816,22 @@
<Compile Include="View\Detail\BudgetView.xaml.cs">
<DependentUpon>BudgetView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\Report\EMailStatusLogControl.xaml.cs">
<DependentUpon>EMailStatusLogControl.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\Report\FlexibleReportView.xaml.cs">
<DependentUpon>FlexibleReportView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\Report\FlexibleReportLayoutSave.xaml.cs">
<DependentUpon>FlexibleReportLayoutSave.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\Report\TestEMailControl.xaml.cs">
<DependentUpon>TestEMailControl.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\Report\TimeSheetMailView.xaml.cs">
<DependentUpon>TimeSheetMailView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Navigation\Sorter\UserSorter.cs" />
<Compile Include="View\StundenplanView.xaml.cs">
<DependentUpon>StundenplanView.xaml</DependentUpon>
</Compile>

View File

@@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PublishUrlHistory>D:\Projects\beyondsoft\BeWoPlaner\Publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\|C:\Projects\beyondsoft\BeWoPlaner\Publish\</PublishUrlHistory>
<InstallUrlHistory>http://app.beyondsoft.de/lha/|http://app.beyondsoft.de/sbd/|http://fortis-bewoplaner.fortis-ev.org.local/|http://app.beyondsoft.de/|http://app.beyondsoft.de/test/</InstallUrlHistory>
<InstallUrlHistory>http://app.beyondsoft.de/sbd/|http://app.beyondsoft.de/lha/|http://fortis-bewoplaner.fortis-ev.org.local/|http://app.beyondsoft.de/|http://app.beyondsoft.de/test/</InstallUrlHistory>
<SupportUrlHistory />
<UpdateUrlHistory />
<BootstrapperUrlHistory />

View File

@@ -392,7 +392,11 @@ namespace BeWo.SchulbegleitenderDienst
at.KrankheitsMeldung = KrankMeldungMitarbeiterDatepicker.DateTime.Date;
ServiceFacade.DoOperationsServiceSync(s => s.InsertNewEmployeeAbsenceTime(currentEmployee.EmployeeOid, at));
}
MVDatepickerVon.DateTime = DateTime.Now.Date;
MVDatepickerBis.DateTime = DateTime.Now.Date;
KrankMeldungMitarbeiterDatepicker.DateTime = DateTime.Now.Date;
}
private CompactCustomerDC currentKlient;
@@ -590,7 +594,11 @@ namespace BeWo.SchulbegleitenderDienst
at.KrankheitsMeldung = KrankMeldungKlientDatepicker.DateTime.Date;
ServiceFacade.DoOperationsServiceSync(s => s.InsertNewCustomerAbsenceTime(currentKlient.CustomerOid, at));
}
KVDatepickerVon.DateTime = DateTime.Now.Date;
KVDatepickerBis.DateTime = DateTime.Now.Date;
KrankMeldungKlientDatepicker.DateTime = DateTime.Now.Date;
}
private void ButtonVertretungWochenAnzeigeMitarbeiter_Click(object sender, RoutedEventArgs e)

View File

@@ -0,0 +1,74 @@
<UserControl x:Class="BeWo.View.Detail.Report.EMailStatusLogControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:dxgt="http://schemas.devexpress.com/winfx/2008/xaml/grid/themekeys"
mc:Ignorable="d"
d:DesignHeight="400" d:DesignWidth="600">
<Grid Background="{StaticResource ObjectEditBackgroundBrush}" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="120"/>
<RowDefinition Height="*"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="Betreff:" Margin="5,3,3,3"/>
<TextBox x:Name="txtSubject" Grid.Row="0" Grid.Column="1" Margin="3"/>
<TextBox x:Name="txtContent" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Margin="5" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"/>
<!--<Label Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="4" Content="Hier können Sie eine E-Mail an den BeWoPlaner-Support formulieren." Margin="3"/>-->
<TextBlock Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" Text="ACHTUNG: Dieser Vorgang kann nicht rückgängig gemacht werden, sobald die E-Mails verschickt wurden." Foreground="Black" Margin="10, 10, 3, 3"/>
<TextBlock x:Name="TxtStatus" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="3" Foreground="{DynamicResource BigInfoTextBrush}" Text="Anzahl: 200 Anzahl ausgewählt: 200" Height="14" Margin="10, 3, 3, 3" />
<Button x:Name="ButtonStartStop" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="3" Content="Versand starten" Margin="3,3,128,3" Click="ButtonStartStop_OnClick" HorizontalAlignment="Right" Width="120"/>
<Button x:Name="ButtonClose" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="3" Content="Schließen" Margin="3" Click="ButtonClose_OnClick" HorizontalAlignment="Right" Width="120"/>
<dxg:GridControl Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" x:Name="GridControlTimesheet" Visibility="Visible" AllowDrop="True" Margin="5,5,5,5" VerticalContentAlignment="Center" BorderBrush="Black" >
<dxg:GridControl.View>
<dxg:TableView AllowPerPixelScrolling="True" ShowTotalSummary="False" AutoWidth="False" ShowGroupPanel="False">
</dxg:TableView>
</dxg:GridControl.View>
<dxg:GridControl.Columns>
<dxg:GridColumn Header=" " FieldName="IsChecked" Width="30" AllowEditing="True"/>
<dxg:GridColumn Header="Mitarbeiter/in" FieldName="Employee.DetailDescription" Width="200" AllowEditing="False" SortOrder="Ascending"/>
<dxg:GridColumn Header="E-Mail Adresse" FieldName="MailAddress" Width="200" AllowEditing="False"/>
<dxg:GridColumn Header="Status" FieldName="Status" Width="400" AllowEditing="True" >
<dxg:GridColumn.EditSettings>
<dxe:TextEditSettings TextWrapping="Wrap"/>
</dxg:GridColumn.EditSettings>
<dxg:GridColumn.CellStyle>
<Style TargetType="{x:Type dxg:LightweightCellEditor}" >
<Setter Property="Foreground" Value="{Binding RowData.Row.StatusColor}" />
</Style>
</dxg:GridColumn.CellStyle>
</dxg:GridColumn>
</dxg:GridControl.Columns>
</dxg:GridControl>
</Grid>
</UserControl>

View File

@@ -0,0 +1,199 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using BeWo.ServiceProxy;
using BS.Shared.Extensions;
using DevExpress.Xpf.Scheduler.Drawing;
using Button = System.Web.UI.WebControls.Button;
namespace BeWo.View.Detail.Report
{
/// <summary>
/// Interaktionslogik für TestEMailControl.xaml
/// </summary>
public partial class EMailStatusLogControl : UserControl
{
public event Action CloseButtonClicked;
private ObservableCollection<EmployeeTimesheetDetails> _employeeTimesheets;
private bool _cancelled = false;
private int _Index = 0;
private bool _SendingInProgress = false;
public EMailStatusLogControl()
{
InitializeComponent();
TxtStatus.Text = "";
}
public ObservableCollection<EmployeeTimesheetDetails> EmployeeTimesheetDetails
{
get { return _employeeTimesheets; }
set
{
_employeeTimesheets = value;
GridControlTimesheet.ItemsSource = _employeeTimesheets;
if (EmployeeTimesheetDetails != null && EmployeeTimesheetDetails.Count > 0)
{
txtSubject.Text = EmployeeTimesheetDetails[0].TimeSheetStatusItem.MailSubjectTemplate;
txtContent.Text = EmployeeTimesheetDetails[0].TimeSheetStatusItem.MailMessageTemplate;
}
UpdateStatusText();
}
}
public bool MailSendingSuccessful { get; set; }
private void ButtonStartStop_OnClick(object sender, RoutedEventArgs e)
{
if (_SendingInProgress)
{
CancelSending();
}
else
{
StartSendingMails();
}
}
private void StartSendingMails()
{
_cancelled = false;
_Index = 0;
_SendingInProgress = true;
ButtonStartStop.Content = "Versand abbrechen";
SendNextMail();
}
private void SendNextMail()
{
if (!_cancelled)
{
if (EmployeeTimesheetDetails != null && _Index < EmployeeTimesheetDetails.Count)
{
var next = EmployeeTimesheetDetails[_Index++];
if (next.IsChecked)
{
SendMail(next);
}
else
{
SendNextMail();
}
}
else
{
ButtonStartStop.Content = "Versand starten";
_SendingInProgress = false;
}
}
}
private void SendMail(EmployeeTimesheetDetails etd)
{
if (!String.IsNullOrWhiteSpace(etd.TimeSheetStatusItem.MailAddress))
{
etd.Status = "Mail wird versendet...";
}
else
{
etd.Status = "Keine Mailadresse vorhanden";
SendNextMail();
return;
}
etd.TimeSheetStatusItem.MailSubjectTemplate = txtSubject.Text;
etd.TimeSheetStatusItem.MailMessageTemplate = txtContent.Text;
//CB ### Generated
//ServiceFacade.DoReportServiceAsync(m => m.SendTimeSheetMail(etd.TimeSheetStatusItem, true),
// (result) =>
// {
// this.Dispatch(delegate
// {
// if (String.IsNullOrWhiteSpace(result))
// {
// etd.Status = "Mail erfolgreich versendet.";
// etd.IsChecked = false;
// MailSendingSuccessful = true;
// }
// else
// {
// if (result.Contains("Fehler"))
// {
// etd.Status = result;
// }
// else
// {
// etd.Status = "Beim Versenden ist ein Fehler aufgetreten! " + result;
// }
// }
// //GridControlTimesheet.RefreshData();
// SendNextMail();
// });
// });
}
private void UpdateStatusText()
{
int count = 0;
foreach (var ts in _employeeTimesheets)
{
if (ts.IsChecked)
{
count++;
}
}
TxtStatus.Text = String.Format("Anzahl Gesamt: {0} Ausgewählt: {1}", _employeeTimesheets.Count, count);
}
public bool CancelSending()
{
if (!_SendingInProgress && (EmployeeTimesheetDetails == null || EmployeeTimesheetDetails.Count == 0))
{
return true;
}
if (MessageBox.Show("Möchten Sie den Vorgang wirklich abbrechen?", "Abbrechen", MessageBoxButton.YesNo,
MessageBoxImage.Question) == MessageBoxResult.Yes)
{
_cancelled = true;
ButtonStartStop.Content = "Versand fortführen";
_SendingInProgress = false;
}
else
{
_cancelled = false;
}
return _cancelled;
}
private void ButtonClose_OnClick(object sender, RoutedEventArgs e)
{
CloseButtonClicked?.Invoke();
}
}
}

View File

@@ -0,0 +1,32 @@
<UserControl x:Class="BeWo.View.Detail.Report.FlexibleReportLayoutSave"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="200" d:DesignWidth="300">
<Grid Background="{StaticResource ObjectEditBackgroundBrush}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="Layout Name:" Margin="3"/>
<TextBox x:Name="txtLayoutName" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="4" Margin="3"/>
<TextBox x:Name="txtLayoutString" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="4" Margin="5" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"/>
<Button x:Name="abbrechenButton" Grid.Row="2" Grid.Column="3" Content="Abbrechen" Margin="3" Click="CancelButton_OnClick" Width="80"/>
<Button x:Name="weiterButton" Grid.Row="2" Grid.Column="2" Content="Speichern" Margin="3" Click="SaveButton_OnClick" HorizontalAlignment="Right" Width="80"/>
</Grid>
</UserControl>

View File

@@ -0,0 +1,53 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace BeWo.View.Detail.Report
{
/// <summary>
/// Interaktionslogik für TestEMailControl.xaml
/// </summary>
public partial class FlexibleReportLayoutSave : UserControl
{
public event Action CancelButtonClicked;
public event Action SaveButtonClicked;
public FlexibleReportLayoutSave()
{
InitializeComponent();
}
public string LayoutName
{
get { return txtLayoutName.Text; }
set { txtLayoutName.Text = value; }
}
public string LayoutString
{
get { return txtLayoutString.Text; }
}
private void SaveButton_OnClick(object sender, RoutedEventArgs e)
{
SaveButtonClicked?.Invoke();
}
private void CancelButton_OnClick(object sender, RoutedEventArgs e)
{
CancelButtonClicked?.Invoke();
}
}
}

View File

@@ -7,10 +7,11 @@
xmlns:localView="clr-namespace:BeWo.View"
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
xmlns:dxpg="http://schemas.devexpress.com/winfx/2008/xaml/pivotgrid" x:Class="BeWo.View.Detail.Report.FlexibleReportView"
xmlns:dxpg="http://schemas.devexpress.com/winfx/2008/xaml/pivotgrid"
xmlns:dxc="http://schemas.devexpress.com/winfx/2008/xaml/charts"
xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
x:Class="BeWo.View.Detail.Report.FlexibleReportView"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" Focusable="True">
<Grid>
<GroupBox Header="Flexibler Bericht" Style="{StaticResource ObjectEditGroupBox}">
@@ -52,7 +53,7 @@
<Button Content="Ansicht laden" Grid.Column="9" Margin="5,0,0,0" x:Name="ButtonLayoutLoad" Click="ButtonLayoutLoad_Click" />
</Grid>
<!-- ############################################### Untere Zeile ###############################################-->
<!-- #############################################ButtonLayoutLoad###############################################-->
<!--<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -90,6 +91,8 @@
<dxpg:PivotGridField x:Name="FlexibleAnzahlMinSoll" FieldName="AnzahlMinutenSoll" Area="FilterArea" Width="60" Caption="Soll Min." AllowedAreas="DataArea,FilterArea" />
<dxpg:PivotGridField x:Name="FlexibleAnzahlStdSoll" FieldName="AnzahlStundenSoll" Area="DataArea" Width="80" Caption="Soll Std." AllowedAreas="DataArea,FilterArea" />
<dxpg:PivotGridField x:Name="FlexibleGefahreneKilometer" FieldName="Kilometer" Area="FilterArea" Width="200" Caption="Gefahrene Kilometer" AllowedAreas="DataArea,FilterArea" />
<dxpg:PivotGridField x:Name="FlexibleBetrag" FieldName="Betrag" Area="DataArea" Width="80" Caption="Betrag" AllowedAreas="DataArea,FilterArea" />
<dxpg:PivotGridField x:Name="FlexibleRundungspotenzial" FieldName="Rundungspotenzial" Area="DataArea" Width="80" Caption="Rundungspotenzial" AllowedAreas="DataArea,FilterArea" />
</dxpg:PivotGridControl.Fields>
</dxpg:PivotGridControl>
</dxlc:LayoutGroup>

View File

@@ -49,17 +49,23 @@ namespace BeWo.View.Detail.Report
{
InitializeComponent();
FlexibleAnzahlMinIst.CellFormat = "{0:N0}";
FlexibleAnzahlStdIst.CellFormat = "{0:N2}";
FlexibleAnzahlMinIst.CellFormat = "{0:N0}";
FlexibleAnzahlStdIst.CellFormat = "{0:N2}";
FlexibleAnzahlMinSoll.CellFormat = "{0:N0}";
FlexibleAnzahlStdSoll.CellFormat = "{0:N2}";
FlexibleAnzahlMinSoll.CellFormat = "{0:N0}";
FlexibleAnzahlStdSoll.CellFormat = "{0:N2}";
FlexibleGefahreneKilometer.CellFormat = "{0:N0}";
FlexibleRundungspotenzial.CellFormat = "{0:N0}";
FlexibleGefahreneKilometer.CellFormat = "{0:N0}";
FlexibleKlient.TotalValueFormat = "{0}";
FlexibleMitarbeiter.TotalValueFormat = "{0}";
FlexibleLeistung.TotalValueFormat = "{0}";
FlexibleLeistungskategorie.TotalValueFormat = "{0}";
FlexibleMitarbeiter.TotalValueFormat = "{0}";
FlexibleLeistung.TotalValueFormat = "{0}";
FlexibleLeistungskategorie.TotalValueFormat = "{0}";
datePickerStartDate.DateTime = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
datePickerEndDate.DateTime = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1).AddMonths(1).AddDays(-1);
@@ -229,12 +235,19 @@ namespace BeWo.View.Detail.Report
public int? Kilometer { get; set; }
public decimal? Betrag
{
get { return AnzahlStundenIst * 57.90m; }
}
public decimal Rundungspotenzial { get; set; }
public static FlexibleReportEntry InitByFlexibleReportEntryDC(FlexibleReportEntryDC entryDC)
{
var returnValue = new FlexibleReportEntry()
{
AnzahlMinutenIst = entryDC.AnzahlMinuten,
Datum = entryDC.Datum,
Datum = entryDC.StartDatum,
SupportConcept = entryDC.SupportConcept == null ? "<Nicht angegeben>" : string.Format("{0:dd.MM.yyyy} - {1:dd.MM.yyyy}", entryDC.SupportConcept.StartDate, entryDC.SupportConcept.EndDate),
Leistung = entryDC.Leistung,
Leistungskategorie = entryDC.Leistungskategorie,
@@ -242,7 +255,8 @@ namespace BeWo.View.Detail.Report
AnzahlMinutenSoll = entryDC.AnzahlMinutenSoll,
EintraegeProTag = entryDC.EintraegeProTag,
Type = entryDC.Type,
Kilometer = entryDC.Kilometer
Kilometer = entryDC.Kilometer,
Rundungspotenzial = entryDC.AnzahlMinuten - ((decimal)entryDC.EndDatum.Subtract(entryDC.StartDatum).TotalMinutes)
};
if (entryDC.Customer == null)

View File

@@ -0,0 +1,43 @@
<UserControl x:Class="BeWo.View.Detail.Report.TestEMailControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="200" d:DesignWidth="300">
<Grid Background="{StaticResource ObjectEditBackgroundBrush}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<!--<Label Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="4" Content="Hier können Sie eine E-Mail an den BeWoPlaner-Support formulieren." Margin="3"/>-->
<Label Grid.Row="0" Grid.Column="0" Content="E-Mail Adresse:" Margin="3"/>
<TextBox x:Name="txtEMail" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="4" Margin="3"/>
<Label Grid.Row="1" Grid.Column="0" Content="Betreff:" Margin="5,3,3,3"/>
<TextBox x:Name="txtSubject" Grid.Row="1" Grid.Column="1" Margin="3" Grid.ColumnSpan="3"/>
<TextBox x:Name="txtContent" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="4" Margin="5" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"/>
<Button x:Name="abbrechenButton" Grid.Row="3" Grid.Column="3" Content="Abbrechen" Margin="3" Click="AbbrechenButton_OnClick" Width="80"/>
<Button x:Name="weiterButton" Grid.Row="3" Grid.Column="2" Content="Absenden" Margin="3" Click="WeiterButton_OnClick" HorizontalAlignment="Right" Width="80"/>
</Grid>
</UserControl>

View File

@@ -0,0 +1,65 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace BeWo.View.Detail.Report
{
/// <summary>
/// Interaktionslogik für TestEMailControl.xaml
/// </summary>
public partial class TestEMailControl : UserControl
{
public event Action CancelButtonClicked;
public event Action OkButtonClicked;
public TestEMailControl()
{
InitializeComponent();
}
public String SenderEMail
{
get { return txtEMail.Text; }
set { txtEMail.Text = value; }
}
public String Subject
{
get { return txtSubject.Text; }
set { txtSubject.Text = value; }
}
public String Message
{
get { return txtContent.Text; }
set { txtContent.Text = value; }
}
private void AbbrechenButton_OnClick(object sender, RoutedEventArgs e)
{
if (CancelButtonClicked != null)
CancelButtonClicked();
}
private void WeiterButton_OnClick(object sender, RoutedEventArgs e)
{
if (OkButtonClicked != null)
OkButtonClicked();
}
}
}

View File

@@ -0,0 +1,170 @@
<localView:BeWoView x:Class="BeWo.View.Detail.Report.TimeSheetMailView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:localView="clr-namespace:BeWo.View"
xmlns:localSearchView="clr-namespace:BeWo.View.Search"
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:dxp="http://schemas.devexpress.com/winfx/2008/xaml/printing"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:dxpbars="http://schemas.devexpress.com/winfx/2008/xaml/printing/bars"
xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
<localView:BeWoView.Resources>
<ResourceDictionary>
<DataTemplate x:Key="mailTemplate">
<dx:MeasurePixelSnapper Margin="5,5,10,10">
<Grid DataContext="{Binding MasterRowData.Row, RelativeSource={RelativeSource TemplatedParent}}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition />
</Grid.RowDefinitions>
<Grid >
<TextBlock Grid.Column="0" Grid.Row="0" Text="{Binding Message}" />
</Grid>
</Grid>
</dx:MeasurePixelSnapper>
</DataTemplate>
<DataTemplate x:Key="contentTemplate">
<dx:MeasurePixelSnapper Margin="5,5,10,10">
<dx:DXTabControl Margin="0">
<dx:DXTabItem Header="Mails">
<dxg:GridControl ItemsSource="{Binding Mails}" >
<dxg:GridControl.DetailDescriptor>
<dxg:ContentDetailDescriptor ShowHeader="False" ContentTemplate="{StaticResource mailTemplate}" />
</dxg:GridControl.DetailDescriptor>
<dxg:GridControl.Columns>
<dxg:GridColumn Header="Gesendet" FieldName="InsertedOn" Width="150">
<dxg:GridColumn.EditSettings>
<dxe:DateEditSettings DisplayFormat="dd.MM.yyyy HH:mm" />
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
<dxg:GridColumn Header="Betreff" FieldName="Subject" Width="300"/>
</dxg:GridControl.Columns>
<dxg:GridControl.View>
<dxg:TableView VerticalScrollbarVisibility="Auto" NavigationStyle="Row" ShowGroupPanel="False" AllowPerPixelScrolling="True"/>
</dxg:GridControl.View>
</dxg:GridControl>
</dx:DXTabItem>
</dx:DXTabControl>
</dx:MeasurePixelSnapper>
</DataTemplate>
</ResourceDictionary>
</localView:BeWoView.Resources>
<GroupBox Header="{markup:Translate Stundenzettel}" Style="{StaticResource ObjectEditGroupBox}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" Grid.Row="0">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Margin="0 2" Content="Monat" Grid.Row="0" Grid.Column="0" />
<ComboBox Height="23" x:Name="combobox_month" Grid.Row="0" Grid.Column="1" Margin="3" VerticalAlignment="Top" Width="90" />
<TextBlock Margin="0 7,3,0" Text=". Jahr" Grid.Row="0" Grid.Column="2" Foreground="Black"/>
<ComboBox Height="23" x:Name="combobox_year" Grid.Row="0" Grid.Column="3" VerticalAlignment="Top" Margin="3" Width="60" />
<Button Name="button_refresh" Grid.Row="0" Grid.Column="4" HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="Bold" Content="Aktualisieren" Click="button_generate_Click" Height="23" Margin="3" />
</Grid>
</ScrollViewer>
<dxg:GridControl Grid.Row="1" x:Name="GridControlTimesheet" Visibility="Visible" AllowDrop="True" Margin="5,5,5,5" VerticalContentAlignment="Center" BorderBrush="Black" FilterChanged="GridControlTimesheet_OnFilterChanged" >
<dxg:GridControl.DetailDescriptor>
<dxg:ContentDetailDescriptor ShowHeader="False" ContentTemplate="{StaticResource contentTemplate}"/>
</dxg:GridControl.DetailDescriptor>
<dxg:GridControl.View>
<dxg:TableView AllowPerPixelScrolling="True" ShowTotalSummary="False" AutoWidth="False" ShowGroupPanel="False" ShowAutoFilterRow="True" />
</dxg:GridControl.View>
<dxg:GridControl.Columns>
<dxg:GridColumn Header=" " FieldName="IsChecked" Width="30" AllowEditing="True"/>
<dxg:GridColumn Header="Mitarbeiter/in" FieldName="Employee.DetailDescription" Width="200" AllowEditing="False" SortOrder="Ascending"/>
<dxg:GridColumn Header="Klient/in" FieldName="Customer" Width="200" AllowEditing="False" />
<dxg:GridColumn Header="Teamleitung" FieldName="TeamLeader" Width="200" AllowEditing="False" />
<dxg:GridColumn Header="E-Mail Adresse" FieldName="MailAddress" Width="200" AllowEditing="False"/>
<dxg:GridColumn Header="Gesendet" FieldName="LastSendDate" Width="120" AllowEditing="False">
<dxg:GridColumn.EditSettings>
<dxe:DateEditSettings DisplayFormat="dd.MM.yyyy HH:mm" />
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
<dxg:GridColumn AllowEditing="False" MinWidth="50" Width="50" FieldName="ReportLink" Header=" ">
<dxg:GridColumn.DisplayTemplate>
<ControlTemplate>
<StackPanel Orientation="Horizontal">
<Button Click="btn_CreateTimeSheet_Click" Content="¥" Padding="0" Margin="1" ToolTip="Stundenzettel anzeigen" Foreground="#FFFFFF" FontSize="13" FontFamily="Webdings" x:Name="btn_CreateTimeSheet" Height="22" Width="22" VerticalAlignment="Center" />
<Button Click="btn_sendTestMail_Click" Content="*" Padding="0" Margin="1" ToolTip="Test E-Mail versenden" Foreground="#FFFFFF" FontSize="13" FontFamily="Wingdings" x:Name="btn_edit" Height="22" Width="22" VerticalAlignment="Center" />
</StackPanel>
</ControlTemplate>
</dxg:GridColumn.DisplayTemplate>
</dxg:GridColumn>
</dxg:GridControl.Columns>
</dxg:GridControl>
<TextBlock x:Name="TxtStatus" Grid.Column="0" Grid.Row="2" Foreground="{DynamicResource BigInfoTextBrush}" Text="Anzahl insgesamt: 200 Anzahl sichtbar: 200 Anzahl ausgewählt: 200" Height="14" Margin="3" />
<StackPanel Grid.Row="3" Orientation="Horizontal">
<Button Margin="10 3 0 0"
Name="button_checkAll" Click="button_checkAll_Click"
HorizontalAlignment="Left">Alle auswählen</Button>
<Button Margin="10 3 0 0"
Name="button_checkAllWithoutMail" Click="button_checkAllWithoutMail_Click"
HorizontalAlignment="Left">Alle ohne Mail auswählen</Button>
<Button Margin="10 3 0 0"
Name="button_uncheckAll" Click="button_uncheckAll_Click"
HorizontalAlignment="Left">Alle abwählen</Button>
</StackPanel>
<StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
<Button Margin="0 3 10 0"
Name="button_createServiceRecords" Click="button_createServiceRecords_Click"
HorizontalAlignment="Left">Zeiterfassung erzeugen</Button>
<Button Margin="0 3 10 0"
Name="button_sendMail" Click="button_sendMail_Click"
HorizontalAlignment="Left">Mail versenden</Button>
</StackPanel>
</Grid>
</GroupBox>
</localView:BeWoView>

View File

@@ -0,0 +1,526 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Navigation;
using BeWo.Controls;
using BeWo.Core;
using BeWo.ServiceProxy;
using BeWo.ViewModel;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Translation;
using DevExpress.Xpf.Core;
using DevExpress.Xpf.Editors;
using DevExpress.Xpf.Printing;
using DevExpress.XtraReports.UI;
namespace BeWo.View.Detail.Report
{
/// <summary>
/// Interaction logic for TimeSheetMailView.xaml
/// </summary>
public partial class TimeSheetMailView : BeWoView
{
private List<EmployeeTimesheetDetails> _employeeTimesheets = new List<EmployeeTimesheetDetails>();
private Dictionary<string, DateTime> Dicdate = new Dictionary<string, DateTime>();
private Dictionary<string, DateTime> DictYear = new Dictionary<string, DateTime>();
public TimeSheetMailView()
{
InitializeComponent();
InitDateCombos();
//if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View))
//{
// checkbox_all.IsEnabled = false;
// checkbox_all.IsChecked = false;
//}
// SetMonthCombobox();
// SetYearCombobox();
TxtStatus.Text = "";
GridControlTimesheet.ItemsSource = _employeeTimesheets;
RefreshTimesheetStatusList(GetSelectedMonth());
combobox_month.SelectionChanged += combobox_month_SelectionChanged;
combobox_year.SelectionChanged += combobox_year_SelectionChanged;
ThemeManager.SetTheme(BeWoApp.CurrentBeWo.MainWindow, Theme.Office2010Black);
}
void combobox_month_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
RefreshTimesheetStatusList(GetSelectedMonth());
}
void combobox_year_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
RefreshTimesheetStatusList(GetSelectedMonth());
}
private DateTime GetSelectedMonth()
{
int month = combobox_month.SelectedIndex + 1;
int year = (int)combobox_year.SelectedItem;
return new DateTime(year, month, 1);
}
private void InitDateCombos()
{
this.combobox_month.ItemsSource = DateTimeFormatInfo.CurrentInfo.MonthNames.Where(s => !string.IsNullOrEmpty(s));
int monthIdx = DateTime.Now.AddMonths(1).Month;
//if (DateTime.Now.Day < 15)
//{
monthIdx--;
if (monthIdx < 0)
monthIdx = 11;
//}
this.combobox_month.SelectedIndex = monthIdx;
var years = new List<int>();
years.Add(DateTime.Now.Year + 1);
for (int i = 0; i <= 10; i++)
{
years.Add(DateTime.Now.Year - i);
}
this.combobox_year.ItemsSource = years;
if (monthIdx == 1)
{
this.combobox_year.SelectedItem = DateTime.Now.Year + 1;
}
else
this.combobox_year.SelectedItem = DateTime.Now.Year;
}
private void button_generate_Click(object sender, RoutedEventArgs e)
{
RefreshTimesheetStatusList(GetSelectedMonth());
}
private void RefreshTimesheetStatusList(DateTime monat)
{
//CB ### Generated
//ServiceFacade.DoCustomerServiceAsync(
// s => s.GetTimesheetStatusList(monat),
// r =>
// {
// List<TimeSheetStatusItemDC> list = r;
// CreateEmployeeTimesheetDetails(list);
// this.Dispatch(delegate
// {
// GridControlTimesheet.RefreshData();
// GridControlTimesheet.RefreshUI();
// UpdateStatusText();
// });
// });
}
private void CreateEmployeeTimesheetDetails(List<TimeSheetStatusItemDC> list)
{
_employeeTimesheets.Clear();
foreach (var ts in list)
{
var d = new EmployeeTimesheetDetails();
d.TimeSheetStatusItem = ts;
d.Employee = ts.Employee;
d.TeamLeader = ts.TeamLeader;
d.MailAddress = ts.MailAddress;
if (ts.Mails != null)
{
foreach (var m in ts.Mails)
{
if (!d.LastSendDate.HasValue || d.LastSendDate < m.InsertedOn)
{
d.LastSendDate = m.InsertedOn;
}
}
d.Mails = ts.Mails;
}
d.Customer = "";
if (ts.Customer != null)
{
foreach (var cc in ts.Customer)
{
if (d.Customer.Length > 0)
{
d.Customer += "; ";
}
d.Customer += cc.DetailDescription;
}
}
_employeeTimesheets.Add(d);
}
}
private void btn_CreateTimeSheet_Click(object sender, RoutedEventArgs e)
{
var vm = this.GridControlTimesheet.GetCurrentValue<EmployeeTimesheetDetails>();
var url = BeWoApp.SiteOfOrigin + "/ReportView.aspx?";
url += "cOid=0&empOid=" + vm.Employee.EmployeeOid + "&type=" + Utils.EnumName(ReportTypes.ServiceOverviewSingleCustomer);
url += "&orgaOid=0&month=" + (combobox_month.SelectedIndex + 1) + "&year=" + combobox_year.SelectedItem;
url = BeWoWpfUtils.GetHTMLEncodedURL(url);
BeWoUtils.NavigateToReportUri(url, "Druckvorschau");
}
private void btn_sendTestMail_Click(object sender, RoutedEventArgs e)
{
var vm = this.GridControlTimesheet.GetCurrentValue<EmployeeTimesheetDetails>();
CreateTestMailWindow(vm);
}
private void CreateTestMailWindow(EmployeeTimesheetDetails vm)
{
BeWoWindow bewoWindow = new BeWoWindow();
bewoWindow.Width = 500;
bewoWindow.Height = 500;
bewoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
TestEMailControl ctrl = new TestEMailControl();
ctrl.Subject = vm.TimeSheetStatusItem.MailSubjectTemplate;
ctrl.Message = vm.TimeSheetStatusItem.MailMessageTemplate;
if (BeWoApp.LoggedOnEmployee.ContactInformations != null)
{
foreach (var contact in BeWoApp.LoggedOnEmployee.ContactInformations)
{
if (contact.ContactType == ContactType.business_Mail)
{
ctrl.SenderEMail = contact.ContactValue;
}
}
}
ctrl.CancelButtonClicked += delegate
{
bewoWindow.Close();
};
ctrl.OkButtonClicked += delegate
{
EMailVersenden(ctrl.SenderEMail, ctrl.Subject, ctrl.Message, vm.TimeSheetStatusItem, bewoWindow);
};
bewoWindow.GroupBoxContent = ctrl;
bewoWindow.rootGroupBox.Header = "E-Mail versenden";
bewoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
bewoWindow.ShowDialog();
}
private void EMailVersenden(string senderEMail, string subject, string mailbody, TimeSheetStatusItemDC timeSheetStatusItem, BeWoWindow window)
{
timeSheetStatusItem.MailAddress = senderEMail;
timeSheetStatusItem.MailSubjectTemplate = subject;
timeSheetStatusItem.MailMessageTemplate = mailbody;
//CB ### Generated
//var result = ServiceFacade.DoReportServiceSync(m => m.SendTimeSheetMail(timeSheetStatusItem, false));
//if (result == null || String.IsNullOrWhiteSpace(result))
//{
// window.Close();
// MessageBox.Show("Die E-Mail wurde erfolgreich versendet.", "E-Mail senden", MessageBoxButton.OK,
// MessageBoxImage.Information);
//}
//else
//{
// MessageBox.Show("Die E-Mail konnte leider nicht gesendet werden.\n\n" + result, "E-Mail senden", MessageBoxButton.OK,
// MessageBoxImage.Error);
//}
}
private void button_checkAll_Click(object sender, RoutedEventArgs e)
{
var list = GetVisibleTimesheetDetails();
foreach (var etd in list)
{
etd.IsChecked = true;
}
GridControlTimesheet.RefreshData();
UpdateStatusText();
}
private void button_checkAllWithoutMail_Click(object sender, RoutedEventArgs e)
{
var list = GetVisibleTimesheetDetails();
foreach (var etd in list)
{
if (etd.Mails == null || etd.Mails.Count == 0)
{
etd.IsChecked = true;
}
else
{
etd.IsChecked = false;
}
}
GridControlTimesheet.RefreshData();
UpdateStatusText();
}
private void button_uncheckAll_Click(object sender, RoutedEventArgs e)
{
var list = GetVisibleTimesheetDetails();
foreach (var etd in list)
{
etd.IsChecked = false;
}
GridControlTimesheet.RefreshData();
UpdateStatusText();
}
private void UpdateStatusText()
{
var list = GetVisibleTimesheetDetails();
int count = 0;
foreach (var ts in _employeeTimesheets)
{
if (ts.IsChecked)
{
count++;
}
}
TxtStatus.Text = String.Format("Anzahl Gesamt: {0} Gefiltert: {1} Ausgewählt: {2}", _employeeTimesheets.Count, list.Count, count);
}
private void button_sendMail_Click(object sender, RoutedEventArgs e)
{
SendMailToSelectedEmployees();
}
private void SendMailToSelectedEmployees()
{
IList<EmployeeTimesheetDetails> details = GetSelectedTimesheetDetails();
BeWoWindow bewoWindow = new BeWoWindow();
//bewoWindow.ResizeMode = ResizeMode.NoResize
// IsMaximizable = false
//};
bewoWindow.Width = 800;
bewoWindow.Height = 800;
bewoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
EMailStatusLogControl ctrl = new EMailStatusLogControl();
ctrl.EmployeeTimesheetDetails = new ObservableCollection<EmployeeTimesheetDetails>(details);
bewoWindow.Closing += (sender, args) =>
{
if (!ctrl.CancelSending())
{
args.Cancel = true;
}
else
{
if (ctrl.MailSendingSuccessful)
{
RefreshTimesheetStatusList(GetSelectedMonth());
}
}
};
ctrl.CloseButtonClicked += () =>
{
bewoWindow.Close();
};
//ctrl.CancelButtonClicked += delegate
//{
// bewoWindow.Close();
//};
//ctrl.OkButtonClicked += delegate
//{
// //EMailVersenden(ctrl.SenderEMail, vm.TimeSheetStatusItem, bewoWindow);
//};
bewoWindow.GroupBoxContent = ctrl;
bewoWindow.rootGroupBox.Header = "E-Mail versenden";
bewoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
bewoWindow.Show();
}
private void button_createServiceRecords_Click(object sender, RoutedEventArgs e)
{
var month = GetSelectedMonth();
IList<EmployeeTimesheetDetails> details = GetSelectedTimesheetDetails();
List<long> employeeOids = details.Select(d => d.Employee.EmployeeOid).ToList();
//CB ### Generated
//ServiceFacade.DoOperationsServiceAsync(
// s => s.CreateDefaultServiceRecords(month, employeeOids),
// result =>
// {
// this.Dispatch(delegate
// {
// if (result == null || !result.Contains("Fehler"))
// {
// MessageBox.Show(result, "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Information);
// }
// else
// {
// MessageBox.Show(result, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
// }
// });
// });
}
private IList<EmployeeTimesheetDetails> GetVisibleTimesheetDetails()
{
List<EmployeeTimesheetDetails> details = new List<EmployeeTimesheetDetails>();
for (int i = 0; i < GridControlTimesheet.VisibleRowCount; i++)
{
int rowHandle = GridControlTimesheet.GetRowHandleByVisibleIndex(i);
var d = GridControlTimesheet.GetRow(rowHandle) as EmployeeTimesheetDetails;
if (d != null)
{
details.Add(d);
}
}
return details;
}
private IList<EmployeeTimesheetDetails> GetSelectedTimesheetDetails()
{
List<EmployeeTimesheetDetails> details = new List<EmployeeTimesheetDetails>();
for (int i = 0; i < GridControlTimesheet.VisibleRowCount; i++)
{
int rowHandle = GridControlTimesheet.GetRowHandleByVisibleIndex(i);
var d = GridControlTimesheet.GetRow(rowHandle) as EmployeeTimesheetDetails;
if (d != null && d.IsChecked)
{
details.Add(d);
}
}
return details;
}
private void GridControlTimesheet_OnFilterChanged(object sender, RoutedEventArgs e)
{
UpdateStatusText();
}
}
public class EmployeeTimesheetDetails : INotifyPropertyChanged
{
private bool _IsChecked;
private String _status;
public bool IsChecked
{
get { return _IsChecked; }
set
{
_IsChecked = value;
OnPropertyChanged("IsChecked");
}
}
public CompactEmployeeDC Employee { get; set; }
public String Customer { get; set; }
public String TeamLeader { get; set; }
public String MailAddress { get; set; }
public DateTime? LastSendDate { get; set; }
public TimeSheetStatusItemDC TimeSheetStatusItem { get; set; }
public IList<MailDC> Mails { get; set; }
public string Status
{
get { return _status;}
set
{
_status = value;
OnPropertyChanged("Status");
OnPropertyChanged("StatusColor");
}
}
public string StatusColor
{
get
{
if (Status != null)
{
if (Status.Contains("Fehler") || Status.Contains("Keine Mailadresse"))
{
return "#FF0000";
}
if (Status.Contains("erfolgreich"))
{
return "#00FF00";
}
}
return "#000000";
}
}
public event PropertyChangedEventHandler PropertyChanged;
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
{
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
}
}
}

View File

@@ -72,7 +72,10 @@ namespace BeWo.View.Detail
return;
}
var mail = new MailDC { Subject = this.subjectTextBox.Text, Message = this.mailTextBox.Text, Priority = priority, Receiver = receiver, Sender = BeWoApp.LoggedOnUser.Employee.EmployeeOid, Status = Status.unread, SenderName = BeWoApp.LoggedOnUser.Employee.FirstName + " " + BeWoApp.LoggedOnUser.Employee.LastName };
var mail = new MailDC { Subject = this.subjectTextBox.Text, Message = this.mailTextBox.Text, Priority = priority,
//Receiver = receiver,
Status = Status.unread,
Sender = BeWoApp.LoggedOnUser.Employee.FirstName + " " + BeWoApp.LoggedOnUser.Employee.LastName };
ServiceFacade.DoMailServiceAsync(
// s => s.SendMail(mail)
@@ -189,8 +192,7 @@ namespace BeWo.View.Detail
this.subjectTextBox.Text = "AW: " + mail.Subject;
this.mailTextBox.Text = this.ConvertToCitation(mail.Message);
// ServiceFacade.DoEmployeeServiceAsync(s => s.LoadEmployee(mail.Sender.Value));
ServiceFacade.DoEmployeeServiceAsync(s => this.Dispatcher.BeginInvoke((Action)delegate { this.AddReceiver(s.GetAllActiveEmployeesCompact().Where(e => e.EmployeeOid == mail.Sender.Value).First()); }));
// ServiceFacade.DoEmployeeServiceAsync(s => this.Dispatcher.BeginInvoke((Action)delegate { this.AddReceiver(s.GetAllActiveEmployeesCompact().Where(e => e.EmployeeOid == mail.Sender.Value).First()); }));
}
private List<MailReceiverDC> ParseReceiver()

View File

@@ -17,6 +17,7 @@ using BS.Shared;
using BS.Shared.Extensions;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.ClientPartials;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Services;
using BS.Shared.Translation;
@@ -87,6 +88,8 @@ namespace BeWo.View.Detail
public void InitView(ServiceRecordListVM pListViewModel, ServiceRecordVM pSCViewModel, bool hideCustomerCombo)
{
InitializeComponent();
if (!hideCustomerCombo)
{
supportConceptSelectionControl.Loaded += (s, e) => SetSelectedCustomerNode();
@@ -191,6 +194,37 @@ namespace BeWo.View.Detail
btnSave.Visibility = Visibility.Hidden;
}
if (_ServiceRecordVM != null)
{
ExpandCheckedGoals(_ServiceRecordVM.GoalTree);
}
}
private void ExpandCheckedGoals(List<SupportConceptGoalDC> goalTree)
{
if (goalTree != null)
{
foreach (var scg in goalTree)
{
if (scg.IsChecked)
{
ExpandParent(scg);
}
ExpandCheckedGoals(scg.Children);
}
}
}
private void ExpandParent(SupportConceptGoalDC scg)
{
if (scg.ParentGoal != null)
{
scg.ParentGoal.IsExpanded = true;
ExpandParent(scg.ParentGoal);
}
}
public void SetSearchText(string text)

View File

@@ -1197,7 +1197,7 @@
<dxb:PopupMenuInfo Opened="PopupInfo_OnOpened" >
<dxb:BarButtonItemLink BarItemName="dxEditButton" />
<dxb:BarButtonItemLink BarItemName="dxDeleteButton" />
<dxb:BarButtonItemLink BarItemName="dxHistoryButton" />
<dxb:BarButtonItemLink BarItemName="dxHistoryButton" />
</dxb:PopupMenuInfo>
</dxb:BarManager.DXContextMenu>
<dxg:GridControl.Columns>
@@ -1248,10 +1248,14 @@
<dxg:GridColumn FieldName="Notice4" AllowEditing="False" Header="Dokumentation4" Width="200" x:Name="head_Doku4"/>
<dxg:GridColumn FieldName="Notice5" AllowEditing="False" Header="Dokumentation5" Width="200" x:Name="head_Doku5"/>
<dxg:GridColumn FieldName="GoalString" AllowEditing="False" Header="Ziele" />
<dxg:GridColumn FieldName="EmployeeName" AllowEditing="False" Header="Angelegt für" />
<dxg:GridColumn FieldName="GoalString" AllowEditing="False" Header="Ziele" />
<dxg:GridColumn FieldName="EmployeeName" AllowEditing="False" Header="Angelegt für" />
<dxg:GridColumn FieldName="InsUser" AllowEditing="False" Header="Angelegt von" x:Name="InsertedByColumn" />
<dxg:GridColumn FieldName="InsertedOn" AllowEditing="False" Header="Angelegt am" x:Name="InsertedOnColumn" />
<dxg:GridColumn FieldName="InsertedOnDateTime" AllowEditing="False" Header="Angelegt am" x:Name="InsertedOnColumn">
<dxg:GridColumn.EditSettings>
<dxe:DateSettings DisplayFormat="dd.MM.yyyy HH:mm"></dxe:DateSettings>
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
<dxg:GridColumn Header="Unterschrift" FieldName="IsUnterschrift" AllowEditing="False" IsEnabled="False" Visible="False" x:Name="UnterschriftenHeader" Width = "70">
<dxg:GridColumn.EditSettings>

View File

@@ -33,7 +33,7 @@ namespace BeWo.View.Detail
{
this.mailTextBox.Text = mail.Message;
this.subjectTextBox.Text = mail.Subject;
this.senderTextBox.Text = mail.SenderName;
this.senderTextBox.Text = mail.Sender;
var priority = mail.Priority ?? Priority.normal;

View File

@@ -64,8 +64,8 @@ namespace BeWo.View
//chat berechtigung
protected bool berechtigt;
//int staerke
private Dictionary<String, bool> newsItemExpandedState = new Dictionary<String, bool>();
public HomeDragPanelView()
{
InitializeComponent();
@@ -406,7 +406,49 @@ namespace BeWo.View
private void UpdateInternalNews()
{
if (InternalNewsGrid != null)
{
newsItemExpandedState.Clear();
foreach (var child in InternalNewsGrid.Children)
{
var rootsp = child as StackPanel;
if (rootsp != null && rootsp.Children.Count > 0)
{
foreach (var child2 in rootsp.Children)
{
var ex = child2 as Expander;
if (ex != null)
{
var grid = ex.Header as Grid;
String text = "";
if (grid != null)
{
foreach (var gridChild in grid.Children)
{
if (gridChild is TextBlock)
{
var tb = gridChild as TextBlock;
text = tb.Text;
}
}
}
if (!newsItemExpandedState.ContainsKey(text))
{
newsItemExpandedState.Add(text, ex.IsExpanded);
}
}
}
}
}
}
var showTeamNews = BeWoApp.AppSettings.ShowTeamNews;
//ServiceFacade.DoEmployeeServiceAsync(s => s.GetPublishedNewsItems(), cb => this.Dispatch(delegate { listboxInternalNews.ItemsSource = cb.OrderByDescending(i => i.PublishDate).ToList(); }));
ServiceFacade.DoEmployeeServiceAsync(
s => s.GetPublishedNewsItemsForEmployee(BeWoApp.LoggedOnUser.Employee.EmployeeOid, showTeamNews),
@@ -466,15 +508,39 @@ namespace BeWo.View
private UIElement CreateInternalNewsControlList(List<TeamNewsItemVM> list)
{
bool expand = true;
if (newsItemExpandedState.Count == 0)
{
if (list != null && list.Count > 1)
{
int count = 0;
foreach (var teamNewsItemVm in list)
{
if (teamNewsItemVm.NewsItems != null)
{
count += teamNewsItemVm.NewsItems.Count;
}
}
if (count > 10)
{
expand = false;
}
}
}
StackPanel sp = new StackPanel();
foreach (var teamNewsItemVm in list)
{
sp.Children.Add(CreateInternalNewsTeamControl(teamNewsItemVm));
sp.Children.Add(CreateInternalNewsTeamControl(teamNewsItemVm, expand));
}
return sp;
}
private UIElement CreateInternalNewsTeamControl(TeamNewsItemVM teamNewsItemVm)
private UIElement CreateInternalNewsTeamControl(TeamNewsItemVM teamNewsItemVm, bool initExpand)
{
var sp = new StackPanel();
foreach (var newsItem in teamNewsItemVm.NewsItems)
@@ -487,13 +553,21 @@ namespace BeWo.View
{
Expander ex = new Expander();
ex.Style = (Style) FindResource("FlatLineExpander");
ex.IsExpanded = true;
ex.Style = (Style)FindResource("FlatLineExpander");
bool expanded = initExpand;
if (newsItemExpandedState.ContainsKey(teamNewsItemVm.Team.Name))
{
expanded = newsItemExpandedState[teamNewsItemVm.Team.Name];
}
ex.IsExpanded = expanded;
ex.Margin = new Thickness(0, 5, 5, 5);
Grid grid = new Grid();
grid.ColumnDefinitions.Add(new ColumnDefinition {Width = new GridLength(1, GridUnitType.Auto)});
grid.ColumnDefinitions.Add(new ColumnDefinition {Width = new GridLength(1, GridUnitType.Star)});
grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Auto) });
grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
TextBlock tb = new TextBlock();
tb.FontSize = 14;
tb.FontWeight = FontWeights.Bold;
@@ -503,7 +577,7 @@ namespace BeWo.View
if (teamNewsItemVm.AllowEdit)
{
Button newBtn = new Button();
newBtn.Style = (Style) FindResource("FlatButton");
newBtn.Style = (Style)FindResource("FlatButton");
newBtn.SetValue(Grid.ColumnProperty, 1);
newBtn.HorizontalAlignment = System.Windows.HorizontalAlignment.Right;
newBtn.Width = 16;

View File

@@ -41,7 +41,10 @@
<TabItem Header="{markup:Translate Hilfeplanübersicht}" Name="tabitem_supportConceptAnalysis" Selector.Selected="tabitem_supportConceptAnalysis_Selected" />
<TabItem Header="{markup:Translate Jahresbericht}" Name="tabitem_annualReport" Selector.Selected="tabitem_annualReport_Selected" />
<TabItem Header="{markup:Translate Quittierungsbelege}" Name="tabitem_serviceOverview" Selector.Selected="tabitem_serviceOverview_Selected" />
<TabItem Header="{markup:Translate Flexibler Bericht}" Name="tabitem_flexibleReport" Selector.Selected="tabitem_flexibleReport_Selected" />
<TabItem Header="{markup:Translate Stundenzettel}" Name="tabitem_stundenzettelOverview" Selector.Selected="tabitem_stundenzettelOverview_Selected" />
<TabItem Header="{markup:Translate Neuer sehr guter Bericht}" Name="tabitem_flexibleReport" Selector.Selected="tabitem_flexibleReport_Selected" />
<!--<TabItem Header="Spitzabrechnung" Name="tabitem_settlement" Selector.Selected="tabitem_settlement_Selected"/>-->
</TabControl>

View File

@@ -108,7 +108,16 @@ namespace BeWo.View.Master
{
tabitem_annualReport.Visibility = Visibility.Collapsed;
}
if (BeWoApp.Mandator.AllowSbd)
{
tabitem_serviceOverview.Visibility = Visibility.Collapsed;
tabitem_stundenzettelOverview.Visibility = Visibility.Visible;
}
else
{
tabitem_serviceOverview.Visibility = Visibility.Visible;
tabitem_stundenzettelOverview.Visibility = Visibility.Collapsed;
}
// if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.Analysis_Settlement_View))
// tabitem_settlement.Visibility = Visibility.Collapsed;
}
@@ -200,7 +209,17 @@ namespace BeWo.View.Master
this.Show(this.tabitem_serviceOverview);
}
private void tabitem_flexibleReport_Selected(object sender, RoutedEventArgs e)
private void tabitem_stundenzettelOverview_Selected(object sender, RoutedEventArgs e)
{
if (!this._OpenViews.ContainsKey(this.tabitem_stundenzettelOverview))
{
this._OpenViews[this.tabitem_stundenzettelOverview] = new TimeSheetMailView();
}
this.Show(this.tabitem_stundenzettelOverview);
}
private void tabitem_flexibleReport_Selected(object sender, RoutedEventArgs e)
{
if (!this._OpenViews.ContainsKey(this.tabitem_flexibleReport))
{

View File

@@ -10,7 +10,7 @@ namespace BeWo.View.Navigation.Sorter
{
get
{
List<SortItem> list = new List<SortItem>(4);
List<SortItem> list = new List<SortItem>();
list.Add(new SortItem("Nachname", "LastName"));
list.Add(new SortItem("Vorname", "FirstName"));
list.Add(new SortItem("Geburtsdatum", "DateOfBirth"));

View File

@@ -10,7 +10,7 @@ namespace BeWo.View.Navigation.Sorter
{
get
{
List<SortItem> list = new List<SortItem>(2);
List<SortItem> list = new List<SortItem>();
list.Add(new SortItem("Nachname", "LastName"));
list.Add(new SortItem("Vorname", "FirstName"));
list.Add(new SortItem("Personalnummer", "PersonnelNumber"));

View File

@@ -10,7 +10,7 @@ namespace BeWo.View.Navigation.Sorter
{
get
{
List<SortItem> list = new List<SortItem>(1);
List<SortItem> list = new List<SortItem>();
list.Add(new SortItem("Name", "Name"));
list.Add(new SortItem("Funktion", "Function"));
list.Add(new SortItem("Straße", "Street"));

View File

@@ -10,7 +10,7 @@ namespace BeWo.View.Navigation.Sorter
{
get
{
List<SortItem> list = new List<SortItem>(2);
List<SortItem> list = new List<SortItem>();
list.Add(new SortItem("Nachname", "LastName"));
list.Add(new SortItem("Vorname", "FirstName"));
list.Add(new SortItem("Geburtsdatum", "DateOfBirth"));

View File

@@ -11,12 +11,12 @@ namespace BeWo.View.Navigation.Sorter
{
get
{
List<SortItem> list = new List<SortItem>(2);
List<SortItem> list = new List<SortItem>();
list.Add(new SortItem("Nachname", "LastName"));
list.Add(new SortItem("Vorname", "FirstName"));
list.Add(new SortItem("Startdatum", "StartDate"));
list.Add(new SortItem("Enddatum", "EndDate"));
list.Add(new SortItem(Translator.Translate("Kostenträger"), "CostBearer"));
list.Add(new SortItem(Translator.Translate("Kostenträger"), "AllCostBearerNames"));
return list;
}

View File

@@ -0,0 +1,21 @@
using System.Collections.Generic;
using BeWo.Core;
using BS.Shared.Translation;
namespace BeWo.View.Navigation.Sorter
{
internal class UserSorter : AbstractSorter
{
public override List<SortItem> SortItems
{
get
{
List<SortItem> list = new List<SortItem>();
list.Add(new SortItem("Benutzername", "LoginName"));
list.Add(new SortItem(Translator.Translate("Mitarbeiter"), "SimpleDescription"));
return list;
}
}
}
}

View File

@@ -10,7 +10,7 @@ namespace BeWo.View.Navigation.Sorter
{
get
{
List<SortItem> list = new List<SortItem>(2);
List<SortItem> list = new List<SortItem>();
list.Add(new SortItem("Name", "WohnheimName"));
return list;

View File

@@ -7,6 +7,7 @@ using System.Windows.Navigation;
using BeWo.Core;
using BeWo.ServiceProxy;
using BeWo.View.Detail;
using BeWo.View.Navigation.Sorter;
using BeWo.ViewModel;
using BS.Shared.Core;
@@ -33,7 +34,10 @@ namespace BeWo.View.Navigation
public UserNavigationView()
{
this.InitializeComponent();
if (BeWoApp.LoggedOnUser.HasRight(UserRightType.User_AllowOrderLicense))
this.mainNavigationView.Sorter = new UserSorter();
if (BeWoApp.LoggedOnUser.HasRight(UserRightType.User_AllowOrderLicense))
{
var url = ServiceFacade.DoOperationsServiceSync(s => s.GetLicenseOrderUrl());

View File

@@ -26,7 +26,7 @@ using DevExpress.XtraReports.UI;
namespace BeWo.View.Report.Employee
{
/// <summary>
/// Interaction logic for ServicesReportView.xaml
/// Interaction logic for EmployeeHourReportView.xaml
/// </summary>
public partial class EmployeeHourReportView : BeWoView
{

View File

@@ -33,5 +33,7 @@ namespace BeWo.View.Report.FLSReport
public DateTime StartDate { get; set; }
public bool ShowOnlyMarker { get; set; }
}
public bool ShowEinheitInMinuten { get; set; }
}
}

View File

@@ -462,7 +462,8 @@ namespace BeWo.View.Report.FLSReport
FLSOverviewDateValue dv = new FLSOverviewDateValue();
dv.DateValue = (double)dateVal;
dv.DateValueText = String.Format("{0:0.00}", dateVal / 60);
dv.DateValueText = SetzeFormat((double)dateVal, config);
if (serviceRecordList != null)
{
dv.ServiceRecordList = serviceRecordList.OrderBy(sr => sr.Start).ToList();
@@ -483,7 +484,7 @@ namespace BeWo.View.Report.FLSReport
detailRow.DateValues = newDateValues;
detailRow.TotalFLM = totalVal;
detailRow.RowTotalFLS = String.Format("{0:0.00}", totalVal / 60);
detailRow.RowTotalFLS = SetzeFormat((double)totalVal, config);
if (group.OID > 0)
{
result.Add(detailRow);
@@ -587,12 +588,12 @@ namespace BeWo.View.Report.FLSReport
{
item.ServiceRecordList = item.ServiceRecordList.OrderBy(sr => sr.Start).ToList();
item.DateValue = item.DateValue;
item.DateValueText = String.Format("{0:0.00}", item.DateValue / 60);
item.DateValueText = SetzeFormat(item.DateValue, config);
}
detailRow.DateValues = newDateValues;
detailRow.TotalFLM = totalVal;
detailRow.RowTotalFLS = String.Format("{0:0.00}", totalVal / 60);
detailRow.RowTotalFLS = SetzeFormat((double)totalVal, config);
result.Add(detailRow);
}
@@ -633,7 +634,7 @@ namespace BeWo.View.Report.FLSReport
totalTotalVal += dateVal;
FLSOverviewDateValue dv = new FLSOverviewDateValue();
dv.DateValueText = String.Format("{0:0.00}", dateVal / 60);
dv.DateValueText = SetzeFormat((double)dateVal, config);
if (headerDict.ContainsKey(dateKey))
{
dv.HeaderValue = headerDict[dateKey];
@@ -648,7 +649,7 @@ namespace BeWo.View.Report.FLSReport
}
totalRow.TotalFLM = totalTotalVal;
totalRow.RowTotalFLS = String.Format("{0:0.00}", totalTotalVal / 60);
totalRow.RowTotalFLS = SetzeFormat((double)totalTotalVal, config);
totalRow.DateValues = newTotalDateValues;
switch (config.DateInterval)
@@ -679,6 +680,16 @@ namespace BeWo.View.Report.FLSReport
return result;
}
private static string SetzeFormat(double dateVal, FLSOverviewConfig config)
{
if (config.ShowEinheitInMinuten)
{
return String.Format("{0:#,###.##}", dateVal);
}
return String.Format("{0:0.00}", dateVal / 60);
}
public static List<FLSOverviewRow> CreateFLSOverviewRows(List<FLSAnalysisRootDC> dcList, FLSOverviewConfig config)
{
List<FLSOverviewRow> rows = new List<FLSOverviewRow>();

View File

@@ -81,6 +81,12 @@
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="4" x:Name="datePickerStartDate" Width="120" HorizontalAlignment="Left" Margin="3,0,0,0" />
<Label Content="Enddatum:" Grid.Column="0" Grid.Row="5" VerticalAlignment="Center" />
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="5" x:Name="datePickerEndDate" HorizontalAlignment="Left" Width="120" Margin="3,0,0,0" />
<StackPanel Grid.ColumnSpan="2" Grid.Row="6" Grid.Column="0" HorizontalAlignment="Left" Orientation="Horizontal" Margin="3,8,0,0" VerticalAlignment="Stretch">
<RadioButton x:Name="radioEinheitInStunden" Content="Einheit in Stunden" GroupName="radioEinheit" IsChecked="True" Checked="RadioButtonEinheit_Checked" />
<RadioButton x:Name="radioEinheitInMinuten" GroupName="radioEinheit" Content="Einheit in Minuten" Margin="4,0,0,0" Checked="RadioButtonEinheit_Checked" />
</StackPanel>
<Label Grid.Row="0" Content="Intervall" Margin="10,0,0,0" Grid.Column="2" Padding="0,5,0,0" />
<StackPanel Grid.ColumnSpan="1" Grid.Row="1" Grid.Column="2" HorizontalAlignment="Left" Orientation="Vertical" Margin="10,8,0,0" Grid.RowSpan="7" VerticalAlignment="Stretch">
<RadioButton Content="Tag" Height="23" GroupName="interval" x:Name="radioButtonIntervalDay" />

View File

@@ -337,8 +337,9 @@ namespace BeWo.View.Report.FLSReport
config.ShowServiceRecords = checkbox_showServiceRecords.IsChecked.Value;
config.ShowOnlyTotalRows = !checkbox_sortBySubGroup.IsChecked.Value;
config.ShowOnlyMarker = checkbox_showMarker.IsChecked.Value;
config.ShowEinheitInMinuten = radioEinheitInMinuten.IsChecked != null && radioEinheitInMinuten.IsChecked.Value;
if (radioButtonIntervalDay.IsChecked.Value)
if (radioButtonIntervalDay.IsChecked.Value)
{
config.DateInterval = DateInterval.Day;
}
@@ -530,6 +531,37 @@ namespace BeWo.View.Report.FLSReport
ChangeReportType();
}
private void RadioButtonEinheit_Checked(object sender, RoutedEventArgs e)
{
//if (radioEinheitInMinuten != null && radioEinheitInStunden != null)
//{
// if (radioEinheitInMinuten.IsChecked != null && radioEinheitInMinuten.IsChecked.Value)
// {
// SetzeEinheit(false);
// }
// else if (radioEinheitInStunden.IsChecked != null && radioEinheitInStunden.IsChecked.Value)
// {
// SetzeEinheit(true);
// }
//}
}
private void SetzeEinheit(bool stunden)
{
if (_FLSOverview != null)
{
foreach (var row in _FLSOverview.FLSOverviewRows)
{
foreach (var drow in row.DetailRows)
{
//drow.
}
}
}
}
private void UpdatePDFExportUri(string id)
{
var url = String.Format("{0}/ReportView.aspx?dcid={1}eoid{2}&type={3}", BeWoApp.SiteOfOrigin, BeWoApp.Tenant, BeWoApp.LoggedOnUser.Employee.EmployeeOid, Utils.EnumName(ReportTypes.FLSReport));

View File

@@ -1160,6 +1160,11 @@ namespace BeWo.ViewModel
}
}
public DateTime? InsertedOnDateTime
{
get { return _InsertedOn; }
}
public bool IsGoalTreeVisible
{
get { return _GoalTree != null && _GoalTree.Count > 0; }

View File

@@ -15,7 +15,7 @@
<AssemblyName>BeWoPlanerMobil</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews>
<UseIISExpress>false</UseIISExpress>
<UseIISExpress>true</UseIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
@@ -177,13 +177,13 @@
</Compile>
<Compile Include="Util\JSONCustomer.cs" />
<Compile Include="Util\MobileUtils.cs" />
<Compile Include="Util\ReferenceNumberWithNotice.cs" />
<Compile Include="Util\ServiceRecord2Validation.cs" />
<Compile Include="Util\TextbausteinDisplayItem.cs" />
<Compile Include="Util\Umfeldsperson.cs" />
<Compile Include="Util\ValidationResult.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Content\appointmentStyle.css" />
<Content Include="Content\BeWoMobileStyle.css" />
<Content Include="Content\datepicker.css" />
<Content Include="Content\datepicker_jQM.css" />
@@ -223,6 +223,7 @@
<Content Include="Scripts\textbausteine.js" />
<Content Include="Scripts\unterschrift.js" />
<Content Include="Scripts\utils.js" />
<Content Include="Scripts\validation.js" />
<Content Include="TestWebService.asmx" />
<Content Include="Web.config">
<SubType>Designer</SubType>
@@ -280,7 +281,7 @@
<AutoAssignPort>False</AutoAssignPort>
<DevelopmentServerPort>8808</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost/BeWoPlanerMobil</IISUrl>
<IISUrl>http://localhost:7707/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>

View File

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

View File

@@ -188,7 +188,7 @@ span {
border-radius: 0;
font-size: 13px;
color: #555;
margin-top: -5px;
margin-top: -2px;
padding: .5em;
}

View File

@@ -0,0 +1,60 @@
.appointment-time-span {
color: #2B508B;
}
.appointment-header-td, .appointment-edit-btn-container {
background-color: #E6E6E6;
}
.appointment-header-p {
display: inline-block;
overflow-wrap: break-word;
padding: 0 .5em;
}
.appointment-edit-btn-container {
width: 1%;
border: none;
}
.appointment-toggle-btn {
background-position: center center;
margin-top: .2em;
margin-bottom: 0;
border: 1px solid #bbb;
border-radius: 0;
background-image: url("images/toggle-icon-d.svg");
background-repeat: no-repeat;
text-align: left;
background-color: #f4f4f4;
}
.appointment-outer-table-row>td {
border-top: .5em solid white;
}
.customer-resource-color {
width: .2em;
background: linear-gradient(cyan 50%, palegoldenrod 50%);
}
.customer_span {
color: #3B7799;
font-weight: bold;
}
.employee_span {
color: #45993b;
font-weight: bold;
}
.resource_span {
color: #04B4D0;
font-weight: bold;
}
.appointment_edit_button {
height: 100%;
float: right;
margin-right: 2.5em;
}

View File

@@ -470,10 +470,8 @@ namespace BeWoPlanerMobil.Controllers
(date.InBetween(w.StartDate.Value, w.EndDate.Value, false) ||
date.CompareShortDates(w.StartDate.Value)))).ToList();
var deletedOccurrences = holySweetFlyingFuck.Where(w => w.Type == 4)
.Select(s => GetOccurrenceId(s.RecurrenceInfo)).ToList();
var changedOccurrences = holySweetFlyingFuck.Where(w => w.Type == 3)
.Select(s => GetOccurrenceId(s.RecurrenceInfo)).ToList();
var deletedOccurrences = holySweetFlyingFuck.Where(w => w.Type == 4).Select(s => GetOccurrenceId(s.RecurrenceInfo)).ToList();
var changedOccurrences = holySweetFlyingFuck.Where(w => w.Type == 3).Select(s => GetOccurrenceId(s.RecurrenceInfo)).ToList();
holySweetFlyingFuck = holySweetFlyingFuck.Where(w => w.Type != 4).ToList();
@@ -568,7 +566,7 @@ namespace BeWoPlanerMobil.Controllers
}
[Authorize]
public string UpdateAppointment(long oid, string betreff, string notice, string startZeit, string endZeit, string day, string endDate)
public string UpdateAppointment(long oid, string betreff, string notice, string startZeit, string endZeit, string day, string endDate, string pLocation)
{
try
{
@@ -588,6 +586,7 @@ namespace BeWoPlanerMobil.Controllers
b1.StartDate = zeit[0];
b1.Subject = betreff;
b1.Description = notice;
b1.Location = pLocation;
KalenderService.UpdateSchedulerAppointments(new List<SchedulerAppointmentDC>{b1});
@@ -601,7 +600,7 @@ namespace BeWoPlanerMobil.Controllers
}
[Authorize]
public void InsertAppointment(string pStartDate, string pStartTime, string pEndTime, string pSubject, string pNotice, string pEndDate)
public void InsertAppointment(string pStartDate, string pStartTime, string pEndTime, string pSubject, string pNotice, string pEndDate, string pLocation)
{
try
{
@@ -620,34 +619,23 @@ namespace BeWoPlanerMobil.Controllers
EmployeeList = new List<Employee2SchedulerAppointmentDC>(),
CustomerList = new List<CompactCustomerDC>(),
ResourceList = new List<ResourceDC>(),
SupportConceptList = new List<CompactSupportConceptDC>(),
EndDate = zeit[1],
StartDate = zeit[0],
Subject = pSubject,
Description = pNotice,
Originator = MobileSessionFacade.LoggedInCompactEmployee
Originator = MobileSessionFacade.LoggedInCompactEmployee,
Location = pLocation
};
var newE2S = new Employee2SchedulerAppointmentDC
{
Employee = MobileSessionFacade.LoggedInCompactEmployee
};
//var newE2S = new Employee2SchedulerAppointmentDC
//{
// Employee = MobileSessionFacade.LoggedInCompactEmployee
//};
newApp.EmployeeList.Add(newE2S);
//newApp.EmployeeList.Add(newE2S);
var list = new List<SchedulerAppointmentDC> {newApp};
//var a1 = new List<SchedulerAppointmentDC> {
// new SchedulerAppointmentDC
// {
// EmployeeList = new List<Employee2SchedulerAppointmentDC>(),
// CustomerList = new List<CompactCustomerDC>(),
// ResourceList = new List<ResourceDC>(),
// EndDate = zeit[1],
// StartDate = zeit[0],
// Subject = pSubject,
// Description = pNotice,
// Originator = MobileSessionFacade.LoggedInCompactEmployee
// }
//};
KalenderService.InsertSchedulerAppointments(list);
}
@@ -1063,7 +1051,7 @@ namespace BeWoPlanerMobil.Controllers
log.Error(e.Message, e);
}
Model.SaveSignature = Model.ShowSignature;
Model.SaveSignature = Model.ShowSignature && Model.SelectedSupportConcept != null;
return RedirectToActionPermanent("Main");
}

View File

@@ -1,11 +1,12 @@
class Appointment {
constructor(pStartDate, pStartTime, pEndTime, pSubject, pNotice, pEndDate) {
constructor(pStartDate, pStartTime, pEndTime, pSubject, pNotice, pEndDate, pLocation) {
this.startDate = pStartDate;
this.startTime = pStartTime;
this.endDate = pEndDate;
this.endTime = pEndTime;
this.subject = pSubject;
this.notice = pNotice;
this.location = pLocation;
}
isValid() {
@@ -14,6 +15,7 @@
this.endDate != null && this.endDate !== "" &&
this.endTime != null && this.endTime !== "" &&
this.subject != null && this.subject !== "" &&
this.notice != null && this.notice !== "";
this.notice != null && this.notice !== "" &&
this.location != null && this.location !== "";
}
}

View File

@@ -1,8 +1,8 @@
var currentAppointment;
var selectedAppointmentOid, selectedAppointmentSubject, selectedAppointmentNotice, selectedAppointmentStartDate, selectedAppointmentEndDate, selectedAppointmentDate;
array2 = new Array();
appointments = new Array();
array2 = [];
appointments = [];
function saveOnlyKalender() {
if(navigator.onLine) {
@@ -21,14 +21,13 @@ function loadAppointments(newtoday) {
data: { newtoday: newtoday },
success: function(json) {
var kalenderRec = $.parseJSON(json);
var appointmentList = $("#AppointmentList");
var html = "<table>";
var html = "";
$("#KalenderTable").empty();
var i = 0;
appointmentList.empty();
$.each(kalenderRec, function(index, termin) {
var description = termin.Subject;
var description = termin.Description;
var startD = termin.StartDate;
var endD = termin.EndDate;
var date = new Date(startD);
@@ -36,19 +35,167 @@ function loadAppointments(newtoday) {
appointments[termin.SchedulerAppointmentOid] = termin;
//html += `<tr class="testklasse"><td class="kalender-td kalender-uhrzeit">${getHoursAndMinutesWithLeadingZeros(date)} - ${getHoursAndMinutesWithLeadingZeros(dateend)}</td><td class="kalender-td" onclick="appointmentOnClick(${termin.SchedulerAppointmentOid})">${description}</td></tr>`;
html += '<tr class="testklasse"><td class="kalender-td kalender-uhrzeit">' + getHoursAndMinutesWithLeadingZeros(date) + ' - ' + getHoursAndMinutesWithLeadingZeros(dateend) + '</td><td class="kalender-td" onclick="appointmentOnClick(' + termin.SchedulerAppointmentOid + ')">' + description + '</td></tr>';
var startTime = getHoursAndMinutesWithLeadingZeros(date);
var endTime = getHoursAndMinutesWithLeadingZeros(dateend);
i++;
var employeeColorStyle = "width: .2em; background-color: #E6E6E6;";
if(termin.EmployeeList.length > 0) {
var color = getSixDigitHexColorCode(termin.EmployeeList[0].Employee.EmployeeColor);
$.each(termin.EmployeeList, function(index, emp) {
if(emp.Employee.Color !== null && emp.Employee.EmployeeColor !== undefined) {
color = getSixDigitHexColorCode(emp.Employee.EmployeeColor);
return false;
}
});
if(color !== null && color !== undefined) {
employeeColorStyle = "width: .2em; background-color: " + color + ";";
} else {
color = getSixDigitHexColorCode(termin.Originator.EmployeeColor);
if(color !== null && color !== undefined) {
employeeColorStyle = "width: .2em; background-color: " + color + ";";
}
}
} else {
var originatorColor = getSixDigitHexColorCode(termin.Originator.EmployeeColor);
if(originatorColor !== null && originatorColor !== undefined) {
employeeColorStyle = "width: .2em; background-color: " + originatorColor + ";";
}
}
var customerResourceColorStyle = "width: .2em; background-color: #E6E6E6;";
var customerColor = "#3B7799";
var resourceColor = "#04B4D0";
if(termin.CustomerList.length > 0 && termin.ResourceList.length > 0) {
$.each(termin.ResourceList, function(index, resource) {
if(resource.Color !== null && resource.Color !== undefined) {
resourceColor = getSixDigitHexColorCode(resource.Color);
return false;
}
});
customerResourceColorStyle = "width: .2em; background: linear-gradient(" + customerColor + " 50%, " + resourceColor + " 50%);";
} else if(termin.CustomerList.length > 0 && termin.ResourceList.length === 0) {
customerResourceColorStyle = "width: .2em; background-color: " + customerColor + ";";
} else if(termin.CustomerList.length === 0 && termin.ResourceList.length > 0) {
$.each(termin.ResourceList, function(index, resource) {
if(resource.Color !== null && resource.Color !== undefined) {
resourceColor = getSixDigitHexColorCode(resource.Color);
return false;
}
});
customerResourceColorStyle = "width: .2em; background-color: " + resourceColor + ";";
}
html +=
'<tr class="appointment-outer-table-row">' +
'<td style="' + employeeColorStyle + '"></td>' +
'<td class="appointment-header-td" onclick="toggleAppointmentDetails(this)">' +
'<p class="appointment-header-p"><span class="appointment-time-span">' + startTime + ' - ' + endTime + '</span> ' + termin.Subject + '</p>' +
'</td>' +
'<td class="appointment-edit-btn-container">' +
'<input type="button" class="edit-button" onclick="appointmentOnClick(this, ' + termin.SchedulerAppointmentOid + ')" />' +
'</td>' +
'<td class="appointment-edit-btn-container">' +
'<input type="button" class="appointment-toggle-btn" onclick="toggleAppointmentDetails(this)" />' +
'</td>' +
'<td style="' + customerResourceColorStyle + '">' +
'</td>' +
'</tr>' +
'<tr class="collapsible-container">' +
'<td colspan="5" style="display: none;">' +
'<div class="kollabierbar">';
if(termin.EmployeeList.length > 0) {
html += '<p><span class="employee_span">M: </span>';
$.each(termin.EmployeeList, function(index, employee) {
html += employee.Employee.LastName + ", " + employee.Employee.FirstName;
if(index !== termin.EmployeeList.length - 1) {
html += "; ";
}
});
html += "</p>";
}
if(termin.CustomerList.length > 0) {
html += '<p><span class="customer_span">K: </span>';
$.each(termin.CustomerList, function(index, customer) {
html += customer.LastName + ", " + customer.FirstName;
if(index !== termin.CustomerList.length - 1) {
html += "; ";
}
});
html += "</p>";
}
if(termin.ResourceList.length > 0) {
html += '<p><span class="resource_span">R: </span>';
$.each(termin.ResourceList, function(index, resource) {
html += resource.Name;
if(index !== termin.ResourceList.length - 1) {
html += ", ";
}
});
html += "</p>";
}
if(termin.EmployeeList.length > 0 || termin.CustomerList.length > 0 || termin.ResourceList.length > 0) {
html += '<hr/>';
}
html += description + '</div></td></tr>';
});
$("#KalenderTable").append(html);
html += "</table>";
appointmentList.append(html);
loadBeWoTask(newtoday);
}
});
}
function appointmentOnClick(appointmentOid) {
function toggleAppointmentDetails(element) {
var element2toggle = null;
var toggleBtn = null;
if($(element).is("input")) {
element2toggle = $(element).parent().parent().next("tr").find("td");
toggleBtn = $(element);
} else {
element2toggle = $(element).parent().next("tr").find("td");
toggleBtn = $(element).parent().find(".appointment-toggle-btn");
}
var newIcon = "url('";
newIcon += element2toggle.css("display") === "none" ? toggleIconUContentUrl : toggleIconDContentUrl;
newIcon += "')";
element2toggle.toggle();
if(toggleBtn !== null) {
toggleBtn.css("background-image", newIcon);
}
}
function appointmentOnClick(element, appointmentOid) {
if(appointmentOid === null) {
return;
}
@@ -59,6 +206,8 @@ function appointmentOnClick(appointmentOid) {
return;
}
var saveAppointmentButton = $("#TerminSpeichern");
var startDate = new Date(selectedAppointment.StartDate);
var endDate = new Date(selectedAppointment.EndDate);
@@ -78,13 +227,16 @@ function appointmentOnClick(appointmentOid) {
$("#TerminEndZeit").val(endTime);
$("#TerminBetreff").val(selectedAppointment.Subject);
$("#TerminNotiz").val(selectedAppointment.Description);
$("#AppointmentLocation").val(selectedAppointment.Location);
$("#TerminSpeichernAbbrechen").val("Schließen");
$("#TerminSpeichern").val("Speichern");
$("#TerminSpeichern").prop("disabled", true);
$("#TerminSpeichern").css("display", "inline");
saveAppointmentButton.val("Speichern");
saveAppointmentButton.prop("disabled", true);
saveAppointmentButton.css("display", "inline");
$("#InsertAppointmentButton").css("display", "none");
$("html, body").animate({scrollTop: 0}, 0);
}
function updateSelectedAppointment() {
@@ -98,7 +250,8 @@ function updateSelectedAppointment() {
startZeit: currentAppointment.startTime,
endZeit: currentAppointment.endTime,
day: currentAppointment.startDate,
endDate: currentAppointment.endDate
endDate: currentAppointment.endDate,
pLocation: currentAppointment.location
}, success: function() {
var dp = $("#KalenderDatumFormat").val();
var dateParts = dp.split(".");
@@ -129,25 +282,64 @@ function checkAppointmentFields() {
var newAppointmentStartTime = $("#TerminStartZeit").val();
var newAppointmentEndTime = $("#TerminEndZeit").val();
var newAppointmentSubject = $("#TerminBetreff").val();
var newAppointmentLocation = $("#AppointmentLocation").val();
if(newAppointmentStartDate === "" || newAppointmentEndDate === "" || newAppointmentStartTime === "" || newAppointmentEndTime === "" || newAppointmentSubject === "") {
writeFatalErrorMessage("Bitte geben Sie Uhrzeit und Betreff ein.");
var errorList = [];
var shouldShowErrorMessage = false;
if (newAppointmentStartDate === "") {
errorList.push("Startdatum");
shouldShowErrorMessage = true;
}
if (newAppointmentEndDate === "") {
errorList.push("Enddatum");
shouldShowErrorMessage = true;
}
if (newAppointmentStartTime === "") {
errorList.push("Startzeit");
shouldShowErrorMessage = true;
}
if (newAppointmentEndTime === "") {
errorList.push("Endzeit");
shouldShowErrorMessage = true;
}
if (newAppointmentSubject === "") {
errorList.push("Betreff");
shouldShowErrorMessage = true;
}
if (shouldShowErrorMessage === true) {
var errorMessage = "Bitte füllen Sie folgende" + (errorList.length === 1 ? "s" : "") + " Feld" + (errorList.length > 1 ? "er" : "") + " aus:<br />";
errorList.forEach(function(item, index, array) {
errorMessage += item + "<br/>";
});
writeFatalErrorMessage(errorMessage);
return false;
}
currentAppointment = new Appointment(newAppointmentStartDate, newAppointmentStartTime, newAppointmentEndTime, newAppointmentSubject, $("#TerminNotiz").val(), newAppointmentEndDate);
if (!doValidation($("#StartDate")) || !doValidation($("#EndDate")) || !doTimeValidation($("#TerminStartZeit")) || !doTimeValidation($("#TerminEndZeit"))) {
toggleErrorPopup("Bitte geben Sie gültige Datums- und/oder Zeitangaben ein");
return false;
}
currentAppointment = new Appointment(newAppointmentStartDate, newAppointmentStartTime, newAppointmentEndTime, newAppointmentSubject, $("#TerminNotiz").val(), newAppointmentEndDate, newAppointmentLocation);
return true;
}
function insertAppointmentOnClick() {
if(checkAppointmentFields()) {
insertNewAppointment(currentAppointment.startDate, currentAppointment.startTime, currentAppointment.endTime, currentAppointment.subject, currentAppointment.notice, currentAppointment.endDate);
insertNewAppointment(currentAppointment.startDate, currentAppointment.startTime, currentAppointment.endTime, currentAppointment.subject, currentAppointment.notice, currentAppointment.endDate, currentAppointment.location);
}
}
function insertNewAppointmentAfterCrash(pDay, pStartTime, pEndTime, pSubject, pNotice, pEndDate) {
function insertNewAppointmentAfterCrash(pDay, pStartTime, pEndTime, pSubject, pNotice, pEndDate, pLocation) {
$.ajax({
type: "GET",
url: insertAppointmentUrl,
@@ -157,12 +349,13 @@ function insertNewAppointmentAfterCrash(pDay, pStartTime, pEndTime, pSubject, pN
pEndTime: pEndTime,
pSubject: pSubject,
pNotice: pNotice,
pEndDate: pEndDate
pEndDate: pEndDate,
pLocation: pLocation
}, success: null, error: null
});
}
function insertNewAppointment(pStartDate, pStartTime, pEndTime, pSubject, pNotice, pEndDate) {
function insertNewAppointment(pStartDate, pStartTime, pEndTime, pSubject, pNotice, pEndDate, pLocation) {
$.ajax({
type: "GET",
url: insertAppointmentUrl,
@@ -172,8 +365,9 @@ function insertNewAppointment(pStartDate, pStartTime, pEndTime, pSubject, pNotic
pEndTime: pEndTime,
pSubject: pSubject,
pNotice: pNotice,
pEndDate: pEndDate
}, success: function() {
pEndDate: pEndDate,
pLocation: pLocation
}, success: function () {
$("#AppointmentEditForm").css("display", "none");
$("#KalenderTable").css("display", "block");
$("#KalenderNavigation").css("display", "block");
@@ -230,15 +424,19 @@ function loadBeWoTask(newtoday) {
html += "<thead><tr><th style='width: 150px; border-bottom: solid 1px #D8D8D8;'>Aufgaben</th><th style='width: 80%; border-bottom: solid 1px #D8D8D8;'></th></tr></thead>";
}
//var minutes = date.getMinutes() < 10 ? `0${date.getMinutes().toString()}` : date.getMinutes().toString();
//var hours = date.getHours() < 10 ? `0${date.getHours().toString()}` : date.getHours().toString();
var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes().toString() : date.getMinutes.toString();
var hours = date.getHours() < 10 ? '0' + date.getHours().toString() : date.getHours().toString();
var farbe = "2B508B";
//html += `<tr><td style="width: 150px; border-bottom: solid 1px #D8D8D8;">${hours.fontcolor(farbe)}:${minutes.fontcolor(farbe)} </td><td style="width: 80%; border-bottom: solid 1px #D8D8D8;">${description}</td></tr>`;
html += '<tr><td style="width: 150px; border-bottom: solid 1px #D8D8D8;">'+hours.fontcolor(farbe)+':' + minutes.fontcolor(farbe) + ' </td><td style="width: 80%; border-bottom: solid 1px #D8D8D8;">' + description + '</td></tr>';
html +=
'<tr>' +
'<td style="width: 150px; border-bottom: solid 1px #D8D8D8;">'+
hours.fontcolor(farbe)+':' + minutes.fontcolor(farbe) + ' ' +
'</td>' +
'<td style="width: 80%; border-bottom: solid 1px #D8D8D8;">' +
description +
'</td></tr>';
zahl++;
});
@@ -279,7 +477,6 @@ function LoadOnly(i, x) {
}
}
function nextDayButtonClick() {
var nextdatum = new Date($("#KalenderDatum").val() + "T00:00:00Z");

View File

@@ -37,7 +37,6 @@ function stringToTime(str) {
if(str.length < 3) {
if(str.length < 2) {
//str = `0${str}`;
str = '0' + str;
}
while(str.length < 4) {
@@ -45,7 +44,6 @@ function stringToTime(str) {
}
} else {
while(str.length < 4) {
//str = `0${str}`;
str = '0' + str;
}
}
@@ -68,9 +66,6 @@ function actualDurationWithEndDate() {
if(endDateObj < startDateObj) {
endDateObj = setHoursAndMinutes(new Date(startDateObj.getTime()), $("#ende_textbox").val());
//console.log(`start date: ${startDateObj}`);
//console.log(`end date: ${endDateObj}`);
console.log('start date: ' + startDateObj);
console.log('end date: ' + endDateObj);
}
@@ -82,9 +77,6 @@ function actualDurationWithEndDate() {
var diffInS = diffInMs / 1000;
var diffInMins = diffInS / 60;
//console.log(`end date: ${endDate}`);
//console.log(`difference in minutes: ${diffInMins}`);
console.log('end date: ' + endDate);
console.log('difference in minutes: ' + diffInMins);
@@ -95,7 +87,6 @@ function actualDurationWithEndDate() {
var startDateString = $("#start_textbox").val();
var duration = diffInMins;// - startDateString;
//console.log(`dateDifference: ${dateDifference}`);
console.log('dateDifference: ' + dateDifference);
var rest = duration % 100;
@@ -286,3 +277,4 @@ function getDateObj(isFromStart) {
return date;
}

View File

@@ -159,7 +159,7 @@ function updateChildGoals(goalOid) {
goalOidArray = new Array();
var parent = document.getElementById("goal" + goalOid);
alert("start");
//alert("start");
CheckChildGoalNodes(parent);
//makeAjaxCall("GET", updateGoalsUrl, null, { pGoalOid: cbId }, null);
}
@@ -168,15 +168,15 @@ function CheckChildGoalNodes(parent) {
goalOidArray = new Array();
var next = parent.parentNode;
alert(next);
alert(next.nextSibling);
//alert(next);
//alert(next.nextSibling);
var nodeList = next.childNodes;
alert(nodeList.length);
//alert(nodeList.length);
for (var i = 0; i < nodeList.length; i++) {
var node = nodeList[i];
alert(node.nodeName);
//alert(node.nodeName);
CheckChildGoalNodes(node);
}

View File

@@ -31,10 +31,24 @@ function validateServiceRecordBeforeSubmit() {
}
}
var dateStr = $("#datum_textbox").val();
var startStr = $("#start_textbox").val();
var endStr = $("#ende_textbox").val();
console.log("dateStr: " + dateStr + "\nstartStr: " + startStr + "\nendStr: " + endStr);
if (!validateDate(dateStr) || !validateTime(startStr) || !validateTime(endStr)) {
hideSanduhr();
console.log("\nIst das Startdatum korrekt: " + validateDate($("#datum_textbox").val()) + "\nIst die Startzeit korrekt: " + validateTime($("#start_textbox").val()) + "\nIst die Endzeit korrekt: " + validateTime($("#ende_textbox").val()));
var errorMessage = "Bitte geben Sie gültige Datums- und/oder Zeitangaben ein";
toggleErrorPopup(errorMessage);
return;
}
var x = getDateObj(true);
var y;

View File

@@ -206,4 +206,18 @@ function deactivateInputFormCompletely() {
disableElement($("#abbrechenBtn"));
disableElement($("#anlegenEditierenBtn"));
}
function getSixDigitHexColorCode(rawColor) {
var result = "#000000";
if(rawColor === null || rawColor === undefined || rawColor.length < 6) {
return result;
}
if(rawColor.length === 9) {
return "#" + rawColor.substring(3);
} else {
return rawColor;
}
}

View File

@@ -46,17 +46,19 @@
return false;
} catch (exception) {
console.log("Fehler: " + exception);
console.log("Fehler bei validateDate: " + exception);
return false;
}
}
function doValidation(elementToValidate) {
var obj = $(elementToValidate);
var isValid = validateDate(obj.val());
obj.css("color", (isValid ? "#555" : "red"));
return isValid;
}
function validateTime(time) {
@@ -86,12 +88,14 @@ function validateTime(time) {
return Number.isInteger(hours) && Number.isInteger(minutes) && hours >= 0 && hours < 25 && minutes >= 0 && minutes < 60;
} catch (exception) {
console.log("Fehler bei validateTime: " + exception);
return false;
}
}
function doTimeValidation(elementToValidate) {
var obj = $(elementToValidate);
var timeString = obj.val();
if (timeString.length === 0) {
@@ -101,4 +105,6 @@ function doTimeValidation(elementToValidate) {
var isValid = validateTime(timeString);
obj.css("color", (isValid ? "#555" : "red"));
return isValid;
}

View File

@@ -0,0 +1,44 @@
namespace BeWoPlanerMobil.Util
{
public class ReferenceNumberWithNotice
{
public string ReferenceNumber { get; set; }
public string Notice { get; set; }
public string Costbearer { get; set; }
public ReferenceNumberWithNotice(string pReferenceNumber, string pNotice, string pCostbearer)
{
ReferenceNumber = pReferenceNumber;
Notice = pNotice;
Costbearer = pCostbearer;
}
public override bool Equals(object obj)
{
if(obj is ReferenceNumberWithNotice referenceNumberObject)
{
return Equals(ReferenceNumber, referenceNumberObject.ReferenceNumber) && Equals(Notice, referenceNumberObject.Notice) && Equals(Costbearer, referenceNumberObject.Costbearer);
}
return false;
}
public override int GetHashCode()
{
unchecked
{
const int hashingBase = (int) 2166136261;
const int hashingMultiplier = 16777619;
var hash = hashingBase;
hash = (hash * hashingMultiplier) ^ (ReferenceNumber?.GetHashCode() ?? 0);
hash = (hash * hashingMultiplier) ^ (Notice?.GetHashCode() ?? 0);
hash = (hash * hashingMultiplier) ^ (Costbearer?.GetHashCode() ?? 0);
return hash;
}
}
}
}

View File

@@ -169,7 +169,7 @@
<tr>
<td colspan="2">
<div class="input-wrapper cell-content">
<input type="text" id="datum_textbox" name="Datum" class="date-input-css floating-label-input" required disabled @{if (Model.IsInEditingMode && Model.IsInGroupBookingMode && Model.SelectedServiceRecord != null && Model.SelectedServiceRecord.Start != null) { @Html.Raw("value='" + Model.SelectedServiceRecord.Start.Value.ToString("dd.MM.yyyy") + "'") }} />
<input type="text" id="datum_textbox" onchange="doValidation(this)" name="Datum" class="date-input-css floating-label-input" required disabled @{if (Model.IsInEditingMode && Model.IsInGroupBookingMode && Model.SelectedServiceRecord != null && Model.SelectedServiceRecord.Start != null) { @Html.Raw("value='" + Model.SelectedServiceRecord.Start.Value.ToString("dd.MM.yyyy") + "'") }} />
<label class="floating-label" for="datum_textbox">Startdatum</label>
</div>
</td>
@@ -177,7 +177,7 @@
<tr>
<td colspan="2">
<div class="input-wrapper cell-content" id="EndDate_div" style="display: none">
<input type="text" id="enddatum_textbox" name="Enddatum" class="date-input-css floating-label-input edit-form-input" required disabled onchange="actualDurationWithEndDate()" @{if (Model.IsInEditingMode && Model.IsInGroupBookingMode && Model.SelectedServiceRecord != null && Model.SelectedServiceRecord.End != null) { @Html.Raw("value='" + Model.SelectedServiceRecord.End.Value.ToString("dd.MM.yyyy") + "'") }} />
<input type="text" id="enddatum_textbox" onchange="doValidation(this)" name="Enddatum" class="date-input-css floating-label-input edit-form-input" required disabled onchange="actualDurationWithEndDate()" @{if (Model.IsInEditingMode && Model.IsInGroupBookingMode && Model.SelectedServiceRecord != null && Model.SelectedServiceRecord.End != null) { @Html.Raw("value='" + Model.SelectedServiceRecord.End.Value.ToString("dd.MM.yyyy") + "'") }} />
<label class="floating-label" for="enddatum_textbox">Enddatum</label>
</div>
</td>
@@ -190,13 +190,13 @@
<tr>
<td>
<div class="input-wrapper cell-content" id="start-cell">
<input class="not-required-input edit-form-input" type="text" id="start_textbox" name="Start" disabled @{if (Model.IsInEditingMode && Model.IsInGroupBookingMode && Model.SelectedServiceRecord != null && Model.SelectedServiceRecord.Start != null) { @Html.Raw("value=\"" + Model.SelectedServiceRecord.Start.Value.ToString("HH:mm") + "\"") }} />
<input class="not-required-input edit-form-input" onchange="doTimeValidation(this)" type="text" id="start_textbox" name="Start" disabled @{if (Model.IsInEditingMode && Model.IsInGroupBookingMode && Model.SelectedServiceRecord != null && Model.SelectedServiceRecord.Start != null) { @Html.Raw("value=\"" + Model.SelectedServiceRecord.Start.Value.ToString("HH:mm") + "\"") }} />
<label for="start_textbox">Von</label>
</div>
</td>
<td>
<div class="input-wrapper cell-content" id="end-cell">
<input class="not-required-input edit-form-input" type="text" id="ende_textbox" name="Ende" disabled @{if (Model.IsInEditingMode && Model.IsInGroupBookingMode && Model.SelectedServiceRecord != null && Model.SelectedServiceRecord.End != null) { @Html.Raw("value=\"" + Model.SelectedServiceRecord.End.Value.ToString("HH:mm") + "\"") }} />
<input class="not-required-input edit-form-input" onchange="doTimeValidation(this)" type="text" id="ende_textbox" name="Ende" disabled @{if (Model.IsInEditingMode && Model.IsInGroupBookingMode && Model.SelectedServiceRecord != null && Model.SelectedServiceRecord.End != null) { @Html.Raw("value=\"" + Model.SelectedServiceRecord.End.Value.ToString("HH:mm") + "\"") }} />
<label for="ende_textbox">Bis</label>
</div>
</td>
@@ -938,13 +938,13 @@
<tr>
<td>
<div class="input-wrapper cell-content" style="margin-top: 1em; margin-right: .15em">
<input class="floating-label-input date-input-css" id="StartDate" name="Datum" onchange="showUsAendern()" />
<input class="floating-label-input date-input-css" id="StartDate" name="Datum" onchange="showUsAendern(); doValidation(this);" />
<label class="floating-label" for="StartDate">Start</label>
</div>
</td>
<td>
<div class="input-wrapper cell-content" style="margin-top: 1em; margin-left: .15em">
<input class="floating-label-input" id="TerminStartZeit" name="Startzeit" onchange="showUsAendern()" />
<input class="floating-label-input" id="TerminStartZeit" name="Startzeit" onchange="showUsAendern(); doTimeValidation(this);" />
<label class="floating-label" for="TerminStartZeit"></label>
</div>
</td>
@@ -952,24 +952,30 @@
<tr>
<td>
<div class="input-wrapper cell-content" style="margin-top: 1em; margin-right: .15em">
<input class="floating-label-input date-input-css" id="EndDate" name="Datum" onchange="showUsAendern()" />
<input class="floating-label-input date-input-css" id="EndDate" name="Datum" onchange="showUsAendern(); doValidation(this);" />
<label class="floating-label" for="EndDate">Ende</label>
</div>
</td>
<td>
<div class="input-wrapper cell-content" style="margin-top: 1em; margin-left: .15em">
<input class="floating-label-input" id="TerminEndZeit" name="Endzeit" onchange="showUsAendern()" />
<input class="floating-label-input" id="TerminEndZeit" name="Endzeit" onchange="showUsAendern(); doTimeValidation(this);" />
<label class="floating-label" for="TerminEndZeit"></label>
</div>
</td>
</tr>
<tr>
<td colspan="2">
<div class="input-wrapper cell-content" style="margin-top: 1em;">
<td>
<div class="input-wrapper cell-content" style="margin-top: 1em; margin-right: .15em">
<input class="floating-label-input" id="TerminBetreff" name="Betreff" onchange="showUsAendern()" />
<label class="floating-label" for="TerminBetreff">Betreff</label>
</div>
</td>
<td>
<div class="input-wrapper cell-content" style="margin-top: 1em; margin-left: .15em">
<input class="floating-label-input" id="AppointmentLocation" name="Location" onchange="showUsAendern()" />
<label class="floating-label" for="AppointmentLocation">Ort</label>
</div>
</td>
</tr>
<tr>
<td colspan="2">
@@ -990,7 +996,8 @@
</tr>
</table>
</div>
<table id="KalenderTable"></table>
<div id="AppointmentList">
</div>
<br />
<table id="KalenderTableTask"></table>
</div>

View File

@@ -14,7 +14,7 @@
<script src="~/Scripts/appointment.js?v=1.2"></script>
<script src="~/Scripts/utils.js?v=1.3"></script>
<script src="~/Scripts/mainView.js?v=1.6"></script>
<script src="~/Scripts/mainView.js?v=1.7"></script>
<script src="~/Scripts/datepicker.js?v=1.2"></script>
<script src="~/Scripts/initialization.js?v=1.2"></script>
<script src="~/Scripts/calendar.js?v=1.2"></script>

View File

@@ -1372,28 +1372,28 @@ namespace BeWo.Data.Access
return c.Select(s => s.SequencePosition).ToList();
}
public IEnumerable<InvoiceBase> GetInvoiceBases(DateTime? startDate, DateTime? endDate, bool useInvoiceDate = true)
{
var lCriteria = CreateCriteriaIsActive<InvoiceBase>();
if (useInvoiceDate)
{
if (startDate.HasValue)
lCriteria.Add(Restrictions.Ge(InvoiceBase.PropertyName_InvoiceDate, startDate));
if (endDate.HasValue)
lCriteria.Add(Restrictions.Le(InvoiceBase.PropertyName_InvoiceDate, endDate));
}
else
{
if (startDate.HasValue)
lCriteria.Add(Restrictions.Ge(InvoiceBase.PropertyName_AccountingPeriodEnd, startDate));
if (endDate.HasValue)
lCriteria.Add(Restrictions.Le(InvoiceBase.PropertyName_AccountingPeriodStart, endDate));
public IEnumerable<InvoiceBase> GetInvoiceBases(DateTime? startDate, DateTime? endDate, bool useInvoiceDate = true)
{
var lCriteria = CreateCriteriaIsActive<InvoiceBase>();
if (useInvoiceDate)
{
if (startDate.HasValue)
lCriteria.Add(Restrictions.Ge(InvoiceBase.PropertyName_InvoiceDate, startDate));
if (endDate.HasValue)
lCriteria.Add(Restrictions.Le(InvoiceBase.PropertyName_InvoiceDate, endDate));
}
else
{
if (startDate.HasValue)
lCriteria.Add(Restrictions.Ge(InvoiceBase.PropertyName_AccountingPeriodEnd, startDate));
if (endDate.HasValue)
lCriteria.Add(Restrictions.Le(InvoiceBase.PropertyName_AccountingPeriodStart, endDate));
}
return lCriteria.List<InvoiceBase>();
}
return lCriteria.List<InvoiceBase>();
}
public IEnumerable<SupportConcept> GetAllActiveSupportConceptsByCustomers(List<long> customerOids, bool expiredOnesToo = false)
public IEnumerable<SupportConcept> GetAllActiveSupportConceptsByCustomers(List<long> customerOids, bool expiredOnesToo = false)
{
var c = CreateCriteria<SupportConcept>()
.Add(Restrictions.Eq(BeWoEntityBase.PropertyName_IsActive, ActivationTypeId.Active))
@@ -2198,7 +2198,38 @@ namespace BeWo.Data.Access
return c.List<QuittierungsCheck>();
}
public IEnumerable<AbsenceTime> GetAllAbsenceTimesInIntervalByEmployee(DateTime start, DateTime end, long pEmployeeOid, bool pHasRightToSeeAllEmployeeAppointments)
public IList<Timesheet> FindTimeSheetsForMonth(DateTime monat)
{
DateTime start = new DateTime(monat.Year, monat.Month, 1);
DateTime end = start.AddMonths(1);
return CreateCriteria<Timesheet>()
.Add(Restrictions.And(Restrictions.Lt(SchedulerAppointment.PropertyName_StartDate, end), Restrictions.Ge(SchedulerAppointment.PropertyName_EndDate, start)))
.List<Timesheet>();
}
public Timesheet FindEmployeeTimeSheetForMonth(long employeeOid, DateTime monat)
{
DateTime start = new DateTime(monat.Year, monat.Month, 1);
DateTime end = start.AddMonths(1);
return CreateCriteria<Timesheet>()
.Add(Restrictions.Eq("EmployeeOid", employeeOid))
.Add(Restrictions.And(Restrictions.Lt(SchedulerAppointment.PropertyName_StartDate, end),
Restrictions.Ge(SchedulerAppointment.PropertyName_EndDate, start)))
.UniqueResult<Timesheet>();
}
public IList<Timesheet2Mail> FindTimeSheetMails(long timesheetOid, long employeeOid)
{
return CreateCriteria<Timesheet2Mail>()
.Add(Restrictions.Eq("TimesheetOid", timesheetOid))
.Add(Restrictions.Eq("EmployeeOid", employeeOid))
.List<Timesheet2Mail>();
}
public IEnumerable<AbsenceTime> GetAllAbsenceTimesInIntervalByEmployee(DateTime start, DateTime end, long pEmployeeOid, bool pHasRightToSeeAllEmployeeAppointments)
{
// Wenn das Enddatum null ist, wird das Ende des Intervalls als Enddatum gesetzt (Ist ja eh read-only).

View File

@@ -182,6 +182,7 @@
<Compile Include="Entities\PersonHistory.cs" />
<Compile Include="Entities\QuittierungsCheck.cs" />
<Compile Include="Entities\Textbaustein.cs" />
<Compile Include="Entities\Timesheet2Mail.cs" />
<Compile Include="Entities\Token.cs" />
<Compile Include="Entities\VertretungsListe.cs" />
<Compile Include="Entities\Vertretung.cs" />
@@ -585,6 +586,7 @@
<EmbeddedResource Include="Mappings\FlexibleReportLayout.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
<Content Include="Mappings\Timesheet2Mail.hbm.xml" />
<EmbeddedResource Include="Mappings\ContactHistory.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>

View File

@@ -20,6 +20,8 @@ namespace BeWo.Data.Entities
public static string PropertyName_UdpUser = "UdpUser";
public static string PropertyName_UpdTs = "UpdTs";
public static string PropertyName_Version = "Version";
protected DateTime? _InsTs;
@@ -34,6 +36,8 @@ namespace BeWo.Data.Entities
protected string _UdpUser;
protected DateTime? _UpdTs;
protected long? _Version;
private ActivationTypeId _IsActive = ActivationTypeId.Active;
@@ -160,6 +164,22 @@ namespace BeWo.Data.Entities
}
}
public virtual DateTime? UpdTs
{
get
{
return this._UpdTs;
}
set
{
if (this.AreDifferent(this._UpdTs, value))
{
this._UpdTs = value;
}
}
}
public virtual long? Version
{
get

View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using BS.Shared;
@@ -8,21 +9,23 @@ namespace BeWo.Data.Entities
{
public static string PropertyName_AttachmentList = "AttachmentList";
public static string PropertyName_Mail2Receiver = "Mail2Receiver";
public static string PropertyName_Message = "Message";
public static string PropertyName_Sender = "Sender";
public static string PropertyName_Receiver = "Receiver";
public static string PropertyName_Subject = "Subject";
private IList<FileAttachmentInfo> _AttachmentList;
private IList<FileAttachment> _AttachmentList;
private IList<Mail2Receiver> _Mail2Receiver;
private string _Message;
private Employee _Sender;
private string _Sender;
private string _Receiver;
private string _Subject;
@@ -31,11 +34,11 @@ namespace BeWo.Data.Entities
this._Tid = TableID.Mail;
}
public virtual IList<FileAttachmentInfo> AttachmentList
public virtual IList<FileAttachment> AttachmentList
{
get
{
return this._AttachmentList ?? (this._AttachmentList = new List<FileAttachmentInfo>());
return this._AttachmentList ?? (this._AttachmentList = new List<FileAttachment>());
}
set
@@ -79,7 +82,7 @@ namespace BeWo.Data.Entities
}
}
public virtual Employee Sender
public virtual string Sender
{
get
{
@@ -95,6 +98,22 @@ namespace BeWo.Data.Entities
}
}
public virtual string Receiver
{
get
{
return this._Receiver;
}
set
{
if (this.AreDifferent(this._Receiver, value))
{
this._Receiver = value;
}
}
}
public virtual string Subject
{
get

View File

@@ -6,49 +6,21 @@ namespace BeWo.Data.Entities
{
public class Timesheet : BeWoEntityBase
{
public static string PropertyName_CreationDate = "CreationDate";
public static string PropertyName_ShortName = "ShortName";
private DateTime? _CreationDate;
private DateTime? _SignDate;
public Timesheet()
{
this._Tid = TableID.Timesheet;
}
public virtual DateTime? StartDate { get; set; }
public virtual DateTime? EndDate { get; set; }
public virtual DateTime? CreationDate { get; set; }
public virtual DateTime? SignDate { get; set; }
public virtual DateTime? PrintedDate { get; set; }
public virtual long? SignedByEmployeeOid { get; set; }
public virtual long? PrintedByEmployeeOid { get; set; }
public virtual long? CustomerOid { get; set; }
public virtual long? EmployeeOid { get; set; }
public virtual String Status { get; set; }
public virtual DateTime? CreationDate
{
get
{
return this._CreationDate;
}
set
{
if (this.AreDifferent(this._CreationDate, value))
{
this._CreationDate = value;
}
}
}
public virtual DateTime? SignDate
{
get
{
return this._SignDate;
}
set
{
if (this.AreDifferent(this._SignDate, value))
{
this._SignDate = value;
}
}
}
}
}
}

View File

@@ -0,0 +1,21 @@
using System;
using BS.Shared;
namespace BeWo.Data.Entities
{
public class Timesheet2Mail : BeWoEntityBase
{
public Timesheet2Mail()
{
this._Tid = TableID.Timesheet2Mail;
}
public virtual long? TimesheetOid { get; set; }
public virtual long? CustomerOid { get; set; }
public virtual long? EmployeeOid { get; set; }
public virtual Mail Mail { get; set; }
}
}

View File

@@ -9,20 +9,24 @@
<property column="Tid" type="BS.Shared.TableID, BS.Shared" name="_Tid" access="field" />
<property column="Message" type="String" name="Message" length="1024" />
<property column="Subject" type="String" name="Subject" length="1024" />
<property column="Sender" type="String" name="Sender" length="1024" />
<property column="Receiver" type="String" name="Receiver" length="1024" />
<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" />
<many-to-one name="Sender" column="SenderOid" class="BeWo.Data.Entities.Employee,BeWo.Data" cascade="none" />
<!--<many-to-one name="Sender" column="SenderOid" class="BeWo.Data.Entities.Employee,BeWo.Data" cascade="none" />
<bag name="ReceiverList" table="Mail2Receiver" generic="true" cascade="all-delete-orphan" where="IsActive = 1">
<key column="MailOid" />
<one-to-many class="BeWo.Data.Entities.Mail2Receiver,BeWo.Data" />
</bag>
<bag name="AttachmentList" table="fileattachment" generic="true" cascade="all-delete-orphan" where="IsActive = 1">
</bag>-->
<bag name="AttachmentList" table="fileattachment" generic="true" cascade="all-delete-orphan" where="ObjectTid = 32 AND IsActive = 1">
<key column="ObjectOid" />
<one-to-many class="BeWo.Data.Entities.FileAttachmentInfo,BeWo.Data" />
<one-to-many class="BeWo.Data.Entities.FileAttachment,BeWo.Data" />
</bag>
</class>
</hibernate-mapping>

View File

@@ -7,13 +7,23 @@
</id>
<version type="Int64" column="Version" name="Version" />
<property column="Tid" type="BS.Shared.TableID, BS.Shared" name="_Tid" access="field" />
<property column="CreationDate" type="DateTime" name="CreationDate" />
<property column="SignDate" type="DateTime" name="SignDate" />
<property column="Notice" type="String" name="Notice" length="1024" />
<property column="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="SystemEntryID" />
<property column="InsTs" type="DateTime" name="InsTs" />
<property column="InsUser" type="String" name="InsUser" length="256" />
<property column="UpdTs" type="DateTime" name="UpdTs" />
<property column="UdpUser" type="String" name="UdpUser" length="256" />
<property column="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" name="IsActive" />
<property name="StartDate" />
<property name="EndDate" />
<property name="CreationDate" />
<property name="SignDate" />
<property name="PrintedDate" />
<property name="EmployeeOid" />
<property name="CustomerOid" />
<property name="PrintedByEmployeeOid" />
<property name="SignedByEmployeeOid" />
<property name="Status" />
</class>
</hibernate-mapping>

View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
<class name="BeWo.Data.Entities.Timesheet2Mail, BeWo.Data" table="Timesheet2Mail">
<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="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="SystemEntryID" />
<property column="InsTs" type="DateTime" name="InsTs" />
<property column="InsUser" type="String" name="InsUser" length="256" />
<property column="UpdTs" type="DateTime" name="UpdTs" />
<property column="UdpUser" type="String" name="UdpUser" length="256" />
<property column="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" name="IsActive" />
<property name="EmployeeOid" />
<property name="CustomerOid" />
<property name="TimesheetOid" />
<many-to-one name="Mail" column="MailOid" class="BeWo.Data.Entities.Mail,BeWo.Data" cascade="none" />
</class>
</hibernate-mapping>

View File

@@ -33,7 +33,13 @@ namespace BeWo.Data
currentState[i] = null;
}
}
return base.OnFlushDirty(entity, id, currentState, previousState, propertyNames, types);
i = propertyNames.IndexOf(BeWoEntityBase.PropertyName_UpdTs);
if (i >= 0)
{
currentState[i] = DateTime.Now;
}
return base.OnFlushDirty(entity, id, currentState, previousState, propertyNames, types);
}
public override bool OnSave(object entity, object id, object[] state, string[] propertyNames, IType[] types)
@@ -50,7 +56,9 @@ namespace BeWo.Data
int i2 = propertyNames.IndexOf(BeWoEntityBase.PropertyName_InsTs);
if (i2 >= 0)
state[i2] = DateTime.Now;
i2 = propertyNames.IndexOf(BeWoEntityBase.PropertyName_UpdTs);
if (i2 >= 0)
state[i2] = DateTime.Now;
return base.OnSave(entity, id, state, propertyNames, types);
}
}

View File

@@ -15,22 +15,11 @@
NHibernate.Driver.MySqlDataDriver
</property>
<property name="connection.connection_string">
<property name="connection.connection_string">
Server=localhost;Password=root;User ID=root; Initial Catalog=bewodemo
</property>
<!--<property name="connection.connection_string">
Server=localhost;Password=root;User ID=root;Initial Catalog=delete_for_good_database
</property>-->
<!--<property name="connection.connection_string">
Server=localhost;Password=root;User ID=root;Initial Catalog=betreuwo
</property>-->
<!--<property name="connection.connection_string">
Server=localhost;Password=root;User ID=root;Initial Catalog=caritasaachen
</property>-->
<property name="dialect">
NHibernate.Dialect.MySQLDialect
</property>

View File

@@ -305,8 +305,19 @@ namespace Host
int year = int.Parse(this.Request.Params["year"]);
long orgaOid = long.Parse(this.Request.Params["orgaOid"]);
long empOid = long.Parse(this.Request.Params["empOid"]);
int startDay = int.Parse(this.Request.Params["start"]);
int endDay = int.Parse(this.Request.Params["end"]);
int startDay = 1;
if (Request.Params["start"] != null)
{
startDay = int.Parse(Request.Params["start"]);
}
int endDay = DateTime.DaysInMonth(year, month);
if (Request.Params["end"] != null)
{
endDay = int.Parse(Request.Params["end"]);
}
long? scOid = null;
if (Request.Params["scOid"] != null)
scOid = long.Parse(Request.Params["scOid"]);
@@ -324,9 +335,20 @@ namespace Host
int year = int.Parse(Request.Params["year"]);
long orgaOid = long.Parse(Request.Params["orgaOid"]);
long empOid = long.Parse(Request.Params["empOid"]);
int startDay = int.Parse(Request.Params["start"]);
int endDay = int.Parse(Request.Params["end"]);
long? scOid;
int startDay = 1;
if (Request.Params["start"] != null)
{
startDay = int.Parse(Request.Params["start"]);
}
int endDay = DateTime.DaysInMonth(year, month);
if (Request.Params["end"] != null)
{
endDay = int.Parse(Request.Params["end"]);
}
long? scOid;
if (Request.Params["scOid"] != null)
scOid = long.Parse(Request.Params["scOid"]);
else

View File

@@ -32,7 +32,7 @@ CREATE TABLE `personhistory` (
`Person_IsActive` tinyint(4) DEFAULT NULL,
`Person_SystemEntryID` int(10) DEFAULT NULL,
`Person_Title` varchar(2048) DEFAULT NULL,
`Person_FunctionV` varchar(2048) DEFAULT NULL,
`Person_Function` varchar(2048) DEFAULT NULL,
`Person_IsMigrant` tinyint(4) DEFAULT NULL,
`Person_Nationalitaet` varchar(2048) DEFAULT NULL,
`Person_AufenthaltsStatus` varchar(2048) DEFAULT NULL

View File

@@ -1,2 +1,2 @@
ALTER TABLE `bewodemo`.`person`
ALTER TABLE `person`
ADD COLUMN `Migrationshintergrund` VARCHAR(1024) NULL AFTER `AufenthaltsStatusValueListEntryOid`;

View File

@@ -614,6 +614,7 @@ namespace BeWo.Report.DefaultReports
this.fieldStd,
this.fieldTotalStd});
this.DataSource = this.bindingSource1;
this.DisplayName = "Stundenzettel";
this.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleIstFerien});

View File

@@ -294,7 +294,6 @@ namespace BeWo.Report.DefaultReports
this.GroupHeader1.HeightF = 70F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.RepeatEveryPage = true;
this.GroupHeader1.StylePriority.UseFont = false;
//
// xrTableServiceRecords1
//
@@ -501,11 +500,9 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell43.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell43.Font = new System.Drawing.Font("Arial", 10F);
this.xrTableCell43.Multiline = true;
this.xrTableCell43.Name = "xrTableCell43";
this.xrTableCell43.StylePriority.UseBorders = false;
this.xrTableCell43.StylePriority.UseFont = false;
this.xrTableCell43.StylePriority.UseTextAlignment = false;
this.xrTableCell43.Weight = 0.44692737430167595D;
//
// xrTableCell49
@@ -1172,9 +1169,9 @@ namespace BeWo.Report.DefaultReports
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.LocationFloat = new DevExpress.Utils.PointFloat(1F, 1F);
this.picSignature.Name = "picSignature";
this.picSignature.SizeF = new System.Drawing.SizeF(160.0001F, 20.00001F);
this.picSignature.SizeF = new System.Drawing.SizeF(158F, 18F);
this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
this.picSignature.StylePriority.UseBorders = false;
this.picSignature.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.picSignature_BeforePrint);

View File

@@ -28,7 +28,7 @@ namespace BeWo.Report.DefaultReports
{
if (sd.IsBillable)
{
//ServicesOverviewRO.CreateSignatureString(sd);
ServicesOverviewRO.CreateSignatureString(sd);
if (sd.IsGroup)
{
//sd.Notice5 = String.Format("{0} Teilnehmer", sd.CustomerCount);

View File

@@ -64,33 +64,37 @@ namespace BeWo.Report.DefaultReports
int index = 1;
foreach (var at in pRo.Abwesenheiten)
{
DevExpress.XtraReports.UI.XRTableRow row = null;
if (index < xrTableAbwesenheiten.Rows.Count)
if (at.AbsenceReason.BillableMinutes.HasValue && at.AbsenceReason.BillableMinutes.Value > 0)
{
row = xrTableAbwesenheiten.Rows[index];
}
else
{
row = xrTableAbwesenheiten.InsertRowBelow(xrTableAbwesenheiten.Rows[xrTableAbwesenheiten.Rows.Count - 1]);
newRows++;
}
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;
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;
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++;
}
else
{
row.Cells[1].Text = "unbekannt";
}
row.Cells[2].Text = String.Format("{0:0}", days);
index++;
}
if (newRows > 0)

View File

@@ -476,7 +476,13 @@ namespace BeWo.Report.ReportObjects
}
else
{
scDc.ApprovedHoursPerWeek = (anteil.AnteilAnBetreuung / 60) * (scDc.ApprovedHoursPerWeek / scDc.ApprovedHoursPerWeekWithRateFactor);
if (scDc.ApprovedHoursPerWeekWithRateFactor > 0)
{
scDc.ApprovedHoursPerWeek = (anteil.AnteilAnBetreuung / 60) *
(scDc.ApprovedHoursPerWeek /
scDc.ApprovedHoursPerWeekWithRateFactor);
}
scDc.ApprovedHoursPerWeekWithRateFactor = anteil.AnteilAnBetreuung / 60;
}
}

View File

@@ -310,7 +310,7 @@ namespace BeWo.Report.ReportObjects
dc.SupportConceptOid = c2s.SupportConcept.SupportConceptOid;
dc.CostBearerRelOids = new List<long>();
dc.CostBearerRelOids.Add(c2s.CostBearer2SupportConceptOid.Value);
dc.IsApproved = c2s.ApprovedStartDate.HasValue && c2s.ApprovedEndDate.HasValue;
return dc;
}
}

View File

@@ -178,8 +178,9 @@ namespace BeWo.Report.ReportObjects
empDetail.EmploymentType = c.EmploymentType;
}
empDetail.SollProTag = (weeklyTotalHours / empDetail.ArbeitstageProWoche);
empDetail.SollProWoche = BerechneSollProWoche(c, empDetail);
empDetail.SollProWoche = BerechneSollProWoche(c, empDetail);
HandleServiceRecords(empDetail, groupFilteredRecords, c);
@@ -230,7 +231,11 @@ namespace BeWo.Report.ReportObjects
stundenSollGesamt += stundenSollImVertragsUndBerichtzeitraum ?? 0;
var tatSollStdImVertragsUndBerichtzeitraum = stundenSollImVertragsUndBerichtzeitraum ?? 0;
empDetail.StundenSollMax = stundenSollGesamt;
var tatSollStdImVertragsUndBerichtzeitraum = stundenSollImVertragsUndBerichtzeitraum ?? 0;
decimal? fehlZeiten = GetFehlzeiten(groupFilteredRecords, berichtsAnfang, berichtsEnde);
@@ -268,54 +273,61 @@ namespace BeWo.Report.ReportObjects
var minusStunden = BerechneStundenDurchAbwesenheiten(ath, berichtsAnfang, berichtsEnde, c, empDetail);
tatSollStdImVertragsUndBerichtzeitraum -= minusStunden;
if (tatSollStdImVertragsUndBerichtzeitraum < 0)
if (tatSollStdImVertragsUndBerichtzeitraum < 0 && !StundenDurchAbwesenheitenDuerfenNegativSein())
{
tatSollStdImVertragsUndBerichtzeitraum = 0;
}
// if (stundenSollProMonat.HasValue)
//{
// decimal stundenProTag = stundenSollProMonat.Value/ empDetail.ArbeitstageImBerichtszeitraum;
// tatSollStdImVertragsUndBerichtzeitraum -= (ath.TageGesamt.Value * stundenProTag);
// }
//else
//{
// var minusStunden = BerechneStundenDurchAbwesenheiten(ath, berichtsAnfang, berichtsEnde, empDetail.ArbeitstageProWoche, weeklyTotalHours);
// tatSollStdImVertragsUndBerichtzeitraum -= minusStunden;
// }
}
tatSollStdGesamt += tatSollStdImVertragsUndBerichtzeitraum;
var ath2 = GetAbwesenheitenDurchServiceRecords(empDetail, c, groupFilteredRecords, berichtsAnfang, berichtsEnde);
var festeflsSollProMonat = BerechneFlsSollProMonat(emp, berichtsAnfang, berichtsEnde);
decimal flsSollImVertragsUndBerichtzeitraum = 0;
if (festeflsSollProMonat.HasValue)
{
flsSollImVertragsUndBerichtzeitraum = tatSollStdImVertragsUndBerichtzeitraum;
if (stundenSollProMonat.HasValue)
{
flsSollImVertragsUndBerichtzeitraum *= (festeflsSollProMonat.Value / stundenSollProMonat.Value);
}
}
else
if (ath2 != null)
{
if (c != null && c.WeeklyFLS.HasValue)
var stunden = ath2.StundenKrankheit + ath2.StundenUrlaub;
tatSollStdImVertragsUndBerichtzeitraum -= stunden;
if (tatSollStdImVertragsUndBerichtzeitraum < 0 && !StundenDurchAbwesenheitenDuerfenNegativSein())
{
flsSollImVertragsUndBerichtzeitraum = tatSollStdImVertragsUndBerichtzeitraum;
tatSollStdImVertragsUndBerichtzeitraum = 0;
}
if (c.WeeklyTotalHours.HasValue && c.WeeklyTotalHours.Value != 0)
if (empDetail.SollProTag > 0)
{
if (!abwesenheitTageGesamt.HasValue)
abwesenheitTageGesamt = 0;
abwesenheitTageGesamt += stunden / empDetail.SollProTag;
if (ath2.StundenKrankheit > 0)
{
flsSollImVertragsUndBerichtzeitraum *= c.WeeklyFLS.Value / c.WeeklyTotalHours.Value;
}
if (!tageKrankheitGesamt.HasValue)
{
tageKrankheitGesamt = 0;
}
tageKrankheitGesamt += ath2.StundenKrankheit / empDetail.SollProTag;
}
if (ath2.StundenUrlaub > 0)
{
if (!tageUrlaubGesamt.HasValue)
{
tageUrlaubGesamt = 0;
}
tageUrlaubGesamt += ath2.StundenUrlaub / empDetail.SollProTag;
}
}
}
flsSollGesamt += flsSollImVertragsUndBerichtzeitraum;
tatSollStdGesamt += tatSollStdImVertragsUndBerichtzeitraum;
flsSollGesamt += BerechneFlsSoll(emp, c, berichtsAnfang, berichtsEnde, tatSollStdImVertragsUndBerichtzeitraum, stundenSollProMonat);
berichtsAnfang = berichtsEnde;
berichtsEnde = monatsEnde;
@@ -342,8 +354,6 @@ namespace BeWo.Report.ReportObjects
empDetail.WorkDaysThisMonth = workdaysTotal;
//decimal stundenSollMax = arbeitstage * (maxWochenstunden / xxx) * bu;
empDetail.SollProTag = (weeklyTotalHours/ empDetail.ArbeitstageProWoche);
empDetail.StundenSollMax = stundenSollGesamt;
empDetail.Fehlzeiten = fehlZeitenGesamt;
@@ -380,7 +390,7 @@ namespace BeWo.Report.ReportObjects
decimal alteExtraUeberstunden = 0;
BerechneUeberstundenBis(empDetail.Employee, groupFilteredRecords, ro.ReportStartDate, out ueberstundenVormonat,
BerechneUeberstundenBis(empDetail, groupFilteredRecords, ro.ReportStartDate, out ueberstundenVormonat,
out alteExtraUeberstunden);
@@ -416,6 +426,90 @@ namespace BeWo.Report.ReportObjects
ro.EmployeeDetailList = FilterEmployeeList(ro.EmployeeDetailList);
}
protected virtual AbsenceTimeHours GetAbwesenheitenDurchServiceRecords(MitarbeiterstundenkontoRO.EmployeeDetail empDetail, Contract c, IList<ServiceRecord> groupFilteredRecords, DateTime berichtsAnfang, DateTime berichtsEnde)
{
return null;
}
protected virtual decimal BerechneFlsSoll(Employee emp, Contract contract, DateTime berichtsAnfang, DateTime berichtsEnde, decimal tatSollStdImVertragsUndBerichtzeitraum, decimal? stundenSollProMonat)
{
var festeflsSollProMonat = BerechneFlsSollProMonat(emp, berichtsAnfang, berichtsEnde);
decimal flsSollImVertragsUndBerichtzeitraum = 0;
if (festeflsSollProMonat.HasValue)
{
flsSollImVertragsUndBerichtzeitraum = tatSollStdImVertragsUndBerichtzeitraum;
if (stundenSollProMonat.HasValue)
{
flsSollImVertragsUndBerichtzeitraum *= (festeflsSollProMonat.Value / stundenSollProMonat.Value);
}
}
else
{
if (contract != null && contract.WeeklyFLS.HasValue)
{
flsSollImVertragsUndBerichtzeitraum = tatSollStdImVertragsUndBerichtzeitraum;
if (HatArbeitszeitImZeitraum(emp.Arbeitszeiten, berichtsAnfang, berichtsEnde))
{
var wochenArbeitszeit = GetWochenArbeitszeit(emp.Arbeitszeiten, berichtsAnfang, berichtsEnde);
if (wochenArbeitszeit > 0)
{
flsSollImVertragsUndBerichtzeitraum *= contract.WeeklyFLS.Value / wochenArbeitszeit;
}
}
else if (contract.WeeklyTotalHours.HasValue && contract.WeeklyTotalHours.Value != 0)
{
flsSollImVertragsUndBerichtzeitraum *= contract.WeeklyFLS.Value / contract.WeeklyTotalHours.Value;
}
}
}
return flsSollImVertragsUndBerichtzeitraum;
}
private decimal GetWochenArbeitszeit(IList<Arbeitszeit> arbeitszeiten, DateTime start, DateTime ende)
{
if (arbeitszeiten != null)
{
foreach (var az in arbeitszeiten)
{
if ((!az.GueltigVon.HasValue || az.GueltigVon.Value < ende) &&
(!az.GueltigBis.HasValue || az.GueltigBis.Value >= start))
{
DateTime wochenStart = start;
while (wochenStart.DayOfWeek != DayOfWeek.Monday)
{
wochenStart = wochenStart.AddDays(1);
}
decimal stunden = 0;
for (int i = 0; i < 7; i++)
{
stunden += GetArbeitszeitStundenFuerTag(az, wochenStart);
wochenStart = wochenStart.AddDays(1);
}
return stunden;
}
}
}
return 0;
}
protected virtual bool StundenDurchAbwesenheitenDuerfenNegativSein()
{
return false;
}
protected virtual decimal? GetSollNachArbeitszeiten(Employee emp, DateTime start, DateTime ende)
{
if (emp.Arbeitszeiten != null && emp.Arbeitszeiten.Count > 0)
@@ -468,24 +562,7 @@ namespace BeWo.Report.ReportObjects
if ((!az.GueltigVon.HasValue || az.GueltigVon.Value <= tag) &&
(!az.GueltigBis.HasValue || az.GueltigBis.Value >= tag))
{
var day = tag.DayOfWeek;
foreach (var ae in az.ArbeitszeitEintraege)
{
if (SindAmGleichenWochentag(day, ae.Tag))
{
String dateStr1 = String.Format("{0:dd.MM.yyyy} {1}", tag, ae.UhrzeitVon);
String dateStr2 = String.Format("{0:dd.MM.yyyy} {1}", tag, ae.UhrzeitBis);
DateTime date1;
DateTime date2;
if (DateTime.TryParse(dateStr1, out date1) && DateTime.TryParse(dateStr2, out date2))
{
soll += (decimal) date2.Subtract(date1).TotalHours;
}
}
}
soll += GetArbeitszeitStundenFuerTag(az, tag);
}
}
}
@@ -494,6 +571,30 @@ namespace BeWo.Report.ReportObjects
return soll;
}
private decimal GetArbeitszeitStundenFuerTag(Arbeitszeit az, DateTime tag)
{
var day = tag.DayOfWeek;
foreach (var ae in az.ArbeitszeitEintraege)
{
if (SindAmGleichenWochentag(day, ae.Tag))
{
String dateStr1 = String.Format("{0:dd.MM.yyyy} {1}", tag, ae.UhrzeitVon);
String dateStr2 = String.Format("{0:dd.MM.yyyy} {1}", tag, ae.UhrzeitBis);
DateTime date1;
DateTime date2;
if (DateTime.TryParse(dateStr1, out date1) && DateTime.TryParse(dateStr2, out date2))
{
return (decimal)date2.Subtract(date1).TotalHours;
}
}
}
return 0;
}
private bool SindAmGleichenWochentag(DayOfWeek day, AppointmentDayOfWeek aeTag)
{
if (day == DayOfWeek.Monday && aeTag == AppointmentDayOfWeek.Montag)
@@ -1170,7 +1271,7 @@ namespace BeWo.Report.ReportObjects
}
if (sr.Start.Value.Second == 0 && dd.NightEnd.HasValue && dd.NightStart.HasValue)
{
var minuten = CheckNachtzeiten(sr.Start.Value, dd.NightStart.Value, dd.NightEnd.Value, (double)sr.RoundedDuration);
var minuten = CheckNachtzeiten(sr.Start.Value, dd.NightStart.Value, dd.NightEnd.Value, (double)duration);
if (minuten > 0)
{
@@ -1345,7 +1446,12 @@ namespace BeWo.Report.ReportObjects
}
public virtual bool IsKrankheitAbsenceTime(AbsenceTime absenceTime)
public virtual bool IstAnrechenbareAbsenceTime(AbsenceTime item)
{
return true;
}
public virtual bool IsKrankheitAbsenceTime(AbsenceTime absenceTime)
{
return !String.IsNullOrEmpty(absenceTime.AbsenceReason.Description) &&
(absenceTime.AbsenceReason.Description.ToLower().IndexOf("arbeitsunfähig") >= 0
@@ -1368,11 +1474,15 @@ namespace BeWo.Report.ReportObjects
return 1;
}
private void BerechneUeberstundenBis(Employee emp, IList<ServiceRecord> records, DateTime monat, out decimal? ueberstunden, out decimal alteExtraUeberstunden)
public virtual MitarbeiterstundenkontoRO.EmployeeDetail BerechneUeberstundenBis(MitarbeiterstundenkontoRO.EmployeeDetail edOrig, IList<ServiceRecord> records, DateTime monat, out decimal? ueberstunden, out decimal alteExtraUeberstunden)
{
ueberstunden = null;
MitarbeiterstundenkontoRO.EmployeeDetail edTotal = new MitarbeiterstundenkontoRO.EmployeeDetail();
ueberstunden = null;
alteExtraUeberstunden = 0;
var emp = edOrig.Employee;
Contract c = emp.FirstContract;
if (c != null)
@@ -1519,15 +1629,14 @@ namespace BeWo.Report.ReportObjects
ed.SollProWoche = BerechneSollProWoche(c, ed);
ed.AbsenceTimeDays = ath;
ed.Employee = emp;
ed.StundenSollMax = sollMitarbeiter;
if (ath.TageGesamt.HasValue)
{
var minusStunden = BerechneStundenDurchAbwesenheiten(ath, start, ende, c, ed);
var minusStunden = BerechneStundenDurchAbwesenheiten(ath, start, ende, c, ed);
sollMitarbeiter -= minusStunden;
if (sollMitarbeiter < 0)
if (sollMitarbeiter < 0 && !StundenDurchAbwesenheitenDuerfenNegativSein())
{
sollMitarbeiter = 0;
}
@@ -1551,7 +1660,25 @@ namespace BeWo.Report.ReportObjects
//}
}
decimal stundenMonat = minutenMonat/60m;
var ath2 = GetAbwesenheitenDurchServiceRecords(ed, c, records, start, ende);
if (ath2 != null)
{
var stunden = (ath2.StundenKrankheit + ath2.StundenUrlaub);
sollMitarbeiter -= stunden;
if (sollMitarbeiter < 0 && !StundenDurchAbwesenheitenDuerfenNegativSein())
{
sollMitarbeiter = 0;
}
}
decimal stundenMonat = minutenMonat/60m;
if (AddRateFactorToIst() != 1)
{
stundenMonat = ((flsIst*AddRateFactorToIst()) + mittelbarIst)/60m;
@@ -1577,7 +1704,7 @@ namespace BeWo.Report.ReportObjects
alteExtraUeberstunden += extraUeberstunden;
ueberstunden = BerechneUeberstunden(ed, ueberstunden, c, start, ende);
if (ShouldCreateDayDetails())
{
@@ -1587,7 +1714,14 @@ namespace BeWo.Report.ReportObjects
ueberstunden += ah;
}
start = ende;
edTotal.StundenSollOhneUrlaubKrankheit += sollMitarbeiter;
edTotal.StundenSollMax += soll ?? 0;
edTotal.FlsIst += flsIst / 60;
edTotal.MittelbarIst += mittelbarIst / 60;
edTotal.StundenGesamtIst += stundenMonat;
edTotal.Ueberstunden += ueberstunden;
start = ende;
}
if (start >= contractEnd)
@@ -1615,8 +1749,15 @@ namespace BeWo.Report.ReportObjects
}
}
return edTotal;
}
protected virtual decimal? BerechneUeberstunden(MitarbeiterstundenkontoRO.EmployeeDetail ed, decimal? ueberstundenStd, Contract contract, DateTime start, DateTime ende)
{
return ueberstundenStd;
}
public virtual decimal BerechneSollProWoche(Contract c, MitarbeiterstundenkontoRO.EmployeeDetail ed)
{
if (c != null)
@@ -1754,22 +1895,20 @@ namespace BeWo.Report.ReportObjects
if ((!at.Start.HasValue || at.Start.Value <= arbeitstagEnde.Date) &&
(!at.End.HasValue || at.End.Value >= arbeitstagStart.Date))
{
var hours = (decimal)arbeitstagEnde.Subtract(arbeitstagStart).TotalHours;
var faktor = GetFeiertagsFaktor(arbeitstagStart);
if (faktor < 1)
{
var hours = (decimal)arbeitstagEnde.Subtract(arbeitstagStart).TotalHours;
if (faktor != 0)
{
hours *= faktor;
}
return hours;
}
return hours;
}
}
@@ -1846,6 +1985,7 @@ namespace BeWo.Report.ReportObjects
return 0;
}
//Wird nicht mehr benutzt
public virtual decimal BerechneStundenDurchAbwesenheiten(AbsenceTimeDays ath, DateTime start, DateTime ende, int arbeitstageProWoche, decimal sollProWoche)
{
decimal stunden = 0;
@@ -2158,85 +2298,90 @@ namespace BeWo.Report.ReportObjects
{
foreach (var item in absenceTimes)
{
DateTimeSpan span = new DateTimeSpan();
span.StartDate = start;
if (item.Start.HasValue && item.Start.Value > span.StartDate)
if (IstAnrechenbareAbsenceTime(item))
{
span.StartDate = item.Start.Value;
}
span.EndDate = end;
if (item.End.HasValue && item.End.Value.Date.AddDays(1) < span.EndDate)
{
span.EndDate = item.End.Value.Date.AddDays(1);
}
if (span.EndDate >= start && span.StartDate < end)
{
DateTime day = span.StartDate;
while (day < end && day < span.EndDate)
DateTimeSpan span = new DateTimeSpan();
span.StartDate = start;
if (item.Start.HasValue && item.Start.Value > span.StartDate)
{
var faktor = GetFeiertagsFaktor(day);
bool istWochenende = day.DayOfWeek == DayOfWeek.Saturday || day.DayOfWeek == DayOfWeek.Sunday;
if (arbeitstageProWoche == 6)
{
istWochenende = day.DayOfWeek == DayOfWeek.Sunday;
}
else if (arbeitstageProWoche > 6)
{
istWochenende = false;
}
span.StartDate = item.Start.Value;
}
if (faktor < 1 && !istWochenende)
{
if (!tage.HasValue)
tage = 0;
span.EndDate = end;
if (item.End.HasValue && item.End.Value.Date.AddDays(1) < span.EndDate)
{
span.EndDate = item.End.Value.Date.AddDays(1);
}
var tag = 1m;
var std = 24m;
if (faktor != 0)
if (span.EndDate >= start && span.StartDate < end)
{
DateTime day = span.StartDate;
while (day < end && day < span.EndDate)
{
var faktor = GetFeiertagsFaktor(day);
bool istWochenende =
day.DayOfWeek == DayOfWeek.Saturday || day.DayOfWeek == DayOfWeek.Sunday;
if (arbeitstageProWoche == 6)
{
tag *= faktor;
std *= faktor;
istWochenende = day.DayOfWeek == DayOfWeek.Sunday;
}
else if (arbeitstageProWoche > 6)
{
istWochenende = false;
}
tage += std;
if (IsKrankheitAbsenceTime(item))
if (faktor < 1 && !istWochenende)
{
if (!atd.TageKrankheit.HasValue)
atd.TageKrankheit = 0;
if (!tage.HasValue)
tage = 0;
atd.TageKrankheit += tag;
}
if (IsUrlaubAbsenceTime(item))
{
if (!atd.TageUrlaub.HasValue)
atd.TageUrlaub = 0;
atd.TageUrlaub += tag;
}
foreach (var week in weeks)
{
if (day >= week.StartDate && day <= week.EndDate)
var tag = 1m;
var std = 24m;
if (faktor != 0)
{
if (atd.TageProWocheDict.ContainsKey(week))
tag *= faktor;
std *= faktor;
}
tage += std;
if (IsKrankheitAbsenceTime(item))
{
if (!atd.TageKrankheit.HasValue)
atd.TageKrankheit = 0;
atd.TageKrankheit += tag;
}
if (IsUrlaubAbsenceTime(item))
{
if (!atd.TageUrlaub.HasValue)
atd.TageUrlaub = 0;
atd.TageUrlaub += tag;
}
foreach (var week in weeks)
{
if (day >= week.StartDate && day <= week.EndDate)
{
atd.TageProWocheDict[week] += 1;
if (atd.TageProWocheDict.ContainsKey(week))
{
atd.TageProWocheDict[week] += 1;
}
}
}
}
}
day = day.AddDays(1);
}
day = day.AddDays(1);
}
}
}
//}
}
}
if (tage.HasValue)
@@ -2244,6 +2389,7 @@ namespace BeWo.Report.ReportObjects
atd.TageGesamt = tage;
return atd;
}
public virtual AbsenceTimeDays GetAbsenceTimeDays(IList<AbsenceTime> absenceTimes, DateTime start, DateTime end)
{
@@ -2482,6 +2628,12 @@ namespace BeWo.Report.ReportObjects
public Dictionary<DateTimeSpan, decimal> RestStundenProWocheDict;
}
public class AbsenceTimeHours
{
public decimal StundenUrlaub;
public decimal StundenKrankheit;
}
public class ServiceRecordSummary
{
public decimal IstAbrechenbar { get; set; }

View File

@@ -203,230 +203,286 @@ namespace BeWo.Report.ReportObjects
pSpan.StartDateTime = new DateTime(pYear, pMonth, start);
pSpan.EndDateTime = pSpan.StartDateTime.AddDays(end - start + 1).AddTicks(-1);
var lCustomer = DAOFactory.GenericDAO.LoadByID<Customer>(pCustomerOid);
return Create(lCustomer, pSpan, orgaOid, empOid, serviceCategoryOid, disableEmptySupportConcepts);
var resultList = new List<SbdStundenaufstellungRO>();
Customer c = null;
if (pCustomerOid > 0)
{
c = DAOFactory.GenericDAO.LoadByID<Customer>(pCustomerOid);
resultList.AddRange(Create(c, pSpan, orgaOid, empOid, serviceCategoryOid, disableEmptySupportConcepts));
}
else if (empOid > 0)
{
var emp = DAOFactory.GenericDAO.LoadByID<Employee>(empOid);
foreach (var e2c in emp.Employee2CustomerList)
{
resultList.AddRange(Create(e2c.Customer, pSpan, orgaOid, empOid, serviceCategoryOid, disableEmptySupportConcepts));
}
}
return resultList;
}
private static List<SbdStundenaufstellungRO> Create(Customer customer, DateTimeSpan span, long orgaOid, long empOid, long serviceCategoryOid, bool disableEmptySupportConcepts)
private static List<SbdStundenaufstellungRO> Create(Customer cust, DateTimeSpan span, long orgaOid, long empOid, long serviceCategoryOid, bool disableEmptySupportConcepts)
{
var resultList = new List<SbdStundenaufstellungRO>();
Dictionary<long, SbdStundenaufstellungRO> employeeOid2Ro = new Dictionary<long, SbdStundenaufstellungRO>();
IList<ServiceRecord> lServiceRecords = DAOFactory.SearchDAO.FindCustomerServiceRecords(customer.Oid.Value, span, null, null, false).OrderBy(s => s.Start).ToList();
var eintraege = ErstelleStundenplanEintraege(customer, span.StartDate, span.EndDate);
Dictionary<int, SbdServiceDetail> day2Details = new Dictionary<int, SbdServiceDetail>();
//IList<ServiceRecord> lServiceRecords = null;
//if (cust != null)
//{
// lServiceRecords = DAOFactory.SearchDAO
// .FindCustomerServiceRecords(cust.Oid.Value, span, null, null, false).OrderBy(s => s.Start)
// .ToList();
//}
//else
//{
// lServiceRecords = new List<ServiceRecord>();
//}
var eintraege = ErstelleStundenplanEintraege(cust, empOid, span.StartDate, span.EndDate);
foreach (var sd in eintraege)
{
day2Details.Add(sd.StartDate.Day, sd);
}
// Dictionary<long, CostBearer2SupportConceptData> cb2scOid2Data = new Dictionary<long, CostBearer2SupportConceptData>();
var cb2scs = new Dictionary<long, SupportConceptCostBearerRelDC>();
var groupBookingDict = new Dictionary<long, ServiceRecord>();
foreach (var iSr in lServiceRecords)
{
//bool deleteEntries = false;
// foreach (var iSr in lServiceRecords)
// {
bool cont = !(empOid != 0 && iSr.EmployeeOid != null && iSr.EmployeeOid != empOid);
// bool cont = !(empOid != 0 && iSr.EmployeeOid != null && iSr.EmployeeOid != empOid);
if (cont)
{
cont = day2Details.ContainsKey(iSr.Start.Value.Day);
}
// if (cont)
// {
// cont = day2Details.ContainsKey(iSr.Start.Value.Day);
// }
CostBearer2SupportConcept cb2sc = null;
if (cont)
{
cb2sc = iSr.CostBearer2SupportConcept;
}
// CostBearer2SupportConcept cb2sc = null;
// if (cont)
// {
// cb2sc = iSr.CostBearer2SupportConcept;
// }
if (cb2sc == null)
{
cont = false;
}
else if (cont && orgaOid != 0 && cb2sc.CostBearer.Organisation != null && cb2sc.CostBearer.Organisation.Oid.Value != orgaOid)
{
cont = false;
}
// if (cb2sc == null)
// {
// cont = false;
// }
// else if (cont && orgaOid != 0 && cb2sc.CostBearer.Organisation != null && cb2sc.CostBearer.Organisation.Oid.Value != orgaOid)
// {
// cont = false;
// }
if (cont)
{
if (cb2sc.SupportConcept.IsActive == ActivationTypeId.Deleted)
{
cont = false;
}
}
// if (cont)
// {
// if (cb2sc.SupportConcept.IsActive == ActivationTypeId.Deleted)
// {
// cont = false;
// }
// }
if (cont && iSr.GroupOid != null && groupBookingDict.ContainsKey(iSr.GroupOid.Value))
{
cont = false;
}
if (cont && serviceCategoryOid > 0 && iSr.ServiceDescription.ServiceCategory.Oid != serviceCategoryOid)
cont = false;
// if (cont && iSr.GroupOid != null && groupBookingDict.ContainsKey(iSr.GroupOid.Value))
// {
// cont = false;
// }
// if (cont && serviceCategoryOid > 0 && iSr.ServiceDescription.ServiceCategory.Oid != serviceCategoryOid)
// cont = false;
if (cont)
{
SbdStundenaufstellungRO ro = null;
if (employeeOid2Ro.ContainsKey(iSr.EmployeeOid.Value))
{
ro = employeeOid2Ro[iSr.EmployeeOid.Value];
}
else
{
ro = CreateInitalRo(customer, span, iSr.Employee, 0);
employeeOid2Ro.Add(iSr.EmployeeOid.Value, ro);
resultList.Add(ro);
}
ro.ApprovedStartDate = cb2sc.StartDate;
ro.ApprovedEndDate = cb2sc.EndDate;
// if (cont)
// {
if (!cb2scs.ContainsKey(cb2sc.Oid.Value))
{
var cb2scDC = cb2sc.MapToNewDC();
var calc = PluginLoader.FindClass<Calculations>(cb2sc.CostBearer.ID) ?? Calculations.GetInstance(cb2sc.CostBearer.ID);
DateTime sdt = span.StartDateTime;
if (sdt < cb2scDC.StartDate)
sdt = cb2scDC.StartDate.Value;
ro.ApprovedPerWeek = calc.GetApprovedHoursPerWeek(cb2scDC, sdt, false) ?? 0;
ro.ApprovedTotal = calc.GetApprovedHoursTotal(cb2scDC, false) ?? 0;
// SbdStundenaufstellungRO ro = null;
// if (employeeOid2Ro.ContainsKey(iSr.EmployeeOid.Value))
// {
// ro = employeeOid2Ro[iSr.EmployeeOid.Value];
// }
// else
// {
// ro = CreateInitalRo(cust, span, iSr.Employee, 0);
// employeeOid2Ro.Add(iSr.EmployeeOid.Value, ro);
// resultList.Add(ro);
// }
cb2scs.Add(cb2sc.Oid.Value, cb2scDC);
}
// ro.ApprovedStartDate = cb2sc.StartDate;
// ro.ApprovedEndDate = cb2sc.EndDate;
// if (!cb2scs.ContainsKey(cb2sc.Oid.Value))
// {
// var cb2scDC = cb2sc.MapToNewDC();
// var calc = PluginLoader.FindClass<Calculations>(cb2sc.CostBearer.ID) ?? Calculations.GetInstance(cb2sc.CostBearer.ID);
// DateTime sdt = span.StartDateTime;
// if (sdt < cb2scDC.StartDate)
// sdt = cb2scDC.StartDate.Value;
// ro.ApprovedPerWeek = calc.GetApprovedHoursPerWeek(cb2scDC, sdt, false) ?? 0;
// ro.ApprovedTotal = calc.GetApprovedHoursTotal(cb2scDC, false) ?? 0;
var sd = day2Details[iSr.Start.Value.Day];
sd.CostBearer = iSr.CostBearer2SupportConcept != null &&
iSr.CostBearer2SupportConcept.CostBearer.Organisation != null
? iSr.CostBearer2SupportConcept.CostBearer.Organisation.Name
: string.Empty;
sd.StartDate = iSr.Start.Value;
// cb2scs.Add(cb2sc.Oid.Value, cb2scDC);
// }
// deleteEntries = true;
// var sd = day2Details[iSr.Start.Value.Day];
// sd.CostBearer = iSr.CostBearer2SupportConcept != null &&
// iSr.CostBearer2SupportConcept.CostBearer.Organisation != null
// ? iSr.CostBearer2SupportConcept.CostBearer.Organisation.Name
// : string.Empty;
// sd.StartDate = iSr.Start.Value;
sd.ServiceRecordOid = iSr.Oid.Value;
sd.SignatureOid = iSr.SignatureOid;
//sd.ServiceRecordOid = iSr.Oid.Value;
// sd.SignatureOid = iSr.SignatureOid;
decimal roundedDur = iSr.RoundedDuration;
if (iSr.ServiceDescription != null && iSr.ServiceDescription.ServiceCategory != null && iSr.ServiceDescription.ServiceCategory.Percentage != 100)
{
roundedDur = (roundedDur * iSr.ServiceDescription.ServiceCategory.Percentage) / 100;
}
// decimal roundedDur = iSr.RoundedDuration;
// if (iSr.ServiceDescription != null && iSr.ServiceDescription.ServiceCategory != null && iSr.ServiceDescription.ServiceCategory.Percentage != 100)
// {
// roundedDur = (roundedDur * iSr.ServiceDescription.ServiceCategory.Percentage) / 100;
// }
sd.Minutes = Convert.ToDouble(roundedDur);
// sd.Minutes = Convert.ToDouble(roundedDur);
if (iSr.GroupEmployeeCount != null)
{
sd.EmployeeCount = iSr.GroupEmployeeCount.Value;
}
else
{
sd.EmployeeCount = 1;
}
// if (iSr.GroupEmployeeCount != null)
// {
// sd.EmployeeCount = iSr.GroupEmployeeCount.Value;
// }
// else
// {
// sd.EmployeeCount = 1;
// }
if (iSr.GroupPersonCount != null)
{
sd.CustomerCount = iSr.GroupPersonCount.Value;
}
else
{
sd.CustomerCount = 1;
}
// if (iSr.GroupPersonCount != null)
// {
// sd.CustomerCount = iSr.GroupPersonCount.Value;
// }
// else
// {
// sd.CustomerCount = 1;
// }
sd.GroupRoundedDuration = iSr.GroupRoundedDuration;
if (iSr.GroupRoundedDuration != null)
{
sd.GroupMinutes = (double)iSr.GroupRoundedDuration.Value;
}
else
{
sd.GroupMinutes = sd.Minutes;
}
// sd.GroupRoundedDuration = iSr.GroupRoundedDuration;
// if (iSr.GroupRoundedDuration != null)
// {
// sd.GroupMinutes = (double)iSr.GroupRoundedDuration.Value;
// }
// else
// {
// sd.GroupMinutes = sd.Minutes;
// }
if (iSr.GroupOid != null)
{
sd.IsGroup = true;
groupBookingDict.Add(iSr.GroupOid.Value, iSr);
}
// if (iSr.GroupOid != null)
// {
// sd.IsGroup = true;
// groupBookingDict.Add(iSr.GroupOid.Value, iSr);
// }
sd.EndDate = sd.StartDate.AddMinutes(sd.GroupMinutes);
sd.EndDateNotRounded = iSr.End.Value;
// sd.EndDate = sd.StartDate.AddMinutes(sd.GroupMinutes);
// sd.EndDateNotRounded = iSr.End.Value;
if (sd.StartDate.Second == 0)
{
// if (sd.StartDate.Second == 0)
// {
// var timeRange = String.Format("{0}-{1}", sd.StartDate.ToShortTimeString(), sd.EndDate.ToShortTimeString());
if (String.IsNullOrWhiteSpace(sd.IstUhrzeiten1))
{
sd.IstUhrzeiten1 = String.Format("{0}-{1}", sd.StartDate.ToShortTimeString(), sd.EndDate.ToShortTimeString());
}
else if (String.IsNullOrWhiteSpace(sd.IstUhrzeiten2))
{
sd.IstUhrzeiten2 = String.Format("{0}-{1}", sd.StartDate.ToShortTimeString(), sd.EndDate.ToShortTimeString());
}
else
{
sd.IstUhrzeiten2 += String.Format(", {0}-{1}", sd.StartDate.ToShortTimeString(), sd.EndDate.ToShortTimeString());
}
// if (sd.StundenplanUhrzeiten1 != timeRange && sd.StundenplanUhrzeiten2 != timeRange)
// {
sd.StartDateMinutes = sd.StartDate;
sd.EndDateMinutes = sd.EndDate;
}
// if (String.IsNullOrWhiteSpace(sd.IstUhrzeiten1))
// {
// sd.IstUhrzeiten1 = String.Format("{0}-{1}", sd.StartDate.ToShortTimeString(),
// sd.EndDate.ToShortTimeString());
// }
// else if (String.IsNullOrWhiteSpace(sd.IstUhrzeiten2))
// {
// sd.IstUhrzeiten2 = String.Format("{0}-{1}", sd.StartDate.ToShortTimeString(),
// sd.EndDate.ToShortTimeString());
// }
// else
// {
// sd.IstUhrzeiten2 += String.Format(", {0}-{1}", sd.StartDate.ToShortTimeString(),
// sd.EndDate.ToShortTimeString());
// }
// }
// sd.StartDateMinutes = sd.StartDate;
// sd.EndDateMinutes = sd.EndDate;
// }
sd.StartDateString = iSr.Start.Value.ToShortDateString();
// sd.StartDateString = iSr.Start.Value.ToShortDateString();
sd.KW = GetKW(sd.StartDate);
// sd.KW = GetKW(sd.StartDate);
string employeeAbbr = iSr.Employee.Person.Abbreviation;
string employeeFullName = iSr.Employee.Person.FirstName + " " + iSr.Employee.Person.LastName;
// string employeeAbbr = iSr.Employee.Person.Abbreviation;
// string employeeFullName = iSr.Employee.Person.FirstName + " " + iSr.Employee.Person.LastName;
if (employeeAbbr == null || employeeAbbr.Length == 0)
{
employeeAbbr = iSr.Employee.Person.FirstName.Substring(0, 1) + ". " + iSr.Employee.Person.LastName;
}
// if (employeeAbbr == null || employeeAbbr.Length == 0)
// {
// employeeAbbr = iSr.Employee.Person.FirstName.Substring(0, 1) + ". " + iSr.Employee.Person.LastName;
// }
sd.EmployeeAbbr = employeeAbbr;
sd.EmployeeFullname = employeeFullName;
sd.EmployeeFirstName = iSr.Employee.Person.FirstName;
sd.EmployeeLastName = iSr.Employee.Person.LastName;
sd.EmployeeOid = iSr.Employee.Oid.Value;
// sd.EmployeeAbbr = employeeAbbr;
// sd.EmployeeFullname = employeeFullName;
// sd.EmployeeFirstName = iSr.Employee.Person.FirstName;
// sd.EmployeeLastName = iSr.Employee.Person.LastName;
// sd.EmployeeOid = iSr.Employee.Oid.Value;
sd.Notice = iSr.Notice;
sd.Notice2 = iSr.Notice2;
sd.Notice3 = iSr.Notice3;
sd.Notice4 = iSr.Notice4;
sd.Notice5 = iSr.Notice5;
// sd.Notice = iSr.Notice;
// sd.Notice2 = iSr.Notice2;
// sd.Notice3 = iSr.Notice3;
// sd.Notice4 = iSr.Notice4;
// sd.Notice5 = iSr.Notice5;
if (iSr.ServiceDescription != null)
{
sd.ServiceDescription = iSr.ServiceDescription.Name;
sd.ServiceCategory = iSr.ServiceDescription.ServiceCategory.Name;
sd.ServiceCategoryAbbr = iSr.ServiceDescription.ServiceCategory.Abbreviation;
if (sd.ServiceCategoryAbbr == null || sd.ServiceCategoryAbbr.Length == 0)
{
sd.ServiceCategoryAbbr = iSr.ServiceDescription.ServiceCategory.Name;
}
}
// if (iSr.ServiceDescription != null)
// {
// sd.ServiceDescription = iSr.ServiceDescription.Name;
// sd.ServiceCategory = iSr.ServiceDescription.ServiceCategory.Name;
// sd.ServiceCategoryAbbr = iSr.ServiceDescription.ServiceCategory.Abbreviation;
// if (sd.ServiceCategoryAbbr == null || sd.ServiceCategoryAbbr.Length == 0)
// {
// sd.ServiceCategoryAbbr = iSr.ServiceDescription.ServiceCategory.Name;
// }
// }
sd.IsBillable = iSr.ServiceDescription.ServiceCategory.IsBillable;
}
}
// sd.IsBillable = iSr.ServiceDescription.ServiceCategory.IsBillable;
// }
// }
//Lösche alle Stundenplaneinträge für die es keinen ServiceRecord gibt, sobald mindestens ein ServiceRecord in diesem Monat existiert
//if (deleteEntries)
//{
// foreach (var key in day2Details.Keys)
// {
// var dd = day2Details[key];
// if (dd.ServiceRecordOid == 0)
// {
// dd.StundenplanUhrzeiten1 = "";
// dd.StundenplanUhrzeiten2 = "";
// }
// }
//}
if (disableEmptySupportConcepts && eintraege.Count == 0)
{
return null;
}
eintraege.Sort((x, y) =>
@@ -442,17 +498,20 @@ namespace BeWo.Report.ReportObjects
Employee hauptBetreuer = null;
foreach (var item in customer.Employee2CustomerList)
if (cust != null)
{
if (hauptBetreuer == null)
foreach (var item in cust.Employee2CustomerList)
{
foreach (var valueEntry in item.ValueList)
if (hauptBetreuer == null)
{
if (valueEntry.Entry.SystemEntryID != null && valueEntry.Entry.SystemEntryID.Value ==
SystemEntryID.EmployeeRoleMainAttendant)
foreach (var valueEntry in item.ValueList)
{
hauptBetreuer = item.Employee;
if (valueEntry.Entry.SystemEntryID != null && valueEntry.Entry.SystemEntryID.Value ==
SystemEntryID.EmployeeRoleMainAttendant)
{
hauptBetreuer = item.Employee;
}
}
}
}
@@ -460,6 +519,10 @@ namespace BeWo.Report.ReportObjects
foreach (var eintrag in eintraege)
{
if (eintrag.EmployeeOid == 0)
{
eintrag.EmployeeOid = empOid;
}
SbdStundenaufstellungRO ro = null;
if (eintrag.EmployeeOid == 0 && hauptBetreuer != null)
{
@@ -471,7 +534,7 @@ namespace BeWo.Report.ReportObjects
}
else
{
ro = CreateInitalRo(customer, span, null, eintrag.EmployeeOid);
ro = CreateInitalRo(cust, span, null, eintrag.EmployeeOid);
employeeOid2Ro.Add(eintrag.EmployeeOid, ro);
resultList.Add(ro);
}
@@ -566,7 +629,7 @@ namespace BeWo.Report.ReportObjects
detail.Notice = ferien.Name;
}
var ft = vs.GetFeiertag(start);
var ft = GetFeiertag(vs, start);
if (ft != null)
{
detail.IstFeiertag = true;
@@ -576,32 +639,54 @@ namespace BeWo.Report.ReportObjects
return detail;
}
private static IList<FeiertagDC> _feiertage = null;
public static FeiertagDC GetFeiertag(VacationService vs, DateTime start)
{
if (_feiertage == null)
{
_feiertage = vs.GetFeiertage(start.Year, "NRW");
}
foreach (var ft in _feiertage)
{
if (start == ft.Datum)
return ft;
}
return null;
}
private static SbdStundenaufstellungRO CreateInitalRo(Customer customer, DateTimeSpan span, Employee employee, long employeeoid)
{
var lResult = new SbdStundenaufstellungRO();
lResult.CustomerOid = customer.Oid.Value;
lResult.Abwesenheiten = new List<AbsenceTime>();
lResult.StartDate = span.StartDate;
lResult.EndDate = span.EndDate;
lResult.CustomerAlias = customer.CustomerAlias;
lResult.CustomerFirstName = customer.Person.FirstName;
lResult.CustomerLastName = customer.Person.LastName;
lResult.CustomerBirthday = customer.Person.DateOfBirth;
lResult.CustomerName = customer.Person.FirstName + " " + customer.Person.LastName;
if (customer.Person.Address != null)
if (customer != null)
{
lResult.CustomerStreet = customer.Person.Address.Street;
lResult.CustomerPostalCode = customer.Person.Address.PostalCode;
lResult.CustomerCity = customer.Person.Address.Town;
}
lResult.CustomerOid = customer.Oid.Value;
lResult.CustomerAlias = customer.CustomerAlias;
lResult.CustomerFirstName = customer.Person.FirstName;
lResult.CustomerLastName = customer.Person.LastName;
lResult.CustomerBirthday = customer.Person.DateOfBirth;
var schule = SucheSchule(customer);
lResult.CustomerName = customer.Person.FirstName + " " + customer.Person.LastName;
if (schule != null)
{
lResult.Schule = MapperFactory.CompactOrganisationDC_Organisation.MapToNewDC(schule);
if (customer.Person.Address != null)
{
lResult.CustomerStreet = customer.Person.Address.Street;
lResult.CustomerPostalCode = customer.Person.Address.PostalCode;
lResult.CustomerCity = customer.Person.Address.Town;
}
var schule = SucheSchule(customer);
if (schule != null)
{
lResult.Schule = MapperFactory.CompactOrganisationDC_Organisation.MapToNewDC(schule);
}
}
if (employee == null && employeeoid > 0)
@@ -643,22 +728,22 @@ namespace BeWo.Report.ReportObjects
return lResult;
}
private static List<SbdServiceDetail> ErstelleStundenplanEintraege(Customer customer, DateTime start, DateTime ende)
private static List<SbdServiceDetail> ErstelleStundenplanEintraege(Customer customer, long empOid, DateTime start, DateTime ende)
{
var stundenplan = GetStundenplan(customer, start, ende);
var vs = PluginLoader.FindClass<VacationService>();
List<SbdServiceDetail> details = new List<SbdServiceDetail>();
while (start <= ende)
{
var stundenplan = GetStundenplan(customer, start, start);
SbdServiceDetail detail = CreateDefaultDetail(vs, start);
details.Add(detail);
if (!detail.IstSamstag && !detail.IstSonntag && !detail.IstFerien && !detail.IstFeiertag)
{
SetzeStundenplanEintraege(stundenplan, detail);
SetzeStundenplanEintraege(stundenplan, detail, empOid);
}
start = start.AddDays(1);
@@ -685,6 +770,10 @@ namespace BeWo.Report.ReportObjects
private static Arbeitszeit GetStundenplan(Customer customer, DateTime start, DateTime ende)
{
if (customer == null)
{
return null;
}
var stundenplan = SucheStundenplan(customer.Arbeitszeiten, start, ende);
@@ -719,7 +808,7 @@ namespace BeWo.Report.ReportObjects
return null;
}
private static void SetzeStundenplanEintraege(Arbeitszeit arbeitszeit, SbdServiceDetail detail)
private static void SetzeStundenplanEintraege(Arbeitszeit arbeitszeit, SbdServiceDetail detail, long empOid)
{
if (arbeitszeit != null && arbeitszeit.ArbeitszeitEintraege != null && arbeitszeit.ArbeitszeitEintraege.Count > 0)
{
@@ -728,33 +817,40 @@ namespace BeWo.Report.ReportObjects
var day = detail.StartDate.DayOfWeek;
foreach (var ae in arbeitszeit.ArbeitszeitEintraege)
{
if (SindAmGleichenWochentag(day, ae.Tag))
if (ae.Employee == null || empOid == 0 || empOid == ae.Employee.Oid.Value)
{
if (String.IsNullOrWhiteSpace(detail.StundenplanUhrzeiten1))
if (SindAmGleichenWochentag(day, ae.Tag))
{
detail.StundenplanUhrzeiten1 = String.Format("{0}-{1}", ae.UhrzeitVon, ae.UhrzeitBis);
}
else if (String.IsNullOrWhiteSpace(detail.StundenplanUhrzeiten2))
{
detail.StundenplanUhrzeiten2 = String.Format("{0}-{1}", ae.UhrzeitVon, ae.UhrzeitBis);
}
else
{
detail.StundenplanUhrzeiten2 +=
String.Format(", {0}-{1}", ae.UhrzeitVon, ae.UhrzeitBis);
}
if (String.IsNullOrWhiteSpace(detail.StundenplanUhrzeiten1))
{
detail.StundenplanUhrzeiten1 = CreateTimeRangeString(ae.UhrzeitVon, ae.UhrzeitBis);
}
else if (String.IsNullOrWhiteSpace(detail.StundenplanUhrzeiten2))
{
detail.StundenplanUhrzeiten2 = CreateTimeRangeString(ae.UhrzeitVon, ae.UhrzeitBis);
}
else
{
detail.StundenplanUhrzeiten2 += CreateTimeRangeString(ae.UhrzeitVon, ae.UhrzeitBis);
}
if (ae.Employee != null)
{
}
}
}
}
}
}
private static string CreateTimeRangeString(string uhrzeitVon, string uhrzeitBis)
{
var dtStart = SchulbegleitenderDienstService.GetDateTime(uhrzeitVon, DateTime.Now);
var dtEnd = SchulbegleitenderDienstService.GetDateTime(uhrzeitBis, DateTime.Now);
return String.Format("{0:HH:mm}-{1:HH:mm}", dtStart, dtEnd);
}
private static bool SindAmGleichenWochentag(DayOfWeek day, AppointmentDayOfWeek aeTag)
{
if (day == DayOfWeek.Monday && aeTag == AppointmentDayOfWeek.Montag)

View File

@@ -74,6 +74,8 @@ namespace BeWo.Report.ReportObjects
public DateTime? CustomerBirthday { get; set; }
public string CustomerName { get; set; }
public string CustomerFirstName { get; set; }
public string CustomerLastName { get; set; }
@@ -133,7 +135,9 @@ namespace BeWo.Report.ReportObjects
public DateTime? TerminationDate { get; set; }
public String TerminationReason { get; set; }
public bool HasGroupRecords { get; set; }
public List<SettlementInvoiceItemRO> InvoiceItems { get; set; }
public class SettlementInvoiceItemRO
@@ -191,6 +195,7 @@ namespace BeWo.Report.ReportObjects
lResult.Salutation1 = lCustomer.Person.Sex == Sex.Male ? "Herr" : "Frau";
lResult.Salutation2 = lCustomer.Person.Sex == Sex.Male ? "Herrn" : "Frau";
lResult.HasGroupRecords = pDC.HasGroupRecords;
lResult.Eigenbeteiligung = pDC.EquityContribution;
if (pDC.ApprovedFLSWeekly != null)
@@ -255,6 +260,8 @@ namespace BeWo.Report.ReportObjects
lResult.CustomerFirstName = lCustomer.Person.FirstName;
lResult.CustomerLastName = lCustomer.Person.LastName;
lResult.CustomerName = String.Format("{0} {1}", lResult.CustomerFirstName, lResult.CustomerLastName);
lResult.CustomerBirthday = lCustomer.Person.DateOfBirth;
lResult.CustomerReferenceNumber = pDC.CustomerReferenceNumber;
lResult.CustomerReferenceNumberAndDate = "Az.: " + pDC.CustomerReferenceNumber;

View File

@@ -259,7 +259,9 @@ namespace BeWo.Report.ReportObjects
public string WeeksWithHourlyRate3String { get; set; }
public decimal WeeksWithNewHourlyRate { get; set; }
public bool HasGroupRecords { get; set; }
public decimal WeeksWithNewHourlyRate { get; set; }
public string WeeksWithNewHourlyRateString { get; set; }
@@ -486,6 +488,8 @@ namespace BeWo.Report.ReportObjects
lResult.WeeksWithOldHourlyRateString = string.Format("{0:0.00}", pDC.WeeksWithOldHourlyRate);
lResult.WeeksWithHourlyRate3String = string.Format("{0:0.00}", pDC.WeeksWithHourlyRate3);
lResult.HasGroupRecords = pDC.HasGroupRecords;
if (lResult.DifferentHourlyRateCount == 1)
{
if (pDC.ApprovedFLS != null)
@@ -783,6 +787,8 @@ namespace BeWo.Report.ReportObjects
return lResult;
}
}
}

View File

@@ -42,6 +42,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Statistics\CustomServiceRecordStatisticFactory.cs" />
<Compile Include="Validation\ServiceRecordValidator.cs" />
</ItemGroup>
<ItemGroup>
@@ -54,5 +55,6 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@@ -0,0 +1,128 @@
using System;
using System.Collections.Generic;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Plugins;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using BS.Shared.Services;
namespace AbwWeeger.Statistics
{
public class CustomServiceRecordStatisticFactory : ServiceRecordStatisticFactory
{
public override ServiceRecordStatisticsInfoDC GetServiceRecordStatisticInfo(long costBearer2SupportConceptOid, DateTime statisticsDate)
{
var stats = base.CreateSupportConceptStatisticsImpl(costBearer2SupportConceptOid, statisticsDate);
var dc = new ServiceRecordStatisticsInfoDC();
dc.Header = new string[4];
dc.Header[0] = "Bewilligungszeitraum:";
dc.Header[1] = "Geleistet diese Woche/Gesamt:";
dc.Header[2] = "Bewilligt pro Woche/Gesamt:";
dc.Header[3] = "Über-/Untererbringung:";
dc.ForegroundColor = new string[4];
dc.ForegroundColor[0] = "#FF2B508B";
dc.ForegroundColor[1] = "#FF2B508B";
dc.ForegroundColor[2] = "#FF2B508B";
dc.ForegroundColor[3] = "#FF2B508B";
dc.PeriodStatisticInfos = new List<ServiceRecordPeriodStatisticsInfoDC>();
if (stats != null)
{
if (stats.PeriodStatistics.Count > 1 && !TimeSpanIsEqual(stats))
dc.PeriodStatisticInfos.Add(CreateTotalStatistics(stats));
foreach (var pdc in stats.PeriodStatistics)
{
bool showOutOfPeriod = stats.PeriodStatistics.Count == 1;
dc.PeriodStatisticInfos.Add(CreateServiceRecordPeriodStatisticsInfo(stats, pdc, showOutOfPeriod));
}
}
return dc;
}
public ServiceRecordPeriodStatisticsInfoDC CreateTotalStatistics(SupportConceptStatisticsDC stats)
{
var dc = CreateDefaultServiceRecordPeriodStatisticsInfo(4);
dc.LeftValues[0] = "Gesamt";
dc.LeftValues[1] = String.Format("{0:0.00}", stats.MinutesProvidedThisWeek / 60);
dc.RightValues[1] = String.Format("{0:0.00}", stats.MinutesProvidedTotalRounded / 60);
dc.LeftValues[2] = String.Format("{0:0.00}", stats.MinutesApprovedPerWeek / 60);
dc.RightValues[2] = String.Format("{0:0.00}", stats.MinutesApprovedTotal / 60);
dc.LeftValues[3] = String.Format("{0:0.00}", (stats.MinutesProvidedTotal - stats.ApprovedMinutesTillNow) / 60);
dc.RightValues[3] = ""; //String.Format("{0:0.00}", (stats.MinutesApprovedTotal - stats.MinutesProvidedTotalRounded) / 60);
if (Math.Abs(stats.MinutesProvidedTotal - stats.ApprovedMinutesTillNow ?? 0) > 8)
{
dc.LeftValueColors[3] = "#FFFF0000";
}
return dc;
}
public ServiceRecordPeriodStatisticsInfoDC CreateServiceRecordPeriodStatisticsInfo(SupportConceptStatisticsDC stats, SupportConceptPeriodStatisticsDC periodStats, bool showOutOfPeriod)
{
var dc = CreateDefaultServiceRecordPeriodStatisticsInfo(4);
if (periodStats.SupportConceptApprovalPeriod != null)
{
if (periodStats.SupportConceptApprovalPeriod.ServiceCategory != null)
{
if (periodStats.SupportConceptApprovalPeriod.StartDate.HasValue && periodStats.SupportConceptApprovalPeriod.EndDate.HasValue &&
periodStats.SupportConceptApprovalPeriod.StartDate.Value.Date == stats.StatisticsStartDate.Date &&
periodStats.SupportConceptApprovalPeriod.EndDate.Value.Date == stats.StatisticsEndDate.Date)
{
dc.LeftValues[0] = periodStats.SupportConceptApprovalPeriod.ServiceCategory.Name;
}
else
{
dc.LeftValues[0] = String.Format("{0}: {1:dd.MM.yy} - {2:dd.MM.yy}",
periodStats.SupportConceptApprovalPeriod.ServiceCategory.Name,
periodStats.SupportConceptApprovalPeriod.StartDate,
periodStats.SupportConceptApprovalPeriod.EndDate);
}
}
else
{
dc.LeftValues[0] = String.Format("{0:dd.MM.yy} - {1:dd.MM.yy}",
periodStats.SupportConceptApprovalPeriod.StartDate,
periodStats.SupportConceptApprovalPeriod.EndDate);
}
}
dc.LeftValues[1] = String.Format("{0:0.00}", periodStats.MinutesProvidedThisWeek / 60);
dc.RightValues[1] = String.Format("{0:0.00}", periodStats.MinutesProvidedTotalRounded / 60);
dc.LeftValues[2] = String.Format("{0:0.00}", periodStats.MinutesApprovedPerWeek / 60);
dc.RightValues[2] = String.Format("{0:0.00}", periodStats.MinutesApprovedTotal / 60);
dc.LeftValues[3] = String.Format("{0:0.00}", (periodStats.MinutesProvidedTotal - periodStats.ApprovedMinutesTillNow) / 60);
dc.RightValues[3] = " "; //String.Format("{0:0.00}", (periodStats.MinutesApprovedTotal - periodStats.MinutesProvidedTotalRounded) / 60);
if (Math.Abs((periodStats.MinutesProvidedTotal - (periodStats.ApprovedMinutesTillNow ?? 0)) / 60) > 8)
{
dc.LeftValueColors[3] = "#FFFF0000";
}
return dc;
}
public override SupportConceptStatisticsDC CreateSupportConceptStatistics(long costBearer2SupportConceptOid, DateTime statisticsDate)
{
return null;
}
}
}

View File

@@ -83,12 +83,13 @@ namespace AdikKleve
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLine1 = new DevExpress.XtraReports.UI.XRLine();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
@@ -652,6 +653,7 @@ namespace AdikKleve
// topMarginBand1
//
this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel3,
this.xrPictureBox1,
this.xrLabel14});
this.topMarginBand1.HeightF = 230F;
@@ -682,36 +684,14 @@ namespace AdikKleve
// bottomMarginBand1
//
this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel13,
this.xrLabel9,
this.xrLabel7,
this.xrLine1});
this.bottomMarginBand1.Font = new System.Drawing.Font("Arial", 10F);
this.bottomMarginBand1.HeightF = 100F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
this.bottomMarginBand1.StylePriority.UseFont = false;
//
// xrLabel9
//
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(397.0001F, 20.00001F);
this.xrLabel9.Multiline = true;
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(299.9999F, 77.49999F);
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.StylePriority.UseTextAlignment = false;
this.xrLabel9.Text = "Volksbank Kleverland\r\nIBAN: DE 13 3246 0422 0024 7070 16\r\nBIC: GENODED 1KLL";
this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrLabel7
//
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 20.00001F);
this.xrLabel7.Multiline = true;
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(351.375F, 77.49999F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "Hoffmannallee 105\r\n47533 Kleve\r\nFinanzamt Kleve\r\nSteuer-Nr. 116/5800/2114\r\n";
//
// xrLine1
//
this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
@@ -740,6 +720,41 @@ namespace AdikKleve
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO);
//
// xrLabel13
//
this.xrLabel13.Font = new System.Drawing.Font("Arial", 8F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 19.99995F);
this.xrLabel13.Multiline = true;
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(517.6666F, 77.49999F);
this.xrLabel13.StylePriority.UseFont = false;
this.xrLabel13.Text = resources.GetString("xrLabel13.Text");
//
// xrLabel9
//
this.xrLabel9.Font = new System.Drawing.Font("Arial", 8F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(517.6666F, 19.99995F);
this.xrLabel9.Multiline = true;
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(208.3333F, 77.49999F);
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.StylePriority.UseTextAlignment = false;
this.xrLabel9.Text = "Volksbank Kleverland\r\nIBAN: DE 13 3246 0422 0024 7070 16\r\nBIC: GENODED 1KLL";
this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrLabel3
//
this.xrLabel3.Font = new System.Drawing.Font("Arial", 8F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 201.4167F);
this.xrLabel3.Multiline = true;
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(351.375F, 28.58333F);
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "ADiK-Kleve GmbH & Co. KG *Hoffmannallee 105* 47533 Kleve";
//
// InvoiceCustomerReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -824,8 +839,9 @@ namespace AdikKleve
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
private DevExpress.XtraReports.UI.XRLine xrLine1;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel lblFax;
private DevExpress.XtraReports.UI.XRLabel xrLabel13;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
}
}

View File

@@ -355,6 +355,14 @@
v3Qa2IytnUdXblSj6FXMgBACfoDJP6VVj+tUoGTh2sWqGYVRByKkRz41qJENqWdH1DKckETIgRCCGkH8
gP/YI5uSaBTQmHEfra/Ilk0qo2uHK7dmk7gmhVw1/ja1/qXwwa7mr02XHWxp7NBlB1eBHbrs4CqwQ5cd
XAV26LKDq8AOXXawaXi9/x+zG5surIRm9AAAAABJRU5ErkJggg==
</value>
</data>
<data name="xrLabel13.Text" xml:space="preserve">
<value>ADiK-Kleve GmbH &amp; Co. KG Hoffmannallee 105 | 47533 Kleve
Kontakt: Tel 02821-7364560 | Fax 02821-9743213 | info@adik-kleve.de |www.adik-kleve.de
Geschäftsführung: Matthias Braß | Marcel Hohenfeld | Hannes Scholtyschik
Sitz der Gesellschaft: Amtsgericht Kleve | HRA 4854
Steuernummer: 116/5750/1549
</value>
</data>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

View File

@@ -37,9 +37,7 @@ namespace AdikKleve
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLine1 = new DevExpress.XtraReports.UI.XRLine();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.lblFax = new DevExpress.XtraReports.UI.XRLabel();
this.lblAddress = new DevExpress.XtraReports.UI.XRLabel();
@@ -97,6 +95,9 @@ namespace AdikKleve
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
@@ -127,6 +128,7 @@ namespace AdikKleve
// topMarginBand1
//
this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel10,
this.xrLabel6,
this.xrPictureBox1});
this.topMarginBand1.HeightF = 230F;
@@ -157,42 +159,18 @@ namespace AdikKleve
// bottomMarginBand1
//
this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel10,
this.xrLine1,
this.xrLabel11});
this.xrLabel13,
this.xrLabel7,
this.xrLine1});
this.bottomMarginBand1.HeightF = 100F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// xrLabel10
//
this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(30F, 20F);
this.xrLabel10.Multiline = true;
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(351.375F, 77.49999F);
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.Text = "Hoffmannallee 105\r\n47533 Kleve\r\nFinanzamt Kleve\r\nSteuer-Nr. 116/5800/2114\r\n";
//
// xrLine1
//
this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLine1.Name = "xrLine1";
this.xrLine1.SizeF = new System.Drawing.SizeF(726F, 20F);
//
// xrLabel11
//
this.xrLabel11.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(397F, 20F);
this.xrLabel11.Multiline = true;
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(300F, 77.5F);
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.StylePriority.UseTextAlignment = false;
this.xrLabel11.Text = "Volksbank Kleverland\r\nIBAN: DE 13 3246 0422 0024 7070 16\r\nBIC: GENODED 1KLL";
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// Page1
//
this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -866,6 +844,41 @@ namespace AdikKleve
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// xrLabel13
//
this.xrLabel13.Font = new System.Drawing.Font("Arial", 8F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 19.99995F);
this.xrLabel13.Multiline = true;
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(517.6666F, 77.49999F);
this.xrLabel13.StylePriority.UseFont = false;
this.xrLabel13.Text = resources.GetString("xrLabel13.Text");
//
// xrLabel7
//
this.xrLabel7.Font = new System.Drawing.Font("Arial", 8F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(517.6666F, 19.99995F);
this.xrLabel7.Multiline = true;
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(208.3333F, 77.49999F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.StylePriority.UseTextAlignment = false;
this.xrLabel7.Text = "Volksbank Kleverland\r\nIBAN: DE 13 3246 0422 0024 7070 16\r\nBIC: GENODED 1KLL";
this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrLabel10
//
this.xrLabel10.Font = new System.Drawing.Font("Arial", 8F);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 201.4167F);
this.xrLabel10.Multiline = true;
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(351.375F, 28.58333F);
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.Text = "ADiK-Kleve GmbH & Co. KG *Hoffmannallee 105* 47533 Kleve";
//
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -958,9 +971,10 @@ namespace AdikKleve
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.XRLine xrLine1;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRLabel lblFax;
private DevExpress.XtraReports.UI.XRLabel xrLabel13;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
}
}

View File

@@ -355,6 +355,14 @@
v3Qa2IytnUdXblSj6FXMgBACfoDJP6VVj+tUoGTh2sWqGYVRByKkRz41qJENqWdH1DKckETIgRCCGkH8
gP/YI5uSaBTQmHEfra/Ilk0qo2uHK7dmk7gmhVw1/ja1/qXwwa7mr02XHWxp7NBlB1eBHbrs4CqwQ5cd
XAV26LKDq8AOXXawaXi9/x+zG5surIRm9AAAAABJRU5ErkJggg==
</value>
</data>
<data name="xrLabel13.Text" xml:space="preserve">
<value>ADiK-Kleve GmbH &amp; Co. KG Hoffmannallee 105 | 47533 Kleve
Kontakt: Tel 02821-7364560 | Fax 02821-9743213 | info@adik-kleve.de |www.adik-kleve.de
Geschäftsführung: Matthias Braß | Marcel Hohenfeld | Hannes Scholtyschik
Sitz der Gesellschaft: Amtsgericht Kleve | HRA 4854
Steuernummer: 116/5750/1549
</value>
</data>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

View File

@@ -403,7 +403,7 @@ namespace AdikKleve
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(220F, 89.99999F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(324.8749F, 18F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(407.6874F, 18F);
this.xrLabel7.StylePriority.UseBorders = false;
this.xrLabel7.StylePriority.UseFont = false;
//
@@ -426,10 +426,10 @@ namespace AdikKleve
this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(220F, 60.00001F);
this.xrLabel28.Name = "xrLabel28";
this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel28.SizeF = new System.Drawing.SizeF(324.8749F, 18F);
this.xrLabel28.SizeF = new System.Drawing.SizeF(407.6874F, 18F);
this.xrLabel28.StylePriority.UseBorders = false;
this.xrLabel28.StylePriority.UseFont = false;
this.xrLabel28.Text = "ADiK-Kleve, Hoffmannallee 105, 47533 Kleve";
this.xrLabel28.Text = "ADiK-Kleve GmbH & Co. KG, Hoffmannallee 105, 47533 Kleve";
//
// xrLabel29
//
@@ -440,7 +440,7 @@ namespace AdikKleve
this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(220F, 120F);
this.xrLabel29.Name = "xrLabel29";
this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel29.SizeF = new System.Drawing.SizeF(324.8749F, 18F);
this.xrLabel29.SizeF = new System.Drawing.SizeF(407.6874F, 18F);
this.xrLabel29.StylePriority.UseBorders = false;
this.xrLabel29.StylePriority.UseFont = false;
//
@@ -453,7 +453,7 @@ namespace AdikKleve
this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(220F, 150F);
this.xrLabel30.Name = "xrLabel30";
this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel30.SizeF = new System.Drawing.SizeF(324.8749F, 18F);
this.xrLabel30.SizeF = new System.Drawing.SizeF(407.6874F, 18F);
this.xrLabel30.StylePriority.UseBorders = false;
this.xrLabel30.StylePriority.UseFont = false;
//
@@ -466,7 +466,7 @@ namespace AdikKleve
this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(220F, 180F);
this.xrLabel31.Name = "xrLabel31";
this.xrLabel31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel31.SizeF = new System.Drawing.SizeF(324.8749F, 18F);
this.xrLabel31.SizeF = new System.Drawing.SizeF(407.6874F, 18F);
this.xrLabel31.StylePriority.UseBorders = false;
this.xrLabel31.StylePriority.UseFont = false;
this.xrLabel31.Text = "xrLabel26";
@@ -601,13 +601,13 @@ namespace AdikKleve
// xrLabel16
//
this.xrLabel16.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Italic);
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(250.9583F, 12.5F);
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(177.7899F, 12.5F);
this.xrLabel16.Multiline = true;
this.xrLabel16.Name = "xrLabel16";
this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel16.SizeF = new System.Drawing.SizeF(210.9581F, 54.45833F);
this.xrLabel16.SizeF = new System.Drawing.SizeF(307.6268F, 54.45833F);
this.xrLabel16.StylePriority.UseFont = false;
this.xrLabel16.Text = "Quittierungsbeleg ADiK-Kleve";
this.xrLabel16.Text = "Quittierungsbeleg ADiK-Kleve GmbH & Co. KG";
//
// xrLabel15
//
@@ -616,7 +616,7 @@ namespace AdikKleve
this.xrLabel15.Multiline = true;
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel15.SizeF = new System.Drawing.SizeF(157.7899F, 54.45833F);
this.xrLabel15.SizeF = new System.Drawing.SizeF(147.3733F, 54.45833F);
this.xrLabel15.StylePriority.UseFont = false;
this.xrLabel15.Text = "Hoffmannallee 105\r\n47533 Kleve";
//

View File

@@ -121,6 +121,7 @@ namespace AdikKleve.Alt
this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -686,6 +687,7 @@ namespace AdikKleve.Alt
// topMarginBand1
//
this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel14,
this.xrPictureBox1,
this.xrLabel7});
this.topMarginBand1.HeightF = 230F;
@@ -724,12 +726,12 @@ namespace AdikKleve.Alt
//
// xrLabel9
//
this.xrLabel9.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(397.0001F, 20.00008F);
this.xrLabel9.Font = new System.Drawing.Font("Arial", 8F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(517.6666F, 19.99995F);
this.xrLabel9.Multiline = true;
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(300F, 77.5F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(208.3333F, 77.49999F);
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.StylePriority.UseTextAlignment = false;
this.xrLabel9.Text = "Volksbank Kleverland\r\nIBAN: DE 13 3246 0422 0024 7070 16\r\nBIC: GENODED 1KLL";
@@ -737,14 +739,14 @@ namespace AdikKleve.Alt
//
// xrLabel13
//
this.xrLabel13.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 20.00008F);
this.xrLabel13.Font = new System.Drawing.Font("Arial", 8F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 19.99995F);
this.xrLabel13.Multiline = true;
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(351.375F, 77.49999F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(517.6666F, 77.49999F);
this.xrLabel13.StylePriority.UseFont = false;
this.xrLabel13.Text = "Hoffmannallee 105\r\n47533 Kleve\r\nFinanzamt Kleve\r\nSteuer-Nr. 116/5800/2114\r\n";
this.xrLabel13.Text = resources.GetString("xrLabel13.Text");
//
// xrLine1
//
@@ -1074,6 +1076,17 @@ namespace AdikKleve.Alt
this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell58.Weight = 0.21685899000901443D;
//
// xrLabel14
//
this.xrLabel14.Font = new System.Drawing.Font("Arial", 8F);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 201.4167F);
this.xrLabel14.Multiline = true;
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.SizeF = new System.Drawing.SizeF(351.375F, 28.58333F);
this.xrLabel14.StylePriority.UseFont = false;
this.xrLabel14.Text = "ADiK-Kleve GmbH & Co. KG *Hoffmannallee 105* 47533 Kleve";
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1196,5 +1209,6 @@ namespace AdikKleve.Alt
private DevExpress.XtraReports.UI.XRLabel xrLabel13;
private DevExpress.XtraReports.UI.XRLine xrLine1;
private DevExpress.XtraReports.UI.XRLabel lblFax;
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
}
}

View File

@@ -359,6 +359,14 @@
v3Qa2IytnUdXblSj6FXMgBACfoDJP6VVj+tUoGTh2sWqGYVRByKkRz41qJENqWdH1DKckETIgRCCGkH8
gP/YI5uSaBTQmHEfra/Ilk0qo2uHK7dmk7gmhVw1/ja1/qXwwa7mr02XHWxp7NBlB1eBHbrs4CqwQ5cd
XAV26LKDq8AOXXawaXi9/x+zG5surIRm9AAAAABJRU5ErkJggg==
</value>
</data>
<data name="xrLabel13.Text" xml:space="preserve">
<value>ADiK-Kleve GmbH &amp; Co. KG Hoffmannallee 105 | 47533 Kleve
Kontakt: Tel 02821-7364560 | Fax 02821-9743213 | info@adik-kleve.de |www.adik-kleve.de
Geschäftsführung: Matthias Braß | Marcel Hohenfeld | Hannes Scholtyschik
Sitz der Gesellschaft: Amtsgericht Kleve | HRA 4854
Steuernummer: 116/5750/1549
</value>
</data>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

View File

@@ -82,8 +82,6 @@ namespace AdikKleve
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLine1 = new DevExpress.XtraReports.UI.XRLine();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.lblFax = new DevExpress.XtraReports.UI.XRLabel();
@@ -115,6 +113,9 @@ namespace AdikKleve
this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -585,6 +586,7 @@ namespace AdikKleve
// topMarginBand1
//
this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel14,
this.xrPictureBox1,
this.xrLabel7});
this.topMarginBand1.HeightF = 230F;
@@ -615,36 +617,12 @@ namespace AdikKleve
// bottomMarginBand1
//
this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel9,
this.xrLabel13,
this.xrLabel9,
this.xrLine1});
this.bottomMarginBand1.HeightF = 100F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// xrLabel9
//
this.xrLabel9.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(397.0001F, 20.00008F);
this.xrLabel9.Multiline = true;
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(300F, 77.5F);
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.StylePriority.UseTextAlignment = false;
this.xrLabel9.Text = "Volksbank Kleverland\r\nIBAN: DE 13 3246 0422 0024 7070 16\r\nBIC: GENODED 1KLL";
this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrLabel13
//
this.xrLabel13.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 20.00008F);
this.xrLabel13.Multiline = true;
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(351.375F, 77.49999F);
this.xrLabel13.StylePriority.UseFont = false;
this.xrLabel13.Text = "Hoffmannallee 105\r\n47533 Kleve\r\nFinanzamt Kleve\r\nSteuer-Nr. 116/5800/2114\r\n";
//
// xrLine1
//
this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
@@ -979,6 +957,41 @@ namespace AdikKleve
this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell60.Weight = 0.21685899000901443D;
//
// xrLabel13
//
this.xrLabel13.Font = new System.Drawing.Font("Arial", 8F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 19.99995F);
this.xrLabel13.Multiline = true;
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(517.6666F, 77.49999F);
this.xrLabel13.StylePriority.UseFont = false;
this.xrLabel13.Text = resources.GetString("xrLabel13.Text");
//
// xrLabel9
//
this.xrLabel9.Font = new System.Drawing.Font("Arial", 8F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(517.6666F, 19.99995F);
this.xrLabel9.Multiline = true;
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(208.3333F, 77.49999F);
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.StylePriority.UseTextAlignment = false;
this.xrLabel9.Text = "Volksbank Kleverland\r\nIBAN: DE 13 3246 0422 0024 7070 16\r\nBIC: GENODED 1KLL";
this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrLabel14
//
this.xrLabel14.Font = new System.Drawing.Font("Arial", 8F);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 201.4167F);
this.xrLabel14.Multiline = true;
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.SizeF = new System.Drawing.SizeF(351.375F, 28.58333F);
this.xrLabel14.StylePriority.UseFont = false;
this.xrLabel14.Text = "ADiK-Kleve GmbH & Co. KG *Hoffmannallee 105* 47533 Kleve";
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1092,9 +1105,10 @@ namespace AdikKleve
private DevExpress.XtraReports.UI.XRTableCell xrTableCell60;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel13;
private DevExpress.XtraReports.UI.XRLine xrLine1;
private DevExpress.XtraReports.UI.XRLabel lblFax;
private DevExpress.XtraReports.UI.XRLabel xrLabel13;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
}
}

View File

@@ -359,6 +359,14 @@
v3Qa2IytnUdXblSj6FXMgBACfoDJP6VVj+tUoGTh2sWqGYVRByKkRz41qJENqWdH1DKckETIgRCCGkH8
gP/YI5uSaBTQmHEfra/Ilk0qo2uHK7dmk7gmhVw1/ja1/qXwwa7mr02XHWxp7NBlB1eBHbrs4CqwQ5cd
XAV26LKDq8AOXXawaXi9/x+zG5surIRm9AAAAABJRU5ErkJggg==
</value>
</data>
<data name="xrLabel13.Text" xml:space="preserve">
<value>ADiK-Kleve GmbH &amp; Co. KG Hoffmannallee 105 | 47533 Kleve
Kontakt: Tel 02821-7364560 | Fax 02821-9743213 | info@adik-kleve.de |www.adik-kleve.de
Geschäftsführung: Matthias Braß | Marcel Hohenfeld | Hannes Scholtyschik
Sitz der Gesellschaft: Amtsgericht Kleve | HRA 4854
Steuernummer: 116/5750/1549
</value>
</data>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

View File

@@ -61,6 +61,12 @@
<Compile Include="SettlementReport.Designer.cs">
<DependentUpon>SettlementReport.cs</DependentUpon>
</Compile>
<Compile Include="SupportConceptReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="SupportConceptReport.Designer.cs">
<DependentUpon>SupportConceptReport.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\licenses.licx" />
@@ -72,6 +78,10 @@
<DependentUpon>SettlementReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="SupportConceptReport.resx">
<DependentUpon>SupportConceptReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Data\Data.csproj">

View File

@@ -0,0 +1,959 @@
using BeWo.Report.ReportObjects;
namespace AidsHilfeDuisburg
{
partial class Hilfeplanuebersicht
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
this.ruleNotApprovedAndExpiringNext4Months = new DevExpress.XtraReports.UI.FormattingRule();
this.ruleNotApprovedAndExpiringNext8Months = new DevExpress.XtraReports.UI.FormattingRule();
this.PageHeader = new DevExpress.XtraReports.UI.PageHeaderBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.PageFooter = new DevExpress.XtraReports.UI.PageFooterBand();
this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
this.approvedText = new DevExpress.XtraReports.UI.CalculatedField();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell53 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell54 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
//
this.Detail.HeightF = 0F;
this.Detail.Name = "Detail";
this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPageInfo1,
this.xrLabel1});
this.ReportHeader.HeightF = 75F;
this.ReportHeader.Name = "ReportHeader";
//
// xrPageInfo1
//
this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F);
this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 32.99999F);
this.xrPageInfo1.Name = "xrPageInfo1";
this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
this.xrPageInfo1.SizeF = new System.Drawing.SizeF(1109F, 23F);
this.xrPageInfo1.StylePriority.UseFont = false;
//
// xrLabel1
//
this.xrLabel1.Font = new System.Drawing.Font("Arial", 14F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 7.999992F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.SizeF = new System.Drawing.SizeF(1109F, 25F);
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.Text = "Hilfeplanübersicht";
//
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail1});
this.DetailReport.DataMember = "SupportConceptDetailList";
this.DetailReport.DataSource = this.bindingSource1;
this.DetailReport.Level = 0;
this.DetailReport.Name = "DetailReport";
//
// Detail1
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable2});
this.Detail1.HeightF = 20F;
this.Detail1.Name = "Detail1";
//
// xrTable2
//
this.xrTable2.BackColor = System.Drawing.Color.Transparent;
this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable2.Font = new System.Drawing.Font("Arial", 7F);
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable2.Name = "xrTable2";
this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 0, 100F);
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
this.xrTable2.SizeF = new System.Drawing.SizeF(1119F, 20F);
this.xrTable2.StylePriority.UseBackColor = false;
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.StylePriority.UseFont = false;
this.xrTable2.StylePriority.UsePadding = false;
//
// xrTableRow2
//
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell18,
this.xrTableCell19,
this.xrTableCell36,
this.xrTableCell20,
this.xrTableCell21,
this.xrTableCell22,
this.xrTableCell23,
this.xrTableCell24,
this.xrTableCell25,
this.xrTableCell26,
this.xrTableCell27,
this.xrTableCell28,
this.xrTableCell29,
this.xrTableCell30,
this.xrTableCell31,
this.xrTableCell32,
this.xrTableCell33,
this.xrTableCell34});
this.xrTableRow2.FormattingRules.Add(this.ruleNotApprovedAndExpiringNext4Months);
this.xrTableRow2.FormattingRules.Add(this.ruleNotApprovedAndExpiringNext8Months);
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Weight = 1D;
//
// xrTableCell18
//
this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.CustomerLastName")});
this.xrTableCell18.Font = new System.Drawing.Font("Arial", 7F, System.Drawing.FontStyle.Bold);
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.StylePriority.UseBorders = false;
this.xrTableCell18.StylePriority.UseFont = false;
this.xrTableCell18.Text = "Name";
this.xrTableCell18.Weight = 0.1947700715855491D;
this.xrTableCell18.WordWrap = false;
//
// xrTableCell19
//
this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.CustomerFirstName")});
this.xrTableCell19.Font = new System.Drawing.Font("Arial", 7F, System.Drawing.FontStyle.Bold);
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.StylePriority.UseFont = false;
this.xrTableCell19.Text = "Vorname";
this.xrTableCell19.Weight = 0.19477006735273841D;
this.xrTableCell19.WordWrap = false;
//
// xrTableCell36
//
this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.Costbearer")});
this.xrTableCell36.Name = "xrTableCell36";
this.xrTableCell36.Text = "xrTableCell36";
this.xrTableCell36.Weight = 0.17583408899385655D;
//
// xrTableCell20
//
this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.StartDate", "{0:dd/MM/yyyy}")});
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.StylePriority.UseTextAlignment = false;
this.xrTableCell20.Text = "xrTableCell20";
this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell20.Weight = 0.16230839191659136D;
//
// xrTableCell21
//
this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.EndDate", "{0:dd/MM/yyyy}")});
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.StylePriority.UseTextAlignment = false;
this.xrTableCell21.Text = "xrTableCell21";
this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell21.Weight = 0.16230838391519292D;
//
// xrTableCell22
//
this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSTotal", "{0:0.00}")});
this.xrTableCell22.Name = "xrTableCell22";
this.xrTableCell22.StylePriority.UseTextAlignment = false;
this.xrTableCell22.Text = "xrTableCell22";
this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell22.Weight = 0.13525698632089914D;
//
// xrTableCell23
//
this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSTotalRecordedBillable", "{0:0.00}")});
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.StylePriority.UseTextAlignment = false;
this.xrTableCell23.Text = "xrTableCell23";
this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell23.Weight = 0.21641118213734861D;
//
// xrTableCell24
//
this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSRemaining", "{0:0.00}")});
this.xrTableCell24.Name = "xrTableCell24";
this.xrTableCell24.StylePriority.UseTextAlignment = false;
this.xrTableCell24.Text = "xrTableCell24";
this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell24.Weight = 0.135256986233857D;
//
// xrTableCell25
//
this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSOpenPerWeek", "{0:0.00}")});
this.xrTableCell25.Name = "xrTableCell25";
this.xrTableCell25.StylePriority.UseTextAlignment = false;
this.xrTableCell25.Text = "xrTableCell25";
this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell25.Weight = 0.15689810126025036D;
//
// xrTableCell26
//
this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.OpenWeeks", "{0:0.00}")});
this.xrTableCell26.Name = "xrTableCell26";
this.xrTableCell26.StylePriority.UseTextAlignment = false;
this.xrTableCell26.Text = "xrTableCell26";
this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell26.Weight = 0.15689811071234514D;
//
// xrTableCell27
//
this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.DurationPercentage", "{0:0}%")});
this.xrTableCell27.Font = new System.Drawing.Font("Arial", 7F, System.Drawing.FontStyle.Bold);
this.xrTableCell27.Name = "xrTableCell27";
this.xrTableCell27.StylePriority.UseFont = false;
this.xrTableCell27.StylePriority.UseTextAlignment = false;
this.xrTableCell27.Text = "xrTableCell27";
this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell27.Weight = 0.089269612164975D;
//
// xrTableCell28
//
this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.TotalWeeks", "{0:0.00}")});
this.xrTableCell28.Name = "xrTableCell28";
this.xrTableCell28.StylePriority.UseTextAlignment = false;
this.xrTableCell28.Text = "xrTableCell28";
this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell28.Weight = 0.1352569855617011D;
//
// xrTableCell29
//
this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.WeeksPassed", "{0:0.00}")});
this.xrTableCell29.Name = "xrTableCell29";
this.xrTableCell29.StylePriority.UseTextAlignment = false;
this.xrTableCell29.Text = "xrTableCell29";
this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell29.Weight = 0.15689810350399458D;
//
// xrTableCell30
//
this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSPerWeekSoll", "{0:0.00}")});
this.xrTableCell30.Name = "xrTableCell30";
this.xrTableCell30.StylePriority.UseTextAlignment = false;
this.xrTableCell30.Text = "xrTableCell30";
this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell30.Weight = 0.17853922903987909D;
//
// xrTableCell31
//
this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSPerWeekIst", "{0:0.00}")});
this.xrTableCell31.Name = "xrTableCell31";
this.xrTableCell31.StylePriority.UseTextAlignment = false;
this.xrTableCell31.Text = "xrTableCell31";
this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell31.Weight = 0.1893597790271834D;
//
// xrTableCell32
//
this.xrTableCell32.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.DiffPerWeekAmount", "{0:c}")});
this.xrTableCell32.Name = "xrTableCell32";
this.xrTableCell32.StylePriority.UseTextAlignment = false;
this.xrTableCell32.Text = "xrTableCell32";
this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell32.Weight = 0.20288547666860882D;
//
// xrTableCell33
//
this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.approvedText")});
this.xrTableCell33.Name = "xrTableCell33";
this.xrTableCell33.Weight = 0.22182145262578162D;
//
// xrTableCell34
//
this.xrTableCell34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.SupportConceptSendDate", "{0:dd.MM.yyyy}")});
this.xrTableCell34.Name = "xrTableCell34";
this.xrTableCell34.StylePriority.UseBorders = false;
this.xrTableCell34.StylePriority.UseTextAlignment = false;
this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell34.Weight = 0.16230838863479286D;
//
// ruleNotApprovedAndExpiringNext4Months
//
this.ruleNotApprovedAndExpiringNext4Months.Condition = "[IsApproved] == False And [OpenMonths] < 4";
this.ruleNotApprovedAndExpiringNext4Months.DataMember = "SupportConceptDetailList";
this.ruleNotApprovedAndExpiringNext4Months.Formatting.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
this.ruleNotApprovedAndExpiringNext4Months.Name = "ruleNotApprovedAndExpiringNext4Months";
//
// ruleNotApprovedAndExpiringNext8Months
//
this.ruleNotApprovedAndExpiringNext8Months.Condition = "[IsApproved] == False And [OpenMonths] < 8 And [OpenMonths] >= 4";
this.ruleNotApprovedAndExpiringNext8Months.DataMember = "SupportConceptDetailList";
this.ruleNotApprovedAndExpiringNext8Months.Formatting.BackColor = System.Drawing.Color.LightBlue;
this.ruleNotApprovedAndExpiringNext8Months.Name = "ruleNotApprovedAndExpiringNext8Months";
//
// PageHeader
//
this.PageHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1});
this.PageHeader.HeightF = 42F;
this.PageHeader.Name = "PageHeader";
this.PageHeader.StylePriority.UseBorderColor = false;
this.PageHeader.StylePriority.UseTextAlignment = false;
this.PageHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
//
// xrTable1
//
this.xrTable1.BackColor = System.Drawing.Color.LightSteelBlue;
this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable1.Font = new System.Drawing.Font("Arial", 7F, System.Drawing.FontStyle.Bold);
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(1119F, 42F);
this.xrTable1.StylePriority.UseBackColor = false;
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.StylePriority.UseTextAlignment = false;
this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
//
// xrTableRow1
//
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell1,
this.xrTableCell2,
this.xrTableCell35,
this.xrTableCell3,
this.xrTableCell4,
this.xrTableCell5,
this.xrTableCell6,
this.xrTableCell7,
this.xrTableCell8,
this.xrTableCell9,
this.xrTableCell10,
this.xrTableCell11,
this.xrTableCell12,
this.xrTableCell13,
this.xrTableCell14,
this.xrTableCell15,
this.xrTableCell16,
this.xrTableCell17});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 1D;
//
// xrTableCell1
//
this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.StylePriority.UseBorders = false;
this.xrTableCell1.Text = "Name";
this.xrTableCell1.Weight = 0.1947700715855491D;
//
// xrTableCell2
//
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Text = "Vorname";
this.xrTableCell2.Weight = 0.19477006735273836D;
//
// xrTableCell35
//
this.xrTableCell35.Name = "xrTableCell35";
this.xrTableCell35.Text = "Kostenträger";
this.xrTableCell35.Weight = 0.17583408383421184D;
//
// xrTableCell3
//
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Text = "Start";
this.xrTableCell3.Weight = 0.1623083867569467D;
//
// xrTableCell4
//
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Text = "Ende";
this.xrTableCell4.Weight = 0.16230838391519292D;
//
// xrTableCell5
//
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Text = "gesamte FLS";
this.xrTableCell5.Weight = 0.13525698632089916D;
//
// xrTableCell6
//
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Text = "geleistete FLS abrechenbar";
this.xrTableCell6.Weight = 0.21641118213734856D;
//
// xrTableCell7
//
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Text = "restliche FLS";
this.xrTableCell7.Weight = 0.135256986233857D;
//
// xrTableCell8
//
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Text = "restl. FLS pro Woche";
this.xrTableCell8.Weight = 0.15689810126025036D;
//
// xrTableCell9
//
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Text = "Restzeit in Wochen";
this.xrTableCell9.Weight = 0.15689811071234514D;
//
// xrTableCell10
//
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Text = "Heute";
this.xrTableCell10.Weight = 0.089269612164975D;
//
// xrTableCell11
//
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.Text = "Wochen gesamt";
this.xrTableCell11.Weight = 0.1352569855617011D;
//
// xrTableCell12
//
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Text = "Wochen bisher";
this.xrTableCell12.Weight = 0.15689810350399458D;
//
// xrTableCell13
//
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Text = "FLS/Woche Soll";
this.xrTableCell13.Weight = 0.17853922903987912D;
//
// xrTableCell14
//
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.Text = "FLS/Woche Ist";
this.xrTableCell14.Weight = 0.18935977902718335D;
//
// xrTableCell15
//
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Text = "Differenz pro Woche x €/Std";
this.xrTableCell15.Weight = 0.20288548698789807D;
//
// xrTableCell16
//
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Text = "bewilligt oder nicht bewilligt";
this.xrTableCell16.Weight = 0.22182145262578162D;
//
// xrTableCell17
//
this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.StylePriority.UseBorders = false;
this.xrTableCell17.Text = "Hilfeplan eingereicht";
this.xrTableCell17.Weight = 0.16230838863479286D;
//
// PageFooter
//
this.PageFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPageInfo2});
this.PageFooter.HeightF = 35.00001F;
this.PageFooter.Name = "PageFooter";
//
// xrPageInfo2
//
this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
this.xrPageInfo2.Format = "Seite {0} von {1}";
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(987.0003F, 17.00001F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(131.9999F, 18F);
this.xrPageInfo2.StylePriority.UseFont = false;
this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// approvedText
//
this.approvedText.DataMember = "SupportConceptDetailList";
this.approvedText.Expression = "Iif([IsApproved], \'bewilligt\' , \'nicht bewilligt\')";
this.approvedText.Name = "approvedText";
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 50F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 20F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable3});
this.GroupFooter1.HeightF = 20F;
this.GroupFooter1.Name = "GroupFooter1";
//
// xrTable3
//
this.xrTable3.BackColor = System.Drawing.Color.Transparent;
this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable3.Font = new System.Drawing.Font("Arial", 7F, System.Drawing.FontStyle.Bold);
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 0, 100F);
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow3});
this.xrTable3.SizeF = new System.Drawing.SizeF(1119F, 20F);
this.xrTable3.StylePriority.UseBackColor = false;
this.xrTable3.StylePriority.UseBorders = false;
this.xrTable3.StylePriority.UseFont = false;
this.xrTable3.StylePriority.UsePadding = false;
//
// xrTableRow3
//
this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell37,
this.xrTableCell38,
this.xrTableCell39,
this.xrTableCell40,
this.xrTableCell41,
this.xrTableCell42,
this.xrTableCell43,
this.xrTableCell44,
this.xrTableCell45,
this.xrTableCell46,
this.xrTableCell47,
this.xrTableCell48,
this.xrTableCell49,
this.xrTableCell50,
this.xrTableCell51,
this.xrTableCell52,
this.xrTableCell53,
this.xrTableCell54});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Weight = 1D;
//
// xrTableCell37
//
this.xrTableCell37.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell37.Font = new System.Drawing.Font("Arial", 7F, System.Drawing.FontStyle.Bold);
this.xrTableCell37.Name = "xrTableCell37";
this.xrTableCell37.StylePriority.UseBorders = false;
this.xrTableCell37.StylePriority.UseFont = false;
this.xrTableCell37.Weight = 0.1947700715855491D;
this.xrTableCell37.WordWrap = false;
//
// xrTableCell38
//
this.xrTableCell38.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell38.Font = new System.Drawing.Font("Arial", 7F, System.Drawing.FontStyle.Bold);
this.xrTableCell38.Name = "xrTableCell38";
this.xrTableCell38.StylePriority.UseBorders = false;
this.xrTableCell38.StylePriority.UseFont = false;
this.xrTableCell38.Weight = 0.19477006735273841D;
this.xrTableCell38.WordWrap = false;
//
// xrTableCell39
//
this.xrTableCell39.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell39.Name = "xrTableCell39";
this.xrTableCell39.StylePriority.UseBorders = false;
this.xrTableCell39.Weight = 0.17583408899385655D;
//
// xrTableCell40
//
this.xrTableCell40.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell40.Name = "xrTableCell40";
this.xrTableCell40.StylePriority.UseBorders = false;
this.xrTableCell40.StylePriority.UseTextAlignment = false;
this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell40.Weight = 0.16230839191659136D;
//
// xrTableCell41
//
this.xrTableCell41.Borders = DevExpress.XtraPrinting.BorderSide.Right;
this.xrTableCell41.Name = "xrTableCell41";
this.xrTableCell41.StylePriority.UseBorders = false;
this.xrTableCell41.StylePriority.UseTextAlignment = false;
this.xrTableCell41.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell41.Weight = 0.16230838391519292D;
//
// xrTableCell42
//
this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSTotal")});
this.xrTableCell42.Name = "xrTableCell42";
this.xrTableCell42.StylePriority.UseTextAlignment = false;
xrSummary1.FormatString = "{0:0.00}";
xrSummary1.IgnoreNullValues = true;
xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.xrTableCell42.Summary = xrSummary1;
this.xrTableCell42.Text = "xrTableCell42";
this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell42.Weight = 0.13525698632089914D;
//
// xrTableCell43
//
this.xrTableCell43.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSTotalRecordedBillable")});
this.xrTableCell43.Name = "xrTableCell43";
this.xrTableCell43.StylePriority.UseTextAlignment = false;
xrSummary2.FormatString = "{0:0.00}";
xrSummary2.IgnoreNullValues = true;
xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.xrTableCell43.Summary = xrSummary2;
this.xrTableCell43.Text = "xrTableCell43";
this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell43.Weight = 0.21641118213734861D;
//
// xrTableCell44
//
this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSRemaining")});
this.xrTableCell44.Name = "xrTableCell44";
this.xrTableCell44.StylePriority.UseTextAlignment = false;
xrSummary3.FormatString = "{0:0.00}";
xrSummary3.IgnoreNullValues = true;
xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.xrTableCell44.Summary = xrSummary3;
this.xrTableCell44.Text = "xrTableCell44";
this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell44.Weight = 0.135256986233857D;
//
// xrTableCell45
//
this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSOpenPerWeek")});
this.xrTableCell45.Name = "xrTableCell45";
this.xrTableCell45.StylePriority.UseBorders = false;
this.xrTableCell45.StylePriority.UseTextAlignment = false;
xrSummary4.FormatString = "{0:0.00}";
xrSummary4.IgnoreNullValues = true;
xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.xrTableCell45.Summary = xrSummary4;
this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell45.Weight = 0.15689810126025036D;
//
// xrTableCell46
//
this.xrTableCell46.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell46.Name = "xrTableCell46";
this.xrTableCell46.StylePriority.UseBorders = false;
this.xrTableCell46.StylePriority.UseTextAlignment = false;
this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell46.Weight = 0.15689811071234514D;
//
// xrTableCell47
//
this.xrTableCell47.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell47.Font = new System.Drawing.Font("Arial", 7F, System.Drawing.FontStyle.Bold);
this.xrTableCell47.Name = "xrTableCell47";
this.xrTableCell47.StylePriority.UseBorders = false;
this.xrTableCell47.StylePriority.UseFont = false;
this.xrTableCell47.StylePriority.UseTextAlignment = false;
this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell47.Weight = 0.089269612164975D;
//
// xrTableCell48
//
this.xrTableCell48.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell48.Name = "xrTableCell48";
this.xrTableCell48.StylePriority.UseBorders = false;
this.xrTableCell48.StylePriority.UseTextAlignment = false;
this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell48.Weight = 0.1352569855617011D;
//
// xrTableCell49
//
this.xrTableCell49.Borders = DevExpress.XtraPrinting.BorderSide.Right;
this.xrTableCell49.Name = "xrTableCell49";
this.xrTableCell49.StylePriority.UseBorders = false;
this.xrTableCell49.StylePriority.UseTextAlignment = false;
this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell49.Weight = 0.15689810350399458D;
//
// xrTableCell50
//
this.xrTableCell50.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSPerWeekSoll")});
this.xrTableCell50.Name = "xrTableCell50";
this.xrTableCell50.StylePriority.UseTextAlignment = false;
xrSummary5.FormatString = "{0:0.00}";
xrSummary5.IgnoreNullValues = true;
xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.xrTableCell50.Summary = xrSummary5;
this.xrTableCell50.Text = "xrTableCell50";
this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell50.Weight = 0.17853922903987909D;
//
// xrTableCell51
//
this.xrTableCell51.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSPerWeekIst")});
this.xrTableCell51.Name = "xrTableCell51";
this.xrTableCell51.StylePriority.UseTextAlignment = false;
xrSummary6.FormatString = "{0:0.00}";
xrSummary6.IgnoreNullValues = true;
xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.xrTableCell51.Summary = xrSummary6;
this.xrTableCell51.Text = "xrTableCell51";
this.xrTableCell51.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell51.Weight = 0.1893597790271834D;
//
// xrTableCell52
//
this.xrTableCell52.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell52.Name = "xrTableCell52";
this.xrTableCell52.StylePriority.UseBorders = false;
this.xrTableCell52.StylePriority.UseTextAlignment = false;
this.xrTableCell52.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell52.Weight = 0.20288547666860882D;
//
// xrTableCell53
//
this.xrTableCell53.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell53.Name = "xrTableCell53";
this.xrTableCell53.StylePriority.UseBorders = false;
this.xrTableCell53.Weight = 0.22182145262578162D;
//
// xrTableCell54
//
this.xrTableCell54.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell54.Name = "xrTableCell54";
this.xrTableCell54.StylePriority.UseBorders = false;
this.xrTableCell54.StylePriority.UseTextAlignment = false;
this.xrTableCell54.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell54.Weight = 0.16230838863479286D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SupportConceptListRO);
//
// Hilfeplanuebersicht
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail,
this.ReportHeader,
this.DetailReport,
this.PageHeader,
this.PageFooter,
this.topMarginBand1,
this.bottomMarginBand1,
this.GroupFooter1});
this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
this.approvedText});
this.DataSource = this.bindingSource1;
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleNotApprovedAndExpiringNext8Months,
this.ruleNotApprovedAndExpiringNext4Months});
this.Landscape = true;
this.Margins = new System.Drawing.Printing.Margins(25, 25, 50, 20);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
#endregion
private DevExpress.XtraReports.UI.DetailBand Detail;
private System.Windows.Forms.BindingSource bindingSource1;
private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.DetailBand Detail1;
private DevExpress.XtraReports.UI.PageHeaderBand PageHeader;
private DevExpress.XtraReports.UI.PageFooterBand PageFooter;
private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1;
private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRTable xrTable2;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell33;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell34;
private DevExpress.XtraReports.UI.CalculatedField approvedText;
private DevExpress.XtraReports.UI.FormattingRule ruleNotApprovedAndExpiringNext8Months;
private DevExpress.XtraReports.UI.FormattingRule ruleNotApprovedAndExpiringNext4Months;
private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell36;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRTable xrTable3;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell38;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell39;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell40;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell41;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell42;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell43;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell44;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell45;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell46;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell49;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell50;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell51;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell52;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell53;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell54;
}
}

View File

@@ -0,0 +1,28 @@
using System;
using System.Drawing;
using System.Collections;
using System.ComponentModel;
using DevExpress.XtraReports.UI;
using BS.Shared.Extensions;
using BeWo.Report.ReportObjects;
using BeWo.Report;
namespace AidsHilfeDuisburg
{
public partial class Hilfeplanuebersicht : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<SupportConceptListRO>
{
public Hilfeplanuebersicht()
{
InitializeComponent();
}
public void SetReportDataSource(SupportConceptListRO pRO)
{
if (pRO.AppointedDate.HasValue && pRO.AppointedDate.Value.Date < DateTime.Now.Date)
{
xrLabel1.Text = String.Format("Hilfeplanübersicht Stand {0:dd.MM.yyyy}", pRO.AppointedDate);
}
this.bindingSource1.DataSource = pRO;
}
}
}

View File

@@ -0,0 +1,123 @@
<?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>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

View File

@@ -48,6 +48,12 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="AuswertungSozialdienst.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="AuswertungSozialdienst.Designer.cs">
<DependentUpon>AuswertungSozialdienst.cs</DependentUpon>
</Compile>
<Compile Include="CustomMitarbeiterstundenkontoBerechnung.cs" />
<Compile Include="CustomReportCreator.cs" />
<Compile Include="Export\CustomDataExporter.cs" />
@@ -84,11 +90,11 @@
<Compile Include="InvoiceCustomerReport.Designer.cs">
<DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
</Compile>
<Compile Include="AuswertungSozialdienst.cs">
<Compile Include="AuswertungSozialdienstAlt.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="AuswertungSozialdienst.Designer.cs">
<DependentUpon>AuswertungSozialdienst.cs</DependentUpon>
<Compile Include="AuswertungSozialdienstAlt.Designer.cs">
<DependentUpon>AuswertungSozialdienstAlt.cs</DependentUpon>
</Compile>
<Compile Include="ServiceInvoiceReport.cs">
<SubType>Component</SubType>
@@ -115,6 +121,12 @@
<DependentUpon>SettlementReport.cs</DependentUpon>
</Compile>
<Compile Include="SozPsychErfassungBeratungRO.cs" />
<Compile Include="Teamauslastung.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Teamauslastung.designer.cs">
<DependentUpon>Teamauslastung.cs</DependentUpon>
</Compile>
<Compile Include="Teamstundenkonto.cs">
<SubType>Component</SubType>
</Compile>
@@ -129,6 +141,9 @@
<EmbeddedResource Include="Abwesenheitstage.resx">
<DependentUpon>Abwesenheitstage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="AuswertungSozialdienst.resx">
<DependentUpon>AuswertungSozialdienst.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Mitarbeiterauslastung.resx">
<DependentUpon>Mitarbeiterauslastung.cs</DependentUpon>
</EmbeddedResource>
@@ -145,8 +160,8 @@
<DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="AuswertungSozialdienst.resx">
<DependentUpon>AuswertungSozialdienst.cs</DependentUpon>
<EmbeddedResource Include="AuswertungSozialdienstAlt.resx">
<DependentUpon>AuswertungSozialdienstAlt.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ServiceInvoiceReport.resx">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
@@ -164,6 +179,9 @@
<DependentUpon>SettlementReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Teamauslastung.resx">
<DependentUpon>Teamauslastung.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Teamstundenkonto.resx">
<DependentUpon>Teamstundenkonto.cs</DependentUpon>
</EmbeddedResource>

View File

@@ -35,7 +35,6 @@ namespace AlphaEv
DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
@@ -182,7 +181,7 @@ namespace AlphaEv
this.xrTableCell286 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell287 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell288 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell289 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellVereinbartGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellDifferenz = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -195,6 +194,7 @@ namespace AlphaEv
this.xrTableCell108 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell109 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell110 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell120 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell111 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell137 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTable6 = new DevExpress.XtraReports.UI.XRTable();
@@ -866,7 +866,7 @@ namespace AlphaEv
// xrTableCell201
//
this.xrTableCell201.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.ZugangUeberSeniorenberatung")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.ZugangUeberKontaktstelle")});
this.xrTableCell201.Name = "xrTableCell201";
this.xrTableCell201.StylePriority.UseBackColor = false;
this.xrTableCell201.Weight = 0.063402822197336436D;
@@ -874,7 +874,7 @@ namespace AlphaEv
// xrTableCell202
//
this.xrTableCell202.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.ZugangUeberPflegedienst")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.ZugangUeberAndere")});
this.xrTableCell202.Name = "xrTableCell202";
this.xrTableCell202.StylePriority.UseBackColor = false;
this.xrTableCell202.Weight = 0.05198112060298575D;
@@ -1054,20 +1054,14 @@ namespace AlphaEv
//
// xrTableCell222
//
this.xrTableCell222.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.AbrechnungVereinbarteFls", "{0:0.00}")});
this.xrTableCell222.Name = "xrTableCell222";
this.xrTableCell222.StylePriority.UseBackColor = false;
this.xrTableCell222.Text = "xrTableCell222";
this.xrTableCell222.Weight = 0.090575466321165837D;
//
// xrTableCell216
//
this.xrTableCell216.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.AbrechnungDifferenz", "{0:0.00}")});
this.xrTableCell216.Name = "xrTableCell216";
this.xrTableCell216.StylePriority.UseBackColor = false;
this.xrTableCell216.Text = "xrTableCell216";
this.xrTableCell216.Weight = 0.09057652884028651D;
//
// DetailReport
@@ -1090,7 +1084,7 @@ namespace AlphaEv
this.xrTable3,
this.xrTable1,
this.xrTableHeader});
this.GroupHeader1.HeightF = 204.8958F;
this.GroupHeader1.HeightF = 205F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.RepeatEveryPage = true;
//
@@ -1100,7 +1094,7 @@ namespace AlphaEv
this.xrTable7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable7.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold);
this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(0.002765656F, 184.8958F);
this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 185F);
this.xrTable7.Name = "xrTable7";
this.xrTable7.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow7});
@@ -1183,7 +1177,7 @@ namespace AlphaEv
this.xrTableCell286,
this.xrTableCell287,
this.xrTableCell288,
this.xrTableCell289,
this.cellVereinbartGesamt,
this.cellDifferenz});
this.xrTableRow7.Name = "xrTableRow7";
this.xrTableRow7.Weight = 1D;
@@ -1552,7 +1546,7 @@ namespace AlphaEv
// xrTableCell266
//
this.xrTableCell266.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ZugangUeberSeniorenberatungCount")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ZugangUeberKontaktstelleCount")});
this.xrTableCell266.Name = "xrTableCell266";
this.xrTableCell266.StylePriority.UseBackColor = false;
this.xrTableCell266.Weight = 0.063402822197336436D;
@@ -1560,7 +1554,7 @@ namespace AlphaEv
// xrTableCell267
//
this.xrTableCell267.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ZugangUeberPflegedienstCount")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ZugangUeberAndereCount")});
this.xrTableCell267.Name = "xrTableCell267";
this.xrTableCell267.StylePriority.UseBackColor = false;
this.xrTableCell267.Weight = 0.05198355304948863D;
@@ -1753,21 +1747,18 @@ namespace AlphaEv
this.xrTableCell288.Text = "xrTableCell288";
this.xrTableCell288.Weight = 0.071292315552708083D;
//
// xrTableCell289
// cellVereinbartGesamt
//
this.xrTableCell289.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.AbrechnungVereinbarteFls")});
this.xrTableCell289.Name = "xrTableCell289";
this.xrTableCell289.StylePriority.UseBackColor = false;
xrSummary6.FormatString = "{0:0.00}";
xrSummary6.IgnoreNullValues = true;
xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.xrTableCell289.Summary = xrSummary6;
this.xrTableCell289.Text = "xrTableCell289";
this.xrTableCell289.Weight = 0.090575466321165837D;
this.cellVereinbartGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbrechnungVereinbarteFlsCount", "{0:0.00}")});
this.cellVereinbartGesamt.Name = "cellVereinbartGesamt";
this.cellVereinbartGesamt.StylePriority.UseBackColor = false;
this.cellVereinbartGesamt.Weight = 0.090575466321165837D;
//
// cellDifferenz
//
this.cellDifferenz.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbrechnungDifferenzCount", "{0:0.00}")});
this.cellDifferenz.Name = "cellDifferenz";
this.cellDifferenz.StylePriority.UseBackColor = false;
this.cellDifferenz.Weight = 0.09057652884028651D;
@@ -1782,7 +1773,7 @@ namespace AlphaEv
this.xrTable4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow4});
this.xrTable4.SizeF = new System.Drawing.SizeF(3099.25F, 63.02084F);
this.xrTable4.SizeF = new System.Drawing.SizeF(3099.25F, 63F);
this.xrTable4.StylePriority.UseBorders = false;
this.xrTable4.StylePriority.UseFont = false;
this.xrTable4.StylePriority.UsePadding = false;
@@ -1801,10 +1792,11 @@ namespace AlphaEv
this.xrTableCell108,
this.xrTableCell109,
this.xrTableCell110,
this.xrTableCell120,
this.xrTableCell111,
this.xrTableCell137});
this.xrTableRow4.Name = "xrTableRow4";
this.xrTableRow4.Weight = 1D;
this.xrTableRow4.Weight = 0.999669320636408D;
//
// xrTableCell105
//
@@ -1828,7 +1820,9 @@ namespace AlphaEv
this.xrTableCell107.BackColor = System.Drawing.Color.YellowGreen;
this.xrTableCell107.Name = "xrTableCell107";
this.xrTableCell107.StylePriority.UseBackColor = false;
this.xrTableCell107.StylePriority.UseTextAlignment = false;
this.xrTableCell107.Text = "Staatsangehörigkeit";
this.xrTableCell107.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell107.Weight = 0.16328387563226884D;
//
// xrTableCell113
@@ -1836,7 +1830,9 @@ namespace AlphaEv
this.xrTableCell113.BackColor = System.Drawing.Color.Yellow;
this.xrTableCell113.Name = "xrTableCell113";
this.xrTableCell113.StylePriority.UseBackColor = false;
this.xrTableCell113.StylePriority.UseTextAlignment = false;
this.xrTableCell113.Text = "Geschlecht";
this.xrTableCell113.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell113.Weight = 0.090713237056410628D;
//
// xrTableCell115
@@ -1844,7 +1840,9 @@ namespace AlphaEv
this.xrTableCell115.BackColor = System.Drawing.Color.YellowGreen;
this.xrTableCell115.Name = "xrTableCell115";
this.xrTableCell115.StylePriority.UseBackColor = false;
this.xrTableCell115.StylePriority.UseTextAlignment = false;
this.xrTableCell115.Text = "Alter zu Beginn der Hilfe";
this.xrTableCell115.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell115.Weight = 0.18142629552408884D;
//
// xrTableCell117
@@ -1852,7 +1850,9 @@ namespace AlphaEv
this.xrTableCell117.BackColor = System.Drawing.Color.Yellow;
this.xrTableCell117.Name = "xrTableCell117";
this.xrTableCell117.StylePriority.UseBackColor = false;
this.xrTableCell117.StylePriority.UseTextAlignment = false;
this.xrTableCell117.Text = "Angebotsform";
this.xrTableCell117.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell117.Weight = 0.32739962658312288D;
//
// xrTableCell108
@@ -1861,15 +1861,19 @@ namespace AlphaEv
this.xrTableCell108.Multiline = true;
this.xrTableCell108.Name = "xrTableCell108";
this.xrTableCell108.StylePriority.UseBackColor = false;
this.xrTableCell108.StylePriority.UseTextAlignment = false;
this.xrTableCell108.Text = "Fahrdienst erforderlich\r\n(zu ergänzendem Angebot,\r\nz.B. Kontaktstelle)";
this.xrTableCell108.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell108.Weight = 0.17859158002515718D;
//
// xrTableCell109
//
this.xrTableCell109.BackColor = System.Drawing.Color.DeepSkyBlue;
this.xrTableCell109.BackColor = System.Drawing.Color.YellowGreen;
this.xrTableCell109.Name = "xrTableCell109";
this.xrTableCell109.StylePriority.UseBackColor = false;
this.xrTableCell109.StylePriority.UseTextAlignment = false;
this.xrTableCell109.Text = "Anfragezeit bis Hilfebeginn (Datumseingabe)";
this.xrTableCell109.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell109.Weight = 0.24766586130788179D;
//
// xrTableCell110
@@ -1880,15 +1884,25 @@ namespace AlphaEv
this.xrTableCell110.StylePriority.UseBackColor = false;
this.xrTableCell110.Weight = 0.12670309893836182D;
//
// xrTableCell120
//
this.xrTableCell120.BackColor = System.Drawing.Color.YellowGreen;
this.xrTableCell120.Name = "xrTableCell120";
this.xrTableCell120.StylePriority.UseBackColor = false;
this.xrTableCell120.StylePriority.UseTextAlignment = false;
this.xrTableCell120.Text = "Angaben zum Lebensumfeld";
this.xrTableCell120.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell120.Weight = 0.39006625118858962D;
//
// xrTableCell111
//
this.xrTableCell111.BackColor = System.Drawing.Color.YellowGreen;
this.xrTableCell111.BackColor = System.Drawing.Color.DeepSkyBlue;
this.xrTableCell111.Name = "xrTableCell111";
this.xrTableCell111.StylePriority.UseBackColor = false;
this.xrTableCell111.StylePriority.UseTextAlignment = false;
this.xrTableCell111.Text = "Angaben zum Lebensumfeld";
this.xrTableCell111.Text = "Erwerbssituation";
this.xrTableCell111.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell111.Weight = 0.75065784360641052D;
this.xrTableCell111.Weight = 0.36059159241782091D;
//
// xrTableCell137
//
@@ -1897,7 +1911,9 @@ namespace AlphaEv
this.xrTableCell137.Name = "xrTableCell137";
this.xrTableCell137.StylePriority.UseBackColor = false;
this.xrTableCell137.StylePriority.UseBorders = false;
this.xrTableCell137.StylePriority.UseTextAlignment = false;
this.xrTableCell137.Text = "psychische oder Suchterkrankung in der Herkunftsfamilie";
this.xrTableCell137.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell137.Weight = 0.15535247422714332D;
//
// xrTable6
@@ -1905,11 +1921,11 @@ namespace AlphaEv
this.xrTable6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable6.Font = new System.Drawing.Font("Arial", 8F);
this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 140.625F);
this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 145F);
this.xrTable6.Name = "xrTable6";
this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow6});
this.xrTable6.SizeF = new System.Drawing.SizeF(3099.25F, 44.27083F);
this.xrTable6.SizeF = new System.Drawing.SizeF(3099.25F, 40F);
this.xrTable6.StylePriority.UseBorders = false;
this.xrTable6.StylePriority.UseFont = false;
this.xrTable6.StylePriority.UsePadding = false;
@@ -1959,7 +1975,7 @@ namespace AlphaEv
this.xrTableCell185,
this.xrTableCell184});
this.xrTableRow6.Name = "xrTableRow6";
this.xrTableRow6.Weight = 1D;
this.xrTableRow6.Weight = 0.90352951557094618D;
//
// xrTableCell144
//
@@ -2280,11 +2296,11 @@ namespace AlphaEv
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable5.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 63.02083F);
this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 63F);
this.xrTable5.Name = "xrTable5";
this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow5});
this.xrTable5.SizeF = new System.Drawing.SizeF(3099.25F, 77.60417F);
this.xrTable5.SizeF = new System.Drawing.SizeF(3099.25F, 82F);
this.xrTable5.StylePriority.UseBorders = false;
this.xrTable5.StylePriority.UseFont = false;
this.xrTable5.StylePriority.UsePadding = false;
@@ -2334,7 +2350,7 @@ namespace AlphaEv
this.xrTableCell183,
this.xrTableCell182});
this.xrTableRow5.Name = "xrTableRow5";
this.xrTableRow5.Weight = 1D;
this.xrTableRow5.Weight = 1.0566442260483808D;
//
// xrTableCell112
//
@@ -2545,7 +2561,7 @@ namespace AlphaEv
//
// xrTableCell135
//
this.xrTableCell135.BackColor = System.Drawing.Color.DeepSkyBlue;
this.xrTableCell135.BackColor = System.Drawing.Color.YellowGreen;
this.xrTableCell135.Multiline = true;
this.xrTableCell135.Name = "xrTableCell135";
this.xrTableCell135.StylePriority.UseBackColor = false;
@@ -2554,7 +2570,7 @@ namespace AlphaEv
//
// xrTableCell136
//
this.xrTableCell136.BackColor = System.Drawing.Color.DeepSkyBlue;
this.xrTableCell136.BackColor = System.Drawing.Color.YellowGreen;
this.xrTableCell136.Multiline = true;
this.xrTableCell136.Name = "xrTableCell136";
this.xrTableCell136.StylePriority.UseBackColor = false;
@@ -2563,7 +2579,7 @@ namespace AlphaEv
//
// xrTableCell138
//
this.xrTableCell138.BackColor = System.Drawing.Color.DeepSkyBlue;
this.xrTableCell138.BackColor = System.Drawing.Color.YellowGreen;
this.xrTableCell138.Multiline = true;
this.xrTableCell138.Name = "xrTableCell138";
this.xrTableCell138.StylePriority.UseBackColor = false;
@@ -2603,7 +2619,7 @@ namespace AlphaEv
this.xrTableCell5.Multiline = true;
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.StylePriority.UseBackColor = false;
this.xrTableCell5.Text = "Kinder\r\nim\r\nHaushalt";
this.xrTableCell5.Text = "minder-\r\njährige\r\nKinder\r\nim\r\nHaushalt";
this.xrTableCell5.Weight = 0.063985065133724039D;
//
// xrTableCell171
@@ -2626,7 +2642,7 @@ namespace AlphaEv
//
// xrTableCell180
//
this.xrTableCell180.BackColor = System.Drawing.Color.YellowGreen;
this.xrTableCell180.BackColor = System.Drawing.Color.DeepSkyBlue;
this.xrTableCell180.Multiline = true;
this.xrTableCell180.Name = "xrTableCell180";
this.xrTableCell180.StylePriority.UseBackColor = false;
@@ -2635,7 +2651,7 @@ namespace AlphaEv
//
// xrTableCell7
//
this.xrTableCell7.BackColor = System.Drawing.Color.YellowGreen;
this.xrTableCell7.BackColor = System.Drawing.Color.DeepSkyBlue;
this.xrTableCell7.Multiline = true;
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.StylePriority.UseBackColor = false;
@@ -2644,7 +2660,7 @@ namespace AlphaEv
//
// xrTableCell181
//
this.xrTableCell181.BackColor = System.Drawing.Color.YellowGreen;
this.xrTableCell181.BackColor = System.Drawing.Color.DeepSkyBlue;
this.xrTableCell181.Multiline = true;
this.xrTableCell181.Name = "xrTableCell181";
this.xrTableCell181.StylePriority.UseBackColor = false;
@@ -2653,7 +2669,7 @@ namespace AlphaEv
//
// xrTableCell291
//
this.xrTableCell291.BackColor = System.Drawing.Color.YellowGreen;
this.xrTableCell291.BackColor = System.Drawing.Color.DeepSkyBlue;
this.xrTableCell291.Multiline = true;
this.xrTableCell291.Name = "xrTableCell291";
this.xrTableCell291.StylePriority.UseBackColor = false;
@@ -2662,7 +2678,7 @@ namespace AlphaEv
//
// xrTableCell143
//
this.xrTableCell143.BackColor = System.Drawing.Color.YellowGreen;
this.xrTableCell143.BackColor = System.Drawing.Color.DeepSkyBlue;
this.xrTableCell143.Multiline = true;
this.xrTableCell143.Name = "xrTableCell143";
this.xrTableCell143.StylePriority.UseBackColor = false;
@@ -2674,7 +2690,7 @@ namespace AlphaEv
this.xrTableCell139.BackColor = System.Drawing.Color.Yellow;
this.xrTableCell139.Name = "xrTableCell139";
this.xrTableCell139.StylePriority.UseBackColor = false;
this.xrTableCell139.Text = "ja2";
this.xrTableCell139.Text = "ja";
this.xrTableCell139.Weight = 0.045907158560638942D;
//
// xrTableCell183
@@ -2682,7 +2698,7 @@ namespace AlphaEv
this.xrTableCell183.BackColor = System.Drawing.Color.Yellow;
this.xrTableCell183.Name = "xrTableCell183";
this.xrTableCell183.StylePriority.UseBackColor = false;
this.xrTableCell183.Text = "nein2";
this.xrTableCell183.Text = "nein";
this.xrTableCell183.Weight = 0.045907158560638942D;
//
// xrTableCell182
@@ -3138,10 +3154,11 @@ namespace AlphaEv
this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell15.Multiline = true;
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.StylePriority.UseBackColor = false;
this.xrTableCell15.StylePriority.UseBorders = false;
this.xrTableCell15.Text = "Senioren- beratung";
this.xrTableCell15.Text = "Kontakt-\r\nstelle";
this.xrTableCell15.Weight = 0.05598693470285105D;
//
// xrTableCell19
@@ -3154,7 +3171,7 @@ namespace AlphaEv
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.StylePriority.UseBackColor = false;
this.xrTableCell19.StylePriority.UseBorders = false;
this.xrTableCell19.Text = "Pflege-\r\ndienst";
this.xrTableCell19.Text = "andere";
this.xrTableCell19.Weight = 0.045902621190025014D;
//
// xrTableCell11
@@ -3208,7 +3225,7 @@ namespace AlphaEv
this.xrTableCell37.Multiline = true;
this.xrTableCell37.Name = "xrTableCell37";
this.xrTableCell37.StylePriority.UseBackColor = false;
this.xrTableCell37.Text = "Kontakt-\r\nstelle2";
this.xrTableCell37.Text = "Kontakt-\r\nstelle";
this.xrTableCell37.Weight = 0.055986935108243686D;
//
// xrTableCell39
@@ -3234,7 +3251,7 @@ namespace AlphaEv
this.xrTableCell43.BackColor = System.Drawing.Color.Yellow;
this.xrTableCell43.Name = "xrTableCell43";
this.xrTableCell43.StylePriority.UseBackColor = false;
this.xrTableCell43.Text = "SpDi2";
this.xrTableCell43.Text = "SpDi";
this.xrTableCell43.Weight = 0.048227655815964478D;
//
// xrTableCell45
@@ -3252,7 +3269,7 @@ namespace AlphaEv
this.xrTableCell47.Multiline = true;
this.xrTableCell47.Name = "xrTableCell47";
this.xrTableCell47.StylePriority.UseBackColor = false;
this.xrTableCell47.Text = "Selbst-\r\nhilfe2";
this.xrTableCell47.Text = "Selbst-\r\nhilfe";
this.xrTableCell47.Weight = 0.073253316258623177D;
//
// xrTableCell49
@@ -3295,7 +3312,7 @@ namespace AlphaEv
this.xrTableCell59.Multiline = true;
this.xrTableCell59.Name = "xrTableCell59";
this.xrTableCell59.StylePriority.UseBackColor = false;
this.xrTableCell59.Text = "KKH /\r\nReha2";
this.xrTableCell59.Text = "KKH /\r\nReha";
this.xrTableCell59.Weight = 0.052591853879138076D;
//
// xrTableCell58
@@ -3393,7 +3410,9 @@ namespace AlphaEv
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.StylePriority.UseBackColor = false;
this.xrTableCell4.StylePriority.UseBorders = false;
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Zugang über";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell4.Weight = 0.52377072939211211D;
//
// xrTableCell12
@@ -3403,7 +3422,9 @@ namespace AlphaEv
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.StylePriority.UseBackColor = false;
this.xrTableCell12.StylePriority.UseBorders = false;
this.xrTableCell12.StylePriority.UseTextAlignment = false;
this.xrTableCell12.Text = "Vermittlung zu / in";
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell12.Weight = 0.82868832288889727D;
//
// xrTableCell9
@@ -3414,7 +3435,9 @@ namespace AlphaEv
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.StylePriority.UseBackColor = false;
this.xrTableCell9.StylePriority.UseBorders = false;
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.Text = "Hilfedauer";
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell9.Weight = 0.17859158002515718D;
//
// xrTableCell28
@@ -3424,7 +3447,9 @@ namespace AlphaEv
this.xrTableCell28.Name = "xrTableCell28";
this.xrTableCell28.StylePriority.UseBackColor = false;
this.xrTableCell28.StylePriority.UseBorders = false;
this.xrTableCell28.StylePriority.UseTextAlignment = false;
this.xrTableCell28.Text = "Beendigungsgrund";
this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell28.Weight = 0.23859453717509535D;
//
// xrTableCell56
@@ -3435,7 +3460,9 @@ namespace AlphaEv
this.xrTableCell56.Name = "xrTableCell56";
this.xrTableCell56.StylePriority.UseBackColor = false;
this.xrTableCell56.StylePriority.UseBorders = false;
this.xrTableCell56.StylePriority.UseTextAlignment = false;
this.xrTableCell56.Text = "geleistete\r\nFachleistungsstunden\r\n(FLS)";
this.xrTableCell56.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell56.Weight = 0.20717588722482214D;
//
// xrTableCell65
@@ -3445,12 +3472,14 @@ namespace AlphaEv
this.xrTableCell65.Name = "xrTableCell65";
this.xrTableCell65.StylePriority.UseBackColor = false;
this.xrTableCell65.StylePriority.UseBorders = false;
this.xrTableCell65.StylePriority.UseTextAlignment = false;
this.xrTableCell65.Text = "Abrechnung";
this.xrTableCell65.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell65.Weight = 0.181426564929897D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(KetteReports.SozPsychErfassungBeratungRO);
this.bindingSource1.DataSource = typeof(AlphaEv.SozPsychErfassungBeratungRO);
//
// ReportHeader
//
@@ -3572,7 +3601,7 @@ namespace AlphaEv
this.fieldDifferenz.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldDifferenz.Name = "fieldDifferenz";
//
// SozPsychErfassungBeratung
// AuswertungSozialdienst
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail,
@@ -3595,7 +3624,7 @@ namespace AlphaEv
this.FieldCaption,
this.PageInfo,
this.DataField});
this.Version = "13.2";
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
@@ -3935,7 +3964,7 @@ namespace AlphaEv
private DevExpress.XtraReports.UI.XRTableCell xrTableCell286;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell287;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell288;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell289;
private DevExpress.XtraReports.UI.XRTableCell cellVereinbartGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellDifferenz;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell293;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell291;
@@ -3944,5 +3973,6 @@ namespace AlphaEv
private DevExpress.XtraReports.UI.XRTableCell xrTableCell295;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell290;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell223;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell120;
}
}

View File

@@ -4,9 +4,9 @@ using BeWo.Report;
using DevExpress.XtraReports.UI;
using System.Data;
using BeWo.Data.Access;
using KetteReports;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Xml.Schema;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
@@ -26,6 +26,7 @@ namespace AlphaEv
private long servicecategoryOid = 0;
private DateTime reportStart = DateTime.MinValue;
private DateTime reportEnd = DateTime.MaxValue;
public AuswertungSozialdienst()
{
InitializeComponent();
@@ -37,9 +38,11 @@ namespace AlphaEv
var dict = CreateStrassenschluesselDict();
var ro = CreateRo(queryRo, dict);
cellDifferenz.Text = string.Format("{0:0.00}",
ro.GeleisteteFlsGesamtCount - ro.AbrechnungVereinbarteFlsCount);
//cellDifferenz.Text = string.Format("{0:0.00}", ro.GeleisteteFlsGesamtCount - ro.AbrechnungVereinbarteFlsCount);
ro.AbrechnungVereinbarteFlsCount = 1103;
ro.AbrechnungDifferenzCount = ro.AbrechnungVereinbarteFlsCount - ro.GeleisteteFlsGesamtCount;
this.bindingSource1.DataSource = ro;
}
@@ -76,12 +79,27 @@ namespace AlphaEv
Customer c = DAOFactory.GenericDAO.LoadByID<Customer>(oid);
ro.Nummer = idx++;
ro.NummerUndName = String.Format("{0}: {1}, {2}", ro.Nummer, c.Person.LastName, c.Person.FirstName);
//ro.NummerUndName = String.Format("{0}: {1}, {2}", ro.Nummer, c.Person.LastName, c.Person.FirstName);
ro.NummerUndName = String.Format("{0}, {1}", c.Person.LastName, c.Person.FirstName);
ro.Ort = String.Format("{0}", row.Field3);
ro.Strasse = String.Format("{0}", row.Field4);
if (c.Person.Nationalitaet != null)
{
var staatsang = c.Person.Nationalitaet.Value;
if (staatsang.ToLower().Contains("deutsch"))
{
ro.Deutsch = "x";
result.DeutschCount++;
}
else
{
ro.Nationalitaet = staatsang;
result.NationalitaetCount++;
}
}
var wp = GetWohnplatz(dict, ro.Strasse, ro.Ort);
if (wp != null)
{
@@ -92,16 +110,16 @@ namespace AlphaEv
result.WohnplatzCount++;
}
bool containsNewAngebot = c.VarFieldValueList.Exists(vv => vv.VarFieldDefOid >= 18 && vv.VarFieldDefOid <= 22);
bool containsNewAngebot = c.VarFieldValueList.Exists(vv => vv.VarFieldDefOid >= 38 && vv.VarFieldDefOid <= 42);
//ro.Strasse = c.Person.FirstNameLastName;
foreach (var vv in c.VarFieldValueList)
{
var varFieldValue = Utils.XMLDeserializeFromString(vv.SerializedValue, Type.GetType(vv.TypeName));
SetzeNationalitaet(result, ro, vv, varFieldValue);
//SetzeNationalitaet(result, ro, vv, varFieldValue);
if (vv.VarFieldDefOid != 2 || !containsNewAngebot)
if (vv.VarFieldDefOid != 22 || !containsNewAngebot)
{
SetzeAngebot(result, ro, vv, varFieldValue);
}
@@ -149,45 +167,46 @@ namespace AlphaEv
}
if (row.Field8 != null && DateTime.TryParse(row.Field8.ToString(), out birthday))
{
{
int alter = reportEnd.Year - birthday.Year;
birthday = birthday.AddYears(alter);
if (reportEnd.CompareTo(birthday) < 0)
{
alter--;
}
if (servicecategoryOid == 8)
{
cellAlter1.Text = "unter 60";
cellAlter2.Text = "60-70";
cellAlter3.Text = "71-80";
cellAlter4.Text = "81+";
//if (servicecategoryOid == 8)
//{
// cellAlter1.Text = "unter 60";
// cellAlter2.Text = "60-70";
// cellAlter3.Text = "71-80";
// cellAlter4.Text = "81+";
if (alter < 60)
{
ro.AlterBis18 = "x";
result.AlterBis18Count++;
}
else if (alter >= 60 && alter <= 70)
{
ro.Alter18_25 = "x";
result.Alter18_25Count++;
}
else if (alter >= 71 && alter <= 80)
{
ro.Alter26_65 = "x";
result.Alter26_65Count++;
}
else if (alter >= 81)
{
ro.AlterAb65 = "x";
result.AlterAb65Count++;
}
}
else
{
// if (alter < 60)
// {
// ro.AlterBis18 = "x";
// result.AlterBis18Count++;
// }
// else if (alter >= 60 && alter <= 70)
// {
// ro.Alter18_25 = "x";
// result.Alter18_25Count++;
// }
// else if (alter >= 71 && alter <= 80)
// {
// ro.Alter26_65 = "x";
// result.Alter26_65Count++;
// }
// else if (alter >= 81)
// {
// ro.AlterAb65 = "x";
// result.AlterAb65Count++;
// }
//}
//else
//{
if (alter < 18)
{
ro.AlterBis18 = "x";
@@ -208,14 +227,13 @@ namespace AlphaEv
ro.AlterAb65 = "x";
result.AlterAb65Count++;
}
}
//}
}
ro.PrimaerErkrankung = CreateDiagnosisString(c.Diagnosis2CustomerList);
//ro.PrimaerErkrankung = c.Diagnosis2CustomerList.Select(s => s.ICD10DiagnosisCode).ToSeparatedString(", ");
ro.PrimaerErkrankung = c.Diagnosis2CustomerList.Select(s => s.ICD10DiagnosisCode).ToSeparatedString(", ");
SetzeVermittlung(result, ro, c);
SetzeBeendigungsgrund(result, ro, c);
@@ -256,13 +274,16 @@ namespace AlphaEv
}
if (bewilligtBis > DateTime.MinValue)
if (bewilligtBis < reportEnd)
{
ro.HilfsdauerFallende = bewilligtBis;
if (bewilligtAb > DateTime.MinValue)
if (bewilligtBis > DateTime.MinValue)
{
ro.HilfsdauerInMonaten = BerechneDauerInMonaten(bewilligtAb, bewilligtBis);
ro.HilfsdauerFallende = bewilligtBis;
if (bewilligtAb > DateTime.MinValue)
{
ro.HilfsdauerInMonaten = BerechneDauerInMonaten(bewilligtAb, bewilligtBis);
}
}
}
@@ -281,10 +302,74 @@ namespace AlphaEv
result.DetailList.Add(ro);
}
}
return result;
}
private string CreateDiagnosisString(IList<Diagnosis2Customer> d2CList)
{
StringBuilder sb = new StringBuilder();
foreach (var d2c in d2CList)
{
if (!String.IsNullOrWhiteSpace(d2c.ICD10DiagnosisCode))
{
String code = d2c.ICD10DiagnosisCode;
if (code.StartsWith("F"))
{
if (code.StartsWith("F0"))
{
code = "F00-F09";
}
else if (code.StartsWith("F1"))
{
code = "F10-F19";
}
else if (code.StartsWith("F2"))
{
code = "F20-F29";
}
else if (code.StartsWith("F3"))
{
code = "F30-F39";
}
else if (code.StartsWith("F4"))
{
code = "F40-F49";
}
else if (code.StartsWith("F5"))
{
code = "F50-F59";
}
else if (code.StartsWith("F6"))
{
code = "F60-F69";
}
else if (code.StartsWith("F7"))
{
code = "F70-F79";
}
else if (code.StartsWith("F8"))
{
code = "F80-F89";
}
else if (code.StartsWith("F9"))
{
code = "F90-F99";
}
}
if (sb.Length > 0)
{
sb.Append(", ");
}
sb.Append(code);
}
}
return sb.ToString();
}
private Wohnplatz GetWohnplatz(Dictionary<string, Wohnplatz> dict, string strasse, string ort)
{
if (!String.IsNullOrWhiteSpace(ort))
@@ -348,8 +433,15 @@ namespace AlphaEv
{
if (serviceRecord.ServiceDescription.ServiceCategory.Oid == servicecategoryOid)
{
ro.GeleisteteFlsKlient += serviceRecord.RoundedDuration;
if (serviceRecord.ServiceDescription.Name.ToLower().Contains("ohne klient"))
{
ro.GeleisteteFlsOhneKlient += serviceRecord.RoundedDuration;
}
else
{
ro.GeleisteteFlsKlient += serviceRecord.RoundedDuration;
}
ro.GeleisteteFlsGesamt += serviceRecord.RoundedDuration;
}
}
@@ -408,22 +500,22 @@ namespace AlphaEv
if (customer.TerminationReason != null)
{
if (customer.TerminationReason.Value == "stabilisiert")
if (customer.TerminationReason.Value == "Ziel(e) erreicht (Sozialdienst)")
{
ro.BeendigungsgrundZeileErreicht = "x";
reportRo.BeendigungsgrundZeileErreichtCount++;
}
else if (customer.TerminationReason.Value == "stationär vermittelt")
else if (customer.TerminationReason.Value == "KKH/Reha (Sozialdienst)")
{
ro.BeendigungsgrundKkhReha = "x";
reportRo.BeendigungsgrundKkhRehaCount++;
}
else if (customer.TerminationReason.Value == "von sich aus beendet")
else if (customer.TerminationReason.Value == "Abbruch (Sozialdienst)")
{
ro.BeendigungsgrundAbbruch = "x";
reportRo.BeendigungsgrundAbbruchCount++;
}
else if (customer.TerminationReason.Value == "verstorben")
else if (customer.TerminationReason.Value == "verstorben (Sozialdienst)")
{
ro.BeendigungsgrundVerstorben = "x";
reportRo.BeendigungsgrundVerstorbenCount++;
@@ -479,7 +571,7 @@ namespace AlphaEv
ro.VermittlungSchuldnerberatung = "x";
reportRo.VermittlungSchuldnerberatungCount++;
}
else if (placement.Objective.Value == "SpDi")
else if (placement.Objective.Value == "Sozialpsychiatrischer Dienst")
{
ro.VermittlungSpdi = "x";
reportRo.VermittlungSpdiCount++;
@@ -506,7 +598,7 @@ namespace AlphaEv
private void SetzeOhneWohnplatz(SozPsychErfassungBeratungRO result, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
{
if (vv.VarFieldDefOid == 17)
if (vv.VarFieldDefOid == 37)
{
if (varFieldValue != null)
{
@@ -524,7 +616,8 @@ namespace AlphaEv
private void SetzeZugang(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
{
if (vv.VarFieldDefOid == 16)
if (vv.VarFieldDefOid == 36)
{
String angebot = varFieldValue as string;
@@ -568,12 +661,22 @@ namespace AlphaEv
ro.ZugangUeberPflegedienst = "x";
reportRo.ZugangUeberPflegedienstCount++;
}
else if (angebot == "Kontaktstelle")
{
ro.ZugangUeberKontaktstelle = "x";
reportRo.ZugangUeberKontaktstelleCount++;
}
else
{
ro.ZugangUeberAndere = "x";
reportRo.ZugangUeberAndereCount++;
}
}
}
private void SetzeErkrankung(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
{
if (vv.VarFieldDefOid == 15)
if (vv.VarFieldDefOid == 35)
{
String angebot = varFieldValue as string;
@@ -598,52 +701,52 @@ namespace AlphaEv
private void SetzeLebensumfeld(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
{
if (vv.VarFieldDefOid == 5 && varFieldValue.ToString() == "True")
if (vv.VarFieldDefOid == 25 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldAlleinLebend = "x";
reportRo.LebensumfeldAlleinLebendCount++;
}
else if (vv.VarFieldDefOid == 6 && varFieldValue.ToString() == "True")
else if (vv.VarFieldDefOid == 26 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldMitPartnerLebend = "x";
reportRo.LebensumfeldMitPartnerLebendCount++;
}
else if (vv.VarFieldDefOid == 7 && varFieldValue.ToString() == "True")
else if (vv.VarFieldDefOid == 27 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldKinderImHaushalt = "x";
reportRo.LebensumfeldKinderImHaushaltCount++;
}
else if (vv.VarFieldDefOid == 8 && varFieldValue.ToString() == "True")
else if (vv.VarFieldDefOid == 28 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldKinderInAnderemHaushalt = "x";
reportRo.LebensumfeldKinderInAnderemHaushaltCount++;
}
else if (vv.VarFieldDefOid == 9 && varFieldValue.ToString() == "True")
else if (vv.VarFieldDefOid == 29 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldWohnhaftInHerkunftsfamilie = "x";
reportRo.LebensumfeldWohnhaftInHerkunftsfamilieCount++;
}
else if (vv.VarFieldDefOid == 10 && varFieldValue.ToString() == "True")
else if (vv.VarFieldDefOid == 30 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldInArbeit = "x";
reportRo.LebensumfeldInArbeitCount++;
}
else if (vv.VarFieldDefOid == 11 && varFieldValue.ToString() == "True")
else if (vv.VarFieldDefOid == 31 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldBeziehtAlg = "x";
reportRo.LebensumfeldBeziehtAlgCount++;
}
else if (vv.VarFieldDefOid == 12 && varFieldValue.ToString() == "True")
else if (vv.VarFieldDefOid == 32 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldBeziehtAlg2 = "x";
reportRo.LebensumfeldBeziehtAlg2Count++;
}
else if (vv.VarFieldDefOid == 13 && varFieldValue.ToString() == "True")
else if (vv.VarFieldDefOid == 33 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldBeziehtGrundsicherung = "x";
reportRo.LebensumfeldBeziehtGrundsicherungCount++;
}
else if (vv.VarFieldDefOid == 14 && varFieldValue.ToString() == "True")
else if (vv.VarFieldDefOid == 34 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldBeziehtRente = "x";
reportRo.LebensumfeldBeziehtRenteCount++;
@@ -652,7 +755,7 @@ namespace AlphaEv
private void SetzeFahrdienst(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
{
if (vv.VarFieldDefOid == 3)
if (vv.VarFieldDefOid == 23)
{
if (varFieldValue.ToString() == "True")
{
@@ -665,7 +768,7 @@ namespace AlphaEv
//reportRo.FahrdienstNeinCount++;
}
}
else if (vv.VarFieldDefOid == 4)
else if (vv.VarFieldDefOid == 24)
{
if (varFieldValue.ToString() == "True")
{
@@ -677,7 +780,7 @@ namespace AlphaEv
private void SetzeAngebot(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
{
if (vv.VarFieldDefOid == 2)
if (vv.VarFieldDefOid == 22)
{
String angebot = varFieldValue as string;
@@ -708,7 +811,7 @@ namespace AlphaEv
}
}
else if (vv.VarFieldDefOid == 18)
else if (vv.VarFieldDefOid == 38)
{
if (varFieldValue.ToString() == "True")
{
@@ -716,7 +819,7 @@ namespace AlphaEv
reportRo.AngebotBeratungCount++;
}
}
else if (vv.VarFieldDefOid == 19)
else if (vv.VarFieldDefOid == 39)
{
if (varFieldValue.ToString() == "True")
{
@@ -724,7 +827,7 @@ namespace AlphaEv
reportRo.AngebotBegleitungCount++;
}
}
else if (vv.VarFieldDefOid == 20)
else if (vv.VarFieldDefOid == 40)
{
if (varFieldValue.ToString() == "True")
{
@@ -732,7 +835,7 @@ namespace AlphaEv
reportRo.AngebotKrisenInterventionCount++;
}
}
else if (vv.VarFieldDefOid == 21)
else if (vv.VarFieldDefOid == 41)
{
if (varFieldValue.ToString() == "True")
{
@@ -740,7 +843,7 @@ namespace AlphaEv
reportRo.AngebotBeratungAngehoerigerCount++;
}
}
else if (vv.VarFieldDefOid == 22)
else if (vv.VarFieldDefOid == 42)
{
if (varFieldValue.ToString() == "True")
{

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,825 @@
using System;
using BeWo.Report.ReportObjects;
using BeWo.Report;
using DevExpress.XtraReports.UI;
using System.Data;
using BeWo.Data.Access;
using System.Collections.Generic;
using System.Linq;
using System.Xml.Schema;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Plugins;
using BeWo.Service.ServiceImplementations;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.Extensions;
using BS.Shared.Services;
using DevExpress.Xpo.DB;
namespace AlphaEv
{
[IDSpecificClass(Identifier = "AuswertungSozialdienstAlt")]
public partial class AuswertungSozialdienstAlt : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<QueryRO>
{
private long servicecategoryOid = 0;
private DateTime reportStart = DateTime.MinValue;
private DateTime reportEnd = DateTime.MaxValue;
public AuswertungSozialdienstAlt()
{
InitializeComponent();
}
public void SetReportDataSource(QueryRO queryRo)
{
var dict = CreateStrassenschluesselDict();
var ro = CreateRo(queryRo, dict);
cellDifferenz.Text = string.Format("{0:0.00}",
ro.GeleisteteFlsGesamtCount - ro.AbrechnungVereinbarteFlsCount);
this.bindingSource1.DataSource = ro;
}
private SozPsychErfassungBeratungRO CreateRo(QueryRO queryRo, Dictionary<string, Wohnplatz> dict)
{
SozPsychErfassungBeratungRO result = new SozPsychErfassungBeratungRO();
result.DetailList = new List<SozPsychErfassungBeratungDetailRO>();
//decimal flsKlientGesamt = 0;
//decimal flsKlientGesamt = 0;
//decimal hilfedauerInMonatenGesamt = 0;
Dictionary<long, bool> custOidDict = new Dictionary<long, bool>();
int idx = 1;
foreach (var row in queryRo.Rows)
{
result.NummerCount++;
SozPsychErfassungBeratungDetailRO ro = new SozPsychErfassungBeratungDetailRO();
if (servicecategoryOid == 0)
{
servicecategoryOid = Int64.Parse(row.Field17.ToString());
}
long oid = Int64.Parse(row.Field1.ToString());
bool add = true;
if (!custOidDict.ContainsKey(oid))
{
//custOidDict.Add(oid, true);
}
else
{
add = false;
}
Customer c = DAOFactory.GenericDAO.LoadByID<Customer>(oid);
ro.Nummer = idx++;
ro.NummerUndName = String.Format("{0}: {1}, {2}", ro.Nummer, c.Person.LastName, c.Person.FirstName);
ro.Ort = String.Format("{0}", row.Field3);
ro.Strasse = String.Format("{0}", row.Field4);
var wp = GetWohnplatz(dict, ro.Strasse, ro.Ort);
if (wp != null)
{
ro.Wohnplatz = wp.Wohnplatzname;
ro.Strasse = wp.Strasse;
ro.Hausnr = wp.HausNummer;
result.WohnplatzCount++;
}
bool containsNewAngebot = c.VarFieldValueList.Exists(vv => vv.VarFieldDefOid >= 18 && vv.VarFieldDefOid <= 22);
//ro.Strasse = c.Person.FirstNameLastName;
foreach (var vv in c.VarFieldValueList)
{
var varFieldValue = Utils.XMLDeserializeFromString(vv.SerializedValue, Type.GetType(vv.TypeName));
SetzeNationalitaet(result, ro, vv, varFieldValue);
if (vv.VarFieldDefOid != 2 || !containsNewAngebot)
{
SetzeAngebot(result, ro, vv, varFieldValue);
}
SetzeFahrdienst(result, ro, vv, varFieldValue);
SetzeLebensumfeld(result, ro, vv, varFieldValue);
SetzeErkrankung(result, ro, vv, varFieldValue);
SetzeZugang(result, ro, vv, varFieldValue);
SetzeOhneWohnplatz(result, ro, vv, varFieldValue);
}
int sex = 0;
if (row.Field7 != null && Int32.TryParse(row.Field7.ToString(), out sex))
{
if ( sex == 1)
{
ro.Weiblich = "x";
result.WeiblichCount++;
}
else if (sex == 0)
{
ro.Maennlich = "x";
result.MaennlichCount++;
}
}
DateTime birthday = DateTime.MinValue;
if (row.Field12 != null)
{
DateTime.TryParse(row.Field12.ToString(), out reportStart);
//if (reportStart == DateTime.MinValue)
//{
// reportStart = DateTime.Now;
//}
}
if (row.Field13 != null)
{
DateTime.TryParse(row.Field13.ToString(), out reportEnd);
if (reportEnd >= DateTime.MaxValue.AddDays(-1))
{
reportEnd = DateTime.Now;
}
}
if (row.Field8 != null && DateTime.TryParse(row.Field8.ToString(), out birthday))
{
int alter = reportEnd.Year - birthday.Year;
birthday = birthday.AddYears(alter);
if (reportEnd.CompareTo(birthday) < 0)
{
alter--;
}
if (servicecategoryOid == 8)
{
cellAlter1.Text = "unter 60";
cellAlter2.Text = "60-70";
cellAlter3.Text = "71-80";
cellAlter4.Text = "81+";
if (alter < 60)
{
ro.AlterBis18 = "x";
result.AlterBis18Count++;
}
else if (alter >= 60 && alter <= 70)
{
ro.Alter18_25 = "x";
result.Alter18_25Count++;
}
else if (alter >= 71 && alter <= 80)
{
ro.Alter26_65 = "x";
result.Alter26_65Count++;
}
else if (alter >= 81)
{
ro.AlterAb65 = "x";
result.AlterAb65Count++;
}
}
else
{
if (alter < 18)
{
ro.AlterBis18 = "x";
result.AlterBis18Count++;
}
else if (alter >= 18 && alter <= 25)
{
ro.Alter18_25 = "x";
result.Alter18_25Count++;
}
else if (alter >= 26 && alter <= 65)
{
ro.Alter26_65 = "x";
result.Alter26_65Count++;
}
else if (alter >= 66)
{
ro.AlterAb65 = "x";
result.AlterAb65Count++;
}
}
}
ro.PrimaerErkrankung = c.Diagnosis2CustomerList.Select(s => s.ICD10DiagnosisCode).ToSeparatedString(", ");
SetzeVermittlung(result, ro, c);
SetzeBeendigungsgrund(result, ro, c);
DateTime beantragtAb = DateTime.MinValue;
DateTime beantragtBis = DateTime.MinValue;
DateTime bewilligtAb = DateTime.MinValue;
DateTime bewilligtBis = DateTime.MinValue;
if (row.Field9 != null)
{
DateTime.TryParse(row.Field9.ToString(), out bewilligtAb);
}
if (row.Field10 != null)
{
DateTime.TryParse(row.Field10.ToString(), out bewilligtBis);
}
if (row.Field14 != null)
{
DateTime.TryParse(row.Field14.ToString(), out beantragtAb);
}
if (row.Field15 != null)
{
DateTime.TryParse(row.Field15.ToString(), out beantragtBis);
}
if (beantragtAb > DateTime.MinValue)
{
ro.AnfrageHilfebeginn = beantragtAb;
}
if (bewilligtAb > DateTime.MinValue)
{
ro.AnfrageClearingbeginn = bewilligtAb;
}
if (beantragtAb > DateTime.MinValue && bewilligtAb > DateTime.MinValue)
{
ro.AnfrageWartezeit = (decimal)bewilligtAb.Subtract(beantragtAb).TotalDays;
}
if (bewilligtBis > DateTime.MinValue)
{
ro.HilfsdauerFallende = bewilligtBis;
if (bewilligtAb > DateTime.MinValue)
{
ro.HilfsdauerInMonaten = BerechneDauerInMonaten(bewilligtAb, bewilligtBis);
}
}
long cb2scoid = Int64.Parse(row.Field16.ToString());
BerechneFls(result, ro, cb2scoid);
if (String.IsNullOrEmpty(ro.FahrdienstJa))
{
ro.FahrdienstNein = "x";
result.FahrdienstNeinCount++;
}
if (add)
{
result.DetailList.Add(ro);
}
}
return result;
}
private Wohnplatz GetWohnplatz(Dictionary<string, Wohnplatz> dict, string strasse, string ort)
{
if (!String.IsNullOrWhiteSpace(ort))
{
if (ort.ToLower() == "berg. gladbach")
{
ort = "bergisch gladbach";
}
if (ort.ToLower() == "bgl")
{
ort = "bergisch gladbach";
}
if (ort.ToLower() == "gl")
{
ort = "bergisch gladbach";
}
if (ort.ToLower() == "b gladbach")
{
ort = "bergisch gladbach";
}
if (ort.ToLower().Contains("bergisch gladbach"))
{
ort = "bergisch gladbach";
}
}
ort = ort.Replace(" ", "").ToLower().Trim();
strasse = strasse.Replace(" ", "").ToLower().Trim();
String key = String.Format("{0} {1}", strasse, ort).ToLower();
if (dict.ContainsKey(key))
{
return dict[key];
}
key = String.Format("{0} {1}", strasse.ToLower().Replace("str.", "straße"), ort).ToLower();
if (dict.ContainsKey(key))
{
return dict[key];
}
key = String.Format("{0} {1}", strasse.ToLower().Replace("strasse", "straße"), ort).ToLower();
if (dict.ContainsKey(key))
{
return dict[key];
}
return null;
}
private void BerechneFls(SozPsychErfassungBeratungRO result, SozPsychErfassungBeratungDetailRO ro, long cb2scoid)
{
CostBearer2SupportConcept cb2sc = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(cb2scoid);
var servicerecords = DAOFactory.SearchDAO.FindServiceRecords(null, cb2scoid);
var frecords = AnalysisServiceImp.FilterGroupServiceRecords(servicerecords);
foreach (var serviceRecord in frecords)
{
if (serviceRecord.Start >= reportStart && serviceRecord.End < reportEnd)
{
if (serviceRecord.ServiceDescription.ServiceCategory.Oid == servicecategoryOid)
{
ro.GeleisteteFlsKlient += serviceRecord.RoundedDuration;
ro.GeleisteteFlsGesamt += serviceRecord.RoundedDuration;
}
}
//else
//{
// ro.GeleisteteFlsOhneKlient += serviceRecord.RoundedDuration;
//}
}
ro.GeleisteteFlsGesamt /= 60;
ro.GeleisteteFlsKlient /= 60;
ro.GeleisteteFlsOhneKlient /= 60;
result.GeleisteteFlsGesamtCount += ro.GeleisteteFlsGesamt;
var calc = PluginLoader.FindClass<Calculations>();
var reldc = MapperFactory.SupportConceptCostBearerRelDC_CostBearer2SupportConcept.MapToNewDC(cb2sc);
var genehmigt = calc.GetApprovedHoursTotal(reldc, false);
ro.AbrechnungVereinbarteFls = genehmigt ?? 0;
ro.AbrechnungDifferenz = ro.GeleisteteFlsGesamt - ro.AbrechnungVereinbarteFls;
result.AbrechnungVereinbarteFlsCount += ro.AbrechnungVereinbarteFls;
}
private decimal BerechneDauerInMonaten(DateTime bewilligtAb, DateTime bewilligtBis)
{
decimal monate = 0;
DateTime start = bewilligtAb.Date;
DateTime ende = bewilligtBis.Date;
while (start < ende)
{
monate++;
start = start.AddMonths(1);
}
if (start != ende.AddDays(1))
{
var days = start.Subtract(ende).TotalDays + 1;
monate += (decimal)(days/DateTime.DaysInMonth(start.Year, start.Month));
}
return monate;
}
private void SetzeBeendigungsgrund(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, Customer customer)
{
if (customer.TerminationReason != null)
{
if (customer.TerminationReason.Value == "stabilisiert")
{
ro.BeendigungsgrundZeileErreicht = "x";
reportRo.BeendigungsgrundZeileErreichtCount++;
}
else if (customer.TerminationReason.Value == "stationär vermittelt")
{
ro.BeendigungsgrundKkhReha = "x";
reportRo.BeendigungsgrundKkhRehaCount++;
}
else if (customer.TerminationReason.Value == "von sich aus beendet")
{
ro.BeendigungsgrundAbbruch = "x";
reportRo.BeendigungsgrundAbbruchCount++;
}
else if (customer.TerminationReason.Value == "verstorben")
{
ro.BeendigungsgrundVerstorben = "x";
reportRo.BeendigungsgrundVerstorbenCount++;
}
}
}
private void SetzeVermittlung(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, Customer customer)
{
foreach (var placement in customer.PlacementList)
{
if (placement.Objective != null)
{
if (placement.Objective.Value == "langfristige Betreuung")
{
ro.VermittlungLangfristigeBegleitung = "x";
reportRo.VermittlungLangfristigeBegleitungCount++;
}
else if (placement.Objective.Value == "Behandlung / Therapie")
{
ro.VermittlungBehandlungTherapie = "x";
reportRo.VermittlungBehandlungTherapieCount++;
}
else if (placement.Objective.Value == "Wohnheime / REHA")
{
ro.VermittlungWohnheimReha = "x";
reportRo.VermittlungWohnheimRehaCount++;
}
else if (placement.Objective.Value == "BEWO")
{
ro.VermittlungBeWo = "x";
reportRo.VermittlungBeWoCount++;
}
else if (placement.Objective.Value == "Tagesstätte")
{
ro.VermittlungTagestaette = "x";
reportRo.VermittlungTagestaetteCount++;
}
else if (placement.Objective.Value == "Kontaktstelle")
{
ro.VermittlungKontaktstelle = "x";
reportRo.VermittlungKontaktstelleCount++;
}
else if (placement.Objective.Value == "SPFH" || placement.Objective.Value == "Jugendamt")
{
ro.VermittlungJugendamtSpfh = "x";
reportRo.VermittlungJugendamtSpfhCount++;
}
else if (placement.Objective.Value == "Schuldnerberatung")
{
ro.VermittlungSchuldnerberatung = "x";
reportRo.VermittlungSchuldnerberatungCount++;
}
else if (placement.Objective.Value == "SpDi")
{
ro.VermittlungSpdi = "x";
reportRo.VermittlungSpdiCount++;
}
else if (placement.Objective.Value == "sonstige Dienste")
{
ro.VermittlungSonstigeDienste = "x";
reportRo.VermittlungSonstigeDiensteCount++;
}
else if (placement.Objective.Value == "Selbsthilfe")
{
ro.VermittlungSelbsthilfe = "x";
reportRo.VermittlungSelbsthilfeCount++;
}
else if (placement.Objective.Value == "keine weiteren Hilfen bekannt")
{
ro.VermittlungUnbekannt = "x";
reportRo.VermittlungUnbekanntCount++;
}
}
}
}
private void SetzeOhneWohnplatz(SozPsychErfassungBeratungRO result, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
{
if (vv.VarFieldDefOid == 17)
{
if (varFieldValue != null)
{
String vvStr = varFieldValue as String;
if (!String.IsNullOrWhiteSpace(vvStr))
{
result.OhneFestenWohnsitzCount++;
ro.OhneFestenWohnsitz = vvStr;
}
}
}
}
private void SetzeZugang(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
{
if (vv.VarFieldDefOid == 16)
{
String angebot = varFieldValue as string;
if (angebot == "selbst/Familie/soz. Umfeld")
{
ro.ZugangUeberSelbst = "x";
reportRo.ZugangUeberSelbstCount++;
}
else if (angebot == "(Fach-)Arzt")
{
ro.ZugangUeberArzt = "x";
reportRo.ZugangUeberArztCount++;
}
else if (angebot == "KKH/Reha")
{
ro.ZugangUeberKkhReha = "x";
reportRo.ZugangUeberKkhRehaCount++;
}
else if (angebot == "SpDi")
{
ro.ZugangUeberSpDi = "x";
reportRo.ZugangUeberSpDiCount++;
}
else if (angebot == "Job Center")
{
ro.ZugangUeberJobCenter = "x";
reportRo.ZugangUeberJobCenterCount++;
}
else if (angebot == "Selbsthilfe")
{
ro.ZugangUeberSelbsthilfe = "x";
reportRo.ZugangUeberSelbsthilfeCount++;
}
else if (angebot == "Seniorenberatung")
{
ro.ZugangUeberSeniorenberatung = "x";
reportRo.ZugangUeberSeniorenberatungCount++;
}
else if (angebot == "Pflegedienst")
{
ro.ZugangUeberPflegedienst = "x";
reportRo.ZugangUeberPflegedienstCount++;
}
}
}
private void SetzeErkrankung(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
{
if (vv.VarFieldDefOid == 15)
{
String angebot = varFieldValue as string;
if (angebot == "Ja")
{
ro.PsychOderSuchterkrankungJa = "x";
reportRo.PsychOderSuchterkrankungJaCount++;
}
else if (angebot == "Nein")
{
ro.PsychOderSuchterkrankungNein = "x";
reportRo.PsychOderSuchterkrankungNeinCount++;
}
else if (angebot == "Unbekannt")
{
ro.PsychOderSuchterkrankungUnbekannt = "x";
reportRo.PsychOderSuchterkrankungUnbekanntCount++;
}
}
}
private void SetzeLebensumfeld(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
{
if (vv.VarFieldDefOid == 5 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldAlleinLebend = "x";
reportRo.LebensumfeldAlleinLebendCount++;
}
else if (vv.VarFieldDefOid == 6 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldMitPartnerLebend = "x";
reportRo.LebensumfeldMitPartnerLebendCount++;
}
else if (vv.VarFieldDefOid == 7 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldKinderImHaushalt = "x";
reportRo.LebensumfeldKinderImHaushaltCount++;
}
else if (vv.VarFieldDefOid == 8 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldKinderInAnderemHaushalt = "x";
reportRo.LebensumfeldKinderInAnderemHaushaltCount++;
}
else if (vv.VarFieldDefOid == 9 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldWohnhaftInHerkunftsfamilie = "x";
reportRo.LebensumfeldWohnhaftInHerkunftsfamilieCount++;
}
else if (vv.VarFieldDefOid == 10 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldInArbeit = "x";
reportRo.LebensumfeldInArbeitCount++;
}
else if (vv.VarFieldDefOid == 11 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldBeziehtAlg = "x";
reportRo.LebensumfeldBeziehtAlgCount++;
}
else if (vv.VarFieldDefOid == 12 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldBeziehtAlg2 = "x";
reportRo.LebensumfeldBeziehtAlg2Count++;
}
else if (vv.VarFieldDefOid == 13 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldBeziehtGrundsicherung = "x";
reportRo.LebensumfeldBeziehtGrundsicherungCount++;
}
else if (vv.VarFieldDefOid == 14 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldBeziehtRente = "x";
reportRo.LebensumfeldBeziehtRenteCount++;
}
}
private void SetzeFahrdienst(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
{
if (vv.VarFieldDefOid == 3)
{
if (varFieldValue.ToString() == "True")
{
ro.FahrdienstJa = "x";
reportRo.FahrdienstJaCount++;
}
else
{
//ro.FahrdienstNein = "x";
//reportRo.FahrdienstNeinCount++;
}
}
else if (vv.VarFieldDefOid == 4)
{
if (varFieldValue.ToString() == "True")
{
ro.FahrdienstErfolgt = "x";
reportRo.FahrdienstErfolgtCount++;
}
}
}
private void SetzeAngebot(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
{
if (vv.VarFieldDefOid == 2)
{
String angebot = varFieldValue as string;
if (angebot == "Beratung")
{
ro.AngebotBeratung = "x";
reportRo.AngebotBeratungCount++;
}
else if (angebot == "Begleitung")
{
ro.AngebotBegleitung = "x";
reportRo.AngebotBegleitungCount++;
}
else if (angebot == "Krisenintervention")
{
ro.AngebotKrisenIntervention = "x";
reportRo.AngebotKrisenInterventionCount++;
}
else if (angebot == "Beratung Angehöriger")
{
ro.AngebotBeratungAngehoeriger = "x";
reportRo.AngebotBeratungAngehoerigerCount++;
}
else if (angebot == "Hausbesuch")
{
ro.AngebotHausbesuch = "x";
reportRo.AngebotHausbesuchCount++;
}
}
else if (vv.VarFieldDefOid == 18)
{
if (varFieldValue.ToString() == "True")
{
ro.AngebotBeratung = "x";
reportRo.AngebotBeratungCount++;
}
}
else if (vv.VarFieldDefOid == 19)
{
if (varFieldValue.ToString() == "True")
{
ro.AngebotBegleitung = "x";
reportRo.AngebotBegleitungCount++;
}
}
else if (vv.VarFieldDefOid == 20)
{
if (varFieldValue.ToString() == "True")
{
ro.AngebotKrisenIntervention = "x";
reportRo.AngebotKrisenInterventionCount++;
}
}
else if (vv.VarFieldDefOid == 21)
{
if (varFieldValue.ToString() == "True")
{
ro.AngebotBeratungAngehoeriger = "x";
reportRo.AngebotBeratungAngehoerigerCount++;
}
}
else if (vv.VarFieldDefOid == 22)
{
if (varFieldValue.ToString() == "True")
{
ro.AngebotHausbesuch = "x";
reportRo.AngebotHausbesuchCount++;
}
}
}
private void SetzeNationalitaet(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
{
if (vv.VarFieldDefOid == 1)
{
String staatsang = varFieldValue as string;
if (!String.IsNullOrWhiteSpace(staatsang))
{
if (staatsang.ToLower().Contains("deutsch"))
{
ro.Deutsch = "x";
reportRo.DeutschCount++;
}
else
{
ro.Nationalitaet = staatsang;
reportRo.NationalitaetCount++;
}
}
}
}
private Dictionary<String, Wohnplatz> CreateStrassenschluesselDict()
{
var dict = new Dictionary<String, Wohnplatz>();
String sql = "Select StrassenName, HausNummer, Gemeinde, Wohnplatzname, Wohnplatznummer from Strassenschluessel";
var table = DAOFactory.AdoDAO.ExecuteQuery(sql).Tables[0];
foreach (DataRow row in table.Rows)
{
String strasse = row[0] as string;
String hausnr = row[1] as string;
String gemeinde = row[2] as string;
strasse = strasse.Replace(" ", "").Trim();
hausnr = hausnr.Replace(" ", "").Trim();
gemeinde = gemeinde.Replace(" ", "").Trim();
String key = String.Format("{0}{1} {2}", strasse, hausnr, gemeinde).ToLower();
if (!dict.ContainsKey(key))
{
Wohnplatz wp = new Wohnplatz();
wp.Strasse = row[0] as string;
wp.HausNummer = row[1] as string;
wp.Gemeinde = row[2] as string;
wp.Wohnplatzname = row[3] as string;
wp.Wohnplatznummer = row[4] as string;
dict.Add(key, wp);
}
else
{
String e = "ERROR";
}
}
return dict;
}
private class Wohnplatz
{
public String Strasse { get; set; }
public String HausNummer { get; set; }
public String Gemeinde { get; set; }
public String Wohnplatzname { get; set; }
public String Wohnplatznummer { get; set; }
}
}
}

View File

@@ -0,0 +1,123 @@
<?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>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

View File

@@ -18,10 +18,71 @@ namespace AlphaEv
{
public class CustomMitarbeiterstundenkontoBerechnung : MitarbeiterstundenkontoBerechnung
{
public override bool AddServiceRecordToDuration(ServiceRecord item)
{
if (!IsKrankheitAbsenceServiceRecord(item) && !IsUrlaubAbsenceServiceRecord(item))
{
return base.AddServiceRecordToDuration(item);
}
return false;
}
private bool IsKrankheitAbsenceServiceRecord(ServiceRecord item)
{
var cat = item.ServiceDescription.ServiceCategory.Name.ToLower();
if (cat.Contains("arztbesuch") ||
cat.Contains("krank"))
{
return true;
}
return false;
}
private bool IsUrlaubAbsenceServiceRecord(ServiceRecord item)
{
var cat = item.ServiceDescription.ServiceCategory.Name.ToLower();
if (cat.Contains("fortbildung") ||
cat.Contains("urlaub") ||
(cat.Contains("betrieb") && cat.Contains("zeiten")))
{
return true;
}
return false;
}
protected override AbsenceTimeHours GetAbwesenheitenDurchServiceRecords(MitarbeiterstundenkontoRO.EmployeeDetail empDetail, Contract c, IList<ServiceRecord> groupFilteredRecords,
DateTime berichtsAnfang, DateTime berichtsEnde)
{
AbsenceTimeHours ath = new AbsenceTimeHours();
foreach (var item in groupFilteredRecords)
{
if (item.Start.Value >= berichtsAnfang && item.Start.Value < berichtsEnde)
{
if (IsKrankheitAbsenceServiceRecord(item))
{
ath.StundenKrankheit += item.RoundedDuration / 60;
}
else if (IsUrlaubAbsenceServiceRecord(item))
{
ath.StundenUrlaub += item.RoundedDuration / 60;
}
}
}
return ath;
}
public override void HandleServiceRecord(MitarbeiterstundenkontoRO.EmployeeDetail emp, ServiceRecord item)
{
if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null && item.ServiceDescription.ServiceCategory.IsBillable)
if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null)
{
decimal duration = 0;
if (item.GroupRoundedDuration.HasValue)
@@ -33,13 +94,16 @@ namespace AlphaEv
duration = item.RoundedDuration;
}
if (!IstHauptbetreuer(item, emp))
if (item.ServiceDescription.ServiceCategory.IsBillable)
{
emp.Custom1 += duration / 60;
}
else
{
emp.Custom2 += duration / 60;
if (!IstHauptbetreuer(item, emp))
{
emp.Custom1 += duration / 60;
}
else
{
emp.Custom2 += duration / 60;
}
}
}
}

View File

@@ -88,6 +88,26 @@ namespace AlphaEv.Export
sb.Append(s);
}
oidList.Clear();
oidList.Add(10);
oidList.Add(13);
oidList.Add(14);
costDict = CreateHourlyRateDict(oidList, date);
oidList.Clear();
oidList.Add(10);
oidList.Add(13);
oidList.Add(14);
s = GetMonatlicheAbrechnungStringForCats(date, oidList, "4042", costDict);
if (!String.IsNullOrWhiteSpace(s))
{
if (sb.Length > 0)
sb.AppendLine();
sb.Append(s);
}
return sb.ToString();
}

View File

@@ -21,6 +21,17 @@ namespace AlphaEv
AuslastungBerechnung b = new AuslastungBerechnung();
b.CreateReport(pRO);
foreach (var ed in pRO.EmployeeDetailList)
{
foreach (var sd in ed.SupportConceptDetailList)
{
if (sd.Customer.Person.Address != null)
{
sd.Custom1 = sd.Customer.Person.Address.Town;
}
}
}
this.bindingSource1.DataSource = pRO;
}

View File

@@ -37,7 +37,9 @@ namespace AlphaEv
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -47,7 +49,9 @@ namespace AlphaEv
this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -73,8 +77,6 @@ namespace AlphaEv
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.fieldTotalSC = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldTotalEmp = new DevExpress.XtraReports.UI.CalculatedField();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -136,7 +138,7 @@ namespace AlphaEv
this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowDetail});
this.xrTableDetail.SizeF = new System.Drawing.SizeF(640F, 25F);
this.xrTableDetail.SizeF = new System.Drawing.SizeF(730F, 25F);
this.xrTableDetail.StylePriority.UseBorders = false;
this.xrTableDetail.StylePriority.UseFont = false;
this.xrTableDetail.StylePriority.UsePadding = false;
@@ -148,12 +150,28 @@ namespace AlphaEv
this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell8,
this.xrTableCell3,
this.xrTableCell11,
this.xrTableCell19,
this.xrTableCell2,
this.xrTableCell28});
this.xrTableRowDetail.Name = "xrTableRowDetail";
this.xrTableRowDetail.Weight = 1D;
//
// xrTableCell8
//
this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.SupportConceptDetailList.CustomerFullName")});
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell8.StylePriority.UsePadding = false;
this.xrTableCell8.StylePriority.UseTextAlignment = false;
xrSummary1.FormatString = "{0}";
xrSummary1.Func = DevExpress.XtraReports.UI.SummaryFunc.RecordNumber;
xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell8.Summary = xrSummary1;
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell8.Weight = 0.027051397655545539D;
//
// xrTableCell3
//
this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -165,7 +183,19 @@ namespace AlphaEv
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "xrTableCell3";
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell3.Weight = 0.15329125338142471D;
this.xrTableCell3.Weight = 0.14427412082957619D;
//
// xrTableCell11
//
this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.SupportConceptDetailList.Custom1")});
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell11.StylePriority.UsePadding = false;
this.xrTableCell11.StylePriority.UseTextAlignment = false;
this.xrTableCell11.Text = "xrTableCell11";
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell11.Weight = 0.12623985572587917D;
//
// xrTableCell19
//
@@ -173,7 +203,7 @@ namespace AlphaEv
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.SupportConceptDetailList.TimeRangeString", "{0:0.00}")});
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Text = "xrTableCell19";
this.xrTableCell19.Weight = 0.15329125338142471D;
this.xrTableCell19.Weight = 0.1352569882777277D;
//
// xrTableCell2
//
@@ -181,7 +211,7 @@ namespace AlphaEv
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.SupportConceptDetailList.OrganisationName")});
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Text = "xrTableCell2";
this.xrTableCell2.Weight = 0.15329125338142469D;
this.xrTableCell2.Weight = 0.13525698827772767D;
//
// xrTableCell28
//
@@ -189,7 +219,7 @@ namespace AlphaEv
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.SupportConceptDetailList.ApprovedHoursPerWeek", "{0:0.00}")});
this.xrTableCell28.Name = "xrTableCell28";
this.xrTableCell28.Text = "xrTableCell28";
this.xrTableCell28.Weight = 0.090171325518485085D;
this.xrTableCell28.Weight = 0.090171325518485071D;
//
// DetailReport
//
@@ -238,7 +268,7 @@ namespace AlphaEv
this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowHeader});
this.xrTableHeader.SizeF = new System.Drawing.SizeF(640F, 40F);
this.xrTableHeader.SizeF = new System.Drawing.SizeF(730F, 40F);
this.xrTableHeader.StylePriority.UseBorders = false;
this.xrTableHeader.StylePriority.UseFont = false;
this.xrTableHeader.StylePriority.UsePadding = false;
@@ -250,12 +280,23 @@ namespace AlphaEv
this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell7,
this.xrTableCell5,
this.xrTableCell10,
this.xrTableCell4,
this.xrTableCell1,
this.xrTableCell9});
this.xrTableRowHeader.Name = "xrTableRowHeader";
this.xrTableRowHeader.Weight = 1.5999999999999996D;
//
// xrTableCell7
//
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell7.StylePriority.UsePadding = false;
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "Nr.";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell7.Weight = 0.027051397767050643D;
//
// xrTableCell5
//
this.xrTableCell5.Name = "xrTableCell5";
@@ -264,19 +305,29 @@ namespace AlphaEv
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Klient/in";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell5.Weight = 0.15329125005316671D;
this.xrTableCell5.Weight = 0.14427411749965396D;
//
// xrTableCell10
//
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell10.StylePriority.UsePadding = false;
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.Text = "Wohnort";
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell10.Weight = 0.12623985595936307D;
//
// xrTableCell4
//
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Text = "Zeitraum";
this.xrTableCell4.Weight = 0.15329125478030675D;
this.xrTableCell4.Weight = 0.1352569896732812D;
//
// xrTableCell1
//
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Text = "Kostenträger";
this.xrTableCell1.Weight = 0.15329125478030678D;
this.xrTableCell1.Weight = 0.13525698967328126D;
//
// xrTableCell9
//
@@ -301,7 +352,7 @@ namespace AlphaEv
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(639.9999F, 25F);
this.xrTable1.SizeF = new System.Drawing.SizeF(729.9998F, 25F);
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.StylePriority.UsePadding = false;
@@ -327,17 +378,17 @@ namespace AlphaEv
this.xrTableCell35.StylePriority.UseTextAlignment = false;
this.xrTableCell35.Text = "Gesamt";
this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell35.Weight = 0.18034254096455143D;
this.xrTableCell35.Weight = 0.17132566933214943D;
//
// xrTableCell38
//
this.xrTableCell38.Name = "xrTableCell38";
this.xrTableCell38.Weight = 0.15329111579090118D;
this.xrTableCell38.Weight = 0.16230798742330319D;
//
// xrTableCell6
//
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Weight = 0.15329140580312939D;
this.xrTableCell6.Weight = 0.23444557577472514D;
//
// cellSollGesamt
//
@@ -345,7 +396,7 @@ namespace AlphaEv
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.ApprovedHoursPerWeek", "{0:0.00}")});
this.cellSollGesamt.Name = "cellSollGesamt";
this.cellSollGesamt.Text = "cellSollGesamt";
this.cellSollGesamt.Weight = 0.090171342851318267D;
this.cellSollGesamt.Weight = 0.090171315333212029D;
//
// bindingSource1
//
@@ -383,9 +434,9 @@ namespace AlphaEv
//
this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
this.xrPageInfo2.Format = "Seite {0} von {1}";
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(342.4169F, 25F);
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(460.0001F, 25F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(297.5831F, 23F);
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(269.9997F, 23F);
this.xrPageInfo2.StyleName = "PageInfo";
this.xrPageInfo2.StylePriority.UseFont = false;
this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
@@ -471,31 +522,6 @@ namespace AlphaEv
this.fieldTotalEmp.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldTotalEmp.Name = "fieldTotalEmp";
//
// xrTableCell7
//
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell7.StylePriority.UsePadding = false;
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "Nr.";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell7.Weight = 0.027051397767050643D;
//
// xrTableCell8
//
this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.SupportConceptDetailList.CustomerFullName")});
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell8.StylePriority.UsePadding = false;
this.xrTableCell8.StylePriority.UseTextAlignment = false;
xrSummary1.FormatString = "{0}";
xrSummary1.Func = DevExpress.XtraReports.UI.SummaryFunc.RecordNumber;
xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell8.Summary = xrSummary1;
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell8.Weight = 0.027051397655545539D;
//
// Mitarbeiterauslastung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -510,7 +536,7 @@ namespace AlphaEv
this.fieldTotalSC,
this.fieldTotalEmp});
this.DataSource = this.bindingSource1;
this.Margins = new System.Drawing.Printing.Margins(100, 30, 50, 30);
this.Margins = new System.Drawing.Printing.Margins(50, 30, 50, 30);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
@@ -574,5 +600,7 @@ namespace AlphaEv
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
}
}

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