completed habit filtering

Author: nbhuiyan

app/src/main/java/com/cmput301f17t11/cupofjava/Models/Habit.java

@@ -90,6 +90,16 @@ public Habit(String title, String reason, Calendar date, ArrayList<Integer> days
      */
     public Habit(){}
 
+    /**
+     * for creating dummy habit for spinner
+     * @param title
+     * @param reason
+     */
+    public Habit(String title, String reason){
+        this.habitTitle = title;
+        this.habitReason = reason;
+    }
+
     /**
      * Gets the habit title.
      *
@@ -249,7 +259,7 @@ public int getHabitStatus(){
 
     @Override
     public String toString(){ //this gets called by array adapter
-        return ("What: " + this.habitTitle + "\n"
-                + "Why: " + this.habitReason);
+        return (this.habitTitle + "\n"
+                + this.habitReason);
     }
 }

app/src/main/java/com/cmput301f17t11/cupofjava/Views/HabitEventTimeLineActivity.java

@@ -29,16 +29,20 @@
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ListView;
+import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.cmput301f17t11.cupofjava.Controllers.ElasticsearchController;
 import com.cmput301f17t11.cupofjava.Controllers.EventFilteringHelper;
 
+import com.cmput301f17t11.cupofjava.Models.Habit;
+import com.cmput301f17t11.cupofjava.Models.HabitAdapter;
 import com.cmput301f17t11.cupofjava.Models.HabitEvent;
 import com.cmput301f17t11.cupofjava.R;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Collections;
 import java.util.Comparator;
 
@@ -176,6 +180,62 @@ public void onClick(DialogInterface dialog, int which) {
                 dialog.show();
             }
         });
+        ArrayList<Habit> habits;
+        ElasticsearchController.GetHabitsTask getHabitsTask = new ElasticsearchController.GetHabitsTask();
+        getHabitsTask.execute(userName);
+        try {
+            habits = getHabitsTask.get();
+        } catch (Exception e) {
+            Log.i("Error Getting Habits ", e.toString());
+            habits = new ArrayList<>();
+        }
+        final Spinner spinner = (Spinner) view.findViewById(R.id.filter_by_habit);
+        ArrayAdapter<Habit> arrayAdapter = new ArrayAdapter<Habit>(getActivity(),
+                R.layout.string_only_list_item);
+
+        final Habit emptyHabit = new Habit("Select", "to filter by habit");
+        arrayAdapter.add(emptyHabit);
+        arrayAdapter.addAll(habits);
+        spinner.setAdapter(arrayAdapter);
+
+        spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                Habit selectedHabit = (Habit) spinner.getSelectedItem();
+                if (selectedHabit.getHabitTitle().equals(emptyHabit.getHabitTitle())){
+                    return;
+                }
+                String habitTitle = selectedHabit.getHabitTitle();
+                events = new ArrayList<>();
+                ElasticsearchController.GetEventsTask getEventsTask = new ElasticsearchController.GetEventsTask();
+                getEventsTask.execute(userName);
+                try {
+                    ArrayList<HabitEvent> foundHabitEvents = getEventsTask.get();
+                    if (!foundHabitEvents.isEmpty()) {
+
+                        events.addAll(foundHabitEvents);
+                        Log.i("HabitEventTimeline: found events :", events.toString());
+                    } else {
+                        Log.i("HabitEventTimeline", "Did Not find habit events" + events.toString());
+
+                    }
+                } catch (Exception e) {
+                    Log.i("HabitEventTimeline", "Failed to get the Habit Events from the async object");
+
+                }
+
+                events = EventFilteringHelper.filterByType(events, habitTitle);
+                events = EventFilteringHelper.reverseChronological(events);
+                updateTextView(events.size());
+                updateListView(events);
+
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
+        });
 
 
         return view;
@@ -279,8 +339,6 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
                     }
                     bundle.putBoolean("hasImage", myEvent.hasImage());
                     bundle.putString("eventId", myEvent.getId());
-                    //bundle.putSerializable("eventClicked", events); //sending habitEventlist
-                    //bundle.putInt("eventIndex", position);
 
                     intent5.putExtras(bundle);
                     startActivity(intent5);
@@ -326,7 +384,6 @@ public void onDetach() {
 
 
     public void mapsAll(int type ){
-//        Log.i("List of event Loc", events.get(0).getLocation().toString());
         Intent intent = new Intent(getActivity(), MapsActivity.class);
         Bundle bundle = new Bundle();
 
@@ -373,13 +430,4 @@ public interface OnFragmentInteractionListener {
         // TODO: Update argument type and name
         void onFragmentInteraction(Uri uri);
     }
-
-    public ArrayList<HabitEvent> filterByTime(ArrayList<HabitEvent> events) {
-        Collections.sort(events, new Comparator<HabitEvent>() {
-            public int compare(HabitEvent o1, HabitEvent o2) {
-                return o1.getHabitEventTime().compareTo(o2.getHabitEventTime());
-            }
-        });
-        return events;
-    }
 }

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

@@ -77,22 +77,16 @@
                 android:orientation="horizontal">
 
                 <android.support.v7.widget.AppCompatSpinner
-                    android:id="@+id/Filter_by_habit"
+                    android:id="@+id/filter_by_habit"
                     style="@android:style/Widget.Holo.Light.Spinner"
-                    android:layout_width="251dp"
-                    android:layout_height="48dp"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginBottom="8dp"
+                    android:layout_width="253dp"
+                    android:layout_height="wrap_content"
                     android:layout_marginLeft="16dp"
                     android:layout_marginRight="16dp"
-                    android:layout_weight="1"
+                    android:layout_marginTop="32dp"
                     android:backgroundTint="@color/colorAccentL"
-                    android:contentDescription="Select Habit"
-                    android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
-                    android:popupBackground="@drawable/common_google_signin_btn_icon_light"
-                    android:prompt="@id/Filter_by_habit"
-                    android:text="BY HABIT"/>
+                    android:spinnerMode="dropdown">
+                </android.support.v7.widget.AppCompatSpinner>
 
                 <Button
                     android:id="@+id/viewMapButton"
@@ -104,7 +98,7 @@
                     android:layout_marginBottom="4dp"
                     android:layout_marginRight="4dp"
                     android:layout_marginTop="8dp"
-                    android:text="MAP" />
+                    android:text="MAP"/>
             </LinearLayout>
 
             <ListView