From 5253f6d0306d08ad171baf2f47ec5f1819a4518a Mon Sep 17 00:00:00 2001 From: Mifd39 Date: Tue, 9 May 2017 11:49:25 +0200 Subject: Add files via upload use cases --- Use casesodt.odt | Bin 0 -> 6884 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Use casesodt.odt diff --git a/Use casesodt.odt b/Use casesodt.odt new file mode 100644 index 0000000..5085eae Binary files /dev/null and b/Use casesodt.odt differ -- cgit v1.2.3 From eb423d5217c58b52ab24f402361281a35565c093 Mon Sep 17 00:00:00 2001 From: pekopa Date: Tue, 9 May 2017 12:58:55 +0200 Subject: Risks list and other product requirements added 2 new pages added. Use cases are needed for further advancement --- Apartment administration.pptx | Bin 0 -> 150549 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Apartment administration.pptx diff --git a/Apartment administration.pptx b/Apartment administration.pptx new file mode 100644 index 0000000..9433583 Binary files /dev/null and b/Apartment administration.pptx differ -- cgit v1.2.3 From 0f4abab2920e6920d4436db9cdb99258ee13004d Mon Sep 17 00:00:00 2001 From: pekopa Date: Tue, 9 May 2017 13:00:53 +0200 Subject: Donatas is fgt --- ApartmentAdmin.odt | Bin 25200 -> 27672 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ApartmentAdmin.odt b/ApartmentAdmin.odt index 470dcd5..eb289fb 100644 Binary files a/ApartmentAdmin.odt and b/ApartmentAdmin.odt differ -- cgit v1.2.3 From d3a65ef8c1554f7b5304de190a88a7b536851304 Mon Sep 17 00:00:00 2001 From: marcinzelent Date: Tue, 9 May 2017 13:11:47 +0200 Subject: Fixed UserSingleton. --- ApartmentManager/ApartmentManager/AppShell.xaml.cs | 6 +++--- ApartmentManager/ApartmentManager/Handler/LoginHandler.cs | 9 ++------- ApartmentManager/ApartmentManager/Singletons/UserSingleton.cs | 4 ++-- ApartmentManager/ApartmentManager/ViewModel/LoginViewModel.cs | 2 +- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/ApartmentManager/ApartmentManager/AppShell.xaml.cs b/ApartmentManager/ApartmentManager/AppShell.xaml.cs index 9d4abe5..121989c 100644 --- a/ApartmentManager/ApartmentManager/AppShell.xaml.cs +++ b/ApartmentManager/ApartmentManager/AppShell.xaml.cs @@ -102,14 +102,14 @@ namespace ApartmentManager { InitializeComponent(); - if (UserSingleton.CurrentUser.Type == "B") navMenuItems = boardMemberMenuItems; + if (UserSingleton.Instance.CurrentUser.Type == "B") navMenuItems = boardMemberMenuItems; else navMenuItems = normalUserMenuItems; List topNavMenuItems = navMenuItems.GetRange(0, navMenuItems.Count); - // List bottomNavMenuItems = navMenuItems.GetRange(3, 2); + //List bottomNavMenuItems = navMenuItems.GetRange(3, 2); NavMenuList.ItemsSource = topNavMenuItems; - // NavMenuList2.ItemsSource = bottomNavMenuItems; + //NavMenuList2.ItemsSource = bottomNavMenuItems; } public Frame AppFrame { get { return Frame; } } diff --git a/ApartmentManager/ApartmentManager/Handler/LoginHandler.cs b/ApartmentManager/ApartmentManager/Handler/LoginHandler.cs index a91fc2b..4cf5fed 100644 --- a/ApartmentManager/ApartmentManager/Handler/LoginHandler.cs +++ b/ApartmentManager/ApartmentManager/Handler/LoginHandler.cs @@ -2,10 +2,6 @@ using ApartmentManager.Persistency; using Newtonsoft.Json; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace ApartmentManager.Handler { @@ -13,14 +9,13 @@ namespace ApartmentManager.Handler { public static void LogIn(string username, string password) { - string serializedUser = ApiClient.GetData($"api/Users/by-username/{username}"); if (serializedUser != null) { User user = JsonConvert.DeserializeObject(serializedUser); if (user.Password == password) { - UserSingleton.CurrentUser = user; + UserSingleton.Instance.CurrentUser = user; } else throw new Exception("Wrong password!"); } @@ -30,7 +25,7 @@ namespace ApartmentManager.Handler public static void LogOut() { - UserSingleton.CurrentUser = null; + UserSingleton.Instance.CurrentUser = null; } } } diff --git a/ApartmentManager/ApartmentManager/Singletons/UserSingleton.cs b/ApartmentManager/ApartmentManager/Singletons/UserSingleton.cs index aa09cf2..e5ca71e 100644 --- a/ApartmentManager/ApartmentManager/Singletons/UserSingleton.cs +++ b/ApartmentManager/ApartmentManager/Singletons/UserSingleton.cs @@ -6,10 +6,10 @@ using System.Threading.Tasks; namespace ApartmentManager.Model { - class UserSingleton + public class UserSingleton { private static UserSingleton instance; - public static User CurrentUser; + public User CurrentUser { get; set; } private UserSingleton() { } diff --git a/ApartmentManager/ApartmentManager/ViewModel/LoginViewModel.cs b/ApartmentManager/ApartmentManager/ViewModel/LoginViewModel.cs index 0290053..cb8dfbb 100644 --- a/ApartmentManager/ApartmentManager/ViewModel/LoginViewModel.cs +++ b/ApartmentManager/ApartmentManager/ViewModel/LoginViewModel.cs @@ -69,7 +69,7 @@ namespace ApartmentManager.ViewModel { // When the navigation stack isn't restored, navigate to the first page // suppressing the initial entrance animation. - if (UserSingleton.CurrentUser.Type == "B") appShell.AppFrame.Navigate(typeof(BoardMembersPage)); + if (UserSingleton.Instance.CurrentUser.Type == "B") appShell.AppFrame.Navigate(typeof(BoardMembersPage)); else appShell.AppFrame.Navigate(typeof(ApartmentPage)); } -- cgit v1.2.3 From a024229beab6fe9230a964529979e56cbfefdb6c Mon Sep 17 00:00:00 2001 From: marcinzelent Date: Tue, 9 May 2017 13:12:04 +0200 Subject: Added test queries. --- Test queries/deleteapartmentanduser.sql | 2 ++ Test queries/insertapartmentanduser.sql | 2 ++ Test queries/selectapartmentanduser.sql | 1 + Test queries/updateapartmentanduser.sql | 2 ++ 4 files changed, 7 insertions(+) create mode 100644 Test queries/deleteapartmentanduser.sql create mode 100644 Test queries/insertapartmentanduser.sql create mode 100644 Test queries/selectapartmentanduser.sql create mode 100644 Test queries/updateapartmentanduser.sql diff --git a/Test queries/deleteapartmentanduser.sql b/Test queries/deleteapartmentanduser.sql new file mode 100644 index 0000000..754b098 --- /dev/null +++ b/Test queries/deleteapartmentanduser.sql @@ -0,0 +1,2 @@ +DELETE FROM Users WHERE ApartmentNr=3; +DELETE FROM Apartments WHERE ApartmentNumber=3; \ No newline at end of file diff --git a/Test queries/insertapartmentanduser.sql b/Test queries/insertapartmentanduser.sql new file mode 100644 index 0000000..af06738 --- /dev/null +++ b/Test queries/insertapartmentanduser.sql @@ -0,0 +1,2 @@ +INSERT INTO Apartments VALUES(3,30,2,'200Dkk',1,'Adres') +INSERT INTO Users(ApartmentNr,Username,Password,Type,FirstName,LastName,BirthDate,Phone,Email) VALUES(3,'nuser','pass','N','Jan','Kowalski','01/01/1970','34567890','jan@onet.pl') \ No newline at end of file diff --git a/Test queries/selectapartmentanduser.sql b/Test queries/selectapartmentanduser.sql new file mode 100644 index 0000000..a3f7ffd --- /dev/null +++ b/Test queries/selectapartmentanduser.sql @@ -0,0 +1 @@ +SELECT * FROM Apartments LEFT JOIN Users ON Apartments.ApartmentNumber=Users.ApartmentNr WHERE Users.LastName='Kowalski' \ No newline at end of file diff --git a/Test queries/updateapartmentanduser.sql b/Test queries/updateapartmentanduser.sql new file mode 100644 index 0000000..3ab4192 --- /dev/null +++ b/Test queries/updateapartmentanduser.sql @@ -0,0 +1,2 @@ +UPDATE Apartments SET MonthlyCharge='5000' WHERE Size=30 +UPDATE Users SET LastName='Nowak' WHERE ApartmentNr=3; \ No newline at end of file -- cgit v1.2.3 From b5c20c3f4e21a6b3fee32c44da5a5ceac8585e05 Mon Sep 17 00:00:00 2001 From: marcinzelent Date: Tue, 9 May 2017 13:12:21 +0200 Subject: Added domain model. --- Domain Model.vsdx | Bin 0 -> 38859 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Domain Model.vsdx diff --git a/Domain Model.vsdx b/Domain Model.vsdx new file mode 100644 index 0000000..e34c569 Binary files /dev/null and b/Domain Model.vsdx differ -- cgit v1.2.3 From 5d9b9cf430d1636b11b0be4be1dd975cdfe24c1b Mon Sep 17 00:00:00 2001 From: marcinzelent Date: Tue, 9 May 2017 13:15:42 +0200 Subject: Repo clean-up. --- Apartment administration.pptx | Bin 150549 -> 0 bytes ApartmentAdmin.odt | Bin 27672 -> 0 bytes Report.odt | Bin 0 -> 27672 bytes Use cases.odt | Bin 0 -> 6884 bytes Use casesodt.odt | Bin 6884 -> 0 bytes 5 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Apartment administration.pptx delete mode 100644 ApartmentAdmin.odt create mode 100644 Report.odt create mode 100644 Use cases.odt delete mode 100644 Use casesodt.odt diff --git a/Apartment administration.pptx b/Apartment administration.pptx deleted file mode 100644 index 9433583..0000000 Binary files a/Apartment administration.pptx and /dev/null differ diff --git a/ApartmentAdmin.odt b/ApartmentAdmin.odt deleted file mode 100644 index eb289fb..0000000 Binary files a/ApartmentAdmin.odt and /dev/null differ diff --git a/Report.odt b/Report.odt new file mode 100644 index 0000000..eb289fb Binary files /dev/null and b/Report.odt differ diff --git a/Use cases.odt b/Use cases.odt new file mode 100644 index 0000000..5085eae Binary files /dev/null and b/Use cases.odt differ diff --git a/Use casesodt.odt b/Use casesodt.odt deleted file mode 100644 index 5085eae..0000000 Binary files a/Use casesodt.odt and /dev/null differ -- cgit v1.2.3 From b8742ea26e1f72f04c814b26b0b5eefc2cd73e0a Mon Sep 17 00:00:00 2001 From: marcinzelent Date: Tue, 9 May 2017 13:26:29 +0200 Subject: Created Use Case Diagram. --- Use Case Diagram.vsdx | Bin 0 -> 26390 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Use Case Diagram.vsdx diff --git a/Use Case Diagram.vsdx b/Use Case Diagram.vsdx new file mode 100644 index 0000000..4eea820 Binary files /dev/null and b/Use Case Diagram.vsdx differ -- cgit v1.2.3 From 3c0c7f27cdd1965f206948b6d5006aff7218b09e Mon Sep 17 00:00:00 2001 From: marcinzelent Date: Tue, 9 May 2017 13:53:39 +0200 Subject: Added A/R/E apartment SSD, moved the diagrams to designated directory. --- Diagrams/Add-remove-edit apartment SSD.vsdx | Bin 0 -> 46561 bytes Diagrams/Domain Model.vsdx | Bin 0 -> 38859 bytes Diagrams/Use Case Diagram.vsdx | Bin 0 -> 26390 bytes Domain Model.vsdx | Bin 38859 -> 0 bytes Use Case Diagram.vsdx | Bin 26390 -> 0 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Diagrams/Add-remove-edit apartment SSD.vsdx create mode 100644 Diagrams/Domain Model.vsdx create mode 100644 Diagrams/Use Case Diagram.vsdx delete mode 100644 Domain Model.vsdx delete mode 100644 Use Case Diagram.vsdx diff --git a/Diagrams/Add-remove-edit apartment SSD.vsdx b/Diagrams/Add-remove-edit apartment SSD.vsdx new file mode 100644 index 0000000..3e56ca2 Binary files /dev/null and b/Diagrams/Add-remove-edit apartment SSD.vsdx differ diff --git a/Diagrams/Domain Model.vsdx b/Diagrams/Domain Model.vsdx new file mode 100644 index 0000000..e34c569 Binary files /dev/null and b/Diagrams/Domain Model.vsdx differ diff --git a/Diagrams/Use Case Diagram.vsdx b/Diagrams/Use Case Diagram.vsdx new file mode 100644 index 0000000..4eea820 Binary files /dev/null and b/Diagrams/Use Case Diagram.vsdx differ diff --git a/Domain Model.vsdx b/Domain Model.vsdx deleted file mode 100644 index e34c569..0000000 Binary files a/Domain Model.vsdx and /dev/null differ diff --git a/Use Case Diagram.vsdx b/Use Case Diagram.vsdx deleted file mode 100644 index 4eea820..0000000 Binary files a/Use Case Diagram.vsdx and /dev/null differ -- cgit v1.2.3 From e720bee61ae7a045606ecea09f421dfdf5ef371a Mon Sep 17 00:00:00 2001 From: marcinzelent Date: Tue, 9 May 2017 14:02:08 +0200 Subject: Added more SSDs. --- Diagrams/Add-remove-edit apartment SSD.vsdx | Bin 46561 -> 46730 bytes Diagrams/Add-remove-edit resident SSD.vsdx | Bin 0 -> 46594 bytes Diagrams/Add-remove-edit user SSD.vsdx | Bin 0 -> 46514 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Diagrams/Add-remove-edit resident SSD.vsdx create mode 100644 Diagrams/Add-remove-edit user SSD.vsdx diff --git a/Diagrams/Add-remove-edit apartment SSD.vsdx b/Diagrams/Add-remove-edit apartment SSD.vsdx index 3e56ca2..dc9670c 100644 Binary files a/Diagrams/Add-remove-edit apartment SSD.vsdx and b/Diagrams/Add-remove-edit apartment SSD.vsdx differ diff --git a/Diagrams/Add-remove-edit resident SSD.vsdx b/Diagrams/Add-remove-edit resident SSD.vsdx new file mode 100644 index 0000000..d412812 Binary files /dev/null and b/Diagrams/Add-remove-edit resident SSD.vsdx differ diff --git a/Diagrams/Add-remove-edit user SSD.vsdx b/Diagrams/Add-remove-edit user SSD.vsdx new file mode 100644 index 0000000..3d9ed00 Binary files /dev/null and b/Diagrams/Add-remove-edit user SSD.vsdx differ -- cgit v1.2.3 From ec53cb8b9428065ed2fed713daedf2ee28b651e7 Mon Sep 17 00:00:00 2001 From: Paulius Klezys Date: Wed, 10 May 2017 09:22:36 +0200 Subject: Improvements --- .../ApartmentManager/ApartmentManager.csproj | 1 + .../Handler/BoardResidentsHandler.cs | 133 +++++++++++++++++++++ .../View/BoardMemberManageApartment.xaml | 38 ++++-- .../View/BoardMemberManageApartment.xaml.cs | 5 + .../ApartmentManager/View/BoardMembersPage.xaml | 24 ++-- .../ApartmentManager/View/BoardMembersPage.xaml.cs | 10 +- .../ApartmentManager/View/InfoForBoardMembers.xaml | 2 +- .../HousingWebAPI/ApartmentResident.cs | 37 ++++++ .../Controllers/ApartmentResidentsController.cs | 133 +++++++++++++++++++++ .../HousingWebAPI/Models/ApartmentResident.cs | 37 ++++++ .../HousingWebAPI/Models/ListApartmentResidents.cs | 42 +++++++ .../Models/database_firewall_rules.cs | 38 ++++++ ApartmentManager/HousingWebAPI/ViewContext.cs | 41 +++++++ .../HousingWebAPI/database_firewall_rules.cs | 38 ++++++ .../HousingWebApi/HousingWebAPI.csproj | 7 ++ ApartmentManager/HousingWebApi/Web.config | 7 +- 16 files changed, 561 insertions(+), 32 deletions(-) create mode 100644 ApartmentManager/ApartmentManager/Handler/BoardResidentsHandler.cs create mode 100644 ApartmentManager/HousingWebAPI/ApartmentResident.cs create mode 100644 ApartmentManager/HousingWebAPI/Controllers/ApartmentResidentsController.cs create mode 100644 ApartmentManager/HousingWebAPI/Models/ApartmentResident.cs create mode 100644 ApartmentManager/HousingWebAPI/Models/ListApartmentResidents.cs create mode 100644 ApartmentManager/HousingWebAPI/Models/database_firewall_rules.cs create mode 100644 ApartmentManager/HousingWebAPI/ViewContext.cs create mode 100644 ApartmentManager/HousingWebAPI/database_firewall_rules.cs diff --git a/ApartmentManager/ApartmentManager/ApartmentManager.csproj b/ApartmentManager/ApartmentManager/ApartmentManager.csproj index 0bf5485..de07d8e 100644 --- a/ApartmentManager/ApartmentManager/ApartmentManager.csproj +++ b/ApartmentManager/ApartmentManager/ApartmentManager.csproj @@ -101,6 +101,7 @@ + diff --git a/ApartmentManager/ApartmentManager/Handler/BoardResidentsHandler.cs b/ApartmentManager/ApartmentManager/Handler/BoardResidentsHandler.cs new file mode 100644 index 0000000..d33d3a3 --- /dev/null +++ b/ApartmentManager/ApartmentManager/Handler/BoardResidentsHandler.cs @@ -0,0 +1,133 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Windows.UI.Popups; +using ApartmentManager.Model; +using ApartmentManager.Persistency; +using ApartmentManager.ViewModel; +using Newtonsoft.Json; + +namespace ApartmentManager.Handler +{ + class BoardResidentsHandler + { + public ApartmentsViewModel ApartmentsViewModel { get; set; } + + public BoardResidentsHandler(ApartmentsViewModel apartmentsViewModel) + { + ApartmentsViewModel = apartmentsViewModel; + } + public void GetApartmentsResidents() + { + Resident resident = new Resident(); + resident.ApartmentNr = ApartmentsViewModel.ApartmentsNumber; + + var residentsFromDatabase = ApiClient.GetData("api/ApartmentResidents/" + resident.ApartmentNr); + IEnumerable residentlist = JsonConvert.DeserializeObject>(residentsFromDatabase); + + ApartmentsViewModel.ApartmentsCatalogSingleton.Residents.Clear(); + ApartmentsViewModel.NewResident = new Resident(); + foreach (var resident2 in residentlist) + { + ApartmentsViewModel.ApartmentsCatalogSingleton.Residents.Add(resident2); + } + + } + + public void CreateResident() + { + try + { + Resident resident = new Resident(); + + resident.ApartmentNr = ApartmentsViewModel.ApartmentsNumber; + resident.FirstName = ApartmentsViewModel.NewResident.FirstName; + resident.LastName = ApartmentsViewModel.NewResident.LastName; + resident.BirthDate = ApartmentsViewModel.NewResident.BirthDate; + resident.Email = ApartmentsViewModel.NewResident.Email; + resident.Picture = ApartmentsViewModel.NewResident.Picture; + resident.Phone = ApartmentsViewModel.NewResident.Phone; + + ApiClient.PostData("api/residents/", resident); + + var residentsFromDatabase = ApiClient.GetData("api/ApartmentResidents/" + resident.ApartmentNr); + IEnumerable residentlist = JsonConvert.DeserializeObject>(residentsFromDatabase); + + ApartmentsViewModel.ApartmentsCatalogSingleton.Residents.Clear(); + ApartmentsViewModel.NewResident = new Resident(); + foreach (var resident2 in residentlist) + { + ApartmentsViewModel.ApartmentsCatalogSingleton.Residents.Add(resident2); + } + } + catch (Exception e) + { + new MessageDialog(e.Message).ShowAsync(); + } + } + + public void DeleteResident() + { + try + { + Resident resident = new Resident(); + resident.ResidentNr = ApartmentsViewModel.NewResident.ResidentNr; + resident.ApartmentNr = ApartmentsViewModel.ApartmentsNumber; + resident.FirstName = ApartmentsViewModel.NewResident.FirstName; + resident.LastName = ApartmentsViewModel.NewResident.LastName; + resident.BirthDate = ApartmentsViewModel.NewResident.BirthDate; + resident.Email = ApartmentsViewModel.NewResident.Email; + resident.Picture = ApartmentsViewModel.NewResident.Picture; + resident.Phone = ApartmentsViewModel.NewResident.Phone; + + ApiClient.DeleteData("api/residents/" + resident.ResidentNr); + + var residentsFromDatabase = ApiClient.GetData("api/ApartmentResidents/" + resident.ApartmentNr); + IEnumerable residentlist = JsonConvert.DeserializeObject>(residentsFromDatabase); + + ApartmentsViewModel.ApartmentsCatalogSingleton.Residents.Clear(); + ApartmentsViewModel.NewResident = new Resident(); + foreach (var resident2 in residentlist) + { + ApartmentsViewModel.ApartmentsCatalogSingleton.Residents.Add(resident2); + } + } + catch (Exception e) + { + new MessageDialog(e.Message).ShowAsync(); + } + } + public void UpdateResident() + { + try + { + Resident resident = new Resident(); + resident.ResidentNr = ApartmentsViewModel.NewResident.ResidentNr; + resident.ApartmentNr = ApartmentsViewModel.ApartmentsNumber; + resident.FirstName = ApartmentsViewModel.NewResident.FirstName; + resident.LastName = ApartmentsViewModel.NewResident.LastName; + resident.BirthDate = ApartmentsViewModel.NewResident.BirthDate; + resident.Email = ApartmentsViewModel.NewResident.Email; + resident.Picture = ApartmentsViewModel.NewResident.Picture; + resident.Phone = ApartmentsViewModel.NewResident.Phone; + + ApiClient.PutData("api/residents/" + resident.ResidentNr, resident); + var residentsFromDatabase = ApiClient.GetData("api/ApartmentResidents/" + resident.ApartmentNr); + IEnumerable residentlist = JsonConvert.DeserializeObject>(residentsFromDatabase); + + ApartmentsViewModel.ApartmentsCatalogSingleton.Residents.Clear(); + ApartmentsViewModel.NewResident = new Resident(); + foreach (var resident2 in residentlist) + { + ApartmentsViewModel.ApartmentsCatalogSingleton.Residents.Add(resident2); + } + } + catch (Exception e) + { + new MessageDialog(e.Message).ShowAsync(); + } + } + } +} \ No newline at end of file diff --git a/ApartmentManager/ApartmentManager/View/BoardMemberManageApartment.xaml b/ApartmentManager/ApartmentManager/View/BoardMemberManageApartment.xaml index 5deab23..ce8577b 100644 --- a/ApartmentManager/ApartmentManager/View/BoardMemberManageApartment.xaml +++ b/ApartmentManager/ApartmentManager/View/BoardMemberManageApartment.xaml @@ -16,16 +16,36 @@ - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/ApartmentManager/ApartmentManager/View/BoardMemberManageApartment.xaml.cs b/ApartmentManager/ApartmentManager/View/BoardMemberManageApartment.xaml.cs index c291b8b..fe460a4 100644 --- a/ApartmentManager/ApartmentManager/View/BoardMemberManageApartment.xaml.cs +++ b/ApartmentManager/ApartmentManager/View/BoardMemberManageApartment.xaml.cs @@ -26,5 +26,10 @@ namespace ApartmentManager.View { this.InitializeComponent(); } + + private void ButtonBase_OnClick(object sender, RoutedEventArgs e) + { + this.Frame.Navigate(typeof(InfoForBoardMembers)); + } } } diff --git a/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml b/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml index b606754..8c72de5 100644 --- a/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml +++ b/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml @@ -13,23 +13,17 @@ - - - - - - - - diff --git a/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml.cs b/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml.cs index b7eb548..dbf2f45 100644 --- a/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml.cs +++ b/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml.cs @@ -27,19 +27,19 @@ namespace ApartmentManager.View this.InitializeComponent(); } - private void Defect(object sender, RoutedEventArgs e) + private void Defects(object sender, RoutedEventArgs e) { Frame.Navigate(typeof(BoardMembersDefectsPage)); } - private void Apartment(object sender, RoutedEventArgs e) + private void Apartments(object sender, RoutedEventArgs e) { - this.Frame.Navigate(typeof(InfoForBoardMembers)); + this.Frame.Navigate(typeof(BoardMemberManageApartment)); } - private void ApartmentManage(object sender, RoutedEventArgs e) + private void Residents(object sender, RoutedEventArgs e) { - this.Frame.Navigate(typeof(BoardMemberManageApartment)); + this.Frame.Navigate(typeof(ApartmentResidentsPage)); } } } diff --git a/ApartmentManager/ApartmentManager/View/InfoForBoardMembers.xaml b/ApartmentManager/ApartmentManager/View/InfoForBoardMembers.xaml index 6ff3559..69d5930 100644 --- a/ApartmentManager/ApartmentManager/View/InfoForBoardMembers.xaml +++ b/ApartmentManager/ApartmentManager/View/InfoForBoardMembers.xaml @@ -17,7 +17,7 @@ - + diff --git a/ApartmentManager/HousingWebAPI/ApartmentResident.cs b/ApartmentManager/HousingWebAPI/ApartmentResident.cs new file mode 100644 index 0000000..092c95f --- /dev/null +++ b/ApartmentManager/HousingWebAPI/ApartmentResident.cs @@ -0,0 +1,37 @@ +namespace HousingWebApi +{ + using System; + using System.Collections.Generic; + using System.ComponentModel.DataAnnotations; + using System.ComponentModel.DataAnnotations.Schema; + using System.Data.Entity.Spatial; + + public partial class ApartmentResident + { + [Key] + [Column(Order = 0)] + [DatabaseGenerated(DatabaseGeneratedOption.None)] + public int ApartmentNumber { get; set; } + + [Key] + [Column(Order = 1)] + [StringLength(20)] + public string FirstName { get; set; } + + [Key] + [Column(Order = 2)] + [StringLength(20)] + public string LastName { get; set; } + + [Column(TypeName = "date")] + public DateTime? BirthDate { get; set; } + + public int? PhoneNo { get; set; } + + [StringLength(30)] + public string Email { get; set; } + + [Column(TypeName = "image")] + public byte[] Picture { get; set; } + } +} diff --git a/ApartmentManager/HousingWebAPI/Controllers/ApartmentResidentsController.cs b/ApartmentManager/HousingWebAPI/Controllers/ApartmentResidentsController.cs new file mode 100644 index 0000000..4b5c82a --- /dev/null +++ b/ApartmentManager/HousingWebAPI/Controllers/ApartmentResidentsController.cs @@ -0,0 +1,133 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.Entity; +using System.Data.Entity.Infrastructure; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Web.Http; +using System.Web.Http.Description; +using HousingWebApi; + +namespace HousingWebApi.Controllers +{ + public class ApartmentResidentsController : ApiController + { + private ViewContext db = new ViewContext(); + + // GET: api/ApartmentResidents + public IQueryable GetApartmentResidents() + { + return db.ApartmentResidents; + } + + // GET: api/ApartmentResidents/5 + [ResponseType(typeof(ApartmentResident))] + public IHttpActionResult GetApartmentResident(int id) + { + ApartmentResident apartmentResident = db.ApartmentResidents.Find(id); + if (apartmentResident == null) + { + return NotFound(); + } + + return Ok(apartmentResident); + } + + // PUT: api/ApartmentResidents/5 + [ResponseType(typeof(void))] + public IHttpActionResult PutApartmentResident(int id, ApartmentResident apartmentResident) + { + if (!ModelState.IsValid) + { + return BadRequest(ModelState); + } + + if (id != apartmentResident.ApartmentNumber) + { + return BadRequest(); + } + + db.Entry(apartmentResident).State = EntityState.Modified; + + try + { + db.SaveChanges(); + } + catch (DbUpdateConcurrencyException) + { + if (!ApartmentResidentExists(id)) + { + return NotFound(); + } + else + { + throw; + } + } + + return StatusCode(HttpStatusCode.NoContent); + } + + // POST: api/ApartmentResidents + [ResponseType(typeof(ApartmentResident))] + public IHttpActionResult PostApartmentResident(ApartmentResident apartmentResident) + { + if (!ModelState.IsValid) + { + return BadRequest(ModelState); + } + + db.ApartmentResidents.Add(apartmentResident); + + try + { + db.SaveChanges(); + } + catch (DbUpdateException) + { + if (ApartmentResidentExists(apartmentResident.ApartmentNumber)) + { + return Conflict(); + } + else + { + throw; + } + } + + return CreatedAtRoute("DefaultApi", new { id = apartmentResident.ApartmentNumber }, apartmentResident); + } + + // DELETE: api/ApartmentResidents/5 + [ResponseType(typeof(ApartmentResident))] + public IHttpActionResult DeleteApartmentResident(int id) + { + ApartmentResident apartmentResident = db.ApartmentResidents.Find(id); + if (apartmentResident == null) + { + return NotFound(); + } + + db.ApartmentResidents.Remove(apartmentResident); + db.SaveChanges(); + + return Ok(apartmentResident); + } + + protected override void Dispose(bool disposing) + { + if (disposing) + { + db.Dispose(); + } + base.Dispose(disposing); + } + + private bool ApartmentResidentExists(int id) + { + return db.ApartmentResidents.Count(e => e.ApartmentNumber == id) > 0; + } + } +} \ No newline at end of file diff --git a/ApartmentManager/HousingWebAPI/Models/ApartmentResident.cs b/ApartmentManager/HousingWebAPI/Models/ApartmentResident.cs new file mode 100644 index 0000000..f54e72b --- /dev/null +++ b/ApartmentManager/HousingWebAPI/Models/ApartmentResident.cs @@ -0,0 +1,37 @@ +namespace HousingWebApi.Models +{ + using System; + using System.Collections.Generic; + using System.ComponentModel.DataAnnotations; + using System.ComponentModel.DataAnnotations.Schema; + using System.Data.Entity.Spatial; + + public partial class ApartmentResident + { + [Key] + [Column(Order = 0)] + [DatabaseGenerated(DatabaseGeneratedOption.None)] + public int ApartmentNumber { get; set; } + + [Key] + [Column(Order = 1)] + [StringLength(20)] + public string FirstName { get; set; } + + [Key] + [Column(Order = 2)] + [StringLength(20)] + public string LastName { get; set; } + + [Column(TypeName = "date")] + public DateTime? BirthDate { get; set; } + + public int? PhoneNo { get; set; } + + [StringLength(30)] + public string Email { get; set; } + + [Column(TypeName = "image")] + public byte[] Picture { get; set; } + } +} diff --git a/ApartmentManager/HousingWebAPI/Models/ListApartmentResidents.cs b/ApartmentManager/HousingWebAPI/Models/ListApartmentResidents.cs new file mode 100644 index 0000000..5d5bffd --- /dev/null +++ b/ApartmentManager/HousingWebAPI/Models/ListApartmentResidents.cs @@ -0,0 +1,42 @@ +namespace HousingWebApi.Models +{ + using System; + using System.Data.Entity; + using System.ComponentModel.DataAnnotations.Schema; + using System.Linq; + + public partial class ListApartmentResidents : DbContext + { + public ListApartmentResidents() + : base("name=ListApartmentResidents") + { + base.Configuration.ProxyCreationEnabled = false; + } + + public virtual DbSet ApartmentResidents { get; set; } + public virtual DbSet database_firewall_rules { get; set; } + + protected override void OnModelCreating(DbModelBuilder modelBuilder) + { + modelBuilder.Entity() + .Property(e => e.FirstName) + .IsUnicode(false); + + modelBuilder.Entity() + .Property(e => e.LastName) + .IsUnicode(false); + + modelBuilder.Entity() + .Property(e => e.Email) + .IsUnicode(false); + + modelBuilder.Entity() + .Property(e => e.start_ip_address) + .IsUnicode(false); + + modelBuilder.Entity() + .Property(e => e.end_ip_address) + .IsUnicode(false); + } + } +} diff --git a/ApartmentManager/HousingWebAPI/Models/database_firewall_rules.cs b/ApartmentManager/HousingWebAPI/Models/database_firewall_rules.cs new file mode 100644 index 0000000..4ea6055 --- /dev/null +++ b/ApartmentManager/HousingWebAPI/Models/database_firewall_rules.cs @@ -0,0 +1,38 @@ +namespace HousingWebApi.Models +{ + using System; + using System.Collections.Generic; + using System.ComponentModel.DataAnnotations; + using System.ComponentModel.DataAnnotations.Schema; + using System.Data.Entity.Spatial; + + [Table("sys.database_firewall_rules")] + public partial class database_firewall_rules + { + [Key] + [Column(Order = 0)] + public int id { get; set; } + + [Key] + [Column(Order = 1)] + public string name { get; set; } + + [Key] + [Column(Order = 2)] + [StringLength(45)] + public string start_ip_address { get; set; } + + [Key] + [Column(Order = 3)] + [StringLength(45)] + public string end_ip_address { get; set; } + + [Key] + [Column(Order = 4)] + public DateTime create_date { get; set; } + + [Key] + [Column(Order = 5)] + public DateTime modify_date { get; set; } + } +} diff --git a/ApartmentManager/HousingWebAPI/ViewContext.cs b/ApartmentManager/HousingWebAPI/ViewContext.cs new file mode 100644 index 0000000..9b50fc3 --- /dev/null +++ b/ApartmentManager/HousingWebAPI/ViewContext.cs @@ -0,0 +1,41 @@ +namespace HousingWebApi +{ + using System; + using System.Data.Entity; + using System.ComponentModel.DataAnnotations.Schema; + using System.Linq; + + public partial class ViewContext : DbContext + { + public ViewContext() + : base("name=ViewContext") + { + } + + public virtual DbSet ApartmentResidents { get; set; } + public virtual DbSet database_firewall_rules { get; set; } + + protected override void OnModelCreating(DbModelBuilder modelBuilder) + { + modelBuilder.Entity() + .Property(e => e.FirstName) + .IsUnicode(false); + + modelBuilder.Entity() + .Property(e => e.LastName) + .IsUnicode(false); + + modelBuilder.Entity() + .Property(e => e.Email) + .IsUnicode(false); + + modelBuilder.Entity() + .Property(e => e.start_ip_address) + .IsUnicode(false); + + modelBuilder.Entity() + .Property(e => e.end_ip_address) + .IsUnicode(false); + } + } +} diff --git a/ApartmentManager/HousingWebAPI/database_firewall_rules.cs b/ApartmentManager/HousingWebAPI/database_firewall_rules.cs new file mode 100644 index 0000000..3b5d6a5 --- /dev/null +++ b/ApartmentManager/HousingWebAPI/database_firewall_rules.cs @@ -0,0 +1,38 @@ +namespace HousingWebApi +{ + using System; + using System.Collections.Generic; + using System.ComponentModel.DataAnnotations; + using System.ComponentModel.DataAnnotations.Schema; + using System.Data.Entity.Spatial; + + [Table("sys.database_firewall_rules")] + public partial class database_firewall_rules + { + [Key] + [Column(Order = 0)] + public int id { get; set; } + + [Key] + [Column(Order = 1)] + public string name { get; set; } + + [Key] + [Column(Order = 2)] + [StringLength(45)] + public string start_ip_address { get; set; } + + [Key] + [Column(Order = 3)] + [StringLength(45)] + public string end_ip_address { get; set; } + + [Key] + [Column(Order = 4)] + public DateTime create_date { get; set; } + + [Key] + [Column(Order = 5)] + public DateTime modify_date { get; set; } + } +} diff --git a/ApartmentManager/HousingWebApi/HousingWebAPI.csproj b/ApartmentManager/HousingWebApi/HousingWebAPI.csproj index 63d4995..da913ec 100644 --- a/ApartmentManager/HousingWebApi/HousingWebAPI.csproj +++ b/ApartmentManager/HousingWebApi/HousingWebAPI.csproj @@ -151,6 +151,9 @@ + + + @@ -191,15 +194,19 @@ + + Global.asax + + diff --git a/ApartmentManager/HousingWebApi/Web.config b/ApartmentManager/HousingWebApi/Web.config index 8ea32e7..cab739c 100644 --- a/ApartmentManager/HousingWebApi/Web.config +++ b/ApartmentManager/HousingWebApi/Web.config @@ -80,6 +80,9 @@ - - + + + + + \ No newline at end of file -- cgit v1.2.3 From 753a8c8685afb04e0289b3b4cfbd628a8cbaa8cb Mon Sep 17 00:00:00 2001 From: Paulius Klezys Date: Wed, 10 May 2017 09:22:42 +0200 Subject: Ayyy lmao --- ApartmentManager/HousingWebApi/HousingWebApi.csproj | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ApartmentManager/HousingWebApi/HousingWebApi.csproj b/ApartmentManager/HousingWebApi/HousingWebApi.csproj index 63d4995..da913ec 100644 --- a/ApartmentManager/HousingWebApi/HousingWebApi.csproj +++ b/ApartmentManager/HousingWebApi/HousingWebApi.csproj @@ -151,6 +151,9 @@ + + + @@ -191,15 +194,19 @@ + + Global.asax + + -- cgit v1.2.3