droideparanoico/myhealth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of

Browse Source 
http://pdp-pds.eimt.uoc.edu/pds19-grupo2/myhealth.git

Conflicts:
	1.sources/MyHealth/src/jpa/VisitJPA.java
This commit is contained in:
Alejandro Linares Amado
2019-12-08 19:39:47 +01:00
parent 50a085b969 1e05d8e82f
commit 504886d74a
57 changed files with 1666 additions and 775 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
1.sources/MyHealth/src/jpa/AdministratorJPA.java Normal file
View File

@@ -0,0 +1,52 @@
package jpa;
import java.io.Serializable;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
*
* @author Marcos García Núñez (mgarcianun@uoc.edu)
*
*/
@Entity
@Table(name = "MyHealth.Administrator")
public class AdministratorJPA implements Serializable {
private static final long serialVersionUID = 1L;
@Id
private String email;
private String password;
/**
* Class constructor methods
*/
public AdministratorJPA() {
super();
}
public AdministratorJPA(String email, String password) {
this.email = email;
this.password = password;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
}

14
1.sources/MyHealth/src/jpa/FamilyDoctorJPA.java
View File

@@ -26,7 +26,7 @@ public class FamilyDoctorJPA implements Serializable {
private static final long serialVersionUID = 1L;
@Id
private Integer id;
private int id;
private String nif;
private String name;
private String surname;
@@ -42,22 +42,22 @@ public class FamilyDoctorJPA implements Serializable {
super();
}
public FamilyDoctorJPA(Integer id, String nif, String name, String surname, String password, String email) {
this.id = id;
public FamilyDoctorJPA(String nif, String name, String surname, String password, String email, PrimaryHealthCareCenterJPA phc) {
this.nif = nif;
this.name = name;
this.surname = surname;
this.password = password;
this.email = email;
this.primaryHealthCareCenter = phc;
}
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
public Integer getId() {
public int getId() {
return id;
}
public void setId(Integer value) {
public void setId(int value) {
this.id = value;
}
@@ -123,6 +123,4 @@ public class FamilyDoctorJPA implements Serializable {
public void setPrimaryHealthCareCenter(PrimaryHealthCareCenterJPA center) {
this.primaryHealthCareCenter = center;
}
}
}

9
1.sources/MyHealth/src/jpa/PatientJPA.java
View File

@@ -23,7 +23,7 @@ public class PatientJPA implements Serializable {
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
private Integer id;
private int id;
private String nif;
private String name;
private String surname;
@@ -40,8 +40,7 @@ public class PatientJPA implements Serializable {
super();
}
public PatientJPA(Integer id, String nif, String name, String surname, String password, String email) {
this.id = id;
public PatientJPA(String nif, String name, String surname, String password, String email) {
this.nif = nif;
this.name = name;
this.surname = surname;
@@ -49,11 +48,11 @@ public class PatientJPA implements Serializable {
this.email = email;
}
public Integer getId() {
public int getId() {
return id;
}
public void setId(Integer value) {
public void setId(int value) {
this.id = value;
}

14
1.sources/MyHealth/src/jpa/PrimaryHealthCareCenterJPA.java
View File

@@ -19,7 +19,7 @@ public class PrimaryHealthCareCenterJPA implements Serializable {
@Id
private String name;
private String description;
private String location;
/**
* Class constructor methods
@@ -28,9 +28,9 @@ public class PrimaryHealthCareCenterJPA implements Serializable {
super();
}
public PrimaryHealthCareCenterJPA(String name, String description) {
public PrimaryHealthCareCenterJPA(String name, String location) {
this.name = name;
this.description = description;
this.location = location;
}
public String getName() {
@@ -41,11 +41,11 @@ public class PrimaryHealthCareCenterJPA implements Serializable {
this.name = name;
}
public String getDescription() {
return description;
public String getLocation() {
return location;
}
public void setDescription(String description) {
this.description = description;
public void setLocation(String description) {
this.location = description;
}
}

12
1.sources/MyHealth/src/jpa/SpecialistDoctorJPA.java
View File

@@ -22,7 +22,7 @@ public class SpecialistDoctorJPA implements Serializable {
private static final long serialVersionUID = 1L;
@Id
private Integer id;
private int id;
private String nif;
private String name;
private String surname;
@@ -37,22 +37,22 @@ public class SpecialistDoctorJPA implements Serializable {
super();
}
public SpecialistDoctorJPA(Integer id, String nif, String name, String surname, String password, String email) {
this.id = id;
public SpecialistDoctorJPA(String nif, String name, String surname, String password, String email, MedicalSpecialtyJPA ms) {
this.nif = nif;
this.name = name;
this.surname = surname;
this.password = password;
this.email = email;
this.medicalSpecialty = ms;
}
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
public Integer getId() {
public int getId() {
return id;
}
public void setId(Integer value) {
public void setId(int value) {
this.id = value;
}
@@ -97,7 +97,7 @@ public class SpecialistDoctorJPA implements Serializable {
}
@ManyToOne
@JoinColumn(name = "MedicalSpecialtyName")
@JoinColumn(name = "MedicalSpecialtyId")
public MedicalSpecialtyJPA getMedicalSpecialty() {
return medicalSpecialty;
}

83
1.sources/MyHealth/src/jpa/VisitJPA.java
View File

@@ -1,3 +1,4 @@
<<<<<<< HEAD
package jpa;
import java.io.Serializable;
@@ -103,3 +104,85 @@ 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