diff --git a/Policlinica/DB/RecordRep.cs b/Policlinica/DB/RecordRep.cs index 7b0f760..fa045b3 100644 --- a/Policlinica/DB/RecordRep.cs +++ b/Policlinica/DB/RecordRep.cs @@ -16,10 +16,11 @@ public class RecordRep:BaseRep { List recordsList = new(); - string sql = @"select r.id,r.client_name, r.client_surname,r.doctor_id,user_id,r.total_amount,r.record_date,d.title,u.name - from records r + string sql = @"select r.id,r.client_name, r.client_surname,r.doctor_id,r.user_id,r.total_amount,r.record_date,r.service_id,d.title,u.name,s.service_name + from records r join doctors d on r.doctor_id = d.id - join users u on r.user_id = u.id "; + join users u on r.user_id = u.id + join services s on r.service_id = s.id"; try { using (var mc = new MySqlCommand(sql, connection)) @@ -35,10 +36,12 @@ public class RecordRep:BaseRep ClientSurname = reader.GetString("client_surname"), DoctorId = reader.GetInt32("doctor_id"), UserId = reader.GetInt32("user_id"), + ServiceId = reader.GetInt32("service_id"), TotalAmount = reader.GetInt32("total_amount"), RecordDate = reader.GetDateTime("record_date"), Name = reader.GetString("name"), - Title = reader.GetString("title") + Title = reader.GetString("title"), + ServiceName = reader.GetString("service_name") }); } } diff --git a/Policlinica/Models/Record.cs b/Policlinica/Models/Record.cs index a92dddb..a510d2e 100644 --- a/Policlinica/Models/Record.cs +++ b/Policlinica/Models/Record.cs @@ -14,10 +14,13 @@ public class Record public int UserId { get; set; } + public int ServiceId { get; set; } + public decimal TotalAmount { get; set; } public DateTime RecordDate { get; set; } public string Title { get; set; } public string Name { get; set; } + public string ServiceName { get; set; } } \ No newline at end of file diff --git a/Policlinica/Views/AdminWindowView.axaml b/Policlinica/Views/AdminWindowView.axaml index 6d0590c..5fb7dd8 100644 --- a/Policlinica/Views/AdminWindowView.axaml +++ b/Policlinica/Views/AdminWindowView.axaml @@ -17,7 +17,7 @@ - + diff --git a/Policlinica/appsetting.json b/Policlinica/appsetting.json index 7945bd2..e96b6ad 100644 --- a/Policlinica/appsetting.json +++ b/Policlinica/appsetting.json @@ -1,6 +1,6 @@ { "DataBaseConnection": { - "ConnectionString" : "server=217.150.77.216;port=24831;userid=student;password=student;database=Polyclinic" + "ConnectionString" : "server=217.150.77.216;port=24831;userid=student;password=student;database=Policlinic" } } \ No newline at end of file diff --git a/Policlinica/bin/Debug/net9.0/Policlinica.dll b/Policlinica/bin/Debug/net9.0/Policlinica.dll index 5c900d5..6353d54 100644 Binary files a/Policlinica/bin/Debug/net9.0/Policlinica.dll and b/Policlinica/bin/Debug/net9.0/Policlinica.dll differ diff --git a/Policlinica/bin/Debug/net9.0/Policlinica.exe b/Policlinica/bin/Debug/net9.0/Policlinica.exe index c2ee540..21ad8f4 100644 Binary files a/Policlinica/bin/Debug/net9.0/Policlinica.exe and b/Policlinica/bin/Debug/net9.0/Policlinica.exe differ diff --git a/Policlinica/bin/Debug/net9.0/Policlinica.pdb b/Policlinica/bin/Debug/net9.0/Policlinica.pdb index 4a44865..f34a8a4 100644 Binary files a/Policlinica/bin/Debug/net9.0/Policlinica.pdb and b/Policlinica/bin/Debug/net9.0/Policlinica.pdb differ diff --git a/Policlinica/bin/Debug/net9.0/appsetting.json b/Policlinica/bin/Debug/net9.0/appsetting.json index 7945bd2..e96b6ad 100644 --- a/Policlinica/bin/Debug/net9.0/appsetting.json +++ b/Policlinica/bin/Debug/net9.0/appsetting.json @@ -1,6 +1,6 @@ { "DataBaseConnection": { - "ConnectionString" : "server=217.150.77.216;port=24831;userid=student;password=student;database=Polyclinic" + "ConnectionString" : "server=217.150.77.216;port=24831;userid=student;password=student;database=Policlinic" } } \ No newline at end of file diff --git a/Policlinica/obj/Debug/net9.0/Avalonia/resources b/Policlinica/obj/Debug/net9.0/Avalonia/resources index 5db5fdc..e514ea1 100644 Binary files a/Policlinica/obj/Debug/net9.0/Avalonia/resources and b/Policlinica/obj/Debug/net9.0/Avalonia/resources differ diff --git a/Policlinica/obj/Debug/net9.0/Policlinica.AssemblyInfo.cs b/Policlinica/obj/Debug/net9.0/Policlinica.AssemblyInfo.cs index a3359f8..27d2f6a 100644 --- a/Policlinica/obj/Debug/net9.0/Policlinica.AssemblyInfo.cs +++ b/Policlinica/obj/Debug/net9.0/Policlinica.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Policlinica")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+4407015adc26f82850c90f3ec73288b176f64b4a")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1ea1be87bdcc1be1edf581939fe3fad5c4543b87")] [assembly: System.Reflection.AssemblyProductAttribute("Policlinica")] [assembly: System.Reflection.AssemblyTitleAttribute("Policlinica")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Policlinica/obj/Debug/net9.0/Policlinica.AssemblyInfoInputs.cache b/Policlinica/obj/Debug/net9.0/Policlinica.AssemblyInfoInputs.cache index 16a9425..5239b7f 100644 --- a/Policlinica/obj/Debug/net9.0/Policlinica.AssemblyInfoInputs.cache +++ b/Policlinica/obj/Debug/net9.0/Policlinica.AssemblyInfoInputs.cache @@ -1 +1 @@ -fcbda8bf225be28d2b4a90514670a80f7dbf22270efc525991c0f3694f1c291f +a4ba19822fdbb15ed15f95983a1e8d700bab0f1304423af8f4b191027a0bf6ee diff --git a/Policlinica/obj/Debug/net9.0/Policlinica.dll b/Policlinica/obj/Debug/net9.0/Policlinica.dll index 5c900d5..6353d54 100644 Binary files a/Policlinica/obj/Debug/net9.0/Policlinica.dll and b/Policlinica/obj/Debug/net9.0/Policlinica.dll differ diff --git a/Policlinica/obj/Debug/net9.0/Policlinica.pdb b/Policlinica/obj/Debug/net9.0/Policlinica.pdb index 4a44865..f34a8a4 100644 Binary files a/Policlinica/obj/Debug/net9.0/Policlinica.pdb and b/Policlinica/obj/Debug/net9.0/Policlinica.pdb differ diff --git a/Policlinica/obj/Debug/net9.0/Policlinica.sourcelink.json b/Policlinica/obj/Debug/net9.0/Policlinica.sourcelink.json index 0cab930..c19e3d2 100644 --- a/Policlinica/obj/Debug/net9.0/Policlinica.sourcelink.json +++ b/Policlinica/obj/Debug/net9.0/Policlinica.sourcelink.json @@ -1 +1 @@ -{"documents":{"C:\\Users\\artem\\RiderProjects\\Policlinica1\\*":"https://raw.githubusercontent.com/Dezkriminant/Policlinica/4407015adc26f82850c90f3ec73288b176f64b4a/*"}} \ No newline at end of file +{"documents":{"C:\\Users\\artem\\RiderProjects\\Policlinica1\\*":"https://raw.githubusercontent.com/Dezkriminant/Policlinica/1ea1be87bdcc1be1edf581939fe3fad5c4543b87/*"}} \ No newline at end of file diff --git a/Policlinica/obj/Debug/net9.0/apphost.exe b/Policlinica/obj/Debug/net9.0/apphost.exe index c2ee540..21ad8f4 100644 Binary files a/Policlinica/obj/Debug/net9.0/apphost.exe and b/Policlinica/obj/Debug/net9.0/apphost.exe differ diff --git a/Policlinica/obj/Debug/net9.0/ref/Policlinica.dll b/Policlinica/obj/Debug/net9.0/ref/Policlinica.dll index be2e984..3b25548 100644 Binary files a/Policlinica/obj/Debug/net9.0/ref/Policlinica.dll and b/Policlinica/obj/Debug/net9.0/ref/Policlinica.dll differ diff --git a/Policlinica/obj/Debug/net9.0/refint/Policlinica.dll b/Policlinica/obj/Debug/net9.0/refint/Policlinica.dll index be2e984..3b25548 100644 Binary files a/Policlinica/obj/Debug/net9.0/refint/Policlinica.dll and b/Policlinica/obj/Debug/net9.0/refint/Policlinica.dll differ