add mapping from Client.Entities to EHEC_Service.Entity with automapper dependency and make a singleclick test possible by filling out fields with a teststring
This commit is contained in:
parent
16b6b91b7b
commit
698546e6da
|
@ -34,10 +34,16 @@
|
|||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="AutoMapper, Version=7.0.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Runtime.Serialization" />
|
||||
<Reference Include="System.ServiceModel" />
|
||||
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Core" />
|
||||
|
@ -74,10 +80,11 @@
|
|||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</ApplicationDefinition>
|
||||
<Compile Include="ServiceClasses\Exam.cs" />
|
||||
<Compile Include="ServiceClasses\Origin.cs" />
|
||||
<Compile Include="ServiceClasses\Origin_Exam.cs" />
|
||||
<Compile Include="ServiceClasses\Result.cs" />
|
||||
<Compile Include="Models\AutomapperProfile.cs" />
|
||||
<Compile Include="Models\Exam.cs" />
|
||||
<Compile Include="Models\Origin.cs" />
|
||||
<Compile Include="Models\Origin_Exam.cs" />
|
||||
<Compile Include="Models\Result.cs" />
|
||||
<Page Include="MainWindow.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
|
@ -91,7 +98,7 @@
|
|||
<DesignTime>True</DesignTime>
|
||||
<DependentUpon>Reference.svcmap</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ServiceClasses\Doctor.cs" />
|
||||
<Compile Include="Models\Doctor.cs" />
|
||||
<Compile Include="Global.cs" />
|
||||
<Compile Include="MainWindow.xaml.cs">
|
||||
<DependentUpon>MainWindow.xaml</DependentUpon>
|
||||
|
@ -99,7 +106,7 @@
|
|||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="ServiceClasses\Patient.cs" />
|
||||
<Compile Include="Models\Patient.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
|
@ -126,6 +133,9 @@
|
|||
<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.Origin_Exam.datasource">
|
||||
<DependentUpon>Reference.svcmap</DependentUpon>
|
||||
</None>
|
||||
<None Include="Connected Services\EHEC_Service\Client.EHEC_Service.Patient.datasource">
|
||||
<DependentUpon>Reference.svcmap</DependentUpon>
|
||||
</None>
|
||||
|
@ -133,9 +143,6 @@
|
|||
<DependentUpon>Reference.svcmap</DependentUpon>
|
||||
</None>
|
||||
<None Include="Connected Services\EHEC_Service\Service.wsdl" />
|
||||
<None Include="Connected Services\EHEC_Service\Service.xsd">
|
||||
<SubType>Designer</SubType>
|
||||
</None>
|
||||
<None Include="Connected Services\EHEC_Service\Service1.xsd">
|
||||
<SubType>Designer</SubType>
|
||||
</None>
|
||||
|
@ -175,8 +182,6 @@
|
|||
<LastGenOutput>Reference.cs</LastGenOutput>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="ViewModel\" />
|
||||
</ItemGroup>
|
||||
<ItemGroup />
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
|
@ -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_Exam" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
|
||||
<TypeInfo>Client.EHEC_Service.Origin_Exam, Connected Services.EHEC_Service.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
|
||||
</GenericObjectDataSource>
|
|
@ -15,14 +15,31 @@ namespace Client.EHEC_Service {
|
|||
|
||||
[System.Diagnostics.DebuggerStepThroughAttribute()]
|
||||
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
|
||||
[System.Runtime.Serialization.DataContractAttribute(Name="DoctorAccess", Namespace="http://schemas.datacontract.org/2004/07/EHEC_Server.DatabaseAccess")]
|
||||
[System.Runtime.Serialization.DataContractAttribute(Name="Doctor", Namespace="http://schemas.datacontract.org/2004/07/EHEC_Server")]
|
||||
[System.SerializableAttribute()]
|
||||
[System.Runtime.Serialization.KnownTypeAttribute(typeof(Client.EHEC_Service.Doctor))]
|
||||
public partial class DoctorAccess : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
|
||||
public partial class Doctor : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
|
||||
|
||||
[System.NonSerializedAttribute()]
|
||||
private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
|
||||
|
||||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private int DoctorIdField;
|
||||
|
||||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private string DoctorOriginField;
|
||||
|
||||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private Client.EHEC_Service.Exam[] ExamsField;
|
||||
|
||||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private string FirstNameField;
|
||||
|
||||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private string LastNameField;
|
||||
|
||||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private string RegionField;
|
||||
|
||||
[global::System.ComponentModel.BrowsableAttribute(false)]
|
||||
public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
|
||||
get {
|
||||
|
@ -33,40 +50,6 @@ namespace Client.EHEC_Service {
|
|||
}
|
||||
}
|
||||
|
||||
public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
|
||||
|
||||
protected void RaisePropertyChanged(string propertyName) {
|
||||
System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
|
||||
if ((propertyChanged != null)) {
|
||||
propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[System.Diagnostics.DebuggerStepThroughAttribute()]
|
||||
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
|
||||
[System.Runtime.Serialization.DataContractAttribute(Name="Doctor", Namespace="http://schemas.datacontract.org/2004/07/EHEC_Server")]
|
||||
[System.SerializableAttribute()]
|
||||
public partial class Doctor : Client.EHEC_Service.DoctorAccess {
|
||||
|
||||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private int DoctorIdField;
|
||||
|
||||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private string DoctorOriginField;
|
||||
|
||||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private Client.EHEC_Service.Exam[] ExamField;
|
||||
|
||||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private string FirstNameField;
|
||||
|
||||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private string LastNameField;
|
||||
|
||||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private string RegionField;
|
||||
|
||||
[System.Runtime.Serialization.DataMemberAttribute()]
|
||||
public int DoctorId {
|
||||
get {
|
||||
|
@ -94,14 +77,14 @@ namespace Client.EHEC_Service {
|
|||
}
|
||||
|
||||
[System.Runtime.Serialization.DataMemberAttribute()]
|
||||
public Client.EHEC_Service.Exam[] Exam {
|
||||
public Client.EHEC_Service.Exam[] Exams {
|
||||
get {
|
||||
return this.ExamField;
|
||||
return this.ExamsField;
|
||||
}
|
||||
set {
|
||||
if ((object.ReferenceEquals(this.ExamField, value) != true)) {
|
||||
this.ExamField = value;
|
||||
this.RaisePropertyChanged("Exam");
|
||||
if ((object.ReferenceEquals(this.ExamsField, value) != true)) {
|
||||
this.ExamsField = value;
|
||||
this.RaisePropertyChanged("Exams");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -144,13 +127,25 @@ namespace Client.EHEC_Service {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
|
||||
|
||||
protected void RaisePropertyChanged(string propertyName) {
|
||||
System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
|
||||
if ((propertyChanged != null)) {
|
||||
propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[System.Diagnostics.DebuggerStepThroughAttribute()]
|
||||
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
|
||||
[System.Runtime.Serialization.DataContractAttribute(Name="Exam", Namespace="http://schemas.datacontract.org/2004/07/EHEC_Server")]
|
||||
[System.SerializableAttribute()]
|
||||
public partial class Exam : Client.EHEC_Service.ExamAccess {
|
||||
public partial class Exam : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
|
||||
|
||||
[System.NonSerializedAttribute()]
|
||||
private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
|
||||
|
||||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private Client.EHEC_Service.Doctor DoctorField;
|
||||
|
@ -161,9 +156,6 @@ namespace Client.EHEC_Service {
|
|||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private int ExamIdField;
|
||||
|
||||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private int OriginOriginIdField;
|
||||
|
||||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private Client.EHEC_Service.Origin_Exam[] Origin_ExamField;
|
||||
|
||||
|
@ -179,6 +171,16 @@ namespace Client.EHEC_Service {
|
|||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private int Result_ResultIdField;
|
||||
|
||||
[global::System.ComponentModel.BrowsableAttribute(false)]
|
||||
public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
|
||||
get {
|
||||
return this.extensionDataField;
|
||||
}
|
||||
set {
|
||||
this.extensionDataField = value;
|
||||
}
|
||||
}
|
||||
|
||||
[System.Runtime.Serialization.DataMemberAttribute()]
|
||||
public Client.EHEC_Service.Doctor Doctor {
|
||||
get {
|
||||
|
@ -218,19 +220,6 @@ namespace Client.EHEC_Service {
|
|||
}
|
||||
}
|
||||
|
||||
[System.Runtime.Serialization.DataMemberAttribute()]
|
||||
public int OriginOriginId {
|
||||
get {
|
||||
return this.OriginOriginIdField;
|
||||
}
|
||||
set {
|
||||
if ((this.OriginOriginIdField.Equals(value) != true)) {
|
||||
this.OriginOriginIdField = value;
|
||||
this.RaisePropertyChanged("OriginOriginId");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[System.Runtime.Serialization.DataMemberAttribute()]
|
||||
public Client.EHEC_Service.Origin_Exam[] Origin_Exam {
|
||||
get {
|
||||
|
@ -295,27 +284,6 @@ namespace Client.EHEC_Service {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[System.Diagnostics.DebuggerStepThroughAttribute()]
|
||||
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
|
||||
[System.Runtime.Serialization.DataContractAttribute(Name="ExamAccess", Namespace="http://schemas.datacontract.org/2004/07/EHEC_Server.DatabaseAccess")]
|
||||
[System.SerializableAttribute()]
|
||||
[System.Runtime.Serialization.KnownTypeAttribute(typeof(Client.EHEC_Service.Exam))]
|
||||
public partial class ExamAccess : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
|
||||
|
||||
[System.NonSerializedAttribute()]
|
||||
private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
|
||||
|
||||
[global::System.ComponentModel.BrowsableAttribute(false)]
|
||||
public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
|
||||
get {
|
||||
return this.extensionDataField;
|
||||
}
|
||||
set {
|
||||
this.extensionDataField = value;
|
||||
}
|
||||
}
|
||||
|
||||
public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
|
||||
|
||||
|
@ -331,7 +299,10 @@ namespace Client.EHEC_Service {
|
|||
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
|
||||
[System.Runtime.Serialization.DataContractAttribute(Name="Patient", Namespace="http://schemas.datacontract.org/2004/07/EHEC_Server")]
|
||||
[System.SerializableAttribute()]
|
||||
public partial class Patient : Client.EHEC_Service.PatientAccess {
|
||||
public partial class Patient : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
|
||||
|
||||
[System.NonSerializedAttribute()]
|
||||
private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
|
||||
|
||||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private System.DateTime BirthDateField;
|
||||
|
@ -340,7 +311,7 @@ namespace Client.EHEC_Service {
|
|||
private string CityField;
|
||||
|
||||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private Client.EHEC_Service.Exam[] ExamField;
|
||||
private Client.EHEC_Service.Exam[] ExamsField;
|
||||
|
||||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private string FirstNameField;
|
||||
|
@ -357,6 +328,16 @@ namespace Client.EHEC_Service {
|
|||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private string StreetField;
|
||||
|
||||
[global::System.ComponentModel.BrowsableAttribute(false)]
|
||||
public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
|
||||
get {
|
||||
return this.extensionDataField;
|
||||
}
|
||||
set {
|
||||
this.extensionDataField = value;
|
||||
}
|
||||
}
|
||||
|
||||
[System.Runtime.Serialization.DataMemberAttribute()]
|
||||
public System.DateTime BirthDate {
|
||||
get {
|
||||
|
@ -384,14 +365,14 @@ namespace Client.EHEC_Service {
|
|||
}
|
||||
|
||||
[System.Runtime.Serialization.DataMemberAttribute()]
|
||||
public Client.EHEC_Service.Exam[] Exam {
|
||||
public Client.EHEC_Service.Exam[] Exams {
|
||||
get {
|
||||
return this.ExamField;
|
||||
return this.ExamsField;
|
||||
}
|
||||
set {
|
||||
if ((object.ReferenceEquals(this.ExamField, value) != true)) {
|
||||
this.ExamField = value;
|
||||
this.RaisePropertyChanged("Exam");
|
||||
if ((object.ReferenceEquals(this.ExamsField, value) != true)) {
|
||||
this.ExamsField = value;
|
||||
this.RaisePropertyChanged("Exams");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -460,16 +441,28 @@ namespace Client.EHEC_Service {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
|
||||
|
||||
protected void RaisePropertyChanged(string propertyName) {
|
||||
System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
|
||||
if ((propertyChanged != null)) {
|
||||
propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[System.Diagnostics.DebuggerStepThroughAttribute()]
|
||||
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
|
||||
[System.Runtime.Serialization.DataContractAttribute(Name="Result", Namespace="http://schemas.datacontract.org/2004/07/EHEC_Server")]
|
||||
[System.SerializableAttribute()]
|
||||
public partial class Result : Client.EHEC_Service.ResultAccess {
|
||||
public partial class Result : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
|
||||
|
||||
[System.NonSerializedAttribute()]
|
||||
private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
|
||||
|
||||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private Client.EHEC_Service.Exam[] ExamField;
|
||||
private Client.EHEC_Service.Exam[] ExamsField;
|
||||
|
||||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private string NameField;
|
||||
|
@ -477,15 +470,25 @@ namespace Client.EHEC_Service {
|
|||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private int ResultIdField;
|
||||
|
||||
[System.Runtime.Serialization.DataMemberAttribute()]
|
||||
public Client.EHEC_Service.Exam[] Exam {
|
||||
[global::System.ComponentModel.BrowsableAttribute(false)]
|
||||
public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
|
||||
get {
|
||||
return this.ExamField;
|
||||
return this.extensionDataField;
|
||||
}
|
||||
set {
|
||||
if ((object.ReferenceEquals(this.ExamField, value) != true)) {
|
||||
this.ExamField = value;
|
||||
this.RaisePropertyChanged("Exam");
|
||||
this.extensionDataField = value;
|
||||
}
|
||||
}
|
||||
|
||||
[System.Runtime.Serialization.DataMemberAttribute()]
|
||||
public Client.EHEC_Service.Exam[] Exams {
|
||||
get {
|
||||
return this.ExamsField;
|
||||
}
|
||||
set {
|
||||
if ((object.ReferenceEquals(this.ExamsField, value) != true)) {
|
||||
this.ExamsField = value;
|
||||
this.RaisePropertyChanged("Exams");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -515,6 +518,15 @@ namespace Client.EHEC_Service {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
|
||||
|
||||
protected void RaisePropertyChanged(string propertyName) {
|
||||
System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
|
||||
if ((propertyChanged != null)) {
|
||||
propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[System.Diagnostics.DebuggerStepThroughAttribute()]
|
||||
|
@ -630,7 +642,10 @@ namespace Client.EHEC_Service {
|
|||
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
|
||||
[System.Runtime.Serialization.DataContractAttribute(Name="Origin", Namespace="http://schemas.datacontract.org/2004/07/EHEC_Server")]
|
||||
[System.SerializableAttribute()]
|
||||
public partial class Origin : Client.EHEC_Service.OriginAccess {
|
||||
public partial class Origin : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
|
||||
|
||||
[System.NonSerializedAttribute()]
|
||||
private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
|
||||
|
||||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private string CityField;
|
||||
|
@ -650,6 +665,16 @@ namespace Client.EHEC_Service {
|
|||
[System.Runtime.Serialization.OptionalFieldAttribute()]
|
||||
private string StreetField;
|
||||
|
||||
[global::System.ComponentModel.BrowsableAttribute(false)]
|
||||
public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
|
||||
get {
|
||||
return this.extensionDataField;
|
||||
}
|
||||
set {
|
||||
this.extensionDataField = value;
|
||||
}
|
||||
}
|
||||
|
||||
[System.Runtime.Serialization.DataMemberAttribute()]
|
||||
public string City {
|
||||
get {
|
||||
|
@ -727,87 +752,6 @@ namespace Client.EHEC_Service {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[System.Diagnostics.DebuggerStepThroughAttribute()]
|
||||
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
|
||||
[System.Runtime.Serialization.DataContractAttribute(Name="OriginAccess", Namespace="http://schemas.datacontract.org/2004/07/EHEC_Server.DatabaseAccess")]
|
||||
[System.SerializableAttribute()]
|
||||
[System.Runtime.Serialization.KnownTypeAttribute(typeof(Client.EHEC_Service.Origin))]
|
||||
public partial class OriginAccess : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
|
||||
|
||||
[System.NonSerializedAttribute()]
|
||||
private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
|
||||
|
||||
[global::System.ComponentModel.BrowsableAttribute(false)]
|
||||
public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
|
||||
get {
|
||||
return this.extensionDataField;
|
||||
}
|
||||
set {
|
||||
this.extensionDataField = value;
|
||||
}
|
||||
}
|
||||
|
||||
public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
|
||||
|
||||
protected void RaisePropertyChanged(string propertyName) {
|
||||
System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
|
||||
if ((propertyChanged != null)) {
|
||||
propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[System.Diagnostics.DebuggerStepThroughAttribute()]
|
||||
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
|
||||
[System.Runtime.Serialization.DataContractAttribute(Name="PatientAccess", Namespace="http://schemas.datacontract.org/2004/07/EHEC_Server.DatabaseAccess")]
|
||||
[System.SerializableAttribute()]
|
||||
[System.Runtime.Serialization.KnownTypeAttribute(typeof(Client.EHEC_Service.Patient))]
|
||||
public partial class PatientAccess : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
|
||||
|
||||
[System.NonSerializedAttribute()]
|
||||
private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
|
||||
|
||||
[global::System.ComponentModel.BrowsableAttribute(false)]
|
||||
public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
|
||||
get {
|
||||
return this.extensionDataField;
|
||||
}
|
||||
set {
|
||||
this.extensionDataField = value;
|
||||
}
|
||||
}
|
||||
|
||||
public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
|
||||
|
||||
protected void RaisePropertyChanged(string propertyName) {
|
||||
System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
|
||||
if ((propertyChanged != null)) {
|
||||
propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[System.Diagnostics.DebuggerStepThroughAttribute()]
|
||||
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
|
||||
[System.Runtime.Serialization.DataContractAttribute(Name="ResultAccess", Namespace="http://schemas.datacontract.org/2004/07/EHEC_Server.DatabaseAccess")]
|
||||
[System.SerializableAttribute()]
|
||||
[System.Runtime.Serialization.KnownTypeAttribute(typeof(Client.EHEC_Service.Result))]
|
||||
public partial class ResultAccess : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
|
||||
|
||||
[System.NonSerializedAttribute()]
|
||||
private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
|
||||
|
||||
[global::System.ComponentModel.BrowsableAttribute(false)]
|
||||
public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
|
||||
get {
|
||||
return this.extensionDataField;
|
||||
}
|
||||
set {
|
||||
this.extensionDataField = value;
|
||||
}
|
||||
}
|
||||
|
||||
public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
|
||||
|
||||
|
@ -847,6 +791,12 @@ namespace Client.EHEC_Service {
|
|||
[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);
|
||||
|
||||
|
@ -919,6 +869,14 @@ namespace Client.EHEC_Service {
|
|||
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);
|
||||
}
|
||||
|
|
|
@ -22,12 +22,11 @@
|
|||
<MetadataSource Address="http://localhost:50200/Service.svc" Protocol="http" SourceId="1" />
|
||||
</MetadataSources>
|
||||
<Metadata>
|
||||
<MetadataFile FileName="Service.xsd" MetadataType="Schema" ID="3c3c5e80-e8b1-4d29-8c86-ee9e12fcbca2" SourceId="1" SourceUrl="http://localhost:50200/Service.svc?xsd=xsd3" />
|
||||
<MetadataFile FileName="Service.disco" MetadataType="Disco" ID="215c1eff-27c5-44da-8d9c-29811a8671fe" SourceId="1" SourceUrl="http://localhost:50200/Service.svc?disco" />
|
||||
<MetadataFile FileName="Service1.xsd" MetadataType="Schema" ID="0b881029-da3a-4689-80c9-21e251d4c6a2" SourceId="1" SourceUrl="http://localhost:50200/Service.svc?xsd=xsd0" />
|
||||
<MetadataFile FileName="Service2.xsd" MetadataType="Schema" ID="b4a292fd-bb29-4b36-bbf6-682bad3b3ad2" SourceId="1" SourceUrl="http://localhost:50200/Service.svc?xsd=xsd1" />
|
||||
<MetadataFile FileName="Service3.xsd" MetadataType="Schema" ID="dacd1ca3-36e4-4dab-86ac-6adfd901314d" SourceId="1" SourceUrl="http://localhost:50200/Service.svc?xsd=xsd2" />
|
||||
<MetadataFile FileName="Service.wsdl" MetadataType="Wsdl" ID="336b045c-efa8-4e27-a59f-38d02a0e7e77" SourceId="1" SourceUrl="http://localhost:50200/Service.svc?wsdl" />
|
||||
<MetadataFile FileName="Service3.xsd" MetadataType="Schema" ID="dacd1ca3-36e4-4dab-86ac-6adfd901314d" SourceId="1" SourceUrl="http://localhost:50200/Service.svc?xsd=xsd2" />
|
||||
<MetadataFile FileName="Service2.xsd" MetadataType="Schema" ID="b4a292fd-bb29-4b36-bbf6-682bad3b3ad2" SourceId="1" SourceUrl="http://localhost:50200/Service.svc?xsd=xsd1" />
|
||||
</Metadata>
|
||||
<Extensions>
|
||||
<ExtensionFile FileName="configuration91.svcinfo" Name="configuration91.svcinfo" />
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
<xsd:import schemaLocation="http://localhost:50200/Service.svc?xsd=xsd0" namespace="http://tempuri.org/" />
|
||||
<xsd:import schemaLocation="http://localhost:50200/Service.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
|
||||
<xsd:import schemaLocation="http://localhost:50200/Service.svc?xsd=xsd2" namespace="http://schemas.datacontract.org/2004/07/EHEC_Server" />
|
||||
<xsd:import schemaLocation="http://localhost:50200/Service.svc?xsd=xsd3" namespace="http://schemas.datacontract.org/2004/07/EHEC_Server.DatabaseAccess" />
|
||||
</xsd:schema>
|
||||
</wsdl:types>
|
||||
<wsdl:message name="IService_WriteDoctor_InputMessage">
|
||||
|
@ -32,6 +31,12 @@
|
|||
<wsdl:message name="IService_WriteExam_OutputMessage">
|
||||
<wsdl:part name="parameters" element="tns:WriteExamResponse" />
|
||||
</wsdl:message>
|
||||
<wsdl:message name="IService_WriteOrigin_Exam_InputMessage">
|
||||
<wsdl:part name="parameters" element="tns:WriteOrigin_Exam" />
|
||||
</wsdl:message>
|
||||
<wsdl:message name="IService_WriteOrigin_Exam_OutputMessage">
|
||||
<wsdl:part name="parameters" element="tns:WriteOrigin_ExamResponse" />
|
||||
</wsdl:message>
|
||||
<wsdl:message name="IService_WriteResult_InputMessage">
|
||||
<wsdl:part name="parameters" element="tns:WriteResult" />
|
||||
</wsdl:message>
|
||||
|
@ -61,6 +66,10 @@
|
|||
<wsdl:input wsaw:Action="http://tempuri.org/IService/WriteExam" message="tns:IService_WriteExam_InputMessage" />
|
||||
<wsdl:output wsaw:Action="http://tempuri.org/IService/WriteExamResponse" message="tns:IService_WriteExam_OutputMessage" />
|
||||
</wsdl:operation>
|
||||
<wsdl:operation name="WriteOrigin_Exam">
|
||||
<wsdl:input wsaw:Action="http://tempuri.org/IService/WriteOrigin_Exam" message="tns:IService_WriteOrigin_Exam_InputMessage" />
|
||||
<wsdl:output wsaw:Action="http://tempuri.org/IService/WriteOrigin_ExamResponse" message="tns:IService_WriteOrigin_Exam_OutputMessage" />
|
||||
</wsdl:operation>
|
||||
<wsdl:operation name="WriteResult">
|
||||
<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" />
|
||||
|
@ -108,6 +117,15 @@
|
|||
<soap:body use="literal" />
|
||||
</wsdl:output>
|
||||
</wsdl:operation>
|
||||
<wsdl:operation name="WriteOrigin_Exam">
|
||||
<soap:operation soapAction="http://tempuri.org/IService/WriteOrigin_Exam" style="document" />
|
||||
<wsdl:input>
|
||||
<soap:body use="literal" />
|
||||
</wsdl:input>
|
||||
<wsdl:output>
|
||||
<soap:body use="literal" />
|
||||
</wsdl:output>
|
||||
</wsdl:operation>
|
||||
<wsdl:operation name="WriteResult">
|
||||
<soap:operation soapAction="http://tempuri.org/IService/WriteResult" style="document" />
|
||||
<wsdl:input>
|
||||
|
|
|
@ -1,23 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/EHEC_Server.DatabaseAccess" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/EHEC_Server.DatabaseAccess" xmlns:xs="http://www.w3.org/2001/XMLSchema">
|
||||
<xs:complexType name="DoctorAccess">
|
||||
<xs:sequence />
|
||||
</xs:complexType>
|
||||
<xs:element name="DoctorAccess" nillable="true" type="tns:DoctorAccess" />
|
||||
<xs:complexType name="ExamAccess">
|
||||
<xs:sequence />
|
||||
</xs:complexType>
|
||||
<xs:element name="ExamAccess" nillable="true" type="tns:ExamAccess" />
|
||||
<xs:complexType name="OriginAccess">
|
||||
<xs:sequence />
|
||||
</xs:complexType>
|
||||
<xs:element name="OriginAccess" nillable="true" type="tns:OriginAccess" />
|
||||
<xs:complexType name="PatientAccess">
|
||||
<xs:sequence />
|
||||
</xs:complexType>
|
||||
<xs:element name="PatientAccess" nillable="true" type="tns:PatientAccess" />
|
||||
<xs:complexType name="ResultAccess">
|
||||
<xs:sequence />
|
||||
</xs:complexType>
|
||||
<xs:element name="ResultAccess" nillable="true" type="tns:ResultAccess" />
|
||||
</xs:schema>
|
|
@ -57,17 +57,31 @@
|
|||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="WriteOrigin_Exam">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element xmlns:q9="http://schemas.datacontract.org/2004/07/EHEC_Server" minOccurs="0" name="origin_exam" nillable="true" type="q9:Origin_Exam" />
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="WriteOrigin_ExamResponse">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element xmlns:q10="http://schemas.datacontract.org/2004/07/EHEC_Server" minOccurs="0" name="WriteOrigin_ExamResult" nillable="true" type="q10:Origin_Exam" />
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="WriteResult">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element xmlns:q9="http://schemas.datacontract.org/2004/07/EHEC_Server" minOccurs="0" name="result" nillable="true" type="q9:Result" />
|
||||
<xs:element xmlns:q11="http://schemas.datacontract.org/2004/07/EHEC_Server" minOccurs="0" name="result" nillable="true" type="q11: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:element xmlns:q12="http://schemas.datacontract.org/2004/07/EHEC_Server" minOccurs="0" name="WriteResultResult" nillable="true" type="q12:Result" />
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
|
@ -79,7 +93,7 @@
|
|||
<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:element xmlns:q13="http://schemas.datacontract.org/2004/07/EHEC_Server" minOccurs="0" name="GetResultsResult" nillable="true" type="q13:ArrayOfResult" />
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
|
|
|
@ -1,19 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/EHEC_Server" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/EHEC_Server" xmlns:xs="http://www.w3.org/2001/XMLSchema">
|
||||
<xs:import schemaLocation="http://localhost:50200/Service.svc?xsd=xsd3" namespace="http://schemas.datacontract.org/2004/07/EHEC_Server.DatabaseAccess" />
|
||||
<xs:complexType name="Doctor">
|
||||
<xs:complexContent mixed="false">
|
||||
<xs:extension xmlns:q1="http://schemas.datacontract.org/2004/07/EHEC_Server.DatabaseAccess" base="q1:DoctorAccess">
|
||||
<xs:sequence>
|
||||
<xs:element minOccurs="0" name="DoctorId" type="xs:int" />
|
||||
<xs:element minOccurs="0" name="DoctorOrigin" nillable="true" type="xs:string" />
|
||||
<xs:element minOccurs="0" name="Exam" nillable="true" type="tns:ArrayOfExam" />
|
||||
<xs:element minOccurs="0" name="FirstName" nillable="true" type="xs:string" />
|
||||
<xs:element minOccurs="0" name="LastName" nillable="true" type="xs:string" />
|
||||
<xs:element minOccurs="0" name="Region" nillable="true" type="xs:string" />
|
||||
</xs:sequence>
|
||||
</xs:extension>
|
||||
</xs:complexContent>
|
||||
<xs:sequence>
|
||||
<xs:element minOccurs="0" name="DoctorId" type="xs:int" />
|
||||
<xs:element minOccurs="0" name="DoctorOrigin" nillable="true" type="xs:string" />
|
||||
<xs:element minOccurs="0" name="Exams" nillable="true" type="tns:ArrayOfExam" />
|
||||
<xs:element minOccurs="0" name="FirstName" nillable="true" type="xs:string" />
|
||||
<xs:element minOccurs="0" name="LastName" nillable="true" type="xs:string" />
|
||||
<xs:element minOccurs="0" name="Region" nillable="true" type="xs:string" />
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
<xs:element name="Doctor" nillable="true" type="tns:Doctor" />
|
||||
<xs:complexType name="ArrayOfExam">
|
||||
|
@ -23,21 +18,16 @@
|
|||
</xs:complexType>
|
||||
<xs:element name="ArrayOfExam" nillable="true" type="tns:ArrayOfExam" />
|
||||
<xs:complexType name="Exam">
|
||||
<xs:complexContent mixed="false">
|
||||
<xs:extension xmlns:q2="http://schemas.datacontract.org/2004/07/EHEC_Server.DatabaseAccess" base="q2:ExamAccess">
|
||||
<xs:sequence>
|
||||
<xs:element minOccurs="0" name="Doctor" nillable="true" type="tns:Doctor" />
|
||||
<xs:element minOccurs="0" name="DoctorId" type="xs:int" />
|
||||
<xs:element minOccurs="0" name="ExamId" type="xs:int" />
|
||||
<xs:element minOccurs="0" name="OriginOriginId" type="xs:int" />
|
||||
<xs:element minOccurs="0" name="Origin_Exam" nillable="true" type="tns:ArrayOfOrigin_Exam" />
|
||||
<xs:element minOccurs="0" name="Patient" nillable="true" type="tns:Patient" />
|
||||
<xs:element minOccurs="0" name="PatientId" type="xs:int" />
|
||||
<xs:element minOccurs="0" name="Result" nillable="true" type="tns:Result" />
|
||||
<xs:element minOccurs="0" name="Result_ResultId" type="xs:int" />
|
||||
</xs:sequence>
|
||||
</xs:extension>
|
||||
</xs:complexContent>
|
||||
<xs:sequence>
|
||||
<xs:element minOccurs="0" name="Doctor" nillable="true" type="tns:Doctor" />
|
||||
<xs:element minOccurs="0" name="DoctorId" type="xs:int" />
|
||||
<xs:element minOccurs="0" name="ExamId" type="xs:int" />
|
||||
<xs:element minOccurs="0" name="Origin_Exam" nillable="true" type="tns:ArrayOfOrigin_Exam" />
|
||||
<xs:element minOccurs="0" name="Patient" nillable="true" type="tns:Patient" />
|
||||
<xs:element minOccurs="0" name="PatientId" type="xs:int" />
|
||||
<xs:element minOccurs="0" name="Result" nillable="true" type="tns:Result" />
|
||||
<xs:element minOccurs="0" name="Result_ResultId" type="xs:int" />
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
<xs:element name="Exam" nillable="true" type="tns:Exam" />
|
||||
<xs:complexType name="ArrayOfOrigin_Exam">
|
||||
|
@ -57,47 +47,35 @@
|
|||
</xs:complexType>
|
||||
<xs:element name="Origin_Exam" nillable="true" type="tns:Origin_Exam" />
|
||||
<xs:complexType name="Origin">
|
||||
<xs:complexContent mixed="false">
|
||||
<xs:extension xmlns:q3="http://schemas.datacontract.org/2004/07/EHEC_Server.DatabaseAccess" base="q3:OriginAccess">
|
||||
<xs:sequence>
|
||||
<xs:element minOccurs="0" name="City" nillable="true" type="xs:string" />
|
||||
<xs:element minOccurs="0" name="Food" nillable="true" type="xs:string" />
|
||||
<xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
|
||||
<xs:element minOccurs="0" name="OriginId" type="xs:int" />
|
||||
<xs:element minOccurs="0" name="Origin_Exam" nillable="true" type="tns:ArrayOfOrigin_Exam" />
|
||||
<xs:element minOccurs="0" name="Street" nillable="true" type="xs:string" />
|
||||
</xs:sequence>
|
||||
</xs:extension>
|
||||
</xs:complexContent>
|
||||
<xs:sequence>
|
||||
<xs:element minOccurs="0" name="City" nillable="true" type="xs:string" />
|
||||
<xs:element minOccurs="0" name="Food" nillable="true" type="xs:string" />
|
||||
<xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
|
||||
<xs:element minOccurs="0" name="OriginId" type="xs:int" />
|
||||
<xs:element minOccurs="0" name="Origin_Exam" nillable="true" type="tns:ArrayOfOrigin_Exam" />
|
||||
<xs:element minOccurs="0" name="Street" nillable="true" type="xs:string" />
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
<xs:element name="Origin" nillable="true" type="tns:Origin" />
|
||||
<xs:complexType name="Patient">
|
||||
<xs:complexContent mixed="false">
|
||||
<xs:extension xmlns:q4="http://schemas.datacontract.org/2004/07/EHEC_Server.DatabaseAccess" base="q4:PatientAccess">
|
||||
<xs:sequence>
|
||||
<xs:element minOccurs="0" name="BirthDate" type="xs:dateTime" />
|
||||
<xs:element minOccurs="0" name="City" nillable="true" type="xs:string" />
|
||||
<xs:element minOccurs="0" name="Exam" nillable="true" type="tns:ArrayOfExam" />
|
||||
<xs:element minOccurs="0" name="FirstName" nillable="true" type="xs:string" />
|
||||
<xs:element minOccurs="0" name="LastName" nillable="true" type="xs:string" />
|
||||
<xs:element minOccurs="0" name="PatientId" type="xs:int" />
|
||||
<xs:element minOccurs="0" name="Region" nillable="true" type="xs:string" />
|
||||
<xs:element minOccurs="0" name="Street" nillable="true" type="xs:string" />
|
||||
</xs:sequence>
|
||||
</xs:extension>
|
||||
</xs:complexContent>
|
||||
<xs:sequence>
|
||||
<xs:element minOccurs="0" name="BirthDate" type="xs:dateTime" />
|
||||
<xs:element minOccurs="0" name="City" nillable="true" type="xs:string" />
|
||||
<xs:element minOccurs="0" name="Exams" nillable="true" type="tns:ArrayOfExam" />
|
||||
<xs:element minOccurs="0" name="FirstName" nillable="true" type="xs:string" />
|
||||
<xs:element minOccurs="0" name="LastName" nillable="true" type="xs:string" />
|
||||
<xs:element minOccurs="0" name="PatientId" type="xs:int" />
|
||||
<xs:element minOccurs="0" name="Region" nillable="true" type="xs:string" />
|
||||
<xs:element minOccurs="0" name="Street" nillable="true" type="xs:string" />
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
<xs:element name="Patient" nillable="true" type="tns:Patient" />
|
||||
<xs:complexType name="Result">
|
||||
<xs:complexContent mixed="false">
|
||||
<xs:extension xmlns:q5="http://schemas.datacontract.org/2004/07/EHEC_Server.DatabaseAccess" base="q5:ResultAccess">
|
||||
<xs:sequence>
|
||||
<xs:element minOccurs="0" name="Exam" nillable="true" type="tns:ArrayOfExam" />
|
||||
<xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
|
||||
<xs:element minOccurs="0" name="ResultId" type="xs:int" />
|
||||
</xs:sequence>
|
||||
</xs:extension>
|
||||
</xs:complexContent>
|
||||
<xs:sequence>
|
||||
<xs:element minOccurs="0" name="Exams" nillable="true" type="tns:ArrayOfExam" />
|
||||
<xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
|
||||
<xs:element minOccurs="0" name="ResultId" type="xs:int" />
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
<xs:element name="Result" nillable="true" type="tns:Result" />
|
||||
<xs:complexType name="ArrayOfResult">
|
||||
|
|
|
@ -30,100 +30,100 @@
|
|||
<ColumnDefinition Width="76*"/>
|
||||
<ColumnDefinition Width="105*"/>
|
||||
<ColumnDefinition Width="134*"/>
|
||||
<ColumnDefinition Width="160*"/>
|
||||
<ColumnDefinition Width="140*"/>
|
||||
<ColumnDefinition Width="60*"/>
|
||||
<ColumnDefinition Width="150*"/>
|
||||
<ColumnDefinition Width="90*"/>
|
||||
<ColumnDefinition Width="120*"/>
|
||||
<ColumnDefinition Width="25*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<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="LabelTitel" Content="EHEC Meldeform:" Grid.ColumnSpan="3" Grid.RowSpan="2" Margin="1,1,1,0.5" VerticalContentAlignment="Center" FontSize="20" />
|
||||
<Label x:Name="LabelArzt" Content="Arzt:" Margin="1,1.5,1,0.5" Grid.Row="2" VerticalContentAlignment="Center"/>
|
||||
<Label x:Name="LabelPatient" Content="Patient:" Margin="1,1.5,1,0.5" RenderTransformOrigin="0.582,0.288" Grid.Row="8" VerticalContentAlignment="Center"/>
|
||||
<Label x:Name="LabelAnalyseergebnisse" Content="Analyseergebnisse:" Margin="1,1.5,1,0.5" Grid.Column="3" Grid.Row="2" VerticalContentAlignment="Center"/>
|
||||
<Label x:Name="LabelNahrungseinnahmen" Content="Nahrungseinnahmen:" Margin="1,1.5,1,0.5" Grid.Column="3" Grid.Row="3" VerticalContentAlignment="Center"/>
|
||||
<Button x:Name="ButtonClose" Content="X" Margin="1,1,1,0.5" Click="ButtonClose_Click" Background="White" RenderTransformOrigin="0.573,1.105" Grid.Column="7"/>
|
||||
<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="Auto Many" Margin="1" Background="White" Grid.Column="5" Grid.Row="14" VerticalContentAlignment="Center" Click="ButtonAutogenerateMany_Click"/>
|
||||
<Button x:Name="ButtonSend" Content="Senden" Margin="1" Click="ButtonSend_Click" Background="White" Grid.Column="6" Grid.Row="14" VerticalContentAlignment="Center"/>
|
||||
<Label x:Name="LabelRueckmeldung" Content="Rückmeldung:" Margin="1,1,1,1.5" Grid.Column="3" Grid.Row="13" VerticalContentAlignment="Center"/>
|
||||
<Label x:Name="LabelRueckmeldungsfeld" Content="" Margin="1,1,10,1.5" Grid.ColumnSpan="4" 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 x:Name="TextboxArztName" Margin="1,1.5,1,0.5" 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>
|
||||
<xctk:WatermarkTextBox x:Name="TextboxArztVorname" Margin="1" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="3" Grid.Column="1" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxArztVorname" Margin="1,1.5,1,0.5" 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="1" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="4" Grid.Column="1" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxArztStrasseNr" Margin="1,1.5,1,0.5" 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="1" Padding="3,1" Grid.Row="5" Grid.Column="1" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxArztPlz" Margin="1,1.5,1,0.5" 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="1" Padding="3,1" Grid.Column="2" Grid.Row="5" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxArztOrt" Margin="1,1.5,1,0.5" 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="1" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="6" Grid.Column="1" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxArztKantonsarzt" Margin="1,1.5,1,0.5" 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="1" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="7" Grid.Column="1" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxArztRegion" Margin="1,1.5,1,0.5" 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" />
|
||||
<TextBlock Text="Arztregion" Margin="2,0,0,0" />
|
||||
</StackPanel>
|
||||
</xctk:WatermarkTextBox.Watermark>
|
||||
</xctk:WatermarkTextBox>
|
||||
<xctk:WatermarkTextBox x:Name="TextboxPatientName" Margin="1" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="8" Grid.Column="1" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxPatientName" Margin="1,1.5,1,0.5" 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="1" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="9" Grid.Column="1" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxPatientVorname" Margin="1,1.5,1,0.5" 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="1" Padding="4,1,3,1" Grid.ColumnSpan="2" Grid.Row="10" Grid.Column="1" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxPatientStrasseNr" Margin="1,1.5,1,0.5" 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="1" Padding="3,1" Grid.Row="11" Grid.Column="1" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxPatientPlz" Margin="1,1.5,1,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="1" Padding="3,1" Grid.Column="2" Grid.Row="11" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxPatientOrt" Margin="1,1.5,1,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" />
|
||||
|
@ -137,132 +137,160 @@
|
|||
</StackPanel>
|
||||
</xctk:WatermarkTextBox.Watermark>
|
||||
</xctk:WatermarkTextBox>
|
||||
<xctk:WatermarkTextBox x:Name="TextboxPatientGeburtstag" Margin="1" Padding="3,1" Grid.ColumnSpan="2" Grid.Row="13" Grid.Column="1" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxPatientGeburtstag" Margin="1,1,1,1.5" 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>
|
||||
<xctk:WatermarkTextBox x:Name="TextboxBakterienstamm" Margin="1" Padding="3,1" Grid.Column="4" Grid.Row="2" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxBakterienstamm" Margin="1,1,1,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 x:Name="TextboxNahrung1Restaurant" Margin="1,1,1,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="TextboxNahrung1Essen" Margin="1" Padding="3,1" Grid.Column="5" Grid.Row="3" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxNahrung1Essen" Margin="1,1,1,1" Padding="3,1" Grid.Column="4" Grid.Row="4" VerticalContentAlignment="Center">
|
||||
<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="1" Padding="3,1" Grid.Column="4" Grid.Row="4" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxNahrung1Strasse" Margin="1,1,1,1" Padding="3,1" Grid.Column="5" 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="TextboxNahrung1Ort" Margin="1" Grid.Column="5" Grid.Row="4" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxNahrung1Plz" Margin="1,1,1,1" Grid.Column="5" 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,1,1,1" Grid.Column="6" 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" Padding="3,1" Grid.Column="4" Grid.Row="5" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxNahrung2Restaurant" Margin="1,1,1,1" Padding="3,1" Grid.Column="4" Grid.Row="5" 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="TextboxNahrung2Essen" Margin="1" Padding="3,1" Grid.Column="5" Grid.Row="5" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxNahrung2Essen" Margin="1,1,1,1" Padding="3,1" Grid.Column="4" Grid.Row="6" VerticalContentAlignment="Center">
|
||||
<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="1" Padding="3,1" Grid.Column="4" Grid.Row="6" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxNahrung2Strasse" Margin="1,1,1,1" Padding="3,1" Grid.Column="5" 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="TextboxNahrung2Ort" Margin="1" Padding="3,1" Grid.Column="5" Grid.Row="6" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxNahrung2Plz" Margin="1,1,1,1" Grid.Column="5" 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,1,1,1" Padding="3,1" Grid.Column="6" 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" Padding="3,1" Grid.Column="4" Grid.Row="7" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxNahrung3Restaurant" Margin="1,1.5,1,0.5" Padding="3,1" Grid.Column="4" Grid.Row="7" 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="TextboxNahrung3Essen" Margin="1" Padding="3,1" Grid.Column="5" Grid.Row="7" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxNahrung3Essen" Margin="1,1.5,1,0.5" Padding="3,1" Grid.Column="4" Grid.Row="8" VerticalContentAlignment="Center">
|
||||
<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="TextboxNahrung3Strasse" Margin="1" Padding="3,1" Grid.Column="4" Grid.Row="8" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxNahrung3Plz" Margin="1,1,1,1" Grid.Column="5" 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="1,1.5,1,0.5" Padding="3,1" Grid.Column="5" 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" Padding="3,1" Grid.Column="5" Grid.Row="8" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxNahrung3Ort" Margin="1,1.5,1,0.5" Padding="3,1" Grid.Column="6" 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" Padding="3,1" Grid.Column="4" Grid.Row="9" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxNahrung4Restaurant" Margin="1,1.5,1,0.5" Padding="3,1" Grid.Column="4" Grid.Row="9" 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="TextboxNahrung4Essen" Margin="1" Padding="3,1" Grid.Column="5" Grid.Row="9" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxNahrung4Essen" Margin="1,1.5,1,0.5" Padding="3,1" Grid.Column="4" Grid.Row="10" VerticalContentAlignment="Center">
|
||||
<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="1" Padding="3,1" Grid.Column="4" Grid.Row="10" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxNahrung4Strasse" Margin="1,1.5,1,0.5" Padding="3,1" Grid.Column="5" Grid.Row="9" VerticalContentAlignment="Center" Grid.ColumnSpan="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="TextboxNahrung4Ort" Margin="1" Padding="3,1" Grid.Column="5" Grid.Row="10" VerticalContentAlignment="Center">
|
||||
<xctk:WatermarkTextBox x:Name="TextboxNahrung4Plz" Margin="1,1,1,1" Grid.Column="5" 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,1.5,1,0.5" Padding="3,1" Grid.Column="6" 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.ColumnSpan="2" Grid.Column="4" HorizontalAlignment="Left" Grid.Row="12" VerticalAlignment="Top" Width="242"/>
|
||||
<ComboBox Grid.Column="4" HorizontalAlignment="Left" Grid.Row="12" VerticalAlignment="Top" Width="148" Height="22" Margin="0.4,0.2,0,0"/>
|
||||
</Grid>
|
||||
</Window>
|
||||
|
|
|
@ -14,6 +14,7 @@ using System.Windows.Navigation;
|
|||
using System.Windows.Shapes;
|
||||
using Xceed.Wpf.Toolkit;
|
||||
using Client.EHEC_Service;
|
||||
using AutoMapper;
|
||||
|
||||
namespace Client
|
||||
{
|
||||
|
@ -25,10 +26,11 @@ namespace Client
|
|||
public MainWindow()
|
||||
{
|
||||
InitializeComponent();
|
||||
// Start Automapper
|
||||
Mapper.Initialize(cfg => cfg.AddProfile<AutomapperProfile>());
|
||||
// loading of dropdowns
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private void ButtonClose_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
|
@ -36,14 +38,16 @@ namespace Client
|
|||
}
|
||||
private void ButtonSend_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
LabelRueckmeldungsfeld.Content = "sende Daten...";
|
||||
Doctor newDoctor = new Doctor(TextboxArztVorname.Text,
|
||||
TextboxArztname.Text,
|
||||
TextboxArztName.Text,
|
||||
TextboxArztStrasseNr.Text,
|
||||
TextboxArztPlz.Text,
|
||||
TextboxArztOrt.Text,
|
||||
TextboxArztRegion.Text,
|
||||
TextboxArztKantonsarzt.Text
|
||||
);
|
||||
|
||||
Patient newPatient = new Patient(TextboxPatientVorname.Text,
|
||||
TextboxPatientName.Text,
|
||||
TextboxPatientStrasseNr.Text,
|
||||
|
@ -52,20 +56,124 @@ namespace Client
|
|||
TextboxPatientRegion.Text,
|
||||
TextboxPatientGeburtstag.Text
|
||||
);
|
||||
|
||||
Result newResult = new Result(TextboxBakterienstamm.Text);
|
||||
//Origin newOrigin = new Origin();
|
||||
|
||||
Exam newExam = new Exam(newDoctor.CreateDoctor(),
|
||||
newPatient.CreatePatient(),
|
||||
newResult.CreateResult()
|
||||
LabelRueckmeldungsfeld.Content = "erstelle Doktor.";
|
||||
newDoctor.CreateDoctor();
|
||||
LabelRueckmeldungsfeld.Content = "erstelle Patient.";
|
||||
newPatient.CreatePatient();
|
||||
LabelRueckmeldungsfeld.Content = "erstelle Bakterie.";
|
||||
newResult.CreateResult();
|
||||
|
||||
Exam newExam = new Exam(newDoctor.Id,
|
||||
newPatient.Id,
|
||||
newResult.Id
|
||||
);
|
||||
LabelRueckmeldungsfeld.Content = "erstelle Untersuchung.";
|
||||
newExam.CreateExam();
|
||||
|
||||
|
||||
Origin newOrigin1 = new Origin(TextboxNahrung1Restaurant.Text,
|
||||
TextboxNahrung1Essen.Text,
|
||||
TextboxNahrung1Strasse.Text,
|
||||
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.";
|
||||
newOrigin1.CreateOrigin();
|
||||
newOrigin2.CreateOrigin();
|
||||
newOrigin3.CreateOrigin();
|
||||
newOrigin4.CreateOrigin();
|
||||
|
||||
Origin_Exam newOrigin_Exam1 = new Origin_Exam(newOrigin1.Id,
|
||||
newExam.Id
|
||||
);
|
||||
|
||||
Origin_Exam newOrigin_Exam2 = new Origin_Exam(newOrigin2.Id,
|
||||
newExam.Id
|
||||
);
|
||||
|
||||
Origin_Exam newOrigin_Exam3 = new Origin_Exam(newOrigin3.Id,
|
||||
newExam.Id
|
||||
);
|
||||
|
||||
Origin_Exam newOrigin_Exam4 = new Origin_Exam(newOrigin4.Id,
|
||||
newExam.Id
|
||||
);
|
||||
|
||||
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.";
|
||||
}
|
||||
|
||||
private void ButtonAutogenerateMany_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void ButtonAutogenerateOne_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
TextboxArztName.Text = "doctorLastname";
|
||||
TextboxArztVorname.Text = "doctorFirstname";
|
||||
TextboxArztStrasseNr.Text = "doctorStreet";
|
||||
TextboxArztPlz.Text = "1000";
|
||||
TextboxArztOrt.Text = "doctorCity";
|
||||
TextboxArztKantonsarzt.Text = "doctorOrigin";
|
||||
TextboxArztRegion.Text = "ArztRegion";
|
||||
TextboxPatientName.Text = "patientLastname";
|
||||
TextboxPatientVorname.Text = "patientFirstname";
|
||||
TextboxPatientStrasseNr.Text = "patientStreet";
|
||||
TextboxPatientPlz.Text = "2000";
|
||||
TextboxPatientOrt.Text = "patientCity";
|
||||
TextboxPatientRegion.Text = "patientRegion";
|
||||
TextboxPatientGeburtstag.Text = "1.1.2001";
|
||||
TextboxBakterienstamm.Text = "bacteriaName";
|
||||
TextboxNahrung1Restaurant.Text = "firstRestaurantName";
|
||||
TextboxNahrung1Essen.Text = "firstRestaurantFood";
|
||||
TextboxNahrung1Strasse.Text = "firstRestaurantStreet";
|
||||
TextboxNahrung1Plz.Text = "1111";
|
||||
TextboxNahrung1Ort.Text = "firstRestaurantCity";
|
||||
TextboxNahrung2Restaurant.Text = "secondRestaurantName";
|
||||
TextboxNahrung2Essen.Text = "secondRestaurantFood";
|
||||
TextboxNahrung2Strasse.Text = "secondRestaurantStreet";
|
||||
TextboxNahrung2Plz.Text = "2222";
|
||||
TextboxNahrung2Ort.Text = "secondRestaurantCity";
|
||||
TextboxNahrung3Restaurant.Text = "thirdRestaurantName";
|
||||
TextboxNahrung3Essen.Text = "thirdRestaurantFood";
|
||||
TextboxNahrung3Strasse.Text = "thirdRestaurantStreet";
|
||||
TextboxNahrung3Plz.Text = "3333";
|
||||
TextboxNahrung3Ort.Text = "thirdRestaurantCity";
|
||||
TextboxNahrung4Restaurant.Text = "fourthRestaurantName";
|
||||
TextboxNahrung4Essen.Text = "fourthRestaurantFood";
|
||||
TextboxNahrung4Strasse.Text = "fourthRestaurantStreet";
|
||||
TextboxNahrung4Plz.Text = "4444";
|
||||
TextboxNahrung4Ort.Text = "fourthRestaurantCity";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using AutoMapper;
|
||||
|
||||
namespace Client
|
||||
{
|
||||
class AutomapperProfile: Profile
|
||||
{
|
||||
public AutomapperProfile()
|
||||
{
|
||||
CreateMap<EHEC_Service.Patient, Patient>();
|
||||
CreateMap<EHEC_Service.Doctor, Doctor>();
|
||||
CreateMap<EHEC_Service.Exam, Exam>();
|
||||
CreateMap<EHEC_Service.Origin, Origin>();
|
||||
CreateMap<EHEC_Service.Origin_Exam, Origin_Exam>();
|
||||
CreateMap<EHEC_Service.Result,Result>();
|
||||
}
|
||||
}
|
||||
}
|
|
@ -3,19 +3,21 @@ using System.Collections.Generic;
|
|||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using AutoMapper;
|
||||
|
||||
namespace Client
|
||||
{
|
||||
public class Doctor
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string FirstName { get; set; }
|
||||
public string LastName { get; set; }
|
||||
public string Strasse { get; set; }
|
||||
public int Plz { get; set; }
|
||||
public string Ort { get; set; }
|
||||
public string Region { get; set; }
|
||||
public string DocType { get; set; }
|
||||
|
||||
public string DoctorOrigin { get; set; }
|
||||
public Doctor() {}
|
||||
/// <summary>
|
||||
/// this is my doctor construcor
|
||||
/// </summary>
|
||||
|
@ -38,13 +40,13 @@ namespace Client
|
|||
Plz = Convert.ToInt32(plz);
|
||||
Ort = ort;
|
||||
Region = region;
|
||||
DocType = doctype;
|
||||
DoctorOrigin = doctype;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// This writes the doctor back to the service into the db
|
||||
/// </summary>
|
||||
public int CreateDoctor()
|
||||
public Doctor CreateDoctor()
|
||||
{
|
||||
// write doctor to wcf interface
|
||||
EHEC_Service.Doctor mydoctor = new EHEC_Service.Doctor
|
||||
|
@ -52,10 +54,10 @@ namespace Client
|
|||
FirstName = FirstName,
|
||||
LastName = LastName,
|
||||
Region = Region,
|
||||
DoctorOrigin = DocType
|
||||
DoctorOrigin = DoctorOrigin
|
||||
};
|
||||
Global.GlobalInstance.Service.WriteDoctor(mydoctor);
|
||||
return mydoctor.DoctorId;
|
||||
return Mapper.Map<Doctor>(mydoctor);
|
||||
}
|
||||
|
||||
}
|
|
@ -3,33 +3,35 @@ using System.Collections.Generic;
|
|||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using AutoMapper;
|
||||
|
||||
namespace Client
|
||||
{
|
||||
public class Exam
|
||||
{
|
||||
public int DocID { get; set; }
|
||||
public int Id { get; set; }
|
||||
public int DoctorID { get; set; }
|
||||
public int PatientID { get; set; }
|
||||
public int ResultID { get; set; }
|
||||
public Exam(int docId,
|
||||
public Exam() { }
|
||||
public Exam(int doctorId,
|
||||
int patientId,
|
||||
int resultId
|
||||
)
|
||||
{
|
||||
DocID = docId;
|
||||
){
|
||||
DoctorID = doctorId;
|
||||
PatientID = patientId;
|
||||
ResultID = resultId;
|
||||
}
|
||||
public int CreateExam()
|
||||
public Exam CreateExam()
|
||||
{
|
||||
EHEC_Service.Exam myExam = new EHEC_Service.Exam
|
||||
{
|
||||
DoctorId = DocID,
|
||||
DoctorId = DoctorID,
|
||||
PatientId = PatientID,
|
||||
Result_ResultId = ResultID
|
||||
};
|
||||
Global.GlobalInstance.Service.WriteExam(myExam);
|
||||
return myExam.ExamId;
|
||||
return Mapper.Map<Exam>(myExam);
|
||||
}
|
||||
}
|
||||
}
|
|
@ -3,16 +3,23 @@ using System.Collections.Generic;
|
|||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using AutoMapper;
|
||||
|
||||
namespace Client
|
||||
{
|
||||
public class Origin
|
||||
{
|
||||
public string RestaurantName { get; set; }
|
||||
public string Foodtype { get; set; }
|
||||
public int Id { get; set; }
|
||||
public string Name { get; set; }
|
||||
public string Food { get; set; }
|
||||
public string Street { get; set; }
|
||||
public int Plz { get; set; }
|
||||
public string City { get; set; }
|
||||
|
||||
public Origin()
|
||||
{
|
||||
|
||||
}
|
||||
public Origin(string restName,
|
||||
string foodtype,
|
||||
string street,
|
||||
|
@ -20,24 +27,24 @@ namespace Client
|
|||
string city
|
||||
)
|
||||
{
|
||||
RestaurantName = restName;
|
||||
Foodtype = foodtype;
|
||||
Name = restName;
|
||||
Food = foodtype;
|
||||
Street = street;
|
||||
Plz = plz;
|
||||
City = city;
|
||||
}
|
||||
|
||||
public int CreateOrigin()
|
||||
public Origin CreateOrigin()
|
||||
{
|
||||
EHEC_Service.Origin myorigin = new EHEC_Service.Origin
|
||||
{
|
||||
Name = RestaurantName,
|
||||
Food = Foodtype,
|
||||
Name = Name,
|
||||
Food = Food,
|
||||
Street = Street,
|
||||
City = City,
|
||||
};
|
||||
Global.GlobalInstance.Service.WriteOrigin(myorigin);
|
||||
return myorigin.OriginId;
|
||||
return Mapper.Map<Origin>(myorigin);
|
||||
}
|
||||
}
|
||||
}
|
|
@ -3,13 +3,20 @@ using System.Collections.Generic;
|
|||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using AutoMapper;
|
||||
|
||||
namespace Client.ServiceClasses
|
||||
namespace Client
|
||||
{
|
||||
public class Origin_Exam
|
||||
{
|
||||
public int OriginOriginId;
|
||||
public int ExamExamId;
|
||||
public int Id { get; set; }
|
||||
public int OriginOriginId { get; set; }
|
||||
public int ExamExamId { get; set; }
|
||||
|
||||
public Origin_Exam()
|
||||
{
|
||||
|
||||
}
|
||||
public Origin_Exam(int originOriginId,
|
||||
int examExamId
|
||||
)
|
||||
|
@ -17,15 +24,15 @@ namespace Client.ServiceClasses
|
|||
OriginOriginId = originOriginId;
|
||||
ExamExamId = examExamId;
|
||||
}
|
||||
public int CreateOrigin_Exam()
|
||||
public Origin_Exam CreateOrigin_Exam()
|
||||
{
|
||||
EHEC_Service.Origin_Exam myorigin_Exam = new EHEC_Service.Origin_Exam
|
||||
{
|
||||
OriginOriginId = OriginOriginId,
|
||||
ExamExamId = ExamExamId
|
||||
};
|
||||
//Global.GlobalInstance.Service.W
|
||||
return myorigin_Exam.Origin_ExamId;
|
||||
Global.GlobalInstance.Service.WriteOrigin_Exam(myorigin_Exam);
|
||||
return Mapper.Map<Origin_Exam>(myorigin_Exam);
|
||||
}
|
||||
}
|
||||
}
|
|
@ -3,11 +3,12 @@ using System.Collections.Generic;
|
|||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
using AutoMapper;
|
||||
namespace Client
|
||||
{
|
||||
public class Patient
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string FirstName { get; set; }
|
||||
public string LastName { get; set; }
|
||||
public string Street { get; set; }
|
||||
|
@ -33,8 +34,8 @@ namespace Client
|
|||
Region = region;
|
||||
BirthDate = birthDate;
|
||||
}
|
||||
|
||||
public int CreatePatient()
|
||||
public Patient() { }
|
||||
public Patient CreatePatient()
|
||||
{
|
||||
EHEC_Service.Patient mypatient = new EHEC_Service.Patient
|
||||
{
|
||||
|
@ -46,7 +47,23 @@ namespace Client
|
|||
BirthDate = Convert.ToDateTime(BirthDate)
|
||||
};
|
||||
Global.GlobalInstance.Service.WritePatient(mypatient);
|
||||
return mypatient.PatientId;
|
||||
|
||||
// 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,
|
||||
// FirstName = mypatient.FirstName,
|
||||
// LastName = mypatient.LastName,
|
||||
// Street = mypatient.Street,
|
||||
// City = mypatient.City,
|
||||
// Region = mypatient.Region,
|
||||
// BirthDate = Convert.ToString(mypatient.BirthDate)
|
||||
//};
|
||||
//return p;
|
||||
|
||||
// Automapper version:
|
||||
return Mapper.Map<Patient>(mypatient);
|
||||
}
|
||||
}
|
||||
}
|
|
@ -3,25 +3,32 @@ using System.Collections.Generic;
|
|||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using AutoMapper;
|
||||
|
||||
namespace Client
|
||||
{
|
||||
public class Result
|
||||
{
|
||||
public string ResultName { get; set; }
|
||||
public int Id { get; set; }
|
||||
public string Name { get; set; }
|
||||
|
||||
public Result()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public Result(string resultName)
|
||||
{
|
||||
ResultName = resultName;
|
||||
Name = resultName;
|
||||
}
|
||||
public int CreateResult()
|
||||
public Result CreateResult()
|
||||
{
|
||||
EHEC_Service.Result myResult = new EHEC_Service.Result
|
||||
{
|
||||
Name = ResultName
|
||||
Name = Name
|
||||
};
|
||||
Global.GlobalInstance.Service.WriteResult(myResult);
|
||||
return myResult.ResultId;
|
||||
return Mapper.Map<Result>(myResult);
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,4 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="AutoMapper" version="7.0.1" targetFramework="net461" />
|
||||
<package id="Extended.Wpf.Toolkit" version="3.3.0" targetFramework="net461" />
|
||||
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
|
||||
</packages>
|
Loading…
Reference in New Issue