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

Reihenfolge der "täglich" Checkbox geändert

Browse Source
This commit is contained in:
Christian
2017-09-19 08:20:30 +02:00
parent b02e515b3b
commit cef1cb349a
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml
View File

@@ -105,8 +105,8 @@
<Label Grid.Row="0" Grid.Column="0" Content="Mitarbeiter/in" />
<Label Grid.Row="2" Grid.Column="0" Content="Abwesenheitskategorie" />
<Label Grid.Row="3" Grid.Column="0" Content="Meldung vom" />
<Label Grid.Row="5" Grid.Column="0" Content="Startdatum" />
<Label Grid.Row="6" Grid.Column="0" Content="Enddatum" />
<Label Grid.Row="4" Grid.Column="0" Content="Startdatum" />
<Label Grid.Row="5" Grid.Column="0" Content="Enddatum" />
<Label Grid.Row="7" Grid.Column="0" Content="Uhrzeit Von" x:Name="MVLabelUhrzeitVon" />
<Label Grid.Row="8" Grid.Column="0" Content="Uhrzeit Bis" x:Name="MVLabelUhrzeitBis" />
<Label Grid.Row="9" Grid.Column="0" Content="Notiz" />
@@ -125,13 +125,13 @@
<dxe:DateEdit x:Name="KrankMeldungMitarbeiterDatepicker" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="3" Margin="3" Height="23" EditValueChanged="MVDatepickerVon_OnEditValueChanged"/>
<CheckBox Grid.Column="1" Grid.Row="4" Unchecked="MitarbeiterVertretungsToggleButton_OnUnchecked" Checked="MitarbeiterVertretungsToggleButton_OnChecked"
Grid.ColumnSpan="2" HorizontalAlignment="Right" x:Name="MVCheckBox" Content="ganztägig"/>
<CheckBox Grid.Column="1" Grid.Row="6" Unchecked="MitarbeiterVertretungsToggleButton_OnUnchecked" Checked="MitarbeiterVertretungsToggleButton_OnChecked"
Grid.ColumnSpan="2" HorizontalAlignment="Left" x:Name="MVCheckBox" Content="ganztägig" Margin="3"/>
<dxe:DateEdit x:Name="MVDatepickerVon" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="5" 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="MVDatepickerBis" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="6" 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" />
<dxe:TextEdit Grid.Column="2" Grid.Row="7" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True" x:Name="MVDatepicker_UhrzeitVon"
MaskUseAsDisplayFormat="True" InvalidValueBehavior="AllowLeaveEditor"
@@ -196,8 +196,8 @@
<Label Grid.Row="0" Grid.Column="0" Content="Klient/in" />
<Label Grid.Row="1" Grid.Column="0" Content="Abwesenheitskategorie" />
<Label Grid.Row="2" Grid.Column="0" Content="Meldung vom" />
<Label Grid.Row="4" Grid.Column="0" Content="Startdatum" />
<Label Grid.Row="5" Grid.Column="0" Content="Enddatum" />
<Label Grid.Row="3" Grid.Column="0" Content="Startdatum" />
<Label Grid.Row="4" Grid.Column="0" Content="Enddatum" />
<Label Grid.Row="6" Grid.Column="0" Content="Uhrzeit Von" x:Name="KVLabelUhrzeitVon" />
<Label Grid.Row="7" Grid.Column="0" Content="Uhrzeit Bis" x:Name="KVLabelUhrzeitBis"/>
@@ -215,13 +215,13 @@
<dxe:DateEdit x:Name="KrankMeldungKlientDatepicker" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="KVDatepickerVon_OnEditValueChanged"/>
<CheckBox Grid.Column="1" Grid.Row="3" Content="ganztägig" Unchecked="KlientVertretungsToggleButton_OnUnchecked" Checked="KlientVertretungsToggleButton_OnChecked"
Grid.ColumnSpan="2" HorizontalAlignment="Right" x:Name="KVCheckBox" />
<CheckBox Grid.Column="1" Grid.Row="5" Content="ganztägig" Unchecked="KlientVertretungsToggleButton_OnUnchecked" Checked="KlientVertretungsToggleButton_OnChecked"
Grid.ColumnSpan="2" HorizontalAlignment="Left" x:Name="KVCheckBox" Margin="3"/>
<dxe:DateEdit x:Name="KVDatepickerVon" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="KVDatepickerVon_OnEditValueChanged"/>
<dxe:DateEdit x:Name="KVDatepickerVon" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="KVDatepickerVon_OnEditValueChanged"/>
<dxe:DateEdit x:Name="KVDatepickerBis" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="5" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="KVDatepickerBis_OnEditValueChanged"/>
<dxe:DateEdit x:Name="KVDatepickerBis" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="2" Margin="3" Height="23" EditValueChanged="KVDatepickerBis_OnEditValueChanged"/>
<dxe:TextEdit Grid.Column="1" Grid.Row="6" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True" x:Name="KVDatepicker_UhrzeitVon"

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

@@ -51,7 +51,11 @@ namespace BeWo.SchulbegleitenderDienst
setAktDate();
SetAbwesenheiten();
}
MVCheckBox.IsChecked = true;
KVCheckBox.IsChecked = true;
}
private void SetAbwesenheiten()
{

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

@@ -794,7 +794,7 @@
ItemsSource="{Binding Path=PrototypeVM.MonateBinden}" />
<Label Content="Stunden" Grid.Column="0" Grid.Row="2"/>
<dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="True" AllowNullInput="False" x:Name="numeric_duration3" Mask="########0.##" MaskUseAsDisplayFormat="True"
<dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="True" AllowNullInput="False" x:Name="numeric_duration3" Mask="########0.00" MaskUseAsDisplayFormat="True"
EditValue="{Binding Path=PrototypeVM.DurationMonthYearGes, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="3" Grid.Row="2"
Height="23" Margin="3,0,3,3"/>