diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs index ae45268a2..4c45d0bd1 100644 --- a/BeWo/ServiceProxy/Generated.cs +++ b/BeWo/ServiceProxy/Generated.cs @@ -166,6 +166,10 @@ namespace BeWo.ServiceProxy public interface IEmployeeService { + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/LoadCompactEmployee", ReplyAction="http://tempuri.org/IEmployeeService/LoadCompactEmployeeResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/LoadCompactEmployeeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + BS.Shared.DataContracts.Compact.CompactEmployeeDC LoadCompactEmployee(long pEmployeeOid); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/IsAssessmentSheetEntryBelongingToAS", ReplyAction="http://tempuri.org/IEmployeeService/IsAssessmentSheetEntryBelongingToASResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/IsAssessmentSheetEntryBelongingToASBeWoFaultF" + "ault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] @@ -634,6 +638,12 @@ namespace BeWo.ServiceProxy "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List GetAllEmployeeAbsenceTimesForYear(int year); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetMultipleEmployeeAbsenceTimesForMonth", ReplyAction="http://tempuri.org/IEmployeeService/GetMultipleEmployeeAbsenceTimesForMonthRespon" + + "se")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetMultipleEmployeeAbsenceTimesForMonthBeWoFa" + + "ultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List GetMultipleEmployeeAbsenceTimesForMonth(int year, int month, System.Collections.Generic.List empOids); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/DeactivateGroupOfPeople", ReplyAction="http://tempuri.org/IEmployeeService/DeactivateGroupOfPeopleResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/DeactivateGroupOfPeopleBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] void DeactivateGroupOfPeople(long pOid, long pVersion); @@ -661,10 +671,6 @@ namespace BeWo.ServiceProxy [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/LoadCompactTeam", ReplyAction="http://tempuri.org/IEmployeeService/LoadCompactTeamResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/LoadCompactTeamBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] BS.Shared.DataContracts.Compact.CompactTeamDC LoadCompactTeam(long pTeamOid); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/LoadCompactEmployee", ReplyAction="http://tempuri.org/IEmployeeService/LoadCompactEmployeeResponse")] - [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/LoadCompactEmployeeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - BS.Shared.DataContracts.Compact.CompactEmployeeDC LoadCompactEmployee(long pEmployeeOid); } [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] @@ -701,6 +707,11 @@ namespace BeWo.ServiceProxy { } + public BS.Shared.DataContracts.Compact.CompactEmployeeDC LoadCompactEmployee(long pEmployeeOid) + { + return base.Channel.LoadCompactEmployee(pEmployeeOid); + } + public bool IsAssessmentSheetEntryBelongingToAS(long assessmentSheetCategoryOid) { return base.Channel.IsAssessmentSheetEntryBelongingToAS(assessmentSheetCategoryOid); @@ -1236,6 +1247,11 @@ namespace BeWo.ServiceProxy return base.Channel.GetAllEmployeeAbsenceTimesForYear(year); } + public System.Collections.Generic.List GetMultipleEmployeeAbsenceTimesForMonth(int year, int month, System.Collections.Generic.List empOids) + { + return base.Channel.GetMultipleEmployeeAbsenceTimesForMonth(year, month, empOids); + } + public void DeactivateGroupOfPeople(long pOid, long pVersion) { base.Channel.DeactivateGroupOfPeople(pOid, pVersion); @@ -1270,11 +1286,6 @@ namespace BeWo.ServiceProxy { return base.Channel.LoadCompactTeam(pTeamOid); } - - public BS.Shared.DataContracts.Compact.CompactEmployeeDC LoadCompactEmployee(long pEmployeeOid) - { - return base.Channel.LoadCompactEmployee(pEmployeeOid); - } } [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] @@ -1501,56 +1512,6 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/ConvertToNewSubstitutionTypeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List>))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BeWo.View.Navigation.Filter.CustomerFilterEnum))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ActivationTypeId))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ValueListEntryType))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ContactType))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.FamilyStatus))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.CostRatePeriodType))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Sex))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.PersonType))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ControlType))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SubstitutionNeed))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AppointmentDayOfWeek))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.TokenTyp))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SupportConceptApprovalInterval))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Bewilligungsart))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SystemEntryID))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AccountingIntervalType))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AccountingvisibilityType))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ScopeTypeId))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.CostBearer2SupportConceptStatus))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SettingsType))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.UserRightType))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ZeiterfassungsDauer))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceUnit))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordFormate))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordTypeId))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GroupTypeId))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactTeamDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactOrganisationDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactCustomerDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactEmployeeDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactVertreterEmployeeDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactTokenDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactPersonDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactSupportConceptDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactCostBearerDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactGroupOfPeopleDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary, decimal>))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.OvertimeDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AuszahlungsartDC))] @@ -1633,6 +1594,56 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BeWo.ServiceProxy.BeWoFault))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BeWo.ServiceProxy.BeWoFaultType))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary, decimal>))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ActivationTypeId))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ValueListEntryType))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ContactType))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.FamilyStatus))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.CostRatePeriodType))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Sex))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.PersonType))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ControlType))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SubstitutionNeed))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AppointmentDayOfWeek))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.TokenTyp))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SupportConceptApprovalInterval))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Bewilligungsart))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SystemEntryID))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AccountingIntervalType))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AccountingvisibilityType))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ScopeTypeId))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.CostBearer2SupportConceptStatus))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SettingsType))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.UserRightType))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ZeiterfassungsDauer))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceUnit))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordFormate))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordTypeId))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GroupTypeId))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactEmployeeDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactTeamDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactOrganisationDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactCustomerDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactVertreterEmployeeDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactTokenDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactPersonDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactSupportConceptDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactCostBearerDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactGroupOfPeopleDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Behinderungsart))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] @@ -5023,6 +5034,11 @@ namespace BeWo.ServiceProxy public interface IOperationsService { + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetPlatzhalterForSupportConcept", ReplyAction="http://tempuri.org/IOperationsService/GetPlatzhalterForSupportConceptResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetPlatzhalterForSupportConceptBeWoFaultFau" + + "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List GetPlatzhalterForSupportConcept(); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetPlatzhalterForCustomer", ReplyAction="http://tempuri.org/IOperationsService/GetPlatzhalterForCustomerResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetPlatzhalterForCustomerBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List GetPlatzhalterForCustomer(); @@ -5384,6 +5400,10 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewDienstEintragBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] void InsertNewDienstEintrag(BS.Shared.DataContracts.DienstEintragDC dienstEintrag); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewDienstEintraege", ReplyAction="http://tempuri.org/IOperationsService/InsertNewDienstEintraegeResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewDienstEintraegeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + void InsertNewDienstEintraege(System.Collections.Generic.List dienstEintraege); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertRegelmaessigerDienst", ReplyAction="http://tempuri.org/IOperationsService/InsertRegelmaessigerDienstResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertRegelmaessigerDienstBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] void InsertRegelmaessigerDienst(BS.Shared.DataContracts.RegelmaessigerDienstDC dienst); @@ -5468,11 +5488,6 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertTemplateBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] BS.Shared.DataContracts.DokumentvorlageDC InsertTemplate(BS.Shared.DataContracts.DokumentvorlageDC dc); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetPlatzhalterForSupportConcept", ReplyAction="http://tempuri.org/IOperationsService/GetPlatzhalterForSupportConceptResponse")] - [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetPlatzhalterForSupportConceptBeWoFaultFau" + - "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - System.Collections.Generic.List GetPlatzhalterForSupportConcept(); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CreateNewChatMessagesDC", ReplyAction="http://tempuri.org/IOperationsService/CreateNewChatMessagesDCResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateNewChatMessagesDCBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] BS.Shared.DataContracts.ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid, string messageid); @@ -6373,6 +6388,11 @@ namespace BeWo.ServiceProxy { } + public System.Collections.Generic.List GetPlatzhalterForSupportConcept() + { + return base.Channel.GetPlatzhalterForSupportConcept(); + } + public System.Collections.Generic.List GetPlatzhalterForCustomer() { return base.Channel.GetPlatzhalterForCustomer(); @@ -6758,6 +6778,11 @@ namespace BeWo.ServiceProxy base.Channel.InsertNewDienstEintrag(dienstEintrag); } + public void InsertNewDienstEintraege(System.Collections.Generic.List dienstEintraege) + { + base.Channel.InsertNewDienstEintraege(dienstEintraege); + } + public void InsertRegelmaessigerDienst(BS.Shared.DataContracts.RegelmaessigerDienstDC dienst) { base.Channel.InsertRegelmaessigerDienst(dienst); @@ -6848,11 +6873,6 @@ namespace BeWo.ServiceProxy return base.Channel.InsertTemplate(dc); } - public System.Collections.Generic.List GetPlatzhalterForSupportConcept() - { - return base.Channel.GetPlatzhalterForSupportConcept(); - } - public BS.Shared.DataContracts.ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid, string messageid) { return base.Channel.CreateNewChatMessagesDC(senderOid, empfängerOid, message, isDeliverd, teamid, messageid); diff --git a/BeWo/View/Controls/DPCtrlDay.cs b/BeWo/View/Controls/DPCtrlDay.cs index ac1b1bcf5..923028dea 100644 --- a/BeWo/View/Controls/DPCtrlDay.cs +++ b/BeWo/View/Controls/DPCtrlDay.cs @@ -4,6 +4,7 @@ using BS.Shared.DataContracts; using BS.Shared.Extensions; using System; using System.Collections.Generic; +using System.Diagnostics; using System.IO; using System.Linq; using System.Text; @@ -39,6 +40,8 @@ namespace BeWo.View.Controls var right = info.DayOfWeek == DayOfWeek.Sunday || info.IsLastColumn; var bottom = info.IsLastRow; + c.Path_Notice.Visibility = info.MarkierungBenoetigt ? Visibility.Visible : Visibility.Collapsed; + c.Border = new Thickness(0, 0, Convert.ToDouble(right), Convert.ToDouble(bottom)); if (!info.IsInContractRange) @@ -79,20 +82,16 @@ namespace BeWo.View.Controls if (dc != null) { c.Text = $"{dc.Kurz}"; - if (!info.Bemerkung.IsNullOrEmpty()) - { - bemerkungVorhanden = true; - c.Path_Notice.Visibility = Visibility.Visible; - } - else + if (c.Path_Notice.Visibility == Visibility.Collapsed) { c.BorderThickness = new Thickness(0, 0, 0, 0); c.BorderBrush = Brushes.Transparent; - c.Path_Notice.Visibility = Visibility.Collapsed; } } else { + if (info.MarkierungBenoetigt) + Debug.WriteLine("Funktioniert falsch"); c.Path_Notice.Visibility = Visibility.Collapsed; c.BorderThickness = new Thickness(0, 0, 0, 0); c.BorderBrush = Brushes.Transparent; @@ -195,7 +194,7 @@ namespace BeWo.View.Controls public string Bemerkung { get; set; } public string[] Zeiten { get; set; } public bool IsFeiertag { get; set; } - + public bool MarkierungBenoetigt { get; set; } } public class StatusInformation diff --git a/BeWo/View/Detail/CustomerView.xaml b/BeWo/View/Detail/CustomerView.xaml index eb9f86a98..0532196e6 100644 --- a/BeWo/View/Detail/CustomerView.xaml +++ b/BeWo/View/Detail/CustomerView.xaml @@ -1836,6 +1836,6 @@ - + \ No newline at end of file diff --git a/BeWo/View/Detail/CustomerView.xaml.cs b/BeWo/View/Detail/CustomerView.xaml.cs index 5af09988b..90b73ed1e 100644 --- a/BeWo/View/Detail/CustomerView.xaml.cs +++ b/BeWo/View/Detail/CustomerView.xaml.cs @@ -681,15 +681,17 @@ namespace BeWo.View.Detail { var gb = tabitem_diagnosis.Resources["gb_possible"] as GroupBox; var c = (gb.Content as Grid).FindFirstVisualChild(); + var temp = c.ItemsSource; c.Width = grid_choosenDiagnosis.ActualWidth; c.FilterString = string.Empty; c.View.FocusedRowHandle = DataControlBase.AutoFilterRowHandle; (c.View as TableView).FocusedColumn = c.Columns[1]; - + temp = c.ItemsSource; // var t = c.View.GetCellElementByRowHandleAndColumn(GridControl.AutoFilterRowHandle, c.Columns[1]); MainControl.ShowControlAsModalPopup(gb, HorizontalAlignment.Center, VerticalAlignment.Top); + temp = c.ItemsSource; } private void button_addDisability_Click(object sender, RoutedEventArgs e) diff --git a/BeWo/View/Detail/Report/AbwesenheitsEditView.xaml b/BeWo/View/Detail/Report/AbwesenheitsEditView.xaml index 96eb4e49a..92a8c005b 100644 --- a/BeWo/View/Detail/Report/AbwesenheitsEditView.xaml +++ b/BeWo/View/Detail/Report/AbwesenheitsEditView.xaml @@ -25,18 +25,21 @@ +