diff --git a/.gitignore b/.gitignore index a3f60446f..036b46383 100644 --- a/.gitignore +++ b/.gitignore @@ -524,3 +524,13 @@ /ReportImp/Kette2/obj/DebugRemote /ReportImp/DomizielAnsbach/obj/Debug /ReportImp/DomizielAnsbach/obj/Release +/ReportImp/AbwMuenster/obj/Debug +/ReportImp/AbwMuenster/obj/Release +/ReportImp/InFamiliaGbr/obj/Debug +/ReportImp/InFamiliaGbr/obj/Release +/ReportImp/LebenshilfeDuisburgBeWo/obj/Debug +/ReportImp/LebenshilfeDuisburgBeWo/obj/Release +/ReportImp/LebenshilfeDuisburgHPFH/obj/Debug +/ReportImp/LebenshilfeDuisburgHPFH/obj/Release +/ReportImp/LebenshilfeDuisburgHPTG/obj/Debug +/ReportImp/LebenshilfeDuisburgHPTG/obj/Release diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index ee0f208ce..cf3e672e8 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -43,12 +43,12 @@ de-DE BeWoPlaner beyondSoft GmbH - 2.0.1.204 + 2.0.1.205 true publish.htm false true - 205 + 206 2.0.1.%2a false true @@ -817,6 +817,7 @@ + UploadDialog.xaml diff --git a/BeWo/View/Controls/ComboBoxTreeViewControl.xaml.cs b/BeWo/View/Controls/ComboBoxTreeViewControl.xaml.cs index 709ced7f3..3865156bc 100644 --- a/BeWo/View/Controls/ComboBoxTreeViewControl.xaml.cs +++ b/BeWo/View/Controls/ComboBoxTreeViewControl.xaml.cs @@ -225,6 +225,10 @@ namespace BeWo.View.Controls return; } + if (ratingPanel.Children.Count == 0) + { + return; + } if (lastCheckedSupportConceptGoal == null) { return; diff --git a/BeWo/View/Detail/AdditionalServiceView.xaml b/BeWo/View/Detail/AdditionalServiceView.xaml index f9549bbc0..956fc9e2d 100644 --- a/BeWo/View/Detail/AdditionalServiceView.xaml +++ b/BeWo/View/Detail/AdditionalServiceView.xaml @@ -431,7 +431,7 @@ - diff --git a/BeWo/View/Detail/EmployeeView.xaml.cs b/BeWo/View/Detail/EmployeeView.xaml.cs index bd3a81110..eef99656b 100644 --- a/BeWo/View/Detail/EmployeeView.xaml.cs +++ b/BeWo/View/Detail/EmployeeView.xaml.cs @@ -140,14 +140,15 @@ namespace BeWo.View.Detail if (BeWoApp.AppSettings.ShowUrlaubsplanung) { - tabitem_documents.Visibility = Visibility.Visible; + LeaveDaysTabItem.Visibility = Visibility.Visible; } else { - tabitem_notizen.Visibility = Visibility.Collapsed; + LeaveDaysTabItem.Visibility = Visibility.Collapsed; } - //Employee Image - if (_ViewModel.EmployeeImage != null) + + //Employee Image + if (_ViewModel.EmployeeImage != null) { using (var ms = new System.IO.MemoryStream(_ViewModel.EmployeeImage)) { diff --git a/BeWo/View/Detail/RatingTypeView.xaml b/BeWo/View/Detail/RatingTypeView.xaml index b6909c171..10b93a2e7 100644 --- a/BeWo/View/Detail/RatingTypeView.xaml +++ b/BeWo/View/Detail/RatingTypeView.xaml @@ -30,7 +30,7 @@ -