diff options
11 files changed, 128 insertions, 54 deletions
diff --git a/ApartmentManager/ApartmentManager/ApartmentManager.csproj b/ApartmentManager/ApartmentManager/ApartmentManager.csproj index 24202c3..722865c 100644 --- a/ApartmentManager/ApartmentManager/ApartmentManager.csproj +++ b/ApartmentManager/ApartmentManager/ApartmentManager.csproj @@ -106,7 +106,7 @@ <Compile Include="Model\CatalogSingleton.cs" /> <Compile Include="Model\Resident.cs" /> <Compile Include="Model\User.cs" /> - <Compile Include="Persistency\Persistency.cs" /> + <Compile Include="Persistency\PersistenceFacade.cs" /> <Compile Include="Properties\Annotations.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="ViewModel\ApartmenViewModel.cs" /> @@ -177,6 +177,9 @@ </Page> </ItemGroup> <ItemGroup> + <PackageReference Include="Microsoft.AspNet.WebApi.Client"> + <Version>5.2.3</Version> + </PackageReference> <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform"> <Version>5.3.1</Version> </PackageReference> diff --git a/ApartmentManager/ApartmentManager/Handler/ResidentsHandler.cs b/ApartmentManager/ApartmentManager/Handler/ResidentsHandler.cs index 77136fb..c04007f 100644 --- a/ApartmentManager/ApartmentManager/Handler/ResidentsHandler.cs +++ b/ApartmentManager/ApartmentManager/Handler/ResidentsHandler.cs @@ -5,6 +5,7 @@ using System.Text; using System.Threading.Tasks; using Windows.UI.Popups; using ApartmentManager.Model; +using ApartmentManager.Persistency; using ApartmentManager.ViewModel; namespace ApartmentManager.Handler @@ -17,32 +18,45 @@ namespace ApartmentManager.Handler { ApartmentViewModel = apartmenViewModel; } + public void GetApartmentResidents() + { + Resident resident = new Resident(); + resident.ApartmentNr = ApartmentViewModel.ApartmentNumber; + var residentlist = new PersistenceFacade().GetApartmentResidents(resident); + ApartmentViewModel.CatalogSingleton.Residents.Clear(); + + foreach (var resident2 in residentlist) + { + ApartmentViewModel.CatalogSingleton.Residents.Add(resident2); + } + } public void CreateResident() { try { Resident resident = new Resident(); + resident.ResidentNr = ApartmentViewModel.CatalogSingleton.Residents.Count; + resident.ResidentNr++; resident.ApartmentNr = ApartmentViewModel.ApartmentNumber; - resident.Name = ApartmentViewModel.NewResident.Name; + resident.FirstName = ApartmentViewModel.NewResident.FirstName; resident.LastName = ApartmentViewModel.NewResident.LastName; resident.BirthDate = ApartmentViewModel.NewResident.BirthDate; resident.Email = ApartmentViewModel.NewResident.Email; resident.Picture = ApartmentViewModel.NewResident.Picture; resident.Phone = ApartmentViewModel.NewResident.Phone; - //new PersistenceFacade().CreateHotel(hotel); + new PersistenceFacade().CreateResident(resident); - ////HotelViewModel.Hotels.Hotels.Add(hotel); - //var hotelsFromDatabase = new PersistenceFacade().GetHotels(); + + var residentsFromDatabase = new PersistenceFacade().GetApartmentResidents(resident); + ApartmentViewModel.CatalogSingleton.Residents.Clear(); - //HotelViewModel.HotelCatalogSingleton.Hotels.Clear(); - //foreach (var hotel1 in hotelsFromDatabase) - //{ - // ApartmentViewModel.HotelCatalogSingleton.Hotels.Add(hotel1); - - //} + foreach (var resident2 in residentsFromDatabase) + { + ApartmentViewModel.CatalogSingleton.Residents.Add(resident2); + } } catch (Exception e) { @@ -56,7 +70,7 @@ namespace ApartmentManager.Handler { Resident resident = new Resident(); resident.ApartmentNr = ApartmentViewModel.ApartmentNumber; - resident.Name = ApartmentViewModel.NewResident.Name; + resident.FirstName = ApartmentViewModel.NewResident.FirstName; resident.LastName = ApartmentViewModel.NewResident.LastName; resident.BirthDate = ApartmentViewModel.NewResident.BirthDate; resident.Email = ApartmentViewModel.NewResident.Email; @@ -86,7 +100,7 @@ namespace ApartmentManager.Handler { Resident resident = new Resident(); resident.ApartmentNr = ApartmentViewModel.ApartmentNumber; - resident.Name = ApartmentViewModel.NewResident.Name; + resident.FirstName = ApartmentViewModel.NewResident.FirstName; resident.LastName = ApartmentViewModel.NewResident.LastName; resident.BirthDate = ApartmentViewModel.NewResident.BirthDate; resident.Email = ApartmentViewModel.NewResident.Email; @@ -109,21 +123,6 @@ namespace ApartmentManager.Handler { new MessageDialog(e.Message).ShowAsync(); } - } - public void GetApartmentResidents() - { - //Resident resident = new Resident(); - //resident.ApartmentNr = ApartmentViewModel.ApartmentNumber; - - - //var roomslist = new PersistenceFacade().GetHotelRooms(roomNumber); - //HotelViewModel.RoomsCatalogSingleton.Rooms.Clear(); - //foreach (var room in roomslist) - //{ - // HotelViewModel.RoomsCatalogSingleton.Rooms.Add(room); - //} - } - - + } } } diff --git a/ApartmentManager/ApartmentManager/Model/CatalogSingleton.cs b/ApartmentManager/ApartmentManager/Model/CatalogSingleton.cs index 249a78f..346d652 100644 --- a/ApartmentManager/ApartmentManager/Model/CatalogSingleton.cs +++ b/ApartmentManager/ApartmentManager/Model/CatalogSingleton.cs @@ -23,10 +23,7 @@ namespace ApartmentManager.Model Apartment = new ObservableCollection<Apartment>(); Apartment.Add(new Apartment(1,"30 Square meters",2,"200",0,"adresas")); Residents = new ObservableCollection<Resident>(); - Residents.Add(new Resident("Bibis", "Kiausiai", 3214568, new DateTime(2017, 1, 5, 0, 0, 0), "Bibis@mail.com", 1,1)); - Residents.Add(new Resident("Bibis", "Kiausiai", 3214568, new DateTime(2017, 1, 5, 0, 0, 0), "Bibis@mail.com", 1,1)); - Residents.Add(new Resident("Bibis", "Kiausiai", 3214568, new DateTime(2017, 1, 5, 0, 0, 0), "Bibis@mail.com", 1,1)); - Residents.Add(new Resident("Bibis", "Kiausiai", 3214568, new DateTime(2017, 1, 5, 0, 0, 0), "Bibis@mail.com", 1,1)); + } } } diff --git a/ApartmentManager/ApartmentManager/Model/Resident.cs b/ApartmentManager/ApartmentManager/Model/Resident.cs index 5e859e6..f9cede7 100644 --- a/ApartmentManager/ApartmentManager/Model/Resident.cs +++ b/ApartmentManager/ApartmentManager/Model/Resident.cs @@ -9,7 +9,7 @@ namespace ApartmentManager.Model { public class Resident { - public string Name { get; set; } + public string FirstName { get; set; } public string LastName { get; set; } public int Phone { get; set; } public DateTime BirthDate { get; set; } @@ -19,9 +19,9 @@ namespace ApartmentManager.Model public int ResidentNr { get; set; } public Resident() { } - public Resident(string Name, string LastName, int Phone, DateTime BirthDate, string Email, int ApartmentNr, int ResidentNr) + public Resident(string FirstName, string LastName, int Phone, DateTime BirthDate, string Email, int ApartmentNr, int ResidentNr) { - this.Name = Name; + this.FirstName = FirstName; this.LastName = LastName; this.Phone = Phone; this.BirthDate = BirthDate; @@ -31,7 +31,7 @@ namespace ApartmentManager.Model } public override string ToString() { - return string.Format($"Name: {Name}, LastName: {LastName}, Birth Date: {BirthDate}, Phone {Phone}, Email {Email} "); + return string.Format($"Name: {FirstName}, LastName: {LastName}, Birth Date: {BirthDate}, Phone {Phone}, Email {Email} "); } } } diff --git a/ApartmentManager/ApartmentManager/Persistency/PersistenceFacade.cs b/ApartmentManager/ApartmentManager/Persistency/PersistenceFacade.cs new file mode 100644 index 0000000..882fd3a --- /dev/null +++ b/ApartmentManager/ApartmentManager/Persistency/PersistenceFacade.cs @@ -0,0 +1,86 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net.Http; +using System.Net.Http.Headers; +using System.Text; +using System.Threading.Tasks; +using Windows.UI.Popups; +using ApartmentManager.Model; +using Newtonsoft.Json; + +namespace ApartmentManager.Persistency +{ + class PersistenceFacade + { + + const string ServerUrl = "http://localhost:60916"; + HttpClientHandler handler; + + public PersistenceFacade() + { + handler = new HttpClientHandler(); + handler.UseDefaultCredentials = true; + } + + ///Get Get Residents/// + public List<Resident> GetApartmentResidents(Resident resident) + { + using (var client = new HttpClient(handler)) + { + client.BaseAddress = new Uri(ServerUrl); + client.DefaultRequestHeaders.Clear(); + client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); + try + { + string residentsBody = "api/residents/" + resident.ApartmentNr; + var response = client.GetAsync(residentsBody).Result; + + if (response.IsSuccessStatusCode) + { + var residentList = response.Content.ReadAsAsync<IEnumerable<Resident>>().Result; + return residentList.ToList(); + } + + } + catch (Exception ex) + { + new MessageDialog(ex.Message).ShowAsync(); + } + return null; + } + } + ///Get Get Residents/// + public void CreateResident(Resident resident) + { + using (var client = new HttpClient(handler)) + { + client.BaseAddress = new Uri(ServerUrl); + client.DefaultRequestHeaders.Clear(); + client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); + try + { + string postBody = JsonConvert.SerializeObject(resident); + var response = client.PostAsync("api/Residents", + new StringContent(postBody, Encoding.UTF8, "application/json")) + .Result; + if (response.IsSuccessStatusCode) + { + new MessageDialog("Success").ShowAsync(); + } + else + { + new MessageDialog("Error").ShowAsync(); + } + + } + catch (Exception ex) + { + new MessageDialog(ex.Message).ShowAsync(); + } + } + + } + + } +} diff --git a/ApartmentManager/ApartmentManager/Persistency/Persistency.cs b/ApartmentManager/ApartmentManager/Persistency/Persistency.cs deleted file mode 100644 index ec46116..0000000 --- a/ApartmentManager/ApartmentManager/Persistency/Persistency.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ApartmentManager.Persistency -{ - class Persistency - { - } -} diff --git a/ApartmentManager/ApartmentManager/View/ResidentsPage.xaml b/ApartmentManager/ApartmentManager/View/ResidentsPage.xaml index 020d4cc..8c8d053 100644 --- a/ApartmentManager/ApartmentManager/View/ResidentsPage.xaml +++ b/ApartmentManager/ApartmentManager/View/ResidentsPage.xaml @@ -18,7 +18,7 @@ <StackPanel Width="400" Margin="0,0,50,0"> <TextBlock Margin="0,10,0,10" Text="Resident Info" HorizontalAlignment="Center" FontSize="20" FontWeight="Bold"/> <TextBlock Margin="0,10,0,10" Text="Name"/> - <TextBox Text="{Binding NewResident.Name, Mode=TwoWay}" /> + <TextBox Text="{Binding NewResident.FirstName, Mode=TwoWay}" /> <TextBlock Margin="0,10,0,10" Text="Last Name"/> <TextBox Text="{Binding NewResident.LastName, Mode=TwoWay}" /> <TextBlock Margin="0,10,0,10" Text="Birthdate"/> diff --git a/ApartmentManager/ApartmentManager/ViewModel/ApartmenViewModel.cs b/ApartmentManager/ApartmentManager/ViewModel/ApartmenViewModel.cs index 57aa003..3d76120 100644 --- a/ApartmentManager/ApartmentManager/ViewModel/ApartmenViewModel.cs +++ b/ApartmentManager/ApartmentManager/ViewModel/ApartmenViewModel.cs @@ -36,6 +36,7 @@ namespace ApartmentManager.ViewModel CreateResidentCommand = new RelayCommand(ResidentsHandler.CreateResident); DeleteResidentCommand = new RelayCommand(ResidentsHandler.DeleteResident); UpdateResidentCommand = new RelayCommand(ResidentsHandler.UpdateResident); + ResidentsHandler.GetApartmentResidents(); } public User NewUser diff --git a/ApartmentManager/HousingWebAPI/HousingWebAPI.csproj b/ApartmentManager/HousingWebAPI/HousingWebAPI.csproj index c6e5113..f824c8e 100644 --- a/ApartmentManager/HousingWebAPI/HousingWebAPI.csproj +++ b/ApartmentManager/HousingWebAPI/HousingWebAPI.csproj @@ -255,7 +255,6 @@ </ItemGroup> <ItemGroup> <Folder Include="App_Data\" /> - <Folder Include="test\" /> </ItemGroup> <ItemGroup> <Content Include="fonts\glyphicons-halflings-regular.woff" /> diff --git a/ApartmentManager/HousingWebAPI/Web.config b/ApartmentManager/HousingWebAPI/Web.config index f50089d..abdcf7a 100644 --- a/ApartmentManager/HousingWebAPI/Web.config +++ b/ApartmentManager/HousingWebAPI/Web.config @@ -81,5 +81,6 @@ <connectionStrings> <add name="DataModel" connectionString="data source=housingdb.database.windows.net;initial catalog=housingdb;persist security info=True;user id=deltaadmin;password=Delta123!;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" /> <add name="Model1" connectionString="data source=housingdb.database.windows.net;initial catalog=housingdb;persist security info=True;user id=deltaadmin;password=Delta123!;multipleactiveresultsets=True;application name=EntityFramework" providerName="System.Data.SqlClient" /> + <add name="Model11" connectionString="data source=housingdb.database.windows.net;initial catalog=housingdb;persist security info=True;user id=deltaadmin;password=Delta123!;multipleactiveresultsets=True;application name=EntityFramework" providerName="System.Data.SqlClient" /> </connectionStrings> </configuration>
\ No newline at end of file diff --git a/ApartmentManager/HousingWebApi/Models/Resident.cs b/ApartmentManager/HousingWebApi/Models/Resident.cs index 4b07bd0..00fc439 100644 --- a/ApartmentManager/HousingWebApi/Models/Resident.cs +++ b/ApartmentManager/HousingWebApi/Models/Resident.cs @@ -19,11 +19,11 @@ namespace HousingWebApi public int ApartmentNr { get; set; } [Required] - [StringLength(15)] + [StringLength(20)] public string FirstName { get; set; } [Required] - [StringLength(15)] + [StringLength(20)] public string LastName { get; set; } [Column(TypeName = "date")] @@ -31,7 +31,7 @@ namespace HousingWebApi public int? Phone { get; set; } - [StringLength(26)] + [StringLength(30)] public string Email { get; set; } [Column(TypeName = "image")] |