From 51f8ff9b5da975dd4723a276176bda80ce034ce2 Mon Sep 17 00:00:00 2001
From: Marcel Hirschle <marcel.hirschle@ownsoft.de>
Date: Thu, 15 Dec 2022 13:21:56 +0100
Subject: [PATCH] =?UTF-8?q?MH:=20Button=20hinzugef=C3=BCgt,=20der=20alle?=
 =?UTF-8?q?=20Mitarbeiter=20f=C3=BCr=20eine=20Hilfeplanaufgabe=20hinzuf?=
 =?UTF-8?q?=C3=BCgt=20+=20Haus=20Duelken=20fix=20in=20AZE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BeWo.sln                                      | 19 +++++++++++
 BeWo/View/Detail/SupportConceptView.xaml      |  5 ++-
 BeWo/View/Detail/SupportConceptView.xaml.cs   | 34 +++++++++++++++++++
 Data/Access/SearchDAO.cs                      |  3 +-
 .../Translation/TranslationDictionary.cs      |  1 +
 ...CustomMitarbeiterstundenkontoBerechnung.cs |  2 +-
 6 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/BeWo.sln b/BeWo.sln
index c85be1e2e..9eea3e3bb 100644
--- a/BeWo.sln
+++ b/BeWo.sln
@@ -567,6 +567,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BellaDonna", "ReportImp\Bel
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BehindertNaUnd", "ReportImp\BehindertNaUnd\BehindertNaUnd.csproj", "{13735B44-C4A2-467A-85C3-BDFD9939EE77}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HausDuelken", "ReportImp\HausDuelken\HausDuelken.csproj", "{ED3DBD24-B774-41E5-A856-99FF78D828A8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|.NET = Debug|.NET
@@ -4490,6 +4492,22 @@ Global
 		{13735B44-C4A2-467A-85C3-BDFD9939EE77}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{13735B44-C4A2-467A-85C3-BDFD9939EE77}.Release|x86.ActiveCfg = Release|Any CPU
 		{13735B44-C4A2-467A-85C3-BDFD9939EE77}.Release|x86.Build.0 = Release|Any CPU
+		{ED3DBD24-B774-41E5-A856-99FF78D828A8}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{ED3DBD24-B774-41E5-A856-99FF78D828A8}.Debug|.NET.Build.0 = Debug|Any CPU
+		{ED3DBD24-B774-41E5-A856-99FF78D828A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED3DBD24-B774-41E5-A856-99FF78D828A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED3DBD24-B774-41E5-A856-99FF78D828A8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ED3DBD24-B774-41E5-A856-99FF78D828A8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ED3DBD24-B774-41E5-A856-99FF78D828A8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ED3DBD24-B774-41E5-A856-99FF78D828A8}.Debug|x86.Build.0 = Debug|Any CPU
+		{ED3DBD24-B774-41E5-A856-99FF78D828A8}.Release|.NET.ActiveCfg = Release|Any CPU
+		{ED3DBD24-B774-41E5-A856-99FF78D828A8}.Release|.NET.Build.0 = Release|Any CPU
+		{ED3DBD24-B774-41E5-A856-99FF78D828A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ED3DBD24-B774-41E5-A856-99FF78D828A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ED3DBD24-B774-41E5-A856-99FF78D828A8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{ED3DBD24-B774-41E5-A856-99FF78D828A8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{ED3DBD24-B774-41E5-A856-99FF78D828A8}.Release|x86.ActiveCfg = Release|Any CPU
+		{ED3DBD24-B774-41E5-A856-99FF78D828A8}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -4769,6 +4787,7 @@ Global
 		{0814AFF5-295C-457A-9741-2BE309E9D437} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{DEC65E83-5B19-42EC-A75E-C0A6AE700567} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{13735B44-C4A2-467A-85C3-BDFD9939EE77} = {D8A691C5-146D-4613-86CC-438F02FE9106}
+		{ED3DBD24-B774-41E5-A856-99FF78D828A8} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}
diff --git a/BeWo/View/Detail/SupportConceptView.xaml b/BeWo/View/Detail/SupportConceptView.xaml
index 07232c222..dee607513 100644
--- a/BeWo/View/Detail/SupportConceptView.xaml
+++ b/BeWo/View/Detail/SupportConceptView.xaml
@@ -1137,7 +1137,10 @@
 													<Line X1="8" X2="8" Y1="4" Y2="12" Fill="{x:Null}" Stroke="#FFFFFFFF" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeThickness="2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="16" Height="16" />
 												</Grid>
 											</Button>
-										</StackPanel>
+                                            <Button x:Name="button_addAllEmployee" HorizontalAlignment="Right" VerticalAlignment="Top" Height="21" Margin="3" Click="button_addAllEmployee_Click" Content="{markup:Translate Für alle Mitarbeiter}" ToolTip="{markup:Translate Aufgabe allen Mitarbeitern hinzufügen}" />
+
+
+                                        </StackPanel>
 										<ListView Grid.Row="1" Grid.Column="2" Grid.RowSpan="2" Margin="3" HorizontalAlignment="Stretch" Height="100" ScrollViewer.VerticalScrollBarVisibility="Auto" ItemsSource="{Binding Tasks.NewVM.EmployeeList}" x:Name="taskEmployeeListView">
 											<ListView.ItemContainerStyle>
 												<Style TargetType="{x:Type ListBoxItem}">
diff --git a/BeWo/View/Detail/SupportConceptView.xaml.cs b/BeWo/View/Detail/SupportConceptView.xaml.cs
index 9f99b8bec..d0c164fc9 100644
--- a/BeWo/View/Detail/SupportConceptView.xaml.cs
+++ b/BeWo/View/Detail/SupportConceptView.xaml.cs
@@ -707,6 +707,38 @@ namespace BeWo.View.Detail
         {
             popup_employee.IsOpen = true;
         }
+        private void button_addAllEmployee_Click(object sender, RoutedEventArgs e)
+        {
+            if (MessageBox.Show("Wollen Sie die Aufgabe " + Translator.Translate("jedem Mitarbeiter") + " zuordnen?", "Achtung", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) == MessageBoxResult.Yes)
+            {
+                var allEmployee = ServiceFacade.DoEmployeeServiceSync(s => s.GetAllActiveEmployeesCompact());
+                //var relations = SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations;
+
+                foreach (var emp in allEmployee)
+                {
+                    if (employeeEditFlag)
+                    {
+                        var data = grid_tasks.View.FocusedRowData;
+
+                        if (data?.RowHandle != null)
+                        {
+                            var vm = grid_tasks.GetRow(data.RowHandle.Value) as SchedulerAppointmentVM;
+
+                            if (!vm.EmployeeList.Exists(i => i.Employee.EmployeeOid.Equals(emp.EmployeeOid)))
+                            {
+                                vm.EmployeeList.Add(new Employee2SchedulerAppointmentDC { Employee = emp });
+                            }
+                        }
+                    }
+                    else if (!ViewModel.Tasks.NewVM.EmployeeList.Exists(i => i.Employee.EmployeeOid.Equals(emp.EmployeeOid)))
+                    {
+                        ViewModel.Tasks.NewVM.EmployeeList.Add(new Employee2SchedulerAppointmentDC { Employee = emp });
+                    }
+                }
+
+                employeeEditFlag = false;
+            }
+        }
 
         private readonly List<SchedulerAppointmentDC> _DeletedTasks = new List<SchedulerAppointmentDC>();
 
@@ -1917,6 +1949,8 @@ namespace BeWo.View.Detail
             }
 
         }
+
+        
     }
 
     public class ValueListEntryTypeToColorConverter : IValueConverter
diff --git a/Data/Access/SearchDAO.cs b/Data/Access/SearchDAO.cs
index 5ae9bd464..72c68b595 100644
--- a/Data/Access/SearchDAO.cs
+++ b/Data/Access/SearchDAO.cs
@@ -104,7 +104,8 @@ namespace BeWo.Data.Access
         {
             var c = CreateCriteria<DienstEintrag>()
                 .Add(Restrictions.Eq("WohnheimOid", wOid))
-                .Add(Restrictions.Between("Datum", start, end));
+                .Add(Restrictions.Between("Datum", start, end))
+                .Add(Restrictions.Eq("IsActive", ActivationTypeId.Active));
 
             return c.List<DienstEintrag>();
         } 
diff --git a/ReportImp/BellaDonna/Translation/TranslationDictionary.cs b/ReportImp/BellaDonna/Translation/TranslationDictionary.cs
index 304bb6e89..65b81144c 100644
--- a/ReportImp/BellaDonna/Translation/TranslationDictionary.cs
+++ b/ReportImp/BellaDonna/Translation/TranslationDictionary.cs
@@ -181,6 +181,7 @@ namespace BellaDonna.Translation
             AddOrReplaceTranslation(dict, "Mitarbeiterabschlüsse", "Abschlüsse von Mitarbeiter:innen");
             AddOrReplaceTranslation(dict, "Rollen der Mitarbeiter", "Rollen der Mitarbeiter:innen");
             AddOrReplaceTranslation(dict, "Mitarbeiter Notiz Kategorie", "Mitarbeiter:in Notiz Kategorie");
+            AddOrReplaceTranslation(dict, "Aufgabe allen Mitarbeitern hinzufügen", "Aufgabe allen Mitarbeiter:innen hinzufügen");
 
 
             //BENUTZER
diff --git a/ReportImp/HausDuelken/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/HausDuelken/CustomMitarbeiterstundenkontoBerechnung.cs
index 418338343..fdf2676f4 100644
--- a/ReportImp/HausDuelken/CustomMitarbeiterstundenkontoBerechnung.cs
+++ b/ReportImp/HausDuelken/CustomMitarbeiterstundenkontoBerechnung.cs
@@ -66,7 +66,7 @@ namespace HausDuelken
                         if (item.ServiceDescription != null &&
                             item.ServiceDescription.ServiceCategory != null)
                         {
-                            if (item.ServiceDescription.ServiceCategory.Name == "Arbeit")
+                            if (item.ServiceDescription.ServiceCategory.Name == "Arbeit" || item.ServiceDescription.ServiceCategory.Name == "Arbeitszeit")
                             {
                                 arbeitszeit += duration;
                             }