Major visual changes by aastabk · Pull Request #488 · NINAnor/genlab_bestilling

aastabk · 2025-07-29T08:46:28Z

Changes include:

New CSS colors for buttons
Change of button orders
Menu choices will become green when clicking them
Hover effects
Changed status name to "Not started" in filters
Added padding between filters and tables for samples
Moved "back" buttons upwards or removed them according to Figma
Added white background for tabs

src/staff/templates/staff/base.html

mortenlyn · 2025-07-29T09:13:57Z

src/genlab_bestilling/templates/genlab_bestilling/base_filter.html

    <form method="get" class="py-3 px-4 border mb-3 ">
+        <div class="mb-2">
+            <span class="text-xl">Filters</span>
+        </div>
        <div class="flex flex-wrap gap-4">
            {{ filter.form | crispy }}
-        <button class="btn custom_order_button_blue mt-6" type="submit">Search</button>
-        <a href="{{ request.path }}" class="btn custom_order_button_grey mt-6">Clear all</a>
+            <div class="flex items-center gap-2">
+                <button class="btn btn-sm custom_order_button_blue" type="submit">
+                    <i class="fa-solid fa-filter"></i>
+                    Apply filters
+                </button>
+                <a href="{{ request.path }}" class="btn btn-sm custom_order_button">Clear all</a>
+            </div>
        </div>
    </form>


Can we reuse this on all other filters as well? Seems like it is repeated a lot.

* 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>

aastabk requested review from mortenlyn and omfj July 29, 2025 08:46

aastabk self-assigned this Jul 29, 2025

aastabk mentioned this pull request Jul 29, 2025

Hide draft and completed orders by default #486

Merged

aastabk force-pushed the 478-update-all-button-colors-icons-and-sizes-2 branch from 63424d0 to 2e6dd32 Compare July 29, 2025 09:03

aastabk added 3 commits July 29, 2025 11:07

Major visual changes

52a40d2

Merge conflicts

316fd00

Assign staff button placement

4a6385e

aastabk force-pushed the 478-update-all-button-colors-icons-and-sizes-2 branch from 00ecc69 to 4a6385e Compare July 29, 2025 09:08

mortenlyn reviewed Jul 29, 2025

View reviewed changes

aastabk added 7 commits July 29, 2025 11:20

Added choice variable for analysis filtering

c44e8d9

removed back button for equipment order

1f28c8b

Fix linter and z-index

bf8ef02

Filter component

420a4d9

Linter

a5add9f

Linter

4af025d

Linetr #3

85f5f5b

aastabk requested a review from mortenlyn July 29, 2025 11:21

mortenlyn approved these changes Jul 29, 2025

View reviewed changes

omfj approved these changes Jul 29, 2025

View reviewed changes

omfj merged commit bd0a936 into summer25-week-31 Jul 29, 2025
8 checks passed

omfj deleted the 478-update-all-button-colors-icons-and-sizes-2 branch July 29, 2025 11:25

nicokant pushed a commit that referenced this pull request Jul 30, 2025

Major visual changes (#488)

5598dc1

omfj mentioned this pull request Jul 30, 2025

Summer25 Week 31 #511

Closed

nicokant pushed a commit that referenced this pull request Jul 30, 2025

Major visual changes (#488)

3e6ff76

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

Major visual changes#488

Major visual changes#488
omfj merged 10 commits intosummer25-week-31from
478-update-all-button-colors-icons-and-sizes-2

aastabk commented Jul 29, 2025

Uh oh!

Uh oh!

mortenlyn Jul 29, 2025

Uh oh!

aastabk Jul 29, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Comments

Conversation

aastabk commented Jul 29, 2025

Uh oh!

Uh oh!

mortenlyn Jul 29, 2025

Choose a reason for hiding this comment

Uh oh!

aastabk Jul 29, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants