Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix allow sample partitions in submitted states #2116

Merged
merged 2 commits into from
Aug 21, 2022
Merged

Fix allow sample partitions in submitted states #2116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dadad2
Fix allow sample partitions in submitted states
ramonski Aug 18, 2022
824130e
Fixed test
ramonski Aug 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/senaite/core/profiles/default/workflows/senaite_sample_workflow/definition.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,7 @@
<exit-transition transition_id="reject" />
<exit-transition transition_id="rollback_to_receive" />
<exit-transition transition_id="detach" />
<exit-transition transition_id="create_partitions" />
<exit-transition transition_id="dispatch" />
<!-- /TRANSITIONS -->

Expand All @@ -622,7 +623,7 @@
<permission-map name="senaite.core: Transition: Retract" acquired="True"/>
<permission-map name="senaite.core: Transition: Sample Sample" acquired="False"/>
<permission-map name="senaite.core: Transition: Schedule Sampling" acquired="False"/>
<permission-map name="senaite.core: Transition: Create Partitions" acquired="False"/>
<permission-map name="senaite.core: Transition: Create Partitions" acquired="True"/>

<permission-map name="senaite.core: Add Analysis" acquired="False">
<!-- LabClerk role has this permission granted by default in rolemap -->
Expand Down Expand Up @@ -787,6 +788,7 @@
<exit-transition transition_id="invalidate" />
<exit-transition transition_id="rollback_to_receive" />
<exit-transition transition_id="detach" />
<exit-transition transition_id="create_partitions" />
<exit-transition transition_id="dispatch" />
<!-- /TRANSITIONS -->

Expand All @@ -810,7 +812,7 @@
<permission-map name="senaite.core: Transition: Retract" acquired="False"/>
<permission-map name="senaite.core: Transition: Sample Sample" acquired="False"/>
<permission-map name="senaite.core: Transition: Schedule Sampling" acquired="False"/>
<permission-map name="senaite.core: Transition: Create Partitions" acquired="False"/>
<permission-map name="senaite.core: Transition: Create Partitions" acquired="True"/>

<!-- Hide the 'Manage Analyses' tab -->
<permission-map name="senaite.core: Add Analysis" acquired="False"/>
Expand Down Expand Up @@ -889,6 +891,7 @@
<!-- TRANSITIONS -->
<exit-transition transition_id="republish"/>
<exit-transition transition_id="invalidate"/>
<exit-transition transition_id="create_partitions" />
<exit-transition transition_id="dispatch" />
<!-- /TRANSITIONS -->

Expand All @@ -908,7 +911,7 @@
<permission-map name="senaite.core: Transition: Retract" acquired="False"/>
<permission-map name="senaite.core: Transition: Sample Sample" acquired="False"/>
<permission-map name="senaite.core: Transition: Schedule Sampling" acquired="False"/>
<permission-map name="senaite.core: Transition: Create Partitions" acquired="False"/>
<permission-map name="senaite.core: Transition: Create Partitions" acquired="True"/>
<!-- Hide the 'Manage Analyses' tab -->
<permission-map name="senaite.core: Add Analysis" acquired="False"/>
<!-- Hide the 'Manage Results' tab -->
Expand Down
12 changes: 6 additions & 6 deletions src/senaite/core/tests/doctests/WorkflowAnalysisRequestCreatePartitions.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@ Submit all analyses:
... analysis.setResult(12)
... success = do_action_for(analysis, "submit")

Partitions cannot be created when the status is `to_be_verified`:
Partitions can be created when the status is `to_be_verified`:

>>> api.get_workflow_status_of(ar)
'to_be_verified'

>>> isTransitionAllowed(ar, "create_partitions")
False
True

Verify all analyses:

Expand All @@ -106,22 +106,22 @@ Verify all analyses:
... success = do_action_for(analysis, "verify")
>>> setup.setSelfVerificationEnabled(False)

Partitions cannot be created when the status is `verified`:
Partitions can be created when the status is `verified`:

>>> api.get_workflow_status_of(ar)
'verified'

>>> isTransitionAllowed(ar, "create_partitions")
False
True

Partitions cannot be created when the status is `published`:
Partitions can be created when the status is `published`:

>>> success = do_action_for(ar, "publish")
>>> api.get_workflow_status_of(ar)
'published'

>>> isTransitionAllowed(ar, "create_partitions")
False
True

Partitions cannot be created when the status is `invalid`:

Expand Down