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

general improvements

This commit is contained in:
Strati 2018-09-02 18:28:24 +02:00
parent 22f6d0ba72
commit ddd2869eef
5 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,6 +109,7 @@ namespace WpfWebClient
client.WriteExam(exam);
}

10
WebClient/WpfWebClient/Helper/GenerateTestData.cs
View File

@ -76,12 +76,15 @@ namespace WpfWebClient.Helper
i++;
}
client.Close();
return Foodplaces;
}
public static List<PatientAtFoodPlace> CreatePatientAtFoodPlaces()
public static List<PatientAtFoodPlace> CreatePatientAtFoodPlaces(int userinput)
{
WpfWebClient.ServiceReferenceEHEC.ServiceClient client = new WpfWebClient.ServiceReferenceEHEC.ServiceClient();
List<WpfWebClient.ServiceReferenceEHEC.FoodPlace> foodPlaces = new List<ServiceReferenceEHEC.FoodPlace>(client.GetFoodPlaces());
@ -103,14 +106,15 @@ namespace WpfWebClient.Helper
patf.FoodPlace = foodpl;
patf.Patient = patient;
//patf.PatientID = i;
patf.VistingDate = new DateTime(2005, 12, 20);
PatientsAtFoodPlaces.Add(patf);
i++;
} while (i < 5);
} while (i < userinput);
client.Close();
return PatientsAtFoodPlaces;
}

16
WebClient/WpfWebClient/Home.xaml
View File

@ -9,15 +9,21 @@
Title="Home" Width="593" Height="565">
<Grid Width="593" Height="565">
<Grid.RowDefinitions>
<RowDefinition Height="98*"/>
<RowDefinition Height="15*"/>
</Grid.RowDefinitions>
<Label Content="Willkommen" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" FontFamily="Tahoma" FontSize="48" Height="61" Width="272"/>
<TextBlock HorizontalAlignment="Left" Margin="10,80,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Height="475" Width="573" FontSize="20"><Run Text="Haben Sie die Applikation zum ersten Mal gestartet"/><Run Text="?"/><LineBreak/><Run/><LineBreak/><Run Text="1. Erstellen Sie neue Patienten"/><LineBreak/><Run Text="2. "/><Run Text="Generieren "/><Run Text="Sie neue Bakterienstämme"/><Run Text=" "/><LineBreak/><Run/><LineBreak/><Run Text="Enter desired letters"/><Run Text=" per strain"/><Run Text=": "/><Run Text="&#x9;"/><InlineUIContainer>
<TextBlock HorizontalAlignment="Left" Margin="10,80,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Height="475" Width="573" FontSize="20" Grid.RowSpan="2"><Run Text="Haben Sie die Applikation zum ersten Mal gestartet"/><Run Text="?"/><LineBreak/><Run/><LineBreak/><Run Text="1. Erstellen Sie neue Patienten"/><LineBreak/><Run Text="2. "/><Run Text="Generieren "/><Run Text="Sie neue Bakterienstämme"/><Run Text=" "/><LineBreak/><Run/><LineBreak/><Run Text="Enter desired letters"/><Run Text=" per strain"/><Run Text=": "/><Run Text="&#x9;"/><InlineUIContainer>
<TextBox x:Name="txtNumLetters" Height="30" TextWrapping="Wrap" Text="5" Width="120"/>
</InlineUIContainer><LineBreak/><Run Text="Enter desired"/><Run Text=" amount of"/><Run Text=" strains: "/><Run Text="&#x9;"/><InlineUIContainer>
<TextBox x:Name="txtNumStrains" Height="30" TextWrapping="Wrap" Text="100" Width="120"/>
<TextBox x:Name="txtNumStrains" Height="30" TextWrapping="Wrap" Text="10" Width="120"/>
</InlineUIContainer><LineBreak/><LineBreak/><InlineUIContainer>
<Button x:Name="btnRandomStrainGenerator" Content="CREATE RANDOM STRAINS" Width="580" Height="34" Click="btnRandomStrainGenerator_Click"/>
</InlineUIContainer><Run Text="&#x9;"/><LineBreak/><Run Text="3. Erfassen Sie einen neuen Fall"/><Run Text=" oder erstellen Sie Testdaten. "/><Run/><LineBreak/><Run Text="4. "/><Run Text="Erfassen Sie neue FoodPlaces oder erstellen Sie Testdaten"/><Run Text="."/><LineBreak/><Run/><LineBreak/><Run/><LineBreak/><InlineUIContainer>
<Button Content="CREATE TESTDATA" Width="582" Click="btnCreateTestdata_Click"/>
<Button x:Name="btnRandomStrainGenerator" Content="CREATE RANDOM STRAINS" Width="572" Height="34" Click="btnRandomStrainGenerator_Click"/>
</InlineUIContainer><Run Text="&#x9;"/><LineBreak/><Run Text="3. Erfassen Sie einen neuen Fall"/><Run Text=" oder erstellen Sie Testdaten. "/><Run/><LineBreak/><Run Text="4. "/><Run Text="Erfassen Sie neue FoodPlaces oder erstellen Sie Testdaten"/><Run Text="."/><LineBreak/><Run/><LineBreak/><Run Text="Anzahl gewünschter Testdaten: "/><Run Text="&#x9;"/><InlineUIContainer>
<TextBox x:Name="txtNumberofTestdata" Height="27" InputMethod.IsInputMethodEnabled="False" TextWrapping="Wrap" Text="200" UseLayoutRounding="True" Width="83" d:DesignUseLayoutRounding="True"/>
</InlineUIContainer><LineBreak/><Run/><LineBreak/><InlineUIContainer>
<Button Content="CREATE TESTDATA" Width="570" Click="btnCreateTestdata_Click"/>
</InlineUIContainer><LineBreak/><Run/><LineBreak/><LineBreak/></TextBlock>
</Grid>

3
WebClient/WpfWebClient/Home.xaml.cs
View File

@ -99,7 +99,8 @@ namespace WpfWebClient
// create a bunch of people at foodplaces
var patientsatfps = GenerateTestData.CreatePatientAtFoodPlaces();
var patientsatfps = GenerateTestData.CreatePatientAtFoodPlaces(int.Parse(txtNumberofTestdata.Text));
foreach (var f in patientsatfps)
{

12
WebClient/WpfWebClient/MainWindow.xaml
View File

@ -13,12 +13,12 @@
</Grid.ColumnDefinitions>
<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="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"/>
<Button Content="Home" HorizontalAlignment="Left" Margin="10,187,0,0" VerticalAlignment="Top" Width="180" Height="66" FontSize="24" FontFamily="Tahoma" Click="Button_Click_Home"/>
<Button Content="Add Patient" HorizontalAlignment="Left" Margin="10,258,0,0" VerticalAlignment="Top" Width="180" Height="66" FontSize="24" FontFamily="Tahoma" Click="Button_Click_AddPatient"/>
<Button Content="View Doctors" HorizontalAlignment="Left" Margin="10,471,0,0" VerticalAlignment="Top" Width="180" Height="66" FontFamily="Tahoma" FontSize="24" Click="Button_Click_ViewDoctors"/>
<Button Content="View Strains" HorizontalAlignment="Left" Margin="10,542,0,-43" VerticalAlignment="Top" Width="180" Height="66" FontFamily="Tahoma" FontSize="24" Click="Button_Click_ViewStrains"/>
<Button Content="Add Foodplace" HorizontalAlignment="Left" Margin="10,329,0,0" VerticalAlignment="Top" Width="180" Height="66" FontFamily="Tahoma" FontSize="24" Click="Button_Click_AddFoodplace"/>
<Button Content="Add Exam" HorizontalAlignment="Left" Margin="10,400,0,0" VerticalAlignment="Top" Width="180" Height="66" FontFamily="Tahoma" FontSize="24" Click="Button_Click_AddExam"/>
<Image HorizontalAlignment="Left" Height="187" VerticalAlignment="Top" Width="200" Source="Images/eheclogo.png"/>
</Grid>