diff options
| author | Paulius Klezys <paul4618@edu.easj.dk> | 2017-05-12 13:05:34 +0200 |
|---|---|---|
| committer | Paulius Klezys <paul4618@edu.easj.dk> | 2017-05-12 13:05:34 +0200 |
| commit | 2a192ba79d69741c947f400a4a4d9c80bf5d3d05 (patch) | |
| tree | d7f68241e42aec08903f98b9c10197b4ebb8590c | |
| parent | a59f6e6d3163d2c83ebfcc9c5b5da2d2f2c114c1 (diff) | |
| parent | 0163e5e6b85907140d70051cf96c32d1dfe9c310 (diff) | |
Ze best čeindž eva
37 files changed, 1241 insertions, 429 deletions
diff --git a/ApartmentManager/ApartmentManager/ApartmentManager.csproj b/ApartmentManager/ApartmentManager/ApartmentManager.csproj index 6a74df4..54a0248 100644 --- a/ApartmentManager/ApartmentManager/ApartmentManager.csproj +++ b/ApartmentManager/ApartmentManager/ApartmentManager.csproj @@ -103,7 +103,7 @@ <Compile Include="Handler\BoardApartmentsHandler.cs" /> <Compile Include="Handler\BoardResidentsHandler.cs" /> <Compile Include="Handler\LoginHandler.cs" /> - <Compile Include="Handler\ResidentsHandler.cs" /> + <Compile Include="Handler\ApartmentHandler.cs" /> <Compile Include="Model\Apartment.cs" /> <Compile Include="Persistency\ImgurPhotoUploader.cs" /> <Compile Include="Singletons\ApartmentsCatalogSingleton.cs" /> @@ -120,6 +120,12 @@ <Compile Include="ViewModel\ApartmentsViewModel.cs" /> <Compile Include="ViewModel\ApartmenViewModel.cs" /> <Compile Include="ViewModel\LoginViewModel.cs" /> + <Compile Include="View\ApartmentDefectPage.xaml.cs"> + <DependentUpon>ApartmentDefectPage.xaml</DependentUpon> + </Compile> + <Compile Include="View\ApartmentNewDefect.xaml.cs"> + <DependentUpon>ApartmentNewDefect.xaml</DependentUpon> + </Compile> <Compile Include="View\ApartmentPage.xaml.cs"> <DependentUpon>ApartmentPage.xaml</DependentUpon> </Compile> @@ -183,6 +189,14 @@ <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> </Page> + <Page Include="View\ApartmentDefectPage.xaml"> + <SubType>Designer</SubType> + <Generator>MSBuild:Compile</Generator> + </Page> + <Page Include="View\ApartmentNewDefect.xaml"> + <SubType>Designer</SubType> + <Generator>MSBuild:Compile</Generator> + </Page> <Page Include="View\ApartmentPage.xaml"> <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> diff --git a/ApartmentManager/ApartmentManager/Handler/ResidentsHandler.cs b/ApartmentManager/ApartmentManager/Handler/ApartmentHandler.cs index 203c06e..f3cc8b3 100644 --- a/ApartmentManager/ApartmentManager/Handler/ResidentsHandler.cs +++ b/ApartmentManager/ApartmentManager/Handler/ApartmentHandler.cs @@ -12,11 +12,11 @@ using Newtonsoft.Json; namespace ApartmentManager.Handler { - public class ResidentsHandler + public class ApartmentHandler { public ApartmentViewModel ApartmentViewModel { get; set; } - public ResidentsHandler(ApartmentViewModel apartmenViewModel) + public ApartmentHandler(ApartmentViewModel apartmenViewModel) { ApartmentViewModel = apartmenViewModel; } @@ -24,7 +24,7 @@ namespace ApartmentManager.Handler { Resident resident = new Resident(); resident.ApartmentNr = ApartmentViewModel.ApartmentNumber; - + var residentsFromDatabase = ApiClient.GetData("api/ApartmentResidents/" + resident.ApartmentNr); IEnumerable<Resident> residentlist = JsonConvert.DeserializeObject<IEnumerable<Resident>>(residentsFromDatabase); @@ -32,8 +32,16 @@ namespace ApartmentManager.Handler ApartmentViewModel.NewResident = new Resident(); foreach (var resident2 in residentlist) { - ApartmentViewModel.CatalogSingleton.Residents.Add(resident2); + ApartmentViewModel.CatalogSingleton.Residents.Add(resident2); } + + } + public void GetApartment() + { + string serializedApartment = ApiClient.GetData("api/Apartments/" + ApartmentViewModel.ApartmentNumber); + + Apartment apartment = JsonConvert.DeserializeObject<Apartment>(serializedApartment); + ApartmentViewModel.CatalogSingleton.Apartment = apartment; } public void CreateResident() @@ -41,7 +49,6 @@ namespace ApartmentManager.Handler try { Resident resident = new Resident(); - resident.ApartmentNr = ApartmentViewModel.ApartmentNumber; resident.FirstName = ApartmentViewModel.NewResident.FirstName; resident.LastName = ApartmentViewModel.NewResident.LastName; @@ -113,7 +120,7 @@ namespace ApartmentManager.Handler resident.Picture = ApartmentViewModel.NewResident.Picture; resident.Phone = ApartmentViewModel.NewResident.Phone; - ApiClient.PutData("api/residents/" + resident.ResidentNr,resident); + ApiClient.PutData("api/residents/" + resident.ResidentNr, resident); var residentsFromDatabase = ApiClient.GetData("api/ApartmentResidents/" + resident.ApartmentNr); IEnumerable<Resident> residentlist = JsonConvert.DeserializeObject<IEnumerable<Resident>>(residentsFromDatabase); @@ -128,6 +135,23 @@ namespace ApartmentManager.Handler { new MessageDialog(e.Message).ShowAsync(); } - } - } + } + + public async void UploadResidentPhoto() + { + try + { + ApartmentViewModel.NewResident.Picture = await ImgurPhotoUploader.UploadPhotoAsync(); + var tmp = ApartmentViewModel.NewResident; + ApartmentViewModel.NewResident = new Resident(); + ApartmentViewModel.NewResident = tmp; + } + catch (Exception e) + { + + + } + + } + } } diff --git a/ApartmentManager/ApartmentManager/Model/Apartment.cs b/ApartmentManager/ApartmentManager/Model/Apartment.cs index 1a37f96..c5754a9 100644 --- a/ApartmentManager/ApartmentManager/Model/Apartment.cs +++ b/ApartmentManager/ApartmentManager/Model/Apartment.cs @@ -14,6 +14,7 @@ namespace ApartmentManager.Model public string MonthlyCharge { get; set; } public int Floor { get; set; } public string Address { get; set; } + public string PlanPicture { get; set; } public Apartment() { } @@ -25,6 +26,7 @@ namespace ApartmentManager.Model this.MonthlyCharge = MonthlyCharge; this.Floor = Floor; this.Address = Address; + } diff --git a/ApartmentManager/ApartmentManager/Model/Defect.cs b/ApartmentManager/ApartmentManager/Model/Defect.cs index c588c18..5d97831 100644 --- a/ApartmentManager/ApartmentManager/Model/Defect.cs +++ b/ApartmentManager/ApartmentManager/Model/Defect.cs @@ -13,18 +13,18 @@ namespace ApartmentManager.Model 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 Picture { get; set; } + public string Picture2 { get; set; } + public string 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) + public Defect( int ApartmentNumber, string Name, DateTime DateUploaded, string Picture, string Picture2, string Picture3, string Description, string Comment, string Status) { - this.DefectNumber = DefectNumber; + this.ApartmentNumber = ApartmentNumber; this.Name = Name; this.DateUploaded = DateUploaded; diff --git a/ApartmentManager/ApartmentManager/Model/Resident.cs b/ApartmentManager/ApartmentManager/Model/Resident.cs index e9f39cd..79bf6a1 100644 --- a/ApartmentManager/ApartmentManager/Model/Resident.cs +++ b/ApartmentManager/ApartmentManager/Model/Resident.cs @@ -12,26 +12,31 @@ namespace ApartmentManager.Model public string FirstName { get; set; } public string LastName { get; set; } public int Phone { get; set; } - public DateTime BirthDate { get; set; } + public DateTimeOffset BirthDate { get; set; } public string Email { get; set; } - public Image Picture { get; set; } + public string Picture { get; set; } public int ApartmentNr { get; set; } public int ResidentNr { get; set; } - public Resident() { } - public Resident(string FirstName, string LastName, int Phone, DateTime BirthDate, string Email, int ApartmentNr ,int ResidentNr) + public Resident() { - this.FirstName = FirstName; - this.LastName = LastName; - this.Phone = Phone; - this.BirthDate = BirthDate; - this.Email = Email; - this.ApartmentNr = ApartmentNr; - this.ResidentNr = ResidentNr; + Picture = "https://tracker.moodle.org/secure/attachment/30912/f3.png"; + BirthDate = DateTimeOffset.Now; + } + public Resident(string firstName, string lastName, int phone, DateTimeOffset birthDate, string email, int apartmentNr ,int residentNr, string picture) + { + FirstName = firstName; + LastName = lastName; + Phone = phone; + BirthDate = birthDate; + Email = email; + ApartmentNr = apartmentNr; + ResidentNr = residentNr; + Picture = picture; } public override string ToString() { - return string.Format($"Name: {FirstName}, LastName: {LastName}, Birth Date: {BirthDate}, Phone {Phone}, Email {Email} "); + return string.Format($"Name: {FirstName}, LastName: {LastName}, Birth Date: {BirthDate.Date}, Phone {Phone}, Email {Email} "); } } } diff --git a/ApartmentManager/ApartmentManager/Singletons/CatalogSingleton.cs b/ApartmentManager/ApartmentManager/Singletons/CatalogSingleton.cs index 3a4c706..490ac49 100644 --- a/ApartmentManager/ApartmentManager/Singletons/CatalogSingleton.cs +++ b/ApartmentManager/ApartmentManager/Singletons/CatalogSingleton.cs @@ -1,11 +1,8 @@ using System; -using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using ApartmentManager.Model; -namespace ApartmentManager.Model +namespace ApartmentManager.Singletons { public class CatalogSingleton { @@ -13,16 +10,20 @@ namespace ApartmentManager.Model public static CatalogSingleton Instance => instance; - public ObservableCollection<User> User { get; set; } - public ObservableCollection<Apartment> Apartment { get; set; } + + public Apartment Apartment { get; set; } public ObservableCollection<Resident> Residents { get; set; } + public ObservableCollection<Defect> Defects { get; set; } private CatalogSingleton() { - User = new ObservableCollection<User>(); - User.Add(new User("Bibis", "Kiausiai", "3214568", new DateTime(2017, 1, 5, 2, 27, 0), "Bibis@mail.com", 1)); - Apartment = new ObservableCollection<Apartment>(); - Apartment.Add(new Apartment(1,"30 Square meters",2,"200",0,"adresas")); Residents = new ObservableCollection<Resident>(); + Defects = new ObservableCollection<Defect>(); + Defects.Add(new Defect(1, "Broken Pipe", new DateTime(1988, 8, 8), "https://cdn.theatlantic.com/assets/media/img/photo/2011/09/vladimir-putin-action-man/p34_DWI22303/main_900.jpg?1420519465", "https://cdn.theatlantic.com/assets/media/img/photo/2011/09/vladimir-putin-action-man/p34_DWI22303/main_900.jpg?1420519465", "https://cdn.theatlantic.com/assets/media/img/photo/2011/09/vladimir-putin-action-man/p34_DWI22303/main_900.jpg?1420519465", "description", "comment", "status")); + Defects.Add(new Defect(1, "Broken Pipe", new DateTime(1988, 8, 8), "https://cdn.theatlantic.com/assets/media/img/photo/2011/09/vladimir-putin-action-man/p34_DWI22303/main_900.jpg?1420519465", "https://cdn.theatlantic.com/assets/media/img/photo/2011/09/vladimir-putin-action-man/p34_DWI22303/main_900.jpg?1420519465", "https://cdn.theatlantic.com/assets/media/img/photo/2011/09/vladimir-putin-action-man/p34_DWI22303/main_900.jpg?1420519465", "description", "comment", "status")); + Defects.Add(new Defect(1, "Broken Pipe", new DateTime(1988, 8, 8), "https://cdn.theatlantic.com/assets/media/img/photo/2011/09/vladimir-putin-action-man/p34_DWI22303/main_900.jpg?1420519465", "https://cdn.theatlantic.com/assets/media/img/photo/2011/09/vladimir-putin-action-man/p34_DWI22303/main_900.jpg?1420519465", "https://cdn.theatlantic.com/assets/media/img/photo/2011/09/vladimir-putin-action-man/p34_DWI22303/main_900.jpg?1420519465", "description", "comment", "status")); + Defects.Add(new Defect(1, "Broken Pipe", new DateTime(1988, 8, 8), "https://cdn.theatlantic.com/assets/media/img/photo/2011/09/vladimir-putin-action-man/p34_DWI22303/main_900.jpg?1420519465", "https://cdn.theatlantic.com/assets/media/img/photo/2011/09/vladimir-putin-action-man/p34_DWI22303/main_900.jpg?1420519465", "https://cdn.theatlantic.com/assets/media/img/photo/2011/09/vladimir-putin-action-man/p34_DWI22303/main_900.jpg?1420519465", "description", "comment", "status")); + + Defects.Add(new Defect(1, "Broken Pipe", new DateTime(1988, 8, 8), "https://cdn.theatlantic.com/assets/media/img/photo/2011/09/vladimir-putin-action-man/p34_DWI22303/main_900.jpg?1420519465", "https://cdn.theatlantic.com/assets/media/img/photo/2011/09/vladimir-putin-action-man/p34_DWI22303/main_900.jpg?1420519465", "https://cdn.theatlantic.com/assets/media/img/photo/2011/09/vladimir-putin-action-man/p34_DWI22303/main_900.jpg?1420519465", "description", "comment", "status")); } } diff --git a/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml new file mode 100644 index 0000000..a69fe96 --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml @@ -0,0 +1,91 @@ +<Page + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:local="using:ApartmentManager.View" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:ViewModel="using:ApartmentManager.ViewModel" + x:Class="ApartmentManager.View.ApartmentDefectPage" + mc:Ignorable="d"> + + <Page.DataContext> + <ViewModel:ApartmentViewModel/> + </Page.DataContext> + + <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> + <StackPanel Margin="10"> + <TextBlock Text="Apartment Defects" HorizontalAlignment="Center" FontSize="30" FontWeight="Bold"></TextBlock> + <ListView ItemsSource="{Binding CatalogSingleton.Defects}" Height="615" SelectedItem="{Binding NewDefect, Mode=TwoWay}" > + <ListView.ItemContainerStyle> + <Style TargetType="ListViewItem"> + <Setter Property="HorizontalContentAlignment" Value="Stretch"/> + </Style> + </ListView.ItemContainerStyle> + + <ListView.ItemTemplate> + + <DataTemplate> + <Grid Background="LightGray" Height="200" Margin="0,0,0,5"> + <Grid.ColumnDefinitions> + <ColumnDefinition Width="200"/> + <ColumnDefinition /> + </Grid.ColumnDefinitions> + <Grid Grid.Column="0" Background="Gray" BorderThickness="0,0,2,0" BorderBrush="#CCFFFFFF" > + <Image Stretch="Fill" Source="{Binding Picture}" /> + </Grid> + <Grid Grid.Column="1" Margin="2"> + <StackPanel Margin="10"> + + <StackPanel Orientation="Horizontal"> + <TextBlock Text="Name :" Margin="0,0,10,0" FontSize="30" FontWeight="Bold"/> + <TextBlock Text="{Binding Name}" Margin="0,0,10,0" FontSize="30"/> + + </StackPanel> + + <StackPanel Orientation="Horizontal"> + <TextBlock Text="{Binding Description}" TextWrapping="Wrap" Margin="0,0,10,0" FontSize="20" Height="108" Width="800"/> + </StackPanel> + + <StackPanel Orientation="Horizontal"/> + + <StackPanel Orientation="Horizontal"> + <TextBlock Text="Status :" Margin="0,0,10,0" FontSize="25"/> + <TextBlock Text="{Binding Status}" Margin="0,0,10,0" FontSize="25"/> + + <TextBlock Text="Date Submitted :" Margin="700,0,10,0" FontSize="25" HorizontalAlignment="Left"/> + <TextBlock Text="{Binding DateUploaded}" Margin="0,0,10,0" FontSize="25"/> + </StackPanel> + + </StackPanel> + + + </Grid> + </Grid> + </DataTemplate> + </ListView.ItemTemplate> + </ListView> + <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,15,0,0"> + <Button Content="New Defect" Width="200" Margin="0,0,100,0" ></Button> + <Button Content="View Defect" Width="200" Margin="0,0,100,0" ></Button> + </StackPanel> + + </StackPanel> + + + + + + + + + + + + + + + + + + </Grid> +</Page> diff --git a/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml.cs new file mode 100644 index 0000000..7a157ab --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.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 +{ + /// <summary> + /// An empty page that can be used on its own or navigated to within a Frame. + /// </summary> + public sealed partial class ApartmentDefectPage : Page + { + public ApartmentDefectPage() + { + this.InitializeComponent(); + } + } +} diff --git a/ApartmentManager/ApartmentManager/View/ApartmentNewDefect.xaml b/ApartmentManager/ApartmentManager/View/ApartmentNewDefect.xaml new file mode 100644 index 0000000..c6332e1 --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/ApartmentNewDefect.xaml @@ -0,0 +1,53 @@ +<Page + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:local="using:ApartmentManager.View" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:ViewModel="using:ApartmentManager.ViewModel" + x:Class="ApartmentManager.View.ApartmentNewDefect" + mc:Ignorable="d"> + + <Page.DataContext> + <ViewModel:ApartmentViewModel/> + </Page.DataContext> + + <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> + <StackPanel Orientation="Vertical" HorizontalAlignment="Center"> + + <TextBlock Margin="0,10,0,10" Text="Defect Information" HorizontalAlignment="Center" FontSize="20" FontWeight="Bold"/> + + <StackPanel Orientation="Horizontal"> + <StackPanel Margin="0,5,30,0"> + + <StackPanel Orientation="Horizontal" > + <Image Height="200" Width="355" Source="{Binding NewDefect.Picture}" /> + <Button Content="Upload Picture" Margin="30,0,0,0"/> + </StackPanel> + + <StackPanel Orientation="Horizontal" Margin="0,30,0,0"> + <Image Height="200" Width="355" Source="{Binding NewDefect.Picture2}" /> + <Button Content="Upload Picture" Margin="30,0,0,0"/> + </StackPanel> + + <StackPanel Orientation="Horizontal" Margin="0,30,0,0"> + <Image Height="200" Width="355" Source="{Binding NewDefect.Picture3}" /> + <Button Content="Upload Picture" Margin="30,0,0,0"/> + </StackPanel> + + </StackPanel> + + <StackPanel Width="400" Margin="0,0,50,0"> + <TextBlock Margin="0,10,0,10" Text="Name"/> + <TextBox Text="{Binding NewDefect.Name, Mode=TwoWay}" /> + <TextBlock Margin="0,10,0,10" Text="Description"/> + <TextBox Text="{Binding NewDefect.Description, Mode=TwoWay}" Height="140" /> + <TextBlock Margin="0,10,0,10" Text="Comment"/> + <TextBox Text="{Binding NewDefect.Comment, Mode=TwoWay}" Height="300" /> + <Button Margin="0,20,0,0" Content="Create" HorizontalAlignment="Stretch"/> + </StackPanel> + + </StackPanel> + </StackPanel> + </Grid> +</Page> diff --git a/ApartmentManager/ApartmentManager/View/ApartmentNewDefect.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentNewDefect.xaml.cs new file mode 100644 index 0000000..5e18b42 --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/ApartmentNewDefect.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 +{ + /// <summary> + /// An empty page that can be used on its own or navigated to within a Frame. + /// </summary> + public sealed partial class ApartmentNewDefect : Page + { + public ApartmentNewDefect() + { + this.InitializeComponent(); + } + } +} diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml index 385e580..acf1cbc 100644 --- a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml +++ b/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml @@ -13,42 +13,61 @@ </Page.DataContext> <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> - <StackPanel Orientation="Horizontal" VerticalAlignment="Top" Width="1000" Margin="50" > - <StackPanel Width="600" Height="300" VerticalAlignment="Top"> - <StackPanel Orientation="Horizontal"> - <TextBlock Text="Apartment Address :" FontSize="20" Margin="0,0,10,0" /> - <TextBlock Text="{Binding CatalogSingleton.Apartment[0].Address}" FontSize="20"/> - </StackPanel> - <StackPanel Orientation="Horizontal"> - <TextBlock Text="Floor :" FontSize="20" Margin="0,0,10,0" /> - <TextBlock Text="{Binding CatalogSingleton.Apartment[0].Floor}" FontSize="20"/> - </StackPanel> - <StackPanel Orientation="Horizontal"> - <TextBlock Text="Apartment Number :" FontSize="20" Margin="0,0,10,0"/> - <TextBlock Text="{Binding CatalogSingleton.Apartment[0].ApartmentNumber}" FontSize="20"/> - </StackPanel> - <StackPanel Orientation="Horizontal"> - <TextBlock Text="Size :" FontSize="20" Margin="0,0,10,0"/> - <TextBlock Text="{Binding CatalogSingleton.Apartment[0].Size}" FontSize="20" Margin="0,0,10,0"/> - <TextBlock Text="m2" FontSize="20"/> - </StackPanel> - <StackPanel Orientation="Horizontal"> - <TextBlock Text="Number of Rooms :" FontSize="20" Margin="0,0,10,0"/> - <TextBlock Text="{Binding CatalogSingleton.Apartment[0].NumberOfRooms}" FontSize="20"/> + <StackPanel Orientation="Horizontal" VerticalAlignment="Top" Margin="50" > + + <StackPanel VerticalAlignment="Top" Margin="50,0,20,0"> + <Image Source="{Binding CatalogSingleton.Apartment.PlanPicture}" MaxWidth="800" MaxHeight="650"></Image> + </StackPanel> + + <StackPanel> + + <StackPanel> + + <StackPanel Orientation="Horizontal"> + <TextBlock Text="Address :" FontSize="20" Margin="0,0,10,0" FontWeight="Bold" /> + <TextBlock Text="{Binding CatalogSingleton.Apartment.Address}" FontSize="20"/> + </StackPanel> + + <StackPanel Orientation="Horizontal"> + <TextBlock Text="Floor :" FontSize="20" Margin="0,0,10,0" FontWeight="Bold" /> + <TextBlock Text="{Binding CatalogSingleton.Apartment.Floor}" FontSize="20"/> + </StackPanel> + + <StackPanel Orientation="Horizontal"> + <TextBlock Text="Apartment Number :" FontSize="20" Margin="0,0,10,0" FontWeight="Bold"/> + <TextBlock Text="{Binding CatalogSingleton.Apartment.ApartmentNumber}" FontSize="20"/> + </StackPanel> + + <StackPanel Orientation="Horizontal"> + <TextBlock Text="Size :" FontSize="20" Margin="0,0,10,0" FontWeight="Bold"/> + <TextBlock Text="{Binding CatalogSingleton.Apartment.Size}" FontSize="20" Margin="0,0,10,0"/> + <TextBlock Text="m2" FontSize="20"/> + </StackPanel> + + <StackPanel Orientation="Horizontal"> + <TextBlock Text="Number of Rooms :" FontSize="20" Margin="0,0,10,0" FontWeight="Bold"/> + <TextBlock Text="{Binding CatalogSingleton.Apartment.NumberOfRooms}" FontSize="20"/> + </StackPanel> + + <StackPanel Orientation="Horizontal"> + <TextBlock Text="Monthly Charge:" FontSize="20" Margin="0,0,10,0" FontWeight="Bold"/> + <TextBlock Text="{Binding CatalogSingleton.Apartment.MonthlyCharge}" FontSize="20" Margin="0,0,10,0"/> + <TextBlock Text="DKK" FontSize="20"/> + </StackPanel> + </StackPanel> - <StackPanel Orientation="Horizontal"> - <TextBlock Text="Monthly Charge:" FontSize="20" Margin="0,0,10,0"/> - <TextBlock Text="{Binding CatalogSingleton.Apartment[0].MonthlyCharge}" FontSize="20" Margin="0,0,10,0"/> - <TextBlock Text="DKK" FontSize="20"/> + + <StackPanel Margin="0,20,0,0" Width="250" VerticalAlignment="Top" HorizontalAlignment="Left"> + <Button Margin="0,10,0,10" Content="Apartment Plan" HorizontalAlignment="Stretch" Click="click"/> + <Button Margin="0,10,0,10" Content="Personal Info" HorizontalAlignment="Stretch" Click="GotoPernalInfoPage"/> + <Button Margin="0,10,0,10" Content="Residents" HorizontalAlignment="Stretch" Click="ResidentPage"/> + <Button Margin="0,10,0,10" Content="Apartment Changes" HorizontalAlignment="Stretch"/> + <Button Margin="0,10,0,10" Content="Apartment Defects" HorizontalAlignment="Stretch" Click="DefectPage" /> </StackPanel> + </StackPanel> - <StackPanel Width="400" Height="300" VerticalAlignment="Top" HorizontalAlignment="Right"> - <Button Margin="0,10,0,10" Content="Apartment Plan" HorizontalAlignment="Stretch" Click="click"/> - <Button Margin="0,10,0,10" Content="Personal Info" HorizontalAlignment="Stretch" Click="GotoPernalInfoPage"/> - <Button Margin="0,10,0,10" Content="Residents" HorizontalAlignment="Stretch" Click="ResidentPage"/> - <Button Margin="0,10,0,10" Content="Apartment Changes" HorizontalAlignment="Stretch"/> - <Button Margin="0,10,0,10" Content="Apartment Defects" HorizontalAlignment="Stretch"/> - </StackPanel> + </StackPanel> + </Grid> </Page> diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs index 4e5d4c9..e24ad53 100644 --- a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs +++ b/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs @@ -41,5 +41,10 @@ namespace ApartmentManager.View { Frame.Navigate(typeof(ApartmentResidentsPage)); } + + private void DefectPage(object sender, RoutedEventArgs e) + { + Frame.Navigate(typeof(ApartmentDefectPage)); + } } } diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml index badc50f..a9b71e5 100644 --- a/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml +++ b/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml @@ -1,14 +1,19 @@ <Page - x:Class="ApartmentManager.View.ApartmentPlanPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="using:ApartmentManager.View" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:ViewModel="using:ApartmentManager.ViewModel" + x:Class="ApartmentManager.View.ApartmentPlanPage" mc:Ignorable="d"> + <Page.DataContext> + <ViewModel:ApartmentViewModel/> + </Page.DataContext> + <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> - <Image Source="ms-appx:///Assets/plan.jpg" Margin="50"></Image> + <Image Source="{Binding CatalogSingleton.Apartment.PlanPicture}" MaxWidth="800" MaxHeight="650" Margin="50"/> </Grid> </Page> diff --git a/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml index 348ba30..ff394b3 100644 --- a/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml +++ b/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml @@ -13,10 +13,74 @@ </Page.DataContext> <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> - <StackPanel Margin="50" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="top" > - <ListView HorizontalAlignment="Left" Margin="0,50,50,0" VerticalAlignment="Top" ItemsSource="{Binding CatalogSingleton.Residents}" SelectedItem="{Binding NewResident, Mode=TwoWay}"/> + <StackPanel Margin="10" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="top" > + + <ListView ItemsSource="{Binding CatalogSingleton.Residents}" Margin="10,10,10,116" SelectedItem="{Binding NewResident, Mode=TwoWay}" > + + + <ListView.ItemContainerStyle> + <Style TargetType="ListViewItem"> + <Setter Property="HorizontalContentAlignment" Value="Stretch"/> + </Style> + </ListView.ItemContainerStyle> + + <ListView.ItemTemplate> + + <DataTemplate> + <Grid Background="LightGray" Height="150" Width="800" Margin="0,0,0,5"> + + <Grid.ColumnDefinitions> + <ColumnDefinition Width="150"/> + <ColumnDefinition /> + </Grid.ColumnDefinitions> + + <Grid Grid.Column="0" Background="Gray" BorderThickness="0,0,2,0" BorderBrush="#CCFFFFFF" > + <Image Stretch="Fill" Source="{Binding Picture}"/> + </Grid> + + <Grid Grid.Column="1" Margin="3,3,3,3"> + + <StackPanel Margin="10"> + + <StackPanel Orientation="Horizontal"> + <TextBlock Text="Full Name :" Margin="0,0,10,0" FontSize="30" FontWeight="Bold" ></TextBlock> + <TextBlock Text="{Binding FirstName}" Margin="0,0,10,0" FontSize="30"></TextBlock> + <TextBlock Text="{Binding LastName}" Margin="0,0,10,0" FontSize="30"></TextBlock> + </StackPanel> + + <StackPanel Orientation="Horizontal"> + <TextBlock Text="Email Address :" Margin="0,0,10,0" FontSize="20" FontWeight="Bold"></TextBlock> + <TextBlock Text="{Binding Email}" Margin="0,0,10,0" FontSize="20"></TextBlock> + </StackPanel> + + <StackPanel Orientation="Horizontal"> + <TextBlock Text="Phone Number :" Margin="0,0,10,0" FontSize="20" FontWeight="Bold"></TextBlock> + <TextBlock Text="{Binding Phone}" Margin="0,0,10,0" FontSize="20"></TextBlock> + </StackPanel> + + <StackPanel Orientation="Horizontal"> + <TextBlock Text="Birth Date :" Margin="0,0,10,0" FontSize="20" FontWeight="Bold"></TextBlock> + <TextBlock Text="{Binding BirthDate.Year}" FontSize="20"></TextBlock> + <TextBlock Text="-" FontSize="20"></TextBlock> + <TextBlock Text="{Binding BirthDate.Month}" FontSize="20"></TextBlock> + <TextBlock Text="-" FontSize="20"></TextBlock> + <TextBlock Text="{Binding BirthDate.Day}" FontSize="20"></TextBlock> + </StackPanel> + + </StackPanel> + </Grid> + </Grid> + </DataTemplate> + + </ListView.ItemTemplate> + </ListView> + + <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,5,0,10" Text="Resident Info" HorizontalAlignment="Center" FontSize="20" FontWeight="Bold"/> + <Image Source="{Binding NewResident.Picture, Mode=TwoWay}" Height="150" Width="150" ></Image> + <Button Content="Upload Picture" HorizontalAlignment="Stretch" Margin="0,10,0,0" Command="{Binding UploadResidentPhoto}" ></Button> <TextBlock Margin="0,10,0,10" Text="Name"/> <TextBox Text="{Binding NewResident.FirstName, Mode=TwoWay}" /> <TextBlock Margin="0,10,0,10" Text="Last Name"/> @@ -27,12 +91,19 @@ <TextBox Text="{Binding NewResident.Email, Mode=TwoWay}" /> <TextBlock Margin="0,10,0,10" Text="Phone Number"/> <TextBox Text="{Binding NewResident.Phone, Mode=TwoWay}" /> + + <StackPanel Orientation="Horizontal"> - <Button Margin="0,10,12,10" Content="Create" Width="125" Command="{Binding CreateResidentCommand}"/> - <Button Margin="0,10,0,10" Content="Delete" Width="125" Command="{Binding DeleteResidentCommand}"/> - <Button Margin="13,10,0,10" Content="Update" Width="125" Command="{Binding UpdateResidentCommand}"/> + <Button Margin="0,5,12,10" Content="Create" Width="125" Command="{Binding CreateResidentCommand}"/> + <Button Margin="0,5,0,10" Content="Delete" Width="125" Command="{Binding DeleteResidentCommand}"/> + <Button Margin="13,5,0,10" Content="Update" Width="125" Command="{Binding UpdateResidentCommand}"/> </StackPanel> + </StackPanel> + + </StackPanel> + </Grid> + </Page> diff --git a/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml.cs index 0df2861..b90815c 100644 --- a/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml.cs +++ b/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml.cs @@ -12,6 +12,7 @@ using Windows.UI.Xaml.Data; using Windows.UI.Xaml.Input; using Windows.UI.Xaml.Media; using Windows.UI.Xaml.Navigation; +using ApartmentManager.ViewModel; // The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238 @@ -24,7 +25,12 @@ namespace ApartmentManager.View { public ApartmentResidentsPage() { - this.InitializeComponent(); + this.InitializeComponent(); + } + + private void OpenFilePicker(object sender, RoutedEventArgs e) + { + } } } diff --git a/ApartmentManager/ApartmentManager/ViewModel/ApartmenViewModel.cs b/ApartmentManager/ApartmentManager/ViewModel/ApartmenViewModel.cs index f4d511b..8083eaa 100644 --- a/ApartmentManager/ApartmentManager/ViewModel/ApartmenViewModel.cs +++ b/ApartmentManager/ApartmentManager/ViewModel/ApartmenViewModel.cs @@ -10,34 +10,55 @@ using ApartmentManager.Annotations; using ApartmentManager.Common; using ApartmentManager.Handler; using ApartmentManager.Model; +using ApartmentManager.Persistency; +using ApartmentManager.Singletons; namespace ApartmentManager.ViewModel { public class ApartmentViewModel : INotifyPropertyChanged { - + public ApartmentHandler ApartmentHandler { get; set; } public CatalogSingleton CatalogSingleton { get; set; } + public UserSingleton UserSingleton { get; set; } + private User _newUser; private Resident _newResident; + private Defect _newDefect; + public static int ApartmentNumber { get; set; } - public Handler.ResidentsHandler ResidentsHandler { get; set; } + public ICommand CreateResidentCommand { get; set; } public ICommand DeleteResidentCommand { get; set; } public ICommand UpdateResidentCommand { get; set; } + public ICommand UploadResidentPhoto { get; set; } public ApartmentViewModel() { NewUser = new User(); NewResident = new Resident(); - ResidentsHandler = new Handler.ResidentsHandler(this); + + ApartmentHandler = new ApartmentHandler(this); CatalogSingleton = CatalogSingleton.Instance; - ApartmentNumber = CatalogSingleton.User[0].ApartmentNr; - CreateResidentCommand = new RelayCommand(ResidentsHandler.CreateResident); - DeleteResidentCommand = new RelayCommand(ResidentsHandler.DeleteResident); - UpdateResidentCommand = new RelayCommand(ResidentsHandler.UpdateResident); - ResidentsHandler.GetApartmentResidents(); + UserSingleton = UserSingleton.Instance; + ApartmentNumber = UserSingleton.CurrentUser.ApartmentNr; + + UploadResidentPhoto = new RelayCommand(ApartmentHandler.UploadResidentPhoto); + CreateResidentCommand = new RelayCommand(ApartmentHandler.CreateResident); + DeleteResidentCommand = new RelayCommand(ApartmentHandler.DeleteResident); + UpdateResidentCommand = new RelayCommand(ApartmentHandler.UpdateResident); + ApartmentHandler.GetApartmentResidents(); + ApartmentHandler.GetApartment(); + } + public Defect NewDefect + { + get => _newDefect; + set + { + _newDefect = value; + OnPropertyChanged(); + } } public User NewUser { diff --git a/ApartmentManager/HousingWebAPI/ApartmentResident.cs b/ApartmentManager/HousingWebAPI/ApartmentResident.cs deleted file mode 100644 index 092c95f..0000000 --- a/ApartmentManager/HousingWebAPI/ApartmentResident.cs +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 4b5c82a..0000000 --- a/ApartmentManager/HousingWebAPI/Controllers/ApartmentResidentsController.cs +++ /dev/null @@ -1,133 +0,0 @@ -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<ApartmentResident> 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 index f54e72b..092c95f 100644 --- a/ApartmentManager/HousingWebAPI/Models/ApartmentResident.cs +++ b/ApartmentManager/HousingWebAPI/Models/ApartmentResident.cs @@ -1,4 +1,4 @@ -namespace HousingWebApi.Models +namespace HousingWebApi { using System; using System.Collections.Generic; diff --git a/ApartmentManager/HousingWebAPI/Models/ListApartmentResidents.cs b/ApartmentManager/HousingWebAPI/Models/ListApartmentResidents.cs deleted file mode 100644 index 5d5bffd..0000000 --- a/ApartmentManager/HousingWebAPI/Models/ListApartmentResidents.cs +++ /dev/null @@ -1,42 +0,0 @@ -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<ApartmentResident> ApartmentResidents { get; set; } - public virtual DbSet<database_firewall_rules> database_firewall_rules { get; set; } - - protected override void OnModelCreating(DbModelBuilder modelBuilder) - { - modelBuilder.Entity<ApartmentResident>() - .Property(e => e.FirstName) - .IsUnicode(false); - - modelBuilder.Entity<ApartmentResident>() - .Property(e => e.LastName) - .IsUnicode(false); - - modelBuilder.Entity<ApartmentResident>() - .Property(e => e.Email) - .IsUnicode(false); - - modelBuilder.Entity<database_firewall_rules>() - .Property(e => e.start_ip_address) - .IsUnicode(false); - - modelBuilder.Entity<database_firewall_rules>() - .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 index 4ea6055..3b5d6a5 100644 --- a/ApartmentManager/HousingWebAPI/Models/database_firewall_rules.cs +++ b/ApartmentManager/HousingWebAPI/Models/database_firewall_rules.cs @@ -1,4 +1,4 @@ -namespace HousingWebApi.Models +namespace HousingWebApi { using System; using System.Collections.Generic; diff --git a/ApartmentManager/HousingWebAPI/ViewContext.cs b/ApartmentManager/HousingWebAPI/ViewContext.cs deleted file mode 100644 index 9b50fc3..0000000 --- a/ApartmentManager/HousingWebAPI/ViewContext.cs +++ /dev/null @@ -1,41 +0,0 @@ -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<ApartmentResident> ApartmentResidents { get; set; } - public virtual DbSet<database_firewall_rules> database_firewall_rules { get; set; } - - protected override void OnModelCreating(DbModelBuilder modelBuilder) - { - modelBuilder.Entity<ApartmentResident>() - .Property(e => e.FirstName) - .IsUnicode(false); - - modelBuilder.Entity<ApartmentResident>() - .Property(e => e.LastName) - .IsUnicode(false); - - modelBuilder.Entity<ApartmentResident>() - .Property(e => e.Email) - .IsUnicode(false); - - modelBuilder.Entity<database_firewall_rules>() - .Property(e => e.start_ip_address) - .IsUnicode(false); - - modelBuilder.Entity<database_firewall_rules>() - .Property(e => e.end_ip_address) - .IsUnicode(false); - } - } -} diff --git a/ApartmentManager/HousingWebAPI/database_firewall_rules.cs b/ApartmentManager/HousingWebAPI/database_firewall_rules.cs deleted file mode 100644 index 3b5d6a5..0000000 --- a/ApartmentManager/HousingWebAPI/database_firewall_rules.cs +++ /dev/null @@ -1,38 +0,0 @@ -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/Controllers/ResidentsController.cs b/ApartmentManager/HousingWebApi/Controllers/ResidentsController.cs index f100211..9cd3932 100644 --- a/ApartmentManager/HousingWebApi/Controllers/ResidentsController.cs +++ b/ApartmentManager/HousingWebApi/Controllers/ResidentsController.cs @@ -34,25 +34,25 @@ namespace HousingWebApi.Controllers return Ok(resident); } - // GET: api/Residents/1 + //GET: api/Residents/1 [Route("api/ApartmentResidents/{id}")] [ResponseType(typeof(ResidentList))] public IQueryable<ResidentList> GetResidents(int id) { var roomlist = from resident in db.Residents - where (resident.ApartmentNr == id) - select new ResidentList - { - ResidentNr = resident.ResidentNr, - ApartmentNr = resident.ApartmentNr, - FirstName = resident.FirstName, - LastName = resident.LastName, - BirthDate = resident.BirthDate, - Phone = resident.Phone, - Email = resident.Email, - Picture = resident.Picture - }; + where (resident.ApartmentNr == id) + select new ResidentList + { + ResidentNr = resident.ResidentNr, + ApartmentNr = resident.ApartmentNr, + FirstName = resident.FirstName, + LastName = resident.LastName, + BirthDate = resident.BirthDate, + Phone = resident.Phone, + Email = resident.Email, + Picture = resident.Picture + }; return roomlist; } diff --git a/ApartmentManager/HousingWebApi/DataModel.cs b/ApartmentManager/HousingWebApi/DataModel.cs index 6fe5c68..fa16d44 100644 --- a/ApartmentManager/HousingWebApi/DataModel.cs +++ b/ApartmentManager/HousingWebApi/DataModel.cs @@ -18,6 +18,9 @@ namespace HousingWebApi public virtual DbSet<PastContractOwner> PastContractOwners { get; set; } public virtual DbSet<Resident> Residents { get; set; } public virtual DbSet<User> Users { get; set; } + public virtual DbSet<AllResident> AllResidents { get; set; } + public virtual DbSet<ApartmentResident> ApartmentResidents { get; set; } + public virtual DbSet<database_firewall_rules> database_firewall_rules { get; set; } protected override void OnModelCreating(DbModelBuilder modelBuilder) { @@ -27,11 +30,15 @@ namespace HousingWebApi modelBuilder.Entity<Apartment>() .Property(e => e.MonthlyCharge) - .IsFixedLength(); + .IsUnicode(false); modelBuilder.Entity<Apartment>() .Property(e => e.Address) - .IsFixedLength(); + .IsUnicode(false); + + modelBuilder.Entity<Apartment>() + .Property(e => e.PlanPicture) + .IsUnicode(false); modelBuilder.Entity<Apartment>() .HasMany(e => e.Defects) @@ -51,7 +58,19 @@ namespace HousingWebApi modelBuilder.Entity<Defect>() .Property(e => e.Name) - .IsFixedLength(); + .IsUnicode(false); + + modelBuilder.Entity<Defect>() + .Property(e => e.Picture) + .IsUnicode(false); + + modelBuilder.Entity<Defect>() + .Property(e => e.Picture2) + .IsUnicode(false); + + modelBuilder.Entity<Defect>() + .Property(e => e.Picture3) + .IsUnicode(false); modelBuilder.Entity<Defect>() .Property(e => e.Description) @@ -63,7 +82,7 @@ namespace HousingWebApi modelBuilder.Entity<Defect>() .Property(e => e.Status) - .IsFixedLength(); + .IsUnicode(false); modelBuilder.Entity<PastContractOwner>() .Property(e => e.ApartmentNr) @@ -81,6 +100,10 @@ namespace HousingWebApi .Property(e => e.Email) .IsUnicode(false); + modelBuilder.Entity<Resident>() + .Property(e => e.Picture) + .IsUnicode(false); + modelBuilder.Entity<User>() .Property(e => e.Username) .IsUnicode(false); @@ -124,6 +147,30 @@ namespace HousingWebApi modelBuilder.Entity<User>() .Property(e => e.SecondEmail) .IsUnicode(false); + + modelBuilder.Entity<AllResident>() + .Property(e => e.FirstName) + .IsUnicode(false); + + modelBuilder.Entity<ApartmentResident>() + .Property(e => e.FirstName) + .IsUnicode(false); + + modelBuilder.Entity<ApartmentResident>() + .Property(e => e.LastName) + .IsUnicode(false); + + modelBuilder.Entity<ApartmentResident>() + .Property(e => e.Email) + .IsUnicode(false); + + modelBuilder.Entity<database_firewall_rules>() + .Property(e => e.start_ip_address) + .IsUnicode(false); + + modelBuilder.Entity<database_firewall_rules>() + .Property(e => e.end_ip_address) + .IsUnicode(false); } } } diff --git a/ApartmentManager/HousingWebApi/HousingWebAPI.csproj b/ApartmentManager/HousingWebApi/HousingWebAPI.csproj index da913ec..3c002fd 100644 --- a/ApartmentManager/HousingWebApi/HousingWebAPI.csproj +++ b/ApartmentManager/HousingWebApi/HousingWebAPI.csproj @@ -151,10 +151,9 @@ </Reference> </ItemGroup> <ItemGroup> - <Compile Include="ApartmentResident.cs" /> - <Compile Include="Controllers\ApartmentResidentsController.cs" /> - <Compile Include="database_firewall_rules.cs" /> + <Compile Include="Models\AllResident.cs" /> <Compile Include="Models\Apartment.cs" /> + <Compile Include="Models\ApartmentResident.cs" /> <Compile Include="Controllers\ApartmentsController.cs" /> <Compile Include="Controllers\DefectsController.cs" /> <Compile Include="Controllers\PastContractOwnersController.cs" /> @@ -193,20 +192,17 @@ <Compile Include="Areas\HelpPage\SampleGeneration\TextSample.cs" /> <Compile Include="Areas\HelpPage\XmlDocumentationProvider.cs" /> <Compile Include="Controllers\HomeController.cs" /> - <Compile Include="DataModel.cs" /> - <Compile Include="Models\ApartmentResident.cs" /> <Compile Include="Models\database_firewall_rules.cs" /> + <Compile Include="DataModel.cs" /> <Compile Include="Models\Defect.cs" /> <Compile Include="Global.asax.cs"> <DependentUpon>Global.asax</DependentUpon> </Compile> - <Compile Include="Models\ListApartmentResidents.cs" /> <Compile Include="Models\PastContractOwner.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="Models\Resident.cs" /> <Compile Include="Models\ResidentList.cs" /> + <Compile Include="Models\Resident.cs" /> <Compile Include="Models\User.cs" /> - <Compile Include="ViewContext.cs" /> </ItemGroup> <ItemGroup> <Content Include="Areas\HelpPage\HelpPage.css" /> diff --git a/ApartmentManager/HousingWebApi/HousingWebApi.csproj b/ApartmentManager/HousingWebApi/HousingWebApi.csproj index da913ec..3c002fd 100644 --- a/ApartmentManager/HousingWebApi/HousingWebApi.csproj +++ b/ApartmentManager/HousingWebApi/HousingWebApi.csproj @@ -151,10 +151,9 @@ </Reference> </ItemGroup> <ItemGroup> - <Compile Include="ApartmentResident.cs" /> - <Compile Include="Controllers\ApartmentResidentsController.cs" /> - <Compile Include="database_firewall_rules.cs" /> + <Compile Include="Models\AllResident.cs" /> <Compile Include="Models\Apartment.cs" /> + <Compile Include="Models\ApartmentResident.cs" /> <Compile Include="Controllers\ApartmentsController.cs" /> <Compile Include="Controllers\DefectsController.cs" /> <Compile Include="Controllers\PastContractOwnersController.cs" /> @@ -193,20 +192,17 @@ <Compile Include="Areas\HelpPage\SampleGeneration\TextSample.cs" /> <Compile Include="Areas\HelpPage\XmlDocumentationProvider.cs" /> <Compile Include="Controllers\HomeController.cs" /> - <Compile Include="DataModel.cs" /> - <Compile Include="Models\ApartmentResident.cs" /> <Compile Include="Models\database_firewall_rules.cs" /> + <Compile Include="DataModel.cs" /> <Compile Include="Models\Defect.cs" /> <Compile Include="Global.asax.cs"> <DependentUpon>Global.asax</DependentUpon> </Compile> - <Compile Include="Models\ListApartmentResidents.cs" /> <Compile Include="Models\PastContractOwner.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="Models\Resident.cs" /> <Compile Include="Models\ResidentList.cs" /> + <Compile Include="Models\Resident.cs" /> <Compile Include="Models\User.cs" /> - <Compile Include="ViewContext.cs" /> </ItemGroup> <ItemGroup> <Content Include="Areas\HelpPage\HelpPage.css" /> diff --git a/ApartmentManager/HousingWebApi/Models/AllResident.cs b/ApartmentManager/HousingWebApi/Models/AllResident.cs new file mode 100644 index 0000000..655ee84 --- /dev/null +++ b/ApartmentManager/HousingWebApi/Models/AllResident.cs @@ -0,0 +1,15 @@ +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 AllResident + { + [Key] + [StringLength(20)] + public string FirstName { get; set; } + } +} diff --git a/ApartmentManager/HousingWebApi/Models/Apartment.cs b/ApartmentManager/HousingWebApi/Models/Apartment.cs index 16d884d..7481344 100644 --- a/ApartmentManager/HousingWebApi/Models/Apartment.cs +++ b/ApartmentManager/HousingWebApi/Models/Apartment.cs @@ -31,6 +31,9 @@ namespace HousingWebApi [StringLength(50)] public string Address { get; set; } + [StringLength(200)] + public string PlanPicture { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<Defect> Defects { get; set; } diff --git a/ApartmentManager/HousingWebApi/Models/Defect.cs b/ApartmentManager/HousingWebApi/Models/Defect.cs index 4336393..b439078 100644 --- a/ApartmentManager/HousingWebApi/Models/Defect.cs +++ b/ApartmentManager/HousingWebApi/Models/Defect.cs @@ -21,15 +21,15 @@ namespace HousingWebApi [Column(TypeName = "date")] public DateTime DateUploaded { get; set; } - [Column(TypeName = "image")] [Required] - public byte[] Picture { get; set; } + [StringLength(200)] + public string Picture { get; set; } - [Column(TypeName = "image")] - public byte[] Picture2 { get; set; } + [StringLength(200)] + public string Picture2 { get; set; } - [Column(TypeName = "image")] - public byte[] Picture3 { get; set; } + [StringLength(200)] + public string Picture3 { get; set; } [Column(TypeName = "text")] [Required] diff --git a/ApartmentManager/HousingWebApi/Models/Resident.cs b/ApartmentManager/HousingWebApi/Models/Resident.cs index a34cf80..319a697 100644 --- a/ApartmentManager/HousingWebApi/Models/Resident.cs +++ b/ApartmentManager/HousingWebApi/Models/Resident.cs @@ -29,8 +29,8 @@ namespace HousingWebApi [StringLength(30)] public string Email { get; set; } - [Column(TypeName = "image")] - public byte[] Picture { get; set; } + [StringLength(220)] + public string Picture { get; set; } public virtual Apartment Apartment { get; set; } } diff --git a/ApartmentManager/HousingWebApi/Models/ResidentList.cs b/ApartmentManager/HousingWebApi/Models/ResidentList.cs index 1fd4b30..9423bc1 100644 --- a/ApartmentManager/HousingWebApi/Models/ResidentList.cs +++ b/ApartmentManager/HousingWebApi/Models/ResidentList.cs @@ -14,7 +14,7 @@ namespace HousingWebApi public DateTime? BirthDate { get; set; } public int? Phone { get; set; } public string Email { get; set; } - public byte[] Picture { get; set; } + public string Picture { get; set; } } }
\ No newline at end of file diff --git a/ApartmentManager/HousingWebApi/Web.config b/ApartmentManager/HousingWebApi/Web.config index cab739c..8261278 100644 --- a/ApartmentManager/HousingWebApi/Web.config +++ b/ApartmentManager/HousingWebApi/Web.config @@ -79,10 +79,5 @@ <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" /> </providers> </entityFramework> - <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;application name=EntityFramework" providerName="System.Data.SqlClient" /> - <add name="ApartmentResidents" 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="ViewContext" 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="ListApartmentResidents" 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 + +<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;application name=EntityFramework" providerName="System.Data.SqlClient" /></connectionStrings></configuration>
\ No newline at end of file diff --git a/Diagrams/CreateResident Seq draft.vsdx b/Diagrams/CreateResident Seq draft.vsdx Binary files differnew file mode 100644 index 0000000..28f4f65 --- /dev/null +++ b/Diagrams/CreateResident Seq draft.vsdx diff --git a/Diagrams/GetApartment seq draft.vsdx b/Diagrams/GetApartment seq draft.vsdx Binary files differnew file mode 100644 index 0000000..6059624 --- /dev/null +++ b/Diagrams/GetApartment seq draft.vsdx diff --git a/Diagrams/GetApertmentResidents seq draft.vsdx b/Diagrams/GetApertmentResidents seq draft.vsdx Binary files differnew file mode 100644 index 0000000..59300b9 --- /dev/null +++ b/Diagrams/GetApertmentResidents seq draft.vsdx @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. |