m1m02530125 Claude Sonnet 4.6 commited on
Commit
ee2b6ed
ยท
1 Parent(s): a5f60d9

Fix infinite generation loop and improve progress visibility

Browse files

- web_app.py: reset stuck 'generating' status on startup (survives hot-reload/crash)
- db/database.py: set SQLite timeout=30s and enable WAL mode to prevent write-lock failures
- optimizer/solver.py: fix _solve_best_effort ignoring always_available flags; add phase/score tracking to progress callback; notify phase-2 start when falling back to best-effort
- routes/generate.py: pass period_id to solve(); expose phase/obj fields in status endpoint
- waiting.html: rAF-driven smooth bar (moves from page load, not first callback); phase labels (step 1/2 vs 2/2); objective score display with delta; 90s client-side timeout

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

db/database.py CHANGED
@@ -72,9 +72,10 @@ class Connection:
72
  else:
73
  import sqlite3
74
  _DB_PATH.parent.mkdir(parents=True, exist_ok=True)
75
- self._conn = sqlite3.connect(str(_DB_PATH))
76
  self._conn.row_factory = sqlite3.Row
77
  self._conn.execute("PRAGMA foreign_keys = ON")
 
78
  self._pool = None
79
  self.backend = "sqlite"
80
  self.lastrowid = None
 
72
  else:
73
  import sqlite3
74
  _DB_PATH.parent.mkdir(parents=True, exist_ok=True)
75
+ self._conn = sqlite3.connect(str(_DB_PATH), timeout=30)
76
  self._conn.row_factory = sqlite3.Row
77
  self._conn.execute("PRAGMA foreign_keys = ON")
78
+ self._conn.execute("PRAGMA journal_mode = WAL")
79
  self._pool = None
80
  self.backend = "sqlite"
81
  self.lastrowid = None
optimizer/solver.py CHANGED
@@ -51,11 +51,15 @@ class SolveProgressCallback(cp_model.CpSolverSolutionCallback):
51
  return
52
  self._last_update = elapsed
53
  pct = min(90, int(elapsed / self._max_time * 100))
 
 
 
 
54
  try:
55
  from db import repositories as repo
56
  repo.update_period_gen_status(
57
  self._period_id, "generating",
58
- f"progress:{pct},solutions:{self._n},elapsed:{elapsed:.1f}"
59
  )
60
  except Exception:
61
  pass
@@ -67,6 +71,7 @@ def solve(
67
  requests: list[ShiftRequest],
68
  config: SolverConfig | None = None,
69
  progress_callback: SolveProgressCallback | None = None,
 
70
  ) -> SolveResult:
71
  """
72
  ใ‚ทใƒ•ใƒˆใ‚’ๆœ€้ฉๅŒ–ใ—ใฆ SolveResult ใ‚’่ฟ”ใ™ใ€‚
@@ -434,6 +439,9 @@ def solve(
434
  # ๅฎŸ่กŒไธๅฏ่ƒฝ โ†’ ๅˆถ็ด„้•ๅใฎ่จบๆ–ญใƒกใƒƒใ‚ปใƒผใ‚ธใ‚’ๅŽ้›†
435
  errs = _diagnose_infeasible(active_employees, date_strs, req_map)
436
 
 
 
 
437
  # ใƒ™ใ‚นใƒˆใ‚จใƒ•ใ‚ฉใƒผใƒˆ็”Ÿๆˆ: ไบบๆ•ฐใƒปใƒชใƒผใƒ€ใƒผๅˆถ็ด„ใ‚’ใ‚ฝใƒ•ใƒˆๅŒ–ใ—ใฆๅ†ๅฎŸ่กŒ
438
  best_assignments, best_warnings = _solve_best_effort(
439
  active_employees, date_strs, slots, positions,
@@ -450,6 +458,19 @@ def solve(
450
  )
451
 
452
 
 
 
 
 
 
 
 
 
 
 
 
 
 
453
  def _extract_assignments(solver, assign, active_employees, date_strs, slots, positions) -> list[ShiftAssignment]:
454
  result = []
455
  for emp in active_employees:
@@ -502,7 +523,12 @@ def _solve_best_effort(
502
  for emp in active_employees:
503
  for ds in date_strs:
504
  for slot in slots:
505
- can_work = req_map.get((emp.id, ds, slot.value), False)
 
 
 
 
 
506
  for pos in positions:
507
  if not can_work:
508
  model.add(assign[emp.id][ds][slot.value][pos.value] == 0)
@@ -631,7 +657,7 @@ def _diagnose_infeasible(
631
 
632
  for ds in date_strs:
633
  d = date.fromisoformat(ds)
634
- dow_labels = ["ๆœˆ", "็ซ", "ๆฐด", "ๆœจ", "้‡‘", "ๆ—ฅ", "ๆ—ฅ"]
635
  label = f"{d.month}/{d.day}({dow_labels[d.weekday()]})"
636
 
637
  for slot in TimeSlot:
 
51
  return
52
  self._last_update = elapsed
53
  pct = min(90, int(elapsed / self._max_time * 100))
54
+ try:
55
+ obj = int(self.ObjectiveValue())
56
+ except Exception:
57
+ obj = -1
58
  try:
59
  from db import repositories as repo
60
  repo.update_period_gen_status(
61
  self._period_id, "generating",
62
+ f"phase:1,progress:{pct},solutions:{self._n},elapsed:{elapsed:.1f},obj:{obj}"
63
  )
64
  except Exception:
65
  pass
 
71
  requests: list[ShiftRequest],
72
  config: SolverConfig | None = None,
73
  progress_callback: SolveProgressCallback | None = None,
74
+ period_id: int | None = None,
75
  ) -> SolveResult:
76
  """
77
  ใ‚ทใƒ•ใƒˆใ‚’ๆœ€้ฉๅŒ–ใ—ใฆ SolveResult ใ‚’่ฟ”ใ™ใ€‚
 
439
  # ๅฎŸ่กŒไธๅฏ่ƒฝ โ†’ ๅˆถ็ด„้•ๅใฎ่จบๆ–ญใƒกใƒƒใ‚ปใƒผใ‚ธใ‚’ๅŽ้›†
440
  errs = _diagnose_infeasible(active_employees, date_strs, req_map)
441
 
442
+ # ใƒ•ใ‚งใƒผใ‚บ2้–‹ๅง‹ใ‚’้€š็Ÿฅ
443
+ _notify_phase2(period_id or (progress_callback._period_id if progress_callback else None))
444
+
445
  # ใƒ™ใ‚นใƒˆใ‚จใƒ•ใ‚ฉใƒผใƒˆ็”Ÿๆˆ: ไบบๆ•ฐใƒปใƒชใƒผใƒ€ใƒผๅˆถ็ด„ใ‚’ใ‚ฝใƒ•ใƒˆๅŒ–ใ—ใฆๅ†ๅฎŸ่กŒ
446
  best_assignments, best_warnings = _solve_best_effort(
447
  active_employees, date_strs, slots, positions,
 
458
  )
459
 
460
 
461
+ def _notify_phase2(period_id):
462
+ if period_id is None:
463
+ return
464
+ try:
465
+ from db import repositories as repo
466
+ repo.update_period_gen_status(
467
+ period_id, "generating",
468
+ "phase:2,progress:0,solutions:0,elapsed:0,obj:-1"
469
+ )
470
+ except Exception:
471
+ pass
472
+
473
+
474
  def _extract_assignments(solver, assign, active_employees, date_strs, slots, positions) -> list[ShiftAssignment]:
475
  result = []
476
  for emp in active_employees:
 
523
  for emp in active_employees:
524
  for ds in date_strs:
525
  for slot in slots:
526
+ if slot == TimeSlot.BREAKFAST and emp.always_available_breakfast:
527
+ can_work = ds not in emp.fixed_unavailable_dates
528
+ elif slot == TimeSlot.DINNER and emp.always_available_dinner:
529
+ can_work = ds not in emp.fixed_unavailable_dates
530
+ else:
531
+ can_work = req_map.get((emp.id, ds, slot.value), False)
532
  for pos in positions:
533
  if not can_work:
534
  model.add(assign[emp.id][ds][slot.value][pos.value] == 0)
 
657
 
658
  for ds in date_strs:
659
  d = date.fromisoformat(ds)
660
+ dow_labels = ["ๆœˆ", "็ซ", "ๆฐด", "ๆœจ", "้‡‘", "ๅœŸ", "ๆ—ฅ"]
661
  label = f"{d.month}/{d.day}({dow_labels[d.weekday()]})"
662
 
663
  for slot in TimeSlot:
routes/generate.py CHANGED
@@ -53,7 +53,7 @@ def run():
53
  with app.app_context():
54
  try:
55
  cb = SolveProgressCallback(period_id, max_time=25.0)
56
- result = solve(period, employees, requests_list, config, progress_callback=cb)
57
  if result.status in ("optimal", "feasible"):
58
  repo.save_assignments(period_id, result.assignments)
59
  msg = f"{result.status},{result.solve_time_sec:.1f}"
@@ -85,8 +85,12 @@ def status(period_id):
85
  msg = gen.get("message", "")
86
  elapsed = 0.0
87
  solutions = 0
88
- if gen["status"] == "generating" and msg.startswith("progress:"):
 
 
89
  parts = dict(kv.split(":") for kv in msg.split(",") if ":" in kv)
90
  elapsed = float(parts.get("elapsed", 0))
91
  solutions = int(parts.get("solutions", 0))
92
- return jsonify({**gen, "elapsed": elapsed, "solutions": solutions})
 
 
 
53
  with app.app_context():
54
  try:
55
  cb = SolveProgressCallback(period_id, max_time=25.0)
56
+ result = solve(period, employees, requests_list, config, progress_callback=cb, period_id=period_id)
57
  if result.status in ("optimal", "feasible"):
58
  repo.save_assignments(period_id, result.assignments)
59
  msg = f"{result.status},{result.solve_time_sec:.1f}"
 
85
  msg = gen.get("message", "")
86
  elapsed = 0.0
87
  solutions = 0
88
+ phase = 1
89
+ obj = -1
90
+ if gen["status"] == "generating" and ("progress:" in msg or "phase:" in msg):
91
  parts = dict(kv.split(":") for kv in msg.split(",") if ":" in kv)
92
  elapsed = float(parts.get("elapsed", 0))
93
  solutions = int(parts.get("solutions", 0))
94
+ phase = int(parts.get("phase", 1))
95
+ obj = int(parts.get("obj", -1))
96
+ return jsonify({**gen, "elapsed": elapsed, "solutions": solutions, "phase": phase, "obj": obj})
templates/generate/waiting.html CHANGED
@@ -6,85 +6,215 @@
6
  </div>
7
 
8
  <div class="content">
9
- <div class="card mx-auto" style="max-width:480px">
10
  <div class="card-body py-4 text-center">
11
  <div class="mb-3">
12
- <i class="bi bi-cpu fs-1 text-primary"></i>
13
  </div>
14
  <h6 class="mb-1">{{ period.start_date }} ใ€œ {{ period.end_date }}</h6>
15
- <p class="text-muted small mb-4" id="status-msg">่งฃใ‚’ๆŽข็ดขใ—ใฆใ„ใพใ™โ€ฆ</p>
 
 
16
 
17
- <!-- ใƒ—ใƒญใ‚ฐใƒฌใ‚นใƒใƒผ๏ผˆๅฎŸ้š›ใฎ็ตŒ้Žๆ™‚้–“ใƒ™ใƒผใ‚น๏ผ‰ -->
18
- <div class="progress mb-2" style="height:12px;border-radius:6px">
 
 
 
 
 
 
 
 
19
  <div id="prog-bar"
20
  class="progress-bar progress-bar-striped progress-bar-animated bg-primary"
21
  role="progressbar"
22
- style="width:0%;transition:width 0.8s ease-out">
23
  </div>
24
  </div>
25
- <div class="d-flex justify-content-between small text-muted">
 
 
26
  <span id="elapsed-label">ๅพ…ๆฉŸไธญโ€ฆ</span>
27
  <span id="solution-label"></span>
28
  </div>
 
 
 
 
 
 
 
29
  </div>
30
  </div>
31
  </div>
32
 
33
  <script>
34
  (function () {
35
- const MAX_SEC = 25.0;
36
- const periodId = {{ period.id }};
 
 
37
  const scheduleUrl = "{{ url_for('schedule.index', period_id=period.id) }}";
38
- const bar = document.getElementById('prog-bar');
39
- const elapsedLabel = document.getElementById('elapsed-label');
40
- const solutionLabel = document.getElementById('solution-label');
41
- const statusMsg = document.getElementById('status-msg');
42
-
43
- function setBar(pct, animate) {
44
- bar.style.transition = animate ? 'width 0.8s ease-out' : 'none';
45
- bar.style.width = Math.min(100, pct) + '%';
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
46
  }
47
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
48
  function poll() {
 
 
 
 
 
49
  fetch("{{ url_for('generate.status', period_id=period.id) }}")
50
  .then(r => r.json())
51
  .then(data => {
52
  if (data.status === 'done') {
53
- setBar(100, true);
54
- bar.classList.remove('progress-bar-animated', 'bg-primary');
55
- bar.classList.add('bg-success');
56
- elapsedLabel.textContent = 'ๅฎŒไบ†';
57
- statusMsg.textContent = '็”ŸๆˆๅฎŒไบ†๏ผใ‚ทใƒ•ใƒˆ่กจใซ็งปๅ‹•ใ—ใพใ™โ€ฆ';
58
- setTimeout(() => { window.location.href = scheduleUrl; }, 800);
59
-
60
  } else if (data.status === 'failed') {
61
- setBar(100, false);
62
- bar.classList.remove('progress-bar-animated', 'bg-primary');
63
- bar.classList.add('bg-danger');
64
- elapsedLabel.textContent = 'ใ‚จใƒฉใƒผ';
65
- statusMsg.textContent = 'ใ‚จใƒฉใƒผ: ' + (data.message || '็”Ÿๆˆใซๅคฑๆ•—ใ—ใพใ—ใŸ');
66
-
67
  } else {
68
- // generating: elapsed ใฏใ‚ณใƒผใƒซใƒใƒƒใ‚ฏใŒๅˆใ‚ใฆๅ‘ผใฐใ‚Œใฆใ‹ใ‚‰ๅฑŠใ
69
- const elapsed = data.elapsed || 0;
70
- if (elapsed > 0) {
71
- const pct = Math.min(95, (elapsed / MAX_SEC) * 100);
72
- setBar(pct, true);
73
- elapsedLabel.textContent = elapsed.toFixed(1) + '็ง’็ตŒ้Ž / ๆœ€ๅคง็ด„' + MAX_SEC + '็ง’';
74
- } else {
75
- // ใพใ ใ‚ณใƒผใƒซใƒใƒƒใ‚ฏๆœช็€็ซ๏ผๅฏ่ƒฝ่งฃใ™ใ‚‰่ฆ‹ใคใ‹ใฃใฆใ„ใชใ„
76
- elapsedLabel.textContent = '่งฃใ‚’ๆŽข็ดขไธญโ€ฆ';
77
- }
78
-
79
- if (data.solutions > 0) {
80
- solutionLabel.textContent = '่งฃ ' + data.solutions + ' ๅ€‹็™บ่ฆ‹';
81
- if (data.solutions === 1) {
82
- statusMsg.textContent = 'ๅˆๆœŸ่งฃใ‚’็™บ่ฆ‹ใ€‚ใ‚ˆใ‚Š่‰ฏใ„่งฃใ‚’ๆŽข็ดขไธญโ€ฆ';
83
- } else {
84
- statusMsg.textContent = '่งฃใ‚’ๆ”นๅ–„ไธญโ€ฆ๏ผˆ' + data.solutions + ' ๅ›žๆ›ดๆ–ฐ๏ผ‰';
85
- }
86
- }
87
-
88
  setTimeout(poll, 2000);
89
  }
90
  })
 
6
  </div>
7
 
8
  <div class="content">
9
+ <div class="card mx-auto" style="max-width:520px">
10
  <div class="card-body py-4 text-center">
11
  <div class="mb-3">
12
+ <i class="bi bi-cpu fs-1 text-primary" id="status-icon"></i>
13
  </div>
14
  <h6 class="mb-1">{{ period.start_date }} ใ€œ {{ period.end_date }}</h6>
15
+ <p class="mb-3" id="status-msg" style="min-height:1.4em">
16
+ <span class="text-muted small">ใƒขใƒ‡ใƒซใ‚’ๆง‹็ฏ‰ใ—ใฆใ„ใพใ™โ€ฆ</span>
17
+ </p>
18
 
19
+ <!-- ใƒ•ใ‚งใƒผใ‚บ่กจ็คบ -->
20
+ <div class="d-flex justify-content-between align-items-center small mb-1">
21
+ <span id="phase-label" class="fw-semibold text-primary">
22
+ <i class="bi bi-search me-1"></i>ใ‚นใƒ†ใƒƒใƒ— 1/2: ๆœ€้ฉ่งฃใ‚’ๆŽข็ดขไธญ
23
+ </span>
24
+ <span id="pct-label" class="text-muted">0%</span>
25
+ </div>
26
+
27
+ <!-- ใƒ—ใƒญใ‚ฐใƒฌใ‚นใƒใƒผ -->
28
+ <div class="progress mb-2" style="height:14px;border-radius:7px">
29
  <div id="prog-bar"
30
  class="progress-bar progress-bar-striped progress-bar-animated bg-primary"
31
  role="progressbar"
32
+ style="width:0%">
33
  </div>
34
  </div>
35
+
36
+ <!-- ็ตŒ้Žๆ™‚้–“ & ็™บ่ฆ‹ๆ•ฐ -->
37
+ <div class="d-flex justify-content-between small text-muted mb-2">
38
  <span id="elapsed-label">ๅพ…ๆฉŸไธญโ€ฆ</span>
39
  <span id="solution-label"></span>
40
  </div>
41
+
42
+ <!-- ใ‚นใ‚ณใ‚ข่กŒ๏ผˆ่งฃใŒ่ฆ‹ใคใ‹ใฃใŸใจใใ ใ‘่กจ็คบ๏ผ‰ -->
43
+ <div id="score-row" class="small p-2 rounded" style="display:none;background:var(--bs-light,#f8f9fa)">
44
+ <i class="bi bi-graph-down-arrow me-1 text-success"></i>
45
+ ใ‚นใ‚ณใ‚ขๆœ€ๅฐๅŒ–ไธญ: <strong id="score-label">โ€“</strong>
46
+ <span id="score-hint" class="text-muted ms-1"></span>
47
+ </div>
48
  </div>
49
  </div>
50
  </div>
51
 
52
  <script>
53
  (function () {
54
+ // โ”€โ”€ ๅฎšๆ•ฐ โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€
55
+ const MAX_SEC_P1 = 25.0; // ใƒ•ใ‚งใƒผใ‚บ1ใฎๆœ€ๅคง็ง’ๆ•ฐ
56
+ const MAX_SEC_P2 = 15.0; // ใƒ•ใ‚งใƒผใ‚บ2ใฎๆœ€ๅคง็ง’ๆ•ฐ
57
+ const TIMEOUT_SEC = 90; // ใ“ใ‚Œใ‚’่ถ…ใˆใŸใ‚‰็•ฐๅธธใจใฟใชใ™
58
  const scheduleUrl = "{{ url_for('schedule.index', period_id=period.id) }}";
59
+
60
+ // โ”€โ”€ DOM โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€
61
+ const bar = document.getElementById('prog-bar');
62
+ const pctLabel = document.getElementById('pct-label');
63
+ const phaseLabel = document.getElementById('phase-label');
64
+ const elapsedLabel= document.getElementById('elapsed-label');
65
+ const solutionLabel=document.getElementById('solution-label');
66
+ const statusMsg = document.getElementById('status-msg');
67
+ const scoreRow = document.getElementById('score-row');
68
+ const scoreLabel = document.getElementById('score-label');
69
+ const scoreHint = document.getElementById('score-hint');
70
+
71
+ // โ”€โ”€ ็Šถๆ…‹ โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€
72
+ const pageStart = Date.now(); // ใƒšใƒผใ‚ธ่ชญใฟ่พผใฟๅŸบ็‚น
73
+ let phase2Start = null; // ใƒ•ใ‚งใƒผใ‚บ2ใซๅ…ฅใฃใŸ wall-clock
74
+ let lastServerElapsed = 0; // ๆœ€ๅพŒใซใ‚ตใƒผใƒใƒผใ‹ใ‚‰ๅ—ใ‘ๅ–ใฃใŸ elapsed
75
+ let lastServerAt = Date.now(); // ใใฎใจใใฎใ‚ฏใƒฉใ‚คใ‚ขใƒณใƒˆๆ™‚ๅˆป
76
+ let currentPhase = 1;
77
+ let prevObj = null;
78
+ let rafId = null;
79
+
80
+ // โ”€โ”€ ใƒใƒผๆ็”ป โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€
81
+ function setBar(pct) {
82
+ const p = Math.min(100, Math.max(0, pct));
83
+ bar.style.width = p + '%';
84
+ pctLabel.textContent = Math.round(p) + '%';
85
+ }
86
+
87
+ // โ”€โ”€ ใ‚ฏใƒฉใ‚คใ‚ขใƒณใƒˆๅดใ‚ขใƒ‹ใƒกใƒผใ‚ทใƒงใƒณ๏ผˆ60fps๏ผ‰ โ”€โ”€โ”€โ”€โ”€โ”€๏ฟฝ๏ฟฝ๏ฟฝโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€
88
+ function tick() {
89
+ const nowMs = Date.now();
90
+
91
+ if (currentPhase === 1) {
92
+ // ใ‚ตใƒผใƒใƒผ elapsed + ใ‚ฏใƒฉใ‚คใ‚ขใƒณใƒˆ่ฃœ้–“
93
+ const clientDelta = (nowMs - lastServerAt) / 1000;
94
+ const estimated = lastServerElapsed + clientDelta;
95
+ setBar(Math.min(95, (estimated / MAX_SEC_P1) * 100));
96
+ elapsedLabel.textContent = estimated.toFixed(1) + '็ง’็ตŒ้Ž / ๆœ€ๅคง' + MAX_SEC_P1 + '็ง’';
97
+ } else {
98
+ // ใƒ•ใ‚งใƒผใ‚บ2: phase2Start ใ‹ใ‚‰ใฎ็ตŒ้Ž
99
+ if (phase2Start !== null) {
100
+ const p2elapsed = (nowMs - phase2Start) / 1000;
101
+ setBar(Math.min(95, (p2elapsed / MAX_SEC_P2) * 100));
102
+ elapsedLabel.textContent = p2elapsed.toFixed(1) + '็ง’็ตŒ้Ž / ๆœ€ๅคง' + MAX_SEC_P2 + '็ง’';
103
+ }
104
+ }
105
+
106
+ rafId = requestAnimationFrame(tick);
107
+ }
108
+ rafId = requestAnimationFrame(tick);
109
+
110
+ // โ”€โ”€ ใ‚ตใƒผใƒใƒผๆ›ดๆ–ฐใ‚’ๅๆ˜  โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€
111
+ function applyGenerating(data) {
112
+ const newPhase = data.phase || 1;
113
+
114
+ if (newPhase === 2 && currentPhase === 1) {
115
+ // ใƒ•ใ‚งใƒผใ‚บๅˆ‡ใ‚Šๆ›ฟใˆ
116
+ currentPhase = 2;
117
+ phase2Start = Date.now();
118
+ phaseLabel.innerHTML =
119
+ '<i class="bi bi-arrow-repeat me-1"></i>ใ‚นใƒ†ใƒƒใƒ— 2/2: ใƒ™ใ‚นใƒˆใ‚จใƒ•ใ‚ฉใƒผใƒˆใงๅ†ๆง‹็ฏ‰ไธญ';
120
+ phaseLabel.classList.replace('text-primary', 'text-warning');
121
+ bar.classList.replace('bg-primary', 'bg-warning');
122
+ statusMsg.innerHTML =
123
+ '<span class="text-warning small">ๅˆถ็ด„ใ‚’็ทฉๅ’Œใ—ใฆๅฎŸ่กŒๅฏ่ƒฝใชใ‚ทใƒ•ใƒˆใ‚’็”Ÿๆˆใ—ใฆใ„ใพใ™โ€ฆ</span>';
124
+ solutionLabel.textContent = '';
125
+ scoreRow.style.display = 'none';
126
+ return;
127
+ }
128
+
129
+ if (newPhase === 1) {
130
+ lastServerElapsed = data.elapsed || 0;
131
+ lastServerAt = Date.now();
132
+
133
+ const n = data.solutions || 0;
134
+ if (n > 0) {
135
+ solutionLabel.textContent = '่งฃ ' + n + ' ไปถ็™บ่ฆ‹';
136
+ if (n === 1) {
137
+ statusMsg.innerHTML =
138
+ '<span class="text-primary small fw-semibold">ๅˆๆœŸ่งฃใ‚’็™บ่ฆ‹ โ€” ใ‚ˆใ‚Š่‰ฏใ„่งฃใ‚’ๆŽข็ดขไธญโ€ฆ</span>';
139
+ } else {
140
+ statusMsg.innerHTML =
141
+ '<span class="text-primary small fw-semibold">่งฃใ‚’ๆ”นๅ–„ไธญ๏ผˆ' + n + ' ๅ›žๆ›ดๆ–ฐ๏ผ‰</span>';
142
+ }
143
+ } else {
144
+ statusMsg.innerHTML =
145
+ '<span class="text-muted small">ๅˆถ็ด„ใ‚’ๆบ€ใŸใ™ๅˆๆœŸ่งฃใ‚’ๆŽข็ดขไธญโ€ฆ</span>';
146
+ }
147
+
148
+ // ใ‚นใ‚ณใ‚ข่กจ็คบ
149
+ const obj = data.obj;
150
+ if (obj !== undefined && obj >= 0) {
151
+ scoreRow.style.display = '';
152
+ scoreLabel.textContent = obj.toLocaleString();
153
+ if (prevObj !== null && obj < prevObj) {
154
+ const diff = prevObj - obj;
155
+ scoreHint.textContent = '(โ–ผ' + diff.toLocaleString() + ' ๆ”นๅ–„)';
156
+ } else {
157
+ scoreHint.textContent = '';
158
+ }
159
+ prevObj = obj;
160
+ }
161
+ }
162
  }
163
 
164
+ // โ”€โ”€ ๅฎŒไบ†ใƒปใ‚จใƒฉใƒผๅ‡ฆ็† โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€
165
+ function finish(ok, msg) {
166
+ cancelAnimationFrame(rafId);
167
+ setBar(100);
168
+ bar.classList.remove('progress-bar-animated', 'progress-bar-striped',
169
+ 'bg-primary', 'bg-warning');
170
+ bar.style.transition = 'width 0.5s ease-out';
171
+ if (ok) {
172
+ bar.classList.add('bg-success');
173
+ phaseLabel.innerHTML = '<i class="bi bi-check-circle me-1"></i>็”ŸๆˆๅฎŒไบ†';
174
+ phaseLabel.classList.remove('text-primary', 'text-warning');
175
+ phaseLabel.classList.add('text-success');
176
+ elapsedLabel.textContent = 'ๅฎŒไบ†';
177
+ statusMsg.innerHTML =
178
+ '<span class="text-success fw-semibold">ใ‚ทใƒ•ใƒˆ่กจใซ็งปๅ‹•ใ—ใพใ™โ€ฆ</span>';
179
+ setTimeout(() => { window.location.href = scheduleUrl; }, 800);
180
+ } else {
181
+ bar.classList.add('bg-danger');
182
+ phaseLabel.innerHTML = '<i class="bi bi-exclamation-triangle me-1"></i>็”Ÿๆˆๅคฑๆ•—';
183
+ phaseLabel.classList.remove('text-primary', 'text-warning');
184
+ phaseLabel.classList.add('text-danger');
185
+ elapsedLabel.textContent = 'ใ‚จใƒฉใƒผ';
186
+ statusMsg.innerHTML =
187
+ '<span class="text-danger small">' + (msg || '็”Ÿๆˆใซๅคฑๆ•—ใ—ใพใ—ใŸ') + '</span>';
188
+ }
189
+ }
190
+
191
+ function showTimeout() {
192
+ cancelAnimationFrame(rafId);
193
+ bar.classList.remove('progress-bar-animated', 'bg-primary', 'bg-warning');
194
+ bar.classList.add('bg-secondary');
195
+ phaseLabel.innerHTML = '<i class="bi bi-clock-history me-1"></i>ๅฟœ็ญ”ใชใ—';
196
+ phaseLabel.className = 'fw-semibold text-secondary';
197
+ elapsedLabel.textContent = 'ใ‚ฟใ‚คใƒ ใ‚ขใ‚ฆใƒˆ';
198
+ statusMsg.innerHTML =
199
+ '<span class="text-muted small">ใƒšใƒผใ‚ธใ‚’ๅ†่ชญใฟ่พผใฟใ—ใฆๅ†ๅบฆใŠ่ฉฆใ—ใใ ใ•ใ„ใ€‚</span>';
200
+ }
201
+
202
+ // โ”€โ”€ ใƒใƒผใƒชใƒณใ‚ฐ โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€๏ฟฝ๏ฟฝ๏ฟฝโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€
203
  function poll() {
204
+ if ((Date.now() - pageStart) / 1000 > TIMEOUT_SEC) {
205
+ showTimeout();
206
+ return;
207
+ }
208
+
209
  fetch("{{ url_for('generate.status', period_id=period.id) }}")
210
  .then(r => r.json())
211
  .then(data => {
212
  if (data.status === 'done') {
213
+ finish(true);
 
 
 
 
 
 
214
  } else if (data.status === 'failed') {
215
+ finish(false, data.message);
 
 
 
 
 
216
  } else {
217
+ applyGenerating(data);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
218
  setTimeout(poll, 2000);
219
  }
220
  })
web_app.py CHANGED
@@ -17,6 +17,18 @@ def create_app():
17
 
18
  initialize_db()
19
 
 
 
 
 
 
 
 
 
 
 
 
 
20
  from routes.employees import bp as emp_bp
21
  from routes.shifts import bp as shifts_bp
22
  from routes.generate import bp as gen_bp
 
17
 
18
  initialize_db()
19
 
20
+ # ใ‚ฏใƒฉใƒƒใ‚ทใƒฅ/ใƒชใƒญใƒผใƒ‰ๅพŒใซ "generating" ใฎใพใพใ‚นใ‚ฟใƒƒใ‚ฏใ—ใŸ็Šถๆ…‹ใ‚’ใƒชใ‚ปใƒƒใƒˆ
21
+ try:
22
+ from db.database import Connection as _Conn
23
+ _c = _Conn()
24
+ _c.execute(
25
+ "UPDATE schedule_periods SET gen_status='idle', gen_message='' WHERE gen_status='generating'"
26
+ )
27
+ _c.commit()
28
+ _c.close()
29
+ except Exception:
30
+ pass
31
+
32
  from routes.employees import bp as emp_bp
33
  from routes.shifts import bp as shifts_bp
34
  from routes.generate import bp as gen_bp