From 6b1ef72f49c0e98f9f8ac0ae19110f6454bd62f6 Mon Sep 17 00:00:00 2001
From: IvanaE <ebivibe@users.noreply.github.com>
Date: Fri, 16 Nov 2018 12:02:27 -0500
Subject: [PATCH 1/3] fixed availibilities ui

---
 .../.idea/caches/build_file_checksums.ser     | Bin 541 -> 537 bytes
 OlympusServices/.idea/codeStyles/Project.xml  |  24 -------------
 ...tivity_service_provider_availabilities.xml |  32 ++++++++++++------
 3 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/OlympusServices/.idea/caches/build_file_checksums.ser b/OlympusServices/.idea/caches/build_file_checksums.ser
index e8bb1ad15ade51f0bc664c430de0d909c928c91a..b788d41ddb3c8ea65dcbbd7acf68a45ad27f4e31 100644
GIT binary patch
delta 226
zcmbQsGLvP(3>FC$SEq?{{Obi03kqVAN;7j(^wNtGQ*u&Eix`-qoz{F7|G~x)@_>nf
zp`w6+fkEJx7#9bhpA$#h%eyPr7*1<0Vc;)LEh)*&OD~3LEM%x-U<0Y0cQaw1&3*Pf
z-2^?UaHqoyOBi@iY=A2a-oh7tcJd$dKa*x{uj-8p)1B<iD66ITuS7}8;j{cKi+{lx
zChF@-7&M%%VnT~ki;81B%M$YvW1u$1OrFN*DfqdUdDWhTrGA@i(~O^;6-cT80O=`F
A`~Uy|

delta 209
zcmbQqGM8n-3>HyEhMyDX_?z<=r<Rmt=A{?wr57cp<fN7sF)&3tt@$kegN-BP0TTm5
zMF9f?gTV5CQimsIZhfi|6&IYQuPQy+pHWgEouMc8^Q3FiIX5MAJxxAem|VdqtGBc7
zsjU8-H9MwkJjiGJ;8aZsgN}Y^acWVqeqvs6Mrm<IVo`3QKGZh-$@>{S?F4q01)P7Y
z`NLwB!@+`2N%|!W0*M6$`bnjkIVmt_6*AN@uz_4M!|?Qq7im6X+L1TdQr=uXT>${3
C!%=Mj

diff --git a/OlympusServices/.idea/codeStyles/Project.xml b/OlympusServices/.idea/codeStyles/Project.xml
index d5ec3da..af2f2e3 100644
--- a/OlympusServices/.idea/codeStyles/Project.xml
+++ b/OlympusServices/.idea/codeStyles/Project.xml
@@ -49,29 +49,5 @@
         <pair source="c" header="h" fileNamingConvention="NONE" />
       </extensions>
     </Objective-C-extensions>
-    <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>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/OlympusServices/app/src/main/res/layout/activity_service_provider_availabilities.xml b/OlympusServices/app/src/main/res/layout/activity_service_provider_availabilities.xml
index 1538788..df72a6c 100644
--- a/OlympusServices/app/src/main/res/layout/activity_service_provider_availabilities.xml
+++ b/OlympusServices/app/src/main/res/layout/activity_service_provider_availabilities.xml
@@ -7,26 +7,25 @@
     android:gravity="center_horizontal"
     android:orientation="vertical"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingLeft="10dp"
+    android:paddingRight="10dp"
+    android:paddingTop="8dp"
     android:background="@drawable/background"
     tools:context=".ServiceProviderAvailabilities">
 
-    <Button
-        android:id="@+id/button"
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:onClick="onSetTimes"
-        android:text="Button" />
-
+        android:layout_height="435dp">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
     <TableLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
         <TableRow
             android:layout_width="match_parent"
-            android:layout_height="45dp"
-            android:layout_marginTop="10dp">
+            android:layout_height="45dp">
 
             <TextView
                 android:id="@+id/Day"
@@ -355,5 +354,16 @@
         </TableRow>
 
     </TableLayout>
+    </LinearLayout>
+    </ScrollView>
+    <Button
+        android:id="@+id/button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:onClick="onSetTimes"
+        android:text="Save"
+        android:theme="@style/AppTheme.Button"
+        android:layout_marginTop="5dp"/>
+
 
 </LinearLayout>
\ No newline at end of file

From 19d9956392203a6e46f5f0b54f5342160c18e200 Mon Sep 17 00:00:00 2001
From: Anshu Sharma <ashar164@uottawa.ca>
Date: Fri, 16 Nov 2018 12:08:25 -0500
Subject: [PATCH 2/3] changes

---
 OlympusServices/.idea/codeStyles/Project.xml | 24 --------------------
 OlympusServices/.idea/vcs.xml                |  1 -
 2 files changed, 25 deletions(-)

diff --git a/OlympusServices/.idea/codeStyles/Project.xml b/OlympusServices/.idea/codeStyles/Project.xml
index d5ec3da..af2f2e3 100644
--- a/OlympusServices/.idea/codeStyles/Project.xml
+++ b/OlympusServices/.idea/codeStyles/Project.xml
@@ -49,29 +49,5 @@
         <pair source="c" header="h" fileNamingConvention="NONE" />
       </extensions>
     </Objective-C-extensions>
-    <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>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/OlympusServices/.idea/vcs.xml b/OlympusServices/.idea/vcs.xml
index 62bd7a0..6c0b863 100644
--- a/OlympusServices/.idea/vcs.xml
+++ b/OlympusServices/.idea/vcs.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
   </component>
 </project>
\ No newline at end of file

From d7a2efd5ef5dfd83d51cba3495244c5cd28c33cc Mon Sep 17 00:00:00 2001
From: Anshu Sharma <ashar164@uottawa.ca>
Date: Fri, 16 Nov 2018 12:24:13 -0500
Subject: [PATCH 3/3] Comments for Availability class.

---
 .../.idea/caches/build_file_checksums.ser     | Bin 537 -> 541 bytes
 .../ServiceProviderAvailabilities.java        |  18 ++++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/OlympusServices/.idea/caches/build_file_checksums.ser b/OlympusServices/.idea/caches/build_file_checksums.ser
index b788d41ddb3c8ea65dcbbd7acf68a45ad27f4e31..5fe8d81f212712a975b0ba6482947999f4ffd439 100644
GIT binary patch
delta 209
zcmbQqGM8n-3>Mj@w!0JO_?z<=r<Rmt=A{?wr57cp<fN7sF)&3tt@$kegN-BP0TTm5
zMF9f?gTV5CQimsIZhfi|6&IYQuPQy+pHWgEouMc8^Q3FiIX5MAJxxAem|VdqtGBc7
zsjU8-H9MwkJjiGJ;8aZsgN}Y^acWVqeqvs6Mrm<IVo`3QKGZh-$@>{S?F4q01)P7Y
z`NLwB!@+`2N%|!W0*M6$`bnjkIVmt_6*AN@uz_4M!|?Qq7im6X+L1TdQr=uXT>$_}
CH&Q?V

delta 226
zcmbQsGLvP(3>FC$SEq?{{Obi03kqVAN;7j(^wNtGQ*u&Eix`-qoz{F7|G~x)@_>nf
zp`w6+fkEJx7#9bhpA$#h%eyPr7*1<0Vc;)LEh)*&OD~3LEM%x-U<0Y0cQaw1&3*Pf
z-2^?UaHqoyOBi@iY=A2a-oh7tcJd$dKa*x{uj-8p)1B<iD66ITuS7}8;j{cKi+{lx
zChF@-7&M%%VnT~ki;81B%M$YvW1u$1OrFN*DfqdUdDWhTrGA@i(~O^;6-cT80O=`F
A`~Uy|

diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderAvailabilities.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderAvailabilities.java
index 7f87410..2898772 100644
--- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderAvailabilities.java
+++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderAvailabilities.java
@@ -11,9 +11,25 @@ import android.widget.Toast;
 
 import java.util.Calendar;
 
+/**
+ *
+ * This class is the java class for the Service Provider's Availabilities menu. This class generates the menu from
+ * the saved Availabilities that the user has set previously or on default set no Availabilities.
+ * The menu gives the option to change availabilities for each day of the week or remove his availability on that
+ * day. User will receive a toast if they set impossible availabilities or they will receive a toast saying
+ * that their availabilities have been saved.
+ *
+ */
+
 public class ServiceProviderAvailabilities extends AppCompatActivity {
     private String username;
 
+    /**
+     * This class generates the availabilities from the serviceProvider class fields
+     * on creation of this menu so the user can edit and change it on the menu.
+     *
+     * @param savedInstanceState
+     */
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -22,8 +38,6 @@ public class ServiceProviderAvailabilities extends AppCompatActivity {
         username = bundle.getString("username");
         DBHelper dbHelper = new DBHelper(this);
         ServiceProvider user = (ServiceProvider) dbHelper.findUserByUsername(username);
-        //int[][] test = {{12,9,17,50},{0,0,0,0},{7,31,17,9},{12,9,17,50},{0,0,0,0},{7,31,17,9},{4,0,19,30}};
-        //user.setAvailabilities(test);
         int[][] days  = user.getAvailabilities();
         String startTime;
         String endTime;