diff --git a/.vs/Serveur-Api/FileContentIndex/1982d43c-27f5-440a-a5ec-d88da1e50a17.vsidx b/.vs/Serveur-Api/FileContentIndex/1982d43c-27f5-440a-a5ec-d88da1e50a17.vsidx new file mode 100644 index 0000000..b189058 Binary files /dev/null and b/.vs/Serveur-Api/FileContentIndex/1982d43c-27f5-440a-a5ec-d88da1e50a17.vsidx differ diff --git a/.vs/Serveur-Api/FileContentIndex/34cfef4a-4861-4ee7-938e-22bb37aa603e.vsidx b/.vs/Serveur-Api/FileContentIndex/34cfef4a-4861-4ee7-938e-22bb37aa603e.vsidx deleted file mode 100644 index 1f2c5ce..0000000 Binary files a/.vs/Serveur-Api/FileContentIndex/34cfef4a-4861-4ee7-938e-22bb37aa603e.vsidx and /dev/null differ diff --git a/.vs/Serveur-Api/v17/.wsuo b/.vs/Serveur-Api/v17/.wsuo new file mode 100644 index 0000000..386718c Binary files /dev/null and b/.vs/Serveur-Api/v17/.wsuo differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index f790be4..d194193 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/Sources/Dto/Classe/TourDTO.cs b/Sources/Dto/Classe/TourDTO.cs index 777bed7..0d9d8cb 100644 --- a/Sources/Dto/Classe/TourDTO.cs +++ b/Sources/Dto/Classe/TourDTO.cs @@ -10,7 +10,7 @@ namespace Dto.Classe { public string Temps { get; set; } public long IdSession { get; set; } - + public int Numero { get; set; } public List Points { get; set; } } } diff --git a/Sources/Dto/Factories/TourFactorie.cs b/Sources/Dto/Factories/TourFactorie.cs index 613e195..fed6c93 100644 --- a/Sources/Dto/Factories/TourFactorie.cs +++ b/Sources/Dto/Factories/TourFactorie.cs @@ -16,6 +16,7 @@ namespace Dto.Factories tourDTO.IdSession = modele.IdSession; tourDTO.Temps = modele.Temps; + tourDTO.Numero = modele.Numero; tourDTO.Points = modele.Points.Select(e => e.ModeleToDTO()).ToList(); return tourDTO; diff --git a/Sources/Entity_Framework/BDD.db-shm b/Sources/Entity_Framework/BDD.db-shm deleted file mode 100644 index fe9ac28..0000000 Binary files a/Sources/Entity_Framework/BDD.db-shm and /dev/null differ diff --git a/Sources/Entity_Framework/BDD.db-wal b/Sources/Entity_Framework/BDD.db-wal deleted file mode 100644 index e69de29..0000000 diff --git a/Sources/Entity_Framework/Factories/PointFactorie.cs b/Sources/Entity_Framework/Factories/PointFactorie.cs index 65ef4f4..112d1f9 100644 --- a/Sources/Entity_Framework/Factories/PointFactorie.cs +++ b/Sources/Entity_Framework/Factories/PointFactorie.cs @@ -30,6 +30,7 @@ namespace Entity_Framework.Factories R_Pedal = modele.RPedal, G_Lon = modele.GLong, G_Lat = modele.GLat, + V_Car = modele.VCar, }; } diff --git a/Sources/Extraction_Donnees/Extraction_EXECL/Excel.cs b/Sources/Extraction_Donnees/Extraction_EXECL/Excel.cs index 9301bf8..41aa142 100644 --- a/Sources/Extraction_Donnees/Extraction_EXECL/Excel.cs +++ b/Sources/Extraction_Donnees/Extraction_EXECL/Excel.cs @@ -99,7 +99,7 @@ namespace Extraction_Donnees.Extraction_EXECL } else { - if (cpt != 2 && cpt % 2 == 0) continue; // saute la moitiƩ des points (omptimization) + if (cpt != 2 && cpt % 2 == 0) continue; // saute la moitiƩ des points (optimization) try { var point = new Point( @@ -138,7 +138,7 @@ namespace Extraction_Donnees.Extraction_EXECL return session; } - public static Session TestExcel(string filePath) + public static async Task TestExcel(string filePath) { var session = new Session(); System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance); diff --git a/Sources/Extraction_Excel_Test/Program.cs b/Sources/Extraction_Excel_Test/Program.cs index acc7b68..2c617cb 100644 --- a/Sources/Extraction_Excel_Test/Program.cs +++ b/Sources/Extraction_Excel_Test/Program.cs @@ -28,8 +28,9 @@ Console.WriteLine("Tours : " + sesh.Tours.Count); */ IApi data = new Extraction(); - -Session session = await Excel.TestExcel2("C:\\Users\\Jolys Enzo\\home\\BUT\\Projet\\Sae4.01\\Projet\\R-Dash_APP\\Extraction_Excel_Test\\tmp.xls"); +//"C:\\Users\\Jolys Enzo\\home\\BUT\\Projet\\Sae4.01\\Projet\\R-Dash_APP\\Extraction_Excel_Test\\tmp.xls" +Session session = await Excel.TestExcel2( "C:\\Users\\zinn1\\source\\repos\\Serveur-Api\\Sources\\Extraction_Excel_Test\\tmp.xls"); Console.WriteLine("Start !"); -await data.AddSession(session, "test_PILOTE", "test_CIRCUIT","Session_test","Championnat"); +//await data.AddSession(session, "test_PILOTE", "test_CIRCUIT","Session_test","Championnat"); +Console.WriteLine(session.ToString()); Console.WriteLine("Fini !");