From aa0e073669e909526940c99c24957d52e61fcc76 Mon Sep 17 00:00:00 2001
From: Anshu Sharma <ashar164@uottawa.ca>
Date: Sun, 2 Dec 2018 12:08:04 -0500
Subject: [PATCH] final logic

---
 OlympusServices/.idea/assetWizardSettings.xml |  14 ----------
 .../.idea/caches/build_file_checksums.ser     | Bin 537 -> 541 bytes
 OlympusServices/.idea/codeStyles/Project.xml  |  24 ------------------
 OlympusServices/.idea/vcs.xml                 |   6 -----
 .../olympus/olympusservices/Bookings.java     |   6 ++++-
 .../olympusservices/FindServiceProvider.java  |   9 ++++++-
 .../olympus/olympusservices/MakeBooking.java  |   3 ---
 7 files changed, 13 insertions(+), 49 deletions(-)
 delete mode 100644 OlympusServices/.idea/assetWizardSettings.xml
 delete mode 100644 OlympusServices/.idea/vcs.xml

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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="WizardSettings">
-    <option name="children">
-      <map>
-        <entry key="vectorWizard">
-          <value>
-            <PersistentState />
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>
\ 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 03c8afea49b0bcc4c038eb4a4f251a3197c55a0d..d94de5c2812102d95bd92f89c7790101f0d5dc8f 100644
GIT binary patch
delta 209
zcmbQqGM8n-43>QR`t=j%_?z<=r<Rmt=A{?wr57cp<fN7sF)&3tt@$kegN-BP0TTm5
zMF9f?gTV5CQimsIZhfi|6&IYQuPQy+pHWgEouMc8^Q3FiIX5MAJxxAem|Vdqt9NjD
zhK9D=56h};t3_Rl*n&zJbo4`uQ;UlA6Z48QN{cfRi*gh7p|<Hy-p}Z1C$PIL;QU+7
z9~P?|4i<b$(l22UNGvGOPb$sKNr5@5kfDx&4djv;hNoA&Nb?cXj=aH^^5*jC3IIIT
BPs9KK

delta 226
zcmbQsGLvP(43?M&Po_+q<6ke3SWpm?RGOKSqL*Hjn39uPTExH<?X>2z_zyOYkOxc*
z3>5_o3=9Il#JD*4{G2%2Ufx}~#&BA52?Kv|YDr0EUV1T1V<AHw0~<)~yqgL8Z0@t?
z=_cq&g*zQySi-=AVgp=Z@D{%Cvy=ar|CuyvdsS~-nC@h6Mp-Sze<ey%4xi;`S^Nvm
zFi~Gu!l2=76%$&VT2vh4S(ccW7z4F2X7V&fPr=W<%&Yb!EcM%Dn`Zp%tUyu)0FQ!G
A?EnA(

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 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <DBN-PSQL>
-      <case-options enabled="false">
-        <option name="KEYWORD_CASE" value="lower" />
-        <option name="FUNCTION_CASE" value="lower" />
-        <option name="PARAMETER_CASE" value="lower" />
-        <option name="DATATYPE_CASE" value="lower" />
-        <option name="OBJECT_CASE" value="preserve" />
-      </case-options>
-      <formatting-settings enabled="false" />
-    </DBN-PSQL>
-    <DBN-SQL>
-      <case-options enabled="false">
-        <option name="KEYWORD_CASE" value="lower" />
-        <option name="FUNCTION_CASE" value="lower" />
-        <option name="PARAMETER_CASE" value="lower" />
-        <option name="DATATYPE_CASE" value="lower" />
-        <option name="OBJECT_CASE" value="preserve" />
-      </case-options>
-      <formatting-settings enabled="false">
-        <option name="STATEMENT_SPACING" value="one_line" />
-        <option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" />
-        <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
-      </formatting-settings>
-    </DBN-SQL>
     <Objective-C-extensions>
       <file>
         <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>
\ 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 c7b38ca..1b9a192 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
@@ -18,6 +18,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 {
@@ -41,10 +43,12 @@ public class Bookings extends AppCompatActivity {
         dbhelper = new DBHelper(this);
 
         List<Booking> booking = (List<Booking>)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<endh || (starth==endh && startmin<endmin)){
                         DBHelper dbHelper = new DBHelper(this);
 
-                        //check if sp is availible not just true
-                        if(true) {
 
                             if (dbHelper.addBooking(serviceprovider, homeowner, service, year, month, day,
                                     starth, startmin, endh, endmin)) {
@@ -96,7 +94,6 @@ public class MakeBooking extends AppCompatActivity {
                             } else {
                                 Toast.makeText(this, "Booking could not be made", Toast.LENGTH_SHORT).show();
                             }
-                        }
 
 
                     }