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

Vieles, SBD Update, MonthlyFLS und Speichern der Durationart in die Appsettings

Browse Source
This commit is contained in:
Waldi
2017-03-30 06:19:17 +02:00
parent c3e25c0b5f
commit ec7f717476
16 changed files with 1504 additions and 1076 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
BeWo/BeWoApp.xaml.cs
View File

@@ -202,6 +202,7 @@ namespace BeWo
bool isZeiterfassungInStdMin = false;
int lastSelectedStundenkontoIntervall = 3;
bool showSignatures = false;
AppSettings.ShowAdvisedAttendedFlag = false;
String timeRecordingMenuName = "Zeiterfassung";
@@ -365,6 +366,7 @@ namespace BeWo
showSignatures = true;
}
switch (_Mandator.BeWoClientType)
{
case 1:
@@ -439,6 +441,7 @@ namespace BeWo
AppSettings.PrinterSettingsUseLandscape = printerSettingsUseLandscape;
AppSettings.PrinterSettingsUseMargins = printerSettingsUseMargins;
AppSettings.PrinterSettingsUsePaperKind = printerSettingsUsePaperKind;
BS.Shared.Settings.ApplicationSettings.SupportConceptExpirationLimitInMonths = AppSettings.HilfeplanAuslaufAuswahl;
}
@@ -664,6 +667,7 @@ namespace BeWo
SetSettingValue(SettingsType.ApplicationSettings, "DocumentationFontSize", _AppSettings.DocumentationFontSize.ToString());
SetSettingValue(SettingsType.ApplicationSettings, "ZeigeNurMeineTermine", _AppSettings.ZeigeNurMeineTermine ? "1" : "0");
SetSettingValue(SettingsType.ApplicationSettings, "LastSelectedServiceRecordTimeIntervalDays", ((int)_AppSettings.LastSelectedServiceRecordTimeIntervalDays).ToString());
SetSettingValue(SettingsType.ApplicationSettings, "LetzteZeiterfassungsDauer", ((int)_AppSettings.LetzteZeiterfassungsDauer).ToString());
string val = string.Empty;
if (_AppSettings.StartupPanelOrder != null)
@@ -809,6 +813,22 @@ namespace BeWo
"LastSelectedServiceRecordTimeIntervalDays"));
}
val = GetSettingValue(SettingsType.ApplicationSettings, "LetzteZeiterfassungsDauer");
if (val != null)
{
var x = Convert.ToInt32(GetSettingValue(SettingsType.ApplicationSettings,
"LetzteZeiterfassungsDauer"));
if (x == 0)
{
_AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Minuten;
}
else
{
_AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Stunden;
}
}
val = GetSettingValue(SettingsType.ApplicationSettings, "StartupPanelOrder");
if (val != null)
{

16
BeWo/Core/Config/AppSettings.cs
View File

@@ -26,6 +26,8 @@ namespace BeWo.Core.Config
private int mLastSelectedServiceRecordTimeIntervalDays = 7;
private ZeiterfassungsDauer mLetzteZeiterfassungsDauer = ZeiterfassungsDauer.Minuten;
public enum WindowStateType
{
Default,
@@ -71,7 +73,19 @@ namespace BeWo.Core.Config
get { return misZeiterfassungInStdMin; }
set { misZeiterfassungInStdMin = value; }
}
public ZeiterfassungsDauer LetzteZeiterfassungsDauer
{
get { return mLetzteZeiterfassungsDauer; }
set
{
if (mLetzteZeiterfassungsDauer != value)
{
mLetzteZeiterfassungsDauer = value;
IsDirty = true;
}
}
}
public int MaxDaysEditServiceRecordsAllowed { get; set; }

155
BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml
View File

@@ -16,6 +16,7 @@
xmlns:controls="clr-namespace:BeWo.View.Controls"
xmlns:controls1="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:validation="clr-namespace:BeWo.Validation"
xmlns:search="clr-namespace:BeWo.View.Search"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
<localView:BeWoView.Resources>
<ResourceDictionary>
@@ -63,9 +64,9 @@
<!-- ####################################### Bereich Mitarbeiter #####################################-->
<Button Content="Mitarbeiter Vertretung" Grid.Row="1" Grid.Column="0" Margin="3,3,3,3" Click="MitarbeiterVertretung_OnClick" x:Name="MitarbeiterVertretung_Button"/>
<controls:PopupNonTopmost Topmost="False" x:Name="popup_newEnvironmentPerson" Width="350" StaysOpen="True" Placement="Relative" Grid.Row="1" PlacementTarget="{Binding ElementName=MitarbeiterVertretung_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">
<GroupBox x:Name="groupbox_newEnvironmentPerson" Header="Neue Person hinzufügen" Style="{DynamicResource ObjectEditGroupBox}">
<GroupBox x:Name="groupbox_newEnvironmentPerson" Header="Neuen Mitarbeiter hinzufügen" Style="{DynamicResource ObjectEditGroupBox}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -78,28 +79,36 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="Person" />
<Label Grid.Row="1" Grid.Column="0" Content="Organisation" />
<Label Grid.Row="2" Grid.Column="0" Content="Rolle" />
<Label Grid.Row="3" Grid.Column="0" Content="Notiz" />
<Label Grid.Row="0" Grid.Column="0" Content="Mitarbeiter" />
<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="Krankschreibung von" />
<Label Grid.Row="4" Grid.Column="0" Content="Krankschreibung bis" />
<Label Grid.Row="5" Grid.Column="0" Content="Notiz" />
<!-- PreviewMouseDoubleClick="Popupedit_environmentPersonSearch_OnPreviewMouseDoubleClick" Text="{validation:ValidationBinding Path=EnvironmentPersons.NewVM.PersonString, UpdateSourceTrigger=PropertyChanged}"
NewClick="popupedit_environmentPersonSearch_NewClick" PopUpClick="popupedit_environmentPersonSearch_PopUpClick" -->
PopUpClick="popupedit_environmentPersonSearch_PopUpClick" -->
<controls1:PopUpEdit Cursor="Arrow" NewButtonVisibility="Visible"
IsReadOnly="True"
x:Name="popupedit_environmentPersonSearch" Grid.Column="1" Grid.ColumnSpan="2" Margin="3" Height="23"
Grid.Row="0" DeleteButtonVisibility="Collapsed" Text="Hi" />
IsReadOnly="True"
x:Name="popupedit_MitarbeiterVertretungSearch" Grid.Column="1" Grid.ColumnSpan="2" Margin="3" Height="23"
Grid.Row="0" DeleteButtonVisibility="Collapsed"
NewClick="Popupedit_MitarbeiterVertretungSearch_OnNewClickpopupedit_MitarbeiterVertretungSearch_NewClick"
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 NewButtonVisibility="Visible"
Cursor="Arrow"
Text="Hallo"
IsReadOnly="True"
x:Name="popupedit_environmentPersonOrganisationSearch"
Grid.Column="1" Margin="3" Height="23" Grid.Row="1" Grid.ColumnSpan="2"
@@ -109,21 +118,25 @@
<!--popupedit_environmentOrganisationSearch danach suchen für organisationsbereich -->
<ComboBox Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Margin="3" Height="23"
ItemsSource="{Binding Path=EnvironmentPersons.PossibleRoles}"
SelectedItem="{validation:ValidationBinding Path=EnvironmentPersons.NewVM.Role}" />
<dxe:DateEdit x:Name="MVDatepickerVon" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="MVDatepickerVon_OnEditValueChanged"/>
<TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="3" Margin="3" Height="50" AcceptsReturn="True"
<dxe:DateEdit x:Name="MVDatepickerBis" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="MVDatepickerBis_OnEditValueChanged" />
<!--<ComboBox Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2" Margin="3" Height="23"
ItemsSource="{Binding Path=EnvironmentPersons.PossibleRoles}"
SelectedItem="{validation:ValidationBinding Path=EnvironmentPersons.NewVM.Role}" />-->
<TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="5" Margin="3" Height="50" AcceptsReturn="True"
VerticalScrollBarVisibility="Auto"
Text="{Binding Path=EnvironmentPersons.NewVM.Notice, UpdateSourceTrigger=PropertyChanged}" />
<!-- Click="button_addEnvironmentPerson_Click" -->
<Button Grid.Column="1" Grid.Row="4" x:Name="button_addEnvironmentPerson" Content="Hinzufügen" Height="25"
FontWeight="Normal" Margin="3" VerticalAlignment="Bottom" HorizontalAlignment="Right" />
<Button Grid.Column="1" Grid.Row="6" 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="4" 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_cancelMitarbeiterVertretung" Click="Button_cancelMitarbeiterVertretung_OnClick"/>
</Grid>
@@ -140,7 +153,7 @@
<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 Person hinzufügen" Style="{DynamicResource ObjectEditGroupBox}">
<GroupBox x:Name="groupbox_newKlientVertretung" Header="Neue Klienten hinzufügen" Style="{DynamicResource ObjectEditGroupBox}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -153,53 +166,43 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="Person" />
<Label Grid.Row="1" Grid.Column="0" Content="Organisation" />
<Label Grid.Row="2" Grid.Column="0" Content="Rolle" />
<Label Grid.Row="3" Grid.Column="0" Content="Notiz" />
<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="Krankschreibung von" />
<Label Grid.Row="3" Grid.Column="0" Content="Krankschreibung bis" />
<Label Grid.Row="4" Grid.Column="0" Content="Notiz" />
<!-- PreviewMouseDoubleClick="Popupedit_environmentPersonSearch_OnPreviewMouseDoubleClick" Text="{validation:ValidationBinding Path=EnvironmentPersons.NewVM.PersonString, UpdateSourceTrigger=PropertyChanged}"
NewClick="popupedit_environmentPersonSearch_NewClick" PopUpClick="popupedit_environmentPersonSearch_PopUpClick" -->
NewClick="popupedit_environmentPersonSearch_NewClick" PopUpClick="Popupedit_environmentPersonSearch2_OnPopUpClick_popupedit_environmentPersonSearch_PopUpClick" -->
<controls1:PopUpEdit Cursor="Arrow" NewButtonVisibility="Visible"
IsReadOnly="True"
x:Name="popupedit_environmentPersonSearch2" Grid.Column="1" Grid.ColumnSpan="2" Margin="3" Height="23"
Grid.Row="0" DeleteButtonVisibility="Collapsed" Text="Hi" />
IsReadOnly="True"
x:Name="popupedit_KlientVertretungSearch" Grid.Column="1" Grid.ColumnSpan="2" Margin="3" Height="23"
Grid.Row="0" DeleteButtonVisibility="Collapsed"
PopUpClick="Popupedit_KlientVertretungSearch_OnPopUpClick_popupedit_KlientVertretungSearch_PopUpClick"/>
<dxe:DateEdit x:Name="KVDatepickerVon" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="KVDatepickerVon_OnEditValueChanged"/>
<!-- NewClick="popupedit_environmentOrganisationSearch_NewClick" PopUpClick="popupedit_environmentPersonOrganisationSearch_PopUpClick"
PreviewMouseDoubleClick="Popupedit_environmentOrganisationSearch_OnPreviewMouseDoubleClick" Text="{Binding Path=EnvironmentPersons.NewVM.OrganisationString, UpdateSourceTrigger=PropertyChanged}"-->
<dxe:DateEdit x:Name="KVDatepickerBis" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="KVDatepickerBis_OnEditValueChanged"/>
<controls1:PopUpEdit NewButtonVisibility="Visible"
Cursor="Arrow"
Text="Hallo"
IsReadOnly="True"
x:Name="popupedit_environmentPersonOrganisationSearch2"
Grid.Column="1" Margin="3" Height="23" Grid.Row="1" Grid.ColumnSpan="2"
DeleteButtonVisibility="Collapsed"/>
<!--popupedit_environmentOrganisationSearch danach suchen für organisationsbereich -->
<ComboBox Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Margin="3" Height="23"
ItemsSource="{Binding Path=EnvironmentPersons.PossibleRoles}"
SelectedItem="{validation:ValidationBinding Path=EnvironmentPersons.NewVM.Role}" />
<TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="3" Margin="3" Height="50" AcceptsReturn="True"
<TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="4" Margin="3" Height="50" AcceptsReturn="True"
VerticalScrollBarVisibility="Auto"
Text="{Binding Path=EnvironmentPersons.NewVM.Notice, UpdateSourceTrigger=PropertyChanged}" />
<!-- Click="button_addEnvironmentPerson_Click" -->
<Button Grid.Column="1" Grid.Row="4" x:Name="button_addEnvironmentPerson2" Content="Hinzufügen" Height="25"
FontWeight="Normal" Margin="3" VerticalAlignment="Bottom" HorizontalAlignment="Right" />
<Button Grid.Column="1" Grid.Row="5" 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="4" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
Margin="3" Content="Abbrechen" x:Name="button_cancelAddEnvironmentPerson2" Click="Button_cancelKlientVertretung_OnClick" />
<Button Grid.Row="5" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
Margin="3" Content="Abbrechen" x:Name="button_cancelKlientVertretung" Click="Button_cancelKlientVertretung_OnClick" />
</Grid>
</GroupBox>
@@ -215,41 +218,8 @@
</Grid>
<!-- ########################################################################################################## -->
<!--<ListView Grid.Column="0" Grid.Row="1" x:Name="MitarbeiterList" Margin="3,3,3,3" AllowDrop="True" DragEnter="MitarbeiterList_OnDragEnter" DragLeave="MitarbeiterList_OnDragLeave">
<ListView.View>
<GridView>
<GridViewColumn Header="Mitarbeiter" Width="200" DisplayMemberBinding="{Binding Mitarbeiter}"/>
</GridView>
</ListView.View>
</ListView>-->
<!--<dxg:GridControl x:Name="MitarbeiterList" Grid.Row="1" Grid.Column="0" AllowDrop="true" DragEnter="GridDataControl_OnDragEnter" DragLeave="GridDataControl_OnDragLeave" Margin="3,3,10,3" Width="250">
<dxg:GridControl.Columns>
<dxg:GridColumn FieldName="Mitarbeiter" Width="250"/>
</dxg:GridControl.Columns>
</dxg:GridControl>-->
<!--<ListView Grid.Column="1" Grid.Row="1" x:Name="SchulbegleitenderDienstList" Margin="3,3,3,3" BorderBrush="Black" BorderThickness="1" HorizontalAlignment="Center">
<ListView.View>
<GridView>
<GridViewColumn Header="Vertretung" Width="200" DisplayMemberBinding="{Binding Vertretung}" />
<GridViewColumn Header="Kunde" Width="385" DisplayMemberBinding="{Binding Kunde}"/>
<GridViewColumn Header="Mitarbeiter/Krank" Width="200" DisplayMemberBinding="{Binding KrankerMitarbeiter}"/>
<GridViewColumn Header="MA Fehlzeit" Width="200" DisplayMemberBinding="{Binding MaFehlzeit}"/>
<GridViewColumn Header="Kind Fehlzeit" Width="200" DisplayMemberBinding="{Binding KindFehlzeit}"/>
</GridView>
</ListView.View>
<ListView.Resources>
<Style x:Key="itemstyle" TargetType="{x:Type ListViewItem}">
<Setter Property="BorderThickness" Value="1" />
<Setter Property="BorderBrush" Value="Black" />
</Style>
</ListView.Resources>
</ListView>-->
<dxg:GridControl AutoGenerateColumns="AddNew" x:Name="GridDataControl" Grid.Row="1" Grid.ColumnSpan="3" AllowDrop="true" DragEnter="GridDataControl_OnDragEnter" DragLeave="GridDataControl_OnDragLeave" 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">
<dxg:GridControl.Columns>
@@ -261,6 +231,7 @@
<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="MaFehlzeit" Width="250"/>
<dxg:GridColumn FieldName="KindFehlzeit" Width="250"/>
</dxg:GridControl.Columns>
@@ -269,7 +240,17 @@
</dxg:GridControl.View>
</dxg:GridControl>
<!-- End mal geschaut -->
</Grid>
<Popup Margin="10" x:Name="popup_MitarbeiterVertretung" StaysOpen="False" Placement="MousePoint" Width="370" Height="250"
Closed="popup_Closed" Opened="popup_Opened">
<search:EmployeeSearchView x:Name="MitarbeiterVertretungsearchview" />
</Popup>
<Popup Margin="10" x:Name="popup_KlientVertretung" StaysOpen="False" Placement="MousePoint" Width="370" Height="250"
Closed="popup_Closed" Opened="popup_Opened">
<search:CustomerSearchView x:Name="KlientVertretungsearchview" />
</Popup>
</Grid>
</ScrollViewer>
</localView:BeWoView>

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

@@ -20,7 +20,8 @@ using BeWo.Core.Service;
using BeWo.Scheduler.Converter;
using BeWo.Scheduler.ViewModel;
using BeWo.ServiceProxy;
using BeWo.View.Detail;
using BeWo.ViewModel;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
@@ -48,18 +49,26 @@ namespace BeWo.SchulbegleitenderDienst
{
public List<string> Mitarbeiter { get; set; }
private List<SchulbegleitenderDienst> items = new List<SchulbegleitenderDienst>();
public NewSchulbegleitenderDienstView()
{
InitializeComponent();
GridDataControl.ItemsSource = items;
getAllVertretungenOnLoad(null,DateTime.Now,null);
TestMitarbeiter();
TestSchulBegleitenderDienst();
setAktDate();
//TestMitarbeiter();
//TestSchulBegleitenderDienst();
//SchulbegleitenderDienstList.ItemContainerStyle = (Style)SchulbegleitenderDienstList.Resources["itemstyle"];
}
@@ -91,14 +100,14 @@ namespace BeWo.SchulbegleitenderDienst
//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", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.03.2017 - 13.03.2017", MaFehlzeit = "KEine",KindFehlzeit = "Keine"});
items.Add(new SchulbegleitenderDienst() { Vertretung = "Miss Piggi" , Kunde = "Schlumpfine", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.05.2017 - 13.06.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
items.Add(new SchulbegleitenderDienst() { Vertretung = "Lynchknoten" , Kunde = "Schlumpfine", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.06.2017 - 13.07.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
items.Add(new SchulbegleitenderDienst() { Vertretung = "Franz Dita von HodenKnecht" , Kunde = "Schlumpfine", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "02.03.2017 - 13.03.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
items.Add(new SchulbegleitenderDienst() { Vertretung = "Miss Piggi", Kunde = "Schlumpfine", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.05.2017 - 13.06.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
items.Add(new SchulbegleitenderDienst() { Vertretung = "Miss Piggi", Kunde = "Schlumpfine", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.05.2017 - 13.06.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
items.Add(new SchulbegleitenderDienst() { Kunde = "Schlumpfine", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.05.2017 - 13.06.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
items.Add(new SchulbegleitenderDienst() { Vertretung = "Miss Piggi", Kunde = "Schlumpfine", KrankerMitarbeiter = "Hanz", KrankheitsZeitraum = "10.05.2017 - 13.06.2017", MaFehlzeit = "KEine", KindFehlzeit = "Keine" });
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;
@@ -113,7 +122,16 @@ namespace BeWo.SchulbegleitenderDienst
//hole zuerst alle Daten
Datepicker.DateTime = dt;
}
//MitarbeiterVertretung
MVDatepickerVon.DateTime = dt;
MVDatepickerBis.DateTime = dt;
//KlientenVertretung
KVDatepickerVon.DateTime = dt;
KVDatepickerBis.DateTime = dt;
}
public void ColorDataGrid()
{
@@ -146,69 +164,314 @@ namespace BeWo.SchulbegleitenderDienst
}
}
public object getAllVertretungen(string MitarbeiterAbsenstime, DateTime AusgewähltesDatum, string KlientenAbsenstime)
public void getAllVertretungenOnLoad(string MitarbeiterAbsenstime, DateTime AusgewähltesDatum, string KlientenAbsenstime)
{
//Hole hier alle Vertretungs Objekte raus || für die Liste
return null;
//Erstmal hole alle vertretungen aus der Datenbank und zeige diese an.
var vertretungen = ServiceFacade.DoOperationsServiceSync(s => s.GetAllVertretungen());
items.Clear();
//Muss noch vollendet werden
foreach (var vertritt in vertretungen)
{
AddItemsToGrid(vertritt);
}
GridDataControl.RefreshData();
//------------------------------------------------------------------------------------------------------
//Dann suche mit mit hilfe aller Absense Times und dem gewählten datum alle passenden Daten
}
public void AddItemsToGrid(VertretungDC vertritt)
{
//diese added diese dann falls nicht vorhanden den items hinzu also mit (Vertrtung oid oder so ) vergleichen
items.Add(new SchulbegleitenderDienst()
{
KrankheitsZeitraum = vertritt.VertretungsZeitraumVon + " - " + vertritt.VertretungsZeitraumBis,
KrankerMitarbeiter = vertritt.EmployeeOid.ToString(),
Vertretung = "",
Kunde = vertritt.CustomerOid.ToString(),
KindFehlzeit = "",
MaFehlzeit = "",
AbwesenheitsKategorie = " "
});
}
public void UpdateGridControl()
{
//erstelle ein GetallNewVertretung
//itemlist mit allen Schulbegleitenden diensten übergeben
// liste der der items hinzufügen
}
//######################### Action Event Listener ###########################
private void MitarbeiterList_OnDragEnter(object sender, DragEventArgs e)
{
e.Effects = DragDropEffects.Copy;
}
private void GridDataControl_OnDragEnter(object sender, DragEventArgs e)
{
//items.Add(new SchulbegleitenderDienst() { Vertretung = e.Data.ToString()});
}
private void GridDataControl_OnDragLeave(object sender, DragEventArgs e)
{
MessageBox.Show("Hallo");
}
private void MitarbeiterList_OnDragLeave(object sender, DragEventArgs e)
{
MessageBox.Show("tschüss");
}
private void Datepicker_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
{
var dt = (DateTime) e.NewValue;
Datelbl.Content = dt.ToString("dddd dd.MM.yyyy");
}
}
//------------------------------------------------------------------------------------------------------------------------------------
//################################ Mitarbeiter DatePicker Von - Bis ################################
private void MVDatepickerVon_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
{
var dt = (DateTime)e.NewValue;
if (dt > MVDatepickerBis.DateTime)
{
MVDatepickerBis.DateTime = dt;
}
}
private void MVDatepickerBis_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
{
var dt = (DateTime)e.NewValue;
if(dt < MVDatepickerVon.DateTime) {
MVDatepickerVon.DateTime = dt;
}
}
//##################################################################################################
//-------------------------------------------------------------------------------------------------------------------------------------
//-------------------------------------------------------------------------------------------------------------------------------------
//################################ Klienten Vertrtung Von - Bis ####################################
private void KVDatepickerVon_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
{
var dt = (DateTime)e.NewValue;
if(dt > KVDatepickerBis.DateTime) {
KVDatepickerBis.DateTime = dt;
}
}
private void KVDatepickerBis_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
{
var dt = (DateTime)e.NewValue;
if(dt < MVDatepickerVon.DateTime) {
KVDatepickerVon.DateTime = dt;
}
}
//###################################################################################################
//-------------------------------------------------------------------------------------------------------------------------------------
public void GetAllEmployees()
{
// popupedit_KlientVertretungSearch.Text = "";
//hole alle mit Service Raus
//var a = ServiceFacade.DoEmployeeServiceSync(s => s.GetAllEmployees());
//Dieser Schitt wird wahrscheinlich nicht gebraucht
// List<string> EmployeeString = new List<string>();
//foreach (var employee in a)
//{
// EmployeeString.Add(employee.FirstName+" "+employee.LastName);
//}
//popupedit_environmentPersonSearch2.
}
//-----------------------------------------------------------------------------------------------------------------------------------------------
//#################### Popup GEdöns ##########################################################
private void MitarbeiterVertretung_OnClick(object sender, RoutedEventArgs e)
{
popup_newEnvironmentPerson.IsOpen = true;
popup_newMitarbeiterVertretung.IsOpen = true;
}
private void Button_cancelMitarbeiterVertretung_OnClick(object sender, RoutedEventArgs e)
{
popup_newEnvironmentPerson.IsOpen = false;
popup_newMitarbeiterVertretung.IsOpen = false;
}
private void Popupedit_MitarbeiterVertretungSearch_OnPopUpClick_popupedit_MitarbeiterVertretungSearch_PopUpClick(object sender, RoutedEventArgs e)
{
MitarbeiterVertretungsearchview.ItemSelected += MitarbeiterVertretungsearchview_MitarbeiterVertretungSelected;
popup_MitarbeiterVertretung.IsOpen = true;
}
private void KlientVertretung_Button_OnClick(object sender, RoutedEventArgs e)
{
popup_newKlientVertretung.IsOpen = true;
private void MitarbeiterVertretungsearchview_MitarbeiterVertretungSelected(object sender, EventArgs<CompactEmployeeDC> e)
{
popup_MitarbeiterVertretung.IsOpen = false;
MitarbeiterVertretungsearchview.ItemSelected -= MitarbeiterVertretungsearchview_MitarbeiterVertretungSelected;
}
//hole alle mit Service Raus
var employeeList = ServiceFacade.DoEmployeeServiceSync(s => s.GetAllActiveEmployeesCompact());
private void Button_cancelKlientVertretung_OnClick(object sender, RoutedEventArgs e)
MitarbeiterVertretungsearchview.ObjectList = employeeList;
popupedit_MitarbeiterVertretungSearch.Focus();
}
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;
vertretung.VertretungsZeitraumBis = MVDatepickerBis.DateTime;
vertretung.CustomerOid = 3;
vertretung.EmployeeOid = 1;
//Notice muss noch in die Vertretung eingefügt werden
//vertretung.Notice = "";
ServiceFacade.DoOperationsServiceSync(s => s.InsertNewMitarbeiterVertretung(vertretung));
getAllVertretungenOnLoad(null, DateTime.Now, null);
}
//-------------------------------------------------------------------------------------------------------------------------------------------------------
// ############################ Klienten Vertretungs Popup gedönse ####################################################
private void KlientVertretung_Button_OnClick(object sender, RoutedEventArgs e)
{
popup_newKlientVertretung.IsOpen = true;
}
private void Button_cancelKlientVertretung_OnClick(object sender, RoutedEventArgs e)
{
popup_newKlientVertretung.IsOpen = false;
}
//Ab hier muss noch am Inhalt bearbeitet werden
private void Popupedit_KlientVertretungSearch_OnPopUpClick_popupedit_KlientVertretungSearch_PopUpClick(object sender, RoutedEventArgs e)
{
KlientVertretungsearchview.ItemSelected +=KlientVertretungsearchview_KlientVertretungSelected;
popup_KlientVertretung.IsOpen = true;
}
private void KlientVertretungsearchview_KlientVertretungSelected(object sender, EventArgs<CompactCustomerDC> e)
{
popup_KlientVertretung.IsOpen = false;
KlientVertretungsearchview.ItemSelected -= KlientVertretungsearchview_KlientVertretungSelected;
//hole alle mit Service Raus
var customerList = ServiceFacade.DoCustomerServiceSync(s => s.GetAllActiveCompactCustomers());
KlientVertretungsearchview.ObjectList = customerList;
popupedit_MitarbeiterVertretungSearch.Focus();
}
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;
VertretungDC vertretung = new VertretungDC();
vertretung.VertretungsZeitraumVon = KVDatepickerVon.DateTime;
vertretung.VertretungsZeitraumBis = KVDatepickerBis.DateTime;
vertretung.CustomerOid = 5;
vertretung.EmployeeOid = 2;
//Die Notice muss noch in die Vertretung eingefügt werden.
//vertretung.Notice = "";
//initialisiere object
ServiceFacade.DoOperationsServiceSync(s => s.InsertNewKlientenVertretung(vertretung));
getAllVertretungenOnLoad(null, DateTime.Now, null);
}
//#######################################################################################################################
//----------------------------------------------------------------------------------------------------------------------------------------------------------------
}
@@ -223,6 +486,7 @@ namespace BeWo.SchulbegleitenderDienst
public string Vertretung { get; set; }
public string Kunde { get; set; }
public string KrankerMitarbeiter { get; set; }
public string AbwesenheitsKategorie { get; set; }
public string MaFehlzeit { get; set; }
public string KindFehlzeit { get; set; }
public string KrankheitsZeitraum { get; set; }

1878
BeWo/ServiceProxy/Generated.cs
View File

File diff suppressed because it is too large Load Diff

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

@@ -396,18 +396,20 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0" Margin="3" VerticalAlignment="Center">Vertragsbeginn</Label>
<Label Grid.Column="0" Grid.Row="1" Margin="3" VerticalAlignment="Center">Befristet bis</Label>
<Label Grid.Column="0" Grid.Row="2" Margin="3" VerticalAlignment="Center">beschäftigt als</Label>
<Label Grid.Column="0" Grid.Row="3" Margin="3" VerticalAlignment="Center">Stundensatz</Label>
<Label Grid.Column="0" Grid.Row="4" Margin="3" VerticalAlignment="Center">FLS/Woche</Label>
<Label Grid.Column="0" Grid.Row="5" Margin="3" VerticalAlignment="Center">Gesamtstunden/Woche</Label>
<Label Grid.Column="0" Grid.Row="6" Margin="3" VerticalAlignment="Center">Gesamtstunden/Monat</Label>
<Label Grid.Column="0" Grid.Row="7" Margin="3" VerticalAlignment="Center">Arbeitstage pro Woche</Label>
<Label Grid.Column="0" Grid.Row="8" Margin="3" VerticalAlignment="Center">Urlaubstage</Label>
<Label Grid.Column="0" Grid.Row="9" Margin="3" VerticalAlignment="Center">Probezeit (Tage)</Label>
<Label Grid.Column="0" Grid.Row="10" Margin="3" VerticalAlignment="Center">Künd.-frist (Tage)</Label>
<Label Grid.Column="0" Grid.Row="5" Margin="3" VerticalAlignment="Center">FLS/Monat</Label>
<Label Grid.Column="0" Grid.Row="6" Margin="3" VerticalAlignment="Center">Gesamtstunden/Woche</Label>
<Label Grid.Column="0" Grid.Row="7" Margin="3" VerticalAlignment="Center">Gesamtstunden/Monat</Label>
<Label Grid.Column="0" Grid.Row="8" Margin="3" VerticalAlignment="Center">Arbeitstage pro Woche</Label>
<Label Grid.Column="0" Grid.Row="9" Margin="3" VerticalAlignment="Center">Urlaubstage</Label>
<Label Grid.Column="0" Grid.Row="10" Margin="3" VerticalAlignment="Center">Probezeit (Tage)</Label>
<Label Grid.Column="0" Grid.Row="11" Margin="3" VerticalAlignment="Center">Künd.-frist (Tage)</Label>
<Label Grid.Column="3" Grid.Row="0" Margin="3" VerticalAlignment="Center">Bemerkungen</Label>
@@ -415,13 +417,14 @@
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" AllowNullInput="True" Grid.Column="1" Grid.Row="1" Margin="3" Height="23" EditValue="{Binding Path=ContractEndDate, UpdateSourceTrigger=PropertyChanged}" />
<dxe:ComboBoxEdit Grid.Column="1" Grid.Row="2" Margin="3" Height="23" Name="combobox_employmenttype" ItemsSource="{Binding Path=PossibleEmploymentTypes, UpdateSourceTrigger=PropertyChanged}" SelectedItem="{Binding Path=EmploymentType}" AutoComplete="True" />
<dxe:TextEdit MaskType="Numeric" Mask="c" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="3" Height="23" Margin="3" EditValue="{Binding Path=HourlyRate, UpdateSourceTrigger=PropertyChanged}"/>
<dxe:TextEdit MaskType="Numeric" Mask="########0.000" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="4" Margin="3" Height="23" EditValue="{Binding Path=WeeklyFLS, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="5" Margin="3" Height="23" EditValue="{Binding Path=WeeklyTotalHours, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="6" Margin="3" Height="23" EditValue="{Binding Path=MonthlyTotalHours, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" MaxValue="7" IsFloatValue="False" Grid.Column="1" Grid.Row="7" Margin="3" Height="23" EditValue="{Binding Path=WeeklyDays, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="8" Margin="3" Height="23" EditValue="{Binding Path=LeaveDays, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" IsFloatValue="False" Grid.Column="1" Grid.Row="9" Margin="3" Height="23" EditValue="{Binding Path=ProbationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" IsFloatValue="False" Grid.Column="1" Grid.Row="10" Margin="3" Height="23" EditValue="{Binding Path=CancellationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.000" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="4" Margin="3" Height="23" EditValue="{Binding Path=WeeklyFLS, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.000" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="5" Margin="3" Height="23" EditValue="{Binding Path=MonthlyFLS, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="6" Margin="3" Height="23" EditValue="{Binding Path=WeeklyTotalHours, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="7" Margin="3" Height="23" EditValue="{Binding Path=MonthlyTotalHours, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" MaxValue="7" IsFloatValue="False" Grid.Column="1" Grid.Row="8" Margin="3" Height="23" EditValue="{Binding Path=WeeklyDays, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="9" Margin="3" Height="23" EditValue="{Binding Path=LeaveDays, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" IsFloatValue="False" Grid.Column="1" Grid.Row="10" Margin="3" Height="23" EditValue="{Binding Path=ProbationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" IsFloatValue="False" Grid.Column="1" Grid.Row="11" Margin="3" Height="23" EditValue="{Binding Path=CancellationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<TextBox Grid.Column="3" Grid.Row="1" Grid.RowSpan="8" Margin="3" Text="{Binding Path=Notice, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" VerticalContentAlignment="Stretch"
HorizontalContentAlignment="Left" ScrollViewer.CanContentScroll="False" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap" AcceptsReturn="True" AutoWordSelection="True" />

17
BeWo/View/Detail/ServiceRecordView2.xaml.cs
View File

@@ -88,6 +88,8 @@ namespace BeWo.View.Detail
public ServiceRecordView2(ServiceRecordListVM pViewModel, long? startSupportConceptOid)
{
InitializeComponent();
multiSupportConceptControl.AutoGetAllAfterLoaded = false;
@@ -96,11 +98,13 @@ namespace BeWo.View.Detail
InsertedByColumn.Visible = !BeWoApp.AppSettings.HideServiceRecordInsertedByAndInsertedOn;
InsertedOnColumn.Visible = !BeWoApp.AppSettings.HideServiceRecordInsertedByAndInsertedOn;
_StartSupportConceptOid = startSupportConceptOid;
ViewModel = pViewModel;
//serviceRecordListContent.
// CheckMinStdSwitch.SelectedIndex = 0;
@@ -262,6 +266,7 @@ namespace BeWo.View.Detail
ConfigureEndDate();
UnterschriftenHeader.Visible = BeWoApp.AppSettings.ShowSignatures;
}
private void ConfigureEndDate() {
@@ -4032,10 +4037,16 @@ namespace BeWo.View.Detail
if(MinSTDOhneEnd.Text == ZeiterfassungsDauer.Minuten.ToString()) {
numerictb_duration.IsFloatValue = false;
numerictb_duration.Mask = "########";
BeWoApp.AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Minuten;
BeWoApp.SaveAppSettings();
}
else {
numerictb_duration.IsFloatValue = true;
numerictb_duration.Mask = "########0.00";
BeWoApp.AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Stunden;
BeWoApp.SaveAppSettings();
}
}
@@ -4044,10 +4055,16 @@ namespace BeWo.View.Detail
if (MinSTDMitEnd.Text == ZeiterfassungsDauer.Minuten.ToString()) {
numeric_duration.IsFloatValue = false;
numeric_duration.Mask = "########";
BeWoApp.AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Minuten;
BeWoApp.SaveAppSettings();
}
else {
numeric_duration.IsFloatValue = true;
numeric_duration.Mask = "########0.00";
BeWoApp.AppSettings.LetzteZeiterfassungsDauer = ZeiterfassungsDauer.Stunden;
BeWoApp.SaveAppSettings();
}
}
}

21
BeWo/ViewModel/ContractVM.cs
View File

@@ -19,6 +19,7 @@ namespace BeWo.ViewModel
public static string PropertyName_ContractEndDate = "ContractEndDate";
public static string PropertyName_HourlyRate = "HourlyRate";
public static string PropertyName_WeeklyFLS = "WeeklyFLS";
public static string PropertyName_MonthlyFLS = "MonthlyFLS";
public static string PropertyName_WeeklyTotalHours = "WeeklyTotalHours";
public static string PropertyName_MonthlyTotalHours = "MonthlyTotalHours";
public static string PropertyName_LeaveDays = "LeaveDays";
@@ -31,6 +32,7 @@ namespace BeWo.ViewModel
private decimal? _WeeklyTotalHours;
private decimal? _MonthlyTotalHours;
private decimal? _WeeklyFLS;
private decimal? _MonthlyFLS;
private decimal? _HourlyRate;
private DateTime? _EntryDate;
private DateTime? _ContractEndDate;
@@ -170,6 +172,23 @@ namespace BeWo.ViewModel
}
}
public decimal? MonthlyFLS
{
get { return this._MonthlyFLS; }
set
{
if (this.AreDifferent(this._MonthlyFLS, value))
{
this._MonthlyFLS = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.MonthlyFLS, value), PropertyName_MonthlyFLS);
this.FirePropertyChanged(PropertyName_MonthlyFLS);
}
}
}
public decimal? HourlyRate
{
get { return this._HourlyRate; }
@@ -291,6 +310,7 @@ namespace BeWo.ViewModel
this._ProbationPeriod = pDataContract.ProbationPeriod;
this._WeeklyDays = pDataContract.WeeklyDays;
this._WeeklyFLS = pDataContract.WeeklyFLS;
this._MonthlyFLS = pDataContract.MonthlyFLS;
this._WeeklyTotalHours = pDataContract.WeeklyTotalHours;
_MonthlyTotalHours = pDataContract.MonthlyTotalHours;
this._Notice = pDataContract.Notice;
@@ -308,6 +328,7 @@ namespace BeWo.ViewModel
pDataContract.ProbationPeriod = this._ProbationPeriod;
pDataContract.WeeklyDays = this._WeeklyDays;
pDataContract.WeeklyFLS = this._WeeklyFLS;
pDataContract.MonthlyFLS = this._MonthlyFLS;
pDataContract.WeeklyTotalHours = this._WeeklyTotalHours;
pDataContract.MonthlyTotalHours = _MonthlyTotalHours;
pDataContract.Notice = this._Notice;

1
BeWo/ViewModel/ServiceRecordVM.cs
View File

@@ -218,6 +218,7 @@ namespace BeWo.ViewModel
List<ValueListEntryDC> pAllGoals)
: base(pDC, pDC.ServiceRecordOid == null)
{
_DurationInStunden = BeWoApp.AppSettings.LetzteZeiterfassungsDauer;
_Category2Services = pCategory2Services;
ChangeGoalTree(pAllGoalCategories, pAllGoals);

14
Data/Entities/Contract.cs
View File

@@ -16,6 +16,7 @@ namespace BeWo.Data.Entities
public static string PropertyName_ContractEndDate = "ContractEndDate";
public static string PropertyName_HourlyRate = "HourlyRate";
public static string PropertyName_WeeklyFLS = "WeeklyFLS";
public static string PropertyName_MonthlyFLS = "MonthlyFLS";
public static string PropertyName_WeeklyTotalHours = "WeeklyTotalHours";
public static string PropertyName_MonthlyTotalHours = "MonthlyTotalHours";
public static string PropertyName_LeaveDays = "LeaveDays";
@@ -26,6 +27,7 @@ namespace BeWo.Data.Entities
private decimal? _WeeklyTotalHours;
private decimal? _MonthlyTotalHours;
private decimal? _WeeklyFLS;
private decimal? _MonthlyFLS;
private decimal? _HourlyRate;
private DateTime? _EntryDate;
private DateTime? _ContractEndDate;
@@ -94,6 +96,18 @@ namespace BeWo.Data.Entities
}
}
public virtual decimal? MonthlyFLS
{
get { return _MonthlyFLS; }
set
{
if (base.AreDifferent(_MonthlyFLS, value))
_MonthlyFLS = value;
}
}
public virtual int ProbationPeriod
{
get { return _ProbationPeriod; }

1
Data/Mappings/Contract.hbm.xml
View File

@@ -15,6 +15,7 @@
<property column="EmployeeOid" type="Int64" name="EmployeeOid" update="false" insert="false"/>
<property column="HourlyRate" type="Decimal" name="HourlyRate" />
<property column="WeeklyFLS" type="Decimal" name="WeeklyFLS" />
<property column="MonthlyFLS" type="Decimal" name="MonthlyFLS" />
<property column="WeeklyTotalHours" type="Decimal" name="WeeklyTotalHours" />
<property column="MonthlyTotalHours" type="Decimal" name="MonthlyTotalHours" />
<property column="LeaveDays" type="Decimal" name="LeaveDays" />

3
Model/Changes_2017_03_29.txt Normal file
View File

@@ -0,0 +1,3 @@
ALTER TABLE `1234567890`.`contract`
ADD COLUMN
`MonthlyFLS` DECIMAL(18,10) NULL DEFAULT NULL COMMENT '' AFTER `MonthlyTotalHours`;

2
Service/DCEntityMapper/ContractDC_Contract.cs
View File

@@ -21,6 +21,7 @@ namespace BeWo.Service.DCEntityMapper
if (pDataContract.WeeklyDays == 0)
pDataContract.WeeklyDays = 5;
pDataContract.WeeklyFLS = pEntity.WeeklyFLS;
pDataContract.MonthlyFLS = pEntity.MonthlyFLS;
pDataContract.WeeklyTotalHours = pEntity.WeeklyTotalHours;
pDataContract.MonthlyTotalHours = pEntity.MonthlyTotalHours;
pDataContract.Notice = pEntity.Notice;
@@ -45,6 +46,7 @@ namespace BeWo.Service.DCEntityMapper
pEntity.ProbationPeriod = pDataContract.ProbationPeriod;
pEntity.WeeklyDays = pDataContract.WeeklyDays;
pEntity.WeeklyFLS = pDataContract.WeeklyFLS;
pEntity.MonthlyFLS = pDataContract.MonthlyFLS;
pEntity.WeeklyTotalHours = pDataContract.WeeklyTotalHours;
pEntity.MonthlyTotalHours = pDataContract.MonthlyTotalHours;
pEntity.Notice = pDataContract.Notice;

12
Service/ServiceContracts/IOperationsService.cs
View File

@@ -581,5 +581,17 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<ServiceRecordDC> GetCustomerServiceRecordsCompactWithStartEndDate(long pCustomerOid, long costbearer2SupportConceptOid, DateTime start, DateTime ende);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<VertretungDC> GetAllVertretungen();
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void InsertNewMitarbeiterVertretung(VertretungDC vertretungM);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void InsertNewKlientenVertretung(VertretungDC vertretungK);
}
}

44
Service/ServiceImplementations/OperationsServiceImp.cs
View File

@@ -3467,6 +3467,50 @@ namespace BeWo.Service.ServiceImplementations
}
}
//all new Audi ##############################################
public List<VertretungDC>GetAllVertretungen()
{
try
{
return MapperFactory.VertretungDC_Vertretung.MapToNewDCs(DAOFactory.GenericDAO.GetAllActive<Vertretung>());
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public void InsertNewMitarbeiterVertretung(VertretungDC vertretungM)
{
try
{
var lVertretung = MapperFactory.VertretungDC_Vertretung.MapToNewEntity(vertretungM);
DAOFactory.GenericDAO.Insert(lVertretung);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public void InsertNewKlientenVertretung(VertretungDC vertretungK)
{
try
{
var lVertretung = MapperFactory.VertretungDC_Vertretung.MapToNewEntity(vertretungK);
DAOFactory.GenericDAO.Insert(lVertretung);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
//#################################################################
#endregion
#endregion

3
Shared/DataContracts/ContractDC.cs
View File

@@ -24,6 +24,9 @@ namespace BS.Shared.DataContracts
[DataMember]
public decimal? WeeklyFLS { get; set; }
[DataMember]
public decimal? MonthlyFLS { get; set; }
[DataMember]
public decimal? HourlyRate { get; set; }