diff --git a/LaaProductionWeb/LaaProductionWeb.Services/AccountService.cs b/LaaProductionWeb/LaaProduction.Services/AccountService.cs similarity index 96% rename from LaaProductionWeb/LaaProductionWeb.Services/AccountService.cs rename to LaaProductionWeb/LaaProduction.Services/AccountService.cs index b99fd538..845b756f 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/AccountService.cs +++ b/LaaProductionWeb/LaaProduction.Services/AccountService.cs @@ -1,8 +1,8 @@ -namespace LaaProductionWeb.Services +namespace LaaProduction.Services { using LaaProductionSQL.Interfaces; - using LaaProductionWeb.Services.Interfaces; - using LaaProductionWeb.Services.Models; + using LaaProduction.Services.Interfaces; + using LaaProduction.Services.Models; using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/ApprovalsService.cs b/LaaProductionWeb/LaaProduction.Services/ApprovalsService.cs similarity index 96% rename from LaaProductionWeb/LaaProductionWeb.Services/ApprovalsService.cs rename to LaaProductionWeb/LaaProduction.Services/ApprovalsService.cs index d3af1a0a..c967ea28 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/ApprovalsService.cs +++ b/LaaProductionWeb/LaaProduction.Services/ApprovalsService.cs @@ -1,8 +1,8 @@ -namespace LaaProductionWeb.Services +namespace LaaProduction.Services { using LaaProductionSQL.Interfaces; - using LaaProductionWeb.Services.Interfaces; - using LaaProductionWeb.Services.Models; + using LaaProduction.Services.Interfaces; + using LaaProduction.Services.Models; public class ApprovalsService : IApprovalsService { diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Interfaces/IAccountService.cs b/LaaProductionWeb/LaaProduction.Services/Interfaces/IAccountService.cs similarity index 80% rename from LaaProductionWeb/LaaProductionWeb.Services/Interfaces/IAccountService.cs rename to LaaProductionWeb/LaaProduction.Services/Interfaces/IAccountService.cs index 299a0bb7..b7771771 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Interfaces/IAccountService.cs +++ b/LaaProductionWeb/LaaProduction.Services/Interfaces/IAccountService.cs @@ -1,6 +1,6 @@ -namespace LaaProductionWeb.Services.Interfaces +namespace LaaProduction.Services.Interfaces { - using LaaProductionWeb.Services.Models; + using LaaProduction.Services.Models; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Interfaces/IApprovalsService.cs b/LaaProductionWeb/LaaProduction.Services/Interfaces/IApprovalsService.cs similarity index 52% rename from LaaProductionWeb/LaaProductionWeb.Services/Interfaces/IApprovalsService.cs rename to LaaProductionWeb/LaaProduction.Services/Interfaces/IApprovalsService.cs index 1efd6552..16ff55d7 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Interfaces/IApprovalsService.cs +++ b/LaaProductionWeb/LaaProduction.Services/Interfaces/IApprovalsService.cs @@ -1,6 +1,6 @@ -namespace LaaProductionWeb.Services.Interfaces +namespace LaaProduction.Services.Interfaces { - using LaaProductionWeb.Services.Models; + using LaaProduction.Services.Models; public interface IApprovalsService { diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Interfaces/IHttpService.cs b/LaaProductionWeb/LaaProduction.Services/Interfaces/IHttpService.cs similarity index 68% rename from LaaProductionWeb/LaaProductionWeb.Services/Interfaces/IHttpService.cs rename to LaaProductionWeb/LaaProduction.Services/Interfaces/IHttpService.cs index ce28dd48..e41eaf0d 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Interfaces/IHttpService.cs +++ b/LaaProductionWeb/LaaProduction.Services/Interfaces/IHttpService.cs @@ -1,6 +1,6 @@ -namespace LaaProductionWeb.Services.Interfaces +namespace LaaProduction.Services.Interfaces { - using LaaProductionWeb.Services.Models; + using LaaProduction.Services.Models; using System.Threading.Tasks; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Interfaces/ILoggerService.cs b/LaaProductionWeb/LaaProduction.Services/Interfaces/ILoggerService.cs similarity index 72% rename from LaaProductionWeb/LaaProductionWeb.Services/Interfaces/ILoggerService.cs rename to LaaProductionWeb/LaaProduction.Services/Interfaces/ILoggerService.cs index 2548d0bf..8e9121f4 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Interfaces/ILoggerService.cs +++ b/LaaProductionWeb/LaaProduction.Services/Interfaces/ILoggerService.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Interfaces +namespace LaaProduction.Services.Interfaces { using System; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Interfaces/IOrdersService.cs b/LaaProductionWeb/LaaProduction.Services/Interfaces/IOrdersService.cs similarity index 70% rename from LaaProductionWeb/LaaProductionWeb.Services/Interfaces/IOrdersService.cs rename to LaaProductionWeb/LaaProduction.Services/Interfaces/IOrdersService.cs index 46315c00..28688032 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Interfaces/IOrdersService.cs +++ b/LaaProductionWeb/LaaProduction.Services/Interfaces/IOrdersService.cs @@ -1,6 +1,6 @@ -namespace LaaProductionWeb.Services.Interfaces +namespace LaaProduction.Services.Interfaces { - using LaaProductionWeb.Services.Models; + using LaaProduction.Services.Models; public interface IOrdersService { diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Interfaces/IProtocolService.cs b/LaaProductionWeb/LaaProduction.Services/Interfaces/IProtocolService.cs similarity index 79% rename from LaaProductionWeb/LaaProductionWeb.Services/Interfaces/IProtocolService.cs rename to LaaProductionWeb/LaaProduction.Services/Interfaces/IProtocolService.cs index 8ef162e7..0ce68ca0 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Interfaces/IProtocolService.cs +++ b/LaaProductionWeb/LaaProduction.Services/Interfaces/IProtocolService.cs @@ -1,7 +1,7 @@ -namespace LaaProductionWeb.Services.Interfaces +namespace LaaProduction.Services.Interfaces { - using LaaProductionWeb.Services.Models; - using LaaProductionWeb.Services.Models.Reports; + using LaaProduction.Services.Models; + using LaaProduction.Services.Models.Reports; using System.Collections.Generic; using System.IO; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Interfaces/IReportService.cs b/LaaProductionWeb/LaaProduction.Services/Interfaces/IReportService.cs similarity index 85% rename from LaaProductionWeb/LaaProductionWeb.Services/Interfaces/IReportService.cs rename to LaaProductionWeb/LaaProduction.Services/Interfaces/IReportService.cs index 44c272e1..59d00c45 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Interfaces/IReportService.cs +++ b/LaaProductionWeb/LaaProduction.Services/Interfaces/IReportService.cs @@ -1,6 +1,6 @@ -namespace LaaProductionWeb.Services.Interfaces +namespace LaaProduction.Services.Interfaces { - using LaaProductionWeb.Services.Models.Reports; + using LaaProduction.Services.Models.Reports; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Interfaces/ISearchService.cs b/LaaProductionWeb/LaaProduction.Services/Interfaces/ISearchService.cs similarity index 68% rename from LaaProductionWeb/LaaProductionWeb.Services/Interfaces/ISearchService.cs rename to LaaProductionWeb/LaaProduction.Services/Interfaces/ISearchService.cs index 5f36499a..20a695a6 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Interfaces/ISearchService.cs +++ b/LaaProductionWeb/LaaProduction.Services/Interfaces/ISearchService.cs @@ -1,6 +1,6 @@ -namespace LaaProductionWeb.Services.Interfaces +namespace LaaProduction.Services.Interfaces { - using LaaProductionWeb.Services.Models; + using LaaProduction.Services.Models; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Interfaces/IShipmentsService.cs b/LaaProductionWeb/LaaProduction.Services/Interfaces/IShipmentsService.cs similarity index 82% rename from LaaProductionWeb/LaaProductionWeb.Services/Interfaces/IShipmentsService.cs rename to LaaProductionWeb/LaaProduction.Services/Interfaces/IShipmentsService.cs index 4b83ce0d..ab0c143a 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Interfaces/IShipmentsService.cs +++ b/LaaProductionWeb/LaaProduction.Services/Interfaces/IShipmentsService.cs @@ -1,6 +1,6 @@ -namespace LaaProductionWeb.Services.Interfaces +namespace LaaProduction.Services.Interfaces { - using LaaProductionWeb.Services.Models; + using LaaProduction.Services.Models; using System.Collections.Generic; public interface IShipmentsService diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Interfaces/ISoftwareService.cs b/LaaProductionWeb/LaaProduction.Services/Interfaces/ISoftwareService.cs similarity index 92% rename from LaaProductionWeb/LaaProductionWeb.Services/Interfaces/ISoftwareService.cs rename to LaaProductionWeb/LaaProduction.Services/Interfaces/ISoftwareService.cs index 8fdd4e1a..230c703a 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Interfaces/ISoftwareService.cs +++ b/LaaProductionWeb/LaaProduction.Services/Interfaces/ISoftwareService.cs @@ -1,6 +1,6 @@ -namespace LaaProductionWeb.Services.Interfaces +namespace LaaProduction.Services.Interfaces { - using LaaProductionWeb.Services.Models.Software; + using LaaProduction.Services.Models.Software; using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/LaaProductionWeb.Services.csproj b/LaaProductionWeb/LaaProduction.Services/LaaProduction.Services.csproj similarity index 98% rename from LaaProductionWeb/LaaProductionWeb.Services/LaaProductionWeb.Services.csproj rename to LaaProductionWeb/LaaProduction.Services/LaaProduction.Services.csproj index 89e52e80..a6cc7873 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/LaaProductionWeb.Services.csproj +++ b/LaaProductionWeb/LaaProduction.Services/LaaProduction.Services.csproj @@ -7,8 +7,8 @@ {FF167011-431A-41A7-A7DB-560E08860388} Library Properties - LaaProductionWeb.Services - LaaProductionWeb.Services + LaaProduction.Services + LaaProduction.Services v4.8.1 512 true diff --git a/LaaProductionWeb/LaaProductionWeb.Services/LoggerService.cs b/LaaProductionWeb/LaaProduction.Services/LoggerService.cs similarity index 94% rename from LaaProductionWeb/LaaProductionWeb.Services/LoggerService.cs rename to LaaProductionWeb/LaaProduction.Services/LoggerService.cs index 0684765c..f9ef601c 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/LoggerService.cs +++ b/LaaProductionWeb/LaaProduction.Services/LoggerService.cs @@ -1,7 +1,7 @@ -namespace LaaProductionWeb.Services +namespace LaaProduction.Services { using LaaProductionSQL.Interfaces; - using LaaProductionWeb.Services.Interfaces; + using LaaProduction.Services.Interfaces; using System; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/BatchPrintModel.cs b/LaaProductionWeb/LaaProduction.Services/Models/BatchPrintModel.cs similarity index 94% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/BatchPrintModel.cs rename to LaaProductionWeb/LaaProduction.Services/Models/BatchPrintModel.cs index c1f43210..89b321ab 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/BatchPrintModel.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/BatchPrintModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models +namespace LaaProduction.Services.Models { using System.Collections.Generic; using System.Linq; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Employee.cs b/LaaProductionWeb/LaaProduction.Services/Models/Employee.cs similarity index 87% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Employee.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Employee.cs index e8bcd4e5..d4c7536f 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Employee.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Employee.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models +namespace LaaProduction.Services.Models { using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/HttpResponseModel.cs b/LaaProductionWeb/LaaProduction.Services/Models/HttpResponseModel.cs similarity index 91% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/HttpResponseModel.cs rename to LaaProductionWeb/LaaProduction.Services/Models/HttpResponseModel.cs index 5972fc70..c3bbcdd4 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/HttpResponseModel.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/HttpResponseModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models +namespace LaaProduction.Services.Models { using Newtonsoft.Json; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/MissingItem.cs b/LaaProductionWeb/LaaProduction.Services/Models/MissingItem.cs similarity index 88% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/MissingItem.cs rename to LaaProductionWeb/LaaProduction.Services/Models/MissingItem.cs index dbbc8f7b..e8b59827 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/MissingItem.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/MissingItem.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models +namespace LaaProduction.Services.Models { using System; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/OrderClientModel.cs b/LaaProductionWeb/LaaProduction.Services/Models/OrderClientModel.cs similarity index 88% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/OrderClientModel.cs rename to LaaProductionWeb/LaaProduction.Services/Models/OrderClientModel.cs index d56ae4fc..0861c995 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/OrderClientModel.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/OrderClientModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models +namespace LaaProduction.Services.Models { public class OrderClientModel { diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/OrderIdentity.cs b/LaaProductionWeb/LaaProduction.Services/Models/OrderIdentity.cs similarity index 83% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/OrderIdentity.cs rename to LaaProductionWeb/LaaProduction.Services/Models/OrderIdentity.cs index bb935c9d..23995188 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/OrderIdentity.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/OrderIdentity.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models +namespace LaaProduction.Services.Models { public class OrderIdentity { diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/OrderInfoModel.cs b/LaaProductionWeb/LaaProduction.Services/Models/OrderInfoModel.cs similarity index 94% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/OrderInfoModel.cs rename to LaaProductionWeb/LaaProduction.Services/Models/OrderInfoModel.cs index 7f38d3f7..2e8c62f5 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/OrderInfoModel.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/OrderInfoModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models +namespace LaaProduction.Services.Models { using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/OrderModel.cs b/LaaProductionWeb/LaaProduction.Services/Models/OrderModel.cs similarity index 91% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/OrderModel.cs rename to LaaProductionWeb/LaaProduction.Services/Models/OrderModel.cs index 0a77cfd3..f63bacb4 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/OrderModel.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/OrderModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models +namespace LaaProduction.Services.Models { using System.ComponentModel.DataAnnotations; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/OrderPositions.cs b/LaaProductionWeb/LaaProduction.Services/Models/OrderPositions.cs similarity index 91% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/OrderPositions.cs rename to LaaProductionWeb/LaaProduction.Services/Models/OrderPositions.cs index 1bf8eec4..5a2303ea 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/OrderPositions.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/OrderPositions.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models +namespace LaaProduction.Services.Models { using System.Collections; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/OrderScanModel.cs b/LaaProductionWeb/LaaProduction.Services/Models/OrderScanModel.cs similarity index 97% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/OrderScanModel.cs rename to LaaProductionWeb/LaaProduction.Services/Models/OrderScanModel.cs index 61d96dd2..4bde2617 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/OrderScanModel.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/OrderScanModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models +namespace LaaProduction.Services.Models { using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/OrdersFoundModel.cs b/LaaProductionWeb/LaaProduction.Services/Models/OrdersFoundModel.cs similarity index 92% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/OrdersFoundModel.cs rename to LaaProductionWeb/LaaProduction.Services/Models/OrdersFoundModel.cs index bb3981b1..73456a94 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/OrdersFoundModel.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/OrdersFoundModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models +namespace LaaProduction.Services.Models { using System.Collections; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/PalletPosition.cs b/LaaProductionWeb/LaaProduction.Services/Models/PalletPosition.cs similarity index 89% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/PalletPosition.cs rename to LaaProductionWeb/LaaProduction.Services/Models/PalletPosition.cs index 25327cc6..db035ee4 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/PalletPosition.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/PalletPosition.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models +namespace LaaProduction.Services.Models { using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/PalletsBatchModel.cs b/LaaProductionWeb/LaaProduction.Services/Models/PalletsBatchModel.cs similarity index 89% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/PalletsBatchModel.cs rename to LaaProductionWeb/LaaProduction.Services/Models/PalletsBatchModel.cs index ec31a0ef..82858930 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/PalletsBatchModel.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/PalletsBatchModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models +namespace LaaProduction.Services.Models { using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/ProductionApproval.cs b/LaaProductionWeb/LaaProduction.Services/Models/ProductionApproval.cs similarity index 95% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/ProductionApproval.cs rename to LaaProductionWeb/LaaProduction.Services/Models/ProductionApproval.cs index 9bc6b16b..df9d01bb 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/ProductionApproval.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/ProductionApproval.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models +namespace LaaProduction.Services.Models { using System; using System.ComponentModel.DataAnnotations; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/ProductionOrders.cs b/LaaProductionWeb/LaaProduction.Services/Models/ProductionOrders.cs similarity index 91% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/ProductionOrders.cs rename to LaaProductionWeb/LaaProduction.Services/Models/ProductionOrders.cs index b82acdd0..e9dbc986 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/ProductionOrders.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/ProductionOrders.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models +namespace LaaProduction.Services.Models { using System.Collections; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/CordonelPressureSensorFilter.cs b/LaaProductionWeb/LaaProduction.Services/Models/Reports/CordonelPressureSensorFilter.cs similarity index 95% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/CordonelPressureSensorFilter.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Reports/CordonelPressureSensorFilter.cs index 705e7827..1203f863 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/CordonelPressureSensorFilter.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Reports/CordonelPressureSensorFilter.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models.Reports +namespace LaaProduction.Services.Models.Reports { public class CordonelPressureSensorFilter : ReportFilter { diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/CordonelPressureSensorItem.cs b/LaaProductionWeb/LaaProduction.Services/Models/Reports/CordonelPressureSensorItem.cs similarity index 97% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/CordonelPressureSensorItem.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Reports/CordonelPressureSensorItem.cs index 68f39366..dfd470cc 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/CordonelPressureSensorItem.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Reports/CordonelPressureSensorItem.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models.Reports +namespace LaaProduction.Services.Models.Reports { using System; using System.ComponentModel.DataAnnotations; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/CordonelPressureSensorModel.cs b/LaaProductionWeb/LaaProduction.Services/Models/Reports/CordonelPressureSensorModel.cs similarity index 93% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/CordonelPressureSensorModel.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Reports/CordonelPressureSensorModel.cs index dc375f31..5fc68670 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/CordonelPressureSensorModel.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Reports/CordonelPressureSensorModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models.Reports +namespace LaaProduction.Services.Models.Reports { using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/HeliumPressurePoint.cs b/LaaProductionWeb/LaaProduction.Services/Models/Reports/HeliumPressurePoint.cs similarity index 76% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/HeliumPressurePoint.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Reports/HeliumPressurePoint.cs index ae504824..3a37f3a1 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/HeliumPressurePoint.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Reports/HeliumPressurePoint.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models.Reports +namespace LaaProduction.Services.Models.Reports { public class HeliumPressurePoint { diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/HeliumReportFilter.cs b/LaaProductionWeb/LaaProduction.Services/Models/Reports/HeliumReportFilter.cs similarity index 96% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/HeliumReportFilter.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Reports/HeliumReportFilter.cs index c5e5c47b..149de87f 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/HeliumReportFilter.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Reports/HeliumReportFilter.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models.Reports +namespace LaaProduction.Services.Models.Reports { public partial class HeliumReportFilter : ReportFilter { diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/HeliumReportItem.cs b/LaaProductionWeb/LaaProduction.Services/Models/Reports/HeliumReportItem.cs similarity index 98% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/HeliumReportItem.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Reports/HeliumReportItem.cs index 00127ea7..39043501 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/HeliumReportItem.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Reports/HeliumReportItem.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models.Reports +namespace LaaProduction.Services.Models.Reports { using System; using System.ComponentModel.DataAnnotations; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/HeliumReportModel.cs b/LaaProductionWeb/LaaProduction.Services/Models/Reports/HeliumReportModel.cs similarity index 92% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/HeliumReportModel.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Reports/HeliumReportModel.cs index 09a7bc53..9977003b 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/HeliumReportModel.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Reports/HeliumReportModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models.Reports +namespace LaaProduction.Services.Models.Reports { using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/KottmannReportFilter.cs b/LaaProductionWeb/LaaProduction.Services/Models/Reports/KottmannReportFilter.cs similarity index 94% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/KottmannReportFilter.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Reports/KottmannReportFilter.cs index 8e297699..b474881e 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/KottmannReportFilter.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Reports/KottmannReportFilter.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models.Reports +namespace LaaProduction.Services.Models.Reports { public class KottmannReportFilter : ReportFilter { diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/KottmannReportItem.cs b/LaaProductionWeb/LaaProduction.Services/Models/Reports/KottmannReportItem.cs similarity index 96% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/KottmannReportItem.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Reports/KottmannReportItem.cs index c8b37db1..d0b37775 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/KottmannReportItem.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Reports/KottmannReportItem.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models.Reports +namespace LaaProduction.Services.Models.Reports { using System; using System.ComponentModel.DataAnnotations; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/KottmannReportModel.cs b/LaaProductionWeb/LaaProduction.Services/Models/Reports/KottmannReportModel.cs similarity index 92% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/KottmannReportModel.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Reports/KottmannReportModel.cs index 95714e28..ea72be86 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/KottmannReportModel.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Reports/KottmannReportModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models.Reports +namespace LaaProduction.Services.Models.Reports { using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/PropertyType.cs b/LaaProductionWeb/LaaProduction.Services/Models/Reports/PropertyType.cs similarity index 61% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/PropertyType.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Reports/PropertyType.cs index e3aeb455..e99e6399 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/PropertyType.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Reports/PropertyType.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models.Reports +namespace LaaProduction.Services.Models.Reports { public enum PropertyType { diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/ReportFilter.cs b/LaaProductionWeb/LaaProduction.Services/Models/Reports/ReportFilter.cs similarity index 98% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/ReportFilter.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Reports/ReportFilter.cs index b79c9a14..b86a2e49 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/ReportFilter.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Reports/ReportFilter.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models.Reports +namespace LaaProduction.Services.Models.Reports { using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/ReportFilterProperty.cs b/LaaProductionWeb/LaaProduction.Services/Models/Reports/ReportFilterProperty.cs similarity index 94% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/ReportFilterProperty.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Reports/ReportFilterProperty.cs index bd025469..59d14a5d 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/ReportFilterProperty.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Reports/ReportFilterProperty.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models.Reports +namespace LaaProduction.Services.Models.Reports { public class ReportFilterProperty { diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/ReportModelExtensions.cs b/LaaProductionWeb/LaaProduction.Services/Models/Reports/ReportModelExtensions.cs similarity index 97% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/ReportModelExtensions.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Reports/ReportModelExtensions.cs index f2a929ae..6451ae02 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/ReportModelExtensions.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Reports/ReportModelExtensions.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models.Reports +namespace LaaProduction.Services.Models.Reports { using System; using System.ComponentModel.DataAnnotations; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/SqlExpression.cs b/LaaProductionWeb/LaaProduction.Services/Models/Reports/SqlExpression.cs similarity index 95% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/SqlExpression.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Reports/SqlExpression.cs index 6bc73c24..e232fc4c 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/SqlExpression.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Reports/SqlExpression.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models.Reports +namespace LaaProduction.Services.Models.Reports { using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/TestStatus.cs b/LaaProductionWeb/LaaProduction.Services/Models/Reports/TestStatus.cs similarity index 85% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/TestStatus.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Reports/TestStatus.cs index b3d7d6b5..0c4304ff 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Reports/TestStatus.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Reports/TestStatus.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models.Reports +namespace LaaProduction.Services.Models.Reports { public class TestStatus { diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Result.cs b/LaaProductionWeb/LaaProduction.Services/Models/Result.cs similarity index 95% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Result.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Result.cs index 89e041af..d9cc884a 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Result.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Result.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models +namespace LaaProduction.Services.Models { public class Result { diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Search/SearchWildcardModel.cs b/LaaProductionWeb/LaaProduction.Services/Models/Search/SearchWildcardModel.cs similarity index 89% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Search/SearchWildcardModel.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Search/SearchWildcardModel.cs index 45c57895..a5ca3c6e 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Search/SearchWildcardModel.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Search/SearchWildcardModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models.Search +namespace LaaProduction.Services.Models.Search { using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Search/WildcardInputModel.cs b/LaaProductionWeb/LaaProduction.Services/Models/Search/WildcardInputModel.cs similarity index 95% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Search/WildcardInputModel.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Search/WildcardInputModel.cs index 2f5e8ba6..b6110107 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Search/WildcardInputModel.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Search/WildcardInputModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models +namespace LaaProduction.Services.Models { using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Search/WildcardResult.cs b/LaaProductionWeb/LaaProduction.Services/Models/Search/WildcardResult.cs similarity index 71% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Search/WildcardResult.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Search/WildcardResult.cs index 2d5029f4..96cd4e71 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Search/WildcardResult.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Search/WildcardResult.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models +namespace LaaProduction.Services.Models { using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/SerialNr.cs b/LaaProductionWeb/LaaProduction.Services/Models/SerialNr.cs similarity index 89% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/SerialNr.cs rename to LaaProductionWeb/LaaProduction.Services/Models/SerialNr.cs index 7b388396..7840f7d7 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/SerialNr.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/SerialNr.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models +namespace LaaProduction.Services.Models { public class SerialNr { diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/ShipmentModel.cs b/LaaProductionWeb/LaaProduction.Services/Models/ShipmentModel.cs similarity index 95% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/ShipmentModel.cs rename to LaaProductionWeb/LaaProduction.Services/Models/ShipmentModel.cs index 80acfd24..5915e4e1 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/ShipmentModel.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/ShipmentModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models +namespace LaaProduction.Services.Models { using System.ComponentModel.DataAnnotations; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Software/FunctionUsers.cs b/LaaProductionWeb/LaaProduction.Services/Models/Software/FunctionUsers.cs similarity index 77% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Software/FunctionUsers.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Software/FunctionUsers.cs index 11e15a6c..b99888ee 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Software/FunctionUsers.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Software/FunctionUsers.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models.Software +namespace LaaProduction.Services.Models.Software { using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Software/Software.cs b/LaaProductionWeb/LaaProduction.Services/Models/Software/Software.cs similarity index 91% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Software/Software.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Software/Software.cs index 6f562838..ed914c41 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Software/Software.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Software/Software.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models.Software +namespace LaaProduction.Services.Models.Software { using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Software/SoftwareFunction.cs b/LaaProductionWeb/LaaProduction.Services/Models/Software/SoftwareFunction.cs similarity index 75% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Software/SoftwareFunction.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Software/SoftwareFunction.cs index bb656e01..8c86b1e2 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Software/SoftwareFunction.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Software/SoftwareFunction.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models.Software +namespace LaaProduction.Services.Models.Software { public class SoftwareFunction { diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Software/SoftwareOverview.cs b/LaaProductionWeb/LaaProduction.Services/Models/Software/SoftwareOverview.cs similarity index 80% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Software/SoftwareOverview.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Software/SoftwareOverview.cs index ee3fcba3..9716cd3b 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Software/SoftwareOverview.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Software/SoftwareOverview.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models.Software +namespace LaaProduction.Services.Models.Software { public class SoftwareOverview { diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Software/SoftwareUser.cs b/LaaProductionWeb/LaaProduction.Services/Models/Software/SoftwareUser.cs similarity index 86% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Software/SoftwareUser.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Software/SoftwareUser.cs index 4504c1b3..2100cf77 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Software/SoftwareUser.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Software/SoftwareUser.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models.Software +namespace LaaProduction.Services.Models.Software { public class SoftwareUser { diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Models/Software/UserFunctions.cs b/LaaProductionWeb/LaaProduction.Services/Models/Software/UserFunctions.cs similarity index 78% rename from LaaProductionWeb/LaaProductionWeb.Services/Models/Software/UserFunctions.cs rename to LaaProductionWeb/LaaProduction.Services/Models/Software/UserFunctions.cs index 7c707350..948bae00 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Models/Software/UserFunctions.cs +++ b/LaaProductionWeb/LaaProduction.Services/Models/Software/UserFunctions.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Services.Models.Software +namespace LaaProduction.Services.Models.Software { using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/OrdersService.cs b/LaaProductionWeb/LaaProduction.Services/OrdersService.cs similarity index 96% rename from LaaProductionWeb/LaaProductionWeb.Services/OrdersService.cs rename to LaaProductionWeb/LaaProduction.Services/OrdersService.cs index 5891e741..c5429ee2 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/OrdersService.cs +++ b/LaaProductionWeb/LaaProduction.Services/OrdersService.cs @@ -1,8 +1,8 @@ -namespace LaaProductionWeb.Services +namespace LaaProduction.Services { using LaaProductionSQL.Interfaces; - using LaaProductionWeb.Services.Interfaces; - using LaaProductionWeb.Services.Models; + using LaaProduction.Services.Interfaces; + using LaaProduction.Services.Models; public class OrdersService : IOrdersService { diff --git a/LaaProductionWeb/LaaProductionWeb.Services/Properties/AssemblyInfo.cs b/LaaProductionWeb/LaaProduction.Services/Properties/AssemblyInfo.cs similarity index 92% rename from LaaProductionWeb/LaaProductionWeb.Services/Properties/AssemblyInfo.cs rename to LaaProductionWeb/LaaProduction.Services/Properties/AssemblyInfo.cs index 1ae42398..d46b1c64 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/Properties/AssemblyInfo.cs +++ b/LaaProductionWeb/LaaProduction.Services/Properties/AssemblyInfo.cs @@ -5,11 +5,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("LaaProductionWeb.Services")] +[assembly: AssemblyTitle("LaaProduction.Services")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("LaaProductionWeb.Services")] +[assembly: AssemblyProduct("LaaProduction.Services")] [assembly: AssemblyCopyright("Copyright © 2023")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/LaaProductionWeb/LaaProductionWeb.Services/ProtocolService.cs b/LaaProductionWeb/LaaProduction.Services/ProtocolService.cs similarity index 98% rename from LaaProductionWeb/LaaProductionWeb.Services/ProtocolService.cs rename to LaaProductionWeb/LaaProduction.Services/ProtocolService.cs index b64c91d7..31257f7b 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/ProtocolService.cs +++ b/LaaProductionWeb/LaaProduction.Services/ProtocolService.cs @@ -1,9 +1,9 @@ -namespace LaaProductionWeb.Services +namespace LaaProduction.Services { using LaaProductionSQL.Interfaces; - using LaaProductionWeb.Services.Interfaces; - using LaaProductionWeb.Services.Models; - using LaaProductionWeb.Services.Models.Reports; + using LaaProduction.Services.Interfaces; + using LaaProduction.Services.Models; + using LaaProduction.Services.Models.Reports; using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/ReportService.cs b/LaaProductionWeb/LaaProduction.Services/ReportService.cs similarity index 99% rename from LaaProductionWeb/LaaProductionWeb.Services/ReportService.cs rename to LaaProductionWeb/LaaProduction.Services/ReportService.cs index c47cd59a..41a6fe1a 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/ReportService.cs +++ b/LaaProductionWeb/LaaProduction.Services/ReportService.cs @@ -1,8 +1,8 @@ -namespace LaaProductionWeb.Services +namespace LaaProduction.Services { using LaaProductionSQL.Interfaces; - using LaaProductionWeb.Services.Interfaces; - using LaaProductionWeb.Services.Models.Reports; + using LaaProduction.Services.Interfaces; + using LaaProduction.Services.Models.Reports; using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/SearchService.cs b/LaaProductionWeb/LaaProduction.Services/SearchService.cs similarity index 98% rename from LaaProductionWeb/LaaProductionWeb.Services/SearchService.cs rename to LaaProductionWeb/LaaProduction.Services/SearchService.cs index 05cfe3a5..e8e2e203 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/SearchService.cs +++ b/LaaProductionWeb/LaaProduction.Services/SearchService.cs @@ -1,8 +1,8 @@ -namespace LaaProductionWeb.Services +namespace LaaProduction.Services { using LaaProductionSQL.Interfaces; - using LaaProductionWeb.Services.Models; - using LaaProductionWeb.Services.Interfaces; + using LaaProduction.Services.Models; + using LaaProduction.Services.Interfaces; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/ShipmentsService.cs b/LaaProductionWeb/LaaProduction.Services/ShipmentsService.cs similarity index 99% rename from LaaProductionWeb/LaaProductionWeb.Services/ShipmentsService.cs rename to LaaProductionWeb/LaaProduction.Services/ShipmentsService.cs index 7faa078c..e2d49bce 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/ShipmentsService.cs +++ b/LaaProductionWeb/LaaProduction.Services/ShipmentsService.cs @@ -1,8 +1,8 @@ -namespace LaaProductionWeb.Services +namespace LaaProduction.Services { using LaaProductionSQL.Interfaces; - using LaaProductionWeb.Services.Interfaces; - using LaaProductionWeb.Services.Models; + using LaaProduction.Services.Interfaces; + using LaaProduction.Services.Models; using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb.Services/SoftwareService.cs b/LaaProductionWeb/LaaProduction.Services/SoftwareService.cs similarity index 99% rename from LaaProductionWeb/LaaProductionWeb.Services/SoftwareService.cs rename to LaaProductionWeb/LaaProduction.Services/SoftwareService.cs index b5142524..30116467 100644 --- a/LaaProductionWeb/LaaProductionWeb.Services/SoftwareService.cs +++ b/LaaProductionWeb/LaaProduction.Services/SoftwareService.cs @@ -1,8 +1,8 @@ -namespace LaaProductionWeb.Services +namespace LaaProduction.Services { using LaaProductionSQL.Interfaces; - using LaaProductionWeb.Services.Interfaces; - using LaaProductionWeb.Services.Models.Software; + using LaaProduction.Services.Interfaces; + using LaaProduction.Services.Models.Software; using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb/App_Content/css/bootstrap.min.css b/LaaProductionWeb/LaaProduction.Web/App_Content/css/bootstrap.min.css similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/App_Content/css/bootstrap.min.css rename to LaaProductionWeb/LaaProduction.Web/App_Content/css/bootstrap.min.css diff --git a/LaaProductionWeb/LaaProductionWeb/App_Content/css/bootstrap.min.css.map b/LaaProductionWeb/LaaProduction.Web/App_Content/css/bootstrap.min.css.map similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/App_Content/css/bootstrap.min.css.map rename to LaaProductionWeb/LaaProduction.Web/App_Content/css/bootstrap.min.css.map diff --git a/LaaProductionWeb/LaaProductionWeb/App_Content/css/styles.css b/LaaProductionWeb/LaaProduction.Web/App_Content/css/styles.css similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/App_Content/css/styles.css rename to LaaProductionWeb/LaaProduction.Web/App_Content/css/styles.css diff --git a/LaaProductionWeb/LaaProductionWeb/App_Content/font/bootstrap-icons.min.css b/LaaProductionWeb/LaaProduction.Web/App_Content/font/bootstrap-icons.min.css similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/App_Content/font/bootstrap-icons.min.css rename to LaaProductionWeb/LaaProduction.Web/App_Content/font/bootstrap-icons.min.css diff --git a/LaaProductionWeb/LaaProductionWeb/App_Content/font/fonts/bootstrap-icons.woff b/LaaProductionWeb/LaaProduction.Web/App_Content/font/fonts/bootstrap-icons.woff similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/App_Content/font/fonts/bootstrap-icons.woff rename to LaaProductionWeb/LaaProduction.Web/App_Content/font/fonts/bootstrap-icons.woff diff --git a/LaaProductionWeb/LaaProductionWeb/App_Content/font/fonts/bootstrap-icons.woff2 b/LaaProductionWeb/LaaProduction.Web/App_Content/font/fonts/bootstrap-icons.woff2 similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/App_Content/font/fonts/bootstrap-icons.woff2 rename to LaaProductionWeb/LaaProduction.Web/App_Content/font/fonts/bootstrap-icons.woff2 diff --git a/LaaProductionWeb/LaaProductionWeb/App_Content/js/bootstrap.bundle.min.js b/LaaProductionWeb/LaaProduction.Web/App_Content/js/bootstrap.bundle.min.js similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/App_Content/js/bootstrap.bundle.min.js rename to LaaProductionWeb/LaaProduction.Web/App_Content/js/bootstrap.bundle.min.js diff --git a/LaaProductionWeb/LaaProductionWeb/App_Content/js/jsbarcode.all.min.js b/LaaProductionWeb/LaaProduction.Web/App_Content/js/jsbarcode.all.min.js similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/App_Content/js/jsbarcode.all.min.js rename to LaaProductionWeb/LaaProduction.Web/App_Content/js/jsbarcode.all.min.js diff --git a/LaaProductionWeb/LaaProductionWeb/App_Content/js/scripts.js b/LaaProductionWeb/LaaProduction.Web/App_Content/js/scripts.js similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/App_Content/js/scripts.js rename to LaaProductionWeb/LaaProduction.Web/App_Content/js/scripts.js diff --git a/LaaProductionWeb/LaaProductionWeb/App_Content/svg/sensus_xylem_logo.svg b/LaaProductionWeb/LaaProduction.Web/App_Content/svg/sensus_xylem_logo.svg similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/App_Content/svg/sensus_xylem_logo.svg rename to LaaProductionWeb/LaaProduction.Web/App_Content/svg/sensus_xylem_logo.svg diff --git a/LaaProductionWeb/LaaProductionWeb/App_Data/client_map.json b/LaaProductionWeb/LaaProduction.Web/App_Data/client_map.json similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/App_Data/client_map.json rename to LaaProductionWeb/LaaProduction.Web/App_Data/client_map.json diff --git a/LaaProductionWeb/LaaProductionWeb/App_Infrastructure/AllowedRolesAttribute.cs b/LaaProductionWeb/LaaProduction.Web/App_Infrastructure/AllowedRolesAttribute.cs similarity index 94% rename from LaaProductionWeb/LaaProductionWeb/App_Infrastructure/AllowedRolesAttribute.cs rename to LaaProductionWeb/LaaProduction.Web/App_Infrastructure/AllowedRolesAttribute.cs index b19c03fd..9b041c4e 100644 --- a/LaaProductionWeb/LaaProductionWeb/App_Infrastructure/AllowedRolesAttribute.cs +++ b/LaaProductionWeb/LaaProduction.Web/App_Infrastructure/AllowedRolesAttribute.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.App_Infrastructure +namespace LaaProduction.Web.App_Infrastructure { using LaaProduction.Personalization; diff --git a/LaaProductionWeb/LaaProductionWeb/App_Infrastructure/Appsettings.cs b/LaaProductionWeb/LaaProduction.Web/App_Infrastructure/Appsettings.cs similarity index 91% rename from LaaProductionWeb/LaaProductionWeb/App_Infrastructure/Appsettings.cs rename to LaaProductionWeb/LaaProduction.Web/App_Infrastructure/Appsettings.cs index a6a5c0d8..9945912b 100644 --- a/LaaProductionWeb/LaaProductionWeb/App_Infrastructure/Appsettings.cs +++ b/LaaProductionWeb/LaaProduction.Web/App_Infrastructure/Appsettings.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.App_Infrastructure +namespace LaaProduction.Web.App_Infrastructure { using System.Configuration; diff --git a/LaaProductionWeb/LaaProductionWeb/App_Infrastructure/AuthorizationFilter.cs b/LaaProductionWeb/LaaProduction.Web/App_Infrastructure/AuthorizationFilter.cs similarity index 93% rename from LaaProductionWeb/LaaProductionWeb/App_Infrastructure/AuthorizationFilter.cs rename to LaaProductionWeb/LaaProduction.Web/App_Infrastructure/AuthorizationFilter.cs index b0c488c0..03aa871d 100644 --- a/LaaProductionWeb/LaaProductionWeb/App_Infrastructure/AuthorizationFilter.cs +++ b/LaaProductionWeb/LaaProduction.Web/App_Infrastructure/AuthorizationFilter.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.App_Infrastructure +namespace LaaProduction.Web.App_Infrastructure { using LaaProduction.Personalization.Interfaces; diff --git a/LaaProductionWeb/LaaProductionWeb/App_Infrastructure/AuthorizeBearerAttribute.cs b/LaaProductionWeb/LaaProduction.Web/App_Infrastructure/AuthorizeBearerAttribute.cs similarity index 66% rename from LaaProductionWeb/LaaProductionWeb/App_Infrastructure/AuthorizeBearerAttribute.cs rename to LaaProductionWeb/LaaProduction.Web/App_Infrastructure/AuthorizeBearerAttribute.cs index bfef8a9b..89e1d0cb 100644 --- a/LaaProductionWeb/LaaProductionWeb/App_Infrastructure/AuthorizeBearerAttribute.cs +++ b/LaaProductionWeb/LaaProduction.Web/App_Infrastructure/AuthorizeBearerAttribute.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.App_Infrastructure +namespace LaaProduction.Web.App_Infrastructure { using LaaProduction.Personalization.Interfaces; @@ -7,17 +7,13 @@ public class AuthorizeBearerAttribute : AuthorizeAttribute { - private readonly IAccountManager accountManager; - - public AuthorizeBearerAttribute() - => this.accountManager = ServiceProvider.GetService(); - protected override bool IsAuthorized(HttpActionContext actionContext) { if (actionContext.Request.Headers.Authorization?.Scheme == "Bearer") { + var accountManager = ServiceProvider.GetService(); var bearer = actionContext.Request.Headers.Authorization.Parameter; - var principal = this.accountManager.GetClaimsPrincipal(bearer); + var principal = accountManager.GetClaimsPrincipal(bearer); return principal.Identity.IsAuthenticated; } diff --git a/LaaProductionWeb/LaaProductionWeb/App_Infrastructure/ExceptionFilter.cs b/LaaProductionWeb/LaaProduction.Web/App_Infrastructure/ExceptionFilter.cs similarity index 82% rename from LaaProductionWeb/LaaProductionWeb/App_Infrastructure/ExceptionFilter.cs rename to LaaProductionWeb/LaaProduction.Web/App_Infrastructure/ExceptionFilter.cs index a38a1d6a..a72a2bfa 100644 --- a/LaaProductionWeb/LaaProductionWeb/App_Infrastructure/ExceptionFilter.cs +++ b/LaaProductionWeb/LaaProduction.Web/App_Infrastructure/ExceptionFilter.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.App_Infrastructure +namespace LaaProduction.Web.App_Infrastructure { using System.Web.Mvc; diff --git a/LaaProductionWeb/LaaProductionWeb/App_Infrastructure/HttpExtensions.cs b/LaaProductionWeb/LaaProduction.Web/App_Infrastructure/HttpExtensions.cs similarity index 99% rename from LaaProductionWeb/LaaProductionWeb/App_Infrastructure/HttpExtensions.cs rename to LaaProductionWeb/LaaProduction.Web/App_Infrastructure/HttpExtensions.cs index 5755f168..4f46b529 100644 --- a/LaaProductionWeb/LaaProductionWeb/App_Infrastructure/HttpExtensions.cs +++ b/LaaProductionWeb/LaaProduction.Web/App_Infrastructure/HttpExtensions.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.App_Infrastructure +namespace LaaProduction.Web.App_Infrastructure { using LaaProductionHttp.Interfaces; using Newtonsoft.Json; diff --git a/LaaProductionWeb/LaaProductionWeb/App_Infrastructure/RouteParameterAttribute.cs b/LaaProductionWeb/LaaProduction.Web/App_Infrastructure/RouteParameterAttribute.cs similarity index 96% rename from LaaProductionWeb/LaaProductionWeb/App_Infrastructure/RouteParameterAttribute.cs rename to LaaProductionWeb/LaaProduction.Web/App_Infrastructure/RouteParameterAttribute.cs index df55f198..b0b8bfb3 100644 --- a/LaaProductionWeb/LaaProductionWeb/App_Infrastructure/RouteParameterAttribute.cs +++ b/LaaProductionWeb/LaaProduction.Web/App_Infrastructure/RouteParameterAttribute.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.App_Infrastructure +namespace LaaProduction.Web.App_Infrastructure { using Newtonsoft.Json; diff --git a/LaaProductionWeb/LaaProductionWeb/App_Infrastructure/ServiceProvider.cs b/LaaProductionWeb/LaaProduction.Web/App_Infrastructure/ServiceProvider.cs similarity index 89% rename from LaaProductionWeb/LaaProductionWeb/App_Infrastructure/ServiceProvider.cs rename to LaaProductionWeb/LaaProduction.Web/App_Infrastructure/ServiceProvider.cs index db775811..47678d74 100644 --- a/LaaProductionWeb/LaaProductionWeb/App_Infrastructure/ServiceProvider.cs +++ b/LaaProductionWeb/LaaProduction.Web/App_Infrastructure/ServiceProvider.cs @@ -1,12 +1,12 @@ -namespace LaaProductionWeb +namespace LaaProduction { using LaaProduction.Personalization; using LaaProduction.Search; using LaaProductionHttp; using LaaProductionSQL; - using LaaProductionWeb.App_Infrastructure; - using LaaProductionWeb.Services; - using LaaProductionWeb.Services.Interfaces; + using LaaProduction.Web.App_Infrastructure; + using LaaProduction.Services; + using LaaProduction.Services.Interfaces; using Microsoft.Extensions.DependencyInjection; @@ -23,6 +23,8 @@ => serviceProvider = new ServiceCollection() .AddSingleton(_ => SQLConnection.CreateConnection(Appsettings.ConnectionString)) .AddSingleton(_ => HttpClient.CreateHttpClient(Appsettings.APIURL)) + .AddAdministration(Appsettings.ConnectionString) + .AddSearching(Appsettings.ConnectionString) .AddScoped() .AddScoped() .AddScoped() @@ -32,8 +34,6 @@ .AddScoped() .AddScoped() .AddScoped() - .AddAdministration(Appsettings.ConnectionString) - .AddSearching(Appsettings.ConnectionString) .BuildServiceProvider(); } } \ No newline at end of file diff --git a/LaaProductionWeb/LaaProductionWeb/App_Start/BundleConfig.cs b/LaaProductionWeb/LaaProduction.Web/App_Start/BundleConfig.cs similarity index 97% rename from LaaProductionWeb/LaaProductionWeb/App_Start/BundleConfig.cs rename to LaaProductionWeb/LaaProduction.Web/App_Start/BundleConfig.cs index 9c808b0d..aba58595 100644 --- a/LaaProductionWeb/LaaProductionWeb/App_Start/BundleConfig.cs +++ b/LaaProductionWeb/LaaProduction.Web/App_Start/BundleConfig.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb +namespace LaaProduction { using System.Web.Optimization; diff --git a/LaaProductionWeb/LaaProductionWeb/App_Start/FilterConfig.cs b/LaaProductionWeb/LaaProduction.Web/App_Start/FilterConfig.cs similarity index 78% rename from LaaProductionWeb/LaaProductionWeb/App_Start/FilterConfig.cs rename to LaaProductionWeb/LaaProduction.Web/App_Start/FilterConfig.cs index d64c7514..e0681850 100644 --- a/LaaProductionWeb/LaaProductionWeb/App_Start/FilterConfig.cs +++ b/LaaProductionWeb/LaaProduction.Web/App_Start/FilterConfig.cs @@ -1,6 +1,6 @@ -namespace LaaProductionWeb +namespace LaaProduction { - using LaaProductionWeb.App_Infrastructure; + using LaaProduction.Web.App_Infrastructure; using System.Web.Mvc; diff --git a/LaaProductionWeb/LaaProductionWeb/App_Start/RouteConfig.cs b/LaaProductionWeb/LaaProduction.Web/App_Start/RouteConfig.cs similarity index 94% rename from LaaProductionWeb/LaaProductionWeb/App_Start/RouteConfig.cs rename to LaaProductionWeb/LaaProduction.Web/App_Start/RouteConfig.cs index 9fb45a7a..8a838602 100644 --- a/LaaProductionWeb/LaaProductionWeb/App_Start/RouteConfig.cs +++ b/LaaProductionWeb/LaaProduction.Web/App_Start/RouteConfig.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb +namespace LaaProduction { using System.Web.Mvc; using System.Web.Routing; diff --git a/LaaProductionWeb/LaaProductionWeb/App_Start/WebApiConfig.cs b/LaaProductionWeb/LaaProduction.Web/App_Start/WebApiConfig.cs similarity index 97% rename from LaaProductionWeb/LaaProductionWeb/App_Start/WebApiConfig.cs rename to LaaProductionWeb/LaaProduction.Web/App_Start/WebApiConfig.cs index 07af12ba..c79b50ed 100644 --- a/LaaProductionWeb/LaaProductionWeb/App_Start/WebApiConfig.cs +++ b/LaaProductionWeb/LaaProduction.Web/App_Start/WebApiConfig.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb +namespace LaaProduction { using System.Web.Http; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Controllers/EmployeesController.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Controllers/EmployeesController.cs similarity index 97% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Controllers/EmployeesController.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Controllers/EmployeesController.cs index 3061e043..a4e30d8d 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Controllers/EmployeesController.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Controllers/EmployeesController.cs @@ -1,9 +1,9 @@ -namespace LaaProductionWeb.Areas.Personalization.Controllers +namespace LaaProduction.Web.Areas.Personalization.Controllers { using LaaProduction.Personalization; using LaaProductionHttp.Interfaces; - using LaaProductionWeb.App_Infrastructure; - using LaaProductionWeb.Areas.Personalization.Models.Employees; + using LaaProduction.Web.App_Infrastructure; + using LaaProduction.Web.Areas.Personalization.Models.Employees; using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Controllers/EmployeesFunctionsController.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Controllers/EmployeesFunctionsController.cs similarity index 78% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Controllers/EmployeesFunctionsController.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Controllers/EmployeesFunctionsController.cs index 529bb6fa..84eb3610 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Controllers/EmployeesFunctionsController.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Controllers/EmployeesFunctionsController.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Controllers +namespace LaaProduction.Web.Areas.Personalization.Controllers { using System.Web.Mvc; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Controllers/EmployeesRolesController.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Controllers/EmployeesRolesController.cs similarity index 78% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Controllers/EmployeesRolesController.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Controllers/EmployeesRolesController.cs index 16fa3612..bedc0752 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Controllers/EmployeesRolesController.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Controllers/EmployeesRolesController.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Controllers +namespace LaaProduction.Web.Areas.Personalization.Controllers { using System.Web.Mvc; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Controllers/PersonalizationController.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Controllers/PersonalizationController.cs similarity index 78% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Controllers/PersonalizationController.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Controllers/PersonalizationController.cs index 0665db1e..61898879 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Controllers/PersonalizationController.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Controllers/PersonalizationController.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Controllers +namespace LaaProduction.Web.Areas.Personalization.Controllers { using System.Web.Mvc; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Controllers/SoftwareController.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Controllers/SoftwareController.cs similarity index 97% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Controllers/SoftwareController.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Controllers/SoftwareController.cs index d7251f71..9c0be390 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Controllers/SoftwareController.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Controllers/SoftwareController.cs @@ -1,10 +1,10 @@ -namespace LaaProductionWeb.Areas.Personalization.Controllers +namespace LaaProduction.Web.Areas.Personalization.Controllers { using LaaProduction.Personalization; - using LaaProductionWeb.App_Infrastructure; - using LaaProductionWeb.Areas.Personalization.Models.Software; - using LaaProductionWeb.Services.Interfaces; + using LaaProduction.Web.App_Infrastructure; + using LaaProduction.Web.Areas.Personalization.Models.Software; + using LaaProduction.Services.Interfaces; using System; using System.Linq; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Controllers/SoftwareFunctionsController.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Controllers/SoftwareFunctionsController.cs similarity index 78% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Controllers/SoftwareFunctionsController.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Controllers/SoftwareFunctionsController.cs index 286fdf59..311f89c8 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Controllers/SoftwareFunctionsController.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Controllers/SoftwareFunctionsController.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Controllers +namespace LaaProduction.Web.Areas.Personalization.Controllers { using System.Web.Mvc; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Employees/Employee.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Employees/Employee.cs similarity index 82% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Employees/Employee.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Employees/Employee.cs index 4bf11876..2e451066 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Employees/Employee.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Employees/Employee.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Models.Employees +namespace LaaProduction.Web.Areas.Personalization.Models.Employees { public class Employee { diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Employees/EmployeeEditFunctionsModel.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Employees/EmployeeEditFunctionsModel.cs similarity index 79% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Employees/EmployeeEditFunctionsModel.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Employees/EmployeeEditFunctionsModel.cs index 9daad251..d3b9e4ee 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Employees/EmployeeEditFunctionsModel.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Employees/EmployeeEditFunctionsModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Models.Employees +namespace LaaProduction.Web.Areas.Personalization.Models.Employees { using System; using System.ComponentModel.DataAnnotations; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Employees/EmployeeEditModel.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Employees/EmployeeEditModel.cs similarity index 82% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Employees/EmployeeEditModel.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Employees/EmployeeEditModel.cs index 2dbe7017..649ae077 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Employees/EmployeeEditModel.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Employees/EmployeeEditModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Models.Employees +namespace LaaProduction.Web.Areas.Personalization.Models.Employees { using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Employees/EmployeeEditRolesModel.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Employees/EmployeeEditRolesModel.cs similarity index 79% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Employees/EmployeeEditRolesModel.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Employees/EmployeeEditRolesModel.cs index b741ed30..3aa77e5b 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Employees/EmployeeEditRolesModel.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Employees/EmployeeEditRolesModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Models.Employees +namespace LaaProduction.Web.Areas.Personalization.Models.Employees { using System; using System.ComponentModel.DataAnnotations; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Employees/EmployeeFindModel.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Employees/EmployeeFindModel.cs similarity index 84% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Employees/EmployeeFindModel.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Employees/EmployeeFindModel.cs index 5c192c24..31d96f34 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Employees/EmployeeFindModel.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Employees/EmployeeFindModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Models.Employees +namespace LaaProduction.Web.Areas.Personalization.Models.Employees { using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Employees/EmployeePassword.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Employees/EmployeePassword.cs similarity index 82% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Employees/EmployeePassword.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Employees/EmployeePassword.cs index eb3730d2..de6bcc6b 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Employees/EmployeePassword.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Employees/EmployeePassword.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Models.Employees +namespace LaaProduction.Web.Areas.Personalization.Models.Employees { using System.ComponentModel.DataAnnotations; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Employees/EmployeesListModel.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Employees/EmployeesListModel.cs similarity index 74% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Employees/EmployeesListModel.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Employees/EmployeesListModel.cs index 22a87aad..15c7167c 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Employees/EmployeesListModel.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Employees/EmployeesListModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Models.Employees +namespace LaaProduction.Web.Areas.Personalization.Models.Employees { using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/AddFunctionModel.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/AddFunctionModel.cs similarity index 79% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/AddFunctionModel.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/AddFunctionModel.cs index 16c5fe21..857d05b7 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/AddFunctionModel.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/AddFunctionModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Models.Software +namespace LaaProduction.Web.Areas.Personalization.Models.Software { using System.ComponentModel.DataAnnotations; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/EditFunctionModel.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/EditFunctionModel.cs similarity index 82% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/EditFunctionModel.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/EditFunctionModel.cs index b87618a7..59c87364 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/EditFunctionModel.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/EditFunctionModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Models.Software +namespace LaaProduction.Web.Areas.Personalization.Models.Software { using System.ComponentModel.DataAnnotations; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/FunctionUsersInputModel.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/FunctionUsersInputModel.cs similarity index 75% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/FunctionUsersInputModel.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/FunctionUsersInputModel.cs index 1ef84e3d..f0c2bdba 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/FunctionUsersInputModel.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/FunctionUsersInputModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Models.Software +namespace LaaProduction.Web.Areas.Personalization.Models.Software { using System.ComponentModel.DataAnnotations; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareEditModel.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareEditModel.cs similarity index 72% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareEditModel.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareEditModel.cs index 8e803b54..f7136c51 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareEditModel.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareEditModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Models.Software +namespace LaaProduction.Web.Areas.Personalization.Models.Software { using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareFunctionModel.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareFunctionModel.cs similarity index 72% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareFunctionModel.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareFunctionModel.cs index 963bfb34..2e427e15 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareFunctionModel.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareFunctionModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Models.Software +namespace LaaProduction.Web.Areas.Personalization.Models.Software { public class SoftwareFunctionModel { diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareFunctionsModel.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareFunctionsModel.cs similarity index 79% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareFunctionsModel.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareFunctionsModel.cs index 82c9e00f..6142f824 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareFunctionsModel.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareFunctionsModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Models.Software +namespace LaaProduction.Web.Areas.Personalization.Models.Software { using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareModel.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareModel.cs similarity index 70% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareModel.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareModel.cs index 5631dc3a..2a0aa407 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareModel.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Models.Software +namespace LaaProduction.Web.Areas.Personalization.Models.Software { using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareOverviewModel.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareOverviewModel.cs similarity index 76% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareOverviewModel.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareOverviewModel.cs index 3acc71b8..b4f8823d 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareOverviewModel.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareOverviewModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Models.Software +namespace LaaProduction.Web.Areas.Personalization.Models.Software { public class SoftwareOverviewModel { diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareUser.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareUser.cs similarity index 82% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareUser.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareUser.cs index 91fc404e..fc1db44a 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareUser.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareUser.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Models.Software +namespace LaaProduction.Web.Areas.Personalization.Models.Software { public class SoftwareUser { diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareVersionModel.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareVersionModel.cs similarity index 89% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareVersionModel.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareVersionModel.cs index 7c368b21..23852ac2 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareVersionModel.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareVersionModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Models.Software +namespace LaaProduction.Web.Areas.Personalization.Models.Software { using System; using System.Linq; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareVersionsModel.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareVersionsModel.cs similarity index 74% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareVersionsModel.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareVersionsModel.cs index 7a8217ee..3963313c 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/SoftwareVersionsModel.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/SoftwareVersionsModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Models.Software +namespace LaaProduction.Web.Areas.Personalization.Models.Software { using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/UserFunctions.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/UserFunctions.cs similarity index 69% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/UserFunctions.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/UserFunctions.cs index 1bbaba3f..b70c1c1f 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/UserFunctions.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/UserFunctions.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Models.Software +namespace LaaProduction.Web.Areas.Personalization.Models.Software { using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/UsersFunctionsInputModel.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/UsersFunctionsInputModel.cs similarity index 75% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/UsersFunctionsInputModel.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/UsersFunctionsInputModel.cs index 929d4c13..75072bb3 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/UsersFunctionsInputModel.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/UsersFunctionsInputModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Models.Software +namespace LaaProduction.Web.Areas.Personalization.Models.Software { using System.ComponentModel.DataAnnotations; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/UsersFunctionsModel.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/UsersFunctionsModel.cs similarity index 83% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/UsersFunctionsModel.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/UsersFunctionsModel.cs index f311a292..3892e9f2 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Models/Software/UsersFunctionsModel.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Models/Software/UsersFunctionsModel.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization.Models.Software +namespace LaaProduction.Web.Areas.Personalization.Models.Software { using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/PersonalizationAreaRegistration.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/PersonalizationAreaRegistration.cs similarity index 56% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/PersonalizationAreaRegistration.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/PersonalizationAreaRegistration.cs index e94ed6aa..a59b708d 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/PersonalizationAreaRegistration.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/PersonalizationAreaRegistration.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Personalization +namespace LaaProduction.Web.Areas.Personalization { using System.Web.Mvc; @@ -9,14 +9,9 @@ public override void RegisterArea(AreaRegistrationContext context) { context.MapRoute( - name: "Personalization_WithId", + name: "PersonalizationMVC", url: "Personalization/{controller}/{action}/{id}", defaults: new { controller = "Personalization", action = "Index", id = UrlParameter.Optional }); - - context.MapRoute( - name: "Personalization_WithEmployeeId", - url: "Personalization/{controller}/{action}/{employeeId}", - defaults: new { controller = "Personalization", action = "Index", id = UrlParameter.Optional }); } } } \ No newline at end of file diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Employees/Edit.cshtml b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Employees/Edit.cshtml similarity index 99% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Employees/Edit.cshtml rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Employees/Edit.cshtml index 6ca94539..b9c2a9f1 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Employees/Edit.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Employees/Edit.cshtml @@ -1,6 +1,6 @@ @model EmployeeEditModel -@using LaaProductionWeb.Areas.Personalization.Models.Employees +@using LaaProduction.Web.Areas.Personalization.Models.Employees
diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Employees/Index.cshtml b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Employees/Index.cshtml similarity index 97% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Employees/Index.cshtml rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Employees/Index.cshtml index 2a197120..d9c6d73a 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Employees/Index.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Employees/Index.cshtml @@ -1,6 +1,6 @@ @model EmployeesListModel -@using LaaProductionWeb.Areas.Personalization.Models.Employees +@using LaaProduction.Web.Areas.Personalization.Models.Employees
diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/EmployeesFunctions/Index.cshtml b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/EmployeesFunctions/Index.cshtml similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/EmployeesFunctions/Index.cshtml rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/EmployeesFunctions/Index.cshtml diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/EmployeesRoles/Index.cshtml b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/EmployeesRoles/Index.cshtml similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/EmployeesRoles/Index.cshtml rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/EmployeesRoles/Index.cshtml diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Personalization/Index.cshtml b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Personalization/Index.cshtml similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Personalization/Index.cshtml rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Personalization/Index.cshtml diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Shared/_Layout.cshtml b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Shared/_Layout.cshtml similarity index 98% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Shared/_Layout.cshtml rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Shared/_Layout.cshtml index c5b0383e..569cebb4 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Shared/_Layout.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Shared/_Layout.cshtml @@ -1,5 +1,5 @@ @using LaaProduction.Personalization -@using LaaProductionWeb.App_Infrastructure +@using LaaProduction.Web.App_Infrastructure diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Shared/_SoftwareSidebar.cshtml b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Shared/_SoftwareSidebar.cshtml similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Shared/_SoftwareSidebar.cshtml rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Shared/_SoftwareSidebar.cshtml diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Software/Index.cshtml b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Software/Index.cshtml similarity index 96% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Software/Index.cshtml rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Software/Index.cshtml index 2874ac60..2c6b502c 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Software/Index.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Software/Index.cshtml @@ -1,4 +1,4 @@ -@model LaaProductionWeb.Areas.Personalization.Models.Software.SoftwareModel +@model LaaProduction.Web.Areas.Personalization.Models.Software.SoftwareModel
diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Software/SoftwareFunctions.cshtml b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Software/SoftwareFunctions.cshtml similarity index 99% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Software/SoftwareFunctions.cshtml rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Software/SoftwareFunctions.cshtml index 183caba8..f9a860b6 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Software/SoftwareFunctions.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Software/SoftwareFunctions.cshtml @@ -1,4 +1,4 @@ -@model LaaProductionWeb.Areas.Personalization.Models.Software.SoftwareFunctionsModel +@model LaaProduction.Web.Areas.Personalization.Models.Software.SoftwareFunctionsModel @{ var softwareSelected = (this.Model?.AppId ?? 0) > 0; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Software/SoftwareListGroup.cshtml b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Software/SoftwareListGroup.cshtml similarity index 81% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Software/SoftwareListGroup.cshtml rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Software/SoftwareListGroup.cshtml index 71c2e78d..bfbf3b83 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Software/SoftwareListGroup.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Software/SoftwareListGroup.cshtml @@ -1,4 +1,4 @@ -@model IEnumerable +s@model IEnumerable @if (this.Model?.Any() ?? false) { diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Software/SoftwareVersions.cshtml b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Software/SoftwareVersions.cshtml similarity index 97% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Software/SoftwareVersions.cshtml rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Software/SoftwareVersions.cshtml index 707f9b92..ceec41da 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Software/SoftwareVersions.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Software/SoftwareVersions.cshtml @@ -1,4 +1,4 @@ -@model LaaProductionWeb.Areas.Personalization.Models.Software.SoftwareVersionsModel +@model LaaProduction.Web.Areas.Personalization.Models.Software.SoftwareVersionsModel
diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Software/Users.cshtml b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Software/Users.cshtml similarity index 97% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Software/Users.cshtml rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Software/Users.cshtml index 9aa09ee2..18622f61 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Software/Users.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Software/Users.cshtml @@ -1,7 +1,7 @@ -@model IEnumerable +@model IEnumerable @using LaaProduction.Personalization -@using LaaProductionWeb.App_Infrastructure +@using LaaProduction.Web.App_Infrastructure
diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Software/UsersFunctions.cshtml b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Software/UsersFunctions.cshtml similarity index 98% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Software/UsersFunctions.cshtml rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Software/UsersFunctions.cshtml index 4c15b8e5..fc3ef0e7 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/Software/UsersFunctions.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/Software/UsersFunctions.cshtml @@ -1,4 +1,4 @@ -@model LaaProductionWeb.Areas.Personalization.Models.Software.UsersFunctionsModel +@model LaaProduction.Web.Areas.Personalization.Models.Software.UsersFunctionsModel @using System.Linq diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/SoftwareFunctions/Index.cshtml b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/SoftwareFunctions/Index.cshtml similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/SoftwareFunctions/Index.cshtml rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/SoftwareFunctions/Index.cshtml diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/_ViewStart.cshtml b/LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/_ViewStart.cshtml similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/Areas/Personalization/Views/_ViewStart.cshtml rename to LaaProductionWeb/LaaProduction.Web/Areas/Personalization/Views/_ViewStart.cshtml diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Shipment/Controllers/ScannedController.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Shipment/Controllers/ScannedController.cs similarity index 71% rename from LaaProductionWeb/LaaProductionWeb/Areas/Shipment/Controllers/ScannedController.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Shipment/Controllers/ScannedController.cs index 790cef3c..4aab8078 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Shipment/Controllers/ScannedController.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Shipment/Controllers/ScannedController.cs @@ -1,7 +1,7 @@ -namespace LaaProductionWeb.Areas.Shipment.Controllers.Scanned +namespace LaaProduction.Web.Areas.Shipment.Controllers.Scanned { - using LaaProductionWeb.Areas.Shipment.Models.Interfaces; - using LaaProductionWeb.Models; + using LaaProduction.Web.Areas.Shipment.Models.Interfaces; + using LaaProduction.Web.Models; using System.Threading.Tasks; using System.Web.Http; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Shipment/Models/Interfaces/IScanModel.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Shipment/Models/Interfaces/IScanModel.cs similarity index 59% rename from LaaProductionWeb/LaaProductionWeb/Areas/Shipment/Models/Interfaces/IScanModel.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Shipment/Models/Interfaces/IScanModel.cs index 27f110ee..d9c7e945 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Shipment/Models/Interfaces/IScanModel.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Shipment/Models/Interfaces/IScanModel.cs @@ -1,6 +1,6 @@ -namespace LaaProductionWeb.Areas.Shipment.Models.Interfaces +namespace LaaProduction.Web.Areas.Shipment.Models.Interfaces { - using LaaProductionWeb.Models; + using LaaProduction.Web.Models; using System.Threading.Tasks; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Shipment/Models/ScanModel.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Shipment/Models/ScanModel.cs similarity index 94% rename from LaaProductionWeb/LaaProductionWeb/Areas/Shipment/Models/ScanModel.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Shipment/Models/ScanModel.cs index 0a0305ad..5258fe95 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Shipment/Models/ScanModel.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Shipment/Models/ScanModel.cs @@ -1,9 +1,9 @@ -namespace LaaProductionWeb.Areas.Shipment.Models +namespace LaaProduction.Web.Areas.Shipment.Models { using LaaProductionSQL.Interfaces; - using LaaProductionWeb.Areas.Shipment.Models.Interfaces; - using LaaProductionWeb.Models; - using LaaProductionWeb.Models.SMTP; + using LaaProduction.Web.Areas.Shipment.Models.Interfaces; + using LaaProduction.Web.Models; + using LaaProduction.Web.Models.SMTP; using System.Collections.Generic; using System.Threading.Tasks; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Software/Controllers/AppIdController.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Software/Controllers/AppIdController.cs similarity index 92% rename from LaaProductionWeb/LaaProductionWeb/Areas/Software/Controllers/AppIdController.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Software/Controllers/AppIdController.cs index c8ce8bd0..23cbe530 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Software/Controllers/AppIdController.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Software/Controllers/AppIdController.cs @@ -1,6 +1,6 @@ -namespace LaaProductionWeb.Areas.Software.Controllers +namespace LaaProduction.Web.Areas.Software.Controllers { - using LaaProductionWeb.Services.Interfaces; + using LaaProduction.Services.Interfaces; using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Software/Controllers/FunctionsController.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Software/Controllers/FunctionsController.cs similarity index 96% rename from LaaProductionWeb/LaaProductionWeb/Areas/Software/Controllers/FunctionsController.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Software/Controllers/FunctionsController.cs index b2d6003a..54118136 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Software/Controllers/FunctionsController.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Software/Controllers/FunctionsController.cs @@ -1,6 +1,6 @@ -namespace LaaProductionWeb.Areas.Software.Controllers +namespace LaaProduction.Web.Areas.Software.Controllers { - using LaaProductionWeb.Services.Interfaces; + using LaaProduction.Services.Interfaces; using System; using System.Web.Http; diff --git a/LaaProductionWeb/LaaProductionWeb/Areas/Software/SoftwareAreaRegistration.cs b/LaaProductionWeb/LaaProduction.Web/Areas/Software/SoftwareAreaRegistration.cs similarity index 51% rename from LaaProductionWeb/LaaProductionWeb/Areas/Software/SoftwareAreaRegistration.cs rename to LaaProductionWeb/LaaProduction.Web/Areas/Software/SoftwareAreaRegistration.cs index 29775497..a79d93ee 100644 --- a/LaaProductionWeb/LaaProductionWeb/Areas/Software/SoftwareAreaRegistration.cs +++ b/LaaProductionWeb/LaaProduction.Web/Areas/Software/SoftwareAreaRegistration.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Areas.Software +namespace LaaProduction.Web.Areas.Software { using System.Web.Mvc; @@ -8,10 +8,7 @@ public override void RegisterArea(AreaRegistrationContext context) { - //context.MapRoute( - // "Software_default", - // "api/Software/{controller}/{id}", - // new { action = "Index", id = UrlParameter.Optional }); + } } } \ No newline at end of file diff --git a/LaaProductionWeb/LaaProductionWeb/Controllers/API/APIExtensions.cs b/LaaProductionWeb/LaaProduction.Web/Controllers/API/APIExtensions.cs similarity index 95% rename from LaaProductionWeb/LaaProductionWeb/Controllers/API/APIExtensions.cs rename to LaaProductionWeb/LaaProduction.Web/Controllers/API/APIExtensions.cs index 49c48b7a..a456a1e9 100644 --- a/LaaProductionWeb/LaaProductionWeb/Controllers/API/APIExtensions.cs +++ b/LaaProductionWeb/LaaProduction.Web/Controllers/API/APIExtensions.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Controllers.API +namespace LaaProduction.Web.Controllers.API { using Newtonsoft.Json; diff --git a/LaaProductionWeb/LaaProductionWeb/Controllers/API/Personalization/EmployeesController.cs b/LaaProductionWeb/LaaProduction.Web/Controllers/API/Personalization/EmployeesController.cs similarity index 96% rename from LaaProductionWeb/LaaProductionWeb/Controllers/API/Personalization/EmployeesController.cs rename to LaaProductionWeb/LaaProduction.Web/Controllers/API/Personalization/EmployeesController.cs index ec427a34..a28bb72c 100644 --- a/LaaProductionWeb/LaaProductionWeb/Controllers/API/Personalization/EmployeesController.cs +++ b/LaaProductionWeb/LaaProduction.Web/Controllers/API/Personalization/EmployeesController.cs @@ -1,7 +1,7 @@ -namespace LaaProductionWeb.Controllers.API.Personalization +namespace LaaProduction.Web.Controllers.API.Personalization { using LaaProduction.Personalization.Interfaces; - using LaaProductionWeb.App_Infrastructure; + using LaaProduction.Web.App_Infrastructure; using System; using System.ComponentModel.DataAnnotations; diff --git a/LaaProductionWeb/LaaProductionWeb/Controllers/API/Personalization/LoginController.cs b/LaaProductionWeb/LaaProduction.Web/Controllers/API/Personalization/LoginController.cs similarity index 95% rename from LaaProductionWeb/LaaProductionWeb/Controllers/API/Personalization/LoginController.cs rename to LaaProductionWeb/LaaProduction.Web/Controllers/API/Personalization/LoginController.cs index 2071cf38..517e1a60 100644 --- a/LaaProductionWeb/LaaProductionWeb/Controllers/API/Personalization/LoginController.cs +++ b/LaaProductionWeb/LaaProduction.Web/Controllers/API/Personalization/LoginController.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Controllers.API.Account +namespace LaaProduction.Web.Controllers.API.Account { using LaaProduction.Personalization.Interfaces; diff --git a/LaaProductionWeb/LaaProductionWeb/Controllers/API/Personalization/RolesController.cs b/LaaProductionWeb/LaaProduction.Web/Controllers/API/Personalization/RolesController.cs similarity index 86% rename from LaaProductionWeb/LaaProductionWeb/Controllers/API/Personalization/RolesController.cs rename to LaaProductionWeb/LaaProduction.Web/Controllers/API/Personalization/RolesController.cs index 4d60f16b..108b460c 100644 --- a/LaaProductionWeb/LaaProductionWeb/Controllers/API/Personalization/RolesController.cs +++ b/LaaProductionWeb/LaaProduction.Web/Controllers/API/Personalization/RolesController.cs @@ -1,7 +1,7 @@ -namespace LaaProductionWeb.Controllers.API.Personalization +namespace LaaProduction.Web.Controllers.API.Personalization { using LaaProduction.Personalization.Interfaces; - using LaaProductionWeb.App_Infrastructure; + using LaaProduction.Web.App_Infrastructure; using System.Web.Http; diff --git a/LaaProductionWeb/LaaProductionWeb/Controllers/API/Personalization/SoftwareController.cs b/LaaProductionWeb/LaaProduction.Web/Controllers/API/Personalization/SoftwareController.cs similarity index 83% rename from LaaProductionWeb/LaaProductionWeb/Controllers/API/Personalization/SoftwareController.cs rename to LaaProductionWeb/LaaProduction.Web/Controllers/API/Personalization/SoftwareController.cs index 5d6cab90..86a08cbd 100644 --- a/LaaProductionWeb/LaaProductionWeb/Controllers/API/Personalization/SoftwareController.cs +++ b/LaaProductionWeb/LaaProduction.Web/Controllers/API/Personalization/SoftwareController.cs @@ -1,7 +1,7 @@ -namespace LaaProductionWeb.Controllers.API.Personalization +namespace LaaProduction.Web.Controllers.API.Personalization { using LaaProduction.Personalization.Interfaces; - using LaaProductionWeb.App_Infrastructure; + using LaaProduction.Web.App_Infrastructure; using System.Web.Http; diff --git a/LaaProductionWeb/LaaProductionWeb/Controllers/API/README.md b/LaaProductionWeb/LaaProduction.Web/Controllers/API/README.md similarity index 99% rename from LaaProductionWeb/LaaProductionWeb/Controllers/API/README.md rename to LaaProductionWeb/LaaProduction.Web/Controllers/API/README.md index c9a478ed..383ec757 100644 --- a/LaaProductionWeb/LaaProductionWeb/Controllers/API/README.md +++ b/LaaProductionWeb/LaaProduction.Web/Controllers/API/README.md @@ -1,7 +1,7 @@ Laa Production API --- -1. **Base address** - http://sla12iis01.emea.sensus.net/LaaProductionWeb +1. **Base address** - http://sla12iis01.emea.sensus.net/LaaProduction.Web 1. **Authentication & Authorization** - each user has his own set of roles and allowed functions to access within his employee account's. Authentication succeeds over username, password and software name. diff --git a/LaaProductionWeb/LaaProductionWeb/Controllers/API/Search/WildcardController.cs b/LaaProductionWeb/LaaProduction.Web/Controllers/API/Search/WildcardController.cs similarity index 95% rename from LaaProductionWeb/LaaProductionWeb/Controllers/API/Search/WildcardController.cs rename to LaaProductionWeb/LaaProduction.Web/Controllers/API/Search/WildcardController.cs index 4b5d4e56..439aa901 100644 --- a/LaaProductionWeb/LaaProductionWeb/Controllers/API/Search/WildcardController.cs +++ b/LaaProductionWeb/LaaProduction.Web/Controllers/API/Search/WildcardController.cs @@ -1,7 +1,7 @@ -namespace LaaProductionWeb.Controllers.API.Search +namespace LaaProduction.Web.Controllers.API.Search { using LaaProduction.Search; - using LaaProductionWeb.App_Infrastructure; + using LaaProduction.Web.App_Infrastructure; using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb/Controllers/AdminController.cs b/LaaProductionWeb/LaaProduction.Web/Controllers/AdminController.cs similarity index 75% rename from LaaProductionWeb/LaaProductionWeb/Controllers/AdminController.cs rename to LaaProductionWeb/LaaProduction.Web/Controllers/AdminController.cs index fe400868..6a662a61 100644 --- a/LaaProductionWeb/LaaProductionWeb/Controllers/AdminController.cs +++ b/LaaProductionWeb/LaaProduction.Web/Controllers/AdminController.cs @@ -1,9 +1,9 @@ -namespace LaaProductionWeb.Controllers +namespace LaaProduction.Web.Controllers { using LaaProduction.Personalization; - using LaaProductionWeb.App_Infrastructure; - using LaaProductionWeb.Services.Interfaces; + using LaaProduction.Web.App_Infrastructure; + using LaaProduction.Services.Interfaces; using System.Web.Mvc; diff --git a/LaaProductionWeb/LaaProductionWeb/Controllers/ApprovalsController.cs b/LaaProductionWeb/LaaProduction.Web/Controllers/ApprovalsController.cs similarity index 87% rename from LaaProductionWeb/LaaProductionWeb/Controllers/ApprovalsController.cs rename to LaaProductionWeb/LaaProduction.Web/Controllers/ApprovalsController.cs index 001af8f7..89e3c609 100644 --- a/LaaProductionWeb/LaaProductionWeb/Controllers/ApprovalsController.cs +++ b/LaaProductionWeb/LaaProduction.Web/Controllers/ApprovalsController.cs @@ -1,10 +1,10 @@ -namespace LaaProductionWeb.Controllers +namespace LaaProduction.Web.Controllers { using LaaProduction.Personalization; - using LaaProductionWeb.App_Infrastructure; - using LaaProductionWeb.Services.Interfaces; - using LaaProductionWeb.Services.Models; + using LaaProduction.Web.App_Infrastructure; + using LaaProduction.Services.Interfaces; + using LaaProduction.Services.Models; using System; using System.Web.Mvc; diff --git a/LaaProductionWeb/LaaProductionWeb/Controllers/EmailController.cs b/LaaProductionWeb/LaaProduction.Web/Controllers/EmailController.cs similarity index 86% rename from LaaProductionWeb/LaaProductionWeb/Controllers/EmailController.cs rename to LaaProductionWeb/LaaProduction.Web/Controllers/EmailController.cs index 2b5d00e2..ea14fd2c 100644 --- a/LaaProductionWeb/LaaProductionWeb/Controllers/EmailController.cs +++ b/LaaProductionWeb/LaaProduction.Web/Controllers/EmailController.cs @@ -1,6 +1,6 @@ -namespace LaaProductionWeb.Controllers +namespace LaaProduction.Web.Controllers { - using LaaProductionWeb.Models.SMTP; + using LaaProduction.Web.Models.SMTP; using System.Threading.Tasks; using System.Web.Http; diff --git a/LaaProductionWeb/LaaProductionWeb/Controllers/HomeController.cs b/LaaProductionWeb/LaaProduction.Web/Controllers/HomeController.cs similarity index 90% rename from LaaProductionWeb/LaaProductionWeb/Controllers/HomeController.cs rename to LaaProductionWeb/LaaProduction.Web/Controllers/HomeController.cs index b3f39905..5f3b6f5b 100644 --- a/LaaProductionWeb/LaaProductionWeb/Controllers/HomeController.cs +++ b/LaaProductionWeb/LaaProduction.Web/Controllers/HomeController.cs @@ -1,10 +1,9 @@ -namespace LaaProductionWeb.Controllers +namespace LaaProduction.Web.Controllers { using LaaProductionHttp.Interfaces; - using LaaProductionWeb.App_Infrastructure; - using LaaProductionWeb.Services.Interfaces; - - using System.Collections.Generic; + using LaaProduction.Web.App_Infrastructure; + using LaaProduction.Services.Interfaces; + using System.Threading.Tasks; using System.Web.Mvc; @@ -45,7 +44,7 @@ .Name; var token = await this.httpClient - .Post("/api/Personalization/Login") + .Post("/LaaProductionWeb/api/Personalization/Login") .WhitJsonBody(new { username, password, software }) .SendAsync(); diff --git a/LaaProductionWeb/LaaProductionWeb/Controllers/ProtocolController.cs b/LaaProductionWeb/LaaProduction.Web/Controllers/ProtocolController.cs similarity index 95% rename from LaaProductionWeb/LaaProductionWeb/Controllers/ProtocolController.cs rename to LaaProductionWeb/LaaProduction.Web/Controllers/ProtocolController.cs index cb45d598..4c101475 100644 --- a/LaaProductionWeb/LaaProductionWeb/Controllers/ProtocolController.cs +++ b/LaaProductionWeb/LaaProduction.Web/Controllers/ProtocolController.cs @@ -1,10 +1,10 @@ -namespace LaaProductionWeb.Controllers +namespace LaaProduction.Web.Controllers { using LaaProduction.Personalization; - using LaaProductionWeb.App_Infrastructure; - using LaaProductionWeb.Services.Interfaces; - using LaaProductionWeb.Services.Models; + using LaaProduction.Web.App_Infrastructure; + using LaaProduction.Services.Interfaces; + using LaaProduction.Services.Models; using System.Web.Mvc; diff --git a/LaaProductionWeb/LaaProductionWeb/Controllers/ReportController.cs b/LaaProductionWeb/LaaProduction.Web/Controllers/ReportController.cs similarity index 93% rename from LaaProductionWeb/LaaProductionWeb/Controllers/ReportController.cs rename to LaaProductionWeb/LaaProduction.Web/Controllers/ReportController.cs index c6bd58ad..37752416 100644 --- a/LaaProductionWeb/LaaProductionWeb/Controllers/ReportController.cs +++ b/LaaProductionWeb/LaaProduction.Web/Controllers/ReportController.cs @@ -1,10 +1,10 @@ -namespace LaaProductionWeb.Controllers +namespace LaaProduction.Web.Controllers { using LaaProduction.Personalization; - using LaaProductionWeb.App_Infrastructure; - using LaaProductionWeb.Services.Interfaces; - using LaaProductionWeb.Services.Models.Reports; + using LaaProduction.Web.App_Infrastructure; + using LaaProduction.Services.Interfaces; + using LaaProduction.Services.Models.Reports; using System; using System.Web.Mvc; diff --git a/LaaProductionWeb/LaaProductionWeb/Controllers/SearchController.cs b/LaaProductionWeb/LaaProduction.Web/Controllers/SearchController.cs similarity index 90% rename from LaaProductionWeb/LaaProductionWeb/Controllers/SearchController.cs rename to LaaProductionWeb/LaaProduction.Web/Controllers/SearchController.cs index 59765f6c..a8960f6d 100644 --- a/LaaProductionWeb/LaaProductionWeb/Controllers/SearchController.cs +++ b/LaaProductionWeb/LaaProduction.Web/Controllers/SearchController.cs @@ -1,10 +1,10 @@ -namespace LaaProductionWeb.Controllers +namespace LaaProduction.Web.Controllers { using LaaProduction.Personalization; using LaaProductionHttp.Interfaces; - using LaaProductionWeb.App_Infrastructure; - using LaaProductionWeb.Services.Interfaces; - using LaaProductionWeb.Services.Models.Search; + using LaaProduction.Web.App_Infrastructure; + using LaaProduction.Services.Interfaces; + using LaaProduction.Services.Models.Search; using System; using System.Collections.Generic; @@ -53,7 +53,7 @@ public async Task Wildcard() { var fieldsResult = await this.httpClient - .Get("/api/Search/Wildcard") + .Get("/LaaProductionWeb/api/Search/Wildcard") .AuthorizeBearer(this.User.GetNameIdentifier()) .SendAsync>(); @@ -86,7 +86,7 @@ } var httpResult = await this.httpClient - .Post($"/api/Search/Wildcard") + .Post($"/LaaProductionWeb/api/Search/Wildcard") .WhitJsonBody(new { model.Token, fields }) .AuthorizeBearer(this.User.GetNameIdentifier()) .SendAsync>>(); diff --git a/LaaProductionWeb/LaaProductionWeb/Controllers/ShipmentsController.cs b/LaaProductionWeb/LaaProduction.Web/Controllers/ShipmentsController.cs similarity index 96% rename from LaaProductionWeb/LaaProductionWeb/Controllers/ShipmentsController.cs rename to LaaProductionWeb/LaaProduction.Web/Controllers/ShipmentsController.cs index a47b0af7..648d7229 100644 --- a/LaaProductionWeb/LaaProductionWeb/Controllers/ShipmentsController.cs +++ b/LaaProductionWeb/LaaProduction.Web/Controllers/ShipmentsController.cs @@ -1,10 +1,10 @@ -namespace LaaProductionWeb.Controllers +namespace LaaProduction.Web.Controllers { using LaaProduction.Personalization; - using LaaProductionWeb.App_Infrastructure; - using LaaProductionWeb.Services.Interfaces; - using LaaProductionWeb.Services.Models; + using LaaProduction.Web.App_Infrastructure; + using LaaProduction.Services.Interfaces; + using LaaProduction.Services.Models; using Newtonsoft.Json; diff --git a/LaaProductionWeb/LaaProductionWeb/Controllers/ValuesController.cs b/LaaProductionWeb/LaaProduction.Web/Controllers/ValuesController.cs similarity index 94% rename from LaaProductionWeb/LaaProductionWeb/Controllers/ValuesController.cs rename to LaaProductionWeb/LaaProduction.Web/Controllers/ValuesController.cs index df37d538..d89dade0 100644 --- a/LaaProductionWeb/LaaProductionWeb/Controllers/ValuesController.cs +++ b/LaaProductionWeb/LaaProduction.Web/Controllers/ValuesController.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Controllers +namespace LaaProduction.Web.Controllers { using System.Web.Http; using System.Web.Http.Results; diff --git a/LaaProductionWeb/LaaProductionWeb/Global.asax b/LaaProductionWeb/LaaProduction.Web/Global.asax similarity index 57% rename from LaaProductionWeb/LaaProductionWeb/Global.asax rename to LaaProductionWeb/LaaProduction.Web/Global.asax index 2462bfae..75f800cb 100644 --- a/LaaProductionWeb/LaaProductionWeb/Global.asax +++ b/LaaProductionWeb/LaaProduction.Web/Global.asax @@ -1 +1 @@ -<%@ Application Codebehind="Global.asax.cs" Inherits="LaaProductionWeb.WebApiApplication" Language="C#" %> +<%@ Application Codebehind="Global.asax.cs" Inherits="LaaProduction.Web.WebApiApplication" Language="C#" %> diff --git a/LaaProductionWeb/LaaProductionWeb/Global.asax.cs b/LaaProductionWeb/LaaProduction.Web/Global.asax.cs similarity index 95% rename from LaaProductionWeb/LaaProductionWeb/Global.asax.cs rename to LaaProductionWeb/LaaProduction.Web/Global.asax.cs index 219054db..8a3b12cb 100644 --- a/LaaProductionWeb/LaaProductionWeb/Global.asax.cs +++ b/LaaProductionWeb/LaaProduction.Web/Global.asax.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb +namespace LaaProduction.Web { using System.Web; using System.Web.Http; diff --git a/LaaProductionWeb/LaaProductionWeb/LaaProductionWeb.csproj b/LaaProductionWeb/LaaProduction.Web/LaaProduction.Web.csproj similarity index 90% rename from LaaProductionWeb/LaaProductionWeb/LaaProductionWeb.csproj rename to LaaProductionWeb/LaaProduction.Web/LaaProduction.Web.csproj index 5403d0f9..a3b0ed98 100644 --- a/LaaProductionWeb/LaaProductionWeb/LaaProductionWeb.csproj +++ b/LaaProductionWeb/LaaProduction.Web/LaaProduction.Web.csproj @@ -7,24 +7,23 @@ 2.0 - {D1AD077B-00E3-4663-AB9F-23FF65D98D2F} + {3B484E6F-E63F-4FD9-91C4-7D31ACA84FD5} {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} Library Properties - LaaProductionWeb - LaaProductionWeb + LaaProduction.Web + LaaProduction.Web v4.8.1 false true - enabled - disabled - false + + + - true @@ -71,46 +70,25 @@ ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - - - ..\packages\System.Data.SqlClient.4.8.5\lib\net461\System.Data.SqlClient.dll - - - ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll - - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.9\lib\net45\System.Net.Http.Formatting.dll - - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - - + + ..\packages\Microsoft.AspNet.WebPages.3.2.9\lib\net45\System.Web.Helpers.dll @@ -126,12 +104,6 @@ ..\packages\Microsoft.AspNet.Razor.3.2.9\lib\net45\System.Web.Razor.dll - - - - - ..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.9\lib\net45\System.Web.WebPages.dll @@ -141,9 +113,20 @@ ..\packages\Microsoft.AspNet.WebPages.3.2.9\lib\net45\System.Web.WebPages.Razor.dll - - + + + + + + + + + + + + ..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll + True ..\packages\WebGrease.1.6.0\lib\WebGrease.dll @@ -152,15 +135,14 @@ True ..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - - + @@ -171,6 +153,7 @@ + @@ -179,8 +162,6 @@ - - @@ -195,6 +176,7 @@ + @@ -204,9 +186,9 @@ - + @@ -247,6 +229,11 @@ + + + + + @@ -255,7 +242,12 @@ - + + + Designer + + + @@ -285,15 +277,9 @@ - - - - - - - - - + + Designer + @@ -305,14 +291,14 @@ {23c6f8cd-2a91-4444-a828-6a0b5b942520} LaaProduction.Search + + {ff167011-431a-41a7-a7db-560e08860388} + LaaProduction.Services + {a487e02b-0e6c-4a98-84f6-4af3e7b8e73b} LaaProduction.Shipment - - {ff167011-431a-41a7-a7db-560e08860388} - LaaProductionWeb.Services - 10.0 @@ -330,9 +316,11 @@ True True - 57995 - /LaaProductionWeb - http://localhost:54448/ + 59768 + / + http://localhost:59768/LaaProductionWeb + True + http://localhost:59768/LaaProductionWeb False False diff --git a/LaaProductionWeb/LaaProductionWeb/Models/ApplicationSettings.cs b/LaaProductionWeb/LaaProduction.Web/Models/ApplicationSettings.cs similarity index 93% rename from LaaProductionWeb/LaaProductionWeb/Models/ApplicationSettings.cs rename to LaaProductionWeb/LaaProduction.Web/Models/ApplicationSettings.cs index 8246e89e..5595fdc4 100644 --- a/LaaProductionWeb/LaaProductionWeb/Models/ApplicationSettings.cs +++ b/LaaProductionWeb/LaaProduction.Web/Models/ApplicationSettings.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Models +namespace LaaProduction.Web.Models { /// /// C# class representation of the appsettings.json file. diff --git a/LaaProductionWeb/LaaProductionWeb/Models/ModelResult.cs b/LaaProductionWeb/LaaProduction.Web/Models/ModelResult.cs similarity index 83% rename from LaaProductionWeb/LaaProductionWeb/Models/ModelResult.cs rename to LaaProductionWeb/LaaProduction.Web/Models/ModelResult.cs index 1d794a5e..54b5f5ca 100644 --- a/LaaProductionWeb/LaaProductionWeb/Models/ModelResult.cs +++ b/LaaProductionWeb/LaaProduction.Web/Models/ModelResult.cs @@ -1,7 +1,5 @@ -namespace LaaProductionWeb.Models +namespace LaaProduction.Web.Models { - using System.Web.Http.Results; - public class ModelResult { private bool state; diff --git a/LaaProductionWeb/LaaProductionWeb/Models/ModelResult[T].cs b/LaaProductionWeb/LaaProduction.Web/Models/ModelResult[T].cs similarity index 97% rename from LaaProductionWeb/LaaProductionWeb/Models/ModelResult[T].cs rename to LaaProductionWeb/LaaProduction.Web/Models/ModelResult[T].cs index 12d5bee9..97ea9da7 100644 --- a/LaaProductionWeb/LaaProductionWeb/Models/ModelResult[T].cs +++ b/LaaProductionWeb/LaaProduction.Web/Models/ModelResult[T].cs @@ -1,7 +1,6 @@ -namespace LaaProductionWeb.Models +namespace LaaProduction.Web.Models { using System.Collections.Generic; - using System.Linq; using System.Web.Http.ModelBinding; public class ModelResult diff --git a/LaaProductionWeb/LaaProductionWeb/Models/SMTP/SMTPClient.cs b/LaaProductionWeb/LaaProduction.Web/Models/SMTP/SMTPClient.cs similarity index 97% rename from LaaProductionWeb/LaaProductionWeb/Models/SMTP/SMTPClient.cs rename to LaaProductionWeb/LaaProduction.Web/Models/SMTP/SMTPClient.cs index f8f463d6..e057615a 100644 --- a/LaaProductionWeb/LaaProductionWeb/Models/SMTP/SMTPClient.cs +++ b/LaaProductionWeb/LaaProduction.Web/Models/SMTP/SMTPClient.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Models.SMTP +namespace LaaProduction.Web.Models.SMTP { using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb/Models/SMTP/SMTPEmail.cs b/LaaProductionWeb/LaaProduction.Web/Models/SMTP/SMTPEmail.cs similarity index 86% rename from LaaProductionWeb/LaaProductionWeb/Models/SMTP/SMTPEmail.cs rename to LaaProductionWeb/LaaProduction.Web/Models/SMTP/SMTPEmail.cs index 2033f667..39b4114c 100644 --- a/LaaProductionWeb/LaaProductionWeb/Models/SMTP/SMTPEmail.cs +++ b/LaaProductionWeb/LaaProduction.Web/Models/SMTP/SMTPEmail.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Models.SMTP +namespace LaaProduction.Web.Models.SMTP { using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb/Models/SMTP/SMTPSettings.cs b/LaaProductionWeb/LaaProduction.Web/Models/SMTP/SMTPSettings.cs similarity index 83% rename from LaaProductionWeb/LaaProductionWeb/Models/SMTP/SMTPSettings.cs rename to LaaProductionWeb/LaaProduction.Web/Models/SMTP/SMTPSettings.cs index bf13d015..9b618b79 100644 --- a/LaaProductionWeb/LaaProductionWeb/Models/SMTP/SMTPSettings.cs +++ b/LaaProductionWeb/LaaProduction.Web/Models/SMTP/SMTPSettings.cs @@ -1,4 +1,4 @@ -namespace LaaProductionWeb.Models.SMTP +namespace LaaProduction.Web.Models.SMTP { public class SMTPSettings { diff --git a/LaaProductionWeb/LaaProductionWeb/Properties/AssemblyInfo.cs b/LaaProductionWeb/LaaProduction.Web/Properties/AssemblyInfo.cs similarity index 88% rename from LaaProductionWeb/LaaProductionWeb/Properties/AssemblyInfo.cs rename to LaaProductionWeb/LaaProduction.Web/Properties/AssemblyInfo.cs index 3abc97d0..7a400386 100644 --- a/LaaProductionWeb/LaaProductionWeb/Properties/AssemblyInfo.cs +++ b/LaaProductionWeb/LaaProduction.Web/Properties/AssemblyInfo.cs @@ -5,11 +5,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("LaaProductionWeb")] +[assembly: AssemblyTitle("LaaProduction.Web")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("LaaProductionWeb")] +[assembly: AssemblyProduct("LaaProduction.Web")] [assembly: AssemblyCopyright("Copyright © 2023")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -20,7 +20,7 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f61afdb7-cccb-49e9-b73c-b11849eadcad")] +[assembly: Guid("8b0c0ac6-46fb-4993-894b-ae0038be24ba")] // Version information for an assembly consists of the following four values: // diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Admin/Index.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Admin/Index.cshtml similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/Views/Admin/Index.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Admin/Index.cshtml diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Approvals/Add.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Approvals/Add.cshtml similarity index 99% rename from LaaProductionWeb/LaaProductionWeb/Views/Approvals/Add.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Approvals/Add.cshtml index f8e1dd26..c623ab5a 100644 --- a/LaaProductionWeb/LaaProductionWeb/Views/Approvals/Add.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Views/Approvals/Add.cshtml @@ -1,4 +1,4 @@ -@model LaaProductionWeb.Services.Models.ProductionApproval +@model LaaProduction.Services.Models.ProductionApproval
diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Home/Index.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Home/Index.cshtml similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/Views/Home/Index.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Home/Index.cshtml diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Protocol/Body.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Protocol/Body.cshtml similarity index 98% rename from LaaProductionWeb/LaaProductionWeb/Views/Protocol/Body.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Protocol/Body.cshtml index 3ae0b8a8..0948cc84 100644 --- a/LaaProductionWeb/LaaProductionWeb/Views/Protocol/Body.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Views/Protocol/Body.cshtml @@ -1,4 +1,4 @@ -@model IEnumerable +@model IEnumerable @{ Func testPassed = (testStatus, nullable) => diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Protocol/Clients.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Protocol/Clients.cshtml similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/Views/Protocol/Clients.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Protocol/Clients.cshtml diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Protocol/Document.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Protocol/Document.cshtml similarity index 94% rename from LaaProductionWeb/LaaProductionWeb/Views/Protocol/Document.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Protocol/Document.cshtml index c1159354..ac34ac09 100644 --- a/LaaProductionWeb/LaaProductionWeb/Views/Protocol/Document.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Views/Protocol/Document.cshtml @@ -1,6 +1,6 @@ @model OrderClientModel -@using LaaProductionWeb.Services.Models +@using LaaProduction.Services.Models
diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Protocol/Index.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Protocol/Index.cshtml similarity index 98% rename from LaaProductionWeb/LaaProductionWeb/Views/Protocol/Index.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Protocol/Index.cshtml index 0f66c9f1..fe0e15ad 100644 --- a/LaaProductionWeb/LaaProductionWeb/Views/Protocol/Index.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Views/Protocol/Index.cshtml @@ -1,7 +1,7 @@ @model OrderClientModel -@using LaaProductionWeb.Controllers -@using LaaProductionWeb.Services.Models +@using LaaProduction.Web.Controllers +@using LaaProduction.Services.Models diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Protocol/Orders.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Protocol/Orders.cshtml similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/Views/Protocol/Orders.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Protocol/Orders.cshtml diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Protocol/Print.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Protocol/Print.cshtml similarity index 97% rename from LaaProductionWeb/LaaProductionWeb/Views/Protocol/Print.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Protocol/Print.cshtml index ee7cea34..1b0a75ab 100644 --- a/LaaProductionWeb/LaaProductionWeb/Views/Protocol/Print.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Views/Protocol/Print.cshtml @@ -1,7 +1,7 @@ -@model OrderClientModel +s@model OrderClientModel -@using LaaProductionWeb.Controllers -@using LaaProductionWeb.Services.Models +@using LaaProduction.Web.Controllers +@using LaaProduction.Services.Models @{ this.Layout = "~/Views/Shared/_PrintLayout.cshtml"; diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Report/CordonelPressureSensor.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Report/CordonelPressureSensor.cshtml similarity index 98% rename from LaaProductionWeb/LaaProductionWeb/Views/Report/CordonelPressureSensor.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Report/CordonelPressureSensor.cshtml index bf3dc174..18cde560 100644 --- a/LaaProductionWeb/LaaProductionWeb/Views/Report/CordonelPressureSensor.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Views/Report/CordonelPressureSensor.cshtml @@ -1,6 +1,6 @@ @model CordonelPressureSensorModel -@using LaaProductionWeb.Services.Models.Reports +@using LaaProduction.Services.Models.Reports
diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Report/DateFilter.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Report/DateFilter.cshtml similarity index 96% rename from LaaProductionWeb/LaaProductionWeb/Views/Report/DateFilter.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Report/DateFilter.cshtml index efc4bf30..1149993b 100644 --- a/LaaProductionWeb/LaaProductionWeb/Views/Report/DateFilter.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Views/Report/DateFilter.cshtml @@ -1,4 +1,4 @@ -@model LaaProductionWeb.Services.Models.Reports.ReportFilterProperty +@model LaaProduction.Services.Models.Reports.ReportFilterProperty @{ Func isChecked = x => x ? "checked" : string.Empty; diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Report/Filter.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Report/Filter.cshtml similarity index 96% rename from LaaProductionWeb/LaaProductionWeb/Views/Report/Filter.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Report/Filter.cshtml index d5c0c485..a240997c 100644 --- a/LaaProductionWeb/LaaProductionWeb/Views/Report/Filter.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Views/Report/Filter.cshtml @@ -1,4 +1,4 @@ -@model LaaProductionWeb.Services.Models.Reports.ReportFilterProperty +@model LaaProduction.Services.Models.Reports.ReportFilterProperty @{ Func isChecked = x => x ? "checked" : string.Empty; diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Report/Helium.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Report/Helium.cshtml similarity index 99% rename from LaaProductionWeb/LaaProductionWeb/Views/Report/Helium.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Report/Helium.cshtml index 2d6bb055..45df804d 100644 --- a/LaaProductionWeb/LaaProductionWeb/Views/Report/Helium.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Views/Report/Helium.cshtml @@ -1,6 +1,6 @@ @model HeliumReportModel -@using LaaProductionWeb.Services.Models.Reports +@using LaaProduction.Services.Models.Reports
diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Report/HeliumResults.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Report/HeliumResults.cshtml similarity index 63% rename from LaaProductionWeb/LaaProductionWeb/Views/Report/HeliumResults.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Report/HeliumResults.cshtml index 67b9deb3..3becb42e 100644 --- a/LaaProductionWeb/LaaProductionWeb/Views/Report/HeliumResults.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Views/Report/HeliumResults.cshtml @@ -1,4 +1,4 @@ -@model IEnumerable +@model IEnumerable @foreach (var item in this.Model) { diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Report/HiddenFilter.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Report/HiddenFilter.cshtml similarity index 87% rename from LaaProductionWeb/LaaProductionWeb/Views/Report/HiddenFilter.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Report/HiddenFilter.cshtml index a132902e..16adbc5f 100644 --- a/LaaProductionWeb/LaaProductionWeb/Views/Report/HiddenFilter.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Views/Report/HiddenFilter.cshtml @@ -1,4 +1,4 @@ -@model LaaProductionWeb.Services.Models.Reports.ReportFilterProperty +@model LaaProduction.Services.Models.Reports.ReportFilterProperty diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Report/Kottmann.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Report/Kottmann.cshtml similarity index 97% rename from LaaProductionWeb/LaaProductionWeb/Views/Report/Kottmann.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Report/Kottmann.cshtml index ed144161..254d48a8 100644 --- a/LaaProductionWeb/LaaProductionWeb/Views/Report/Kottmann.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Views/Report/Kottmann.cshtml @@ -1,6 +1,6 @@ -@model LaaProductionWeb.Services.Models.Reports.KottmannReportModel +@model LaaProduction.Services.Models.Reports.KottmannReportModel -@using LaaProductionWeb.Services.Models.Reports +@using LaaProduction.Services.Models.Reports
diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Search/Orders.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Search/Orders.cshtml similarity index 77% rename from LaaProductionWeb/LaaProductionWeb/Views/Search/Orders.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Search/Orders.cshtml index b54dc988..60d69710 100644 --- a/LaaProductionWeb/LaaProductionWeb/Views/Search/Orders.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Views/Search/Orders.cshtml @@ -1,4 +1,4 @@ -@model LaaProductionWeb.Services.Models.OrdersFoundModel +@model LaaProduction.Services.Models.OrdersFoundModel @foreach (var order in this.Model) { diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Search/Positions.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Search/Positions.cshtml similarity index 72% rename from LaaProductionWeb/LaaProductionWeb/Views/Search/Positions.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Search/Positions.cshtml index 0a020584..5b63cbcb 100644 --- a/LaaProductionWeb/LaaProductionWeb/Views/Search/Positions.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Views/Search/Positions.cshtml @@ -1,4 +1,4 @@ -@model LaaProductionWeb.Services.Models.OrderPositions +@model LaaProduction.Services.Models.OrderPositions
  • Alle
    • diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Search/Production.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Search/Production.cshtml similarity index 73% rename from LaaProductionWeb/LaaProductionWeb/Views/Search/Production.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Search/Production.cshtml index e5b2e7ad..df5c1b96 100644 --- a/LaaProductionWeb/LaaProductionWeb/Views/Search/Production.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Views/Search/Production.cshtml @@ -1,4 +1,4 @@ -@model LaaProductionWeb.Services.Models.ProductionOrders +@model LaaProduction.Services.Models.ProductionOrders @foreach (var fertigungNr in this.Model) { diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Search/Wildcard.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Search/Wildcard.cshtml similarity index 98% rename from LaaProductionWeb/LaaProductionWeb/Views/Search/Wildcard.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Search/Wildcard.cshtml index cb7262a6..db750e7a 100644 --- a/LaaProductionWeb/LaaProductionWeb/Views/Search/Wildcard.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Views/Search/Wildcard.cshtml @@ -1,4 +1,4 @@ -@model LaaProductionWeb.Services.Models.Search.SearchWildcardModel +@model LaaProduction.Services.Models.Search.SearchWildcardModel
    diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Shared/Error.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Shared/Error.cshtml similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/Views/Shared/Error.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Shared/Error.cshtml diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Shared/_Layout.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Shared/_Layout.cshtml similarity index 98% rename from LaaProductionWeb/LaaProductionWeb/Views/Shared/_Layout.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Shared/_Layout.cshtml index 091a9206..d0b4acda 100644 --- a/LaaProductionWeb/LaaProductionWeb/Views/Shared/_Layout.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Views/Shared/_Layout.cshtml @@ -1,5 +1,5 @@ @using LaaProduction.Personalization -@using LaaProductionWeb.App_Infrastructure +@using LaaProduction.Web.App_Infrastructure diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Shared/_PrintLayout.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Shared/_PrintLayout.cshtml similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/Views/Shared/_PrintLayout.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Shared/_PrintLayout.cshtml diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Shipments/Batch.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Shipments/Batch.cshtml similarity index 99% rename from LaaProductionWeb/LaaProductionWeb/Views/Shipments/Batch.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Shipments/Batch.cshtml index 7f5c6fe3..80a678a2 100644 --- a/LaaProductionWeb/LaaProductionWeb/Views/Shipments/Batch.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Views/Shipments/Batch.cshtml @@ -1,4 +1,4 @@ -@using LaaProductionWeb.Services.Models +@using LaaProduction.Services.Models @model PalletsBatchModel diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Shipments/Index.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Shipments/Index.cshtml similarity index 98% rename from LaaProductionWeb/LaaProductionWeb/Views/Shipments/Index.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Shipments/Index.cshtml index 7968c8ec..bcba9a96 100644 --- a/LaaProductionWeb/LaaProductionWeb/Views/Shipments/Index.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Views/Shipments/Index.cshtml @@ -1,5 +1,5 @@ -@using LaaProductionWeb.Controllers -@using LaaProductionWeb.Services.Models +@using LaaProduction.Web.Controllers +@using LaaProduction.Services.Models @model ShipmentModel diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Shipments/Missing.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Shipments/Missing.cshtml similarity index 94% rename from LaaProductionWeb/LaaProductionWeb/Views/Shipments/Missing.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Shipments/Missing.cshtml index 37a56e05..5d180023 100644 --- a/LaaProductionWeb/LaaProductionWeb/Views/Shipments/Missing.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Views/Shipments/Missing.cshtml @@ -1,4 +1,4 @@ -@model IEnumerable +@model IEnumerable
    diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Shipments/Print.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Shipments/Print.cshtml similarity index 98% rename from LaaProductionWeb/LaaProductionWeb/Views/Shipments/Print.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Shipments/Print.cshtml index 1f5d7f73..374b1583 100644 --- a/LaaProductionWeb/LaaProductionWeb/Views/Shipments/Print.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Views/Shipments/Print.cshtml @@ -1,4 +1,4 @@ -@model LaaProductionWeb.Services.Models.BatchPrintModel +@model LaaProduction.Services.Models.BatchPrintModel @{ this.Layout = "~/Views/Shared/_PrintLayout.cshtml"; diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Shipments/Scan.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/Shipments/Scan.cshtml similarity index 98% rename from LaaProductionWeb/LaaProductionWeb/Views/Shipments/Scan.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/Shipments/Scan.cshtml index 05701db1..90d67589 100644 --- a/LaaProductionWeb/LaaProductionWeb/Views/Shipments/Scan.cshtml +++ b/LaaProductionWeb/LaaProduction.Web/Views/Shipments/Scan.cshtml @@ -1,4 +1,4 @@ -@model LaaProductionWeb.Services.Models.OrderScanModel +@model LaaProduction.Services.Models.OrderScanModel @if (this.Model.OrderNr > 0) { diff --git a/LaaProductionWeb/LaaProductionWeb/Views/_ViewStart.cshtml b/LaaProductionWeb/LaaProduction.Web/Views/_ViewStart.cshtml similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/Views/_ViewStart.cshtml rename to LaaProductionWeb/LaaProduction.Web/Views/_ViewStart.cshtml diff --git a/LaaProductionWeb/LaaProductionWeb/favicon.ico b/LaaProductionWeb/LaaProduction.Web/favicon.ico similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/favicon.ico rename to LaaProductionWeb/LaaProduction.Web/favicon.ico diff --git a/LaaProductionWeb/LaaProductionWeb/favicon.svg b/LaaProductionWeb/LaaProduction.Web/favicon.svg similarity index 100% rename from LaaProductionWeb/LaaProductionWeb/favicon.svg rename to LaaProductionWeb/LaaProduction.Web/favicon.svg diff --git a/LaaProductionWeb/LaaProductionWeb.Services/app.config b/LaaProductionWeb/LaaProductionWeb.Services/app.config deleted file mode 100644 index 488caa33..00000000 --- a/LaaProductionWeb/LaaProductionWeb.Services/app.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/LaaProductionWeb/LaaProductionWeb.sln b/LaaProductionWeb/LaaProductionWeb.sln index 158bd7cd..6cc8ff2b 100644 --- a/LaaProductionWeb/LaaProductionWeb.sln +++ b/LaaProductionWeb/LaaProductionWeb.sln @@ -3,21 +3,21 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.33423.255 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LaaProductionWeb.Services", "LaaProductionWeb.Services\LaaProductionWeb.Services.csproj", "{FF167011-431A-41A7-A7DB-560E08860388}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LaaProduction.Services", "LaaProduction.Services\LaaProduction.Services.csproj", "{FF167011-431A-41A7-A7DB-560E08860388}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documents", "Documents", "{59875741-02AA-4D9A-9B3C-683CA6DDBE7B}" ProjectSection(SolutionItems) = preProject ..\..\..\..\Downloads\SRS Wildcard Order Info Search.docx = ..\..\..\..\Downloads\SRS Wildcard Order Info Search.docx EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LaaProductionWeb", "LaaProductionWeb\LaaProductionWeb.csproj", "{D1AD077B-00E3-4663-AB9F-23FF65D98D2F}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LaaProduction.Personalization", "LaaProduction.Personalization\LaaProduction.Personalization.csproj", "{4C17FD42-7002-431A-8D6E-C57DD7D7C2D2}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LaaProduction.Shipment", "LaaProduction.Shipment\LaaProduction.Shipment.csproj", "{A487E02B-0E6C-4A98-84F6-4AF3E7B8E73B}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LaaProduction.Search", "LaaProduction.Search\LaaProduction.Search.csproj", "{23C6F8CD-2A91-4444-A828-6A0B5B942520}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LaaProduction.Web", "LaaProduction.Web\LaaProduction.Web.csproj", "{3B484E6F-E63F-4FD9-91C4-7D31ACA84FD5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -28,10 +28,6 @@ Global {FF167011-431A-41A7-A7DB-560E08860388}.Debug|Any CPU.Build.0 = Debug|Any CPU {FF167011-431A-41A7-A7DB-560E08860388}.Release|Any CPU.ActiveCfg = Release|Any CPU {FF167011-431A-41A7-A7DB-560E08860388}.Release|Any CPU.Build.0 = Release|Any CPU - {D1AD077B-00E3-4663-AB9F-23FF65D98D2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1AD077B-00E3-4663-AB9F-23FF65D98D2F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1AD077B-00E3-4663-AB9F-23FF65D98D2F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1AD077B-00E3-4663-AB9F-23FF65D98D2F}.Release|Any CPU.Build.0 = Release|Any CPU {4C17FD42-7002-431A-8D6E-C57DD7D7C2D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4C17FD42-7002-431A-8D6E-C57DD7D7C2D2}.Debug|Any CPU.Build.0 = Debug|Any CPU {4C17FD42-7002-431A-8D6E-C57DD7D7C2D2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -44,6 +40,10 @@ Global {23C6F8CD-2A91-4444-A828-6A0B5B942520}.Debug|Any CPU.Build.0 = Debug|Any CPU {23C6F8CD-2A91-4444-A828-6A0B5B942520}.Release|Any CPU.ActiveCfg = Release|Any CPU {23C6F8CD-2A91-4444-A828-6A0B5B942520}.Release|Any CPU.Build.0 = Release|Any CPU + {3B484E6F-E63F-4FD9-91C4-7D31ACA84FD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3B484E6F-E63F-4FD9-91C4-7D31ACA84FD5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3B484E6F-E63F-4FD9-91C4-7D31ACA84FD5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3B484E6F-E63F-4FD9-91C4-7D31ACA84FD5}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Web.config b/LaaProductionWeb/LaaProductionWeb/Views/Web.config deleted file mode 100644 index 3246b092..00000000 --- a/LaaProductionWeb/LaaProductionWeb/Views/Web.config +++ /dev/null @@ -1,43 +0,0 @@ - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/LaaProductionWeb/LaaProductionWeb/Web.config b/LaaProductionWeb/LaaProductionWeb/Web.config deleted file mode 100644 index fd4612c3..00000000 --- a/LaaProductionWeb/LaaProductionWeb/Web.config +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/LaaProductionWeb/LaaProductionWeb/packages.config b/LaaProductionWeb/LaaProductionWeb/packages.config deleted file mode 100644 index 0542a338..00000000 --- a/LaaProductionWeb/LaaProductionWeb/packages.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file