Skip to content

Comments

Filterset for EquipmentOrder#500

Closed
aastabk wants to merge 42 commits intosummer25-week-32from
499-make-specific-filter-for-equipmentorder-page
Closed

Filterset for EquipmentOrder#500
aastabk wants to merge 42 commits intosummer25-week-32from
499-make-specific-filter-for-equipmentorder-page

Conversation

@aastabk
Copy link
Contributor

@aastabk aastabk commented Jul 29, 2025

Skjermbilde 2025-07-29 kl  16 30 49

emilte and others added 30 commits July 28, 2025 10:14
Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>
Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>
* Restrict fields shown in placing an order

* Keep is_urgent as a visible field
…g. (#438)

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

* Mark as seen button follows correct styling
* 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
Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>
* Minor visual changes for analysis order

* Linter fix

* Linter fix #2

* Linter fix #3
* 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
Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>
…d fix N + 1 query. (#430)

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

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>
…to keep code DRY (#455)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>
* 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>
…rs page (#461)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>
* Filter on marked, plucked and isolated

* Remove prints

* Reuse filter method
Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>
Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>
* Fixed error in mark as seen. Adding svg for exclaimation mark.

* Cleanup
omfj and others added 12 commits July 29, 2025 09:20
- 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>
)

Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>
Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>
Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>
Co-authored-by: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>
@aastabk aastabk requested review from mortenlyn and omfj July 29, 2025 14:32
@aastabk aastabk self-assigned this Jul 29, 2025
Base automatically changed from summer25-week-31 to main July 30, 2025 11:05
@omfj omfj changed the base branch from main to summer25-week-32 July 30, 2025 11:16
@omfj omfj force-pushed the summer25-week-32 branch 3 times, most recently from ef06d74 to 8b8c6ae Compare July 30, 2025 11:27
@aastabk aastabk closed this Jul 31, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants