[smarcet] - #14574

* bug fixing

Author: smarcet

app/src/main/java/org/openstack/android/summit/common/DTOs/SummitDTO.java

@@ -78,6 +78,12 @@ public DateTime getLocalStartDate() {
         return new DateTime(getStartDate(), summitTimeZone);
     }
 
+    public DateTime getLocalStartShowingVenuesDate() {
+        if(this.startShowingVenuesDate == null) return null;
+        DateTimeZone summitTimeZone = DateTimeZone.forID(getTimeZone());
+        return new DateTime(this.startShowingVenuesDate, summitTimeZone);
+    }
+
     public DateTime getLocalEndDate() {
         DateTimeZone summitTimeZone = DateTimeZone.forID(getTimeZone());
         return new DateTime(getEndDate(), summitTimeZone);
@@ -112,6 +118,13 @@ public boolean isCurrentDateTimeInsideSummitRange() {
         return ( startDate.isBefore(currentLocal) || startDate.isEqual(currentLocal)) && ( endDate.isAfter(currentLocal) || endDate.isEqual(currentLocal));
     }
 
+    public boolean shouldShowVenues(){
+        DateTime currentLocal = getCurrentLocalTime();
+        DateTime startDate    = this.getLocalStartShowingVenuesDate();
+        if(startDate == null) return true;
+        return currentLocal.isAfter(startDate) || currentLocal.isEqual(startDate);
+    }
+
     public boolean isNotStarted(){
         DateTime currentLocal = getCurrentLocalTime().withTimeAtStartOfDay();
         DateTime startDate    = this.scheduleStartDate != null ?

app/src/main/java/org/openstack/android/summit/common/entities/VenueFloor.java

@@ -15,6 +15,7 @@ public class VenueFloor extends RealmObject implements INamedEntity {
     private String pictureUrl;
     private String description;
     private Venue venue;
+    private int number;
 
     public RealmList<VenueRoom> getRooms() {
         if(rooms == null) rooms = new RealmList<>();
@@ -25,7 +26,6 @@ public void setRooms(RealmList<VenueRoom> rooms) {
         this.rooms = rooms;
     }
 
-    private int number;
     private RealmList<VenueRoom> rooms = new RealmList<>();
 
     public String getPictureUrl() {

app/src/main/java/org/openstack/android/summit/modules/general_schedule_filter/business_logic/GeneralScheduleFilterInteractor.java

@@ -126,7 +126,6 @@ public boolean VenueIncludesAnyOfGivenRooms(int venueId, List<Integer> roomsIds)
                 if(roomsIds.contains(room.getId()))
                   return true;
             }
-
         }
         return false;
     }
@@ -150,13 +149,12 @@ public List<NamedDTO> getRoomsBelongingToVenue(int venueId, List<Integer> roomsI
         Venue venue = venueDataStore.getById(venueId);
         if(venue == null) return result;
 
-        List<VenueFloor> floors   = venue.getFloors();
+        List<VenueFloor> floors   = venue.getFloors().sort("number");
         for(VenueFloor floor: floors){
             for(VenueRoom  room: floor.getRooms()){
                 if(roomsIds.contains(room.getId()))
                     result.add(createDTO(room, NamedDTO.class));
             }
-
         }
 
         return result;
@@ -174,7 +172,7 @@ public List<NamedDTO> getRoomsForVenue(int venueId) {
         Venue venue = venueDataStore.getById(venueId);
         if(venue == null) return new ArrayList<>();
         List<NamedDTO> rooms = new ArrayList<>();
-        List<VenueFloor> floors   = venue.getFloors();
+        List<VenueFloor> floors   = venue.getFloors().sort("number");
         for(VenueFloor floor: floors){
             List<VenueRoom> results = floor.getRooms();
             List<NamedDTO> dtos = createDTOList(results, NamedDTO.class);

app/src/main/java/org/openstack/android/summit/modules/general_schedule_filter/user_interface/GeneralScheduleFilterFragment.java

@@ -49,9 +49,6 @@ public void onCreate(Bundle savedInstanceState) {
     @BindView(R.id.filter_track_groups_list)
     LinearListView trackGroupList;
 
-    @BindView(R.id.filter_venues_list)
-    LinearListView venuesList;
-
     @BindView(R.id.hide_past_talks)
     Switch hidePastTalks;
 
@@ -63,9 +60,16 @@ public void onCreate(Bundle savedInstanceState) {
 
     @BindView(R.id.hide_past_talks_header)
     LinearLayout pastTalksHeader;
+
     @BindView(R.id.hide_past_talks_container)
     LinearLayout pastTalksContainer;
 
+    @BindView(R.id.venues_header)
+    LinearLayout venuesHeader;
+
+    @BindView(R.id.filter_venues_list)
+    LinearListView venuesList;
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         view = inflater.inflate(R.layout.fragment_general_schedule_filter, container, false);
@@ -120,6 +124,12 @@ public void showShowPastTalks(boolean show) {
         pastTalksContainer.setVisibility(show ? View.VISIBLE : View.GONE);
     }
 
+    @Override
+    public void showVenuesFilter(boolean show) {
+        venuesHeader.setVisibility(show ? View.VISIBLE : View.GONE);
+        venuesList.setVisibility(show ? View.VISIBLE : View.GONE);
+    }
+
     @Override
     public void onResume() {
         super.onResume();

app/src/main/java/org/openstack/android/summit/modules/general_schedule_filter/user_interface/GeneralScheduleFilterPresenter.java

@@ -4,6 +4,7 @@
 import android.os.Bundle;
 
 import org.openstack.android.summit.common.DTOs.NamedDTO;
+import org.openstack.android.summit.common.DTOs.SummitDTO;
 import org.openstack.android.summit.common.DTOs.TrackDTO;
 import org.openstack.android.summit.common.DTOs.TrackGroupDTO;
 import org.openstack.android.summit.common.IScheduleFilter;
@@ -117,7 +118,7 @@ public void onCreateView(Bundle savedInstanceState) {
         view.showLevels(levels);
         view.showVenues(venues);
         view.showShowPastTalks(false);
-
+        view.showVenuesFilter(false);
     }
 
     @Override
@@ -261,15 +262,18 @@ public void onResume() {
         List<Boolean> filtersOnShowVideoTalks = (List<Boolean>) (List<?>) scheduleFilter.getSelections().get(FilterSectionType.ShowVideoTalks);
         boolean showVideoTalks = filtersOnShowVideoTalks != null && !filtersOnShowVideoTalks.isEmpty() ? filtersOnShowVideoTalks.get(0) : false;
         view.toggleShowVideoTalks(showVideoTalks);
+        SummitDTO activeSummit = interactor.getActiveSummit();
+        if (activeSummit != null ){
 
-        if (interactor.getActiveSummit() != null ){
-
-            if(interactor.getActiveSummit().isCurrentDateTimeInsideSummitRange()) {
+            if(activeSummit.isCurrentDateTimeInsideSummitRange()) {
                 view.showShowPastTalks(true);
                 List<Boolean> filtersOnPassTalks = (List<Boolean>) (List<?>) scheduleFilter.getSelections().get(FilterSectionType.HidePastTalks);
                 boolean hidePastTalks = filtersOnPassTalks != null && !filtersOnPassTalks.isEmpty() ? filtersOnPassTalks.get(0) : false;
                 view.toggleShowPastTalks(hidePastTalks);
             }
+            if(activeSummit.shouldShowVenues()){
+                view.showVenuesFilter(true);
+            }
         }
 
     }

app/src/main/java/org/openstack/android/summit/modules/general_schedule_filter/user_interface/IGeneralScheduleFilterView.java

@@ -25,5 +25,7 @@ public interface IGeneralScheduleFilterView extends IBaseView {
 
     void showShowPastTalks(boolean show);
 
+    void showVenuesFilter(boolean show);
+
     void toggleShowVideoTalks(boolean isChecked);
 }

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

@@ -92,7 +92,8 @@
                 android:id="@+id/filter_levels_list"
                 style="@style/AppTheme.FilterSectionList" />
 
-            <LinearLayout style="@style/AppTheme.SubsectionHeaderFilter">
+            <LinearLayout style="@style/AppTheme.SubsectionHeaderFilter"
+                android:id="@+id/venues_header">
                 <TextView
                     style="@style/AppTheme.SubsectionHeaderFilter.Text"
                     android:text="@string/venues"/>