ibz
/
oop_AM-6
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

edit forms to fit english language

This commit is contained in:
Strati 2018-07-28 13:47:47 +02:00
parent 0b2fb702ad
commit d4cf23c9ff
12 changed files with 136 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
WebClient/WpfWebClient/AddFoodplace.xaml
View File

@ -1,15 +0,0 @@
<Page x:Class="WpfWebClient.AddFoodplace"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:WpfWebClient"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"
Title="Home" Width="593" Height="565">
<Grid Width="593" Height="565">
<Label Content="Neuen Foodplace" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" FontFamily="Tahoma" FontSize="48" Height="61" Width="583"/>
</Grid>
</Page>

22
WebClient/WpfWebClient/ExamForm.xaml Normal file
View File

@ -0,0 +1,22 @@
<Page x:Class="WpfWebClient.ExamForm"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:WpfWebClient"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"
Title="PatientForm" Width="593" Height="565">
<Grid Height="565">
<Grid.RowDefinitions>
<RowDefinition Height="42*"/>
<RowDefinition Height="523*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="138*"/>
<ColumnDefinition Width="455*"/>
</Grid.ColumnDefinitions>
<Label Content="Add new exam" HorizontalAlignment="Left" VerticalAlignment="Top" Height="45" Width="433" FontFamily="Tahoma" FontSize="24" Margin="0.4,-3,0,0" Grid.Column="1" Grid.RowSpan="2"/>
</Grid>
</Page>

8
WebClient/WpfWebClient/AddFoodplace.xaml.cs → WebClient/WpfWebClient/ExamForm.xaml.cs
View File

@ -10,16 +10,18 @@ using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using WpfWebClient.ServiceReferenceEHEC;
namespace WpfWebClient
{
/// <summary>
/// Interaction logic for AddFoodplace.xaml
/// Interaction logic for CaseForm.xaml
/// </summary>
public partial class AddFoodplace : Page
public partial class ExamForm : Page
{
public AddFoodplace()
public ExamForm()
{
InitializeComponent();
}

22
WebClient/WpfWebClient/FoodplaceForm.xaml Normal file
View File

@ -0,0 +1,22 @@
<Page x:Class="WpfWebClient.FoodplaceForm"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:WpfWebClient"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"
Title="PatientForm" Width="593" Height="565">
<Grid Height="565">
<Grid.RowDefinitions>
<RowDefinition Height="42*"/>
<RowDefinition Height="523*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="138*"/>
<ColumnDefinition Width="455*"/>
</Grid.ColumnDefinitions>
<Label Content="Add new foodplace" HorizontalAlignment="Left" VerticalAlignment="Top" Height="45" Width="433" FontFamily="Tahoma" FontSize="24" Margin="0.4,-3,0,0" Grid.Column="1" Grid.RowSpan="2"/>
</Grid>
</Page>

29
WebClient/WpfWebClient/FoodplaceForm.xaml.cs Normal file
View File

@ -0,0 +1,29 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using WpfWebClient.ServiceReferenceEHEC;
namespace WpfWebClient
{
/// <summary>
/// Interaction logic for FoodplaceForm.xaml
/// </summary>
public partial class FoodplaceForm : Page
{
public FoodplaceForm()
{
InitializeComponent();
}
}
}

14
WebClient/WpfWebClient/MainWindow.xaml
View File

@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:WpfWebClient"
mc:Ignorable="d"
Title="MainWindow" Height="596" Width="800">
Title="MainWindow" Height="700" Width="800">
<Grid Margin="0,0,-6.4,0.4">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="199*"/>
@ -14,12 +14,14 @@
<Grid HorizontalAlignment="Left" Height="565" VerticalAlignment="Top" Width="200
" Grid.ColumnSpan="2">
<Button Content="Home" HorizontalAlignment="Left" Margin="10,187,0,0" VerticalAlignment="Top" Width="190" Height="66" FontSize="24" FontFamily="Tahoma" Click="Button_Click_Home"/>
<Button Content="New Case" HorizontalAlignment="Left" Margin="10,258,0,0" VerticalAlignment="Top" Width="190" Height="66" FontSize="24" FontFamily="Tahoma" Click="Button_Click_NewCase"/>
<Button Content="View Doctors" HorizontalAlignment="Left" Margin="10,329,0,0" VerticalAlignment="Top" Width="190" Height="66" FontFamily="Tahoma" FontSize="24" Click="Button_Click_ViewDoctors"/>
<Button Content="View Strains" HorizontalAlignment="Left" Margin="10,400,0,0" VerticalAlignment="Top" Width="190" Height="66" FontFamily="Tahoma" FontSize="24" Click="Button_Click_ViewStrains"/>
<Button Content="Add Foodplace" HorizontalAlignment="Left" Margin="10,473,0,0" VerticalAlignment="Top" Width="190" Height="66" FontFamily="Tahoma" FontSize="24" Click="Button_Click_AddFoodplace"/>
<Button Content="Add Patient" HorizontalAlignment="Left" Margin="10,258,0,0" VerticalAlignment="Top" Width="190" Height="66" FontSize="24" FontFamily="Tahoma" Click="Button_Click_AddPatient"/>
<Button Content="View Doctors" HorizontalAlignment="Left" Margin="10,471,0,0" VerticalAlignment="Top" Width="190" Height="66" FontFamily="Tahoma" FontSize="24" Click="Button_Click_ViewDoctors"/>
<Button Content="View Strains" HorizontalAlignment="Left" Margin="10,542,0,-43" VerticalAlignment="Top" Width="190" Height="66" FontFamily="Tahoma" FontSize="24" Click="Button_Click_ViewStrains"/>
<Button Content="Add Foodplace" HorizontalAlignment="Left" Margin="10,329,0,0" VerticalAlignment="Top" Width="190" Height="66" FontFamily="Tahoma" FontSize="24" Click="Button_Click_AddFoodplace"/>
<Button Content="Add Exam" HorizontalAlignment="Left" Margin="10,400,0,0" VerticalAlignment="Top" Width="190" Height="66" FontFamily="Tahoma" FontSize="24" Click="Button_Click_AddExam"/>
<Image HorizontalAlignment="Left" Height="187" VerticalAlignment="Top" Width="200" Source="Images/eheclogo.png"/>
</Grid>
</Grid>
<Grid Grid.Column="1" HorizontalAlignment="Right" Height="565" VerticalAlignment="Top" Width="593"/>
<Frame x:Name="Main" HorizontalAlignment="Left" Width="593" Grid.Column="1" NavigationUIVisibility="Hidden" Navigated="Main_Navigated" Margin="0" UseLayoutRounding="False"/>
</Grid>

27
WebClient/WpfWebClient/MainWindow.xaml.cs
View File

@ -25,11 +25,26 @@ namespace WpfWebClient
InitializeComponent();
}
private void Button_Click_NewCase(object sender, RoutedEventArgs e)
private void Button_Click_Home(object sender, RoutedEventArgs e)
{
Main.Content = new Home();
}
private void Button_Click_AddPatient(object sender, RoutedEventArgs e)
{
Main.Content = new PatientForm();
}
private void Button_Click_AddFoodplace(object sender, RoutedEventArgs e)
{
Main.Content = new FoodplaceForm();
}
private void Button_Click_AddExam(object sender, RoutedEventArgs e)
{
Main.Content = new ExamForm();
}
private void Button_Click_ViewDoctors(object sender, RoutedEventArgs e)
{
Main.Content = new ViewDoctors();
@ -40,16 +55,6 @@ namespace WpfWebClient
Main.Content = new ViewStrains();
}
private void Button_Click_Home(object sender, RoutedEventArgs e)
{
Main.Content = new Home();
}
private void Button_Click_AddFoodplace(object sender, RoutedEventArgs e)
{
Main.Content = new AddFoodplace();
}
private void Main_Navigated(object sender, NavigationEventArgs e)
{

32
WebClient/WpfWebClient/PatientForm.xaml
View File

@ -8,7 +8,7 @@
d:DesignHeight="450" d:DesignWidth="800"
Title="PatientForm" Width="593" Height="565">
<Grid Width="593" Height="565">
<Grid Height="565">
<Grid.RowDefinitions>
<RowDefinition Height="42*"/>
<RowDefinition Height="523*"/>
@ -17,20 +17,20 @@
<ColumnDefinition Width="138*"/>
<ColumnDefinition Width="455*"/>
</Grid.ColumnDefinitions>
<Label Content="Neuen Patienten anlegen" HorizontalAlignment="Left" VerticalAlignment="Top" Height="35" Width="433" FontFamily="Tahoma" FontSize="24" Margin="0,-3,0,0" Grid.Column="1"/>
<Label Content="Name" HorizontalAlignment="Left" Margin="10,104,0,0" Grid.Row="1" VerticalAlignment="Top" Height="34" Width="104" FontFamily="Tahoma" FontSize="24"/>
<Label Content="Vorname" HorizontalAlignment="Left" Margin="10,152,0,0" Grid.Row="1" VerticalAlignment="Top" Height="34" Width="104" FontFamily="Tahoma" FontSize="24"/>
<Label Content="Strasse" HorizontalAlignment="Left" Margin="10,201,0,0" Grid.Row="1" VerticalAlignment="Top" Height="34" Width="104" FontFamily="Tahoma" FontSize="24"/>
<Label Content="Ort" HorizontalAlignment="Left" Margin="10,248,0,0" Grid.Row="1" VerticalAlignment="Top" Height="34" Width="75" FontFamily="Tahoma" FontSize="24"/>
<Label Content="Arzt" HorizontalAlignment="Left" Margin="10,351.4,0,0" Grid.Row="1" VerticalAlignment="Top" Height="34" Width="75" FontFamily="Tahoma" FontSize="24" RenderTransformOrigin="0.533,1.244"/>
<Label Content="Anrede" HorizontalAlignment="Left" Margin="10,61,0,0" Grid.Row="1" VerticalAlignment="Top" Height="34" Width="104" FontSize="24" FontFamily="Tahoma"/>
<TextBox x:Name="txtName" Grid.Column="1" HorizontalAlignment="Left" Height="34" Margin="0,104,0,0" Grid.Row="1" TextWrapping="Wrap" Text="TextBox" VerticalAlignment="Top" Width="455"/>
<TextBox x:Name="txtVorname" Grid.Column="1" HorizontalAlignment="Left" Height="34" Margin="0,152,0,0" Grid.Row="1" TextWrapping="Wrap" Text="TextBox" VerticalAlignment="Top" Width="455"/>
<TextBox x:Name="txtStrasse" Grid.Column="1" HorizontalAlignment="Left" Height="34" Margin="0,201,0,0" Grid.Row="1" TextWrapping="Wrap" Text="TextBox" VerticalAlignment="Top" Width="455"/>
<ComboBox x:Name="ComboBoxSalutations" HorizontalAlignment="Left" Margin="0.4,61.4,-0.2,0" Grid.Row="1" VerticalAlignment="Top" Width="455" Height="34" Grid.Column="1"/>
<ComboBox x:Name="ComboBoxCities" HorizontalAlignment="Left" Margin="0.4,253.4,-0.2,0" Grid.Row="1" VerticalAlignment="Top" Width="455" Grid.Column="1" Height="34"/>
<ComboBox x:Name="ComboBoxCountries" HorizontalAlignment="Left" Margin="0.4,297.4,-0.2,0" Grid.Row="1" VerticalAlignment="Top" Width="455" Grid.Column="1" Height="34"/>
<ComboBox x:Name="ComboBoxDoctors" HorizontalAlignment="Left" Margin="0.4,351.4,-0.2,0" Grid.Row="1" VerticalAlignment="Top" Width="455" Grid.Column="1" Height="34"/>
<Label Content="Land" HorizontalAlignment="Left" Margin="10,297.4,0,0" Grid.Row="1" VerticalAlignment="Top" Height="34" Width="75" FontFamily="Tahoma" FontSize="24"/>
<Label Content="Add new patient" HorizontalAlignment="Left" VerticalAlignment="Top" Height="45" Width="433" FontFamily="Tahoma" FontSize="24" Margin="0.4,-3,0,0" Grid.Column="1" Grid.RowSpan="2"/>
<Label Content="Surname" Margin="0,66.4,454.8,0" Grid.Row="1" VerticalAlignment="Top" Height="34" FontFamily="Tahoma" FontSize="24" Grid.ColumnSpan="2"/>
<Label Content="Name" Margin="0,114.4,454.8,0" Grid.Row="1" VerticalAlignment="Top" Height="34" FontFamily="Tahoma" FontSize="24" Grid.ColumnSpan="2"/>
<Label Content="Street" Margin="0,163.4,454.8,0" Grid.Row="1" VerticalAlignment="Top" Height="34" FontFamily="Tahoma" FontSize="24" Grid.ColumnSpan="2"/>
<Label Content="City" Margin="0,210.4,454.8,0" Grid.Row="1" VerticalAlignment="Top" Height="39" FontFamily="Tahoma" FontSize="24" Grid.ColumnSpan="2"/>
<Label Content="Doctors" Margin="0,305.4,454.8,0" Grid.Row="1" VerticalAlignment="Top" Height="34" FontFamily="Tahoma" FontSize="24" RenderTransformOrigin="0.533,1.244" Grid.ColumnSpan="2"/>
<Label Content="Salutation" Margin="0,23.4,454.8,0" Grid.Row="1" VerticalAlignment="Top" Height="34" FontSize="24" FontFamily="Tahoma" Grid.ColumnSpan="2"/>
<TextBox x:Name="txtSurname" Grid.Column="1" HorizontalAlignment="Left" Height="34" Margin="0.4,66.4,0,0" Grid.Row="1" TextWrapping="Wrap" VerticalAlignment="Top" Width="433"/>
<TextBox x:Name="txtFirstName" Grid.Column="1" HorizontalAlignment="Left" Height="34" Margin="0.4,114.4,0,0" Grid.Row="1" TextWrapping="Wrap" VerticalAlignment="Top" Width="433"/>
<TextBox x:Name="txtStreet" Grid.Column="1" Height="34" Margin="0.4,163.4,21.8,0" Grid.Row="1" TextWrapping="Wrap" VerticalAlignment="Top"/>
<ComboBox x:Name="ComboBoxSalutations" HorizontalAlignment="Left" Margin="0.4,23.4,0,0" Grid.Row="1" VerticalAlignment="Top" Width="433" Height="34" Grid.Column="1"/>
<ComboBox x:Name="ComboBoxCities" HorizontalAlignment="Left" Margin="0.4,215.4,0,0" Grid.Row="1" VerticalAlignment="Top" Width="433" Grid.Column="1" Height="34"/>
<ComboBox x:Name="ComboBoxCountries" HorizontalAlignment="Left" Margin="0.4,259.4,0,0" Grid.Row="1" VerticalAlignment="Top" Width="433" Grid.Column="1" Height="34"/>
<ComboBox x:Name="ComboBoxDoctors" HorizontalAlignment="Left" Margin="0.4,305.4,0,0" Grid.Row="1" VerticalAlignment="Top" Width="433" Grid.Column="1" Height="34"/>
<Label Content="Country" Margin="0,259.4,454.8,0" Grid.Row="1" VerticalAlignment="Top" Height="41" FontFamily="Tahoma" FontSize="24" Grid.ColumnSpan="2"/>
</Grid>
</Page>

1
WebClient/WpfWebClient/PatientForm.xaml.cs
View File

@ -57,6 +57,7 @@ namespace WpfWebClient
ComboBoxDoctors.DisplayMemberPath = "FirstName";
client.Close();
}

4
WebClient/WpfWebClient/ViewDoctors.xaml.cs
View File

@ -28,11 +28,13 @@ namespace WpfWebClient
WpfWebClient.ServiceReferenceEHEC.ServiceClient client = new WpfWebClient.ServiceReferenceEHEC.ServiceClient();
//var doctors = client.GetDoctors();
//call method GetDoctors and save them to doctorlist
List<WpfWebClient.ServiceReferenceEHEC.Doctor> doctorlist = new List<ServiceReferenceEHEC.Doctor>(client.GetDoctors());
DataGridViewDoctors.ItemsSource = doctorlist;
client.Close();
}
}
}

8
WebClient/WpfWebClient/ViewStrains.xaml.cs
View File

@ -27,13 +27,13 @@ namespace WpfWebClient
WpfWebClient.ServiceReferenceEHEC.ServiceClient client = new WpfWebClient.ServiceReferenceEHEC.ServiceClient();
//var doctors = client.GetDoctors();
//call method GetStrains and save them to strainlist
//List<WpfWebClient.ServiceReferenceEHEC.Doctor> doctorlist = new List<ServiceReferenceEHEC.Doctor>(client.GetStrains());
List<WpfWebClient.ServiceReferenceEHEC.Strain> strainlist = new List<ServiceReferenceEHEC.Strain>(client.GetStrains());
DataGridViewStrains.ItemsSource = strainlist;
//DataGridViewStrains.ItemsSource = doctorlist;
client.Close();
}
}

13
WebClient/WpfWebClient/WpfWebClient.csproj
View File

@ -56,8 +56,11 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Compile Include="AddFoodplace.xaml.cs">
<DependentUpon>AddFoodplace.xaml</DependentUpon>
<Compile Include="ExamForm.xaml.cs">
<DependentUpon>ExamForm.xaml</DependentUpon>
</Compile>
<Compile Include="FoodplaceForm.xaml.cs">
<DependentUpon>FoodplaceForm.xaml</DependentUpon>
</Compile>
<Compile Include="Home.xaml.cs">
<DependentUpon>Home.xaml</DependentUpon>
@ -68,7 +71,11 @@
<Compile Include="ViewDoctors.xaml.cs">
<DependentUpon>ViewDoctors.xaml</DependentUpon>
</Compile>
<Page Include="AddFoodplace.xaml">
<Page Include="ExamForm.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="FoodplaceForm.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>