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

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

Browse Source
This commit is contained in:
Christian
2017-06-14 08:29:22 +02:00
parent bb7a90af9e abb0b683b2
commit 96d8667bf5
41 changed files with 1794 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BeWo/BeWo.csproj
View File

@@ -2506,6 +2506,9 @@
<ItemGroup>
<Resource Include="Ressources\Icons\Haeckchen.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Ressources\Icons\ArrowLeft.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>

1
BeWo/BeWoApp.xaml
View File

@@ -62,6 +62,7 @@
<conv:IndividualGoalMassnahmeUncheckPreventConverter x:Key="IndividualGoalMassnahmeUncheckPreventConverter" />
<conv:Rights2DefaultBooleanConverter x:Key="Rights2DefaultBooleanConverter"/>
<conv:CollectionCountToVisibilityConverter x:Key="CollectionCountToVisibilityConverter" />
<Style x:Key="SupportConceptDetailStyle" TargetType="{x:Type ListBoxItem}">
<Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type ItemsControl}, Mode=FindAncestor}}" />

110
BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml
View File

@@ -105,6 +105,9 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="Mitarbeiter/in" />
@@ -113,7 +116,9 @@
<Label Grid.Row="3" Grid.Column="0" Content="Meldung vom" />
<Label Grid.Row="4" Grid.Column="0" Content="Startdatum" />
<Label Grid.Row="5" Grid.Column="0" Content="Enddatum" />
<Label Grid.Row="6" Grid.Column="0" Content="Notiz" />
<Label Grid.Row="7" Grid.Column="0" Content="Uhrzeit Von" x:Name="MVLabelUhrzeitVon" />
<Label Grid.Row="8" Grid.Column="0" Content="Uhrzeit Bis" x:Name="MVLabelUhrzeitBis" />
<Label Grid.Row="9" Grid.Column="0" Content="Notiz" />
<!-- PreviewMouseDoubleClick="Popupedit_environmentPersonSearch_OnPreviewMouseDoubleClick" Text="{validation:ValidationBinding Path=EnvironmentPersons.NewVM.PersonString, UpdateSourceTrigger=PropertyChanged}"
@@ -137,7 +142,7 @@
Grid.Column="1" Margin="3" Height="23" Grid.Row="1" Grid.ColumnSpan="2" />-->
<ComboBox Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Margin="3" Height="23" x:Name="ComboBoxMitarbeiterVertretung" />
<controls1:NullItemComboBox Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Margin="3" Height="23" x:Name="ComboBoxMitarbeiterVertretung" />
<!--popupedit_environmentOrganisationSearch danach suchen für organisationsbereich -->
@@ -147,17 +152,33 @@
<dxe:DateEdit x:Name="MVDatepickerBis" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="5" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="MVDatepickerBis_OnEditValueChanged" />
<!--################# Neuer Kram #################-->
<CheckBox Grid.Column="1" Grid.Row="6" Content="ganztägig" Unchecked="MitarbeiterVertretungsToggleButton_OnUnchecked" Checked="MitarbeiterVertretungsToggleButton_OnChecked"
Grid.ColumnSpan="2" HorizontalAlignment="Right" x:Name="MVCheckBox" />
<dxe:TextEdit Grid.Column="1" Grid.Row="7" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True" x:Name="MVDatepicker_UhrzeitVon"
MaskUseAsDisplayFormat="True" InvalidValueBehavior="AllowLeaveEditor"
Height="23" Grid.ColumnSpan="2" Visibility="Visible"
Margin="3,3,3,3"/>
<dxe:TextEdit Grid.Column="1" Grid.Row="8" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True" x:Name="MVDatepicker_UhrzeitBis"
MaskUseAsDisplayFormat="True" InvalidValueBehavior="AllowLeaveEditor"
Height="23" Grid.ColumnSpan="2" Visibility="Visible"
Margin="3,3,3,3"/>
<!--##############################################-->
<TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="6" Margin="3" Height="50" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" x:Name="MitarbeiterNotice"/>
<TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="9" Margin="3" Height="50" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" x:Name="MitarbeiterNotice"/>
<Button Grid.Column="1" Grid.Row="7" x:Name="button_addMitarbeiterVertretung" Content="Hinzufügen" Height="25"
<Button Grid.Column="1" Grid.Row="10" x:Name="button_addMitarbeiterVertretung" Content="Hinzufügen" Height="25"
FontWeight="Normal" Margin="3" VerticalAlignment="Bottom" HorizontalAlignment="Right" Click="Button_addMitarbeiterVertretung_OnClick"/>
<Button Grid.Row="7" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
<Button Grid.Row="10" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
Margin="3" Content="Abbrechen" x:Name="button_cancelMitarbeiterVertretung" Click="Button_cancelMitarbeiterVertretung_OnClick"/>
</Grid>
@@ -193,6 +214,9 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="Klient/in" />
@@ -200,7 +224,11 @@
<Label Grid.Row="2" Grid.Column="0" Content="Meldung vom" />
<Label Grid.Row="3" Grid.Column="0" Content="Startdatum" />
<Label Grid.Row="4" Grid.Column="0" Content="Enddatum" />
<Label Grid.Row="5" Grid.Column="0" Content="Notiz" />
<Label Grid.Row="6" Grid.Column="0" Content="Uhrzeit Von" x:Name="KVLabelUhrzeitVon" />
<Label Grid.Row="7" Grid.Column="0" Content="Uhrzeit Bis" x:Name="KVLabelUhrzeitBis"/>
<Label Grid.Row="8" Grid.Column="0" Content="Notiz" />
<!-- PreviewMouseDoubleClick="Popupedit_environmentPersonSearch_OnPreviewMouseDoubleClick" Text="{validation:ValidationBinding Path=EnvironmentPersons.NewVM.PersonString, UpdateSourceTrigger=PropertyChanged}"
@@ -211,25 +239,42 @@
Grid.Row="0" DeleteButtonVisibility="Collapsed"
PopUpClick="Popupedit_KlientVertretungSearch_OnPopUpClick_popupedit_KlientVertretungSearch_PopUpClick"/>
<ComboBox Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2" Margin="3" Height="23" x:Name="ComboBoxKlientVertretung"/>
<controls1:NullItemComboBox Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2" Margin="3" Height="23" x:Name="ComboBoxKlientVertretung"/>
<dxe:DateEdit x:Name="KrankMeldungKlientDatepicker" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="KVDatepickerVon_OnEditValueChanged"/>
<dxe:DateEdit x:Name="KVDatepickerVon" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="KVDatepickerVon_OnEditValueChanged"/>
<dxe:DateEdit x:Name="KVDatepickerBis" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="KVDatepickerBis_OnEditValueChanged"/>
<!--################# Neuer Kram #################-->
<CheckBox Grid.Column="1" Grid.Row="5" Content="ganztägig" Unchecked="KlientVertretungsToggleButton_OnUnchecked" Checked="KlientVertretungsToggleButton_OnChecked"
Grid.ColumnSpan="2" HorizontalAlignment="Right" x:Name="KVCheckBox" />
<TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="5" Margin="3" Height="50" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" x:Name="KlientNotice"/>
<dxe:TextEdit Grid.Column="1" Grid.Row="6" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True" x:Name="KVDatepicker_UhrzeitVon"
MaskUseAsDisplayFormat="True" InvalidValueBehavior="AllowLeaveEditor"
Height="23" Grid.ColumnSpan="2" Visibility="Visible"
Margin="3,3,3,3"/>
<dxe:TextEdit Grid.Column="1" Grid.Row="7" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True" x:Name="KVDatepicker_UhrzeitBis"
MaskUseAsDisplayFormat="True" InvalidValueBehavior="AllowLeaveEditor"
Height="23" Grid.ColumnSpan="2" Visibility="Visible"
Margin="3,3,3,3"/>
<!--##############################################-->
<TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="8" Margin="3" Height="50" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" x:Name="KlientNotice"/>
<Button Grid.Column="1" Grid.Row="6" x:Name="button_addKlientVertretung" Content="Hinzufügen" Height="25"
<Button Grid.Column="1" Grid.Row="9" x:Name="button_addKlientVertretung" Content="Hinzufügen" Height="25"
FontWeight="Normal" Margin="3" VerticalAlignment="Bottom" HorizontalAlignment="Right" Click="Button_addKlientVertretung_OnClick" />
<Button Grid.Row="6" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
<Button Grid.Row="9" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
Margin="3" Content="Abbrechen" x:Name="button_cancelKlientVertretung" Click="Button_cancelKlientVertretung_OnClick" />
</Grid>
@@ -238,12 +283,24 @@
</controls:PopupNonTopmost>
<!-- ################################################################################## -->
</StackPanel>
<!-- jeweils links und rechts ein Pfeil button -->
<StackPanel Grid.ColumnSpan="3" Grid.Row="1" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Bottom" >
<Button Click="PfeilLinksDatumRunter_OnClick" Margin="3,3,3,3" Height="24" Width="24" ToolTip="Vorheriges Datum" Style="{x:Null}">
<Image Source="/BeWoPlaner;component/Ressources/Icons/ArrowLeft.png" />
</Button>
<Label x:Name="Datelbl" HorizontalAlignment="Center" VerticalAlignment="Bottom" Content="PlaceHolder" FontSize="16" Margin="3,3,3,3" />
<Button Click="PfeilRechtsDatumHoch_OnClick" Margin="3,3,3,3" Height="24" Width="24" ToolTip="Nächstes Datum" Style="{x:Null}" >
<Image Source="/BeWoPlaner;component/Ressources/Icons/ArrowRight.png" />
</Button>
<Label Grid.ColumnSpan="3" Grid.Row="1" x:Name="Datelbl" HorizontalAlignment="Center" VerticalAlignment="Bottom" Content="PlaceHolder" FontSize="16" Margin="3,3,3,3" Grid.Column="0"/>
</StackPanel>
<!---->
</Grid>
@@ -253,13 +310,13 @@
<dxg:GridControl.Columns >
<dxg:GridColumn FieldName="KrankerMitarbeiter" Width="125" ReadOnly="True" Header="Mitarbeiter/in"/>
<dxg:GridColumn FieldName="KrankerMitarbeiter" Width="125" ReadOnly="True" Header="Mitarbeiter / in"/>
<!--<dxg:GridColumn.CellStyle>
<Style TargetType="{x:Type dxg:CellContentPresenter}">
<Style.Triggers>
<DataTrigger Binding="{Binding RowData.Row.IsMitarbeiter}" Value="0">
<Setter Property="Background" Value="#ff3232" />
</DataTrigger>
</DataTrigger>
</Style.Triggers>
</Style>
</dxg:GridColumn.CellStyle>-->
@@ -267,7 +324,7 @@
<dxg:GridColumn FieldName="Arbeitszeit" ReadOnly="True" Width="75"/>
<dxg:GridColumn FieldName="Kunde" Header="Klient/in" Width="125" ReadOnly="True">
<dxg:GridColumn FieldName="Kunde" Header="Klient / in" Width="125" ReadOnly="True">
<dxg:GridColumn.CellStyle>
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
<Style.Triggers>
@@ -277,6 +334,9 @@
<DataTrigger Binding="{Binding RowData.Row.IsKunde}" Value="0">
<Setter Property="Background" Value="Red" />
</DataTrigger>
<DataTrigger Binding="{Binding RowData.Row.IsKunde}" Value="2">
<Setter Property="Background" Value="Orange" />
</DataTrigger>
</Style.Triggers>
</Style>
</dxg:GridColumn.CellStyle>
@@ -300,14 +360,14 @@
<dxg:GridColumn FieldName="KrankheitsMeldung" Width="125" Header="Meldung vom"/>
<dxg:GridColumn FieldName="KrankheitsZeitraum" Width="175" ReadOnly="True" Header="Abwesenheit von - bis">
<dxg:GridColumn FieldName="KrankheitsZeitraum" Width="200" ReadOnly="True" Header="Abwesenheit von - bis">
<dxg:GridColumn.EditSettings>
<dxe:ComboBoxEditSettings DefaultButtonClick="KrankmeldungsZeitraumBearbeitungsView"/>
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
<!-- Maybee das gleiche wie oben -->
<dxg:GridColumn FieldName="VertretungsZeitraum" Header="Vertretung von - bis" Width="175" ReadOnly="True" />
<dxg:GridColumn FieldName="VertretungsZeitraum" Header="Vertretung von - bis" Width="200" ReadOnly="True" />
<dxg:GridColumn FieldName="AbwesenheitsKategorie" Header="Abwesenheitskategorie" Width="175">
<dxg:GridColumn.EditSettings>
@@ -396,7 +456,7 @@
</DataTrigger>
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiDi}" Value="">
<Setter Property="Background" Value="Red" />
</DataTrigger>
</DataTrigger>
</Style.Triggers>
</Style>
</dxg:GridColumn.CellStyle>
@@ -516,7 +576,7 @@
</DataTrigger>
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiSa}" Value="">
<Setter Property="Background" Value="Red" />
</DataTrigger>
</DataTrigger>
</Style.Triggers>
</Style>
</dxg:GridColumn.CellStyle>
@@ -535,7 +595,7 @@
<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="Mitarbeiter/in" Width="125" ReadOnly="True" />
<dxg:GridColumn FieldName="MaKrank" Header="Mitarbeiter / in" Width="125" ReadOnly="True" />
<dxg:GridColumn FieldName="Kind" Header="Klient/in" Width="125" ReadOnly="True" />
@@ -660,7 +720,7 @@
</dxg:GridColumn.CellStyle>
</dxg:GridColumn>
<dxg:GridColumn FieldName="Fr" Header="Fr" Width="75" ReadOnly="True"/>
<dxg:GridColumn FieldName="Fr" Header="Fr" Width="75" ReadOnly="True" />
<dxg:GridColumn FieldName="VertretungFr" Header="Vertretung" Width="125" >
<dxg:GridColumn.EditSettings >

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

File diff suppressed because it is too large Load Diff

64
BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstBearbeitungsView.xaml
View File

@@ -4,6 +4,7 @@
xmlns:view="clr-namespace:BeWo.View"
xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:search="clr-namespace:BeWo.View.Search"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
Title="Vertretung auswählen" Height="600" Width="600" WindowStartupLocation="CenterScreen"
ResizeMode="CanResizeWithGrip" WindowStyle="None" Background="Transparent">
@@ -17,6 +18,7 @@
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
@@ -31,7 +33,7 @@
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="100"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
@@ -65,11 +67,67 @@
<!-- ############################################################################################################## -->
<!--Bereich einfügen um auszuwählen ob ganzen tag oder nur teilweise -->
<GroupBox Header="Vertretungs Zeitraum" Grid.Row="1" Grid.Column="0" Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3" >
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<CheckBox Grid.Column="0" Grid.Row="0" Content="ganztägig" Unchecked="KVCheckBox_OnUnchecked" Checked="KVCheckBox_OnChecked"
Grid.ColumnSpan="4" HorizontalAlignment="Right" x:Name="KVCheckBox" />
<Label Grid.Row="1" Grid.Column="0" Content="Vertretung Von" />
<Label Grid.Row="2" Grid.Column="0" Content="Vertretung Bis" />
<Label Grid.Row="3" Grid.Column="0" Content="Uhrzeit Von" x:Name="KVLabelUhrzeitVon" />
<Label Grid.Row="4" Grid.Column="0" Content="Uhrzeit Bis" x:Name="KVLabelUhrzeitBis"/>
<dxe:DateEdit x:Name="KVDatepickerVon" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2" Margin="3" Height="23" Width="125" EditValueChanged="KVDatepickerVon_OnEditValueChanged"/>
<dxe:DateEdit x:Name="KVDatepickerBis" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Margin="3" Height="23" Width="125" EditValueChanged="KVDatepickerBis_OnEditValueChanged" />
<dxe:TextEdit Grid.Column="1" Grid.Row="3" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True" x:Name="KVDatepicker_UhrzeitVon"
MaskUseAsDisplayFormat="True" InvalidValueBehavior="AllowLeaveEditor"
Height="23" Grid.ColumnSpan="2" Visibility="Visible" Width="125"
Margin="3,3,3,3"/>
<dxe:TextEdit Grid.Column="1" Grid.Row="4" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True" x:Name="KVDatepicker_UhrzeitBis"
MaskUseAsDisplayFormat="True" InvalidValueBehavior="AllowLeaveEditor" Width="125"
Height="23" Grid.ColumnSpan="2" Visibility="Visible"
Margin="3,3,3,3"/>
</Grid>
</GroupBox>
<!--##################################################################-->
<!-- ##################################### unterer 2/3 Mitarbeiter Controll ####################################### -->
<search:EmployeeSearchView Grid.Row="1" Grid.Column="0" x:Name="MitarbeiterVertretungsearchview" Margin="3,3,3,3" ItemSelected="MitarbeiterVertretungsearchview_OnItemSelected" />
<search:EmployeeSearchView Grid.Row="2" Grid.Column="0" x:Name="MitarbeiterVertretungsearchview" Margin="3,3,3,3" ItemSelected="MitarbeiterVertretungsearchview_OnItemSelected" />
<StackPanel Grid.Row="2" Grid.Column="0" Grid.RowSpan="1" >
<StackPanel Grid.Row="3" Grid.Column="0" Grid.RowSpan="1" >
<WrapPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="3,3,3,3" VerticalAlignment="Bottom" >

151
BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstBearbeitungsView.xaml.cs
View File

@@ -16,6 +16,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
using System.Globalization;
using System.IO;
using System.Text;
using System.Windows.Data;
@@ -30,6 +31,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using DevExpress.Xpf.Core;
using DevExpress.Xpf.Editors;
using DevExpress.XtraPrinting.Native;
using DevExpress.XtraPrinting.XamlExport;
using Microsoft.Office.Interop.Word;
@@ -44,11 +46,27 @@ namespace BeWo.SchulbegleitenderDienst
public event EventHandler<CustomKlientEventArgs> RaiseKlientCustomEvent;
private DateTime? _startDate;
private DateTime? _endDate;
public SchulbegleitenderDienstBearbeitungsView(int y)
public SchulbegleitenderDienstBearbeitungsView(int y, DateTime? startdate, DateTime? enddate)
{
InitializeComponent();
_startDate = startdate;
_endDate = enddate;
if (_startDate != null)
KVDatepickerVon.EditValue = _startDate;
if(_endDate != null)
KVDatepickerBis.EditValue = _endDate;
//Width = System.Windows.SystemParameters.PrimaryScreenWidth / 2;
//Height = System.Windows.SystemParameters.PrimaryScreenWidth / 2;
@@ -70,7 +88,7 @@ namespace BeWo.SchulbegleitenderDienst
}
private void RootGroupBox_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
private void RootGroupBox_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{
try
{
@@ -93,8 +111,6 @@ namespace BeWo.SchulbegleitenderDienst
}
//Bereich zum auswählen des Mitarbeiters
#region MitarbeiterSearch
@@ -148,11 +164,46 @@ namespace BeWo.SchulbegleitenderDienst
//Hier den Employee zurück geben
if (MitarbeiterVertretungsearchview.SelectedItem != null)
{
CompactEmployeeDC x = MitarbeiterVertretungsearchview.SelectedItem;
// Abfragen ob Date Gesestzt ist weil sonst tuts wehh
if (_startDate.HasValue && _endDate.HasValue && KVCheckBox.IsChecked.Value)
{
CompactEmployeeDC x = MitarbeiterVertretungsearchview.SelectedItem;
RaiseCustomEvent(this, new CustomEventArgs(x));
RaiseCustomEvent(this, new CustomEventArgs(x, _startDate, _endDate));
Close();
Close();
}
else if (!KVDatepickerVon.Text.Equals("") && !KVDatepickerBis.Text.Equals("") && _startDate.HasValue && _endDate.HasValue)
{
var xvon = KVDatepicker_UhrzeitVon.Text;
DateTime dateTimeStart = DateTime.ParseExact(xvon, "HH:mm", CultureInfo.CurrentCulture);
var yvon = KVDatepicker_UhrzeitBis.Text;
DateTime dateTimeEnd = DateTime.ParseExact(yvon, "HH:mm", CultureInfo.CurrentCulture);
DateTime? xVon = new DateTime(_startDate.Value.Year,_startDate.Value.Month,_startDate.Value.Day,dateTimeStart.Hour,dateTimeStart.Minute,dateTimeStart.Second);
DateTime? xBis = new DateTime(_endDate.Value.Year,_endDate.Value.Month,_endDate.Value.Day,dateTimeEnd.Hour,dateTimeEnd.Minute,dateTimeEnd.Second);
CompactEmployeeDC x = MitarbeiterVertretungsearchview.SelectedItem;
RaiseCustomEvent(this, new CustomEventArgs(x, xVon, xBis));
Close();
}
else
{
if (_startDate.HasValue && _endDate.HasValue && KVDatepickerVon.Text.Equals("") && KVDatepickerBis.Text.Equals("") && !KVCheckBox.IsChecked.Value)
{
MessageBox.Show("Bitte Geben sie eine Start Uhrzeit und eine End Uhrzeit an.");
}
else
{
MessageBox.Show("Bitte Geben sie ein Start und ein Enddatum an.");
}
}
}
}
@@ -163,34 +214,112 @@ namespace BeWo.SchulbegleitenderDienst
Close();
}
//################### Neuer bereich Vertretungs zeitraum bereich/ ganztägig oder nur ein teil ####################################
private void KVCheckBox_OnUnchecked(object sender, RoutedEventArgs e)
{
KVDatepicker_UhrzeitBis.Text = "";
KVDatepicker_UhrzeitBis.Visibility = Visibility.Visible;
KVLabelUhrzeitVon.Visibility = Visibility.Visible;
KVDatepicker_UhrzeitVon.Text = "";
KVDatepicker_UhrzeitVon.Visibility = Visibility.Visible;
KVLabelUhrzeitBis.Visibility = Visibility.Visible;
}
private void KVCheckBox_OnChecked(object sender, RoutedEventArgs e)
{
KVDatepicker_UhrzeitBis.Visibility = Visibility.Collapsed;
KVLabelUhrzeitVon.Visibility = Visibility.Collapsed;
KVDatepicker_UhrzeitVon.Visibility = Visibility.Collapsed;
KVLabelUhrzeitBis.Visibility = Visibility.Collapsed;
}
private void KVDatepickerVon_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
{
DateEdit ed = (DateEdit) sender;
DateTime date = ed.DateTime;
if (date >= _endDate.Value && date <= _startDate.Value)
{
KVDatepickerVon.DateTime = _endDate.Value;
}
}
private void KVDatepickerBis_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
{
DateEdit ed = (DateEdit)sender;
DateTime date = ed.DateTime;
if (date <= _startDate.Value && date >= _endDate.Value)
{
KVDatepickerVon.DateTime = _startDate.Value;
}
}
//#######################################################################
}
public class CustomEventArgs : EventArgs
{
public CustomEventArgs(CompactEmployeeDC s)
private CompactEmployeeDC dc;
private DateTime? startdt;
private DateTime? enddt;
public CustomEventArgs(CompactEmployeeDC s, DateTime? start, DateTime? ende)
{
dc = s;
startdt = start;
enddt = ende;
}
private CompactEmployeeDC dc;
public CompactEmployeeDC Message
{
get { return dc; }
}
public DateTime? StartDate
{
get { return startdt; }
}
public DateTime? EndDate
{
get { return enddt; }
}
}
public class CustomKlientEventArgs : EventArgs
{
private CompactCustomerDC dc;
private DateTime? startdt;
private DateTime? enddt;
public CustomKlientEventArgs(CompactCustomerDC s)
public CustomKlientEventArgs(CompactCustomerDC s, DateTime? start, DateTime? ende)
{
dc = s;
startdt = start;
enddt = ende;
}
public CompactCustomerDC Message
{
get { return dc; }
}
public DateTime? StartDate
{
get{return startdt;}
}
public DateTime? EndDate
{
get { return enddt; }
}
}
}

15
BeWo/ServiceProxy/Generated.cs
View File

@@ -4171,7 +4171,11 @@ namespace BeWo.ServiceProxy
[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.Collections.Generic.List<BS.Shared.DataContracts.VertretungsListeItemsDC> VertretungsListe(System.DateTime datum);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/VertretungsListeWoechentlich", ReplyAction="http://tempuri.org/IOperationsService/VertretungsListeWoechentlichResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/VertretungsListeWoechentlichBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.VertretungsListeItemsDC> VertretungsListeWoechentlich(System.DateTime start, System.DateTime ende);
[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")]
@@ -4905,9 +4909,14 @@ namespace BeWo.ServiceProxy
base.Channel.UpdateVertretung(vert);
}
public BS.Shared.DataContracts.VertretungsListeDC VertretungsListe(System.DateTime absenceTime)
public System.Collections.Generic.List<BS.Shared.DataContracts.VertretungsListeItemsDC> VertretungsListe(System.DateTime datum)
{
return base.Channel.VertretungsListe(absenceTime);
return base.Channel.VertretungsListe(datum);
}
public System.Collections.Generic.List<BS.Shared.DataContracts.VertretungsListeItemsDC> VertretungsListeWoechentlich(System.DateTime start, System.DateTime ende)
{
return base.Channel.VertretungsListeWoechentlich(start, ende);
}
public void CreateVertretung(BS.Shared.DataContracts.VertretungDC vertretung)

4
BeWo/View/BargeldkassenView.xaml
View File

@@ -229,10 +229,10 @@
<dxe:DateEdit x:Name="KassenBuchEndCB" MaskType="DateTimeAdvancingCaret" Height="23" Margin="3" EditValue="{Binding Path=PreselectedEndDate, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}, Mode=OneWay}" AllowNullInput="False"/>
<!--<ComboBox x:Name="KassenbuchMonatsCB" Margin="3" ItemsSource="{Binding Path=MonatsComboBoxSource, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}"
<!--<uc:NullItemComboBox x:Name="KassenbuchMonatsCB" Margin="3" ItemsSource="{Binding Path=MonatsComboBoxSource, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}"
SelectedItem="{Binding Path=PreselectedMonth, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}, Mode=OneWay}"/>
<ComboBox x:Name="KassenbuchJahresCB" Margin="3" ItemsSource="{Binding Path=JahresComboBoxSource, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}"
<uc:NullItemComboBox x:Name="KassenbuchJahresCB" Margin="3" ItemsSource="{Binding Path=JahresComboBoxSource, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}"
SelectedItem="{Binding Path=PreselectedYear, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}, Mode=OneWay}"/>-->
<TextBlock Margin="3" FontSize="14" VerticalAlignment="Center" PreviewMouseLeftButtonDown="KlassenbuchLinkOnPreviewMouseLeftButtonDown" Tag="{Binding}" IsEnabled="{Binding Path=Bargeldtransaktionen.VMList.Count, Converter={StaticResource CollectionCountToBoolConverter}, UpdateSourceTrigger=PropertyChanged}">

4
BeWo/View/Detail/AccountingTransactionBookingView.xaml
View File

@@ -69,7 +69,7 @@
<ColumnDefinition Width="250" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<!--<ComboBox x:Name="customerComboBox" IsSynchronizedWithCurrentItem="True" AlternationCount="-1"
<!--<uc:NullItemComboBox x:Name="customerComboBox" IsSynchronizedWithCurrentItem="True" AlternationCount="-1"
ItemTemplate="{DynamicResource CustomerComboBoxItemTemplate}"
SelectionChanged="customerComboBox_SelectionChanged" Height="62"
ItemsPanel="{DynamicResource CustomerComboBoxItemsPanelTemplate}"
@@ -159,7 +159,7 @@
EditValue="{val:ValidationBinding Path=PrototypeVM.ValidityDate, Mode=TwoWay}"/>
<Label Grid.Row="3" Content="Kategorie" />
<ComboBox Grid.Column="1" Grid.ColumnSpan="2" Height="23" Margin="3" Grid.Row="3"
<uc:NullItemComboBox Grid.Column="1" Grid.ColumnSpan="2" Height="23" Margin="3" Grid.Row="3"
x:Name="combobox_categories"
SelectedItem="{val:ValidationBinding Path=PrototypeVM.Category}" />
<Label Grid.Column="0" Grid.Row="4" VerticalAlignment="Top" Content="Kommentar"

4
BeWo/View/Detail/AccountingTransactionEditView.xaml
View File

@@ -51,7 +51,7 @@
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<!--<ComboBox x:Name="customerComboBox" IsSynchronizedWithCurrentItem="True"
<!--<uc:NullItemComboBox x:Name="customerComboBox" IsSynchronizedWithCurrentItem="True"
AlternationCount="-1" ItemTemplate="{DynamicResource CustomerComboBoxItemTemplate}"
SelectionChanged="customerComboBox_SelectionChanged" Height="62"
ItemsPanel="{DynamicResource CustomerComboBoxItemsPanelTemplate}"
@@ -94,7 +94,7 @@
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="2" Background="White" Height="23" Margin="3" EditValue="{val:ValidationBinding Path=ValidityDate, Mode=TwoWay}" />
<Label Grid.Row="3" Content="Kategorie" />
<ComboBox Grid.Column="1" Height="23" Margin="3" Grid.Row="3" x:Name="combobox_categories" SelectedItem="{val:ValidationBinding Path=Category}" />
<uc:NullItemComboBox Grid.Column="1" Height="23" Margin="3" Grid.Row="3" x:Name="combobox_categories" SelectedItem="{val:ValidationBinding Path=Category}" />
</Grid>

4
BeWo/View/Detail/AccountingTransactionView.xaml
View File

@@ -42,8 +42,8 @@
<ColumnDefinition Width="*" SharedSizeGroup="a" />
<ColumnDefinition Width="Auto" SharedSizeGroup="b" />
</Grid.ColumnDefinitions>
<ComboBox x:Name="combobox_year" IsEnabled="{Binding Path=IsChecked, ElementName=checkbox_yearfilter}" Margin="3" Height="20" MinWidth="80" Padding="5 0" VerticalContentAlignment="Center" Background="White" />
<ComboBox x:Name="combobox_month" IsEnabled="{Binding Path=IsChecked, ElementName=checkbox_monthfilter}" Grid.Column="1" Margin="8,0,0,0" Height="20" MinWidth="120" Padding="5 0" VerticalContentAlignment="Center" Background="White" Grid.Row="1" />
<ComboBox x:Name="combobox_year" IsEnabled="{Binding Path=IsChecked, ElementName=checkbox_yearfilter}" Margin="3" Height="20" MinWidth="80" Padding="5 0" VerticalContentAlignment="Center" Background="White" />
<ComboBox x:Name="combobox_month" IsEnabled="{Binding Path=IsChecked, ElementName=checkbox_monthfilter}" Grid.Column="1" Margin="8,0,0,0" Height="20" MinWidth="120" Padding="5 0" VerticalContentAlignment="Center" Background="White" Grid.Row="1" />
</Grid>
</GroupBox>

3
BeWo/View/Detail/AdditionalServiceGroupOfPeopleView.xaml
View File

@@ -6,6 +6,7 @@
xmlns:val="clr-namespace:BeWo.Validation"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:shared="clr-namespace:BS.Shared;assembly=BS.Shared"
xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True" >
<localView:BeWoView.Resources>
<ObjectDataProvider MethodName="GetValues"
@@ -116,7 +117,7 @@
<Label Grid.Column="0" Grid.ColumnSpan="1">Name der Gruppe</Label>
<TextBox Grid.Column="1" Grid.ColumnSpan="3" VerticalContentAlignment="Center" Height="23" Margin="3,0,3,0" Text="{val:ValidationBinding Path=Name, UpdateSourceTrigger=PropertyChanged}" />
<Label Visibility="Collapsed" Grid.Column="2">Intervall</Label>
<ComboBox Visibility="Collapsed" VerticalContentAlignment="Center" ItemsSource="{Binding Source={StaticResource AppointmentDayOfWeeks}}" SelectedItem="{Binding Path=AppointmentDayOfWeek}" Grid.Column="3"/>
<controls:NullItemComboBox Visibility="Collapsed" VerticalContentAlignment="Center" ItemsSource="{Binding Source={StaticResource AppointmentDayOfWeeks}}" SelectedItem="{Binding Path=AppointmentDayOfWeek}" Grid.Column="3"/>
</Grid>
<GroupBox Grid.Row="3" Grid.ColumnSpan="4" Header="Mitglieder hinzufügen" Margin="3,15,0,0" Style="{DynamicResource ObjectEditGroupBox}">
<Grid>

5
BeWo/View/Detail/AdditionalServiceRegionView.xaml
View File

@@ -4,7 +4,8 @@
xmlns:localView="clr-namespace:BeWo.View"
xmlns:val="clr-namespace:BeWo.Validation"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" Focusable="True">
<GroupBox Name="root" Header="Aktuell definierte Angebote" Style="{StaticResource ObjectEditGroupBox}">
<Grid>
@@ -22,7 +23,7 @@
<Label>Bezeichnung</Label>
<TextBox Grid.Column="1" Margin="3" Height="23" Text="{val:ValidationBinding Path=NewVM.Name, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Column="2">Bereich</Label>
<ComboBox Grid.Column="3" Height="23" ItemsSource="{Binding Path=PossibleServices, Mode=OneWay}" Margin="3" SelectedItem="{val:ValidationBinding Path=NewVM.AdditionalService}"/>
<controls:NullItemComboBox Grid.Column="3" Height="23" ItemsSource="{Binding Path=PossibleServices, Mode=OneWay}" Margin="3" SelectedItem="{val:ValidationBinding Path=NewVM.AdditionalService}"/>
<Button Name="button_addServiceRegion" Click="Button_addServiceRegion_OnClick" Grid.Column="4" Height="25" Margin="3,3,3,3" Padding="5 0" IsDefault="True" Content="Hinzufügen" Grid.ColumnSpan="2" />
<dxg:GridControl x:Name="DatagridRegions" Margin="0,10,0,0" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="7" DataSource="{Binding VMList}">
<dxg:GridControl.Columns>

10
BeWo/View/Detail/AdditionalServiceView.xaml
View File

@@ -301,7 +301,7 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Content="Bereich: " Grid.Column="0" Grid.Row="0" />
<ComboBox SelectedIndex="0" x:Name="Bereichscombobox" Margin="3,0,3,3"
<uc:NullItemComboBox SelectedIndex="0" x:Name="Bereichscombobox" Margin="3,0,3,3"
Height="23" Grid.Column="1" Grid.Row="0"
ItemsSource="{Binding Path=AdditionalServices}"
SelectionChanged="BereichsComboboxChange" />
@@ -380,9 +380,9 @@
</Grid.ColumnDefinitions>
<Button Content="FLS anlegen" Grid.Column="0" Click="FLSAnlegenBtn_OnClick" />
<Label x:Name="MonatsLabel" Content="Monat" Grid.Column="1" />
<ComboBox x:Name="MonatsCombobox" Grid.Column="2" MinWidth="90" ItemsSource="{Binding Source={StaticResource Monat}}" SelectedItem="{Binding Path=SelectedMonth}" />
<ComboBox x:Name="MonatsCombobox" Grid.Column="2" MinWidth="90" ItemsSource="{Binding Source={StaticResource Monat}}" SelectedItem="{Binding Path=SelectedMonth}" />
<Label x:Name="JahresLabel" Content="Jahr" Grid.Column="3" />
<ComboBox x:Name="JahresCombobox" Grid.Column="4" MinWidth="75" ItemsSource="{Binding Path=Years}" SelectedItem="{Binding Path=SelectedYear}" />
<ComboBox x:Name="JahresCombobox" Grid.Column="4" MinWidth="75" ItemsSource="{Binding Path=Years}" SelectedItem="{Binding Path=SelectedYear}" />
<TextBlock Grid.Column="5" x:Name="TextblockLinkPdfexport2" Margin="5,0,5,3" FontSize="14" HorizontalAlignment="Right">
<Hyperlink x:Name="LinkPdfExport2" TargetName="_NewWindow" Foreground="#FF2B508B" RequestNavigate="LinkPdfExport2_OnRequestNavigate">
<Run Text="Drucken" />
@@ -490,13 +490,13 @@
</StackPanel>
</StackPanel>
<Label Grid.Column="0" Grid.Row="2" Content="Kategorie" />
<ComboBox Grid.Column="1" Grid.Row="2"
<uc:NullItemComboBox Grid.Column="1" Grid.Row="2"
SelectedItem="{val:ValidationBinding Path=PrototypeVM.Category}"
ItemsSource="{Binding Path=PrototypeVM.SortedCategories}"
SelectedIndex="0" Margin="3,0,3,3"
Height="23" />
<Label Grid.Column="0" Grid.Row="3" Content="Leistung" />
<ComboBox Grid.Column="1" Grid.Row="3" SelectedItem="{val:ValidationBinding Path=PrototypeVM.ServiceDescription}"
<uc:NullItemComboBox Grid.Column="1" Grid.Row="3" SelectedItem="{val:ValidationBinding Path=PrototypeVM.ServiceDescription}"
ItemsSource="{Binding Path=PrototypeVM.PossibleServiceDescriptions}"
SelectedIndex="0" x:Name="ComboboxServices" Margin="3,0,3,3"
Height="23" />

9
BeWo/View/Detail/AssessmentSheetEntryView.xaml
View File

@@ -7,7 +7,8 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True"
xmlns:conv="clr-namespace:BeWo.Converter"
xmlns:controls="clr-namespace:BeWo.View.Controls">
xmlns:controls="clr-namespace:BeWo.View.Controls"
xmlns:controls1="clr-namespace:BeWo.Controls;assembly=BeWo.Controls">
<localView:BeWoView.Resources>
<DataTemplate x:Key="LayoutPanelCaptionTemplateWithoutButtons">
<Border BorderThickness="1,1,1,0" BorderBrush="Gray" CornerRadius="3,3,0,0" Background="#FFEAEDF3">
@@ -31,12 +32,12 @@
<StackPanel Orientation="Horizontal" >
<Label VerticalAlignment="Center" Content="Tag" />
<ComboBox x:Name="comboDay" Height="23" Width="45"/>
<controls1:NullItemComboBox x:Name="comboDay" Height="23" Width="45"/>
<Label VerticalAlignment="Center" Content="Monat" />
<ComboBox x:Name="comboMonth" Height="23" Width="85"/>
<controls1:NullItemComboBox x:Name="comboMonth" Height="23" Width="85"/>
<Label VerticalAlignment="Center" Content="Jahr" />
<ComboBox x:Name="comboYear" Height="23" Width="57"/>
<controls1:NullItemComboBox x:Name="comboYear" Height="23" Width="57"/>
<!--<Label VerticalAlignment="Center" Margin="3" Height="23" Content="anz Tage" />
<dxe:TextEdit x:Name="txtDayCount" Margin="3" Height="23" Width="40" Text="7"/>-->
<Button x:Name="btnMoveLastWeek" FontFamily="Webdings" Content="3" Width="25" Margin="6,3,3,3" Click="ButtonLastWeek_Click" ToolTip="Vergangene Woche anzeigen"/>

32
BeWo/View/Detail/BookingView.xaml
View File

@@ -50,7 +50,7 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock VerticalAlignment="Center" Margin="3" Text="Übersicht:" FontSize="16" Foreground="{StaticResource TabItemHotTextBrush}" FontFamily="Microsoft Sans Serif" />
<ComboBox Margin="3" Grid.Column="1" DisplayMemberPath="TypeDescription" Name="combobox_resourceCategories" MinWidth="120" Height="20" BorderBrush="{StaticResource TextBoxBorderBrush}" BorderThickness="1" />
<ComboBox Margin="3" Grid.Column="1" DisplayMemberPath="TypeDescription" Name="combobox_resourceCategories" MinWidth="120" Height="20" BorderBrush="{StaticResource TextBoxBorderBrush}" BorderThickness="1" />
<Label Grid.Column="2" VerticalAlignment="Center" Content="ab dem:" />
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Margin="3" Grid.Column="3" BorderThickness="1" Height="20" EditValue="{Binding CalendarStartDate, Mode=TwoWay, ElementName=calendar}" />
</Grid>
@@ -147,7 +147,7 @@
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<ComboBox Name="combo_Intervall" ItemsSource="{x:Static core:EnumTranslations.CalendarIntervalTranslations}" DisplayMemberPath="Value" SelectedValuePath="Key" SelectedValue="{Binding Path=TimeInterval, ElementName=calendar}" VerticalAlignment="Center" Height="23" />
<ComboBox Name="combo_Intervall" ItemsSource="{x:Static core:EnumTranslations.CalendarIntervalTranslations}" DisplayMemberPath="Value" SelectedValuePath="Key" SelectedValue="{Binding Path=TimeInterval, ElementName=calendar}" VerticalAlignment="Center" Height="23" />
<Label Grid.Column="1" Content="Einteilung" VerticalAlignment="Center" />
</Grid>
@@ -202,7 +202,7 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Label>Ressource</Label>
<ComboBox Name="combobox_newVMResource" DisplayMemberPath="Name" Height="23" Margin="3" Grid.Column="1" />
<ComboBox Name="combobox_newVMResource" DisplayMemberPath="Name" Height="23" Margin="3" Grid.Column="1" />
</Grid>
@@ -212,16 +212,16 @@
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Row="1" Grid.Column="1" Background="White" Height="23" MinWidth="80" Margin="3" Name="NEW_datepickerStartDate" EditValue="{Binding Path=NewVM.RootAppointment.Duration.StartDate, Mode=TwoWay}" />
<ComboBox Grid.Row="1" Grid.Column="2" Height="23" MinWidth="40" Margin="3" ItemsSource="{x:Static localDetailView:BookingView.Hours}" DisplayMemberPath="Key" SelectedValuePath="Value" Name="NEW_comboboxStartHour" SelectedValue="{Binding Path=NewVM.RootAppointment.Duration.StartHours, Mode=TwoWay}" />
<ComboBox Grid.Row="1" Grid.Column="2" Height="23" MinWidth="40" Margin="3" ItemsSource="{x:Static localDetailView:BookingView.Hours}" DisplayMemberPath="Key" SelectedValuePath="Value" Name="NEW_comboboxStartHour" SelectedValue="{Binding Path=NewVM.RootAppointment.Duration.StartHours, Mode=TwoWay}" />
<Label Grid.Row="1" Grid.Column="3" Content=":" Margin="0" Padding="0" VerticalAlignment="Center" />
<ComboBox Grid.Row="1" Grid.Column="4" Height="23" MinWidth="40" Margin="3" ItemsSource="{x:Static localDetailView:BookingView.Minutes}" DisplayMemberPath="Key" SelectedValuePath="Value" Name="NEW_comboboxStartMinute" SelectedValue="{Binding Path=NewVM.RootAppointment.Duration.StartMinutes, Mode=TwoWay}" />
<ComboBox Grid.Row="1" Grid.Column="4" Height="23" MinWidth="40" Margin="3" ItemsSource="{x:Static localDetailView:BookingView.Minutes}" DisplayMemberPath="Key" SelectedValuePath="Value" Name="NEW_comboboxStartMinute" SelectedValue="{Binding Path=NewVM.RootAppointment.Duration.StartMinutes, Mode=TwoWay}" />
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="2" MinWidth="80" Height="23" Margin="3" Name="NEW_datepickerEndDate" EditValue="{Binding Path=NewVM.RootAppointment.Duration.EndDate, Mode=TwoWay}" />
<ComboBox Grid.Column="2" Grid.Row="2" Height="23" MinWidth="40" Margin="3" ItemsSource="{x:Static localDetailView:BookingView.Hours}" DisplayMemberPath="Key" Name="NEW_comboboxEndHour" SelectedValuePath="Value" SelectedValue="{Binding Path=NewVM.RootAppointment.Duration.EndHours, Mode=TwoWay}" />
<ComboBox Grid.Column="2" Grid.Row="2" Height="23" MinWidth="40" Margin="3" ItemsSource="{x:Static localDetailView:BookingView.Hours}" DisplayMemberPath="Key" Name="NEW_comboboxEndHour" SelectedValuePath="Value" SelectedValue="{Binding Path=NewVM.RootAppointment.Duration.EndHours, Mode=TwoWay}" />
<Label Grid.Column="3" Grid.Row="2" Content=":" Margin="0" Padding="0" VerticalAlignment="Center" />
<ComboBox Grid.Column="4" Grid.Row="2" Height="23" MinWidth="40" Margin="3" ItemsSource="{x:Static localDetailView:BookingView.Minutes}" DisplayMemberPath="Key" Name="NEW_comboboxEndMinute" SelectedValuePath="Value" SelectedValue="{Binding Path=NewVM.RootAppointment.Duration.EndMinutes, Mode=TwoWay}" />
<ComboBox Grid.Column="4" Grid.Row="2" Height="23" MinWidth="40" Margin="3" ItemsSource="{x:Static localDetailView:BookingView.Minutes}" DisplayMemberPath="Key" Name="NEW_comboboxEndMinute" SelectedValuePath="Value" SelectedValue="{Binding Path=NewVM.RootAppointment.Duration.EndMinutes, Mode=TwoWay}" />
<Expander Grid.Row="3" Grid.ColumnSpan="5" Grid.Column="0" Margin="3" Header="Termin Wiederholen">
@@ -237,7 +237,7 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<ComboBox Name="combobox_newFrequence" Grid.ColumnSpan="2" Height="23" Margin="3" ItemsSource="{Binding NewVM.PossibleFrequencies}" DisplayMemberPath="Translation" SelectedValuePath="Frequency" SelectedValue="{Binding Path=NewVM.Frequency}" />
<ComboBox Name="combobox_newFrequence" Grid.ColumnSpan="2" Height="23" Margin="3" ItemsSource="{Binding NewVM.PossibleFrequencies}" DisplayMemberPath="Translation" SelectedValuePath="Frequency" SelectedValue="{Binding Path=NewVM.Frequency}" />
<Label Grid.Row="1" Content="Intervall" IsEnabled="{Binding ElementName=combobox_newFrequence, Path=SelectedIndex, Converter={StaticResource IndexBoolConverter}, ConverterParameter=0}" />
<dxe:SpinEdit IsFloatValue="False" Grid.Row="1" Grid.Column="1" Height="23" Margin="3" MinValue="1" MaxValue="100" EditValue="{Binding Path=NewVM.RepeatInterval, Mode=TwoWay, Converter={StaticResource Int2DecimalConverter}}" IsEnabled="{Binding ElementName=combobox_newFrequence, Path=SelectedIndex, Converter={StaticResource IndexBoolConverter}, ConverterParameter=0}" />
@@ -247,8 +247,8 @@
</Expander>
<Label Grid.Row="4" Content="Mitarbeiter" />
<ComboBox Height="23" Margin="3" Grid.Row="4" Grid.Column="1"
<uc:NullItemComboBox Height="23" Margin="3" Grid.Row="4" Grid.Column="1"
Name="combobox_newEmployee" Grid.ColumnSpan="4"
PreviewMouseDoubleClick="Combobox_newEmployee_OnPreviewMouseDoubleClick"
/>
@@ -281,15 +281,15 @@
<Label Grid.Row="1" VerticalAlignment="Center">Ende</Label>
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="1" Height="23" MinWidth="80" Margin="3" Name="EDIT_datepickerStartDate" />
<ComboBox Grid.Column="2" Height="23" MinWidth="40" Margin="3" ItemsSource="{x:Static localDetailView:BookingView.Hours}" DisplayMemberPath="Key" SelectedValuePath="Value" Name="EDIT_comboStartHours" />
<ComboBox Grid.Column="2" Height="23" MinWidth="40" Margin="3" ItemsSource="{x:Static localDetailView:BookingView.Hours}" DisplayMemberPath="Key" SelectedValuePath="Value" Name="EDIT_comboStartHours" />
<Label Grid.Column="3" Content=":" Margin="0" Padding="0" VerticalAlignment="Center" />
<ComboBox Grid.Column="4" Height="23" MinWidth="40" Margin="3" ItemsSource="{x:Static localDetailView:BookingView.Minutes}" DisplayMemberPath="Key" SelectedValuePath="Value" Name="EDIT_comboStartMinutes" />
<ComboBox Grid.Column="4" Height="23" MinWidth="40" Margin="3" ItemsSource="{x:Static localDetailView:BookingView.Minutes}" DisplayMemberPath="Key" SelectedValuePath="Value" Name="EDIT_comboStartMinutes" />
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="1" MinWidth="80" Height="23" Margin="3" Name="EDIT_datepickerEndDate"/>
<ComboBox Grid.Column="2" Grid.Row="1" Height="23" MinWidth="40" Margin="3" ItemsSource="{x:Static localDetailView:BookingView.Hours}" DisplayMemberPath="Key" SelectedValuePath="Value" Name="EDIT_comboEndHours" />
<ComboBox Grid.Column="2" Grid.Row="1" Height="23" MinWidth="40" Margin="3" ItemsSource="{x:Static localDetailView:BookingView.Hours}" DisplayMemberPath="Key" SelectedValuePath="Value" Name="EDIT_comboEndHours" />
<Label Grid.Column="3" Content=":" Margin="0" Padding="0" VerticalAlignment="Center" />
<ComboBox Grid.Column="4" Grid.Row="1" Height="23" MinWidth="40" Margin="3" ItemsSource="{x:Static localDetailView:BookingView.Minutes}" DisplayMemberPath="Key" SelectedValuePath="Value" Name="EDIT_comboEndMinutes" />
<ComboBox Grid.Column="4" Grid.Row="1" Height="23" MinWidth="40" Margin="3" ItemsSource="{x:Static localDetailView:BookingView.Minutes}" DisplayMemberPath="Key" SelectedValuePath="Value" Name="EDIT_comboEndMinutes" />
<Expander Grid.Row="2" Grid.ColumnSpan="5" Margin="3" Header="Termin Wiederholen">
@@ -316,7 +316,7 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<ComboBox Grid.ColumnSpan="2" Height="23" Margin="3" ItemsSource="{Binding EditVM.PossibleFrequencies}" DisplayMemberPath="Translation" SelectedValuePath="Frequency" Name="EDIT_comboFrequency" />
<ComboBox Grid.ColumnSpan="2" Height="23" Margin="3" ItemsSource="{Binding EditVM.PossibleFrequencies}" DisplayMemberPath="Translation" SelectedValuePath="Frequency" Name="EDIT_comboFrequency" />
<Label Grid.Row="1" Content="Intervall" IsEnabled="{Binding ElementName=EDIT_comboFrequency, Path=SelectedIndex, Converter={StaticResource IndexBoolConverter}, ConverterParameter=0}" />
<dxe:SpinEdit IsFloatValue="False" Grid.Row="1" Grid.Column="1" Height="23" Margin="3" MinValue="1" MaxValue="100" Name="EDIT_spineditIntervall" IsEnabled="{Binding ElementName=EDIT_comboFrequency, Path=SelectedIndex, Converter={StaticResource IndexBoolConverter}, ConverterParameter=0}" />
<Label Grid.Row="2" Content="Bis" IsEnabled="{Binding ElementName=EDIT_comboFrequency, Path=SelectedIndex, Converter={StaticResource IndexBoolConverter}, ConverterParameter=0}" />
@@ -327,7 +327,7 @@
</Expander>
<Label Grid.Row="3" Content="Mitarbeiter" />
<ComboBox Grid.Row="3" Height="23" Margin="3" Grid.Column="1" SelectedItem="{Binding Path=EditAppointment.Tag}" Name="combobox_editEmployee" Grid.ColumnSpan="4" PreviewMouseDoubleClick="Combobox_newEmployee_OnPreviewMouseDoubleClick" />
<ComboBox Grid.Row="3" Height="23" Margin="3" Grid.Column="1" SelectedItem="{Binding Path=EditAppointment.Tag}" Name="combobox_editEmployee" Grid.ColumnSpan="4" PreviewMouseDoubleClick="Combobox_newEmployee_OnPreviewMouseDoubleClick" />
<Label Grid.Row="4" Content="Notiz" />
<TextBox Grid.Column="1" Grid.Row="4" Name="EDIT_textboxNotice" Grid.ColumnSpan="4" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" Height="45" Width="180" Margin="3" />

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

@@ -460,7 +460,7 @@
<Label Grid.Column="0" Content="Staatsangehörigkeit"/>
<ComboBox x:Name="comboBox_Nationalitaet" Grid.Column="1" Margin="3" Height="23" SelectedValue="{Binding Path=Nationalitaet, Mode=TwoWay}" MinWidth="120" HorizontalAlignment="Left"/>
<uc:NullItemComboBox x:Name="comboBox_Nationalitaet" Grid.Column="1" Margin="3" Height="23" SelectedValue="{Binding Path=Nationalitaet, Mode=TwoWay}" MinWidth="120" HorizontalAlignment="Left"/>
</Grid>
<!-- ####################################### -->
@@ -481,8 +481,8 @@
</Grid.ColumnDefinitions>
<Label Grid.Column="0" HorizontalAlignment="Left" Content="Aufenthaltsstatus"/>
<ComboBox x:Name="comboBox_Aufenthalt" Grid.Column="1" Margin="3" Height="23" SelectedValue="{Binding Path=AufenthaltsStatus, Mode=TwoWay}" MinWidth="120" HorizontalAlignment="Stretch"/>
<uc:NullItemComboBox x:Name="comboBox_Aufenthalt" Grid.Column="1" Margin="3" Height="23" SelectedValue="{Binding Path=AufenthaltsStatus, Mode=TwoWay}" MinWidth="120" HorizontalAlignment="Stretch"/>
</Grid>
@@ -918,7 +918,7 @@
Width="150" HorizontalAlignment="Left" MaskType="DateTimeAdvancingCaret" />
<Label Grid.Column="2" Grid.Row="1" Content="Grad der Behinderung" VerticalAlignment="Center" />
<ComboBox Grid.Column="3" Grid.Row="1" Height="23" Margin="3" x:Name="GdBComboBox" Width="150" SelectionChanged="GdBComboBox_OnSelectionChanged"/>
<ComboBox Grid.Column="3" Grid.Row="1" Height="23" Margin="3" x:Name="GdBComboBox" Width="150" SelectionChanged="GdBComboBox_OnSelectionChanged"/>
<Label Grid.Column="2" Grid.Row="2" Content="Merkzeichen" VerticalAlignment="Center" />
<uc:PopUpEdit IsReadOnly="True"
@@ -992,7 +992,7 @@
MaskType="DateTimeAdvancingCaret" />
<Label Content="Grund für Beendigung" Grid.Row="2" Grid.Column="0" />
<ComboBox x:Name="comboBox_TerminationReason" ItemsSource="{Binding Path=TerminationReasons, Mode=OneWay}"
<uc:NullItemComboBox x:Name="comboBox_TerminationReason" ItemsSource="{Binding Path=TerminationReasons, Mode=OneWay}"
HorizontalAlignment="Left" Width="200" Grid.Column="1" Grid.Row="2" Margin="3" Height="23"
SelectedValue="{Binding Path=TerminationReason, Mode=TwoWay}" />
@@ -1111,7 +1111,7 @@
PreviewMouseDoubleClick="Popupedit_employeeRelations_OnPreviewMouseDoubleClick"
Cursor="Arrow" />
<Label Content="Rolle" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" />
<ComboBox Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2" Margin="3" Height="23"
<uc:NullItemComboBox Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2" Margin="3" Height="23"
ItemsSource="{Binding Path=EmployeeRelations.PossibleRoles}"
SelectedItem="{val:ValidationBinding Path=EmployeeRelations.NewVM.Role}" />
<Label Content="Notiz" Grid.Row="2" Grid.Column="0" VerticalAlignment="Top" />
@@ -1245,7 +1245,7 @@
EditValue="{val:ValidationBinding Path=AbsenceTimes.NewVM.Start, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="3" Grid.Row="0" Height="23" Margin="3"
EditValue="{val:ValidationBinding Path=AbsenceTimes.NewVM.End, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
<ComboBox Name="combox_reasons" Grid.Column="1" Grid.Row="1" Height="23" Margin="3"
<uc:NullItemComboBox Name="combox_reasons" Grid.Column="1" Grid.Row="1" Height="23" Margin="3"
ItemsSource="{Binding Path=AbsenceTimes.PossibleReasons}"
SelectedItem="{val:ValidationBinding Path=AbsenceTimes.NewVM.Reason}">
<ComboBox.ItemContainerStyle>
@@ -1253,7 +1253,7 @@
<Setter Property="Control.HorizontalContentAlignment" Value="Stretch" />
</Style>
</ComboBox.ItemContainerStyle>
</ComboBox>
</uc:NullItemComboBox>
<TextBox Grid.Column="3" Grid.Row="1" Height="23" Margin="3" Text="{Binding Path=AbsenceTimes.NewVM.Notice, UpdateSourceTrigger=PropertyChanged}" />
</Grid>
</GroupBox>
@@ -1334,8 +1334,8 @@
Text="{Binding Path=EnvironmentPersons.NewVM.OrganisationString, UpdateSourceTrigger=PropertyChanged}" />
<!--popupedit_environmentOrganisationSearch danach suchen für organisationsbereich -->
<ComboBox Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Margin="3" Height="23"
<uc:NullItemComboBox Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Margin="3" Height="23"
ItemsSource="{Binding Path=EnvironmentPersons.PossibleRoles}"
SelectedItem="{val:ValidationBinding Path=EnvironmentPersons.NewVM.Role}" />
@@ -1421,7 +1421,7 @@
Text="{Binding Path=EnvironmentOrganisations.NewVM.PersonString, UpdateSourceTrigger=PropertyChanged}" />
<!--Neu -->
<ComboBox Grid.Column="1" Margin="3" Height="23" Grid.Row="2" Grid.ColumnSpan="2"
<uc:NullItemComboBox Grid.Column="1" Margin="3" Height="23" Grid.Row="2" Grid.ColumnSpan="2"
ItemsSource="{Binding Path=EnvironmentOrganisations.PossibleRoles}"
SelectedItem="{val:ValidationBinding Path=EnvironmentOrganisations.NewVM.Role}" />
@@ -1490,8 +1490,8 @@
Grid.Row="0" DeleteButtonVisibility="Collapsed"
PopUpClick="popupedit_environmentPersonFamilySearch_PopUpClick"
Text="{val:ValidationBinding Path=EnvironmentPersonsWithFamily.NewVM.PersonString, UpdateSourceTrigger=PropertyChanged}" />
<ComboBox Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Margin="3" Height="23"
<uc:NullItemComboBox Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Margin="3" Height="23"
ItemsSource="{Binding Path=RoleInFamilys}"
SelectedItem="{val:ValidationBinding Path=EnvironmentPersonsWithFamily.NewVM.Role}" />
@@ -1852,7 +1852,7 @@
EditValue="{Binding Path=Auszahlungsintervall, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<StackPanel Grid.Column="3" Grid.Row="0" HorizontalAlignment="Right" Orientation="Horizontal">
<ComboBox x:Name="KassenbuchMonatsCB" Margin="3">
<uc:NullItemComboBox x:Name="KassenbuchMonatsCB" Margin="3">
<ComboBoxItem>1</ComboBoxItem>
<ComboBoxItem>2</ComboBoxItem>
<ComboBoxItem>3</ComboBoxItem>
@@ -1865,8 +1865,8 @@
<ComboBoxItem>10</ComboBoxItem>
<ComboBoxItem>11</ComboBoxItem>
<ComboBoxItem>12</ComboBoxItem>
</ComboBox>
<ComboBox x:Name="KassenbuchJahresCB" Margin="3" />
</uc:NullItemComboBox>
<uc:NullItemComboBox x:Name="KassenbuchJahresCB" Margin="3" />
<TextBlock Margin="3" FontSize="14" VerticalAlignment="Center" PreviewMouseLeftButtonDown="UIElement_OnPreviewMouseLeftButtonDown">
<Hyperlink x:Name="LinkKassenbuchDrucken" TargetName="_NewWindow" Foreground="#FF2B508B">
<Run Text="Kassenbuch Drucken" />

2
BeWo/View/Detail/CustomerView2.xaml
View File

@@ -452,7 +452,7 @@
<dxe:DateEdit Grid.Column="1" Grid.Row="0" Height="23" Margin="3" EditValue="{val:ValidationBinding Path=AbsenceTimes.NewVM.Start, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
<dxe:DateEdit Grid.Column="3" Grid.Row="0" Height="23" Margin="3" EditValue="{val:ValidationBinding Path=AbsenceTimes.NewVM.End, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
<!--<ComboBox Name="combox_reasons" Grid.Column="1" Grid.Row="1" Height="23" Margin="3" ItemsSource="{Binding Path=AbsenceTimes.PossibleReasons}" SelectedItem="{val:ValidationBinding Path=AbsenceTimes.NewVM.Reason}">
<!--<uc:NullItemComboBox Name="combox_reasons" Grid.Column="1" Grid.Row="1" Height="23" Margin="3" ItemsSource="{Binding Path=AbsenceTimes.PossibleReasons}" SelectedItem="{val:ValidationBinding Path=AbsenceTimes.NewVM.Reason}">
<ComboBox.ItemContainerStyle>
<Style>
<Setter Property="Control.HorizontalContentAlignment" Value="Stretch" />

10
BeWo/View/Detail/EmployeeView.xaml
View File

@@ -551,7 +551,7 @@
<Label VerticalAlignment="Center" Content="Klient" />
<uc:PopUpEdit IsReadOnly="True" DeleteButtonVisibility="Collapsed" Grid.Column="1" Margin="3" Height="23" x:Name="popupedit_customerRelations" Text="{val:ValidationBinding Path=CustomerRelations.NewVM.CustomerString}" PopUpClick="popupedit_customerRelations_PopUpClick" />
<Label Content="Rolle" Grid.Column="2" VerticalAlignment="Center" />
<ComboBox Grid.Column="3" Margin="3" Height="23" ItemsSource="{Binding Path=CustomerRelations.PossibleRoles}" SelectedItem="{val:ValidationBinding Path=CustomerRelations.NewVM.Role}" />
<uc:NullItemComboBox Grid.Column="3" Margin="3" Height="23" ItemsSource="{Binding Path=CustomerRelations.PossibleRoles}" SelectedItem="{val:ValidationBinding Path=CustomerRelations.NewVM.Role}" />
<Label Content="Notiz" Grid.Row="1" VerticalAlignment="Top" />
<TextBox Grid.Row="1" Grid.Column="1" Height="50" Margin="3" Text="{Binding Path=CustomerRelations.NewVM.Notice, UpdateSourceTrigger=PropertyChanged}" />
<Button Grid.Row="1" Grid.ColumnSpan="4" HorizontalAlignment="Right" VerticalAlignment="Bottom" Height="25" Margin="3" Content="Hinzufügen" x:Name="button_addCustomerRelation" Click="button_addCustomerRelation_Click" />
@@ -620,13 +620,13 @@
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="0" Height="23" Margin="3" EditValue="{val:ValidationBinding Path=AbsenceTimes.NewVM.Start, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="3" Grid.Row="0" Height="23" Margin="3" EditValue="{val:ValidationBinding Path=AbsenceTimes.NewVM.End, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
<ComboBox Name="combox_reasons" Grid.Column="1" Grid.Row="1" Height="23" Margin="3" ItemsSource="{Binding Path=AbsenceTimes.PossibleReasons}" SelectedItem="{val:ValidationBinding Path=AbsenceTimes.NewVM.Reason}">
<uc:NullItemComboBox Name="combox_reasons" Grid.Column="1" Grid.Row="1" Height="23" Margin="3" ItemsSource="{Binding Path=AbsenceTimes.PossibleReasons}" SelectedItem="{val:ValidationBinding Path=AbsenceTimes.NewVM.Reason}">
<ComboBox.ItemContainerStyle>
<Style>
<Setter Property="Control.HorizontalContentAlignment" Value="Stretch" />
</Style>
</ComboBox.ItemContainerStyle>
</ComboBox>
</uc:NullItemComboBox>
<TextBox Grid.Column="3" Grid.Row="1" Height="23" Margin="3" Text="{Binding Path=AbsenceTimes.NewVM.Notice, UpdateSourceTrigger=PropertyChanged}" />
</Grid>
@@ -672,13 +672,13 @@
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="0" Height="23" Margin="3" EditValue="{val:ValidationBinding Path=Overtimes.NewVM.Date, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
<dxe:TextEdit MaskType="Numeric" Grid.Column="3" Grid.Row="0" Height="23" Margin="3" EditValue="{val:ValidationBinding Path=Overtimes.NewVM.Betrag, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
<ComboBox Name="combox_art" Grid.Column="1" Grid.Row="1" Height="23" Margin="3" ItemsSource="{Binding Path=PossibleAuszahlungsarten}" SelectedItem="{Binding Path=Overtimes.NewVM.Auszahlungsart}">
<uc:NullItemComboBox Name="combox_art" Grid.Column="1" Grid.Row="1" Height="23" Margin="3" ItemsSource="{Binding Path=PossibleAuszahlungsarten}" SelectedItem="{Binding Path=Overtimes.NewVM.Auszahlungsart}">
<ComboBox.ItemContainerStyle>
<Style>
<Setter Property="Control.HorizontalContentAlignment" Value="Stretch" />
</Style>
</ComboBox.ItemContainerStyle>
</ComboBox>
</uc:NullItemComboBox>
<TextBox Grid.Column="3" Grid.Row="1" Height="23" Margin="3" Text="{Binding Path=Overtimes.NewVM.Notice, UpdateSourceTrigger=PropertyChanged}" />
</Grid>

7
BeWo/View/Detail/MailMergeWindow.xaml
View File

@@ -2,7 +2,8 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:detail="clr-namespace:BeWo.View.Detail"
xmlns:conv="clr-namespace:BeWo.Converter"
xmlns:conv="clr-namespace:BeWo.Converter"
xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
WindowStyle="None"
AllowsTransparency="True"
Background="Transparent"
@@ -469,7 +470,7 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Label Grid.Row="0" Grid.Column="0" Margin="3" Content="Vorlage" />
<ComboBox x:Name="VorlagenComboBox" Grid.Row="0" Grid.Column="1" Margin="3" DisplayMemberPath="FileName" ItemsSource="{Binding Path=WordTemplates, UpdateSourceTrigger=PropertyChanged}" SelectedIndex="0"/>
<controls:NullItemComboBox x:Name="VorlagenComboBox" Grid.Row="0" Grid.Column="1" Margin="3" DisplayMemberPath="FileName" ItemsSource="{Binding Path=WordTemplates, UpdateSourceTrigger=PropertyChanged}" SelectedIndex="0"/>
</Grid>
<StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="0" Margin="3" Grid.ColumnSpan="2">
<Label Content="Suche" FontSize="14" Margin="0,-5,0,0" />
@@ -478,7 +479,7 @@
</StackPanel>
<StackPanel Orientation="Horizontal" x:Name="SortPanel" Margin="3" Grid.Row="2" Grid.Column="0">
<TextBlock Foreground="Black" HorizontalAlignment="Left" Text="Sortiert nach" FontFamily="Microsoft Sans Serif" FontSize="12" Margin="6,2,0,0" />
<ComboBox x:Name="SortCombo" HorizontalAlignment="Left" FontFamily="Microsoft Sans Serif" FontSize="12" Margin="10,0,0,0" MinWidth="100" DisplayMemberPath="DisplayName" SelectionChanged="SortCombo_SelectionChanged" Style="{DynamicResource SortComboBox}" />
<controls:NullItemComboBox x:Name="SortCombo" HorizontalAlignment="Left" FontFamily="Microsoft Sans Serif" FontSize="12" Margin="10,0,0,0" MinWidth="100" DisplayMemberPath="DisplayName" SelectionChanged="SortCombo_SelectionChanged" Style="{DynamicResource SortComboBox}" />
<ToggleButton Style="{DynamicResource SortDirectionToggleButtonStyle}" x:Name="SortDirectionToggleButton" Click="SortDirectionToggleButton_Click" />
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Right">

6
BeWo/View/Detail/OrganisationView.xaml
View File

@@ -105,7 +105,7 @@
Width="300" HorizontalAlignment="Left" />
<Label Grid.Column="0" Grid.Row="2" Content="Funktion" />
<ComboBox x:Name="comboBox_Function" Grid.Column="1" Grid.Row="2" Margin="10,3,3,3" Height="23" Width="300" HorizontalAlignment="Left" SelectedValue="{Binding Path=Function, Mode=TwoWay}" />
<uc:NullItemComboBox x:Name="comboBox_Function" Grid.Column="1" Grid.Row="2" Margin="10,3,3,3" Height="23" Width="300" HorizontalAlignment="Left" SelectedValue="{Binding Path=Function, Mode=TwoWay}" />
@@ -291,7 +291,7 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Label Content="Qualifikationsabhängigen Stundensatz hinzufügen" Margin="3" />
<ComboBox Grid.Column="1" Width="200" Name="cb_qualifications" Margin="3"
<uc:NullItemComboBox Grid.Column="1" Width="200" Name="cb_qualifications" Margin="3"
ItemsSource="{Binding PossibleQualifications}" />
<Button Name="bt_addQualificationRate" Height="23" Margin="3" Grid.Column="2"
Content="hinzufügen" Click="bt_addQualificationRate_Click" />
@@ -423,7 +423,7 @@
<!-- neu -->
<ComboBox Grid.Column="3" Grid.Row="0" Margin="3" Height="23" x:Name="Combobox_Rolle" ItemsSource="" />
<uc:NullItemComboBox Grid.Column="3" Grid.Row="0" Margin="3" Height="23" x:Name="Combobox_Rolle" ItemsSource="" />

16
BeWo/View/Detail/PersonView.xaml
View File

@@ -109,10 +109,10 @@
<ComboBox x:Name="comboBox_Title" Grid.Column="1" Grid.Row="0" Margin="3" Height="23" SelectedValue="{Binding Path=Title, Mode=TwoWay}" />
<uc:NullItemComboBox x:Name="comboBox_Title" Grid.Column="1" Grid.Row="0" Margin="3" Height="23" SelectedValue="{Binding Path=Title, Mode=TwoWay}" />
<TextBox Grid.Column="1" Grid.Row="1" Margin="3" Height="23" Text="{Binding Path=FirstName, UpdateSourceTrigger=PropertyChanged}" />
<TextBox Grid.Column="1" Grid.Row="2" Margin="3" Height="23" Text="{val:ValidationBinding Path=LastName, UpdateSourceTrigger=PropertyChanged}" />
@@ -132,13 +132,13 @@
ItemsSource="{x:Static core:EnumTranslations.FamilyStatusTranslations}"
SelectedValue="{Binding Path=FamilyStatus}" DisplayMemberPath="Value"
SelectedValuePath="Key" />
<ComboBox x:Name="comboBox_Function" Grid.Column="1" Grid.Row="6" Margin="3" Height="23" SelectedValue="{Binding Path=Function, Mode=TwoWay}" />
<ComboBox x:Name="comboBox_Nationalitaet" Grid.Column="1" Grid.Row="7" Margin="3" Height="23" SelectedValue="{Binding Path=Nationalitaet, Mode=TwoWay}" />
<uc:NullItemComboBox x:Name="comboBox_Function" Grid.Column="1" Grid.Row="6" Margin="3" Height="23" SelectedValue="{Binding Path=Function, Mode=TwoWay}" />
<uc:NullItemComboBox x:Name="comboBox_Nationalitaet" Grid.Column="1" Grid.Row="7" Margin="3" Height="23" SelectedValue="{Binding Path=Nationalitaet, Mode=TwoWay}" />
<CheckBox Grid.Column="1" VerticalAlignment="Center" Margin="3,5,3,1" x:Name="chkMigration" Grid.Row="8"
IsChecked="{Binding Path=IsMigrant, UpdateSourceTrigger=PropertyChanged}" Height="23"/>
<ComboBox x:Name="comboBox_Aufenthalt" Grid.Row="9" Grid.Column="1" Margin="3" Height="23" SelectedValue="{Binding Path=AufenthaltsStatus, Mode=TwoWay}" MinWidth="120" HorizontalAlignment="Stretch"/>
<uc:NullItemComboBox x:Name="comboBox_Aufenthalt" Grid.Row="9" Grid.Column="1" Margin="3" Height="23" SelectedValue="{Binding Path=AufenthaltsStatus, Mode=TwoWay}" MinWidth="120" HorizontalAlignment="Stretch"/>
<CheckBox x:Name="chkArchiviert" Grid.Column="1" Grid.Row="10" Margin="3,5,3,1" Height="23" IsChecked="{Binding Path=IsArchived, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Stretch" />
<TextBox Grid.Row="11" Grid.RowSpan="3" Grid.Column="1" Margin="3" VerticalAlignment="Stretch" VerticalScrollBarVisibility="Auto" AcceptsReturn="True" Text="{Binding Path=Notice, UpdateSourceTrigger=PropertyChanged}" HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap" AutoWordSelection="True" />
@@ -293,7 +293,7 @@
<!-- neu -->
<ComboBox Grid.Column="3" Grid.Row="0" Margin="3" Height="23"
<uc:NullItemComboBox Grid.Column="3" Grid.Row="0" Margin="3" Height="23"
x:Name="ComboBox_RoleInOrganisation"
SelectedItem="{val:ValidationBinding Path=OrganisationRelations.NewVM.RolleInOrganisation}" />

10
BeWo/View/Detail/Report/ServicesReportView.xaml
View File

@@ -48,16 +48,16 @@
<Label Margin="0 2" Content="Monat" Grid.Column="3" />
<ComboBox Height="23" x:Name="combobox_month" Grid.Column="4" Margin="3" VerticalAlignment="Top" Width="90" />
<ComboBox Height="23" x:Name="combobox_month" Grid.Column="4" Margin="3" VerticalAlignment="Top" Width="90" />
<Label Margin="0 2" Content="Vom" Grid.Column="5" />
<ComboBox Height="23" x:Name="combobox_Startday" Grid.Column="6" Margin="3,3,0,3" VerticalAlignment="Top" Width="50" />
<ComboBox Height="23" x:Name="combobox_Startday" Grid.Column="6" Margin="3,3,0,3" VerticalAlignment="Top" Width="50" />
<TextBlock Margin="0 7,3,0" Text=". bis" Grid.Column="7" Foreground="Black" />
<ComboBox Height="23" x:Name="combobox_Endday" Grid.Column="8" Margin="3,3,0,3" VerticalAlignment="Top" Width="50" />
<ComboBox Height="23" x:Name="combobox_Endday" Grid.Column="8" Margin="3,3,0,3" VerticalAlignment="Top" Width="50" />
<TextBlock Margin="0 7,3,0" Text=". Jahr" Grid.Column="9" Foreground="Black"/>
<ComboBox Height="23" x:Name="combobox_year" Grid.Column="10" VerticalAlignment="Top" Margin="3" Width="60" />
<ComboBox Height="23" x:Name="combobox_year" Grid.Column="10" VerticalAlignment="Top" Margin="3" Width="60" />
<Button Name="button_generate" Grid.Column="11" VerticalAlignment="Top" FontWeight="Bold" Content="Erstellen" Click="button_generate_Click" Height="23" Margin="3" />
@@ -82,7 +82,7 @@
<StackPanel Grid.Row="3" Grid.ColumnSpan="12" Orientation="Horizontal" VerticalAlignment="Stretch">
<CheckBox Margin="3 7" Grid.Row="1" Name="ChkForAllServiceCategories" Content="Nur für ausgewählte Leistungskategorie erstellen" IsChecked="False" />
<ComboBox Width="250" Margin="3" VerticalAlignment="Top" x:Name="ServiceCategoriesComboBox" SelectedIndex="0"
<uc:NullItemComboBox Width="250" Margin="3" VerticalAlignment="Top" x:Name="ServiceCategoriesComboBox" SelectedIndex="0"
Visibility="{Binding Path=IsChecked, ElementName=ChkForAllServiceCategories, Converter={StaticResource BoolVisibilityConverter}, ConverterParameter='true'}"/>
</StackPanel>

2
BeWo/View/Detail/RessourceView.xaml
View File

@@ -36,7 +36,7 @@
<TextBox Grid.Column="3" Grid.Row="0" Grid.ColumnSpan="2" Margin="3" Height="23" Text="{Binding Path=NewVM.Description, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Row="1">Kategorie</Label>
<ComboBox Grid.Column="1" Grid.Row="1" Margin="3" Height="23" ItemsSource="{Binding Path=PossibleCategories, Mode=OneWay}" SelectedItem="{val:ValidationBinding Path=NewVM.Category}" DisplayMemberPath="TypeDescription" />
<uc:NullItemComboBox Grid.Column="1" Grid.Row="1" Margin="3" Height="23" ItemsSource="{Binding Path=PossibleCategories, Mode=OneWay}" SelectedItem="{val:ValidationBinding Path=NewVM.Category}" DisplayMemberPath="TypeDescription" />
<Label Grid.Column="2" Grid.Row="1">
Farbe im Belegungsplan
</Label>

5
BeWo/View/Detail/ServiceDescriptionView.xaml
View File

@@ -7,6 +7,7 @@
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:Shared="clr-namespace:BS.Shared;assembly=BS.Shared"
xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" Focusable="True">
<GroupBox Name="root" Header="Aktuell definierte Leistungen" Style="{StaticResource ObjectEditGroupBox}">
@@ -35,7 +36,7 @@
<Label Grid.Column="0" Grid.Row="0">Bezeichnung</Label>
<TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" Text="{val:ValidationBinding Path=NewVM.Name, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Column="2" Grid.Row="0">Kategorie</Label>
<ComboBox Name="combobox_categories" Grid.Column="3" Grid.Row="0" Height="23" ItemsSource="{Binding Path=PossibleCategories, Mode=OneWay}" Margin="3" SelectedItem="{val:ValidationBinding Path=NewVM.ServiceCategory}" SelectionChanged="Combobox_categories_OnSelected">
<controls:NullItemComboBox Name="combobox_categories" Grid.Column="3" Grid.Row="0" Height="23" ItemsSource="{Binding Path=PossibleCategories, Mode=OneWay}" Margin="3" SelectedItem="{val:ValidationBinding Path=NewVM.ServiceCategory}" SelectionChanged="Combobox_categories_OnSelected">
<ComboBox.Resources>
<DataTemplate x:Key="DropDownItemTemplate">
<Grid>
@@ -58,7 +59,7 @@
<Setter Property="Control.HorizontalContentAlignment" Value="Stretch" />
</Style>
</ComboBox.ItemContainerStyle>
</ComboBox>
</controls:NullItemComboBox>
<Label Content="Position" Grid.Column="0" Grid.Row="1" HorizontalAlignment="Left"/>

4
BeWo/View/Detail/ServiceRecordEditView.xaml
View File

@@ -92,9 +92,9 @@
TreeViewSourceList="{Binding Path=GoalTree, Mode=TwoWay}"
Visibility="{Binding Path=IsGoalTreeVisible, Converter={StaticResource BoolVisibilityConverter}}" />
<Label Grid.Column="0" Grid.Row="2" Content="Kategorie" />
<ComboBox Grid.Column="1" Grid.Row="2" SelectedItem="{val:ValidationBinding Path=Category, Mode=TwoWay}" ItemsSource="{Binding Path=SortedCategories}" SelectedIndex="0" x:Name="combobox_category" Margin="3,0,3,3" Height="23" />
<ComboBox Grid.Column="1" Grid.Row="2" SelectedItem="{val:ValidationBinding Path=Category, Mode=TwoWay}" ItemsSource="{Binding Path=SortedCategories}" SelectedIndex="0" x:Name="combobox_category" Margin="3,0,3,3" Height="23" />
<Label Grid.Column="0" Grid.Row="3" Content="Leistung" />
<ComboBox Grid.Column="1" Grid.Row="3" SelectedItem="{val:ValidationBinding Path=ServiceDescription, Mode=TwoWay}" ItemsSource="{Binding Path=PossibleServiceDescriptions}" SelectedIndex="0" x:Name="combobox_services" Margin="3,0,3,3" Height="23" />
<ComboBox Grid.Column="1" Grid.Row="3" SelectedItem="{val:ValidationBinding Path=ServiceDescription, Mode=TwoWay}" ItemsSource="{Binding Path=PossibleServiceDescriptions}" SelectedIndex="0" x:Name="combobox_services" Margin="3,0,3,3" Height="23" />
<Border Grid.Row="4" Grid.ColumnSpan="2" BorderThickness="0,0,0,1" Margin="3,3,3,3" BorderBrush="#FF86878F" Padding="0,0,0,3">
<CheckBox Content="Freie/Inhaltliche Doku"
x:Name="chkServiceRecordTypeContent" IsChecked="{Binding Path=IsServiceRecordTypeContent}"

1
BeWo/View/Detail/ServiceRecordGroupEditView.xaml
View File

@@ -6,6 +6,7 @@
xmlns:val="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:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
Height="Auto" Width="Auto"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Focusable="True">

16
BeWo/View/Detail/ServiceRecordView2.xaml
View File

@@ -626,7 +626,7 @@
<Label Grid.Column="0" Grid.Row="2" Content="Kategorie" />
<ComboBox Grid.Column="1" Grid.Row="2"
<ComboBox Grid.Column="1" Grid.Row="2"
SelectionChanged="Combobox_category_OnSelectionChanged"
SelectedItem="{val:ValidationBinding Path=PrototypeVM.Category}"
ItemsSource="{Binding Path=PrototypeVM.SortedCategories}"
@@ -635,7 +635,7 @@
<Label Grid.Column="0" Grid.Row="3" Content="Leistung" />
<ComboBox Grid.Column="1" Grid.Row="3"
<ComboBox Grid.Column="1" Grid.Row="3"
SelectedItem="{val:ValidationBinding Path=PrototypeVM.ServiceDescription}"
ItemsSource="{Binding Path=PrototypeVM.PossibleServiceDescriptions}"
SelectedIndex="0" x:Name="combobox_services" Margin="3,0,3,3"
@@ -1304,24 +1304,26 @@
</Grid.ColumnDefinitions>
<Label Grid.Column="0" Content="Wohnheim" Margin="0,0,3,3" />
<ComboBox x:Name="wohnheimbuchungsWohnheimComboBox" Grid.Column="1" Width="150" Margin="0,0,3,3" ItemsSource="{Binding Path=AlleWohnheime}" SelectedItem="{Binding Path=SelectedWohnheimbuchung.Wohnheim, UpdateSourceTrigger=PropertyChanged}" SelectionChanged="WohnheimbuchungsWohnheimComboBox_OnSelectionChanged" />
<uc:NullItemComboBox x:Name="wohnheimbuchungsWohnheimComboBox" Grid.Column="1" Width="150" Margin="0,0,3,3" ItemsSource="{Binding Path=AlleWohnheime}" SelectedItem="{Binding Path=SelectedWohnheimbuchung.Wohnheim, UpdateSourceTrigger=PropertyChanged}" SelectionChanged="WohnheimbuchungsWohnheimComboBox_OnSelectionChanged" />
<Label Grid.Column="2" Content="Datum" Margin="0,0,3,3" />
<dxe:DateEdit Grid.Column="3" x:Name="wohnheimbuchungsDateEdit" Height="23" Width="150" Margin="0,0,3,3"
EditValueChanged="WohnheimbuchungsDateEdit_OnEditValueChanged"
EditValue="{Binding Mode=TwoWay, Path=SelectedWohnheimbuchung.Buchungsdatum}" MaskType="DateTimeAdvancingCaret"/>
--><!--<Label Grid.Column="4" Content="Kategorie" />
<ComboBox Grid.Column="5" SelectedItem="{Binding Path=SelectedWohnheimbuchung.Category}"
-->
<!--<Label Grid.Column="4" Content="Kategorie" />
<uc:NullItemComboBox Grid.Column="5" SelectedItem="{Binding Path=SelectedWohnheimbuchung.Category}"
ItemsSource="{Binding Path=SelectedWohnheimbuchung.SortedCategories}"
SelectedIndex="0" x:Name="combobox_category_wohnheimbuchung" Margin="3,0,3,3"
Height="23" Width="150" />
<Label Grid.Column="6" Content="Leistung" />
<ComboBox Grid.Column="7" SelectedItem="{Binding Path=SelectedWohnheimbuchung.ServiceDescription}"
<uc:NullItemComboBox Grid.Column="7" SelectedItem="{Binding Path=SelectedWohnheimbuchung.ServiceDescription}"
HorizontalAlignment="Left"
ItemsSource="{Binding Path=SelectedWohnheimbuchung.PossibleServiceDescriptions}"
SelectedIndex="0" x:Name="combobox_services_wohnheimbuchung" Margin="3,0,3,3" Height="23" Width="150" />--><!--
SelectedIndex="0" x:Name="combobox_services_wohnheimbuchung" Margin="3,0,3,3" Height="23" Width="150" />-->
<!--
</Grid>
<StackPanel Grid.Column="0" Grid.Row="1" Orientation="Horizontal">

2
BeWo/View/Detail/SupportConceptGoalView.xaml
View File

@@ -15,7 +15,7 @@
<Label Grid.Column="0" Grid.Row="0">Bezeichnung</Label>
<TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" Text="{val:ValidationBinding Path=NewVM.Description, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Column="2" Grid.Row="0">Grundsatzziel</Label>
<ComboBox Name="combobox_categories" Grid.Column="3" Grid.Row="0" Height="23" ItemsSource="{Binding Path=PossibleCategories, Mode=OneWay}" Margin="3" SelectedItem="{val:ValidationBinding Path=NewVM.ParentEntry}" />
<uc:NullItemComboBox Name="combobox_categories" Grid.Column="3" Grid.Row="0" Height="23" ItemsSource="{Binding Path=PossibleCategories, Mode=OneWay}" Margin="3" SelectedItem="{val:ValidationBinding Path=NewVM.ParentEntry}" />
<Button Name="button_add" Click="button_add_Click" Grid.Column="6" Grid.Row="0" Height="25" Margin="3" Padding="5 0" IsDefault="True">Hinzufügen</Button>
<dxg:GridControl x:Name="datagridcontrol" Margin="0,10,0,0" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="7" DataSource="{Binding VMList}">
<dxg:GridControl.Columns>

5
BeWo/View/Detail/TextbausteinView.xaml
View File

@@ -6,7 +6,8 @@
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:validation="clr-namespace:BeWo.Validation"
xmlns:detail="clr-namespace:BeWo.View.Detail"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" Focusable="True">
<view:BeWoView.Resources>
<detail:IsOnlyForEmployeeRightsConverter x:Key="IsOnlyForEmployeeRightsConverter" />
@@ -40,7 +41,7 @@
<Label Grid.Column="2" Grid.Row="0">Position</Label>
<dxe:SpinEdit Grid.Column="3" Grid.Row="0" Width="100" Height="23" MinValue="0" IsFloatValue="False" Value="{Binding Path=NewVM.Position, Mode=TwoWay, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}"></dxe:SpinEdit>
<Label Grid.Column="4" Grid.Row="0">Kategorie</Label>
<ComboBox Grid.Column="5" Grid.Row="0" Width="150" Height="23" ItemsSource="{Binding Path=PossibleCategories, Mode=OneWay}" SelectedItem="{Binding Path=NewVM.ServiceCategory}" />
<controls:NullItemComboBox Grid.Column="5" Grid.Row="0" Width="150" Height="23" ItemsSource="{Binding Path=PossibleCategories, Mode=OneWay}" SelectedItem="{Binding Path=NewVM.ServiceCategory}" />
<Label Grid.Column="0" Grid.Row="1">Text</Label>
<TextBox Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="5" AcceptsReturn="True" MaxWidth="469" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" TextWrapping="Wrap" Height="100" Margin="0,3,0,0" Text="{Binding Path=NewVM.Text, UpdateSourceTrigger=PropertyChanged}"></TextBox>
<Button Grid.Column="4" Grid.Row="2" x:Name="AddTextbausteinButton" Margin="3" HorizontalAlignment="Right" Grid.ColumnSpan="2" Click="ButtonAddTextbaustein_Click">Hinzufügen</Button>

8
BeWo/View/EmployeeArbeitszeitView.xaml
View File

@@ -218,7 +218,7 @@
</Grid>
</GroupBox.Header>
<dxg:GridControl Name="grid_Arbeitszeiten" Tag="{Binding}" MaxWidth="{Binding ElementName=BlubbTest, Path=ActualWidth}" DataSource="{Binding Path=ArbeitszeitEintraege.VMList, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" >
<dxg:GridControl Name="grid_Arbeitszeiten" Tag="{Binding}" MaxWidth="{Binding ElementName=BlubbTest, Path=ActualWidth}" DataSource="{Binding Path=ArbeitszeitEintraege.VMList, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" CustomColumnSort="GridControl_OnCustomColumnSort" >
<dxg:GridControl.Columns>
<dxg:GridColumn FieldName="x" Header="" Width="25" FixedWidth="True" >
@@ -228,8 +228,8 @@
</DataTemplate>
</dxg:GridColumn.CellTemplate>
</dxg:GridColumn>
<dxg:GridColumn Header="Tag" FixedWidth="True" Width="100" FieldName="Tag" SortOrder="Ascending">
<dxg:GridColumn Header="Tag" FixedWidth="True" Width="100" FieldName="Tag" SortOrder="Ascending" SortMode="Custom">
<dxg:GridColumn.EditSettings>
<dxe:ComboBoxEditSettings ItemsSource="{Binding Source={StaticResource AppointmentDayOfWeeks}}" />
</dxg:GridColumn.EditSettings>
@@ -251,7 +251,7 @@
</dxg:GridControl.Columns>
<dxg:GridControl.View>
<dxg:TableView NavigationStyle="Cell" Margin="2,2,2,2" AutoWidth="True" ShowGroupPanel="False" ShowGroupedColumns="False" ShowTotalSummary="False" HorizontalContentAlignment="Left"/>
<dxg:TableView NavigationStyle="Cell" Margin="2,2,2,2" AutoWidth="True" ShowGroupPanel="False" ShowGroupedColumns="False" ShowTotalSummary="False" HorizontalContentAlignment="Left" />
</dxg:GridControl.View>
</dxg:GridControl>

49
BeWo/View/EmployeeArbeitszeitView.xaml.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.IO;
using System.Linq;
@@ -151,5 +152,53 @@ namespace BeWo.View
grid_ArbeitszeitEintrag.RefreshData();
}
private void GridControl_OnCustomColumnSort(object sender, CustomColumnSortEventArgs e)
{
var comparer = new WochentagComparerClass();
e.Result = comparer.Compare(e.Value1.ToString(), e.Value2.ToString());
e.Handled = true;
}
}
public class WochentagComparerClass : IComparer<String>
{
public int Compare(String x, String y)
{
if (x.Equals(y))
return 0;
switch (y)
{
case "Montag":
return 1;
case "Dienstag":
return x.Equals("Montag") ? -1 : 1;
case "Mittwoch":
return x.Equals("Montag") ||
x.Equals("Dienstag") ? -1 : 1;
case "Donnerstag":
return x.Equals("Montag") ||
x.Equals("Dienstag") ||
x.Equals("Mittwoch") ? -1 : 1;
case "Freitag":
return x.Equals("Montag") ||
x.Equals("Dienstag") ||
x.Equals("Mittwoch") ||
x.Equals("Donnerstag") ? -1 : 1;
case "Samstag":
return x.Equals("Montag") ||
x.Equals("Dienstag") ||
x.Equals("Mittwoch") ||
x.Equals("Donnerstag") ||
x.Equals("Freitag") ? -1 : 1;
case "Sonntag":
return -1;
default:
return 0;
}
}
}
}

4
BeWo/View/Report/AnnualReport/AnnualReportView.xaml
View File

@@ -45,7 +45,7 @@
</Grid.RowDefinitions>
<Label Content="Jahr:" HorizontalAlignment="Left" Grid.Column="0" Grid.Row="0" VerticalAlignment="Center" />
<ComboBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" Name="combobox_year" />
<ComboBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" Name="combobox_year" />
<Label x:Name="lblCostcenter" Content="Kostenträger:" HorizontalAlignment="Left" Grid.Column="0" Grid.Row="1" VerticalAlignment="Center" />
<uc:PopUpEdit Grid.Column="1" Grid.ColumnSpan="1" Grid.Row="1"
@@ -57,7 +57,7 @@
HorizontalAlignment="Left" Width="200" HorizontalContentAlignment="Left" Height="24" Margin="3" />
<Label Content="Betreuungsart:" HorizontalAlignment="Left" Grid.Column="0" Grid.Row="3" VerticalAlignment="Center" />
<ComboBox Grid.Column="1" Grid.Row="3" Margin="3" Height="23" Name="combobox_customercaretype" />
<uc:NullItemComboBox Grid.Column="1" Grid.Row="3" Margin="3" Height="23" Name="combobox_customercaretype" />
<Button x:Name="button_generate" Grid.Column="1" Grid.Row="4" Content="Aktualisieren" Click="button_generate_Click" Height="24" HorizontalAlignment="Right" Width="90" Margin="3" />

4
BeWo/View/Report/Auslastung/AuslastungReportView2.xaml
View File

@@ -52,10 +52,10 @@
<Label Margin="0 2" Content="Monat" Grid.Row="2" />
<ComboBox Height="23" x:Name="combobox_month" Grid.Row="2" Grid.Column="1" Margin="3" VerticalAlignment="Top" Width="90" />
<ComboBox Height="23" x:Name="combobox_month" Grid.Row="2" Grid.Column="1" Margin="3" VerticalAlignment="Top" Width="90" />
<TextBlock Margin="0 7,3,0" Text=". Jahr" Grid.Row="2" Grid.Column="2" Foreground="Black"/>
<ComboBox Height="23" x:Name="combobox_year" Grid.Row="2" Grid.Column="3" VerticalAlignment="Top" Margin="3" Width="60" />
<ComboBox Height="23" x:Name="combobox_year" Grid.Row="2" Grid.Column="3" VerticalAlignment="Top" Margin="3" Width="60" />
<Button Name="button_generate" Grid.Row="3" Grid.Column="0" HorizontalAlignment="Stretch" VerticalAlignment="Top" FontWeight="Bold" Content="Erstellen" Click="button_generate_Click" Height="23" Margin="3" />

51
Data/Access/SearchDAO.cs
View File

@@ -2019,57 +2019,6 @@ namespace BeWo.Data.Access
return c.UniqueResult<ServiceRecord>();
}
public VertretungsListe VertretungListe(DateTime abssenceTime)
{
VertretungsListe liste = new VertretungsListe();
//CreateCriteria<Vertretung>()
// .CreateCriteria(Customer.PropertyName_Person, JoinType.LeftOuterJoin)
// .CreateCriteria(Person.PropertyName_Address, JoinType.LeftOuterJoin)
// .List<Customer>();
//var qVert = Session.CreateSQLQuery("SELECT Oid FROM Vertretung WHERE VertretungsZeitraumVon = '" + abssenceTime.ToString("yyyyMMdd") + "' ");
var qVert = Session.CreateSQLQuery("SELECT Oid FROM Vertretung ");
var vert = qVert.List<long>();
var lvert = DAOFactory.GenericDAO.GetActiveByIDs<Vertretung>(vert);
liste.Vertretunglist = lvert.ToList();
var qabsence = Session.CreateSQLQuery("SELECT Oid FROM AbsenceTime ");
var absence = qabsence.List<long>();
var labsence = DAOFactory.GenericDAO.GetActiveByIDs<AbsenceTime>(absence);
liste.AbsenceTimelist = labsence.ToList();
var qemployee = Session.CreateSQLQuery("SELECT Oid FROM Employee WHERE isActive = 1");
var employee = qemployee.List<long>();
var lemployee = DAOFactory.GenericDAO.GetActiveByIDs<Employee>(employee);
liste.Employeelist = lemployee.ToList();
var qcustomer = Session.CreateSQLQuery("SELECT Oid FROM Customer WHERE isActive = 1");
var customer = qcustomer.List<long>();
var lcustomer = DAOFactory.GenericDAO.GetActiveByIDs<Customer>(customer);
liste.Customerlist = lcustomer.ToList();
var qemployeeArbeitszeit = Session.CreateSQLQuery("SELECT Oid FROM Arbeitszeit");
var employeeArbeitszeit = qemployeeArbeitszeit.List<long>();
var larbeitszeit = DAOFactory.GenericDAO.GetActiveByIDs<Arbeitszeit>(employeeArbeitszeit);
liste.Arbeitszeitliste = larbeitszeit.ToList();
return liste;
}
public ArbeitszeitListe FindEmployeeArbeitszeitListe(long employeeOid)
{
var c = CreateCriteria<Arbeitszeit>().Add(Restrictions.Eq(Arbeitszeit.PropertyName_EmployeeOid,employeeOid));

575
Service/SBD/Vertretung/VertretungsAlgorithmus.cs Normal file
View File

@@ -0,0 +1,575 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BS.Shared;
using BS.Shared.DataContracts;
namespace BeWo.Service.SBD.Vertretung
{
class VertretungsAlgorithmus
{
private readonly Dictionary<long, List<long>> _employee2CustomerHaupt = new Dictionary<long, List<long>>();
private readonly VertretungsListeDC _schulbegleitenderDienst = new VertretungsListeDC();
private DateTime _absenceTime;
private DateTime _startDate;
private DateTime _endDate;
private bool arbeitszeitschalter = false;
public List<VertretungsListeItemsDC> vertretungsliste = new List<VertretungsListeItemsDC>();
private readonly List<long> _vorhandeneCustomerOidListe = new List<long>();
public VertretungsAlgorithmus(VertretungsListeDC sbd , DateTime date)
{
_schulbegleitenderDienst = sbd;
_absenceTime = date;
Hauptbetreuungen();
ErstelleItemVonVertretungen();
ErstelleItemVonAbsencetimes();
}
public VertretungsAlgorithmus(VertretungsListeDC sbd, DateTime start,DateTime ende)
{
_schulbegleitenderDienst = sbd;
_startDate = start;
_endDate = ende;
Hauptbetreuungen();
ErstelleItemVonWoechentlicherVertretungen();
ErstelleItemVonWoechentlicherAbsencetimes();
}
public void Hauptbetreuungen()
{
foreach (var xa in _schulbegleitenderDienst.Employeesliste)
{
List<long> klientoids = new List<long>();
Employee e = DAOFactory.GenericDAO.LoadByID<Employee>(xa.EmployeeOid);
foreach (var e2c in e.Employee2CustomerList)
{
foreach (var v2o in e2c.ValueList)
{
if (v2o.Entry.Type == ValueListEntryType.StaffRoleType && v2o.Entry.SystemEntryID.HasValue &&
v2o.Entry.SystemEntryID.Value == SystemEntryID.EmployeeRoleMainAttendant)
{
klientoids.Add(e2c.CustomerOid.Value);
}
}
}
if (!_employee2CustomerHaupt.ContainsKey(xa.EmployeeOid))
_employee2CustomerHaupt.Add(xa.EmployeeOid, klientoids);
}
_schulbegleitenderDienst.Employee2CustomerHauptbetreuung = _employee2CustomerHaupt;
}
//----- Tages Vertretung
private void ErstelleItemVonVertretungen()
{
_vorhandeneCustomerOidListe.Clear();
VertretungsListeItemsDC item = new VertretungsListeItemsDC();
foreach (var vertritt in _schulbegleitenderDienst.Vertretungsliste)
{
item = BuildVertertungslisteItems();
//Vertretungsdc wird übergeben
item.Vertretung = vertritt;
if (vertritt.VertretungsZeitraumVon.Date <= _absenceTime.Date && vertritt.VertretungsZeitraumBis.Date >= _absenceTime.Date)
{
foreach (var mit in _schulbegleitenderDienst.Employeesliste)
{
if (vertritt.EmployeeOid == mit.EmployeeOid)
{
item.EmployeeName = mit.FirstName + " " + mit.LastName;
item.EmployeeOid = mit.EmployeeOid;
}
if (vertritt.VertretenderMitarbeiterOid == mit.EmployeeOid)
{
item.VertretenderMitarbeiter = mit.FirstName + " " + mit.LastName;
item.VertetenderMit = mit.EmployeeOid;
}
foreach (var hauptbetreuung in _schulbegleitenderDienst.Employee2CustomerHauptbetreuung)
{
if (hauptbetreuung.Key == vertritt.EmployeeOid && vertritt.EmployeeOid == mit.EmployeeOid)
{
foreach (var cust in _schulbegleitenderDienst.Customersliste)
{
foreach (var val in hauptbetreuung.Value)
{
if (val == cust.CustomerOid)
{
if (cust.CustomerOid == vertritt.CustomerOid)
{
_vorhandeneCustomerOidListe.Add(cust.CustomerOid);
item.Customer.Add(cust.CustomerOid, cust.FullName);
}
}
}
}
}
}
}
foreach (var ab in _schulbegleitenderDienst.AbsenceTimeliste)
{
if (vertritt.AbsenceTimeOid == ab.AbsenceTimeOid)
{
item.Abwesenheitskategorie = ab.Reason;
AddKrankheitsZeitraumAndMeldungToItem(item, ab);
item.Absencetime = ab;
AddArbeitszeitToItem(item, vertritt.EmployeeOid,1);
if (item.EmployeeOid == 0 || item.EmployeeName.Equals(""))
{
foreach (var emp in _schulbegleitenderDienst.Employeesliste)
{
if (emp.EmployeeOid == ab.EmployeeOid)
{
item.EmployeeOid = ab.EmployeeOid.Value;
item.EmployeeName = emp.FirstName + " " + emp.LastName;
}
}
}
}
}
//überprüfung durchführen und ggf mehrere Davon anlegen. wegen vertretungszeiten bei krankheitszeiträumen
vertretungsliste.Add(item);
//if (vertritt.VertretungsZeitraumVon != ab.Start.Value && vertritt.VertretungsZeitraumBis != ab.End.Value) für die zeiten inerghalb eines tages
//{
// add der vertretungsliste einen Weiteren Tag der nicht
// allerdings müsste da wieder ne neue vertretung erstellt werden.
// desweiteren müsste die range der Stunden ermittelt werden.
// vertretungsliste.Add(item);
//}
}
}
}
private void ErstelleItemVonAbsencetimes()
{
VertretungsListeItemsDC item = new VertretungsListeItemsDC();
foreach (var ars in _schulbegleitenderDienst.AbsenceTimeliste)
{
item = BuildVertertungslisteItems();
item.Abwesenheitskategorie = ars.Reason;
item.Absencetime = ars;
AddKrankheitsZeitraumAndMeldungToItem(item, ars);
if (ars.Start.Value.Date <= _absenceTime.Date && ars.End.Value.Date >= _absenceTime.Date)
{
foreach (var emp in _schulbegleitenderDienst.Employeesliste)
{
if (ars.EmployeeOid == emp.EmployeeOid)
{
item.EmployeeName = emp.FirstName + " " + emp.LastName;
}
foreach (var hauptbetreuung in _schulbegleitenderDienst.Employee2CustomerHauptbetreuung)
{
if (hauptbetreuung.Key == emp.EmployeeOid && emp.EmployeeOid == ars.EmployeeOid)
{
foreach (var cust in _schulbegleitenderDienst.Customersliste)
{
foreach (var val in hauptbetreuung.Value)
{
if (val == cust.CustomerOid)
{
if (!_vorhandeneCustomerOidListe.Contains(cust.CustomerOid))
item.Customer.Add(cust.CustomerOid, cust.FullName);
}
}
}
}
}
}
if (item.EmployeeOid == 0 || item.EmployeeName.Equals(""))
{
foreach (var emp in _schulbegleitenderDienst.Employeesliste)
{
if (emp.EmployeeOid == ars.EmployeeOid)
{
item.EmployeeOid = ars.EmployeeOid.Value;
item.EmployeeName = emp.FirstName + " " + emp.LastName;
AddArbeitszeitToItem(item, emp.EmployeeOid,1);
}
}
}
//Sonderfall wenn keine vertertung verfügbar und employee nicht gegeben aber absence eine customer oid besitzt
if (item.Customer.Count == 0 && item.EmployeeOid == 0 && ars.CustomerOid.Value != 0)
{
foreach (var cust in _schulbegleitenderDienst.Customersliste)
{
if (ars.CustomerOid.Value == cust.CustomerOid)
{
item.Customer.Add(cust.CustomerOid, cust.FullName);
}
}
}
if (item.Customer.Count != 0)//hier auch employeecount abfragen // bearbeiten
{
vertretungsliste.Add(item);
}
}
}
}
//---------
//----- Wochentliche Vertretungen date abfrage muss hier gerichtet werden ?? habe ich das nicht bereits erledigt
private void ErstelleItemVonWoechentlicherVertretungen()
{
_vorhandeneCustomerOidListe.Clear();
VertretungsListeItemsDC item = new VertretungsListeItemsDC();
foreach (var vertritt in _schulbegleitenderDienst.Vertretungsliste)
{
item = BuildVertertungslisteItems();
//Vertretungsdc wird übergeben
item.Vertretung = vertritt;
if (vertritt.VertretungsZeitraumVon.Date <= _endDate.Date && vertritt.VertretungsZeitraumBis.Date >= _startDate.Date)
{
foreach (var mit in _schulbegleitenderDienst.Employeesliste)
{
if (vertritt.EmployeeOid == mit.EmployeeOid)
{
item.EmployeeName = mit.FirstName + " " + mit.LastName;
item.EmployeeOid = mit.EmployeeOid;
}
if (vertritt.VertretenderMitarbeiterOid == mit.EmployeeOid)
{
item.VertretenderMitarbeiter = mit.FirstName + " " + mit.LastName;
item.VertetenderMit = mit.EmployeeOid;
}
foreach (var hauptbetreuung in _schulbegleitenderDienst.Employee2CustomerHauptbetreuung)
{
if (hauptbetreuung.Key == vertritt.EmployeeOid && vertritt.EmployeeOid == mit.EmployeeOid)
{
foreach (var cust in _schulbegleitenderDienst.Customersliste)
{
foreach (var val in hauptbetreuung.Value)
{
if (val == cust.CustomerOid)
{
if (cust.CustomerOid == vertritt.CustomerOid)
{
_vorhandeneCustomerOidListe.Add(cust.CustomerOid);
item.Customer.Add(cust.CustomerOid, cust.FullName);
}
}
}
}
}
}
}
foreach (var ab in _schulbegleitenderDienst.AbsenceTimeliste)
{
if (vertritt.AbsenceTimeOid == ab.AbsenceTimeOid)
{
item.Abwesenheitskategorie = ab.Reason;
AddKrankheitsZeitraumAndMeldungToItem(item, ab);
item.Absencetime = ab;
AddArbeitszeitToItem(item, vertritt.EmployeeOid,2);
if (item.EmployeeOid == 0 || item.EmployeeName.Equals(""))
{
foreach (var emp in _schulbegleitenderDienst.Employeesliste)
{
if (emp.EmployeeOid == ab.EmployeeOid)
{
item.EmployeeOid = ab.EmployeeOid.Value;
item.EmployeeName = emp.FirstName + " " + emp.LastName;
}
}
}
}
}
vertretungsliste.Add(item);
}
}
}
private void ErstelleItemVonWoechentlicherAbsencetimes()
{
VertretungsListeItemsDC item = new VertretungsListeItemsDC();
foreach (var ars in _schulbegleitenderDienst.AbsenceTimeliste)
{
item = BuildVertertungslisteItems();
item.Abwesenheitskategorie = ars.Reason;
item.Absencetime = ars;
AddKrankheitsZeitraumAndMeldungToItem(item, ars);
if (ars.Start.Value.Date <= _endDate.Date && ars.End.Value.Date >= _startDate.Date )
{
foreach (var emp in _schulbegleitenderDienst.Employeesliste)
{
if (ars.EmployeeOid == emp.EmployeeOid)
{
item.EmployeeName = emp.FirstName + " " + emp.LastName;
}
foreach (var hauptbetreuung in _schulbegleitenderDienst.Employee2CustomerHauptbetreuung)
{
if (hauptbetreuung.Key == emp.EmployeeOid && emp.EmployeeOid == ars.EmployeeOid)
{
foreach (var cust in _schulbegleitenderDienst.Customersliste)
{
foreach (var val in hauptbetreuung.Value)
{
if (val == cust.CustomerOid)
{
if (!_vorhandeneCustomerOidListe.Contains(cust.CustomerOid))
item.Customer.Add(cust.CustomerOid, cust.FullName);
}
}
}
}
}
}
if (item.EmployeeOid == 0 || item.EmployeeName.Equals(""))
{
foreach (var emp in _schulbegleitenderDienst.Employeesliste)
{
if (emp.EmployeeOid == ars.EmployeeOid)
{
item.EmployeeOid = ars.EmployeeOid.Value;
item.EmployeeName = emp.FirstName + " " + emp.LastName;
AddArbeitszeitToItem(item, emp.EmployeeOid,2);
}
}
}
//Sonderfall wenn keine vertertung verfügbar und employee nicht gegeben aber absence eine customer oid besitzt
if (item.Customer.Count == 0 && item.EmployeeOid == 0 && ars.CustomerOid.Value != 0)
{
foreach (var cust in _schulbegleitenderDienst.Customersliste)
{
if (ars.CustomerOid.Value == cust.CustomerOid)
{
item.Customer.Add(cust.CustomerOid, cust.FullName);
}
}
}
if (item.Customer.Count != 0)//hier auch employeecount abfragen // bearbeiten
{
vertretungsliste.Add(item);
}
}
}
}
//----
//########## Neuer bereich der ausprobiert werden soll
private void ErmittleTimeRange(DateTime start, DateTime end, DateTime VertretStart, DateTime VertretEnd)
{
var startzeit = start.TimeOfDay;
var endzeit = end.TimeOfDay;
if (startzeit > VertretEnd.TimeOfDay && endzeit < VertretStart.TimeOfDay)
{
//create new irgendwas
}
}
private void CreateNewVertretung()
{
}
//############################# ende Probezeit
private void AddKrankheitsZeitraumAndMeldungToItem(VertretungsListeItemsDC item, AbsenceTimeDC ars)
{
if (ars.Start.Value.Date != ars.End.Value.Date)
{
if (ars.Start.Value.Hour == 0 && ars.Start.Value.Minute == 0 &&
ars.End.Value.Hour == 0 && ars.End.Value.Minute == 0)
{
item.Krankheitszeitraum = ars.Start.Value.ToString("dd.MM.yyyy") + " - " + ars.End.Value.ToString("dd.MM.yyyy");
}
else
{
item.Krankheitszeitraum = ars.Start.Value.ToString("dd.MM.yyyy HH:mm") + " - " + ars.End.Value.ToString("dd.MM.yyyy HH:mm");
}
}
else
{
if (ars.Start.Value.Hour == 0 && ars.Start.Value.Minute == 0 &&
ars.End.Value.Hour == 0 && ars.End.Value.Minute == 0)
{
item.Krankheitszeitraum = ars.Start.Value.ToString("dd.MM.yyyy");
}
else
{
item.Krankheitszeitraum = ars.Start.Value.ToString("dd.MM.yyyy HH:mm") + " - " + ars.End.Value.ToString("HH:mm");
}
}
if (ars.KrankheitsMeldung != null)
item.Krankheitsmeldung = ars.KrankheitsMeldung.Value;
else
item.Krankheitsmeldung = ars.Start.Value;
}
private void AddArbeitszeitToItem(VertretungsListeItemsDC item, long? emp, int i)
{
foreach (var arbeitszeit in _schulbegleitenderDienst.Arbeitszeitliste)
{
if (!arbeitszeit.GueltigVon.HasValue && !arbeitszeit.GueltigBis.HasValue)
{
arbeitszeitschalter = true;
}
else
{
if (i == 1)
{
if (arbeitszeit.GueltigVon.Value <= _absenceTime && arbeitszeit.GueltigBis.Value >= _absenceTime)
{
arbeitszeitschalter = true;
}
}
else
{
if (arbeitszeit.GueltigVon.Value <= _endDate && arbeitszeit.GueltigBis.Value >= _startDate)
{
arbeitszeitschalter = true;
}
}
}
if (emp == arbeitszeit.EmployeeOid && arbeitszeitschalter)
{
foreach (var eintrag in arbeitszeit.Eintraege)
{
if ((int)_absenceTime.DayOfWeek == (int)eintrag.Tag + 1)
{
if (!String.IsNullOrEmpty(item.Worktime))
{
item.Worktime += ", ";
}
item.Worktime += eintrag.UhrzeitVon + " - " + eintrag.UhrzeitBis;
}
if (!item.Wochentagsarbeitszeit.ContainsKey(eintrag.Tag))
{
item.Wochentagsarbeitszeit.Add(eintrag.Tag,
eintrag.UhrzeitVon + " - " + eintrag.UhrzeitBis);
}
else
{
item.Wochentagsarbeitszeit[eintrag.Tag] += " " + eintrag.UhrzeitVon + " - " + eintrag.UhrzeitBis;
}
}
arbeitszeitschalter = false;
}
}
}
private VertretungsListeItemsDC BuildVertertungslisteItems()
{
VertretungsListeItemsDC item = new VertretungsListeItemsDC()
{
Worktime = "",
EmployeeName = "",
CustomerName = new List<string>(),
Krankheitszeitraum = "",
Abwesenheitskategorie = new AbsenceReasonDC(),
VertretenderMitarbeiter = "",
Krankheitsmeldung = new DateTime(),
Absencetime = new AbsenceTimeDC(),
VertetenderMit = 0,
EmployeeOid = 0,
CustomerOid = new List<long>(),
Wochentagsarbeitszeit = new Dictionary<AppointmentDayOfWeek, string>(),
Customer = new Dictionary<long, string>()
};
return item;
}
}
}

1
Service/Service.csproj
View File

@@ -314,6 +314,7 @@
<Compile Include="Plugins\PluginLoader.cs" />
<Compile Include="Plugins\VacationService.cs" />
<Compile Include="Reporting\AnnualReportFactory.cs" />
<Compile Include="SBD\Vertretung\VertretungsAlgorithmus.cs" />
<Compile Include="Security\SecurityBehaviorExtension.cs" />
<Compile Include="Security\SecurityEndpointBehavior.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />

6
Service/ServiceContracts/IOperationsService.cs
View File

@@ -612,7 +612,11 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
VertretungsListeDC VertretungsListe(DateTime absenceTime);
List<VertretungsListeItemsDC> VertretungsListe(DateTime datum);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<VertretungsListeItemsDC> VertretungsListeWoechentlich(DateTime start, DateTime ende);
[FaultContract(typeof(BeWoFault))]
[OperationContract]

84
Service/ServiceImplementations/OperationsServiceImp.cs
View File

@@ -17,6 +17,7 @@ using BeWo.Service.Core;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Invoicing;
using BeWo.Service.Plugins;
using BeWo.Service.SBD.Vertretung;
using BeWo.Service.Security;
using BeWo.Service.ServiceContracts;
@@ -27,6 +28,7 @@ using BS.Shared.DataContracts.Compact;
using BS.Shared.DataContracts.Reports;
using BS.Shared.Extensions;
using BS.Shared.Services;
using DevExpress.XtraCharts.Native;
using Utils = BeWo.Service.Core.Utils;
namespace BeWo.Service.ServiceImplementations
@@ -3652,51 +3654,73 @@ namespace BeWo.Service.ServiceImplementations
}
}
public VertretungsListeDC VertretungsListe(DateTime absenceTime)
public List<VertretungsListeItemsDC> VertretungsListe(DateTime datum)
{
try
{
var x = DAOFactory.SearchDAO.VertretungListe(absenceTime);
{
VertretungsListe x = new VertretungsListe();
x.Vertretunglist = (List<Vertretung>)DAOFactory.GenericDAO.GetAllActive<Vertretung>();
x.AbsenceTimelist = (List<AbsenceTime>)DAOFactory.GenericDAO.GetAllActive<AbsenceTime>();
x.Arbeitszeitliste = (List<Arbeitszeit>)DAOFactory.GenericDAO.GetAllActive<Arbeitszeit>();
x.Employeelist = (List<Employee>)DAOFactory.GenericDAO.GetAllActive<Employee>(); ;
x.Customerlist = (List<Customer>)DAOFactory.GenericDAO.GetAllActive<Customer>();
var schulbegleitenderDienst = MapperFactory.VertretungsListeDC_VertretungsListe.MapToNewDC(x);
Dictionary<long,List<long>> Employee2CustomerHaupt = new Dictionary<long, List<long>>();
foreach (var xa in schulbegleitenderDienst.Employeesliste)
{
List<long> klientoids = new List<long>();
VertretungsAlgorithmus alorythmus = new VertretungsAlgorithmus(schulbegleitenderDienst,datum);
Employee e = DAOFactory.GenericDAO.LoadByID<Employee>(xa.EmployeeOid);
foreach (var e2c in e.Employee2CustomerList)
{
foreach (var v2o in e2c.ValueList)
{
if (v2o.Entry.Type == ValueListEntryType.StaffRoleType && v2o.Entry.SystemEntryID.HasValue &&
v2o.Entry.SystemEntryID.Value == SystemEntryID.EmployeeRoleMainAttendant)
{
klientoids.Add(e2c.CustomerOid.Value);
}
}
}
if (!Employee2CustomerHaupt.ContainsKey(xa.EmployeeOid))
Employee2CustomerHaupt.Add(xa.EmployeeOid,klientoids);
}
schulbegleitenderDienst.Employee2CustomerHauptbetreuung = Employee2CustomerHaupt;
return schulbegleitenderDienst;
return alorythmus.vertretungsliste;
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
//hole die Range an vertretungen raus raus
public List<VertretungsListeItemsDC> VertretungsListeWoechentlich(DateTime start, DateTime ende)
{
try
{
VertretungsListe x = new VertretungsListe();
x.Vertretunglist = (List<Vertretung>)DAOFactory.GenericDAO.GetAllActive<Vertretung>();
x.AbsenceTimelist = (List<AbsenceTime>)DAOFactory.GenericDAO.GetAllActive<AbsenceTime>();
x.Arbeitszeitliste = (List<Arbeitszeit>)DAOFactory.GenericDAO.GetAllActive<Arbeitszeit>();
x.Employeelist = (List<Employee>)DAOFactory.GenericDAO.GetAllActive<Employee>(); ;
x.Customerlist = (List<Customer>)DAOFactory.GenericDAO.GetAllActive<Customer>();
var schulbegleitenderDienst = MapperFactory.VertretungsListeDC_VertretungsListe.MapToNewDC(x);
VertretungsAlgorithmus alorythmus = new VertretungsAlgorithmus(schulbegleitenderDienst, start,ende);
return alorythmus.vertretungsliste;
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
//#################################################################

53
Shared/DataContracts/VertretungsListeItemsDC.cs Normal file
View File

@@ -0,0 +1,53 @@
using System;
using System.Collections.Generic;
using System.Runtime.Serialization;
namespace BS.Shared.DataContracts
{
[DataContract]
public class VertretungsListeItemsDC : IDataContract
{
[DataMember]
public string Worktime { get; set; }
[DataMember]
public string EmployeeName { get; set; }
[DataMember]
public List<string> CustomerName { get; set; }
[DataMember]
public string Krankheitszeitraum { get; set; }
[DataMember]
public AbsenceReasonDC Abwesenheitskategorie { get; set; }
[DataMember]
public string VertretenderMitarbeiter { get; set; }
[DataMember]
public DateTime Krankheitsmeldung { get; set; }
[DataMember]
public AbsenceTimeDC Absencetime { get; set; }
[DataMember]
public long VertetenderMit { get; set; }
[DataMember]
public long EmployeeOid { get; set; }
[DataMember]
public List<long> CustomerOid { get; set; }
[DataMember]
public Dictionary<AppointmentDayOfWeek, string> Wochentagsarbeitszeit { get; set; }
[DataMember]
public Dictionary<long, string> Customer { get; set; }
[DataMember]
public VertretungDC Vertretung { get; set; }
}
}

1
Shared/Shared.csproj
View File

@@ -173,6 +173,7 @@
<Compile Include="DataContracts\ChatMediaMessageDC.cs" />
<Compile Include="DataContracts\ArbeitszeitDC.cs" />
<Compile Include="DataContracts\ArbeitszeitEintragDC.cs" />
<Compile Include="DataContracts\VertretungsListeItemsDC.cs" />
<Compile Include="DataContracts\VertretungsListeDC.cs" />
<Compile Include="DataContracts\KriterienDC.cs" />
<Compile Include="DataContracts\VertretungDC.cs" />