show next schedules; pull to refresh

app/src/main/java/com/rthoni/stssaguenay/business/SchedulesBusiness.java

@@ -2,7 +2,11 @@ package com.rthoni.stssaguenay.business;
 
 import com.luticate.utils.business.LuPromise;
 import com.luticate.utils.dbo.LuDataAccessConfigDbo;
+import com.rthoni.stssaguenay.dataaccess.SchedulesDataAccess;
 import com.rthoni.stssaguenay.dbo.FavouriteStopDbo;
+import com.rthoni.stssaguenay.dbo.SchedulesDbo;
+
+import org.joda.time.LocalDateTime;
 
 import java.util.List;
 
@@ -12,8 +16,8 @@ import java.util.List;
 
 public class SchedulesBusiness {
 
-//    public static LuPromise<List> getMultiple(LuDataAccessConfigDbo config, List<FavouriteStopDbo> favouriteStopDbos)
-//    {
-//
-//    }
+    public static LuPromise<List<SchedulesDbo>> getMultiple(LuDataAccessConfigDbo config, List<FavouriteStopDbo> favouriteStopDbos, LocalDateTime date, int count)
+    {
+        return SchedulesDataAccess.getMultiple(config, favouriteStopDbos, date, count);
+    }
 }

app/src/main/java/com/rthoni/stssaguenay/dataaccess/SchedulesDataAccess.java

@@ -4,7 +4,15 @@ import com.luticate.utils.business.LuPromise;
 import com.luticate.utils.business.LuRequest;
 import com.luticate.utils.dbo.LuDataAccessConfigDbo;
 import com.rthoni.stssaguenay.dbo.FavouriteStopDbo;
+import com.rthoni.stssaguenay.dbo.RoutesDbo;
+import com.rthoni.stssaguenay.dbo.SchedulesDbo;
 
+import org.joda.time.LocalDateTime;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -13,8 +21,32 @@ import java.util.List;
 
 public class SchedulesDataAccess {
 
-//    public static LuPromise<List> getMultiple(LuDataAccessConfigDbo config, List<FavouriteStopDbo> favouriteStopDbos)
-//    {
-//        return LuRequest.post(config, )
-//    }
+    public static LuPromise<List<SchedulesDbo>> getMultiple(LuDataAccessConfigDbo config, List<FavouriteStopDbo> favouriteStopDbos, LocalDateTime date, int count)
+    {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("count", Integer.toString(count));
+        map.put("date", JSONObject.quote(date.toString("y-M-d HH:mm:ss")));
+
+        JSONArray stops = new JSONArray();
+        for (FavouriteStopDbo dbo : favouriteStopDbos) {
+            for (RoutesDbo routesDbo : dbo.getRoutes()) {
+                JSONObject obj = new JSONObject();
+                try {
+                    obj.put("stopId", dbo.getStop().getId());
+                    obj.put("routeId", routesDbo.getId());
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+                stops.put(obj);
+            }
+        }
+        map.put("stops", stops.toString());
+
+        return LuRequest.post(config, SchedulesDbo.SchedulesDboArray.class, "schedules/multiple", map).map(new LuPromise.LuConverter<SchedulesDbo.SchedulesDboArray, List<SchedulesDbo>>() {
+            @Override
+            public List<SchedulesDbo> convert(SchedulesDbo.SchedulesDboArray data) {
+                return data.getData();
+            }
+        });
+    }
 }

app/src/main/java/com/rthoni/stssaguenay/dbo/SchedulesDbo.java

@@ -1,13 +1,19 @@
 package com.rthoni.stssaguenay.dbo;
 
 import com.luticate.utils.dbo.LuDbo;
+import com.luticate.utils.dbo.LuPaginatedDbo;
 
+import org.joda.time.LocalDateTime;
 import org.joda.time.LocalTime;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Vector;
 
 /**
  * Created by robin on 10/1/16.
@@ -15,19 +21,53 @@ import java.util.List;
 
 public class SchedulesDbo extends LuDbo {
 
+    public static class SchedulesDboArray extends LuPaginatedDbo<SchedulesDbo>
+    {
+    }
+
     protected String _stopId;
 
     protected String _routeId;
 
-    protected List<LocalTime> _schedules;
+    protected List<LocalDateTime> _schedules;
 
     @Override
     public void fromJson(JSONObject json) throws JSONException {
-
+        _stopId = json.getString("stopId");
+        _routeId = json.getString("routeId");
+        _schedules = new Vector<>();
+        JSONArray schedules = json.getJSONArray("schedules");
+        for (int i = 0; i < schedules.length(); ++i) {
+            _schedules.add(LocalDateTime.parse(schedules.getString(i), DateTimeFormat.forPattern("y-M-d H:m:s")));
+        }
     }
 
     @Override
     public HashMap<String, Object> toArray() {
         return null;
     }
+
+    public String getStopId() {
+        return _stopId;
+    }
+
+    public void setStopId(String stopId) {
+        _stopId = stopId;
+    }
+
+    public String getRouteId() {
+        return _routeId;
+    }
+
+    public void setRouteId(String routeId) {
+        _routeId = routeId;
+    }
+
+    public List<LocalDateTime> getSchedules() {
+        return _schedules;
+    }
+
+    public void setSchedules(List<LocalDateTime> schedules) {
+        _schedules = schedules;
+    }
 }

app/src/main/java/com/rthoni/stssaguenay/ui/fragments/HomeFragment.java

@@ -4,6 +4,7 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
+import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -13,11 +14,25 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.luticate.utils.business.LuPromise;
 import com.rthoni.stssaguenay.R;
 import com.rthoni.stssaguenay.business.STSBusiness;
+import com.rthoni.stssaguenay.business.SchedulesBusiness;
 import com.rthoni.stssaguenay.dbo.FavouriteStopDbo;
-
+import com.rthoni.stssaguenay.dbo.SchedulesDbo;
+
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.joda.time.LocalDateTime;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
+import java.util.TimeZone;
 import java.util.Vector;
 
 import butterknife.BindView;
@@ -31,11 +46,15 @@ public class HomeFragment extends Fragment {
     @BindView(R.id.listFavouritesStops)
     RecyclerView _favouritesStopsList;
 
+    @BindView(R.id.swipeContainer)
+    SwipeRefreshLayout _swipeRefreshLayout;
+
     FavouriteStopsAdapter _adapter;
 
     public static class ViewHolder extends RecyclerView.ViewHolder {
         public View _parentView;
         public TextView _textView;
+        public TextView _textView2;
         public ViewHolder(View v) {
             super(v);
             _parentView = v;
@@ -46,12 +65,15 @@ public class HomeFragment extends Fragment {
 
         private List<FavouriteStopDbo> _favourites;
 
+        private List<SchedulesDbo> _schedules;
+
         @Override
         public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
             View v = LayoutInflater.from(parent.getContext())
                     .inflate(R.layout.favourite_stop_recycler_view_item, parent, false);
             ViewHolder vh = new ViewHolder(v);
             vh._textView = (TextView) v.findViewById(R.id.textView);
+            vh._textView2 = (TextView) v.findViewById(R.id.textView2);
             return vh;
         }
 
@@ -72,6 +94,32 @@ public class HomeFragment extends Fragment {
                     return true;
                 }
             });
+
+            if (_schedules != null) {
+                List<LocalDateTime> schedules = new Vector<>();
+                for (SchedulesDbo schedule : _schedules) {
+                    if (schedule.getStopId().equals(favouriteStopDbo.getStop().getId())) {
+                        schedules.addAll(schedule.getSchedules());
+                    }
+                }
+
+                Collections.sort(schedules);
+                schedules.size();
+
+                StringBuilder text = new StringBuilder();
+
+                for (int i = 0; i < Math.min(5, schedules.size()); ++i) {
+                    if (i > 0) {
+                        text.append(", ");
+                    }
+                    text.append(schedules.get(i).toString("HH:mm"));
+                }
+
+                holder._textView2.setText(text.toString());
+            }
+            else {
+                holder._textView2.setText(R.string.loading_schedules);
+            }
         }
 
         @Override
@@ -81,6 +129,20 @@ public class HomeFragment extends Fragment {
 
         public void setFavourites(List<FavouriteStopDbo> favourites) {
             _favourites = favourites;
+            _schedules = null;
+            notifyDataSetChanged();
+        }
+
+        public List<FavouriteStopDbo> getFavourites() {
+            return _favourites;
+        }
+
+        public List<SchedulesDbo> getSchedules() {
+            return _schedules;
+        }
+
+        public void setSchedules(List<SchedulesDbo> schedules) {
+            _schedules = schedules;
             notifyDataSetChanged();
         }
     }
@@ -95,6 +157,13 @@ public class HomeFragment extends Fragment {
         _favouritesStopsList.setAdapter(_adapter);
         _favouritesStopsList.setLayoutManager(new LinearLayoutManager(getContext()));
 
+        _swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                loadSchedules();
+            }
+        });
+
         loadFavourites();
 
         return v;
@@ -104,6 +173,7 @@ public class HomeFragment extends Fragment {
     {
         List<FavouriteStopDbo> favourites = STSBusiness.getFavouriteStops(getContext());
         _adapter.setFavourites(favourites);
+        loadSchedules();
     }
 
     public void onFavouriteClicked(FavouriteStopDbo favouriteStopDbo)
@@ -121,12 +191,8 @@ public class HomeFragment extends Fragment {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
 
-                        List<FavouriteStopDbo> favouriteStopDbos = STSBusiness.getFavouriteStops(getContext());
-                        for (int i = 0; i < favouriteStopDbos.size(); ++i) {
-                            if (favouriteStopDbos.get(i).getStop().getId().equals(favouriteStopDbo.getStop().getId())) {
-                                favouriteStopDbos.remove(i--);
-                            }
-                        }
+                        List<FavouriteStopDbo> favouriteStopDbos = _adapter.getFavourites();
+                        favouriteStopDbos.remove(favouriteStopDbo);
                         STSBusiness.setFavouriteStops(getContext(), favouriteStopDbos);
 
                         Toast.makeText(getContext(), getString(R.string.favourite_removed, favouriteStopDbo.getStop().getFullName()), Toast.LENGTH_LONG).show();
@@ -137,4 +203,27 @@ public class HomeFragment extends Fragment {
                 .setNegativeButton(android.R.string.no, null)
                 .show();
     }
+
+    public void loadSchedules()
+    {
+        _swipeRefreshLayout.setRefreshing(true);
+        _adapter.setSchedules(null);
+        DateTimeZone dtz = DateTimeZone.forOffsetMillis(TimeZone.getDefault().getRawOffset() + TimeZone.getDefault().getDSTSavings());
+        LocalDateTime date = LocalDateTime.now(dtz).plusMinutes(-30);
+
+        SchedulesBusiness.getMultiple(STSBusiness.getConfig(), _adapter.getFavourites(), date, 10)
+                .then(new LuPromise.LuConsumer<List<SchedulesDbo>>() {
+                    @Override
+                    public void execute(List<SchedulesDbo> data) {
+                        _adapter.setSchedules(data);
+                        _swipeRefreshLayout.setRefreshing(false);
+                    }
+                }, new LuPromise.LuConsumer<LuPromise.LuPromiseError>() {
+                    @Override
+                    public void execute(LuPromise.LuPromiseError data) {
+                        _swipeRefreshLayout.setRefreshing(false);
+                        //TODO
+                    }
+                });
+    }
 }

app/src/main/java/com/rthoni/stssaguenay/ui/fragments/StopPickerFragment.java

@@ -172,6 +172,7 @@ public class StopPickerFragment extends Fragment {
     {
         final ProgressDialog progressDialog = new ProgressDialog(getContext());
         progressDialog.setIndeterminate(true);
+        progressDialog.setCancelable(false);
         progressDialog.show();
         progressDialog.setTitle(R.string.loading);
         progressDialog.setMessage(getString(R.string.loading_stops));

app/src/main/java/com/rthoni/stssaguenay/ui/fragments/StopRoutesPickerFragment.java

@@ -151,6 +151,7 @@ public class StopRoutesPickerFragment extends Fragment {
     {
         final ProgressDialog progressDialog = new ProgressDialog(getContext());
         progressDialog.setIndeterminate(true);
+        progressDialog.setCancelable(false);
         progressDialog.show();
         progressDialog.setTitle(R.string.loading);
         progressDialog.setMessage(getString(R.string.loading_routes));

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

@@ -15,14 +15,22 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"/>
 
-    <android.support.v7.widget.RecyclerView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/listFavouritesStops"
+    <android.support.v4.widget.SwipeRefreshLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/swipeContainer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_below="@+id/textView"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"/>
+        android:layout_alignParentBottom="true">
+
+        <android.support.v7.widget.RecyclerView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/listFavouritesStops"/>
+
+    </android.support.v4.widget.SwipeRefreshLayout>
 </RelativeLayout>