Fix planner conflicts and compact layout

app.py

@@ -59,6 +59,7 @@ MSG_INVALID_WEEKDAY = "星期设置不正确"
 MSG_INVALID_WEEK_RANGE = "开始周数不能晚于结束周数"
 MSG_INVALID_WEEK_PATTERN = "单双周设置不正确"
 MSG_INVALID_DURATION = "默认任务时长需在 30 到 240 分钟之间"
+MSG_SCHEDULE_CONFLICT = "该时间段已有课程或任务，请换一个时间"
 WEEKDAYS = [
     "星期一",
     "星期二",
@@ -284,6 +285,49 @@ def course_occurs_on(course: dict, current_week: int, selected_date: date) -> bo
     return True
 
 
+def schedules_overlap(
+    left_start_minutes: int,
+    left_end_minutes: int,
+    right_start_minutes: int,
+    right_end_minutes: int,
+) -> bool:
+    return left_start_minutes < right_end_minutes and right_start_minutes < left_end_minutes
+
+
+def find_schedule_conflict(task_id: str, schedule: dict | None) -> str | None:
+    if not schedule:
+        return None
+
+    schedule_date = date.fromisoformat(schedule["date"])
+    start_minutes = parse_time_to_minutes(schedule["start_time"])
+    end_minutes = parse_time_to_minutes(schedule["end_time"])
+
+    settings = store.get_schedule_settings()
+    semester_start = date.fromisoformat(settings["semester_start"])
+    current_week = get_academic_week(schedule_date, semester_start)
+
+    for task in store.list_tasks():
+        if task["id"] == task_id:
+            continue
+        existing_schedule = task.get("schedule")
+        if not existing_schedule or existing_schedule.get("date") != schedule["date"]:
+            continue
+        existing_start = parse_time_to_minutes(existing_schedule["start_time"])
+        existing_end = parse_time_to_minutes(existing_schedule["end_time"])
+        if schedules_overlap(start_minutes, end_minutes, existing_start, existing_end):
+            return task["title"]
+
+    for course in store.list_courses():
+        if not course_occurs_on(course, current_week, schedule_date):
+            continue
+        course_start = parse_time_to_minutes(course["start_time"])
+        course_end = parse_time_to_minutes(course["end_time"])
+        if schedules_overlap(start_minutes, end_minutes, course_start, course_end):
+            return course["title"]
+
+    return None
+
+
 def build_planner_payload(selected_date: date) -> dict:
     settings = store.get_schedule_settings()
     semester_start = date.fromisoformat(settings["semester_start"])
@@ -612,6 +656,15 @@ def update_task_schedule(task_id: str):
     except ValueError as exc:
         return jsonify({"ok": False, "error": str(exc)}), 400
 
+    conflict_title = find_schedule_conflict(task_id, schedule)
+    if conflict_title:
+        return jsonify(
+            {
+                "ok": False,
+                "error": f"该时间段与“{conflict_title}”冲突，请换一个时间",
+            }
+        ), 400
+
     try:
         task = store.schedule_task(task_id, schedule)
     except KeyError:

static/planner.js

@@ -239,6 +239,28 @@
     return Math.max(MIN_DURATION, Number((state.planner.settings && state.planner.settings.default_task_duration_minutes) || 45));
   }
 
+  function rangesOverlap(leftStart, leftEnd, rightStart, rightEnd) {
+    return leftStart < rightEnd && rightStart < leftEnd;
+  }
+
+  function hasScheduleConflict(dateIso, startMinutes, endMinutes, ignoreTaskId = null) {
+    return (state.planner.scheduled_items || []).some((item) => {
+      const itemDate = item.date || state.selectedDate;
+      if (itemDate !== dateIso) {
+        return false;
+      }
+      if (ignoreTaskId && item.kind === "task" && item.task_id === ignoreTaskId) {
+        return false;
+      }
+      return rangesOverlap(
+        startMinutes,
+        endMinutes,
+        toMinutes(item.start_time),
+        toMinutes(item.end_time)
+      );
+    });
+  }
+
   function minutesToPixels(minutes) {
     return Math.round(minutes * getPixelsPerMinute());
   }
@@ -684,10 +706,8 @@
           block.style.setProperty("--event-accent", item.color);
         }
         const courseWeekText = getCourseWeekText(item);
-        const coursePeriodText = getCoursePeriodRange(item.start_time, item.end_time);
         const courseLines = [
           courseWeekText,
-          coursePeriodText,
           item.location || "",
           `${item.start_time} - ${item.end_time}`,
         ].filter(Boolean);
@@ -697,7 +717,6 @@
             <strong class="planner-course-title">${escapeHtml(item.title)}</strong>
             <div class="planner-course-details">
               <span class="planner-course-line">${escapeHtml(courseWeekText)}</span>
-              <span class="planner-course-line">${escapeHtml(coursePeriodText)}</span>
               <span class="planner-course-line">${escapeHtml(item.location || "")}</span>
               <span class="planner-course-line planner-event-time">${escapeHtml(item.start_time)} - ${escapeHtml(item.end_time)}</span>
             </div>
@@ -793,6 +812,7 @@
       }
       event.preventDefault();
       preview.style.display = "none";
+      preview.classList.remove("is-conflict");
       if (!requireAuth()) {
         state.dragTaskId = null;
         return;
@@ -976,12 +996,10 @@
           block.style.setProperty("--event-accent", item.color);
         }
         const courseWeekText = getCourseWeekText(item);
-        const coursePeriodText = getCoursePeriodRange(item.start_time, item.end_time);
         const courseLines = [
           courseWeekText,
-          coursePeriodText,
-          `${item.start_time} - ${item.end_time}`,
           item.location || "",
+          `${item.start_time} - ${item.end_time}`,
         ].filter(Boolean);
         block.title = [item.title, ...courseLines].join("\n");
         block.innerHTML = `
@@ -989,9 +1007,8 @@
             <strong class="planner-course-title">${escapeHtml(item.title)}</strong>
             <div class="planner-course-details">
               <span class="planner-course-line">${escapeHtml(courseWeekText)}</span>
-              <span class="planner-course-line">${escapeHtml(coursePeriodText)}</span>
-              <span class="planner-course-line planner-event-time">${escapeHtml(item.start_time)} - ${escapeHtml(item.end_time)}</span>
               <span class="planner-course-line">${escapeHtml(item.location || "")}</span>
+              <span class="planner-course-line planner-event-time">${escapeHtml(item.start_time)} - ${escapeHtml(item.end_time)}</span>
             </div>
           </div>
         `;
@@ -1056,6 +1073,7 @@
               endMinutes: item.endMinutes,
               duration: item.endMinutes - item.startMinutes,
               pointerOffsetMinutes: point ? point.minutes - item.startMinutes : 0,
+              hasConflict: false,
             };
 
             if (typeof block.setPointerCapture === "function") {
@@ -1099,18 +1117,21 @@
       const duration = getTaskDuration(task);
       const startMinutes = clamp(point.minutes, dayStart, dayEnd - duration);
       const dayMeta = getWeekDayMeta(point.date);
+      const hasConflict = hasScheduleConflict(point.date, startMinutes, startMinutes + duration, task.id);
       preview.style.display = "grid";
+      preview.classList.toggle("is-conflict", hasConflict);
       setBlockBounds(preview, startMinutes, startMinutes + duration, dayStart);
       setBlockHorizontalBounds(preview, point.date, 0, 1);
       preview.innerHTML = `
         <strong>${escapeHtml(dayMeta ? dayMeta.short_label : "")}</strong>
-        <span>${minutesToTime(startMinutes)} - ${minutesToTime(startMinutes + duration)}</span>
+        <span>${hasConflict ? "时间冲突" : `${minutesToTime(startMinutes)} - ${minutesToTime(startMinutes + duration)}`}</span>
       `;
     });
 
     canvasLayer.addEventListener("dragleave", (event) => {
       if (!canvasLayer.contains(event.relatedTarget)) {
         preview.style.display = "none";
+        preview.classList.remove("is-conflict");
       }
     });
 
@@ -1135,6 +1156,11 @@
       try {
         const duration = getTaskDuration(task);
         const startMinutes = clamp(point.minutes, dayStart, dayEnd - duration);
+        if (hasScheduleConflict(point.date, startMinutes, startMinutes + duration, task.id)) {
+          showToast("该时间段已有课程或任务，请换一个时间", "error");
+          state.dragTaskId = null;
+          return;
+        }
         await requestJSON(`/api/tasks/${task.id}/schedule`, {
           method: "PATCH",
           body: JSON.stringify({
@@ -1253,6 +1279,7 @@
     const preview = document.getElementById("timelineDropPreview");
     if (preview) {
       preview.style.display = "none";
+      preview.classList.remove("is-conflict");
     }
   });
 
@@ -1300,6 +1327,14 @@
       state.interaction.duration = state.interaction.endMinutes - state.interaction.startMinutes;
     }
 
+    state.interaction.hasConflict = hasScheduleConflict(
+      state.interaction.currentDate,
+      state.interaction.startMinutes,
+      state.interaction.endMinutes,
+      state.interaction.taskId
+    );
+    state.interaction.block.classList.toggle("is-conflict", !!state.interaction.hasConflict);
+
     updateEventLayout(state.interaction.block, {
       date: state.interaction.currentDate,
       startMinutes: state.interaction.startMinutes,
@@ -1363,6 +1398,7 @@
 
     const current = state.interaction;
     current.block.classList.remove("is-dragging");
+    current.block.classList.remove("is-conflict");
     state.interaction = null;
     releaseInteractionPointer(current);
     finishPlannerInteraction();
@@ -1376,6 +1412,12 @@
       return;
     }
 
+    if (current.hasConflict) {
+      loadPlanner(current.currentDate || state.selectedDate, true);
+      showToast("该时间段已有课程或任务，请换一个时间", "error");
+      return;
+    }
+
     persistWeekInteraction(current);
   }
 

static/v020.css

@@ -160,15 +160,19 @@ body.planner-interacting .page-planner {
   display: grid;
   gap: 12px;
   grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
+  grid-auto-rows: minmax(0, 1fr);
   align-items: stretch;
   align-content: start;
   min-height: 0;
-  height: auto;
+  height: 100%;
+  overflow: hidden;
 }
 
 .todo-column {
   padding: 16px;
   min-height: 0;
+  height: 100%;
+  max-height: 100%;
   display: grid;
   grid-template-rows: auto minmax(0, 1fr);
 }
@@ -185,13 +189,17 @@ body.planner-interacting .page-planner {
   gap: 10px;
   margin-top: 12px;
   min-height: 0;
-  overflow: auto;
+  height: 100%;
+  max-height: 100%;
+  overflow-y: auto;
+  overscroll-behavior: contain;
   padding-right: 4px;
 }
 
 .task-card {
   padding: 14px;
   border-radius: 18px;
+  flex: none;
 }
 
 .task-copy h4 {
@@ -219,7 +227,7 @@ body.planner-interacting .page-planner {
   height: 100%;
   display: grid;
   grid-template-rows: auto auto minmax(0, 1fr);
-  gap: 10px;
+  gap: 8px;
 }
 
 .planner-head h2 {
@@ -295,12 +303,27 @@ body.planner-interacting .page-planner {
 
 .planner-layout {
   display: grid;
-  grid-template-columns: minmax(0, 7.7fr) minmax(250px, 2.3fr);
+  grid-template-columns: minmax(0, 8.2fr) minmax(220px, 1.8fr);
   gap: 12px;
   min-height: 0;
   overflow: hidden;
 }
 
+.page-planner .planner-head h2,
+.page-planner #plannerHeadlineNote,
+.page-planner .planner-sidebar-note,
+.page-planner .planner-sidebar-head .column-label {
+  display: none;
+}
+
+.page-planner .planner-head {
+  align-items: center;
+}
+
+.page-planner .planner-head .section-kicker {
+  margin: 0;
+}
+
 .timeline-surface,
 .planner-sidebar {
   border-radius: 26px;
@@ -591,8 +614,8 @@ body.planner-interacting .page-planner {
 .planner-course-title {
   display: block;
   margin: 0;
-  font-size: 0.72rem;
-  line-height: 1.08;
+  font-size: 0.74rem;
+  line-height: 1.12;
   letter-spacing: 0.01em;
   word-break: break-word;
   overflow: hidden;
@@ -605,8 +628,8 @@ body.planner-interacting .page-planner {
   display: grid;
   gap: 1px;
   color: rgba(238, 244, 251, 0.82);
-  font-size: 0.56rem;
-  line-height: 1.08;
+  font-size: 0.58rem;
+  line-height: 1.12;
 }
 
 .planner-course-line {
@@ -668,6 +691,17 @@ body.planner-interacting .page-planner {
   z-index: 8;
 }
 
+.planner-event.is-conflict,
+.timeline-drop-preview.is-conflict {
+  border-color: rgba(255, 107, 92, 0.72);
+  box-shadow: 0 0 0 1px rgba(255, 107, 92, 0.22), 0 16px 28px rgba(0, 0, 0, 0.24);
+}
+
+.planner-event.is-conflict::before,
+.timeline-drop-preview.is-conflict::before {
+  background: #ff6b5c;
+}
+
 .course-event {
   padding: 7px 8px 7px 10px;
 }
@@ -749,7 +783,7 @@ body.planner-interacting .page-planner {
   gap: 12px;
   align-content: start;
   min-height: 0;
-  grid-template-rows: auto auto minmax(0, 1fr);
+  grid-template-rows: auto minmax(0, 1fr);
 }
 
 .planner-sidebar-note {
@@ -763,7 +797,10 @@ body.planner-interacting .page-planner {
   display: grid;
   gap: 10px;
   min-height: 0;
-  overflow: auto;
+  height: 100%;
+  max-height: 100%;
+  overflow-y: auto;
+  overscroll-behavior: contain;
   padding-right: 4px;
 }