diff --git a/DoctorApp/App.xaml b/DoctorApp/App.xaml index 3c1bb2a..5159278 100644 --- a/DoctorApp/App.xaml +++ b/DoctorApp/App.xaml @@ -14,5 +14,6 @@ + diff --git a/DoctorApp/FodyWeavers.xml b/DoctorApp/FodyWeavers.xml new file mode 100644 index 0000000..d5abfed --- /dev/null +++ b/DoctorApp/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/DoctorApp/FodyWeavers.xsd b/DoctorApp/FodyWeavers.xsd new file mode 100644 index 0000000..69dbe48 --- /dev/null +++ b/DoctorApp/FodyWeavers.xsd @@ -0,0 +1,74 @@ + + + + + + + + + + + Used to control if the On_PropertyName_Changed feature is enabled. + + + + + Used to control if the Dependent properties feature is enabled. + + + + + Used to control if the IsChanged property feature is enabled. + + + + + Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form. + + + + + Used to control if equality checks should be inserted. If false, equality checking will be disabled for the project. + + + + + Used to control if equality checks should use the Equals method resolved from the base class. + + + + + Used to control if equality checks should use the static Equals method resolved from the base class. + + + + + Used to turn off build warnings from this weaver. + + + + + Used to turn off build warnings about mismatched On_PropertyName_Changed methods. + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/DoctorApp/ViewModels/MainViewModel.cs b/DoctorApp/ViewModels/MainViewModel.cs index 04d0637..fe7feba 100644 --- a/DoctorApp/ViewModels/MainViewModel.cs +++ b/DoctorApp/ViewModels/MainViewModel.cs @@ -9,9 +9,12 @@ namespace DoctorApp.ViewModels { public MainWindowViewModel MainWindowViewModel { get; set; } + Client client; + public MainViewModel(MainWindowViewModel mainWindowViewModel) { - MainWindowViewModel = mainWindowViewModel; + this.MainWindowViewModel = mainWindowViewModel; + client = this.MainWindowViewModel.client; } } } diff --git a/DoctorApp/ViewModels/MainWindowViewModel.cs b/DoctorApp/ViewModels/MainWindowViewModel.cs index c269da7..7b41840 100644 --- a/DoctorApp/ViewModels/MainWindowViewModel.cs +++ b/DoctorApp/ViewModels/MainWindowViewModel.cs @@ -6,7 +6,7 @@ using System.Text; namespace DoctorApp.ViewModels { - class MainWindowViewModel + class MainWindowViewModel : ObservableObject { public Info InfoModel { get; set; } diff --git a/DoctorApp/Views/LoginView.xaml b/DoctorApp/Views/LoginView.xaml index 8d0ff26..144d10d 100644 --- a/DoctorApp/Views/LoginView.xaml +++ b/DoctorApp/Views/LoginView.xaml @@ -1,12 +1,13 @@ - + > @@ -20,4 +21,4 @@ - + diff --git a/DoctorApp/Views/LoginView.xaml.cs b/DoctorApp/Views/LoginView.xaml.cs index dd7ffef..28c02da 100644 --- a/DoctorApp/Views/LoginView.xaml.cs +++ b/DoctorApp/Views/LoginView.xaml.cs @@ -16,7 +16,7 @@ namespace DoctorApp.Views /// /// Interaction logic for LoginView.xaml /// - public partial class LoginView : Page + public partial class LoginView : UserControl { public LoginView() { diff --git a/DoctorApp/Views/MainView.xaml b/DoctorApp/Views/MainView.xaml index 56a7de1..d5e4a35 100644 --- a/DoctorApp/Views/MainView.xaml +++ b/DoctorApp/Views/MainView.xaml @@ -1,4 +1,4 @@ - + > - +