From 87d07b30975af6316cc9d730c50e4a5d5275e0bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20Ho=CC=88rler?= Date: Sat, 30 Jun 2018 11:52:50 +0200 Subject: [PATCH] various changes for db and service so that feedback from db connection can be established. --- Client.sln => Client/Client.sln | 4 +- Client/{ => Client}/App.config | 0 Client/{ => Client}/App.xaml | 0 Client/{ => Client}/App.xaml.cs | 0 Client/{ => Client}/Client.csproj | 20 ++ .../Client.EHEC_Service.Doctor.datasource | 10 + .../Client.EHEC_Service.Exam.datasource | 10 + .../Client.EHEC_Service.Origin.datasource | 10 + .../Client.EHEC_Service.Patient.datasource | 10 + .../Client.EHEC_Service.Result.datasource | 10 + .../EHEC_Service/Reference.cs | 64 +++-- .../EHEC_Service/Reference.svcmap | 0 .../EHEC_Service/Service.disco | 0 .../EHEC_Service/Service.wsdl | 19 ++ .../EHEC_Service/Service.xsd | 0 .../EHEC_Service/Service1.xsd | 38 ++- .../EHEC_Service/Service2.xsd | 0 .../EHEC_Service/Service3.xsd | 6 + .../EHEC_Service/configuration.svcinfo | 0 .../EHEC_Service/configuration91.svcinfo | 0 Client/{ => Client}/MainWindow.xaml | 231 ++++++++++-------- Client/{ => Client}/MainWindow.xaml.cs | 20 ++ .../{ => Client}/Properties/AssemblyInfo.cs | 0 .../Properties/Resources.Designer.cs | 0 Client/{ => Client}/Properties/Resources.resx | 0 .../Properties/Settings.Designer.cs | 0 .../{ => Client}/Properties/Settings.settings | 0 Client/{ => Client}/packages.config | 0 client.txt => Client/client.txt | 0 EHEC_Server/EHEC_Server.sln | 6 - .../DatabaseAccess/DoctorAccess.cs | 6 +- .../EHEC_Server/DatabaseAccess/ExamAccess.cs | 6 +- .../DatabaseAccess/OriginAccess.cs | 6 +- .../DatabaseAccess/PatientAccess.cs | 6 +- .../DatabaseAccess/ResultAccess.cs | 8 +- EHEC_Server/EHEC_Server/IService.cs | 13 +- EHEC_Server/EHEC_Server/Service.svc.cs | 41 ++-- EHEC_Server/EHEC_Server/Web.config | 3 +- SQL/EHEC_DB_Query.sql | 30 ++- 39 files changed, 383 insertions(+), 194 deletions(-) rename Client.sln => Client/Client.sln (96%) rename Client/{ => Client}/App.config (100%) rename Client/{ => Client}/App.xaml (100%) rename Client/{ => Client}/App.xaml.cs (100%) rename Client/{ => Client}/Client.csproj (88%) create mode 100644 Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Doctor.datasource create mode 100644 Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Exam.datasource create mode 100644 Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Origin.datasource create mode 100644 Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Patient.datasource create mode 100644 Client/Client/Connected Services/EHEC_Service/Client.EHEC_Service.Result.datasource rename Client/{ => Client}/Connected Services/EHEC_Service/Reference.cs (91%) rename Client/{ => Client}/Connected Services/EHEC_Service/Reference.svcmap (100%) rename Client/{ => Client}/Connected Services/EHEC_Service/Service.disco (100%) rename Client/{ => Client}/Connected Services/EHEC_Service/Service.wsdl (87%) rename Client/{ => Client}/Connected Services/EHEC_Service/Service.xsd (100%) rename Client/{ => Client}/Connected Services/EHEC_Service/Service1.xsd (59%) rename Client/{ => Client}/Connected Services/EHEC_Service/Service2.xsd (100%) rename Client/{ => Client}/Connected Services/EHEC_Service/Service3.xsd (95%) rename Client/{ => Client}/Connected Services/EHEC_Service/configuration.svcinfo (100%) rename Client/{ => Client}/Connected Services/EHEC_Service/configuration91.svcinfo (100%) rename Client/{ => Client}/MainWindow.xaml (65%) rename Client/{ => Client}/MainWindow.xaml.cs (87%) rename Client/{ => Client}/Properties/AssemblyInfo.cs (100%) rename Client/{ => Client}/Properties/Resources.Designer.cs (100%) rename Client/{ => Client}/Properties/Resources.resx (100%) rename Client/{ => Client}/Properties/Settings.Designer.cs (100%) rename Client/{ => Client}/Properties/Settings.settings (100%) rename Client/{ => Client}/packages.config (100%) rename client.txt => Client/client.txt (100%) 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"> - + + + + + + + + + + + + + + + + + + - - + + + + + + + + -