From ac5362ca76f7785a645f1d7ebc79a196895e0892 Mon Sep 17 00:00:00 2001 From: Alejandro Linares Amado Date: Mon, 2 Dec 2019 22:34:38 +0100 Subject: [PATCH 01/13] Componente Visit JPA --- 1.sources/MyHealth/src/jpa/VisitJPA.java | 32 +++++++++++++++++------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/1.sources/MyHealth/src/jpa/VisitJPA.java b/1.sources/MyHealth/src/jpa/VisitJPA.java index db42528..cb5f44a 100644 --- a/1.sources/MyHealth/src/jpa/VisitJPA.java +++ b/1.sources/MyHealth/src/jpa/VisitJPA.java @@ -32,6 +32,13 @@ public class VisitJPA implements Serializable { private String time; private String observations; private String result; + @ManyToOne + @JoinColumn (name="FamilyDoctorId") + private FamilyDoctorJPA familyDoctor; + @ManyToOne + @JoinColumn (name="PatientId") + private PatientJPA patient; + /** * Class constructor methods @@ -81,7 +88,7 @@ public class VisitJPA implements Serializable { public void setObservations(String observation) { this.observations = observations; } - + /** @@ -97,13 +104,20 @@ public class VisitJPA implements Serializable { public void setPatients(Collection patients) { this.patients = patients; } + /** + * 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; + } - @ManyToOne - @JoinColumn (name="PrimaryHealthCareCenterId") - public PrimaryHealthCareCenterJPA getPrimaryHealthCareCenter() { - return primaryHealthCareCenter; - } - public void setPrimaryHealthCareCenter(PrimaryHealthCareCenterJPA center) { - this.primaryHealthCareCenter = center; - } } From c108063664f0490373fb7542349c7529b63945ab Mon Sep 17 00:00:00 2001 From: Alejandro Linares Amado Date: Wed, 4 Dec 2019 02:29:46 +0100 Subject: [PATCH 02/13] VisitJpa corregido --- 1.sources/MyHealth/src/jpa/VisitJPA.java | 44 +----------------------- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/1.sources/MyHealth/src/jpa/VisitJPA.java b/1.sources/MyHealth/src/jpa/VisitJPA.java index cb5f44a..7e45a94 100644 --- a/1.sources/MyHealth/src/jpa/VisitJPA.java +++ b/1.sources/MyHealth/src/jpa/VisitJPA.java @@ -1,18 +1,13 @@ package jpa; import java.io.Serializable; -import java.util.Collection; +import java.sql.time; import java.util.Date; -import javax.persistence.CascadeType; import javax.persistence.Entity; -import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; import javax.persistence.Table; /** @@ -32,12 +27,6 @@ public class VisitJPA implements Serializable { private String time; private String observations; private String result; - @ManyToOne - @JoinColumn (name="FamilyDoctorId") - private FamilyDoctorJPA familyDoctor; - @ManyToOne - @JoinColumn (name="PatientId") - private PatientJPA patient; /** @@ -89,35 +78,4 @@ public class VisitJPA implements Serializable { this.observations = observations; } - - - /** - * Metodos para get/set de relaciones (pacientes) - * @return - */ - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) - @JoinColumn(name = "FamilyDoctorId") - public Collection getPatients() { - return patients; - } - - public void setPatients(Collection patients) { - this.patients = patients; - } - /** - * 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; - } - } From 5a3d56014bbbbc9b61b79f5a982cbaf760566ccd Mon Sep 17 00:00:00 2001 From: Alejandro Linares Amado Date: Wed, 4 Dec 2019 02:30:33 +0100 Subject: [PATCH 03/13] VisitJPA corregido --- 1.sources/MyHealth/src/jpa/VisitJPA.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1.sources/MyHealth/src/jpa/VisitJPA.java b/1.sources/MyHealth/src/jpa/VisitJPA.java index 7e45a94..d156e9c 100644 --- a/1.sources/MyHealth/src/jpa/VisitJPA.java +++ b/1.sources/MyHealth/src/jpa/VisitJPA.java @@ -24,7 +24,7 @@ public class VisitJPA implements Serializable { @Id private Integer id; private Date date; - private String time; + private Time time; private String observations; private String result; From 9b2d54915672de190e377c523e25324c4c542254 Mon Sep 17 00:00:00 2001 From: Alejandro Linares Amado Date: Wed, 4 Dec 2019 04:27:59 +0100 Subject: [PATCH 04/13] =?UTF-8?q?VisitTO=20componente=20implementaci=C3=B3?= =?UTF-8?q?n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.sources/MyHealth/src/TO/VisitTO.java | 45 ++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/1.sources/MyHealth/src/TO/VisitTO.java b/1.sources/MyHealth/src/TO/VisitTO.java index a2030fc..a053984 100644 --- a/1.sources/MyHealth/src/TO/VisitTO.java +++ b/1.sources/MyHealth/src/TO/VisitTO.java @@ -17,13 +17,54 @@ import javax.xml.bind.annotation.XmlRootElement; */ @XmlRootElement(name = "Visit") public class VisitTO implements Serializable { + + private static final long serialVersionUID = 1L; - + private Integer id; + private Date date; + private Time time; + private String observations; + private String result; 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 obs) { + this.observations=obs; + } } From 0bb4d6e73f22d53afa12d51d0f2c6d134f2dd1e4 Mon Sep 17 00:00:00 2001 From: Alejandro Linares Amado Date: Wed, 4 Dec 2019 04:29:20 +0100 Subject: [PATCH 05/13] =?UTF-8?q?VisitTO=20implementaci=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.sources/MyHealth/src/TO/VisitTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1.sources/MyHealth/src/TO/VisitTO.java b/1.sources/MyHealth/src/TO/VisitTO.java index a053984..9a0ccaf 100644 --- a/1.sources/MyHealth/src/TO/VisitTO.java +++ b/1.sources/MyHealth/src/TO/VisitTO.java @@ -66,5 +66,5 @@ public class VisitTO implements Serializable { public void setObservations(String obs) { this.observations=obs; } - + } From bba5a3bf0a65086e12e0e33199cb98a0c61ed9ba Mon Sep 17 00:00:00 2001 From: Alejandro Linares Amado Date: Wed, 4 Dec 2019 04:37:57 +0100 Subject: [PATCH 06/13] Implementacion componente VisitTO --- 1.sources/MyHealth/src/TO/VisitTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1.sources/MyHealth/src/TO/VisitTO.java b/1.sources/MyHealth/src/TO/VisitTO.java index 9a0ccaf..a053984 100644 --- a/1.sources/MyHealth/src/TO/VisitTO.java +++ b/1.sources/MyHealth/src/TO/VisitTO.java @@ -66,5 +66,5 @@ public class VisitTO implements Serializable { public void setObservations(String obs) { this.observations=obs; } - + } From 80296c682c6b3f1ea0a46e7af57716377cc17cde Mon Sep 17 00:00:00 2001 From: Alejandro Linares Amado Date: Wed, 4 Dec 2019 04:39:33 +0100 Subject: [PATCH 07/13] =?UTF-8?q?Implementaci=C3=B3n=20VisitTO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.sources/MyHealth/src/TO/VisitTO.java | 1 + 1 file changed, 1 insertion(+) diff --git a/1.sources/MyHealth/src/TO/VisitTO.java b/1.sources/MyHealth/src/TO/VisitTO.java index a053984..44d2267 100644 --- a/1.sources/MyHealth/src/TO/VisitTO.java +++ b/1.sources/MyHealth/src/TO/VisitTO.java @@ -67,4 +67,5 @@ public class VisitTO implements Serializable { this.observations=obs; } + } From 26f4635db4da4bb442d26bcda2639ab699ad3f08 Mon Sep 17 00:00:00 2001 From: Alejandro Linares Amado Date: Wed, 4 Dec 2019 05:31:58 +0100 Subject: [PATCH 08/13] =?UTF-8?q?Implementaci=C3=B3n=20VisitTO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.sources/MyHealth/src/TO/VisitTO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/1.sources/MyHealth/src/TO/VisitTO.java b/1.sources/MyHealth/src/TO/VisitTO.java index 44d2267..b58bcce 100644 --- a/1.sources/MyHealth/src/TO/VisitTO.java +++ b/1.sources/MyHealth/src/TO/VisitTO.java @@ -63,8 +63,8 @@ public class VisitTO implements Serializable { return this.observations; } - public void setObservations(String obs) { - this.observations=obs; + public void setObservations(String observations) { + this.observations=observations; } From 5cd6826e7330a81b0a432f103d3e7834504ceaf3 Mon Sep 17 00:00:00 2001 From: Alejandro Linares Amado Date: Wed, 4 Dec 2019 14:12:33 +0100 Subject: [PATCH 09/13] =?UTF-8?q?Implementaci=C3=B3n=20VisitTO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.sources/MyHealth/src/TO/VisitTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1.sources/MyHealth/src/TO/VisitTO.java b/1.sources/MyHealth/src/TO/VisitTO.java index b58bcce..68530f7 100644 --- a/1.sources/MyHealth/src/TO/VisitTO.java +++ b/1.sources/MyHealth/src/TO/VisitTO.java @@ -67,5 +67,5 @@ public class VisitTO implements Serializable { this.observations=observations; } - + } From 7ce3cb57d6881aee5ee6ffd4377d47d05a07c555 Mon Sep 17 00:00:00 2001 From: Alejandro Linares Amado Date: Wed, 4 Dec 2019 15:47:54 +0100 Subject: [PATCH 10/13] VisitJPA IMPLEMENTACION --- 1.sources/MyHealth/src/jpa/VisitJPA.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1.sources/MyHealth/src/jpa/VisitJPA.java b/1.sources/MyHealth/src/jpa/VisitJPA.java index d156e9c..52a01fd 100644 --- a/1.sources/MyHealth/src/jpa/VisitJPA.java +++ b/1.sources/MyHealth/src/jpa/VisitJPA.java @@ -77,5 +77,5 @@ public class VisitJPA implements Serializable { public void setObservations(String observation) { this.observations = observations; } - + } From 86f8f036e6d051826445d3c131ca0c549e77e3b5 Mon Sep 17 00:00:00 2001 From: Alejandro Linares Amado Date: Thu, 5 Dec 2019 02:54:06 +0100 Subject: [PATCH 11/13] =?UTF-8?q?Implementaci=C3=B3n=20Componente=20Visit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .project | 17 +++++++++++++++++ 1.sources/MyHealth/src/TO/VisitTO.java | 2 ++ 1.sources/MyHealth/src/jpa/VisitJPA.java | 24 +++++++++++++++++++++++- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 .project diff --git a/.project b/.project new file mode 100644 index 0000000..3070514 --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + myhealth3 + + + + + + org.jboss.ide.eclipse.archives.core.archivesBuilder + + + + + + org.jboss.ide.eclipse.archives.core.archivesNature + + diff --git a/1.sources/MyHealth/src/TO/VisitTO.java b/1.sources/MyHealth/src/TO/VisitTO.java index 68530f7..46da075 100644 --- a/1.sources/MyHealth/src/TO/VisitTO.java +++ b/1.sources/MyHealth/src/TO/VisitTO.java @@ -26,6 +26,8 @@ public class VisitTO implements Serializable { private Time time; private String observations; private String result; + private FamilyDoctorTO familyDoctor; + private PatientTO patient; public VisitTO() { super(); diff --git a/1.sources/MyHealth/src/jpa/VisitJPA.java b/1.sources/MyHealth/src/jpa/VisitJPA.java index 52a01fd..4bacbb5 100644 --- a/1.sources/MyHealth/src/jpa/VisitJPA.java +++ b/1.sources/MyHealth/src/jpa/VisitJPA.java @@ -9,6 +9,12 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +@ManyToOne +@JoinColumn (name="FamilyDoctorId") +private FamilyDoctorJPA familyDoctor; +@ManyToOne +@JoinColumn (name="PatientId") +private PatientJPA patient; /** * @@ -77,5 +83,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; + } } From 50a085b969d430620cf8f87364d7dd854d6bf885 Mon Sep 17 00:00:00 2001 From: Alejandro Linares Amado Date: Sun, 8 Dec 2019 19:17:57 +0100 Subject: [PATCH 12/13] =?UTF-8?q?A=C3=B1adidas=20referencias=20a=20otras?= =?UTF-8?q?=20tablas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.sources/MyHealth/src/jpa/VisitJPA.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/1.sources/MyHealth/src/jpa/VisitJPA.java b/1.sources/MyHealth/src/jpa/VisitJPA.java index 4bacbb5..faf47fd 100644 --- a/1.sources/MyHealth/src/jpa/VisitJPA.java +++ b/1.sources/MyHealth/src/jpa/VisitJPA.java @@ -9,6 +9,8 @@ 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; From 2bcef7e9761339636f14bf7550a519a49ddd3dca Mon Sep 17 00:00:00 2001 From: Alejandro Linares Amado Date: Sun, 8 Dec 2019 19:45:21 +0100 Subject: [PATCH 13/13] Eliminado codigo sobrante --- 1.sources/MyHealth/src/jpa/VisitJPA.java | 82 ------------------------ 1 file changed, 82 deletions(-) diff --git a/1.sources/MyHealth/src/jpa/VisitJPA.java b/1.sources/MyHealth/src/jpa/VisitJPA.java index 47f8f20..7d9b35c 100644 --- a/1.sources/MyHealth/src/jpa/VisitJPA.java +++ b/1.sources/MyHealth/src/jpa/VisitJPA.java @@ -104,85 +104,3 @@ public class VisitJPA implements Serializable { this.patient=pat; } } -======= -package jpa; - -import java.io.Serializable; -import java.sql.Time; -import java.util.Date; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; - -/** - * - * @author Marcos García Núñez (mgarcianun@uoc.edu) - * - */ -@Entity -@Table(name = "MyHealth.Visit") -public class VisitJPA implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - private Integer id; - private Date date; - private Time time; - private String observations; - private String result; - - /** - * Class constructor methods - */ - public VisitJPA() { - super(); - } - - public VisitJPA(Integer id, Date date, Time time, String observations, String result) { - this.id = id; - this.date=date; - this.time = time; - this.observations = observations; - this.result = result; - } - - @Id - @GeneratedValue(strategy=GenerationType.IDENTITY) - public Integer getId() { - return id; - } - - public void setId(Integer value) { - this.id = value; - } - - public Date getDate() { - return date; - } - - public void setDate(Date value) { - this.date = value; - } - - public Time getTime() { - return time; - } - - public void setTime(Time value) { - this.time = value; - } - - public String getObservations() { - return observations; - } - - public void setObservations(String observation) { - this.observations = observations; - } - -} ->>>>>>> branch 'master' of http://pdp-pds.eimt.uoc.edu/pds19-grupo2/myhealth.git