From e96981c8b91ccb6a45b64a549cec1dfd62746753 Mon Sep 17 00:00:00 2001 From: Marcin Jedynski Date: Tue, 27 Nov 2018 14:51:55 +0100 Subject: [PATCH] fixed post update tutortab --- .../com/uam/wmi/findmytutor/activity/TutorTab.java | 14 ++++++++++---- .../wmi/findmytutor/model/TutorTabViewModel.java | 8 ++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) 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 f2fba1c..e3df91d 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 @@ -60,6 +60,7 @@ public class TutorTab extends AppCompatActivity { TextView userEmail = findViewById(R.id.userEmail); TextView department = findViewById(R.id.userDepartment); Button saveButon = findViewById(R.id.saveButon); + userName.setText(String.format("%s %s", PrefUtils.getUserFirstName(getApplicationContext()), PrefUtils.getUserLastName(getApplicationContext()))); disposable.add( tutorTabService.apiUsersTutorTabByTutorIdGet(PrefUtils.getUserId(getApplicationContext())) @@ -68,7 +69,9 @@ public class TutorTab extends AppCompatActivity { .subscribeWith(new DisposableSingleObserver() { @Override public void onSuccess(TutorTabViewModel tutorTabViewModel) { - newTab = tutorTabViewModel; +// newTab = tutorTabViewModel; +// Log.d("TUTORTAB onsuc toPost",newTab.toString()); + List dutyHoursList = Stream.of(tutorTabViewModel.getDutyHours()) .map(DutyHourViewModel::getSummary).toList(); Log.d("TUTORTAB", Arrays.toString(dutyHoursList.toArray())); @@ -111,9 +114,12 @@ public class TutorTab extends AppCompatActivity { button.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - TutorTabViewModel toPost = newTab; - toPost.setNote(note.getText().toString()); - putUserTab(toPost); + newTab = new TutorTabViewModel(PrefUtils.getUserId(getApplicationContext()),note.getText().toString()); + Log.d("TUTORTAB button",note.getText().toString()); + Log.d("TUTORTAB toPost",newTab.toString()); + //topost jest nullem +// toPost.setNote(note.getText().toString()); + putUserTab(newTab); } }); } diff --git a/app/src/main/java/com/uam/wmi/findmytutor/model/TutorTabViewModel.java b/app/src/main/java/com/uam/wmi/findmytutor/model/TutorTabViewModel.java index f74d50c..e726ce9 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/model/TutorTabViewModel.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/model/TutorTabViewModel.java @@ -33,11 +33,19 @@ public class TutorTabViewModel { @SerializedName("dutyHours") private List dutyHours = null; + public TutorTabViewModel(String userId, String note){ + this.userId=userId; +// this.room=room; +// this.emailTutorTab=emailTutorTab; + this.note=note; + } + public TutorTabViewModel tutorTabId(UUID tutorTabId) { this.tutorTabId = tutorTabId; return this; } + /** * Get tutorTabId * @return tutorTabId