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

Merge branch 'master' into rorden

Browse Source
This commit is contained in:
Roberto Orden Erena
2019-12-14 11:23:42 +01:00
parent 9136d53f2c 2b1ab687ae
commit ddf9145718
39 changed files with 1348 additions and 644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
1.sources/MyHealth/src/TO/FamilyDoctorTO.java
View File

@@ -14,6 +14,7 @@ public class FamilyDoctorTO implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
private String professionalNumber;
private String nif;
private String name;
private String surname;
@@ -25,14 +26,15 @@ public class FamilyDoctorTO implements Serializable {
super();
}
public FamilyDoctorTO(Integer id, String nif, String name, String surname, String password, String email, PrimaryHealthCareCenterTO phc) {
this.setId(id);
this.setNif(nif);
this.setName(name);
this.setSurname(surname);
this.setPassword(password);
this.setEmail(email);
this.setPrimaryHealthCareCenter(phc);
public FamilyDoctorTO(Integer id, String pic, String nif, String name, String surname, String password, String email, PrimaryHealthCareCenterTO phc) {
this.id = id;
this.professionalNumber = pic;
this.nif = nif;
this.name = name;
this.surname = surname;
this.password = password;
this.email =email;
this.primaryHealthCareCenter = phc;
}
public String getEmail() {
@@ -83,7 +85,7 @@ public class FamilyDoctorTO implements Serializable {
this.id = id;
}
public String getDisplayDescription() {
public String getDisplayName() {
return String.format("[%d] %s %s", this.id, this.name, this.surname);
}
@@ -95,4 +97,11 @@ public class FamilyDoctorTO implements Serializable {
this.primaryHealthCareCenter = primaryHealthCareCenter;
}
public String getProfessionalNumber() {
return professionalNumber;
}
public void setProfessionalNumber(String professionalNumber) {
this.professionalNumber = professionalNumber;
}
}

4
1.sources/MyHealth/src/TO/LoggedUserTO.java
View File

@@ -60,8 +60,8 @@ public class LoggedUserTO implements Serializable {
return userType;
}
public void setUserType(UserType userType) {
this.userType = userType;
public void setUserType(UserType value) {
this.userType = value;
}
}

15
1.sources/MyHealth/src/TO/MedicalSpecialtyTO.java
View File

@@ -13,7 +13,7 @@ import javax.xml.bind.annotation.XmlRootElement;
public class MedicalSpecialtyTO implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
private String name;
private String description;
@@ -21,11 +21,20 @@ public class MedicalSpecialtyTO implements Serializable {
super();
}
public MedicalSpecialtyTO(String name, String description) {
public MedicalSpecialtyTO(Integer id, String name, String description) {
this.id = id;
this.name = name;
this.description = description;
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getName() {
return name;
}
@@ -42,7 +51,7 @@ public class MedicalSpecialtyTO implements Serializable {
this.description = description;
}
public String getDisplayDescription() {
public String getDisplayName() {
return String.format("[%s] %s", this.name, this.description);
}

24
1.sources/MyHealth/src/TO/PatientTO.java
View File

@@ -16,6 +16,7 @@ public class PatientTO implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
private String personalIdentificationCode;
private String nif;
private String name;
private String surname;
@@ -30,14 +31,15 @@ public class PatientTO implements Serializable {
super();
}
public PatientTO(Integer id, String nif, String name, String surname, String password, String email, FamilyDoctorTO familyDoc) {
this.setId(id);
this.setNif(nif);
this.setName(name);
this.setSurname(surname);
this.setPassword(password);
this.setEmail(email);
this.setFamilyDoctor(familyDoc);
public PatientTO(Integer id, String pic, String nif, String name, String surname, String password, String email, FamilyDoctorTO familyDoc) {
this.id = id;
this.personalIdentificationCode = pic;
this.nif = nif;
this.name = name;
this.surname = surname;
this.password = password;
this.email =email;
this.familyDoctor = familyDoc;
}
public String getEmail() {
@@ -96,5 +98,11 @@ public class PatientTO implements Serializable {
this.familyDoctor = familyDoctor;
}
public String getPersonalIdentificationCode() {
return personalIdentificationCode;
}
public void setPersonalIdentificationCode(String personalIdentificationCode) {
this.personalIdentificationCode = personalIdentificationCode;
}
}

26
1.sources/MyHealth/src/TO/PrimaryHealthCareCenterTO.java
View File

@@ -13,20 +13,28 @@ import javax.xml.bind.annotation.XmlRootElement;
public class PrimaryHealthCareCenterTO implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
private String name;
private String location;
public PrimaryHealthCareCenterTO() {
super();
}
public PrimaryHealthCareCenterTO(String name, String location) {
public PrimaryHealthCareCenterTO(Integer Id, String name, String location) {
this.id = Id;
this.name = name;
this.location = location;
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getName() {
return name;
}
@@ -39,16 +47,16 @@ public class PrimaryHealthCareCenterTO implements Serializable {
return location;
}
public void setLocation(String description) {
this.location = description;
public void setLocation(String value) {
this.location = value;
}
public String getDisplayDescription() {
public String getDisplayName() {
return String.format("[%s] %s", this.name, this.location);
}
@Override
public String toString() {
return String.format("%s[name=%s]", getClass().getSimpleName(), this.getName());
return String.format("%s[name=%s]", getClass().getSimpleName(), this.getName());
}
}

25
1.sources/MyHealth/src/TO/SpecialistDoctorTO.java
View File

@@ -14,6 +14,7 @@ public class SpecialistDoctorTO implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
private String professionalNumber;
private String nif;
private String name;
private String surname;
@@ -25,14 +26,15 @@ public class SpecialistDoctorTO implements Serializable {
super();
}
public SpecialistDoctorTO(Integer id, String nif, String name, String surname, String password, String email, MedicalSpecialtyTO medicalSpec) {
this.setId(id);
this.setNif(nif);
this.setName(name);
this.setSurname(surname);
this.setPassword(password);
this.setEmail(email);
this.setMedicalSpecialty(medicalSpec);
public SpecialistDoctorTO(Integer id, String pic, String nif, String name, String surname, String password, String email, MedicalSpecialtyTO medicalSpec) {
this.id = id;
this.professionalNumber = pic;
this.nif = nif;
this.name = name;
this.surname = surname;
this.password = password;
this.email =email;
this.medicalSpecialty = medicalSpec;
}
public String getEmail() {
@@ -91,4 +93,11 @@ public class SpecialistDoctorTO implements Serializable {
this.medicalSpecialty = medicalSpecialty;
}
public String getProfessionalNumber() {
return professionalNumber;
}
public void setProfessionalNumber(String professionalNumber) {
this.professionalNumber = professionalNumber;
}
}