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:
staccatomamba
2017-04-07 13:50:15 +02:00
parent 5dc9e6c9a1 fafba7d11d
commit 539aca19b1
41 changed files with 4394 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
BeWo/BeWo.csproj
View File

@@ -429,6 +429,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\SchulbegleitenderDienstCustomer.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Master\SchulbegleitenderDienstMasterView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -616,6 +620,7 @@
<Compile Include="ViewModel\EmployeeAPPCodeVM.cs" />
<Compile Include="ViewModel\ChatMessageVM.cs" />
<Compile Include="ViewModel\ChatMediaMessageVM.cs" />
<Compile Include="ViewModel\KriterienVM.cs" />
<Compile Include="ViewModel\VertretungVM.cs" />
<Compile Include="ViewModel\PasswortVerlaufVM.cs" />
<Compile Include="ViewModel\ListViewModel\BargeldkassenListVM.cs" />
@@ -815,6 +820,9 @@
<Compile Include="View\ChatEmojisView.xaml.cs">
<DependentUpon>ChatEmojisView.xaml</DependentUpon>
</Compile>
<Compile Include="View\SchulbegleitenderDienstCustomer.xaml.cs">
<DependentUpon>SchulbegleitenderDienstCustomer.xaml</DependentUpon>
</Compile>
<Compile Include="View\Master\SchulbegleitenderDienstMasterView.xaml.cs">
<DependentUpon>SchulbegleitenderDienstMasterView.xaml</DependentUpon>
</Compile>
@@ -2024,352 +2032,352 @@
<ItemGroup>
<PublishFile Include="Blacklight.Wpf.Controls">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Charts.v13.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Data.v13.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Data.v13.1.Linq">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Office.v13.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.PivotGrid.v13.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Printing.v13.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.RichEdit.v13.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Sparkline.v13.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Utils.v13.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Charts.v13.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Core.v13.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Docking.v13.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Grid.v13.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Grid.v13.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Layout.v13.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Mvvm.v13.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Printing.v13.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Printing.v13.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Ribbon.v13.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Scheduler.v13.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Themes.LightGray.v13.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Themes.Office2007Black.v13.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Themes.Office2010Black.v13.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraBars.v13.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraCharts.v13.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraEditors.v13.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraNavBar.v13.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraPivotGrid.v13.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraPrinting.v13.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraReports.v13.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraScheduler.v13.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraScheduler.v13.1.Core">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraScheduler.v13.1.Reporting">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraTreeList.v13.1">
<Visible>False</Visible>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
</ItemGroup>

158
BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml
View File

@@ -57,12 +57,16 @@
<!-- EditValue="{Binding Path=PlacementDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" -->
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="0" x:Name="Datepicker" Height="23" Grid.Row="0" Width="100" HorizontalAlignment="Left" VerticalAlignment="Top" EditValueChanged="Datepicker_OnEditValueChanged" Margin="3,3,3,3"/>
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.ColumnSpan="1" x:Name="Datepicker" Height="23" Grid.Row="0" Width="100" HorizontalAlignment="Left" VerticalAlignment="Top" EditValueChanged="Datepicker_OnEditValueChanged" Margin="3,3,3,3"/>
<!-- ####################################### Bereich Mitarbeiter #####################################-->
<Button Content="Mitarbeiter Vertretung" Grid.Row="1" Grid.Column="0" Margin="3,3,3,3" Click="MitarbeiterVertretung_OnClick" x:Name="MitarbeiterVertretung_Button"/>
<!--<Button Content="Mitarbeiter Vertretung" Grid.Row="1" Grid.Column="0" Margin="3,3,3,3" x:Name="MitarbeiterVertretung_Button"/>-->
<Button Style="{DynamicResource IconButtonStyle}" x:Name="MitarbeiterVertretung_Button" Grid.Row="1" Grid.Column="0" Background="Transparent" BorderBrush="Transparent" HorizontalAlignment="Left" Margin="3,3,3,3" Click="MitarbeiterVertretung_OnClick" >
<Image x:Name="MitarbeiterImage" ToolTip="Mitarbeiter Krankmelden" Source="../Ressources/Icons/User Business Male.png" />
</Button>
<controls:PopupNonTopmost Topmost="False" x:Name="popup_newMitarbeiterVertretung" Width="350" StaysOpen="True" Placement="Relative" Grid.Row="1" PlacementTarget="{Binding ElementName=MitarbeiterVertretung_Button}">
<Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
@@ -81,14 +85,16 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="Mitarbeiter" />
<Label Grid.Row="1" Grid.Column="0" Content="Vertretung" />
<!--<Label Grid.Row="1" Grid.Column="0" Content="Vertretung" />-->
<Label Grid.Row="2" Grid.Column="0" Content="Abwesenheits Kategorie" />
<Label Grid.Row="3" Grid.Column="0" Content="Von" />
<Label Grid.Row="4" Grid.Column="0" Content="Bis" />
<Label Grid.Row="5" Grid.Column="0" Content="Notiz" />
<Label Grid.Row="3" Grid.Column="0" Content="Krankmeldung von:" />
<Label Grid.Row="4" Grid.Column="0" Content="Von" />
<Label Grid.Row="5" Grid.Column="0" Content="Bis" />
<Label Grid.Row="6" Grid.Column="0" Content="Notiz" />
<!-- PreviewMouseDoubleClick="Popupedit_environmentPersonSearch_OnPreviewMouseDoubleClick" Text="{validation:ValidationBinding Path=EnvironmentPersons.NewVM.PersonString, UpdateSourceTrigger=PropertyChanged}"
@@ -97,41 +103,42 @@
IsReadOnly="True"
x:Name="popupedit_MitarbeiterVertretungSearch" Grid.Column="1" Grid.ColumnSpan="2" Margin="3" Height="23"
Grid.Row="0" DeleteButtonVisibility="Collapsed"
PopUpClick="Popupedit_MitarbeiterVertretungSearch_OnPopUpClick_popupedit_MitarbeiterVertretungSearch_PopUpClick"
PopUpClick="Popupedit_MitarbeiterVertretungSearch_OnPopUpClick_popupedit_MitarbeiterVertretungSearch_PopUpClick" />
/>
<!-- NewClick="popupedit_environmentOrganisationSearch_NewClick" PopUpClick="popupedit_environmentPersonOrganisationSearch_PopUpClick"
PreviewMouseDoubleClick="Popupedit_environmentOrganisationSearch_OnPreviewMouseDoubleClick" Text="{Binding Path=EnvironmentPersons.NewVM.OrganisationString, UpdateSourceTrigger=PropertyChanged}"-->
<controls1:PopUpEdit
<!--<controls1:PopUpEdit
Cursor="Arrow"
IsReadOnly="True"
x:Name="popupedit_environmentPersonOrganisationSearch"
Grid.Column="1" Margin="3" Height="23" Grid.Row="1" Grid.ColumnSpan="2" />
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" />
<!--popupedit_environmentOrganisationSearch danach suchen für organisationsbereich -->
<dxe:DateEdit x:Name="KrankMeldungMitarbeiterDatepicker" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="MVDatepickerVon_OnEditValueChanged"/>
<dxe:DateEdit x:Name="MVDatepickerVon" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="MVDatepickerVon_OnEditValueChanged"/>
<dxe:DateEdit x:Name="MVDatepickerVon" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="MVDatepickerVon_OnEditValueChanged"/>
<dxe:DateEdit x:Name="MVDatepickerBis" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="MVDatepickerBis_OnEditValueChanged" />
<dxe:DateEdit x:Name="MVDatepickerBis" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="5" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="MVDatepickerBis_OnEditValueChanged" />
<TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="5" Margin="3" Height="50" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" x:Name="MitarbeiterNotice"/>
<TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="6" Margin="3" Height="50" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" x:Name="MitarbeiterNotice"/>
<!-- Click="button_addEnvironmentPerson_Click" -->
<Button Grid.Column="1" Grid.Row="6" x:Name="button_addMitarbeiterVertretung" Content="Hinzufügen" Height="25"
<Button Grid.Column="1" Grid.Row="7" x:Name="button_addMitarbeiterVertretung" Content="Hinzufügen" Height="25"
FontWeight="Normal" Margin="3" VerticalAlignment="Bottom" HorizontalAlignment="Right" Click="Button_addMitarbeiterVertretung_OnClick"/>
<!--Click="button_cancelAddEnvironmentPerson_Click" -->
<Button Grid.Row="6" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
<Button Grid.Row="7" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
Margin="3" Content="Abbrechen" x:Name="button_cancelMitarbeiterVertretung" Click="Button_cancelMitarbeiterVertretung_OnClick"/>
</Grid>
@@ -144,8 +151,14 @@
<!-- ##################### Klienten Vertretung Bereich ################################ -->
<Button Content="Klienten Vertretung" Grid.Row="1" Grid.Column="1" Margin="3,3,3,3" x:Name="KlientVertretung_Button" Click="KlientVertretung_Button_OnClick"/>
<!--<Button Content="Klienten Vertretung" Grid.Row="1" Grid.Column="1" Margin="3,3,3,3" x:Name="KlientVertretung_Button" Click="KlientVertretung_Button_OnClick"/>-->
<Button Style="{DynamicResource IconButtonStyle}" x:Name="KlientVertretung_Button" Grid.Row="1" Grid.Column="1" Background="Transparent" BorderBrush="Transparent" HorizontalAlignment="Left" Margin="3,3,3,3" Click="KlientVertretung_Button_OnClick" >
<Image x:Name="KlientImage" ToolTip="Klient Krankmelden" Source="../Ressources/Icons/UserHomeMaleDisabled.png" />
</Button>
<controls:PopupNonTopmost Topmost="False" x:Name="popup_newKlientVertretung" Width="350" StaysOpen="True" Placement="Relative" Grid.Row="1" PlacementTarget="{Binding ElementName=KlientVertretung_Button}">
<Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
<GroupBox x:Name="groupbox_newKlientVertretung" Header="Neue Klienten hinzufügen" Style="{DynamicResource ObjectEditGroupBox}">
@@ -163,13 +176,15 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="Klient" />
<Label Grid.Row="1" Grid.Column="0" Content="Abwesenheits Kategorie" />
<Label Grid.Row="2" Grid.Column="0" Content="Von" />
<Label Grid.Row="3" Grid.Column="0" Content="Bis" />
<Label Grid.Row="4" Grid.Column="0" Content="Notiz" />
<Label Grid.Row="2" Grid.Column="0" Content="Krankmeldung von:" />
<Label Grid.Row="3" Grid.Column="0" Content="Von" />
<Label Grid.Row="4" Grid.Column="0" Content="Bis" />
<Label Grid.Row="5" Grid.Column="0" Content="Notiz" />
<!-- PreviewMouseDoubleClick="Popupedit_environmentPersonSearch_OnPreviewMouseDoubleClick" Text="{validation:ValidationBinding Path=EnvironmentPersons.NewVM.PersonString, UpdateSourceTrigger=PropertyChanged}"
@@ -182,21 +197,23 @@
<ComboBox Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2" Margin="3" Height="23" x:Name="ComboBoxKlientVertretung"/>
<dxe:DateEdit x:Name="KVDatepickerVon" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="KVDatepickerVon_OnEditValueChanged"/>
<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="KVDatepickerBis" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="KVDatepickerBis_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"/>
<TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="4" Margin="3" Height="50" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" x:Name="KlientNotice"/>
<TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="5" Margin="3" Height="50" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" x:Name="KlientNotice"/>
<!-- Click="button_addEnvironmentPerson_Click" -->
<Button Grid.Column="1" Grid.Row="5" x:Name="button_addKlientVertretung" Content="Hinzufügen" Height="25"
<Button Grid.Column="1" Grid.Row="6" x:Name="button_addKlientVertretung" Content="Hinzufügen" Height="25"
FontWeight="Normal" Margin="3" VerticalAlignment="Bottom" HorizontalAlignment="Right" Click="Button_addKlientVertretung_OnClick" />
<!--Click="button_cancelAddEnvironmentPerson_Click" -->
<Button Grid.Row="5" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
<Button Grid.Row="6" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
Margin="3" Content="Abbrechen" x:Name="button_cancelKlientVertretung" Click="Button_cancelKlientVertretung_OnClick" />
</Grid>
@@ -214,10 +231,10 @@
<!-- #####################################################################################IsLeft="False"##################### -->
<dxg:GridControl AutoGenerateColumns="AddNew" x:Name="GridDataControl" Grid.Row="1" Grid.ColumnSpan="3" AllowDrop="true" Margin="5,5,5,5" >
<dxg:GridControl AutoGenerateColumns="AddNew" x:Name="GridDataControl" Grid.Row="1" Grid.ColumnSpan="3" AllowDrop="true" Margin="5,5,5,5" VerticalContentAlignment="Center" >
<dxg:GridControl.Columns>
<!-- <dxe:ComboBoxEditSettings x:Name="ComboBoxEditSettingsVertretung"/> -->
<!--<dxe:ComboBoxEditSettings x:Name="ComboBoxEditSettingsVertretung"/>-->
<dxg:GridColumn FieldName="Vertretung" Width="250" x:Name="ColumnVertretung" >
<dxg:GridColumn.EditSettings >
<dxe:ButtonEditSettings x:Name="ButtonEditSet" AllowDefaultButton="False">
@@ -231,19 +248,80 @@
</dxe:ButtonEditSettings>
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
<dxg:GridColumn FieldName="Kunde" Width="250"/>
<dxg:GridColumn FieldName="KrankerMitarbeiter" Width="250" />
<dxg:GridColumn FieldName="KrankheitsZeitraum" Width="250"/>
<dxg:GridColumn FieldName="AbwesenheitsKategorie" Width="250"/>
<dxg:GridColumn FieldName="Beschreibung" MinWidth="250"/>
<!--<dxg:GridColumn FieldName="KindFehlzeit" Width="250"/>-->
<dxg:GridColumn FieldName="Kunde" Width="200" >
<dxg:GridColumn.CellStyle>
<Style TargetType="{x:Type dxg:CellContentPresenter}">
<Setter Property="TextBlock.Foreground" Value="Black" />
<Style.Triggers>
<DataTrigger Binding="{Binding Path=SchulbegleitenderDienst.IsKunde}" Value="True">
<Setter Property="Background" Value="Lime" />
<Setter Property="TextBlock.Foreground" Value="Black" />
</DataTrigger>
</Style.Triggers>
</Style>
</dxg:GridColumn.CellStyle>
</dxg:GridColumn>
<dxg:GridColumn FieldName="KrankerMitarbeiter" Width="200" />
<dxg:GridColumn FieldName="KrankheitsMeldung" Width="200" />
<dxg:GridColumn FieldName="KrankheitsZeitraum" Width="200"/>
<dxg:GridColumn FieldName="AbwesenheitsKategorie" Width="200"/>
<dxg:GridColumn FieldName="Beschreibung" MinWidth="200" />
<dxg:GridColumn FieldName="VertretungsDC" MinWidth="0" Visible="False" />
<dxg:GridColumn FieldName="KindFehlzeit" Width="250"/>
</dxg:GridControl.Columns>
<!--############################### Context Menue ################################################-->
<dxg:GridControl.View>
<dxg:TableView AllowPerPixelScrolling="True" ShowTotalSummary="False" AutoWidth="True" />
<dxg:TableView AllowPerPixelScrolling="True" ShowTotalSummary="False" AutoWidth="True" ShowGridMenu="DataViewBase_OnShowGridMenu" />
</dxg:GridControl.View>
</dxg:GridControl>
<!--###################################################################################################-->
</dxg:GridControl>
<!-- End mal geschaut -->
<!-- ################################## TreeListControl ##############################################################-->
<!--<dxg:TreeListControl x:Name="GridDataControl" Grid.Row="1" Grid.RowSpan="2" Grid.ColumnSpan="3" AllowDrop="true" Margin="5,5,5,5" VerticalContentAlignment="Center" >
<dxg:TreeListControl.Columns>
<dxg:TreeListColumn FieldName="Vertretung" Width="250" x:Name="ColumnVertretung" >
<dxg:TreeListColumn.EditSettings >
<dxe:ButtonEditSettings x:Name="ButtonEditSet" AllowDefaultButton="False">
<dxe:ButtonEditSettings.Buttons >
<dxe:ButtonInfo GlyphKind="Custom" ButtonKind="Simple" Click="ButtonEditSettings_OnDefaultButtonClick" >
<dxe:ButtonInfo.Content>
<Image Source ="../Ressources/Icons/Search.png" Width="20" Height="15" RenderOptions.BitmapScalingMode="HighQuality" x:Name="SearchImageButton" ToolTip="Hidden Valley Suddenly Dead"/>
</dxe:ButtonInfo.Content>
</dxe:ButtonInfo>
</dxe:ButtonEditSettings.Buttons>
</dxe:ButtonEditSettings>
</dxg:TreeListColumn.EditSettings>
</dxg:TreeListColumn>
<dxg:TreeListColumn FieldName="Kunde" Width="200" />
<dxg:TreeListColumn FieldName="KrankerMitarbeiter" Width="200" />
<dxg:TreeListColumn FieldName="KrankheitsMeldung" Width="200" />
<dxg:TreeListColumn FieldName="KrankheitsZeitraum" Width="200"/>
<dxg:TreeListColumn FieldName="AbwesenheitsKategorie" Width="200"/>
<dxg:TreeListColumn FieldName="Beschreibung" MinWidth="200" />
<dxg:TreeListColumn FieldName="VertretungsDC" MinWidth="0" Visible="False" />
--><!--<dxg:TreeListColumn FieldName="ParentId" dxg:BandBase.GridRow="1" />
<dxg:TreeListColumn FieldName="Oid" />--><!--
</dxg:TreeListControl.Columns>
<dxg:TreeListControl.View>
<dxg:TreeListView x:Name="view"
ParentFieldName="ParentId"
KeyFieldName="Oid" AutoWidth="True" />
</dxg:TreeListControl.View>
</dxg:TreeListControl>-->
<!-- ####################################################ShowAutoFilterRow="{Binding ShowAutoFilterRow}"##############################################################-->
<Popup Margin="10" x:Name="popup_MitarbeiterVertretung" StaysOpen="False" Placement="MousePoint" Width="370" Height="250"
Closed="popup_Closed" Opened="popup_Opened">

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

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
using System.Globalization;
using System.IO;
using System.Linq;
@@ -12,6 +13,7 @@ using System.Windows.Data;
using System.Windows.Forms;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using BeWo.Annotations;
@@ -20,6 +22,7 @@ using BeWo.Core.Service;
using BeWo.Scheduler.Converter;
using BeWo.Scheduler.ViewModel;
using BeWo.ServiceProxy;
using BeWo.View;
using BeWo.View.Detail;
using BeWo.ViewModel;
using BS.Shared;
@@ -39,7 +42,9 @@ using Appointment = DevExpress.XtraScheduler.Appointment;
using ColorConverter = System.Windows.Media.ColorConverter;
using DragDropEffects = System.Windows.DragDropEffects;
using DragEventArgs = System.Windows.DragEventArgs;
using Image = System.Windows.Controls.Image;
using MessageBox = System.Windows.MessageBox;
using Point = System.Windows.Point;
using SchedulerControl = DevExpress.Xpf.Scheduler.SchedulerControl;
@@ -51,85 +56,32 @@ namespace BeWo.SchulbegleitenderDienst
private List<SchulbegleitenderDienst> items = new List<SchulbegleitenderDienst>();
private SchulbegleitenderDienstBearbeitungsView view = null;
public NewSchulbegleitenderDienstView()
{
InitializeComponent();
GridDataControl.ItemsSource = items;
getAllVertretungenOnLoad(null,DateTime.Now,null);
GetAllVertretungenOnLoad(null, DateTime.Now, null);
setAktDate();
SetAbwesenheiten();
//AbsenceReasonDC
//TestSchulBegleitenderDienst();
//SchulbegleitenderDienstList.ItemContainerStyle = (Style)SchulbegleitenderDienstList.Resources["itemstyle"];
}
public void SetAbwesenheiten()
{
var abwesenheiten = ServiceFacade.DoCustomerServiceSync(s => s.GetAllAbsenceReasons());
// List<string> a = new List<string>();
//foreach (var reason in abwesenheiten)
//{
// a.Add(reason.Description);
//}
ComboBoxKlientVertretung.ItemsSource = abwesenheiten;
ComboBoxMitarbeiterVertretung.ItemsSource = abwesenheiten;
}
public void TestMitarebieter()
{
// Hier muss nacher die Funktion hin die Alle Verfügbaen Mitarbeiter Rauspickt
//List<User> items = new List<User>();
//items.Add(new User() { Mitarbeiter = "John Doe" });
//items.Add(new User() { Mitarbeiter = "Miss Piggi" });
//items.Add(new User() { Mitarbeiter = "Lynchknoten" });
//items.Add(new User() { Mitarbeiter = "Franz Dita von HodenKnecht" });
//List<string> items = new List<string>();
//items.Add("John Doe");
//items.Add("Miss Piggi");
//items.Add("Lynchknoten");
//items.Add("Franz Dita von HodenKnecht");
//Mitarbeiter = items.ToList();
//ComboBoxEditSettingsVertretung.ItemsSource = items;
// MitarbeiterList.ItemsSource = items;
}
public void TestSchulBegleitenderDienst()
{
////Hier muss nacher die Funktion hin die Alle Daten Rauspickt
//List<SchulbegleitenderDienst> items = new List<SchulbegleitenderDienst>();
//items.Add(new SchulbegleitenderDienst() { Vertretung = "John Doe" , Kunde = "Schlumpfine", AbwesenheitsKategorie = "Husten",KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.03.2017 - 13.03.2017", MaFehlzeit = "KEine",KindFehlzeit = "Keine"});
//items.Add(new SchulbegleitenderDienst() { Vertretung = "Miss Piggi" , Kunde = "Schlumpfine", AbwesenheitsKategorie = "Husten", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.05.2017 - 13.06.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
//items.Add(new SchulbegleitenderDienst() { Vertretung = "Lynchknoten" , Kunde = "Schlumpfine", AbwesenheitsKategorie = "Husten", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.06.2017 - 13.07.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
//items.Add(new SchulbegleitenderDienst() { Vertretung = "Franz Dita von HodenKnecht" , Kunde = "Schlumpfine", AbwesenheitsKategorie = "Husten", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "02.03.2017 - 13.03.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
//items.Add(new SchulbegleitenderDienst() { Vertretung = "Miss Piggi", Kunde = "Schlumpfine", AbwesenheitsKategorie = "Husten", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.05.2017 - 13.06.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
//items.Add(new SchulbegleitenderDienst() { Vertretung = "Miss Piggi", Kunde = "Schlumpfine", AbwesenheitsKategorie = "Husten", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.05.2017 - 13.06.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
//items.Add(new SchulbegleitenderDienst() { Kunde = "Schlumpfine", KrankerMitarbeiter = "Hanz", AbwesenheitsKategorie = "Husten", KrankheitsZeitraum = "10.05.2017 - 13.06.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
//items.Add(new SchulbegleitenderDienst() { Vertretung = "Miss Piggi", Kunde = "Schlumpfine", AbwesenheitsKategorie = "Husten", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.05.2017 - 13.06.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
////SchulbegleitenderDienstList.ItemsSource = items;
//GridDataControl.ItemsSource = items;
}
public void setAktDate()
{
@@ -149,128 +101,117 @@ namespace BeWo.SchulbegleitenderDienst
KVDatepickerVon.DateTime = dt;
KVDatepickerBis.DateTime = dt;
}
public void ColorDataGrid()
{
GridControl grid = GridDataControl;
foreach (object column in grid.Columns)
{
var Schulbegleit = (SchulbegleitenderDienst) column;
if (Schulbegleit.Vertretung.IsNullOrEmpty())
{
//Farbe Rot Fordergrund gelb
//new SolidColorBrush(Colors.Red);
//new SolidColorBrush(Colors.Yellow);
}
else
{
//Farbe Grün und Fordergrund weis
//new SolidColorBrush(Colors.Green);
//new SolidColorBrush(Colors.White);
}
}
}
public void getAllVertretungenOnLoad(string MitarbeiterAbsenstime, DateTime AusgewähltesDatum, string KlientenAbsenstime)
{
//Erstmal hole alle vertretungen aus der Datenbank und zeige diese an.
var vertretungen = ServiceFacade.DoOperationsServiceSync(s => s.GetAllVertretungen());
//hole alle klieneten
var klienten = ServiceFacade.DoCustomerServiceSync(s => s.GetAllCustomersCompact(BeWoApp.LoggedOnUser.Employee.EmployeeOid));
//hole alle mitarbeiter
var mitarbeiter = ServiceFacade.DoEmployeeServiceSync(s => s.GetAllActiveEmployeesCompact());
//holle die alle AbsenceReasons
var abwesenheiten = ServiceFacade.DoCustomerServiceSync(s => s.GetAllAbsenceReasons());
items.Clear();
//Muss noch vollendet werden
string employeeName = "";
string customerName = "";
string abwesenheitskategorie = "";
foreach (var vertritt in vertretungen)
{
employeeName = "";
customerName = "";
abwesenheitskategorie = "";
foreach (var klient in klienten)
{
if (vertritt.CustomerOid == klient.CustomerOid)
{
customerName = klient.FullName;
}
}
foreach (var mit in mitarbeiter)
{
if (vertritt.EmployeeOid == mit.EmployeeOid)
{
employeeName = mit.FirstName + " " + mit.LastName;
}
}
foreach (var ab in abwesenheiten)
{
if (vertritt.AbwesenheitsOid == ab.AbsenceReasonOid)
{
abwesenheitskategorie = ab.Description;
}
}
AddItemsToGrid(vertritt,employeeName,customerName,abwesenheitskategorie);
}
GridDataControl.RefreshData();
//------------------------------------------------------------------------------------------------------
//Dann suche mit mit hilfe aller Absense Times und dem gewählten datum alle passenden Daten
//ArbeitsUnfähigkeitsKrankmeldung Am
KrankMeldungMitarbeiterDatepicker.DateTime = dt;
KrankMeldungKlientDatepicker.DateTime = dt;
}
public void AddItemsToGrid(VertretungDC vertritt,string employee, string customer, string abwesenheit)
//public void ColorDataGrid()
//{
// //GridControl grid = GridDataControl;
// foreach (object column in grid.Columns)
// {
// var Schulbegleit = (SchulbegleitenderDienst) column;
// if (Schulbegleit.Vertretung.IsNullOrEmpty())
// {
// //Farbe Rot Fordergrund gelb
// //new SolidColorBrush(Colors.Red);
// //new SolidColorBrush(Colors.Yellow);
// }
// else
// {
// //Farbe Grün und Fordergrund weis
// //new SolidColorBrush(Colors.Green);
// //new SolidColorBrush(Colors.White);
// }
// }
//}
public void GetAllVertretungenOnLoad(string MitarbeiterAbsenstime, DateTime AusgewähltesDatum, string KlientenAbsenstime)
{
var schulbegleitenderDienst = ServiceFacade.DoOperationsServiceSync(s => s.VertretungsListe(AusgewähltesDatum));
items.Clear();
foreach (var vertritt in schulbegleitenderDienst.Vertretungsliste)
{
if (vertritt.VertretungsZeitraumVon.Date == AusgewähltesDatum.Date)
{
var employeeName = "";
var customerName = "";
var abwesenheitskategorie = "";
var VertretenderMitarbeiter = " ";
foreach (var klient in schulbegleitenderDienst.Customersliste)
{
if (vertritt.CustomerOid == klient.CustomerOid)
{
customerName = klient.FirstName + " " + klient.LastName;
}
}
foreach (var mit in schulbegleitenderDienst.Employeesliste)
{
if (vertritt.EmployeeOid == mit.EmployeeOid)
{
employeeName = mit.FirstName + " " + mit.LastName;
}
if (vertritt.VertretenderMitarbeiterOid == mit.EmployeeOid)
{
VertretenderMitarbeiter = mit.FirstName + " " + mit.LastName;
}
}
foreach (var ab in schulbegleitenderDienst.AbsenceReasonsliste)
{
if (vertritt.AbwesenheitsOid == ab.AbsenceReasonOid)
{
abwesenheitskategorie = ab.Description;
}
}
AddItemsToGrid(vertritt, employeeName, customerName, abwesenheitskategorie, VertretenderMitarbeiter);
}
}
UpdateGridControl();
}
public void AddItemsToGrid(VertretungDC vertritt,string employee, string customer, string abwesenheit,string vertretenderMitarbeiter)
{
items.Add(new SchulbegleitenderDienst()
{
KrankheitsZeitraum = vertritt.VertretungsZeitraumVon.ToString("dd.MM.yyyy") + " - " + vertritt.VertretungsZeitraumBis.ToString("dd.MM.yyyy"),
KrankerMitarbeiter = employee,
Vertretung = "", //--> ist gleich eine andere MitarbeiterOid
Vertretung = vertretenderMitarbeiter,
Kunde = customer,
AbwesenheitsKategorie = abwesenheit,
Beschreibung = vertritt.Notice
Beschreibung = vertritt.Notice,
KrankheitsMeldung = vertritt.KrankheitsMeldung.ToString("dd.MM.yyyy"),
VertretungsDC = vertritt
//ParentId = 0,
//Oid = (int)vertritt.VertretungOid.Value
});
}
public void UpdateGridControl()
{
//erstelle ein GetallNewVertretung
//itemlist mit allen Schulbegleitenden diensten übergeben
// liste der der items hinzufügen
GridDataControl.RefreshData();
GridDataControl.RefreshUI();
}
@@ -376,57 +317,15 @@ namespace BeWo.SchulbegleitenderDienst
}
private void Popupedit_MitarbeiterVertretungSearch_OnNewClickpopupedit_MitarbeiterVertretungSearch_NewClick(object sender, RoutedEventArgs e)
{
//popup_newMitarbeiterVertretung.IsOpen = false;
//VMFactory.CreateEmployeeVMAsync(
// cb => this.Dispatch(() => BeWoUtils.OpenModalViewWindow<EmployeeVM, EmployeeDC, NewSchulbegleitenderDienstView>(cb, this,
// () => this.Dispatch(delegate { }), _EmployeeModalPopUp_EmployeeSavedOrUpdated, allowSaveIfParentDirty: true)));
}
private void _EmployeeModalPopUp_EmployeeSavedOrUpdated(object sender, EventArgs<EmployeeVM> e)
{
ServiceFacade.DoEmployeeServiceAsync(
s => s.LoadCompactEmployee(e.Data.DataContract.EmployeeOid.Value),
p => this.Dispatch(
delegate
{
MainControl.CloseCurrentPopUp();
BeWoUtils.UpdateAllViews(p);
//ViewModel.EnvironmentOrganisations.NewVM.Organisation = p;
//popup_newEnvironmentOrganisation.IsOpen = true;
//popupedit_environmentOrganisationSearch.Focus();
}));
}
private void Button_addMitarbeiterVertretung_OnClick(object sender, RoutedEventArgs e)
{
popup_newMitarbeiterVertretung.IsOpen = false;
//Speichere alle daten in die Vertretungs Daten tabelle
VertretungDC vertretung = new VertretungDC();
//initialisiere die vertretung
vertretung.VertretungsZeitraumVon = MVDatepickerVon.DateTime.Date;
vertretung.VertretungsZeitraumBis = MVDatepickerBis.DateTime.Date;
vertretung.CustomerOid = 0;
vertretung.EmployeeOid = currentEmployee.EmployeeOid;
var x = (AbsenceReasonDC)ComboBoxMitarbeiterVertretung.SelectedValue;
vertretung.AbwesenheitsOid = x.AbsenceReasonOid;
vertretung.Notice = MitarbeiterNotice.Text;
//Save in die Daten Tabelle
ServiceFacade.DoOperationsServiceSync(s => s.InsertNewMitarbeiterVertretung(vertretung));
SaveEmployeeInVertretung();
ClearAllMitarbeiterValues();
getAllVertretungenOnLoad(null, DateTime.Now, null);
// GetAllVertretungenOnLoad(null, DateTime.Now, null);
}
@@ -441,6 +340,26 @@ namespace BeWo.SchulbegleitenderDienst
MitarbeiterNotice.Text = "";
}
private void SaveEmployeeInVertretung()
{
VertretungDC vertretung = new VertretungDC();
vertretung.VertretungsZeitraumVon = MVDatepickerVon.DateTime.Date;
vertretung.VertretungsZeitraumBis = MVDatepickerBis.DateTime.Date;
vertretung.CustomerOid = 0;
vertretung.EmployeeOid = currentEmployee.EmployeeOid;
vertretung.KrankheitsMeldung = KrankMeldungMitarbeiterDatepicker.DateTime.Date;
vertretung.VertretenderMitarbeiterOid = 0;
var x = (AbsenceReasonDC)ComboBoxMitarbeiterVertretung.SelectedValue;
vertretung.AbwesenheitsOid = x.AbsenceReasonOid;
vertretung.Notice = MitarbeiterNotice.Text;
ServiceFacade.DoOperationsServiceSync(s => s.InsertNewMitarbeiterVertretung(vertretung));
}
#endregion
//------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -487,31 +406,6 @@ namespace BeWo.SchulbegleitenderDienst
}
private void Popupedit_KlientSearch_OnNewClickpopupedit_KlientSearch_NewClick(object sender, RoutedEventArgs e)
{
//popup_newMitarbeiterVertretung.IsOpen = false;
//VMFactory.CreateEmployeeVMAsync(
// cb => this.Dispatch(() => BeWoUtils.OpenModalViewWindow<CustomerVM, CustomerDC, NewSchulbegleitenderDienstView>(cb, this,
// () => this.Dispatch(delegate { }), _KlientModalPopUp_KlientSavedOrUpdated, allowSaveIfParentDirty: true)));
}
private void _KlientModalPopUp_KlientSavedOrUpdated(object sender, EventArgs<EmployeeVM> e)
{
ServiceFacade.DoCustomerServiceAsync(
s => s.LoadPersonCompact(e.Data.DataContract.PersonOid.Value),
p => this.Dispatch(
delegate
{
MainControl.CloseCurrentPopUp();
BeWoUtils.UpdateAllViews(p);
//ViewModel.EnvironmentOrganisations.NewVM.Organisation = p;
//popup_newEnvironmentOrganisation.IsOpen = true;
//popupedit_environmentOrganisationSearch.Focus();
}));
}
private void Button_addKlientVertretung_OnClick(object sender, RoutedEventArgs e)
{
popup_newKlientVertretung.IsOpen = false;
@@ -523,6 +417,8 @@ namespace BeWo.SchulbegleitenderDienst
vertretung.VertretungsZeitraumBis = KVDatepickerBis.DateTime.Date;
vertretung.CustomerOid = currentKlient.CustomerOid;
vertretung.EmployeeOid = 0;
vertretung.KrankheitsMeldung = KrankMeldungKlientDatepicker.DateTime.Date;
vertretung.VertretenderMitarbeiterOid = 0;
var x = (AbsenceReasonDC) ComboBoxKlientVertretung.SelectedValue;
@@ -534,7 +430,7 @@ namespace BeWo.SchulbegleitenderDienst
ClearAllKlientValues();
getAllVertretungenOnLoad(null, DateTime.Now, null);
// GetAllVertretungenOnLoad(null, DateTime.Now, null);
}
private void ClearAllKlientValues()
@@ -558,45 +454,290 @@ namespace BeWo.SchulbegleitenderDienst
//######################### Action Event Listener ###########################
//Fertig
private void Datepicker_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
{
var dt = (DateTime)e.NewValue;
Datelbl.Content = dt.ToString("dddd dd.MM.yyyy");
//Vorbereitung hole alle vom ausgewählten Datum
GetAllVertretungenOnLoad(null, dt, null);
}
//Fertig
private void ButtonEditSettings_OnDefaultButtonClick(object sender, RoutedEventArgs e)
{
//Es gibt noch probleme -> Button anclickbar obwohl nicht sichtbar
//Rufe hier ein Neues Fenster auf das VErschiedenste Settings bearbeitet
SchulbegleitenderDienstBearbeitungsView view = new SchulbegleitenderDienstBearbeitungsView();
view.Show();
if (view == null)
{
view = new SchulbegleitenderDienstBearbeitungsView();
view.RaiseCustomEvent += new EventHandler<CustomEventArgs>(newWindow_RaiseCustomEvent);
view.ShowDialog();
}
else
{
view.Close();
view = new SchulbegleitenderDienstBearbeitungsView();
view.RaiseCustomEvent += new EventHandler<CustomEventArgs>(newWindow_RaiseCustomEvent);
view.ShowDialog();
}
}
//Fertig
private void newWindow_RaiseCustomEvent(object sender, CustomEventArgs e)
{
UpdateMitarbeiterToVertretung(e.Message);
}
//Fertig
private void UpdateMitarbeiterToVertretung(CompactEmployeeDC employee)
{
var a = (SchulbegleitenderDienst)GridDataControl.SelectedItem;
VertretungDC vert = new VertretungDC();
vert = a.VertretungsDC;
vert.VertretenderMitarbeiterOid = employee.EmployeeOid;
ServiceFacade.DoOperationsServiceSync(s => s.UpdateVertretung(vert));
view.Close();
GetAllVertretungenOnLoad(null, DateTime.Now, null);
}
//################### Kontext Menue bereich ###############################
private void DataViewBase_OnShowGridMenu(object sender, GridMenuEventArgs e)
{
if (e.MenuInfo.Column.FieldName == "Kunde")
{
BarButtonItem x = new BarButtonItem() {Content = "Kunden Info"};
x.ItemClick += Kundeninfo_OnClick;
e.Customizations.Add(x);
}
if (e.MenuInfo.Column.FieldName == "KrankerMitarbeiter")
{
BarButtonItem x = new BarButtonItem() {Content = "Mitarbeiter Info"};
x.ItemClick += Mitarbeiterinfo_OnClick;
e.Customizations.Add(x);
}
if (e.MenuInfo.Column.FieldName == "Vertretung")
{
BarButtonItem s = new BarButtonItem() { Content = "Mitarbeiter Info" };
s.ItemClick += MitarbeiterVertretunginfo_OnClick;
e.Customizations.Add(s);
}
BarButtonItem y = new BarButtonItem() { Content = "Löschen" };
y.ItemClick += DeletPerson_OnClick;
e.Customizations.Add(y);
}
//Fertig
private void Kundeninfo_OnClick(object sender, RoutedEventArgs e)
{
var a = (SchulbegleitenderDienst)GridDataControl.SelectedItem;
if (!a.Kunde.Equals(""))
{
VertretungDC vert = new VertretungDC();
vert = a.VertretungsDC;
List<long> abf = new List<long>();
abf.Add(vert.CustomerOid.Value);
var sgf = ServiceFacade.DoCustomerServiceSync(s => s.GetCompactCustomersById(abf));
var selectedCustomer = sgf[0];
VMFactory.CreateCustomerVMAsync(selectedCustomer.CustomerOid,
cb => this.Dispatch(
() =>
BeWoUtils.OpenModalViewWindow<CustomerVM, CustomerDC, BeWoView>(cb, null, () => this.Dispatch(
delegate
{
var updatedCustomer = new CompactCustomerDC();
ServiceFacade.DoCustomerServiceSync(
s => updatedCustomer = s.GetCompactCustomerDC(selectedCustomer.CustomerOid));
selectedCustomer = new CompactCustomerDC();
selectedCustomer = updatedCustomer;
// UpdateControls();
// customerText.Text = updatedCustomer.ToString();
BeWoUtils.UpdateAllViews(selectedCustomer);
}))
));
}
else
MessageBox.Show("Es wurde der Vertretung kein Kunde zugeteilt");
}
//Fertig
private void Mitarbeiterinfo_OnClick(object sender, RoutedEventArgs e)
{
var a = (SchulbegleitenderDienst)GridDataControl.SelectedItem;
if (!a.KrankerMitarbeiter.Equals(""))
{
VertretungDC vert = new VertretungDC();
vert = a.VertretungsDC;
List<long> abf = new List<long>();
abf.Add(vert.EmployeeOid.Value);
var sgf = ServiceFacade.DoEmployeeServiceSync(s => s.GetActiveCompactEmployeeWithOid(vert.EmployeeOid.Value));
var selectedEmployee = sgf;
VMFactory.CreateEmployeeVMAsync(selectedEmployee.EmployeeOid,
cb => this.Dispatch(
() =>
BeWoUtils.OpenModalViewWindow<EmployeeVM, EmployeeDC, BeWoView>(cb, null, () => this.Dispatch(
delegate
{
var updatedEmployee = new CompactEmployeeDC();
ServiceFacade.DoEmployeeServiceSync(
s => updatedEmployee = s.GetActiveCompactEmployeeWithOid(selectedEmployee.EmployeeOid));
selectedEmployee = new CompactEmployeeDC();
selectedEmployee = updatedEmployee;
// UpdateControls();
// customerText.Text = updatedCustomer.ToString();
BeWoUtils.UpdateAllViews(selectedEmployee);
}))
));
}
else
MessageBox.Show("Es wurde der Vertretung kein Mitarbeiter zugeteilt");
}
//Fertig
private void MitarbeiterVertretunginfo_OnClick(object sender, RoutedEventArgs e)
{
var a = (SchulbegleitenderDienst)GridDataControl.SelectedItem;
if (!a.Vertretung.Equals(""))
{
VertretungDC vert = new VertretungDC();
vert = a.VertretungsDC;
List<long> abf = new List<long>();
abf.Add(vert.EmployeeOid.Value);
var sgf = ServiceFacade.DoEmployeeServiceSync(s => s.GetActiveCompactEmployeeWithOid(vert.VertretenderMitarbeiterOid.Value));
var selectedEmployee = sgf;
VMFactory.CreateEmployeeVMAsync(selectedEmployee.EmployeeOid,
cb => this.Dispatch(
() =>
BeWoUtils.OpenModalViewWindow<EmployeeVM, EmployeeDC, BeWoView>(cb, null, () => this.Dispatch(
delegate
{
var updatedEmployee = new CompactEmployeeDC();
ServiceFacade.DoEmployeeServiceSync(
s => updatedEmployee = s.GetActiveCompactEmployeeWithOid(selectedEmployee.EmployeeOid));
selectedEmployee = new CompactEmployeeDC();
selectedEmployee = updatedEmployee;
// UpdateControls();
// customerText.Text = updatedCustomer.ToString();
BeWoUtils.UpdateAllViews(selectedEmployee);
}))
));
}
else
MessageBox.Show("Es wurde der Vertretung kein Mitarbeiter zugeteilt");
}
//Fertig
private void DeletPerson_OnClick(object sender, RoutedEventArgs e)
{
if (MessageBox.Show("Möchten Sie die Vertretung wirklich Löschen?", "Vertretung Löschen", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
{
//get oid from vertretung
var a = (SchulbegleitenderDienst) GridDataControl.SelectedItem;
// delet vertretung from oid
VertretungDC vert = new VertretungDC();
vert = a.VertretungsDC;
ServiceFacade.DoOperationsServiceSync(s => s.DeleteVertretung(vert));
GetAllVertretungenOnLoad(null, DateTime.Now, null);
}
}
//############################################################################
}
#region Connectoren
//Binding Connectoren
public class User
{
public string Mitarbeiter { get; set; }
}
public class SchulbegleitenderDienst
{
public VertretungDC VertretungsDC { get; set; }
public string Vertretung { get; set; }
public string Kunde { get; set; }
public string KrankerMitarbeiter { get; set; }
public string AbwesenheitsKategorie { get; set; }
public string KrankheitsMeldung { get; set; }
//public string MaFehlzeit { get; set; }
//public string KindFehlzeit { get; set; }
public string KrankheitsZeitraum { get; set; }
public string Beschreibung { get; set; }
//public int ParentId { get; set; }
//public int Oid { get; set; }
public bool IsKunde
{
get
{
//Bearbeiten, vllt Grid Updaten oder so
if (!Kunde.Equals(""))
{
return true;
}
else
{
return false;
}
}
}
public bool IsMitarbeiter
{
get
{
//Bearbeiten, vllt Grid Updaten oder so
if (!KrankerMitarbeiter.Equals(""))
{
return true;
}
else
{
return false;
}
}
}
}
#endregion

80
BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstBearbeitungsView.xaml
View File

@@ -2,26 +2,80 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:view="clr-namespace:BeWo.View"
Title="Chat Dokumentation" Height="500" Width="800" WindowStartupLocation="CenterScreen" WindowStyle="None"
AllowsTransparency="True"
Background="Transparent"
ResizeMode="CanResizeWithGrip">
xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:search="clr-namespace:BeWo.View.Search"
Title="Chat Dokumentation" Height="500" Width="800" WindowStartupLocation="CenterScreen"
ResizeMode="CanResizeWithGrip" WindowStyle="None" Background="Transparent">
<GroupBox Header="Schulbegleitende Bearbeitungs View" x:Name="rootGroupBox" Style="{DynamicResource MainContentGroupBoxWithoutMaximizeBtnStyle}" MouseLeftButtonDown="RootGroupBox_OnMouseLeftButtonDown">
<Grid Background="Aqua">
<Grid Background="White">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<!-- ############################### Oberes 1/3 auswahl Kriterien #######Search########################################## -->
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="250" />
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="100"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<!--MouseLeftButtonDown="RootGroupBox_OnMouseLeftButtonDown" -->
</Grid>
<GroupBox Header="WunschKriterien" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3" >
</GroupBox>
<GroupBox Header="AusschlussKriterien" Grid.Row="0" Grid.Column="2" Grid.ColumnSpan="2" Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3">
</GroupBox>
<GroupBox Header="Geschlecht" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3">
<WrapPanel Orientation="Horizontal">
<RadioButton Content="männlich" GroupName="Geschlecht" Margin="3,3,3,3"/>
<RadioButton Content="weiblich" GroupName="Geschlecht" Margin="3,3,3,3"/>
</WrapPanel>
</GroupBox>
<GroupBox Grid.Column="2" Grid.Row="1" Grid.ColumnSpan="2" Margin="3,3,3,3" Style="{StaticResource ObjectEditGroupBox}" Header="Klienten PLZ">
<WrapPanel Orientation="Horizontal">
<Label Margin="3,3,3,3">PLZ: </Label>
<TextBox x:Name="PlzKlient" Height="20" Width="50" MaxLength="5" Margin="3,3,3,3" VerticalContentAlignment="Center" />
</WrapPanel>
</GroupBox>
</Grid>
<!-- ############################################################################################################## -->
<!-- ##################################### unterer 2/3 Mitarbeiter Controll ####################################### -->
<StackPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Grid.RowSpan="2" >
<search:EmployeeSearchView x:Name="MitarbeiterVertretungsearchview" Margin="3,3,3,3" ItemSelected="MitarbeiterVertretungsearchview_OnItemSelected" />
<WrapPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="3,3,3,3" VerticalAlignment="Bottom" >
<Button Content="Übernehmen" Width="75" Click="ButtonBase_OnClick" Margin="3,3,3,3" />
<Button Content="Schließen" Width="75" Click="ButtonClose_OnClick" Margin="3,3,3,3"/>
</WrapPanel>
</StackPanel>
<!-- #######################Closed="popup_Closed" Opened="popup_Opened"###StaysOpen="False"Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"#################################################################################### -->
</Grid>
</GroupBox>
</Window>

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

@@ -21,10 +21,12 @@ using System.Text;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Media.Imaging;
using BeWo.Core;
using BeWo.Core.Service;
using BeWo.View.Detail;
using BeWo.ViewModel.ListViewModel;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using DevExpress.Xpf.Core;
@@ -37,6 +39,10 @@ namespace BeWo.SchulbegleitenderDienst
{
public partial class SchulbegleitenderDienstBearbeitungsView
{
public event EventHandler<CustomEventArgs> RaiseCustomEvent;
public SchulbegleitenderDienstBearbeitungsView()
{
InitializeComponent();
@@ -72,5 +78,85 @@ namespace BeWo.SchulbegleitenderDienst
}));
}
//Bereich zum auswählen des Mitarbeiters
#region MitarbeiterSearch
private CompactEmployeeDC currentEmployee;
//private void Popupedit_MitarbeiterVertretungSearch_OnPopUpClick_popupedit_MitarbeiterVertretungSearch_PopUpClick(object sender, RoutedEventArgs e)
//{
// MitarbeiterVertretungsearchview.ItemSelected += MitarbeiterVertretungsearchview_MitarbeiterVertretungSelected;
// popup_MitarbeiterVertretung.IsOpen = true;
//}
private void MitarbeiterVertretungsearchview_MitarbeiterVertretungSelected(object sender, EventArgs<CompactEmployeeDC> e)
{
//popup_MitarbeiterVertretung.IsOpen = false;
MitarbeiterVertretungsearchview.ItemSelected -= MitarbeiterVertretungsearchview_MitarbeiterVertretungSelected;
currentEmployee = e.Data;
//popupedit_MitarbeiterVertretungSearch.Text = currentEmployee.FirstName + " " + currentEmployee.LastName;
//hole alle mit Service Raus
var employeeList = ServiceFacade.DoEmployeeServiceSync(s => s.GetAllActiveEmployeesCompact());
MitarbeiterVertretungsearchview.ObjectList = employeeList;
//popupedit_MitarbeiterVertretungSearch.Focus();
}
//Ein TextFeld
#endregion
private void MitarbeiterVertretungsearchview_OnSelected(object sender, RoutedEventArgs e)
{
//MessageBox.Show("Item wurde Selektiert");
}
private void MitarbeiterVertretungsearchview_OnItemSelected(object sender, EventArgs<CompactEmployeeDC> e)
{
//MessageBox.Show("Youre welcome! Not");
}
//Übergebe die Daten Zurück an die SBD View
private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
{
//Hier den Employee zurück geben
if (MitarbeiterVertretungsearchview.SelectedItem != null)
{
CompactEmployeeDC x = MitarbeiterVertretungsearchview.SelectedItem;
RaiseCustomEvent(this, new CustomEventArgs(x));
}
}
//Schließe aktuelles Fenster
private void ButtonClose_OnClick(object sender, RoutedEventArgs e)
{
Close();
}
}
public class CustomEventArgs : EventArgs
{
public CustomEventArgs(CompactEmployeeDC s)
{
dc = s;
}
private CompactEmployeeDC dc;
public CompactEmployeeDC Message
{
get { return dc; }
}
}
}

37
BeWo/ServiceProxy/Generated.cs
View File

@@ -499,6 +499,11 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/DeleteEmployeeCustomerRelationForEmployeeBeWo" +
"FaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void DeleteEmployeeCustomerRelationForEmployee(long employeeOid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetActiveCompactEmployeeWithOid", ReplyAction="http://tempuri.org/IEmployeeService/GetActiveCompactEmployeeWithOidResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetActiveCompactEmployeeWithOidBeWoFaultFault" +
"", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BS.Shared.DataContracts.Compact.CompactEmployeeDC GetActiveCompactEmployeeWithOid(long employeeOid);
}
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -929,6 +934,11 @@ namespace BeWo.ServiceProxy
{
base.Channel.DeleteEmployeeCustomerRelationForEmployee(employeeOid);
}
public BS.Shared.DataContracts.Compact.CompactEmployeeDC GetActiveCompactEmployeeWithOid(long employeeOid)
{
return base.Channel.GetActiveCompactEmployeeWithOid(employeeOid);
}
}
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -4129,6 +4139,18 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewKlientenVertretungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void InsertNewKlientenVertretung(BS.Shared.DataContracts.VertretungDC vertretungK);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeleteVertretung", ReplyAction="http://tempuri.org/IOperationsService/DeleteVertretungResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeleteVertretungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void DeleteVertretung(BS.Shared.DataContracts.VertretungDC vert);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateVertretung", ReplyAction="http://tempuri.org/IOperationsService/UpdateVertretungResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateVertretungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void UpdateVertretung(BS.Shared.DataContracts.VertretungDC vert);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/VertretungsListe", ReplyAction="http://tempuri.org/IOperationsService/VertretungsListeResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/VertretungsListeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BS.Shared.DataContracts.VertretungsListeDC VertretungsListe(System.DateTime absenceTime);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeactivateInvoices", ReplyAction="http://tempuri.org/IOperationsService/DeactivateInvoicesResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeactivateInvoicesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void DeactivateInvoices(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceDC> invoices);
@@ -4839,6 +4861,21 @@ namespace BeWo.ServiceProxy
base.Channel.InsertNewKlientenVertretung(vertretungK);
}
public void DeleteVertretung(BS.Shared.DataContracts.VertretungDC vert)
{
base.Channel.DeleteVertretung(vert);
}
public void UpdateVertretung(BS.Shared.DataContracts.VertretungDC vert)
{
base.Channel.UpdateVertretung(vert);
}
public BS.Shared.DataContracts.VertretungsListeDC VertretungsListe(System.DateTime absenceTime)
{
return base.Channel.VertretungsListe(absenceTime);
}
public void DeactivateInvoices(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceDC> invoices)
{
base.Channel.DeactivateInvoices(invoices);

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

@@ -1965,7 +1965,9 @@
</TabItem>
<TabItem Header="Dokumente" Name="tabitem_documents" Selector.Selected="tabitem_documents_Selected" />
<TabItem Header="Chat Service" Name="tabitem_chatservice" Selector.Selected="tabitem_chatservice_Selected" />
<TabItem Header="Chat Service" Name="tabitem_chatservice" Selector.Selected="tabitem_chatservice_Selected" />
<TabItem Header="Schulbegleitender Dienst" Name="tabitem_schuldienst" Selector.Selected="tabitem_SchulDienst_Selected" />
<TabItem Header="Log" Name="tabitem_log" Selector.Selected="tabitem_log_Selected" />
</TabControl>

8
BeWo/View/Detail/CustomerView.xaml.cs
View File

@@ -991,6 +991,14 @@ namespace BeWo.View.Detail
}
}
private void tabitem_SchulDienst_Selected(object sender, RoutedEventArgs e)
{
if (tabitem_schuldienst.Content == null)
{
tabitem_schuldienst.Content = new SchulbegleitenderDienstCustomer(TableID.Customer, ViewModel.DataContract.CustomerOid.Value);
}
}
private void tabitem_log_Selected(object sender, RoutedEventArgs e)
{
if (ShouldLog)

59
BeWo/View/SchulbegleitenderDienstCustomer.xaml Normal file
View File

@@ -0,0 +1,59 @@
<localView:BeWoView x:Class="BeWo.View.SchulbegleitenderDienstCustomer"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:localView="clr-namespace:BeWo.View"
xmlns:localViewModel="clr-namespace:BeWo.ViewModel"
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
xmlns:diagnostics="clr-namespace:System.Diagnostics;assembly=WindowsBase"
VerticalAlignment="Stretch" Focusable="True">
<Grid>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<GroupBox Grid.ColumnSpan="2" Padding="5" Style="{StaticResource ObjectEditGroupBox}" Header="Schulbegleitender Dienst">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<GroupBox Header="Ausschlusskriterien" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="0" >
<Label>Hier Kommt später von Dxe grid Controll Ausschlusskriterien hin </Label>
</GroupBox>
<GroupBox Header="Wunschkriterien" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" >
<Label>Hier Kommt später von Dxe grid Controll Wunschkriterien hin </Label>
</GroupBox>
</Grid>
</GroupBox>
</Grid>
</Grid>
</localView:BeWoView>

123
BeWo/View/SchulbegleitenderDienstCustomer.xaml.cs Normal file
View File

@@ -0,0 +1,123 @@
using System;
using System.IO;
using System.Linq;
using System.Windows;
using System.Windows.Controls.Primitives;
using System.Windows.Documents;
using System.Windows.Forms;
using System.Windows.Forms.VisualStyles;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Navigation;
using System.Windows.Threading;
using BeWo.Core;
using BeWo.Core.Service;
using BeWo.ViewModel;
using BeWo.ServiceProxy;
using BeWo.View.Detail;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using BS.Shared;
using BS.Shared.Core;
using Microsoft.Win32;
using CheckBox = System.Windows.Controls.CheckBox;
using MessageBox = System.Windows.MessageBox;
namespace BeWo.View
{
public partial class SchulbegleitenderDienstCustomer
{
private CustomerVM _ViewModel;
// TableID tableid;
long? customerOid;
public SchulbegleitenderDienstCustomer(TableID pObjectTid, long? oid)
{
InitializeComponent();
customerOid = oid;
// tableid = pObjectTid;
//LaodInfostoView();
}
public CustomerVM PublicViewModel { get { return _ViewModel; } }
public override bool IsDirty
{
get
{
return ViewModel != null && ViewModel.IsDirty;
}
}
private CustomerVM ViewModel
{
get { return _ViewModel; }
set
{
DataContext = value;
_ViewModel = value;
}
}
//TODO Speicher Button Aktivieren
/* private bool DoSaveCheck()
{
Cache.GetInstance().GetActiveSupportConceptCostbearer(scList =>
VMFactory.CreateServiceRecordVMAsync(
BeWoApp.LoggedOnUser.Employee.EmployeeOid,
vm => this.Dispatch(
delegate
{
ChatServiceCustomer newView = new ChatServiceCustomer(tableid, customerOid);
if (newView.CommandBindings.Count == 0)
{
newView.CommandBindings.Add(
new CommandBinding(
ApplicationCommands.Close,
(s, e) =>
{
if (!newView.DoSaveCheck())
{
return;
}
}));
newView.CommandBindings.Add(
new CommandBinding(
ApplicationCommands.Save,
(s, e) =>
{
bool save = true;
if (!save)
{
return;
}
newView.SaveData();
}));
}
})));
}
*/
}
}

96
BeWo/ViewModel/KriterienVM.cs Normal file
View File

@@ -0,0 +1,96 @@
using BS.Shared;
using BS.Shared.DataContracts;
using System;
namespace BeWo.ViewModel
{
public class KriterienVM : AbstractDCMapperVM<KriterienDC>
{
public static string PropertyName_AusschlussKriterien = "AusschlussKriterien";
public static string PropertyName_WunschKriterien = "WunschKriterien";
//public static string PropertyName_Notice = "Notice";
private string _AusschlussKriterien;
private string _WunschKriterien;
//private string _Notice;
public KriterienVM(KriterienDC pDC)
: base(pDC, true)
{
}
public string AusschlussKriterien
{
get { return this._AusschlussKriterien; }
set
{
if (this.AreDifferent(this._AusschlussKriterien, value))
{
this._AusschlussKriterien = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.AusschlussKriterien, value), PropertyName_AusschlussKriterien);
this.FirePropertyChanged(PropertyName_AusschlussKriterien);
}
}
}
public string WunschKriterien
{
get { return this._WunschKriterien; }
set
{
if (this.AreDifferent(this._WunschKriterien, value))
{
this._WunschKriterien = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.WunschKriterien, value), PropertyName_WunschKriterien);
this.FirePropertyChanged(PropertyName_WunschKriterien);
}
}
}
//public string Notice
//{
// get { return _Notice; }
// set
// {
// if (AreDifferent(_Notice, value))
// {
// _Notice = value;
// StoreDirtyInformation(AreDifferent(DataContract.Notice, value), PropertyName_Notice);
// FirePropertyChanged(PropertyName_Notice);
// }
// }
//}
protected override void InitByDataContract(KriterienDC pDataContract)
{
this._AusschlussKriterien = pDataContract.AusschlussKriterien;
this._WunschKriterien = pDataContract.WunschKriterien;
//this._Notice = pDataContract.Notice;
}
protected override KriterienDC MapToDataContract(KriterienDC pDataContract, bool doCommit)
{
pDataContract.AusschlussKriterien = _AusschlussKriterien;
pDataContract.WunschKriterien = _WunschKriterien;
//pDataContract.Notice = _Notice;
return pDataContract;
}
}
}

24
BeWo/ViewModel/VertretungVM.cs
View File

@@ -10,12 +10,16 @@ namespace BeWo.ViewModel
public static string PropertyName_VertretungsZeitraumBis = "VertretungsZeitraumBis";
public static string PropertyName_Notice = "Notice";
public static string PropertyName_KrankheitsMeldung = "KrankheitsMeldung";
public static string PropertyName_Notice = "Notice";
private DateTime _VertretungsZeitraumVon;
private DateTime _VertretungsZeitraumBis;
private DateTime _KrankheitsMeldung;
private long? _AbwesenheitsOid;
private string _Notice;
@@ -56,6 +60,21 @@ namespace BeWo.ViewModel
}
}
public DateTime KrankheitsMeldung
{
get { return this._KrankheitsMeldung; }
set
{
if (this.AreDifferent(this._KrankheitsMeldung, value))
{
this._KrankheitsMeldung = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.KrankheitsMeldung, value), PropertyName_KrankheitsMeldung);
this.FirePropertyChanged(PropertyName_KrankheitsMeldung);
}
}
}
public string Notice
{
get { return _Notice; }
@@ -93,6 +112,7 @@ namespace BeWo.ViewModel
{
this._VertretungsZeitraumVon = pDataContract.VertretungsZeitraumVon;
this._VertretungsZeitraumBis = pDataContract.VertretungsZeitraumBis;
this._KrankheitsMeldung = pDataContract.KrankheitsMeldung;
this._Notice = pDataContract.Notice;
@@ -103,7 +123,7 @@ namespace BeWo.ViewModel
pDataContract.VertretungsZeitraumVon = _VertretungsZeitraumVon;
pDataContract.VertretungsZeitraumBis = _VertretungsZeitraumBis;
pDataContract.Notice = _Notice;
pDataContract.KrankheitsMeldung = _KrankheitsMeldung;
return pDataContract;

38
Data/Access/SearchDAO.cs
View File

@@ -2018,5 +2018,43 @@ namespace BeWo.Data.Access
return c.UniqueResult<ServiceRecord>();
}
public VertretungsListe VertretungListe()
{
VertretungsListe liste = new VertretungsListe();
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 AbsenceReason ");
var absence = qabsence.List<long>();
var labsence = DAOFactory.GenericDAO.GetActiveByIDs<AbsenceReason>(absence);
liste.Absencereasonlist = 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();
return liste;
}
}
}

5
Data/Data.csproj
View File

@@ -159,6 +159,8 @@
<Compile Include="Entities\ChatMessage.cs" />
<Compile Include="Entities\ChatMediaMessage.cs" />
<Compile Include="Entities\Image.cs" />
<Compile Include="Entities\VertretungsListe.cs" />
<Compile Include="Entities\Kriterien.cs" />
<Compile Include="Entities\Vertretung.cs" />
<Compile Include="Entities\PasswortVerlauf.cs" />
<Compile Include="Entities\MedRecord.cs" />
@@ -555,6 +557,9 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="ICD10\icd10gm2012syst_claml_20110923.xml" />
<EmbeddedResource Include="Mappings\Kriterien.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Mappings\Vertretung.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>

70
Data/Entities/Kriterien.cs Normal file
View File

@@ -0,0 +1,70 @@
using BS.Shared;
using System;
namespace BeWo.Data.Entities
{
public class Kriterien : BeWoEntityBase
{
public static string PropertyName_AusschlussKriterien = "AusschlussKriterien";
public static string PropertyName_WunschKriterien = "WunschKriterien";
public static string PropertyName_CustomerOid = "CustomerOid";
private string _AusschlussKriterien;
private string _WunschKriterien;
private long? _CustomerOid;
public virtual string AusschlussKriterien
{
get
{
return this._AusschlussKriterien;
}
set
{
if (this.AreDifferent(this._AusschlussKriterien, value))
{
this._AusschlussKriterien = value;
}
}
}
public virtual string WunschKriterien
{
get
{
return this._WunschKriterien;
}
set
{
if (this.AreDifferent(this._WunschKriterien, value))
{
this._WunschKriterien = value;
}
}
}
public virtual long? CustomerOid
{
get
{
return this._CustomerOid;
}
set
{
if (this.AreDifferent(this._CustomerOid, value))
{
this._CustomerOid = value;
}
}
}
}
}

43
Data/Entities/Vertretung.cs
View File

@@ -7,23 +7,31 @@ namespace BeWo.Data.Entities
{
public static string PropertyName_VertretungsZeitraumVon = "VertretungsZeitraumVon";
public static string PropertyName_VertretungsZeitraumBis = "VertretungsZeitraumBis";
public static string PropertyName_VertretungsZeitraumBis = "VertretungsZeitraumBis";
public static string PropertyName_KrankheitsMeldung = "KrankheitsMeldung";
public static string PropertyName_CustomerOid = "CustomerOid";
public static string PropertyName_EmployeeOid = "EmployeeOid";
public static string PropertyName_VertretenderMitarbeiterOid = "VertretenderMitarbeiterOid";
public static string PropertyName_AbwesenheitsOid = "AbwesenheitsOid";
private DateTime _VertretungsZeitraumVon;
private DateTime _VertretungsZeitraumBis;
private DateTime _KrankheitsMeldung;
private long? _CustomerOid;
private long? _EmployeeOid;
private long? _AbwesenheitsOid;
private long? _AbwesenheitsOid;
private long? _VertretenderMitarbeiterOid;
public virtual DateTime VertretungsZeitraumVon
@@ -58,6 +66,22 @@ namespace BeWo.Data.Entities
}
}
public virtual DateTime KrankheitsMeldung
{
get
{
return this._KrankheitsMeldung;
}
set
{
if (this.AreDifferent(this._KrankheitsMeldung, value))
{
this._KrankheitsMeldung = value;
}
}
}
public virtual long? CustomerOid
{
get
@@ -106,6 +130,21 @@ namespace BeWo.Data.Entities
}
}
public virtual long? VertretenderMitarbeiterOid
{
get
{
return this._VertretenderMitarbeiterOid;
}
set
{
if (this.AreDifferent(this._VertretenderMitarbeiterOid, value))
{
this._VertretenderMitarbeiterOid = value;
}
}
}
}

92
Data/Entities/VertretungsListe.cs Normal file
View File

@@ -0,0 +1,92 @@
using BS.Shared;
using System;
using System.Collections.Generic;
namespace BeWo.Data.Entities
{
public class VertretungsListe : BeWoEntityBase
{
public static string PropertyName_VertretungsListe = "VertretungsListe";
public static string PropertyName_EmployeesListe = "EmployeesListe";
public static string PropertyName_CustomersListe = "CustomersListe";
public static string PropertyName_AbsenceReasonsListe = "AbsenceReasonsListe";
private List<Vertretung> _vertretunglist;
private List<Employee> _employeelist;
private List<Customer> _customerlist;
private List<AbsenceReason> _absencereasonlist;
public virtual List<Vertretung> Vertretunglist
{
get
{
return this._vertretunglist;
}
set
{
if (this.AreDifferent(this._vertretunglist, value))
{
this._vertretunglist = value;
}
}
}
public virtual List<Employee> Employeelist
{
get
{
return this._employeelist;
}
set
{
if (this.AreDifferent(this._employeelist, value))
{
this._employeelist = value;
}
}
}
public virtual List<Customer> Customerlist
{
get
{
return this._customerlist;
}
set
{
if (this.AreDifferent(this._customerlist, value))
{
this._customerlist = value;
}
}
}
public virtual List<AbsenceReason> Absencereasonlist
{
get
{
return this._absencereasonlist;
}
set
{
if (this.AreDifferent(this._absencereasonlist, value))
{
this._absencereasonlist = value;
}
}
}
}
}

24
Data/Mappings/Kriterien.hbm.xml Normal file
View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
<class name="BeWo.Data.Entities.Kriterien,BeWo.Data" table="Kriterien">
<id name="Oid" column ="Oid" unsaved-value="null">
<generator class="identity" />
</id>
<version type="Int64" column="Version" name="Version" />
<property name="CustomerOid" column="KlientOid" />
<property name="InsTs" />
<property name="InsUser" />
<property column="Tid" type="BS.Shared.TableID, BS.Shared" name="_Tid" access="field" />
<property name="UdpUser" />
<property name="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" />
<property name="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" />
<property name="Notice" column="Notice" length="1024" />
<property name="AusschlussKriterien" column="AusschlussKriterien" />
<property name="WunschKriterien" column="WunschKriterien" />
</class>
</hibernate-mapping>

6
Data/Mappings/Vertretung.hbm.xml
View File

@@ -19,7 +19,11 @@
<property name="VertretungsZeitraumVon" column="VertretungsZeitraumVon" />
<property name="VertretungsZeitraumBis" column="VertretungsZeitraumBis" />
<property name="KrankheitsMeldung" column="KrankheitsMeldung" />
<property name="VertretenderMitarbeiterOid" column="VertretenderMitarbeiterOid" />
</class>
</hibernate-mapping>

3
Model/Changes_2017_03_30.txt Normal file
View File

@@ -0,0 +1,3 @@
ALTER TABLE `1234567890`.`vertretung`
ADD COLUMN `AbsenceReasonOid` BIGINT(19) NULL DEFAULT NULL COMMENT '' AFTER `VertretungsZeitraumBis`;

3
Model/Changes_2017_04_03.txt Normal file
View File

@@ -0,0 +1,3 @@
ALTER TABLE `1234567890`.`vertretung`
ADD COLUMN `KrankheitsMeldung`
DATETIME NULL DEFAULT NULL COMMENT '' AFTER `AbsenceReasonOid`;

24
Model/Changes_2017_04_03_2.txt Normal file
View File

@@ -0,0 +1,24 @@
CREATE TABLE `1234567890`.`kriterien` (
`Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
`KlientenOid` BIGINT(19) NULL DEFAULT NULL COMMENT '',
`Tid` INT(10) NULL DEFAULT NULL COMMENT '',
`Notice` VARCHAR(1024) NULL DEFAULT NULL COMMENT '',
`InsTs` DATETIME NULL COMMENT '',
`InsUser` VARCHAR(1024) NULL COMMENT '',
`Version` BIGINT(19) NULL COMMENT '',
`UdpUser` VARCHAR(256) NULL COMMENT '',
`isActive` TINYINT(4) NULL COMMENT '',
`SystemEntryID` INT(10) NULL COMMENT '',
`AusschlussKriterien` VARCHAR(1024) NULL COMMENT '',
`WunschKriterien` VARCHAR(1024) NULL COMMENT '',
PRIMARY KEY (`Oid`) COMMENT '');

4
Model/Changes_2017_04_06.txt Normal file
View File

@@ -0,0 +1,4 @@
ALTER TABLE `1234567890`.`vertretung`
ADD COLUMN `VertretenderMitarbeiterOid`
BIGINT(19) NULL DEFAULT 0 COMMENT '' AFTER `KrankheitsMeldung`;

BIN
ReportImp/HphBersenbrueckAtz/Bilder/HpHBersenbrueckAutismusTherapieLogo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

15
ReportImp/HphBersenbrueckAtz/HphBersenbrueckAtz.csproj
View File

@@ -33,11 +33,16 @@
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpo.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
@@ -48,6 +53,12 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="QueryListReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="QueryListReport.Designer.cs">
<DependentUpon>QueryListReport.cs</DependentUpon>
</Compile>
<Compile Include="ServicesOverviewReport.cs">
<SubType>Component</SubType>
</Compile>
@@ -57,6 +68,10 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="QueryListReport.resx">
<DependentUpon>QueryListReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="ServicesOverviewReport.resx">
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
</EmbeddedResource>

2452
ReportImp/HphBersenbrueckAtz/QueryListReport.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

64
ReportImp/HphBersenbrueckAtz/QueryListReport.cs Normal file
View File

@@ -0,0 +1,64 @@
using System;
using BeWo.Report.ReportObjects;
using BeWo.Report;
using DevExpress.XtraReports.UI;
using System.Data;
namespace BeWo.Report.DefaultReports
{
public partial class Bericht : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<QueryRO>
{
public Bericht()
{
InitializeComponent();
}
public void SetReportDataSource(QueryRO pRO)
{
InitTable(pRO);
this.bindingSource1.DataSource = pRO;
}
private void InitTable(QueryRO ro)
{
//xrTableRowHeader.Cells.Clear();
//xrTableRowDetail.Cells.Clear();
//int index = 1;
//foreach (DataColumn column in ro.DataTable.Columns)
//{
// Type type = column.DataType;
// XRTableCell headerCell = new XRTableCell();
// headerCell.Text = column.ColumnName;
// headerCell.WidthF = xrTableHeader.WidthF / ro.DataTable.Columns.Count;
// this.xrTableRowHeader.Cells.Add(headerCell);
// XRTableCell rowCell = new XRTableCell();
// rowCell.WidthF = xrTableHeader.WidthF / ro.DataTable.Columns.Count;
// if (type == typeof(DateTime))
// rowCell.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
// new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field" + index, "{0:dd/MM/yyyy}")});
// else
// rowCell.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
// new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field" + index)});
// this.xrTableRowDetail.Cells.Add(rowCell);
// index++;
//}
//foreach (XRTableCell cell in xrTableRowHeader.Cells)
//{
// cell.WidthF = xrTableHeader.WidthF / ro.DataTable.Columns.Count;
//}
//foreach (XRTableCell cell in xrTableRowDetail.Cells)
//{
// cell.WidthF = xrTableHeader.WidthF / ro.DataTable.Columns.Count;
//}
}
}
}

205
ReportImp/HphBersenbrueckAtz/QueryListReport.resx Normal file
View File

@@ -0,0 +1,205 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="xrPictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
YII=
</value>
</data>
<metadata name="xpInstantFeedbackSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>154, 17</value>
</metadata>
</root>

45
Service/DCEntityMapper/KriterienDC_Kriterien.cs Normal file
View File

@@ -0,0 +1,45 @@
using System.IO;
using BeWo.Data.Entities;
using BS.Shared.DataContracts;
namespace BeWo.Service.DCEntityMapper
{
public class KriterienDC_Kriterien : AbstractIDCEntityMapper<Kriterien, KriterienDC>
{
public override KriterienDC MergeWithDC(Kriterien pEntity, KriterienDC pDataContract)
{
pDataContract.CustomerOid = pEntity.CustomerOid;
pDataContract.AusschlussKriterien = pEntity.AusschlussKriterien;
pDataContract.WunschKriterien = pEntity.WunschKriterien;
//pDataContract.Notice = pEntity.Notice;
return pDataContract;
}
public override Kriterien MergeWithEntity(KriterienDC pDataContract, Kriterien pEntity)
{
pEntity.CustomerOid = pDataContract.CustomerOid;
pEntity.AusschlussKriterien = pDataContract.AusschlussKriterien;
pEntity.WunschKriterien = pDataContract.WunschKriterien;
//pEntity.Notice = pDataContract.Notice;
return pEntity;
}
protected override bool AreDCAndEntityEqual(KriterienDC pDC, Kriterien pEntity)
{
if (pDC.KriterienOid == null)
{
return false;
}
return pDC.KriterienOid == pEntity.Oid;
}
}
}

20
Service/DCEntityMapper/MapperFactory.cs
View File

@@ -47,6 +47,10 @@ namespace BeWo.Service.DCEntityMapper
private static VertretungDC_Vertretung _VertretungDC_Vertretung;
private static KriterienDC_Kriterien _KriterienDC_Kriterien;
private static VertretungsListeDC_VertretungsListe _VertretungsListeDC_VertretungsListe;
private static PasswortVerlaufDC_PasswortVerlauf _PasswortVerlaufDC_PasswortVerlauf;
private static ChatMessageDC_ChatMessage _ChatMessageDC_ChatMessage;
@@ -534,6 +538,22 @@ namespace BeWo.Service.DCEntityMapper
}
}
public static KriterienDC_Kriterien KriterienDC_Kriterien
{
get
{
return _KriterienDC_Kriterien ?? (_KriterienDC_Kriterien = new KriterienDC_Kriterien());
}
}
public static VertretungsListeDC_VertretungsListe VertretungsListeDC_VertretungsListe
{
get
{
return _VertretungsListeDC_VertretungsListe ?? (_VertretungsListeDC_VertretungsListe = new VertretungsListeDC_VertretungsListe());
}
}
public static PasswortVerlaufDC_PasswortVerlauf PasswortVerlaufDC_PasswortVerlauf
{
get

8
Service/DCEntityMapper/VertretungDC_Vertretung.cs
View File

@@ -9,13 +9,15 @@ namespace BeWo.Service.DCEntityMapper
{
public override VertretungDC MergeWithDC(Vertretung pEntity, VertretungDC pDataContract)
{
pDataContract.VertretungOid = pEntity.Oid;
pDataContract.CustomerOid = pEntity.CustomerOid;
pDataContract.EmployeeOid = pEntity.EmployeeOid;
pDataContract.AbwesenheitsOid = pEntity.AbwesenheitsOid;
pDataContract.VertretungsZeitraumVon = pEntity.VertretungsZeitraumVon;
pDataContract.VertretungsZeitraumBis = pEntity.VertretungsZeitraumBis;
pDataContract.KrankheitsMeldung = pEntity.KrankheitsMeldung;
pDataContract.Notice = pEntity.Notice;
pDataContract.VertretenderMitarbeiterOid = pEntity.VertretenderMitarbeiterOid;
return pDataContract;
}
@@ -27,8 +29,10 @@ namespace BeWo.Service.DCEntityMapper
pEntity.AbwesenheitsOid = pDataContract.AbwesenheitsOid;
pEntity.VertretungsZeitraumVon = pDataContract.VertretungsZeitraumVon;
pEntity.VertretungsZeitraumBis = pDataContract.VertretungsZeitraumBis;
pEntity.KrankheitsMeldung = pDataContract.KrankheitsMeldung;
pEntity.Notice = pDataContract.Notice;
pEntity.Oid = pDataContract.VertretungOid;
pEntity.VertretenderMitarbeiterOid = pDataContract.VertretenderMitarbeiterOid;
return pEntity;
}

41
Service/DCEntityMapper/VertretungsListeDC_VertretungsListe.cs Normal file
View File

@@ -0,0 +1,41 @@
using System.IO;
using BeWo.Data.Entities;
using BS.Shared.DataContracts;
namespace BeWo.Service.DCEntityMapper
{
public class VertretungsListeDC_VertretungsListe : AbstractIDCEntityMapper<VertretungsListe, VertretungsListeDC>
{
public override VertretungsListeDC MergeWithDC(VertretungsListe pEntity, VertretungsListeDC pDataContract)
{
pDataContract.Customersliste = MapperFactory.CustomerDC_Customer.MapToNewDCs(pEntity.Customerlist);
pDataContract.Employeesliste = MapperFactory.EmployeeDC_Employee.MapToNewDCs(pEntity.Employeelist);
pDataContract.Vertretungsliste = MapperFactory.VertretungDC_Vertretung.MapToNewDCs(pEntity.Vertretunglist);
pDataContract.AbsenceReasonsliste = MapperFactory.AbsenceReasonDC_AbsenceReason.MapToNewDCs(pEntity.Absencereasonlist);
return pDataContract;
}
public override VertretungsListe MergeWithEntity(VertretungsListeDC pDataContract, VertretungsListe pEntity)
{
pEntity.Customerlist = MapperFactory.CustomerDC_Customer.MapToNewEntities(pDataContract.Customersliste);
pEntity.Employeelist = MapperFactory.EmployeeDC_Employee.MapToNewEntities(pDataContract.Employeesliste);
pEntity.Vertretunglist = MapperFactory.VertretungDC_Vertretung.MapToNewEntities(pDataContract.Vertretungsliste);
pEntity.Absencereasonlist = MapperFactory.AbsenceReasonDC_AbsenceReason.MapToNewEntities(pDataContract.AbsenceReasonsliste);
return pEntity;
}
protected override bool AreDCAndEntityEqual(VertretungsListeDC pDC, VertretungsListe pEntity)
{
if (pDC.VertretungslisteOid == null)
{
return false;
}
return pDC.VertretungslisteOid == pEntity.Oid;
}
}
}

2
Service/Service.csproj
View File

@@ -214,6 +214,8 @@
<Compile Include="DCEntityMapper\EmployeeAPPCodeDC_EmployeeAPPCode.cs" />
<Compile Include="DCEntityMapper\ChatMessageDC_ChatMessage.cs" />
<Compile Include="DCEntityMapper\ChatMediaMessageDC_ChatMediaMessage.cs" />
<Compile Include="DCEntityMapper\VertretungsListeDC_VertretungsListe.cs" />
<Compile Include="DCEntityMapper\KriterienDC_Kriterien.cs" />
<Compile Include="DCEntityMapper\PasswortVerlaufDC_PasswortVerlauf.cs" />
<Compile Include="DCEntityMapper\MedRecordDC_MedRecord.cs" />
<Compile Include="DCEntityMapper\SignatureDC_Signature.cs" />

4
Service/ServiceContracts/IEmployeeService.cs
View File

@@ -326,5 +326,9 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void DeleteEmployeeCustomerRelationForEmployee(long employeeOid);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
CompactEmployeeDC GetActiveCompactEmployeeWithOid(long employeeOid);
}
}

12
Service/ServiceContracts/IOperationsService.cs
View File

@@ -593,5 +593,17 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void InsertNewKlientenVertretung(VertretungDC vertretungK);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void DeleteVertretung(VertretungDC vert);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void UpdateVertretung(VertretungDC vert);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
VertretungsListeDC VertretungsListe(DateTime absenceTime);
}
}

16
Service/ServiceImplementations/EmployeeServiceImp.cs
View File

@@ -1224,7 +1224,21 @@ namespace BeWo.Service.ServiceImplementations
{
throw Utils.CreateBeWoFaultException(e);
}
}
}
public CompactEmployeeDC GetActiveCompactEmployeeWithOid(long employeeOid)
{
try
{
var employee = DAOFactory.GenericDAO.GetByID<Employee>(employeeOid);
return MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(employee);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
}

59
Service/ServiceImplementations/OperationsServiceImp.cs
View File

@@ -3471,8 +3471,10 @@ namespace BeWo.Service.ServiceImplementations
public List<VertretungDC>GetAllVertretungen()
{
try
{
return MapperFactory.VertretungDC_Vertretung.MapToNewDCs(DAOFactory.GenericDAO.GetAllActive<Vertretung>());
{
var x = DAOFactory.GenericDAO.GetAllActive<Vertretung>();
return MapperFactory.VertretungDC_Vertretung.MapToNewDCs(x);
}
catch (Exception e)
{
@@ -3509,6 +3511,59 @@ namespace BeWo.Service.ServiceImplementations
}
}
public void DeleteVertretung(VertretungDC vert)
{
try
{
var origVertretung = DAOFactory.GenericDAO.LoadByID<Vertretung>(vert.VertretungOid.Value);
DAOFactory.GenericDAO.Delete(origVertretung);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public void UpdateVertretung(VertretungDC vert)
{
try
{
var origVertretung = DAOFactory.GenericDAO.LoadByID<Vertretung>(vert.VertretungOid.Value);
MapperFactory.VertretungDC_Vertretung.MergeWithEntity(vert, origVertretung);
DAOFactory.GenericDAO.Update(origVertretung);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public VertretungsListeDC VertretungsListe(DateTime absenceTime)
{
try
{
var x = DAOFactory.SearchDAO.VertretungListe();
var schulbegleitenderDienst = MapperFactory.VertretungsListeDC_VertretungsListe.MapToNewDC(x);
//schulbegleitenden Dienst nur die nehmen wo bei vertretung die zeit passt
return schulbegleitenderDienst;
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
//#################################################################
#endregion

27
Shared/DataContracts/KriterienDC.cs Normal file
View File

@@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.Runtime.Serialization;
namespace BS.Shared.DataContracts
{
[DataContract]
public class KriterienDC : IDataContract
{
[DataMember]
public long? KriterienOid { get; set; }
[DataMember]
public long? CustomerOid { get; set; }
[DataMember]
public string AusschlussKriterien { get; set; }
[DataMember]
public string WunschKriterien { get; set; }
//[DataMember]
//public string Notice { get; set; }
}
}

7
Shared/DataContracts/VertretungDC.cs
View File

@@ -25,8 +25,15 @@ namespace BS.Shared.DataContracts
[DataMember]
public DateTime VertretungsZeitraumBis { get; set; }
[DataMember]
public DateTime KrankheitsMeldung { get; set; }
[DataMember]
public string Notice { get; set; }
[DataMember]
public long? VertretenderMitarbeiterOid { get; set; }
}
}

26
Shared/DataContracts/VertretungsListeDC.cs Normal file
View File

@@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Runtime.Serialization;
namespace BS.Shared.DataContracts
{
[DataContract]
public class VertretungsListeDC : IDataContract
{
[DataMember]
public long? VertretungslisteOid { get; set; }
[DataMember]
public List<VertretungDC> Vertretungsliste { get; set; }
[DataMember]
public List<EmployeeDC> Employeesliste { get; set; }
[DataMember]
public List<CustomerDC> Customersliste { get; set; }
[DataMember]
public List<AbsenceReasonDC> AbsenceReasonsliste { get; set; }
}
}

2
Shared/Shared.csproj
View File

@@ -170,6 +170,8 @@
<Compile Include="DataContracts\EmployeeAPPCodeDC.cs" />
<Compile Include="DataContracts\ChatMessageDC.cs" />
<Compile Include="DataContracts\ChatMediaMessageDC.cs" />
<Compile Include="DataContracts\VertretungsListeDC.cs" />
<Compile Include="DataContracts\KriterienDC.cs" />
<Compile Include="DataContracts\VertretungDC.cs" />
<Compile Include="DataContracts\PasswortVerlaufDC.cs" />
<Compile Include="DataContracts\MedRecordDC.cs" />