diff options
-rw-r--r-- | ApartmentManager/ApartmentManager/Singletons/CatalogSingleton.cs | 4 | ||||
-rw-r--r-- | ApartmentManager/ApartmentManager/ViewModel/ApartmentViewModel.cs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ApartmentManager/ApartmentManager/Singletons/CatalogSingleton.cs b/ApartmentManager/ApartmentManager/Singletons/CatalogSingleton.cs index 689f08d..6baa647 100644 --- a/ApartmentManager/ApartmentManager/Singletons/CatalogSingleton.cs +++ b/ApartmentManager/ApartmentManager/Singletons/CatalogSingleton.cs @@ -19,13 +19,13 @@ namespace ApartmentManager.Singletons ////////// For Defects ////////// public ObservableCollection<Defect> Defects { get; set; } public ObservableCollection<DefectPicture> DefectPictures { get; set; } - public ObservableCollection<DefectComments> DefectComments { get; set; } + public ObservableCollection<DefectComment> DefectComments { get; set; } public Defect Defect { get; set; } public int DefectId { get; set; } ////////// Constructor ////////// private CatalogSingleton() { - DefectComments = new ObservableCollection<DefectComments>(); + DefectComments = new ObservableCollection<DefectComment>(); Residents = new ObservableCollection<Resident>(); Defects = new ObservableCollection<Defect>(); DefectPictures = new ObservableCollection<DefectPicture>(); diff --git a/ApartmentManager/ApartmentManager/ViewModel/ApartmentViewModel.cs b/ApartmentManager/ApartmentManager/ViewModel/ApartmentViewModel.cs index b84602d..6048db4 100644 --- a/ApartmentManager/ApartmentManager/ViewModel/ApartmentViewModel.cs +++ b/ApartmentManager/ApartmentManager/ViewModel/ApartmentViewModel.cs @@ -27,7 +27,7 @@ namespace ApartmentManager.ViewModel private Resident _newResident; private Defect _newDefect; private DefectPicture _selectedDefectPicture; - private DefectComments _newDefectComment; + private DefectComment _newDefectComment; ////////// Resident relay commands////////// public ICommand CreateResidentCommand { get; set; } public ICommand DeleteResidentCommand { get; set; } @@ -49,7 +49,7 @@ namespace ApartmentManager.ViewModel NewUser = new User(); NewResident = new Resident(); NewDefect = new Defect(); - NewDefectComment = new DefectComments(); + NewDefectComment = new DefectComment(); SelectedDefectPicture = new DefectPicture(); ////////// Handler ////////// ApartmentHandler = new ApartmentHandler(this); @@ -72,7 +72,7 @@ namespace ApartmentManager.ViewModel CreateDefectComment = new RelayCommand(ApartmentHandler.CreateDefectComment); } ////////// Store Data From Interface////////// - public DefectComments NewDefectComment + public DefectComment NewDefectComment { get => _newDefectComment; set |