Ripristino delle quote già misurate nel ciclo in corso dopo un reload (#40)
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -595,6 +595,40 @@ def api_task_progress(task_id: int):
|
||||
return jsonify(row), 200
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Route: quotes already measured in the current cycle (#40)
|
||||
# ---------------------------------------------------------------------------
|
||||
@measure_bp.route("/api/current-cycle/<int:task_id>", methods=["GET"])
|
||||
@login_required
|
||||
@role_required("MeasurementTec")
|
||||
def api_current_cycle(task_id: int):
|
||||
"""Proxy: quotes of this task already measured in the cycle under way.
|
||||
|
||||
The run comes from _current_run_id(), like the rest of the page. Outside a
|
||||
production there is no cycle to restore and the answer is an empty list.
|
||||
"""
|
||||
task_resp = api_client.get(f"/api/tasks/{task_id}")
|
||||
if isinstance(task_resp, dict) and task_resp.get("error"):
|
||||
return jsonify(task_resp), task_resp.get("status_code", 500)
|
||||
|
||||
recipe_id = task_resp.get("recipe_id")
|
||||
if recipe_id and not _recipe_allowed_at_station(recipe_id):
|
||||
abort(403, description=_("Ricetta non assegnata a questa stazione"))
|
||||
|
||||
run_id = _current_run_id()
|
||||
if not run_id:
|
||||
return jsonify({"measurements": []}), 200
|
||||
|
||||
resp = api_client.get(
|
||||
"/api/measurements/current-cycle",
|
||||
params={"production_run_id": run_id, "task_id": task_id},
|
||||
)
|
||||
if not isinstance(resp, dict) or resp.get("error"):
|
||||
# Never fatal: without the restore the screen behaves as it always did.
|
||||
return jsonify({"measurements": []}), 200
|
||||
return jsonify(resp), 200
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Routes: Out-of-tolerance authorisation (point 5)
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
@@ -1100,6 +1100,7 @@ function taskExecute() {
|
||||
this.inputStartedAt = Date.now();
|
||||
// Rejoin whatever production is already open at this station.
|
||||
await this.loadProductionRun();
|
||||
await this.loadCurrentCycle();
|
||||
await this.loadPendingAuthorisation();
|
||||
// A tablet left to sleep drifts (#37.7): catch the countdown back up to
|
||||
// the server's own clock, the same source adoptProductionRun already
|
||||
@@ -1110,6 +1111,42 @@ function taskExecute() {
|
||||
});
|
||||
},
|
||||
|
||||
/* Quotes already measured in the cycle under way (#40).
|
||||
|
||||
A reload, a timer redirect or an auto-logout used to bring every quote back
|
||||
and measuring them again put duplicates in the SPC statistics. Only inside
|
||||
a production: outside one there is no cycle, and the screen starts empty as
|
||||
it always did. */
|
||||
async loadCurrentCycle() {
|
||||
if (!this.isMeasureTask || !this.subtasks.length || !this.productionRun) return;
|
||||
try {
|
||||
const resp = await fetch(
|
||||
'{{ url_for("measure.api_current_cycle", task_id=task.id) }}',
|
||||
);
|
||||
if (!resp.ok) return;
|
||||
const data = await resp.json();
|
||||
const known = new Set(this.subtasks.map(s => s.id));
|
||||
const restored = (data.measurements || []).filter(m => known.has(m.subtask_id));
|
||||
if (!restored.length) return;
|
||||
this.measurements = restored.map(m => {
|
||||
const st = this.subtasks.find(s => s.id === m.subtask_id);
|
||||
const nominal = st ? (st.nominal || 0) : 0;
|
||||
return {
|
||||
subtask_id: m.subtask_id,
|
||||
value: m.value,
|
||||
pass_fail: m.pass_fail,
|
||||
deviation: m.value - nominal,
|
||||
};
|
||||
});
|
||||
const next = this.subtasks.findIndex(
|
||||
s => !this.measurements.some(m => m.subtask_id === s.id),
|
||||
);
|
||||
this.currentIndex = next !== -1 ? next : this.subtasks.length - 1;
|
||||
} catch (e) {
|
||||
// Offline: the screen starts empty, as before.
|
||||
}
|
||||
},
|
||||
|
||||
/* Is a quote already waiting for the capoturno?
|
||||
|
||||
Reloading the page was the simplest way past the old gate. It is not one
|
||||
|
||||
@@ -248,6 +248,67 @@ class TestApiTaskProgress:
|
||||
assert resp.status_code in (302, 401)
|
||||
|
||||
|
||||
class TestApiCurrentCycle:
|
||||
"""GET /measure/api/current-cycle/<task_id> (gitea#40)."""
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def _station_configured(self, monkeypatch):
|
||||
monkeypatch.setattr("blueprints.measure.Config.STATION_CODE", "ST-TEST")
|
||||
|
||||
def test_forwards_run_and_task(self, logged_in_client, mock_api_client):
|
||||
mock_api_client.get_station_recipes.return_value = [{"id": 1}]
|
||||
payload = {"measurements": [
|
||||
{"subtask_id": 3, "value": 10.1, "pass_fail": "pass",
|
||||
"measured_at": "2026-10-01T08:01:00"},
|
||||
]}
|
||||
mock_api_client.get.side_effect = api_get_router({
|
||||
"/api/tasks/7": {"id": 7, "recipe_id": 1, "version_id": 42},
|
||||
"/api/production-runs/current": {"id": 5},
|
||||
"/api/measurements/current-cycle": payload,
|
||||
})
|
||||
|
||||
resp = logged_in_client.get("/measure/api/current-cycle/7")
|
||||
|
||||
assert resp.status_code == 200
|
||||
assert resp.get_json() == payload
|
||||
call = next(
|
||||
c for c in mock_api_client.get.call_args_list
|
||||
if c.args[0] == "/api/measurements/current-cycle"
|
||||
)
|
||||
assert call.kwargs["params"] == {"production_run_id": 5, "task_id": 7}
|
||||
|
||||
def test_no_run_means_empty_and_no_backend_call(
|
||||
self, logged_in_client, mock_api_client,
|
||||
):
|
||||
mock_api_client.get_station_recipes.return_value = [{"id": 1}]
|
||||
mock_api_client.get.side_effect = api_get_router({
|
||||
"/api/tasks/7": {"id": 7, "recipe_id": 1, "version_id": 42},
|
||||
"/api/production-runs/current": None,
|
||||
})
|
||||
|
||||
resp = logged_in_client.get("/measure/api/current-cycle/7")
|
||||
|
||||
assert resp.get_json() == {"measurements": []}
|
||||
assert not any(
|
||||
c.args[0] == "/api/measurements/current-cycle"
|
||||
for c in mock_api_client.get.call_args_list
|
||||
)
|
||||
|
||||
def test_refuses_a_recipe_not_assigned_to_this_station(
|
||||
self, logged_in_client, mock_api_client,
|
||||
):
|
||||
mock_api_client.get_station_recipes.return_value = [{"id": 99}]
|
||||
mock_api_client.get.side_effect = api_get_router({
|
||||
"/api/tasks/7": {"id": 7, "recipe_id": 1, "version_id": 42},
|
||||
})
|
||||
|
||||
assert logged_in_client.get("/measure/api/current-cycle/7").status_code == 403
|
||||
|
||||
def test_requires_login(self, client):
|
||||
resp = client.get("/measure/api/current-cycle/7")
|
||||
assert resp.status_code in (302, 401)
|
||||
|
||||
|
||||
class TestStartSequence:
|
||||
"""GET /measure/start/<recipe_id> — the operator's way in."""
|
||||
|
||||
|
||||
Reference in New Issue
Block a user