From 8750d5519894bfab2724121769ee6c957cbff29e Mon Sep 17 00:00:00 2001
From: IvanaE <ebivibe@users.noreply.github.com>
Date: Tue, 13 Nov 2018 15:17:41 -0500
Subject: [PATCH] fixes still needed

---
 .../uottawa/olympus/olympusservices/EditProfile.java   |  2 +-
 .../olympusservices/ServiceProviderServicesList.java   | 10 ++++++----
 .../com/uottawa/olympus/olympusservices/SignUp.java    |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/EditProfile.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/EditProfile.java
index 8804922..caf9da2 100644
--- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/EditProfile.java
+++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/EditProfile.java
@@ -74,7 +74,7 @@ public class EditProfile extends AppCompatActivity {
                 ) {
 
             dbHelper.updateUserInfo(username, password.getText().toString(), firstname.getText().toString(), lastname.getText().toString(),
-                    address.getText().toString(), phonenumber.getText().toString(), companyname.getText().toString(), licensed.isChecked());
+                    address.getText().toString(), phonenumber.getText().toString(), companyname.getText().toString(), new Boolean(licensed.isChecked()));
             Toast.makeText(this, "Profile has been updated", Toast.LENGTH_LONG).show();
         }
         else{
diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderServicesList.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderServicesList.java
index 3ca7aa4..43d6e7d 100644
--- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderServicesList.java
+++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderServicesList.java
@@ -54,7 +54,7 @@ public class ServiceProviderServicesList extends AppCompatActivity implements De
         DBHelper dbHelper = new DBHelper(this);
 
         //grid
-        List<String[]> serviceslist2 = dbHelper.getAllServices();
+        List<String[]> serviceslist2 = dbHelper.getAllServicesProvidedByUser(username);
         Service[] services2 = new Service[(serviceslist2.size())];
         Iterator iter2 = serviceslist2.iterator();
         for (int i=0; i<serviceslist2.size();i++){
@@ -129,10 +129,12 @@ public class ServiceProviderServicesList extends AppCompatActivity implements De
      *
      * @param view View object contains the generated list and buttons
      */
-    public void addService(View view, String name) {
-        MaterialSpinner spinner = findViewById(R.id.RoleInput);
+    public void addService(View view) {
+        MaterialSpinner spinner = findViewById(R.id.ServicesInput);
         String servicename = spinner.getText().toString();
-        //add service to service provider if doesn't already exist
+        DBHelper dbHelper = new DBHelper(this);
+        dbHelper.addServiceProvidedByUser(servicename, username);
+        this.recreate();
     }
 
 
diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java
index 4210de0..9d9300d 100644
--- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java
+++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java
@@ -54,7 +54,7 @@ public class SignUp extends AppCompatActivity {
         String lastname = ((EditText) findViewById(R.id.LastNameInput)).getText().toString();
         MaterialSpinner spinner = findViewById(R.id.RoleInput);
 
-        if(username.length()>=5 && password.length()>5 && firstname.length()>0 && lastname.length()>0 && username.matches("[a-zA-Z0-9]*") && password.matches("[a-zA-Z0-9]*")
+        if(username.length()>=5 && password.length()>=5 && firstname.length()>0 && lastname.length()>0 && username.matches("[a-zA-Z0-9]*") && password.matches("[a-zA-Z0-9]*")
                 && firstname.matches("[a-zA-Z]*") && lastname.matches("[a-zA-Z]*")){
             DBHelper dbHelper = new DBHelper(this);
             Intent intent = new Intent(getApplicationContext(),LogIn.class);