Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c6d4260ede | |||
| c8dd5eecfd | |||
| f7d6d008c7 | |||
| 837f3d1069 | |||
| f5a2affa0f | |||
| 7ef28b7a9f | |||
| 06b87a15b3 | |||
| 3b3ecceb2a | |||
| e44ac3129f | |||
| 4e52095423 | |||
| 23bfc93f1c | |||
| 6648882ec1 | |||
| b5aa19170e | |||
| 2d03577165 | |||
| 27dc5e77af | |||
| 8e3316957c | |||
| 3c1d5f1323 | |||
| db5d686938 | |||
| c764cf73c6 |
@@ -20,7 +20,8 @@ from src.backend.models.api.production import (
|
||||
)
|
||||
from src.backend.models.orm.production import ProductionRun
|
||||
from src.backend.models.orm.user import User
|
||||
from src.backend.services import auth_service, production_service
|
||||
from src.backend.models.api.monitor import MonitorRun
|
||||
from src.backend.services import auth_service, monitor_service, production_service
|
||||
|
||||
router = APIRouter(prefix="/api/production-runs", tags=["production"])
|
||||
|
||||
@@ -81,6 +82,27 @@ async def get_current_production_run(
|
||||
return await _as_response(db, run) if run is not None else None
|
||||
|
||||
|
||||
async def _require_high_authority(user: User = Depends(get_current_user)) -> User:
|
||||
"""Monitor of all stations (#57): admin or Supervisor (capoturno) only."""
|
||||
if user.is_admin or user.has_role("Supervisor"):
|
||||
return user
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_403_FORBIDDEN, detail="Supervisor role required",
|
||||
)
|
||||
|
||||
|
||||
@router.get("/open", response_model=list[MonitorRun])
|
||||
async def list_open_production_runs(
|
||||
user: User = Depends(_require_high_authority),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
):
|
||||
"""Every open run with timer, last event and recent measurements (#57).
|
||||
|
||||
Declared before /{run_id} so "open" is not parsed as a run id.
|
||||
"""
|
||||
return await monitor_service.list_open_runs(db)
|
||||
|
||||
|
||||
@router.get("/{run_id}", response_model=ProductionRunWithEventsResponse)
|
||||
async def get_production_run(
|
||||
run_id: int,
|
||||
|
||||
@@ -9,6 +9,7 @@ from src.backend.api.middleware.api_key import get_current_user, require_maker,
|
||||
from src.backend.models.orm.user import User
|
||||
from src.backend.models.api.recipe import (
|
||||
RecipeCreate,
|
||||
RecipeDuplicate,
|
||||
RecipeListResponse,
|
||||
RecipeResponse,
|
||||
RecipeUpdate,
|
||||
@@ -52,6 +53,18 @@ async def create_recipe(
|
||||
return _recipe_to_response(recipe)
|
||||
|
||||
|
||||
@router.post("/{recipe_id}/duplicate", response_model=RecipeResponse, status_code=201)
|
||||
async def duplicate_recipe(
|
||||
recipe_id: int,
|
||||
data: RecipeDuplicate,
|
||||
user: User = Depends(require_maker),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
):
|
||||
"""Duplicate a recipe with its current tasks under a new code (#52). Requires Maker role."""
|
||||
recipe = await recipe_service.duplicate_recipe(db, recipe_id, data.code, data.name, user)
|
||||
return _recipe_to_response(recipe)
|
||||
|
||||
|
||||
@router.get("", response_model=RecipeListResponse)
|
||||
async def list_recipes(
|
||||
page: int = Query(1, ge=1),
|
||||
|
||||
@@ -23,6 +23,7 @@ async def download_spc_report(
|
||||
operator_id: int | None = Query(None),
|
||||
lot_number: str | None = Query(None),
|
||||
serial_number: str | None = Query(None),
|
||||
production_run_id: int | None = Query(None), # #58
|
||||
user: User = Depends(require_metrologist),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> Response:
|
||||
@@ -32,6 +33,7 @@ async def download_spc_report(
|
||||
db, recipe_id, subtask_id,
|
||||
version_id, date_from, date_to,
|
||||
operator_id, lot_number, serial_number,
|
||||
production_run_id=production_run_id, # #58
|
||||
)
|
||||
except Exception as e:
|
||||
raise HTTPException(
|
||||
@@ -57,6 +59,7 @@ async def download_measurement_report(
|
||||
operator_id: int | None = Query(None),
|
||||
lot_number: str | None = Query(None),
|
||||
serial_number: str | None = Query(None),
|
||||
production_run_id: int | None = Query(None), # #58
|
||||
user: User = Depends(require_metrologist),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> Response:
|
||||
@@ -66,6 +69,7 @@ async def download_measurement_report(
|
||||
db, recipe_id, subtask_id,
|
||||
version_id, date_from, date_to,
|
||||
operator_id, lot_number, serial_number,
|
||||
production_run_id=production_run_id, # #58
|
||||
)
|
||||
except Exception as e:
|
||||
raise HTTPException(
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
"""System settings router - read/update settings, upload company logo."""
|
||||
import json
|
||||
from decimal import Decimal, InvalidOperation
|
||||
|
||||
from fastapi import APIRouter, Depends, File, HTTPException, UploadFile, status
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
@@ -18,6 +21,23 @@ _VALID_CSV_DELIMITERS = {",", ";", "\t", "|"}
|
||||
_VALID_CSV_DECIMAL_SEPARATORS = {",", "."}
|
||||
|
||||
|
||||
def _validate_string_list(key: str, value: str) -> None:
|
||||
"""#49: array JSON di stringhe non vuote, max 50 voci (vuoto = nessuna lista)."""
|
||||
try:
|
||||
items = json.loads(value)
|
||||
except ValueError:
|
||||
items = None
|
||||
if (
|
||||
not isinstance(items, list)
|
||||
or len(items) > 50
|
||||
or not all(isinstance(i, str) and i.strip() for i in items)
|
||||
):
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
|
||||
detail=f"{key} deve essere vuoto o un array JSON di al massimo 50 stringhe non vuote",
|
||||
)
|
||||
|
||||
|
||||
def _validate_setting_value(key: str, value: str) -> None:
|
||||
"""Raise 422 for a value that would break the code reading this key.
|
||||
|
||||
@@ -41,6 +61,29 @@ def _validate_setting_value(key: str, value: str) -> None:
|
||||
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
|
||||
detail="auto_logout_minutes deve essere vuoto (disabilitato) o un intero fra 1 e 480",
|
||||
)
|
||||
elif key == "default_measurement_interval_minutes":
|
||||
# #47: vuoto = nessun default
|
||||
if value != "" and (not value.isdigit() or not (1 <= int(value) <= 1440)):
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
|
||||
detail="default_measurement_interval_minutes deve essere vuoto o un intero fra 1 e 1440",
|
||||
)
|
||||
elif key in ("general_tolerance_plus", "general_tolerance_minus"):
|
||||
# #48: decimale >= 0 con punto; vuoto = nessun default
|
||||
if value != "":
|
||||
try:
|
||||
number = Decimal(value)
|
||||
ok = number.is_finite() and number >= 0
|
||||
except InvalidOperation:
|
||||
ok = False
|
||||
if not ok:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
|
||||
detail=f"{key} deve essere vuoto o un numero decimale maggiore o uguale a 0 (punto decimale)",
|
||||
)
|
||||
elif key in ("list_measurement_types", "list_units"):
|
||||
if value != "":
|
||||
_validate_string_list(key, value)
|
||||
elif key in ("company_name", "company_logo_path"):
|
||||
if not value.strip() or len(value) > 200:
|
||||
raise HTTPException(
|
||||
|
||||
@@ -3,12 +3,13 @@ from datetime import datetime
|
||||
from src.backend.models.api.tipi import UtcNaiveInput
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query, status
|
||||
from sqlalchemy import and_, select
|
||||
from sqlalchemy import and_, func, select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from src.backend.database import get_db
|
||||
from src.backend.api.middleware.api_key import require_metrologist
|
||||
from src.backend.models.orm.measurement import Measurement
|
||||
from src.backend.models.orm.production import ProductionRun
|
||||
from src.backend.models.orm.recipe import RecipeVersion
|
||||
from src.backend.models.orm.task import RecipeSubtask, RecipeTask
|
||||
from src.backend.models.orm.user import User
|
||||
@@ -38,6 +39,7 @@ async def _query_measurements(
|
||||
operator_id: int | None = None,
|
||||
lot_number: str | None = None,
|
||||
serial_number: str | None = None,
|
||||
production_run_id: int | None = None, # #58: solo le misure di una sessione
|
||||
) -> list[Measurement]:
|
||||
"""Query measurements with common filters.
|
||||
|
||||
@@ -67,6 +69,9 @@ async def _query_measurements(
|
||||
if serial_number is not None:
|
||||
filters.append(Measurement.serial_number == serial_number)
|
||||
|
||||
if production_run_id is not None:
|
||||
filters.append(Measurement.production_run_id == production_run_id)
|
||||
|
||||
query = (
|
||||
select(Measurement)
|
||||
.where(and_(*filters) if filters else True)
|
||||
@@ -106,6 +111,7 @@ async def get_summary(
|
||||
operator_id: int | None = Query(None),
|
||||
lot_number: str | None = Query(None),
|
||||
serial_number: str | None = Query(None),
|
||||
production_run_id: int | None = Query(None), # #58
|
||||
user: User = Depends(require_metrologist),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> SummaryData:
|
||||
@@ -113,6 +119,7 @@ async def get_summary(
|
||||
measurements = await _query_measurements(
|
||||
db, recipe_id, version_id, subtask_id,
|
||||
date_from, date_to, operator_id, lot_number, serial_number,
|
||||
production_run_id=production_run_id, # #58
|
||||
)
|
||||
pass_fail_values = [m.pass_fail for m in measurements]
|
||||
return compute_summary(pass_fail_values)
|
||||
@@ -128,6 +135,7 @@ async def get_capability(
|
||||
operator_id: int | None = Query(None),
|
||||
lot_number: str | None = Query(None),
|
||||
serial_number: str | None = Query(None),
|
||||
production_run_id: int | None = Query(None), # #58
|
||||
user: User = Depends(require_metrologist),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> CapabilityData:
|
||||
@@ -135,6 +143,7 @@ async def get_capability(
|
||||
measurements = await _query_measurements(
|
||||
db, recipe_id, version_id, subtask_id,
|
||||
date_from, date_to, operator_id, lot_number, serial_number,
|
||||
production_run_id=production_run_id, # #58
|
||||
)
|
||||
values = [float(m.value) for m in measurements]
|
||||
tol = await _get_subtask_tolerances(db, subtask_id)
|
||||
@@ -151,6 +160,7 @@ async def get_control_chart(
|
||||
operator_id: int | None = Query(None),
|
||||
lot_number: str | None = Query(None),
|
||||
serial_number: str | None = Query(None),
|
||||
production_run_id: int | None = Query(None), # #58
|
||||
user: User = Depends(require_metrologist),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> ControlChartData:
|
||||
@@ -158,6 +168,7 @@ async def get_control_chart(
|
||||
measurements = await _query_measurements(
|
||||
db, recipe_id, version_id, subtask_id,
|
||||
date_from, date_to, operator_id, lot_number, serial_number,
|
||||
production_run_id=production_run_id, # #58
|
||||
)
|
||||
values = [float(m.value) for m in measurements]
|
||||
timestamps = [m.measured_at for m in measurements]
|
||||
@@ -178,6 +189,7 @@ async def get_histogram(
|
||||
operator_id: int | None = Query(None),
|
||||
lot_number: str | None = Query(None),
|
||||
serial_number: str | None = Query(None),
|
||||
production_run_id: int | None = Query(None), # #58
|
||||
n_bins: int = Query(20, ge=5, le=100),
|
||||
user: User = Depends(require_metrologist),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
@@ -186,6 +198,7 @@ async def get_histogram(
|
||||
measurements = await _query_measurements(
|
||||
db, recipe_id, version_id, subtask_id,
|
||||
date_from, date_to, operator_id, lot_number, serial_number,
|
||||
production_run_id=production_run_id, # #58
|
||||
)
|
||||
values = [float(m.value) for m in measurements]
|
||||
return compute_histogram(values, n_bins)
|
||||
@@ -235,3 +248,49 @@ async def get_recipe_subtasks(
|
||||
})
|
||||
|
||||
return subtasks_list
|
||||
|
||||
|
||||
@router.get("/runs")
|
||||
async def get_recipe_runs(
|
||||
recipe_id: int = Query(...),
|
||||
user: User = Depends(require_metrologist),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> list[dict]:
|
||||
"""#58: production runs of a recipe (for the "Sessione" filter), newest first."""
|
||||
runs = (await db.execute(
|
||||
select(ProductionRun)
|
||||
.where(ProductionRun.recipe_id == recipe_id)
|
||||
.order_by(ProductionRun.started_at.desc(), ProductionRun.id.desc())
|
||||
)).scalars().all()
|
||||
# #58: conta solo le misure dei run della ricetta, non tutta la tabella.
|
||||
run_ids = [r.id for r in runs]
|
||||
counts = {}
|
||||
if run_ids:
|
||||
counts = dict((await db.execute(
|
||||
select(Measurement.production_run_id, func.count(Measurement.id))
|
||||
.where(Measurement.production_run_id.in_(run_ids))
|
||||
.group_by(Measurement.production_run_id)
|
||||
)).all())
|
||||
operator_ids = {r.operator_id for r in runs}
|
||||
names = {}
|
||||
if operator_ids:
|
||||
names = dict((await db.execute(
|
||||
select(User.id, User.display_name).where(User.id.in_(operator_ids))
|
||||
)).all())
|
||||
return [
|
||||
{
|
||||
"id": r.id,
|
||||
"station_id": r.station_id,
|
||||
"station_name": r.station.name if r.station else None,
|
||||
"operator_id": r.operator_id,
|
||||
"operator_name": names.get(r.operator_id),
|
||||
"started_at": r.started_at.isoformat() if r.started_at else None,
|
||||
"closed_at": r.closed_at.isoformat() if r.closed_at else None,
|
||||
"status": r.status,
|
||||
"lot_number": r.lot_number,
|
||||
"serial_number": r.serial_number,
|
||||
"cycle_count": r.cycle_count,
|
||||
"measurement_count": counts.get(r.id, 0),
|
||||
}
|
||||
for r in runs
|
||||
]
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
"""API models for the live station monitor (#57)."""
|
||||
from datetime import datetime
|
||||
from typing import Optional
|
||||
|
||||
from pydantic import BaseModel
|
||||
|
||||
|
||||
class MonitorSubtask(BaseModel):
|
||||
"""Mean of the recent measurements of one quote, against its tolerance."""
|
||||
|
||||
subtask_id: int
|
||||
description: str
|
||||
unit: str
|
||||
count: int
|
||||
mean: float
|
||||
ltl: Optional[float] = None
|
||||
utl: Optional[float] = None
|
||||
# True when ltl <= mean <= utl (a missing limit does not constrain).
|
||||
in_tolerance: bool
|
||||
|
||||
|
||||
class MonitorEvent(BaseModel):
|
||||
event_type: str
|
||||
created_at: datetime
|
||||
note: Optional[str] = None
|
||||
|
||||
|
||||
class MonitorRun(BaseModel):
|
||||
id: int
|
||||
station_code: str
|
||||
station_name: str
|
||||
recipe_code: str
|
||||
recipe_name: str
|
||||
version_number: int
|
||||
operator: str
|
||||
status: str
|
||||
started_at: datetime
|
||||
duration_seconds: int
|
||||
cycle_count: int
|
||||
seconds_to_next_measurement: Optional[int] = None
|
||||
overdue: bool
|
||||
last_event: Optional[MonitorEvent] = None
|
||||
# Counts over the last MONITOR_WINDOW measurements of the run.
|
||||
measured: int
|
||||
pass_count: int
|
||||
warning_count: int
|
||||
fail_count: int
|
||||
subtasks: list[MonitorSubtask]
|
||||
server_time: datetime
|
||||
@@ -26,6 +26,12 @@ class RecipeCreate(BaseModel):
|
||||
annotations_json: Optional[dict] = None
|
||||
|
||||
|
||||
class RecipeDuplicate(BaseModel):
|
||||
"""Schema for duplicating a recipe (#52): only the new code and name."""
|
||||
code: str = Field(..., min_length=1, max_length=100)
|
||||
name: str = Field(..., min_length=1, max_length=255)
|
||||
|
||||
|
||||
class RecipeUpdate(BaseModel):
|
||||
"""Schema for updating a recipe (creates new version)."""
|
||||
name: Optional[str] = Field(None, min_length=1, max_length=255)
|
||||
|
||||
@@ -0,0 +1,133 @@
|
||||
"""Live monitor of the open production runs (#57).
|
||||
|
||||
One query per table, whatever the number of runs: measurements and last events are
|
||||
ranked per run with a window function and cut in the database, not in a loop.
|
||||
"""
|
||||
from collections import defaultdict
|
||||
|
||||
from sqlalchemy import func, select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from src.backend.models.api.monitor import MonitorEvent, MonitorRun, MonitorSubtask
|
||||
from src.backend.models.orm.measurement import Measurement
|
||||
from src.backend.models.orm.production import ProductionEvent, ProductionRun
|
||||
from src.backend.models.orm.task import RecipeSubtask
|
||||
from src.backend.models.orm.user import User
|
||||
from src.backend.services import production_service
|
||||
|
||||
# Recent measurements per run that feed counts and means (#57: last N).
|
||||
MONITOR_WINDOW = 20
|
||||
|
||||
|
||||
def _in_tolerance(mean: float, ltl, utl) -> bool:
|
||||
# A missing limit does not constrain.
|
||||
if ltl is not None and mean < float(ltl):
|
||||
return False
|
||||
if utl is not None and mean > float(utl):
|
||||
return False
|
||||
return True
|
||||
|
||||
|
||||
async def list_open_runs(db: AsyncSession) -> list[MonitorRun]:
|
||||
runs = (await db.execute(
|
||||
select(ProductionRun)
|
||||
.where(ProductionRun.status.in_(("running", "paused")))
|
||||
.order_by(ProductionRun.started_at)
|
||||
)).scalars().all()
|
||||
if not runs:
|
||||
return []
|
||||
run_ids = [r.id for r in runs]
|
||||
|
||||
# Operators: one query.
|
||||
users = {
|
||||
u.id: u for u in (await db.execute(
|
||||
select(User).where(User.id.in_({r.operator_id for r in runs}))
|
||||
)).scalars().all()
|
||||
}
|
||||
|
||||
# Last event per run: rank desc inside the run, keep rank 1.
|
||||
ev_rank = func.row_number().over(
|
||||
partition_by=ProductionEvent.run_id,
|
||||
order_by=(ProductionEvent.created_at.desc(), ProductionEvent.id.desc()),
|
||||
).label("rn")
|
||||
ev_sub = select(
|
||||
ProductionEvent.run_id.label("run_id"),
|
||||
ProductionEvent.event_type.label("event_type"),
|
||||
ProductionEvent.created_at.label("created_at"),
|
||||
ProductionEvent.note.label("note"),
|
||||
ev_rank,
|
||||
).where(ProductionEvent.run_id.in_(run_ids)).subquery()
|
||||
ev_rows = (await db.execute(
|
||||
select(ev_sub.c.run_id, ev_sub.c.event_type, ev_sub.c.created_at, ev_sub.c.note)
|
||||
.where(ev_sub.c.rn == 1)
|
||||
)).all()
|
||||
last_event = {r.run_id: r for r in ev_rows}
|
||||
|
||||
# Last N measurements per run, joined to their subtask for the limits.
|
||||
m_rank = func.row_number().over(
|
||||
partition_by=Measurement.production_run_id,
|
||||
order_by=(Measurement.measured_at.desc(), Measurement.id.desc()),
|
||||
).label("rn")
|
||||
m_sub = select(
|
||||
Measurement.production_run_id.label("run_id"),
|
||||
Measurement.subtask_id.label("subtask_id"),
|
||||
Measurement.value.label("value"),
|
||||
Measurement.pass_fail.label("pass_fail"),
|
||||
m_rank,
|
||||
).where(Measurement.production_run_id.in_(run_ids)).subquery()
|
||||
m_rows = (await db.execute(
|
||||
select(
|
||||
m_sub.c.run_id, m_sub.c.subtask_id, m_sub.c.value, m_sub.c.pass_fail,
|
||||
RecipeSubtask.description, RecipeSubtask.unit,
|
||||
RecipeSubtask.ltl, RecipeSubtask.utl,
|
||||
)
|
||||
.join(RecipeSubtask, RecipeSubtask.id == m_sub.c.subtask_id)
|
||||
.where(m_sub.c.rn <= MONITOR_WINDOW)
|
||||
)).all()
|
||||
by_run = defaultdict(list)
|
||||
for row in m_rows:
|
||||
by_run[row.run_id].append(row)
|
||||
|
||||
result = []
|
||||
for run in runs:
|
||||
rows = by_run.get(run.id, [])
|
||||
per_sub: dict[int, list] = defaultdict(list)
|
||||
for row in rows:
|
||||
per_sub[row.subtask_id].append(row)
|
||||
subtasks = []
|
||||
for sid, group in sorted(per_sub.items()):
|
||||
mean = sum(float(g.value) for g in group) / len(group)
|
||||
first = group[0]
|
||||
subtasks.append(MonitorSubtask(
|
||||
subtask_id=sid, description=first.description, unit=first.unit,
|
||||
count=len(group), mean=round(mean, 6),
|
||||
ltl=float(first.ltl) if first.ltl is not None else None,
|
||||
utl=float(first.utl) if first.utl is not None else None,
|
||||
in_tolerance=_in_tolerance(mean, first.ltl, first.utl),
|
||||
))
|
||||
timer = production_service.describe(run)
|
||||
ev = last_event.get(run.id)
|
||||
operator = users.get(run.operator_id)
|
||||
result.append(MonitorRun(
|
||||
id=run.id,
|
||||
station_code=run.station.code, station_name=run.station.name,
|
||||
recipe_code=run.recipe.code, recipe_name=run.recipe.name,
|
||||
version_number=run.version.version_number,
|
||||
operator=(operator.display_name or operator.username) if operator else "",
|
||||
status=run.status,
|
||||
started_at=run.started_at,
|
||||
duration_seconds=max(0, int((timer["server_time"] - run.started_at).total_seconds())),
|
||||
cycle_count=run.cycle_count,
|
||||
seconds_to_next_measurement=timer["seconds_to_next_measurement"],
|
||||
overdue=timer["overdue"],
|
||||
last_event=MonitorEvent(
|
||||
event_type=ev.event_type, created_at=ev.created_at, note=ev.note,
|
||||
) if ev else None,
|
||||
measured=len(rows),
|
||||
pass_count=sum(1 for g in rows if g.pass_fail == "pass"),
|
||||
warning_count=sum(1 for g in rows if g.pass_fail == "warning"),
|
||||
fail_count=sum(1 for g in rows if g.pass_fail == "fail"),
|
||||
subtasks=subtasks,
|
||||
server_time=timer["server_time"],
|
||||
))
|
||||
return result
|
||||
@@ -255,6 +255,78 @@ async def create_recipe(
|
||||
return result.scalar_one()
|
||||
|
||||
|
||||
async def duplicate_recipe(
|
||||
db: AsyncSession,
|
||||
recipe_id: int,
|
||||
new_code: str,
|
||||
new_name: str,
|
||||
user: User,
|
||||
) -> Recipe:
|
||||
"""Duplicate a recipe (#52): new code/name, v1 with the current version's tasks.
|
||||
|
||||
The source recipe is left untouched.
|
||||
"""
|
||||
source = await _get_recipe_or_404(db, recipe_id)
|
||||
|
||||
existing = await db.execute(select(Recipe).where(Recipe.code == new_code))
|
||||
if existing.scalar_one_or_none() is not None:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_409_CONFLICT,
|
||||
detail=f"Recipe code '{new_code}' already exists",
|
||||
)
|
||||
|
||||
# Same header fields create_recipe persists, taken from the source recipe
|
||||
recipe = Recipe(
|
||||
code=new_code,
|
||||
name=new_name,
|
||||
description=source.description,
|
||||
image_path=source.image_path,
|
||||
measurement_interval_minutes=source.measurement_interval_minutes,
|
||||
requires_lot=source.requires_lot,
|
||||
requires_serial=source.requires_serial,
|
||||
allow_manual_input=source.allow_manual_input,
|
||||
created_by=user.id,
|
||||
)
|
||||
db.add(recipe)
|
||||
await db.flush()
|
||||
|
||||
version = RecipeVersion(
|
||||
recipe_id=recipe.id,
|
||||
version_number=1,
|
||||
is_current=True,
|
||||
created_by=user.id,
|
||||
change_notes=f"Duplicated from {source.code}",
|
||||
)
|
||||
db.add(version)
|
||||
await db.flush()
|
||||
|
||||
# Reuse the existing deep copy of tasks/subtasks from the current version
|
||||
source_version = await _get_current_version(db, source.id)
|
||||
if source_version is not None:
|
||||
await _copy_tasks_to_version(db, source_version, version)
|
||||
|
||||
await _write_audit(
|
||||
db,
|
||||
recipe_id=recipe.id,
|
||||
old_version_id=None,
|
||||
new_version_id=version.id,
|
||||
changed_by=user.id,
|
||||
change_type="CREATE",
|
||||
change_reason=f"Duplicated from recipe {source.code}",
|
||||
)
|
||||
|
||||
result = await db.execute(
|
||||
select(Recipe)
|
||||
.where(Recipe.id == recipe.id)
|
||||
.options(
|
||||
selectinload(Recipe.versions)
|
||||
.selectinload(RecipeVersion.tasks)
|
||||
.selectinload(RecipeTask.subtasks)
|
||||
)
|
||||
)
|
||||
return result.scalar_one()
|
||||
|
||||
|
||||
async def create_new_version(
|
||||
db: AsyncSession,
|
||||
recipe_id: int,
|
||||
|
||||
@@ -48,6 +48,7 @@ async def _query_measurements(
|
||||
operator_id: int | None = None,
|
||||
lot_number: str | None = None,
|
||||
serial_number: str | None = None,
|
||||
production_run_id: int | None = None, # #58
|
||||
) -> list[Measurement]:
|
||||
"""Query measurements with common filters (duplicated from statistics router)."""
|
||||
filters = []
|
||||
@@ -73,6 +74,9 @@ async def _query_measurements(
|
||||
if serial_number is not None:
|
||||
filters.append(Measurement.serial_number == serial_number)
|
||||
|
||||
if production_run_id is not None:
|
||||
filters.append(Measurement.production_run_id == production_run_id)
|
||||
|
||||
query = (
|
||||
select(Measurement)
|
||||
.where(and_(*filters) if filters else True)
|
||||
@@ -281,6 +285,7 @@ async def generate_spc_report(
|
||||
operator_id: int | None = None,
|
||||
lot_number: str | None = None,
|
||||
serial_number: str | None = None,
|
||||
production_run_id: int | None = None, # #58
|
||||
) -> bytes:
|
||||
"""Generate SPC PDF report and return bytes.
|
||||
|
||||
@@ -290,6 +295,7 @@ async def generate_spc_report(
|
||||
measurements = await _query_measurements(
|
||||
db, recipe_id, version_id, subtask_id,
|
||||
date_from, date_to, operator_id, lot_number, serial_number,
|
||||
production_run_id=production_run_id, # #58
|
||||
)
|
||||
|
||||
# 2. Compute SPC data
|
||||
@@ -336,6 +342,8 @@ async def generate_spc_report(
|
||||
filters_desc.append(f"Lot: {lot_number}")
|
||||
if serial_number:
|
||||
filters_desc.append(f"Serial: {serial_number}")
|
||||
if production_run_id is not None:
|
||||
filters_desc.append(f"Run: {production_run_id}") # #58
|
||||
|
||||
# 6. Render HTML template
|
||||
template = _jinja_env.get_template("spc_report.html")
|
||||
@@ -367,12 +375,14 @@ async def generate_measurement_report(
|
||||
operator_id: int | None = None,
|
||||
lot_number: str | None = None,
|
||||
serial_number: str | None = None,
|
||||
production_run_id: int | None = None, # #58
|
||||
) -> bytes:
|
||||
"""Generate measurement table PDF report and return bytes."""
|
||||
# 1. Query measurements
|
||||
measurements = await _query_measurements(
|
||||
db, recipe_id, version_id, subtask_id,
|
||||
date_from, date_to, operator_id, lot_number, serial_number,
|
||||
production_run_id=production_run_id, # #58
|
||||
)
|
||||
|
||||
# 2. Get recipe info
|
||||
@@ -427,6 +437,8 @@ async def generate_measurement_report(
|
||||
filters_desc.append(f"Lot: {lot_number}")
|
||||
if serial_number:
|
||||
filters_desc.append(f"Serial: {serial_number}")
|
||||
if production_run_id is not None:
|
||||
filters_desc.append(f"Run: {production_run_id}") # #58
|
||||
|
||||
# 7. Render template
|
||||
template = _jinja_env.get_template("measurement_report.html")
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
"""GET /api/production-runs/open - live monitor of the open runs (#57)."""
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
from sqlalchemy import select
|
||||
|
||||
from src.backend.models.orm.measurement import Measurement
|
||||
from src.backend.models.orm.production import ProductionEvent, ProductionRun
|
||||
from src.backend.models.orm.station import Station
|
||||
from src.backend.models.orm.task import RecipeSubtask, RecipeTask
|
||||
from src.backend.tests.conftest import _create_user, auth_headers, create_test_recipe
|
||||
|
||||
|
||||
async def _run(db, user, code, status="running", overdue=False, open_=True):
|
||||
"""A station plus a run on a fresh recipe (limits ltl 9.5 / utl 10.5)."""
|
||||
station = Station(code=f"ST-{code}", name=f"Linea {code}", active=True, created_by=user.id)
|
||||
db.add(station)
|
||||
recipe = await create_test_recipe(db, user_id=user.id, code=f"REC-{code}")
|
||||
await db.flush()
|
||||
version = recipe.versions[0]
|
||||
now = datetime.utcnow()
|
||||
run = ProductionRun(
|
||||
station_id=station.id, recipe_id=recipe.id, version_id=version.id,
|
||||
operator_id=user.id, status=status if open_ else "closed",
|
||||
started_at=now - timedelta(hours=1),
|
||||
measurement_interval_minutes=30,
|
||||
next_measurement_at=now + (timedelta(minutes=-5) if overdue else timedelta(minutes=20)),
|
||||
cycle_count=3,
|
||||
active_station_id=station.id if open_ else None,
|
||||
)
|
||||
db.add(run)
|
||||
await db.flush()
|
||||
db.add(ProductionEvent(run_id=run.id, event_type="start", user_id=user.id))
|
||||
sub = (await db.execute(
|
||||
select(RecipeSubtask).join(RecipeTask, RecipeTask.id == RecipeSubtask.task_id)
|
||||
.where(RecipeTask.version_id == version.id)
|
||||
)).scalars().first()
|
||||
return run, sub, version
|
||||
|
||||
|
||||
def _m(run, sub, version, user, value, pf, minutes=0):
|
||||
return Measurement(
|
||||
subtask_id=sub.id, version_id=version.id, measured_by=user.id, value=value,
|
||||
pass_fail=pf, production_run_id=run.id,
|
||||
measured_at=datetime.utcnow() - timedelta(minutes=minutes),
|
||||
)
|
||||
|
||||
|
||||
async def test_open_requires_high_authority(client, db_session, measurement_tec_user):
|
||||
resp = await client.get("/api/production-runs/open", headers=auth_headers(measurement_tec_user))
|
||||
assert resp.status_code == 403
|
||||
|
||||
|
||||
async def test_open_lists_only_open_runs_with_means(client, db_session, admin_user):
|
||||
sup = await _create_user(db_session, "capo", roles=["Supervisor"])
|
||||
r1, s1, v1 = await _run(db_session, admin_user, "A", overdue=True)
|
||||
r2, s2, v2 = await _run(db_session, admin_user, "B", status="paused")
|
||||
await _run(db_session, admin_user, "C", open_=False)
|
||||
# Run A: mean 10.0 (inside), run B: mean 10.8 (outside, one fail).
|
||||
for i, (val, pf) in enumerate([(9.9, "pass"), (10.1, "pass")]):
|
||||
db_session.add(_m(r1, s1, v1, admin_user, val, pf, i))
|
||||
for i, (val, pf) in enumerate([(10.6, "fail"), (11.0, "fail"), (10.8, "warning")]):
|
||||
db_session.add(_m(r2, s2, v2, admin_user, val, pf, i))
|
||||
await db_session.commit()
|
||||
|
||||
resp = await client.get("/api/production-runs/open", headers=auth_headers(sup))
|
||||
assert resp.status_code == 200
|
||||
body = {r["station_code"]: r for r in resp.json()}
|
||||
assert set(body) == {"ST-A", "ST-B"} # closed run C is absent
|
||||
a, b = body["ST-A"], body["ST-B"]
|
||||
assert a["overdue"] is True and a["seconds_to_next_measurement"] < 0
|
||||
assert b["overdue"] is False and b["status"] == "paused"
|
||||
assert a["duration_seconds"] >= 3600 and a["cycle_count"] == 3
|
||||
assert a["last_event"]["event_type"] == "start"
|
||||
assert a["pass_count"] == 2 and a["fail_count"] == 0
|
||||
assert a["subtasks"][0]["mean"] == 10.0 and a["subtasks"][0]["in_tolerance"] is True
|
||||
assert b["fail_count"] == 2 and b["warning_count"] == 1
|
||||
assert round(b["subtasks"][0]["mean"], 3) == 10.8
|
||||
assert b["subtasks"][0]["in_tolerance"] is False
|
||||
|
||||
|
||||
async def test_open_empty_for_admin(client, admin_user):
|
||||
resp = await client.get("/api/production-runs/open", headers=auth_headers(admin_user))
|
||||
assert resp.status_code == 200 and resp.json() == []
|
||||
@@ -0,0 +1,74 @@
|
||||
"""Tests for POST /api/recipes/{id}/duplicate (#52)."""
|
||||
from httpx import AsyncClient
|
||||
from sqlalchemy import func, select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from src.backend.models.orm.recipe import Recipe, RecipeVersion
|
||||
from src.backend.models.orm.task import RecipeSubtask, RecipeTask
|
||||
from src.backend.models.orm.user import User
|
||||
from src.backend.tests.conftest import auth_headers, create_test_recipe
|
||||
|
||||
|
||||
class TestDuplicateRecipe:
|
||||
async def test_duplicate_copies_tasks_and_keeps_original(
|
||||
self, client: AsyncClient, maker_user: User, db_session: AsyncSession
|
||||
):
|
||||
src = await create_test_recipe(db_session, maker_user.id)
|
||||
src_id = src.id
|
||||
before_tasks = (await db_session.execute(select(func.count(RecipeTask.id)))).scalar_one()
|
||||
before_subs = (await db_session.execute(select(func.count(RecipeSubtask.id)))).scalar_one()
|
||||
|
||||
resp = await client.post(
|
||||
f"/api/recipes/{src_id}/duplicate",
|
||||
json={"code": "REC-COPIA", "name": "Copia"},
|
||||
headers=auth_headers(maker_user),
|
||||
)
|
||||
assert resp.status_code == 201
|
||||
data = resp.json()
|
||||
assert data["code"] == "REC-COPIA" and data["name"] == "Copia"
|
||||
assert data["id"] != src_id
|
||||
assert data["description"] == "A recipe for testing"
|
||||
assert data["current_version"]["version_number"] == 1
|
||||
|
||||
# Tasks and subtasks doubled: copied, not moved
|
||||
after_tasks = (await db_session.execute(select(func.count(RecipeTask.id)))).scalar_one()
|
||||
after_subs = (await db_session.execute(select(func.count(RecipeSubtask.id)))).scalar_one()
|
||||
assert after_tasks == before_tasks * 2
|
||||
assert after_subs == before_subs * 2
|
||||
|
||||
new_version = (await db_session.execute(
|
||||
select(RecipeVersion).where(RecipeVersion.recipe_id == data["id"])
|
||||
)).scalar_one()
|
||||
new_tasks = (await db_session.execute(
|
||||
select(RecipeTask).where(RecipeTask.version_id == new_version.id)
|
||||
)).scalars().all()
|
||||
assert len(new_tasks) == before_tasks
|
||||
|
||||
# Original unchanged
|
||||
orig = (await db_session.execute(select(Recipe).where(Recipe.id == src_id))).scalar_one()
|
||||
assert orig.code == "REC-001" and orig.name == "Test Recipe"
|
||||
orig_versions = (await db_session.execute(
|
||||
select(func.count(RecipeVersion.id)).where(RecipeVersion.recipe_id == src_id)
|
||||
)).scalar_one()
|
||||
assert orig_versions == 1
|
||||
|
||||
async def test_duplicate_code_conflict(
|
||||
self, client: AsyncClient, maker_user: User, db_session: AsyncSession
|
||||
):
|
||||
src = await create_test_recipe(db_session, maker_user.id)
|
||||
resp = await client.post(
|
||||
f"/api/recipes/{src.id}/duplicate",
|
||||
json={"code": "REC-001", "name": "X"},
|
||||
headers=auth_headers(maker_user),
|
||||
)
|
||||
assert resp.status_code == 409
|
||||
|
||||
async def test_duplicate_missing_recipe(
|
||||
self, client: AsyncClient, maker_user: User
|
||||
):
|
||||
resp = await client.post(
|
||||
"/api/recipes/99999/duplicate",
|
||||
json={"code": "NEW", "name": "X"},
|
||||
headers=auth_headers(maker_user),
|
||||
)
|
||||
assert resp.status_code == 404
|
||||
@@ -176,6 +176,50 @@ class TestUpdateSettingsValidation:
|
||||
)
|
||||
assert resp.status_code == 200
|
||||
|
||||
# --- #47/#48/#49: chiavi Impostazioni di Tràfilo ---
|
||||
|
||||
@pytest.mark.parametrize("key,value", [
|
||||
("default_measurement_interval_minutes", "1"),
|
||||
("default_measurement_interval_minutes", "1440"),
|
||||
("default_measurement_interval_minutes", ""),
|
||||
("general_tolerance_plus", "0"),
|
||||
("general_tolerance_plus", "0.05"),
|
||||
("general_tolerance_minus", ""),
|
||||
("list_measurement_types", '["Lunghezza", "Diametro"]'),
|
||||
("list_units", "[]"),
|
||||
("list_units", ""),
|
||||
])
|
||||
async def test_new_keys_valid_accepted(
|
||||
self, client: AsyncClient, admin_user: User, key: str, value: str
|
||||
):
|
||||
resp = await client.put(
|
||||
"/api/settings/", headers=auth_headers(admin_user), json={key: value}
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
|
||||
@pytest.mark.parametrize("key,value", [
|
||||
("default_measurement_interval_minutes", "0"),
|
||||
("default_measurement_interval_minutes", "1441"),
|
||||
("default_measurement_interval_minutes", "abc"),
|
||||
("general_tolerance_plus", "-0.1"),
|
||||
("general_tolerance_plus", "0,05"),
|
||||
("general_tolerance_minus", "NaN"),
|
||||
("general_tolerance_minus", "abc"),
|
||||
("list_measurement_types", "not json"),
|
||||
("list_measurement_types", '{"a": 1}'),
|
||||
("list_units", '["mm", ""]'),
|
||||
("list_units", '["mm", 3]'),
|
||||
("list_units", "[" + ",".join(f'"v{i}"' for i in range(51)) + "]"),
|
||||
])
|
||||
async def test_new_keys_invalid_rejected(
|
||||
self, client: AsyncClient, admin_user: User, key: str, value: str
|
||||
):
|
||||
resp = await client.put(
|
||||
"/api/settings/", headers=auth_headers(admin_user), json={key: value}
|
||||
)
|
||||
assert resp.status_code == 422, resp.text
|
||||
assert key in resp.json()["detail"]
|
||||
|
||||
async def test_unknown_key_not_validated(
|
||||
self, client: AsyncClient, admin_user: User
|
||||
):
|
||||
|
||||
@@ -211,3 +211,79 @@ class TestDateFilter:
|
||||
assert resp.status_code == 200
|
||||
# All measurements should be within this wide range
|
||||
assert resp.json()["total"] >= 2
|
||||
|
||||
|
||||
class TestRunFilter:
|
||||
"""#58: statistiche per sessione di produzione."""
|
||||
|
||||
async def _setup(self, db_session, user, metro):
|
||||
from datetime import datetime
|
||||
from src.backend.models.orm.production import ProductionRun
|
||||
from src.backend.models.orm.station import Station
|
||||
from src.backend.models.orm.recipe import RecipeVersion
|
||||
from sqlalchemy import select
|
||||
recipe = await create_test_recipe(db_session, user.id)
|
||||
version = (await db_session.execute(
|
||||
select(RecipeVersion).where(RecipeVersion.recipe_id == recipe.id)
|
||||
)).scalars().first()
|
||||
station = Station(code="ST-58", name="Stazione 58", active=True, created_by=user.id)
|
||||
db_session.add(station)
|
||||
await db_session.commit()
|
||||
runs = []
|
||||
for i, lot in enumerate(["L1", "L2"]):
|
||||
run = ProductionRun(
|
||||
station_id=station.id, recipe_id=recipe.id, version_id=version.id,
|
||||
operator_id=user.id, status="closed", lot_number=lot,
|
||||
started_at=datetime(2026, 1, 1 + i),
|
||||
)
|
||||
db_session.add(run)
|
||||
runs.append(run)
|
||||
await db_session.commit()
|
||||
return recipe, runs
|
||||
|
||||
async def test_filter_by_run_and_unfiltered(
|
||||
self, client, measurement_tec_user, metrologist_user, db_session,
|
||||
):
|
||||
from src.backend.models.orm.measurement import Measurement
|
||||
recipe, runs = await self._setup(db_session, measurement_tec_user, metrologist_user)
|
||||
subtask_id, version_id = await _seed_measurements(
|
||||
client, measurement_tec_user, recipe.id, [10.0, 10.1, 10.2],
|
||||
)
|
||||
# Assegna le prime due misure al run 1, la terza al run 2.
|
||||
from sqlalchemy import select
|
||||
ms = (await db_session.execute(
|
||||
select(Measurement).order_by(Measurement.id)
|
||||
)).scalars().all()
|
||||
ms[0].production_run_id = runs[0].id
|
||||
ms[1].production_run_id = runs[0].id
|
||||
ms[2].production_run_id = runs[1].id
|
||||
await db_session.commit()
|
||||
|
||||
h = auth_headers(metrologist_user)
|
||||
r1 = await client.get("/api/statistics/summary", headers=h,
|
||||
params={"recipe_id": recipe.id, "production_run_id": runs[0].id})
|
||||
assert r1.json()["total"] == 2
|
||||
r2 = await client.get("/api/statistics/summary", headers=h,
|
||||
params={"recipe_id": recipe.id, "production_run_id": runs[1].id})
|
||||
assert r2.json()["total"] == 1
|
||||
r_all = await client.get("/api/statistics/summary", headers=h,
|
||||
params={"recipe_id": recipe.id})
|
||||
assert r_all.json()["total"] == 3
|
||||
|
||||
runs_resp = await client.get("/api/statistics/runs", headers=h,
|
||||
params={"recipe_id": recipe.id})
|
||||
assert runs_resp.status_code == 200
|
||||
data = runs_resp.json()
|
||||
assert [r["id"] for r in data] == [runs[1].id, runs[0].id] # più recente prima
|
||||
assert [r["measurement_count"] for r in data] == [1, 2]
|
||||
assert data[0]["lot_number"] == "L2"
|
||||
assert data[0]["station_name"] == "Stazione 58"
|
||||
assert data[0]["closed_at"] is None
|
||||
|
||||
async def test_runs_require_metrologist(
|
||||
self, client, measurement_tec_user, db_session,
|
||||
):
|
||||
resp = await client.get("/api/statistics/runs",
|
||||
headers=auth_headers(measurement_tec_user),
|
||||
params={"recipe_id": 1})
|
||||
assert resp.status_code == 403
|
||||
|
||||
@@ -74,12 +74,14 @@ def create_app() -> Flask:
|
||||
from blueprints.maker import maker_bp
|
||||
from blueprints.statistics import statistics_bp
|
||||
from blueprints.admin import admin_bp
|
||||
from blueprints.monitor import monitor_bp # #57 live station monitor
|
||||
|
||||
app.register_blueprint(auth_bp)
|
||||
app.register_blueprint(measure_bp, url_prefix="/measure")
|
||||
app.register_blueprint(maker_bp, url_prefix="/maker")
|
||||
app.register_blueprint(statistics_bp, url_prefix="/statistics")
|
||||
app.register_blueprint(admin_bp, url_prefix="/admin")
|
||||
app.register_blueprint(monitor_bp, url_prefix="/monitor") # #57
|
||||
|
||||
@app.before_request
|
||||
def _check_secret_key():
|
||||
|
||||
@@ -29,28 +29,30 @@ def admin_required(f):
|
||||
@login_required
|
||||
@admin_required
|
||||
def user_list():
|
||||
"""User management page."""
|
||||
resp = api_client.get("/api/users")
|
||||
|
||||
if isinstance(resp, dict) and resp.get("error"):
|
||||
flash(_("Errore nel caricamento degli utenti: %(error)s", error=resp.get("detail", "")), "error")
|
||||
users = []
|
||||
elif isinstance(resp, list):
|
||||
users = resp
|
||||
else:
|
||||
users = []
|
||||
|
||||
return render_template("admin/users.html", users=users)
|
||||
"""#50: la gestione utenti vive nella tab «Utenti» di Impostazioni."""
|
||||
return redirect(url_for("admin.settings_page", tab="utenti"))
|
||||
|
||||
|
||||
@admin_bp.route("/settings")
|
||||
@login_required
|
||||
@admin_required
|
||||
def settings_page():
|
||||
"""System settings page."""
|
||||
"""System settings page (admin only), con la tab «Utenti» (#50)."""
|
||||
resp = api_client.get("/api/settings")
|
||||
settings = resp if not isinstance(resp, dict) or not resp.get("error") else {}
|
||||
return render_template("admin/settings.html", settings=settings)
|
||||
# Solo un dict valido sono impostazioni: un errore o altro tipo = nessuna
|
||||
settings = resp if isinstance(resp, dict) and not resp.get("error") else {}
|
||||
|
||||
users_resp = api_client.get("/api/users")
|
||||
if isinstance(users_resp, dict) and users_resp.get("error"):
|
||||
flash(_("Errore nel caricamento degli utenti: %(error)s", error=users_resp.get("detail", "")), "error")
|
||||
users = []
|
||||
elif isinstance(users_resp, list):
|
||||
users = users_resp
|
||||
else:
|
||||
users = []
|
||||
|
||||
tab = "utenti" if request.args.get("tab") == "utenti" else "generale"
|
||||
return render_template("admin/settings.html", settings=settings, users=users, active_tab=tab)
|
||||
|
||||
|
||||
@admin_bp.route("/api/settings", methods=["PUT"])
|
||||
|
||||
@@ -59,6 +59,45 @@ def _post_login_landing():
|
||||
return url_for("auth.profile")
|
||||
|
||||
|
||||
def _complete_login(response, fallback_name):
|
||||
"""Dopo una risposta di login riuscita: sessione, preferenze, impostazioni (#59).
|
||||
|
||||
Comune al login con password e al login con PIN, cosi' i due restano identici.
|
||||
Ritorna l'utente salvato in sessione.
|
||||
"""
|
||||
# Salva in sessione. permanent=True fa valere PERMANENT_SESSION_LIFETIME
|
||||
# (8h, config.py): senza, Flask usa una sessione di durata browser e il
|
||||
# limite configurato non ha mai effetto (#33).
|
||||
session.permanent = True
|
||||
session["api_key"] = response["api_key"]
|
||||
session["user"] = response["user"]
|
||||
session["user_id"] = response["user"]["id"]
|
||||
|
||||
# Applica preferenze utente
|
||||
user = response["user"]
|
||||
if user.get("language_pref"):
|
||||
session["language"] = user["language_pref"]
|
||||
if user.get("theme_pref"):
|
||||
session["theme"] = user["theme_pref"]
|
||||
|
||||
# Carica impostazioni di sistema
|
||||
settings_resp = api_client.get("/api/settings")
|
||||
if not settings_resp.get("error"):
|
||||
logo_path = settings_resp.get("company_logo_path")
|
||||
if logo_path:
|
||||
session["company_logo"] = logo_path
|
||||
auto_logout = settings_resp.get("auto_logout_minutes")
|
||||
if auto_logout:
|
||||
try:
|
||||
session["auto_logout_minutes"] = int(auto_logout)
|
||||
except (ValueError, TypeError):
|
||||
pass
|
||||
|
||||
flash(_("Benvenuto, %(name)s!", name=user.get("display_name", fallback_name)), "success")
|
||||
|
||||
return user
|
||||
|
||||
|
||||
@auth_bp.route("/login", methods=["GET", "POST"])
|
||||
def login():
|
||||
"""Login page and form handler."""
|
||||
@@ -81,35 +120,7 @@ def login():
|
||||
flash(response.get("detail", _("Credenziali non valide")), "error")
|
||||
return render_template("auth/login.html")
|
||||
|
||||
# Salva in sessione. permanent=True fa valere PERMANENT_SESSION_LIFETIME
|
||||
# (8h, config.py): senza, Flask usa una sessione di durata browser e il
|
||||
# limite configurato non ha mai effetto (#33).
|
||||
session.permanent = True
|
||||
session["api_key"] = response["api_key"]
|
||||
session["user"] = response["user"]
|
||||
session["user_id"] = response["user"]["id"]
|
||||
|
||||
# Applica preferenze utente
|
||||
user = response["user"]
|
||||
if user.get("language_pref"):
|
||||
session["language"] = user["language_pref"]
|
||||
if user.get("theme_pref"):
|
||||
session["theme"] = user["theme_pref"]
|
||||
|
||||
# Carica impostazioni di sistema
|
||||
settings_resp = api_client.get("/api/settings")
|
||||
if not settings_resp.get("error"):
|
||||
logo_path = settings_resp.get("company_logo_path")
|
||||
if logo_path:
|
||||
session["company_logo"] = logo_path
|
||||
auto_logout = settings_resp.get("auto_logout_minutes")
|
||||
if auto_logout:
|
||||
try:
|
||||
session["auto_logout_minutes"] = int(auto_logout)
|
||||
except (ValueError, TypeError):
|
||||
pass
|
||||
|
||||
flash(_("Benvenuto, %(name)s!", name=user.get("display_name", username)), "success")
|
||||
user = _complete_login(response, username)
|
||||
|
||||
# Redirect dopo login (in base al ruolo)
|
||||
return redirect(_post_login_landing())
|
||||
@@ -121,6 +132,55 @@ def login():
|
||||
return render_template("auth/login.html")
|
||||
|
||||
|
||||
@auth_bp.route("/pin-users", methods=["GET"])
|
||||
def pin_users():
|
||||
"""Elenco nomi per la vista Operatore del login (#59): solo id e nome.
|
||||
|
||||
Pubblica come il login; se il backend non risponde o non ha il PIN, lista
|
||||
vuota e la pagina apre il form password.
|
||||
"""
|
||||
if session.get("api_key"):
|
||||
return jsonify([])
|
||||
try:
|
||||
resp = api_client.get("/api/auth/pin-users")
|
||||
except Exception:
|
||||
return jsonify([])
|
||||
if not isinstance(resp, list):
|
||||
return jsonify([])
|
||||
return jsonify([
|
||||
{"id": u.get("id"), "display_name": u.get("display_name", "")}
|
||||
for u in resp if isinstance(u, dict)
|
||||
])
|
||||
|
||||
|
||||
@auth_bp.route("/login-pin", methods=["POST"])
|
||||
def login_pin():
|
||||
"""Login con nome + PIN (#59). JSON in/out; CSRF come il login password
|
||||
(header X-CSRFToken, gestito da CSRFProtect)."""
|
||||
data = request.get_json(silent=True) or {}
|
||||
user_id = data.get("user_id")
|
||||
pin = str(data.get("pin", ""))
|
||||
if not isinstance(user_id, int) or not (len(pin) == 4 and pin.isdigit()):
|
||||
return jsonify({"error": True, "status_code": 422, "detail": _("Il PIN deve essere di 4 cifre")}), 422
|
||||
|
||||
try:
|
||||
response = api_client.post("/api/auth/login-pin", data={"user_id": user_id, "pin": pin})
|
||||
except Exception as e:
|
||||
return jsonify({"error": True, "status_code": 502,
|
||||
"detail": _("Errore di connessione al server: %(error)s", error=str(e))}), 502
|
||||
|
||||
if response.get("error"):
|
||||
status = response.get("status_code") or 401
|
||||
if status == 401:
|
||||
detail = _("PIN errato")
|
||||
else:
|
||||
detail = response.get("detail") or _("Credenziali non valide")
|
||||
return jsonify({"error": True, "status_code": status, "detail": detail}), status
|
||||
|
||||
_complete_login(response, "") # include il flash di benvenuto
|
||||
return jsonify({"ok": True, "redirect": _post_login_landing()})
|
||||
|
||||
|
||||
@auth_bp.route("/logout", methods=["POST"])
|
||||
def logout():
|
||||
"""Clear session and redirect to login."""
|
||||
|
||||
@@ -57,7 +57,20 @@ def recipe_list():
|
||||
@role_required("Maker")
|
||||
def recipe_new():
|
||||
"""Create new recipe."""
|
||||
return render_template("maker/recipe_editor.html", recipe=None)
|
||||
# #49: loop duration pre-filled from the system default (new recipes only);
|
||||
# missing/empty/invalid key -> None -> behaviour unchanged
|
||||
default_interval = None
|
||||
settings = api_client.get("/api/settings")
|
||||
if isinstance(settings, dict) and not settings.get("error"):
|
||||
try:
|
||||
value = int(str(settings.get("default_measurement_interval_minutes", "")).strip())
|
||||
if 1 <= value <= 1440:
|
||||
default_interval = value
|
||||
except ValueError:
|
||||
pass
|
||||
return render_template(
|
||||
"maker/recipe_editor.html", recipe=None, default_interval=default_interval
|
||||
)
|
||||
|
||||
|
||||
@maker_bp.route("/recipes/<int:recipe_id>/edit")
|
||||
@@ -201,6 +214,21 @@ def api_create_recipe():
|
||||
return jsonify(resp), 201
|
||||
|
||||
|
||||
@maker_bp.route("/api/recipes/<int:recipe_id>/duplicate", methods=["POST"])
|
||||
@login_required
|
||||
@role_required("Maker")
|
||||
def api_duplicate_recipe(recipe_id: int):
|
||||
"""Proxy: Duplicate a recipe under a new code/name (#52)."""
|
||||
data = request.get_json(silent=True) or {}
|
||||
|
||||
resp = api_client.post(f"/api/recipes/{recipe_id}/duplicate", data=data)
|
||||
|
||||
if resp.get("error"):
|
||||
return jsonify(resp), resp.get("status_code", 500)
|
||||
|
||||
return jsonify(resp), 201
|
||||
|
||||
|
||||
@maker_bp.route("/api/recipes/<int:recipe_id>", methods=["PUT"])
|
||||
@login_required
|
||||
@role_required("Maker")
|
||||
|
||||
@@ -814,6 +814,91 @@ def api_close_production(run_id: int):
|
||||
return _supervised_action(run_id, "close")
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Routes: task results (#53 #54 #55) - outcome of a "check" task and the values /
|
||||
# attachments of a "note" task with fields. The browser cannot send X-API-Key,
|
||||
# so each call goes through here.
|
||||
# ---------------------------------------------------------------------------
|
||||
def _relay(resp, ok_status: int = 200):
|
||||
"""JSON back to the browser: backend errors keep their status and detail.
|
||||
|
||||
The detail is what the operator reads («Per un NOK serve la nota»), so it is
|
||||
passed through as it came, never replaced by a generic message.
|
||||
"""
|
||||
if isinstance(resp, dict) and resp.get("error"):
|
||||
body = {"error": True, "detail": resp.get("detail", _("Errore nel salvataggio"))}
|
||||
if resp.get("session_expired"):
|
||||
body["session_expired"] = True
|
||||
status_code = resp.get("status_code", 500)
|
||||
return jsonify(body), status_code if status_code >= 400 else 500
|
||||
return jsonify(resp), ok_status
|
||||
|
||||
|
||||
@measure_bp.route("/api/tasks/<int:task_id>", methods=["GET"])
|
||||
@login_required
|
||||
@role_required("MeasurementTec")
|
||||
def api_get_task(task_id: int):
|
||||
"""Proxy: a task with its fields (#55: the tasks to fill at the end of production)."""
|
||||
return _relay(api_client.get(f"/api/tasks/{task_id}"))
|
||||
|
||||
|
||||
@measure_bp.route("/api/task-results", methods=["POST"])
|
||||
@login_required
|
||||
@role_required("MeasurementTec")
|
||||
def api_save_task_result():
|
||||
"""Proxy: record the result of a check / note task (#54, #55)."""
|
||||
data = request.get_json(silent=True) or {}
|
||||
if data.get("task_id") is None:
|
||||
return jsonify({
|
||||
"error": True, "detail": _("Dati mancanti: task_id è obbligatorio"),
|
||||
}), 400
|
||||
payload = {
|
||||
"task_id": data.get("task_id"),
|
||||
"production_run_id": data.get("production_run_id"),
|
||||
"outcome": data.get("outcome"),
|
||||
"note": data.get("note"),
|
||||
"values": data.get("values"),
|
||||
"attachments": data.get("attachments"),
|
||||
}
|
||||
return _relay(api_client.post("/api/task-results", data=payload), 201)
|
||||
|
||||
|
||||
@measure_bp.route("/api/task-results", methods=["GET"])
|
||||
@login_required
|
||||
@role_required("MeasurementTec")
|
||||
def api_list_task_results():
|
||||
"""Proxy: results already recorded, filtered by production run and/or task."""
|
||||
params = {
|
||||
key: request.args[key]
|
||||
for key in ("production_run_id", "task_id")
|
||||
if request.args.get(key)
|
||||
}
|
||||
return _relay(api_client.get("/api/task-results", params=params))
|
||||
|
||||
|
||||
@measure_bp.route("/api/attachments", methods=["POST"])
|
||||
@login_required
|
||||
@role_required("MeasurementTec")
|
||||
def api_upload_attachment():
|
||||
"""Proxy: upload an attachment of a note task (image or PDF), multipart.
|
||||
|
||||
Answers with the backend's reply: the `file_path` in it is what goes into the
|
||||
`attachments` of the result.
|
||||
"""
|
||||
upload = request.files.get("file")
|
||||
if upload is None or not upload.filename:
|
||||
return jsonify({"error": True, "detail": _("Nessun file caricato")}), 400
|
||||
resp = api_client.post(
|
||||
"/api/files/upload",
|
||||
files={"file": (
|
||||
upload.filename,
|
||||
upload.read(),
|
||||
upload.mimetype or "application/octet-stream",
|
||||
)},
|
||||
)
|
||||
return _relay(resp, 201)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Route: File proxy (browser can't send X-API-Key directly)
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
"""Live monitor of the open production runs (#57).
|
||||
|
||||
Page at /monitor for admin and Supervisor (capoturno); the page polls a JSON proxy
|
||||
of GET /api/production-runs/open every 10 seconds.
|
||||
"""
|
||||
from functools import wraps
|
||||
|
||||
from flask import Blueprint, abort, jsonify, render_template, session
|
||||
|
||||
from blueprints.auth import login_required
|
||||
from services.api_client import api_client
|
||||
|
||||
monitor_bp = Blueprint("monitor", __name__)
|
||||
|
||||
|
||||
def monitor_required(f):
|
||||
"""Admin or Supervisor only: the same people the backend lets read /open."""
|
||||
@wraps(f)
|
||||
def decorated(*args, **kwargs):
|
||||
user = session.get("user", {})
|
||||
if not (user.get("is_admin") or "Supervisor" in user.get("roles", [])):
|
||||
abort(403)
|
||||
return f(*args, **kwargs)
|
||||
return decorated
|
||||
|
||||
|
||||
@monitor_bp.route("", strict_slashes=False)
|
||||
@login_required
|
||||
@monitor_required
|
||||
def index():
|
||||
return render_template("monitor/index.html")
|
||||
|
||||
|
||||
@monitor_bp.route("/api/runs")
|
||||
@login_required
|
||||
@monitor_required
|
||||
def api_runs():
|
||||
"""JSON proxy polled by the page."""
|
||||
resp = api_client.get("/api/production-runs/open")
|
||||
if isinstance(resp, dict) and resp.get("error"):
|
||||
body = {"error": True, "detail": resp.get("detail", "")}
|
||||
if resp.get("session_expired"):
|
||||
body["session_expired"] = True
|
||||
return jsonify(body), resp.get("status_code", 500)
|
||||
return jsonify(resp)
|
||||
@@ -50,7 +50,7 @@ def _proxy_statistics(endpoint: str):
|
||||
for key in [
|
||||
"recipe_id", "version_id", "subtask_id",
|
||||
"date_from", "date_to", "operator_id",
|
||||
"lot_number", "serial_number", "n_bins",
|
||||
"lot_number", "serial_number", "n_bins", "production_run_id", # #58
|
||||
]:
|
||||
val = request.args.get(key)
|
||||
if val is not None and val != "":
|
||||
@@ -127,6 +127,27 @@ def api_subtasks():
|
||||
return jsonify(resp)
|
||||
|
||||
|
||||
@statistics_bp.route("/api/runs")
|
||||
@login_required
|
||||
@role_required("Metrologist")
|
||||
def api_runs():
|
||||
"""Proxy: production runs of a recipe (#58, "Sessione" filter)."""
|
||||
params = {}
|
||||
recipe_id = request.args.get("recipe_id")
|
||||
if recipe_id:
|
||||
params["recipe_id"] = recipe_id
|
||||
|
||||
resp = api_client.get("/api/statistics/runs", params=params)
|
||||
|
||||
if isinstance(resp, dict) and resp.get("error"):
|
||||
error_body = {"error": True, "detail": resp.get("detail", "")}
|
||||
if resp.get("session_expired"):
|
||||
error_body["session_expired"] = True
|
||||
return jsonify(error_body), resp.get("status_code", 500)
|
||||
|
||||
return jsonify(resp)
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# PROXY REPORT PDF → FastAPI
|
||||
# ============================================================================
|
||||
@@ -137,7 +158,7 @@ def _proxy_report(endpoint: str):
|
||||
for key in [
|
||||
"recipe_id", "version_id", "subtask_id",
|
||||
"date_from", "date_to", "operator_id",
|
||||
"lot_number", "serial_number",
|
||||
"lot_number", "serial_number", "production_run_id", # #58
|
||||
]:
|
||||
val = request.args.get(key)
|
||||
if val is not None and val != "":
|
||||
|
||||
@@ -0,0 +1,293 @@
|
||||
/**
|
||||
* image-crop.js — ritaglio di immagine/PDF prima dell'upload (#56).
|
||||
*
|
||||
* Cosa fa: ImageCrop.open(file) apre una modale con un rettangolo di ritaglio
|
||||
* trascinabile e ridimensionabile (mouse e touch, Pointer Events). Per un PDF
|
||||
* rasterizza la pagina scelta con pdf.js (>= 2000 px sul lato lungo).
|
||||
* Risolve: Blob PNG del ritaglio (a piena risoluzione) | il file originale
|
||||
* ("Usa originale") | null ("Annulla").
|
||||
* Come si usa: ImageCrop.configure({pdfSrc, workerSrc, labels}) una volta dal
|
||||
* template (URL di vendor/pdf e stringhe tradotte), poi `await ImageCrop.open(file)`.
|
||||
* Dipendenze: nessuna obbligatoria. pdf.js (gia' vendorizzato) viene caricato
|
||||
* al bisogno solo per i PDF; il ritaglio usa un canvas 2D semplice invece di
|
||||
* fabric.js perche' serve solo un rettangolo, non un editor di oggetti.
|
||||
*/
|
||||
(function (global) {
|
||||
'use strict';
|
||||
|
||||
var cfg = {
|
||||
pdfSrc: '',
|
||||
workerSrc: '',
|
||||
labels: {
|
||||
title: 'Ritaglia immagine',
|
||||
page: 'Pagina',
|
||||
hint: 'Trascina il rettangolo o i suoi bordi per scegliere la zona da tenere.',
|
||||
pdfNote: 'Un PDF ritagliato viene salvato come immagine PNG.',
|
||||
confirm: 'Conferma ritaglio',
|
||||
original: 'Usa originale',
|
||||
cancel: 'Annulla',
|
||||
loading: 'Caricamento...',
|
||||
error: 'Impossibile aprire il file per il ritaglio.'
|
||||
}
|
||||
};
|
||||
|
||||
var MIN_SIDE = 16; // lato minimo del ritaglio, in px immagine
|
||||
var HANDLE = 12; // raggio di presa delle maniglie, in px schermo
|
||||
var PDF_MIN_LONG = 2000; // lato lungo minimo del raster PDF
|
||||
var PDF_MAX_LONG = 6000; // tetto per non esaurire la memoria del canvas
|
||||
|
||||
function configure(opts) {
|
||||
if (!opts) return;
|
||||
if (opts.pdfSrc) cfg.pdfSrc = opts.pdfSrc;
|
||||
if (opts.workerSrc) cfg.workerSrc = opts.workerSrc;
|
||||
if (opts.labels) for (var k in opts.labels) cfg.labels[k] = opts.labels[k];
|
||||
}
|
||||
|
||||
function isPdf(file) {
|
||||
return file.type === 'application/pdf' || /\.pdf$/i.test(file.name || '');
|
||||
}
|
||||
|
||||
function loadPdfJs() {
|
||||
if (global.pdfjsLib) return Promise.resolve(global.pdfjsLib);
|
||||
if (!cfg.pdfSrc) return Promise.reject(new Error('pdf.js non configurato'));
|
||||
return new Promise(function (resolve, reject) {
|
||||
var s = document.createElement('script');
|
||||
s.src = cfg.pdfSrc;
|
||||
s.onload = function () { resolve(global.pdfjsLib); };
|
||||
s.onerror = function () { reject(new Error('pdf.js non caricato')); };
|
||||
document.head.appendChild(s);
|
||||
});
|
||||
}
|
||||
|
||||
function readImage(file) {
|
||||
return new Promise(function (resolve, reject) {
|
||||
var url = URL.createObjectURL(file);
|
||||
var img = new Image();
|
||||
img.onload = function () { URL.revokeObjectURL(url); resolve(img); };
|
||||
img.onerror = function () { URL.revokeObjectURL(url); reject(new Error('immagine illeggibile')); };
|
||||
img.src = url;
|
||||
});
|
||||
}
|
||||
|
||||
function renderPdfPage(pdf, n) {
|
||||
return pdf.getPage(n).then(function (page) {
|
||||
var base = page.getViewport({ scale: 1 });
|
||||
var long = Math.max(base.width, base.height);
|
||||
var scale = Math.min(PDF_MAX_LONG / long, Math.max(2, PDF_MIN_LONG / long));
|
||||
var vp = page.getViewport({ scale: scale });
|
||||
var c = document.createElement('canvas');
|
||||
c.width = Math.round(vp.width);
|
||||
c.height = Math.round(vp.height);
|
||||
return page.render({ canvasContext: c.getContext('2d'), viewport: vp }).promise
|
||||
.then(function () { return c; });
|
||||
});
|
||||
}
|
||||
|
||||
function el(tag, cls, text) {
|
||||
var e = document.createElement(tag);
|
||||
if (cls) e.className = cls;
|
||||
if (text) e.textContent = text;
|
||||
return e;
|
||||
}
|
||||
|
||||
function open(file) {
|
||||
var L = cfg.labels;
|
||||
return new Promise(function (resolve) {
|
||||
var src = null; // Image o canvas sorgente a piena risoluzione
|
||||
var rect = null; // {x,y,w,h} in px immagine
|
||||
var pdfDoc = null;
|
||||
var closed = false;
|
||||
|
||||
// ---- DOM (stile Maker: variabili CSS del tema + classi btn gia' presenti) ----
|
||||
var overlay = el('div', 'fixed inset-0 z-[100] flex items-center justify-center p-3 bg-black/60');
|
||||
overlay.setAttribute('role', 'dialog');
|
||||
overlay.setAttribute('aria-modal', 'true');
|
||||
var box = el('div', 'rounded-xl shadow-xl flex flex-col w-full max-w-4xl max-h-full');
|
||||
box.style.cssText = 'background:var(--bg-primary,#fff);color:var(--text-primary,#111);border:1px solid var(--border-color,#ddd);';
|
||||
var head = el('div', 'flex items-center justify-between gap-3 px-4 py-3');
|
||||
head.appendChild(el('h3', 'font-semibold text-sm', L.title));
|
||||
var pageWrap = el('label', 'text-xs items-center gap-2');
|
||||
pageWrap.style.display = 'none';
|
||||
pageWrap.appendChild(document.createTextNode(L.page + ' '));
|
||||
var pageSel = el('select', 'tmf-input text-xs');
|
||||
pageSel.style.width = 'auto';
|
||||
pageWrap.appendChild(pageSel);
|
||||
head.appendChild(pageWrap);
|
||||
var body = el('div', 'px-4 flex-1 min-h-0 overflow-auto flex justify-center');
|
||||
var status = el('p', 'text-xs py-6', L.loading);
|
||||
body.appendChild(status);
|
||||
var canvas = el('canvas');
|
||||
canvas.style.cssText = 'max-width:100%;max-height:65vh;touch-action:none;cursor:crosshair;display:none;';
|
||||
body.appendChild(canvas);
|
||||
var foot = el('div', 'px-4 py-3 flex flex-wrap items-center justify-between gap-2');
|
||||
var note = el('p', 'text-xs');
|
||||
note.style.color = 'var(--text-muted,#666)';
|
||||
note.textContent = L.hint + (isPdf(file) ? ' ' + L.pdfNote : '');
|
||||
var btns = el('div', 'flex gap-2');
|
||||
var bCancel = el('button', 'btn btn-secondary text-xs', L.cancel);
|
||||
var bOrig = el('button', 'btn btn-secondary text-xs', L.original);
|
||||
var bOk = el('button', 'btn btn-primary text-xs', L.confirm);
|
||||
[bCancel, bOrig, bOk].forEach(function (b) { b.type = 'button'; btns.appendChild(b); });
|
||||
bOk.disabled = true;
|
||||
foot.appendChild(note);
|
||||
foot.appendChild(btns);
|
||||
box.appendChild(head); box.appendChild(body); box.appendChild(foot);
|
||||
overlay.appendChild(box);
|
||||
document.body.appendChild(overlay);
|
||||
|
||||
function onKey(e) { if (e.key === 'Escape') finish(null); }
|
||||
function finish(value) {
|
||||
if (closed) return;
|
||||
closed = true;
|
||||
document.removeEventListener('keydown', onKey);
|
||||
overlay.remove();
|
||||
resolve(value);
|
||||
}
|
||||
document.addEventListener('keydown', onKey);
|
||||
bCancel.onclick = function () { finish(null); };
|
||||
bOrig.onclick = function () { finish(file); };
|
||||
bOk.onclick = function () {
|
||||
if (!src || !rect) return;
|
||||
var out = document.createElement('canvas');
|
||||
out.width = Math.round(rect.w);
|
||||
out.height = Math.round(rect.h);
|
||||
out.getContext('2d').drawImage(src, Math.round(rect.x), Math.round(rect.y),
|
||||
out.width, out.height, 0, 0, out.width, out.height);
|
||||
out.toBlob(function (blob) { finish(blob || file); }, 'image/png');
|
||||
};
|
||||
|
||||
// ---- disegno ----
|
||||
function sw() { return src.width || src.naturalWidth; }
|
||||
function sh() { return src.height || src.naturalHeight; }
|
||||
function handlePoints(r) {
|
||||
var mx = r.x + r.w / 2, my = r.y + r.h / 2, ex = r.x + r.w, ey = r.y + r.h;
|
||||
return [
|
||||
{ n: 'nw', x: r.x, y: r.y }, { n: 'n', x: mx, y: r.y }, { n: 'ne', x: ex, y: r.y },
|
||||
{ n: 'e', x: ex, y: my }, { n: 'se', x: ex, y: ey }, { n: 's', x: mx, y: ey },
|
||||
{ n: 'sw', x: r.x, y: ey }, { n: 'w', x: r.x, y: my }
|
||||
];
|
||||
}
|
||||
function draw() {
|
||||
var ctx = canvas.getContext('2d');
|
||||
ctx.drawImage(src, 0, 0, canvas.width, canvas.height);
|
||||
var r = rect; // il canvas di visualizzazione ha la risoluzione della sorgente
|
||||
// velo scuro fuori dal ritaglio (4 fasce)
|
||||
ctx.fillStyle = 'rgba(0,0,0,0.5)';
|
||||
ctx.fillRect(0, 0, canvas.width, r.y);
|
||||
ctx.fillRect(0, r.y + r.h, canvas.width, canvas.height - r.y - r.h);
|
||||
ctx.fillRect(0, r.y, r.x, r.h);
|
||||
ctx.fillRect(r.x + r.w, r.y, canvas.width - r.x - r.w, r.h);
|
||||
ctx.strokeStyle = '#3b82f6';
|
||||
ctx.lineWidth = Math.max(2, canvas.width / 400);
|
||||
ctx.strokeRect(r.x, r.y, r.w, r.h);
|
||||
ctx.fillStyle = '#3b82f6';
|
||||
var hs = Math.max(8, canvas.width / 80);
|
||||
handlePoints(r).forEach(function (p) { ctx.fillRect(p.x - hs / 2, p.y - hs / 2, hs, hs); });
|
||||
}
|
||||
function setSource(s) {
|
||||
src = s;
|
||||
canvas.width = sw();
|
||||
canvas.height = sh();
|
||||
rect = { x: 0, y: 0, w: sw(), h: sh() }; // all'inizio: tutta l'immagine
|
||||
status.style.display = 'none';
|
||||
canvas.style.display = 'block';
|
||||
bOk.disabled = false;
|
||||
draw();
|
||||
}
|
||||
|
||||
// ---- interazione ----
|
||||
var drag = null;
|
||||
function toImg(e) {
|
||||
var b = canvas.getBoundingClientRect();
|
||||
return { x: (e.clientX - b.left) * sw() / b.width, y: (e.clientY - b.top) * sh() / b.height,
|
||||
k: sw() / b.width }; // k = px immagine per px schermo
|
||||
}
|
||||
function hit(p) {
|
||||
var best = null, bd = HANDLE * p.k;
|
||||
handlePoints(rect).forEach(function (h) {
|
||||
var d = Math.max(Math.abs(h.x - p.x), Math.abs(h.y - p.y));
|
||||
if (d <= bd) { bd = d; best = h.n; }
|
||||
});
|
||||
if (best) return best;
|
||||
if (p.x > rect.x && p.x < rect.x + rect.w && p.y > rect.y && p.y < rect.y + rect.h) return 'move';
|
||||
return 'new';
|
||||
}
|
||||
function clamp(v, a, b) { return Math.max(a, Math.min(b, v)); }
|
||||
canvas.addEventListener('pointerdown', function (e) {
|
||||
if (!src) return;
|
||||
var p = toImg(e);
|
||||
var mode = hit(p);
|
||||
drag = { mode: mode, sx: p.x, sy: p.y, r0: { x: rect.x, y: rect.y, w: rect.w, h: rect.h } };
|
||||
if (mode === 'new') { // nuovo rettangolo: parte dal punto di tocco
|
||||
drag.r0 = { x: clamp(p.x, 0, sw()), y: clamp(p.y, 0, sh()), w: 0, h: 0 };
|
||||
}
|
||||
canvas.setPointerCapture(e.pointerId);
|
||||
e.preventDefault();
|
||||
});
|
||||
canvas.addEventListener('pointermove', function (e) {
|
||||
if (!src) return;
|
||||
var p = toImg(e);
|
||||
if (!drag) {
|
||||
var m = hit(p);
|
||||
canvas.style.cursor = m === 'move' ? 'move' : m === 'new' ? 'crosshair'
|
||||
: (m.length === 2 ? (m === 'nw' || m === 'se' ? 'nwse-resize' : 'nesw-resize')
|
||||
: (m === 'n' || m === 's' ? 'ns-resize' : 'ew-resize'));
|
||||
return;
|
||||
}
|
||||
var dx = p.x - drag.sx, dy = p.y - drag.sy, r0 = drag.r0, W = sw(), H = sh();
|
||||
if (drag.mode === 'move') {
|
||||
rect.x = clamp(r0.x + dx, 0, W - r0.w);
|
||||
rect.y = clamp(r0.y + dy, 0, H - r0.h);
|
||||
} else {
|
||||
var x1 = r0.x, y1 = r0.y, x2 = r0.x + r0.w, y2 = r0.y + r0.h, m2 = drag.mode;
|
||||
if (m2 === 'new') { x2 = clamp(p.x, 0, W); y2 = clamp(p.y, 0, H); }
|
||||
else {
|
||||
if (m2.indexOf('w') >= 0) x1 = clamp(r0.x + dx, 0, x2 - MIN_SIDE);
|
||||
if (m2.indexOf('e') >= 0) x2 = clamp(x2 + dx, x1 + MIN_SIDE, W);
|
||||
if (m2.indexOf('n') >= 0) y1 = clamp(r0.y + dy, 0, y2 - MIN_SIDE);
|
||||
if (m2.indexOf('s') >= 0) y2 = clamp(y2 + dy, y1 + MIN_SIDE, H);
|
||||
}
|
||||
rect = { x: Math.min(x1, x2), y: Math.min(y1, y2), w: Math.abs(x2 - x1), h: Math.abs(y2 - y1) };
|
||||
}
|
||||
bOk.disabled = rect.w < MIN_SIDE || rect.h < MIN_SIDE; // ritaglio troppo piccolo: non confermabile
|
||||
draw();
|
||||
e.preventDefault();
|
||||
});
|
||||
function up() { drag = null; }
|
||||
canvas.addEventListener('pointerup', up);
|
||||
canvas.addEventListener('pointercancel', up);
|
||||
|
||||
// ---- caricamento sorgente ----
|
||||
function fail(err) {
|
||||
console.error('ImageCrop:', err);
|
||||
status.style.display = '';
|
||||
status.textContent = L.error;
|
||||
canvas.style.display = 'none';
|
||||
bOk.disabled = true;
|
||||
}
|
||||
if (isPdf(file)) {
|
||||
loadPdfJs().then(function (lib) {
|
||||
if (cfg.workerSrc) lib.GlobalWorkerOptions.workerSrc = cfg.workerSrc;
|
||||
return file.arrayBuffer().then(function (buf) { return lib.getDocument({ data: buf }).promise; });
|
||||
}).then(function (pdf) {
|
||||
pdfDoc = pdf;
|
||||
if (pdf.numPages > 1) {
|
||||
for (var i = 1; i <= pdf.numPages; i++) {
|
||||
var o = el('option', '', String(i)); o.value = String(i); pageSel.appendChild(o);
|
||||
}
|
||||
pageWrap.style.display = 'flex';
|
||||
}
|
||||
return renderPdfPage(pdf, 1);
|
||||
}).then(setSource).catch(fail);
|
||||
pageSel.onchange = function () {
|
||||
bOk.disabled = true;
|
||||
renderPdfPage(pdfDoc, parseInt(pageSel.value, 10)).then(setSource).catch(fail);
|
||||
};
|
||||
} else {
|
||||
readImage(file).then(setSource).catch(fail);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
global.ImageCrop = { open: open, configure: configure };
|
||||
})(window);
|
||||
@@ -0,0 +1,60 @@
|
||||
/* Login Operatore: nome + PIN a 4 cifre (#59).
|
||||
* Componente Alpine globale `pinLogin()`, usato da templates/auth/login.html.
|
||||
* Contratto: GET /auth/pin-users -> [{id, display_name}];
|
||||
* POST /auth/login-pin {user_id, pin} -> {ok, redirect} | {error, detail}. */
|
||||
function pinLogin() {
|
||||
return {
|
||||
mode: 'pin', // vista Operatore di default; se l'elenco e' vuoto/fallisce passa a 'password'
|
||||
users: [],
|
||||
selected: null,
|
||||
pin: '',
|
||||
error: '',
|
||||
busy: false,
|
||||
|
||||
init: function () {
|
||||
var self = this;
|
||||
fetch(window.TMF_PIN.usersUrl, { headers: { 'Accept': 'application/json' } })
|
||||
.then(function (r) { return r.ok ? r.json() : []; })
|
||||
.then(function (list) {
|
||||
self.users = Array.isArray(list) ? list : [];
|
||||
if (!self.users.length) self.mode = 'password'; // elenco vuoto: form password
|
||||
})
|
||||
.catch(function () { self.users = []; self.mode = 'password'; });
|
||||
},
|
||||
select: function (u) { this.selected = u; this.pin = ''; this.error = ''; },
|
||||
back: function () { this.selected = null; this.pin = ''; this.error = ''; },
|
||||
del: function () { this.pin = this.pin.slice(0, -1); },
|
||||
press: function (d) {
|
||||
if (this.busy || this.pin.length >= 4) return;
|
||||
this.pin += d;
|
||||
this.error = '';
|
||||
if (this.pin.length === 4) this.submit(); // invio automatico alla quarta cifra
|
||||
},
|
||||
submit: function () {
|
||||
var self = this;
|
||||
var csrf = document.querySelector('meta[name=csrf-token]');
|
||||
self.busy = true;
|
||||
fetch(window.TMF_PIN.loginUrl, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'Accept': 'application/json',
|
||||
'X-CSRFToken': (csrf && csrf.content) || ''
|
||||
},
|
||||
body: JSON.stringify({ user_id: self.selected.id, pin: self.pin })
|
||||
})
|
||||
.then(function (r) { return r.json().catch(function () { return {}; }); })
|
||||
.then(function (d) {
|
||||
if (d.ok && d.redirect) { window.location.href = d.redirect; return; }
|
||||
self.error = d.detail || window.TMF_PIN.msgNet; // 401 PIN errato, 423 blocco con ora
|
||||
self.pin = '';
|
||||
self.busy = false;
|
||||
})
|
||||
.catch(function () {
|
||||
self.error = window.TMF_PIN.msgNet;
|
||||
self.pin = '';
|
||||
self.busy = false;
|
||||
});
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,272 @@
|
||||
/**
|
||||
* Task results (#53 #54 #55) - Alpine component for the tasks that record a result.
|
||||
*
|
||||
* - «check» task (#54): the operator answers OK or NOK, with a note (mandatory for NOK).
|
||||
* - «note» task with `fields` (#55): one input per field, an optional attachment
|
||||
* (image / PDF) for the fields that ask for it, outcome 'done'.
|
||||
*
|
||||
* The same component serves the task being executed (one form) and the panel shown
|
||||
* at the end of production (one form per at_close task), so the field rules live here
|
||||
* once. The page sets `window.__taskResultsCfg` (urls + labels) and the component's
|
||||
* `ctx` (production run id + callbacks) from its x-init, the way visionExecute() does.
|
||||
*
|
||||
* Plain functions only (no framework imports) so tests/js/test_task_results.js can
|
||||
* run them under node with a stubbed fetch.
|
||||
*/
|
||||
function taskResultForm() {
|
||||
return {
|
||||
// Set by the page's x-init: () => ({ runId: int|null, done: () => void })
|
||||
ctx: null,
|
||||
forms: [],
|
||||
working: false,
|
||||
error: '',
|
||||
// true once a result was recorded during this page view (shows «Prosegui»)
|
||||
justRecorded: false,
|
||||
// Panel open state (used by the end-of-production panel only)
|
||||
open: false,
|
||||
|
||||
cfg() { return window.__taskResultsCfg || { labels: {} }; },
|
||||
label(key, fallback) {
|
||||
return (this.cfg().labels && this.cfg().labels[key]) || fallback;
|
||||
},
|
||||
runId() {
|
||||
const c = this.ctx ? this.ctx() : null;
|
||||
return c && c.runId ? c.runId : null;
|
||||
},
|
||||
|
||||
/* One form per task: values start from the field's default, the way the maker set it. */
|
||||
makeForm(task) {
|
||||
const fields = Array.isArray(task.fields) ? task.fields : [];
|
||||
const values = {};
|
||||
fields.forEach((f) => { values[f.key] = (f.default === null || f.default === undefined) ? '' : String(f.default); });
|
||||
return {
|
||||
task_id: task.id,
|
||||
title: task.title || '',
|
||||
directive: task.directive || '',
|
||||
type: task.task_type,
|
||||
fields: fields,
|
||||
values: values,
|
||||
files: {},
|
||||
fileNames: {},
|
||||
note: '',
|
||||
outcome: '',
|
||||
error: '',
|
||||
result: null,
|
||||
recorded: false,
|
||||
};
|
||||
},
|
||||
|
||||
/* The single form of the task on screen. */
|
||||
initForTask(task) {
|
||||
if (!task) return;
|
||||
const isCheck = task.task_type === 'check';
|
||||
const isNoteWithFields = task.task_type === 'note' && Array.isArray(task.fields) && task.fields.length > 0;
|
||||
if (!isCheck && !isNoteWithFields) return;
|
||||
this.forms = [this.makeForm(task)];
|
||||
this.loadLast();
|
||||
},
|
||||
|
||||
pickFile(form, key, ev) {
|
||||
const f = ev && ev.target && ev.target.files ? ev.target.files[0] : null;
|
||||
if (f) { form.files[key] = f; form.fileNames[key] = f.name; }
|
||||
else { delete form.files[key]; form.fileNames[key] = ''; }
|
||||
},
|
||||
|
||||
csrf() {
|
||||
const m = typeof document !== 'undefined' ? document.querySelector('meta[name=csrf-token]') : null;
|
||||
return (m && m.content) || '';
|
||||
},
|
||||
|
||||
/* Fetch + JSON with the page's usual error reading: the detail of the server is
|
||||
what the operator sees; an HTML answer (expired CSRF / session) means «reload». */
|
||||
async call(url, opts) {
|
||||
let resp;
|
||||
try {
|
||||
resp = await fetch(url, opts);
|
||||
} catch (e) {
|
||||
return { ok: false, detail: this.label('connection', 'Errore di connessione') };
|
||||
}
|
||||
const data = await resp.json().catch(() => null);
|
||||
if (!data || data.csrf_expired || data.session_expired) {
|
||||
return { ok: false, detail: this.label('sessionExpired', 'Sessione scaduta: ricaricare la pagina') };
|
||||
}
|
||||
if (!resp.ok) {
|
||||
return { ok: false, detail: data.detail || this.label('serverError', 'Errore di comunicazione con il server') };
|
||||
}
|
||||
return { ok: true, data: data };
|
||||
},
|
||||
|
||||
/* The last result of this task: in the run under way if there is one, otherwise
|
||||
the one given in this browser session (no run = nothing on the server to ask).
|
||||
Only shown: the buttons stay active, a loop gives a new result every cycle. */
|
||||
async loadLast() {
|
||||
const form = this.forms[0];
|
||||
if (!form) return;
|
||||
const rid = this.runId();
|
||||
if (rid && this.cfg().listUrl) {
|
||||
const r = await this.call(
|
||||
this.cfg().listUrl + '?production_run_id=' + encodeURIComponent(rid) +
|
||||
'&task_id=' + encodeURIComponent(form.task_id));
|
||||
if (r.ok && Array.isArray(r.data) && r.data.length) {
|
||||
form.result = r.data[r.data.length - 1];
|
||||
return;
|
||||
}
|
||||
}
|
||||
try {
|
||||
const raw = window.sessionStorage.getItem('tmf-task-result-' + form.task_id);
|
||||
if (raw && !rid) form.result = JSON.parse(raw);
|
||||
} catch (e) { /* storage may be unavailable: the result is simply not shown */ }
|
||||
},
|
||||
|
||||
/* Validation before anything goes on the wire. Returns the message or ''. */
|
||||
validate(form, outcome) {
|
||||
if (form.type === 'check') {
|
||||
if (outcome === 'nok' && !(form.note || '').trim()) {
|
||||
return this.label('nokNeedsNote', 'Per un NOK serve la nota');
|
||||
}
|
||||
return '';
|
||||
}
|
||||
for (const f of form.fields) {
|
||||
const v = form.values[f.key];
|
||||
if (f.type === 'number' && v !== '' && v !== null && v !== undefined &&
|
||||
!isFinite(Number(String(v).replace(',', '.')))) {
|
||||
return this.label('notANumber', 'Valore non numerico') + ': ' + f.label;
|
||||
}
|
||||
}
|
||||
return '';
|
||||
},
|
||||
|
||||
/* Upload the attachments of a form, then POST the result.
|
||||
Returns true when the result is recorded (forms already recorded are skipped). */
|
||||
async record(form, outcome) {
|
||||
if (form.recorded) return true;
|
||||
form.error = this.validate(form, outcome);
|
||||
if (form.error) return false;
|
||||
|
||||
const attachments = [];
|
||||
for (const f of form.fields) {
|
||||
const file = form.files[f.key];
|
||||
if (!f.attachment || !file) continue;
|
||||
const fd = new FormData();
|
||||
fd.append('file', file, file.name);
|
||||
const up = await this.call(this.cfg().uploadUrl, {
|
||||
method: 'POST', headers: { 'X-CSRFToken': this.csrf() }, body: fd,
|
||||
});
|
||||
if (!up.ok) { form.error = up.detail; return false; }
|
||||
// The backend answers {file_path, ...}: that path is what the result keeps.
|
||||
attachments.push({ key: f.key, path: up.data.file_path || up.data.path, name: file.name });
|
||||
}
|
||||
|
||||
let values = null;
|
||||
if (form.type === 'note' && form.fields.length) {
|
||||
values = {};
|
||||
form.fields.forEach((f) => {
|
||||
const v = form.values[f.key];
|
||||
if (v === '' || v === null || v === undefined) return;
|
||||
values[f.key] = f.type === 'number' ? String(v).replace(',', '.') : String(v);
|
||||
});
|
||||
}
|
||||
|
||||
const body = {
|
||||
task_id: form.task_id,
|
||||
production_run_id: this.runId(),
|
||||
outcome: form.type === 'check' ? outcome : 'done',
|
||||
note: (form.note || '').trim() || null,
|
||||
values: values,
|
||||
attachments: attachments.length ? attachments : null,
|
||||
};
|
||||
const r = await this.call(this.cfg().saveUrl, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json', 'X-CSRFToken': this.csrf() },
|
||||
body: JSON.stringify(body),
|
||||
});
|
||||
if (!r.ok) { form.error = r.detail; return false; }
|
||||
form.result = r.data;
|
||||
form.recorded = true;
|
||||
try {
|
||||
window.sessionStorage.setItem('tmf-task-result-' + form.task_id, JSON.stringify(r.data));
|
||||
} catch (e) { /* storage may be unavailable */ }
|
||||
return true;
|
||||
},
|
||||
|
||||
/* Task on screen: OK / NOK button, or «Completato» of a note with fields. */
|
||||
async submit(outcome) {
|
||||
const form = this.forms[0];
|
||||
if (!form || this.working) return;
|
||||
this.working = true;
|
||||
this.error = '';
|
||||
const ok = await this.record(form, outcome);
|
||||
this.working = false;
|
||||
if (!ok) return;
|
||||
this.justRecorded = true;
|
||||
this.proceed();
|
||||
},
|
||||
|
||||
/* Hand over to the page: close the cycle / go on. Also bound to «Prosegui», for
|
||||
when that step failed after the result was already recorded. */
|
||||
proceed() {
|
||||
const c = this.ctx ? this.ctx() : null;
|
||||
if (c && c.done) c.done();
|
||||
},
|
||||
|
||||
/* The result as the operator reads it. */
|
||||
resultLabel(result) {
|
||||
if (!result) return '';
|
||||
if (result.outcome === 'ok') return this.label('outcomeOk', 'OK');
|
||||
if (result.outcome === 'nok') return this.label('outcomeNok', 'NOK');
|
||||
return this.label('outcomeDone', 'Registrato');
|
||||
},
|
||||
|
||||
// ---- End of production panel (#55) ----
|
||||
|
||||
/* Open the panel for the at_close tasks of the run. A task that already has a
|
||||
result in this run (page reloaded in between) is not asked again. */
|
||||
async openClose(ids) {
|
||||
this.error = '';
|
||||
this.working = true;
|
||||
this.open = true;
|
||||
this.forms = [];
|
||||
const rid = this.runId();
|
||||
let done = [];
|
||||
if (rid && this.cfg().listUrl) {
|
||||
const r = await this.call(this.cfg().listUrl + '?production_run_id=' + encodeURIComponent(rid));
|
||||
if (r.ok && Array.isArray(r.data)) done = r.data.map((x) => x.task_id);
|
||||
}
|
||||
const forms = [];
|
||||
for (const id of ids) {
|
||||
const r = await this.call(this.cfg().taskUrlTpl.replace('/0', '/' + id));
|
||||
if (!r.ok) { this.error = r.detail; this.working = false; return; }
|
||||
const form = this.makeForm(r.data);
|
||||
if (done.indexOf(id) !== -1) form.recorded = true;
|
||||
forms.push(form);
|
||||
}
|
||||
this.forms = forms;
|
||||
this.working = false;
|
||||
// Nothing left to ask: straight on to the capoturno.
|
||||
if (forms.every((f) => f.recorded)) this.finishClose();
|
||||
},
|
||||
|
||||
cancelClose() { this.open = false; this.forms = []; this.error = ''; },
|
||||
|
||||
async submitClose() {
|
||||
if (this.working) return;
|
||||
this.working = true;
|
||||
this.error = '';
|
||||
let allOk = true;
|
||||
for (const form of this.forms) {
|
||||
// Keep going after a failure: each form shows its own error, and the ones
|
||||
// already recorded are not sent again on the next try.
|
||||
if (!(await this.record(form, 'done'))) allOk = false;
|
||||
}
|
||||
this.working = false;
|
||||
if (allOk) this.finishClose();
|
||||
},
|
||||
|
||||
finishClose() {
|
||||
this.open = false;
|
||||
this.proceed();
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
if (typeof module !== 'undefined') module.exports = { taskResultForm };
|
||||
+55
-219
@@ -1,18 +1,7 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}{{ _('Gestione Utenti') }} - TieMeasureFlow{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{# Pannello utenti: incluso nella tab «Utenti» di Impostazioni (#50) #}
|
||||
<script>window.__users = {{ users|tojson }};</script>
|
||||
|
||||
<div class="tmf-page"
|
||||
x-data="userManagement(window.__users)">
|
||||
|
||||
<!-- Header -->
|
||||
<div class="mb-6">
|
||||
<h1 class="text-2xl font-bold text-[var(--text-primary)]">{{ _('Gestione Utenti') }}</h1>
|
||||
<p class="mt-1 text-sm text-[var(--text-secondary)]">{{ _('Crea, modifica e gestisci gli utenti del sistema') }}</p>
|
||||
</div>
|
||||
<div x-data="userManagement(window.__users)">
|
||||
|
||||
<!-- Toolbar -->
|
||||
<div class="flex flex-col sm:flex-row items-start sm:items-center justify-between gap-3 mb-6">
|
||||
@@ -102,6 +91,12 @@
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"/>
|
||||
</svg>
|
||||
</button>
|
||||
<!-- #51: reset password dall'admin -->
|
||||
<button @click="openReset(user)" class="p-1.5 rounded-lg text-[var(--text-secondary)] hover:text-primary hover:bg-primary-50 dark:hover:bg-primary-900/20 transition-colors" :title="{{ _('Reset password')|tojson_attr }}">
|
||||
<svg class="w-4 h-4" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M15 7a2 2 0 012 2m4 0a6 6 0 01-7.743 5.743L11 17H9v2H7v2H4a1 1 0 01-1-1v-2.586a1 1 0 01.293-.707l5.964-5.964A6 6 0 1121 9z"/>
|
||||
</svg>
|
||||
</button>
|
||||
<button @click="toggleActive(user)" class="p-1.5 rounded-lg transition-colors"
|
||||
:class="user.active
|
||||
? 'text-[var(--text-secondary)] hover:text-red-600 hover:bg-red-50 dark:hover:bg-red-900/20'
|
||||
@@ -332,210 +327,51 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- #51: Modal reset password (la password attuale non si mostra mai) -->
|
||||
<div x-show="showReset" x-cloak
|
||||
class="fixed inset-0 z-50 flex items-center justify-center p-4"
|
||||
@keydown.escape.window="closeReset()">
|
||||
<div class="absolute inset-0 bg-black/50" @click="closeReset()"></div>
|
||||
<div class="relative bg-[var(--bg-card)] rounded-xl border border-[var(--border-color)] shadow-xl w-full max-w-md p-6">
|
||||
<h3 class="text-lg font-semibold text-[var(--text-primary)] mb-2">
|
||||
{{ _('Reset password') }}: <span x-text="resetUser?.username"></span>
|
||||
</h3>
|
||||
<p class="text-sm text-[var(--text-secondary)] mb-4">
|
||||
{{ _('Le sessioni aperte dell\'utente verranno chiuse e dovrà accedere con la nuova password.') }}
|
||||
</p>
|
||||
<template x-if="!resetDone">
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-[var(--text-primary)] mb-1">{{ _('Nuova password (minimo 8 caratteri)') }}</label>
|
||||
<div class="flex gap-2">
|
||||
<input type="text" x-model="resetPw" autocomplete="off"
|
||||
class="flex-1 px-3 py-2 rounded-lg border border-[var(--border-color)] bg-[var(--bg-card)] text-sm font-mono text-[var(--text-primary)] focus:outline-none focus:ring-2 focus:ring-primary/30 focus:border-primary">
|
||||
<button @click="generateResetPw()" type="button"
|
||||
class="px-3 py-2 text-sm font-medium rounded-lg border border-[var(--border-color)] text-[var(--text-primary)] hover:bg-[var(--bg-secondary)]">
|
||||
{{ _('Genera') }}
|
||||
</button>
|
||||
</div>
|
||||
<template x-if="resetError">
|
||||
<p class="mt-2 text-sm text-red-600" x-text="resetError"></p>
|
||||
</template>
|
||||
</div>
|
||||
</template>
|
||||
<template x-if="resetDone">
|
||||
<div class="px-3 py-2 rounded-lg bg-emerald-50 dark:bg-emerald-900/20 border border-emerald-200 dark:border-emerald-800">
|
||||
<p class="text-sm text-emerald-700 dark:text-emerald-300">{{ _('Password cambiata. Annotala ora: non verrà mostrata di nuovo.') }}</p>
|
||||
<p class="mt-1 text-base font-mono font-semibold text-[var(--text-primary)] select-all" x-text="resetPw"></p>
|
||||
</div>
|
||||
</template>
|
||||
<div class="flex justify-end gap-3 mt-5">
|
||||
<button @click="closeReset()"
|
||||
class="px-4 py-2 text-sm font-medium text-[var(--text-secondary)] rounded-lg hover:bg-[var(--bg-secondary)]">
|
||||
<span x-text="resetDone ? {{ _('Chiudi')|tojson_attr }} : {{ _('Annulla')|tojson_attr }}"></span>
|
||||
</button>
|
||||
<button x-show="!resetDone" @click="confirmReset()" :disabled="saving"
|
||||
class="px-4 py-2 bg-primary text-white text-sm font-medium rounded-lg hover:bg-primary-700 shadow-sm disabled:opacity-50">
|
||||
{{ _('Imposta password') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block extra_js %}
|
||||
<script>
|
||||
function userManagement(initialUsers) {
|
||||
return {
|
||||
users: initialUsers || [],
|
||||
search: '',
|
||||
showModal: false,
|
||||
showToggleConfirm: false,
|
||||
isEditing: false,
|
||||
editingUserId: null,
|
||||
toggleUser: null,
|
||||
saving: false,
|
||||
errorMsg: '',
|
||||
form: {
|
||||
username: '',
|
||||
display_name: '',
|
||||
email: '',
|
||||
password: '',
|
||||
roles: [],
|
||||
is_admin: false,
|
||||
language_pref: 'it',
|
||||
theme_pref: 'light'
|
||||
},
|
||||
|
||||
get csrfToken() {
|
||||
const meta = document.querySelector('meta[name=csrf-token]');
|
||||
return meta ? meta.content : '';
|
||||
},
|
||||
|
||||
get filteredUsers() {
|
||||
if (!this.search.trim()) return this.users;
|
||||
const q = this.search.toLowerCase();
|
||||
return this.users.filter(u =>
|
||||
u.username.toLowerCase().includes(q) ||
|
||||
(u.display_name && u.display_name.toLowerCase().includes(q)) ||
|
||||
(u.email && u.email.toLowerCase().includes(q)) ||
|
||||
(u.roles && u.roles.some(r => r.toLowerCase().includes(q)))
|
||||
);
|
||||
},
|
||||
|
||||
openCreateModal() {
|
||||
this.isEditing = false;
|
||||
this.editingUserId = null;
|
||||
this.errorMsg = '';
|
||||
this.form = {
|
||||
username: '',
|
||||
display_name: '',
|
||||
email: '',
|
||||
password: '',
|
||||
roles: [],
|
||||
is_admin: false,
|
||||
language_pref: 'it',
|
||||
theme_pref: 'light'
|
||||
};
|
||||
this.showModal = true;
|
||||
},
|
||||
|
||||
openEditModal(user) {
|
||||
this.isEditing = true;
|
||||
this.editingUserId = user.id;
|
||||
this.errorMsg = '';
|
||||
this.form = {
|
||||
username: user.username,
|
||||
display_name: user.display_name || '',
|
||||
email: user.email || '',
|
||||
password: '',
|
||||
roles: [...(user.roles || [])],
|
||||
is_admin: user.is_admin || false,
|
||||
language_pref: user.language_pref || 'it',
|
||||
theme_pref: user.theme_pref || 'light'
|
||||
};
|
||||
this.showModal = true;
|
||||
},
|
||||
|
||||
closeModal() {
|
||||
this.showModal = false;
|
||||
this.errorMsg = '';
|
||||
},
|
||||
|
||||
async saveUser() {
|
||||
this.saving = true;
|
||||
this.errorMsg = '';
|
||||
|
||||
try {
|
||||
if (this.isEditing) {
|
||||
// Update user
|
||||
const data = {
|
||||
display_name: this.form.display_name,
|
||||
email: this.form.email || null,
|
||||
roles: this.form.roles,
|
||||
is_admin: this.form.is_admin,
|
||||
language_pref: this.form.language_pref,
|
||||
theme_pref: this.form.theme_pref
|
||||
};
|
||||
|
||||
const resp = await fetch(`/admin/api/users/${this.editingUserId}`, {
|
||||
method: 'PUT',
|
||||
headers: { 'Content-Type': 'application/json', 'X-CSRFToken': this.csrfToken },
|
||||
body: JSON.stringify(data)
|
||||
});
|
||||
|
||||
const result = await resp.json();
|
||||
if (!resp.ok) {
|
||||
this.errorMsg = result.detail || 'Errore nel salvataggio';
|
||||
return;
|
||||
}
|
||||
|
||||
// Update local array
|
||||
const idx = this.users.findIndex(u => u.id === this.editingUserId);
|
||||
if (idx >= 0) this.users[idx] = result;
|
||||
|
||||
// Change password if provided
|
||||
if (this.form.password) {
|
||||
const pwResp = await fetch(`/admin/api/users/${this.editingUserId}/password`, {
|
||||
method: 'PUT',
|
||||
headers: { 'Content-Type': 'application/json', 'X-CSRFToken': this.csrfToken },
|
||||
body: JSON.stringify({ password: this.form.password })
|
||||
});
|
||||
if (!pwResp.ok) {
|
||||
const pwResult = await pwResp.json();
|
||||
this.errorMsg = pwResult.detail || 'Errore nel cambio password';
|
||||
return;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// Create user
|
||||
if (!this.form.username || !this.form.display_name || !this.form.password) {
|
||||
this.errorMsg = '{{ _("Username, nome visualizzato e password sono obbligatori") }}';
|
||||
return;
|
||||
}
|
||||
|
||||
const data = {
|
||||
username: this.form.username,
|
||||
password: this.form.password,
|
||||
display_name: this.form.display_name,
|
||||
email: this.form.email || null,
|
||||
roles: this.form.roles,
|
||||
is_admin: this.form.is_admin,
|
||||
language_pref: this.form.language_pref,
|
||||
theme_pref: this.form.theme_pref
|
||||
};
|
||||
|
||||
const resp = await fetch('/admin/api/users', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json', 'X-CSRFToken': this.csrfToken },
|
||||
body: JSON.stringify(data)
|
||||
});
|
||||
|
||||
const result = await resp.json();
|
||||
if (!resp.ok) {
|
||||
this.errorMsg = result.detail || 'Errore nella creazione';
|
||||
return;
|
||||
}
|
||||
|
||||
this.users.push(result);
|
||||
}
|
||||
|
||||
this.closeModal();
|
||||
} catch (e) {
|
||||
this.errorMsg = '{{ _("Errore di connessione al server") }}';
|
||||
} finally {
|
||||
this.saving = false;
|
||||
}
|
||||
},
|
||||
|
||||
toggleActive(user) {
|
||||
this.toggleUser = user;
|
||||
this.showToggleConfirm = true;
|
||||
},
|
||||
|
||||
async confirmToggle() {
|
||||
if (!this.toggleUser) return;
|
||||
this.saving = true;
|
||||
|
||||
try {
|
||||
const newActive = !this.toggleUser.active;
|
||||
const resp = await fetch(`/admin/api/users/${this.toggleUser.id}/toggle-active`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json', 'X-CSRFToken': this.csrfToken },
|
||||
body: JSON.stringify({ active: newActive })
|
||||
});
|
||||
|
||||
const result = await resp.json();
|
||||
if (!resp.ok) {
|
||||
alert(result.detail || 'Errore');
|
||||
return;
|
||||
}
|
||||
|
||||
// Update local array
|
||||
const idx = this.users.findIndex(u => u.id === this.toggleUser.id);
|
||||
if (idx >= 0) this.users[idx] = result;
|
||||
|
||||
this.showToggleConfirm = false;
|
||||
this.toggleUser = null;
|
||||
} catch (e) {
|
||||
alert('{{ _("Errore di connessione al server") }}');
|
||||
} finally {
|
||||
this.saving = false;
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
</script>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,258 @@
|
||||
<script>
|
||||
function userManagement(initialUsers) {
|
||||
return {
|
||||
users: initialUsers || [],
|
||||
search: '',
|
||||
showModal: false,
|
||||
showToggleConfirm: false,
|
||||
// #51: stato del reset password
|
||||
showReset: false,
|
||||
resetUser: null,
|
||||
resetPw: '',
|
||||
resetDone: false,
|
||||
resetError: '',
|
||||
isEditing: false,
|
||||
editingUserId: null,
|
||||
toggleUser: null,
|
||||
saving: false,
|
||||
errorMsg: '',
|
||||
form: {
|
||||
username: '',
|
||||
display_name: '',
|
||||
email: '',
|
||||
password: '',
|
||||
roles: [],
|
||||
is_admin: false,
|
||||
language_pref: 'it',
|
||||
theme_pref: 'light'
|
||||
},
|
||||
|
||||
get csrfToken() {
|
||||
const meta = document.querySelector('meta[name=csrf-token]');
|
||||
return meta ? meta.content : '';
|
||||
},
|
||||
|
||||
get filteredUsers() {
|
||||
if (!this.search.trim()) return this.users;
|
||||
const q = this.search.toLowerCase();
|
||||
return this.users.filter(u =>
|
||||
u.username.toLowerCase().includes(q) ||
|
||||
(u.display_name && u.display_name.toLowerCase().includes(q)) ||
|
||||
(u.email && u.email.toLowerCase().includes(q)) ||
|
||||
(u.roles && u.roles.some(r => r.toLowerCase().includes(q)))
|
||||
);
|
||||
},
|
||||
|
||||
openCreateModal() {
|
||||
this.isEditing = false;
|
||||
this.editingUserId = null;
|
||||
this.errorMsg = '';
|
||||
this.form = {
|
||||
username: '',
|
||||
display_name: '',
|
||||
email: '',
|
||||
password: '',
|
||||
roles: [],
|
||||
is_admin: false,
|
||||
language_pref: 'it',
|
||||
theme_pref: 'light'
|
||||
};
|
||||
this.showModal = true;
|
||||
},
|
||||
|
||||
openEditModal(user) {
|
||||
this.isEditing = true;
|
||||
this.editingUserId = user.id;
|
||||
this.errorMsg = '';
|
||||
this.form = {
|
||||
username: user.username,
|
||||
display_name: user.display_name || '',
|
||||
email: user.email || '',
|
||||
password: '',
|
||||
roles: [...(user.roles || [])],
|
||||
is_admin: user.is_admin || false,
|
||||
language_pref: user.language_pref || 'it',
|
||||
theme_pref: user.theme_pref || 'light'
|
||||
};
|
||||
this.showModal = true;
|
||||
},
|
||||
|
||||
closeModal() {
|
||||
this.showModal = false;
|
||||
this.errorMsg = '';
|
||||
},
|
||||
|
||||
async saveUser() {
|
||||
this.saving = true;
|
||||
this.errorMsg = '';
|
||||
|
||||
try {
|
||||
if (this.isEditing) {
|
||||
// Update user
|
||||
const data = {
|
||||
display_name: this.form.display_name,
|
||||
email: this.form.email || null,
|
||||
roles: this.form.roles,
|
||||
is_admin: this.form.is_admin,
|
||||
language_pref: this.form.language_pref,
|
||||
theme_pref: this.form.theme_pref
|
||||
};
|
||||
|
||||
const resp = await fetch(`/admin/api/users/${this.editingUserId}`, {
|
||||
method: 'PUT',
|
||||
headers: { 'Content-Type': 'application/json', 'X-CSRFToken': this.csrfToken },
|
||||
body: JSON.stringify(data)
|
||||
});
|
||||
|
||||
const result = await resp.json();
|
||||
if (!resp.ok) {
|
||||
this.errorMsg = result.detail || 'Errore nel salvataggio';
|
||||
return;
|
||||
}
|
||||
|
||||
// Update local array
|
||||
const idx = this.users.findIndex(u => u.id === this.editingUserId);
|
||||
if (idx >= 0) this.users[idx] = result;
|
||||
|
||||
// Change password if provided
|
||||
if (this.form.password) {
|
||||
const pwResp = await fetch(`/admin/api/users/${this.editingUserId}/password`, {
|
||||
method: 'PUT',
|
||||
headers: { 'Content-Type': 'application/json', 'X-CSRFToken': this.csrfToken },
|
||||
body: JSON.stringify({ password: this.form.password })
|
||||
});
|
||||
if (!pwResp.ok) {
|
||||
const pwResult = await pwResp.json();
|
||||
this.errorMsg = pwResult.detail || 'Errore nel cambio password';
|
||||
return;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// Create user
|
||||
if (!this.form.username || !this.form.display_name || !this.form.password) {
|
||||
this.errorMsg = '{{ _("Username, nome visualizzato e password sono obbligatori") }}';
|
||||
return;
|
||||
}
|
||||
|
||||
const data = {
|
||||
username: this.form.username,
|
||||
password: this.form.password,
|
||||
display_name: this.form.display_name,
|
||||
email: this.form.email || null,
|
||||
roles: this.form.roles,
|
||||
is_admin: this.form.is_admin,
|
||||
language_pref: this.form.language_pref,
|
||||
theme_pref: this.form.theme_pref
|
||||
};
|
||||
|
||||
const resp = await fetch('/admin/api/users', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json', 'X-CSRFToken': this.csrfToken },
|
||||
body: JSON.stringify(data)
|
||||
});
|
||||
|
||||
const result = await resp.json();
|
||||
if (!resp.ok) {
|
||||
this.errorMsg = result.detail || 'Errore nella creazione';
|
||||
return;
|
||||
}
|
||||
|
||||
this.users.push(result);
|
||||
}
|
||||
|
||||
this.closeModal();
|
||||
} catch (e) {
|
||||
this.errorMsg = '{{ _("Errore di connessione al server") }}';
|
||||
} finally {
|
||||
this.saving = false;
|
||||
}
|
||||
},
|
||||
|
||||
// #51: reset password dall'admin, usa PUT /admin/api/users/<id>/password
|
||||
openReset(user) {
|
||||
this.resetUser = user;
|
||||
this.resetPw = '';
|
||||
this.resetDone = false;
|
||||
this.resetError = '';
|
||||
this.showReset = true;
|
||||
},
|
||||
|
||||
closeReset() {
|
||||
this.showReset = false;
|
||||
this.resetPw = ''; // la password generata non resta in memoria
|
||||
this.resetDone = false;
|
||||
},
|
||||
|
||||
generateResetPw() {
|
||||
// 12 caratteri senza simboli ambigui (0/O, 1/l/I), da crypto random
|
||||
const chars = 'ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz23456789';
|
||||
const buf = new Uint32Array(12);
|
||||
crypto.getRandomValues(buf);
|
||||
this.resetPw = Array.from(buf, n => chars[n % chars.length]).join('');
|
||||
this.resetError = '';
|
||||
},
|
||||
|
||||
async confirmReset() {
|
||||
if (!this.resetPw || this.resetPw.length < 8) {
|
||||
this.resetError = {{ _('La password deve avere almeno 8 caratteri')|tojson }};
|
||||
return;
|
||||
}
|
||||
this.saving = true;
|
||||
this.resetError = '';
|
||||
try {
|
||||
const resp = await fetch(`/admin/api/users/${this.resetUser.id}/password`, {
|
||||
method: 'PUT',
|
||||
headers: { 'Content-Type': 'application/json', 'X-CSRFToken': this.csrfToken },
|
||||
body: JSON.stringify({ password: this.resetPw })
|
||||
});
|
||||
const result = await resp.json();
|
||||
if (!resp.ok) {
|
||||
this.resetError = result.detail || {{ _('Errore nel cambio password')|tojson }};
|
||||
return;
|
||||
}
|
||||
this.resetDone = true;
|
||||
} catch (e) {
|
||||
this.resetError = {{ _('Errore di connessione al server')|tojson }};
|
||||
} finally {
|
||||
this.saving = false;
|
||||
}
|
||||
},
|
||||
|
||||
toggleActive(user) {
|
||||
this.toggleUser = user;
|
||||
this.showToggleConfirm = true;
|
||||
},
|
||||
|
||||
async confirmToggle() {
|
||||
if (!this.toggleUser) return;
|
||||
this.saving = true;
|
||||
|
||||
try {
|
||||
const newActive = !this.toggleUser.active;
|
||||
const resp = await fetch(`/admin/api/users/${this.toggleUser.id}/toggle-active`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json', 'X-CSRFToken': this.csrfToken },
|
||||
body: JSON.stringify({ active: newActive })
|
||||
});
|
||||
|
||||
const result = await resp.json();
|
||||
if (!resp.ok) {
|
||||
alert(result.detail || 'Errore');
|
||||
return;
|
||||
}
|
||||
|
||||
// Update local array
|
||||
const idx = this.users.findIndex(u => u.id === this.toggleUser.id);
|
||||
if (idx >= 0) this.users[idx] = result;
|
||||
|
||||
this.showToggleConfirm = false;
|
||||
this.toggleUser = null;
|
||||
} catch (e) {
|
||||
alert('{{ _("Errore di connessione al server") }}');
|
||||
} finally {
|
||||
this.saving = false;
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
</script>
|
||||
@@ -3,17 +3,31 @@
|
||||
{% block title %}{{ _('Impostazioni') }} - TieMeasureFlow{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="tmf-page tmf-page-narrow"
|
||||
x-data="systemSettings()">
|
||||
<div class="tmf-page" x-data="{ tab: {{ active_tab|tojson_attr }} }">
|
||||
|
||||
<!-- Header -->
|
||||
<div class="mb-6">
|
||||
<div class="mb-4">
|
||||
<h1 class="text-2xl font-bold text-[var(--text-primary)]">{{ _('Impostazioni di Sistema') }}</h1>
|
||||
<p class="mt-1 text-sm text-[var(--text-secondary)]">{{ _('Configura i parametri generali del sistema') }}</p>
|
||||
</div>
|
||||
|
||||
<!-- #50: tab. L'intera pagina e' gia' solo per admin (admin_required) -->
|
||||
<div class="flex gap-1 mb-6 border-b border-[var(--border-color)]">
|
||||
<button type="button" @click="tab = 'generale'"
|
||||
:class="tab === 'generale' ? 'border-primary text-primary' : 'border-transparent text-[var(--text-secondary)] hover:text-[var(--text-primary)]'"
|
||||
class="px-4 py-2 -mb-px text-sm font-medium border-b-2 transition-colors">{{ _('Generale') }}</button>
|
||||
<button type="button" @click="tab = 'utenti'"
|
||||
:class="tab === 'utenti' ? 'border-primary text-primary' : 'border-transparent text-[var(--text-secondary)] hover:text-[var(--text-primary)]'"
|
||||
class="px-4 py-2 -mb-px text-sm font-medium border-b-2 transition-colors">{{ _('Utenti') }}</button>
|
||||
</div>
|
||||
|
||||
<div x-show="tab === 'utenti'" x-cloak>
|
||||
{% include "admin/_users_panel.html" %}
|
||||
</div>
|
||||
|
||||
<div x-show="tab === 'generale'" class="max-w-4xl mx-auto" x-data="systemSettings()">
|
||||
<!-- Settings Card -->
|
||||
<div class="tmf-card">
|
||||
<div class="tmf-card mb-6">
|
||||
<div class="tmf-card-header flex items-center gap-2">
|
||||
<svg class="w-4 h-4 text-[var(--text-muted)]" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z"/>
|
||||
@@ -43,6 +57,57 @@
|
||||
{{ _('L\'operatore verrà disconnesso automaticamente dopo il periodo di inattività indicato. Lasciare vuoto per disabilitare.') }}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- #47: durata loop predefinita delle ricette -->
|
||||
<div class="pt-5 border-t border-[var(--border-color)]">
|
||||
<h3 class="text-sm font-semibold text-[var(--text-primary)] mb-3">{{ _('Ricette') }}</h3>
|
||||
<label class="tmf-label" for="default-interval">{{ _('Durata loop predefinita (minuti)') }}</label>
|
||||
<input id="default-interval" type="number" x-model="defaultInterval" class="tmf-input w-32" min="1" max="1440" placeholder="—">
|
||||
<p class="text-xs text-[var(--text-muted)] mt-1">{{ _('Proposta come intervallo di misura nelle nuove ricette (1-1440). Vuoto = nessun predefinito.') }}</p>
|
||||
</div>
|
||||
|
||||
<!-- #48: tolleranze generali -->
|
||||
<div class="pt-5 border-t border-[var(--border-color)]">
|
||||
<h3 class="text-sm font-semibold text-[var(--text-primary)] mb-3">{{ _('Tolleranze generali') }}</h3>
|
||||
<div class="flex items-center gap-6">
|
||||
<div>
|
||||
<label class="tmf-label" for="tol-plus">{{ _('Tolleranza +') }}</label>
|
||||
<input id="tol-plus" type="text" inputmode="decimal" x-model="tolPlus" class="tmf-input w-32" placeholder="—">
|
||||
</div>
|
||||
<div>
|
||||
<label class="tmf-label" for="tol-minus">{{ _('Tolleranza −') }}</label>
|
||||
<input id="tol-minus" type="text" inputmode="decimal" x-model="tolMinus" class="tmf-input w-32" placeholder="—">
|
||||
</div>
|
||||
</div>
|
||||
<p class="text-xs text-[var(--text-muted)] mt-1">{{ _('Valori positivi (zero o più) proposti come tolleranza nelle nuove misure. Vuoto = nessun predefinito.') }}</p>
|
||||
</div>
|
||||
|
||||
<!-- #49: anagrafiche (liste di scelta) -->
|
||||
<div class="pt-5 border-t border-[var(--border-color)]">
|
||||
<h3 class="text-sm font-semibold text-[var(--text-primary)] mb-3">{{ _('Anagrafiche') }}</h3>
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 gap-6">
|
||||
<template x-for="lst in ['types', 'units']" :key="lst">
|
||||
<div>
|
||||
<label class="tmf-label" x-text="lst === 'types' ? {{ _('Tipi di misura')|tojson_attr }} : {{ _('Unità di misura')|tojson_attr }}"></label>
|
||||
<ul class="space-y-1 mb-2">
|
||||
<template x-for="(item, i) in lists[lst]" :key="lst + i">
|
||||
<li class="flex items-center gap-1 text-sm">
|
||||
<span class="flex-1 px-2 py-1 rounded bg-[var(--bg-secondary)] text-[var(--text-primary)]" x-text="item"></span>
|
||||
<button type="button" @click="moveItem(lst, i, -1)" :disabled="i === 0" class="px-1.5 text-[var(--text-muted)] hover:text-primary disabled:opacity-30" title="{{ _('Su') }}">▲</button>
|
||||
<button type="button" @click="moveItem(lst, i, 1)" :disabled="i === lists[lst].length - 1" class="px-1.5 text-[var(--text-muted)] hover:text-primary disabled:opacity-30" title="{{ _('Giù') }}">▼</button>
|
||||
<button type="button" @click="removeItem(lst, i)" class="px-1.5 text-[var(--text-muted)] hover:text-red-500" title="{{ _('Rimuovi') }}">✕</button>
|
||||
</li>
|
||||
</template>
|
||||
</ul>
|
||||
<div class="flex gap-2">
|
||||
<input type="text" x-model="newItem[lst]" @keydown.enter.prevent="addItem(lst)" class="tmf-input flex-1" placeholder="{{ _('Nuova voce') }}">
|
||||
<button type="button" @click="addItem(lst)" class="btn btn-secondary">{{ _('Aggiungi') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
<p class="text-xs text-[var(--text-muted)] mt-2">{{ _('Massimo 50 voci per lista. Un elenco vuoto = nessuna scelta predefinita.') }}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="tmf-card-footer flex items-center justify-between">
|
||||
@@ -68,18 +133,48 @@
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div><!-- /tab generale -->
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block extra_js %}
|
||||
<script>
|
||||
// #49: legge un array JSON di stringhe salvato come impostazione; vuoto/malformato = lista vuota
|
||||
function tmfParseList(raw) {
|
||||
try { var a = JSON.parse(raw || '[]'); return Array.isArray(a) ? a.map(String) : []; }
|
||||
catch (e) { return []; }
|
||||
}
|
||||
function systemSettings() {
|
||||
return {
|
||||
autoLogoutMinutes: {{ (settings.auto_logout_minutes or '')|tojson }},
|
||||
// #47-#49: nuove chiavi (valori stringa, vuoto = nessun default)
|
||||
defaultInterval: {{ (settings.default_measurement_interval_minutes or '')|tojson }},
|
||||
tolPlus: {{ (settings.general_tolerance_plus or '')|tojson }},
|
||||
tolMinus: {{ (settings.general_tolerance_minus or '')|tojson }},
|
||||
lists: {
|
||||
types: tmfParseList({{ (settings.list_measurement_types or '')|tojson }}),
|
||||
units: tmfParseList({{ (settings.list_units or '')|tojson }})
|
||||
},
|
||||
newItem: { types: '', units: '' },
|
||||
saving: false,
|
||||
saved: false,
|
||||
errorMessage: '',
|
||||
|
||||
addItem(lst) {
|
||||
var v = (this.newItem[lst] || '').trim();
|
||||
if (!v) return;
|
||||
if (this.lists[lst].length >= 50) { this.errorMessage = {{ _('Massimo 50 voci per lista')|tojson }}; return; }
|
||||
if (this.lists[lst].indexOf(v) === -1) this.lists[lst].push(v);
|
||||
this.newItem[lst] = '';
|
||||
},
|
||||
removeItem(lst, i) { this.lists[lst].splice(i, 1); },
|
||||
moveItem(lst, i, d) {
|
||||
var a = this.lists[lst].slice(), j = i + d;
|
||||
if (j < 0 || j >= a.length) return;
|
||||
var t = a[i]; a[i] = a[j]; a[j] = t;
|
||||
this.lists[lst] = a;
|
||||
},
|
||||
|
||||
async save() {
|
||||
this.saving = true;
|
||||
this.saved = false;
|
||||
@@ -87,7 +182,13 @@ function systemSettings() {
|
||||
|
||||
var csrfToken = document.querySelector('meta[name=csrf-token]')?.content;
|
||||
var payload = {
|
||||
auto_logout_minutes: this.autoLogoutMinutes ? String(this.autoLogoutMinutes) : ''
|
||||
auto_logout_minutes: this.autoLogoutMinutes ? String(this.autoLogoutMinutes) : '',
|
||||
default_measurement_interval_minutes: String(this.defaultInterval || '').trim(),
|
||||
// virgola decimale accettata in input, il backend vuole il punto
|
||||
general_tolerance_plus: String(this.tolPlus || '').trim().replace(',', '.'),
|
||||
general_tolerance_minus: String(this.tolMinus || '').trim().replace(',', '.'),
|
||||
list_measurement_types: this.lists.types.length ? JSON.stringify(this.lists.types) : '',
|
||||
list_units: this.lists.units.length ? JSON.stringify(this.lists.units) : ''
|
||||
};
|
||||
|
||||
try {
|
||||
@@ -111,4 +212,5 @@ function systemSettings() {
|
||||
};
|
||||
}
|
||||
</script>
|
||||
{% include "admin/_users_script.html" %}
|
||||
{% endblock %}
|
||||
|
||||
@@ -26,8 +26,50 @@
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- Login Form -->
|
||||
<form method="POST" action="{{ url_for('auth.login') }}" class="space-y-6">
|
||||
<div x-data="pinLogin()" x-init="init()">
|
||||
<!-- Vista Operatore: nome + PIN (#59) -->
|
||||
<div x-show="mode === 'pin'" x-cloak>
|
||||
<!-- Elenco nomi -->
|
||||
<div x-show="!selected">
|
||||
<p class="text-sm text-center text-[var(--text-secondary)] mb-4">{{ _('Chi sei?') }}</p>
|
||||
<div class="grid grid-cols-2 gap-3" id="pin-user-list">
|
||||
<template x-for="u in users" :key="u.id">
|
||||
<button type="button" @click="select(u)"
|
||||
class="btn btn-secondary min-h-[64px] text-base w-full" x-text="u.display_name"></button>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Tastierino -->
|
||||
<div x-show="selected" id="pin-pad">
|
||||
<p class="text-center font-semibold mb-1" x-text="selected && selected.display_name"></p>
|
||||
<p class="text-sm text-center text-[var(--text-secondary)] mb-3">{{ _('Inserisci il PIN') }}</p>
|
||||
<div class="flex justify-center gap-3 mb-3" aria-hidden="true">
|
||||
<template x-for="i in 4" :key="i">
|
||||
<span class="h-4 w-4 rounded-full border-2 border-[var(--border-color)]"
|
||||
:class="pin.length >= i ? 'bg-primary-600 border-primary-600' : ''"></span>
|
||||
</template>
|
||||
</div>
|
||||
<p class="text-sm text-center text-red-600 min-h-[1.25rem] mb-2" role="alert" x-text="error"></p>
|
||||
<div class="grid grid-cols-3 gap-3 max-w-xs mx-auto">
|
||||
<template x-for="d in ['1','2','3','4','5','6','7','8','9']" :key="d">
|
||||
<button type="button" @click="press(d)" :disabled="busy"
|
||||
class="btn btn-secondary h-16 min-w-[64px] text-2xl" x-text="d"></button>
|
||||
</template>
|
||||
<button type="button" @click="back()" :disabled="busy"
|
||||
class="btn btn-secondary h-16 min-w-[64px] text-sm">{{ _('Indietro') }}</button>
|
||||
<button type="button" @click="press('0')" :disabled="busy"
|
||||
class="btn btn-secondary h-16 min-w-[64px] text-2xl">0</button>
|
||||
<button type="button" @click="del()" :disabled="busy"
|
||||
class="btn btn-secondary h-16 min-w-[64px] text-sm">{{ _('Cancella') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
<p class="mt-6 text-center">
|
||||
<a href="#" @click.prevent="mode = 'password'" class="text-sm text-primary-600 hover:underline">{{ _('Accedi con password') }}</a>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- Login Form (password: admin e chi non ha PIN) -->
|
||||
<form x-show="mode === 'password'" method="POST" action="{{ url_for('auth.login') }}" class="space-y-6">
|
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
|
||||
<!-- Username -->
|
||||
<div>
|
||||
@@ -98,6 +140,11 @@
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<p class="mt-4 text-center" x-show="mode === 'password' && users.length" x-cloak>
|
||||
<a href="#" @click.prevent="mode = 'pin'" class="text-sm text-primary-600 hover:underline">{{ _('Accedi con PIN') }}</a>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- Help Text -->
|
||||
<div class="mt-6 text-center">
|
||||
<p class="text-xs text-[var(--text-muted)]">
|
||||
@@ -115,3 +162,15 @@
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block extra_js %}
|
||||
<script>
|
||||
/* Configurazione e testi per pin-pad.js (#59) */
|
||||
window.TMF_PIN = {
|
||||
usersUrl: {{ url_for('auth.pin_users')|tojson }},
|
||||
loginUrl: {{ url_for('auth.login_pin')|tojson }},
|
||||
msgNet: {{ _('Errore di connessione al server')|tojson }}
|
||||
};
|
||||
</script>
|
||||
<script src="{{ url_for('static', filename='js/pin-pad.js') }}"></script>
|
||||
{% endblock %}
|
||||
|
||||
@@ -32,7 +32,6 @@
|
||||
{{ nav_link(url_for('statistics.dashboard'), _('Statistiche'), icon_stats, ep.startswith('statistics.'), mobile) }}
|
||||
{% endif %}
|
||||
{% if current_user.get('is_admin') %}
|
||||
{{ nav_link(url_for('admin.user_list'), _('Utenti'), icon_users, ep == 'admin.user_list', mobile) }}
|
||||
{{ nav_link(url_for('admin.station_list'), _('Stazioni'), icon_stations, ep == 'admin.station_list', mobile) }}
|
||||
{{ nav_link(url_for('admin.settings_page'), _('Impostazioni'), icon_settings, ep == 'admin.settings_page', mobile) }}
|
||||
{% endif %}
|
||||
|
||||
@@ -503,6 +503,32 @@
|
||||
{% endblock %}
|
||||
|
||||
{% block extra_js %}
|
||||
<script src="{{ url_for('static', filename='js/image-crop.js') }}"></script>
|
||||
<script>
|
||||
// #56: stringhe e percorsi per il ritaglio prima dell'upload
|
||||
ImageCrop.configure({
|
||||
pdfSrc: '{{ url_for('static', filename='vendor/pdf-3.11.174.min.js') }}',
|
||||
workerSrc: '{{ url_for('static', filename='vendor/pdf.worker-3.11.174.min.js') }}',
|
||||
labels: {
|
||||
title: {{ _('Ritaglia immagine')|tojson }},
|
||||
page: {{ _('Pagina')|tojson }},
|
||||
hint: {{ _('Trascina il rettangolo o i suoi bordi per scegliere la zona da tenere.')|tojson }},
|
||||
pdfNote: {{ _('Un PDF ritagliato viene salvato come immagine PNG.')|tojson }},
|
||||
confirm: {{ _('Conferma ritaglio')|tojson }},
|
||||
original: {{ _('Usa originale')|tojson }},
|
||||
cancel: {{ _('Annulla')|tojson }},
|
||||
loading: {{ _('Caricamento...')|tojson }},
|
||||
error: {{ _('Impossibile aprire il file per il ritaglio.')|tojson }}
|
||||
}
|
||||
});
|
||||
// #56: apre la modale di ritaglio; null = annullato, altrimenti il file da caricare
|
||||
async function tmfCropBeforeUpload(file) {
|
||||
const res = await ImageCrop.open(file);
|
||||
if (res === null || res === file) return res;
|
||||
const base = (file.name || 'file').replace(/\.[^.]+$/, '');
|
||||
return new File([res], base + '-ritaglio.png', { type: 'image/png' });
|
||||
}
|
||||
</script>
|
||||
<script>
|
||||
function recipeEditor() {
|
||||
return {
|
||||
@@ -526,7 +552,8 @@ function recipeEditor() {
|
||||
currentVersion: {{ (recipe.current_version.version_number if recipe and recipe.current_version else 0)|tojson }},
|
||||
|
||||
// ---- Measurement interval ----
|
||||
measurementIntervalMinutes: {{ (recipe.measurement_interval_minutes if recipe and recipe.measurement_interval_minutes else 'null')|tojson }},
|
||||
// #49: a new recipe starts from the system default duration (default_interval), an existing one never does
|
||||
measurementIntervalMinutes: {{ (recipe.measurement_interval_minutes if recipe and recipe.measurement_interval_minutes else (default_interval if not recipe and default_interval else 'null'))|tojson }},
|
||||
|
||||
// ---- Rules of measurement (points 8 and 9) ----
|
||||
// A new recipe forbids typing: the caliper is the instrument, and permission
|
||||
@@ -672,6 +699,10 @@ function recipeEditor() {
|
||||
return;
|
||||
}
|
||||
|
||||
// #56: scelta di ritaglio (immagine/PDF) prima dell'upload; senza ritaglio il file resta invariato
|
||||
file = await tmfCropBeforeUpload(file);
|
||||
if (!file) return;
|
||||
|
||||
this.uploadingFile = true;
|
||||
this.errorMessage = '';
|
||||
|
||||
|
||||
@@ -10,6 +10,51 @@
|
||||
filter: 'all',
|
||||
deleteModal: false,
|
||||
deleteTarget: null,
|
||||
// #52: duplicate modal state
|
||||
dupModal: false,
|
||||
dupSource: null,
|
||||
dupCode: '',
|
||||
dupName: '',
|
||||
dupError: '',
|
||||
dupBusy: false,
|
||||
|
||||
openDupModal(recipe) {
|
||||
this.dupSource = recipe;
|
||||
this.dupCode = recipe.code + '-COPIA';
|
||||
this.dupName = recipe.name + ' ' + {{ _('(copia)')|tojson_attr }};
|
||||
this.dupError = '';
|
||||
this.dupModal = true;
|
||||
},
|
||||
|
||||
async duplicateRecipe() {
|
||||
const csrfToken = document.querySelector('meta[name=csrf-token]')?.content;
|
||||
this.dupBusy = true;
|
||||
this.dupError = '';
|
||||
try {
|
||||
const resp = await fetch(`/maker/api/recipes/${this.dupSource.id}/duplicate`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json', 'X-CSRFToken': csrfToken || '' },
|
||||
body: JSON.stringify({ code: this.dupCode.trim(), name: this.dupName.trim() })
|
||||
});
|
||||
const data = await resp.json().catch(() => ({}));
|
||||
if (resp.ok) {
|
||||
// open the new recipe in the editor
|
||||
window.location.href = '/maker/recipes/' + data.id + '/edit';
|
||||
return;
|
||||
}
|
||||
if (resp.status === 409) {
|
||||
this.dupError = {{ _('Esiste già una ricetta con questo codice')|tojson_attr }};
|
||||
} else if (resp.status === 422) {
|
||||
this.dupError = {{ _('Codice o nome non validi')|tojson_attr }};
|
||||
} else {
|
||||
this.dupError = data.detail || data.error || {{ _('Errore durante la duplicazione')|tojson_attr }};
|
||||
}
|
||||
} catch (err) {
|
||||
this.dupError = {{ _('Errore di connessione')|tojson_attr }};
|
||||
} finally {
|
||||
this.dupBusy = false;
|
||||
}
|
||||
},
|
||||
|
||||
get filteredRecipes() {
|
||||
let filtered = this.recipes;
|
||||
@@ -265,6 +310,15 @@
|
||||
{{ _('Versioni') }}
|
||||
</a>
|
||||
|
||||
<!-- Duplica (#52) -->
|
||||
<button @click="openDupModal(recipe)"
|
||||
class="btn btn-secondary gap-1.5 text-xs">
|
||||
<svg class="w-4 h-4" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M8 16H6a2 2 0 01-2-2V6a2 2 0 012-2h8a2 2 0 012 2v2m-6 12h8a2 2 0 002-2v-8a2 2 0 00-2-2h-8a2 2 0 00-2 2v8a2 2 0 002 2z"/>
|
||||
</svg>
|
||||
{{ _('Duplica') }}
|
||||
</button>
|
||||
|
||||
<!-- Spacer -->
|
||||
<div class="flex-1"></div>
|
||||
|
||||
@@ -318,6 +372,42 @@
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<!-- Duplicate Modal (#52) -->
|
||||
<div x-show="dupModal"
|
||||
x-cloak
|
||||
@keydown.escape.window="dupModal = false"
|
||||
class="fixed inset-0 z-50 overflow-y-auto"
|
||||
role="dialog"
|
||||
aria-modal="true">
|
||||
<div @click="dupModal = false" class="fixed inset-0 bg-black/50 backdrop-blur-sm"></div>
|
||||
<div class="flex min-h-full items-center justify-center p-4">
|
||||
<div class="tmf-card max-w-lg w-full relative p-6">
|
||||
<h3 class="text-lg font-semibold text-[var(--text-primary)] mb-4">
|
||||
{{ _('Duplica ricetta') }}
|
||||
</h3>
|
||||
<div class="mb-3">
|
||||
<label class="tmf-label" for="dup-code">{{ _('Codice') }}</label>
|
||||
<input id="dup-code" type="text" x-model="dupCode" maxlength="100" class="tmf-input">
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="tmf-label" for="dup-name">{{ _('Nome') }}</label>
|
||||
<input id="dup-name" type="text" x-model="dupName" maxlength="255" class="tmf-input">
|
||||
</div>
|
||||
<p x-show="dupError" x-text="dupError" class="text-sm text-red-600 mb-3"></p>
|
||||
<div class="flex flex-col sm:flex-row gap-3">
|
||||
<button @click="dupModal = false" class="btn btn-secondary flex-1 justify-center">
|
||||
{{ _('Annulla') }}
|
||||
</button>
|
||||
<button @click="duplicateRecipe()"
|
||||
:disabled="dupBusy || !dupCode.trim() || !dupName.trim()"
|
||||
class="btn btn-primary flex-1 justify-center">
|
||||
{{ _('Duplica') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Delete Confirmation Modal -->
|
||||
<div x-show="deleteModal"
|
||||
x-cloak
|
||||
|
||||
@@ -1162,6 +1162,32 @@
|
||||
<script src="{{ url_for('static', filename='vendor/pdf-3.11.174.min.js') }}"></script>
|
||||
<script>if(typeof pdfjsLib!=='undefined')pdfjsLib.GlobalWorkerOptions.workerSrc='{{ url_for('static', filename='vendor/pdf.worker-3.11.174.min.js') }}';</script>
|
||||
<script src="{{ url_for('static', filename='js/annotation-viewer.js') }}?v=6"></script>
|
||||
<script src="{{ url_for('static', filename='js/image-crop.js') }}"></script>
|
||||
<script>
|
||||
// #56: stringhe e percorsi per il ritaglio prima dell'upload
|
||||
ImageCrop.configure({
|
||||
pdfSrc: '{{ url_for('static', filename='vendor/pdf-3.11.174.min.js') }}',
|
||||
workerSrc: '{{ url_for('static', filename='vendor/pdf.worker-3.11.174.min.js') }}',
|
||||
labels: {
|
||||
title: {{ _('Ritaglia immagine')|tojson }},
|
||||
page: {{ _('Pagina')|tojson }},
|
||||
hint: {{ _('Trascina il rettangolo o i suoi bordi per scegliere la zona da tenere.')|tojson }},
|
||||
pdfNote: {{ _('Un PDF ritagliato viene salvato come immagine PNG.')|tojson }},
|
||||
confirm: {{ _('Conferma ritaglio')|tojson }},
|
||||
original: {{ _('Usa originale')|tojson }},
|
||||
cancel: {{ _('Annulla')|tojson }},
|
||||
loading: {{ _('Caricamento...')|tojson }},
|
||||
error: {{ _('Impossibile aprire il file per il ritaglio.')|tojson }}
|
||||
}
|
||||
});
|
||||
// #56: apre la modale di ritaglio; null = annullato, altrimenti il file da caricare
|
||||
async function tmfCropBeforeUpload(file) {
|
||||
const res = await ImageCrop.open(file);
|
||||
if (res === null || res === file) return res;
|
||||
const base = (file.name || 'file').replace(/\.[^.]+$/, '');
|
||||
return new File([res], base + '-ritaglio.png', { type: 'image/png' });
|
||||
}
|
||||
</script>
|
||||
<script>
|
||||
// Force reload when page is restored from browser bfcache (back/forward navigation).
|
||||
// This ensures fresh data is displayed after editing annotations in task_drawing.
|
||||
@@ -1887,6 +1913,10 @@ function taskEditor() {
|
||||
return;
|
||||
}
|
||||
|
||||
// #56: scelta di ritaglio (immagine/PDF) prima dell'upload; senza ritaglio il file resta invariato
|
||||
file = await tmfCropBeforeUpload(file);
|
||||
if (!file) return;
|
||||
|
||||
this.saving = true;
|
||||
this.errorMessage = '';
|
||||
|
||||
|
||||
@@ -13,6 +13,15 @@
|
||||
barcodeInput: '',
|
||||
barcodeLoading: false,
|
||||
barcodeError: '',
|
||||
/* #63/#64: ricetta scelta che richiede lotto/seriale; il pannello compare solo allora. */
|
||||
selected: null,
|
||||
needsTrace(recipe) {
|
||||
return !!(recipe && (recipe.requires_lot || recipe.requires_serial));
|
||||
},
|
||||
choose(recipe) {
|
||||
this.selected = recipe;
|
||||
this.$nextTick(() => { const el = document.getElementById('trace-panel'); if (el) el.scrollIntoView({ behavior: 'smooth', block: 'center' }); });
|
||||
},
|
||||
get filteredRecipes() {
|
||||
if (!this.search) return this.recipes;
|
||||
const q = this.search.toLowerCase();
|
||||
@@ -62,9 +71,12 @@
|
||||
// The scanner is a way in like any other: a recipe that demands a lot
|
||||
// demands it here too, or the rule would last exactly as long as it
|
||||
// took someone to reach for the barcode reader.
|
||||
const missing = this.missingTraceability(data);
|
||||
if (missing.length) {
|
||||
this.barcodeError = {{ _("Compila prima:")|tojson_attr }} + ' ' + missing.join(', ');
|
||||
// #63/#64: se la ricetta chiede lotto/seriale mancanti, la si sceglie e
|
||||
// compare il pannello con i soli campi richiesti.
|
||||
if (this.missingTraceability(data).length) {
|
||||
this.barcodeModal = false;
|
||||
this.barcodeInput = '';
|
||||
this.choose(data);
|
||||
return;
|
||||
}
|
||||
this.barcodeModal = false;
|
||||
@@ -149,50 +161,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Traceability (data entry, NOT a search filter) -->
|
||||
<div class="tmf-card mb-6 border-l-4 border-l-primary">
|
||||
<div class="p-4 sm:p-5">
|
||||
<div class="flex items-center gap-2 mb-3">
|
||||
<svg class="w-5 h-5 text-primary shrink-0" fill="none" stroke="currentColor" stroke-width="1.75" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4"/>
|
||||
</svg>
|
||||
<div>
|
||||
<h2 class="text-sm font-semibold text-[var(--text-primary)] leading-tight">{{ _('Tracciabilità') }}</h2>
|
||||
<p class="text-xs text-[var(--text-muted)] leading-tight">{{ _('Dati del pezzo da misurare — compila prima di selezionare la ricetta') }}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
|
||||
<!-- Lot Number -->
|
||||
<div>
|
||||
<label class="tmf-label flex items-center gap-1.5">
|
||||
<svg class="w-3.5 h-3.5 text-amber-500" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4"/>
|
||||
</svg>
|
||||
{{ _('Numero Lotto') }}
|
||||
</label>
|
||||
<input type="text"
|
||||
x-model="lot_number"
|
||||
placeholder="{{ _('Es. LOT-2026-001') }}"
|
||||
class="tmf-input font-mono">
|
||||
</div>
|
||||
|
||||
<!-- Serial Number -->
|
||||
<div>
|
||||
<label class="tmf-label flex items-center gap-1.5">
|
||||
<svg class="w-3.5 h-3.5 text-indigo-500" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M7 20l4-16m2 16l4-16M6 9h14M4 15h14"/>
|
||||
</svg>
|
||||
{{ _('Numero Seriale') }}
|
||||
</label>
|
||||
<input type="text"
|
||||
x-model="serial_number"
|
||||
placeholder="{{ _('Es. SN-000123') }}"
|
||||
class="tmf-input font-mono">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Results Count -->
|
||||
<div class="flex items-center justify-between mb-4">
|
||||
<p class="text-sm text-[var(--text-secondary)]">
|
||||
@@ -269,30 +237,25 @@
|
||||
<div class="px-5 py-3.5 border-t border-[var(--border-color)] bg-[var(--bg-secondary)]
|
||||
rounded-b-xl">
|
||||
|
||||
{# What this recipe insists on before anyone measures. Said on the card
|
||||
rather than after the fact: a measurement taken without its lot cannot
|
||||
be traced back, and finding that out later is finding it out too late. #}
|
||||
<template x-if="missingTraceability(recipe).length">
|
||||
<p class="mb-2 flex items-start gap-1.5 text-xs text-amber-700 dark:text-amber-300">
|
||||
<svg class="w-3.5 h-3.5 shrink-0 mt-px" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126zM12 15.75h.007v.008H12v-.008z"/>
|
||||
</svg>
|
||||
<span x-text="{{ _('Compila prima:')|tojson_attr }} + ' ' + missingTraceability(recipe).join(', ')"></span>
|
||||
</p>
|
||||
{# #63/#64: una ricetta con lotto/seriale obbligatori si sceglie prima
|
||||
(il pannello compare sotto la griglia); le altre partono subito. #}
|
||||
<template x-if="needsTrace(recipe)">
|
||||
<button type="button" @click="choose(recipe)"
|
||||
:class="selected && selected.id === recipe.id ? 'ring-2 ring-primary' : ''"
|
||||
class="btn btn-primary w-full justify-center text-sm font-semibold">
|
||||
{{ _('Seleziona') }}
|
||||
</button>
|
||||
</template>
|
||||
<template x-if="!needsTrace(recipe)">
|
||||
<a :href="buildTaskUrl(recipe.id)"
|
||||
class="btn btn-primary w-full justify-center text-sm font-semibold
|
||||
transition-shadow duration-200 group-hover:shadow-md">
|
||||
<svg class="w-4 h-4" fill="none" stroke="currentColor" stroke-width="2.5" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M5 3l14 9-14 9V3z"/>
|
||||
</svg>
|
||||
{{ _('AVVIA ATTIVITÀ') }}
|
||||
</a>
|
||||
</template>
|
||||
|
||||
<a :href="missingTraceability(recipe).length ? null : buildTaskUrl(recipe.id)"
|
||||
:aria-disabled="missingTraceability(recipe).length > 0"
|
||||
:class="missingTraceability(recipe).length
|
||||
? 'opacity-40 cursor-not-allowed pointer-events-none'
|
||||
: 'group-hover:shadow-md'"
|
||||
class="btn btn-primary w-full justify-center text-sm font-semibold
|
||||
transition-shadow duration-200">
|
||||
<svg class="w-4 h-4" fill="none" stroke="currentColor" stroke-width="2.5" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M5 3l14 9-14 9V3z"/>
|
||||
</svg>
|
||||
{{ _('AVVIA IN SEQUENZA') }}
|
||||
</a>
|
||||
|
||||
{# The whole list, for when the operator wants to see it or go back to a
|
||||
task left unfinished. Deliberately the quiet one of the two. #}
|
||||
@@ -306,6 +269,41 @@
|
||||
</template>
|
||||
</div>
|
||||
|
||||
<!-- Traceability (#63/#64): compare solo dopo aver scelto una ricetta con
|
||||
requires_lot / requires_serial, con i soli campi richiesti. -->
|
||||
<div id="trace-panel" x-show="selected && needsTrace(selected)" x-cloak
|
||||
class="tmf-card mt-6 border-l-4 border-l-primary">
|
||||
<div class="p-4 sm:p-5">
|
||||
<div class="flex items-center gap-2 mb-3">
|
||||
<svg class="w-5 h-5 text-primary shrink-0" fill="none" stroke="currentColor" stroke-width="1.75" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4"/>
|
||||
</svg>
|
||||
<div>
|
||||
<h2 class="text-sm font-semibold text-[var(--text-primary)] leading-tight">{{ _('Tracciabilità') }}: <span x-text="selected ? selected.name : ''"></span></h2>
|
||||
<p class="text-xs text-[var(--text-muted)] leading-tight">{{ _('Dati del pezzo da misurare — compila prima di selezionare la ricetta') }}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
|
||||
<div x-show="selected && selected.requires_lot">
|
||||
<label class="tmf-label">{{ _('Numero Lotto') }}</label>
|
||||
<input type="text" x-model="lot_number"
|
||||
placeholder="{{ _('Es. LOT-2026-001') }}" class="tmf-input font-mono">
|
||||
</div>
|
||||
<div x-show="selected && selected.requires_serial">
|
||||
<label class="tmf-label">{{ _('Numero Seriale') }}</label>
|
||||
<input type="text" x-model="serial_number"
|
||||
placeholder="{{ _('Es. SN-000123') }}" class="tmf-input font-mono">
|
||||
</div>
|
||||
</div>
|
||||
<a :href="selected && !missingTraceability(selected).length ? buildTaskUrl(selected.id) : null"
|
||||
:aria-disabled="!selected || missingTraceability(selected).length > 0"
|
||||
:class="(!selected || missingTraceability(selected).length) ? 'opacity-40 cursor-not-allowed pointer-events-none' : ''"
|
||||
class="btn btn-primary w-full justify-center text-sm font-semibold mt-4">
|
||||
{{ _('AVVIA ATTIVITÀ') }}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Empty State -->
|
||||
<div x-show="filteredRecipes.length === 0" x-cloak
|
||||
class="text-center py-16">
|
||||
|
||||
@@ -115,20 +115,12 @@
|
||||
</svg>
|
||||
{{ _('Lista task') }}
|
||||
</a>
|
||||
<button @click="goToNextTask()"
|
||||
:disabled="!canLeaveTask"
|
||||
:title="canLeaveTask ? '' : blockedReason"
|
||||
:class="canLeaveTask ? '' : 'opacity-40 cursor-not-allowed'"
|
||||
class="btn btn-secondary text-xs py-1 px-2.5 gap-1">
|
||||
<svg class="w-3.5 h-3.5" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M5 13l4 4L19 7"/>
|
||||
</svg>
|
||||
{{ _('Completato') }}
|
||||
</button>
|
||||
{# #60: un solo «Completato», quello grande in fondo (touch); qui resta solo la lista. #}
|
||||
</div>
|
||||
|
||||
{# Fermo linea + Fine produzione (measurement tasks only) #}
|
||||
<template x-if="isMeasureTask">
|
||||
<template x-if="isMeasureTask && productionRun">
|
||||
{# #61: Fermo linea / Fine produzione solo con una produzione aperta #}
|
||||
<div class="shrink-0 flex items-center gap-1.5">
|
||||
{# While the line is stopped this becomes the way to restart it, so the
|
||||
capoturno never has to hunt for a second control. #}
|
||||
@@ -264,6 +256,88 @@
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{# #55: the inputs of the fields of a «note» task. One block for the task on screen
|
||||
and for the panel at the end of production, so the rules are written once. #}
|
||||
{% macro result_fields() %}
|
||||
<template x-for="fld in f.fields" :key="fld.key">
|
||||
<div class="mb-3">
|
||||
<label class="block text-sm font-medium text-[var(--text-secondary)] mb-1" x-text="fld.label"></label>
|
||||
<input :type="fld.type === 'number' ? 'number' : 'text'"
|
||||
:step="fld.type === 'number' ? 'any' : null"
|
||||
:inputmode="fld.type === 'number' ? 'decimal' : null"
|
||||
x-model="f.values[fld.key]"
|
||||
class="input w-full text-base py-2">
|
||||
<template x-if="fld.attachment">
|
||||
<div class="mt-1.5">
|
||||
<label class="btn btn-secondary text-xs gap-1.5 cursor-pointer">
|
||||
{{ _('Allega immagine o PDF') }}
|
||||
<input type="file" accept="image/*,application/pdf" class="hidden"
|
||||
@change="pickFile(f, fld.key, $event)">
|
||||
</label>
|
||||
<span class="ml-2 text-xs text-[var(--text-muted)]" x-text="f.fileNames[fld.key]"></span>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</template>
|
||||
{% endmacro %}
|
||||
|
||||
{# #54 #55: result panel of the task on screen - OK / NOK for a «check», the
|
||||
fields and «Completato» for a «note» with fields. #}
|
||||
<div x-show="hasResultPanel" x-cloak
|
||||
x-data="taskResultForm()"
|
||||
x-init="ctx = () => ({ runId: productionRun ? productionRun.id : null, done: () => advanceAfterResult() });
|
||||
initForTask(task);
|
||||
$watch('productionRun && productionRun.id', () => loadLast())"
|
||||
@task-result-reset.window="justRecorded = false; initForTask(task)"
|
||||
class="shrink-0 max-h-[65%] overflow-y-auto px-4 py-3 bg-[var(--bg-card)] border-b border-[var(--border-color)]">
|
||||
<template x-for="f in forms" :key="f.task_id">
|
||||
<div class="max-w-2xl mx-auto">
|
||||
<div x-show="f.result" class="mb-3 px-3 py-2 rounded-lg text-sm border border-[var(--border-color)] bg-[var(--bg-secondary)]">
|
||||
<span class="text-[var(--text-secondary)]">{{ _('Ultimo esito') }}:</span>
|
||||
<span class="font-bold"
|
||||
:class="f.result && f.result.outcome === 'nok' ? 'text-measure-fail' : 'text-measure-pass'"
|
||||
x-text="resultLabel(f.result)"></span>
|
||||
<span class="text-[var(--text-muted)]" x-text="f.result && f.result.note ? '— ' + f.result.note : ''"></span>
|
||||
</div>
|
||||
|
||||
<template x-if="f.type === 'check'">
|
||||
<div>
|
||||
<textarea x-model="f.note" rows="2"
|
||||
placeholder="{{ _('Nota (obbligatoria per un NOK)') }}"
|
||||
class="input w-full text-base mb-3"></textarea>
|
||||
<div class="grid grid-cols-2 gap-3">
|
||||
<button @click="submit('ok')" :disabled="working"
|
||||
class="btn min-h-[72px] text-2xl font-bold justify-center shadow-md bg-measure-pass text-white hover:opacity-90 disabled:opacity-50">
|
||||
{{ _('OK') }}
|
||||
</button>
|
||||
<button @click="submit('nok')" :disabled="working"
|
||||
class="btn min-h-[72px] text-2xl font-bold justify-center shadow-md bg-red-600 text-white hover:bg-red-700 disabled:opacity-50">
|
||||
{{ _('NOK') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<template x-if="f.type === 'note'">
|
||||
<div>
|
||||
{{ result_fields() }}
|
||||
<button @click="submit('done')" :disabled="working"
|
||||
class="btn text-lg font-bold w-full min-h-[64px] justify-center gap-2 shadow-md bg-measure-pass text-white hover:opacity-90 disabled:opacity-50">
|
||||
<span>{{ _('Completato') }}</span>
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<p x-show="f.error" class="mt-2 text-sm text-measure-fail" x-text="f.error"></p>
|
||||
{# The result is in, but going on failed (cycle refused, network): another try, without recording twice. #}
|
||||
<button x-show="justRecorded" @click="proceed()"
|
||||
class="btn btn-secondary mt-3 w-full justify-center">
|
||||
{{ _('Prosegui') }}
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
|
||||
{# Main image area #}
|
||||
<div class="flex-1 overflow-hidden relative">
|
||||
|
||||
@@ -755,11 +829,14 @@
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
<template x-if="!isMeasureTask || subtasks.length === 0">
|
||||
{# #54 #55: a check / note-with-fields task has its own buttons in the panel #}
|
||||
<template x-if="(!isMeasureTask || subtasks.length === 0) && !hasResultPanel">
|
||||
{# #60: unico «Completato», largo e alto almeno 64 px per il touch. #}
|
||||
<button @click="goToNextTask()"
|
||||
class="btn text-xs shrink-0 gap-1 py-1.5 px-3 shadow-md
|
||||
:disabled="!canLeaveTask"
|
||||
class="btn text-lg font-bold flex-1 w-full min-h-[64px] justify-center gap-2 shadow-md
|
||||
bg-measure-pass text-white hover:opacity-90">
|
||||
<svg class="w-3.5 h-3.5" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
|
||||
<svg class="w-5 h-5" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M5 13l4 4L19 7"/>
|
||||
</svg>
|
||||
{{ _('Completato') }}
|
||||
@@ -845,6 +922,10 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{# #61: se il server rifiuta l'avvio produzione, l'errore si vede qui, nell'overlay #}
|
||||
<p x-show="productionError" x-cloak
|
||||
class="mb-2 text-sm text-red-700 dark:text-red-300 text-center" x-text="productionError"></p>
|
||||
|
||||
<div class="flex gap-2">
|
||||
<button @click="goToSummary()"
|
||||
class="btn btn-secondary flex-1 justify-center gap-2">
|
||||
@@ -897,6 +978,39 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{# ================================================================
|
||||
#55 TASK DI CHIUSURA — before the capoturno's modal, the notes marked «alla fine
|
||||
della produzione» are filled in and recorded on the run. The modal below is
|
||||
untouched: it opens when this panel is done.
|
||||
================================================================ #}
|
||||
<div x-show="open" x-cloak
|
||||
x-data="taskResultForm()"
|
||||
x-init="ctx = () => ({ runId: productionRun ? productionRun.id : null, done: () => closeTasksRecorded() })"
|
||||
@task-close-open.window="openClose($event.detail.ids)"
|
||||
class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm">
|
||||
<div class="bg-[var(--bg-card)] rounded-2xl shadow-2xl p-6 w-full max-w-xl mx-4 max-h-[90vh] overflow-y-auto border border-[var(--border-color)]">
|
||||
<h3 class="text-lg font-bold text-[var(--text-primary)] mb-3">{{ _('Prima di chiudere la produzione') }}</h3>
|
||||
<p x-show="working && !forms.length" class="text-sm text-[var(--text-muted)]">{{ _('Caricamento...') }}</p>
|
||||
<template x-for="f in forms" :key="f.task_id">
|
||||
<div class="mb-4" x-show="!f.recorded">
|
||||
<div class="font-semibold text-[var(--text-primary)] mb-1" x-text="f.title"></div>
|
||||
<div class="text-sm text-[var(--text-secondary)] mb-2" x-show="f.directive" x-text="f.directive"></div>
|
||||
{{ result_fields() }}
|
||||
<textarea x-model="f.note" rows="2" placeholder="{{ _('Nota') }}" class="input w-full text-base"></textarea>
|
||||
<p x-show="f.error" class="mt-1 text-sm text-measure-fail" x-text="f.error"></p>
|
||||
</div>
|
||||
</template>
|
||||
<p x-show="error" class="mb-2 text-sm text-measure-fail" x-text="error"></p>
|
||||
<div class="flex gap-3 mt-2">
|
||||
<button @click="cancelClose()" class="btn btn-secondary flex-1 justify-center">{{ _('Annulla') }}</button>
|
||||
<button @click="submitClose()" :disabled="working || !forms.length"
|
||||
class="btn flex-1 justify-center font-bold bg-measure-pass text-white hover:opacity-90 disabled:opacity-50">
|
||||
{{ _('Registra e prosegui') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{# ================================================================
|
||||
SUPERVISOR LOGIN MODAL
|
||||
================================================================ #}
|
||||
@@ -982,6 +1096,26 @@
|
||||
};
|
||||
</script>
|
||||
<script src="{{ url_for('static', filename='js/vision_execute.js') }}"></script>
|
||||
{# #53 #54 #55: result of check / note tasks (urls and words for the component) #}
|
||||
<script>
|
||||
window.__taskResultsCfg = {
|
||||
saveUrl: '{{ url_for("measure.api_save_task_result") }}',
|
||||
listUrl: '{{ url_for("measure.api_list_task_results") }}',
|
||||
uploadUrl: '{{ url_for("measure.api_upload_attachment") }}',
|
||||
taskUrlTpl: '{{ url_for("measure.api_get_task", task_id=0) }}',
|
||||
labels: {
|
||||
connection: {{ _('Errore di connessione')|tojson }},
|
||||
sessionExpired: {{ _('Sessione scaduta: ricaricare la pagina')|tojson }},
|
||||
serverError: {{ _('Errore di comunicazione con il server')|tojson }},
|
||||
nokNeedsNote: {{ _('Per un NOK serve la nota')|tojson }},
|
||||
notANumber: {{ _('Valore non numerico')|tojson }},
|
||||
outcomeOk: {{ _('OK')|tojson }},
|
||||
outcomeNok: {{ _('NOK')|tojson }},
|
||||
outcomeDone: {{ _('Registrato')|tojson }},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
<script src="{{ url_for('static', filename='js/task-results.js') }}"></script>
|
||||
{# The clock's rules - how a delay reads, when the buzzer goes, where the
|
||||
measurement lives - are shared with the other screens rather than restated. #}
|
||||
<script src="{{ url_for('static', filename='js/production-clock.js') }}"></script>
|
||||
@@ -1030,6 +1164,10 @@ function taskExecute() {
|
||||
// The measurement tasks of this recipe, in order: the loop the operator stays
|
||||
// in once production starts, and what says which task closes a cycle.
|
||||
measurementTaskIds: [],
|
||||
// #55: notes to fill in before the capoturno closes the production, and whether
|
||||
// they were already recorded (so cancelling the modal does not ask them again).
|
||||
closeTaskIds: [],
|
||||
closeTasksDone: false,
|
||||
// The interval has elapsed and it has been said out loud - buzzer, and the
|
||||
// operator on their way back to the measurement. Kept so it is said once.
|
||||
dueAnnounced: false,
|
||||
@@ -1250,11 +1388,18 @@ function taskExecute() {
|
||||
async loadProductionRun() {
|
||||
try {
|
||||
const resp = await fetch('{{ url_for("measure.api_current_production") }}');
|
||||
if (!resp.ok) return;
|
||||
if (!resp.ok) {
|
||||
// #61: si mostra il detail del server (es. 503 "Stazione non configurata"),
|
||||
// che e' la causa vera; fallback generico se il corpo non e' JSON.
|
||||
const errBody = await resp.json().catch(() => null);
|
||||
this.productionError = (errBody && errBody.detail) || '{{ _("Errore di comunicazione con il server") }}';
|
||||
return;
|
||||
}
|
||||
const run = await resp.json();
|
||||
if (run && run.id) this.adoptProductionRun(run);
|
||||
} catch (e) {
|
||||
// Offline or server down: leave the page usable, just without the timer.
|
||||
// #61: offline o server giu: pagina usabile, ma l'errore e' visibile.
|
||||
this.productionError = '{{ _("Errore di connessione") }}';
|
||||
}
|
||||
},
|
||||
|
||||
@@ -1265,6 +1410,7 @@ function taskExecute() {
|
||||
this.productionStarted = run.status !== 'closed';
|
||||
this.cycleCount = run.cycle_count;
|
||||
this.measurementTaskIds = run.measurement_task_ids || [];
|
||||
this.closeTaskIds = run.close_task_ids || []; // #55
|
||||
|
||||
const seconds = run.seconds_to_next_measurement;
|
||||
if (seconds === null || seconds === undefined) {
|
||||
@@ -1691,6 +1837,7 @@ function taskExecute() {
|
||||
this.currentValue = null;
|
||||
this.errorMessage = '';
|
||||
this.inputStartedAt = Date.now();
|
||||
window.dispatchEvent(new CustomEvent('task-result-reset')); // #54: a check / note loops on the spot
|
||||
},
|
||||
|
||||
// ---- Where the measurement lives ----
|
||||
@@ -1767,13 +1914,9 @@ function taskExecute() {
|
||||
this.showCompletionOverlay = false;
|
||||
const opened = await this.startProduction();
|
||||
if (!opened) {
|
||||
// Server refused: keep the operator working rather than stranding them
|
||||
// mid-shift, but productionError is on screen so it is not silent.
|
||||
this.cycleConfirmed = true;
|
||||
this.cycleCount++;
|
||||
if (this.measurementIntervalMinutes && this.measurementIntervalMinutes > 0) {
|
||||
this.startCountdownFrom(this.measurementIntervalMinutes * 60);
|
||||
}
|
||||
// #61: server rifiuta -> niente timer locale finto; si riapre l'overlay
|
||||
// con l'errore (productionError) cosi' l'operatore puo' riprovare.
|
||||
this.showCompletionOverlay = true;
|
||||
return;
|
||||
}
|
||||
// The START-phase measurements have just been taken: record them as the first
|
||||
@@ -1787,6 +1930,33 @@ function taskExecute() {
|
||||
return window.ProductionClock.format(this.timerRemaining);
|
||||
},
|
||||
|
||||
/* #53: result recorded on a check / note task. In the loop of a production the
|
||||
task counts as a step of the cycle exactly like a measurement task: the last
|
||||
one closes the cycle (the server decides, as in confirmCycle), the others go
|
||||
to the next one. If the server refuses, the panel stays with «Prosegui». */
|
||||
async advanceAfterResult() {
|
||||
if (this.productionRun && this.isMeasurementTaskOfRun) {
|
||||
const countBefore = this.cycleCount;
|
||||
const run = await this.postProduction(
|
||||
'{{ url_for("measure.api_complete_cycle", run_id=0) }}'.replace('/0/', '/' + this.productionRun.id + '/'),
|
||||
{ task_id: this.task.id },
|
||||
);
|
||||
if (!run) return;
|
||||
this.adoptProductionRun(run);
|
||||
if (run.cycle_count === countBefore && this.nextMeasurementTaskId) {
|
||||
this.goToTask(this.nextMeasurementTaskId);
|
||||
return;
|
||||
}
|
||||
}
|
||||
this.goToNextTask();
|
||||
},
|
||||
|
||||
/* #55: the end-of-production notes are recorded: now the capoturno's modal. */
|
||||
closeTasksRecorded() {
|
||||
this.closeTasksDone = true;
|
||||
this.openSupervisorModal('fine_produzione');
|
||||
},
|
||||
|
||||
// ---- Navigate to next task (Completato) ----
|
||||
/* With a production open the operator stays in the measurement loop until the
|
||||
capoturno closes it: after the last measurement task they go back to the
|
||||
@@ -1821,6 +1991,18 @@ function taskExecute() {
|
||||
|
||||
// ---- Open/close supervisor modal (always reset fields) ----
|
||||
openSupervisorModal(action) {
|
||||
// #61: fermo/ripresa/fine produzione agiscono su un run: senza run aperto
|
||||
// si dice subito, prima di chiedere le credenziali.
|
||||
if (['fermo_linea', 'ripresa', 'fine_produzione'].includes(action) && !this.productionRun) {
|
||||
this.productionError = '{{ _("Nessuna produzione aperta su questa stazione") }}';
|
||||
return;
|
||||
}
|
||||
// #55: first the notes marked «alla fine della produzione»; the panel calls back
|
||||
// here (closeTasksRecorded) when they are recorded.
|
||||
if (action === 'fine_produzione' && this.closeTaskIds.length && !this.closeTasksDone) {
|
||||
window.dispatchEvent(new CustomEvent('task-close-open', { detail: { ids: this.closeTaskIds } }));
|
||||
return;
|
||||
}
|
||||
this.supervisorAction = action;
|
||||
this.supervisorUsername = '';
|
||||
this.supervisorPassword = '';
|
||||
@@ -1852,6 +2034,19 @@ function taskExecute() {
|
||||
return t === 'camera_measure' || t === 'dxf_compare';
|
||||
},
|
||||
|
||||
/* #54: «Controllo OK/NOK» - no quotes, the result is the outcome. */
|
||||
get isCheckTask() {
|
||||
return this.task.task_type === 'check';
|
||||
},
|
||||
|
||||
/* #54 #55: tasks that bring their own result panel (a check, or a note with
|
||||
fields). A note without fields stays the plain «Completato» task. */
|
||||
get hasResultPanel() {
|
||||
if (this.isCheckTask) return true;
|
||||
return this.task.task_type === 'note' && Array.isArray(this.task.fields)
|
||||
&& this.task.fields.length > 0;
|
||||
},
|
||||
|
||||
/* A measurement task with no quotes yet: the recipe is unfinished. Said out
|
||||
loud rather than silently rendering an empty screen. */
|
||||
get isMeasureTaskWithoutQuotes() {
|
||||
|
||||
@@ -104,7 +104,7 @@
|
||||
<svg class="w-6 h-6" fill="none" stroke="currentColor" stroke-width="2.5" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M5 3l14 9-14 9V3z"/>
|
||||
</svg>
|
||||
{{ _('AVVIA IN SEQUENZA') }}
|
||||
{{ _('AVVIA ATTIVITÀ') }}
|
||||
</a>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
@@ -0,0 +1,105 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}{{ _("Monitor stazioni") }} — TieMeasureFlow{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="tmf-page" x-data="stationMonitor()" x-init="init()">
|
||||
<div class="mb-6 flex items-center justify-between">
|
||||
<div>
|
||||
<h1 class="text-2xl font-bold text-[var(--text-primary)]">{{ _("Monitor stazioni") }}</h1>
|
||||
<p class="text-sm text-steel mt-1">{{ _("Produzioni aperte, aggiornate ogni 10 secondi") }}</p>
|
||||
</div>
|
||||
<div class="text-xs text-steel" x-text="updatedLabel"></div>
|
||||
</div>
|
||||
|
||||
<div x-show="error" class="mb-4 p-3 rounded-lg bg-red-50 text-red-700 text-sm" x-text="error"></div>
|
||||
|
||||
<div x-show="loaded && runs.length === 0 && !error"
|
||||
class="p-8 text-center text-steel bg-[var(--bg-secondary)] rounded-xl border border-[var(--border-color)]">
|
||||
{{ _("Nessuna stazione in produzione") }}
|
||||
</div>
|
||||
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4">
|
||||
<template x-for="r in runs" :key="r.id">
|
||||
<div class="bg-[var(--bg-secondary)] rounded-xl border border-[var(--border-color)] border-l-8 shadow-sm p-4"
|
||||
:class="borderClass(r)">
|
||||
<div class="flex items-start justify-between gap-2">
|
||||
<div>
|
||||
<div class="text-lg font-bold text-[var(--text-primary)]" x-text="r.station_code + ' — ' + r.station_name"></div>
|
||||
<div class="text-sm text-steel" x-text="r.recipe_code + ' ' + r.recipe_name + ' (v' + r.version_number + ')'"></div>
|
||||
</div>
|
||||
<span class="text-xs font-semibold px-2 py-1 rounded"
|
||||
:class="r.overdue ? 'bg-red-600 text-white animate-pulse' : 'bg-gray-200 text-gray-700'"
|
||||
x-text="statusLabel(r)"></span>
|
||||
</div>
|
||||
|
||||
<dl class="mt-3 grid grid-cols-2 gap-x-3 gap-y-1 text-sm">
|
||||
<dt class="text-steel">{{ _("Operatore") }}</dt><dd x-text="r.operator"></dd>
|
||||
<dt class="text-steel">{{ _("Avviata alle") }}</dt><dd x-text="startedAt(r)"></dd>
|
||||
<dt class="text-steel">{{ _("Durata") }}</dt><dd x-text="fmt(r.duration_seconds)"></dd>
|
||||
<dt class="text-steel">{{ _("Cicli") }}</dt><dd x-text="r.cycle_count"></dd>
|
||||
<dt class="text-steel">{{ _("Prossima misura") }}</dt>
|
||||
<dd :class="r.overdue ? 'text-red-600 font-bold' : ''" x-text="timerLabel(r)"></dd>
|
||||
<dt class="text-steel">{{ _("Ultimo evento") }}</dt>
|
||||
<dd x-text="r.last_event ? r.last_event.event_type : '-'"></dd>
|
||||
</dl>
|
||||
|
||||
<div class="mt-3 flex gap-2 text-xs font-semibold">
|
||||
<span class="px-2 py-1 rounded bg-green-100 text-green-800" x-text="'OK ' + r.pass_count"></span>
|
||||
<span class="px-2 py-1 rounded bg-yellow-100 text-yellow-800" x-text="'{{ _("Avviso") }} ' + r.warning_count"></span>
|
||||
<span class="px-2 py-1 rounded bg-red-100 text-red-800" x-text="'NOK ' + r.fail_count"></span>
|
||||
</div>
|
||||
|
||||
<ul class="mt-3 space-y-1 text-sm">
|
||||
<template x-for="s in r.subtasks" :key="s.subtask_id">
|
||||
<li class="flex justify-between gap-2">
|
||||
<span class="truncate" x-text="s.description"></span>
|
||||
<span class="font-mono whitespace-nowrap"
|
||||
:class="s.in_tolerance ? 'text-green-700' : 'text-red-700 font-bold'"
|
||||
x-text="s.mean.toFixed(3) + ' ' + s.unit"></span>
|
||||
</li>
|
||||
</template>
|
||||
</ul>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
function stationMonitor() {
|
||||
return {
|
||||
runs: [], loaded: false, error: '', updatedLabel: '',
|
||||
init() { this.load(); setInterval(() => this.load(), 10000); },
|
||||
async load() {
|
||||
try {
|
||||
const resp = await fetch('/monitor/api/runs');
|
||||
const data = await resp.json();
|
||||
if (!resp.ok || data.error) { this.error = data.detail || {{ _("Errore di caricamento")|tojson }}; return; }
|
||||
this.runs = data; this.error = ''; this.loaded = true;
|
||||
this.updatedLabel = new Date().toLocaleTimeString();
|
||||
} catch (e) { this.error = {{ _("Errore di rete")|tojson }}; }
|
||||
},
|
||||
// Green in tolerance, yellow with warnings, red with fails or a mean out of tolerance.
|
||||
borderClass(r) {
|
||||
if (r.fail_count > 0 || r.subtasks.some(s => !s.in_tolerance)) return 'border-l-red-600';
|
||||
if (r.warning_count > 0) return 'border-l-yellow-500';
|
||||
return 'border-l-green-600';
|
||||
},
|
||||
statusLabel(r) {
|
||||
if (r.overdue) return {{ _("IN RITARDO")|tojson }};
|
||||
return r.status === 'paused' ? {{ _("In pausa")|tojson }} : {{ _("In corso")|tojson }};
|
||||
},
|
||||
startedAt(r) { return new Date(r.started_at + 'Z').toLocaleTimeString(); },
|
||||
timerLabel(r) {
|
||||
if (r.seconds_to_next_measurement === null) return '-';
|
||||
const s = r.seconds_to_next_measurement;
|
||||
return (s < 0 ? '-' : '') + this.fmt(Math.abs(s));
|
||||
},
|
||||
fmt(sec) {
|
||||
const h = Math.floor(sec / 3600), m = Math.floor((sec % 3600) / 60), s = sec % 60;
|
||||
return (h ? h + 'h ' : '') + m + 'm ' + String(s).padStart(2, '0') + 's';
|
||||
},
|
||||
};
|
||||
}
|
||||
</script>
|
||||
{% endblock %}
|
||||
@@ -35,6 +35,19 @@
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- Sessione di produzione (#58) -->
|
||||
<div>
|
||||
<label class="block text-xs font-medium text-steel mb-1">{{ _("Sessione") }}</label>
|
||||
<select x-model="selectedRunId"
|
||||
:disabled="runs.length === 0"
|
||||
class="w-full rounded-lg border border-[var(--border-color)] bg-[var(--bg-primary)] text-[var(--text-primary)] px-3 py-2 text-sm focus:ring-2 focus:ring-primary focus:border-primary disabled:opacity-50">
|
||||
<option value="">{{ _("Tutte le sessioni") }}</option>
|
||||
<template x-for="r in runs" :key="r.id">
|
||||
<option :value="r.id" x-text="runLabel(r)"></option>
|
||||
</template>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- Subtask -->
|
||||
<div>
|
||||
<label class="block text-xs font-medium text-steel mb-1">{{ _("Punto di misura") }}</label>
|
||||
@@ -258,6 +271,8 @@ function spcDashboard() {
|
||||
// Filter state
|
||||
selectedRecipeId: '',
|
||||
selectedSubtaskId: '',
|
||||
selectedRunId: '', // #58
|
||||
runs: [], // #58 sessioni della ricetta
|
||||
dateFrom: '',
|
||||
dateTo: '',
|
||||
subtasks: [],
|
||||
@@ -281,6 +296,8 @@ function spcDashboard() {
|
||||
|
||||
async onRecipeChange() {
|
||||
this.selectedSubtaskId = '';
|
||||
this.selectedRunId = ''; // #58
|
||||
this.runs = [];
|
||||
this.subtasks = [];
|
||||
this.hasData = false;
|
||||
this.summary = null;
|
||||
@@ -290,6 +307,15 @@ function spcDashboard() {
|
||||
|
||||
if (!this.selectedRecipeId) return;
|
||||
|
||||
// #58: sessioni della ricetta per il filtro «Sessione»
|
||||
try {
|
||||
const rresp = await fetch('/statistics/api/runs?recipe_id=' + this.selectedRecipeId);
|
||||
const rdata = await rresp.json();
|
||||
if (Array.isArray(rdata)) this.runs = rdata;
|
||||
} catch (e) {
|
||||
console.error('Error loading runs:', e);
|
||||
}
|
||||
|
||||
// Load subtasks for dropdown
|
||||
try {
|
||||
const resp = await fetch('/statistics/api/subtasks?recipe_id=' + this.selectedRecipeId);
|
||||
@@ -302,6 +328,12 @@ function spcDashboard() {
|
||||
}
|
||||
},
|
||||
|
||||
// #58: etichetta sessione = data, stazione, operatore, lotto
|
||||
runLabel(r) {
|
||||
const d = r.started_at ? new Date(r.started_at + (r.started_at.endsWith('Z') ? '' : 'Z')).toLocaleString() : '';
|
||||
return [d, r.station_name, r.operator_name, r.lot_number].filter(Boolean).join(' · ');
|
||||
},
|
||||
|
||||
async loadData() {
|
||||
if (!this.selectedRecipeId) return;
|
||||
|
||||
@@ -312,6 +344,7 @@ function spcDashboard() {
|
||||
const params = new URLSearchParams();
|
||||
params.set('recipe_id', this.selectedRecipeId);
|
||||
if (this.selectedSubtaskId) params.set('subtask_id', this.selectedSubtaskId);
|
||||
if (this.selectedRunId) params.set('production_run_id', this.selectedRunId); // #58
|
||||
if (this.dateFrom) params.set('date_from', new Date(this.dateFrom + 'T00:00:00').toISOString());
|
||||
if (this.dateTo) params.set('date_to', new Date(this.dateTo + 'T23:59:59.999').toISOString());
|
||||
|
||||
@@ -417,6 +450,7 @@ function spcDashboard() {
|
||||
const params = new URLSearchParams();
|
||||
params.set('recipe_id', this.selectedRecipeId);
|
||||
if (this.selectedSubtaskId) params.set('subtask_id', this.selectedSubtaskId);
|
||||
if (this.selectedRunId) params.set('production_run_id', this.selectedRunId); // #58
|
||||
if (this.dateFrom) params.set('date_from', new Date(this.dateFrom + 'T00:00:00').toISOString());
|
||||
if (this.dateTo) params.set('date_to', new Date(this.dateTo + 'T23:59:59.999').toISOString());
|
||||
|
||||
|
||||
@@ -0,0 +1,110 @@
|
||||
// Behaviour test for static/js/task-results.js (#53 #54 #55), plain node, no framework.
|
||||
// Run: node tests/js/test_task_results.js (exit code != 0 on failure)
|
||||
const assert = require('assert');
|
||||
const { taskResultForm } = require('../../static/js/task-results.js');
|
||||
|
||||
const calls = [];
|
||||
let responses = [];
|
||||
global.window = {
|
||||
__taskResultsCfg: {
|
||||
saveUrl: '/s', listUrl: '/l', uploadUrl: '/u', taskUrlTpl: '/t/0',
|
||||
labels: { nokNeedsNote: 'Per un NOK serve la nota' },
|
||||
},
|
||||
sessionStorage: { _d: {}, getItem(k) { return this._d[k] || null; }, setItem(k, v) { this._d[k] = v; } },
|
||||
};
|
||||
global.FormData = class { constructor() { this.d = []; } append(k, v, n) { this.d.push([k, v, n]); } };
|
||||
global.fetch = async (url, opts) => {
|
||||
calls.push({ url, opts });
|
||||
const r = responses.shift() || { status: 200, body: {} };
|
||||
return { ok: r.status < 400, status: r.status, json: async () => r.body };
|
||||
};
|
||||
|
||||
function comp(runId) {
|
||||
const c = taskResultForm();
|
||||
c.ctx = () => ({ runId, done() { c._done = (c._done || 0) + 1; } });
|
||||
return c;
|
||||
}
|
||||
|
||||
(async () => {
|
||||
// check: NOK without note is refused before any request
|
||||
let c = comp(4);
|
||||
c.initForTask({ id: 30, task_type: 'check' });
|
||||
responses = [{ status: 200, body: [] }]; // loadLast
|
||||
await c.submit('nok');
|
||||
assert.strictEqual(c.forms[0].error, 'Per un NOK serve la nota');
|
||||
assert.ok(!calls.some((x) => x.url === '/s'), 'no POST for a NOK without note');
|
||||
|
||||
// check: OK goes to the server with the run id, then hands over
|
||||
calls.length = 0;
|
||||
responses = [{ status: 201, body: { id: 1, outcome: 'ok' } }];
|
||||
await c.submit('ok');
|
||||
const post = calls.find((x) => x.url === '/s');
|
||||
const body = JSON.parse(post.opts.body);
|
||||
assert.deepStrictEqual([body.task_id, body.production_run_id, body.outcome, body.values], [30, 4, 'ok', null]);
|
||||
assert.strictEqual(c._done, 1);
|
||||
assert.strictEqual(c.forms[0].result.outcome, 'ok');
|
||||
|
||||
// server 422: the detail is shown, nothing is handed over
|
||||
c = comp(4);
|
||||
responses = [{ status: 200, body: [] }, { status: 422, body: { detail: 'Per un NOK serve la nota' } }];
|
||||
c.initForTask({ id: 30, task_type: 'check' }); // consumes the first one (loadLast)
|
||||
await new Promise((r) => setTimeout(r, 0));
|
||||
c.forms[0].note = 'x';
|
||||
await c.submit('nok');
|
||||
assert.strictEqual(c.forms[0].error, 'Per un NOK serve la nota');
|
||||
assert.ok(!c._done);
|
||||
|
||||
// note with fields: defaults, upload of the attachment, values + attachments in the result
|
||||
calls.length = 0;
|
||||
c = comp(null);
|
||||
const task = { id: 31, task_type: 'note', fields: [
|
||||
{ key: 'peso', label: 'Peso', type: 'number', default: '1,5', attachment: false },
|
||||
{ key: 'foto', label: 'Foto', type: 'text', default: null, attachment: true },
|
||||
] };
|
||||
c.initForTask(task);
|
||||
assert.strictEqual(c.forms[0].values.peso, '1,5');
|
||||
c.forms[0].files.foto = { name: 'a.png' };
|
||||
responses = [
|
||||
{ status: 201, body: { file_path: 'general/a.png' } },
|
||||
{ status: 201, body: { id: 2, outcome: 'done' } },
|
||||
];
|
||||
await c.submit('done');
|
||||
const saved = JSON.parse(calls.find((x) => x.url === '/s').opts.body);
|
||||
assert.deepStrictEqual(saved.values, { peso: '1.5' });
|
||||
assert.deepStrictEqual(saved.attachments, [{ key: 'foto', path: 'general/a.png', name: 'a.png' }]);
|
||||
assert.strictEqual(saved.outcome, 'done');
|
||||
assert.strictEqual(saved.production_run_id, null);
|
||||
|
||||
// non numeric value in a number field is refused locally
|
||||
c = comp(null);
|
||||
c.initForTask(task);
|
||||
c.forms[0].values.peso = 'abc';
|
||||
await c.submit('done');
|
||||
assert.ok(c.forms[0].error.indexOf('Peso') !== -1);
|
||||
|
||||
// a note without fields has no panel
|
||||
c = comp(null);
|
||||
c.initForTask({ id: 33, task_type: 'note', fields: [] });
|
||||
assert.strictEqual(c.forms.length, 0);
|
||||
|
||||
// end of production: tasks already recorded in the run are skipped; the rest recorded then handed over
|
||||
calls.length = 0;
|
||||
c = comp(4);
|
||||
responses = [
|
||||
{ status: 200, body: [{ task_id: 40 }] }, // results of the run
|
||||
{ status: 200, body: { id: 40, title: 'A', task_type: 'note', fields: [] } },
|
||||
{ status: 200, body: { id: 41, title: 'B', task_type: 'note', fields: [{ key: 'k', label: 'K', type: 'text', default: null, attachment: false }] } },
|
||||
];
|
||||
await c.openClose([40, 41]);
|
||||
assert.strictEqual(c.forms[0].recorded, true);
|
||||
assert.strictEqual(c.forms[1].recorded, false);
|
||||
assert.ok(c.open && !c._done);
|
||||
c.forms[1].values.k = 'ok';
|
||||
responses = [{ status: 201, body: { id: 5, outcome: 'done' } }];
|
||||
await c.submitClose();
|
||||
assert.strictEqual(c._done, 1);
|
||||
assert.strictEqual(c.open, false);
|
||||
assert.strictEqual(calls.filter((x) => x.url === '/s').length, 1, 'only the pending task is posted');
|
||||
|
||||
console.log('ok');
|
||||
})().catch((e) => { console.error(e); process.exit(1); });
|
||||
@@ -0,0 +1,64 @@
|
||||
"""#50/#51: tab Utenti dentro Impostazioni, redirect da /admin/users, reset password."""
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
import pytest
|
||||
|
||||
from tests.conftest import api_get_router
|
||||
|
||||
USER = {
|
||||
"id": 2, "username": "mario", "display_name": "Mario", "email": None,
|
||||
"roles": ["MeasurementTec"], "is_admin": False, "language_pref": "it",
|
||||
"theme_pref": "light", "active": True,
|
||||
}
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def mock_admin_api():
|
||||
mock = MagicMock()
|
||||
mock.get.side_effect = api_get_router({
|
||||
"/api/users": [USER],
|
||||
"/api/settings": {"auto_logout_minutes": "30"},
|
||||
})
|
||||
with patch("blueprints.admin.api_client", mock):
|
||||
yield mock
|
||||
|
||||
|
||||
def test_users_url_redirects_to_settings_tab(logged_in_client, mock_admin_api):
|
||||
resp = logged_in_client.get("/admin/users")
|
||||
assert resp.status_code == 302
|
||||
assert resp.headers["Location"].endswith("/admin/settings?tab=utenti")
|
||||
|
||||
|
||||
def test_settings_has_users_tab_and_reset_for_admin(logged_in_client, mock_admin_api):
|
||||
resp = logged_in_client.get("/admin/settings?tab=utenti")
|
||||
assert resp.status_code == 200
|
||||
html = resp.data.decode("utf-8")
|
||||
assert "userManagement(" in html # pannello utenti incluso
|
||||
assert "openReset(user)" in html # pulsante reset password (#51)
|
||||
assert "mario" in html # utente caricato
|
||||
assert "tab: " in html and "utenti" in html # tab iniziale richiesta
|
||||
|
||||
|
||||
def test_navbar_has_no_users_link(logged_in_client, mock_admin_api):
|
||||
html = logged_in_client.get("/admin/settings").data.decode("utf-8")
|
||||
assert 'href="/admin/users"' not in html
|
||||
|
||||
|
||||
def test_non_admin_cannot_reach_users_tab(client, mock_admin_api):
|
||||
with client.session_transaction() as sess:
|
||||
sess["api_key"] = "k"
|
||||
sess["user"] = {"id": 3, "username": "op", "roles": ["MeasurementTec"],
|
||||
"is_admin": False, "language_pref": "it", "theme_pref": "light"}
|
||||
for url in ("/admin/settings?tab=utenti", "/admin/users"):
|
||||
resp = client.get(url)
|
||||
assert resp.status_code == 302
|
||||
assert "/admin/" not in resp.headers["Location"]
|
||||
mock_admin_api.get.assert_not_called()
|
||||
|
||||
|
||||
def test_password_reset_proxy(logged_in_client, mock_admin_api):
|
||||
mock_admin_api.put.return_value = {"message": "ok"}
|
||||
resp = logged_in_client.put("/admin/api/users/2/password", json={"password": "Nuova1234"})
|
||||
assert resp.status_code == 200
|
||||
mock_admin_api.put.assert_called_once_with(
|
||||
"/api/users/2/password", data={"password": "Nuova1234"})
|
||||
@@ -136,3 +136,67 @@ class TestLanguageSwitch:
|
||||
with client.session_transaction() as sess:
|
||||
# Invalid language should NOT be stored
|
||||
assert sess.get("language") != "xx"
|
||||
|
||||
|
||||
class TestPinLogin:
|
||||
"""Login Operatore con nome + PIN (#59)."""
|
||||
|
||||
USER = {
|
||||
"id": 7, "username": "mario", "display_name": "Mario Rossi",
|
||||
"roles": ["MeasurementTec"], "is_admin": False,
|
||||
"language_pref": "it", "theme_pref": "light", "active": True,
|
||||
}
|
||||
|
||||
def test_login_page_has_pin_view_and_password_link(self, client):
|
||||
resp = client.get("/auth/login")
|
||||
assert b"pin-pad.js" in resp.data
|
||||
assert b"pin-pad" in resp.data # tastierino presente nel markup
|
||||
assert b'name="password"' in resp.data # form password ancora presente
|
||||
|
||||
def test_pin_users_listed(self, client, mock_api_client):
|
||||
mock_api_client.get.return_value = [
|
||||
{"id": 7, "display_name": "Mario Rossi", "secret": "x"},
|
||||
]
|
||||
resp = client.get("/auth/pin-users")
|
||||
assert resp.status_code == 200
|
||||
assert resp.get_json() == [{"id": 7, "display_name": "Mario Rossi"}]
|
||||
|
||||
def test_pin_users_empty_on_error(self, client, mock_api_client):
|
||||
mock_api_client.get.return_value = {"error": True, "detail": "boom"}
|
||||
assert client.get("/auth/pin-users").get_json() == []
|
||||
|
||||
def test_pin_users_empty_list_falls_back(self, client, mock_api_client):
|
||||
mock_api_client.get.return_value = []
|
||||
assert client.get("/auth/pin-users").get_json() == []
|
||||
|
||||
def test_login_pin_success_sets_session(self, client, mock_api_client):
|
||||
mock_api_client.post.return_value = {"api_key": "pin-key", "user": self.USER}
|
||||
mock_api_client.get.return_value = {}
|
||||
resp = client.post("/auth/login-pin", json={"user_id": 7, "pin": "1234"})
|
||||
assert resp.status_code == 200
|
||||
assert resp.get_json()["ok"] is True
|
||||
assert resp.get_json()["redirect"]
|
||||
mock_api_client.post.assert_called_once_with(
|
||||
"/api/auth/login-pin", data={"user_id": 7, "pin": "1234"})
|
||||
with client.session_transaction() as sess:
|
||||
assert sess["api_key"] == "pin-key"
|
||||
assert sess["user_id"] == 7
|
||||
assert sess.permanent is True
|
||||
|
||||
def test_login_pin_wrong_pin_401(self, client, mock_api_client):
|
||||
mock_api_client.post.return_value = {"error": True, "status_code": 401, "detail": "x"}
|
||||
resp = client.post("/auth/login-pin", json={"user_id": 7, "pin": "0000"})
|
||||
assert resp.status_code == 401
|
||||
assert resp.get_json()["detail"] == "PIN errato"
|
||||
|
||||
def test_login_pin_locked_423_shows_detail(self, client, mock_api_client):
|
||||
mock_api_client.post.return_value = {
|
||||
"error": True, "status_code": 423, "detail": "Utente bloccato fino alle 10:15"}
|
||||
resp = client.post("/auth/login-pin", json={"user_id": 7, "pin": "0000"})
|
||||
assert resp.status_code == 423
|
||||
assert "10:15" in resp.get_json()["detail"]
|
||||
|
||||
def test_login_pin_invalid_pin_422(self, client, mock_api_client):
|
||||
resp = client.post("/auth/login-pin", json={"user_id": 7, "pin": "12"})
|
||||
assert resp.status_code == 422
|
||||
mock_api_client.post.assert_not_called()
|
||||
|
||||
@@ -71,6 +71,61 @@ class TestRecipeNew:
|
||||
assert resp.status_code == 200
|
||||
|
||||
|
||||
def test_recipe_new_default_interval_present(self, logged_in_client, mock_api_client):
|
||||
"""#49: default_measurement_interval_minutes pre-fills the loop duration."""
|
||||
mock_api_client.get.return_value = {"default_measurement_interval_minutes": "45"}
|
||||
html = logged_in_client.get("/maker/recipes/new").get_data(as_text=True)
|
||||
assert "measurementIntervalMinutes: 45," in html
|
||||
|
||||
def test_recipe_new_default_interval_absent(self, logged_in_client, mock_api_client):
|
||||
"""#49: key missing, empty or invalid -> unchanged behaviour (null)."""
|
||||
for payload in ({}, {"default_measurement_interval_minutes": ""},
|
||||
{"default_measurement_interval_minutes": "abc"},
|
||||
{"default_measurement_interval_minutes": "5000"}):
|
||||
mock_api_client.get.return_value = payload
|
||||
html = logged_in_client.get("/maker/recipes/new").get_data(as_text=True)
|
||||
assert 'measurementIntervalMinutes: "null",' in html
|
||||
|
||||
def test_recipe_edit_ignores_default_interval(self, logged_in_client, mock_api_client):
|
||||
"""#49: an existing recipe never receives the default."""
|
||||
def fake_get(path, *a, **k):
|
||||
if path == "/api/recipes/7":
|
||||
return {"id": 7, "code": "R", "name": "R"}
|
||||
if path.endswith("/versions"):
|
||||
return []
|
||||
return {"default_measurement_interval_minutes": "45"}
|
||||
mock_api_client.get.side_effect = fake_get
|
||||
html = logged_in_client.get("/maker/recipes/7/edit").get_data(as_text=True)
|
||||
assert 'measurementIntervalMinutes: "null",' in html
|
||||
|
||||
|
||||
class TestRecipeDuplicateProxy:
|
||||
"""POST /maker/api/recipes/<id>/duplicate (#52)."""
|
||||
|
||||
def test_duplicate_proxy_ok(self, logged_in_client, mock_api_client):
|
||||
mock_api_client.post.return_value = {"id": 9, "code": "A-COPIA"}
|
||||
resp = logged_in_client.post(
|
||||
"/maker/api/recipes/3/duplicate", json={"code": "A-COPIA", "name": "A (copia)"}
|
||||
)
|
||||
assert resp.status_code == 201
|
||||
assert resp.get_json()["id"] == 9
|
||||
mock_api_client.post.assert_called_with(
|
||||
"/api/recipes/3/duplicate", data={"code": "A-COPIA", "name": "A (copia)"}
|
||||
)
|
||||
|
||||
def test_duplicate_proxy_conflict(self, logged_in_client, mock_api_client):
|
||||
mock_api_client.post.return_value = {"error": True, "status_code": 409, "detail": "exists"}
|
||||
resp = logged_in_client.post(
|
||||
"/maker/api/recipes/3/duplicate", json={"code": "A", "name": "A"}
|
||||
)
|
||||
assert resp.status_code == 409
|
||||
|
||||
def test_recipe_list_has_duplicate_button(self, logged_in_client, mock_api_client):
|
||||
mock_api_client.get.return_value = {"items": [], "total": 0, "pages": 1}
|
||||
html = logged_in_client.get("/maker/recipes").get_data(as_text=True)
|
||||
assert "openDupModal" in html
|
||||
|
||||
|
||||
class TestRoleRequired:
|
||||
"""Maker role enforcement tests."""
|
||||
|
||||
@@ -240,3 +295,30 @@ class TestTaskEditorVisionUi:
|
||||
assert "visionRecipe(" in html
|
||||
assert "vision_output" in html
|
||||
assert "js/vision_recipe.js" in html
|
||||
|
||||
|
||||
class TestImageCropInclusion:
|
||||
"""#56: i due editor includono image-crop.js e agganciano il ritaglio all'upload."""
|
||||
|
||||
def test_task_editor_includes_crop(self, logged_in_client, mock_api_client):
|
||||
from tests.conftest import api_get_router
|
||||
|
||||
mock_api_client.get.side_effect = api_get_router({
|
||||
"/api/recipes/3": {"id": 3, "code": "R", "name": "R"},
|
||||
"/api/recipes/3/tasks": [{
|
||||
"id": 11, "title": "T", "task_type": "measure", "subtasks": [],
|
||||
"file_path": None, "order_index": 1,
|
||||
}],
|
||||
})
|
||||
html = logged_in_client.get("/maker/recipes/3/tasks").get_data(as_text=True)
|
||||
assert "js/image-crop.js" in html
|
||||
assert "tmfCropBeforeUpload(file)" in html
|
||||
|
||||
def test_recipe_editor_includes_crop(self, logged_in_client, mock_api_client):
|
||||
mock_api_client.get.side_effect = [
|
||||
{"id": 1, "code": "REC-001", "name": "Recipe A"},
|
||||
[{"version_number": 1, "is_current": True}],
|
||||
]
|
||||
html = logged_in_client.get("/maker/recipes/1/edit").get_data(as_text=True)
|
||||
assert "js/image-crop.js" in html
|
||||
assert "tmfCropBeforeUpload(file)" in html
|
||||
|
||||
@@ -0,0 +1,205 @@
|
||||
"""gitea:Adriano/TieMeasureFlow#53 #54 #55 - operator side of the check / note results.
|
||||
|
||||
The backend (task-results, in_loop, close_task_ids) lives in another unit: api_client
|
||||
is mocked and the tests work against the contract written in the issues.
|
||||
"""
|
||||
import io
|
||||
import shutil
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
from tests.conftest import api_get_router
|
||||
from tests.test_template_js_syntax import (
|
||||
_INLINE_SCRIPT_RX, _check_alpine_attributes, _force_italian, _node_check,
|
||||
)
|
||||
|
||||
FLASK_APP_DIR = Path(__file__).resolve().parent.parent
|
||||
|
||||
RECIPE = {
|
||||
"id": 3, "code": "REC-1", "name": "Ricetta",
|
||||
"measurement_interval_minutes": 30, "allow_manual_input": True,
|
||||
"current_version": {"id": 5, "version_number": 1},
|
||||
}
|
||||
|
||||
|
||||
def _task(task_id, task_type, **extra):
|
||||
task = {
|
||||
"id": task_id, "recipe_id": 3, "version_id": 5, "task_type": task_type,
|
||||
"title": "Task d'esempio", "directive": None, "description": None,
|
||||
"file_path": None, "file_type": None, "annotations_json": None,
|
||||
"subtasks": [], "fields": None,
|
||||
}
|
||||
task.update(extra)
|
||||
return task
|
||||
|
||||
|
||||
def _render(client, mock_api_client, monkeypatch, task):
|
||||
monkeypatch.setattr("blueprints.measure.Config.STATION_CODE", "ST-TEST")
|
||||
mock_api_client.get_station_recipes.return_value = {"items": [{"id": 3}]}
|
||||
mock_api_client.get.side_effect = api_get_router({
|
||||
f"/api/tasks/{task['id']}": task,
|
||||
"/api/recipes/3/tasks": [{"id": task["id"], "order_index": 0}],
|
||||
"/api/recipes/3": RECIPE,
|
||||
})
|
||||
return client.get(f"/measure/execute/{task['id']}")
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Page
|
||||
# ---------------------------------------------------------------------------
|
||||
def test_check_task_has_ok_nok_buttons(logged_in_client, mock_api_client, monkeypatch):
|
||||
resp = _render(logged_in_client, mock_api_client, monkeypatch, _task(30, "check"))
|
||||
html = resp.get_data(as_text=True)
|
||||
assert resp.status_code == 200
|
||||
assert "submit('ok')" in html and "submit('nok')" in html
|
||||
assert "taskResultForm()" in html
|
||||
assert "/measure/api/task-results" in html
|
||||
assert "js/task-results.js" in html
|
||||
|
||||
|
||||
def test_note_with_fields_shows_field_inputs(logged_in_client, mock_api_client, monkeypatch):
|
||||
fields = [
|
||||
{"key": "peso", "label": "Peso", "type": "number", "default": "1.5", "attachment": False},
|
||||
{"key": "foto", "label": "Foto", "type": "text", "default": None, "attachment": True},
|
||||
]
|
||||
task = _task(31, "note", fields=fields)
|
||||
html = _render(logged_in_client, mock_api_client, monkeypatch, task).get_data(as_text=True)
|
||||
# the fields travel to the page in the task data, the inputs are drawn from them
|
||||
assert '"key": "peso"' in html or '"key":"peso"' in html
|
||||
assert 'x-model="f.values[fld.key]"' in html
|
||||
assert "pickFile(f, fld.key, $event)" in html
|
||||
assert "submit('done')" in html
|
||||
|
||||
|
||||
def test_close_panel_and_modal_hook_present(logged_in_client, mock_api_client, monkeypatch):
|
||||
html = _render(logged_in_client, mock_api_client, monkeypatch, _task(32, "check")).get_data(as_text=True)
|
||||
assert "task-close-open" in html
|
||||
assert "closeTasksRecorded()" in html
|
||||
assert "close_task_ids" in html
|
||||
assert "/measure/api/tasks/0" in html
|
||||
|
||||
|
||||
@pytest.mark.parametrize("task", [
|
||||
_task(30, "check"),
|
||||
_task(31, "note", fields=[{"key": "n", "label": "L'etichetta", "type": "text",
|
||||
"default": None, "attachment": True}]),
|
||||
])
|
||||
def test_inline_js_and_alpine_attributes_valid(logged_in_client, mock_api_client, monkeypatch, task):
|
||||
_force_italian(logged_in_client)
|
||||
html = _render(logged_in_client, mock_api_client, monkeypatch, task).get_data(as_text=True)
|
||||
scripts = _INLINE_SCRIPT_RX.findall(html)
|
||||
assert scripts
|
||||
for i, body in enumerate(scripts):
|
||||
_node_check(body, f"/measure/execute check-note script[{i}]")
|
||||
_check_alpine_attributes(html, "/measure/execute check-note")
|
||||
|
||||
|
||||
def test_plain_note_keeps_old_footer(logged_in_client, mock_api_client, monkeypatch):
|
||||
"""A note without fields has no result panel: it is still the plain «Completato»."""
|
||||
html = _render(logged_in_client, mock_api_client, monkeypatch, _task(33, "note")).get_data(as_text=True)
|
||||
assert "goToNextTask()" in html
|
||||
# the panel markup is in the page either way; hasResultPanel (false here) decides
|
||||
assert "hasResultPanel" in html
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Proxies
|
||||
# ---------------------------------------------------------------------------
|
||||
def test_task_result_post_is_forwarded(logged_in_client, mock_api_client):
|
||||
mock_api_client.post.return_value = {"id": 9, "outcome": "nok"}
|
||||
body = {
|
||||
"task_id": 30, "production_run_id": 4, "outcome": "nok", "note": "graffio",
|
||||
"values": None, "attachments": None, "ignored": "x",
|
||||
}
|
||||
resp = logged_in_client.post("/measure/api/task-results", json=body)
|
||||
assert resp.status_code == 201
|
||||
assert resp.get_json()["id"] == 9
|
||||
args, kwargs = mock_api_client.post.call_args
|
||||
assert args[0] == "/api/task-results"
|
||||
assert kwargs["data"] == {
|
||||
"task_id": 30, "production_run_id": 4, "outcome": "nok", "note": "graffio",
|
||||
"values": None, "attachments": None,
|
||||
}
|
||||
|
||||
|
||||
def test_task_result_422_detail_is_passed_through(logged_in_client, mock_api_client):
|
||||
mock_api_client.post.return_value = {
|
||||
"error": True, "status_code": 422, "detail": "Per un NOK serve la nota",
|
||||
}
|
||||
resp = logged_in_client.post(
|
||||
"/measure/api/task-results", json={"task_id": 30, "outcome": "nok"})
|
||||
assert resp.status_code == 422
|
||||
assert resp.get_json()["detail"] == "Per un NOK serve la nota"
|
||||
|
||||
|
||||
def test_task_result_requires_task_id(logged_in_client, mock_api_client):
|
||||
resp = logged_in_client.post("/measure/api/task-results", json={"outcome": "ok"})
|
||||
assert resp.status_code == 400
|
||||
mock_api_client.post.assert_not_called()
|
||||
|
||||
|
||||
def test_task_results_list_forwards_filters(logged_in_client, mock_api_client):
|
||||
mock_api_client.get.return_value = [{"id": 1, "task_id": 30}]
|
||||
resp = logged_in_client.get("/measure/api/task-results?production_run_id=4&task_id=30")
|
||||
assert resp.status_code == 200
|
||||
assert resp.get_json() == [{"id": 1, "task_id": 30}]
|
||||
args, kwargs = mock_api_client.get.call_args
|
||||
assert args[0] == "/api/task-results"
|
||||
assert kwargs["params"] == {"production_run_id": "4", "task_id": "30"}
|
||||
|
||||
|
||||
def test_attachment_upload_forwards_multipart(logged_in_client, mock_api_client):
|
||||
mock_api_client.post.return_value = {"file_path": "general/foto.png", "file_type": "image/png"}
|
||||
resp = logged_in_client.post(
|
||||
"/measure/api/attachments",
|
||||
data={"file": (io.BytesIO(b"\x89PNG fake"), "foto.png", "image/png")},
|
||||
content_type="multipart/form-data",
|
||||
)
|
||||
assert resp.status_code == 201
|
||||
assert resp.get_json()["file_path"] == "general/foto.png"
|
||||
args, kwargs = mock_api_client.post.call_args
|
||||
assert args[0] == "/api/files/upload"
|
||||
name, content, mime = kwargs["files"]["file"]
|
||||
assert name == "foto.png" and mime == "image/png" and content.startswith(b"\x89PNG")
|
||||
|
||||
|
||||
def test_attachment_upload_requires_file(logged_in_client, mock_api_client):
|
||||
resp = logged_in_client.post("/measure/api/attachments", data={})
|
||||
assert resp.status_code == 400
|
||||
mock_api_client.post.assert_not_called()
|
||||
|
||||
|
||||
def test_attachment_upload_error_detail_is_passed_through(logged_in_client, mock_api_client):
|
||||
mock_api_client.post.return_value = {"error": True, "status_code": 400, "detail": "File type not allowed"}
|
||||
resp = logged_in_client.post(
|
||||
"/measure/api/attachments",
|
||||
data={"file": (io.BytesIO(b"x"), "a.exe", "application/octet-stream")},
|
||||
content_type="multipart/form-data",
|
||||
)
|
||||
assert resp.status_code == 400
|
||||
assert resp.get_json()["detail"] == "File type not allowed"
|
||||
|
||||
|
||||
def test_get_task_proxy(logged_in_client, mock_api_client):
|
||||
mock_api_client.get.return_value = {"id": 40, "task_type": "note", "fields": []}
|
||||
resp = logged_in_client.get("/measure/api/tasks/40")
|
||||
assert resp.status_code == 200
|
||||
assert resp.get_json()["id"] == 40
|
||||
assert mock_api_client.get.call_args[0][0] == "/api/tasks/40"
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Component logic (plain node, stubbed fetch)
|
||||
# ---------------------------------------------------------------------------
|
||||
def test_task_results_component_js():
|
||||
node = shutil.which("node")
|
||||
if not node:
|
||||
pytest.skip("node non installato: test JS di task-results.js saltato")
|
||||
script = Path(__file__).resolve().parent / "js" / "test_task_results.js"
|
||||
result = subprocess.run(
|
||||
[node, str(script)], cwd=str(FLASK_APP_DIR),
|
||||
capture_output=True, text=True, timeout=30,
|
||||
)
|
||||
assert result.returncode == 0, f"stdout:\n{result.stdout}\nstderr:\n{result.stderr}"
|
||||
@@ -0,0 +1,46 @@
|
||||
"""Live station monitor page and JSON proxy (#57)."""
|
||||
from unittest.mock import patch
|
||||
|
||||
import pytest
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def mock_api():
|
||||
with patch("blueprints.monitor.api_client") as m:
|
||||
yield m
|
||||
|
||||
|
||||
def _login(client, roles, is_admin=False):
|
||||
with client.session_transaction() as sess:
|
||||
sess["api_key"] = "k"
|
||||
sess["user"] = {"id": 2, "username": "u", "display_name": "U", "roles": roles,
|
||||
"is_admin": is_admin, "language_pref": "en", "theme_pref": "light",
|
||||
"active": True}
|
||||
sess["language"] = "en"
|
||||
|
||||
|
||||
def test_page_ok_for_supervisor(client, mock_api):
|
||||
_login(client, ["Supervisor"])
|
||||
resp = client.get("/monitor")
|
||||
assert resp.status_code == 200 and b"stationMonitor" in resp.data
|
||||
|
||||
|
||||
def test_page_forbidden_for_operator(client, mock_api):
|
||||
_login(client, ["MeasurementTec"])
|
||||
assert client.get("/monitor").status_code == 403
|
||||
assert client.get("/monitor/api/runs").status_code == 403
|
||||
|
||||
|
||||
def test_proxy_returns_backend_json(client, mock_api):
|
||||
_login(client, ["Supervisor"])
|
||||
mock_api.get.return_value = [{"id": 1, "station_code": "ST-1"}]
|
||||
resp = client.get("/monitor/api/runs")
|
||||
assert resp.status_code == 200 and resp.get_json()[0]["station_code"] == "ST-1"
|
||||
mock_api.get.assert_called_once_with("/api/production-runs/open")
|
||||
|
||||
|
||||
def test_proxy_passes_backend_error(client, mock_api):
|
||||
_login(client, [], is_admin=True)
|
||||
mock_api.get.return_value = {"error": True, "status_code": 403, "detail": "no"}
|
||||
resp = client.get("/monitor/api/runs")
|
||||
assert resp.status_code == 403 and resp.get_json()["error"] is True
|
||||
@@ -104,7 +104,7 @@ def test_the_selection_screen_starts_the_sequence(
|
||||
def test_avvia_on_the_list_starts_the_sequence(logged_in_client, mock_api_client):
|
||||
html = _list_page(logged_in_client, mock_api_client)
|
||||
assert "/measure/start/3" in html
|
||||
assert "AVVIA IN SEQUENZA" in html
|
||||
assert "AVVIA ATTIVITÀ" in html
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
@@ -163,6 +163,32 @@ def test_the_header_offers_completato_not_the_summary(
|
||||
assert '@click="goToNextTask()"' in html
|
||||
|
||||
|
||||
def test_only_one_completato_and_it_is_big(
|
||||
logged_in_client, mock_api_client, monkeypatch,
|
||||
):
|
||||
"""#60: «Completato» una sola volta (in basso), largo e alto per il touch."""
|
||||
html = _execute_page(logged_in_client, mock_api_client, monkeypatch)
|
||||
# the label as a button text on its own line (comments in the JS also name it)
|
||||
assert [l.strip() for l in html.splitlines()].count("Completato") == 1
|
||||
assert "min-h-[64px]" in html
|
||||
|
||||
|
||||
def test_no_open_run_means_no_fermo_linea_and_no_fake_timer(
|
||||
logged_in_client, mock_api_client, monkeypatch,
|
||||
):
|
||||
"""#61: senza produzione aperta i pulsanti non si vedono, la modale non si
|
||||
apre e un rifiuto del server non avvia un timer locale finto."""
|
||||
html = _execute_page(logged_in_client, mock_api_client, monkeypatch)
|
||||
assert 'x-if="isMeasureTask && productionRun"' in html
|
||||
assert "!this.productionRun" in html
|
||||
# #61: loadProductionRun mostra il detail del server, non solo il messaggio generico
|
||||
assert "errBody.detail" in html
|
||||
assert "Nessuna produzione aperta su questa stazione" in html
|
||||
# il vecchio ripiego locale non c'e' piu'
|
||||
assert "this.startCountdownFrom(this.measurementIntervalMinutes * 60)" not in html.split(
|
||||
"async startProductionFromOverlay()")[1].split("async confirmCycle")[0]
|
||||
|
||||
|
||||
def test_fine_ciclo_is_shown_before_it_can_be_used(
|
||||
logged_in_client, mock_api_client, monkeypatch,
|
||||
):
|
||||
@@ -196,3 +222,27 @@ def test_the_operator_flow_never_links_to_the_statistics(
|
||||
]
|
||||
for html in pages:
|
||||
assert "/statistics" not in html
|
||||
|
||||
|
||||
def test_trace_panel_only_for_recipes_that_require_it(
|
||||
logged_in_client, mock_api_client, monkeypatch,
|
||||
):
|
||||
"""#63/#64: ricerca+griglia in alto, pannello lotto/seriale solo dopo la
|
||||
scelta di una ricetta che lo richiede, con i soli campi richiesti."""
|
||||
_italian(logged_in_client)
|
||||
monkeypatch.setattr("blueprints.measure.Config.STATION_CODE", "ST-TEST")
|
||||
mock_api_client.get_station_recipes.return_value = [
|
||||
{"id": 1, "code": "A", "name": "Con lotto", "requires_lot": True,
|
||||
"requires_serial": False},
|
||||
{"id": 2, "code": "B", "name": "Libera"},
|
||||
]
|
||||
html = logged_in_client.get("/measure/select").get_data(as_text=True)
|
||||
assert 'id="trace-panel"' in html
|
||||
assert 'x-show="selected && needsTrace(selected)"' in html
|
||||
assert 'x-show="selected && selected.requires_lot"' in html
|
||||
assert 'x-show="selected && selected.requires_serial"' in html
|
||||
# la ricerca e la griglia precedono il pannello
|
||||
assert html.index("Cerca ricetta") < html.index('id="trace-panel"')
|
||||
assert html.index("Recipe Grid") < html.index('id="trace-panel"')
|
||||
# le ricette senza obblighi partono direttamente
|
||||
assert 'x-if="!needsTrace(recipe)"' in html
|
||||
|
||||
@@ -112,3 +112,21 @@ class TestSPCProxy:
|
||||
assert resp.status_code == 200
|
||||
data = resp.get_json()
|
||||
assert "cp" in data
|
||||
|
||||
|
||||
class TestRunsProxy:
|
||||
"""#58: filtro per sessione di produzione."""
|
||||
|
||||
def test_runs_proxy(self, logged_in_client, mock_api_client):
|
||||
mock_api_client.get.return_value = [{"id": 5, "measurement_count": 3}]
|
||||
resp = logged_in_client.get("/statistics/api/runs?recipe_id=7")
|
||||
assert resp.status_code == 200
|
||||
assert resp.get_json()[0]["id"] == 5
|
||||
args, kwargs = mock_api_client.get.call_args
|
||||
assert args[0] == "/api/statistics/runs"
|
||||
assert kwargs["params"] == {"recipe_id": "7"}
|
||||
|
||||
def test_summary_forwards_production_run_id(self, logged_in_client, mock_api_client):
|
||||
mock_api_client.get.return_value = {"total": 1}
|
||||
logged_in_client.get("/statistics/api/summary?recipe_id=1&production_run_id=5")
|
||||
assert mock_api_client.get.call_args.kwargs["params"]["production_run_id"] == "5"
|
||||
|
||||
@@ -256,7 +256,7 @@ def test_admin_stations_inline_js_is_valid_in_english(
|
||||
|
||||
|
||||
def test_admin_users_inline_js_is_valid(logged_in_client, mock_admin_api):
|
||||
"""Same guard for /admin/users (reuses the userManagement Alpine pattern)."""
|
||||
"""Same guard for the Users tab, now inside /admin/settings (#50)."""
|
||||
mock_admin_api.get.return_value = [{
|
||||
"id": 1, "username": "admin", "display_name": "Admin",
|
||||
"email": None, "roles": ["Maker"], "is_admin": True,
|
||||
@@ -264,7 +264,7 @@ def test_admin_users_inline_js_is_valid(logged_in_client, mock_admin_api):
|
||||
}]
|
||||
|
||||
_force_italian(logged_in_client)
|
||||
resp = logged_in_client.get("/admin/users")
|
||||
resp = logged_in_client.get("/admin/settings")
|
||||
assert resp.status_code == 200
|
||||
|
||||
html = resp.data.decode("utf-8")
|
||||
@@ -272,9 +272,9 @@ def test_admin_users_inline_js_is_valid(logged_in_client, mock_admin_api):
|
||||
assert scripts
|
||||
|
||||
for i, body in enumerate(scripts):
|
||||
_node_check(body, f"/admin/users script[{i}]")
|
||||
_node_check(body, f"/admin/settings script[{i}]")
|
||||
|
||||
_check_alpine_attributes(html, "/admin/users")
|
||||
_check_alpine_attributes(html, "/admin/settings")
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
|
||||
@@ -1862,8 +1862,8 @@ msgstr "No description available"
|
||||
|
||||
#: templates/measure/select_recipe.html:294
|
||||
#: templates/measure/task_list.html:107
|
||||
msgid "AVVIA IN SEQUENZA"
|
||||
msgstr "START THE SEQUENCE"
|
||||
msgid "AVVIA ATTIVITÀ"
|
||||
msgstr "START ACTIVITY"
|
||||
|
||||
# Maker - Task Editor
|
||||
#: templates/measure/select_recipe.html:302
|
||||
|
||||
@@ -1864,8 +1864,8 @@ msgstr "Nessuna descrizione disponibile"
|
||||
|
||||
#: templates/measure/select_recipe.html:294
|
||||
#: templates/measure/task_list.html:107
|
||||
msgid "AVVIA IN SEQUENZA"
|
||||
msgstr "AVVIA IN SEQUENZA"
|
||||
msgid "AVVIA ATTIVITÀ"
|
||||
msgstr "AVVIA ATTIVITÀ"
|
||||
|
||||
# Maker - Task Editor
|
||||
#: templates/measure/select_recipe.html:302
|
||||
|
||||
@@ -1825,7 +1825,7 @@ msgstr ""
|
||||
|
||||
#: templates/measure/select_recipe.html:294
|
||||
#: templates/measure/task_list.html:107
|
||||
msgid "AVVIA IN SEQUENZA"
|
||||
msgid "AVVIA ATTIVITÀ"
|
||||
msgstr ""
|
||||
|
||||
#: templates/measure/select_recipe.html:302
|
||||
|
||||
Reference in New Issue
Block a user