diff --git a/BeWo/MainWindow.xaml.cs b/BeWo/MainWindow.xaml.cs index 058fee8b4..7ea221032 100644 --- a/BeWo/MainWindow.xaml.cs +++ b/BeWo/MainWindow.xaml.cs @@ -79,9 +79,21 @@ namespace BeWo return; } } - - BeWoApp.MainControl.HomeView.CloseServerConnection(); - + + try + { + if (BeWoApp.MainControl.HomeView.clientSocket.Connected) + { + BeWoApp.MainControl.HomeView.CloseServerConnection(); + + } + } + catch (Exception edf) + { + } + + + BeWoApp.CurrentBeWo.DocumentWatcher.LoescheTempDateien(); Application.Current.Shutdown(); diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs index 936961750..38e3b3dc9 100644 --- a/BeWo/ServiceProxy/Generated.cs +++ b/BeWo/ServiceProxy/Generated.cs @@ -1177,6 +1177,14 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/FindAllChatMessagesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List FindAllChatMessages(long senderOid, long empfaengerOid); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/FindAllChatMessagesFromTeam", ReplyAction="http://tempuri.org/ICustomerService/FindAllChatMessagesFromTeamResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/FindAllChatMessagesFromTeamBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List FindAllChatMessagesFromTeam(long senderOid, long teamEmpfangOid); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateIstGelesen", ReplyAction="http://tempuri.org/ICustomerService/UpdateIstGelesenResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateIstGelesenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + void UpdateIstGelesen(long senderOid, long empfaengerOid, bool istGelesen); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetCustomerImage", ReplyAction="http://tempuri.org/ICustomerService/GetCustomerImageResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetCustomerImageBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] byte[] GetCustomerImage(long customerOid); @@ -1889,6 +1897,16 @@ namespace BeWo.ServiceProxy return base.Channel.FindAllChatMessages(senderOid, empfaengerOid); } + public System.Collections.Generic.List FindAllChatMessagesFromTeam(long senderOid, long teamEmpfangOid) + { + return base.Channel.FindAllChatMessagesFromTeam(senderOid, teamEmpfangOid); + } + + public void UpdateIstGelesen(long senderOid, long empfaengerOid, bool istGelesen) + { + base.Channel.UpdateIstGelesen(senderOid, empfaengerOid, istGelesen); + } + public byte[] GetCustomerImage(long customerOid) { return base.Channel.GetCustomerImage(customerOid); @@ -3775,29 +3793,34 @@ namespace BeWo.ServiceProxy [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, int istZugestellt); + BS.Shared.DataContracts.ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, int istZugestellt, long teamid); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CreateNewIsChatActiveCustomerAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/CreateNewIsChatActiveCustomerAPPCodeDCRespo" + - "nse")] - [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateNewIsChatActiveCustomerAPPCodeDCBeWoF" + - "aultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - BS.Shared.DataContracts.CustomerAPPCodeDC CreateNewIsChatActiveCustomerAPPCodeDC(long customerOid, int activeType); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDCResponse" + + "")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDCBeWoFaul" + + "tFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + void UpdateIsChatActiveCustomerAPPCodeDC(long customerOid, int activeType); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetIsChatActiveCustomerAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/GetIsChatActiveCustomerAPPCodeDCResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetIsChatActiveCustomerAPPCodeDCBeWoFaultFa" + + "ult", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List GetIsChatActiveCustomerAPPCodeDC(long customerOid, int activeType); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CreateNewEmployeeAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/CreateNewEmployeeAPPCodeDCResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateNewEmployeeAPPCodeDCBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] BS.Shared.DataContracts.EmployeeAPPCodeDC CreateNewEmployeeAPPCodeDC(long employeeOid); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CreateNewIsChatActiveEmployeeAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/CreateNewIsChatActiveEmployeeAPPCodeDCRespo" + - "nse")] - [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateNewIsChatActiveEmployeeAPPCodeDCBeWoF" + - "aultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - BS.Shared.DataContracts.EmployeeAPPCodeDC CreateNewIsChatActiveEmployeeAPPCodeDC(long employeeOid, int activeType); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateIsChatActiveEmployeeAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/UpdateIsChatActiveEmployeeAPPCodeDCResponse" + + "")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateIsChatActiveEmployeeAPPCodeDCBeWoFaul" + + "tFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + void UpdateIsChatActiveEmployeeAPPCodeDC(long employeeOid, int activeType); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CreateNewNotfallNacrichtEmployeeAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/CreateNewNotfallNacrichtEmployeeAPPCodeDCRe" + - "sponse")] - [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateNewNotfallNacrichtEmployeeAPPCodeDCBe" + - "WoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - BS.Shared.DataContracts.EmployeeAPPCodeDC CreateNewNotfallNacrichtEmployeeAPPCodeDC(long employeeOid, string notfallstate); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateNotfallNacrichtEmployeeAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/UpdateNotfallNacrichtEmployeeAPPCodeDCRespo" + + "nse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateNotfallNacrichtEmployeeAPPCodeDCBeWoF" + + "aultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + void UpdateNotfallNacrichtEmployeeAPPCodeDC(long employeeOid, string notfallstate); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/LoadOrganisationPersonRelationsByOid", ReplyAction="http://tempuri.org/IOperationsService/LoadOrganisationPersonRelationsByOidRespons" + "e")] @@ -4432,14 +4455,19 @@ namespace BeWo.ServiceProxy return base.Channel.CreateNewCustomerAPPCodeDC(customerOid); } - public BS.Shared.DataContracts.ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, int istZugestellt) + public BS.Shared.DataContracts.ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, int istZugestellt, long teamid) { - return base.Channel.CreateNewChatMessagesDC(senderOid, empfängerOid, message, istZugestellt); + return base.Channel.CreateNewChatMessagesDC(senderOid, empfängerOid, message, istZugestellt, teamid); } - public BS.Shared.DataContracts.CustomerAPPCodeDC CreateNewIsChatActiveCustomerAPPCodeDC(long customerOid, int activeType) + public void UpdateIsChatActiveCustomerAPPCodeDC(long customerOid, int activeType) { - return base.Channel.CreateNewIsChatActiveCustomerAPPCodeDC(customerOid, activeType); + base.Channel.UpdateIsChatActiveCustomerAPPCodeDC(customerOid, activeType); + } + + public System.Collections.Generic.List GetIsChatActiveCustomerAPPCodeDC(long customerOid, int activeType) + { + return base.Channel.GetIsChatActiveCustomerAPPCodeDC(customerOid, activeType); } public BS.Shared.DataContracts.EmployeeAPPCodeDC CreateNewEmployeeAPPCodeDC(long employeeOid) @@ -4447,14 +4475,14 @@ namespace BeWo.ServiceProxy return base.Channel.CreateNewEmployeeAPPCodeDC(employeeOid); } - public BS.Shared.DataContracts.EmployeeAPPCodeDC CreateNewIsChatActiveEmployeeAPPCodeDC(long employeeOid, int activeType) + public void UpdateIsChatActiveEmployeeAPPCodeDC(long employeeOid, int activeType) { - return base.Channel.CreateNewIsChatActiveEmployeeAPPCodeDC(employeeOid, activeType); + base.Channel.UpdateIsChatActiveEmployeeAPPCodeDC(employeeOid, activeType); } - public BS.Shared.DataContracts.EmployeeAPPCodeDC CreateNewNotfallNacrichtEmployeeAPPCodeDC(long employeeOid, string notfallstate) + public void UpdateNotfallNacrichtEmployeeAPPCodeDC(long employeeOid, string notfallstate) { - return base.Channel.CreateNewNotfallNacrichtEmployeeAPPCodeDC(employeeOid, notfallstate); + base.Channel.UpdateNotfallNacrichtEmployeeAPPCodeDC(employeeOid, notfallstate); } public System.Collections.Generic.List LoadOrganisationPersonRelationsByOid(System.Collections.Generic.List pOids) diff --git a/BeWo/View/ChatServiceCustomer.xaml b/BeWo/View/ChatServiceCustomer.xaml index ff1c576b5..5646758e3 100644 --- a/BeWo/View/ChatServiceCustomer.xaml +++ b/BeWo/View/ChatServiceCustomer.xaml @@ -43,10 +43,10 @@