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

SBD Update mit vielen Farben und teil umstruckturierungen

Browse Source
This commit is contained in:
Waldi
2017-05-18 16:54:33 +02:00
parent cf1fb793e7
commit f899913026
10 changed files with 828 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
BeWo/SchulbegleitenderDienst/KrankheitsZeitraumView.xaml
View File

@@ -2,7 +2,7 @@
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">
Background="Transparent" Height="125" Width="400" WindowStartupLocation="CenterScreen" WindowStyle="None">
<GroupBox Header="KrankheitsZeitraumView" x:Name="rootGroupBox" Style="{DynamicResource MainContentGroupBoxWithoutMaximizeBtnStyle}" Background="Transparent" MouseLeftButtonDown="RootGroupBox_OnMouseLeftButtonDown">
<Grid Background="White">
@@ -26,9 +26,10 @@
<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"/>
<StackPanel Grid.Row="1" Grid.Column="3" Grid.ColumnSpan="2" Orientation="Horizontal">
<Button Content="Schließen" Click="ButtonBase_OnClick" HorizontalAlignment="Right" Margin="2,2,2,2"/>
<Button Content="Übernehmen" Click="RaisEvent_OnClick" HorizontalAlignment="Right" Margin="2,2,2,2"/>
</StackPanel>
</Grid>
</GroupBox>

39
BeWo/SchulbegleitenderDienst/KrankheitsZeitraumView.xaml.cs
View File

@@ -20,12 +20,14 @@ namespace BeWo.SchulbegleitenderDienst
{
public event EventHandler<KrankheitsEventArgs> RaiseCustomEvent;
public KrankheitsZeitraumView( DateTime[] Zeitraum)
public KrankheitsZeitraumView( DateTime start,DateTime ende)
{
InitializeComponent();
DateVon.DateTime = Zeitraum[0];
DateBis.DateTime = Zeitraum[1];
DateVon.EditValue = start;
DateBis.EditValue = ende;
CloseWindow();
}
@@ -57,32 +59,37 @@ namespace BeWo.SchulbegleitenderDienst
public void RaisEvent_OnClick(object sender, RoutedEventArgs e)
{
string a = DateVon.DateTime.ToString();
string b = DateBis.DateTime.ToString();
var a = DateVon.DateTime;
var b = DateBis.DateTime;
string x = a + " - " + b;
RaiseCustomEvent(this, new KrankheitsEventArgs(x));
CloseWindow();
RaiseCustomEvent(this, new KrankheitsEventArgs(a,b));
}
private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
{
CloseWindow();
Close();
}
}
public class KrankheitsEventArgs : EventArgs
{
public KrankheitsEventArgs(string s)
public KrankheitsEventArgs(DateTime s, DateTime e)
{
dc = s;
_start = s;
_end = e;
}
private string dc;
public string Message
private DateTime _start;
private DateTime _end;
public DateTime Start
{
get { return dc; }
get { return _start; }
}
public DateTime Ende
{
get { return _end; }
}
}
}

180
BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml
View File

@@ -57,7 +57,7 @@
<!-- EditValue="{Binding Path=PlacementDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" -->
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.ColumnSpan="1" x:Name="Datepicker" Height="23" Grid.Row="0" Width="100" HorizontalAlignment="Left" VerticalAlignment="Top" EditValueChanged="Datepicker_OnEditValueChanged" Margin="3,3,3,3"/>
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.ColumnSpan="1" x:Name="Datepicker" Height="23" Grid.Row="0" Width="100" HorizontalAlignment="Left" VerticalAlignment="Top" EditValueChanged="Datepicker_OnEditValueChanged" Margin="3,3,3,3" AllowNullInput="False"/>
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" >
@@ -70,6 +70,10 @@
<Image Source="/BeWoPlaner;component/Ressources/Icons/Calendar5Day24.png" />
</Button>
<Button Style="{x:Null}" Margin="3,3,3,3" Height="24" Width="24" ToolTip="Aktualisieren" Click="Aktualisieren_OnClick" VerticalAlignment="Top" >
<Image Source="/BeWoPlaner;component/Ressources/Icons/SymbolRefresh32.png" />
</Button>
</StackPanel>
@@ -78,9 +82,9 @@
<StackPanel Orientation="Horizontal" Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="0">
<!-- ####################################### Bereich Mitarbeiter #####################################-->
<!--<Button Content="Mitarbeiter Vertretung" Grid.Row="1" Grid.Column="0" Margin="3,3,3,3" x:Name="MitarbeiterVertretung_Button"/>-->
<Button Style="{DynamicResource IconButtonStyle}" x:Name="MitarbeiterVertretung_Button" Background="Transparent" BorderBrush="Transparent" HorizontalAlignment="Left" Margin="3,3,3,3" Click="MitarbeiterVertretung_OnClick" >
<Image x:Name="MitarbeiterImage" ToolTip="Mitarbeiter Krankmelden" Source="../Ressources/Icons/User Business Male.png" />
<!--<Button Style="{DynamicResource IconButtonStyle}" Content="Mitarbeiter Vertretung" Grid.Row="1" Grid.Column="0" Margin="3,3,3,3" x:Name="MitarbeiterVertretung_Button"/>-->
<Button x:Name="MitarbeiterVertretung_Button" Background="Transparent" BorderBrush="Transparent" HorizontalAlignment="Left" Margin="3,3,3,3" Click="MitarbeiterVertretung_OnClick" Content="Mitarbeiter Krankmelden" >
<!-- <Image x:Name="MitarbeiterImage" ToolTip="Mitarbeiter Krankmelden" Source="../Ressources/Icons/User Business Male.png" />-->
</Button>
<controls:PopupNonTopmost Topmost="False" x:Name="popup_newMitarbeiterVertretung" Width="350" StaysOpen="True" Placement="MousePoint" Grid.Row="1" PlacementTarget="{Binding ElementName=MitarbeiterVertretung_Button}">
@@ -165,9 +169,9 @@
<!-- ##################### Klienten Vertretung Bereich ################################ -->
<!--<Button Content="Klienten Vertretung" Grid.Row="1" Grid.Column="1" Margin="3,3,3,3" x:Name="KlientVertretung_Button" Click="KlientVertretung_Button_OnClick"/>-->
<Button Style="{DynamicResource IconButtonStyle}" x:Name="KlientVertretung_Button" Background="Transparent" BorderBrush="Transparent" HorizontalAlignment="Left" Margin="3,3,3,3" Click="KlientVertretung_Button_OnClick" >
<Image x:Name="KlientImage" ToolTip="Klient Krankmelden" Source="../Ressources/Icons/UserHomeMaleDisabled.png" />
<!--<Button Style="{DynamicResource IconButtonStyle}" Content="Klienten Vertretung" Grid.Row="1" Grid.Column="1" Margin="3,3,3,3" x:Name="KlientVertretung_Button" Click="KlientVertretung_Button_OnClick"/>-->
<Button x:Name="KlientVertretung_Button" Background="Transparent" BorderBrush="Transparent" HorizontalAlignment="Left" Margin="3,3,3,3" Click="KlientVertretung_Button_OnClick" Content="Klient Krankmelden" >
<!-- <Image x:Name="KlientImage" ToolTip="Klient Krankmelden" Source="../Ressources/Icons/UserHomeMaleDisabled.png" />-->
</Button>
@@ -249,7 +253,7 @@
<dxg:GridControl.Columns >
<dxg:GridColumn FieldName="KrankerMitarbeiter" Width="200" ReadOnly="True"/>
<dxg:GridColumn FieldName="KrankerMitarbeiter" Width="125" ReadOnly="True"/>
<!--<dxg:GridColumn.CellStyle>
<Style TargetType="{x:Type dxg:CellContentPresenter}">
<Style.Triggers>
@@ -261,9 +265,9 @@
</dxg:GridColumn.CellStyle>-->
<!--<dxe:ComboBoxEditSettings x:Name="ComboBoxEditSettingsVertretung"/>-->
<dxg:GridColumn FieldName="Arbeitszeit" ReadOnly="True" Width="100"/>
<dxg:GridColumn FieldName="Arbeitszeit" ReadOnly="True" Width="75"/>
<dxg:GridColumn FieldName="Kunde" Header="Kind" Width="200" ReadOnly="True">
<dxg:GridColumn FieldName="Kunde" Header="Kind" Width="125" ReadOnly="True">
<dxg:GridColumn.CellStyle>
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
<Style.Triggers>
@@ -279,7 +283,7 @@
</dxg:GridColumn>
<dxg:GridColumn FieldName="Vertretung" Width="250" x:Name="ColumnVertretung" ReadOnly="True">
<dxg:GridColumn FieldName="Vertretung" Width="125" x:Name="ColumnVertretung" ReadOnly="True">
<dxg:GridColumn.EditSettings >
<dxe:ButtonEditSettings x:Name="ButtonEditSet" AllowDefaultButton="False">
<dxe:ButtonEditSettings.Buttons >
@@ -294,24 +298,24 @@
</dxg:GridColumn>
<dxg:GridColumn FieldName="KrankheitsMeldung" Width="200" />
<dxg:GridColumn FieldName="KrankheitsMeldung" Width="125" />
<dxg:GridColumn FieldName="KrankheitsZeitraum" Width="200" ReadOnly="True">
<dxg:GridColumn FieldName="KrankheitsZeitraum" Width="175" 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="VertretungsZeitraum" Width="175" ReadOnly="True" />
<dxg:GridColumn FieldName="AbwesenheitsKategorie" Width="200">
<dxg:GridColumn FieldName="AbwesenheitsKategorie" Width="175">
<dxg:GridColumn.EditSettings>
<dxe:ComboBoxEditSettings x:Name="AbwesenheitsKategorieComboBox"/>
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
<dxg:GridColumn FieldName="Beschreibung" Header="Freie Bemerkung" Width="400" >
<dxg:GridColumn FieldName="Beschreibung" Header="Freie Bemerkung" Width="500" >
<dxg:GridColumn.EditSettings>
<dxe:TextEditSettings TextWrapping="Wrap" AcceptsReturn="True" />
</dxg:GridColumn.EditSettings>
@@ -340,7 +344,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="Mitarbeiter" Width="175" ReadOnly="True" >
<dxg:GridColumn FieldName="MaFrei" Header="Mitarbeiter" Width="125" ReadOnly="True" >
<!--<dxg:GridColumn.CellTemplate>
<DataTemplate>
<Border BorderThickness="1" BorderBrush="Black"/>
@@ -348,9 +352,9 @@
</dxg:GridColumn.CellTemplate>-->
</dxg:GridColumn>
<dxg:GridColumn FieldName="Mo" Header="Mo" Width="100" />
<dxg:GridColumn FieldName="Mo" Header="Mo" Width="75" />
<dxg:GridColumn FieldName="EingesetztBeiMo" Header="Eingesetzt bei" Width="175" >
<dxg:GridColumn FieldName="EingesetztBeiMo" Header="Eingesetzt bei" Width="125" >
<dxg:GridColumn.EditSettings >
<dxe:ButtonEditSettings x:Name="ButtonEditSetMaMo" AllowDefaultButton="False">
<dxe:ButtonEditSettings.Buttons >
@@ -364,19 +368,23 @@
</dxg:GridColumn.EditSettings>
<dxg:GridColumn.CellStyle>
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
<Setter Property="Background" Value="#7fff7f" />
<Style.Triggers>
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiMo}" Value=" ">
<Setter Property="Background" Value="DarkTurquoise" />
<Setter Property="Background" Value="LightGray" />
<Setter Property="IsEnabled" Value="False" />
</DataTrigger>
</Style.Triggers>
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiMo}" Value="">
<Setter Property="Background" Value="Red" />
</DataTrigger>
</Style.Triggers>
</Style>
</dxg:GridColumn.CellStyle>
</dxg:GridColumn>
<dxg:GridColumn FieldName="Di" Header="Di" Width="100" />
<dxg:GridColumn FieldName="Di" Header="Di" Width="75" />
<dxg:GridColumn FieldName="EingesetztBeiDi" Header="Eingesetzt bei" Width="175" >
<dxg:GridColumn FieldName="EingesetztBeiDi" Header="Eingesetzt bei" Width="125" >
<dxg:GridColumn.EditSettings >
<dxe:ButtonEditSettings x:Name="ButtonEditSetMaDi" AllowDefaultButton="False">
<dxe:ButtonEditSettings.Buttons >
@@ -390,19 +398,23 @@
</dxg:GridColumn.EditSettings>
<dxg:GridColumn.CellStyle>
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
<Setter Property="Background" Value="#7fff7f" />
<Style.Triggers>
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiDi}" Value=" ">
<Setter Property="Background" Value="DarkTurquoise" />
<Setter Property="Background" Value="LightGray" />
<Setter Property="IsEnabled" Value="False" />
</DataTrigger>
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiDi}" Value="">
<Setter Property="Background" Value="Red" />
</DataTrigger>
</Style.Triggers>
</Style>
</dxg:GridColumn.CellStyle>
</dxg:GridColumn>
<dxg:GridColumn FieldName="Mi" Header="Mi" Width="100" />
<dxg:GridColumn FieldName="Mi" Header="Mi" Width="75" />
<dxg:GridColumn FieldName="EingesetztBeiMi" Header="Eingesetzt bei" Width="175" >
<dxg:GridColumn FieldName="EingesetztBeiMi" Header="Eingesetzt bei" Width="125" >
<dxg:GridColumn.EditSettings >
<dxe:ButtonEditSettings x:Name="ButtonEditSetMaMi" AllowDefaultButton="False">
<dxe:ButtonEditSettings.Buttons >
@@ -416,19 +428,23 @@
</dxg:GridColumn.EditSettings>
<dxg:GridColumn.CellStyle>
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
<Setter Property="Background" Value="#7fff7f" />
<Style.Triggers>
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiMi}" Value=" ">
<Setter Property="Background" Value="DarkTurquoise" />
<Setter Property="Background" Value="LightGray" />
<Setter Property="IsEnabled" Value="False" />
</DataTrigger>
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiMi}" Value="">
<Setter Property="Background" Value="Red" />
</DataTrigger>
</Style.Triggers>
</Style>
</dxg:GridColumn.CellStyle>
</dxg:GridColumn>
<dxg:GridColumn FieldName="Do" Header="Do" Width="100" />
<dxg:GridColumn FieldName="Do" Header="Do" Width="75" />
<dxg:GridColumn FieldName="EingesetztBeiDo" Header="Eingesetzt bei" Width="175" >
<dxg:GridColumn FieldName="EingesetztBeiDo" Header="Eingesetzt bei" Width="125" >
<dxg:GridColumn.EditSettings >
<dxe:ButtonEditSettings x:Name="ButtonEditSetMaDo" AllowDefaultButton="False">
<dxe:ButtonEditSettings.Buttons >
@@ -442,19 +458,23 @@
</dxg:GridColumn.EditSettings>
<dxg:GridColumn.CellStyle>
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
<Setter Property="Background" Value="#7fff7f" />
<Style.Triggers>
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiDo}" Value=" ">
<Setter Property="Background" Value="DarkTurquoise" />
<Setter Property="Background" Value="LightGray" />
<Setter Property="IsEnabled" Value="False" />
</DataTrigger>
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiDo}" Value="">
<Setter Property="Background" Value="Red" />
</DataTrigger>
</Style.Triggers>
</Style>
</dxg:GridColumn.CellStyle>
</dxg:GridColumn>
<dxg:GridColumn FieldName="Fr" Header="Fr" Width="100" />
<dxg:GridColumn FieldName="Fr" Header="Fr" Width="75" />
<dxg:GridColumn FieldName="EingesetztBeiFr" Header="Eingesetzt bei" Width="175" >
<dxg:GridColumn FieldName="EingesetztBeiFr" Header="Eingesetzt bei" Width="125" >
<dxg:GridColumn.EditSettings >
<dxe:ButtonEditSettings x:Name="ButtonEditSetMaFr" AllowDefaultButton="False">
<dxe:ButtonEditSettings.Buttons >
@@ -468,19 +488,23 @@
</dxg:GridColumn.EditSettings>
<dxg:GridColumn.CellStyle>
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
<Setter Property="Background" Value="#7fff7f" />
<Style.Triggers>
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiFr}" Value=" ">
<Setter Property="Background" Value="DarkTurquoise" />
<Setter Property="Background" Value="LightGray" />
<Setter Property="IsEnabled" Value="False" />
</DataTrigger>
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiFr}" Value="">
<Setter Property="Background" Value="Red" />
</DataTrigger>
</Style.Triggers>
</Style>
</dxg:GridColumn.CellStyle>
</dxg:GridColumn>
<dxg:GridColumn FieldName="Sa" Header="Sa" Width="100" />
<dxg:GridColumn FieldName="Sa" Header="Sa" Width="75" />
<dxg:GridColumn FieldName="EingesetztBeiSa" Header="Eingesetzt bei" Width="175" >
<dxg:GridColumn FieldName="EingesetztBeiSa" Header="Eingesetzt bei" Width="125" >
<dxg:GridColumn.EditSettings >
<dxe:ButtonEditSettings x:Name="ButtonEditSetMaSa" AllowDefaultButton="False">
<dxe:ButtonEditSettings.Buttons >
@@ -494,11 +518,15 @@
</dxg:GridColumn.EditSettings>
<dxg:GridColumn.CellStyle>
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
<Setter Property="Background" Value="#7fff7f" />
<Style.Triggers>
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiSa}" Value=" ">
<Setter Property="Background" Value="DarkTurquoise" />
<Setter Property="Background" Value="LightGray" />
<Setter Property="IsEnabled" Value="False" />
</DataTrigger>
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiSa}" Value="">
<Setter Property="Background" Value="Red" />
</DataTrigger>
</Style.Triggers>
</Style>
</dxg:GridColumn.CellStyle>
@@ -507,17 +535,17 @@
</dxg:GridControl.Columns>
<dxg:GridControl.View>
<dxg:TableView AllowPerPixelScrolling="True" ShowTotalSummary="False" AutoWidth="True" ShowGridMenu="DataViewBase_OnShowGridMenu" CellValueChanged="GridViewWochenMitarbeiterBase_OnRowUpdated" />
<dxg:TableView AllowPerPixelScrolling="True" ShowTotalSummary="False" AutoWidth="False" ShowGridMenu="DataViewBase_OnShowGridMenu" CellValueChanged="GridViewWochenMitarbeiterBase_OnRowUpdated" />
</dxg:GridControl.View>
</dxg:GridControl>
<!--############################### 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" BorderBrush="Black">
<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" ReadOnly="True" >
<dxg:GridColumn FieldName="MaKrank" Header="Ma Krank" Width="125" ReadOnly="True" >
<!--<dxg:GridColumn.CellTemplate>
<DataTemplate>
<Border BorderThickness="1" BorderBrush="Black" Background="Transparent"/>
@@ -525,7 +553,7 @@
</dxg:GridColumn.CellTemplate>-->
</dxg:GridColumn>
<dxg:GridColumn FieldName="Kind" Header="Kind" Width="175" ReadOnly="True" >
<dxg:GridColumn FieldName="Kind" Header="Kind" Width="125" ReadOnly="True" >
<!--<dxg:GridColumn.CellTemplate>
<DataTemplate>
<Border BorderThickness="1" BorderBrush="Black" Background="Transparent"/>
@@ -533,9 +561,9 @@
</dxg:GridColumn.CellTemplate>-->
</dxg:GridColumn>
<dxg:GridColumn FieldName="Mo" Header="Mo" Width="100" />
<dxg:GridColumn FieldName="Mo" Header="Mo" Width="75" />
<dxg:GridColumn FieldName="VertretungMo" Header="Vertretung" Width="175" >
<dxg:GridColumn FieldName="VertretungMo" Header="Vertretung" Width="125" >
<dxg:GridColumn.EditSettings >
<dxe:ButtonEditSettings x:Name="ButtonEditSetMo" AllowDefaultButton="False">
<dxe:ButtonEditSettings.Buttons >
@@ -549,19 +577,23 @@
</dxg:GridColumn.EditSettings>
<dxg:GridColumn.CellStyle>
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
<Setter Property="Background" Value="#7fff7f" />
<Style.Triggers>
<DataTrigger Binding="{Binding RowData.Row.VertretungMo}" Value=" ">
<Setter Property="Background" Value="DimGray" />
<Setter Property="Background" Value="LightGray" />
<Setter Property="IsEnabled" Value="False" />
</DataTrigger>
<DataTrigger Binding="{Binding RowData.Row.VertretungMo}" Value="">
<Setter Property="Background" Value="Red" />
</DataTrigger>
</Style.Triggers>
</Style>
</dxg:GridColumn.CellStyle>
</dxg:GridColumn>
<dxg:GridColumn FieldName="Di" Header="Di" Width="100" />
<dxg:GridColumn FieldName="Di" Header="Di" Width="75" />
<dxg:GridColumn FieldName="VertretungDi" Header="Vertretung" Width="175" >
<dxg:GridColumn FieldName="VertretungDi" Header="Vertretung" Width="125" >
<dxg:GridColumn.EditSettings >
<dxe:ButtonEditSettings x:Name="ButtonEditSetDi" AllowDefaultButton="False">
<dxe:ButtonEditSettings.Buttons >
@@ -574,20 +606,25 @@
</dxe:ButtonEditSettings>
</dxg:GridColumn.EditSettings>
<dxg:GridColumn.CellStyle>
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
<Setter Property="Background" Value="#7fff7f" />
<Style.Triggers>
<DataTrigger Binding="{Binding RowData.Row.VertretungDi}" Value=" ">
<Setter Property="Background" Value="DimGray" />
<Setter Property="Background" Value="LightGray" />
<Setter Property="IsEnabled" Value="False" />
</DataTrigger>
<DataTrigger Binding="{Binding RowData.Row.VertretungDi}" Value="">
<Setter Property="Background" Value="Red" />
</DataTrigger>
</Style.Triggers>
</Style>
</dxg:GridColumn.CellStyle>
</dxg:GridColumn>
<dxg:GridColumn FieldName="Mi" Header="Mi" Width="100" />
<dxg:GridColumn FieldName="Mi" Header="Mi" Width="75" />
<dxg:GridColumn FieldName="VertretungMi" Header="Vertretung" Width="175" >
<dxg:GridColumn FieldName="VertretungMi" Header="Vertretung" Width="125" >
<dxg:GridColumn.EditSettings >
<dxe:ButtonEditSettings x:Name="ButtonEditSetMi" AllowDefaultButton="False">
<dxe:ButtonEditSettings.Buttons >
@@ -601,19 +638,23 @@
</dxg:GridColumn.EditSettings>
<dxg:GridColumn.CellStyle>
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
<Setter Property="Background" Value="#7fff7f" />
<Style.Triggers>
<DataTrigger Binding="{Binding RowData.Row.VertretungMi}" Value=" ">
<Setter Property="Background" Value="DimGray" />
<Setter Property="Background" Value="LightGray" />
<Setter Property="IsEnabled" Value="False" />
</DataTrigger>
<DataTrigger Binding="{Binding RowData.Row.VertretungMi}" Value="">
<Setter Property="Background" Value="Red" />
</DataTrigger>
</Style.Triggers>
</Style>
</dxg:GridColumn.CellStyle>
</dxg:GridColumn>
<dxg:GridColumn FieldName="Do" Header="Do" Width="100" />
<dxg:GridColumn FieldName="Do" Header="Do" Width="75" />
<dxg:GridColumn FieldName="VertretungDo" Header="Vertretung" Width="175" >
<dxg:GridColumn FieldName="VertretungDo" Header="Vertretung" Width="125" >
<dxg:GridColumn.EditSettings >
<dxe:ButtonEditSettings x:Name="ButtonEditSetDo" AllowDefaultButton="False">
<dxe:ButtonEditSettings.Buttons >
@@ -627,9 +668,14 @@
</dxg:GridColumn.EditSettings>
<dxg:GridColumn.CellStyle>
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
<Setter Property="Background" Value="#7fff7f" />
<Style.Triggers>
<DataTrigger Binding="{Binding RowData.Row.VertretungDo}" Value=" ">
<Setter Property="Background" Value="DimGray" />
<Setter Property="Background" Value="LightGray" />
<Setter Property="IsEnabled" Value="False" />
</DataTrigger>
<DataTrigger Binding="{Binding RowData.Row.VertretungDo}" Value="">
<Setter Property="Background" Value="Red" />
<Setter Property="IsEnabled" Value="False" />
</DataTrigger>
</Style.Triggers>
@@ -637,9 +683,9 @@
</dxg:GridColumn.CellStyle>
</dxg:GridColumn>
<dxg:GridColumn FieldName="Fr" Header="Fr" Width="100" />
<dxg:GridColumn FieldName="Fr" Header="Fr" Width="75" />
<dxg:GridColumn FieldName="VertretungFr" Header="Vertretung" Width="175" >
<dxg:GridColumn FieldName="VertretungFr" Header="Vertretung" Width="125" >
<dxg:GridColumn.EditSettings >
<dxe:ButtonEditSettings x:Name="ButtonEditSetFr" AllowDefaultButton="False">
<dxe:ButtonEditSettings.Buttons >
@@ -653,9 +699,14 @@
</dxg:GridColumn.EditSettings>
<dxg:GridColumn.CellStyle>
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
<Setter Property="Background" Value="#7fff7f" />
<Style.Triggers>
<DataTrigger Binding="{Binding RowData.Row.VertretungFr}" Value=" ">
<Setter Property="Background" Value="DimGray" />
<Setter Property="Background" Value="LightGray" />
<Setter Property="IsEnabled" Value="False" />
</DataTrigger>
<DataTrigger Binding="{Binding RowData.Row.VertretungFr}" Value="">
<Setter Property="Background" Value="Red" />
<Setter Property="IsEnabled" Value="False" />
</DataTrigger>
</Style.Triggers>
@@ -663,9 +714,9 @@
</dxg:GridColumn.CellStyle>
</dxg:GridColumn>
<dxg:GridColumn FieldName="Sa" Header="Sa" Width="100" />
<dxg:GridColumn FieldName="Sa" Header="Sa" Width="75" />
<dxg:GridColumn FieldName="VertretungSa" Header="Vertretung" Width="175" >
<dxg:GridColumn FieldName="VertretungSa" Header="Vertretung" Width="125" >
<dxg:GridColumn.EditSettings >
<dxe:ButtonEditSettings x:Name="ButtonEditSetSa" AllowDefaultButton="False">
<dxe:ButtonEditSettings.Buttons >
@@ -679,9 +730,14 @@
</dxg:GridColumn.EditSettings>
<dxg:GridColumn.CellStyle>
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
<Setter Property="Background" Value="#7fff7f" />
<Style.Triggers>
<DataTrigger Binding="{Binding RowData.Row.VertretungSa}" Value=" ">
<Setter Property="Background" Value="DimGray" />
<Setter Property="Background" Value="LightGray" />
<Setter Property="IsEnabled" Value="False" />
</DataTrigger>
<DataTrigger Binding="{Binding RowData.Row.VertretungSa}" Value="">
<Setter Property="Background" Value="Red" />
<Setter Property="IsEnabled" Value="False" />
</DataTrigger>
</Style.Triggers>
@@ -691,7 +747,7 @@
</dxg:GridControl.Columns>
<dxg:GridControl.View>
<dxg:TableView AllowPerPixelScrolling="True" ShowTotalSummary="False" AutoWidth="True" ShowGridMenu="DataViewBase_OnShowGridMenu" CellValueChanged="GridViewWochenKlientBase_OnRowUpdated" />
<dxg:TableView AllowPerPixelScrolling="True" ShowTotalSummary="False" AutoWidth="False" ShowGridMenu="DataViewBase_OnShowGridMenu" CellValueChanged="GridViewWochenKlientBase_OnRowUpdated" AllowBestFit="True" />
</dxg:GridControl.View>
</dxg:GridControl>
@@ -777,12 +833,12 @@
<Popup Margin="10" x:Name="popup_MitarbeiterVertretung" StaysOpen="False" Placement="MousePoint" Width="370" Height="250"
Closed="popup_Closed" Opened="popup_Opened">
Closed="popup_Closed" Opened="popup_Opened">
<search:EmployeeSearchView x:Name="MitarbeiterVertretungsearchview" />
</Popup>
<Popup Margin="10" x:Name="popup_KlientVertretung" StaysOpen="False" Placement="MousePoint" Width="370" Height="250"
Closed="popup_Closed" Opened="popup_Opened">
Closed="popup_Closed" Opened="popup_Opened">
<search:CustomerSearchView x:Name="KlientVertretungsearchview" />
</Popup>
</Grid>

916
BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml.cs
View File

File diff suppressed because it is too large Load Diff

70
BeWo/ServiceProxy/Generated.cs
View File

@@ -4144,18 +4144,13 @@ namespace BeWo.ServiceProxy
"dDateBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.ServiceRecordDC> GetCustomerServiceRecordsCompactWithStartEndDate(long pCustomerOid, long costbearer2SupportConceptOid, System.DateTime start, System.DateTime ende);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllVertretungen", ReplyAction="http://tempuri.org/IOperationsService/GetAllVertretungenResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllVertretungenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.VertretungDC> GetAllVertretungen();
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewEmployeeAbsenceTime", ReplyAction="http://tempuri.org/IOperationsService/InsertNewEmployeeAbsenceTimeResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewEmployeeAbsenceTimeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void InsertNewEmployeeAbsenceTime(long employeeOid, BS.Shared.DataContracts.AbsenceTimeDC at);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewMitarbeiterVertretung", ReplyAction="http://tempuri.org/IOperationsService/InsertNewMitarbeiterVertretungResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewMitarbeiterVertretungBeWoFaultFaul" +
"t", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void InsertNewMitarbeiterVertretung(BS.Shared.DataContracts.VertretungDC vertretungM, System.Nullable<long> absenceReasonOid, System.DateTime krankheitsMeldung);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewKlientenVertretung", ReplyAction="http://tempuri.org/IOperationsService/InsertNewKlientenVertretungResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewKlientenVertretungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void InsertNewKlientenVertretung(BS.Shared.DataContracts.VertretungDC vertretungK, System.Nullable<long> absenceReasonOid, System.DateTime krankheitsMeldung);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewCustomerAbsenceTime", ReplyAction="http://tempuri.org/IOperationsService/InsertNewCustomerAbsenceTimeResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewCustomerAbsenceTimeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void InsertNewCustomerAbsenceTime(long customerOid, BS.Shared.DataContracts.AbsenceTimeDC at);
[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")]
@@ -4163,7 +4158,7 @@ namespace BeWo.ServiceProxy
[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, BS.Shared.DataContracts.AbsenceReasonDC absenceReason);
void UpdateVertretung(BS.Shared.DataContracts.VertretungDC vert);
[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")]
@@ -4171,16 +4166,21 @@ namespace BeWo.ServiceProxy
[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);
void CreateVertretung(BS.Shared.DataContracts.VertretungDC vertretung);
[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/UpdateVertretungAndAbsenceTime", ReplyAction="http://tempuri.org/IOperationsService/UpdateVertretungAndAbsenceTimeResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateVertretungAndAbsenceTimeBeWoFaultFaul" +
"t", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void UpdateVertretungAndAbsenceTime(BS.Shared.DataContracts.VertretungDC vert, BS.Shared.DataContracts.AbsenceTimeDC abs);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateAbsenceTime", ReplyAction="http://tempuri.org/IOperationsService/UpdateAbsenceTimeResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateAbsenceTimeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void UpdateAbsenceTime(BS.Shared.DataContracts.AbsenceTimeDC abs);
[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);
@@ -4876,19 +4876,14 @@ namespace BeWo.ServiceProxy
return base.Channel.GetCustomerServiceRecordsCompactWithStartEndDate(pCustomerOid, costbearer2SupportConceptOid, start, ende);
}
public System.Collections.Generic.List<BS.Shared.DataContracts.VertretungDC> GetAllVertretungen()
public void InsertNewEmployeeAbsenceTime(long employeeOid, BS.Shared.DataContracts.AbsenceTimeDC at)
{
return base.Channel.GetAllVertretungen();
base.Channel.InsertNewEmployeeAbsenceTime(employeeOid, at);
}
public void InsertNewMitarbeiterVertretung(BS.Shared.DataContracts.VertretungDC vertretungM, System.Nullable<long> absenceReasonOid, System.DateTime krankheitsMeldung)
public void InsertNewCustomerAbsenceTime(long customerOid, BS.Shared.DataContracts.AbsenceTimeDC at)
{
base.Channel.InsertNewMitarbeiterVertretung(vertretungM, absenceReasonOid, krankheitsMeldung);
}
public void InsertNewKlientenVertretung(BS.Shared.DataContracts.VertretungDC vertretungK, System.Nullable<long> absenceReasonOid, System.DateTime krankheitsMeldung)
{
base.Channel.InsertNewKlientenVertretung(vertretungK, absenceReasonOid, krankheitsMeldung);
base.Channel.InsertNewCustomerAbsenceTime(customerOid, at);
}
public void DeleteVertretung(long vert)
@@ -4896,9 +4891,9 @@ namespace BeWo.ServiceProxy
base.Channel.DeleteVertretung(vert);
}
public void UpdateVertretung(BS.Shared.DataContracts.VertretungDC vert, BS.Shared.DataContracts.AbsenceReasonDC absenceReason)
public void UpdateVertretung(BS.Shared.DataContracts.VertretungDC vert)
{
base.Channel.UpdateVertretung(vert, absenceReason);
base.Channel.UpdateVertretung(vert);
}
public BS.Shared.DataContracts.VertretungsListeDC VertretungsListe(System.DateTime absenceTime)
@@ -4906,14 +4901,9 @@ 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)
public void CreateVertretung(BS.Shared.DataContracts.VertretungDC vertretung)
{
return base.Channel.CreateVertretung(mitarbeiterOid, klientenOid, vertretenderMitarbeiterOid, absencetimeOid, notiz, vertretungszeitraumVon, vertretungszeitraumBis);
}
public void DeletAbsenceTime(long absenceoid)
{
base.Channel.DeletAbsenceTime(absenceoid);
base.Channel.CreateVertretung(vertretung);
}
public void DeactivateAbsenceTime(System.Collections.Generic.Dictionary<long, long> pOid2Version)
@@ -4921,6 +4911,16 @@ namespace BeWo.ServiceProxy
base.Channel.DeactivateAbsenceTime(pOid2Version);
}
public void UpdateVertretungAndAbsenceTime(BS.Shared.DataContracts.VertretungDC vert, BS.Shared.DataContracts.AbsenceTimeDC abs)
{
base.Channel.UpdateVertretungAndAbsenceTime(vert, abs);
}
public void UpdateAbsenceTime(BS.Shared.DataContracts.AbsenceTimeDC abs)
{
base.Channel.UpdateAbsenceTime(abs);
}
public void DeactivateInvoices(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceDC> invoices)
{
base.Channel.DeactivateInvoices(invoices);

2
BeWo/View/EmployeeArbeitszeitView.xaml
View File

@@ -221,7 +221,7 @@
<dxg:GridControl Name="grid_bargeldtransaktionen" Tag="{Binding}" MaxWidth="{Binding ElementName=BlubbTest, Path=ActualWidth}" DataSource="{Binding Path=ArbeitszeitEintraege.VMList, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" >
<dxg:GridControl.Columns>
<dxg:GridColumn Header="Tag" FixedWidth="True" Width="100" ReadOnly="True" FieldName="Tag" />
<dxg:GridColumn Header="Tag" FixedWidth="True" Width="100" ReadOnly="True" FieldName="Tag" SortOrder="Ascending"/>
<dxg:GridColumn Header="Uhrzeit Von" FixedWidth="True" Width="250" ReadOnly="True" FieldName="UhrzeitVon" />
<dxg:GridColumn Header="Uhrzeit Bis" FixedWidth="True" Width="250" ReadOnly="True" FieldName="UhrzeitBis"/>
<dxg:GridColumn Header="Notiz" FixedWidth="True" Width="500" ReadOnly="True" FieldName="Notice"/>

2
BeWoPlanerAndroid/BeWoPlanerAndroid.csproj
View File

@@ -137,7 +137,7 @@
<WebProjectProperties>
<UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>62630</DevelopmentServerPort>
<DevelopmentServerPort>58676</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost/BeWoPlanerAndroid</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>

3
Service/DCEntityMapper/AbsenceTimeDC_AbsenceTime.cs
View File

@@ -19,6 +19,7 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.EmployeeOid = pEntity.EmployeeOid;
pDataContract.CustomerOid = pEntity.CustomerOid;
pDataContract.KrankheitsMeldung = pEntity.KrankheitsMeldung;
return pDataContract;
@@ -36,8 +37,6 @@ namespace BeWo.Service.DCEntityMapper
pEntity.Notice = pDataContract.Notice;
pEntity.Oid = pDataContract.AbsenceTimeOid;
pEntity.EmployeeOid = pDataContract.EmployeeOid;
pEntity.CustomerOid = pDataContract.CustomerOid;
pEntity.KrankheitsMeldung = pDataContract.KrankheitsMeldung;
return pEntity;

37
Service/ServiceContracts/IOperationsService.cs
View File

@@ -582,17 +582,25 @@ namespace BeWo.Service.ServiceContracts
[OperationContract]
List<ServiceRecordDC> GetCustomerServiceRecordsCompactWithStartEndDate(long pCustomerOid, long costbearer2SupportConceptOid, DateTime start, DateTime ende);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<VertretungDC> GetAllVertretungen();
//[FaultContract(typeof(BeWoFault))]
//[OperationContract]
//List<VertretungDC> GetAllVertretungen();
//[FaultContract(typeof(BeWoFault))]
//[OperationContract]
//void InsertNewMitarbeiterVertretung(VertretungDC vertretungM, long? absenceReasonOid, DateTime krankheitsMeldung);
//[FaultContract(typeof(BeWoFault))]
//[OperationContract]
//void InsertNewKlientenVertretung(VertretungDC vertretungK, long? absenceReasonOid, DateTime krankheitsMeldung);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void InsertNewMitarbeiterVertretung(VertretungDC vertretungM, long? absenceReasonOid, DateTime krankheitsMeldung);
void InsertNewEmployeeAbsenceTime(long employeeOid, AbsenceTimeDC at);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void InsertNewKlientenVertretung(VertretungDC vertretungK, long? absenceReasonOid, DateTime krankheitsMeldung);
void InsertNewCustomerAbsenceTime(long customerOid, AbsenceTimeDC at);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
@@ -600,7 +608,7 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void UpdateVertretung(VertretungDC vert, AbsenceReasonDC absenceReason);
void UpdateVertretung(VertretungDC vert);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
@@ -608,16 +616,23 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
VertretungDC CreateVertretung(long mitarbeiterOid, long klientenOid, long vertretenderMitarbeiterOid,
long absencetimeOid, string notiz, DateTime vertretungszeitraumVon, DateTime vertretungszeitraumBis);
void CreateVertretung(VertretungDC vertretung);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void DeletAbsenceTime(long absenceoid);
//[FaultContract(typeof(BeWoFault))]
//[OperationContract]
//void DeletAbsenceTime(long absenceoid);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void DeactivateAbsenceTime(Dictionary<long, long> pOid2Version);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void UpdateVertretungAndAbsenceTime(VertretungDC vert, AbsenceTimeDC abs);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void UpdateAbsenceTime(AbsenceTimeDC abs);
}
}

250
Service/ServiceImplementations/OperationsServiceImp.cs
View File

@@ -3469,20 +3469,20 @@ namespace BeWo.Service.ServiceImplementations
//####################### Schulbegleitender Dienst ##############################################
public void DeletAbsenceTime(long absenceoid)
{
try
{
var x = DAOFactory.GenericDAO.GetByID<AbsenceTime>(absenceoid);
//public void DeletAbsenceTime(long absenceoid)
//{
// try
// {
// var x = DAOFactory.GenericDAO.GetByID<AbsenceTime>(absenceoid);
DAOFactory.GenericDAO.Delete(x);
// DAOFactory.GenericDAO.Delete(x);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
// }
// catch (Exception e)
// {
// throw Utils.CreateBeWoFaultException(e);
// }
//}
public void DeactivateAbsenceTime( Dictionary<long,long> pOid2Version)
{
@@ -3496,13 +3496,28 @@ namespace BeWo.Service.ServiceImplementations
}
}
public List<VertretungDC>GetAllVertretungen()
//public List<VertretungDC>GetAllVertretungen()
//{
// try
// {
// var x = DAOFactory.GenericDAO.GetAllActive<Vertretung>();
// return MapperFactory.VertretungDC_Vertretung.MapToNewDCs(x);
// }
// catch (Exception e)
// {
// throw Utils.CreateBeWoFaultException(e);
// }
//}
public void InsertNewEmployeeAbsenceTime(long employeeOid, AbsenceTimeDC at)
{
try
{
var x = DAOFactory.GenericDAO.GetAllActive<Vertretung>();
return MapperFactory.VertretungDC_Vertretung.MapToNewDCs(x);
{
var emp = DAOFactory.GenericDAO.GetByID<Employee>(employeeOid);
emp.AbsenceTimes.Add(MapperFactory.AbsenceTimeDC_AbsenceTime.MapToNewEntity(at));
DAOFactory.GenericDAO.Update(emp);
}
catch (Exception e)
{
@@ -3510,73 +3525,88 @@ namespace BeWo.Service.ServiceImplementations
}
}
public void InsertNewMitarbeiterVertretung(VertretungDC vertretungM, long? absenceReasonOid, DateTime krankheitsMeldung)
public void InsertNewCustomerAbsenceTime(long customerOid, AbsenceTimeDC at)
{
try
{
//################# AbsenceTime ###########################
AbsenceTimeDC abstm = new AbsenceTimeDC();
var cust = DAOFactory.GenericDAO.GetByID<Customer>(customerOid);
cust.AbsenceTimes.Add(MapperFactory.AbsenceTimeDC_AbsenceTime.MapToNewEntity(at));
abstm.Start = vertretungM.VertretungsZeitraumVon;
abstm.End = vertretungM.VertretungsZeitraumBis;
abstm.EmployeeOid = vertretungM.EmployeeOid;
abstm.KrankheitsMeldung = krankheitsMeldung;
var x = DAOFactory.GenericDAO.GetByID<AbsenceReason>(absenceReasonOid.Value);
DAOFactory.GenericDAO.Update(cust);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
abstm.Reason = MapperFactory.AbsenceReasonDC_AbsenceReason.MapToNewDC(x);
//public void InsertNewMitarbeiterVertretung(VertretungDC vertretungM, long? absenceReasonOid, DateTime krankheitsMeldung)
//{
// try
// {
// //################# AbsenceTime ###########################
// AbsenceTimeDC abstm = new AbsenceTimeDC();
// abstm.Start = vertretungM.VertretungsZeitraumVon;
// abstm.End = vertretungM.VertretungsZeitraumBis;
// abstm.EmployeeOid = vertretungM.EmployeeOid.Value;
// abstm.KrankheitsMeldung = krankheitsMeldung;
// var x = DAOFactory.GenericDAO.GetByID<AbsenceReason>(absenceReasonOid.Value);
// abstm.Reason = MapperFactory.AbsenceReasonDC_AbsenceReason.MapToNewDC(x);
// var lAbsenceTime = MapperFactory.AbsenceTimeDC_AbsenceTime.MapToNewEntity(abstm);
// DAOFactory.GenericDAO.Insert(lAbsenceTime);
// vertretungM.AbsenceTimeOid = lAbsenceTime.Oid.Value;
// //#########################################################
// var lVertretung = MapperFactory.VertretungDC_Vertretung.MapToNewEntity(vertretungM);
// DAOFactory.GenericDAO.Insert(lVertretung);
// }
// catch (Exception e)
// {
// throw Utils.CreateBeWoFaultException(e);
// }
//}
//public void InsertNewKlientenVertretung(VertretungDC vertretungK, long? absenceReasonOid,DateTime krankheitsMeldung)
//{
// try
// {
// //################# AbsenceTime ###########################
// AbsenceTimeDC abstm = new AbsenceTimeDC();
// abstm.Start = vertretungK.VertretungsZeitraumVon;
// abstm.End = vertretungK.VertretungsZeitraumBis;
// abstm.CustomerOid = vertretungK.CustomerOid.Value;
// abstm.KrankheitsMeldung = krankheitsMeldung;
// var x = DAOFactory.GenericDAO.GetByID<AbsenceReason>(absenceReasonOid.Value);
// abstm.Reason = MapperFactory.AbsenceReasonDC_AbsenceReason.MapToNewDC(x);
// var lAbsenceTime = MapperFactory.AbsenceTimeDC_AbsenceTime.MapToNewEntity(abstm);
// DAOFactory.GenericDAO.Insert(lAbsenceTime);
var lAbsenceTime = MapperFactory.AbsenceTimeDC_AbsenceTime.MapToNewEntity(abstm);
DAOFactory.GenericDAO.Insert(lAbsenceTime);
vertretungM.AbsenceTimeOid = lAbsenceTime.Oid;
//#########################################################
var lVertretung = MapperFactory.VertretungDC_Vertretung.MapToNewEntity(vertretungM);
DAOFactory.GenericDAO.Insert(lVertretung);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public void InsertNewKlientenVertretung(VertretungDC vertretungK, long? absenceReasonOid,DateTime krankheitsMeldung)
{
try
{
//################# AbsenceTime ###########################
AbsenceTimeDC abstm = new AbsenceTimeDC();
abstm.Start = vertretungK.VertretungsZeitraumVon;
abstm.End = vertretungK.VertretungsZeitraumBis;
abstm.CustomerOid = vertretungK.CustomerOid;
abstm.KrankheitsMeldung = krankheitsMeldung;
var x = DAOFactory.GenericDAO.GetByID<AbsenceReason>(absenceReasonOid.Value);
abstm.Reason = MapperFactory.AbsenceReasonDC_AbsenceReason.MapToNewDC(x);
var lAbsenceTime = MapperFactory.AbsenceTimeDC_AbsenceTime.MapToNewEntity(abstm);
DAOFactory.GenericDAO.Insert(lAbsenceTime);
vertretungK.AbsenceTimeOid = lAbsenceTime.Oid;
//#########################################################
// vertretungK.AbsenceTimeOid = lAbsenceTime.Oid.Value;
// //#########################################################
var lVertretung = MapperFactory.VertretungDC_Vertretung.MapToNewEntity(vertretungK);
DAOFactory.GenericDAO.Insert(lVertretung);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
// var lVertretung = MapperFactory.VertretungDC_Vertretung.MapToNewEntity(vertretungK);
// DAOFactory.GenericDAO.Insert(lVertretung);
// }
// catch (Exception e)
// {
// throw Utils.CreateBeWoFaultException(e);
// }
//}
public void DeleteVertretung(long vert)
{
@@ -3592,7 +3622,24 @@ namespace BeWo.Service.ServiceImplementations
}
}
public void UpdateVertretung(VertretungDC vert, AbsenceReasonDC absenceReason)
public void UpdateVertretung(VertretungDC vert)
{
try
{
//update auch die dazugehörige AbsenceTime
var origVertretung = DAOFactory.GenericDAO.LoadByID<Vertretung>(vert.VertretungOid.Value);
MapperFactory.VertretungDC_Vertretung.MergeWithEntity(vert, origVertretung);
DAOFactory.GenericDAO.Update(origVertretung);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public void UpdateVertretungAndAbsenceTime(VertretungDC vert, AbsenceTimeDC abs)
{
try
{
@@ -3605,23 +3652,12 @@ namespace BeWo.Service.ServiceImplementations
//Upadate AbsenceTime
var origAbsenceTime = DAOFactory.GenericDAO.LoadByID<AbsenceTime>(vert.AbsenceTimeOid.Value);
var origAbsenceTime = DAOFactory.GenericDAO.LoadByID<AbsenceTime>(abs.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;
MapperFactory.AbsenceTimeDC_AbsenceTime.MergeWithEntity(abs, origAbsenceTime);
DAOFactory.GenericDAO.Update(origAbsenceTime);
}
catch (Exception e)
{
@@ -3630,28 +3666,14 @@ namespace BeWo.Service.ServiceImplementations
}
//verbesserungswürdig
public VertretungDC CreateVertretung(long mitarbeiterOid, long klientenOid,long vertretenderMitarbeiterOid,long absencetimeOid,string notiz, DateTime vertretungszeitraumVon, DateTime vertretungszeitraumBis)
public void CreateVertretung(VertretungDC vertretung)
{
try
{
VertretungDC ahh = new VertretungDC()
{
EmployeeOid = mitarbeiterOid,
CustomerOid = klientenOid,
VertretenderMitarbeiterOid = vertretenderMitarbeiterOid,
Notice = notiz,
VertretungsZeitraumVon = vertretungszeitraumVon,
VertretungsZeitraumBis = vertretungszeitraumBis,
AbsenceTimeOid = absencetimeOid
};
var x = MapperFactory.VertretungDC_Vertretung.MapToNewEntity(ahh);
var x = MapperFactory.VertretungDC_Vertretung.MapToNewEntity(vertretung);
DAOFactory.GenericDAO.Insert(x);
return ahh;
}
catch (Exception e)
{
@@ -3659,6 +3681,22 @@ namespace BeWo.Service.ServiceImplementations
}
}
public void UpdateAbsenceTime(AbsenceTimeDC abs)
{
try
{
var x = DAOFactory.GenericDAO.LoadByID<AbsenceTime>(abs.AbsenceTimeOid.Value);
MapperFactory.AbsenceTimeDC_AbsenceTime.MergeWithEntity(abs, x);
DAOFactory.GenericDAO.Update(x);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
//Fertig
public VertretungsListeDC VertretungsListe(DateTime absenceTime)
{