Fixing Dossier medical

app/src/main/java/com/ensias/healthcareapp/ConsultationFragmentPage.java

@@ -48,7 +48,7 @@ private void setUpRecyclerView() {
 
  String email_id = getActivity().getIntent().getExtras().getString("patient_email");
  FicheRef = db.collection("Patient").document(email_id).collection("MyMedicalFolder");
- Query query = FicheRef.whereEqualTo("type", "Consultation").orderBy("dateCreated", Query.Direction.DESCENDING);
+ Query query = FicheRef.whereEqualTo("type", "Consultation");
 
  FirestoreRecyclerOptions<Fiche> options = new FirestoreRecyclerOptions.Builder<Fiche>()
  .setQuery(query, Fiche.class)

app/src/main/java/com/ensias/healthcareapp/DossierMedical.java

@@ -11,6 +11,7 @@
 import android.view.View;
 import android.widget.TextView;
 
+import com.ensias.healthcareapp.Common.Common;
 import com.ensias.healthcareapp.adapter.ConsultationFragmentAdapter;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;
@@ -38,6 +39,9 @@ public void onClick(View view) {
  openPatientFiche();
  }
  });
+ if(Common.CurrentUserType.equals("patient")){
+ createNewFicheButton.setVisibility(View.GONE);
+ }
 
 
  }

app/src/main/java/com/ensias/healthcareapp/Hospitalisation.java

@@ -46,9 +46,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
  return result;
  }
  private void setUpRecyclerView() {
-
- FicheRef = db.collection("Patient").document(FirebaseAuth.getInstance().getCurrentUser().getEmail().toString()).collection("MyMedicalFolder");
- Query query = FicheRef.whereEqualTo("type", "Consultation").orderBy("dateCreated", Query.Direction.DESCENDING);
+ String email_id = getActivity().getIntent().getExtras().getString("patient_email");
+ FicheRef = db.collection("Patient").document(email_id).collection("MyMedicalFolder");
+ Query query = FicheRef.whereEqualTo("type", "Hospitalisation");
 
  FirestoreRecyclerOptions<Fiche> options = new FirestoreRecyclerOptions.Builder<Fiche>()
  .setQuery(query, Fiche.class)

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<LinearLayout
+ android:orientation="vertical"
  xmlns:android="https://schemas.android.com/apk/res/android"
  xmlns:app="https://schemas.android.com/apk/res-auto"
  android:layout_width="match_parent"
@@ -14,28 +15,27 @@
  android:text="Select your appointement purpose"
  android:textSize="24sp" />
 
+ <ImageView
+ android:id="@+id/imageView"
+ android:layout_width="match_parent"
+ android:layout_height="170dp"
+ android:layout_marginTop="15dp"
+ android:alpha="0.7"
+ app:srcCompat="@drawable/medcal_logo" />
+
  <Spinner
  android:id="@+id/spinnerBooking"
  android:layout_width="299dp"
  android:layout_height="46dp"
 
  android:layout_marginStart="50dp"
  android:layout_marginLeft="50dp"
- android:layout_marginTop="350dp"
+ android:layout_marginTop="75dp"
  android:layout_marginEnd="62dp"
  android:layout_marginRight="62dp"
  android:layout_marginBottom="200dp"
  android:background="#ffffff"
  android:paddingLeft="20dp"
- android:prompt="@string/common_google_play_services_update_text"
  android:spinnerMode="dropdown" />
 
- <ImageView
- android:id="@+id/imageView"
- android:layout_width="match_parent"
- android:layout_height="170dp"
- android:layout_alignParentTop="true"
- android:layout_marginTop="120dp"
- android:alpha="0.7"
- app:srcCompat="@drawable/medcal_logo" />
-</RelativeLayout>
+</LinearLayout>