diff --git a/OlympusServices/.idea/assetWizardSettings.xml b/OlympusServices/.idea/assetWizardSettings.xml deleted file mode 100644 index 6b96cf0..0000000 --- a/OlympusServices/.idea/assetWizardSettings.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OlympusServices/.idea/caches/build_file_checksums.ser b/OlympusServices/.idea/caches/build_file_checksums.ser index 03c8afe..d94de5c 100644 Binary files a/OlympusServices/.idea/caches/build_file_checksums.ser and b/OlympusServices/.idea/caches/build_file_checksums.ser differ diff --git a/OlympusServices/.idea/codeStyles/Project.xml b/OlympusServices/.idea/codeStyles/Project.xml index af2f2e3..30aa626 100644 --- a/OlympusServices/.idea/codeStyles/Project.xml +++ b/OlympusServices/.idea/codeStyles/Project.xml @@ -1,29 +1,5 @@ - - - - - - - - - - - - + diff --git a/OlympusServices/.idea/vcs.xml b/OlympusServices/.idea/vcs.xml deleted file mode 100644 index 6c0b863..0000000 --- a/OlympusServices/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Bookings.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Bookings.java index 5c79c9d..4a211eb 100644 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Bookings.java +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Bookings.java @@ -20,6 +20,8 @@ import android.widget.RadioGroup; import android.widget.TextView; import android.widget.Toast; +import java.util.Collection; +import java.util.Collections; import java.util.List; public class Bookings extends AppCompatActivity { @@ -43,10 +45,12 @@ public class Bookings extends AppCompatActivity { dbhelper = new DBHelper(this); List booking = (List)dbhelper.findBookings(username); + Collections.reverse(booking); Booking[] bookings = new Booking[booking.size()]; bookings = booking.toArray(bookings); + Booking[] mostRecentBookings = new Booking[bookings.length]; - /* mock data + /* //mock data Booking[] bookings = {new Booking(5, 5, 6, 6, 2, 3, 2019, (ServiceProvider)dbhelper.findUserByUsername("testing"), (HomeOwner)dbhelper.findUserByUsername("tester"), dbhelper.findService("service1"))}; */ diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/FindServiceProvider.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/FindServiceProvider.java index 717d6f7..fecbd3d 100644 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/FindServiceProvider.java +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/FindServiceProvider.java @@ -85,7 +85,14 @@ public class FindServiceProvider extends AppCompatActivity { public void Reset(View view){ - + Button button = findViewById(R.id.Start); + Button button2 = findViewById(R.id.End); + Button button3 = findViewById(R.id.Date); + RadioGroup ratingselect = findViewById(R.id.RatingSelect); + button.setText("START"); + button2.setText("END"); + button3.setText("DATE"); + ratingselect.clearCheck(); //clears recycler view String[][] empty = {}; mAdapter = new MyAdapter(empty, this); diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/MakeBooking.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/MakeBooking.java index 5c51195..0b113dc 100644 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/MakeBooking.java +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/MakeBooking.java @@ -82,8 +82,6 @@ public class MakeBooking extends AppCompatActivity { if (starth