diff --git a/BeWoOhneReports.sln b/BeWoOhneReports.sln index d2b525eab..caf49ee76 100644 --- a/BeWoOhneReports.sln +++ b/BeWoOhneReports.sln @@ -25,7 +25,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Report", "Report\Report.csp EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Host", "Host\Host.csproj", "{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReportingService", "ReportService\ReportingService.csproj", "{663EFCB5-9E3E-4C76-97EE-3188E072634C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReportService", "ReportService\ReportService.csproj", "{663EFCB5-9E3E-4C76-97EE-3188E072634C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatController", "..\Chat\ChatController\ChatController.csproj", "{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}" EndProject diff --git a/Host/Host.csproj b/Host/Host.csproj index 022b9ee47..9f53da443 100644 --- a/Host/Host.csproj +++ b/Host/Host.csproj @@ -235,10 +235,6 @@ - - {b0d73e3d-4ae7-4024-93a6-db1f46d7ccee} - Data - {663efcb5-9e3e-4c76-97ee-3188e072634c} ReportingService diff --git a/Host/ReportService.svc b/Host/ReportService.svc index 66890550f..66f495276 100644 --- a/Host/ReportService.svc +++ b/Host/ReportService.svc @@ -1 +1 @@ -<%@ ServiceHost Language="C#" Debug="true" Service="ReportingService.ServiceImplementations.ReportServiceImp" %> \ No newline at end of file +<%@ ServiceHost Language="C#" Debug="true" Service="ReportService.ServiceImplementations.ReportServiceImp" %> \ No newline at end of file diff --git a/Host/Web.config b/Host/Web.config index 8b28a069d..bab094ce5 100644 --- a/Host/Web.config +++ b/Host/Web.config @@ -153,8 +153,8 @@ - - + + diff --git a/ReportService/Plugins/TimeSheetReportService.cs b/ReportService/Plugins/TimeSheetReportService.cs index 9b6760ce9..60342b232 100644 --- a/ReportService/Plugins/TimeSheetReportService.cs +++ b/ReportService/Plugins/TimeSheetReportService.cs @@ -23,7 +23,7 @@ using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; using DevExpress.XtraReports.UI; -namespace ReportingService.Plugins +namespace ReportService.Plugins { public class TimeSheetReportService : AbstractIDSpecificDefaultClass { diff --git a/ReportService/Properties/AssemblyInfo.cs b/ReportService/Properties/AssemblyInfo.cs index f7404cde7..1d3b56776 100644 --- a/ReportService/Properties/AssemblyInfo.cs +++ b/ReportService/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("ReportingService")] +[assembly: AssemblyTitle("ReportService")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ReportingService")] +[assembly: AssemblyProduct("ReportService")] [assembly: AssemblyCopyright("Copyright © 2015")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/ReportService/ReportingService.csproj b/ReportService/ReportService.csproj similarity index 96% rename from ReportService/ReportingService.csproj rename to ReportService/ReportService.csproj index 1ffb3ba6d..b1521775b 100644 --- a/ReportService/ReportingService.csproj +++ b/ReportService/ReportService.csproj @@ -1,97 +1,97 @@ - - - - - Debug - AnyCPU - {663EFCB5-9E3E-4C76-97EE-3188E072634C} - Library - Properties - ReportingService - ReportingService - v4.7.2 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE} - Data - - - {40d8b312-ea64-49e3-a31a-5e57ed4d5654} - Report - - - {094331c3-ecee-4c89-bbfd-4c9ded89f0ef} - Service - - - {2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4} - Shared - - - - - - - + + + + + Debug + AnyCPU + {663EFCB5-9E3E-4C76-97EE-3188E072634C} + Library + Properties + ReportService + ReportService + v4.7.2 + 512 + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE} + Data + + + {40d8b312-ea64-49e3-a31a-5e57ed4d5654} + Report + + + {094331c3-ecee-4c89-bbfd-4c9ded89f0ef} + Service + + + {2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4} + Shared + + + + + + + \ No newline at end of file diff --git a/ReportService/ServiceContracts/IReportService.cs b/ReportService/ServiceContracts/IReportService.cs index d7b940787..983765857 100644 --- a/ReportService/ServiceContracts/IReportService.cs +++ b/ReportService/ServiceContracts/IReportService.cs @@ -11,7 +11,7 @@ using BS.Shared.DataContracts; using BS.Shared.DataContracts.Compact; using DevExpress.Data.Mask; -namespace ReportingService.ServiceContracts +namespace ReportService.ServiceContracts { [ServiceContract] public interface IReportService diff --git a/ReportService/ServiceImplementations/ReportServiceImp.cs b/ReportService/ServiceImplementations/ReportServiceImp.cs index e338380df..0e8d2f009 100644 --- a/ReportService/ServiceImplementations/ReportServiceImp.cs +++ b/ReportService/ServiceImplementations/ReportServiceImp.cs @@ -21,10 +21,10 @@ using BS.Shared.DataContracts.Compact; using DevExpress.XtraPrinting; using DevExpress.XtraReports.UI; -using ReportingService.Plugins; -using ReportingService.ServiceContracts; +using ReportService.Plugins; +using ReportService.ServiceContracts; -namespace ReportingService.ServiceImplementations +namespace ReportService.ServiceImplementations { [ServiceBehavior(InstanceContextMode = InstanceContextMode.PerCall, ConcurrencyMode = ConcurrencyMode.Single)] public class ReportServiceImp : IReportService