Merge branch 'feat/study-closing' into feat/study-closing-studystatus

# Conflicts: # core/lib/src/models/tables/study.dart # designer_v2/lib/common_views/action_popup_menu.dart # designer_v2/lib/features/recruit/study_recruit_page.dart # designer_v2/lib/repositories/study_repository.dart # designer_v2/lib/services/notifications.dart # designer_v2/lib/utils/model_action.dart
hpi-studyu · johannesvedder · Jun 19, 2024 · May 25, 2024 · May 25, 2024 · May 26, 2024
commit 931c4e2fa50e64bb0ada2486f99106009fe9509c
diff --git a/app/lib/screens/study/onboarding/study_selection.dart b/app/lib/screens/study/onboarding/study_selection.dart
@@ -172,10 +172,6 @@ class _StudySelectionScreenState extends State<StudySelectionScreen> {
  child: StudyTile.fromStudy(
  study: study,
  onTap: () async {
- if (study.isClosed) {
- await showStudyClosedDialog(context);
- return;
- }
  await navigateToStudyOverview(context, study);
  },
  ),

diff --git a/database/migration/migrate-close_study.sql b/database/migration/migrate-close_study.sql
diff --git a/designer_v2/lib/domain/study.dart b/designer_v2/lib/domain/study.dart
@@ -14,7 +14,6 @@ enum StudyActionType {
  duplicateDraft,
  addCollaborator,
  export,
- close,
  delete,
 }
 
@@ -28,8 +27,6 @@ extension StudyActionTypeFormatted on StudyActionType {
  return tr.action_unpin;
  case StudyActionType.edit:
  return tr.action_edit;
- case StudyActionType.close:
- return tr.action_close;
  case StudyActionType.delete:
  return tr.action_delete;
  case StudyActionType.duplicate:

diff --git a/designer_v2/lib/features/study/study_actions.dart b/designer_v2/lib/features/study/study_actions.dart
@@ -11,5 +11,4 @@ Map<StudyActionType, IconData> studyActionIcons = {
  StudyActionType.addCollaborator: Icons.person_add_rounded,
  StudyActionType.export: Icons.download_rounded,
  StudyActionType.delete: Icons.delete_rounded,
- StudyActionType.close: MdiIcons.accountLock,
 };
diff --git a/designer_v2/lib/localization/app_de.arb b/designer_v2/lib/localization/app_de.arb
@@ -551,7 +551,6 @@
  "action_pin": "Anheften",
  "action_unpin": "Nicht mehr anheften",
  "action_edit": "Bearbeiten",
- "action_close": "Schließen",
  "action_delete": "Löschen",
  "action_remove": "Entfernen",
  "action_duplicate": "Duplizieren",

diff --git a/designer_v2/lib/localization/app_en.arb b/designer_v2/lib/localization/app_en.arb
@@ -600,7 +600,6 @@
  "action_pin": "Pin",
  "action_unpin": "Remove pin",
  "action_delete": "Delete",
- "action_close": "Close",
  "action_remove": "Remove",
  "action_duplicate": "Duplicate",
  "action_clipboard": "Copy to clipboard",

diff --git a/designer_v2/lib/repositories/study_repository.dart b/designer_v2/lib/repositories/study_repository.dart
@@ -143,18 +143,6 @@ class StudyRepository extends ModelRepository<Study>
  );
  }
 
- Future<void> onCloseCallback() {
- model.isClosed = true;
- return save(model)
- .then((value) =>
- ref.read(routerProvider).dispatch(RoutingIntents.studies),)
- .then((value) => Future.delayed(
- const Duration(milliseconds: 200),
- () => ref
- .read(notificationServiceProvider)
- .show(Notifications.studyClosed),),);
- }
-
  final currentUser = authRepository.currentUser;
  if (currentUser == null) return [];
 

diff --git a/designer_v2/lib/services/notifications.dart b/designer_v2/lib/services/notifications.dart
@@ -19,9 +19,6 @@ class Notifications {
  static final studyDeleted = SnackbarIntent(
  message: tr.notification_study_deleted,
  );
- static final studyClosed = SnackbarIntent(
- message: tr.notification_study_closed,
- );
  static final inviteCodeDeleted = SnackbarIntent(
  message: tr.notification_code_deleted,
  );