From b194a1ccd9364d3088cd61b6077bd0d7a3fe3787 Mon Sep 17 00:00:00 2001 From: Stoyan Zlatev Date: Wed, 18 Sep 2024 16:08:46 +0200 Subject: [PATCH] submodules deleted --- .gitmodules | 3 - .../Data/WildcardRepository.cs | 2 +- .../LaaProduction.Services/ReportService.cs | 150 +++++++++--------- LaaProductionWeb/LaaProductionWeb.sln | 7 - .../API/Personalization/SoftwareController.cs | 2 - .../LaaProductionWeb/LaaProductionWeb.csproj | 6 +- .../LaaProductionWeb/packages.config | 1 + LaaProductionWeb/laapackages | 1 - 8 files changed, 79 insertions(+), 93 deletions(-) delete mode 100644 .gitmodules delete mode 160000 LaaProductionWeb/laapackages diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 4799dec1..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "LaaProductionWeb/LaaPackages"] - path = LaaProductionWeb/LaaPackages - url = https://slm.sms-esaap.com/la_operations/laapackages.git diff --git a/LaaProductionWeb/LaaProduction.Search/Data/WildcardRepository.cs b/LaaProductionWeb/LaaProduction.Search/Data/WildcardRepository.cs index 3bd00c4e..9c205bbb 100644 --- a/LaaProductionWeb/LaaProduction.Search/Data/WildcardRepository.cs +++ b/LaaProductionWeb/LaaProduction.Search/Data/WildcardRepository.cs @@ -114,7 +114,7 @@ foreach (var field in fields) { - wildcardResult[field] = reader.GetValue(field); + wildcardResult[field] = reader.GetValue(field); } return wildcardResult; diff --git a/LaaProductionWeb/LaaProduction.Services/ReportService.cs b/LaaProductionWeb/LaaProduction.Services/ReportService.cs index 2b49ce6b..37fb49f6 100644 --- a/LaaProductionWeb/LaaProduction.Services/ReportService.cs +++ b/LaaProductionWeb/LaaProduction.Services/ReportService.cs @@ -55,19 +55,19 @@ .SetParameters(orderBy.Parameters) .ExecuteReader(reader => new CordonelPressureSensorItem { - AuftragNr = reader.GetValue(), - PosNr = reader.GetValue(), - SerialNr = reader.GetValue(), - CustomerSerialNr = reader.GetValue(), - IdentNr = reader.GetValue(), - PcbId = reader.GetValue(), - TypeI = reader.GetValue(), - TypeII = reader.GetValue(), - Nennweite = reader.GetValue(), - Baulaenge = reader.GetValue(), - AVGPressure = reader.GetValue(), - TestPassed = reader.GetValue(), - TestDate = reader.GetValue(), + AuftragNr = reader.GetValue(0), + PosNr = reader.GetValue(1), + SerialNr = reader.GetValue(2), + CustomerSerialNr = reader.GetValue(3), + IdentNr = reader.GetValue(4), + PcbId = reader.GetValue(5), + TypeI = reader.GetValue(6), + TypeII = reader.GetValue(7), + Nennweite = reader.GetValue(8), + Baulaenge = reader.GetValue(9), + AVGPressure = reader.GetValue(10), + TestPassed = reader.GetValue(11), + TestDate = reader.GetValue(12), }); return model; @@ -118,25 +118,25 @@ .SetParameters(orderBy.Parameters) .ExecuteReader(reader => new HeliumReportItem { - FertigungNr = reader.GetValue(), - AuftragNr = reader.GetValue(), - PositionNr = reader.GetValue(), - SerialNr = reader.GetValue(), - IdentNr = reader.GetValue(), - HeId = reader.GetValue(), - HeTestId = reader.GetValue(), - PcbId = reader.GetValue(), - Nennweite = reader.GetValue(), - Baulaenge = reader.GetValue(), - Typ = reader.GetValue(), - Druck = reader.GetValue(), - Temperatur = reader.GetValue(), - HeLakeRate = reader.GetValue(), - HeTestPressure = reader.GetValue(), - IsValid = reader.GetValue(), - TestDate = reader.GetValue(), - Text = reader.GetValue(), - Tester = reader.GetValue() + FertigungNr = reader.GetValue(0), + AuftragNr = reader.GetValue(1), + PositionNr = reader.GetValue(2), + SerialNr = reader.GetValue(3), + IdentNr = reader.GetValue(4), + HeId = reader.GetValue(5), + HeTestId = reader.GetValue(6), + PcbId = reader.GetValue(7), + Nennweite = reader.GetValue(8), + Baulaenge = reader.GetValue(9), + Typ = reader.GetValue(10), + Druck = reader.GetValue(11), + Temperatur = reader.GetValue(12), + HeLakeRate = reader.GetValue(13), + HeTestPressure = reader.GetValue(14), + IsValid = reader.GetValue(15), + TestDate = reader.GetValue(16), + Text = reader.GetValue(17), + Tester = reader.GetValue(18) }); return model; @@ -212,25 +212,25 @@ .SetParameters(orderBy.Parameters) .ExecuteReader(reader => new Object[] { - reader.GetValue(), - reader.GetValue(), - reader.GetValue(), - reader.GetValue(), - reader.GetValue(), - reader.GetValue(), - reader.GetValue(), - reader.GetValue(), - reader.GetValue(), - reader.GetValue(), - reader.GetValue().Replace(',', ' '), - reader.GetValue(), - reader.GetValue(), - reader.GetValue().Replace(',', '.'), - reader.GetValue().Replace(',', ' '), - reader.GetValue(), - $"{reader.GetValue():yyyy-MM-dd}", - reader.GetValue().Replace(',', ' '), - reader.GetValue().Replace(',', ' ') + reader.GetValue(0), + reader.GetValue(1), + reader.GetValue(2), + reader.GetValue(3), + reader.GetValue(4), + reader.GetValue(5), + reader.GetValue(6), + reader.GetValue(7), + reader.GetValue(8), + reader.GetValue(9), + reader.GetValue(10).Replace(',', ' '), + reader.GetValue(11), + reader.GetValue(12), + reader.GetValue(13).Replace(',', '.'), + reader.GetValue(14).Replace(',', ' '), + reader.GetValue(15), + $"{reader.GetValue(16):yyyy-MM-dd}", + reader.GetValue(17).Replace(',', ' '), + reader.GetValue(18).Replace(',', ' ') }); csvItems.AddRange(items); @@ -295,18 +295,18 @@ .SetParameters(orderBy.Parameters) .ExecuteReader(reader => new KottmannReportItem { - FertigungsNr = reader.GetValue(), - SerialNr = reader.GetValue(), - PcbId = reader.GetValue(), - Typ = reader.GetValue(), - Nennweite = reader.GetValue(), - Baulaenge = reader.GetValue(), - StartDruck = reader.GetValue(), - EndDruck = reader.GetValue(), - DruckZeit = reader.GetValue(), - Dicht = reader.GetValue(), - Datum = reader.GetValue(), - Bemerkung = reader.GetValue() + FertigungsNr = reader.GetValue(0), + SerialNr = reader.GetValue(1), + PcbId = reader.GetValue(2), + Typ = reader.GetValue(3), + Nennweite = reader.GetValue(4), + Baulaenge = reader.GetValue(5), + StartDruck = reader.GetValue(6), + EndDruck = reader.GetValue(7), + DruckZeit = reader.GetValue(8), + Dicht = reader.GetValue(9), + Datum = reader.GetValue(10), + Bemerkung = reader.GetValue(11) }); return model; @@ -368,18 +368,18 @@ .SetParameters(orderBy.Parameters) .ExecuteReader(reader => new Object[] { - reader.GetValue(), - reader.GetValue(), - reader.GetValue(), - reader.GetValue(), - reader.GetValue(), - reader.GetValue(), - reader.GetValue(), - reader.GetValue(), - reader.GetValue(), - reader.GetValue(), - $"{reader.GetValue():yyyy-MM-dd}", - reader.GetValue().Replace(',', ' ') + reader.GetValue(0), + reader.GetValue(1), + reader.GetValue(2), + reader.GetValue(3), + reader.GetValue(4), + reader.GetValue(5), + reader.GetValue(6), + reader.GetValue(7), + reader.GetValue(8), + reader.GetValue(9), + $"{reader.GetValue(10):yyyy-MM-dd}", + reader.GetValue(11).Replace(',', ' ') }); csvItems.AddRange(items); diff --git a/LaaProductionWeb/LaaProductionWeb.sln b/LaaProductionWeb/LaaProductionWeb.sln index 5f10c7e5..b2c29df1 100644 --- a/LaaProductionWeb/LaaProductionWeb.sln +++ b/LaaProductionWeb/LaaProductionWeb.sln @@ -56,8 +56,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LaaPackages", "LaaPackages" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LaaPackages.SqlClient", "LaaPackages\LaaPackages.SqlClient\LaaPackages.SqlClient.csproj", "{F90B940C-9A83-496D-AAE0-11CD02CE0A22}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LaaPackages.HttpClient", "LaaPackages\LaaPackages.HttpClient\LaaPackages.HttpClient.csproj", "{356AD085-26AD-447E-8CC7-31E5A8B39A4D}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -120,10 +118,6 @@ Global {F90B940C-9A83-496D-AAE0-11CD02CE0A22}.Debug|Any CPU.Build.0 = Debug|Any CPU {F90B940C-9A83-496D-AAE0-11CD02CE0A22}.Release|Any CPU.ActiveCfg = Release|Any CPU {F90B940C-9A83-496D-AAE0-11CD02CE0A22}.Release|Any CPU.Build.0 = Release|Any CPU - {356AD085-26AD-447E-8CC7-31E5A8B39A4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {356AD085-26AD-447E-8CC7-31E5A8B39A4D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {356AD085-26AD-447E-8CC7-31E5A8B39A4D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {356AD085-26AD-447E-8CC7-31E5A8B39A4D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -133,7 +127,6 @@ Global {CB91E680-2715-4E94-988A-401C0F4A0707} = {90A75AEB-70C5-42E5-A802-6B744280B8F8} {25BACE1B-1961-411A-8AC0-1375A1898F8F} = {90A75AEB-70C5-42E5-A802-6B744280B8F8} {F90B940C-9A83-496D-AAE0-11CD02CE0A22} = {35CDD71E-6FF8-45F5-B6E1-DF73573B4C26} - {356AD085-26AD-447E-8CC7-31E5A8B39A4D} = {35CDD71E-6FF8-45F5-B6E1-DF73573B4C26} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9D3C9EBA-FB4B-4BF4-8158-4A9FE47D3E88} diff --git a/LaaProductionWeb/LaaProductionWeb/API/Personalization/SoftwareController.cs b/LaaProductionWeb/LaaProductionWeb/API/Personalization/SoftwareController.cs index 09c87337..7fea9be2 100644 --- a/LaaProductionWeb/LaaProductionWeb/API/Personalization/SoftwareController.cs +++ b/LaaProductionWeb/LaaProductionWeb/API/Personalization/SoftwareController.cs @@ -1,10 +1,8 @@ namespace LaaProductionWeb.API.Personalization { - using LaaProduction.Http.Interfaces; using LaaProduction.Personalization.Interfaces; using LaaProduction.Personalization.Models; using LaaProductionWeb.App_Infrastructure; - using LaaProductionDI; using System; using System.Collections.Generic; diff --git a/LaaProductionWeb/LaaProductionWeb/LaaProductionWeb.csproj b/LaaProductionWeb/LaaProductionWeb/LaaProductionWeb.csproj index 676fa5d3..dbd6f80b 100644 --- a/LaaProductionWeb/LaaProductionWeb/LaaProductionWeb.csproj +++ b/LaaProductionWeb/LaaProductionWeb/LaaProductionWeb.csproj @@ -361,10 +361,6 @@ {CB91E680-2715-4E94-988A-401C0F4A0707} LaaProduction.Data.Omni - - {356ad085-26ad-447e-8cc7-31e5a8b39a4d} - LaaPackages.HttpClient - {F90B940C-9A83-496D-AAE0-11CD02CE0A22} LaaPackages.SqlClient @@ -427,6 +423,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + $(SolutionDir)RoutesBuilder\bin\Debug\RoutesBuilder.exe @@ -435,6 +432,7 @@ del "$(TargetDir)*.pdb" del "$(TargetDir)*.xml" +