Merge branch 'master' of http://pdp-pds.eimt.uoc.edu/pds19-grupo2/myhealth.git

.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>myhealth3</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.jboss.ide.eclipse.archives.core.archivesBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.jboss.ide.eclipse.archives.core.archivesNature</nature>
+	</natures>
+</projectDescription>

1.sources/MyHealth/src/TO/VisitTO.java

@@ -18,12 +18,56 @@ import javax.xml.bind.annotation.XmlRootElement;
 @XmlRootElement(name = "Visit")
 public class VisitTO implements Serializable {
 	
-	private static final long serialVersionUID = 1L;
 
 
+	private static final long serialVersionUID = 1L;
+	private Integer id;
+	private Date date;
+	private Time time;
+	private String observations;
+	private String result;
+	private FamilyDoctorTO familyDoctor;
+	private PatientTO patient;
+
 	public VisitTO() {
 		super();
 	}
+	public VisitTO(Integer id, Date date, Time time, String observation, String result) {
+		this.setId(id);
+		this date=date;
+		this time
+	1}
+	public Integer getId() {
+		return this.id;
+	}
+	
+	public void setId(integer id) {
+		this.id=id;
+	}
+	
+	public Date getDate() {
+		return this.Date;
+	}
+	
+	public void setDate(Date date) {
+		this.date=date;
+	}
+	
+	public Time getTime() {
+		return this.time;
+	}
+	
+	public void setTime(Time time) {
+		this.time=time;
+	}
+	
+	public String getObservations() {
+		return this.observations;
+	}
+	
+	public void setObservations(String observations) {
+		this.observations=observations;
+	}
 
  	
 }

1.sources/MyHealth/src/jpa/VisitJPA.java

@@ -1,7 +1,8 @@
+<<<<<<< HEAD
 package jpa;
 
 import java.io.Serializable;
-import java.sql.Time;
+import java.sql.time;
 import java.util.Date;
 
 import javax.persistence.Entity;
@@ -9,6 +10,14 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+@ManyToOne
+@JoinColumn (name="FamilyDoctorId")
+private FamilyDoctorJPA familyDoctor;
+@ManyToOne
+@JoinColumn (name="PatientId")
+private PatientJPA patient;
 
 /**
  * 
@@ -28,10 +37,11 @@ public class VisitJPA implements Serializable {
 	private String observations;
 	private String result;
 	 
+
 	/**
 	 * Class constructor methods
 	 */
-	public VisitJPA() {
+	public VistitJPA() {
 		super();
 	}
 
@@ -53,19 +63,19 @@ public class VisitJPA implements Serializable {
 		this.id = value;
 	}
 
-	public Date getDate() {
+	public String getDate() {
 		return date;
 	}
 
-	public void setDate(Date value) {
+	public void setDate(String value) {
 		this.date = value;
 	}
 
-	public Time getTime() {
+	public String getTime() {
 		return time;
 	}
 
-	public void setTime(Time value) {
+	public void setTime(String value) {
 		this.time = value;
 	}
 
@@ -76,5 +86,21 @@ public class VisitJPA implements Serializable {
 	public void setObservations(String observation) {
 		this.observations = observations;
 	}
+	/**
+	 * Methods get/set persistent relationships
+	 */
+	public FamilyDoctorJPA getFamilyDoctor() {
+		return familyDoctor;
+	}
+	public  void setFamilyDoctor(FamilyDoctorJPA familyDoc) {
+		this.familyDoctor = familyDoc;
+	}
 	
+	public PatientJPA getPatient() {
+		return patient;
+	}
+	
+	public void setPatient (PatientJPA pat) {
+		this.patient=pat;
+	}
 }