Reimproving dossier medical

YassineBOUJNAH · Jun 4, 2020 · b03cedd · b03cedd
1 parent 683ff32
commit b03cedd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 17 deletions.
diff --git a/app/src/main/java/com/ensias/healthcareapp/FicheActivity.java b/app/src/main/java/com/ensias/healthcareapp/FicheActivity.java
@@ -68,14 +68,16 @@ private void addFiche(){
  String descriptionFiche = description.getText().toString();
  String traitemenfiche = traitement.getText().toString();
  String typeFiche = ficheType.getSelectedItem().toString();
+
  String patient_name = getIntent().getStringExtra("patient_name");
  String patient_email = getIntent().getStringExtra("patient_email");
 
 
  CollectionReference ficheRef = FirebaseFirestore.getInstance().collection("Patient").document(""+patient_email+"")
  .collection("MyMedicalFolder");
- ficheRef.add(new Fiche(maladieFiche, descriptionFiche, traitemenfiche, typeFiche, FirebaseAuth.getInstance().getCurrentUser().getEmail().toString()));
- Toast.makeText(this, "Fiche added.", Toast.LENGTH_LONG).show();
+ ficheRef.document().set(new Fiche(maladieFiche, descriptionFiche, traitemenfiche, typeFiche, FirebaseAuth.getInstance().getCurrentUser().getEmail().toString()));
+ //ficheRef.add(new Fiche(maladieFiche, descriptionFiche, traitemenfiche, typeFiche, FirebaseAuth.getInstance().getCurrentUser().getEmail().toString()));
+ Toast.makeText(this, "Fiche added."+patient_name, Toast.LENGTH_LONG).show();
  finish();
  }
 

diff --git a/app/src/main/java/com/ensias/healthcareapp/adapter/ConsultationAdapter.java b/app/src/main/java/com/ensias/healthcareapp/adapter/ConsultationAdapter.java
@@ -33,7 +33,7 @@ public ConsultationAdapter(@NonNull FirestoreRecyclerOptions<Fiche> options) {
 
  @Override
  protected void onBindViewHolder(@NonNull FicheHolder holder, int position, @NonNull final Fiche model) {
- FirebaseFirestore.getInstance().document("Doctor/"+model.getDoctor()).get().addOnSuccessListener(new OnSuccessListener<DocumentSnapshot>() {
+ FirebaseFirestore.getInstance().document("Doctor/" + model.getDoctor()).get().addOnSuccessListener(new OnSuccessListener<DocumentSnapshot>() {
  @Override
  public void onSuccess(DocumentSnapshot documentSnapshot) {
  holder.doctor_name.setText(documentSnapshot.getString("name"));
@@ -43,16 +43,19 @@ public void onSuccess(DocumentSnapshot documentSnapshot) {
  holder.btn.setOnClickListener(new View.OnClickListener() {
  @Override
  public void onClick(View v) {
- openPage(v.getContext(),model);
+ openPage(v.getContext(), model);
  }
  });
- String[] date ;
- date = model.getDateCreated().toString().split(" ");
- // Thu Jun 04 14:46:12 GMT+01:00 2020
- holder.appointement_day_name.setText(date[0]);
- holder.appointement_day.setText(date[2]);
- holder.appointement_month.setText(date[1]);
- holder.doctor_view_title.setText(date[3]);
+ String[] date;
+ if (model.getDateCreated() != null) {
+
+ date = model.getDateCreated().toString().split(" ");
+ // Thu Jun 04 14:46:12 GMT+01:00 2020
+ holder.appointement_day_name.setText(date[0]);
+ holder.appointement_day.setText(date[2]);
+ holder.appointement_month.setText(date[1]);
+ holder.doctor_view_title.setText(date[3]);
+ }
  }
 
  private void openPage(Context wf,Fiche m){

diff --git a/app/src/main/java/com/ensias/healthcareapp/adapter/HospitalisationAdapter.java b/app/src/main/java/com/ensias/healthcareapp/adapter/HospitalisationAdapter.java
@@ -46,12 +46,14 @@ public void onClick(View v) {
  }
  });
  String[] date ;
- date = model.getDateCreated().toString().split(" ");
- // Thu Jun 04 14:46:12 GMT+01:00 2020
- holder.appointement_day_name.setText(date[0]);
- holder.appointement_day.setText(date[2]);
- holder.appointement_month.setText(date[1]);
- holder.doctor_view_title.setText(date[3]);
+ if(model.getDateCreated() != null) {
+ date = model.getDateCreated().toString().split(" ");
+ // Thu Jun 04 14:46:12 GMT+01:00 2020
+ holder.appointement_day_name.setText(date[0]);
+ holder.appointement_day.setText(date[2]);
+ holder.appointement_month.setText(date[1]);
+ holder.doctor_view_title.setText(date[3]);
+ }
 
  }