diff --git a/Client.sln b/Client/Client.sln
similarity index 96%
rename from Client.sln
rename to Client/Client.sln
index 1802980..f005089 100644
--- a/Client.sln
+++ b/Client/Client.sln
@@ -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
diff --git a/Client/App.config b/Client/Client/App.config
similarity index 100%
rename from Client/App.config
rename to Client/Client/App.config
diff --git a/Client/App.xaml b/Client/Client/App.xaml
similarity index 100%
rename from Client/App.xaml
rename to Client/Client/App.xaml
diff --git a/Client/App.xaml.cs b/Client/Client/App.xaml.cs
similarity index 100%
rename from Client/App.xaml.cs
rename to Client/Client/App.xaml.cs
diff --git a/Client/Client.csproj b/Client/Client/Client.csproj
similarity index 88%
rename from Client/Client.csproj
rename to Client/Client/Client.csproj
index b27c435..7ca65fb 100644
--- a/Client/Client.csproj
+++ b/Client/Client/Client.csproj
@@ -74,6 +74,7 @@
MSBuild:Compile
Designer
+
MSBuild:Compile
Designer
@@ -110,6 +111,21 @@
ResXFileCodeGenerator
Resources.Designer.cs
+
+ Reference.svcmap
+
+
+ Reference.svcmap
+
+
+ Reference.svcmap
+
+
+ Reference.svcmap
+
+
+ Reference.svcmap
+
Designer
@@ -153,5 +169,9 @@
Reference.cs
+
+
+
+
\ No newline at end of file
diff --git a/Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Doctor.datasource b/Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Doctor.datasource
new file mode 100644
index 0000000..0001540
--- /dev/null
+++ b/Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Doctor.datasource
@@ -0,0 +1,10 @@
+
+
+
+ Client.EHEC_Service.Doctor, Connected Services.EHEC_Service.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+
\ No newline at end of file
diff --git a/Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Exam.datasource b/Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Exam.datasource
new file mode 100644
index 0000000..982d40a
--- /dev/null
+++ b/Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Exam.datasource
@@ -0,0 +1,10 @@
+
+
+
+ Client.EHEC_Service.Exam, Connected Services.EHEC_Service.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+
\ No newline at end of file
diff --git a/Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Origin.datasource b/Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Origin.datasource
new file mode 100644
index 0000000..490afaf
--- /dev/null
+++ b/Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Origin.datasource
@@ -0,0 +1,10 @@
+
+
+
+ Client.EHEC_Service.Origin, Connected Services.EHEC_Service.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+
\ No newline at end of file
diff --git a/Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Patient.datasource b/Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Patient.datasource
new file mode 100644
index 0000000..559030f
--- /dev/null
+++ b/Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Patient.datasource
@@ -0,0 +1,10 @@
+
+
+
+ Client.EHEC_Service.Patient, Connected Services.EHEC_Service.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+
\ No newline at end of file
diff --git a/Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Result.datasource b/Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Result.datasource
new file mode 100644
index 0000000..75850e1
--- /dev/null
+++ b/Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Result.datasource
@@ -0,0 +1,10 @@
+
+
+
+ Client.EHEC_Service.Result, Connected Services.EHEC_Service.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+
\ No newline at end of file
diff --git a/Client/Connected Services/EHEC_Service/Reference.cs b/Client/Client/Connected Services/EHEC_Service/Reference.cs
similarity index 91%
rename from Client/Connected Services/EHEC_Service/Reference.cs
rename to Client/Client/Connected Services/EHEC_Service/Reference.cs
index 7ee7244..27bf7fb 100644
--- a/Client/Connected Services/EHEC_Service/Reference.cs
+++ b/Client/Client/Connected Services/EHEC_Service/Reference.cs
@@ -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 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 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 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 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 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 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 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 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 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 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 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 GetResultsAsync() {
+ return base.Channel.GetResultsAsync();
+ }
}
}
diff --git a/Client/Connected Services/EHEC_Service/Reference.svcmap b/Client/Client/Connected Services/EHEC_Service/Reference.svcmap
similarity index 100%
rename from Client/Connected Services/EHEC_Service/Reference.svcmap
rename to Client/Client/Connected Services/EHEC_Service/Reference.svcmap
diff --git a/Client/Connected Services/EHEC_Service/Service.disco b/Client/Client/Connected Services/EHEC_Service/Service.disco
similarity index 100%
rename from Client/Connected Services/EHEC_Service/Service.disco
rename to Client/Client/Connected Services/EHEC_Service/Service.disco
diff --git a/Client/Connected Services/EHEC_Service/Service.wsdl b/Client/Client/Connected Services/EHEC_Service/Service.wsdl
similarity index 87%
rename from Client/Connected Services/EHEC_Service/Service.wsdl
rename to Client/Client/Connected Services/EHEC_Service/Service.wsdl
index 93845d0..4729ef6 100644
--- a/Client/Connected Services/EHEC_Service/Service.wsdl
+++ b/Client/Client/Connected Services/EHEC_Service/Service.wsdl
@@ -38,6 +38,12 @@
+
+
+
+
+
+
@@ -59,6 +65,10 @@
+
+
+
+
@@ -107,6 +117,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/Client/Connected Services/EHEC_Service/Service.xsd b/Client/Client/Connected Services/EHEC_Service/Service.xsd
similarity index 100%
rename from Client/Connected Services/EHEC_Service/Service.xsd
rename to Client/Client/Connected Services/EHEC_Service/Service.xsd
diff --git a/Client/Connected Services/EHEC_Service/Service1.xsd b/Client/Client/Connected Services/EHEC_Service/Service1.xsd
similarity index 59%
rename from Client/Connected Services/EHEC_Service/Service1.xsd
rename to Client/Client/Connected Services/EHEC_Service/Service1.xsd
index 23d304e..4622ce8 100644
--- a/Client/Connected Services/EHEC_Service/Service1.xsd
+++ b/Client/Client/Connected Services/EHEC_Service/Service1.xsd
@@ -10,55 +10,77 @@
-
+
+
+
-
+
-
+
+
+
-
+
-
+
+
+
-
+
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Client/Connected Services/EHEC_Service/Service2.xsd b/Client/Client/Connected Services/EHEC_Service/Service2.xsd
similarity index 100%
rename from Client/Connected Services/EHEC_Service/Service2.xsd
rename to Client/Client/Connected Services/EHEC_Service/Service2.xsd
diff --git a/Client/Connected Services/EHEC_Service/Service3.xsd b/Client/Client/Connected Services/EHEC_Service/Service3.xsd
similarity index 95%
rename from Client/Connected Services/EHEC_Service/Service3.xsd
rename to Client/Client/Connected Services/EHEC_Service/Service3.xsd
index 18846d1..2d27ea7 100644
--- a/Client/Connected Services/EHEC_Service/Service3.xsd
+++ b/Client/Client/Connected Services/EHEC_Service/Service3.xsd
@@ -100,4 +100,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Client/Connected Services/EHEC_Service/configuration.svcinfo b/Client/Client/Connected Services/EHEC_Service/configuration.svcinfo
similarity index 100%
rename from Client/Connected Services/EHEC_Service/configuration.svcinfo
rename to Client/Client/Connected Services/EHEC_Service/configuration.svcinfo
diff --git a/Client/Connected Services/EHEC_Service/configuration91.svcinfo b/Client/Client/Connected Services/EHEC_Service/configuration91.svcinfo
similarity index 100%
rename from Client/Connected Services/EHEC_Service/configuration91.svcinfo
rename to Client/Client/Connected Services/EHEC_Service/configuration91.svcinfo
diff --git a/Client/MainWindow.xaml b/Client/Client/MainWindow.xaml
similarity index 65%
rename from Client/MainWindow.xaml
rename to Client/Client/MainWindow.xaml
index f40acf7..64af0b8 100644
--- a/Client/MainWindow.xaml
+++ b/Client/Client/MainWindow.xaml
@@ -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">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Client/MainWindow.xaml.cs b/Client/Client/MainWindow.xaml.cs
similarity index 87%
rename from Client/MainWindow.xaml.cs
rename to Client/Client/MainWindow.xaml.cs
index 89f7d49..7adfd0f 100644
--- a/Client/MainWindow.xaml.cs
+++ b/Client/Client/MainWindow.xaml.cs
@@ -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)
+ {
+
}
}
diff --git a/Client/Properties/AssemblyInfo.cs b/Client/Client/Properties/AssemblyInfo.cs
similarity index 100%
rename from Client/Properties/AssemblyInfo.cs
rename to Client/Client/Properties/AssemblyInfo.cs
diff --git a/Client/Properties/Resources.Designer.cs b/Client/Client/Properties/Resources.Designer.cs
similarity index 100%
rename from Client/Properties/Resources.Designer.cs
rename to Client/Client/Properties/Resources.Designer.cs
diff --git a/Client/Properties/Resources.resx b/Client/Client/Properties/Resources.resx
similarity index 100%
rename from Client/Properties/Resources.resx
rename to Client/Client/Properties/Resources.resx
diff --git a/Client/Properties/Settings.Designer.cs b/Client/Client/Properties/Settings.Designer.cs
similarity index 100%
rename from Client/Properties/Settings.Designer.cs
rename to Client/Client/Properties/Settings.Designer.cs
diff --git a/Client/Properties/Settings.settings b/Client/Client/Properties/Settings.settings
similarity index 100%
rename from Client/Properties/Settings.settings
rename to Client/Client/Properties/Settings.settings
diff --git a/Client/packages.config b/Client/Client/packages.config
similarity index 100%
rename from Client/packages.config
rename to Client/Client/packages.config
diff --git a/client.txt b/Client/client.txt
similarity index 100%
rename from client.txt
rename to Client/client.txt
diff --git a/EHEC_Server/EHEC_Server.sln b/EHEC_Server/EHEC_Server.sln
index 34f00d3..c598b69 100644
--- a/EHEC_Server/EHEC_Server.sln
+++ b/EHEC_Server/EHEC_Server.sln
@@ -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
diff --git a/EHEC_Server/EHEC_Server/DatabaseAccess/DoctorAccess.cs b/EHEC_Server/EHEC_Server/DatabaseAccess/DoctorAccess.cs
index b055d39..9cb30fa 100644
--- a/EHEC_Server/EHEC_Server/DatabaseAccess/DoctorAccess.cs
+++ b/EHEC_Server/EHEC_Server/DatabaseAccess/DoctorAccess.cs
@@ -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 GetAllDoctors()
diff --git a/EHEC_Server/EHEC_Server/DatabaseAccess/ExamAccess.cs b/EHEC_Server/EHEC_Server/DatabaseAccess/ExamAccess.cs
index 38d7b04..b4daa49 100644
--- a/EHEC_Server/EHEC_Server/DatabaseAccess/ExamAccess.cs
+++ b/EHEC_Server/EHEC_Server/DatabaseAccess/ExamAccess.cs
@@ -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 GetAllExams()
diff --git a/EHEC_Server/EHEC_Server/DatabaseAccess/OriginAccess.cs b/EHEC_Server/EHEC_Server/DatabaseAccess/OriginAccess.cs
index 1bb5f7c..8209f95 100644
--- a/EHEC_Server/EHEC_Server/DatabaseAccess/OriginAccess.cs
+++ b/EHEC_Server/EHEC_Server/DatabaseAccess/OriginAccess.cs
@@ -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 GetAllOrigins()
diff --git a/EHEC_Server/EHEC_Server/DatabaseAccess/PatientAccess.cs b/EHEC_Server/EHEC_Server/DatabaseAccess/PatientAccess.cs
index 8d4c052..f5fb45f 100644
--- a/EHEC_Server/EHEC_Server/DatabaseAccess/PatientAccess.cs
+++ b/EHEC_Server/EHEC_Server/DatabaseAccess/PatientAccess.cs
@@ -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();
}
}
diff --git a/EHEC_Server/EHEC_Server/DatabaseAccess/ResultAccess.cs b/EHEC_Server/EHEC_Server/DatabaseAccess/ResultAccess.cs
index 9c9dd89..2b80595 100644
--- a/EHEC_Server/EHEC_Server/DatabaseAccess/ResultAccess.cs
+++ b/EHEC_Server/EHEC_Server/DatabaseAccess/ResultAccess.cs
@@ -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 GetAllResults()
{
using (EHEC_DBEntities ctx = new EHEC_DBEntities())
{
+ ctx.Configuration.ProxyCreationEnabled = false;
+ List list = new List();
return ctx.Result.ToList();
}
}
diff --git a/EHEC_Server/EHEC_Server/IService.cs b/EHEC_Server/EHEC_Server/IService.cs
index dc9bb33..3a0d539 100644
--- a/EHEC_Server/EHEC_Server/IService.cs
+++ b/EHEC_Server/EHEC_Server/IService.cs
@@ -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 GetResults();
}
}
diff --git a/EHEC_Server/EHEC_Server/Service.svc.cs b/EHEC_Server/EHEC_Server/Service.svc.cs
index 883d76c..11c14c8 100644
--- a/EHEC_Server/EHEC_Server/Service.svc.cs
+++ b/EHEC_Server/EHEC_Server/Service.svc.cs
@@ -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 GetDoctors()
{
- Doctor dataaccess = new Doctor();
- return dataaccess.GetAllDoctors();
+ return dataaccess_doctor.GetAllDoctors();
}
public List GetPatients()
{
- Patient dataaccess = new Patient();
- return dataaccess.GetAllPatients();
+ return dataaccess_patient.GetAllPatients();
+ }
+ public List 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);
}
}
}
diff --git a/EHEC_Server/EHEC_Server/Web.config b/EHEC_Server/EHEC_Server/Web.config
index b7c76a7..3fd839c 100644
--- a/EHEC_Server/EHEC_Server/Web.config
+++ b/EHEC_Server/EHEC_Server/Web.config
@@ -30,7 +30,8 @@
-
+
+
diff --git a/SQL/EHEC_DB_Query.sql b/SQL/EHEC_DB_Query.sql
index c517592..2829fce 100644
--- a/SQL/EHEC_DB_Query.sql
+++ b/SQL/EHEC_DB_Query.sql
@@ -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..!';