diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProvider.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProvider.java index caba948..b80d012 100644 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProvider.java +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProvider.java @@ -1,6 +1,7 @@ package com.uottawa.olympus.olympusservices; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -13,6 +14,9 @@ public class ServiceProvider extends UserType { //Field for list of services that service provider offers. private List services; + //Field for array of availabilities + private int[][] availabilities; + /** * Constructor for the service object which takes the parameters to @@ -26,6 +30,7 @@ public class ServiceProvider extends UserType { ServiceProvider(String username, String password, String firstname, String lastname){ super(username, password, firstname, lastname); services = new ArrayList<>(); + Availability = new Date[7][2]; } /** @@ -61,4 +66,17 @@ public class ServiceProvider extends UserType { return services; } + + public void setAvailabilities(int day, int startHour, int startMin, int endHour, int endMin){ + availabilities[day][0] = startHour; + availabilities[day][1] = startMin; + availabilities[day][2] = endHour; + availabilities[day][3] = endMin; + } + + public int[][] getAvailabilities(){ + return availabilities; + } + + } diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderWelcome.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderWelcome.java new file mode 100644 index 0000000..07acb75 --- /dev/null +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderWelcome.java @@ -0,0 +1,13 @@ +package com.uottawa.olympus.olympusservices; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +public class ServiceProviderWelcome extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_service_provider_welcome); + } +} diff --git a/OlympusServices/app/src/main/res/layout/activity_service_provider_welcome.xml b/OlympusServices/app/src/main/res/layout/activity_service_provider_welcome.xml new file mode 100644 index 0000000..7c74884 --- /dev/null +++ b/OlympusServices/app/src/main/res/layout/activity_service_provider_welcome.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file