Update Schulbegleitender Dienst und Arbeitszeit
This commit is contained in:
Waldi
15
BeWo.sln
15
BeWo.sln
@@ -369,6 +369,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BetreuungsBueroScholzReport
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BAPBielefelderAmbulantePflege", "ReportImp\BAPBielefelderAmbulantePflege\BAPBielefelderAmbulantePflege.csproj", "{7A7E980E-447C-444C-B43B-A23A20F52C02}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LebenshilfeMannheimEV", "ReportImp\LebenshilfeMannheimEV\LebenshilfeMannheimEV.csproj", "{0FDF87A6-B39E-4494-AE31-0CE302D8BA80}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|.NET = Debug|.NET
|
||||
@@ -2728,6 +2730,18 @@ Global
|
||||
{7A7E980E-447C-444C-B43B-A23A20F52C02}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{7A7E980E-447C-444C-B43B-A23A20F52C02}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{7A7E980E-447C-444C-B43B-A23A20F52C02}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{0FDF87A6-B39E-4494-AE31-0CE302D8BA80}.Debug|.NET.ActiveCfg = Debug|Any CPU
|
||||
{0FDF87A6-B39E-4494-AE31-0CE302D8BA80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{0FDF87A6-B39E-4494-AE31-0CE302D8BA80}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{0FDF87A6-B39E-4494-AE31-0CE302D8BA80}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{0FDF87A6-B39E-4494-AE31-0CE302D8BA80}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{0FDF87A6-B39E-4494-AE31-0CE302D8BA80}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{0FDF87A6-B39E-4494-AE31-0CE302D8BA80}.Release|.NET.ActiveCfg = Release|Any CPU
|
||||
{0FDF87A6-B39E-4494-AE31-0CE302D8BA80}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{0FDF87A6-B39E-4494-AE31-0CE302D8BA80}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{0FDF87A6-B39E-4494-AE31-0CE302D8BA80}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{0FDF87A6-B39E-4494-AE31-0CE302D8BA80}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{0FDF87A6-B39E-4494-AE31-0CE302D8BA80}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
@@ -2908,5 +2922,6 @@ Global
|
||||
{56D310FE-DB98-4EFE-8527-DF94628657F8} = {D8A691C5-146D-4613-86CC-438F02FE9106}
|
||||
{606566D9-B8B5-4522-A2B4-175F4BCE98DD} = {D8A691C5-146D-4613-86CC-438F02FE9106}
|
||||
{7A7E980E-447C-444C-B43B-A23A20F52C02} = {D8A691C5-146D-4613-86CC-438F02FE9106}
|
||||
{0FDF87A6-B39E-4494-AE31-0CE302D8BA80} = {D8A691C5-146D-4613-86CC-438F02FE9106}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
||||
@@ -182,6 +182,10 @@
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="SchulbegleitenderDienst\KrankheitsZeitraumView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="SchulbegleitenderDienst\SchulbegleitenderDienstBearbeitungsView.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
@@ -432,6 +436,10 @@
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="View\EmployeeArbeitszeitView.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="View\SchulbegleitenderDienstCustomer.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
@@ -534,6 +542,9 @@
|
||||
<Compile Include="ProxyLoginView.xaml.cs">
|
||||
<DependentUpon>ProxyLoginView.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="SchulbegleitenderDienst\KrankheitsZeitraumView.xaml.cs">
|
||||
<DependentUpon>KrankheitsZeitraumView.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="SchulbegleitenderDienst\SchulbegleitenderDienstBearbeitungsView.xaml.cs">
|
||||
<DependentUpon>SchulbegleitenderDienstBearbeitungsView.xaml</DependentUpon>
|
||||
</Compile>
|
||||
@@ -623,7 +634,10 @@
|
||||
<Compile Include="ViewModel\EmployeeAPPCodeVM.cs" />
|
||||
<Compile Include="ViewModel\ChatMessageVM.cs" />
|
||||
<Compile Include="ViewModel\ChatMediaMessageVM.cs" />
|
||||
<Compile Include="ViewModel\ArbeitszeitVM.cs" />
|
||||
<Compile Include="ViewModel\ArbeitszeitEintragVM.cs" />
|
||||
<Compile Include="ViewModel\KriterienVM.cs" />
|
||||
<Compile Include="ViewModel\ListViewModel\ArbeitszeitListVM.cs" />
|
||||
<Compile Include="ViewModel\VertretungVM.cs" />
|
||||
<Compile Include="ViewModel\PasswortVerlaufVM.cs" />
|
||||
<Compile Include="ViewModel\ListViewModel\BargeldkassenListVM.cs" />
|
||||
@@ -823,6 +837,9 @@
|
||||
<Compile Include="View\ChatEmojisView.xaml.cs">
|
||||
<DependentUpon>ChatEmojisView.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="View\EmployeeArbeitszeitView.xaml.cs">
|
||||
<DependentUpon>EmployeeArbeitszeitView.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="View\SchulbegleitenderDienstCustomer.xaml.cs">
|
||||
<DependentUpon>SchulbegleitenderDienstCustomer.xaml</DependentUpon>
|
||||
</Compile>
|
||||
|
||||
@@ -247,7 +247,7 @@
|
||||
|
||||
<!-- #Neuer Bereich Kinder Betreuungs gedoense Content=Schulbegleitender Dienst################ -->
|
||||
|
||||
<!--<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, AccountingTransactionView_View"
|
||||
<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, AccountingTransactionView_View"
|
||||
ImageSource="Ressources\Icons\CoinsDisabled.png" x:Name="button_SchulbegleitenderDienst"
|
||||
Click="Button_SchulbegleitenderDienst_OnClick" Style="{StaticResource NavBarButton}"
|
||||
Content="SBD" Background="{StaticResource SchulbegleitenderDienstContentBrush}"
|
||||
@@ -261,7 +261,7 @@
|
||||
<TranslateTransform X="0" Y="0" />
|
||||
</TransformGroup>
|
||||
</Button.RenderTransform>
|
||||
</localView:ImageButton>-->
|
||||
</localView:ImageButton>
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1464,8 +1464,6 @@ namespace BeWo.Scheduler.View
|
||||
OnPropertyChanged("SelectedEmployees");
|
||||
OnPropertyChanged("SelectedItems");
|
||||
OnPropertyChanged("ViewModel");
|
||||
|
||||
Scheduler.ActiveView.LayoutChanged();
|
||||
}
|
||||
|
||||
//private void ExportAsiCal(object sender, RoutedEventArgs e)
|
||||
|
||||
@@ -30,11 +30,13 @@ namespace BeWo.Scheduler.ViewModel
|
||||
set
|
||||
{
|
||||
if(value != null)
|
||||
{
|
||||
{
|
||||
mActiveAppointmentViewModel = value;
|
||||
|
||||
if(ViewModelChanged != null)
|
||||
if (ViewModelChanged != null)
|
||||
{
|
||||
ViewModelChanged.Invoke(this, new EventArgs<ISchedulerViewModel>(value));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
35
BeWo/SchulbegleitenderDienst/KrankheitsZeitraumView.xaml
Normal file
35
BeWo/SchulbegleitenderDienst/KrankheitsZeitraumView.xaml
Normal file
@@ -0,0 +1,35 @@
|
||||
<Window x:Class="BeWo.SchulbegleitenderDienst.KrankheitsZeitraumView"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
|
||||
Background="Transparent" Height="125" Width="400" WindowStyle="None">
|
||||
|
||||
<GroupBox Header="KrankheitsZeitraumView" x:Name="rootGroupBox" Style="{DynamicResource MainContentGroupBoxWithoutMaximizeBtnStyle}" Background="Transparent" MouseLeftButtonDown="RootGroupBox_OnMouseLeftButtonDown">
|
||||
<Grid Background="White">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="27"/>
|
||||
<RowDefinition Height="27"/>
|
||||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Label Content="Von: " Grid.Row="0" Grid.Column="0" Margin="2,2,2,2"/>
|
||||
<Label Content=" - " Grid.Row="0" Grid.Column="2" Margin="2,2,2,2"/>
|
||||
<Label Content="Bis: " Grid.Row="0" Grid.Column="3" Margin="2,2,2,2"/>
|
||||
<dxe:DateEdit Grid.Row="0" Grid.Column="1" Width="125" x:Name="DateVon" Margin="2,2,2,2"/>
|
||||
<dxe:DateEdit Grid.Row="0" Grid.Column="4" Width="125" x:Name="DateBis" Margin="2,2,2,2"/>
|
||||
|
||||
<Button Content="Schluss" Grid.Row="1" Grid.Column="3" Click="ButtonBase_OnClick" HorizontalAlignment="Right" Margin="2,2,2,2"/>
|
||||
<Button Content="Übernehmen" Grid.Row="1" Grid.Column="4" Click="RaisEvent_OnClick" HorizontalAlignment="Right" Margin="2,2,2,2"/>
|
||||
|
||||
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
</Window>
|
||||
88
BeWo/SchulbegleitenderDienst/KrankheitsZeitraumView.xaml.cs
Normal file
88
BeWo/SchulbegleitenderDienst/KrankheitsZeitraumView.xaml.cs
Normal file
@@ -0,0 +1,88 @@
|
||||
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.Shapes;
|
||||
|
||||
namespace BeWo.SchulbegleitenderDienst
|
||||
{
|
||||
/// <summary>
|
||||
/// Interaktionslogik für KrankheitsZeitraumView.xaml
|
||||
/// </summary>
|
||||
public partial class KrankheitsZeitraumView : Window
|
||||
{
|
||||
|
||||
public event EventHandler<KrankheitsEventArgs> RaiseCustomEvent;
|
||||
public KrankheitsZeitraumView( DateTime[] Zeitraum)
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
DateVon.DateTime = Zeitraum[0];
|
||||
DateBis.DateTime = Zeitraum[1];
|
||||
|
||||
CloseWindow();
|
||||
}
|
||||
|
||||
|
||||
private void RootGroupBox_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
DragMove();
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
public void CloseWindow()
|
||||
{
|
||||
CommandBindings.Add(
|
||||
new CommandBinding(
|
||||
ApplicationCommands.Close,
|
||||
(s, e) =>
|
||||
{
|
||||
Close();
|
||||
}));
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void RaisEvent_OnClick(object sender, RoutedEventArgs e)
|
||||
{
|
||||
string a = DateVon.DateTime.ToString();
|
||||
string b = DateBis.DateTime.ToString();
|
||||
|
||||
string x = a + " - " + b;
|
||||
|
||||
RaiseCustomEvent(this, new KrankheitsEventArgs(x));
|
||||
|
||||
CloseWindow();
|
||||
}
|
||||
|
||||
private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
|
||||
{
|
||||
CloseWindow();
|
||||
}
|
||||
}
|
||||
|
||||
public class KrankheitsEventArgs : EventArgs
|
||||
{
|
||||
public KrankheitsEventArgs(string s)
|
||||
{
|
||||
dc = s;
|
||||
}
|
||||
private string dc;
|
||||
public string Message
|
||||
{
|
||||
get { return dc; }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -6,8 +6,7 @@
|
||||
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
|
||||
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
|
||||
xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler"
|
||||
xmlns:dxschint="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/internal"
|
||||
xmlns:dxschui="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v13.1"
|
||||
xmlns:dxschint="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/internal"
|
||||
xmlns:dxscht="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/themekeys"
|
||||
xmlns:view="clr-namespace:BeWo.Scheduler.View"
|
||||
xmlns:converter="clr-namespace:BeWo.Converter"
|
||||
@@ -248,7 +247,7 @@
|
||||
<dxg:GridControl.Columns >
|
||||
|
||||
|
||||
<dxg:GridColumn FieldName="KrankerMitarbeiter" Width="200" />
|
||||
<dxg:GridColumn FieldName="KrankerMitarbeiter" Width="200" ReadOnly="True"/>
|
||||
<!--<dxg:GridColumn.CellStyle>
|
||||
<Style TargetType="{x:Type dxg:CellContentPresenter}">
|
||||
<Style.Triggers>
|
||||
@@ -260,7 +259,7 @@
|
||||
</dxg:GridColumn.CellStyle>-->
|
||||
<!--<dxe:ComboBoxEditSettings x:Name="ComboBoxEditSettingsVertretung"/>-->
|
||||
|
||||
<dxg:GridColumn FieldName="Kunde" Header="Kind" Width="200" >
|
||||
<dxg:GridColumn FieldName="Kunde" Header="Kind" Width="200" ReadOnly="True">
|
||||
<dxg:GridColumn.CellStyle>
|
||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
||||
<Style.Triggers>
|
||||
@@ -276,7 +275,7 @@
|
||||
</dxg:GridColumn>
|
||||
|
||||
|
||||
<dxg:GridColumn FieldName="Vertretung" Width="250" x:Name="ColumnVertretung" >
|
||||
<dxg:GridColumn FieldName="Vertretung" Width="250" x:Name="ColumnVertretung" ReadOnly="True">
|
||||
<dxg:GridColumn.EditSettings >
|
||||
<dxe:ButtonEditSettings x:Name="ButtonEditSet" AllowDefaultButton="False">
|
||||
<dxe:ButtonEditSettings.Buttons >
|
||||
@@ -292,8 +291,15 @@
|
||||
|
||||
|
||||
<dxg:GridColumn FieldName="KrankheitsMeldung" Width="200" />
|
||||
<dxg:GridColumn FieldName="KrankheitsZeitraum" Width="200"/>
|
||||
|
||||
<dxg:GridColumn FieldName="KrankheitsZeitraum" Width="200" ReadOnly="True">
|
||||
<dxg:GridColumn.EditSettings>
|
||||
<dxe:ComboBoxEditSettings DefaultButtonClick="KrankmeldungsZeitraumBearbeitungsView"/>
|
||||
</dxg:GridColumn.EditSettings>
|
||||
</dxg:GridColumn>
|
||||
|
||||
<!-- Maybee das gleiche wie oben -->
|
||||
<dxg:GridColumn FieldName="VertretungsZeitraum" Width="200" ReadOnly="True" />
|
||||
|
||||
<dxg:GridColumn FieldName="AbwesenheitsKategorie" Width="200">
|
||||
<dxg:GridColumn.EditSettings>
|
||||
@@ -330,7 +336,7 @@
|
||||
<dxg:GridControl x:Name="GridDataControlMitarbeiterWochenansicht" Visibility="Collapsed" Grid.Row="1" Grid.ColumnSpan="3" AllowDrop="true" Margin="5,5,5,5" VerticalContentAlignment="Center" >
|
||||
<dxg:GridControl.Columns >
|
||||
|
||||
<dxg:GridColumn FieldName="MaFrei" Header="Ma Frei" Width="175" >
|
||||
<dxg:GridColumn FieldName="MaFrei" Header="Mitarbeiter" Width="175" ReadOnly="True" >
|
||||
<!--<dxg:GridColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<Border BorderThickness="1" BorderBrush="Black"/>
|
||||
@@ -340,27 +346,37 @@
|
||||
|
||||
<dxg:GridColumn FieldName="Mo" Header="Mo" Width="25" />
|
||||
|
||||
<dxg:GridColumn FieldName="VertretungMo" Header="Eingesetzt bei" Width="175" >
|
||||
<dxg:GridColumn FieldName="EingesetztBeiMo" Header="Eingesetzt bei" Width="175" >
|
||||
<dxg:GridColumn.EditSettings >
|
||||
<dxe:ButtonEditSettings x:Name="ButtonEditSetMaMo" AllowDefaultButton="False">
|
||||
<dxe:ButtonEditSettings.Buttons >
|
||||
<dxe:ButtonInfo GlyphKind="Custom" ButtonKind="Simple" Click="ButtonEditSettings_OnDefaultButtonClick" >
|
||||
<dxe:ButtonInfo GlyphKind="Custom" ButtonKind="Simple" Click="ButtonEditSettingsAddKlient_OnDefaultButtonClick" >
|
||||
<dxe:ButtonInfo.Content>
|
||||
<Image Source ="../Ressources/Icons/Search.png" Width="20" Height="15" RenderOptions.BitmapScalingMode="HighQuality" x:Name="SearchImageButtonMaMo" ToolTip="Hidden Valley Suddenly Dead"/>
|
||||
</dxe:ButtonInfo.Content>
|
||||
</dxe:ButtonInfo>
|
||||
</dxe:ButtonEditSettings.Buttons>
|
||||
</dxe:ButtonEditSettings>
|
||||
</dxg:GridColumn.EditSettings>
|
||||
</dxg:GridColumn.EditSettings>
|
||||
<dxg:GridColumn.CellStyle>
|
||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiMo}" Value=" ">
|
||||
<Setter Property="Background" Value="DarkTurquoise" />
|
||||
<Setter Property="IsEnabled" Value="False" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</dxg:GridColumn.CellStyle>
|
||||
</dxg:GridColumn>
|
||||
|
||||
<dxg:GridColumn FieldName="Di" Header="Di" Width="25" />
|
||||
|
||||
<dxg:GridColumn FieldName="VertretungDi" Header="Eingesetzt bei" Width="175" >
|
||||
<dxg:GridColumn FieldName="EingesetztBeiDi" Header="Eingesetzt bei" Width="175" >
|
||||
<dxg:GridColumn.EditSettings >
|
||||
<dxe:ButtonEditSettings x:Name="ButtonEditSetMaDi" AllowDefaultButton="False">
|
||||
<dxe:ButtonEditSettings.Buttons >
|
||||
<dxe:ButtonInfo GlyphKind="Custom" ButtonKind="Simple" Click="ButtonEditSettings_OnDefaultButtonClick" >
|
||||
<dxe:ButtonInfo GlyphKind="Custom" ButtonKind="Simple" Click="ButtonEditSettingsAddKlient_OnDefaultButtonClick" >
|
||||
<dxe:ButtonInfo.Content>
|
||||
<Image Source ="../Ressources/Icons/Search.png" Width="20" Height="15" RenderOptions.BitmapScalingMode="HighQuality" x:Name="SearchImageButtonMaDi" ToolTip="Hidden Valley Suddenly Dead"/>
|
||||
</dxe:ButtonInfo.Content>
|
||||
@@ -368,15 +384,25 @@
|
||||
</dxe:ButtonEditSettings.Buttons>
|
||||
</dxe:ButtonEditSettings>
|
||||
</dxg:GridColumn.EditSettings>
|
||||
<dxg:GridColumn.CellStyle>
|
||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiDi}" Value=" ">
|
||||
<Setter Property="Background" Value="DarkTurquoise" />
|
||||
<Setter Property="IsEnabled" Value="False" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</dxg:GridColumn.CellStyle>
|
||||
</dxg:GridColumn>
|
||||
|
||||
<dxg:GridColumn FieldName="Mi" Header="Mi" Width="25" />
|
||||
|
||||
<dxg:GridColumn FieldName="VertretungMi" Header="Eingesetzt bei" Width="175" >
|
||||
<dxg:GridColumn FieldName="EingesetztBeiMi" Header="Eingesetzt bei" Width="175" >
|
||||
<dxg:GridColumn.EditSettings >
|
||||
<dxe:ButtonEditSettings x:Name="ButtonEditSetMaMi" AllowDefaultButton="False">
|
||||
<dxe:ButtonEditSettings.Buttons >
|
||||
<dxe:ButtonInfo GlyphKind="Custom" ButtonKind="Simple" Click="ButtonEditSettings_OnDefaultButtonClick" >
|
||||
<dxe:ButtonInfo GlyphKind="Custom" ButtonKind="Simple" Click="ButtonEditSettingsAddKlient_OnDefaultButtonClick" >
|
||||
<dxe:ButtonInfo.Content>
|
||||
<Image Source ="../Ressources/Icons/Search.png" Width="20" Height="15" RenderOptions.BitmapScalingMode="HighQuality" x:Name="SearchImageButtonMaMi" ToolTip="Hidden Valley Suddenly Dead"/>
|
||||
</dxe:ButtonInfo.Content>
|
||||
@@ -384,15 +410,25 @@
|
||||
</dxe:ButtonEditSettings.Buttons>
|
||||
</dxe:ButtonEditSettings>
|
||||
</dxg:GridColumn.EditSettings>
|
||||
<dxg:GridColumn.CellStyle>
|
||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiMi}" Value=" ">
|
||||
<Setter Property="Background" Value="DarkTurquoise" />
|
||||
<Setter Property="IsEnabled" Value="False" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</dxg:GridColumn.CellStyle>
|
||||
</dxg:GridColumn>
|
||||
|
||||
<dxg:GridColumn FieldName="Do" Header="Do" Width="25" />
|
||||
|
||||
<dxg:GridColumn FieldName="VertretungDo" Header="Eingesetzt bei" Width="175" >
|
||||
<dxg:GridColumn FieldName="EingesetztBeiDo" Header="Eingesetzt bei" Width="175" >
|
||||
<dxg:GridColumn.EditSettings >
|
||||
<dxe:ButtonEditSettings x:Name="ButtonEditSetMaDo" AllowDefaultButton="False">
|
||||
<dxe:ButtonEditSettings.Buttons >
|
||||
<dxe:ButtonInfo GlyphKind="Custom" ButtonKind="Simple" Click="ButtonEditSettings_OnDefaultButtonClick" >
|
||||
<dxe:ButtonInfo GlyphKind="Custom" ButtonKind="Simple" Click="ButtonEditSettingsAddKlient_OnDefaultButtonClick" >
|
||||
<dxe:ButtonInfo.Content>
|
||||
<Image Source ="../Ressources/Icons/Search.png" Width="20" Height="15" RenderOptions.BitmapScalingMode="HighQuality" x:Name="SearchImageButtonMaDo" ToolTip="Hidden Valley Suddenly Dead"/>
|
||||
</dxe:ButtonInfo.Content>
|
||||
@@ -400,15 +436,25 @@
|
||||
</dxe:ButtonEditSettings.Buttons>
|
||||
</dxe:ButtonEditSettings>
|
||||
</dxg:GridColumn.EditSettings>
|
||||
<dxg:GridColumn.CellStyle>
|
||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiDo}" Value=" ">
|
||||
<Setter Property="Background" Value="DarkTurquoise" />
|
||||
<Setter Property="IsEnabled" Value="False" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</dxg:GridColumn.CellStyle>
|
||||
</dxg:GridColumn>
|
||||
|
||||
<dxg:GridColumn FieldName="Fr" Header="Fr" Width="25" />
|
||||
|
||||
<dxg:GridColumn FieldName="VertretungFr" Header="Eingesetzt bei" Width="175" >
|
||||
<dxg:GridColumn FieldName="EingesetztBeiFr" Header="Eingesetzt bei" Width="175" >
|
||||
<dxg:GridColumn.EditSettings >
|
||||
<dxe:ButtonEditSettings x:Name="ButtonEditSetMaFr" AllowDefaultButton="False">
|
||||
<dxe:ButtonEditSettings.Buttons >
|
||||
<dxe:ButtonInfo GlyphKind="Custom" ButtonKind="Simple" Click="ButtonEditSettings_OnDefaultButtonClick" >
|
||||
<dxe:ButtonInfo GlyphKind="Custom" ButtonKind="Simple" Click="ButtonEditSettingsAddKlient_OnDefaultButtonClick" >
|
||||
<dxe:ButtonInfo.Content>
|
||||
<Image Source ="../Ressources/Icons/Search.png" Width="20" Height="15" RenderOptions.BitmapScalingMode="HighQuality" x:Name="SearchImageButtonMaFr" ToolTip="Hidden Valley Suddenly Dead"/>
|
||||
</dxe:ButtonInfo.Content>
|
||||
@@ -416,15 +462,25 @@
|
||||
</dxe:ButtonEditSettings.Buttons>
|
||||
</dxe:ButtonEditSettings>
|
||||
</dxg:GridColumn.EditSettings>
|
||||
<dxg:GridColumn.CellStyle>
|
||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiFr}" Value=" ">
|
||||
<Setter Property="Background" Value="DarkTurquoise" />
|
||||
<Setter Property="IsEnabled" Value="False" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</dxg:GridColumn.CellStyle>
|
||||
</dxg:GridColumn>
|
||||
|
||||
<dxg:GridColumn FieldName="Sa" Header="Sa" Width="25" />
|
||||
|
||||
<dxg:GridColumn FieldName="VertretungSa" Header="Eingesetzt bei" Width="175" >
|
||||
<dxg:GridColumn FieldName="EingesetztBeiSa" Header="Eingesetzt bei" Width="175" >
|
||||
<dxg:GridColumn.EditSettings >
|
||||
<dxe:ButtonEditSettings x:Name="ButtonEditSetMaSa" AllowDefaultButton="False">
|
||||
<dxe:ButtonEditSettings.Buttons >
|
||||
<dxe:ButtonInfo GlyphKind="Custom" ButtonKind="Simple" Click="ButtonEditSettings_OnDefaultButtonClick" >
|
||||
<dxe:ButtonInfo GlyphKind="Custom" ButtonKind="Simple" Click="ButtonEditSettingsAddKlient_OnDefaultButtonClick" >
|
||||
<dxe:ButtonInfo.Content>
|
||||
<Image Source ="../Ressources/Icons/Search.png" Width="20" Height="15" RenderOptions.BitmapScalingMode="HighQuality" x:Name="SearchImageButtonMaSa" ToolTip="Hidden Valley Suddenly Dead"/>
|
||||
</dxe:ButtonInfo.Content>
|
||||
@@ -432,6 +488,16 @@
|
||||
</dxe:ButtonEditSettings.Buttons>
|
||||
</dxe:ButtonEditSettings>
|
||||
</dxg:GridColumn.EditSettings>
|
||||
<dxg:GridColumn.CellStyle>
|
||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiSa}" Value=" ">
|
||||
<Setter Property="Background" Value="DarkTurquoise" />
|
||||
<Setter Property="IsEnabled" Value="False" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</dxg:GridColumn.CellStyle>
|
||||
</dxg:GridColumn>
|
||||
|
||||
</dxg:GridControl.Columns>
|
||||
@@ -444,10 +510,10 @@
|
||||
|
||||
<!--############################### Wochenüberblick Mitarbeiter ende ##############################################-->
|
||||
|
||||
<dxg:GridControl x:Name="GridDataControlKlientenWochenansicht" Visibility="Collapsed" Grid.Row="1" Grid.ColumnSpan="3" AllowDrop="true" Margin="5,5,5,5" VerticalContentAlignment="Center">
|
||||
<dxg:GridControl x:Name="GridDataControlKlientenWochenansicht" Visibility="Collapsed" Grid.Row="1" Grid.ColumnSpan="3" AllowDrop="true" Margin="5,5,5,5" VerticalContentAlignment="Center" BorderBrush="Black">
|
||||
<dxg:GridControl.Columns >
|
||||
|
||||
<dxg:GridColumn FieldName="MaKrank" Header="Ma Krank" Width="175" >
|
||||
<dxg:GridColumn FieldName="MaKrank" Header="Ma Krank" Width="175" ReadOnly="True" >
|
||||
<!--<dxg:GridColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<Border BorderThickness="1" BorderBrush="Black" Background="Transparent"/>
|
||||
@@ -455,7 +521,7 @@
|
||||
</dxg:GridColumn.CellTemplate>-->
|
||||
</dxg:GridColumn>
|
||||
|
||||
<dxg:GridColumn FieldName="Kind" Header="Kind" Width="175" >
|
||||
<dxg:GridColumn FieldName="Kind" Header="Kind" Width="175" ReadOnly="True" >
|
||||
<!--<dxg:GridColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<Border BorderThickness="1" BorderBrush="Black" Background="Transparent"/>
|
||||
@@ -476,7 +542,17 @@
|
||||
</dxe:ButtonInfo>
|
||||
</dxe:ButtonEditSettings.Buttons>
|
||||
</dxe:ButtonEditSettings>
|
||||
</dxg:GridColumn.EditSettings>
|
||||
</dxg:GridColumn.EditSettings>
|
||||
<dxg:GridColumn.CellStyle>
|
||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding RowData.Row.VertretungMo}" Value=" ">
|
||||
<Setter Property="Background" Value="DimGray" />
|
||||
<Setter Property="IsEnabled" Value="False" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</dxg:GridColumn.CellStyle>
|
||||
</dxg:GridColumn>
|
||||
|
||||
<dxg:GridColumn FieldName="Di" Header="Di" Width="25" />
|
||||
@@ -493,6 +569,16 @@
|
||||
</dxe:ButtonEditSettings.Buttons>
|
||||
</dxe:ButtonEditSettings>
|
||||
</dxg:GridColumn.EditSettings>
|
||||
<dxg:GridColumn.CellStyle>
|
||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding RowData.Row.VertretungDi}" Value=" ">
|
||||
<Setter Property="Background" Value="DimGray" />
|
||||
<Setter Property="IsEnabled" Value="False" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</dxg:GridColumn.CellStyle>
|
||||
</dxg:GridColumn>
|
||||
|
||||
<dxg:GridColumn FieldName="Mi" Header="Mi" Width="25" />
|
||||
@@ -509,6 +595,16 @@
|
||||
</dxe:ButtonEditSettings.Buttons>
|
||||
</dxe:ButtonEditSettings>
|
||||
</dxg:GridColumn.EditSettings>
|
||||
<dxg:GridColumn.CellStyle>
|
||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding RowData.Row.VertretungMi}" Value=" ">
|
||||
<Setter Property="Background" Value="DimGray" />
|
||||
<Setter Property="IsEnabled" Value="False" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</dxg:GridColumn.CellStyle>
|
||||
</dxg:GridColumn>
|
||||
|
||||
<dxg:GridColumn FieldName="Do" Header="Do" Width="25" />
|
||||
@@ -525,6 +621,16 @@
|
||||
</dxe:ButtonEditSettings.Buttons>
|
||||
</dxe:ButtonEditSettings>
|
||||
</dxg:GridColumn.EditSettings>
|
||||
<dxg:GridColumn.CellStyle>
|
||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding RowData.Row.VertretungDo}" Value=" ">
|
||||
<Setter Property="Background" Value="DimGray" />
|
||||
<Setter Property="IsEnabled" Value="False" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</dxg:GridColumn.CellStyle>
|
||||
</dxg:GridColumn>
|
||||
|
||||
<dxg:GridColumn FieldName="Fr" Header="Fr" Width="25" />
|
||||
@@ -541,6 +647,16 @@
|
||||
</dxe:ButtonEditSettings.Buttons>
|
||||
</dxe:ButtonEditSettings>
|
||||
</dxg:GridColumn.EditSettings>
|
||||
<dxg:GridColumn.CellStyle>
|
||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding RowData.Row.VertretungFr}" Value=" ">
|
||||
<Setter Property="Background" Value="DimGray" />
|
||||
<Setter Property="IsEnabled" Value="False" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</dxg:GridColumn.CellStyle>
|
||||
</dxg:GridColumn>
|
||||
|
||||
<dxg:GridColumn FieldName="Sa" Header="Sa" Width="25" />
|
||||
@@ -557,11 +673,21 @@
|
||||
</dxe:ButtonEditSettings.Buttons>
|
||||
</dxe:ButtonEditSettings>
|
||||
</dxg:GridColumn.EditSettings>
|
||||
<dxg:GridColumn.CellStyle>
|
||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding RowData.Row.VertretungSa}" Value=" ">
|
||||
<Setter Property="Background" Value="DimGray" />
|
||||
<Setter Property="IsEnabled" Value="False" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</dxg:GridColumn.CellStyle>
|
||||
</dxg:GridColumn>
|
||||
|
||||
</dxg:GridControl.Columns>
|
||||
<dxg:GridControl.View>
|
||||
<dxg:TableView AllowPerPixelScrolling="True" ShowTotalSummary="False" AutoWidth="True" ShowGridMenu="DataViewBase_OnShowGridMenu" CellValueChanged="GridViewWochenKlientBase_OnRowUpdated" />
|
||||
<dxg:GridControl.View>
|
||||
<dxg:TableView AllowPerPixelScrolling="True" ShowTotalSummary="False" AutoWidth="True" ShowGridMenu="DataViewBase_OnShowGridMenu" CellValueChanged="GridViewWochenKlientBase_OnRowUpdated" />
|
||||
</dxg:GridControl.View>
|
||||
</dxg:GridControl>
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -7,8 +7,11 @@
|
||||
Title="Chat Dokumentation" Height="500" Width="800" WindowStartupLocation="CenterScreen"
|
||||
ResizeMode="CanResizeWithGrip" WindowStyle="None" Background="Transparent">
|
||||
|
||||
<GroupBox Header="Schulbegleitende Bearbeitungs View" x:Name="rootGroupBox" Style="{DynamicResource MainContentGroupBoxWithoutMaximizeBtnStyle}" MouseLeftButtonDown="RootGroupBox_OnMouseLeftButtonDown">
|
||||
<Grid Background="White">
|
||||
<GroupBox Header="Schulbegleitende Bearbeitungs View" x:Name="rootGroupBox" Style="{DynamicResource MainContentGroupBoxWithoutMaximizeBtnStyle}" MouseLeftButtonDown="RootGroupBox_OnMouseLeftButtonDown" >
|
||||
<Grid>
|
||||
|
||||
|
||||
<Grid Background="White" x:Name="rootGroupBoxMitarbeiter" Visibility="Collapsed">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*"/>
|
||||
@@ -76,8 +79,36 @@
|
||||
<!-- #######################Closed="popup_Closed" Opened="popup_Opened"###StaysOpen="False"Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"#################################################################################### -->
|
||||
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
|
||||
|
||||
<!--####################################################### Klient hinzufügeview ########################################################-->
|
||||
|
||||
<Grid Background="White" x:Name="rootGroupBoxKlient" Visibility="Collapsed">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="25"/>
|
||||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<search:CustomerSearchView x:Name="Klientsearchview" Margin="3,3,3,3" Grid.Row="0" Grid.Column="0"/>
|
||||
|
||||
<Button Content="Übernehmen" Width="75" Click="ButtonBaseKlient_OnClick" Margin="3,3,3,3" Grid.Row="1" Grid.Column="1"/>
|
||||
|
||||
</Grid>
|
||||
|
||||
|
||||
|
||||
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
</Window>
|
||||
|
||||
|
||||
|
||||
@@ -42,8 +42,10 @@ namespace BeWo.SchulbegleitenderDienst
|
||||
|
||||
public event EventHandler<CustomEventArgs> RaiseCustomEvent;
|
||||
|
||||
public event EventHandler<CustomKlientEventArgs> RaiseKlientCustomEvent;
|
||||
|
||||
public SchulbegleitenderDienstBearbeitungsView()
|
||||
|
||||
public SchulbegleitenderDienstBearbeitungsView(int y)
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
@@ -53,6 +55,18 @@ namespace BeWo.SchulbegleitenderDienst
|
||||
CloseWindow();
|
||||
|
||||
|
||||
|
||||
|
||||
if (y == 1)
|
||||
{
|
||||
//y == 1 Mitarbeiterauswahl
|
||||
rootGroupBoxMitarbeiter.Visibility = Visibility.Visible;
|
||||
}else if (y == 2)
|
||||
{
|
||||
//y == 2 Klientenauswahl
|
||||
rootGroupBoxKlient.Visibility = Visibility.Visible;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -137,7 +151,10 @@ namespace BeWo.SchulbegleitenderDienst
|
||||
CompactEmployeeDC x = MitarbeiterVertretungsearchview.SelectedItem;
|
||||
|
||||
RaiseCustomEvent(this, new CustomEventArgs(x));
|
||||
|
||||
Close();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//Schließe aktuelles Fenster
|
||||
@@ -145,6 +162,19 @@ namespace BeWo.SchulbegleitenderDienst
|
||||
{
|
||||
Close();
|
||||
}
|
||||
|
||||
private void ButtonBaseKlient_OnClick(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (Klientsearchview.SelectedItem != null)
|
||||
{
|
||||
CompactCustomerDC x = Klientsearchview.SelectedItem;
|
||||
|
||||
RaiseKlientCustomEvent(this, new CustomKlientEventArgs(x));
|
||||
|
||||
Close();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public class CustomEventArgs : EventArgs
|
||||
@@ -159,4 +189,19 @@ namespace BeWo.SchulbegleitenderDienst
|
||||
get { return dc; }
|
||||
}
|
||||
}
|
||||
|
||||
public class CustomKlientEventArgs : EventArgs
|
||||
{
|
||||
private CompactCustomerDC dc;
|
||||
|
||||
public CustomKlientEventArgs(CompactCustomerDC s)
|
||||
{
|
||||
dc = s;
|
||||
}
|
||||
|
||||
public CompactCustomerDC Message
|
||||
{
|
||||
get { return dc; }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -504,6 +504,10 @@ namespace BeWo.ServiceProxy
|
||||
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetActiveCompactEmployeeWithOidBeWoFaultFault" +
|
||||
"", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
|
||||
BS.Shared.DataContracts.Compact.CompactEmployeeDC GetActiveCompactEmployeeWithOid(long employeeOid);
|
||||
|
||||
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/InsertNewArbeitsZeit", ReplyAction="http://tempuri.org/IEmployeeService/InsertNewArbeitsZeitResponse")]
|
||||
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/InsertNewArbeitsZeitBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
|
||||
void InsertNewArbeitsZeit(BS.Shared.DataContracts.ArbeitszeitDC arbeitszeit, BS.Shared.DataContracts.ArbeitszeitEintragDC arbeitszeitEintrag);
|
||||
}
|
||||
|
||||
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
|
||||
@@ -939,6 +943,11 @@ namespace BeWo.ServiceProxy
|
||||
{
|
||||
return base.Channel.GetActiveCompactEmployeeWithOid(employeeOid);
|
||||
}
|
||||
|
||||
public void InsertNewArbeitsZeit(BS.Shared.DataContracts.ArbeitszeitDC arbeitszeit, BS.Shared.DataContracts.ArbeitszeitEintragDC arbeitszeitEintrag)
|
||||
{
|
||||
base.Channel.InsertNewArbeitsZeit(arbeitszeit, arbeitszeitEintrag);
|
||||
}
|
||||
}
|
||||
|
||||
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
|
||||
@@ -4141,16 +4150,32 @@ namespace BeWo.ServiceProxy
|
||||
|
||||
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeleteVertretung", ReplyAction="http://tempuri.org/IOperationsService/DeleteVertretungResponse")]
|
||||
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeleteVertretungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
|
||||
void DeleteVertretung(BS.Shared.DataContracts.VertretungDC vert);
|
||||
void DeleteVertretung(long vert);
|
||||
|
||||
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateVertretung", ReplyAction="http://tempuri.org/IOperationsService/UpdateVertretungResponse")]
|
||||
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateVertretungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
|
||||
void UpdateVertretung(BS.Shared.DataContracts.VertretungDC vert);
|
||||
void UpdateVertretung(BS.Shared.DataContracts.VertretungDC vert, BS.Shared.DataContracts.AbsenceReasonDC absenceReason);
|
||||
|
||||
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/VertretungsListe", ReplyAction="http://tempuri.org/IOperationsService/VertretungsListeResponse")]
|
||||
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/VertretungsListeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
|
||||
BS.Shared.DataContracts.VertretungsListeDC VertretungsListe(System.DateTime absenceTime);
|
||||
|
||||
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CreateVertretung", ReplyAction="http://tempuri.org/IOperationsService/CreateVertretungResponse")]
|
||||
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateVertretungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
|
||||
BS.Shared.DataContracts.VertretungDC CreateVertretung(long mitarbeiterOid, long klientenOid, long vertretenderMitarbeiterOid, long absencetimeOid, string notiz, System.DateTime vertretungszeitraumVon, System.DateTime vertretungszeitraumBis);
|
||||
|
||||
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeletAbsenceTime", ReplyAction="http://tempuri.org/IOperationsService/DeletAbsenceTimeResponse")]
|
||||
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeletAbsenceTimeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
|
||||
void DeletAbsenceTime(long absenceoid);
|
||||
|
||||
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeactivateAbsenceTime", ReplyAction="http://tempuri.org/IOperationsService/DeactivateAbsenceTimeResponse")]
|
||||
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeactivateAbsenceTimeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
|
||||
void DeactivateAbsenceTime(System.Collections.Generic.Dictionary<long, long> pOid2Version);
|
||||
|
||||
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAlleArbeitszeiten", ReplyAction="http://tempuri.org/IOperationsService/GetAlleArbeitszeitenResponse")]
|
||||
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAlleArbeitszeitenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
|
||||
BS.Shared.DataContracts.ArbeitszeitListeDC GetAlleArbeitszeiten(long employeeOid);
|
||||
|
||||
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeactivateInvoices", ReplyAction="http://tempuri.org/IOperationsService/DeactivateInvoicesResponse")]
|
||||
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeactivateInvoicesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
|
||||
void DeactivateInvoices(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceDC> invoices);
|
||||
@@ -4861,14 +4886,14 @@ namespace BeWo.ServiceProxy
|
||||
base.Channel.InsertNewKlientenVertretung(vertretungK, absenceReasonOid, krankheitsMeldung);
|
||||
}
|
||||
|
||||
public void DeleteVertretung(BS.Shared.DataContracts.VertretungDC vert)
|
||||
public void DeleteVertretung(long vert)
|
||||
{
|
||||
base.Channel.DeleteVertretung(vert);
|
||||
}
|
||||
|
||||
public void UpdateVertretung(BS.Shared.DataContracts.VertretungDC vert)
|
||||
public void UpdateVertretung(BS.Shared.DataContracts.VertretungDC vert, BS.Shared.DataContracts.AbsenceReasonDC absenceReason)
|
||||
{
|
||||
base.Channel.UpdateVertretung(vert);
|
||||
base.Channel.UpdateVertretung(vert, absenceReason);
|
||||
}
|
||||
|
||||
public BS.Shared.DataContracts.VertretungsListeDC VertretungsListe(System.DateTime absenceTime)
|
||||
@@ -4876,6 +4901,26 @@ namespace BeWo.ServiceProxy
|
||||
return base.Channel.VertretungsListe(absenceTime);
|
||||
}
|
||||
|
||||
public BS.Shared.DataContracts.VertretungDC CreateVertretung(long mitarbeiterOid, long klientenOid, long vertretenderMitarbeiterOid, long absencetimeOid, string notiz, System.DateTime vertretungszeitraumVon, System.DateTime vertretungszeitraumBis)
|
||||
{
|
||||
return base.Channel.CreateVertretung(mitarbeiterOid, klientenOid, vertretenderMitarbeiterOid, absencetimeOid, notiz, vertretungszeitraumVon, vertretungszeitraumBis);
|
||||
}
|
||||
|
||||
public void DeletAbsenceTime(long absenceoid)
|
||||
{
|
||||
base.Channel.DeletAbsenceTime(absenceoid);
|
||||
}
|
||||
|
||||
public void DeactivateAbsenceTime(System.Collections.Generic.Dictionary<long, long> pOid2Version)
|
||||
{
|
||||
base.Channel.DeactivateAbsenceTime(pOid2Version);
|
||||
}
|
||||
|
||||
public BS.Shared.DataContracts.ArbeitszeitListeDC GetAlleArbeitszeiten(long employeeOid)
|
||||
{
|
||||
return base.Channel.GetAlleArbeitszeiten(employeeOid);
|
||||
}
|
||||
|
||||
public void DeactivateInvoices(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceDC> invoices)
|
||||
{
|
||||
base.Channel.DeactivateInvoices(invoices);
|
||||
|
||||
@@ -686,6 +686,8 @@
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem Header="Dokumente" Name="tabitem_documents" Selector.Selected="tabitem_documents_Selected" />
|
||||
|
||||
<TabItem Header="Arbeitszeit" Name="tabitem_arbeitszeit" Selector.Selected="tabitem_arbeitszeit_Selected" />
|
||||
|
||||
<TabItem Header="Chat Service" Name="tabitem_chatservice" Selector.Selected="tabitem_chatservice_Selected" />
|
||||
|
||||
|
||||
@@ -441,6 +441,14 @@ namespace BeWo.View.Detail
|
||||
}
|
||||
}
|
||||
|
||||
private void tabitem_arbeitszeit_Selected(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (tabitem_arbeitszeit.Content == null)
|
||||
{
|
||||
tabitem_arbeitszeit.Content = new EmployeeArbeitszeitView(TableID.Employee, ViewModel.DataContract.EmployeeOid.Value);
|
||||
}
|
||||
}
|
||||
|
||||
private void tabitem_chatservice_Selected(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (tabitem_chatservice.Content == null)
|
||||
|
||||
206
BeWo/View/EmployeeArbeitszeitView.xaml
Normal file
206
BeWo/View/EmployeeArbeitszeitView.xaml
Normal file
@@ -0,0 +1,206 @@
|
||||
<localView:BeWoView x:Class="BeWo.View.EmployeeArbeitszeitView"
|
||||
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:localViewModel="clr-namespace:BeWo.ViewModel"
|
||||
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
|
||||
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
|
||||
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
|
||||
xmlns:diagnostics="clr-namespace:System.Diagnostics;assembly=WindowsBase"
|
||||
xmlns:controls="clr-namespace:BeWo.View.Controls"
|
||||
xmlns:validation="clr-namespace:BeWo.Validation"
|
||||
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
|
||||
xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
|
||||
xmlns:sys="clr-namespace:System;assembly=mscorlib"
|
||||
xmlns:shared="clr-namespace:BS.Shared;assembly=BS.Shared"
|
||||
VerticalAlignment="Stretch" Focusable="True">
|
||||
<localView:BeWoView.Resources>
|
||||
<Style x:Key="bargeldkassenListBoxItemStyle" TargetType="{x:Type ListBoxItem}">
|
||||
<Setter Property="Background" Value="#00FFFFFF" />
|
||||
<Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ItemsControl}}}" />
|
||||
<Setter Property="VerticalContentAlignment" Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ItemsControl}}}" />
|
||||
<Setter Property="Padding" Value="2,0,0,0" />
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type ListBoxItem}">
|
||||
<Border x:Name="Bd" SnapsToDevicePixels="True" Background="{TemplateBinding Background}"
|
||||
BorderBrush="{TemplateBinding BorderBrush}"
|
||||
BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}">
|
||||
<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
|
||||
Content="{TemplateBinding Content}"
|
||||
ContentStringFormat="{TemplateBinding ContentStringFormat}"
|
||||
ContentTemplate="{TemplateBinding ContentTemplate}" />
|
||||
</Border>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsEnabled" Value="False">
|
||||
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<ObjectDataProvider MethodName="GetValues"
|
||||
ObjectType="{x:Type sys:Enum}"
|
||||
x:Key="AppointmentDayOfWeeks">
|
||||
<ObjectDataProvider.MethodParameters>
|
||||
<x:Type TypeName="shared:AppointmentDayOfWeek" />
|
||||
</ObjectDataProvider.MethodParameters>
|
||||
</ObjectDataProvider>
|
||||
</localView:BeWoView.Resources>
|
||||
|
||||
<Grid>
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<GroupBox Grid.ColumnSpan="2" Padding="5" Style="{StaticResource ObjectEditGroupBox}" Header="Arbeitszeit">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<StackPanel Orientation="Vertical" Grid.RowSpan="2">
|
||||
<Button Content="Neue Arbeitszeit hinzufügen" Margin="3" HorizontalAlignment="Left" IsEnabled="{Binding Path=DarfBargeldTransaktionAnlegen, RelativeSource={RelativeSource AncestorType={x:Type localView:BargeldkassenView}}}" Click="ButtonOpenAndAddArbeitszeitClick" />
|
||||
|
||||
<!--#################################### TabControll ItemsSource="{Binding Contracts.VMList}" Visibility="{Binding IsSelected, RelativeSource={RelativeSource AncestorType={x:Type TabItem}}, Converter={StaticResource BoolVisibilityConverter}}"######################################################################################################-->
|
||||
<TabControl x:Name="tabcontrol_Arbeitszeit" Margin="5">
|
||||
|
||||
<TabControl.ItemTemplate>
|
||||
|
||||
<DataTemplate>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Label Content="bitch pleas" />
|
||||
|
||||
|
||||
<Button
|
||||
VerticalAlignment="Center" Height="20" Name="btn_deleteContract"
|
||||
Click="btn_deleteArbeitszeit_Click"
|
||||
ToolTip="Arbeitszeit löschen"
|
||||
Style="{DynamicResource CloseButtonStyle}" Margin="0" />
|
||||
|
||||
</StackPanel>
|
||||
</DataTemplate>
|
||||
</TabControl.ItemTemplate>
|
||||
<TabControl.ContentTemplate>
|
||||
<DataTemplate>
|
||||
|
||||
<ScrollViewer HorizontalScrollBarVisibility="Auto"
|
||||
VerticalScrollBarVisibility="Auto">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
|
||||
<GroupBox Margin="5" Style="{DynamicResource ObjectEditGroupBox}">
|
||||
|
||||
<GroupBox.Header>
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="23" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<TextBlock Text="Details" Margin="0 1" Grid.Row="1" Name="Details"
|
||||
VerticalAlignment="Bottom"
|
||||
TextElement.FontSize="16"
|
||||
TextElement.Foreground="{StaticResource TabItemHotTextBrush}"
|
||||
TextElement.FontFamily="Microsoft Sans Serif"
|
||||
/>
|
||||
|
||||
|
||||
<!--############# Hier der bereich für die daten #########EditValue="{Binding Path=ContractEndDate, UpdateSourceTrigger=PropertyChanged}"#######EditValue="{Binding Path=EntryDate, UpdateSourceTrigger=PropertyChanged}" #########-->
|
||||
|
||||
<Grid Margin="0" Grid.Row="0" Grid.ColumnSpan="2">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Label Grid.Column="0" Grid.Row="0" Margin="0,3,3,3" VerticalAlignment="Center" >Arbeitszeit Von</Label>
|
||||
<Label Grid.Column="2" Grid.Row="0" Margin="3" VerticalAlignment="Center">Arbeitszeit Bis</Label>
|
||||
|
||||
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" AllowNullInput="True" Grid.Column="1" Grid.Row="0" Margin="3" Width="125" Height="23" Name="ArbeitszeitVon"/>
|
||||
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" AllowNullInput="True" Grid.Column="3" Grid.Row="0" Margin="3" Width="125" Height="23" Name="ArbeitszeitBis" />
|
||||
|
||||
|
||||
<Label Grid.Column="0" Grid.Row="1" Margin="0,3,3,3" VerticalAlignment="Center">Tag</Label>
|
||||
<Label Grid.Column="2" Grid.Row="1" Margin="3" VerticalAlignment="Center">Uhrzeit Von</Label>
|
||||
<Label Grid.Column="4" Grid.Row="1" Margin="3" VerticalAlignment="Center">Uhrzeit Bis</Label>
|
||||
|
||||
|
||||
<dxe:ComboBoxEdit Grid.Column="1" Grid.Row="1" VerticalContentAlignment="Center" Margin="3" Height="23" ItemsSource="{Binding Source={StaticResource AppointmentDayOfWeeks}}" Name="Tag"/>
|
||||
|
||||
<dxe:TextEdit Grid.Column="3" Grid.Row="1" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True" Name="UhrzeitVon"
|
||||
MaskUseAsDisplayFormat="True" InvalidValueBehavior="AllowLeaveEditor"
|
||||
Height="23"
|
||||
Margin="3,3,3,3"/>
|
||||
|
||||
<dxe:TextEdit Grid.Column="5" Grid.Row="1" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True" Name="UhrzeitBis"
|
||||
MaskUseAsDisplayFormat="True" InvalidValueBehavior="AllowLeaveEditor"
|
||||
Height="23" Width="125"
|
||||
Margin="3,3,3,3"/>
|
||||
|
||||
<Button Grid.Row="1" Grid.Column="6" Grid.ColumnSpan="2" Content="Hinzufügen" HorizontalAlignment="Right" Click="AddArbeitszeitToView_Click" Height="23"/>
|
||||
|
||||
</Grid>
|
||||
|
||||
<!--###############################EditValue="{Binding Path=ContractEndDate, UpdateSourceTrigger=PropertyChanged}"############ EditValue="{Binding Mode=TwoWay, Path=StartTimeEditString, UpdateSourceTrigger=PropertyChanged}"# EditValue="{Binding Mode=TwoWay, Path=StartTimeEditString, UpdateSourceTrigger=PropertyChanged}"###########################-->
|
||||
</Grid>
|
||||
</GroupBox.Header>
|
||||
|
||||
<dxg:GridControl Name="grid_bargeldtransaktionen" Tag="{Binding}" MaxWidth="{Binding ElementName=BlubbTest, Path=ActualWidth}" >
|
||||
<dxg:GridControl.Columns>
|
||||
|
||||
<dxg:GridColumn Header="Tag" FixedWidth="True" Width="250" ReadOnly="True" />
|
||||
<dxg:GridColumn Header="Uhrzeit Von" FixedWidth="True" Width="250" ReadOnly="True" />
|
||||
<dxg:GridColumn Header="Uhrzeit Bis" FixedWidth="True" Width="250" ReadOnly="True" />
|
||||
<dxg:GridColumn Header="Notiz" FixedWidth="True" Width="250" ReadOnly="True" />
|
||||
|
||||
</dxg:GridControl.Columns>
|
||||
<dxg:GridControl.View>
|
||||
<dxg:TableView NavigationStyle="Cell" Margin="2,2,2,2" AutoWidth="True" ShowGroupPanel="False" ShowGroupedColumns="False" ShowTotalSummary="False" />
|
||||
</dxg:GridControl.View>
|
||||
</dxg:GridControl>
|
||||
|
||||
</GroupBox>
|
||||
</Grid>
|
||||
</ScrollViewer>
|
||||
</DataTemplate>
|
||||
</TabControl.ContentTemplate>
|
||||
</TabControl>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
</localView:BeWoView>
|
||||
283
BeWo/View/EmployeeArbeitszeitView.xaml.cs
Normal file
283
BeWo/View/EmployeeArbeitszeitView.xaml.cs
Normal file
@@ -0,0 +1,283 @@
|
||||
using System;
|
||||
using System.ComponentModel;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Controls.Primitives;
|
||||
using System.Windows.Documents;
|
||||
using System.Windows.Input;
|
||||
using System.Windows.Media;
|
||||
using System.Windows.Navigation;
|
||||
using System.Windows.Threading;
|
||||
|
||||
using BeWo.Core;
|
||||
using BeWo.ViewModel;
|
||||
using BeWo.ServiceProxy;
|
||||
|
||||
using BS.Shared.DataContracts;
|
||||
using BS.Shared.Extensions;
|
||||
using BS.Shared;
|
||||
using BS.Shared.Core;
|
||||
using DevExpress.Xpf.Editors;
|
||||
using Microsoft.Win32;
|
||||
|
||||
namespace BeWo.View
|
||||
{
|
||||
public partial class EmployeeArbeitszeitView
|
||||
{
|
||||
|
||||
private ArbeitszeitVM _ArbeitszeitViewModel;
|
||||
|
||||
private ArbeitszeitEintragVM _ArbeitszeitEintragViewModel;
|
||||
|
||||
long? employeeOid;
|
||||
|
||||
public EmployeeArbeitszeitView(TableID pObjectTid, long? oid)
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
employeeOid = oid;
|
||||
|
||||
// LaodInfostoView();
|
||||
|
||||
ReloadViewModel();
|
||||
|
||||
//AppointmentDayOfWeeks
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
public ArbeitszeitVM PublicViewModel { get { return _ArbeitszeitViewModel; } }
|
||||
|
||||
|
||||
public override bool IsDirty
|
||||
{
|
||||
get
|
||||
{
|
||||
return ArbeitszeitViewModel != null && ArbeitszeitViewModel.IsDirty || ArbeitszeitEintragViewModel != null && ArbeitszeitEintragViewModel.IsDirty;
|
||||
}
|
||||
}
|
||||
|
||||
private ArbeitszeitVM ArbeitszeitViewModel
|
||||
{
|
||||
get { return _ArbeitszeitViewModel; }
|
||||
|
||||
set
|
||||
{
|
||||
DataContext = value;
|
||||
_ArbeitszeitViewModel = value;
|
||||
}
|
||||
}
|
||||
|
||||
private ArbeitszeitEintragVM ArbeitszeitEintragViewModel
|
||||
{
|
||||
get { return _ArbeitszeitEintragViewModel; }
|
||||
|
||||
set
|
||||
{
|
||||
DataContext = value;
|
||||
_ArbeitszeitEintragViewModel = value;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void ReloadViewModel()
|
||||
{
|
||||
|
||||
//hole hier die Arbeistzeiten raus und füge dieser der view hinzu
|
||||
|
||||
ArbeitszeitListeDC arListe = new ArbeitszeitListeDC();
|
||||
|
||||
ServiceFacade.DoOperationsServiceAsync(s => s.GetAlleArbeitszeiten(employeeOid.Value), r => this.Dispatch(
|
||||
delegate
|
||||
{
|
||||
|
||||
arListe.ArbeitszeitEintragliste = r.ArbeitszeitEintragliste;
|
||||
arListe.Arbeitszeitliste = r.Arbeitszeitliste;
|
||||
|
||||
|
||||
if(arListe.ArbeitszeitEintragliste.Count != 0)
|
||||
ArbeitszeitEintragViewModel = new ArbeitszeitEintragVM(arListe.ArbeitszeitEintragliste[0]);
|
||||
|
||||
if(arListe.Arbeitszeitliste.Count != 0)
|
||||
ArbeitszeitViewModel = new ArbeitszeitVM(arListe.Arbeitszeitliste[0]);
|
||||
|
||||
|
||||
}));
|
||||
|
||||
}
|
||||
|
||||
|
||||
//###################### Popup Arbeitszeit ###########################################
|
||||
private void ButtonOpenAndAddArbeitszeitClick(object sender, RoutedEventArgs e)
|
||||
{
|
||||
//Verträge pendant
|
||||
//ViewModel.Contracts.AddNewVMToList();
|
||||
//tabcontrol_contracts.SelectedIndex = tabcontrol_contracts.Items.Count - 1;
|
||||
|
||||
|
||||
TabItem newTabItem = new TabItem
|
||||
{
|
||||
Header = "Neuer Vertrag",
|
||||
Name = "NeuerVertrag"
|
||||
};
|
||||
tabcontrol_Arbeitszeit.Items.Add(newTabItem);
|
||||
|
||||
tabcontrol_Arbeitszeit.SelectedIndex = tabcontrol_Arbeitszeit.Items.Count - 1;
|
||||
|
||||
}
|
||||
|
||||
|
||||
private void ClosePopupNewArbeitszeit_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
//popup_newArbeitszeit.IsOpen = false;
|
||||
}
|
||||
|
||||
private void AddArbeitszeit_OnClick(object sender, RoutedEventArgs e)
|
||||
{
|
||||
/* Beispiel von Bargeldkassen
|
||||
if (!Validate(groupbox_newBargeldkasse))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var neu = ViewModel.NewVM;
|
||||
neu.ObjectOid = currentObjectOid;
|
||||
neu.ObjectTid = currentObjectTid;
|
||||
|
||||
ServiceFacade.DoOperationsServiceAsync(s => s.InsertNewBargeldkasse(neu.CommitToDataContract()), r => this.Dispatch(delegate
|
||||
{
|
||||
popup_newBargeldkasse.IsOpen = false;
|
||||
|
||||
ViewModel.NewVM = new BargeldkassenVM(new BargeldkassenDC());
|
||||
|
||||
ReloadViewModel();
|
||||
}));
|
||||
*/
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
//#####################################################################################
|
||||
private void btn_deleteArbeitszeit_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
//Verträge pendant
|
||||
//var contract = tabcontrol_contracts.SelectedItem as ContractVM;
|
||||
//ViewModel.Contracts.VMList.Remove(contract);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
private void AddArbeitszeitToView_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
AddNewArbeitsZeit();
|
||||
}
|
||||
|
||||
|
||||
public void AddNewArbeitsZeit()
|
||||
{
|
||||
var tab = tabcontrol_Arbeitszeit.Items.GetItemAt(tabcontrol_Arbeitszeit.SelectedIndex);
|
||||
|
||||
var tabbi = (TabItem)tab;
|
||||
|
||||
//Auslagern
|
||||
var DE = tabcontrol_Arbeitszeit.GetAllChildren().OfType<DateEdit>();
|
||||
var CBE = tabcontrol_Arbeitszeit.GetAllChildren().OfType<ComboBoxEdit>();
|
||||
var TE = tabcontrol_Arbeitszeit.GetAllChildren().OfType<TextEdit>();
|
||||
|
||||
var AV = DE.First(x => x.Name.Equals("ArbeitszeitVon"));
|
||||
var AB = DE.First(x => x.Name.Equals("ArbeitszeitBis"));
|
||||
|
||||
var TAG = CBE.First(x => x.Name.Equals("Tag"));
|
||||
|
||||
var UV = TE.First(x => x.Name.Equals("UhrzeitVon"));
|
||||
var UB = TE.First(x => x.Name.Equals("UhrzeitBis"));
|
||||
|
||||
var dateAVon = AV.DateTime;
|
||||
var dateABis = AB.DateTime;
|
||||
|
||||
var AnTagenWieDiese = TAG.SelectedText;
|
||||
|
||||
var UVon = UV.Text;
|
||||
var UBis = UB.Text;
|
||||
//Auslagern
|
||||
|
||||
tabbi.Header = dateAVon.ToString("dd.MM.yyyy") + " - " + dateABis.ToString("dd.MM.yyyy");
|
||||
|
||||
//erstelle hier den ServiceAufruf für die Arbeitszeit
|
||||
|
||||
|
||||
ArbeitszeitDC arbeitszeit = new ArbeitszeitDC();
|
||||
arbeitszeit.EmployeeOid = employeeOid;
|
||||
arbeitszeit.GueltigVon = dateAVon;
|
||||
arbeitszeit.GueltigBis = dateABis;
|
||||
arbeitszeit.Notice = "Eine notiz muss noch auf die view";
|
||||
|
||||
|
||||
ArbeitszeitEintragDC arbeitszeitEintrag = new ArbeitszeitEintragDC();
|
||||
arbeitszeitEintrag.Tag = (AppointmentDayOfWeek)TAG.SelectedItem; //den tag in
|
||||
arbeitszeitEintrag.UhrzeitVon = UVon; //zu string umschreiben
|
||||
arbeitszeitEintrag.UhrzeitBis = UBis; //zu string umschreiben
|
||||
arbeitszeitEintrag.Notice = "Eine notiz muss noch auf die view";
|
||||
|
||||
|
||||
ServiceFacade.DoEmployeeServiceSync(s => s.InsertNewArbeitsZeit(arbeitszeit, arbeitszeitEintrag));
|
||||
ClearArbeitszeitItems();
|
||||
|
||||
}
|
||||
|
||||
|
||||
private void ClearArbeitszeitItems()
|
||||
{
|
||||
//Auslagern
|
||||
var DE = tabcontrol_Arbeitszeit.GetAllChildren().OfType<DateEdit>();
|
||||
var CBE = tabcontrol_Arbeitszeit.GetAllChildren().OfType<ComboBoxEdit>();
|
||||
var TE = tabcontrol_Arbeitszeit.GetAllChildren().OfType<TextEdit>();
|
||||
|
||||
var AV = DE.First(x => x.Name.Equals("ArbeitszeitVon"));
|
||||
var AB = DE.First(x => x.Name.Equals("ArbeitszeitBis"));
|
||||
|
||||
var TAG = CBE.First(x => x.Name.Equals("Tag"));
|
||||
|
||||
var UV = TE.First(x => x.Name.Equals("UhrzeitVon"));
|
||||
var UB = TE.First(x => x.Name.Equals("UhrzeitBis"));
|
||||
|
||||
//auslagern
|
||||
|
||||
//AV.Clear();
|
||||
//AB.Clear();
|
||||
TAG.Clear();
|
||||
UV.Clear();
|
||||
UB.Clear();
|
||||
|
||||
}
|
||||
|
||||
private string GetArbeitszeitOnRunTime()
|
||||
{
|
||||
var DE = tabcontrol_Arbeitszeit.GetAllChildren().OfType<DateEdit>();
|
||||
var CBE = tabcontrol_Arbeitszeit.GetAllChildren().OfType<ComboBoxEdit>();
|
||||
var TE = tabcontrol_Arbeitszeit.GetAllChildren().OfType<TextEdit>();
|
||||
|
||||
|
||||
|
||||
var AV = DE.First(x => x.Name.Equals("ArbeitszeitVon"));
|
||||
var AB = DE.First(x => x.Name.Equals("ArbeitszeitBis"));
|
||||
|
||||
var TAG = CBE.First(x => x.Name.Equals("Tag"));
|
||||
|
||||
var UV = TE.First(x => x.Name.Equals("UhrzeitVon"));
|
||||
var UB = TE.First(x => x.Name.Equals("UhrzeitBis"));
|
||||
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
113
BeWo/ViewModel/ArbeitszeitEintragVM.cs
Normal file
113
BeWo/ViewModel/ArbeitszeitEintragVM.cs
Normal file
@@ -0,0 +1,113 @@
|
||||
using BS.Shared;
|
||||
using BS.Shared.DataContracts;
|
||||
using System;
|
||||
|
||||
namespace BeWo.ViewModel
|
||||
{
|
||||
public class ArbeitszeitEintragVM : AbstractDCMapperVM<ArbeitszeitEintragDC>
|
||||
{
|
||||
public static string PropertyName_UhrzeitVon = "UhrzeitVon";
|
||||
|
||||
public static string PropertyName_UhrzeitBis = "UhrzeitBis";
|
||||
|
||||
public static string PropertyName_Tag = "Tag";
|
||||
|
||||
public static string PropertyName_Notice = "Notice";
|
||||
|
||||
private string _UhrzeitVon;
|
||||
|
||||
private string _UhrzeitBis;
|
||||
|
||||
private AppointmentDayOfWeek _Tag;
|
||||
|
||||
private string _Notice;
|
||||
|
||||
|
||||
public ArbeitszeitEintragVM(ArbeitszeitEintragDC pDC)
|
||||
: base(pDC, true)
|
||||
{
|
||||
}
|
||||
|
||||
public string UhrzeitVon
|
||||
{
|
||||
get { return this._UhrzeitVon; }
|
||||
|
||||
set
|
||||
{
|
||||
if (this.AreDifferent(this._UhrzeitVon, value))
|
||||
{
|
||||
this._UhrzeitVon = value;
|
||||
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.UhrzeitVon, value), PropertyName_UhrzeitVon);
|
||||
this.FirePropertyChanged(PropertyName_UhrzeitVon);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public string UhrzeitBis
|
||||
{
|
||||
get { return this._UhrzeitBis; }
|
||||
|
||||
set
|
||||
{
|
||||
if (this.AreDifferent(this._UhrzeitBis, value))
|
||||
{
|
||||
this._UhrzeitBis = value;
|
||||
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.UhrzeitBis, value), PropertyName_UhrzeitBis);
|
||||
this.FirePropertyChanged(PropertyName_UhrzeitBis);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public AppointmentDayOfWeek Tag
|
||||
{
|
||||
get { return this._Tag; }
|
||||
|
||||
set
|
||||
{
|
||||
if (this.AreDifferent(this._Tag, value))
|
||||
{
|
||||
this._Tag = value;
|
||||
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Tag, value), PropertyName_Tag);
|
||||
this.FirePropertyChanged(PropertyName_Tag);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public string Notice
|
||||
{
|
||||
get { return _Notice; }
|
||||
|
||||
set
|
||||
{
|
||||
if (AreDifferent(_Notice, value))
|
||||
{
|
||||
_Notice = value;
|
||||
StoreDirtyInformation(AreDifferent(DataContract.Notice, value), PropertyName_Notice);
|
||||
FirePropertyChanged(PropertyName_Notice);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
protected override void InitByDataContract(ArbeitszeitEintragDC pDataContract)
|
||||
{
|
||||
this._Tag = pDataContract.Tag;
|
||||
this._UhrzeitVon = pDataContract.UhrzeitVon;
|
||||
this._UhrzeitBis = pDataContract.UhrzeitBis;
|
||||
this._Notice = pDataContract.Notice;
|
||||
|
||||
}
|
||||
|
||||
protected override ArbeitszeitEintragDC MapToDataContract(ArbeitszeitEintragDC pDataContract, bool doCommit)
|
||||
{
|
||||
pDataContract.UhrzeitVon = _UhrzeitVon;
|
||||
pDataContract.UhrzeitBis = _UhrzeitBis;
|
||||
pDataContract.Tag = _Tag;
|
||||
pDataContract.Notice = _Notice;
|
||||
|
||||
|
||||
return pDataContract;
|
||||
}
|
||||
}
|
||||
}
|
||||
91
BeWo/ViewModel/ArbeitszeitVM.cs
Normal file
91
BeWo/ViewModel/ArbeitszeitVM.cs
Normal file
@@ -0,0 +1,91 @@
|
||||
using BS.Shared;
|
||||
using BS.Shared.DataContracts;
|
||||
using System;
|
||||
|
||||
namespace BeWo.ViewModel
|
||||
{
|
||||
public class ArbeitszeitVM : AbstractDCMapperVM<ArbeitszeitDC>
|
||||
{
|
||||
public static string PropertyName_GueltigVon = "GueltigVon";
|
||||
|
||||
public static string PropertyName_GueltigBis = "GueltigBis";
|
||||
|
||||
public static string PropertyName_Notice = "Notice";
|
||||
|
||||
private DateTime _GueltigVon;
|
||||
|
||||
private DateTime _GueltigBis;
|
||||
|
||||
private string _Notice;
|
||||
|
||||
|
||||
public ArbeitszeitVM(ArbeitszeitDC pDC)
|
||||
: base(pDC, true)
|
||||
{
|
||||
}
|
||||
|
||||
public DateTime GueltigVon
|
||||
{
|
||||
get { return this._GueltigVon; }
|
||||
|
||||
set
|
||||
{
|
||||
if (this.AreDifferent(this._GueltigVon, value))
|
||||
{
|
||||
this._GueltigVon = value;
|
||||
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.GueltigVon, value), PropertyName_GueltigVon);
|
||||
this.FirePropertyChanged(PropertyName_GueltigVon);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public DateTime GueltigBis
|
||||
{
|
||||
get { return this._GueltigBis; }
|
||||
|
||||
set
|
||||
{
|
||||
if (this.AreDifferent(this._GueltigBis, value))
|
||||
{
|
||||
this._GueltigBis = value;
|
||||
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.GueltigBis, value), PropertyName_GueltigBis);
|
||||
this.FirePropertyChanged(PropertyName_GueltigBis);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public string Notice
|
||||
{
|
||||
get { return _Notice; }
|
||||
|
||||
set
|
||||
{
|
||||
if (AreDifferent(_Notice, value))
|
||||
{
|
||||
_Notice = value;
|
||||
StoreDirtyInformation(AreDifferent(DataContract.Notice, value), PropertyName_Notice);
|
||||
FirePropertyChanged(PropertyName_Notice);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
protected override void InitByDataContract(ArbeitszeitDC pDataContract)
|
||||
{
|
||||
this._GueltigBis = pDataContract.GueltigBis;
|
||||
this._GueltigVon = pDataContract.GueltigVon;
|
||||
this._Notice = pDataContract.Notice;
|
||||
|
||||
}
|
||||
|
||||
protected override ArbeitszeitDC MapToDataContract(ArbeitszeitDC pDataContract, bool doCommit)
|
||||
{
|
||||
pDataContract.GueltigVon = _GueltigVon;
|
||||
pDataContract.GueltigBis = _GueltigBis;
|
||||
pDataContract.Notice = _Notice;
|
||||
|
||||
|
||||
return pDataContract;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -76,6 +76,7 @@ namespace BeWo.ViewModel
|
||||
public static String PropertyName_EmployeeColor = "EmployeeColor";
|
||||
public static String PropertyName_EmployeeBrush = "EmployeeBrush";
|
||||
public static string PropertyName_EmployeeImage = "EmployeeImage";
|
||||
public static string PropertyName_Arbeitszeit = "Arbeitszeit";
|
||||
|
||||
#endregion
|
||||
|
||||
@@ -126,6 +127,7 @@ namespace BeWo.ViewModel
|
||||
private String _EmployeeColor;
|
||||
private SolidColorBrush _EmployeeBrush;
|
||||
private byte[] _EmployeeImage;
|
||||
private ArbeitszeitVM _Arbeitszeit;
|
||||
|
||||
public EmployeeVM(
|
||||
EmployeeDC pEmployeeDC, IList<EmploymentTypeDC> pPossibleTypes, IEnumerable<ValueListEntryDC> pPossibleQualifications,
|
||||
@@ -260,6 +262,17 @@ namespace BeWo.ViewModel
|
||||
}
|
||||
}
|
||||
|
||||
public ArbeitszeitVM Arbietszeit
|
||||
{
|
||||
get { return _Arbeitszeit; }
|
||||
|
||||
set
|
||||
{
|
||||
_Arbeitszeit = value;
|
||||
FirePropertyChanged(PropertyName_Arbeitszeit);
|
||||
}
|
||||
}
|
||||
|
||||
public ContractVM LastContract
|
||||
{
|
||||
get
|
||||
@@ -596,7 +609,7 @@ namespace BeWo.ViewModel
|
||||
get
|
||||
{
|
||||
return base.IsDirty || (CustomerRelations != null && CustomerRelations.IsDirty)
|
||||
|| (_AbsenceTimes != null && _AbsenceTimes.IsDirty) || (_Contracts != null && _Contracts.IsDirty) || (_Overtimes != null && _Overtimes.IsDirty);
|
||||
|| (_AbsenceTimes != null && _AbsenceTimes.IsDirty) || (_Contracts != null && _Contracts.IsDirty) || (_Overtimes != null && _Overtimes.IsDirty) || (_Arbeitszeit != null && _Arbeitszeit.IsDirty);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1229,6 +1242,11 @@ namespace BeWo.ViewModel
|
||||
pDataContract.Contracts = _Contracts.CopyToDCList(doCommit);
|
||||
}
|
||||
|
||||
//if (_Arbeitszeit != null)
|
||||
//{
|
||||
// pDataContract.Arbeitszeit = _Arbeitszeit.CopyToDCList(doCommit);
|
||||
//}
|
||||
|
||||
if (_Overtimes != null)
|
||||
{
|
||||
pDataContract.Overtimes = _Overtimes.CopyToDCList(doCommit);
|
||||
|
||||
26
BeWo/ViewModel/ListViewModel/ArbeitszeitListVM.cs
Normal file
26
BeWo/ViewModel/ListViewModel/ArbeitszeitListVM.cs
Normal file
@@ -0,0 +1,26 @@
|
||||
using System.Collections.Generic;
|
||||
|
||||
using BS.Shared.DataContracts;
|
||||
|
||||
namespace BeWo.ViewModel.ListViewModel
|
||||
{
|
||||
public class ArbeitszeitListVM : AbstractDCListMapperVM<ArbeitszeitDC, ArbeitszeitVM>
|
||||
{
|
||||
private IList<EmploymentTypeDC> _PossibleEmploymentTypes;
|
||||
|
||||
public ArbeitszeitListVM(IList<EmploymentTypeDC> allEmploymentTypes, List<ArbeitszeitDC> pDCs)
|
||||
: base(pDCs)
|
||||
{
|
||||
this._PossibleEmploymentTypes = allEmploymentTypes;
|
||||
}
|
||||
|
||||
//protected override ArbeitszeitVM CreateVM(ArbeitszeitDC pDC)
|
||||
//{
|
||||
// ArbeitszeitVM vm = base.CreateVM(pDC);
|
||||
|
||||
// vm. = _PossibleEmploymentTypes;
|
||||
|
||||
// return vm;
|
||||
//}
|
||||
}
|
||||
}
|
||||
@@ -34,7 +34,7 @@
|
||||
</root>
|
||||
</log4net>
|
||||
<appSettings>
|
||||
<add key="MultitenancyPath" value="C:\Projekte\BeWo\Host\Multitenancy\" /> <!--F:\Projects\BeWo\Host\Multitenancy\ -->
|
||||
<add key="MultitenancyPath" value="F:\Projects\BeWo\Host\Multitenancy\" /> <!-- C:\Projekte\BeWo\Host\Multitenancy\-->
|
||||
<add key="BeWoPlanerAndroid.AndroidSoapService" value="http://localhost/AndroidSoapService.asmx" />
|
||||
</appSettings>
|
||||
<system.serviceModel>
|
||||
|
||||
@@ -124,7 +124,7 @@
|
||||
<add key="PreserveLoginUrl" value="true" />
|
||||
<add key="ClientValidationEnabled" value="true" />
|
||||
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
|
||||
<add key="MultitenancyPath" value="C:\Projekte\BeWo\Host\Multitenancy\" />
|
||||
<add key="MultitenancyPath" value="F:\Projects\BeWo\Host\Multitenancy\" />
|
||||
<!--<add key="MultitenancyPath" value="..\Host\Multitenancy"/>-->
|
||||
</appSettings>
|
||||
|
||||
|
||||
@@ -2057,5 +2057,33 @@ namespace BeWo.Data.Access
|
||||
|
||||
return liste;
|
||||
}
|
||||
|
||||
public ArbeitszeitListe FindEmployeeArbeitszeitListe(long employeeOid)
|
||||
{
|
||||
var c = CreateCriteria<Arbeitszeit>().Add(Restrictions.Eq(Arbeitszeit.PropertyName_EmployeeOid,employeeOid));
|
||||
|
||||
List<long> nAr = new List<long>();
|
||||
|
||||
|
||||
foreach (var item in c.List<Arbeitszeit>())
|
||||
{
|
||||
nAr.Add(item.Oid.Value);
|
||||
}
|
||||
|
||||
ArbeitszeitListe a = new ArbeitszeitListe();
|
||||
a.Arbeitszeit = c.List<Arbeitszeit>().ToList();
|
||||
|
||||
if(nAr.Count != 0){
|
||||
var cEintrag =
|
||||
CreateCriteria<ArbeitszeitEintrag>()
|
||||
.Add(Restrictions.Eq(ArbeitszeitEintrag.PropertyName_ArbeitszeitOid, nAr));
|
||||
|
||||
a.ArbeitszeitEintrag = cEintrag.List<ArbeitszeitEintrag>().ToList();
|
||||
|
||||
}
|
||||
|
||||
return a;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -159,6 +159,9 @@
|
||||
<Compile Include="Entities\ChatMessage.cs" />
|
||||
<Compile Include="Entities\ChatMediaMessage.cs" />
|
||||
<Compile Include="Entities\Image.cs" />
|
||||
<Compile Include="Entities\Arbeitszeit.cs" />
|
||||
<Compile Include="Entities\ArbeitszeitEintrag.cs" />
|
||||
<Compile Include="Entities\ArbeitszeitListe.cs" />
|
||||
<Compile Include="Entities\VertretungsListe.cs" />
|
||||
<Compile Include="Entities\Kriterien.cs" />
|
||||
<Compile Include="Entities\Vertretung.cs" />
|
||||
@@ -557,6 +560,12 @@
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="ICD10\icd10gm2012syst_claml_20110923.xml" />
|
||||
<EmbeddedResource Include="Mappings\ArbeitszeitEintrag.hbm.xml">
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Mappings\Arbeitszeit.hbm.xml">
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Mappings\Kriterien.hbm.xml">
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
|
||||
87
Data/Entities/Arbeitszeit.cs
Normal file
87
Data/Entities/Arbeitszeit.cs
Normal file
@@ -0,0 +1,87 @@
|
||||
using BS.Shared;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace BeWo.Data.Entities
|
||||
{
|
||||
public class Arbeitszeit : BeWoEntityBase
|
||||
{
|
||||
public static string PropertyName_GueltigVon = "GueltigVon";
|
||||
|
||||
public static string PropertyName_GueltigBis = "GueltigBis";
|
||||
|
||||
public static string PropertyName_EmployeeOid = "EmployeeOid";
|
||||
|
||||
public static string PropertyName_ArbeitsZeiteintragListe = "ArbeitszeitEintragListe";
|
||||
|
||||
private DateTime _GueltigVon;
|
||||
|
||||
private DateTime _GueltigBis;
|
||||
|
||||
private long? _EmployeeOid;
|
||||
|
||||
private IList<ArbeitszeitEintrag> _ArbeitszeitEintrag;
|
||||
|
||||
|
||||
public virtual DateTime GueltigVon
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._GueltigVon;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
if (this.AreDifferent(this._GueltigVon, value))
|
||||
{
|
||||
this._GueltigVon = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public virtual DateTime GueltigBis
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._GueltigBis;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
if (this.AreDifferent(this._GueltigBis, value))
|
||||
{
|
||||
this._GueltigBis = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public virtual long? EmployeeOid
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._EmployeeOid;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
if (this.AreDifferent(this._EmployeeOid, value))
|
||||
{
|
||||
this._EmployeeOid = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public virtual IList<ArbeitszeitEintrag> ArbeitszeitEintra
|
||||
{
|
||||
get { return this._ArbeitszeitEintrag; }
|
||||
set
|
||||
{
|
||||
if (this.AreDifferent(this._ArbeitszeitEintrag, value))
|
||||
{
|
||||
this._ArbeitszeitEintrag = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
91
Data/Entities/ArbeitszeitEintrag.cs
Normal file
91
Data/Entities/ArbeitszeitEintrag.cs
Normal file
@@ -0,0 +1,91 @@
|
||||
using BS.Shared;
|
||||
using System;
|
||||
|
||||
namespace BeWo.Data.Entities
|
||||
{
|
||||
public class ArbeitszeitEintrag : BeWoEntityBase
|
||||
{
|
||||
public static string PropertyName_UhrzeitVon = "UhrzeitVon";
|
||||
|
||||
public static string PropertyName_UhrzeitBis = "UhrzeitBis";
|
||||
|
||||
public static string PropertyName_Tag = "Tag";
|
||||
|
||||
public static string PropertyName_ArbeitszeitOid = "ArbeitszeitOid";
|
||||
|
||||
private string _UhrzeitVon;
|
||||
|
||||
private string _UhrzeitBis;
|
||||
|
||||
private AppointmentDayOfWeek _Tag;
|
||||
|
||||
private long? _ArbeitszeitOid;
|
||||
|
||||
|
||||
public virtual string UhrzeitVon
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._UhrzeitVon;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
if (this.AreDifferent(this._UhrzeitVon, value))
|
||||
{
|
||||
this._UhrzeitVon = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public virtual string UhrzeitBis
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._UhrzeitBis;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
if (this.AreDifferent(this._UhrzeitBis, value))
|
||||
{
|
||||
this._UhrzeitBis = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public virtual AppointmentDayOfWeek Tag
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Tag;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
if (this.AreDifferent(this._Tag, value))
|
||||
{
|
||||
this._Tag = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public virtual long? ArbeitszeitOid
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._ArbeitszeitOid;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
if (this.AreDifferent(this._ArbeitszeitOid, value))
|
||||
{
|
||||
this._ArbeitszeitOid = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
51
Data/Entities/ArbeitszeitListe.cs
Normal file
51
Data/Entities/ArbeitszeitListe.cs
Normal file
@@ -0,0 +1,51 @@
|
||||
using BS.Shared;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace BeWo.Data.Entities
|
||||
{
|
||||
public class ArbeitszeitListe : BeWoEntityBase
|
||||
{
|
||||
public static string PropertyName_ArbeitszeitEintrag = "ArbeitszeitEintrag";
|
||||
|
||||
public static string PropertyName_Arbeitszeit = "Arbeitszeit";
|
||||
|
||||
private List<ArbeitszeitEintrag> _ArbeitszeitEintrag;
|
||||
|
||||
private List<Arbeitszeit> _Arbeitszeit;
|
||||
|
||||
|
||||
public virtual List<ArbeitszeitEintrag> ArbeitszeitEintrag
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._ArbeitszeitEintrag;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
if (this.AreDifferent(this._ArbeitszeitEintrag, value))
|
||||
{
|
||||
this._ArbeitszeitEintrag = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public virtual List<Arbeitszeit> Arbeitszeit
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Arbeitszeit;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
if (this.AreDifferent(this._Arbeitszeit, value))
|
||||
{
|
||||
this._Arbeitszeit = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -36,6 +36,8 @@ namespace BeWo.Data.Entities
|
||||
|
||||
public static string PropertyName_Contracts = "Contracts";
|
||||
|
||||
public static string PropertyName_Arbeitszeit = "Arbeitszeit";
|
||||
|
||||
public static string PropertyName_Text1 = "Text1";
|
||||
|
||||
public static string PropertyName_Text2 = "Text2";
|
||||
@@ -54,6 +56,8 @@ namespace BeWo.Data.Entities
|
||||
|
||||
private IList<Contract> _Contracts;
|
||||
|
||||
private IList<Arbeitszeit> _Arbeitszeit;
|
||||
|
||||
private IList<Employee2Customer> _Employee2CustomerList;
|
||||
|
||||
private string _HealthInsurance;
|
||||
@@ -152,6 +156,19 @@ namespace BeWo.Data.Entities
|
||||
}
|
||||
}
|
||||
|
||||
public virtual IList<Arbeitszeit> Arbeitszeit
|
||||
{
|
||||
get { return _Arbeitszeit ?? (_Arbeitszeit = new List<Arbeitszeit>()); }
|
||||
|
||||
set
|
||||
{
|
||||
if (AreDifferent(_Arbeitszeit, value))
|
||||
{
|
||||
_Arbeitszeit = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public virtual IList<Employee2Customer> Employee2CustomerList
|
||||
{
|
||||
get { return _Employee2CustomerList ?? (_Employee2CustomerList = new List<Employee2Customer>()); }
|
||||
|
||||
24
Data/Mappings/Arbeitszeit.hbm.xml
Normal file
24
Data/Mappings/Arbeitszeit.hbm.xml
Normal file
@@ -0,0 +1,24 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
|
||||
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
|
||||
<class name="BeWo.Data.Entities.Arbeitszeit,BeWo.Data" table="arbeitszeit">
|
||||
<id name="Oid" column ="Oid" unsaved-value="null">
|
||||
<generator class="identity" />
|
||||
</id>
|
||||
<version type="Int64" column="Version" name="Version" />
|
||||
<property name="EmployeeOid" column="EmployeeOid" />
|
||||
|
||||
<property name="InsTs" />
|
||||
<property name="InsUser" />
|
||||
<property column="Tid" type="BS.Shared.TableID, BS.Shared" name="_Tid" access="field" />
|
||||
<property name="UdpUser" />
|
||||
<property name="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" />
|
||||
<property name="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" />
|
||||
<property name="Notice" column="Notice" length="1024" />
|
||||
|
||||
<property name="GueltigVon" column="GueltigVon" />
|
||||
<property name="GueltigBis" column="GueltigBis" />
|
||||
|
||||
|
||||
</class>
|
||||
</hibernate-mapping>
|
||||
28
Data/Mappings/ArbeitszeitEintrag.hbm.xml
Normal file
28
Data/Mappings/ArbeitszeitEintrag.hbm.xml
Normal file
@@ -0,0 +1,28 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
|
||||
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
|
||||
<class name="BeWo.Data.Entities.ArbeitszeitEintrag,BeWo.Data" table="arbeitszeiteintrag">
|
||||
<id name="Oid" column ="Oid" unsaved-value="null">
|
||||
<generator class="identity" />
|
||||
</id>
|
||||
<version type="Int64" column="Version" name="Version" />
|
||||
|
||||
<property name="ArbeitszeitOid" column="ArbeitszeitOid" />
|
||||
|
||||
<property name="InsTs" />
|
||||
<property name="InsUser" />
|
||||
<property column="Tid" type="BS.Shared.TableID, BS.Shared" name="_Tid" access="field" />
|
||||
<property name="UdpUser" />
|
||||
<property name="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" />
|
||||
<property name="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" />
|
||||
<property name="Notice" column="Notice" length="1024" />
|
||||
|
||||
<property name="Tag" column="Tag" />
|
||||
<property name="UhrzeitVon" column="UhrzeitVon" />
|
||||
|
||||
<property name="UhrzeitBis" column="UhrzeitBis" />
|
||||
|
||||
|
||||
|
||||
</class>
|
||||
</hibernate-mapping>
|
||||
55
Model/Changes_2017_05_11.txt
Normal file
55
Model/Changes_2017_05_11.txt
Normal file
@@ -0,0 +1,55 @@
|
||||
CREATE TABLE `1234567890`.`arbeitszeit` (
|
||||
`Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
|
||||
|
||||
`EmployeeOid` BIGINT(19) NULL COMMENT '',
|
||||
`Tid` INT(10) NULL COMMENT '',
|
||||
`Notice` VARCHAR(1024) NULL COMMENT '',
|
||||
|
||||
`InsTs` DATETIME NULL COMMENT '',
|
||||
`InsUser` VARCHAR(1024) NULL COMMENT '',
|
||||
`Version` BIGINT(19) NULL COMMENT '',
|
||||
|
||||
`UdpUser` VARCHAR(256) NULL COMMENT '',
|
||||
`isActive` TINYINT(4) NULL COMMENT '',
|
||||
`SystemEntryID` INT(10) NULL COMMENT '',
|
||||
|
||||
`GueltigVon` DATETIME NULL COMMENT '',
|
||||
`GueltigBis` DATETIME NULL COMMENT '',
|
||||
PRIMARY KEY (`Oid`) COMMENT '');
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
CREATE TABLE `1234567890`.`arbeitszeiteintrag` (
|
||||
`Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
|
||||
`ArbeitszeitOid` BIGINT(19) NULL COMMENT '',
|
||||
|
||||
`Tid` INT(10) NULL COMMENT '',
|
||||
`Notice` VARCHAR(1024) NULL COMMENT '',
|
||||
`InsTs` DATETIME NULL COMMENT '',
|
||||
`InsUser` VARCHAR(1024) NULL COMMENT '',
|
||||
|
||||
`Version` BIGINT(19) NULL COMMENT '',
|
||||
`UdpUser` VARCHAR(256) NULL COMMENT '',
|
||||
`isActive` TINYINT(4) NULL COMMENT '',
|
||||
`SystemEntryID` INT(10) NULL COMMENT '',
|
||||
|
||||
`Tag` DATETIME NULL COMMENT '',
|
||||
`UhrzeitVon` DATETIME NULL COMMENT '',
|
||||
`UhrzeitBis` DATETIME NULL COMMENT '',
|
||||
PRIMARY KEY (`Oid`) COMMENT '');
|
||||
|
||||
|
||||
|
||||
|
||||
ALTER TABLE `1234567890`.`arbeitszeiteintrag`
|
||||
CHANGE COLUMN `Tag` `Tag` INT(10) NULL DEFAULT NULL COMMENT '' ;
|
||||
|
||||
|
||||
ALTER TABLE `1234567890`.`arbeitszeiteintrag`
|
||||
|
||||
CHANGE COLUMN `UhrzeitVon` `UhrzeitVon` VARCHAR(256) NULL DEFAULT NULL COMMENT '' ,
|
||||
|
||||
CHANGE COLUMN `UhrzeitBis` `UhrzeitBis` VARCHAR(256) NULL DEFAULT NULL COMMENT '' ;
|
||||
@@ -10,7 +10,6 @@ using BS.Shared.Extensions;
|
||||
using BS.Shared.Services;
|
||||
using BS.Shared.DataContracts;
|
||||
using BeWo.Service.DCEntityMapper;
|
||||
using DevExpress.XtraPivotGrid.Data.Wrappers;
|
||||
|
||||
namespace BeWo.BetreuWoReports
|
||||
{
|
||||
|
||||
@@ -10,7 +10,6 @@ using BS.Shared.Extensions;
|
||||
using BS.Shared.Services;
|
||||
using BS.Shared.DataContracts;
|
||||
using BeWo.Service.DCEntityMapper;
|
||||
using DevExpress.XtraPivotGrid.Data.Wrappers;
|
||||
|
||||
namespace BeWo.BetreuWoReports.Kostenstellenauswertung3
|
||||
{
|
||||
|
||||
@@ -9,8 +9,9 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>HphBersenbrueckAtz</RootNamespace>
|
||||
<AssemblyName>1106039294_Reports</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
@@ -30,12 +31,11 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Xpo.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Data.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.2.Core, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Configuration" />
|
||||
<Reference Include="System.Core" />
|
||||
@@ -53,12 +53,6 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="QueryListReport.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
<Compile Include="QueryListReport.Designer.cs">
|
||||
<DependentUpon>QueryListReport.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ServicesOverviewReport.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
@@ -68,10 +62,6 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="Properties\licenses.licx" />
|
||||
<EmbeddedResource Include="QueryListReport.resx">
|
||||
<DependentUpon>QueryListReport.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="ServicesOverviewReport.resx">
|
||||
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
@@ -94,6 +84,9 @@
|
||||
<Name>Shared</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<WCFMetadata Include="Service References\" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
|
||||
2452
ReportImp/HphBersenbrueckAtz/QueryListReport.Designer.cs
generated
2452
ReportImp/HphBersenbrueckAtz/QueryListReport.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
@@ -1,64 +0,0 @@
|
||||
using System;
|
||||
using BeWo.Report.ReportObjects;
|
||||
using BeWo.Report;
|
||||
using DevExpress.XtraReports.UI;
|
||||
using System.Data;
|
||||
|
||||
namespace BeWo.Report.DefaultReports
|
||||
{
|
||||
public partial class Bericht : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<QueryRO>
|
||||
{
|
||||
public Bericht()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
}
|
||||
|
||||
public void SetReportDataSource(QueryRO pRO)
|
||||
{
|
||||
InitTable(pRO);
|
||||
this.bindingSource1.DataSource = pRO;
|
||||
}
|
||||
|
||||
private void InitTable(QueryRO ro)
|
||||
{
|
||||
//xrTableRowHeader.Cells.Clear();
|
||||
//xrTableRowDetail.Cells.Clear();
|
||||
//int index = 1;
|
||||
//foreach (DataColumn column in ro.DataTable.Columns)
|
||||
//{
|
||||
// Type type = column.DataType;
|
||||
// XRTableCell headerCell = new XRTableCell();
|
||||
// headerCell.Text = column.ColumnName;
|
||||
// headerCell.WidthF = xrTableHeader.WidthF / ro.DataTable.Columns.Count;
|
||||
// this.xrTableRowHeader.Cells.Add(headerCell);
|
||||
|
||||
// XRTableCell rowCell = new XRTableCell();
|
||||
// rowCell.WidthF = xrTableHeader.WidthF / ro.DataTable.Columns.Count;
|
||||
|
||||
// if (type == typeof(DateTime))
|
||||
// rowCell.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
// new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field" + index, "{0:dd/MM/yyyy}")});
|
||||
// else
|
||||
// rowCell.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
// new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field" + index)});
|
||||
|
||||
// this.xrTableRowDetail.Cells.Add(rowCell);
|
||||
|
||||
// index++;
|
||||
//}
|
||||
|
||||
//foreach (XRTableCell cell in xrTableRowHeader.Cells)
|
||||
//{
|
||||
// cell.WidthF = xrTableHeader.WidthF / ro.DataTable.Columns.Count;
|
||||
//}
|
||||
|
||||
//foreach (XRTableCell cell in xrTableRowDetail.Cells)
|
||||
//{
|
||||
// cell.WidthF = xrTableHeader.WidthF / ro.DataTable.Columns.Count;
|
||||
//}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,205 +0,0 @@
|
||||
<?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>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="xrPictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
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
|
||||
YII=
|
||||
</value>
|
||||
</data>
|
||||
<metadata name="xpInstantFeedbackSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>154, 17</value>
|
||||
</metadata>
|
||||
</root>
|
||||
44
Service/DCEntityMapper/ArbeitszeitDC_Arbeitszeit.cs
Normal file
44
Service/DCEntityMapper/ArbeitszeitDC_Arbeitszeit.cs
Normal file
@@ -0,0 +1,44 @@
|
||||
using System.IO;
|
||||
using BeWo.Data.Entities;
|
||||
|
||||
using BS.Shared.DataContracts;
|
||||
|
||||
namespace BeWo.Service.DCEntityMapper
|
||||
{
|
||||
public class ArbeitszeitDC_Arbeitszeit : AbstractIDCEntityMapper<Arbeitszeit, ArbeitszeitDC>
|
||||
{
|
||||
public override ArbeitszeitDC MergeWithDC(Arbeitszeit pEntity, ArbeitszeitDC pDataContract)
|
||||
{
|
||||
pDataContract.ArbeitszeitOid = pEntity.Oid;
|
||||
|
||||
pDataContract.EmployeeOid = pEntity.EmployeeOid;
|
||||
pDataContract.GueltigVon = pEntity.GueltigVon;
|
||||
pDataContract.GueltigBis = pEntity.GueltigBis;
|
||||
pDataContract.Notice = pEntity.Notice;
|
||||
|
||||
return pDataContract;
|
||||
}
|
||||
|
||||
public override Arbeitszeit MergeWithEntity(ArbeitszeitDC pDataContract, Arbeitszeit pEntity)
|
||||
{
|
||||
pEntity.EmployeeOid = pDataContract.EmployeeOid;
|
||||
pEntity.GueltigVon = pDataContract.GueltigVon;
|
||||
pEntity.GueltigBis = pDataContract.GueltigBis;
|
||||
pEntity.Notice = pDataContract.Notice;
|
||||
pEntity.Oid = pDataContract.ArbeitszeitOid;
|
||||
|
||||
return pEntity;
|
||||
}
|
||||
|
||||
protected override bool AreDCAndEntityEqual(ArbeitszeitDC pDC, Arbeitszeit pEntity)
|
||||
{
|
||||
|
||||
if (pDC.ArbeitszeitOid == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return pDC.ArbeitszeitOid == pEntity.Oid;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
using System.IO;
|
||||
using BeWo.Data.Entities;
|
||||
|
||||
using BS.Shared.DataContracts;
|
||||
|
||||
namespace BeWo.Service.DCEntityMapper
|
||||
{
|
||||
public class ArbeitszeitEintragDC_ArbeitszeitEintrag : AbstractIDCEntityMapper<ArbeitszeitEintrag, ArbeitszeitEintragDC>
|
||||
{
|
||||
public override ArbeitszeitEintragDC MergeWithDC(ArbeitszeitEintrag pEntity, ArbeitszeitEintragDC pDataContract)
|
||||
{
|
||||
pDataContract.ArbeitszeitEintragOid = pEntity.Oid;
|
||||
pDataContract.ArbeitszeitOid = pEntity.ArbeitszeitOid;
|
||||
pDataContract.Tag = pEntity.Tag;
|
||||
pDataContract.UhrzeitVon = pEntity.UhrzeitVon;
|
||||
pDataContract.UhrzeitBis = pEntity.UhrzeitBis;
|
||||
pDataContract.Notice = pEntity.Notice;
|
||||
|
||||
return pDataContract;
|
||||
}
|
||||
|
||||
public override ArbeitszeitEintrag MergeWithEntity(ArbeitszeitEintragDC pDataContract, ArbeitszeitEintrag pEntity)
|
||||
{
|
||||
pEntity.ArbeitszeitOid = pDataContract.ArbeitszeitOid;
|
||||
pEntity.Tag = pDataContract.Tag;
|
||||
pEntity.UhrzeitVon = pDataContract.UhrzeitVon;
|
||||
pEntity.UhrzeitBis = pDataContract.UhrzeitBis;
|
||||
pEntity.Notice = pDataContract.Notice;
|
||||
pEntity.Oid = pDataContract.ArbeitszeitEintragOid;
|
||||
|
||||
return pEntity;
|
||||
}
|
||||
|
||||
protected override bool AreDCAndEntityEqual(ArbeitszeitEintragDC pDC, ArbeitszeitEintrag pEntity)
|
||||
{
|
||||
|
||||
if (pDC.ArbeitszeitEintragOid == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return pDC.ArbeitszeitEintragOid == pEntity.Oid;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
using System.IO;
|
||||
using BeWo.Data.Entities;
|
||||
|
||||
using BS.Shared.DataContracts;
|
||||
|
||||
namespace BeWo.Service.DCEntityMapper
|
||||
{
|
||||
public class ArbeitszeitListeDC_ArbeitszeitListe : AbstractIDCEntityMapper<ArbeitszeitListe, ArbeitszeitListeDC>
|
||||
{
|
||||
public override ArbeitszeitListeDC MergeWithDC(ArbeitszeitListe pEntity, ArbeitszeitListeDC pDataContract)
|
||||
{
|
||||
pDataContract.Arbeitszeitliste = MapperFactory.ArbeitszeitDC_Arbeitszeit.MapToNewDCs(pEntity.Arbeitszeit);
|
||||
pDataContract.ArbeitszeitEintragliste = MapperFactory.ArbeitszeitEintragDC_ArbeitszeitEintrag.MapToNewDCs(pEntity.ArbeitszeitEintrag);
|
||||
|
||||
|
||||
return pDataContract;
|
||||
}
|
||||
|
||||
public override ArbeitszeitListe MergeWithEntity(ArbeitszeitListeDC pDataContract, ArbeitszeitListe pEntity)
|
||||
{
|
||||
pEntity.Arbeitszeit = MapperFactory.ArbeitszeitDC_Arbeitszeit.MapToNewEntities(pDataContract.Arbeitszeitliste);
|
||||
pEntity.ArbeitszeitEintrag = MapperFactory.ArbeitszeitEintragDC_ArbeitszeitEintrag.MapToNewEntities(pDataContract.ArbeitszeitEintragliste);
|
||||
|
||||
return pEntity;
|
||||
}
|
||||
|
||||
protected override bool AreDCAndEntityEqual(ArbeitszeitListeDC pDC, ArbeitszeitListe pEntity)
|
||||
{
|
||||
|
||||
if (pDC.VertretungslisteOid == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return pDC.VertretungslisteOid == pEntity.Oid;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -47,10 +47,16 @@ namespace BeWo.Service.DCEntityMapper
|
||||
|
||||
private static VertretungDC_Vertretung _VertretungDC_Vertretung;
|
||||
|
||||
private static ArbeitszeitDC_Arbeitszeit _ArbeitszeitDC_Arbeitszeit;
|
||||
|
||||
private static ArbeitszeitEintragDC_ArbeitszeitEintrag _ArbeitszeitEintragDC_ArbeitszeitEintrag;
|
||||
|
||||
private static KriterienDC_Kriterien _KriterienDC_Kriterien;
|
||||
|
||||
private static VertretungsListeDC_VertretungsListe _VertretungsListeDC_VertretungsListe;
|
||||
|
||||
private static ArbeitszeitListeDC_ArbeitszeitListe _ArbeitszeitListeDC_ArbeitszeitListe;
|
||||
|
||||
private static PasswortVerlaufDC_PasswortVerlauf _PasswortVerlaufDC_PasswortVerlauf;
|
||||
|
||||
private static ChatMessageDC_ChatMessage _ChatMessageDC_ChatMessage;
|
||||
@@ -538,6 +544,21 @@ namespace BeWo.Service.DCEntityMapper
|
||||
}
|
||||
}
|
||||
|
||||
public static ArbeitszeitDC_Arbeitszeit ArbeitszeitDC_Arbeitszeit
|
||||
{
|
||||
get
|
||||
{
|
||||
return _ArbeitszeitDC_Arbeitszeit ?? (_ArbeitszeitDC_Arbeitszeit = new ArbeitszeitDC_Arbeitszeit());
|
||||
}
|
||||
}
|
||||
|
||||
public static ArbeitszeitEintragDC_ArbeitszeitEintrag ArbeitszeitEintragDC_ArbeitszeitEintrag
|
||||
{
|
||||
get
|
||||
{
|
||||
return _ArbeitszeitEintragDC_ArbeitszeitEintrag ?? (_ArbeitszeitEintragDC_ArbeitszeitEintrag = new ArbeitszeitEintragDC_ArbeitszeitEintrag());
|
||||
}
|
||||
}
|
||||
public static KriterienDC_Kriterien KriterienDC_Kriterien
|
||||
{
|
||||
get
|
||||
@@ -554,6 +575,15 @@ namespace BeWo.Service.DCEntityMapper
|
||||
}
|
||||
}
|
||||
|
||||
public static ArbeitszeitListeDC_ArbeitszeitListe ArbeitszeitListeDC_ArbeitszeitListe
|
||||
{
|
||||
get
|
||||
{
|
||||
return _ArbeitszeitListeDC_ArbeitszeitListe ?? (_ArbeitszeitListeDC_ArbeitszeitListe = new ArbeitszeitListeDC_ArbeitszeitListe());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static PasswortVerlaufDC_PasswortVerlauf PasswortVerlaufDC_PasswortVerlauf
|
||||
{
|
||||
get
|
||||
|
||||
@@ -214,6 +214,9 @@
|
||||
<Compile Include="DCEntityMapper\EmployeeAPPCodeDC_EmployeeAPPCode.cs" />
|
||||
<Compile Include="DCEntityMapper\ChatMessageDC_ChatMessage.cs" />
|
||||
<Compile Include="DCEntityMapper\ChatMediaMessageDC_ChatMediaMessage.cs" />
|
||||
<Compile Include="DCEntityMapper\ArbeitszeitDC_Arbeitszeit.cs" />
|
||||
<Compile Include="DCEntityMapper\ArbeitszeitEintragDC_ArbeitszeitEintrag.cs" />
|
||||
<Compile Include="DCEntityMapper\ArbeitszeitListeDC_ArbeitszeitListe.cs" />
|
||||
<Compile Include="DCEntityMapper\VertretungsListeDC_VertretungsListe.cs" />
|
||||
<Compile Include="DCEntityMapper\KriterienDC_Kriterien.cs" />
|
||||
<Compile Include="DCEntityMapper\PasswortVerlaufDC_PasswortVerlauf.cs" />
|
||||
|
||||
@@ -330,5 +330,9 @@ namespace BeWo.Service.ServiceContracts
|
||||
[FaultContract(typeof(BeWoFault))]
|
||||
[OperationContract]
|
||||
CompactEmployeeDC GetActiveCompactEmployeeWithOid(long employeeOid);
|
||||
|
||||
[FaultContract(typeof(BeWoFault))]
|
||||
[OperationContract]
|
||||
void InsertNewArbeitsZeit(ArbeitszeitDC arbeitszeit, ArbeitszeitEintragDC arbeitszeitEintrag);
|
||||
}
|
||||
}
|
||||
@@ -596,14 +596,31 @@ namespace BeWo.Service.ServiceContracts
|
||||
|
||||
[FaultContract(typeof(BeWoFault))]
|
||||
[OperationContract]
|
||||
void DeleteVertretung(VertretungDC vert);
|
||||
void DeleteVertretung(long vert);
|
||||
|
||||
[FaultContract(typeof(BeWoFault))]
|
||||
[OperationContract]
|
||||
void UpdateVertretung(VertretungDC vert);
|
||||
void UpdateVertretung(VertretungDC vert, AbsenceReasonDC absenceReason);
|
||||
|
||||
[FaultContract(typeof(BeWoFault))]
|
||||
[OperationContract]
|
||||
VertretungsListeDC VertretungsListe(DateTime absenceTime);
|
||||
|
||||
[FaultContract(typeof(BeWoFault))]
|
||||
[OperationContract]
|
||||
VertretungDC CreateVertretung(long mitarbeiterOid, long klientenOid, long vertretenderMitarbeiterOid,
|
||||
long absencetimeOid, string notiz, DateTime vertretungszeitraumVon, DateTime vertretungszeitraumBis);
|
||||
|
||||
[FaultContract(typeof(BeWoFault))]
|
||||
[OperationContract]
|
||||
void DeletAbsenceTime(long absenceoid);
|
||||
|
||||
[FaultContract(typeof(BeWoFault))]
|
||||
[OperationContract]
|
||||
void DeactivateAbsenceTime(Dictionary<long, long> pOid2Version);
|
||||
|
||||
[FaultContract(typeof(BeWoFault))]
|
||||
[OperationContract]
|
||||
ArbeitszeitListeDC GetAlleArbeitszeiten(long employeeOid);
|
||||
}
|
||||
}
|
||||
@@ -1240,6 +1240,27 @@ namespace BeWo.Service.ServiceImplementations
|
||||
}
|
||||
}
|
||||
|
||||
public void InsertNewArbeitsZeit(ArbeitszeitDC arbeitszeit, ArbeitszeitEintragDC arbeitszeitEintrag)
|
||||
{
|
||||
try
|
||||
{
|
||||
var x = MapperFactory.ArbeitszeitDC_Arbeitszeit.MapToNewEntity(arbeitszeit);
|
||||
|
||||
arbeitszeitEintrag.ArbeitszeitOid = x.Oid;
|
||||
|
||||
var y = MapperFactory.ArbeitszeitEintragDC_ArbeitszeitEintrag.MapToNewEntity(arbeitszeitEintrag);
|
||||
|
||||
DAOFactory.GenericDAO.Insert(x);
|
||||
|
||||
DAOFactory.GenericDAO.Insert(y);
|
||||
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
throw Utils.CreateBeWoFaultException(e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -3467,7 +3467,35 @@ namespace BeWo.Service.ServiceImplementations
|
||||
}
|
||||
}
|
||||
|
||||
//all new Audi ##############################################
|
||||
//####################### Schulbegleitender Dienst ##############################################
|
||||
|
||||
public void DeletAbsenceTime(long absenceoid)
|
||||
{
|
||||
try
|
||||
{
|
||||
var x = DAOFactory.GenericDAO.GetByID<AbsenceTime>(absenceoid);
|
||||
|
||||
DAOFactory.GenericDAO.Delete(x);
|
||||
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
throw Utils.CreateBeWoFaultException(e);
|
||||
}
|
||||
}
|
||||
|
||||
public void DeactivateAbsenceTime( Dictionary<long,long> pOid2Version)
|
||||
{
|
||||
try
|
||||
{
|
||||
ServiceLogic.SetActivationType<AbsenceTime>(pOid2Version, ActivationTypeId.Deleted);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
throw Utils.CreateBeWoFaultException(e);
|
||||
}
|
||||
}
|
||||
|
||||
public List<VertretungDC>GetAllVertretungen()
|
||||
{
|
||||
try
|
||||
@@ -3550,11 +3578,11 @@ namespace BeWo.Service.ServiceImplementations
|
||||
}
|
||||
}
|
||||
|
||||
public void DeleteVertretung(VertretungDC vert)
|
||||
public void DeleteVertretung(long vert)
|
||||
{
|
||||
try
|
||||
{
|
||||
var origVertretung = DAOFactory.GenericDAO.LoadByID<Vertretung>(vert.VertretungOid.Value);
|
||||
var origVertretung = DAOFactory.GenericDAO.LoadByID<Vertretung>(vert);
|
||||
|
||||
DAOFactory.GenericDAO.Delete(origVertretung);
|
||||
}
|
||||
@@ -3564,7 +3592,7 @@ namespace BeWo.Service.ServiceImplementations
|
||||
}
|
||||
}
|
||||
|
||||
public void UpdateVertretung(VertretungDC vert)
|
||||
public void UpdateVertretung(VertretungDC vert, AbsenceReasonDC absenceReason)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -3574,6 +3602,26 @@ namespace BeWo.Service.ServiceImplementations
|
||||
MapperFactory.VertretungDC_Vertretung.MergeWithEntity(vert, origVertretung);
|
||||
|
||||
DAOFactory.GenericDAO.Update(origVertretung);
|
||||
|
||||
|
||||
//Upadate AbsenceTime
|
||||
var origAbsenceTime = DAOFactory.GenericDAO.LoadByID<AbsenceTime>(vert.AbsenceTimeOid.Value);
|
||||
|
||||
//AbsenceReason abs = new AbsenceReason();
|
||||
|
||||
//abs.Oid = absenceReason.AbsenceReasonOid;
|
||||
//abs.Description = absenceReason.Description;
|
||||
//abs.BillableMinutes = absenceReason.BillableMinutes;
|
||||
//abs.Color = absenceReason.Color;
|
||||
|
||||
//MapperFactory.AbsenceReasonDC_AbsenceReason.MergeWithEntity(absenceReason,abs);
|
||||
|
||||
var abs = DAOFactory.GenericDAO.LoadByID<AbsenceReason>(absenceReason.AbsenceReasonOid.Value);
|
||||
|
||||
origAbsenceTime.AbsenceReason = abs;
|
||||
|
||||
DAOFactory.GenericDAO.Update(origAbsenceTime);
|
||||
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
@@ -3581,8 +3629,8 @@ namespace BeWo.Service.ServiceImplementations
|
||||
}
|
||||
}
|
||||
|
||||
//Muss noch generiert werden
|
||||
public void CreateVertretung(long mitarbeiterOid, long klientenOid,long vertretenderMitarbeiter,string notiz, DateTime vertretungszeitraumVon, DateTime vertretungszeitraumBis)
|
||||
//verbesserungswürdig
|
||||
public VertretungDC CreateVertretung(long mitarbeiterOid, long klientenOid,long vertretenderMitarbeiterOid,long absencetimeOid,string notiz, DateTime vertretungszeitraumVon, DateTime vertretungszeitraumBis)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -3591,18 +3639,19 @@ namespace BeWo.Service.ServiceImplementations
|
||||
{
|
||||
EmployeeOid = mitarbeiterOid,
|
||||
CustomerOid = klientenOid,
|
||||
VertretenderMitarbeiterOid = vertretenderMitarbeiter,
|
||||
VertretenderMitarbeiterOid = vertretenderMitarbeiterOid,
|
||||
Notice = notiz,
|
||||
VertretungsZeitraumVon = vertretungszeitraumVon,
|
||||
VertretungsZeitraumBis = vertretungszeitraumBis,
|
||||
|
||||
AbsenceTimeOid = absencetimeOid
|
||||
};
|
||||
|
||||
|
||||
var x = MapperFactory.VertretungDC_Vertretung.MapToNewEntity(ahh);
|
||||
|
||||
DAOFactory.GenericDAO.Insert(x);
|
||||
|
||||
|
||||
return ahh;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
@@ -3657,6 +3706,24 @@ namespace BeWo.Service.ServiceImplementations
|
||||
}
|
||||
//#################################################################
|
||||
|
||||
|
||||
public ArbeitszeitListeDC GetAlleArbeitszeiten(long employeeOid)
|
||||
{
|
||||
try
|
||||
{
|
||||
var x = DAOFactory.SearchDAO.FindEmployeeArbeitszeitListe(employeeOid);
|
||||
|
||||
var aff = MapperFactory.ArbeitszeitListeDC_ArbeitszeitListe.MapToNewDC(x);
|
||||
|
||||
|
||||
return aff;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
throw Utils.CreateBeWoFaultException(e);
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#endregion
|
||||
|
||||
30
Shared/DataContracts/ArbeitszeitDC.cs
Normal file
30
Shared/DataContracts/ArbeitszeitDC.cs
Normal file
@@ -0,0 +1,30 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Runtime.Serialization;
|
||||
|
||||
namespace BS.Shared.DataContracts
|
||||
{
|
||||
[DataContract]
|
||||
public class ArbeitszeitDC : IDataContract
|
||||
{
|
||||
[DataMember]
|
||||
public long? ArbeitszeitOid { get; set; }
|
||||
|
||||
[DataMember]
|
||||
public long? EmployeeOid { get; set; }
|
||||
|
||||
[DataMember]
|
||||
public DateTime GueltigVon { get; set; }
|
||||
|
||||
[DataMember]
|
||||
public DateTime GueltigBis { get; set; }
|
||||
|
||||
[DataMember]
|
||||
public string Notice { get; set; }
|
||||
|
||||
[DataMember]
|
||||
public List<ArbeitszeitEintragDC> Eintraege { get; set; }
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
30
Shared/DataContracts/ArbeitszeitEintragDC.cs
Normal file
30
Shared/DataContracts/ArbeitszeitEintragDC.cs
Normal file
@@ -0,0 +1,30 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Runtime.Serialization;
|
||||
|
||||
namespace BS.Shared.DataContracts
|
||||
{
|
||||
[DataContract]
|
||||
public class ArbeitszeitEintragDC : IDataContract
|
||||
{
|
||||
[DataMember]
|
||||
public long? ArbeitszeitEintragOid { get; set; }
|
||||
|
||||
[DataMember]
|
||||
public long? ArbeitszeitOid { get; set; }
|
||||
|
||||
[DataMember]
|
||||
public AppointmentDayOfWeek Tag { get; set; }
|
||||
|
||||
[DataMember]
|
||||
public string UhrzeitVon { get; set; }
|
||||
|
||||
[DataMember]
|
||||
public string UhrzeitBis { get; set; }
|
||||
|
||||
[DataMember]
|
||||
public string Notice { get; set; }
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
22
Shared/DataContracts/ArbeitszeitListeDC.cs
Normal file
22
Shared/DataContracts/ArbeitszeitListeDC.cs
Normal file
@@ -0,0 +1,22 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Runtime.Serialization;
|
||||
using BS.Shared.DataContracts.Compact;
|
||||
|
||||
namespace BS.Shared.DataContracts
|
||||
{
|
||||
[DataContract]
|
||||
public class ArbeitszeitListeDC : IDataContract
|
||||
{
|
||||
[DataMember]
|
||||
public long? VertretungslisteOid { get; set; }
|
||||
|
||||
[DataMember]
|
||||
public List<ArbeitszeitDC> Arbeitszeitliste { get; set; }
|
||||
|
||||
[DataMember]
|
||||
public List<ArbeitszeitEintragDC> ArbeitszeitEintragliste { get; set; }
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -18,6 +18,9 @@ namespace BS.Shared.DataContracts
|
||||
[DataMember]
|
||||
public List<ContractDC> Contracts { get; set; }
|
||||
|
||||
[DataMember]
|
||||
public List<ArbeitszeitDC> Arbeitszeit { get; set; }
|
||||
|
||||
//[DataMember]
|
||||
//public int CancellationPeriod { get; set; }
|
||||
|
||||
|
||||
@@ -170,6 +170,9 @@
|
||||
<Compile Include="DataContracts\EmployeeAPPCodeDC.cs" />
|
||||
<Compile Include="DataContracts\ChatMessageDC.cs" />
|
||||
<Compile Include="DataContracts\ChatMediaMessageDC.cs" />
|
||||
<Compile Include="DataContracts\ArbeitszeitDC.cs" />
|
||||
<Compile Include="DataContracts\ArbeitszeitEintragDC.cs" />
|
||||
<Compile Include="DataContracts\ArbeitszeitListeDC.cs" />
|
||||
<Compile Include="DataContracts\VertretungsListeDC.cs" />
|
||||
<Compile Include="DataContracts\KriterienDC.cs" />
|
||||
<Compile Include="DataContracts\VertretungDC.cs" />
|
||||
|
||||
Reference in New Issue
Block a user