diff options
author | Andy Doan <andy.doan@linaro.org> | 2011-10-25 15:25:25 -0500 |
---|---|---|
committer | Andy Doan <andy.doan@linaro.org> | 2011-10-25 15:25:25 -0500 |
commit | cdca8eaf52685410863492b1f24dd494067d3574 (patch) | |
tree | b53ea3464bb48aa362db5608d451a987c17f1fec | |
parent | f614968c8863faa022898b51ebfbfb606e1d5fe3 (diff) | |
download | LinaroConnect-cdca8eaf52685410863492b1f24dd494067d3574.tar.gz |
add ability to display schedules by room
-rw-r--r-- | src/org/linaro/connect/ScheduleActivity.java | 3 | ||||
-rw-r--r-- | src/org/linaro/connect/sched/ScheduleItem.java | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/org/linaro/connect/ScheduleActivity.java b/src/org/linaro/connect/ScheduleActivity.java index bf3d624..ac68232 100644 --- a/src/org/linaro/connect/ScheduleActivity.java +++ b/src/org/linaro/connect/ScheduleActivity.java @@ -81,7 +81,8 @@ public class ScheduleActivity extends Activity { String day = uri.getQueryParameter("day"); String track = uri.getQueryParameter("track"); - mFilter = new ScheduleItem.Filter(day, track); + String location = uri.getQueryParameter("location"); + mFilter = new ScheduleItem.Filter(day, track, location); String url = getIntent().getDataString(); int idx = url.indexOf('?'); diff --git a/src/org/linaro/connect/sched/ScheduleItem.java b/src/org/linaro/connect/sched/ScheduleItem.java index 9a4ab57..e4f8d7c 100644 --- a/src/org/linaro/connect/sched/ScheduleItem.java +++ b/src/org/linaro/connect/sched/ScheduleItem.java @@ -114,6 +114,9 @@ public class ScheduleItem implements Serializable { } } + if( matches && f.location != null ) + matches = f.location.equals(getLocation()); + return matches; } @@ -163,10 +166,12 @@ public class ScheduleItem implements Serializable { public static class Filter { int dayOfWeek = -1; String track = null; + String location = null; - public Filter(String day, String track) { + public Filter(String day, String track, String location) { dayOfWeek = getDayOfWeek(day); this.track = track; + this.location = location; } } |