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

Finaly got Client to run.

This commit is contained in:
Ivan Hörler 2018-07-13 21:17:03 +02:00
parent a5a89f8bbe
commit b5736e9e3c
12 changed files with 114 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Client/Client/Connected Services/EHEC_Service/Reference.cs
View File

@ -770,44 +770,23 @@ namespace Client.EHEC_Service {
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IService/WriteDoctor", ReplyAction="http://tempuri.org/IService/WriteDoctorResponse")]
Client.EHEC_Service.Doctor WriteDoctor(Client.EHEC_Service.Doctor doctor);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IService/WriteDoctor", ReplyAction="http://tempuri.org/IService/WriteDoctorResponse")]
System.Threading.Tasks.Task<Client.EHEC_Service.Doctor> WriteDoctorAsync(Client.EHEC_Service.Doctor doctor);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IService/WritePatient", ReplyAction="http://tempuri.org/IService/WritePatientResponse")]
Client.EHEC_Service.Patient WritePatient(Client.EHEC_Service.Patient patient);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IService/WritePatient", ReplyAction="http://tempuri.org/IService/WritePatientResponse")]
System.Threading.Tasks.Task<Client.EHEC_Service.Patient> WritePatientAsync(Client.EHEC_Service.Patient patient);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IService/WriteOrigin", ReplyAction="http://tempuri.org/IService/WriteOriginResponse")]
Client.EHEC_Service.Origin WriteOrigin(Client.EHEC_Service.Origin origin);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IService/WriteOrigin", ReplyAction="http://tempuri.org/IService/WriteOriginResponse")]
System.Threading.Tasks.Task<Client.EHEC_Service.Origin> WriteOriginAsync(Client.EHEC_Service.Origin origin);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IService/WriteExam", ReplyAction="http://tempuri.org/IService/WriteExamResponse")]
Client.EHEC_Service.Exam WriteExam(Client.EHEC_Service.Exam exam);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IService/WriteExam", ReplyAction="http://tempuri.org/IService/WriteExamResponse")]
System.Threading.Tasks.Task<Client.EHEC_Service.Exam> WriteExamAsync(Client.EHEC_Service.Exam exam);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IService/WriteOrigin_Exam", ReplyAction="http://tempuri.org/IService/WriteOrigin_ExamResponse")]
Client.EHEC_Service.Origin_Exam WriteOrigin_Exam(Client.EHEC_Service.Origin_Exam origin_exam);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IService/WriteOrigin_Exam", ReplyAction="http://tempuri.org/IService/WriteOrigin_ExamResponse")]
System.Threading.Tasks.Task<Client.EHEC_Service.Origin_Exam> WriteOrigin_ExamAsync(Client.EHEC_Service.Origin_Exam origin_exam);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IService/WriteResult", ReplyAction="http://tempuri.org/IService/WriteResultResponse")]
Client.EHEC_Service.Result WriteResult(Client.EHEC_Service.Result result);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IService/WriteResult", ReplyAction="http://tempuri.org/IService/WriteResultResponse")]
System.Threading.Tasks.Task<Client.EHEC_Service.Result> WriteResultAsync(Client.EHEC_Service.Result result);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IService/GetResults", ReplyAction="http://tempuri.org/IService/GetResultsResponse")]
Client.EHEC_Service.Result[] GetResults();
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IService/GetResults", ReplyAction="http://tempuri.org/IService/GetResultsResponse")]
System.Threading.Tasks.Task<Client.EHEC_Service.Result[]> GetResultsAsync();
}
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@ -841,56 +820,28 @@ namespace Client.EHEC_Service {
return base.Channel.WriteDoctor(doctor);
}
public System.Threading.Tasks.Task<Client.EHEC_Service.Doctor> WriteDoctorAsync(Client.EHEC_Service.Doctor doctor) {
return base.Channel.WriteDoctorAsync(doctor);
}
public Client.EHEC_Service.Patient WritePatient(Client.EHEC_Service.Patient patient) {
return base.Channel.WritePatient(patient);
}
public System.Threading.Tasks.Task<Client.EHEC_Service.Patient> WritePatientAsync(Client.EHEC_Service.Patient patient) {
return base.Channel.WritePatientAsync(patient);
}
public Client.EHEC_Service.Origin WriteOrigin(Client.EHEC_Service.Origin origin) {
return base.Channel.WriteOrigin(origin);
}
public System.Threading.Tasks.Task<Client.EHEC_Service.Origin> WriteOriginAsync(Client.EHEC_Service.Origin origin) {
return base.Channel.WriteOriginAsync(origin);
}
public Client.EHEC_Service.Exam WriteExam(Client.EHEC_Service.Exam exam) {
return base.Channel.WriteExam(exam);
}
public System.Threading.Tasks.Task<Client.EHEC_Service.Exam> WriteExamAsync(Client.EHEC_Service.Exam exam) {
return base.Channel.WriteExamAsync(exam);
}
public Client.EHEC_Service.Origin_Exam WriteOrigin_Exam(Client.EHEC_Service.Origin_Exam origin_exam) {
return base.Channel.WriteOrigin_Exam(origin_exam);
}
public System.Threading.Tasks.Task<Client.EHEC_Service.Origin_Exam> WriteOrigin_ExamAsync(Client.EHEC_Service.Origin_Exam origin_exam) {
return base.Channel.WriteOrigin_ExamAsync(origin_exam);
}
public Client.EHEC_Service.Result WriteResult(Client.EHEC_Service.Result result) {
return base.Channel.WriteResult(result);
}
public System.Threading.Tasks.Task<Client.EHEC_Service.Result> WriteResultAsync(Client.EHEC_Service.Result result) {
return base.Channel.WriteResultAsync(result);
}
public Client.EHEC_Service.Result[] GetResults() {
return base.Channel.GetResults();
}
public System.Threading.Tasks.Task<Client.EHEC_Service.Result[]> GetResultsAsync() {
return base.Channel.GetResultsAsync();
}
}
}

1
Client/Client/Connected Services/EHEC_Service/Reference.svcmap
View File

@ -2,7 +2,6 @@
<ReferenceGroup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ID="534f788b-c5fe-481c-bffe-c254d9c791d6" xmlns="urn:schemas-microsoft-com:xml-wcfservicemap">
<ClientOptions>
<GenerateAsynchronousMethods>false</GenerateAsynchronousMethods>
<GenerateTaskBasedAsynchronousMethod>true</GenerateTaskBasedAsynchronousMethod>
<EnableDataBinding>true</EnableDataBinding>
<ExcludedTypes />
<ImportXmlTypes>false</ImportXmlTypes>

112
Client/Client/MainWindow.xaml
View File

@ -16,17 +16,18 @@
<RowDefinition Height="32*"/>
<RowDefinition Height="32*"/>
<RowDefinition Height="32*"/>
<RowDefinition Height="32"/>
<RowDefinition Height="32*"/>
<RowDefinition Height="31*"/>
<RowDefinition Height="32*"/>
<RowDefinition Height="31*"/>
<RowDefinition Height="32*"/>
<RowDefinition Height="32*"/>
<RowDefinition Height="32*"/>
<RowDefinition Height="32*"/>
<RowDefinition Height="32*"/>
<RowDefinition Height="31*"/>
<RowDefinition Height="32*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="75*"/>
<ColumnDefinition Width="55*"/>
<ColumnDefinition Width="20*"/>
<ColumnDefinition Width="76*"/>
<ColumnDefinition Width="105*"/>
<ColumnDefinition Width="134*"/>
@ -36,262 +37,269 @@
<ColumnDefinition Width="120*"/>
<ColumnDefinition Width="25*"/>
</Grid.ColumnDefinitions>
<Label x:Name="LabelTitel" Content="EHEC Meldeform:" Grid.ColumnSpan="3" Grid.RowSpan="2" Margin="1,1,1,0.4" VerticalContentAlignment="Center" FontSize="20" />
<Label x:Name="LabelArzt" Content="Arzt:" Margin="1,1.6,1.2,0.4" Grid.Row="2" VerticalContentAlignment="Center"/>
<Label x:Name="LabelPatient" Content="Patient:" Margin="1,1.6,1.2,0.4" RenderTransformOrigin="0.582,0.288" Grid.Row="8" VerticalContentAlignment="Center"/>
<Label x:Name="LabelAnalyseergebnisse" Content="Analyseergebnisse:" Margin="1,1.6,0.6,0.4" Grid.Column="3" Grid.Row="2" VerticalContentAlignment="Center"/>
<Label x:Name="LabelNahrungseinnahmen" Content="Nahrungseinnahmen:" Margin="1,1.6,0.6,0.4" Grid.Column="3" Grid.Row="3" VerticalContentAlignment="Center"/>
<Button x:Name="ButtonClose" Content="X" Margin="1.2,1,0.6,0.8" Click="ButtonClose_Click" Background="White" RenderTransformOrigin="0.573,1.105" Grid.Column="8"/>
<Button x:Name="ButtonAutogenerateOne" Content="Auto One" Margin="1" Background="White" Grid.Column="4" Grid.Row="14" VerticalContentAlignment="Center" RenderTransformOrigin="0.501,0.5" Click="ButtonAutogenerateOne_Click"/>
<Button x:Name="ButtonAutogenerateMany" Content="Many" Margin="1" Background="White" Grid.Column="5" Grid.Row="14" VerticalContentAlignment="Center" Click="ButtonAutogenerateMany_Click"/>
<Button x:Name="ButtonSend" Content="Senden" Margin="1.2,1,0.8,1" Click="ButtonSend_Click" Background="White" Grid.Column="7" Grid.Row="14" VerticalContentAlignment="Center"/>
<Label x:Name="LabelRueckmeldung" Content="Rückmeldung:" Margin="1,1.2,0.6,2" Grid.Column="3" Grid.Row="13" VerticalContentAlignment="Center"/>
<Label x:Name="LabelRueckmeldungsfeld" Content="" Margin="1.4,1.2,9.6,2" Grid.ColumnSpan="5" Grid.Column="4" Grid.Row="13" VerticalContentAlignment="Center"/>
<xctk:WatermarkTextBox x:Name="TextboxArztName" Margin="0.8,1.6,1,0.4" Padding="3,1" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="2" VerticalContentAlignment="Center">
<Label x:Name="LabelTitel" Content="EHEC Meldeform:" Grid.ColumnSpan="4" Grid.RowSpan="2" Margin="1,1,1,0.4" VerticalContentAlignment="Center" FontSize="20" />
<Label x:Name="LabelArzt" Content="Arzt:" Margin="1" Grid.Row="2" VerticalContentAlignment="Center"/>
<Label x:Name="LabelPatient" Content="Patient:" Margin="1" RenderTransformOrigin="0.582,0.288" Grid.Row="8" VerticalContentAlignment="Center" Width="50"/>
<Label x:Name="LabelAnalyseergebnisse" Content="Analyseergebnisse:" Margin="1,1.6,0.6,0.4" Grid.Column="4" Grid.Row="2" VerticalContentAlignment="Center"/>
<Label x:Name="LabelNahrungseinnahmen" Content="Nahrungseinnahmen:" Margin="1,1.6,0.6,0.4" Grid.Column="4" Grid.Row="3" VerticalContentAlignment="Center"/>
<Button x:Name="ButtonClose" Content="X" Margin="1.2,1,0.6,0.8" Click="ButtonClose_Click" Background="White" RenderTransformOrigin="0.573,1.105" Grid.Column="9"/>
<Button x:Name="ButtonAutogenerateOne" Content="Auto One" Margin="1.4,1,1.2,1" Background="White" Grid.Column="5" Grid.Row="14" VerticalContentAlignment="Center" RenderTransformOrigin="0.501,0.5" Click="ButtonAutogenerateOne_Click"/>
<Button x:Name="ButtonAutogenerateMany" Content="Many" Margin="0.8,1,1.2,1" Background="White" Grid.Column="6" Grid.Row="14" VerticalContentAlignment="Center" Click="ButtonAutogenerateMany_Click"/>
<Button x:Name="ButtonSend" Content="Senden" Margin="1.2,1,0.8,1" Click="ButtonSend_Click" Background="White" Grid.Column="8" Grid.Row="14" VerticalContentAlignment="Center"/>
<Label x:Name="LabelRueckmeldung" Content="Rückmeldung:" Margin="1,1.2,0.6,2" Grid.Column="4" Grid.Row="13" VerticalContentAlignment="Center"/>
<Label x:Name="LabelRueckmeldungsfeld" Content="" Margin="1.4,1.2,9.6,2" Grid.ColumnSpan="5" Grid.Column="5" Grid.Row="13" VerticalContentAlignment="Center"/>
<ComboBox Grid.Column="5" HorizontalAlignment="Left" Grid.Row="12" VerticalAlignment="Top" Width="148" Height="22" Margin="0.4,0.2,0,0" Grid.ColumnSpan="2"/>
<Label x:Name="LabelPatientId" Content="" Margin="0" Grid.Row="8" VerticalContentAlignment="Center" Grid.Column="1" FontSize="6"/>
<Label x:Name="LabelArztId" Content="" Margin="0" Grid.Row="2" VerticalContentAlignment="Center" Grid.Column="1" FontSize="6"/>
<Label x:Name="LabelBakterienstamm" Content="" Margin="0.8,0.6,58.8,1.4" Grid.Row="2" VerticalContentAlignment="Center" Grid.Column="7" FontSize="6"/>
<Label x:Name="LabelNahrung1Id" Content="" Margin="1" Grid.Row="3" VerticalContentAlignment="Center" Grid.Column="9" FontSize="6"/>
<Label x:Name="LabelNahrung2Id" Content="" Margin="1" Grid.Row="5" VerticalContentAlignment="Center" Grid.Column="9" FontSize="6"/>
<Label x:Name="LabelNahrung3Id" Content="" Margin="1" Grid.Row="7" VerticalContentAlignment="Center" Grid.Column="9" FontSize="6"/>
<Label x:Name="LabelNahrung4Id" Content="" Margin="1" Grid.Row="9" VerticalContentAlignment="Center" Grid.Column="9" FontSize="6"/>
<xctk:WatermarkTextBox x:Name="TextboxArztName" Margin="0.8,1.6,1,0.4" Padding="3,1" Grid.ColumnSpan="2" Grid.Column="2" Grid.Row="2" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Name" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxArztVorname" Margin="0.8,1.6,1,0.4" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="3" Grid.Column="1" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox x:Name="TextboxArztVorname" Margin="0.8,1.6,1,0.4" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="3" Grid.Column="2" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Vorname" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxArztStrasseNr" Margin="0.8,1.6,1,0.4" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="4" Grid.Column="1" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox x:Name="TextboxArztStrasseNr" Margin="0.8,1.6,1,0.4" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="4" Grid.Column="2" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Strasse Nr" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxArztPlz" Margin="0.8,1.6,1.2,0.4" Padding="3,1" Grid.Row="5" Grid.Column="1" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox x:Name="TextboxArztPlz" Margin="0.8,1.6,1.2,0.4" Padding="3,1" Grid.Row="5" Grid.Column="2" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="PLZ" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxArztOrt" Margin="0.8,1.6,1,0.4" Padding="3,1" Grid.Column="2" Grid.Row="5" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox x:Name="TextboxArztOrt" Margin="0.8,1.6,1,0.4" Padding="3,1" Grid.Column="3" Grid.Row="5" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Ort" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxArztKantonsarzt" Margin="0.8,1.6,1,0.4" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="6" Grid.Column="1" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox x:Name="TextboxArztKantonsarzt" Margin="0.8,1.6,1,0.4" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="6" Grid.Column="2" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Kantonsarzt" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxArztRegion" Margin="0.8,1.6,1,0.4" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="7" Grid.Column="1" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox x:Name="TextboxArztRegion" Margin="0.8,1.6,1,0.4" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="7" Grid.Column="2" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Arztregion" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxPatientName" Margin="0.8,1.6,1,0.4" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="8" Grid.Column="1" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox x:Name="TextboxPatientName" Margin="0.8,1.6,1,0.4" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="8" Grid.Column="2" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Name" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxPatientVorname" Margin="0.8,1.6,1,31.6" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="9" Grid.Column="1" VerticalContentAlignment="Center" Grid.RowSpan="2">
<xctk:WatermarkTextBox x:Name="TextboxPatientVorname" Margin="0.8,1.6,1,31.6" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="9" Grid.Column="2" VerticalContentAlignment="Center" Grid.RowSpan="2">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Vorname" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxPatientStrasseNr" Margin="0.8,1.4,1,0.6" Padding="4,1,3,1" Grid.ColumnSpan="2" Grid.Row="10" Grid.Column="1" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox x:Name="TextboxPatientStrasseNr" Margin="0.8,1.4,1,0.6" Padding="4,1,3,1" Grid.ColumnSpan="2" Grid.Row="10" Grid.Column="2" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Strasse Nr" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxPatientPlz" Margin="0.8,1.4,1.2,0.8" Padding="3,1" Grid.Row="11" Grid.Column="1" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox x:Name="TextboxPatientPlz" Margin="0.8,1.4,1.2,0.8" Padding="3,1" Grid.Row="11" Grid.Column="2" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="PLZ" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxPatientOrt" Margin="0.8,1.4,1,0.8" Padding="3,1" Grid.Column="2" Grid.Row="11" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox x:Name="TextboxPatientOrt" Margin="0.8,1.4,1,0.8" Padding="3,1" Grid.Column="3" Grid.Row="11" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Ort" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxPatientRegion" Margin="0.8,1.2,1,0.8" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="12" Grid.Column="1" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox x:Name="TextboxPatientRegion" Margin="0.8,1.2,1,0.8" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="12" Grid.Column="2" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Region" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxPatientGeburtstag" Margin="0.8,1.2,1,1" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="13" Grid.Column="1" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox x:Name="TextboxPatientGeburtstag" Margin="0.8,1.2,1,1" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="13" Grid.Column="2" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Geburtstag" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxBakterienstamm" Margin="1.4,0.6,0.2,1.4" Padding="3,1" Grid.Column="4" Grid.Row="2" VerticalContentAlignment="Center" Grid.ColumnSpan="2">
<xctk:WatermarkTextBox x:Name="TextboxBakterienstamm" Margin="1.4,0.6,0.2,1.4" Padding="3,1" Grid.Column="5" Grid.Row="2" VerticalContentAlignment="Center" Grid.ColumnSpan="2">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Bakterienstamm" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung1Restaurant" Margin="1.4,0.6,0.2,1.4" Padding="3,1" Grid.Column="4" Grid.Row="3" VerticalContentAlignment="Center" Grid.ColumnSpan="2">
<xctk:WatermarkTextBox x:Name="TextboxNahrung1Restaurant" Margin="1.4,0.6,0.2,1.4" Padding="3,1" Grid.Column="5" Grid.Row="3" VerticalContentAlignment="Center" Grid.ColumnSpan="2">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Restaurant 1" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung1Essen" Margin="1.4,0.6,0.2,1.4" Padding="3,1" Grid.Column="4" Grid.Row="4" VerticalContentAlignment="Center" Grid.ColumnSpan="2">
<xctk:WatermarkTextBox x:Name="TextboxNahrung1Essen" Margin="1.4,0.6,0.2,1.4" Padding="3,1" Grid.Column="5" Grid.Row="4" VerticalContentAlignment="Center" Grid.ColumnSpan="2">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Essen 1" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung1Strasse" Margin="0.8,0.6,0.8,1.4" Padding="3,1" Grid.Column="6" Grid.Row="3" VerticalContentAlignment="Center" Grid.ColumnSpan="2">
<xctk:WatermarkTextBox x:Name="TextboxNahrung1Strasse" Margin="0.8,0.6,0.8,1.4" Padding="3,1" Grid.Column="7" Grid.Row="3" VerticalContentAlignment="Center" Grid.ColumnSpan="2">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Strasse 1" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung1Plz" Margin="0.8,0.6,0.8,1.4" Grid.Column="6" Grid.Row="4" VerticalContentAlignment="Center" Grid.RowSpan="1">
<xctk:WatermarkTextBox x:Name="TextboxNahrung1Plz" Margin="0.8,0.6,0.8,1.4" Grid.Column="7" Grid.Row="4" VerticalContentAlignment="Center" Grid.RowSpan="1">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="PLZ 1" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung1Ort" Margin="1.2,0.6,0.8,1.4" Grid.Column="7" Grid.Row="4" VerticalContentAlignment="Center" Grid.RowSpan="1">
<xctk:WatermarkTextBox x:Name="TextboxNahrung1Ort" Margin="1.2,0.6,0.8,1.4" Grid.Column="8" Grid.Row="4" VerticalContentAlignment="Center" Grid.RowSpan="1">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Ort 1" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung2Restaurant" Margin="1.4,0.6,0.2,1.4" Padding="3,1" Grid.Column="4" Grid.Row="5" VerticalContentAlignment="Center" Grid.ColumnSpan="2">
<xctk:WatermarkTextBox x:Name="TextboxNahrung2Restaurant" Margin="1.4,0.6,0.2,1.4" Padding="3,1" Grid.Column="5" Grid.Row="5" VerticalContentAlignment="Center" Grid.ColumnSpan="2">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Restaurant 2" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung2Essen" Margin="1.4,0.6,0.2,1.4" Padding="3,1" Grid.Column="4" Grid.Row="6" VerticalContentAlignment="Center" Grid.ColumnSpan="2">
<xctk:WatermarkTextBox x:Name="TextboxNahrung2Essen" Margin="1.4,0.6,0.2,1.4" Padding="3,1" Grid.Column="5" Grid.Row="6" VerticalContentAlignment="Center" Grid.ColumnSpan="2">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Essen 2" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung2Strasse" Margin="0.8,0.6,0.8,1.4" Padding="3,1" Grid.Column="6" Grid.Row="5" VerticalContentAlignment="Center" Grid.ColumnSpan="2">
<xctk:WatermarkTextBox x:Name="TextboxNahrung2Strasse" Margin="0.8,0.6,0.8,1.4" Padding="3,1" Grid.Column="7" Grid.Row="5" VerticalContentAlignment="Center" Grid.ColumnSpan="2">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Strasse 2" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung2Plz" Margin="0.8,0.6,0.8,1.4" Grid.Column="6" Grid.Row="6" VerticalContentAlignment="Center" Grid.RowSpan="1">
<xctk:WatermarkTextBox x:Name="TextboxNahrung2Plz" Margin="0.8,0.6,0.8,1.4" Grid.Column="7" Grid.Row="6" VerticalContentAlignment="Center" Grid.RowSpan="1">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="PLZ 2" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung2Ort" Margin="1.2,0.6,0.8,1.4" Padding="3,1" Grid.Column="7" Grid.Row="6" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox x:Name="TextboxNahrung2Ort" Margin="1.2,0.6,0.8,1.4" Padding="3,1" Grid.Column="8" Grid.Row="6" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Ort 2" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung3Restaurant" Margin="1.4,1.6,0.2,0.4" Padding="3,1" Grid.Column="4" Grid.Row="7" VerticalContentAlignment="Center" Grid.ColumnSpan="2">
<xctk:WatermarkTextBox x:Name="TextboxNahrung3Restaurant" Margin="1.4,1.6,0.2,0.4" Padding="3,1" Grid.Column="5" Grid.Row="7" VerticalContentAlignment="Center" Grid.ColumnSpan="2">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Restaurant 3" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung3Essen" Margin="1.4,1.6,0.2,0.4" Padding="3,1" Grid.Column="4" Grid.Row="8" VerticalContentAlignment="Center" Grid.ColumnSpan="2">
<xctk:WatermarkTextBox x:Name="TextboxNahrung3Essen" Margin="1.4,1.6,0.2,0.4" Padding="3,1" Grid.Column="5" Grid.Row="8" VerticalContentAlignment="Center" Grid.ColumnSpan="2">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Essen 3" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung3Plz" Margin="0.8,0.6,0.8,1.4" Grid.Column="6" Grid.Row="8" VerticalContentAlignment="Center" Grid.RowSpan="1">
<xctk:WatermarkTextBox x:Name="TextboxNahrung3Plz" Margin="0.8,0.6,0.8,1.4" Grid.Column="7" Grid.Row="8" VerticalContentAlignment="Center" Grid.RowSpan="1">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="PLZ 3" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung3Strasse" Margin="0.8,1.6,0.8,0.4" Padding="3,1" Grid.Column="6" Grid.Row="7" VerticalContentAlignment="Center" Grid.ColumnSpan="2">
<xctk:WatermarkTextBox x:Name="TextboxNahrung3Strasse" Margin="0.8,1.6,0.8,0.4" Padding="3,1" Grid.Column="7" Grid.Row="7" VerticalContentAlignment="Center" Grid.ColumnSpan="2">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Strasse 3" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung3Ort" Margin="1.2,1.6,0.8,0.4" Padding="3,1" Grid.Column="7" Grid.Row="8" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox x:Name="TextboxNahrung3Ort" Margin="1.2,1.6,0.8,0.4" Padding="3,1" Grid.Column="8" Grid.Row="8" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Ort 3" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung4Restaurant" Margin="1.4,1.6,0.2,31.6" Padding="3,1" Grid.Column="4" Grid.Row="9" VerticalContentAlignment="Center" Grid.ColumnSpan="2" Grid.RowSpan="2">
<xctk:WatermarkTextBox x:Name="TextboxNahrung4Restaurant" Margin="1.4,1.6,0.2,31.6" Padding="3,1" Grid.Column="5" Grid.Row="9" VerticalContentAlignment="Center" Grid.ColumnSpan="2" Grid.RowSpan="2">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Restaurant 4" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung4Essen" Margin="1.4,1.4,0.2,0.6" Padding="3,1" Grid.Column="4" Grid.Row="10" VerticalContentAlignment="Center" Grid.ColumnSpan="2">
<xctk:WatermarkTextBox x:Name="TextboxNahrung4Essen" Margin="1.4,1.4,0.2,0.6" Padding="3,1" Grid.Column="5" Grid.Row="10" VerticalContentAlignment="Center" Grid.ColumnSpan="2">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Essen 4" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung4Strasse" Margin="0.8,1.6,0.8,31.6" Padding="3,1" Grid.Column="6" Grid.Row="9" VerticalContentAlignment="Center" Grid.ColumnSpan="2" Grid.RowSpan="2">
<xctk:WatermarkTextBox x:Name="TextboxNahrung4Strasse" Margin="0.8,1.6,0.8,31.6" Padding="3,1" Grid.Column="7" Grid.Row="9" VerticalContentAlignment="Center" Grid.ColumnSpan="2" Grid.RowSpan="2">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Strasse 4" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung4Plz" Margin="0.8,1.4,0.8,0.6" Grid.Column="6" Grid.Row="10" VerticalContentAlignment="Center" Grid.RowSpan="1">
<xctk:WatermarkTextBox x:Name="TextboxNahrung4Plz" Margin="0.8,1.4,0.8,0.6" Grid.Column="7" Grid.Row="10" VerticalContentAlignment="Center" Grid.RowSpan="1">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="PLZ 4" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung4Ort" Margin="1.2,1.4,0.8,0.6" Padding="3,1" Grid.Column="7" Grid.Row="10" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox x:Name="TextboxNahrung4Ort" Margin="1.2,1.4,0.8,0.6" Padding="3,1" Grid.Column="8" Grid.Row="10" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Ort" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<ComboBox Grid.Column="4" HorizontalAlignment="Left" Grid.Row="12" VerticalAlignment="Top" Width="148" Height="22" Margin="0.4,0.2,0,0" Grid.ColumnSpan="2"/>
</Grid>
</Window>

41
Client/Client/MainWindow.xaml.cs
View File

@ -38,7 +38,8 @@ namespace Client
}
private void ButtonSend_Click(object sender, RoutedEventArgs e)
{
LabelRueckmeldungsfeld.Content = "sende Daten...";
LabelRueckmeldungsfeld.Content = "Sende Daten. ";
Doctor newDoctor = new Doctor(TextboxArztVorname.Text,
TextboxArztName.Text,
TextboxArztStrasseNr.Text,
@ -47,6 +48,7 @@ namespace Client
TextboxArztRegion.Text,
TextboxArztKantonsarzt.Text
);
Patient newPatient = new Patient(TextboxPatientVorname.Text,
TextboxPatientName.Text,
@ -57,20 +59,26 @@ namespace Client
TextboxPatientGeburtstag.Text
);
Result newResult = new Result(TextboxBakterienstamm.Text);
LabelRueckmeldungsfeld.Content = "erstelle Doktor.";
LabelRueckmeldungsfeld.Content += "erstelle Doktor, ";
newDoctor.CreateDoctor();
LabelRueckmeldungsfeld.Content = "erstelle Patient.";
LabelArztId.Content = Convert.ToString(newDoctor.Id);
LabelRueckmeldungsfeld.Content += "erstelle Patient, ";
newPatient.CreatePatient();
LabelRueckmeldungsfeld.Content = "erstelle Bakterie.";
LabelPatientId.Content = Convert.ToString(newPatient.Id);
LabelRueckmeldungsfeld.Content += "erstelle Bakterie, ";
newResult.CreateResult();
LabelBakterienstamm.Content = Convert.ToString(newResult.Id);
Exam newExam = new Exam(newDoctor.Id,
newPatient.Id,
newResult.Id
);
LabelRueckmeldungsfeld.Content = "erstelle Untersuchung.";
LabelRueckmeldungsfeld.Content += "erstelle Untersuchung, ";
newExam.CreateExam();
@ -80,32 +88,41 @@ namespace Client
Convert.ToInt32(TextboxNahrung1Plz.Text),
TextboxNahrung1Ort.Text
);
Origin newOrigin2 = new Origin(TextboxNahrung2Restaurant.Text,
TextboxNahrung2Essen.Text,
TextboxNahrung2Strasse.Text,
Convert.ToInt32(TextboxNahrung2Plz.Text),
TextboxNahrung2Ort.Text
);
Origin newOrigin3 = new Origin(TextboxNahrung3Restaurant.Text,
TextboxNahrung3Essen.Text,
TextboxNahrung3Strasse.Text,
Convert.ToInt32(TextboxNahrung3Plz.Text),
TextboxNahrung3Ort.Text
);
Origin newOrigin4 = new Origin(TextboxNahrung4Restaurant.Text,
TextboxNahrung4Essen.Text,
TextboxNahrung4Strasse.Text,
Convert.ToInt32(TextboxNahrung4Plz.Text),
TextboxNahrung4Ort.Text
);
LabelRueckmeldungsfeld.Content = "erstelle Nahrungsaufnahmen.";
LabelRueckmeldungsfeld.Content += "erstelle Nahrungsaufnahmen.";
newOrigin1.CreateOrigin();
LabelNahrung1Id.Content = Convert.ToString(newOrigin1.Id);
newOrigin2.CreateOrigin();
LabelNahrung2Id.Content = Convert.ToString(newOrigin2.Id);
newOrigin3.CreateOrigin();
LabelNahrung3Id.Content = Convert.ToString(newOrigin3.Id);
newOrigin4.CreateOrigin();
LabelNahrung4Id.Content = Convert.ToString(newOrigin4.Id);
Origin_Exam newOrigin_Exam1 = new Origin_Exam(newOrigin1.Id,
newExam.Id
@ -123,12 +140,12 @@ namespace Client
newExam.Id
);
LabelRueckmeldungsfeld.Content = "verlinke Nahrungsaufnahmen mit der Untersuchungsnummer.";
LabelRueckmeldungsfeld.Content += "Verlinke Nahrungsaufnahmen mit der Untersuchungsnummer.";
newOrigin_Exam1.CreateOrigin_Exam();
newOrigin_Exam2.CreateOrigin_Exam();
newOrigin_Exam3.CreateOrigin_Exam();
newOrigin_Exam4.CreateOrigin_Exam();
LabelRueckmeldungsfeld.Content = "Fertig.";
LabelRueckmeldungsfeld.Content = "Fertig. Behandlung Nr." + Convert.ToString(newExam.Id) + " gespeichert.";
}
private void ButtonAutogenerateMany_Click(object sender, RoutedEventArgs e)

6
Client/Client/Models/AutomapperProfile.cs
View File

@ -12,11 +12,17 @@ namespace Client
public AutomapperProfile()
{
CreateMap<EHEC_Service.Patient, Patient>();
CreateMap<Patient, EHEC_Service.Patient>();
CreateMap<EHEC_Service.Doctor, Doctor>();
CreateMap<Doctor, EHEC_Service.Doctor>();
CreateMap<EHEC_Service.Exam, Exam>();
CreateMap<Exam, EHEC_Service.Exam>();
CreateMap<EHEC_Service.Origin, Origin>();
CreateMap<Origin, EHEC_Service.Origin>();
CreateMap<EHEC_Service.Origin_Exam, Origin_Exam>();
CreateMap<Origin_Exam, EHEC_Service.Origin_Exam>();
CreateMap<EHEC_Service.Result,Result>();
CreateMap<Result, EHEC_Service.Result>();
}
}
}

2
Client/Client/Models/Doctor.cs
View File

@ -56,7 +56,7 @@ namespace Client
Region = Region,
DoctorOrigin = DoctorOrigin
};
Global.GlobalInstance.Service.WriteDoctor(mydoctor);
Id = Global.GlobalInstance.Service.WriteDoctor(mydoctor).DoctorId;
return Mapper.Map<Doctor>(mydoctor);
}

2
Client/Client/Models/Exam.cs
View File

@ -30,7 +30,7 @@ namespace Client
PatientId = PatientID,
ResultId = ResultID
};
Global.GlobalInstance.Service.WriteExam(myExam);
Id = Global.GlobalInstance.Service.WriteExam(myExam).ExamId;
return Mapper.Map<Exam>(myExam);
}
}

2
Client/Client/Models/Origin.cs
View File

@ -43,7 +43,7 @@ namespace Client
Street = Street,
City = City,
};
Global.GlobalInstance.Service.WriteOrigin(myorigin);
Id = Global.GlobalInstance.Service.WriteOrigin(myorigin).OriginId;
return Mapper.Map<Origin>(myorigin);
}
}

2
Client/Client/Models/Origin_Exam.cs
View File

@ -31,7 +31,7 @@ namespace Client
OriginId = OriginOriginId,
ExamId = ExamExamId
};
Global.GlobalInstance.Service.WriteOrigin_Exam(myorigin_Exam);
Id = Global.GlobalInstance.Service.WriteOrigin_Exam(myorigin_Exam).Origin_ExamId;
return Mapper.Map<Origin_Exam>(myorigin_Exam);
}
}

8
Client/Client/Models/Patient.cs
View File

@ -46,13 +46,12 @@ namespace Client
Region = Region,
BirthDate = Convert.ToDateTime(BirthDate)
};
Global.GlobalInstance.Service.WritePatient(mypatient);
// Mapper back to Object of Local 'Patient' object but with
// the new 'EHEC_Service.Patient' in the db created id:
////Mapper back to Object of Local 'Patient' object but with
////the new 'EHEC_Service.Patient' in the db created id:
//Patient p = new Patient()
//{
// id = mypatient.PatientId,
// Id = mypatient.PatientId,
// FirstName = mypatient.FirstName,
// LastName = mypatient.LastName,
// Street = mypatient.Street,
@ -63,6 +62,7 @@ namespace Client
//return p;
// Automapper version:
Id = Global.GlobalInstance.Service.WritePatient(mypatient).PatientId;
return Mapper.Map<Patient>(mypatient);
}
}

2
Client/Client/Models/Result.cs
View File

@ -27,7 +27,7 @@ namespace Client
{
Name = Name
};
Global.GlobalInstance.Service.WriteResult(myResult);
Id = Global.GlobalInstance.Service.WriteResult(myResult).ResultId;
return Mapper.Map<Result>(myResult);
}
}

10
EHEC_Server/EHEC_Server.sln
View File

@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27428.2027
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "..\Client\Client\Client.csproj", "{7467FD6B-4743-4436-A87B-095EA46C476F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EHEC_Server", "EHEC_Server\EHEC_Server.csproj", "{611B075A-0526-4661-BD58-B141BD42E6D7}"
EndProject
Global
@ -13,6 +15,14 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7467FD6B-4743-4436-A87B-095EA46C476F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7467FD6B-4743-4436-A87B-095EA46C476F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7467FD6B-4743-4436-A87B-095EA46C476F}.Debug|x86.ActiveCfg = Debug|Any CPU
{7467FD6B-4743-4436-A87B-095EA46C476F}.Debug|x86.Build.0 = Debug|Any CPU
{7467FD6B-4743-4436-A87B-095EA46C476F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7467FD6B-4743-4436-A87B-095EA46C476F}.Release|Any CPU.Build.0 = Release|Any CPU
{7467FD6B-4743-4436-A87B-095EA46C476F}.Release|x86.ActiveCfg = Release|Any CPU
{7467FD6B-4743-4436-A87B-095EA46C476F}.Release|x86.Build.0 = Release|Any CPU
{611B075A-0526-4661-BD58-B141BD42E6D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{611B075A-0526-4661-BD58-B141BD42E6D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{611B075A-0526-4661-BD58-B141BD42E6D7}.Debug|x86.ActiveCfg = Debug|x86