#5633 Implemented sheit

app/src/main/java/dk/adamino/rehabilitation/BE/Client.java

@@ -6,4 +6,5 @@
 public class Client extends User {
     public String address;
     public String phone;
+    public RehabilitationPlan rehabilitationPlan;
 }

app/src/main/java/dk/adamino/rehabilitation/BE/RehabilitationPlan.java

@@ -0,0 +1,9 @@
+package dk.adamino.rehabilitation.BE;
+
+/**
+ * Created by Adamino.
+ */
+public class RehabilitationPlan {
+    public String uid;
+    public String diagnosis;
+}

app/src/main/java/dk/adamino/rehabilitation/DAL/FirestoreDAO.java

@@ -24,20 +24,15 @@ public class FirestoreDAO implements IFirestore {
     private FirebaseFirestore mFirestore = FirebaseFirestore.getInstance();
 
     @Override
-    public void getClientById(String clientUID, final IFirestoreCallback firestoreCallback) {
+    public void getClientByIdAsync(String clientUID, final IFirestoreCallback firestoreCallback) {
         DocumentReference docRef = mFirestore.collection(USERS_COLLECTION).document(clientUID);
         docRef.get().addOnCompleteListener(new OnCompleteListener<DocumentSnapshot>() {
             @Override
             public void onComplete(@NonNull Task<DocumentSnapshot> task) {
                 if (task.isSuccessful()) {
                     DocumentSnapshot document = task.getResult();
                     if (document.exists()) {
-                        Client client = new Client();
-                        client.uid = document.getId();
-                        client.fullName = document.getString("fullName");
-                        client.email = document.getString("email");
-                        client.phone = document.getString("phone");
-                        client.address = document.getString("address");
+                        Client client = task.getResult().toObject(Client.class);
                         firestoreCallback.onClientResponse(client);
                         Log.d(TAG, "DocumentSnapshot data: " + document.getData());
                     } else {

app/src/main/java/dk/adamino/rehabilitation/DAL/IFirestore.java

@@ -11,5 +11,5 @@ public interface IFirestore {
      * @param uid
      * @return Client
      */
-    void getClientById(String uid, IFirestoreCallback firestoreCallback);
+    void getClientByIdAsync(String uid, IFirestoreCallback firestoreCallback);
 }

app/src/main/java/dk/adamino/rehabilitation/GUI/Model/FirebaseClientModel.java

@@ -29,9 +29,9 @@ public static FirebaseClientModel getInstance() {
      * Get currently logged in client
      * @param response
      */
-    public void getLoggedInClient(IFirestoreCallback response) {
+    public void loadLoggedInClientAsync(IFirestoreCallback response) {
         // TODO ALH: Replace!
         String adamUID = "7fdjYuWZC1ZQD4npgb1YG3kfNK02";
-        mFirestoreDAO.getClientById(adamUID, response);
+        mFirestoreDAO.getClientByIdAsync(adamUID, response);
     }
 }

app/src/main/java/dk/adamino/rehabilitation/GUI/ProfileActivity.java

@@ -14,7 +14,7 @@
 public class ProfileActivity extends AppCompatActivity implements IFirestoreCallback {
     public static final String TAG = "GUI";
 
-    private TextView mName, mPhone, mEmail;
+    private TextView mName, mPhone, mEmail, mDiagnosis;
 
     private FirebaseClientModel mClientModel;
 
@@ -28,17 +28,23 @@ protected void onCreate(Bundle savedInstanceState) {
         mName = findViewById(R.id.txtName);
         mPhone = findViewById(R.id.txtPhone);
         mEmail = findViewById(R.id.txtEmail);
+        mDiagnosis = findViewById(R.id.txtDiagnosis);
 
-        mClientModel.getLoggedInClient(this);
+        // Load logged in client async
+        mClientModel.loadLoggedInClientAsync(this);
     }
 
     /**
      * When data is loaded, set client information
      */
     private void setClientInformation(Client loggedInClient) {
+        // Client info
         mName.setText(loggedInClient.fullName);
         mPhone.setText(loggedInClient.phone);
         mEmail.setText(loggedInClient.email);
+
+        // Rehabilitation Plan
+        mDiagnosis.setText(loggedInClient.rehabilitationPlan.diagnosis);
     }
 
     @Override

app/src/main/res/layout/activity_profile.xml

@@ -7,6 +7,8 @@
     android:layout_height="match_parent"
     tools:context=".GUI.ProfileActivity">
 
+    <!--USER INFORMATION-->
+
     <ImageView
         android:id="@+id/imageView"
         android:layout_width="107dp"
@@ -24,7 +26,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="36dp"
         android:layout_marginTop="8dp"
-        android:text="Loading data"
+        android:text="@string/loading_data"
         app:layout_constraintStart_toEndOf="@+id/imageView"
         app:layout_constraintTop_toTopOf="@+id/imageView"/>
 
@@ -46,6 +48,8 @@
         app:layout_constraintStart_toStartOf="@+id/txtPhone"
         app:layout_constraintTop_toBottomOf="@+id/txtPhone"/>
 
+    <!--REHABILITATION PLAN-->
+
     <TextView
         android:id="@+id/textView6"
         android:layout_width="wrap_content"
@@ -61,7 +65,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:text=""
+        android:text="@string/loading_data"
         app:layout_constraintEnd_toEndOf="@+id/txtEmail"
         app:layout_constraintStart_toStartOf="@+id/textView6"
         app:layout_constraintTop_toBottomOf="@+id/textView6"/>
@@ -81,7 +85,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:text=""
+        android:text="@string/loading_data"
         app:layout_constraintStart_toStartOf="@+id/txtDiagnosis"
         app:layout_constraintTop_toBottomOf="@+id/textView9"
         />

app/src/main/res/values/strings.xml

@@ -6,4 +6,5 @@
     <string name="profile_image">Profile Image</string>
     <string name="diagnosis">Diagnosis</string>
     <string name="goal">Goal</string>
+    <string name="loading_data">Loading data</string>
 </resources>