Release/v5.0.78+1878 (#3803)

dobromirdobrev · TodorBachvarov · roberlander2 · web-flow · commit 6745f3b1d566 · 2023-10-10T08:54:56.000-05:00
* Hide Laundry location button even if it's location is valid [#1674] * Rename Attendee List to Registrants in Event2AttendanceDetailPanel [#3647] * Groups load upcoming events [#3645] * sync plugin * Fix typo. Rename Chineese to Chinese [#3646] * Version: 5.0.56+1856 * start improving survey preview [#3581] * override survey preview popup message [#3581] * Sync plugin. * Merge string.en.json [#3665] * Merge string.zh.json [#3665] * Add missing entries from strings.en.json [#3665] * Update CHANGELOG.md [#3665] * Show assistance tab depending on group membership for "Assistant" * Remove description from Attendance panels * Implement new Mobile access flow for requesting mobile credentials. [#3651] * Update CHANGELOG.md [#3651] * Version: 5.0.57+1857 * Acknowledge the new model for mobile id credentials from Identity BB [#3679] * Load mobile access details after successful device registration [#3679] * Read delete timout from config [#3679] * Update CHANGELOG.md [#3679] * Change To-Do item header title [#3677] * Update CHANGELOG.md [#3677] * sync plugin * keep content.attributes consistent with the ContentBB content * version: 5.0.58+1858 * Rename "i-card" to "Illini ID" [#3685] * Update CHANGELOG.md [#3685] * Do not show Illini ID FAQs for users that are not allowed to have Mobile Access [#3687] * Update CHANGELOG.md [#3687] * Fix wording for team roster and staff [#3682] * Update CHANGELOG.md [#3682] * Events Feed renamed to All Events [#3690] * Added dialog prompt to Star an event after successful registration [#3692] * Removed members selection when Create/Add event to group [#3672] * update changelog * version: 5.0.59+1859 * Hide Illini ID FAQs for all [#3696] * Update CHANGELOG.md [#3696] * Show Mobile Access based on mobile id status from studentid API [#3698] * Update CHANGELOG.md [#3698] * Remove warning. * - Bring back dialog for adding event to multiple groups that user is admin of [#3695] * - Group events load private events for group members[#3674] * remove hardcoded test message * version: 5.0.60+1860 * hook EventSelector.finishSelection * Event2CreatePanel update attendance description [#3702] * Acknowledge location description when presenting event locations [#3510]. * version: 5.0.61+1861 * Display right number of registrations [#3671]. * Update texts for Attendance panels * Update Texts for Event registration panel * Highlight Attendees count when their count reaches or exceeds event capacity [#3671]. * Show Guest List in Registration Panel * update changelog.md * Do not allow register button if event capacity is filled, display proper info status in this case [#3671]. * Updated CHANGELOG.md [#3671]. * version: 5.0.62+1862 * SavedPanel: load events from events/lite (includes private events) * Fix android studio INTERPRETER_PATH to use Mac OS path * Display game events date time in local time zone - 3.1 [#3714] * Show "Past" and "Upcoming" games based on the event day/time until midnight local time - 3.2 [#3714] * Show only participants in the Registration Panel guest list [#3678+] * Update CHANGELOG.md [#3714] * Version: 5.0.63+1863 * Fixed DSYM upload for Firebase Crashlytics on iOS. * Replace & with 'and' for event Categories * replace & with 'and' for group categories * replace & with 'and' for event sub category 'category' field * Display event2 time in local timezone [#3718] * Sync plugin [#3718] * Use local timezone for events time [#3718] * Update CHANGELOG.md [#3718] * Tidy source code [#3718]. * Tidy source code [#3718]. * Sync plugin [rokwire/app-flutter-plugin#377]. * Version: 5.0.64+1864 * Upgrade to connectivity_plus plugin [#rokmetro/vogue-app/issues/45). * Android: Update HID / Origo sdk to latest 1.9.1 version [#3725] * Update CHANGELOG.md [#3725] * iOS: update HID / Origo sdk to the latest 1.10.0 [#3727] * Update CHANGELOG.md [#3727] * Display registration type in attendees list [#3722]. * Load live games based on local timezone. [#3729] * Update CHANGELOG.md [#3729] * Play sound when adding attendee [#3722]. * Updated CHANGELOG.md [#3722]. * Version: 5.0.65+1865 * Show "am/pm" in lower case [#3735] * Show display date time formatted in the game [#3735] * Update CHANGELOG.md [#3735] * Sync plugin. * Do not show "Event Attendance" when modifying event. It is not acknolwedged from the backend [#3656] * Sync plugin. * Do not allow adding additional attendance taker if one's netid is in the registrant list [#3656] * Update CHANGELOG.md [#3656] * Version: 5.0.66+1866 * Do not show Register button until we are sure that registration is available for the event [#3671]. * Undo do not show "Event Attendance" when modifying event [#3656]. * Undo do not allow adding additional attendance taker if one's netid is in the registrant list [#3656]. * Updated CHANGELOG.md [#3656]. * version: 5.0.67+1867 * Updated plugin [#3743]. * Updated CHANGELOG.md [#3743]. * Do not show additional attendance takers edit when creating/updating event [#3656]. * Add event selector to AthleticsGameDetailPanel * update CHANGELOG * fix warning * version: 5.0.68+1868 * allow editing of event survey from bottom modal only if event has attendance details set * update changelog * fix typo, fix event survey refresh * Submit updated strings.zh.json [#3749] * Add missing key-value pairs [#3749] * Update CHANGELOG.md [#3749] * Tuned refreshing of event detail [#3723]. * sync assets/extra/content.attributes.json with latest on bb [#3749] * version: 5.0.69+1869 * Plugin version 1.5.0 * SECURITY.md version 5.0.69 * better handling of event survey update errors * pop to the details panel if survey creation fails after event creation * Sync plugin. * Updated CHANGELOG.md [rokwire/app-flutter-plugin#381]. * App version 5.0.70, Plugin version 1.5.1 * Acknowledge the new service APIs for the new /group/events/v3 backend APIs [#3733]. * Updated attendance taking message [#3762]. * Acknowledge 'can_renew_mobileid' value from studentid endpoint [#3763] * Check for invalid attendance takers before updating event attendance [#3762]. * Updated CHANGELOG.md [#3762]. * Show "Pending" / "Issuing" label based on the mobile id status that Identity BB returns [#3763] * Bring back "Renew" mobile id button. Show it based on the response from the /studentid API [#3763] * Implement "Renew" mobile access button. [#3763] * Update CHANGELOG.md [#3763] * Version: 5.0.71+1871 * Fixed unused import warnings. * Show progress indicator in GroupAllEventsPanel [#3733]. * Updated CHANGELOG.md [#3733]. * App version 5.0.72+1872 / Plugin version: 1.5.2 * Check if attendee candidate is registered for an event before registering it [#3722]. * Check if maual attendee is already added before adding it [#3722]. * Added a marker for checking if scanned attendee is already added before adding it [#3722]. * Added methods for capacity check and prompt, commented for now [#3722]. * Update strings.en.json file [#3770] * Change "Self Registered" to "Self-Registered" - 5.2 [#3770] * Update CHANGELOG.md [#3770] * Check for scanned attendees if they are already registered [#3722]. * Check for event capacity reached [#3722]. * Updated CHANGELOG.md [#3722]. * App version 5.0.73+1873 / Plugin version 1.5.3 * Acknowledge selected and highlighted states when guest list item is disabled [#3722]. * version: 5.0.74+1874 * version: 5.0.74+1874 / SECURITY.md * Improve Accessibility for Event2CreatePanel * Replace ampersand "&" with "and" [#3780] * Update CHANGELOG.md [#3780] * Update group privacy message * Update changelog * Version: 5.0.75+1875 * Sync plugin [#3781] * Get rid of Onboarding2.loginAccountScope as this is the default login scope now [#3781]. * Sync plugin [#3781]. * Implement paging for group events. Show correct number for events [#3790] * Update CHANGELOG.md [#3790] * Version: 5.0.76+1876 * Commit missed Podfile.lock file after plugin version change. * Update SECURITY.md with the latest app version. * Update SECURITY.md to set proper version. * Event2DetailPanel update follow up survey message [#3788] * Fix message * Fix DeviceCalendar add to calendar functionality [#3789] * update Settings title "My Calendar Settings" to "Add to My Device's Calendar" * Removed "My" section from Browse panel, "My Athletics" and "My News" moved to "Athletics" section, most of the Athletics section entries renamed [#3787]. * version: 5.0.77+1877 * Implement paging for linked events in Event2DetailPanel [#3790] * Update CHANGELOG.md [#3790] * Version: 5.0.78+1878 --------- Co-authored-by: Todor Bachvarov <tobachvarov@gmail.com> Co-authored-by: Ryan Oberlander <reoberlander2@gmail.com> Co-authored-by: Mihail Varbanov <mihail.varbanov@inabyte.com> Co-authored-by: Mihail Varbanov <misho@inabyte.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [5.0.78] - 2023-10-10
+### Fixed
+- Showing all sub-events in Events2DetailPanel [#3790](https://github.com/rokwire/illinois-app/issues/3790).
+
 ## [5.0.77] - 2023-10-09
 ### Changed
 - Event2DetailPanel update follow up survey message [#3788](https://github.com/rokwire/illinois-app/issues/3788).
diff --git a/SECURITY.md b/SECURITY.md
@@ -6,8 +6,8 @@ Patches for [ **illinois-app** ] will only be applied to the following versions:
 
 | Version  | Supported |
 |----------| ------------------ |
-| 5.0.77   | :white_check_mark: |
-| < 5.0.77 | :x: |
+| 5.0.78   | :white_check_mark: |
+| < 5.0.78 | :x: |
 | 4.3.61   | :white_check_mark: |
 | < 4.3.61 | :x: |
 | 4.2.52   | :white_check_mark: |
diff --git a/lib/ui/events2/Event2DetailPanel.dart b/lib/ui/events2/Event2DetailPanel.dart
@@ -65,9 +65,17 @@ class _Event2DetailPanelState extends State<Event2DetailPanel> implements Notifi
   Survey? _survey;
   bool? _hasSurveyResponse;
   Event2PersonsResult? _persons;
-  List<Event2>? _linkedEvents;
   Event2? _superEvent;
 
+  List<Event2>? _linkedEvents;
+  bool _linkedEventsLoading = false;
+  int? _totalLinkedEventsCount;
+  bool _extendingLinkedEvents = false;
+  bool? _lastPageLoadedAllLinkedEvents;
+  static const int _linkedEventsPageLength = 20;
+
+  ScrollController _scrollController = ScrollController();
+
   // Keep a copy of the user position in the State because it gets cleared somehow in the widget
   // when sending the appliction to background in iOS.
   Position? _userLocation;
@@ -76,7 +84,6 @@ class _Event2DetailPanelState extends State<Event2DetailPanel> implements Notifi
   bool _registrationLoading = false;
   bool _eventLoading = false;
   bool _eventProcessing = false;
-  bool _linkedEventsLoading = false;
   bool _registrationLaunching = false;
   bool _websiteLaunching = false;
   bool _onlineLaunching = false;
@@ -90,6 +97,7 @@ class _Event2DetailPanelState extends State<Event2DetailPanel> implements Notifi
       Auth2.notifyLoginChanged,
       Events2.notifyUpdated,
     ]);
+    _scrollController.addListener(_scrollListener);
     _event = widget.event;
     _superEvent = widget.superEvent;
     _survey = widget.survey;
@@ -149,7 +157,7 @@ class _Event2DetailPanelState extends State<Event2DetailPanel> implements Notifi
 
   Widget get _eventContent =>
   RefreshIndicator(onRefresh: _refreshEvent, child:
-    CustomScrollView(slivers: <Widget>[
+    CustomScrollView(controller: _scrollController, slivers: <Widget>[
       SliverToutHeaderBar(
         title: _event?.name,
         flexImageUrl:  _event?.imageUrl,
@@ -683,6 +691,9 @@ class _Event2DetailPanelState extends State<Event2DetailPanel> implements Notifi
           ));
         }
       }
+      if (_extendingLinkedEvents) {
+        cardWidgets.add(Padding(padding: EdgeInsets.only(top: cardWidgets.isNotEmpty ? 8 : 0), child: _extendingLinkedEventsIndicator));
+      }
     }
     if (cardWidgets.isEmpty) {
       String? message;
@@ -715,6 +726,15 @@ class _Event2DetailPanelState extends State<Event2DetailPanel> implements Notifi
     )
   );
 
+  Widget get _extendingLinkedEventsIndicator => Container(
+      padding: EdgeInsets.symmetric(horizontal: 16, vertical: 32),
+      child: Align(
+          alignment: Alignment.center,
+          child: SizedBox(
+              width: 24,
+              height: 24,
+              child: CircularProgressIndicator(
+                  strokeWidth: 3, valueColor: AlwaysStoppedAnimation<Color?>(Styles().colors!.fillColorSecondary)))));
 
   List<Widget>? get _selectorWidget {
       Widget? customSelectorWidget = widget.eventSelector?.buildWidget(this);
@@ -1156,7 +1176,7 @@ class _Event2DetailPanelState extends State<Event2DetailPanel> implements Notifi
       Event2Grouping? linkedEventsGrouping = _event?.linkedEventsGroupingQuery;
       int? linkedEventsIndex = ((linkedEventsGrouping != null) && (_linkedEvents == null)) ? futures.length : null;
       if (linkedEventsIndex != null) {
-        futures.add(Events2().loadEvents(Events2Query(grouping: linkedEventsGrouping)));
+        futures.add(Events2().loadEvents(Events2Query(grouping: linkedEventsGrouping, limit: _linkedEventsPageLength)));
         //TMP: futures.add(Events2().loadEvents(Events2Query(searchText: 'Prairie')));
         setState(() {
           _linkedEventsLoading = true;
@@ -1195,6 +1215,10 @@ class _Event2DetailPanelState extends State<Event2DetailPanel> implements Notifi
           }
           if (linkedEventsResult?.events != null) {
             _linkedEvents = linkedEventsResult?.events;
+            _lastPageLoadedAllLinkedEvents = (linkedEventsResult!.events!.length >= _linkedEventsPageLength);
+            if (linkedEventsResult.totalCount != null) {
+              _totalLinkedEventsCount = linkedEventsResult.totalCount;
+            }
           }
           if (superEvent != null) {
             _superEvent = superEvent;
@@ -1235,7 +1259,7 @@ class _Event2DetailPanelState extends State<Event2DetailPanel> implements Notifi
           Event2Grouping? linkedEventsGrouping = event.linkedEventsGroupingQuery;
           int? linkedEventsIndex = (linkedEventsGrouping != null) ? futures.length : null;
           if (linkedEventsIndex != null) {
-            futures.add(Events2().loadEvents(Events2Query(grouping: linkedEventsGrouping)));
+            futures.add(Events2().loadEvents(Events2Query(grouping: linkedEventsGrouping, limit: (_linkedEvents?.length ?? _linkedEventsPageLength))));
           }
 
           int? superEventIndex = event.isSuperEventChild ? futures.length : null;
@@ -1275,6 +1299,10 @@ class _Event2DetailPanelState extends State<Event2DetailPanel> implements Notifi
               }
               if (linkedEventsResult?.events != null) {
                 _linkedEvents = linkedEventsResult?.events;
+                _lastPageLoadedAllLinkedEvents = (linkedEventsResult!.events!.length >= _linkedEventsPageLength);
+                if (linkedEventsResult.totalCount != null) {
+                  _totalLinkedEventsCount = linkedEventsResult.totalCount;
+                }
               }
               if (superEvent != null) {
                 _superEvent = superEvent;
@@ -1305,6 +1333,45 @@ class _Event2DetailPanelState extends State<Event2DetailPanel> implements Notifi
     }
   }
 
+  void _scrollListener() {
+    if ((_event?.hasLinkedEvents == true) &&
+        (_scrollController.offset >= _scrollController.position.maxScrollExtent) &&
+        (_hasMoreLinkedEvents != false) &&
+        !_linkedEventsLoading &&
+        !_extendingLinkedEvents) {
+      _extendLinkedEvents();
+    }
+  }
+
+  Future<void> _extendLinkedEvents() async {
+    Event2Grouping? linkedEventsGrouping = _event?.linkedEventsGroupingQuery;
+    if ((linkedEventsGrouping != null) && !_linkedEventsLoading && !_extendingLinkedEvents) {
+      setStateIfMounted(() {
+        _extendingLinkedEvents = true;
+      });
+      Events2ListResult? linkedEventsListResult = await Events2().loadEvents(Events2Query(grouping: linkedEventsGrouping, offset: _linkedEvents?.length ?? 0, limit: _linkedEventsPageLength));
+      List<Event2>? events = linkedEventsListResult?.events;
+      int? totalCount = linkedEventsListResult?.totalCount;
+
+      if (mounted && _extendingLinkedEvents && !_linkedEventsLoading) {
+        setState(() {
+          if (events != null) {
+            if (_linkedEvents != null) {
+              _linkedEvents?.addAll(events);
+            } else {
+              _linkedEvents = List<Event2>.from(events);
+            }
+            _lastPageLoadedAllLinkedEvents = (events.length >= _linkedEventsPageLength);
+          }
+          if (totalCount != null) {
+            _totalLinkedEventsCount = totalCount;
+          }
+          _extendingLinkedEvents = false;
+        });
+      }
+    }
+  }
+
   //Event getters
   bool get _isAdmin =>  _event?.userRole == Event2UserRole.admin;
   bool get _isAttendanceTaker =>  _event?.userRole == Event2UserRole.attendanceTaker;
@@ -1313,7 +1380,7 @@ class _Event2DetailPanelState extends State<Event2DetailPanel> implements Notifi
   bool get _hasDisplayCategories => (_displayCategories?.isNotEmpty == true);
   bool get _isInternalRegistrationAvailable => (_event?.registrationDetails?.type == Event2RegistrationType.internal) &&
     (_event?.registrationDetails?.isRegistrationAvailable(_persons?.registrationOccupancy) == true);
-
+  bool? get _hasMoreLinkedEvents => (_totalLinkedEventsCount != null) ? ((_linkedEvents?.length ?? 0) < _totalLinkedEventsCount!) : _lastPageLoadedAllLinkedEvents;
 
   String? get _eventId => widget.event?.id ?? widget.eventId;
 
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -11,7 +11,7 @@ description: Illinois client application.
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 5.0.77+1877
+version: 5.0.78+1878
 
 publish_to: none
 
