batuhan-basoglu/SEG2105-Olympus-Android-Application
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

updated booking class

Browse source
This commit is contained in:
IvanaE 2018-11-18 11:57:00 -05:00
parent 16402a2aff
commit 658a227d7b
3 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Booking.java
View file

@ -13,8 +13,24 @@ public class Booking {
public enum Status {
PENDING, CONFIRMED, 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){
this.starth = starth;
this.startmin = startmin;
this.endh = endh;
this.endmin = endmin;
this.day = day;
this.month = month;
this.year = year;
this.serviceprovider = serviceprovider;
this.homeowner = homeowner;
this.status = Status.PENDING;
}
public int getStarth() {
return starth;
@ -88,6 +104,14 @@ public class Booking {
this.homeowner = homeowner;
}
public void setStatus(Status status){
this.status = status;
}
public Status getStatus(){
return this.status;
}
public int getRating() {
return rating;
}

2
OlympusServices/app/src/main/res/layout/activity_admin_welcome.xml
View file

@ -11,7 +11,7 @@
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:background="@drawable/background"
tools:context=".Welcome">
tools:context=".AdminWelcome">
<TextView
android:id="@+id/Welcome"
android:layout_width="300dp"

2
OlympusServices/app/src/main/res/layout/activity_users_list.xml
View file

@ -11,7 +11,7 @@
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:background="@drawable/background"
tools:context=".Welcome">
tools:context=".UsersList">
<LinearLayout