aaugust
/
BathhouseManagment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Переделал

master
Святой Владислав Солоп 2026-05-15 09:44:43 +10:00
parent 4e1ab770f1
commit 41512c28ef
7 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Database/EmployeeRepository.cs
View File

@ -15,10 +15,10 @@ public class EmployeeRepository
connection = new MySqlConnection(connect.Value.ConnectionString);
}
public List<Employee> GetEmployees(Position position)
public List<Employee> GetEmployees()
{
List<Employee> result = new();
string sql = "select * from `employee` where position_id = " + position.Id;
string sql = "select e.id as eid, e.position_id as pid, e.name as ename, e.surname as esurname, p.name as pname from employee e join position p on e.position_id = p.id";
try
{
connection.Open();
@ -29,11 +29,20 @@ public class EmployeeRepository
{
result.Add(new Employee
{
/*
Id = reader.GetInt32("id"),
Name = reader.GetString("name"),
Surname = reader.GetString("surname"),
OnWork = reader.GetBoolean("on_work"),
PositionId = reader.GetInt32("position_id"),
*/
Id = reader.GetInt32("eid"),
Name = reader.GetString("ename"),
Surname = reader.GetString("esurname"),
Position = new Position()
{
Id = reader.GetInt32("pid"),
Name = reader.GetString("name"),
}
});
}
}
@ -57,7 +66,6 @@ public class EmployeeRepository
{
command.Parameters.AddWithValue("@name", employee.Name);
command.Parameters.AddWithValue("@surname", employee.Surname);
command.Parameters.AddWithValue("@on_work", employee.OnWork);
command.Parameters.AddWithValue("@position_id", employee.PositionId);
command.ExecuteNonQuery();
}
@ -82,7 +90,6 @@ public class EmployeeRepository
{
command.Parameters.AddWithValue("@name", employee.Name);
command.Parameters.AddWithValue("@surname", employee.Surname);
command.Parameters.AddWithValue("@on_work", employee.OnWork);
command.Parameters.AddWithValue("@position_id", employee.PositionId);
command.ExecuteNonQuery();
}

2
Models/Employee.cs
View File

@ -5,6 +5,6 @@ public class Employee
public int Id { get; set; }
public string Name { get; set; }
public string Surname { get; set; }
public bool OnWork { get; set; }
public int PositionId { get; set; }
public Position Position { get; set; }
}

2
ViewModels/MainWindowViewModel.cs
View File

@ -13,6 +13,7 @@ public partial class MainWindowViewModel : ViewModelBase
private readonly OrderRepository _orderRepository;
[ObservableProperty] List<Order> orders;
[ObservableProperty] List<Employee> employees;
public MainWindowViewModel(IServiceProvider serviceProvider, EmployeeRepository employeeRepository, OrderRepository orderRepository)
{
@ -20,6 +21,7 @@ public partial class MainWindowViewModel : ViewModelBase
_employeeRepository = employeeRepository;
_orderRepository = orderRepository;
Employees = employeeRepository.GetEmployees();
Orders = orderRepository.GetOrders();
}
}

19
Views/MainWindow.axaml
View File

@ -16,17 +16,24 @@
<DataGrid ItemsSource="{Binding Orders}" AutoGenerateColumns="False">
<DataGrid.Columns>
<DataGridTextColumn Header="Дата заказа" Binding="{Binding OrderDate}"/>
<DataGridTextColumn Header="ID клиента" Binding="{Binding ClientId}"/>
<DataGridTextColumn Header="ID скидки" Binding="{Binding DiscountId}"/>
<DataGridTextColumn Header="ID Сотрудника" Binding="{Binding EmployeeId}"/>
<DataGridTextColumn Header="ID услуги" Binding="{Binding ServiceId}"/>
<DataGridTextColumn Header="ID зоны" Binding="{Binding ZoneId}"/>
<DataGridTextColumn Header="Имя клиента" Binding="{Binding Client.Name}"/>
<DataGridTextColumn Header="Фамилия клиента" Binding="{Binding Client.Name}"/>
<DataGridTextColumn Header="Название услуги" Binding="{Binding Service.Name}"/>
<DataGridTextColumn Header="Имя сотрудника" Binding="{Binding Employee.Name}"/>
<DataGridTextColumn Header="Фамилия сотрудника" Binding="{Binding Employee.Surname}"/>
<DataGridTextColumn Header="Название зоны" Binding="{Binding Zone.Name}"/>
<DataGridTextColumn Header="Окончательная цена" Binding="{Binding FinalPrice}"/>
</DataGrid.Columns>
</DataGrid>
</TabItem>
<TabItem Header="Сотрудники">
<DataGrid ItemsSource="{Binding Employees}" AutoGenerateColumns="False">
<DataGrid.Columns>
<DataGridTextColumn Header="Имя сотрудника" Binding="{Binding Name}"/>
<DataGridTextColumn Header="Фамилия сотрудника" Binding="{Binding Surname}"/>
<DataGridTextColumn Header="Должность сотрудника" Binding="{Binding Position.Name}"/>
</DataGrid.Columns>
</DataGrid>
</TabItem>
</TabControl>
</TabItem>

BIN
obj/Debug/net10.0/Avalonia/resources
View File

Binary file not shown.

2
obj/Debug/net10.0/BathHouseManagmet.AssemblyInfo.cs
View File

@ -13,7 +13,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("BathHouseManagmet")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+55e84ef57c6abfe4ef4f4ef588ea91f719ce8536")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+4e1ab770f1b973c62387290bf8e7c9407bc2cd2a")]
[assembly: System.Reflection.AssemblyProductAttribute("BathHouseManagmet")]
[assembly: System.Reflection.AssemblyTitleAttribute("BathHouseManagmet")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
obj/Debug/net10.0/BathHouseManagmet.AssemblyInfoInputs.cache
View File

@ -1 +1 @@
af96d54e4de83c2d92c24c535a5ffbc3bfff4696e1e3b1ef13b37dfd8a84647a
f47cb2fe8a4221890c3e523f6ef8a05ece1d4ec0d2150086183c9d3e4a5ddd93