From 1eb4f1e79326fc9d5e3fb59dca3546f8d00b7e90 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sat, 4 Aug 2018 11:16:26 +0200 Subject: [PATCH 1/4] unify line endings --- Server/Server/Helper/GenerateData.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Server/Server/Helper/GenerateData.cs b/Server/Server/Helper/GenerateData.cs index 43110a5..fa983dc 100644 --- a/Server/Server/Helper/GenerateData.cs +++ b/Server/Server/Helper/GenerateData.cs @@ -50,7 +50,7 @@ namespace Server.Helper { foreach (var s in SalutationList) { - Salutations.Add(new Salutation(s)); + Salutations.Add(new Salutation(s)); } return Salutations; } @@ -58,7 +58,7 @@ namespace Server.Helper { foreach (var g in GenderList) { - Genders.Add(new Gender(g)); + Genders.Add(new Gender(g)); } return Genders; } @@ -66,7 +66,7 @@ namespace Server.Helper { foreach (var c in CountryList) { - Countries.Add(new Country(c)); + Countries.Add(new Country(c)); } return Countries; } From 548a1a667278c5b50ec77c74fc0026ded8040269 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sat, 4 Aug 2018 11:43:07 +0200 Subject: [PATCH 2/4] Set the datatype Date for the VisitingDate property It makes more sense to store the VisitingDate as Date instead of DateTime. Since we most likely don't know the exact time someone visits a FoodPlace. --- Server/Server/Models/PatientAtFoodPlace.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Server/Server/Models/PatientAtFoodPlace.cs b/Server/Server/Models/PatientAtFoodPlace.cs index 89f0470..166707a 100644 --- a/Server/Server/Models/PatientAtFoodPlace.cs +++ b/Server/Server/Models/PatientAtFoodPlace.cs @@ -1,5 +1,6 @@ using System; using System.Runtime.Serialization; +using System.ComponentModel.DataAnnotations.Schema; namespace Server.Models { @@ -11,6 +12,7 @@ namespace Server.Models [DataMember] public int FoodPlaceID { get; set; } [DataMember] + [Column(TypeName = "Date")] public DateTime VistingDate { get; set; } [DataMember] From 61ee07375ea13fb96c06e24d869ae3b7501a7802 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sat, 4 Aug 2018 11:48:10 +0200 Subject: [PATCH 3/4] Add exception handling to the DB classes --- Server/Server/DB/CityDB.cs | 11 +++++++---- Server/Server/DB/CountryDB.cs | 11 +++++++---- Server/Server/DB/DoctorDB.cs | 11 +++++++---- Server/Server/DB/ExamDb.cs | 11 +++++++---- Server/Server/DB/FoodPlaceDB.cs | 11 +++++++---- Server/Server/DB/GenderDB.cs | 11 +++++++---- Server/Server/DB/PatientAtFoodPlaceDB.cs | 13 ++++++++----- Server/Server/DB/PersonDB.cs | 11 +++++++---- Server/Server/DB/SalutationDB.cs | 11 +++++++---- Server/Server/DB/StrainDB.cs | 11 +++++++---- 10 files changed, 71 insertions(+), 41 deletions(-) diff --git a/Server/Server/DB/CityDB.cs b/Server/Server/DB/CityDB.cs index 59d9137..b13c6c6 100644 --- a/Server/Server/DB/CityDB.cs +++ b/Server/Server/DB/CityDB.cs @@ -28,8 +28,9 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } } @@ -46,8 +47,9 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } @@ -64,10 +66,11 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } } } -} \ No newline at end of file +} diff --git a/Server/Server/DB/CountryDB.cs b/Server/Server/DB/CountryDB.cs index 198f6b7..d62b58e 100644 --- a/Server/Server/DB/CountryDB.cs +++ b/Server/Server/DB/CountryDB.cs @@ -25,8 +25,9 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } } @@ -43,8 +44,9 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } @@ -61,10 +63,11 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } } } -} \ No newline at end of file +} diff --git a/Server/Server/DB/DoctorDB.cs b/Server/Server/DB/DoctorDB.cs index cd0885a..3edf0d8 100644 --- a/Server/Server/DB/DoctorDB.cs +++ b/Server/Server/DB/DoctorDB.cs @@ -30,8 +30,9 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } } @@ -48,8 +49,9 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } @@ -66,10 +68,11 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } } } -} \ No newline at end of file +} diff --git a/Server/Server/DB/ExamDb.cs b/Server/Server/DB/ExamDb.cs index 46eaf49..7701a92 100644 --- a/Server/Server/DB/ExamDb.cs +++ b/Server/Server/DB/ExamDb.cs @@ -30,8 +30,9 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } } @@ -48,8 +49,9 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } @@ -66,10 +68,11 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } } } -} \ No newline at end of file +} diff --git a/Server/Server/DB/FoodPlaceDB.cs b/Server/Server/DB/FoodPlaceDB.cs index 66edffc..75ae883 100644 --- a/Server/Server/DB/FoodPlaceDB.cs +++ b/Server/Server/DB/FoodPlaceDB.cs @@ -29,8 +29,9 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } } @@ -47,8 +48,9 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } @@ -65,10 +67,11 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } } } -} \ No newline at end of file +} diff --git a/Server/Server/DB/GenderDB.cs b/Server/Server/DB/GenderDB.cs index c2e4801..e9b0ec2 100644 --- a/Server/Server/DB/GenderDB.cs +++ b/Server/Server/DB/GenderDB.cs @@ -25,8 +25,9 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } } @@ -43,8 +44,9 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } @@ -61,10 +63,11 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } } } -} \ No newline at end of file +} diff --git a/Server/Server/DB/PatientAtFoodPlaceDB.cs b/Server/Server/DB/PatientAtFoodPlaceDB.cs index 2d0f71c..6ad983f 100644 --- a/Server/Server/DB/PatientAtFoodPlaceDB.cs +++ b/Server/Server/DB/PatientAtFoodPlaceDB.cs @@ -5,7 +5,7 @@ using Server.Models; namespace Server.DB { - public class PatientAtFoodPlaceDB + public class PatientAtFoodPlaceDB { public ICollection GetAllRelations() { @@ -31,8 +31,9 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } } @@ -49,8 +50,9 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } @@ -67,10 +69,11 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } } } -} \ No newline at end of file +} diff --git a/Server/Server/DB/PersonDB.cs b/Server/Server/DB/PersonDB.cs index c5513f4..47abfe1 100644 --- a/Server/Server/DB/PersonDB.cs +++ b/Server/Server/DB/PersonDB.cs @@ -31,8 +31,9 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } } @@ -49,8 +50,9 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } @@ -67,10 +69,11 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } } } -} \ No newline at end of file +} diff --git a/Server/Server/DB/SalutationDB.cs b/Server/Server/DB/SalutationDB.cs index 85d5b83..87694ed 100644 --- a/Server/Server/DB/SalutationDB.cs +++ b/Server/Server/DB/SalutationDB.cs @@ -25,8 +25,9 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } } @@ -43,8 +44,9 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } @@ -61,10 +63,11 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } } } -} \ No newline at end of file +} diff --git a/Server/Server/DB/StrainDB.cs b/Server/Server/DB/StrainDB.cs index 74f8a20..ff8c941 100644 --- a/Server/Server/DB/StrainDB.cs +++ b/Server/Server/DB/StrainDB.cs @@ -25,8 +25,9 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } } @@ -43,8 +44,9 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } @@ -61,10 +63,11 @@ namespace Server.DB } return true; } - catch (Exception) + catch (Exception e) { + System.Diagnostics.Trace.WriteLine(e.Message); return false; } } } -} \ No newline at end of file +} From 249614e8e4e9bbd408468d9b087f4d82b4f73b0a Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sat, 4 Aug 2018 11:51:35 +0200 Subject: [PATCH 4/4] remove an unused file --- Server/Server/DB/Patient.cs | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 Server/Server/DB/Patient.cs diff --git a/Server/Server/DB/Patient.cs b/Server/Server/DB/Patient.cs deleted file mode 100644 index 78836c3..0000000 --- a/Server/Server/DB/Patient.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Runtime.Serialization; -using System.ComponentModel.DataAnnotations.Schema; - -namespace Server.Models -{ - [Table("Patients")] - [DataContract] - public class Patient : Person - { - public Patient() { } - public Patient(string firstName, string lastName, Gender gender, Salutation salutation, - string streetName, string streetNumber, City city) - { - this.FirstName = firstName; - this.LastName = lastName; - this.Gender = gender; - this.Salutation = salutation; - this.StreetName = streetName; - this.StreetNumber = streetNumber; - this.City = city; - } - } -}