From c43aabf7396d86356dc87efd654d13631499d3af Mon Sep 17 00:00:00 2001 From: Marcin Jedynski Date: Tue, 27 Nov 2018 13:03:45 +0100 Subject: [PATCH] added save/fetch functionality to tutortab --- .../findmytutor/activity/LoginActivity.java | 2 +- .../wmi/findmytutor/activity/TutorTab.java | 21 +++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java index 245280c..b1ebc98 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java @@ -154,7 +154,7 @@ public class LoginActivity extends AppCompatActivity { private void loginProcess(String email, String password) { ValidateUser user = new ValidateUser(email, password); - LdapUser fuser = new LdapUser(email,password,"wmi","tutor","marek","nocny","smarek@wmi.pl"); + LdapUser fuser = new LdapUser(email,password,"wmi","tutor","marek","nocny","szmare@wmi.pl"); // disposable.add(ldapService.validate(user) disposable.add(ldapService.fakeValidate(fuser) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java index 45e8001..f2fba1c 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java @@ -5,6 +5,7 @@ import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.View; import android.widget.Button; +import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; @@ -36,11 +37,12 @@ public class TutorTab extends AppCompatActivity { private CompositeDisposable disposable = new CompositeDisposable(); private TextView userName; private TextView userDutyHours; - private TextView userNote; + private EditText userNote; private TextView userRoom; private TextView userEmail; private TextView department; private Button saveButon; + private TutorTabViewModel newTab; @Override protected void onCreate(Bundle savedInstanceState) { @@ -53,7 +55,7 @@ public class TutorTab extends AppCompatActivity { setContentView(R.layout.content_tutor_tab); TextView userName = findViewById(R.id.userName); TextView userDutyHours = findViewById(R.id.userDutyHours); - TextView userNote = findViewById(R.id.userNote); + EditText userNote = findViewById(R.id.userNote); TextView userRoom = findViewById(R.id.userRoom); TextView userEmail = findViewById(R.id.userEmail); TextView department = findViewById(R.id.userDepartment); @@ -66,6 +68,7 @@ public class TutorTab extends AppCompatActivity { .subscribeWith(new DisposableSingleObserver() { @Override public void onSuccess(TutorTabViewModel tutorTabViewModel) { + newTab = tutorTabViewModel; List dutyHoursList = Stream.of(tutorTabViewModel.getDutyHours()) .map(DutyHourViewModel::getSummary).toList(); Log.d("TUTORTAB", Arrays.toString(dutyHoursList.toArray())); @@ -85,8 +88,7 @@ public class TutorTab extends AppCompatActivity { })); disposable.add( -// userService.getUserById(PrefUtils.getUserId(getApplicationContext())) - userService.getUserById(PrefUtils.getUserId(getApplicationContext())) + userService.getUserById(PrefUtils.getUserId(getApplicationContext())) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribeWith(new DisposableSingleObserver() { @@ -102,15 +104,16 @@ public class TutorTab extends AppCompatActivity { showError(e); } })); -// setUpSaveListener(); + setUpSaveListener(saveButon, userNote); } - private void setUpSaveListener() { - saveButon.setOnClickListener(new View.OnClickListener() { + private void setUpSaveListener(Button button, EditText note) { + button.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - TutorTabViewModel newTab = new TutorTabViewModel(); - putUserTab(newTab); + TutorTabViewModel toPost = newTab; + toPost.setNote(note.getText().toString()); + putUserTab(toPost); } }); }