diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs index 2ead1a56c..d41c8fcef 100644 --- a/BeWo/ServiceProxy/Generated.cs +++ b/BeWo/ServiceProxy/Generated.cs @@ -489,6 +489,10 @@ namespace BeWo.ServiceProxy [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetEmployeeImage", ReplyAction="http://tempuri.org/IEmployeeService/GetEmployeeImageResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetEmployeeImageBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] byte[] GetEmployeeImage(long employeeOid); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetEmployeeThumbnail", ReplyAction="http://tempuri.org/IEmployeeService/GetEmployeeThumbnailResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetEmployeeThumbnailBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + byte[] GetEmployeeThumbnail(long employeeOid); } [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] @@ -909,6 +913,11 @@ namespace BeWo.ServiceProxy { return base.Channel.GetEmployeeImage(employeeOid); } + + public byte[] GetEmployeeThumbnail(long employeeOid) + { + return base.Channel.GetEmployeeThumbnail(employeeOid); + } } [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] diff --git a/BeWo/View/ChatView.xaml.cs b/BeWo/View/ChatView.xaml.cs index afea38dbb..0e4b912ff 100644 --- a/BeWo/View/ChatView.xaml.cs +++ b/BeWo/View/ChatView.xaml.cs @@ -564,7 +564,7 @@ namespace BeWo.View { if(list.PersonOid != BeWoApp.LoggedOnUser.Employee.PersonOid){ Clientlist.Items.Add(new KontaktlistBuilder(list.FirstName + " " + list.LastName, StatusType.Offline, - BuildImg(ServiceFacade.DoEmployeeServiceSync(s => s.GetEmployeeImage(list.EmployeeOid)),ChatType.Mitarbeiter), + BuildImg(ServiceFacade.DoEmployeeServiceSync(s => s.GetEmployeeThumbnail(list.EmployeeOid)),ChatType.Mitarbeiter), list.PersonOid, ChatType.Mitarbeiter)); } } @@ -650,7 +650,7 @@ namespace BeWo.View if (!idMitarbeitspeicher.Contains(var.PersonOid) && idMitarbeitspeicher.Count <= offmitarbeiter.Count && var.PersonOid != BeWoApp.LoggedOnUser.Employee.PersonOid) { ita.Add(new KontaktlistBuilder(var.FirstName + " " + var.LastName,StatusType.Offline, - BuildImg(ServiceFacade.DoEmployeeServiceSync(s => s.GetEmployeeImage(var.EmployeeOid)),ChatType.Mitarbeiter), + BuildImg(ServiceFacade.DoEmployeeServiceSync(s => s.GetEmployeeThumbnail(var.EmployeeOid)),ChatType.Mitarbeiter), var.PersonOid, ChatType.Mitarbeiter)); view.Refresh(); } diff --git a/Data/Entities/Employee.cs b/Data/Entities/Employee.cs index df9e77277..e9aca7510 100644 --- a/Data/Entities/Employee.cs +++ b/Data/Entities/Employee.cs @@ -50,7 +50,9 @@ namespace BeWo.Data.Entities public static String PropertyName_EmployeeColor = "EmployeeColor"; - public static string PropertyName_EmployeeImage = "EmployeeImage"; + public static string PropertyName_EmployeeImage = "EmployeeImage"; + + public static string PropertyName_EmployeeThumbnail = "EmployeeThumbnail"; private IList _AbsenceTimes; @@ -99,6 +101,8 @@ namespace BeWo.Data.Entities private byte[] _EmployeeImage; + private byte[] _EmployeeThumbnail; + public Employee() { @@ -474,5 +478,20 @@ namespace BeWo.Data.Entities } } } + + public virtual Byte[] EmployeeThumbnail + { + get { return _EmployeeThumbnail; } + + set + { + if (AreDifferent(_EmployeeThumbnail, value)) + { + _EmployeeThumbnail = value; + } + } + } + + } } \ No newline at end of file diff --git a/Data/Mappings/Employee.hbm.xml b/Data/Mappings/Employee.hbm.xml index a5b8b6781..8ad83a1e7 100644 --- a/Data/Mappings/Employee.hbm.xml +++ b/Data/Mappings/Employee.hbm.xml @@ -23,6 +23,7 @@ + diff --git a/Model/Changes_06_10_2016.txt b/Model/Changes_06_10_2016.txt new file mode 100644 index 000000000..cdf56fb07 --- /dev/null +++ b/Model/Changes_06_10_2016.txt @@ -0,0 +1,2 @@ +ALTER TABLE `1234567890`.`employee` +ADD COLUMN `EmployeeThumbnail` LONGBLOB NULL DEFAULT NULL COMMENT '' AFTER `EmployeeImage`; diff --git a/Service/DCEntityMapper/EmployeeDC_Employee.cs b/Service/DCEntityMapper/EmployeeDC_Employee.cs index 666e54307..4c0c1953b 100644 --- a/Service/DCEntityMapper/EmployeeDC_Employee.cs +++ b/Service/DCEntityMapper/EmployeeDC_Employee.cs @@ -4,6 +4,7 @@ using System.Linq; using BeWo.Data.Entities; using BS.Shared; +using BS.Shared.Core; using BS.Shared.DataContracts; namespace BeWo.Service.DCEntityMapper @@ -157,6 +158,10 @@ namespace BeWo.Service.DCEntityMapper pEntity.IsActive = pDataContract.ActivationType; pEntity.EmployeeImage = pDataContract.EmployeeImage; + + pEntity.EmployeeThumbnail = Utils.ErstelleThumbnail(pDataContract.EmployeeImage, 200, 200); + + //pEntity.CancellationPeriod = pDataContract.CancellationPeriod; //pEntity.EntryDate = pDataContract.EntryDate; diff --git a/Service/ServiceContracts/IEmployeeService.cs b/Service/ServiceContracts/IEmployeeService.cs index 352314a79..187e5dcc3 100644 --- a/Service/ServiceContracts/IEmployeeService.cs +++ b/Service/ServiceContracts/IEmployeeService.cs @@ -318,5 +318,9 @@ namespace BeWo.Service.ServiceContracts [FaultContract(typeof(BeWoFault))] [OperationContract] Byte[] GetEmployeeImage(long employeeOid); + + [FaultContract(typeof(BeWoFault))] + [OperationContract] + Byte[] GetEmployeeThumbnail(long employeeOid); } } \ No newline at end of file diff --git a/Service/ServiceImplementations/EmployeeServiceImp.cs b/Service/ServiceImplementations/EmployeeServiceImp.cs index bf4e8945f..d325b0c70 100644 --- a/Service/ServiceImplementations/EmployeeServiceImp.cs +++ b/Service/ServiceImplementations/EmployeeServiceImp.cs @@ -1183,6 +1183,19 @@ namespace BeWo.Service.ServiceImplementations } } + public Byte[] GetEmployeeThumbnail(long employeeOid) + { + try + { + var employee = DAOFactory.GenericDAO.GetByID(employeeOid); + + return employee.EmployeeThumbnail; + } + catch (Exception e) + { + throw Utils.CreateBeWoFaultException(e); + } + } }