From 98f7c4015db97d659a000c9c51051cc4abe009a8 Mon Sep 17 00:00:00 2001 From: Paulius Klezys Date: Wed, 3 May 2017 23:38:25 +0200 Subject: Gaben and Putin added --- ApartmentManager/ApartmentManager.sln | 6 +- .../ApartmentManager/ApartmentManager.csproj | 36 +++++++++ .../ApartmentManager/Assets/BrokenDownpipe.jpg | Bin 0 -> 294533 bytes .../ApartmentManager/Assets/Person1.jpg | Bin 0 -> 448838 bytes .../ApartmentManager/Assets/Person2.jpg | Bin 0 -> 48173 bytes .../ApartmentManager/Assets/Person3.jpg | Bin 0 -> 4614 bytes .../Handler/BoardApartmentsHandler.cs | 19 +++++ .../ApartmentManager/Model/Apartment.cs | 13 ++-- .../Model/ApartmentsCatalogSingleton.cs | 45 +++++++++++ ApartmentManager/ApartmentManager/Model/Defect.cs | 43 +++++++++++ .../View/BoardMembersDefectsPage.xaml | 30 ++++++++ .../View/BoardMembersDefectsPage.xaml.cs | 35 +++++++++ .../ApartmentManager/View/BoardMembersPage.xaml | 25 +++++++ .../ApartmentManager/View/BoardMembersPage.xaml.cs | 40 ++++++++++ .../View/DefectsPicturesBoard.xaml | 29 ++++++++ .../View/DefectsPicturesBoard.xaml.cs | 30 ++++++++ .../ApartmentManager/View/InfoForBoardMembers.xaml | 49 ++++++++++++ .../View/InfoForBoardMembers.xaml.cs | 30 ++++++++ .../ViewModel/ApartmentsViewModel.cs | 82 +++++++++++++++++++++ 19 files changed, 503 insertions(+), 9 deletions(-) create mode 100644 ApartmentManager/ApartmentManager/Assets/BrokenDownpipe.jpg create mode 100644 ApartmentManager/ApartmentManager/Assets/Person1.jpg create mode 100644 ApartmentManager/ApartmentManager/Assets/Person2.jpg create mode 100644 ApartmentManager/ApartmentManager/Assets/Person3.jpg create mode 100644 ApartmentManager/ApartmentManager/Handler/BoardApartmentsHandler.cs create mode 100644 ApartmentManager/ApartmentManager/Model/ApartmentsCatalogSingleton.cs create mode 100644 ApartmentManager/ApartmentManager/Model/Defect.cs create mode 100644 ApartmentManager/ApartmentManager/View/BoardMembersDefectsPage.xaml create mode 100644 ApartmentManager/ApartmentManager/View/BoardMembersDefectsPage.xaml.cs create mode 100644 ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml create mode 100644 ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml.cs create mode 100644 ApartmentManager/ApartmentManager/View/DefectsPicturesBoard.xaml create mode 100644 ApartmentManager/ApartmentManager/View/DefectsPicturesBoard.xaml.cs create mode 100644 ApartmentManager/ApartmentManager/View/InfoForBoardMembers.xaml create mode 100644 ApartmentManager/ApartmentManager/View/InfoForBoardMembers.xaml.cs create mode 100644 ApartmentManager/ApartmentManager/ViewModel/ApartmentsViewModel.cs diff --git a/ApartmentManager/ApartmentManager.sln b/ApartmentManager/ApartmentManager.sln index 97a72ca..eea880e 100644 --- a/ApartmentManager/ApartmentManager.sln +++ b/ApartmentManager/ApartmentManager.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26403.7 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApartmentManager", "ApartmentManager\ApartmentManager.csproj", "{95401ED6-D03C-417D-8897-81B5454D2426}" EndProject @@ -20,6 +20,8 @@ Global EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {95401ED6-D03C-417D-8897-81B5454D2426}.Debug|Any CPU.ActiveCfg = Debug|x86 + {95401ED6-D03C-417D-8897-81B5454D2426}.Debug|Any CPU.Build.0 = Debug|x86 + {95401ED6-D03C-417D-8897-81B5454D2426}.Debug|Any CPU.Deploy.0 = Debug|x86 {95401ED6-D03C-417D-8897-81B5454D2426}.Debug|ARM.ActiveCfg = Debug|ARM {95401ED6-D03C-417D-8897-81B5454D2426}.Debug|ARM.Build.0 = Debug|ARM {95401ED6-D03C-417D-8897-81B5454D2426}.Debug|ARM.Deploy.0 = Debug|ARM diff --git a/ApartmentManager/ApartmentManager/ApartmentManager.csproj b/ApartmentManager/ApartmentManager/ApartmentManager.csproj index 21b1952..aca5e4f 100644 --- a/ApartmentManager/ApartmentManager/ApartmentManager.csproj +++ b/ApartmentManager/ApartmentManager/ApartmentManager.csproj @@ -101,7 +101,10 @@ + + + @@ -109,10 +112,23 @@ + ApartmentPage.xaml + + BoardMembersDefectsPage.xaml + + + BoardMembersPage.xaml + + + DefectsPicturesBoard.xaml + + + InfoForBoardMembers.xaml + LoginPage.xaml @@ -132,6 +148,10 @@ + + + + @@ -159,6 +179,22 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/ApartmentManager/ApartmentManager/Assets/BrokenDownpipe.jpg b/ApartmentManager/ApartmentManager/Assets/BrokenDownpipe.jpg new file mode 100644 index 0000000..34cb5b2 Binary files /dev/null and b/ApartmentManager/ApartmentManager/Assets/BrokenDownpipe.jpg differ diff --git a/ApartmentManager/ApartmentManager/Assets/Person1.jpg b/ApartmentManager/ApartmentManager/Assets/Person1.jpg new file mode 100644 index 0000000..edf9716 Binary files /dev/null and b/ApartmentManager/ApartmentManager/Assets/Person1.jpg differ diff --git a/ApartmentManager/ApartmentManager/Assets/Person2.jpg b/ApartmentManager/ApartmentManager/Assets/Person2.jpg new file mode 100644 index 0000000..4e67876 Binary files /dev/null and b/ApartmentManager/ApartmentManager/Assets/Person2.jpg differ diff --git a/ApartmentManager/ApartmentManager/Assets/Person3.jpg b/ApartmentManager/ApartmentManager/Assets/Person3.jpg new file mode 100644 index 0000000..b9ed3a7 Binary files /dev/null and b/ApartmentManager/ApartmentManager/Assets/Person3.jpg differ diff --git a/ApartmentManager/ApartmentManager/Handler/BoardApartmentsHandler.cs b/ApartmentManager/ApartmentManager/Handler/BoardApartmentsHandler.cs new file mode 100644 index 0000000..f988489 --- /dev/null +++ b/ApartmentManager/ApartmentManager/Handler/BoardApartmentsHandler.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ApartmentManager.ViewModel; + +namespace ApartmentManager.Handler +{ + class BoardApartmentsHandler + { + public ApartmentsViewModel ApartmentsViewModel { get; set; } + + public BoardApartmentsHandler(ApartmentsViewModel apartmentsViewModel) + { + ApartmentsViewModel = apartmentsViewModel; + } + } +} diff --git a/ApartmentManager/ApartmentManager/Model/Apartment.cs b/ApartmentManager/ApartmentManager/Model/Apartment.cs index fb67904..1a37f96 100644 --- a/ApartmentManager/ApartmentManager/Model/Apartment.cs +++ b/ApartmentManager/ApartmentManager/Model/Apartment.cs @@ -28,12 +28,11 @@ namespace ApartmentManager.Model } - //public override string ToString() - //{ - // return string.Format($"Name {Name} LastName {LastName} Phone {Phone}"); - //} - - - + public override string ToString() + { + return string.Format( + "Apartment No: {0} Size: {1} NoOfRooms: {2} MonthlyCharge: {3} Floor: {4} Address: {5}", + ApartmentNumber, Size, NumberOfRooms, MonthlyCharge, Floor, Address); + } } } diff --git a/ApartmentManager/ApartmentManager/Model/ApartmentsCatalogSingleton.cs b/ApartmentManager/ApartmentManager/Model/ApartmentsCatalogSingleton.cs new file mode 100644 index 0000000..b9e8bfc --- /dev/null +++ b/ApartmentManager/ApartmentManager/Model/ApartmentsCatalogSingleton.cs @@ -0,0 +1,45 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Media; +using Windows.UI.Xaml.Media.Imaging; + +namespace ApartmentManager.Model +{ + class ApartmentsCatalogSingleton + { + private static ApartmentsCatalogSingleton instance = new ApartmentsCatalogSingleton(); + + public static ApartmentsCatalogSingleton Instance => instance; + + public ObservableCollection Apartment { get; set; } + public ObservableCollection User { get; set; } + public ObservableCollection Residents { get; set; } + public ObservableCollection Defects { get; set; } + private ApartmentsCatalogSingleton() + { + User = new ObservableCollection(); + User.Add(new User("Bibis", "Kiausiai", 3214568, new DateTime(2017, 1, 5, 2, 27, 0), "Bibis@mail.com", 1)); + + Apartment = new ObservableCollection(); + Apartment.Add(new Apartment(1, "30 Square meters", 2, "200", 0, "adresas")); + Apartment.Add(new Apartment(2, "40 Square meters", 4, "300", 1, "kvaerkebyvej")); + Apartment.Add(new Apartment(3, "28 Square meters", 1, "125", 0, "ugandavej")); + + Residents = new ObservableCollection(); + Residents.Add(new Resident("Bibis", "Kiausiai", 3214568, new DateTime(2017, 1, 5, 0, 0, 0), "Bibis@mail.com", 1)); + Residents.Add(new Resident("Bibis", "Kiausiai", 3214568, new DateTime(2017, 1, 5, 0, 0, 0), "Bibis@mail.com", 1)); + Residents.Add(new Resident("Bibis", "Kiausiai", 3214568, new DateTime(2017, 1, 5, 0, 0, 0), "Bibis@mail.com", 1)); + Residents.Add(new Resident("Bibis", "Kiausiai", 3214568, new DateTime(2017, 1, 5, 0, 0, 0), "Bibis@mail.com", 1)); + + Defects = new ObservableCollection(); + Defects.Add(new Defect(1, 2, "Leaking downpipe", DateTime.Now, new Image(), new Image(), new Image(), "Ze fokin daun paip iz aboot to ekslpod bois", "Iditi vse naxui", "Not fixed")); + Defects.Add(new Defect(1, 2, "Leaking downpipe", DateTime.Now, new Image(), new Image(), new Image(), "Ze fokin daun paip iz aboot to ekslpod bois", "Iditi vse naxui", "Not fixed")); + Defects.Add(new Defect(1, 2, "Leaking downpipe", DateTime.Now, new Image(), new Image(), new Image(), "Ze fokin daun paip iz aboot to ekslpod bois", "Iditi vse naxui", "Fixed")); + } + } +} diff --git a/ApartmentManager/ApartmentManager/Model/Defect.cs b/ApartmentManager/ApartmentManager/Model/Defect.cs new file mode 100644 index 0000000..f695c95 --- /dev/null +++ b/ApartmentManager/ApartmentManager/Model/Defect.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Windows.UI.Xaml.Controls; + +namespace ApartmentManager.Model +{ + class Defect + { + public int DefectNumber { get; set; } + public int ApartmentNumber { get; set; } + public string Name { get; set; } + public DateTime DateUploaded { get; set; } + public Image Picture { get; set; } + public Image Picture2 { get; set; } + public Image Picture3 { get; set; } + public string Description { get; set; } + public string Comment { get; set; } + public string Status { get; set; } + + public Defect() { } + + public Defect(int DefectNumber, int ApartmentNumber, string Name, DateTime DateUploaded, Image Picture, Image Picture2, Image Picture3, string Description, string Comment, string Status) + { + this.DefectNumber = DefectNumber; + this.ApartmentNumber = ApartmentNumber; + this.Name = Name; + this.DateUploaded = DateUploaded; + this.Picture = Picture; + this.Picture2 = Picture2; + this.Picture3 = Picture3; + this.Description = Description; + this.Comment = Comment; + this.Status = Status; + } + public override string ToString() + { + return string.Format($"Defect Number: {DefectNumber}, Apartment Number: {ApartmentNumber}, Name: {Name}, Date Uploaded {DateUploaded}, {Picture}, {Picture2}, {Picture3}, Description: {Description}, Comment: {Comment}, Status: {Status}"); + } + } +} diff --git a/ApartmentManager/ApartmentManager/View/BoardMembersDefectsPage.xaml b/ApartmentManager/ApartmentManager/View/BoardMembersDefectsPage.xaml new file mode 100644 index 0000000..58b0f3d --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/BoardMembersDefectsPage.xaml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/ApartmentManager/ApartmentManager/View/BoardMembersDefectsPage.xaml.cs b/ApartmentManager/ApartmentManager/View/BoardMembersDefectsPage.xaml.cs new file mode 100644 index 0000000..d910d39 --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/BoardMembersDefectsPage.xaml.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.Foundation; +using Windows.Foundation.Collections; +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Controls.Primitives; +using Windows.UI.Xaml.Data; +using Windows.UI.Xaml.Input; +using Windows.UI.Xaml.Media; +using Windows.UI.Xaml.Navigation; + +// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238 + +namespace ApartmentManager.View +{ + /// + /// An empty page that can be used on its own or navigated to within a Frame. + /// + public sealed partial class BoardMembersDefectsPage : Page + { + public BoardMembersDefectsPage() + { + this.InitializeComponent(); + } + + private void PicturesDefects(object sender, RoutedEventArgs e) + { + this.Frame.Navigate(typeof(DefectsPicturesBoard)); + } + } +} diff --git a/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml b/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml new file mode 100644 index 0000000..9acc60e --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + diff --git a/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml.cs b/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml.cs new file mode 100644 index 0000000..2ac43c8 --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.Foundation; +using Windows.Foundation.Collections; +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Controls.Primitives; +using Windows.UI.Xaml.Data; +using Windows.UI.Xaml.Input; +using Windows.UI.Xaml.Media; +using Windows.UI.Xaml.Navigation; + +// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238 + +namespace ApartmentManager.View +{ + /// + /// An empty page that can be used on its own or navigated to within a Frame. + /// + public sealed partial class BoardMembersPage : Page + { + public BoardMembersPage() + { + this.InitializeComponent(); + } + + private void ButtonBase_OnClick(object sender, RoutedEventArgs e) + { + Frame.Navigate(typeof(BoardMembersDefectsPage)); + } + + private void Apartment(object sender, RoutedEventArgs e) + { + this.Frame.Navigate(typeof(InfoForBoardMembers)); + } + } +} diff --git a/ApartmentManager/ApartmentManager/View/DefectsPicturesBoard.xaml b/ApartmentManager/ApartmentManager/View/DefectsPicturesBoard.xaml new file mode 100644 index 0000000..6c038c7 --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/DefectsPicturesBoard.xaml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + diff --git a/ApartmentManager/ApartmentManager/View/DefectsPicturesBoard.xaml.cs b/ApartmentManager/ApartmentManager/View/DefectsPicturesBoard.xaml.cs new file mode 100644 index 0000000..de9332c --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/DefectsPicturesBoard.xaml.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.Foundation; +using Windows.Foundation.Collections; +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Controls.Primitives; +using Windows.UI.Xaml.Data; +using Windows.UI.Xaml.Input; +using Windows.UI.Xaml.Media; +using Windows.UI.Xaml.Navigation; + +// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238 + +namespace ApartmentManager.View +{ + /// + /// An empty page that can be used on its own or navigated to within a Frame. + /// + public sealed partial class DefectsPicturesBoard : Page + { + public DefectsPicturesBoard() + { + this.InitializeComponent(); + } + } +} diff --git a/ApartmentManager/ApartmentManager/View/InfoForBoardMembers.xaml b/ApartmentManager/ApartmentManager/View/InfoForBoardMembers.xaml new file mode 100644 index 0000000..6ff3559 --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/InfoForBoardMembers.xaml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +