feat: support manual course editing by sseu-buhzzi · Pull Request #667 · DanXi-Dev/DanXi

sseu-buhzzi · 2026-03-13T21:12:43Z

Introduces the ability to users to edit manually added courses.
Supports removing course times in the course editing dialog.
Supports sorting and deduplicating course times after user adds it.
Enhances i18n for days of weeks.

Close #666.

- Added `MANUALLY_ADDED_ROOM_ID` constant and `isManuallyAdded` getter to the `Course` model to replace hardcoded room ID. - Renamed `courseRoomIdcontroller` to `courseRoomNameController` for consistency.

- Updated `ManuallyAddCourseDialog` to support an `initialCourse` for editing existing entries. It might be renamed then. - Added `EditCourseEvent` and its stream listener to handle corse updates. - Extract some common logics in `ManuallyAddCourseDialog` into separate functions. # Conflicts: # lib/widget/dialogs/manually_add_course_dialog.dart

- Replace hardcoded `Constant.WeekDays` list with `DateFormat.E()`. - Move `kMonday` anchor from `TimeTable` to `Constant` for centralized access. - Update manual course dialogs and timetable to use the new method.

- Implement `Comparable` for `CourseTime` to support sorting by weekday and slot. - Support removing a `CourseTime` by both clicking a button or swiping horizontally

And implement deep copy.

Copilot

Pull request overview

Adds support for editing manually added courses from the timetable UI, including updating existing course fields and managing course meeting times, while improving weekday i18n formatting across the app.

Changes:

Extend the manual course dialog to accept an initialCourse for editing, and support removing course times plus sorting/deduping after additions.
Add an edit action for manually added courses in the timetable page and wire it through an EditCourseEvent.
Centralize weekday string formatting via Constant.weekDay() and update relevant UI/data formatting to use it.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
lib/widget/dialogs/manually_add_course_dialog_sub.dart	Uses slot-count derived from timetable config and switches weekday label rendering to `Constant.weekDay()`.
lib/widget/dialogs/manually_add_course_dialog.dart	Supports editing via `initialCourse`, provides time tile removal UI, and attempts to sort/dedup added times.
lib/page/subpage_timetable.dart	Adds edit event/subscription and shows an edit button for manually added courses.
lib/model/time_table.dart	Adds `Course.copyWith`, `Course.isManuallyAdded`, and makes `CourseTime` comparable; updates weekday formatting usage.
lib/common/constant.dart	Introduces `Constant.weekDay()` (intl-based) and moves the “reference Monday” constant here.

Comments suppressed due to low confidence (1)

lib/model/time_table.dart:355

CourseTime is used in Set operations (e.g., toSet() for dedup) and is now Comparable, but it still lacks operator==/hashCode. Without value equality (weekDay+slot), deduplication via Set<CourseTime> will not work and may leave duplicate times. Implement == and hashCode consistent with compareTo (and ideally keep it immutable).

class CourseTime implements Comparable<CourseTime> {
  //Monday is 0, Morning lesson is 0
  int weekDay, slot;

  CourseTime(this.weekDay, this.slot);

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

w568w · 2026-03-14T11:13:50Z

Reminder: It might be worth taking a look at Copilot's suggestions too.

Even though I mentioned earlier that most of them aren't helpful, these specific ones actually seem to make sense.

To correctly deduplicate slots of courses.

- Deleted `lib/widget/dialogs/manually_add_course_dialog_sub.dart`. - Appended the `AddCourseDialogSub` class and its state to `lib/widget/dialogs/manually_add_course_dialog.dart`.

Instead of new ID, remove the courses with the old ID. This ensures the courses with the old ID to be deleted even though the user modified the ID. By the way, when the ID is not unique, all matching courses are deleted, as this is the behaviour of the delete button.

Copilot

Pull request overview

Adds manual-course editing support in the timetable UI, including removing course times and improving weekday localization.

Changes:

Extend the manual add course dialog to support editing an existing course and removing selected time entries.
Add Course/CourseTime utilities (manual-course identifier, copyWith, Comparable/equality) to enable deduplication + sorting of times.
Centralize weekday display via Constant.weekDay() to improve i18n.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
lib/widget/dialogs/manually_add_course_dialog_sub.dart	Removes the standalone slot-selection sub-dialog (logic moved inline).
lib/widget/dialogs/manually_add_course_dialog.dart	Adds edit-mode support (`initialCourse`), dedup/sort on add, and UI to remove times.
lib/page/subpage_timetable.dart	Introduces edit event flow and surfaces edit action for manually-added courses.
lib/model/time_table.dart	Adds manual-course identifier helpers, `Course.copyWith`, and `CourseTime` ordering/equality.
lib/common/constant.dart	Adds localized weekday helper (`weekDay`) and moves weekday formatting dependency here.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

w568w · 2026-03-15T18:08:16Z

Has GitHub upgraded the base model for their Copilot? 🤔

Those suggestions still look valid to me. Please take a look.

And uninfy the `times` to be ungrowable.

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

Copilot

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 5 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

You can also share your feedback on Copilot code review. Take the survey.

- Implemented validation in `ManuallyAddCourseDialog` to ensure course IDs are non-empty and unique among existing manual courses. - Refactored warning dialog logic into a helper method `_showWarningDialog`. - Added localization strings for empty and conflicting course ID provided.

Copilot

Pull request overview

Copilot reviewed 10 out of 10 changed files in this pull request and generated 4 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

You can also share your feedback on Copilot code review. Take the survey.

+    final availableWeeks = newCourse.availableWeeks;
+    if (availableWeeks != null) {
+      // Populate staged course times from the initial course, and drop the old
+      // ones.
+      widget.courseAvailableList.clear();
+      widget.courseAvailableList.addAll(availableWeeks);
+    }


        PlatformDialogAction(
+          child: Text(S.of(context).ok),
+          onPressed: () {


sseu-buhzzi · 2026-03-18T23:13:47Z

Some confirmations:

I have added some checking dialogs before updating the course IDs, disallowing users to set duplicated IDs.
When editing the ID, it will delete courses with the old ID, same with the delete button.

Are these OK?

w568w · 2026-03-19T03:06:52Z

Are these OK?

That's okay to me.

w568w

LGTM. Thanks for your contribution!

sseu-buhzzi added 5 commits March 14, 2026 02:01

refactor(timetable): encapsulate the magic number and improve naming

eb6af57

- Added `MANUALLY_ADDED_ROOM_ID` constant and `isManuallyAdded` getter to the `Course` model to replace hardcoded room ID. - Renamed `courseRoomIdcontroller` to `courseRoomNameController` for consistency.

refactor: support weekday names i18n using DateFormat

34654ab

- Replace hardcoded `Constant.WeekDays` list with `DateFormat.E()`. - Move `kMonday` anchor from `TimeTable` to `Constant` for centralized access. - Update manual course dialogs and timetable to use the new method.

refactor(timetable): support sorting and removing CourseTimes

827907a

- Implement `Comparable` for `CourseTime` to support sorting by weekday and slot. - Support removing a `CourseTime` by both clicking a button or swiping horizontally

refactor(timetable): replace copy() with copyWith()

24fdb1b

And implement deep copy.

sseu-buhzzi changed the title ~~feat: refac~~ feat: support manual course editing Mar 13, 2026

w568w requested review from Copilot and w568w March 14, 2026 10:59

Copilot started reviewing on behalf of w568w March 14, 2026 10:59 View session

Copilot AI reviewed Mar 14, 2026

View reviewed changes

Comment thread lib/widget/dialogs/manually_add_course_dialog.dart

Comment thread lib/page/subpage_timetable.dart Outdated

Comment thread lib/widget/dialogs/manually_add_course_dialog.dart Outdated

w568w requested changes Mar 14, 2026

View reviewed changes

Comment thread lib/widget/dialogs/manually_add_course_dialog.dart Outdated

Comment thread lib/widget/dialogs/manually_add_course_dialog_sub.dart Outdated

sseu-buhzzi added 5 commits March 14, 2026 20:18

refactor: simplify teacher names parsing

6aed71b

fix: implement operator == and hashCode for CourseTime

30614f9

To correctly deduplicate slots of courses.

refactor: concatenate dialogs for cohesion

763a78e

- Deleted `lib/widget/dialogs/manually_add_course_dialog_sub.dart`. - Appended the `AddCourseDialogSub` class and its state to `lib/widget/dialogs/manually_add_course_dialog.dart`.

refactor: rename AddCourseDialogSub to _SelectSlotsDialog

c4e82fe

sseu-buhzzi requested a review from w568w March 15, 2026 15:24

w568w requested a review from Copilot March 15, 2026 16:43

Copilot started reviewing on behalf of w568w March 15, 2026 16:56 View session

Copilot AI reviewed Mar 15, 2026

View reviewed changes

sseu-buhzzi added 5 commits March 16, 2026 02:20

fix: handle the empty string when split names

3e34d98

refactor: optimize slot buttons UI logics

b084368

fix: correct a Set literal used as a lambda

e006fa3

refactor: handle some expected duplicated or unsorted lists

742588b

And uninfy the `times` to be ungrowable.

refactor: replace hardcoded week count with TimeTable.MAX_WEEK

c6d0b0a

sseu-buhzzi requested a review from Copilot March 15, 2026 19:29

Copilot started reviewing on behalf of sseu-buhzzi March 15, 2026 19:56 View session

Copilot AI reviewed Mar 15, 2026

View reviewed changes

sseu-buhzzi requested a review from Copilot March 15, 2026 20:13

Copilot started reviewing on behalf of sseu-buhzzi March 15, 2026 20:14 View session

Copilot AI reviewed Mar 15, 2026

View reviewed changes

Comment thread lib/widget/dialogs/manually_add_course_dialog.dart

Comment thread lib/widget/dialogs/manually_add_course_dialog.dart Outdated

Comment thread lib/page/subpage_timetable.dart

Comment thread lib/page/subpage_timetable.dart Outdated

Comment thread lib/page/subpage_timetable.dart

sseu-buhzzi added 3 commits March 16, 2026 04:21

fix: cancel _editCourseSubscription on dispose

e3d86d0

refactor: fix shallow copy in the dialog and simplify update logic

737f6ea

sseu-buhzzi requested a review from Copilot March 15, 2026 21:20

Copilot started reviewing on behalf of sseu-buhzzi March 15, 2026 21:21 View session

Copilot AI reviewed Mar 15, 2026

View reviewed changes

sseu-buhzzi added 2 commits March 16, 2026 05:43

fix: allow course IDs to be same with the previous

4976854

style: remove an extra space

51ddcef

w568w approved these changes Mar 19, 2026

View reviewed changes

w568w merged commit 60aa3a5 into DanXi-Dev:main Mar 19, 2026

Conversation

sseu-buhzzi commented Mar 13, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

w568w commented Mar 14, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

w568w commented Mar 15, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

sseu-buhzzi commented Mar 18, 2026

Uh oh!

w568w commented Mar 19, 2026

Uh oh!

w568w left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants