Skip to content

Update column order complete sheet csv for terrestrisk #490

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

Merged
omfj merged 2 commits into from
Jul 29, 2025
Merged

Update column order complete sheet csv for terrestrisk #490

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
646df92
Refactor SampleViewset to simplify order ID retrieval and update orde…
Jul 29, 2025
96a0527
Add 'order' field to CSV constants and update LabelCSVSerializer to i…
Jul 29, 2025
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
12 changes: 6 additions & 6 deletions src/genlab_bestilling/api/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,9 @@
"rerun_date",
),
"Terrestrisk": (
"name",
"genlab_id",
"guid",
"name",
"type.name",
"species.name",
"location.name",
Expand Down Expand Up @@ -199,9 +199,9 @@
}

LABEL_CSV_FIELDS_BY_AREA = {
"Akvatisk": ("fish_id", "genlab_id", "guid"),
"Elvemusling": ("fish_id", "genlab_id", "guid"),
"Terrestrisk": ("genlab_id", "guid", "name"),
"MiljøDNA": ("genlab_id", "guid", "name", "location.name"),
"default": ("genlab_id", "guid", "name"),
"Akvatisk": ("fish_id", "genlab_id", "guid", "order"),
"Elvemusling": ("fish_id", "genlab_id", "guid", "order"),
"Terrestrisk": ("genlab_id", "guid", "name", "order"),
"MiljøDNA": ("genlab_id", "guid", "name", "location.name", "order"),
"default": ("genlab_id", "guid", "name", "order"),
}
4 changes: 4 additions & 0 deletions src/genlab_bestilling/api/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,17 @@ def get_internal_note(self, obj: Sample) -> str:


class LabelCSVSerializer(serializers.ModelSerializer):
location = LocationSerializer(allow_null=True, required=False)

class Meta:
model = Sample
fields = (
"genlab_id",
"guid",
"name",
"fish_id",
"order",
"location",
)

def get_fish_id(self, obj: Sample) -> str:
Expand Down
7 changes: 3 additions & 4 deletions src/genlab_bestilling/api/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,9 @@ def get_serializer_class(self) -> type[BaseSerializer]:

def get_order_id(self, queryset: QuerySet) -> str:
order_id = "unknown_order_id"
first_sample = queryset.first()
if first_sample and first_sample.order and first_sample.order.id:
order_id = str(first_sample.order.id)

order_id_value = queryset.values_list("order__id", flat=True).first()
if order_id_value:
order_id = str(order_id_value)
return order_id

@action(
Expand Down