Merge pull request #4651 from pangeachat/4648-bot-role-shown-as-open-in-saved-activity
fix: for archived activity summary display, use the activity roles di…
This commit is contained in:
commit
e2a3974354
2 changed files with 6 additions and 4 deletions
|
|
@ -140,6 +140,9 @@ class Message extends StatelessWidget {
|
|||
return ActivitySummary(
|
||||
activity: event.room.activityPlan!,
|
||||
room: event.room,
|
||||
assignedRoles: event.room.hasArchivedActivity
|
||||
? event.room.activityRoles?.roles ?? {}
|
||||
: event.room.assignedRoles ?? {},
|
||||
showInstructions: controller.showInstructions,
|
||||
toggleInstructions: controller.toggleShowInstructions,
|
||||
getParticipantOpacity: (role) =>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ import 'package:fluffychat/l10n/l10n.dart';
|
|||
import 'package:fluffychat/pangea/activity_planner/activity_plan_model.dart';
|
||||
import 'package:fluffychat/pangea/activity_sessions/activity_participant_list.dart';
|
||||
import 'package:fluffychat/pangea/activity_sessions/activity_role_model.dart';
|
||||
import 'package:fluffychat/pangea/activity_sessions/activity_room_extension.dart';
|
||||
import 'package:fluffychat/pangea/activity_sessions/activity_session_details_row.dart';
|
||||
import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.dart';
|
||||
import 'package:fluffychat/pangea/common/utils/overlay.dart';
|
||||
|
|
@ -30,7 +29,7 @@ class ActivitySummary extends StatelessWidget {
|
|||
final ActivityPlanModel activity;
|
||||
final Room? room;
|
||||
final Room? course;
|
||||
final Map<String, ActivityRoleModel>? assignedRoles;
|
||||
final Map<String, ActivityRoleModel> assignedRoles;
|
||||
|
||||
final bool showInstructions;
|
||||
final VoidCallback toggleInstructions;
|
||||
|
|
@ -45,7 +44,7 @@ class ActivitySummary extends StatelessWidget {
|
|||
required this.activity,
|
||||
required this.showInstructions,
|
||||
required this.toggleInstructions,
|
||||
this.assignedRoles,
|
||||
required this.assignedRoles,
|
||||
this.onTapParticipant,
|
||||
this.canSelectParticipant,
|
||||
this.isParticipantSelected,
|
||||
|
|
@ -81,7 +80,7 @@ class ActivitySummary extends StatelessWidget {
|
|||
ActivityParticipantList(
|
||||
activity: activity,
|
||||
room: room,
|
||||
assignedRoles: room?.assignedRoles ?? assignedRoles ?? {},
|
||||
assignedRoles: assignedRoles,
|
||||
course: course,
|
||||
onTap: onTapParticipant,
|
||||
canSelect: canSelectParticipant,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue