Merge branch 'master' of

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

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

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

@@ -0,0 +1,67 @@
+package TO;
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import common.UserType;
+
+/**
+ * 
+ * @author Marcos García Núñez (mgarcianun@uoc.edu)
+ *
+ */
+@XmlRootElement(name = "LoggedUser")
+public class LoggedUserTO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String id;
+	private String password;
+	private String name;
+	private UserType userType;
+
+	public LoggedUserTO() {
+		super();
+	}
+	
+	public LoggedUserTO(String usrId, String usrName, String usrPwd, UserType usrType) {
+		id = usrId;
+		name = usrName;
+		password = usrPwd;
+		userType = usrType;
+				
+	}
+	
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public UserType getUserType() {
+		return userType;
+	}
+
+	public void setUserType(UserType userType) {
+		this.userType = userType;
+	}
+
+}

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

@@ -41,4 +41,10 @@ public class MedicalSpecialtyTO implements Serializable {
 	public void setDescription(String description) {
 		this.description = description;
 	}
+	
+	@Override
+	public String toString() {
+	    return String.format("%s[name=%s]", getClass().getSimpleName(), getName());
+	}
+	
 }

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

@@ -15,16 +15,16 @@ public class PrimaryHealthCareCenterTO implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	private String name;
-	private String description;
+	private String location;
 
 
 	public PrimaryHealthCareCenterTO() {
 		super();
 	}
 
-	public PrimaryHealthCareCenterTO(String name, String description) {
+	public PrimaryHealthCareCenterTO(String name, String location) {
 		this.name = name;
-		this.description = description;
+		this.location = location;
 	}
 
 	public String getName() {
@@ -35,12 +35,16 @@ public class PrimaryHealthCareCenterTO 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;
+	}
+   
+	@Override
+	public String toString() {
+	    return String.format("%s[name=%s]", getClass().getSimpleName(), getName());
 	}
-
 }