diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1de5f2d..b70e8ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project tries to adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [Unreleased]
+### Fixed
+- structure and collection in URL query
+
## [0.5.0] - 2024-03-22
### Added
- selection view for selecting structure and collection
diff --git a/django_energysystem_viewer/templates/django_energysystem_viewer/artifact_detail.html b/django_energysystem_viewer/templates/django_energysystem_viewer/artifact_detail.html
index 85cc3f7..df57a26 100644
--- a/django_energysystem_viewer/templates/django_energysystem_viewer/artifact_detail.html
+++ b/django_energysystem_viewer/templates/django_energysystem_viewer/artifact_detail.html
@@ -7,7 +7,7 @@
Related processes:
diff --git a/django_energysystem_viewer/templates/django_energysystem_viewer/artifacts.html b/django_energysystem_viewer/templates/django_energysystem_viewer/artifacts.html
index 656b32a..3b20aae 100644
--- a/django_energysystem_viewer/templates/django_energysystem_viewer/artifacts.html
+++ b/django_energysystem_viewer/templates/django_energysystem_viewer/artifacts.html
@@ -17,7 +17,7 @@ {{ group.grouper }}
{% for artifact in group.list %}
{{ artifact.artifact }} ({{ artifact.version }})
{% endfor %}
diff --git a/django_energysystem_viewer/templates/django_energysystem_viewer/process_detail.html b/django_energysystem_viewer/templates/django_energysystem_viewer/process_detail.html
index 7b8e286..de0e75a 100644
--- a/django_energysystem_viewer/templates/django_energysystem_viewer/process_detail.html
+++ b/django_energysystem_viewer/templates/django_energysystem_viewer/process_detail.html
@@ -5,7 +5,7 @@ Related artifacts:
diff --git a/django_energysystem_viewer/templates/django_energysystem_viewer/processes.html b/django_energysystem_viewer/templates/django_energysystem_viewer/processes.html
index b6321dc..7c31b7b 100644
--- a/django_energysystem_viewer/templates/django_energysystem_viewer/processes.html
+++ b/django_energysystem_viewer/templates/django_energysystem_viewer/processes.html
@@ -14,7 +14,7 @@ Collection "{{ collection_name }}"
{% for process in processes %}
{{ process }}
{% endfor %}
diff --git a/django_energysystem_viewer/templates/django_energysystem_viewer/selection.html b/django_energysystem_viewer/templates/django_energysystem_viewer/selection.html
index c0f254a..4a06cc9 100644
--- a/django_energysystem_viewer/templates/django_energysystem_viewer/selection.html
+++ b/django_energysystem_viewer/templates/django_energysystem_viewer/selection.html
@@ -6,13 +6,13 @@ Selections:
{% csrf_token %}
Structure
-
+
{% for structure in structure_list %}{{ structure }} {% endfor %}
- Collection
-
+ Collection
+
{% for collection in collection_list %}{{ collection }} {% endfor %}
diff --git a/django_energysystem_viewer/urls.py b/django_energysystem_viewer/urls.py
index 70a648e..8922de0 100644
--- a/django_energysystem_viewer/urls.py
+++ b/django_energysystem_viewer/urls.py
@@ -12,18 +12,18 @@
path("energysystem/abbreviation/", views.abbreviations, name="abbreviations"),
path("energysystem/abbreviation_meaning/", views.abbreviation_meaning),
path("energysystem/aggregation/", views.AggregationView.as_view(), name="aggregations"),
- path("collection/processes/", views.ProcessesView.as_view(), name="processes"),
+ path("energysystem/processes/", views.ProcessesView.as_view(), name="processes"),
path(
- "collection//process//data/",
+ "energysystem/process//data/",
views.ProcessDetailView.as_view(),
),
- path("collection/artifacts/", views.ArtifactsView.as_view(), name="artifacts"),
+ path("energysystem/artifacts/", views.ArtifactsView.as_view(), name="artifacts"),
path(
- "collection//artifact///data/",
+ "energysystem/artifact///data/",
views.ArtifactDetailView.as_view(),
),
path(
- "collection//artifact////data/",
+ "energysystem/artifact////data/",
views.ArtifactDetailView.as_view(),
),
]
diff --git a/django_energysystem_viewer/views.py b/django_energysystem_viewer/views.py
index cde85a7..a0037ae 100644
--- a/django_energysystem_viewer/views.py
+++ b/django_energysystem_viewer/views.py
@@ -29,7 +29,7 @@ def get_excel_data(file: str, sheet: str):
def network(request):
- structure_name = request.GET.get("structures")
+ structure_name = request.GET.get("structure")
process_set = get_excel_data(structure_name, "Process_Set")
unique_processes = process_set["process"].unique()
@@ -75,7 +75,7 @@ def network_graph(request):
def abbreviations(request):
- structure_name = request.GET.get("structures")
+ structure_name = request.GET.get("structure")
abbreviations = get_excel_data(structure_name, "Abbreviations")
abbreviation_list = abbreviations["abbreviations"].unique()
return render(
@@ -103,13 +103,13 @@ class AggregationView(TemplateView):
template_name = "django_energysystem_viewer/aggregation.html"
def get_context_data(self, **kwargs):
- structure_name = self.request.GET.get("structures")
+ structure_name = self.request.GET.get("structure")
return {"structure_name": structure_name}
class ProcessDetailMixin:
def get_context_data(self, **kwargs):
- collection_name = self.request.GET.get("collections")
+ collection_name = self.request.GET["collection"]
collection_url = collection.get_collection_meta(collection_name)["name"]
process_name = kwargs.get("process_name", self.request.GET.get("process"))
if not process_name:
@@ -133,9 +133,11 @@ class ProcessesView(ProcessDetailMixin, TemplateView):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
- collection_name = self.request.GET.get("collections")
+ collection_name = self.request.GET.get("collection")
processes = collection.get_processes_from_collection(collection_name)
- context = {"collection_name": collection_name, "processes": processes, "banner_data": collection_name}
+ context["collection_name"] = collection_name
+ context["processes"] = processes
+ context["banner_data"] = collection_name
return context
@@ -147,7 +149,7 @@ class ArtifactsView(TemplateView):
template_name = "django_energysystem_viewer/artifacts.html"
def get_context_data(self, **kwargs):
- collection_name = self.request.GET.get("collections")
+ collection_name = self.request.GET.get("collection")
collection_url = collection.get_collection_meta(collection_name)["name"]
artifacts = collection.get_artifacts_from_collection(collection_name)
context = {
@@ -175,7 +177,7 @@ class ArtifactDetailView(TemplateView):
template_name = "django_energysystem_viewer/artifact_detail.html"
def get_context_data(self, **kwargs):
- collection_name = kwargs["collection_name"]
+ collection_name = self.request.GET["collection"]
group_name = kwargs["group_name"]
artifact_name = kwargs["artifact_name"]
version = kwargs.get("version")