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

various changes for db and service so that feedback from db connection can be established.

This commit is contained in:
Ivan Hörler 2018-06-30 11:52:50 +02:00
parent 6bc10ad774
commit 87d07b3097
39 changed files with 383 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Client.sln → Client/Client.sln
View File

@ -11,8 +11,8 @@ Global
Release|Any CPU = Release|Any CPU
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|Any CPU.ActiveCfg = Release|Any CPU
{7467FD6B-4743-4436-A87B-095EA46C476F}.Debug|Any CPU.Build.0 = Release|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
EndGlobalSection

0
Client/App.config → Client/Client/App.config
View File

0
Client/App.xaml → Client/Client/App.xaml
View File

0
Client/App.xaml.cs → Client/Client/App.xaml.cs
View File

20
Client/Client.csproj → Client/Client/Client.csproj
View File

@ -74,6 +74,7 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Compile Include="Person.cs" />
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@ -110,6 +111,21 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="Connected Services\EHEC_Service\Client.EHEC_Service.Doctor.datasource">
<DependentUpon>Reference.svcmap</DependentUpon>
</None>
<None Include="Connected Services\EHEC_Service\Client.EHEC_Service.Exam.datasource">
<DependentUpon>Reference.svcmap</DependentUpon>
</None>
<None Include="Connected Services\EHEC_Service\Client.EHEC_Service.Origin.datasource">
<DependentUpon>Reference.svcmap</DependentUpon>
</None>
<None Include="Connected Services\EHEC_Service\Client.EHEC_Service.Patient.datasource">
<DependentUpon>Reference.svcmap</DependentUpon>
</None>
<None Include="Connected Services\EHEC_Service\Client.EHEC_Service.Result.datasource">
<DependentUpon>Reference.svcmap</DependentUpon>
</None>
<None Include="Connected Services\EHEC_Service\Service.wsdl" />
<None Include="Connected Services\EHEC_Service\Service.xsd">
<SubType>Designer</SubType>
@ -153,5 +169,9 @@
<LastGenOutput>Reference.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<Folder Include="ViewModel\" />
<Folder Include="View\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

10
Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Doctor.datasource Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is automatically generated by Visual Studio .Net. It is
used to store generic object data source configuration information.
Renaming the file extension or editing the content of this file may
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="Doctor" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>Client.EHEC_Service.Doctor, Connected Services.EHEC_Service.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>

10
Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Exam.datasource Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is automatically generated by Visual Studio .Net. It is
used to store generic object data source configuration information.
Renaming the file extension or editing the content of this file may
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="Exam" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>Client.EHEC_Service.Exam, Connected Services.EHEC_Service.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>

10
Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Origin.datasource Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is automatically generated by Visual Studio .Net. It is
used to store generic object data source configuration information.
Renaming the file extension or editing the content of this file may
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="Origin" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>Client.EHEC_Service.Origin, Connected Services.EHEC_Service.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>

10
Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Patient.datasource Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is automatically generated by Visual Studio .Net. It is
used to store generic object data source configuration information.
Renaming the file extension or editing the content of this file may
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="Patient" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>Client.EHEC_Service.Patient, Connected Services.EHEC_Service.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>

10
Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Result.datasource Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is automatically generated by Visual Studio .Net. It is
used to store generic object data source configuration information.
Renaming the file extension or editing the content of this file may
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="Result" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>Client.EHEC_Service.Result, Connected Services.EHEC_Service.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>

64
Client/Connected Services/EHEC_Service/Reference.cs → Client/Client/Connected Services/EHEC_Service/Reference.cs
View File

@ -824,34 +824,40 @@ namespace Client.EHEC_Service {
public interface IService {
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IService/WriteDoctor", ReplyAction="http://tempuri.org/IService/WriteDoctorResponse")]
void WriteDoctor(Client.EHEC_Service.Doctor doctor);
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 WriteDoctorAsync(Client.EHEC_Service.Doctor doctor);
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")]
void WritePatient(Client.EHEC_Service.Patient patient);
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 WritePatientAsync(Client.EHEC_Service.Patient patient);
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")]
void WriteOrigin(Client.EHEC_Service.Origin origin);
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 WriteOriginAsync(Client.EHEC_Service.Origin origin);
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")]
void WriteExam(Client.EHEC_Service.Exam exam);
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 WriteExamAsync(Client.EHEC_Service.Exam exam);
System.Threading.Tasks.Task<Client.EHEC_Service.Exam> WriteExamAsync(Client.EHEC_Service.Exam exam);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IService/WriteResult", ReplyAction="http://tempuri.org/IService/WriteResultResponse")]
void WriteResult(Client.EHEC_Service.Result result);
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 WriteResultAsync(Client.EHEC_Service.Result result);
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")]
@ -881,44 +887,52 @@ namespace Client.EHEC_Service {
base(binding, remoteAddress) {
}
public void WriteDoctor(Client.EHEC_Service.Doctor doctor) {
base.Channel.WriteDoctor(doctor);
public Client.EHEC_Service.Doctor WriteDoctor(Client.EHEC_Service.Doctor doctor) {
return base.Channel.WriteDoctor(doctor);
}
public System.Threading.Tasks.Task WriteDoctorAsync(Client.EHEC_Service.Doctor doctor) {
public System.Threading.Tasks.Task<Client.EHEC_Service.Doctor> WriteDoctorAsync(Client.EHEC_Service.Doctor doctor) {
return base.Channel.WriteDoctorAsync(doctor);
}
public void WritePatient(Client.EHEC_Service.Patient patient) {
base.Channel.WritePatient(patient);
public Client.EHEC_Service.Patient WritePatient(Client.EHEC_Service.Patient patient) {
return base.Channel.WritePatient(patient);
}
public System.Threading.Tasks.Task WritePatientAsync(Client.EHEC_Service.Patient patient) {
public System.Threading.Tasks.Task<Client.EHEC_Service.Patient> WritePatientAsync(Client.EHEC_Service.Patient patient) {
return base.Channel.WritePatientAsync(patient);
}
public void WriteOrigin(Client.EHEC_Service.Origin origin) {
base.Channel.WriteOrigin(origin);
public Client.EHEC_Service.Origin WriteOrigin(Client.EHEC_Service.Origin origin) {
return base.Channel.WriteOrigin(origin);
}
public System.Threading.Tasks.Task WriteOriginAsync(Client.EHEC_Service.Origin origin) {
public System.Threading.Tasks.Task<Client.EHEC_Service.Origin> WriteOriginAsync(Client.EHEC_Service.Origin origin) {
return base.Channel.WriteOriginAsync(origin);
}
public void WriteExam(Client.EHEC_Service.Exam exam) {
base.Channel.WriteExam(exam);
public Client.EHEC_Service.Exam WriteExam(Client.EHEC_Service.Exam exam) {
return base.Channel.WriteExam(exam);
}
public System.Threading.Tasks.Task WriteExamAsync(Client.EHEC_Service.Exam exam) {
public System.Threading.Tasks.Task<Client.EHEC_Service.Exam> WriteExamAsync(Client.EHEC_Service.Exam exam) {
return base.Channel.WriteExamAsync(exam);
}
public void WriteResult(Client.EHEC_Service.Result result) {
base.Channel.WriteResult(result);
public Client.EHEC_Service.Result WriteResult(Client.EHEC_Service.Result result) {
return base.Channel.WriteResult(result);
}
public System.Threading.Tasks.Task WriteResultAsync(Client.EHEC_Service.Result 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();
}
}
}

0
Client/Connected Services/EHEC_Service/Reference.svcmap → Client/Client/Connected Services/EHEC_Service/Reference.svcmap
View File

0
Client/Connected Services/EHEC_Service/Service.disco → Client/Client/Connected Services/EHEC_Service/Service.disco
View File

19
Client/Connected Services/EHEC_Service/Service.wsdl → Client/Client/Connected Services/EHEC_Service/Service.wsdl
View File

@ -38,6 +38,12 @@
<wsdl:message name="IService_WriteResult_OutputMessage">
<wsdl:part name="parameters" element="tns:WriteResultResponse" />
</wsdl:message>
<wsdl:message name="IService_GetResults_InputMessage">
<wsdl:part name="parameters" element="tns:GetResults" />
</wsdl:message>
<wsdl:message name="IService_GetResults_OutputMessage">
<wsdl:part name="parameters" element="tns:GetResultsResponse" />
</wsdl:message>
<wsdl:portType name="IService">
<wsdl:operation name="WriteDoctor">
<wsdl:input wsaw:Action="http://tempuri.org/IService/WriteDoctor" message="tns:IService_WriteDoctor_InputMessage" />
@ -59,6 +65,10 @@
<wsdl:input wsaw:Action="http://tempuri.org/IService/WriteResult" message="tns:IService_WriteResult_InputMessage" />
<wsdl:output wsaw:Action="http://tempuri.org/IService/WriteResultResponse" message="tns:IService_WriteResult_OutputMessage" />
</wsdl:operation>
<wsdl:operation name="GetResults">
<wsdl:input wsaw:Action="http://tempuri.org/IService/GetResults" message="tns:IService_GetResults_InputMessage" />
<wsdl:output wsaw:Action="http://tempuri.org/IService/GetResultsResponse" message="tns:IService_GetResults_OutputMessage" />
</wsdl:operation>
</wsdl:portType>
<wsdl:binding name="BasicHttpBinding_IService" type="tns:IService">
<soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
@ -107,6 +117,15 @@
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="GetResults">
<soap:operation soapAction="http://tempuri.org/IService/GetResults" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
<wsdl:output>
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="Service">
<wsdl:port name="BasicHttpBinding_IService" binding="tns:BasicHttpBinding_IService">

0
Client/Connected Services/EHEC_Service/Service.xsd → Client/Client/Connected Services/EHEC_Service/Service.xsd
View File

38
Client/Connected Services/EHEC_Service/Service1.xsd → Client/Client/Connected Services/EHEC_Service/Service1.xsd
View File

@ -10,55 +10,77 @@
</xs:element>
<xs:element name="WriteDoctorResponse">
<xs:complexType>
<xs:sequence />
<xs:sequence>
<xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/EHEC_Server" minOccurs="0" name="WriteDoctorResult" nillable="true" type="q2:Doctor" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="WritePatient">
<xs:complexType>
<xs:sequence>
<xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/EHEC_Server" minOccurs="0" name="patient" nillable="true" type="q2:Patient" />
<xs:element xmlns:q3="http://schemas.datacontract.org/2004/07/EHEC_Server" minOccurs="0" name="patient" nillable="true" type="q3:Patient" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="WritePatientResponse">
<xs:complexType>
<xs:sequence />
<xs:sequence>
<xs:element xmlns:q4="http://schemas.datacontract.org/2004/07/EHEC_Server" minOccurs="0" name="WritePatientResult" nillable="true" type="q4:Patient" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="WriteOrigin">
<xs:complexType>
<xs:sequence>
<xs:element xmlns:q3="http://schemas.datacontract.org/2004/07/EHEC_Server" minOccurs="0" name="origin" nillable="true" type="q3:Origin" />
<xs:element xmlns:q5="http://schemas.datacontract.org/2004/07/EHEC_Server" minOccurs="0" name="origin" nillable="true" type="q5:Origin" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="WriteOriginResponse">
<xs:complexType>
<xs:sequence />
<xs:sequence>
<xs:element xmlns:q6="http://schemas.datacontract.org/2004/07/EHEC_Server" minOccurs="0" name="WriteOriginResult" nillable="true" type="q6:Origin" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="WriteExam">
<xs:complexType>
<xs:sequence>
<xs:element xmlns:q4="http://schemas.datacontract.org/2004/07/EHEC_Server" minOccurs="0" name="exam" nillable="true" type="q4:Exam" />
<xs:element xmlns:q7="http://schemas.datacontract.org/2004/07/EHEC_Server" minOccurs="0" name="exam" nillable="true" type="q7:Exam" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="WriteExamResponse">
<xs:complexType>
<xs:sequence />
<xs:sequence>
<xs:element xmlns:q8="http://schemas.datacontract.org/2004/07/EHEC_Server" minOccurs="0" name="WriteExamResult" nillable="true" type="q8:Exam" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="WriteResult">
<xs:complexType>
<xs:sequence>
<xs:element xmlns:q5="http://schemas.datacontract.org/2004/07/EHEC_Server" minOccurs="0" name="result" nillable="true" type="q5:Result" />
<xs:element xmlns:q9="http://schemas.datacontract.org/2004/07/EHEC_Server" minOccurs="0" name="result" nillable="true" type="q9:Result" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="WriteResultResponse">
<xs:complexType>
<xs:sequence>
<xs:element xmlns:q10="http://schemas.datacontract.org/2004/07/EHEC_Server" minOccurs="0" name="WriteResultResult" nillable="true" type="q10:Result" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="GetResults">
<xs:complexType>
<xs:sequence />
</xs:complexType>
</xs:element>
<xs:element name="GetResultsResponse">
<xs:complexType>
<xs:sequence>
<xs:element xmlns:q11="http://schemas.datacontract.org/2004/07/EHEC_Server" minOccurs="0" name="GetResultsResult" nillable="true" type="q11:ArrayOfResult" />
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:schema>

0
Client/Connected Services/EHEC_Service/Service2.xsd → Client/Client/Connected Services/EHEC_Service/Service2.xsd
View File

6
Client/Connected Services/EHEC_Service/Service3.xsd → Client/Client/Connected Services/EHEC_Service/Service3.xsd
View File

@ -100,4 +100,10 @@
</xs:complexContent>
</xs:complexType>
<xs:element name="Result" nillable="true" type="tns:Result" />
<xs:complexType name="ArrayOfResult">
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="Result" nillable="true" type="tns:Result" />
</xs:sequence>
</xs:complexType>
<xs:element name="ArrayOfResult" nillable="true" type="tns:ArrayOfResult" />
</xs:schema>

0
Client/Connected Services/EHEC_Service/configuration.svcinfo → Client/Client/Connected Services/EHEC_Service/configuration.svcinfo
View File

0
Client/Connected Services/EHEC_Service/configuration91.svcinfo → Client/Client/Connected Services/EHEC_Service/configuration91.svcinfo
View File

231
Client/MainWindow.xaml → Client/Client/MainWindow.xaml
View File

@ -7,194 +7,219 @@
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
mc:Ignorable="d"
Title="MainWindow" Height="482.318" Width="800" WindowStyle="None" ShowInTaskbar="False" WindowStartupLocation="CenterScreen">
<Grid Margin="0,0,-5.4,4">
<Grid Margin="10,10,10,10">
<Grid.RowDefinitions>
<RowDefinition Height="25*"/>
<RowDefinition Height="18*"/>
<RowDefinition Height="32*"/>
<RowDefinition Height="32*"/>
<RowDefinition Height="32*"/>
<RowDefinition Height="32*"/>
<RowDefinition Height="32*"/>
<RowDefinition Height="32*"/>
<RowDefinition Height="32*"/>
<RowDefinition Height="32*"/>
<RowDefinition Height="32*"/>
<RowDefinition Height="32*"/>
<RowDefinition Height="32*"/>
<RowDefinition Height="32*"/>
<RowDefinition Height="32*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="159*"/>
<ColumnDefinition/>
<ColumnDefinition Width="75*"/>
<ColumnDefinition Width="76*"/>
<ColumnDefinition Width="105*"/>
<ColumnDefinition Width="134*"/>
<ColumnDefinition Width="160*"/>
<ColumnDefinition Width="140*"/>
<ColumnDefinition Width="60*"/>
<ColumnDefinition Width="25*"/>
</Grid.ColumnDefinitions>
<Label x:Name="LabelTitel" Content="EHEC Meldeform:" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" FontSize="20" Height="36" Width="164" />
<Label x:Name="LabelArzt" Content="Arzt:" HorizontalAlignment="Left" Margin="38,54,0,0" VerticalAlignment="Top" Height="26" Width="34"/>
<Label x:Name="LabelPatient" Content="Patient:" HorizontalAlignment="Left" Margin="23,244,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.582,0.288" Height="26" Width="49"/>
<Label x:Name="LabelAnalyseergebnisse" Content="Analyseergebnisse:" HorizontalAlignment="Left" Margin="267,86,0,0" VerticalAlignment="Top" Height="26" Width="110"/>
<Label x:Name="LabelNahrungseinnahmen" Content="Nahrungseinnahmen:" HorizontalAlignment="Left" Margin="265,249,0,0" VerticalAlignment="Top" Height="26" Width="124"/>
<xctk:WatermarkTextBox x:Name="TextboxArztname" Margin="76,56,533.4,391" FontSize="10" Padding="3,1" Height="25">
<Label x:Name="LabelTitel" Content="EHEC Meldeform:" Grid.ColumnSpan="3" Grid.RowSpan="2" Margin="1" 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"/>
<Label x:Name="LabelAnalyseergebnisse" Content="Analyseergebnisse:" Margin="1" Grid.Column="3" Grid.Row="2" VerticalContentAlignment="Center"/>
<Label x:Name="LabelNahrungseinnahmen" Content="Nahrungseinnahmen:" Margin="1" Grid.Column="3" Grid.Row="3" VerticalContentAlignment="Center"/>
<Button x:Name="ButtonClose" Content="X" Margin="1" Click="ButtonClose_Click" Background="White" RenderTransformOrigin="0.573,1.105" Grid.Column="7"/>
<Button x:Name="ButtonAutogenerateOne" Content="Auto One" Margin="1,1.5,10,1" Background="White" Grid.Column="6" Grid.Row="11" VerticalContentAlignment="Center" Grid.ColumnSpan="2"/>
<Button x:Name="ButtonAutogenerateMany" Content="Auto Many" Margin="1,1,10,1" Background="White" Grid.Column="6" Grid.Row="12" VerticalContentAlignment="Center" Click="ButtonAutogenerateMany_Click" Grid.ColumnSpan="2"/>
<Button x:Name="ButtonSend" Content="Senden" Margin="1,0.5,10,1.5" Click="ButtonSend_Click" Background="White" Grid.Column="6" Grid.Row="14" VerticalContentAlignment="Center" Grid.ColumnSpan="2"/>
<Label x:Name="LabelRueckmeldung" Content="Rückmeldung:" Margin="1" Grid.Column="3" Grid.Row="13" VerticalContentAlignment="Center"/>
<Label x:Name="LabelRueckmeldungsfeld" Content="" Margin="1" Grid.ColumnSpan="3" Grid.Column="4" Grid.Row="13" VerticalContentAlignment="Center"/>
<xctk:WatermarkTextBox x:Name="TextboxArztname" Margin="1" Padding="3,1" Grid.ColumnSpan="2" Grid.Column="1" 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>
<Button x:Name="ButtonClose" Content="X" HorizontalAlignment="Left" Margin="755,21,0,426" Width="25" Click="ButtonClose_Click" Background="White" RenderTransformOrigin="0.573,1.105" Height="25"/>
<Button x:Name="ButtonAutogenerateOne" Content="Auto One" HorizontalAlignment="Left" Margin="578,146,0,0" VerticalAlignment="Top" Width="70" Background="White" BorderBrush="White" Foreground="White" Height="46"/>
<Button x:Name="ButtonSend" Content="Senden" HorizontalAlignment="Left" Margin="705,442,0,0" VerticalAlignment="Top" Width="75" Click="ButtonSend_Click" Background="White" Height="20"/>
<xctk:WatermarkTextBox x:Name="TextboxArztVorname" Margin="76,87,533.4,360" FontSize="10" Padding="3,1" Height="25">
<xctk:WatermarkTextBox x:Name="TextboxArztVorname" Margin="1" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="3" Grid.Column="1" 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="76,117,533.4,330" FontSize="10" Padding="3,1" Height="25">
<xctk:WatermarkTextBox x:Name="TextboxArztStrasseNr" Margin="1" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="4" Grid.Column="1" 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="76,148,644.4,299" FontSize="10" Padding="3,1" Height="25">
<xctk:WatermarkTextBox x:Name="TextboxArztPlz" Margin="1" Padding="3,1" Grid.Row="5" Grid.Column="1" 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="149,148,533.4,299" FontSize="10" Padding="3,1" Height="25">
<xctk:WatermarkTextBox x:Name="TextboxArztOrt" Margin="1" Padding="3,1" Grid.Column="2" 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="76,179,533.4,268" FontSize="10" Padding="3,1" Height="25">
<xctk:WatermarkTextBox x:Name="TextboxArztKantonsarzt" Margin="1" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="6" Grid.Column="1" 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="76,210,533.4,237" FontSize="10" Padding="3,1" Height="25">
<xctk:WatermarkTextBox x:Name="TextboxArztRegion" Margin="1" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="7" Grid.Column="1" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Arzt" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxPatientName" Margin="76,250,533.4,197" FontSize="10" Padding="3,1" Height="25">
<xctk:WatermarkTextBox x:Name="TextboxPatientName" Margin="1" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="8" Grid.Column="1" 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="76,283,533.4,164" FontSize="10" Padding="3,1" Height="25">
<xctk:WatermarkTextBox x:Name="TextboxPatientVorname" Margin="1" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="9" Grid.Column="1" 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="TextboxPatientStrasseNr" Margin="76,315,533.4,132" FontSize="10" Padding="4,1,3,1" Height="25">
<xctk:WatermarkTextBox x:Name="TextboxPatientStrasseNr" Margin="1" Padding="4,1,3,1" Grid.ColumnSpan="2" Grid.Row="10" Grid.Column="1" 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="76,347,644.4,100" FontSize="10" Padding="3,1" Height="25">
<xctk:WatermarkTextBox x:Name="TextboxPatientPlz" Margin="1" Padding="3,1" Grid.Row="11" Grid.Column="1" 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="149,347,533.4,100" FontSize="10" Padding="3,1" Height="25">
<xctk:WatermarkTextBox x:Name="TextboxPatientOrt" Margin="1" Padding="3,1" Grid.Column="2" 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="76,378,533.4,69" FontSize="10" Padding="3,1" Height="25">
<xctk:WatermarkTextBox x:Name="TextboxPatientRegion" Margin="1" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="12" Grid.Column="1" 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="TextboxBakterienstamm" Margin="393,87,256.4,360" FontSize="10" Padding="3,1" Height="25">
<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="393,250,256.4,197" FontSize="10" Padding="3,1" Height="25">
<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="TextboxNahrung1Ort" Margin="577,250,72.4,197" FontSize="10" Height="25">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Ort" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung2Restaurant" Margin="393,283,256.4,164" FontSize="10" Padding="3,1" Height="25">
<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="TextboxNahrung2Ort" Margin="577,283,72.4,164" FontSize="10" Padding="3,1" Height="25">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Ort" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung3Restaurant" Margin="393,315,256.4,132" FontSize="10" Padding="3,1" Height="25">
<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="TextboxNahrung3Ort" Margin="577,315,72.4,132" FontSize="10" Padding="3,1" Height="25">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Ort" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung4Restaurant" Margin="393,347,256.4,100" FontSize="10" Padding="3,1" Height="25">
<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="TextboxNahrung4Ort" Margin="577,347,72.4,100" FontSize="10" Padding="3,1" Height="25">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Ort" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung5Restaurant" Margin="393,381,256.4,66" FontSize="10" Padding="3,1" Height="25">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Restaurant 5" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung5Ort" Margin="577,381,72.4,66" FontSize="10" Padding="3,1" Height="25">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Ort" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxPatientGeburtstag" Margin="76,410,533.4,37" FontSize="10" Padding="3,1" Height="25">
<xctk:WatermarkTextBox x:Name="TextboxPatientGeburtstag" Margin="1" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="13" Grid.Column="1" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Geburtstag" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<Button x:Name="ButtonAutogenerateMany" Content="Auto Many" HorizontalAlignment="Left" Margin="653,146,0,0" VerticalAlignment="Top" Width="70" Background="White" BorderBrush="White" Foreground="White" Height="46"/>
<xctk:WatermarkTextBox x:Name="TextboxBakterienstamm" Margin="1" Padding="3,1" Grid.Column="4" Grid.Row="2" VerticalContentAlignment="Center">
<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" Padding="3,1" Grid.Column="4" Grid.Row="3" VerticalContentAlignment="Center">
<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="TextboxNahrung1Ort" Margin="1" Grid.Column="5" Grid.Row="3" 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="TextboxNahrung2Restaurant" Margin="1" Padding="3,1" Grid.Column="4" Grid.Row="4" VerticalContentAlignment="Center">
<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="TextboxNahrung2Ort" Margin="1" Padding="3,1" Grid.Column="5" Grid.Row="4" 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="TextboxNahrung3Restaurant" Margin="1" Padding="3,1" Grid.Column="4" Grid.Row="5" VerticalContentAlignment="Center">
<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="TextboxNahrung3Ort" Margin="1" Padding="3,1" Grid.Column="5" 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="TextboxNahrung4Restaurant" Margin="1" Padding="3,1" Grid.Column="4" Grid.Row="6" VerticalContentAlignment="Center">
<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="TextboxNahrung4Ort" Margin="1" Padding="3,1" Grid.Column="5" Grid.Row="6" 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="TextboxNahrung5Restaurant" Margin="1" Padding="3,1" Grid.Column="4" Grid.Row="7" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Restaurant 5" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
<xctk:WatermarkTextBox x:Name="TextboxNahrung5Ort" Margin="1" Padding="3,1" Grid.Column="5" Grid.Row="7" VerticalContentAlignment="Center">
<xctk:WatermarkTextBox.Watermark>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Ort" Margin="2,0,0,0" />
</StackPanel>
</xctk:WatermarkTextBox.Watermark>
</xctk:WatermarkTextBox>
</Grid>
</Window>

20
Client/MainWindow.xaml.cs → Client/Client/MainWindow.xaml.cs
View File

@ -66,6 +66,26 @@ namespace Client
Region = patientRegion
};
servize.WritePatient(p);
if (p.PatientId == 0)
{
//LabelRueckmeldungsfeld.Text = "some";
}
Doctor d = new Doctor
{
FirstName = arztVorname,
LastName = arztName,
Region = arztRegion,
DoctorOrigin = arztKantonsarzt,
};
servize.WriteDoctor(d);
//WatermarkTextBox TextboxArztname = null;
}
private void ButtonAutogenerateMany_Click(object sender, RoutedEventArgs e)
{
}
}

0
Client/Properties/AssemblyInfo.cs → Client/Client/Properties/AssemblyInfo.cs
View File

0
Client/Properties/Resources.Designer.cs → Client/Client/Properties/Resources.Designer.cs generated
View File

0
Client/Properties/Resources.resx → Client/Client/Properties/Resources.resx
View File

0
Client/Properties/Settings.Designer.cs → Client/Client/Properties/Settings.Designer.cs generated
View File

0
Client/Properties/Settings.settings → Client/Client/Properties/Settings.settings
View File

0
Client/packages.config → Client/Client/packages.config
View File

0
client.txt → Client/client.txt
View File

6
EHEC_Server/EHEC_Server.sln
View File

@ -5,8 +5,6 @@ VisualStudioVersion = 15.0.27428.2027
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EHEC_Server", "EHEC_Server\EHEC_Server.csproj", "{611B075A-0526-4661-BD58-B141BD42E6D7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "..\Client\Client.csproj", "{7467FD6B-4743-4436-A87B-095EA46C476F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -17,10 +15,6 @@ Global
{611B075A-0526-4661-BD58-B141BD42E6D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{611B075A-0526-4661-BD58-B141BD42E6D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{611B075A-0526-4661-BD58-B141BD42E6D7}.Release|Any CPU.Build.0 = Release|Any CPU
{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}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7467FD6B-4743-4436-A87B-095EA46C476F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

6
EHEC_Server/EHEC_Server/DatabaseAccess/DoctorAccess.cs
View File

@ -9,7 +9,7 @@ namespace EHEC_Server.DatabaseAccess
{
public class DoctorAccess
{
public bool CreateDoctor(Doctor doctor)
public Doctor CreateDoctor(Doctor doctor)
{
try
{
@ -18,11 +18,11 @@ namespace EHEC_Server.DatabaseAccess
ctx.Doctor.Add(doctor);
ctx.SaveChanges();
}
return true;
return doctor;
}
catch (Exception)
{
return false;
return new Doctor();
}
}
public List<Doctor> GetAllDoctors()

6
EHEC_Server/EHEC_Server/DatabaseAccess/ExamAccess.cs
View File

@ -9,7 +9,7 @@ namespace EHEC_Server.DatabaseAccess
{
public class ExamAccess
{
public bool CreateExam(Exam exam)
public Exam CreateExam(Exam exam)
{
try
{
@ -18,11 +18,11 @@ namespace EHEC_Server.DatabaseAccess
ctx.Exam.Add(exam);
ctx.SaveChanges();
}
return true;
return exam;
}
catch (Exception)
{
return false;
return new Exam();
}
}
public List<Exam> GetAllExams()

6
EHEC_Server/EHEC_Server/DatabaseAccess/OriginAccess.cs
View File

@ -8,7 +8,7 @@ namespace EHEC_Server.DatabaseAccess
{
public class OriginAccess
{
public bool CreateOrigin(Origin origin)
public Origin CreateOrigin(Origin origin)
{
try
{
@ -17,11 +17,11 @@ namespace EHEC_Server.DatabaseAccess
ctx.Origin.Add(origin);
ctx.SaveChanges();
}
return true;
return origin;
}
catch (Exception)
{
return false;
return new Origin();
}
}
public List<Origin> GetAllOrigins()

6
EHEC_Server/EHEC_Server/DatabaseAccess/PatientAccess.cs
View File

@ -8,7 +8,7 @@ namespace EHEC_Server.DatabaseAccess
{
public class PatientAccess
{
public bool CreatePatient(Patient patient)
public Patient CreatePatient(Patient patient)
{
try
{
@ -17,11 +17,11 @@ namespace EHEC_Server.DatabaseAccess
ctx.Patient.Add(patient);
ctx.SaveChanges();
}
return true;
return patient;
}
catch (Exception)
{
return false;
return new Patient();
}
}

8
EHEC_Server/EHEC_Server/DatabaseAccess/ResultAccess.cs
View File

@ -8,7 +8,7 @@ namespace EHEC_Server.DatabaseAccess
{
public class ResultAccess
{
public bool CreateResult(Result result)
public Result CreateResult(Result result)
{
try
{
@ -17,17 +17,19 @@ namespace EHEC_Server.DatabaseAccess
ctx.Result.Add(result);
ctx.SaveChanges();
}
return true;
return result;
}
catch (Exception)
{
return false;
return new Result();
}
}
public List<Result> GetAllResults()
{
using (EHEC_DBEntities ctx = new EHEC_DBEntities())
{
ctx.Configuration.ProxyCreationEnabled = false;
List<Result> list = new List<Result>();
return ctx.Result.ToList();
}
}

13
EHEC_Server/EHEC_Server/IService.cs
View File

@ -13,20 +13,21 @@ namespace EHEC_Server
{
[OperationContract]
void WriteDoctor(Doctor doctor);
Doctor WriteDoctor(Doctor doctor);
[OperationContract]
void WritePatient(Patient patient);
Patient WritePatient(Patient patient);
[OperationContract]
void WriteOrigin(Origin origin);
Origin WriteOrigin(Origin origin);
[OperationContract]
void WriteExam(Exam exam);
Exam WriteExam(Exam exam);
[OperationContract]
void WriteResult(Result result);
Result WriteResult(Result result);
[OperationContract]
List<Result> GetResults();
}
}

41
EHEC_Server/EHEC_Server/Service.svc.cs
View File

@ -14,46 +14,49 @@ namespace EHEC_Server
public class Service : IService
{
Doctor dataaccess_doctor = new Doctor();
Patient dataaccess_patient = new Patient();
Result dataaccess_result = new Result();
Origin dataaccess_origin = new Origin();
Exam dataaccess_exam = new Exam();
public List<Doctor> GetDoctors()
{
Doctor dataaccess = new Doctor();
return dataaccess.GetAllDoctors();
return dataaccess_doctor.GetAllDoctors();
}
public List<Patient> GetPatients()
{
Patient dataaccess = new Patient();
return dataaccess.GetAllPatients();
return dataaccess_patient.GetAllPatients();
}
public List<Result> GetResults()
{
return dataaccess_result.GetAllResults();
}
public void WriteDoctor(Doctor doctor)
public Doctor WriteDoctor(Doctor doctor)
{
Doctor dataaccess = new Doctor();
dataaccess.CreateDoctor(doctor);
return dataaccess_doctor.CreateDoctor(doctor);
}
public void WritePatient(Patient patient)
public Patient WritePatient(Patient patient)
{
Patient dataaccess = new Patient();
dataaccess.CreatePatient(patient);
return dataaccess_patient.CreatePatient(patient);
}
public void WriteOrigin(Origin origin)
public Origin WriteOrigin(Origin origin)
{
Origin dataaccess = new Origin();
dataaccess.CreateOrigin(origin);
return dataaccess_origin.CreateOrigin(origin);
}
public void WriteExam(Exam exam)
public Exam WriteExam(Exam exam)
{
Exam dataaccess = new Exam();
dataaccess.CreateExam(exam);
return dataaccess_exam.CreateExam(exam);
}
public void WriteResult(Result result)
public Result WriteResult(Result result)
{
Result dataaccess = new Result();
dataaccess.CreateResult(result);
return dataaccess_result.CreateResult(result);
}
}
}

3
EHEC_Server/EHEC_Server/Web.config
View File

@ -30,7 +30,8 @@
<serviceHostingEnvironment aspNetCompatibilityEnabled="true" multipleSiteBindingsEnabled="true" />
</system.serviceModel>
<connectionStrings>
<add name="EHEC_DBEntities" connectionString="metadata=res://*/Model.csdl|res://*/Model.ssdl|res://*/Model.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=LAPTOP-S6N189QG;initial catalog=EHEC_DB;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
<!--<add name="EHEC_DBEntities" connectionString="metadata=res://*/Model.csdl|res://*/Model.ssdl|res://*/Model.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=LAPTOP-S6N189QG;initial catalog=EHEC_DB;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />-->
<add name="EHEC_DBEntities" connectionString="metadata=res://*/Model.csdl|res://*/Model.ssdl|res://*/Model.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=.\SQLEXPRESS;initial catalog=EHEC_DB;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
</connectionStrings>
<entityFramework>
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">

30
SQL/EHEC_DB_Query.sql
View File

@ -6,7 +6,9 @@
-- Generated from Cadaroski Ismail
-----------------------------------------------------
-- CHANGE LOG:
-- 180618 Ivan, Add Create DB
-- 180618 Ivan, Add Create DB
-- 180621 Ismail, change Tables
-- 180629 Ivan, Add inserts for fixed lists
-- --------------------------------------------------
-- Auskommentieren für Löschung der Datenbank
@ -41,7 +43,7 @@ IF SCHEMA_ID(N'dbo') IS NULL EXECUTE(N'CREATE SCHEMA [dbo]');
GO
-- --------------------------------------------------
-- Dropping existing FOREIGN KEY constraints
PRINT 'Dropping existing FOREIGN KEY constraints';
-- --------------------------------------------------
IF OBJECT_ID(N'[dbo].[FK_ResultExam]', 'F') IS NOT NULL
@ -59,7 +61,7 @@ IF OBJECT_ID(N'[dbo].[FK_OriginExam]', 'F') IS NOT NULL
GO
-- --------------------------------------------------
-- Dropping existing tables
PRINT 'Dropping existing tables';
-- --------------------------------------------------
IF OBJECT_ID(N'[dbo].[Patient]', 'U') IS NOT NULL
@ -79,7 +81,7 @@ IF OBJECT_ID(N'[dbo].[Result]', 'U') IS NOT NULL
GO
-- --------------------------------------------------
-- Creating all tables
PRINT 'Creating all tables';
-- --------------------------------------------------
-- Creating table 'Patient'
@ -140,7 +142,7 @@ CREATE TABLE [dbo].[Origin_Exam] (
GO
-- --------------------------------------------------
-- Creating all PRIMARY KEY constraints
PRINT 'Creating all PRIMARY KEY constraints';
-- --------------------------------------------------
-- Creating primary key on [Origin_ExamId] in table 'Origin_Exam'
ALTER TABLE [dbo].[Origin_Exam]
@ -179,12 +181,9 @@ ADD CONSTRAINT [PK_Result]
GO
-- --------------------------------------------------
-- Creating all FOREIGN KEY constraints
PRINT 'Creating all FOREIGN KEY constraints';
-- --------------------------------------------------
-- Creating foreign key on [Result_ResultId] in table 'Exam'
ALTER TABLE [dbo].[Exam]
ADD CONSTRAINT [FK_ResultExam]
@ -260,6 +259,19 @@ ON [dbo].[Origin_Exam]
([ExamExamId]);
GO
-- --------------------------------------------------
PRINT 'Creating inserts for fixed list objects';
-- --------------------------------------------------
INSERT INTO Result(Name)
VALUES
('EHEC-A'),
('EHEC-B'),
('EHEC-C'),
('EHEC-D'),
('EHEC-E')
GO
-- --------------------------------------------------
PRINT 'Erfolgreich erstellt..!';