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

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

Browse Source
This commit is contained in:
Marcos Garcia Nuñez
2019-12-08 22:26:54 +01:00
parent e718afeb3a 2bcef7e976
commit a369839770
3 changed files with 169 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
.project Normal file
View File

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

48
1.sources/MyHealth/src/TO/VisitTO.java
View File

@@ -17,13 +17,57 @@ 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;
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;
}
}

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

@@ -1,80 +1,106 @@
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;
}
}
<<<<<<< HEAD
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;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
@ManyToOne
@JoinColumn (name="FamilyDoctorId")
private FamilyDoctorJPA familyDoctor;
@ManyToOne
@JoinColumn (name="PatientId")
private PatientJPA patient;
/**
*
* @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 VistitJPA() {
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 String getDate() {
return date;
}
public void setDate(String value) {
this.date = value;
}
public String getTime() {
return time;
}
public void setTime(String value) {
this.time = value;
}
public String getObservations() {
return observations;
}
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;
}
}