/| into block-level / grid
+// containers. Hide column headers entirely. Use CSS Grid on each row
+// to position prompt + meta + value into a card layout.
+// =============================================================================
+
+.o_fp_input_card_list {
+ // Override the default list chrome — no border, no horizontal scroll
+ .o_list_renderer {
+ background: transparent;
+ border: none;
+ overflow: visible;
+ }
+
+ .o_list_table {
+ display: block;
+ width: 100%;
+ border: none;
+ border-collapse: separate;
+ background: transparent;
+
+ // No column headers — each card carries its own labels
+ > thead { display: none; }
+
+ > tbody {
+ display: flex;
+ flex-direction: column;
+ gap: 12px;
+ }
+
+ // Each row becomes a card
+ tr.o_data_row {
+ display: grid;
+ grid-template-columns: 1fr auto;
+ grid-template-areas:
+ "prompt meta"
+ "value value"
+ "extras extras";
+ gap: 8px 16px;
+ align-items: start;
+ padding: 16px 20px;
+ background-color: $fp-iw-card;
+ border: 1px solid $fp-iw-border;
+ border-radius: 12px;
+ transition: border-color 150ms ease, background-color 150ms ease;
+
+ &:hover {
+ background-color: $fp-iw-card-hover;
+ }
+ &:focus-within {
+ border-color: $fp-iw-border-focus;
+ box-shadow: 0 0 0 3px
+ color-mix(in srgb, #{$fp-iw-border-focus} 18%, transparent);
+ }
+
+ // Per-cell rest — strip table styling; we'll re-position via
+ // grid-area on the cells we actually want visible.
+ > td {
+ display: block;
+ padding: 0;
+ margin: 0;
+ border: none !important;
+ background: transparent !important;
+ vertical-align: top;
+
+ // Inputs inherit row width
+ .o_field_widget {
+ width: 100%;
+ }
+ }
+
+ // Defensive: any cell whose widget is logically invisible
+ // (Odoo's invisible="..." attr) drops out of the grid so it
+ // doesn't punch an empty slot in our layout.
+ > td:has(.o_invisible_modifier),
+ > td.o_invisible_modifier,
+ > td:empty {
+ display: none;
+ }
+
+ // ---------- Card header — prompt name ----------
+ td.o_fp_iw_prompt {
+ grid-area: prompt;
+
+ input, .o_field_widget {
+ font-size: 1rem;
+ font-weight: 600;
+ color: $fp-iw-ink;
+ background: transparent !important;
+ border: none !important;
+ padding: 0 !important;
+ box-shadow: none !important;
+ cursor: text;
+
+ &[readonly], &:disabled {
+ cursor: default;
+ }
+ }
+
+ // Required asterisk — driven by data-required attribute
+ // OR a server-side compute. We can't easily inspect the
+ // model field here, so the asterisk is rendered by the
+ // XML view via a span sibling (.o_fp_iw_required_marker).
+ }
+
+ // ---------- Meta — type + unit pill, target range ----------
+ td.o_fp_iw_meta {
+ grid-area: meta;
+ display: flex;
+ gap: 8px;
+ align-items: center;
+ justify-content: flex-end;
+ font-size: 0.75rem;
+ color: $fp-iw-ink-mute;
+
+ .o_field_widget {
+ width: auto;
+ }
+
+ // Type/unit selection looks like a pill
+ select, input {
+ font-size: 0.75rem;
+ padding: 4px 10px !important;
+ background-color: $fp-iw-pill-bg !important;
+ color: $fp-iw-ink-soft !important;
+ border: 1px solid $fp-iw-border !important;
+ border-radius: 999px !important;
+ line-height: 1.2 !important;
+ height: auto !important;
+ min-height: 0 !important;
+ }
+ }
+
+ // ---------- Value — the live widget for this row's type ----------
+ td.o_fp_iw_value {
+ grid-area: value;
+ max-width: 360px;
+
+ // Numeric / text / date inputs — large + comfortable
+ input[type="text"],
+ input[type="number"],
+ input[type="datetime-local"],
+ input:not([type]) {
+ font-size: 1.125rem;
+ font-weight: 500;
+ padding: 10px 14px;
+ min-height: 48px;
+ background-color: $fp-iw-card;
+ color: $fp-iw-ink;
+ border: 1px solid $fp-iw-border;
+ border-radius: 8px;
+ box-shadow: none;
+ transition: border-color 120ms ease,
+ box-shadow 120ms ease;
+
+ &:focus {
+ border-color: $fp-iw-border-focus;
+ box-shadow: 0 0 0 3px
+ color-mix(in srgb,
+ #{$fp-iw-border-focus} 25%, transparent);
+ outline: none;
+ }
+
+ &::placeholder {
+ color: $fp-iw-ink-faint;
+ font-weight: 400;
+ }
+ }
+
+ // Boolean toggle — make the pill bigger, easier to tap
+ .o_boolean_toggle {
+ transform: scale(1.4);
+ transform-origin: left center;
+ margin: 8px 0;
+ }
+
+ // Image / photo widget
+ .o_field_image {
+ img, .o_image, .o_form_uri {
+ max-width: 240px;
+ max-height: 180px;
+ border-radius: 8px;
+ border: 1px solid $fp-iw-border;
+ }
+ }
+ }
+
+ // ---------- Extras — composite types (multi-point, panel) ----------
+ td.o_fp_iw_extra {
+ grid-area: extras;
+ display: inline-flex;
+ gap: 8px;
+ align-items: baseline;
+ margin-right: 8px;
+
+ // Compact label-above-input grouping
+ &::before {
+ content: attr(data-label);
+ display: block;
+ font-size: 0.75rem;
+ color: $fp-iw-ink-mute;
+ margin-right: 4px;
+ }
+
+ input {
+ width: 80px !important;
+ font-size: 1rem;
+ padding: 6px 10px;
+ min-height: 38px;
+ background-color: $fp-iw-card;
+ color: $fp-iw-ink;
+ border: 1px solid $fp-iw-border;
+ border-radius: 6px;
+ }
+ }
+
+ // Trash button column — small, right-aligned, low contrast
+ td.o_list_record_remove {
+ grid-area: meta;
+ align-self: start;
+ justify-self: end;
+ opacity: 0.4;
+
+ &:hover { opacity: 1; }
+
+ button {
+ color: $fp-iw-ink-mute;
+ background: transparent !important;
+ border: none !important;
+ padding: 4px;
+
+ &:hover {
+ color: $fp-iw-required;
+ }
+ }
+ }
+ }
+
+ // "Add a line" footer — make it a tasteful CTA card
+ tfoot, .o_field_x2many_list_row_add {
+ display: block;
+ margin-top: 4px;
+
+ a, td {
+ display: inline-block;
+ padding: 10px 18px;
+ font-size: 0.875rem;
+ font-weight: 600;
+ color: $fp-iw-ink-soft;
+ background-color: $fp-iw-card;
+ border: 1px dashed $fp-iw-border;
+ border-radius: 10px;
+ cursor: pointer;
+ transition: border-color 120ms ease, color 120ms ease;
+ text-decoration: none;
+
+ &:hover {
+ color: $fp-iw-border-focus;
+ border-color: $fp-iw-border-focus;
+ background-color: $fp-iw-card-hover;
+ text-decoration: none;
+ }
+ }
+ }
+ }
+}
+
+
+// =============================================================================
+// Tablet polish — operators on shop-floor tablets need bigger touch targets
+// =============================================================================
+
+@media (max-width: 900px) {
+ .o_fp_input_card_list .o_list_table tr.o_data_row {
+ grid-template-columns: 1fr;
+ grid-template-areas:
+ "prompt"
+ "meta"
+ "value"
+ "extras";
+
+ td.o_fp_iw_meta {
+ justify-content: flex-start;
+ }
+
+ td.o_fp_iw_value {
+ max-width: 100%;
+
+ input { min-height: 56px; }
+ }
+
+ td.o_list_record_remove {
+ justify-self: end;
+ }
+ }
+}
diff --git a/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py b/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py
index f33cf458..1b5831e4 100644
--- a/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py
+++ b/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py
@@ -826,3 +826,231 @@ class TestContractReviewStepRouting(TransactionCase):
'Non-CR steps must NOT be redirected to QA-005, got: %r'
% action,
)
+
+
+class TestSequentialEnforcement(TransactionCase):
+ """Sub 13 — recipe-level + per-step sequential enforcement.
+
+ Decision matrix being verified:
+ recipe.enforce_sequential | step.parallel_start | step.req_pred (legacy) | block?
+ --------------------------|---------------------|------------------------|------
+ True | False | any | YES
+ True | True | any | no
+ False | any | True | YES
+ False | any | False | no
+ """
+
+ def setUp(self):
+ super().setUp()
+ from odoo.exceptions import UserError
+ self._UserError = UserError
+ self.partner = self.env['res.partner'].create({'name': 'Seq Cust'})
+ self.product = self.env['product.product'].create({'name': 'Seq W'})
+ self.wc = self.env['fp.work.centre'].create({
+ 'name': 'Bench', 'code': 'BENCH', 'kind': 'inspection',
+ })
+
+ def _build_recipe(self, enforce_sequential=True, names=None):
+ """Build a 3-step recipe with the given enforcement setting."""
+ names = names or ['Step A', 'Step B', 'Step C']
+ recipe = self.env['fusion.plating.process.node'].create({
+ 'name': 'Seq Recipe (%s)' % (
+ 'sequential' if enforce_sequential else 'free-flow'),
+ 'node_type': 'recipe',
+ 'enforce_sequential': enforce_sequential,
+ })
+ nodes = []
+ for i, n in enumerate(names):
+ nodes.append(self.env['fusion.plating.process.node'].create({
+ 'name': n,
+ 'node_type': 'operation',
+ 'parent_id': recipe.id,
+ 'sequence': (i + 1) * 10,
+ }))
+ return recipe, nodes
+
+ def _build_job(self, recipe, nodes):
+ """Create a job + matching steps in (pending) state.
+ Skips the auto-generator so the test doesn't depend on the SO
+ fixture chain.
+ """
+ job = self.env['fp.job'].create({
+ 'partner_id': self.partner.id,
+ 'product_id': self.product.id,
+ 'qty': 1.0,
+ 'recipe_id': recipe.id,
+ })
+ steps = []
+ for n in nodes:
+ steps.append(self.env['fp.job.step'].create({
+ 'job_id': job.id,
+ 'name': n.name,
+ 'recipe_node_id': n.id,
+ 'work_centre_id': self.wc.id,
+ 'sequence': n.sequence,
+ 'kind': 'other',
+ 'state': 'ready',
+ }))
+ # job.enforce_sequential is a related from recipe.enforce_sequential
+ # — invalidate to force re-read after the fact-of-life writes above.
+ job.invalidate_recordset(['enforce_sequential'])
+ return job, steps
+
+ # ---- Sequential mode (the new default) -----------------------------
+
+ def test_sequential_default_blocks_out_of_order_start(self):
+ recipe, nodes = self._build_recipe(enforce_sequential=True)
+ job, steps = self._build_job(recipe, nodes)
+ a, b, c = steps
+ # Start A first — should succeed
+ a.button_start()
+ self.assertEqual(a.state, 'in_progress')
+ # Now try to start C while A is still in_progress
+ with self.assertRaises(self._UserError):
+ c.button_start()
+
+ def test_sequential_starting_first_step_works(self):
+ recipe, nodes = self._build_recipe(enforce_sequential=True)
+ job, steps = self._build_job(recipe, nodes)
+ a, b, c = steps
+ # First step has no predecessors → should always be allowed
+ a.button_start()
+ self.assertEqual(a.state, 'in_progress')
+
+ def test_sequential_after_predecessor_finishes_unlocks_next(self):
+ recipe, nodes = self._build_recipe(enforce_sequential=True)
+ job, steps = self._build_job(recipe, nodes)
+ a, b, c = steps
+ a.button_start()
+ a.button_finish()
+ # Now B should be startable
+ b.button_start()
+ self.assertEqual(b.state, 'in_progress')
+
+ def test_sequential_skipped_predecessor_unlocks_next(self):
+ recipe, nodes = self._build_recipe(enforce_sequential=True)
+ job, steps = self._build_job(recipe, nodes)
+ a, b, c = steps
+ a.button_skip()
+ b.button_start()
+ self.assertEqual(b.state, 'in_progress')
+
+ # ---- Per-step parallel_start opt-out --------------------------------
+
+ def test_parallel_start_step_can_start_anytime(self):
+ recipe, nodes = self._build_recipe(enforce_sequential=True)
+ nodes[2].parallel_start = True # mark Step C as parallel
+ job, steps = self._build_job(recipe, nodes)
+ a, b, c = steps
+ # Start A so B+C are blocked under normal sequential rules
+ a.button_start()
+ # B is still blocked (default behaviour)
+ with self.assertRaises(self._UserError):
+ b.button_start()
+ # C is parallel — should start fine while A is in_progress
+ c.button_start()
+ self.assertEqual(c.state, 'in_progress')
+
+ # ---- Free-flow mode (legacy escape hatch) ---------------------------
+
+ def test_free_flow_does_not_block(self):
+ recipe, nodes = self._build_recipe(enforce_sequential=False)
+ job, steps = self._build_job(recipe, nodes)
+ a, b, c = steps
+ # All three startable in any order — no enforcement
+ c.button_start()
+ a.button_start()
+ b.button_start()
+ self.assertEqual(a.state, 'in_progress')
+ self.assertEqual(b.state, 'in_progress')
+ self.assertEqual(c.state, 'in_progress')
+
+ def test_free_flow_with_legacy_per_step_flag_still_blocks(self):
+ recipe, nodes = self._build_recipe(enforce_sequential=False)
+ nodes[2].requires_predecessor_done = True # legacy flag
+ job, steps = self._build_job(recipe, nodes)
+ a, b, c = steps
+ a.button_start()
+ # Even in free-flow, the legacy flag forces C to wait
+ with self.assertRaises(self._UserError):
+ c.button_start()
+
+ # ---- Manager bypass --------------------------------------------------
+
+ def test_manager_bypass_via_context(self):
+ recipe, nodes = self._build_recipe(enforce_sequential=True)
+ job, steps = self._build_job(recipe, nodes)
+ a, b, c = steps
+ a.button_start()
+ # Manager override skips the gate
+ c.with_context(fp_skip_predecessor_check=True).button_start()
+ self.assertEqual(c.state, 'in_progress')
+
+ # ---- can_start compute ----------------------------------------------
+
+ def test_can_start_compute_reflects_gate(self):
+ recipe, nodes = self._build_recipe(enforce_sequential=True)
+ job, steps = self._build_job(recipe, nodes)
+ a, b, c = steps
+ # All ready — only first step can start
+ steps.invalidate_recordset(['can_start'])
+ self.assertTrue(a.can_start, 'First step has no predecessor — should be startable')
+ self.assertFalse(b.can_start, 'Step B blocked by Step A (ready, not done)')
+ self.assertFalse(c.can_start, 'Step C blocked by Step A')
+ # After A finishes, B becomes startable (C still blocked by B)
+ a.button_start()
+ a.button_finish()
+ steps.invalidate_recordset(['can_start'])
+ self.assertTrue(b.can_start)
+ self.assertFalse(c.can_start)
+
+ def test_can_start_false_for_done_steps(self):
+ recipe, nodes = self._build_recipe(enforce_sequential=True)
+ job, steps = self._build_job(recipe, nodes)
+ a, b, c = steps
+ a.button_start()
+ a.button_finish()
+ steps.invalidate_recordset(['can_start'])
+ self.assertFalse(a.can_start, 'Done step is not startable')
+
+ def test_can_start_true_for_parallel_step(self):
+ recipe, nodes = self._build_recipe(enforce_sequential=True)
+ nodes[2].parallel_start = True
+ job, steps = self._build_job(recipe, nodes)
+ a, b, c = steps
+ a.button_start()
+ steps.invalidate_recordset(['can_start'])
+ self.assertTrue(c.can_start, 'parallel_start step should always be startable')
+
+ # ---- Library template snapshot --------------------------------------
+
+ def test_parallel_start_snapshots_from_library_template(self):
+ """When a library template with parallel_start=True is dropped
+ into a recipe via the Simple Editor controller, the new
+ recipe-node should inherit the flag.
+ """
+ tpl = self.env['fp.step.template'].create({
+ 'name': 'Parallel paperwork step',
+ 'parallel_start': True,
+ })
+ recipe = self.env['fusion.plating.process.node'].create({
+ 'name': 'Snap recipe',
+ 'node_type': 'recipe',
+ })
+ # Mimic the controller's _SNAPSHOT_FIELDS copy
+ from odoo.addons.fusion_plating.controllers.simple_recipe_controller \
+ import _SNAPSHOT_FIELDS
+ self.assertIn(
+ 'parallel_start', _SNAPSHOT_FIELDS,
+ 'parallel_start must be in the controller _SNAPSHOT_FIELDS list',
+ )
+ new_node = self.env['fusion.plating.process.node'].create({
+ 'parent_id': recipe.id,
+ 'node_type': 'operation',
+ 'sequence': 10,
+ **{f: tpl[f] for f in _SNAPSHOT_FIELDS},
+ })
+ self.assertTrue(
+ new_node.parallel_start,
+ 'parallel_start did not snapshot from library template',
+ )
diff --git a/fusion_plating/fusion_plating_jobs/wizards/fp_job_step_input_wizard_views.xml b/fusion_plating/fusion_plating_jobs/wizards/fp_job_step_input_wizard_views.xml
index 1f93d17b..e7e0eb10 100644
--- a/fusion_plating/fusion_plating_jobs/wizards/fp_job_step_input_wizard_views.xml
+++ b/fusion_plating/fusion_plating_jobs/wizards/fp_job_step_input_wizard_views.xml
@@ -93,11 +93,154 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ fp.job.step.input.wizard.form.v3
+ fp.job.step.input.wizard
+
+
+
+
+
Record Step Inputs
fp.job.step.input.wizard
form
-
+
new
diff --git a/fusion_plating/fusion_plating_shopfloor/controllers/move_controller.py b/fusion_plating/fusion_plating_shopfloor/controllers/move_controller.py
index 2a521485..65e31b37 100644
--- a/fusion_plating/fusion_plating_shopfloor/controllers/move_controller.py
+++ b/fusion_plating/fusion_plating_shopfloor/controllers/move_controller.py
@@ -115,8 +115,15 @@ class FpTabletMoveController(http.Controller):
'resolve_action': 'open_rack_parts_dialog',
})
- # 2. Predecessor lock (S14 hard block)
- if to_step.requires_predecessor_done and not skip_predecessor:
+ # 2. Predecessor lock (Sub 13 — recipe + per-step enforcement).
+ # Delegates to fp.job.step._fp_should_block_predecessors so the
+ # tablet Move dialog and the backend button_start use the same
+ # decision matrix (recipe.enforce_sequential, step.parallel_start,
+ # legacy step.requires_predecessor_done).
+ if not skip_predecessor and (
+ hasattr(to_step, '_fp_should_block_predecessors')
+ and to_step._fp_should_block_predecessors()
+ ):
unfinished = to_step.job_id.step_ids.filtered(
lambda s: s.sequence < to_step.sequence
and s.state not in ('done', 'skipped', 'cancelled')
|