Skip to content

Comments

Minor visual changes for analysis order#446

Merged
aastabk merged 4 commits intosummer25-week-31from
443-make-text-field-for-internal-note
Jul 25, 2025
Merged

Minor visual changes for analysis order#446
aastabk merged 4 commits intosummer25-week-31from
443-make-text-field-for-internal-note

Conversation

@aastabk
Copy link
Contributor

@aastabk aastabk commented Jul 25, 2025

Changes:

  • In analysis samples, the names are changed to "PCR" and "Output" from "Has PCR" and "Is Outputted"
  • Internal note is added to analysis samples with minor visual changes done to the spinner and checkmark
  • The "expected delivery date" in analysis order is changed to "deadline"

@aastabk aastabk requested review from mortenlyn and omfj July 25, 2025 12:32
@aastabk aastabk self-assigned this Jul 25, 2025
@aastabk aastabk force-pushed the 443-make-text-field-for-internal-note branch from b78b9d0 to 220d0ea Compare July 25, 2025 14:11
@aastabk aastabk merged commit b4a5064 into summer25-week-31 Jul 25, 2025
8 checks passed
@aastabk aastabk deleted the 443-make-text-field-for-internal-note branch July 25, 2025 14:13
omfj pushed a commit that referenced this pull request Jul 28, 2025
@aastabk @omfj
Minor visual changes for analysis order (#446)
f2d1175 
* Minor visual changes for analysis order

* Linter fix

* Linter fix #2

* Linter fix #3
mortenlyn added a commit that referenced this pull request Jul 28, 2025
@mortenlyn @emilte
@omfj @aastabk
Change name on downloaded csv file (#457)
abed102 
* Improve IsolationMethodAdmin. (#404)

* Fix order by sample status (#421)

* Improve dashboard overflow (#429)

* Refactor SafeRedirectMixin to remove repetitive code (#419)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Add filtering for sample status (#425)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* 423 remove is seen and is prioritized from table in a order (#432)

* Restrict fields shown in placing an order

* Keep is_urgent as a visible field

* If an order is started (has genlab ids) it cannot be deleted by researchers (#434)

* When all samples are isolated/analysed, the order is set to completed (#439)

* Use tuples. (#418)

* Equipment buttons moved up. Mark as seen button has consistent styling. (#438)

* Equipment buttons moved up. Mark as seen button has consistent styling.

* Mark as seen button follows correct styling

* 406 assign responsible scientist to project (#411)

* Added results contact info for analysis

* Added migrations

* Added migrations

* Safe fields for name and email for analysis results

* Mypy fix

* Safer (?) fix

* Fixed comments

* Removed mark_safe()

* Removed duplicate import

* Changed names of columns (analysis results contact person)

* Make field mandatory

* Fix blank species field (#447)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Minor visual changes for analysis order (#446)

* Minor visual changes for analysis order

* Linter fix

* Linter fix #2

* Linter fix #3

* Processing and complete status are always seen. Added buttons to equipment order. (#459)

* Fix dashboard horizontal scroll (#460)

* Add isolation method to multiple sample types (#427)

* Status logic (#450)

* Order will be set to processing or completed after being a draft if it has already been in those states

* Made the status update to an Order method

* Update SafeRedirectMixin (#440)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Refactor logic to choose when analysis_orders are shown in the CSV and fix N + 1 query. (#430)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Remove status transition buttons for delivered and processing orders (#454)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Add FlagField serializer for boolean representation of sample status to keep code DRY (#455)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Make specified CSV filenames with order id

---------

Co-authored-by: Emil Telstad <22004178+emilte@users.noreply.github.com>
Co-authored-by: Ole Magnus <me@omfj.no>
Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>
Co-authored-by: Bertine <112892518+aastabk@users.noreply.github.com>
github-merge-queue bot pushed a commit that referenced this pull request Jul 30, 2025
@omfj @emilte
@mortenlyn @aastabk
Summer25 week 31 (#408)
0bec5e1 
* Improve IsolationMethodAdmin. (#404)

* Fix order by sample status (#421)

* Improve dashboard overflow (#429)

* Refactor SafeRedirectMixin to remove repetitive code (#419)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Add filtering for sample status (#425)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* 423 remove is seen and is prioritized from table in a order (#432)

* Restrict fields shown in placing an order

* Keep is_urgent as a visible field

* If an order is started (has genlab ids) it cannot be deleted by researchers (#434)

* When all samples are isolated/analysed, the order is set to completed (#439)

* Use tuples. (#418)

* Equipment buttons moved up. Mark as seen button has consistent styling. (#438)

* Equipment buttons moved up. Mark as seen button has consistent styling.

* Mark as seen button follows correct styling

* 406 assign responsible scientist to project (#411)

* Added results contact info for analysis

* Added migrations

* Added migrations

* Safe fields for name and email for analysis results

* Mypy fix

* Safer (?) fix

* Fixed comments

* Removed mark_safe()

* Removed duplicate import

* Changed names of columns (analysis results contact person)

* Make field mandatory

* Fix blank species field (#447)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Minor visual changes for analysis order (#446)

* Minor visual changes for analysis order

* Linter fix

* Linter fix #2

* Linter fix #3

* Processing and complete status are always seen. Added buttons to equipment order. (#459)

* Fix dashboard horizontal scroll (#460)

* Add isolation method to multiple sample types (#427)

* Status logic (#450)

* Order will be set to processing or completed after being a draft if it has already been in those states

* Made the status update to an Order method

* Update SafeRedirectMixin (#440)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Refactor logic to choose when analysis_orders are shown in the CSV and fix N + 1 query. (#430)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Remove status transition buttons for delivered and processing orders (#454)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Add FlagField serializer for boolean representation of sample status to keep code DRY (#455)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Changed to "Clear all" as filter text. Samples page also can clear filters. (#467)

* Change name on downloaded csv file (#457)

* Improve IsolationMethodAdmin. (#404)

* Fix order by sample status (#421)

* Improve dashboard overflow (#429)

* Refactor SafeRedirectMixin to remove repetitive code (#419)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Add filtering for sample status (#425)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* 423 remove is seen and is prioritized from table in a order (#432)

* Restrict fields shown in placing an order

* Keep is_urgent as a visible field

* If an order is started (has genlab ids) it cannot be deleted by researchers (#434)

* When all samples are isolated/analysed, the order is set to completed (#439)

* Use tuples. (#418)

* Equipment buttons moved up. Mark as seen button has consistent styling. (#438)

* Equipment buttons moved up. Mark as seen button has consistent styling.

* Mark as seen button follows correct styling

* 406 assign responsible scientist to project (#411)

* Added results contact info for analysis

* Added migrations

* Added migrations

* Safe fields for name and email for analysis results

* Mypy fix

* Safer (?) fix

* Fixed comments

* Removed mark_safe()

* Removed duplicate import

* Changed names of columns (analysis results contact person)

* Make field mandatory

* Fix blank species field (#447)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Minor visual changes for analysis order (#446)

* Minor visual changes for analysis order

* Linter fix

* Linter fix #2

* Linter fix #3

* Processing and complete status are always seen. Added buttons to equipment order. (#459)

* Fix dashboard horizontal scroll (#460)

* Add isolation method to multiple sample types (#427)

* Status logic (#450)

* Order will be set to processing or completed after being a draft if it has already been in those states

* Made the status update to an Order method

* Update SafeRedirectMixin (#440)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Refactor logic to choose when analysis_orders are shown in the CSV and fix N + 1 query. (#430)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Remove status transition buttons for delivered and processing orders (#454)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Add FlagField serializer for boolean representation of sample status to keep code DRY (#455)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Make specified CSV filenames with order id

---------

Co-authored-by: Emil Telstad <22004178+emilte@users.noreply.github.com>
Co-authored-by: Ole Magnus <me@omfj.no>
Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>
Co-authored-by: Bertine <112892518+aastabk@users.noreply.github.com>

* Add AnalysisMarkerAutocomplete and filter for markers in AnalysisOrders page (#461)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* 462 refactor sample status filtering 2 (#468)

* Filter on marked, plucked and isolated

* Remove prints

* Reuse filter method

* Remove prioritization feature on samples (#471)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Add markers to staff samples view (#428)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Update logic for analysisorder (#472)

* Remove custom order on dashboard (#475)

* Fixed error in mark as seen. Adding svg for exclaimation mark. (#481)

* Fixed error in mark as seen. Adding svg for exclaimation mark.

* Cleanup

* Assign staff multiselect (#300)

* Add project filtering and activation features (#480)

- Introduced ProjectFilter for filtering projects by number, name, verified status, and active status.
- Updated ProjectTable to include a toggle for project activation.
- Created templates for project verification and activation buttons.
- Added ProjectArchiveActionView to handle project activation state changes.
- Updated URLs to include the new archive action for projects.

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Style dashboard table (#483)

* Use format_html (#479)

* Add static choices support and hide statuses by default in filters (#486)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Remove genetic from table column name (#487)

* Set order to processing when updating sample status (#485)

* Major visual changes (#488)

* Update column order complete sheet csv for terrestrisk (#490)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Fix N+1 query by prefetching order (#491)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Prefetch isolation method to fix N+1 query (#492)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Add progress abr for isolated samples (#510)

---------

Co-authored-by: Emil Telstad <22004178+emilte@users.noreply.github.com>
Co-authored-by: Morten Lyngstad <81157760+mortenlyn@users.noreply.github.com>
Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>
Co-authored-by: Bertine <112892518+aastabk@users.noreply.github.com>
nicokant pushed a commit that referenced this pull request Jul 30, 2025
@aastabk @nicokant
Minor visual changes for analysis order (#446)
40b0785 
* Minor visual changes for analysis order

* Linter fix

* Linter fix #2

* Linter fix #3
nicokant pushed a commit that referenced this pull request Jul 30, 2025
@mortenlyn @emilte
@omfj @aastabk @nicokant
Change name on downloaded csv file (#457)
c23c9d9 
* Improve IsolationMethodAdmin. (#404)

* Fix order by sample status (#421)

* Improve dashboard overflow (#429)

* Refactor SafeRedirectMixin to remove repetitive code (#419)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Add filtering for sample status (#425)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* 423 remove is seen and is prioritized from table in a order (#432)

* Restrict fields shown in placing an order

* Keep is_urgent as a visible field

* If an order is started (has genlab ids) it cannot be deleted by researchers (#434)

* When all samples are isolated/analysed, the order is set to completed (#439)

* Use tuples. (#418)

* Equipment buttons moved up. Mark as seen button has consistent styling. (#438)

* Equipment buttons moved up. Mark as seen button has consistent styling.

* Mark as seen button follows correct styling

* 406 assign responsible scientist to project (#411)

* Added results contact info for analysis

* Added migrations

* Added migrations

* Safe fields for name and email for analysis results

* Mypy fix

* Safer (?) fix

* Fixed comments

* Removed mark_safe()

* Removed duplicate import

* Changed names of columns (analysis results contact person)

* Make field mandatory

* Fix blank species field (#447)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Minor visual changes for analysis order (#446)

* Minor visual changes for analysis order

* Linter fix

* Linter fix #2

* Linter fix #3

* Processing and complete status are always seen. Added buttons to equipment order. (#459)

* Fix dashboard horizontal scroll (#460)

* Add isolation method to multiple sample types (#427)

* Status logic (#450)

* Order will be set to processing or completed after being a draft if it has already been in those states

* Made the status update to an Order method

* Update SafeRedirectMixin (#440)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Refactor logic to choose when analysis_orders are shown in the CSV and fix N + 1 query. (#430)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Remove status transition buttons for delivered and processing orders (#454)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Add FlagField serializer for boolean representation of sample status to keep code DRY (#455)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Make specified CSV filenames with order id

---------

Co-authored-by: Emil Telstad <22004178+emilte@users.noreply.github.com>
Co-authored-by: Ole Magnus <me@omfj.no>
Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>
Co-authored-by: Bertine <112892518+aastabk@users.noreply.github.com>
@omfj omfj mentioned this pull request Jul 30, 2025
Closed
nicokant pushed a commit that referenced this pull request Jul 30, 2025
@aastabk @nicokant
Minor visual changes for analysis order (#446)
bbe084f 
* Minor visual changes for analysis order

* Linter fix

* Linter fix #2

* Linter fix #3
nicokant pushed a commit that referenced this pull request Jul 30, 2025
@mortenlyn @emilte
@omfj @aastabk @nicokant
Change name on downloaded csv file (#457)
54d81d9 
* Improve IsolationMethodAdmin. (#404)

* Fix order by sample status (#421)

* Improve dashboard overflow (#429)

* Refactor SafeRedirectMixin to remove repetitive code (#419)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Add filtering for sample status (#425)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* 423 remove is seen and is prioritized from table in a order (#432)

* Restrict fields shown in placing an order

* Keep is_urgent as a visible field

* If an order is started (has genlab ids) it cannot be deleted by researchers (#434)

* When all samples are isolated/analysed, the order is set to completed (#439)

* Use tuples. (#418)

* Equipment buttons moved up. Mark as seen button has consistent styling. (#438)

* Equipment buttons moved up. Mark as seen button has consistent styling.

* Mark as seen button follows correct styling

* 406 assign responsible scientist to project (#411)

* Added results contact info for analysis

* Added migrations

* Added migrations

* Safe fields for name and email for analysis results

* Mypy fix

* Safer (?) fix

* Fixed comments

* Removed mark_safe()

* Removed duplicate import

* Changed names of columns (analysis results contact person)

* Make field mandatory

* Fix blank species field (#447)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Minor visual changes for analysis order (#446)

* Minor visual changes for analysis order

* Linter fix

* Linter fix #2

* Linter fix #3

* Processing and complete status are always seen. Added buttons to equipment order. (#459)

* Fix dashboard horizontal scroll (#460)

* Add isolation method to multiple sample types (#427)

* Status logic (#450)

* Order will be set to processing or completed after being a draft if it has already been in those states

* Made the status update to an Order method

* Update SafeRedirectMixin (#440)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Refactor logic to choose when analysis_orders are shown in the CSV and fix N + 1 query. (#430)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Remove status transition buttons for delivered and processing orders (#454)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Add FlagField serializer for boolean representation of sample status to keep code DRY (#455)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>

* Make specified CSV filenames with order id

---------

Co-authored-by: Emil Telstad <22004178+emilte@users.noreply.github.com>
Co-authored-by: Ole Magnus <me@omfj.no>
Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>
Co-authored-by: Bertine <112892518+aastabk@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@omfj omfj Awaiting requested review from omfj

1 more reviewer

@mortenlyn mortenlyn mortenlyn approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@aastabk aastabk

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@aastabk @mortenlyn