В тупике
parent
0c39d43067
commit
26694989ee
|
|
@ -15,9 +15,6 @@ public partial class AdminWindowViewModel : ViewModelBase
|
||||||
private readonly Navigation _navigation;
|
private readonly Navigation _navigation;
|
||||||
private readonly IServiceProvider _provider;
|
private readonly IServiceProvider _provider;
|
||||||
private readonly RecordRep _recordRep;
|
private readonly RecordRep _recordRep;
|
||||||
[ObservableProperty] private string _password;
|
|
||||||
[ObservableProperty] private string _login;
|
|
||||||
[ObservableProperty] public string _eror;
|
|
||||||
[ObservableProperty] ObservableCollection<Record> _recordsList = new();
|
[ObservableProperty] ObservableCollection<Record> _recordsList = new();
|
||||||
[ObservableProperty] private Record _selectedRecord;
|
[ObservableProperty] private Record _selectedRecord;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,12 +16,13 @@ public partial class DoctorViewModel : ViewModelBase
|
||||||
[ObservableProperty] string name;
|
[ObservableProperty] string name;
|
||||||
[ObservableProperty] List<Doctor> _doctorList;
|
[ObservableProperty] List<Doctor> _doctorList;
|
||||||
[ObservableProperty] Doctor selectedDoctor;
|
[ObservableProperty] Doctor selectedDoctor;
|
||||||
[ObservableProperty] string g;
|
// [ObservableProperty] string g;
|
||||||
|
|
||||||
public DoctorViewModel(IServiceProvider provider, DoctorRepository repository)
|
public DoctorViewModel(IServiceProvider provider, DoctorRepository repository, Navigation navigation)
|
||||||
{
|
{
|
||||||
_provider = provider;
|
_provider = provider;
|
||||||
_doctorList = repository.GetDoctorsByTest();
|
_doctorList = repository.GetDoctorsByTest();
|
||||||
|
_navigation = navigation;
|
||||||
}
|
}
|
||||||
|
|
||||||
[RelayCommand]
|
[RelayCommand]
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,8 @@ public partial class ServiceViewModel : ViewModelBase
|
||||||
[ObservableProperty] string _login;
|
[ObservableProperty] string _login;
|
||||||
[ObservableProperty] Doctor _selectedDoctor;
|
[ObservableProperty] Doctor _selectedDoctor;
|
||||||
|
|
||||||
public ServiceViewModel(IServiceProvider provider, Navigation navigation,Doctor selectedDoctor, ServiceRepository repository)
|
public ServiceViewModel(IServiceProvider provider, Navigation navigation, Doctor selectedDoctor,
|
||||||
|
ServiceRepository repository)
|
||||||
{
|
{
|
||||||
_provider = provider;
|
_provider = provider;
|
||||||
_navigation = navigation;
|
_navigation = navigation;
|
||||||
|
|
@ -58,4 +59,5 @@ public partial class ServiceViewModel : ViewModelBase
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -6,6 +6,8 @@
|
||||||
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
||||||
x:Class="Policlinica.Views.DoctoraWindow"
|
x:Class="Policlinica.Views.DoctoraWindow"
|
||||||
x:DataType="vm:DoctorViewModel">
|
x:DataType="vm:DoctorViewModel">
|
||||||
|
|
||||||
|
<Border BorderBrush="Aqua" CornerRadius="8" BorderThickness="2" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10">
|
||||||
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
|
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||||
|
|
||||||
<TextBlock Text="Создание заказа" FontSize="20" FontWeight="Bold" HorizontalAlignment="Center"/>
|
<TextBlock Text="Создание заказа" FontSize="20" FontWeight="Bold" HorizontalAlignment="Center"/>
|
||||||
|
|
@ -22,7 +24,6 @@
|
||||||
DisplayMemberBinding="{Binding Title}"/>
|
DisplayMemberBinding="{Binding Title}"/>
|
||||||
<Button Content="Далее"
|
<Button Content="Далее"
|
||||||
Command="{Binding StartTestCommand}"/>
|
Command="{Binding StartTestCommand}"/>
|
||||||
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
</Border>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -13,7 +13,7 @@ using System.Reflection;
|
||||||
[assembly: System.Reflection.AssemblyCompanyAttribute("Policlinica")]
|
[assembly: System.Reflection.AssemblyCompanyAttribute("Policlinica")]
|
||||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
||||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
||||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e3c82b3beb1339a2b45ae0135f4cec1dd2d539ad")]
|
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+0c39d4306759ff136287d4976888185e020a9731")]
|
||||||
[assembly: System.Reflection.AssemblyProductAttribute("Policlinica")]
|
[assembly: System.Reflection.AssemblyProductAttribute("Policlinica")]
|
||||||
[assembly: System.Reflection.AssemblyTitleAttribute("Policlinica")]
|
[assembly: System.Reflection.AssemblyTitleAttribute("Policlinica")]
|
||||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
f9b7536251095c35c285debded6d0b23c2542b426e625ba97bb4d89f55dd8a5b
|
b8ea74dd85d117535ad18242a353cd36b1febc4b76095cec0f716a58f5270286
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
|
|
@ -1 +1 @@
|
||||||
{"documents":{"C:\\Users\\artem\\RiderProjects\\Policlinica1\\*":"https://raw.githubusercontent.com/Dezkriminant/Policlinica/e3c82b3beb1339a2b45ae0135f4cec1dd2d539ad/*"}}
|
{"documents":{"C:\\Users\\artem\\RiderProjects\\Policlinica1\\*":"https://raw.githubusercontent.com/Dezkriminant/Policlinica/0c39d4306759ff136287d4976888185e020a9731/*"}}
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue