From 465c08211535f969402e883c2342b1e16404ba8a Mon Sep 17 00:00:00 2001 From: Mary Tran Date: Mon, 19 Nov 2018 21:33:39 -0500 Subject: [PATCH] Added a few things to Booking --- .../olympus/olympusservices/Booking.java | 36 ++++++++++++++----- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Booking.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Booking.java index c3d9de1..c809331 100644 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Booking.java +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Booking.java @@ -8,17 +8,35 @@ public class Booking { private int day; private int month; private int year; - private String serviceprovider; //username - private String homeowner; //username + private ServiceProvider serviceprovider; //username + private HomeOwner homeowner; //username + private Service service; public enum Status { - PENDING, CONFIRMED, CANCELLED + PENDING{ + @Override + public String toString() { + return "Pending"; + } + }, + CONFIRMED{ + @Override + public String toString() { + return "Confirmed"; + } + }, + CANCELLED{ + @Override + public String toString() { + return "Cancelled"; + } + } } private Status status; int rating; //out of 5 public Booking(int starth, int startmin, int endh, int endmin, int day, int month, int year, - String serviceprovider, String homeowner){ + ServiceProvider serviceprovider, HomeOwner homeowner, Service service){ this.starth = starth; this.startmin = startmin; this.endh = endh; @@ -88,19 +106,21 @@ public class Booking { this.year = year; } - public String getServiceprovider() { + public ServiceProvider getServiceprovider() { return serviceprovider; } - public void setServiceprovider(String serviceprovider) { + public void setServiceprovider(ServiceProvider serviceprovider) { this.serviceprovider = serviceprovider; } - public String getHomeowner() { + public HomeOwner getHomeowner() { return homeowner; } - public void setHomeowner(String homeowner) { + public Service getService(){ return service; } + + public void setHomeowner(HomeOwner homeowner) { this.homeowner = homeowner; }