rename genetic project, add shortcuts

Author: nicokant

src/apps/core/templates/core/partials/user-dropdown.html

@@ -16,8 +16,6 @@
       >
     </span>
 
-    <span class="h-12 w-12 rounded-full bg-red"></span>
-
     <i
       :class="dropdownOpen ? 'fa-angle-up' : 'fa-angle-down'"
       class="hidden fill-current sm:block fas"
@@ -28,15 +26,15 @@
   <div
     x-cloak
     x-show="dropdownOpen"
-    class="absolute right-0 mt-4 flex w-62.5 flex-col rounded-sm border border-stroke bg-white shadow-default dark:border-strokedark dark:bg-boxdark"
+    class="absolute right-0 mt-4 flex w-40 flex-col rounded-sm border border-stroke bg-white shadow-default dark:border-strokedark dark:bg-boxdark"
   >
     <ul
       class="flex flex-col border-b border-stroke dark:border-strokedark"
     >
       <li>
         <a
           href="{% url 'socialaccount_connections' %}"
-          class="flex items-center gap-3.5 px-6 border-b py-4 text-sm font-medium duration-300 ease-in-out hover:text-primary lg:text-base"
+          class="flex items-center gap-3.5 px-3 border-b py-2 text-sm font-medium duration-300 ease-in-out hover:text-primary lg:text-base"
         >
           <i class="fas fa-user"></i>
           My profile
@@ -47,20 +45,19 @@
       <li>
         <a
           href="{% url 'admin:index' %}"
-          class="flex items-center gap-3.5 px-6 border-b py-4 text-sm font-medium duration-300 ease-in-out hover:text-primary lg:text-base"
+          class="flex items-center gap-3.5 px-3 border-b py-2 text-sm font-medium duration-300 ease-in-out hover:text-primary lg:text-base"
         >
-          <span>
-            <i class="fas fa-cog"></i>
+            <i class="fas fa-cog "></i>
             {% trans 'Admin' %}
-          </span>
         </a>
       </li>
       {% endif %}
       <li>
         <a
           href="{% url 'account_logout' %}"
-          class="flex items-center gap-3.5 px-6 py-4 text-sm font-medium duration-300 ease-in-out hover:text-primary lg:text-base"
+          class="flex items-center gap-3.5 px-3 py-2 text-sm font-medium duration-300 ease-in-out hover:text-primary lg:text-base"
         >
+          <i class="fas fa-right-from-bracket"></i>
           {% trans 'Log Out' %}
         </a>
       </li>

src/config/unfold.py

@@ -58,7 +58,7 @@
 #     "link": reverse_lazy("admin:genlab_bestilling_equipmentorder_changelist"),
 # }
 GENREQUEST_LINK = {
-    "title": _("Requests"),
+    "title": _("Genetic projects"),
     "icon": "inbox",
     "link": reverse_lazy("admin:genlab_bestilling_genrequest_changelist"),
 }

src/genlab_bestilling/migrations/0005_alter_genrequest_options_alter_order_genrequest.py

@@ -0,0 +1,27 @@
+# Generated by Django 5.1.4 on 2025-01-21 11:36
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("genlab_bestilling", "0004_alter_sample_order"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="genrequest",
+            options={"verbose_name": "Genetic Project"},
+        ),
+        migrations.AlterField(
+            model_name="order",
+            name="genrequest",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="orders",
+                to="genlab_bestilling.genrequest",
+                verbose_name="Genetic Project",
+            ),
+        ),
+    ]

src/genlab_bestilling/models.py

@@ -191,7 +191,7 @@ def get_absolute_url(self):
         )
 
     class Meta:
-        verbose_name = "Genetic Request"
+        verbose_name = "Genetic Project"
 
 
 class Order(PolymorphicModel):
@@ -213,7 +213,10 @@ class OrderStatus(models.TextChoices):
 
     name = models.CharField(null=True, blank=True)
     genrequest = models.ForeignKey(
-        "Genrequest", on_delete=models.CASCADE, related_name="orders"
+        "Genrequest",
+        on_delete=models.CASCADE,
+        related_name="orders",
+        verbose_name="Genetic Project",
     )
     notes = models.TextField(blank=True, null=True)
     status = models.CharField(default=OrderStatus.DRAFT, choices=OrderStatus)

src/genlab_bestilling/tables.py

@@ -41,6 +41,8 @@ class Meta:
             "name",
             "status",
             "polymorphic_ctype",
+            "genrequest",
+            "genrequest__project",
             "created_at",
             "last_modified_at",
         )
@@ -76,7 +78,7 @@ class Meta:
             "tags",
         )
 
-        empty_text = "No requests"
+        empty_text = "No projects"
 
     def render_tags(self, record):
         return ",".join(map(str, record.tags.all()))
@@ -142,7 +144,11 @@ class AnalysisOrderTable(BaseOrderTable):
 
     class Meta(BaseOrderTable.Meta):
         model = AnalysisOrder
-        fields = BaseOrderTable.Meta.fields + ("return_samples",)
+        fields = BaseOrderTable.Meta.fields + (
+            "genrequest",
+            "genrequest__project",
+            "return_samples",
+        )
 
 
 class ExtractionOrderTable(BaseOrderTable):
@@ -161,6 +167,8 @@ class Meta(BaseOrderTable.Meta):
             "needs_guid",
             "return_samples",
             "pre_isolated",
+            "genrequest",
+            "genrequest__project",
         )
 
 

src/genlab_bestilling/templates/genlab_bestilling/analysisorder_filter.html

@@ -2,10 +2,12 @@
 {% load neapolitan %}
 {% load render_table from django_tables2 %}
 
-{% block page-title %}Analysis Orders relative to {{ genrequest }}{% endblock page-title %}
+{% block page-title %}Analysis Orders{% if genrequest %} relative to {{ genrequest }}{% endif %}{% endblock page-title %}
 {% block page-inner %}
 <div class="flex gap-5 mb-5">
+    {% if genrequest %}
     <a class="btn bg-primary" href="{% url 'genrequest-detail' pk=genrequest.id %}"><i class="fas fa-arrow-left"></i> back</a>
     <a class="btn bg-primary" href="{% url 'genrequest-analysis-create' genrequest_id=genrequest.id %}"><i class="fas fa-plus"></i> Equipment order</a>
+    {% endif %}
 </div>
 {% endblock page-inner %}

src/genlab_bestilling/templates/genlab_bestilling/equipmentorder_filter.html

@@ -2,10 +2,12 @@
 {% load neapolitan %}
 {% load render_table from django_tables2 %}
 
-{% block page-title %}Equipment Orders relative to {{ genrequest }}{% endblock page-title %}
+{% block page-title %}Equipment Orders{% if genrequest %} relative to {{ genrequest }}{% endif %}{% endblock page-title %}
 {% block page-inner %}
 <div class="flex gap-5 mb-5">
+    {% if genrequest %}
     <a class="btn bg-primary" href="{% url 'genrequest-detail' pk=genrequest.id %}"><i class="fas fa-arrow-left"></i> back</a>
     <a class="btn bg-primary" href="{% url 'genrequest-equipment-create' genrequest_id=genrequest.id %}"><i class="fas fa-plus"></i> Equipment order</a>
+    {% endif %}
 </div>
 {% endblock page-inner %}

src/genlab_bestilling/templates/genlab_bestilling/extractionorder_filter.html

@@ -2,10 +2,12 @@
 {% load neapolitan %}
 {% load render_table from django_tables2 %}
 
-{% block page-title %}Extraction Orders relative to {{ genrequest }}{% endblock page-title %}
+{% block page-title %}Extraction Orders{% if genrequest %} relative to {{ genrequest }}{% endif %}{% endblock page-title %}
 {% block page-inner %}
 <div class="flex gap-5 mb-5">
+    {% if genrequest %}
     <a class="btn bg-primary" href="{% url 'genrequest-detail' pk=genrequest.id %}"><i class="fas fa-arrow-left"></i> back</a>
     <a class="btn bg-primary" href="{% url 'genrequest-extraction-create' genrequest_id=genrequest.id %}"><i class="fas fa-plus"></i> Equipment order</a>
+    {% endif %}
 </div>
 {% endblock page-inner %}

src/genlab_bestilling/templates/genlab_bestilling/genrequest_list.html

@@ -3,9 +3,9 @@
 {% load render_table from django_tables2 %}
 
 {% block content %}
-    <h3 class="text-4xl mb-5">Requests</h3>
+    <h3 class="text-4xl mb-5">Genetic Project</h3>
     <div class="flex gap-5 mb-5">
-        <a class="btn bg-primary" href="{% url 'genrequest-create' %}"><i class="fas fa-plus"></i> Request</a>
+        <a class="btn bg-primary" href="{% url 'genrequest-create' %}"><i class="fas fa-plus"></i> Project</a>
     </div>
 
     {% render_table table %}

src/genlab_bestilling/templates/genlab_bestilling/order_filter.html

@@ -2,12 +2,14 @@
 {% load neapolitan %}
 {% load render_table from django_tables2 %}
 
-{% block page-title %}Orders relative to {{ genrequest }}{% endblock page-title %}
+{% block page-title %}{% if genrequest %}Orders relative to {{ genrequest }}{% else %}Orders{% endif %}{% endblock page-title %}
 {% block page-inner %}
 <div class="flex gap-5 mb-5">
+    {% if genrequest %}
     <a class="btn bg-primary" href="{% url 'genrequest-detail' pk=genrequest.id %}"><i class="fas fa-arrow-left"></i> back</a>
     <a class="btn bg-primary" href="{% url 'genrequest-equipment-create' genrequest_id=genrequest.id %}"><i class="fas fa-plus"></i> Equipment order</a>
     <a class="btn bg-primary" href="{% url 'genrequest-extraction-create' genrequest_id=genrequest.id %}"><i class="fas fa-plus"></i> Extraction order</a>
     <a class="btn bg-primary" href="{% url 'genrequest-analysis-create' genrequest_id=genrequest.id %}"><i class="fas fa-plus"></i> Analysis order</a>
+    {% endif %}
 </div>
 {% endblock page-inner %}