diff --git a/WpfApp1/WpfApp1/Data/coaches.json b/WpfApp1/WpfApp1/Data/coaches.json
new file mode 100644
index 0000000..0b17dae
--- /dev/null
+++ b/WpfApp1/WpfApp1/Data/coaches.json
@@ -0,0 +1,80 @@
+[
+ {
+ "Surname": "Платонова",
+ "Name": "Ева",
+ "Patronymic": "Артёмовна",
+ "Speciality": "Пилатес"
+ },
+ {
+ "Surname": "Кочетова",
+ "Name": "Виктория",
+ "Patronymic": "Макаровна",
+ "Speciality": "Кроссфит"
+ },
+ {
+ "Surname": "Филиппова",
+ "Name": "Ангелина",
+ "Patronymic": "Антоновна",
+ "Speciality": "Фитнес-ЙОГА"
+ },
+ {
+ "Surname": "Карасев",
+ "Name": "Данил",
+ "Patronymic": "Викторович",
+ "Speciality": "Кроссфит"
+ },
+ {
+ "Surname": "Романова",
+ "Name": "Александра",
+ "Patronymic": "Евгеньевна",
+ "Speciality": "Растяжка"
+ },
+ {
+ "Surname": "Смирнов",
+ "Name": "Егор",
+ "Patronymic": "Янович",
+ "Speciality": "Силовая тренировка"
+ },
+ {
+ "Surname": "Андреева",
+ "Name": "Светлана",
+ "Patronymic": "Данииловна",
+ "Speciality": "Аквааэробика"
+ },
+ {
+ "Surname": "Антонов",
+ "Name": "Евгений",
+ "Patronymic": "Евгеньевич",
+ "Speciality": "Аквааэробика"
+ },
+ {
+ "Surname": "Романова",
+ "Name": "Тамара",
+ "Patronymic": "Дмитриевна",
+ "Speciality": "Растяжка"
+ },
+ {
+ "Surname": "Фирсова",
+ "Name": "Варвара",
+ "Patronymic": "Антоновна",
+ "Speciality": "Фитнес-ЙОГА"
+ },
+ {
+ "Surname": "Захаров",
+ "Name": "Платон",
+ "Patronymic": "Ярославович",
+ "Speciality": "Зумба"
+ },
+ {
+ "Surname": "Смирнов",
+ "Name": "Максим",
+ "Patronymic": "Максимович",
+ "Speciality": "Силовая тренировка"
+ },
+ {
+ "Surname": "Золотова",
+ "Name": "Александра",
+ "Patronymic": "Григорьевна",
+ "Speciality": "Зумба"
+ }
+]
\ No newline at end of file
diff --git a/WpfApp1/WpfApp1/MainWindow.xaml.cs b/WpfApp1/WpfApp1/MainWindow.xaml.cs
index ab20c94..b1f355c 100644
--- a/WpfApp1/WpfApp1/MainWindow.xaml.cs
+++ b/WpfApp1/WpfApp1/MainWindow.xaml.cs
@@ -143,7 +143,7 @@ namespace WpfApp1
new Coach { Surname="Петров И.И.", Speciality="Силовой тренинг" }
};
- RecordWindow recordWin = new RecordWindow(_selectedClient, coaches);
+ RecordWindow recordWin = new RecordWindow(_selectedClient);
recordWin.ShowDialog();
}
diff --git a/WpfApp1/WpfApp1/RecordWindow.xaml b/WpfApp1/WpfApp1/RecordWindow.xaml
index cbf3579..5dba752 100644
--- a/WpfApp1/WpfApp1/RecordWindow.xaml
+++ b/WpfApp1/WpfApp1/RecordWindow.xaml
@@ -12,7 +12,7 @@
-
+
diff --git a/WpfApp1/WpfApp1/RecordWindow.xaml.cs b/WpfApp1/WpfApp1/RecordWindow.xaml.cs
index 5854676..35c3dbd 100644
--- a/WpfApp1/WpfApp1/RecordWindow.xaml.cs
+++ b/WpfApp1/WpfApp1/RecordWindow.xaml.cs
@@ -22,13 +22,34 @@ namespace WpfApp1
public partial class RecordWindow : Window
{
private Client _currentClient;
- private List _allCoaches;
+ private List _allCoaches = new List();
+ private const string CoachesFilePath = "Data/coaches.json";
- public RecordWindow(Client client, List coaches)
+ private void LoadCoachesData()
+ {
+ if (File.Exists(CoachesFilePath))
+ {
+ string json = File.ReadAllText(CoachesFilePath);
+ var options = new JsonSerializerOptions { PropertyNameCaseInsensitive = true };
+
+ _allCoaches = JsonSerializer.Deserialize>(json, options) ?? new List();
+
+ // Заполняем ComboBox специальностей
+ cbSpeciality.ItemsSource = _allCoaches
+ .Select(c => c.Speciality)
+ .Distinct()
+ .ToList();
+ }
+ else
+ {
+ MessageBox.Show($"Файл не найден по пути:");
+ }
+ }
+ public RecordWindow(Client client)
{
InitializeComponent();
+ LoadCoachesData();
_currentClient = client;
- _allCoaches = coaches;
txtClientName.Text = $"{client.surname} {client.name}";
@@ -52,7 +73,6 @@ namespace WpfApp1
try
{
- // 1. Создаем новый экземпляр записи
Entry newEntry = new Entry
{
Client = _currentClient,
diff --git a/WpfApp1/WpfApp1/ViewRecordsWindow.xaml.cs b/WpfApp1/WpfApp1/ViewRecordsWindow.xaml.cs
index f3acdd4..43824ff 100644
--- a/WpfApp1/WpfApp1/ViewRecordsWindow.xaml.cs
+++ b/WpfApp1/WpfApp1/ViewRecordsWindow.xaml.cs
@@ -33,7 +33,6 @@ namespace WpfApp1
LoadEntries();
}
-
private void LoadEntries()
{
if (File.Exists(FilePath))
diff --git a/WpfApp1/WpfApp1/WpfApp1.csproj b/WpfApp1/WpfApp1/WpfApp1.csproj
index 7c9043e..1cedd14 100644
--- a/WpfApp1/WpfApp1/WpfApp1.csproj
+++ b/WpfApp1/WpfApp1/WpfApp1.csproj
@@ -142,6 +142,9 @@
+
+
+