From d2ce4767596f45134bca9bd231964e23f9ccb03e Mon Sep 17 00:00:00 2001 From: Waldi Date: Mon, 27 Mar 2017 13:17:30 +0200 Subject: [PATCH] Zeiterfassung Designer komma fix --- .../View/Detail/ServiceRecordEditView.xaml.cs | 43 ++++++---- .../Detail/ServiceRecordGroupEditView.xaml.cs | 42 ++++++---- BeWo/View/Detail/ServiceRecordView2.xaml.cs | 78 ++++++++++--------- 3 files changed, 94 insertions(+), 69 deletions(-) diff --git a/BeWo/View/Detail/ServiceRecordEditView.xaml.cs b/BeWo/View/Detail/ServiceRecordEditView.xaml.cs index 9248f6ed6..4e1b8457b 100644 --- a/BeWo/View/Detail/ServiceRecordEditView.xaml.cs +++ b/BeWo/View/Detail/ServiceRecordEditView.xaml.cs @@ -209,13 +209,17 @@ namespace BeWo.View.Detail MinSTDMitEnd.Visibility = Visibility.Visible; MinStdDauerlbl.SetValue(Grid.ColumnProperty, 0); numeric_duration.SetValue(Grid.ColumnProperty, 1); - numeric_duration.IsFloatValue = true; - numeric_duration.Mask = "########0.##"; - } - else - { - numeric_duration.IsFloatValue = false; - numeric_duration.Mask = "########"; + + if (MinSTDMitEnd.Text == ZeiterfassungsDauer.Stunden.ToString()) + { + numeric_duration.IsFloatValue = true; + numeric_duration.Mask = "########0.##"; + } + else + { + numeric_duration.IsFloatValue = false; + numeric_duration.Mask = "########"; + } } } else @@ -241,15 +245,20 @@ namespace BeWo.View.Detail if (Settings.IsZeiterfassungInStdMin || zsd == ZeiterfassungsDauer.Stunden) { MinSTDOhneEnd.Visibility = Visibility.Visible; - MinStdDauerLabel.SetValue(Grid.ColumnProperty,0); - numerictb_duration.SetValue(Grid.ColumnProperty,1); + MinStdDauerLabel.SetValue(Grid.ColumnProperty, 0); + numerictb_duration.SetValue(Grid.ColumnProperty, 1); MinStdDauerLabel.Content = "Dauer"; - numerictb_duration.IsFloatValue = true; - numerictb_duration.Mask = "########0.##"; - } - else { - numerictb_duration.IsFloatValue = false; - numerictb_duration.Mask = "########"; + + if (MinSTDOhneEnd.Text == ZeiterfassungsDauer.Stunden.ToString()) + { + numerictb_duration.IsFloatValue = true; + numerictb_duration.Mask = "########0.##"; + } + else + { + numerictb_duration.IsFloatValue = false; + numerictb_duration.Mask = "########"; + } } } @@ -526,12 +535,12 @@ namespace BeWo.View.Detail if (MinSTDOhneEnd.Text == ZeiterfassungsDauer.Minuten.ToString()) { numerictb_duration.IsFloatValue = false; - numeric_duration.Mask = "########"; + numerictb_duration.Mask = "########"; } else { numerictb_duration.IsFloatValue = true; - numeric_duration.Mask = "########0.##"; + numerictb_duration.Mask = "########0.##"; } } diff --git a/BeWo/View/Detail/ServiceRecordGroupEditView.xaml.cs b/BeWo/View/Detail/ServiceRecordGroupEditView.xaml.cs index 16d81e717..480e6c1f0 100644 --- a/BeWo/View/Detail/ServiceRecordGroupEditView.xaml.cs +++ b/BeWo/View/Detail/ServiceRecordGroupEditView.xaml.cs @@ -699,13 +699,17 @@ namespace BeWo.View.Detail MinSTDMitEnd.Visibility = Visibility.Visible; MinStdDauerlbl.SetValue(Grid.ColumnProperty, 0); numeric_duration.SetValue(Grid.ColumnProperty, 1); - numeric_duration.IsFloatValue = true; - numeric_duration.Mask = "########0.##"; - } - else - { - numeric_duration.IsFloatValue = false; - numeric_duration.Mask = "########"; + + if (MinSTDMitEnd.Text == ZeiterfassungsDauer.Stunden.ToString()) + { + numeric_duration.IsFloatValue = true; + numeric_duration.Mask = "########0.##"; + } + else + { + numeric_duration.IsFloatValue = false; + numeric_duration.Mask = "########"; + } } } else @@ -721,7 +725,7 @@ namespace BeWo.View.Detail lblDistance.SetValue(Grid.ColumnSpanProperty, 2); - } + } else { GridOhneEnddatum.Visibility = Visibility.Visible; @@ -735,13 +739,19 @@ namespace BeWo.View.Detail MinStdDauerLabel.SetValue(Grid.ColumnProperty, 0); numerictb_duration.SetValue(Grid.ColumnProperty, 1); MinStdDauerLabel.Content = "Dauer"; - numerictb_duration.IsFloatValue = true; - numerictb_duration.Mask = "########0.##"; - } else { - numerictb_duration.IsFloatValue = false; - numerictb_duration.Mask = "########"; + + if (MinSTDOhneEnd.Text == ZeiterfassungsDauer.Stunden.ToString()) + { + numerictb_duration.IsFloatValue = true; + numerictb_duration.Mask = "########0.##"; + } + else + { + numerictb_duration.IsFloatValue = false; + numerictb_duration.Mask = "########"; + } } - + } } @@ -764,12 +774,12 @@ namespace BeWo.View.Detail if (MinSTDOhneEnd.Text == ZeiterfassungsDauer.Minuten.ToString()) { numerictb_duration.IsFloatValue = false; - numeric_duration.Mask = "########"; + numerictb_duration.Mask = "########"; } else { numerictb_duration.IsFloatValue = true; - numeric_duration.Mask = "########0.##"; + numerictb_duration.Mask = "########0.##"; } } } diff --git a/BeWo/View/Detail/ServiceRecordView2.xaml.cs b/BeWo/View/Detail/ServiceRecordView2.xaml.cs index 87a5721ce..cac341126 100644 --- a/BeWo/View/Detail/ServiceRecordView2.xaml.cs +++ b/BeWo/View/Detail/ServiceRecordView2.xaml.cs @@ -280,19 +280,20 @@ namespace BeWo.View.Detail numerictb_distance.SetValue(HorizontalAlignmentProperty, HorizontalAlignment.Right); lblDistance.SetValue(HorizontalAlignmentProperty, HorizontalAlignment.Left); } - else - if (Settings.IsEndDateVisible) - { - GridMitEnddatum.Visibility = Visibility.Visible; - GridMitJahrMonat.Visibility = Visibility.Collapsed; - GridOhneEnddatum.Visibility = Visibility.Collapsed; + else if (Settings.IsEndDateVisible) + { + GridMitEnddatum.Visibility = Visibility.Visible; + GridMitJahrMonat.Visibility = Visibility.Collapsed; + GridOhneEnddatum.Visibility = Visibility.Collapsed; - - if (Settings.IsZeiterfassungInStdMin) - { - MinSTDMitEnd.Visibility = Visibility.Visible; - MinStdDauerlbl.SetValue(Grid.ColumnProperty, 0); - numeric_duration.SetValue(Grid.ColumnProperty, 1); + + if (Settings.IsZeiterfassungInStdMin) + { + MinSTDMitEnd.Visibility = Visibility.Visible; + MinStdDauerlbl.SetValue(Grid.ColumnProperty, 0); + numeric_duration.SetValue(Grid.ColumnProperty, 1); + + if (MinSTDMitEnd.Text == ZeiterfassungsDauer.Stunden.ToString()) { numeric_duration.IsFloatValue = true; numeric_duration.Mask = "########0.##"; } @@ -301,30 +302,34 @@ namespace BeWo.View.Detail numeric_duration.IsFloatValue = false; numeric_duration.Mask = "########"; } - - EndDatumHeader.Visible = true; - - numerictb_distance.SetValue(WidthProperty, (double)47); - numerictb_distance.SetValue(HorizontalAlignmentProperty, HorizontalAlignment.Right); - } - else + + EndDatumHeader.Visible = true; + + numerictb_distance.SetValue(WidthProperty, (double)47); + numerictb_distance.SetValue(HorizontalAlignmentProperty, HorizontalAlignment.Right); + + } + else + { + GridMitEnddatum.Visibility = Visibility.Collapsed; + GridMitJahrMonat.Visibility = Visibility.Collapsed; + GridOhneEnddatum.Visibility = Visibility.Visible; + + //Collapse Zeit art und ändere namen von Dauer aufs originale zurück. + RoundedDHeader.Header = "Minuten"; + DutationInSTDHeader.Visible = false; + + + if (Settings.IsZeiterfassungInStdMin) { - GridMitEnddatum.Visibility = Visibility.Collapsed; - GridMitJahrMonat.Visibility = Visibility.Collapsed; - GridOhneEnddatum.Visibility = Visibility.Visible; + MinSTDOhneEnd.Visibility = Visibility.Visible; + MinStdDauerLabel.SetValue(Grid.ColumnProperty, 0); + numerictb_duration.SetValue(Grid.ColumnProperty, 1); + MinStdDauerLabel.Content = "Dauer"; - //Collapse Zeit art und ändere namen von Dauer aufs originale zurück. - RoundedDHeader.Header = "Minuten"; - DutationInSTDHeader.Visible = false; - - - if (Settings.IsZeiterfassungInStdMin) + if (MinSTDOhneEnd.Text == ZeiterfassungsDauer.Stunden.ToString()) { - MinSTDOhneEnd.Visibility = Visibility.Visible; - MinStdDauerLabel.SetValue(Grid.ColumnProperty, 0); - numerictb_duration.SetValue(Grid.ColumnProperty, 1); - MinStdDauerLabel.Content = "Dauer"; numerictb_duration.IsFloatValue = true; numerictb_duration.Mask = "########0.##"; } @@ -333,10 +338,11 @@ namespace BeWo.View.Detail numerictb_duration.IsFloatValue = false; numerictb_duration.Mask = "########"; } - - EndDatumHeader.Visible = false; } + EndDatumHeader.Visible = false; + } + } private void ConfigureDocTypes() @@ -4019,11 +4025,11 @@ namespace BeWo.View.Detail { if(MinSTDOhneEnd.Text == ZeiterfassungsDauer.Minuten.ToString()) { numerictb_duration.IsFloatValue = false; - numeric_duration.Mask = "########"; + numerictb_duration.Mask = "########"; } else { numerictb_duration.IsFloatValue = true; - numeric_duration.Mask = "########0.##"; + numerictb_duration.Mask = "########0.##"; } }