diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index a4efe3d12..61dcca35d 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -311,7 +311,7 @@
MSBuild:Compile
Designer
-
+
MSBuild:Compile
Designer
@@ -1008,8 +1008,8 @@
OwnChatSettingsView.xaml
-
- SchedulerEmployeeInformationView.xaml
+
+ InformationView.xaml
diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml b/BeWo/Scheduler/View/NewSchedulerView.xaml
index 75c3cfdb3..921b8da2f 100644
--- a/BeWo/Scheduler/View/NewSchedulerView.xaml
+++ b/BeWo/Scheduler/View/NewSchedulerView.xaml
@@ -690,7 +690,7 @@
-
+
diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs
index 8e2011ad4..e524e63a6 100644
--- a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs
+++ b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs
@@ -2470,7 +2470,8 @@ namespace BeWo.Scheduler.View
CompactEmployeeDC emp = (CompactEmployeeDC)datacontext;
//popup_infos_employee.IsOpen = true; //Wird nicht gefunden
- var control = new SchedulerEmployeeInformationView();
+ var control = new InformationView();
+ control.InitView(emp);
var beWoWindow = new BeWoWindow();
control.ButtonCloseClicked += () => beWoWindow.Close();
@@ -2484,10 +2485,10 @@ namespace BeWo.Scheduler.View
beWoWindow.ShowDialog();
}
- private void popup_button_infos_employee_Click(object sender, RoutedEventArgs e)
- {
+ //private void popup_button_infos_employee_Click(object sender, RoutedEventArgs e)
+ //{
- }
+ //}
}
#region Converter
diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs
index 70d877786..2bbca4558 100644
--- a/BeWo/ServiceProxy/Generated.cs
+++ b/BeWo/ServiceProxy/Generated.cs
@@ -5192,6 +5192,13 @@ namespace BeWo.ServiceProxy
"", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
string GetColorForServiceRecordView2();
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAdditionalEmployeeInformationForSchedule" +
+ "r", ReplyAction="http://tempuri.org/IOperationsService/GetAdditionalEmployeeInformationForSchedule" +
+ "rResponse")]
+ [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAdditionalEmployeeInformationForSchedule" +
+ "rBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+ System.Collections.Generic.Dictionary GetAdditionalEmployeeInformationForScheduler(long empOid);
+
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceBookings", ReplyAction="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceBookingsResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceBookingsBeWoFault" +
"Fault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
@@ -6421,6 +6428,11 @@ namespace BeWo.ServiceProxy
return base.Channel.GetColorForServiceRecordView2();
}
+ public System.Collections.Generic.Dictionary GetAdditionalEmployeeInformationForScheduler(long empOid)
+ {
+ return base.Channel.GetAdditionalEmployeeInformationForScheduler(empOid);
+ }
+
public System.Collections.Generic.List InsertNewAdditionalServiceBookings(System.Collections.Generic.List pAdditionalServiceBookings)
{
return base.Channel.InsertNewAdditionalServiceBookings(pAdditionalServiceBookings);
diff --git a/BeWo/View/Detail/InformationView.xaml b/BeWo/View/Detail/InformationView.xaml
new file mode 100644
index 000000000..5cd57e101
--- /dev/null
+++ b/BeWo/View/Detail/InformationView.xaml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/BeWo/View/Detail/InformationView.xaml.cs b/BeWo/View/Detail/InformationView.xaml.cs
new file mode 100644
index 000000000..5160fc163
--- /dev/null
+++ b/BeWo/View/Detail/InformationView.xaml.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+using BeWo.Controls;
+using BeWo.Core;
+using BeWo.ServiceProxy;
+using BeWo.Validation;
+using BeWo.View.Search;
+using BeWo.ViewModel;
+using BeWo.ViewModel.ListViewModel;
+using BeWo.Core.Service;
+
+using BS.Shared;
+using BS.Shared.Extensions;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.ClientPartials;
+using BS.Shared.DataContracts.Compact;
+using BS.Shared.Services;
+using BS.Shared.Translation;
+using DevExpress.Xpf.RichEdit;
+using SupportConceptService = BeWo.Core.Service.SupportConceptService;
+using System.Linq;
+using DevExpress.Xpf.Grid;
+using System.Windows.Media.Imaging;
+using DevExpress.Utils;
+
+namespace BeWo.View.Detail
+{
+ public partial class InformationView
+ {
+
+ public event Action ButtonCloseClicked;
+ public Dictionary dict;
+
+
+ public InformationView()
+ {
+ InitializeComponent();
+ }
+
+ public void InitView(CompactEmployeeDC employee)
+ {
+ dict = ServiceFacade.DoOperationsServiceSync(s => s.GetAdditionalEmployeeInformationForScheduler(employee.EmployeeOid));
+ var list = dict.ToList();
+ list = list.OrderBy(l => l.Key).ToList();
+ datagrid_employee_infos.ItemsSource = list;
+ }
+
+ private void button_close_Click(object sender, RoutedEventArgs e)
+ {
+ ButtonCloseClicked?.Invoke();
+ }
+ }
+}
\ No newline at end of file
diff --git a/Service/ServiceContracts/IOperationsService.cs b/Service/ServiceContracts/IOperationsService.cs
index e1e099aaa..33bbd56df 100644
--- a/Service/ServiceContracts/IOperationsService.cs
+++ b/Service/ServiceContracts/IOperationsService.cs
@@ -1061,6 +1061,10 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
string GetColorForServiceRecordView2();
+
+ [FaultContract(typeof(BeWoFault))]
+ [OperationContract]
+ Dictionary GetAdditionalEmployeeInformationForScheduler(long empOid);
}
}
\ No newline at end of file
diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs
index f818026ad..24e649fa6 100644
--- a/Service/ServiceImplementations/OperationsServiceImp.cs
+++ b/Service/ServiceImplementations/OperationsServiceImp.cs
@@ -6583,6 +6583,37 @@ namespace BeWo.Service.ServiceImplementations
throw Utils.CreateBeWoFaultException(e);
}
}
+
+ public Dictionary GetAdditionalEmployeeInformationForScheduler(long empOid)
+ {
+ Dictionary dict = new Dictionary();
+
+ var employee = DAOFactory.GenericDAO.GetByID(empOid);
+
+ dict.Add("Vorname", employee.Person.FirstName);
+ dict.Add("Nachname", employee.Person.LastName);
+ if(employee.Person.DateOfBirth != null)
+ {
+ var dateAndTime = employee.Person.DateOfBirth.ToString().Split(' ');
+ dict.Add("Geburtstag", dateAndTime[0]);
+ }
+ //if(employee.AbsenceTimes != null)
+ //{
+ // int c = 1;
+ // foreach (var item in employee.AbsenceTimes)
+ // {
+ // dict.Add("Abwesenheit " + c, item.AbsenceSpan.ToDateString());
+ // c++;
+ // }
+ //}
+ if(employee.IsQualified != null)
+ dict.Add("Qualifiziert", ((bool)employee.IsQualified) ? "Ja" : "Nein");
+ if(employee.Schutzstufe != null)
+ dict.Add("Schutzstufe", employee.Schutzstufe);
+
+
+ return dict;
+ }
}