Automatic and Manual Event Ending

client/lib/features/community/presentation/widgets/carousel/carousel_tabs.dart

@@ -94,7 +94,12 @@ class FeaturedEventCarouselTab extends StatelessWidget {
         if (event.scheduledTime != null) ...[
           Align(
             alignment: Alignment.centerLeft,
-            child: VerticalTimeAndDateIndicator(time: event.scheduledTime!),
+            child: VerticalTimeAndDateIndicator(
+              time: event.scheduledTime!,
+              endTime: event.scheduledTime!.add(
+                Duration(minutes: event.durationInMinutes),
+              ),
+            ),
           ),
           SizedBox(height: 8),
         ],

client/lib/features/community/presentation/widgets/carousel/time_indicator.dart

@@ -8,24 +8,29 @@ import 'package:client/core/widgets/height_constained_text.dart';
 /// Text is contained in a rounded container with vertical aspect ratio and box shadow
 class VerticalTimeAndDateIndicator extends StatelessWidget {
   final DateTime time;
+  final DateTime? endTime;
   final bool shadow;
   final bool isDisabled;
   final EdgeInsetsGeometry padding;
 
   const VerticalTimeAndDateIndicator({
     required this.time,
+    this.endTime,
     this.shadow = true,
     this.isDisabled = false,
     this.padding = const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
     Key? key,
   }) : super(key: key);
 
-  String get _timeString {
-    final timeString = DateFormat('h:mma').format(time);
-    final correctlyFormattedTimeString =
-        timeString.substring(0, timeString.length - 1).toLowerCase();
+  String _formatTime(DateTime t) {
+    final timeString = DateFormat('h:mma').format(t);
+    return timeString.substring(0, timeString.length - 1).toLowerCase();
+  }
 
-    return correctlyFormattedTimeString;
+  String get _timeString {
+    final start = _formatTime(time);
+    if (endTime == null) return start;
+    return '$start - ${_formatTime(endTime!)}';
   }
 
   @override

client/lib/features/community/presentation/widgets/event_card.dart

@@ -114,6 +114,9 @@ class EventCard extends StatelessWidget {
                 time: DateTime.fromMillisecondsSinceEpoch(
                   (event.scheduledTime?.millisecondsSinceEpoch ?? 0),
                 ),
+                endTime: event.scheduledTime?.add(
+                  Duration(minutes: event.durationInMinutes),
+                ),
               )
             else
               SizedBox(width: 100),

client/lib/features/events/data/services/cloud_functions_event_service.dart

@@ -39,11 +39,18 @@ class CloudFunctionsEventService {
     await cloudFunctions.callFunction('eventEnded', request.toJson());
   }
 
+  Future<void> endMeetingForAll(EndMeetingForAllRequest request) async {
+    loggingService.log(
+      'CloudFunctionsService.endMeetingForAll: Data: ${request.toJson()}',
+    );
+    await cloudFunctions.callFunction('endMeetingForAll', request.toJson());
+  }
+
   Future<GetCommunityCalendarLinkResponse> getCommunityCalendarLink(
     GetCommunityCalendarLinkRequest request,
   ) async {
     final result = await cloudFunctions.callFunction(
-        'getCommunityCalendarLink', request.toJson());
+        'getCommunityCalendarLink', request.toJson(),);
     return GetCommunityCalendarLinkResponse.fromJson(result);
   }
 }

client/lib/features/events/features/event_page/presentation/event_settings_presenter.dart

@@ -118,6 +118,18 @@ class EventSettingsPresenter {
     _view.updateView();
   }
 
+  void updateSettingValue(String setting, dynamic value) {
+    final settings = EventSettings.fromJson(
+      _model.eventSettings.toJson()
+        ..addEntries([
+          MapEntry(setting, value),
+        ]),
+    );
+    _model.eventSettings = settings;
+    _appDrawerProvider.setUnsavedChanges(_helper.wereChangesMade(_model));
+    _view.updateView();
+  }
+
   Future<void> saveSettings() async {
     switch (_model.eventSettingsDrawerType) {
       case EventSettingsDrawerType.template:

client/lib/features/events/features/event_page/presentation/event_tab_controller.dart

@@ -216,6 +216,7 @@ class _EventTabsDefinitionState extends State<EventTabsDefinition> {
     );
 
     if (message != null) {
+      if (!mounted) return;
       await alertOnError(context, () => tabsController.sendMessage(message));
     }
   }

client/lib/features/events/features/event_page/presentation/views/event_settings_drawer.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:client/core/utils/toast_utils.dart';
 import 'package:client/styles/styles.dart';
 import 'package:flutter/material.dart';
@@ -40,6 +42,23 @@ class _EventSettingsDrawerState extends State<EventSettingsDrawer>
     implements EventSettingsView {
   late final EventSettingsModel _model;
   late final EventSettingsPresenter _presenter;
+  // Grace period input uses a managed TextEditingController + FocusNode
+  // rather than TextFormField's initialValue/ValueKey pattern. This avoids
+  // losing focus on every keystroke (ValueKey rebuilds destroy the widget).
+  //
+  // Validation: valid range is 0-120 (integer). While typing, invalid input
+  // shows a red border and red text immediately. Auto-correction fires after
+  // a 1-second debounce, on focus loss, or on save -- whichever comes first
+  // -- clamping to 0-120 and flooring any decimals.
+  //
+  // The _gracePeriodEditing flag prevents _syncGracePeriodController (called
+  // from updateView) from overwriting the controller text while the user is
+  // actively typing.
+  final _gracePeriodController = TextEditingController();
+  final _gracePeriodFocusNode = FocusNode();
+  Timer? _gracePeriodDebounce;
+  bool _gracePeriodInvalid = false;
+  bool _gracePeriodEditing = false;
 
   @override
   void initState() {
@@ -48,6 +67,81 @@ class _EventSettingsDrawerState extends State<EventSettingsDrawer>
     _model = EventSettingsModel(widget.eventSettingsDrawerType);
     _presenter = EventSettingsPresenter(context, this, _model);
     _presenter.init();
+    _syncGracePeriodController();
+    _gracePeriodFocusNode.addListener(_onGracePeriodFocusChange);
+  }
+
+  @override
+  void dispose() {
+    _gracePeriodDebounce?.cancel();
+    _gracePeriodController.dispose();
+    _gracePeriodFocusNode.removeListener(_onGracePeriodFocusChange);
+    _gracePeriodFocusNode.dispose();
+    super.dispose();
+  }
+
+  /// Syncs the controller text to the model value. Skipped while the user
+  /// is actively editing to avoid overwriting mid-keystroke.
+  void _syncGracePeriodController() {
+    if (_gracePeriodEditing) return;
+    final value =
+        (_model.eventSettings.autoEndGracePeriodMinutes ?? 0).toString();
+    if (_gracePeriodController.text != value) {
+      _gracePeriodController.text = value;
+    }
+  }
+
+  void _onGracePeriodFocusChange() {
+    if (_gracePeriodFocusNode.hasFocus) {
+      _gracePeriodEditing = true;
+    } else {
+      _correctGracePeriodInput();
+      _gracePeriodEditing = false;
+    }
+  }
+
+  void _onGracePeriodChanged(String value) {
+    _gracePeriodDebounce?.cancel();
+    _gracePeriodEditing = true;
+    final parsed = int.tryParse(value);
+    final isValid = parsed != null && parsed >= 0 && parsed <= 120;
+    if (isValid) {
+      _presenter.updateSettingValue(
+        EventSettings.kFieldAutoEndGracePeriodMinutes,
+        parsed,
+      );
+    }
+    setState(() {
+      _gracePeriodInvalid = !isValid && value.isNotEmpty;
+    });
+    _gracePeriodDebounce = Timer(const Duration(seconds: 1), () {
+      _correctGracePeriodInput();
+    });
+  }
+
+  /// Clamps the current input to 0-120, floors decimals, and pushes the
+  /// corrected value to the controller and presenter.
+  void _correctGracePeriodInput() {
+    _gracePeriodDebounce?.cancel();
+    final text = _gracePeriodController.text;
+    final parsed = num.tryParse(text);
+    int corrected;
+    if (parsed == null || parsed < 0) {
+      corrected = 0;
+    } else if (parsed > 120) {
+      corrected = 120;
+    } else {
+      corrected = parsed.floor();
+    }
+    _gracePeriodController.text = corrected.toString();
+    _gracePeriodEditing = false;
+    _presenter.updateSettingValue(
+      EventSettings.kFieldAutoEndGracePeriodMinutes,
+      corrected,
+    );
+    setState(() {
+      _gracePeriodInvalid = false;
+    });
   }
 
   @override
@@ -131,6 +225,72 @@ class _EventSettingsDrawerState extends State<EventSettingsDrawer>
             ),
           ),
           SizedBox(height: 16),
+          _SwitchAndTooltip(
+            onUpdate: (isSelected) => _presenter.updateSetting(
+              EventSettings.kFieldAutoEndMeeting,
+              isSelected,
+            ),
+            text: context.l10n.autoEndMeeting,
+            val: _model.eventSettings.autoEndMeeting ?? false,
+            isIndicatorShown: _presenter.isSettingNotDefaultIndicatorShown(
+              (settings) => settings.autoEndMeeting,
+            ),
+          ),
+          if (_model.eventSettings.autoEndMeeting == true) ...[
+            SizedBox(height: 8),
+            Padding(
+              padding: const EdgeInsets.only(left: 16),
+              child: Row(
+                children: [
+                  Expanded(
+                    child: HeightConstrainedText(
+                        context.l10n.gracePeriodMinutes,
+                      style: context.theme.textTheme.bodyMedium,
+                    ),
+                  ),
+                  SizedBox(
+                    width: 64,
+                    child: TextFormField(
+                      controller: _gracePeriodController,
+                      focusNode: _gracePeriodFocusNode,
+                      keyboardType: TextInputType.number,
+                      textAlign: TextAlign.center,
+                      style: context.theme.textTheme.bodyMedium?.copyWith(
+                        color: _gracePeriodInvalid
+                            ? context.theme.colorScheme.error
+                            : null,
+                      ),
+                      decoration: InputDecoration(
+                        isDense: true,
+                        contentPadding: EdgeInsets.symmetric(
+                          horizontal: 8,
+                          vertical: 8,
+                        ),
+                        border: OutlineInputBorder(),
+                        enabledBorder: _gracePeriodInvalid
+                            ? OutlineInputBorder(
+                                borderSide: BorderSide(
+                                  color: context.theme.colorScheme.error,
+                                ),
+                              )
+                            : null,
+                        focusedBorder: _gracePeriodInvalid
+                            ? OutlineInputBorder(
+                                borderSide: BorderSide(
+                                  color: context.theme.colorScheme.error,
+                                  width: 2,
+                                ),
+                              )
+                            : null,
+                      ),
+                      onChanged: _onGracePeriodChanged,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ],
+          SizedBox(height: 16),
           _SwitchAndTooltip(
             onUpdate: (isSelected) => _presenter.updateSetting(
               EventSettings.kFieldTalkingTimer,
@@ -156,7 +316,10 @@ class _EventSettingsDrawerState extends State<EventSettingsDrawer>
           ActionButton(
             expand: true,
             text: context.l10n.saveSettings,
-            onPressed: () => _presenter.saveSettings(),
+            onPressed: () {
+              _correctGracePeriodInput();
+              _presenter.saveSettings();
+            },
             color: context.theme.colorScheme.primary,
             textColor: context.theme.colorScheme.onPrimary,
           ),
@@ -178,12 +341,17 @@ class _EventSettingsDrawerState extends State<EventSettingsDrawer>
               style: context.theme.textTheme.headlineSmall!,
             ),
             SizedBox(height: 40),
-            for (final feature in _model.eventSettings.toJson().keys.toList())
+            for (final entry
+                in _model.eventSettings.toJson().entries.where(
+                      (e) =>
+                          e.key !=
+                          EventSettings.kFieldAutoEndGracePeriodMinutes,
+                    ))
               CustomSwitchTile(
                 onUpdate: (isSelected) =>
-                    _presenter.updateSetting(feature, isSelected),
-                text: feature,
-                val: _model.eventSettings.toJson()[feature] ?? false,
+                    _presenter.updateSetting(entry.key, isSelected),
+                text: entry.key,
+                val: (entry.value as bool?) ?? false,
                 style: context.theme.textTheme.bodyMedium,
               ),
           ],
@@ -204,6 +372,7 @@ class _EventSettingsDrawerState extends State<EventSettingsDrawer>
 
   @override
   void updateView() {
+    _syncGracePeriodController();
     setState(() {});
   }
 }