m1m02530125 Claude Sonnet 4.6 commited on
Commit
07fdb41
·
1 Parent(s): 5765c6f

fix: reorder_employees now pushes non-dragged employees to the end

Browse files

Previously only the visible employees' display_order was updated.
Employees absent from the ordered_ids list kept display_order=0,
which caused them to appear at the top (sorted by id ascending).

Now: listed employees → display_order 0..n-1
unlisted employees → display_order n+id (always > n-1)

This ensures the drag-and-drop order is respected even when some
employees are not included in the current list (e.g. future additions).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Files changed (1) hide show
  1. db/repositories.py +10 -0
db/repositories.py CHANGED
@@ -107,8 +107,18 @@ def restore_employee(employee_id: int):
107
  def reorder_employees(ordered_ids: list[int]):
108
  """ドラッグ&ドロップ後の並び順を保存する"""
109
  conn = get_connection()
 
 
110
  for i, emp_id in enumerate(ordered_ids):
111
  conn.execute("UPDATE employees SET display_order=? WHERE id=?", (i, emp_id))
 
 
 
 
 
 
 
 
112
  conn.commit()
113
  conn.close()
114
  cache.delete_memoized(get_all_employees)
 
107
  def reorder_employees(ordered_ids: list[int]):
108
  """ドラッグ&ドロップ後の並び順を保存する"""
109
  conn = get_connection()
110
+ n = len(ordered_ids)
111
+ # 表示中の従業員を 0, 1, 2 ... n-1 に設定
112
  for i, emp_id in enumerate(ordered_ids):
113
  conn.execute("UPDATE employees SET display_order=? WHERE id=?", (i, emp_id))
114
+ # リストに含まれていない従業員(非表示等)を必ず末尾へ
115
+ # display_order = n + id → 常に n-1 より大きい値になりリスト末尾に集まる
116
+ if ordered_ids:
117
+ ph = ",".join(["?"] * n)
118
+ conn.execute(
119
+ f"UPDATE employees SET display_order = ? + id WHERE id NOT IN ({ph})",
120
+ (n, *ordered_ids)
121
+ )
122
  conn.commit()
123
  conn.close()
124
  cache.delete_memoized(get_all_employees)