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

Merge branch 'server' into WebClient_Dev

This commit is contained in:
Strati 2018-08-05 20:41:05 +02:00
parent e265cd7fda 249614e8e4
commit 6905091ddb
13 changed files with 76 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Server/Server/DB/CityDB.cs
View File

@ -28,8 +28,9 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
} }
@ -46,8 +47,9 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
@ -64,10 +66,11 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
} }
} }
} }

11
Server/Server/DB/CountryDB.cs
View File

@ -25,8 +25,9 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
} }
@ -43,8 +44,9 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
@ -61,10 +63,11 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
} }
} }
} }

11
Server/Server/DB/DoctorDB.cs
View File

@ -30,8 +30,9 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
} }
@ -48,8 +49,9 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
@ -66,10 +68,11 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
} }
} }
} }

11
Server/Server/DB/ExamDb.cs
View File

@ -30,8 +30,9 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
} }
@ -48,8 +49,9 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
@ -66,10 +68,11 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
} }
} }
} }

11
Server/Server/DB/FoodPlaceDB.cs
View File

@ -29,8 +29,9 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
} }
@ -47,8 +48,9 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
@ -65,10 +67,11 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
} }
} }
} }

11
Server/Server/DB/GenderDB.cs
View File

@ -25,8 +25,9 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
} }
@ -43,8 +44,9 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
@ -61,10 +63,11 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
} }
} }
} }

23
Server/Server/DB/Patient.cs
View File

@ -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;
}
}
}

13
Server/Server/DB/PatientAtFoodPlaceDB.cs
View File

@ -5,7 +5,7 @@ using Server.Models;
namespace Server.DB namespace Server.DB
{ {
public class PatientAtFoodPlaceDB public class PatientAtFoodPlaceDB
{ {
public ICollection<PatientAtFoodPlace> GetAllRelations() public ICollection<PatientAtFoodPlace> GetAllRelations()
{ {
@ -31,8 +31,9 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
} }
@ -49,8 +50,9 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
@ -67,10 +69,11 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
} }
} }
} }

11
Server/Server/DB/PersonDB.cs
View File

@ -31,8 +31,9 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
} }
@ -49,8 +50,9 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
@ -67,10 +69,11 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
} }
} }
} }

11
Server/Server/DB/SalutationDB.cs
View File

@ -25,8 +25,9 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
} }
@ -43,8 +44,9 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
@ -61,10 +63,11 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
} }
} }
} }

11
Server/Server/DB/StrainDB.cs
View File

@ -25,8 +25,9 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
} }
@ -43,8 +44,9 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
@ -61,10 +63,11 @@ namespace Server.DB
} }
return true; return true;
} }
catch (Exception) catch (Exception e)
{ {
System.Diagnostics.Trace.WriteLine(e.Message);
return false; return false;
} }
} }
} }
} }

6
Server/Server/Helper/GenerateData.cs
View File

@ -50,7 +50,7 @@ namespace Server.Helper
{ {
foreach (var s in SalutationList) foreach (var s in SalutationList)
{ {
Salutations.Add(new Salutation(s)); Salutations.Add(new Salutation(s));
} }
return Salutations; return Salutations;
} }
@ -58,7 +58,7 @@ namespace Server.Helper
{ {
foreach (var g in GenderList) foreach (var g in GenderList)
{ {
Genders.Add(new Gender(g)); Genders.Add(new Gender(g));
} }
return Genders; return Genders;
} }
@ -66,7 +66,7 @@ namespace Server.Helper
{ {
foreach (var c in CountryList) foreach (var c in CountryList)
{ {
Countries.Add(new Country(c)); Countries.Add(new Country(c));
} }
return Countries; return Countries;
} }

2
Server/Server/Models/PatientAtFoodPlace.cs
View File

@ -1,5 +1,6 @@
using System; using System;
using System.Runtime.Serialization; using System.Runtime.Serialization;
using System.ComponentModel.DataAnnotations.Schema;
namespace Server.Models namespace Server.Models
{ {
@ -11,6 +12,7 @@ namespace Server.Models
[DataMember] [DataMember]
public int FoodPlaceID { get; set; } public int FoodPlaceID { get; set; }
[DataMember] [DataMember]
[Column(TypeName = "Date")]
public DateTime VistingDate { get; set; } public DateTime VistingDate { get; set; }
[DataMember] [DataMember]