back
Equipment order
diff --git a/src/genlab_bestilling/views.py b/src/genlab_bestilling/views.py
index ad3828a..2ed80cb 100644
--- a/src/genlab_bestilling/views.py
+++ b/src/genlab_bestilling/views.py
@@ -83,15 +83,24 @@ class GenrequestListView(LoginRequiredMixin, SingleTableView):
model = Genrequest
table_class = GenrequestTable
+ def get_queryset(self) -> QuerySet[Any]:
+ return super().get_queryset().filter(project__memberships=self.request.user)
+
class GenrequestDetailView(LoginRequiredMixin, DetailView):
model = Genrequest
+ def get_queryset(self) -> QuerySet[Any]:
+ return super().get_queryset().filter(project__memberships=self.request.user)
+
class GenrequestUpdateView(FormsetUpdateView):
model = Genrequest
form_class = GenrequestEditForm
+ def get_queryset(self) -> QuerySet[Any]:
+ return super().get_queryset().filter(project__memberships=self.request.user)
+
def get_success_url(self):
return reverse(
"genrequest-detail",
@@ -103,6 +112,9 @@ class GenrequestCreateView(FormsetCreateView):
model = Genrequest
form_class = GenrequestForm
+ def get_queryset(self) -> QuerySet[Any]:
+ return super().get_queryset().filter(project__memberships=self.request.user)
+
def get_form_kwargs(self):
kwargs = super().get_form_kwargs()
kwargs["user"] = self.request.user
@@ -124,10 +136,18 @@ class GenrequestNestedMixin(LoginRequiredMixin):
and adds it to the render context.
"""
- genrequest_id_accessor = "genrequest_id"
+ genrequest_accessor = "genrequest"
def get_genrequest(self):
- return Genrequest.objects.get(id=self.kwargs["genrequest_id"], verified=True)
+ return Genrequest.objects.filter(project__memberships=self.request.user).get(
+ id=self.kwargs["genrequest_id"]
+ )
+
+ def get_project_filtered(self, qs):
+ filters = {
+ f"{self.genrequest_accessor}__project__memberships": self.request.user
+ }
+ return qs.filter(**filters)
def post(self, request, *args, **kwargs):
self.genrequest = self.get_genrequest()
@@ -138,8 +158,9 @@ def get(self, request, *args, **kwargs):
return super().get(request, *args, **kwargs)
def get_queryset(self) -> QuerySet[Any]:
- kwargs = {self.genrequest_id_accessor: self.genrequest.id}
- return super().get_queryset().filter(**kwargs)
+ qs = self.get_project_filtered(qs=super().get_queryset())
+ kwargs = {f"{self.genrequest_accessor}_id": self.genrequest.id}
+ return qs.filter(**kwargs)
def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
ctx = super().get_context_data(**kwargs)
@@ -256,7 +277,7 @@ class EquipmentOrderQuantityUpdateView(GenrequestNestedMixin, BulkEditCollection
collection_class = EquipmentQuantityCollection
template_name = "genlab_bestilling/equipmentorderquantity_form.html"
model = EquimentOrderQuantity
- genrequest_id_accessor = "order__genrequest_id"
+ genrequest_accessor = "order__genrequest"
def get_queryset(self) -> QuerySet[Any]:
return (
@@ -303,7 +324,7 @@ def get_queryset(self) -> QuerySet[Any]:
class SamplesListView(GenrequestNestedMixin, SingleTableView):
- genrequest_id_accessor = "order__genrequest_id"
+ genrequest_accessor = "order__genrequest"
model = Sample
table_class = SampleTable
@@ -316,7 +337,7 @@ class SamplesUpdateView(GenrequestNestedMixin, BulkEditCollectionView):
collection_class = SamplesCollection
template_name = "genlab_bestilling/sample_form.html"
model = Sample
- genrequest_id_accessor = "order__genrequest_id"
+ genrequest_accessor = "order__genrequest"
def get_queryset(self) -> QuerySet[Any]:
return (
diff --git a/src/nina/__init__.py b/src/nina/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/nina/admin.py b/src/nina/admin.py
new file mode 100644
index 0000000..3d76b8a
--- /dev/null
+++ b/src/nina/admin.py
@@ -0,0 +1,29 @@
+from django.contrib import admin
+from unfold.admin import ModelAdmin
+
+from .models import (
+ Project,
+ ProjectMembership,
+)
+
+
+class ProjectMembershipInline(admin.TabularInline):
+ model = ProjectMembership
+ autocomplete_fields = ["user"]
+
+
+@admin.register(Project)
+class ProjectAdmin(ModelAdmin):
+ search_fields = ["number", "name"]
+ list_filter = ["active"]
+ list_display = ["number", "name", "active"]
+
+ inlines = [ProjectMembershipInline]
+
+
+@admin.register(ProjectMembership)
+class ProjectMembershipAdmin(ModelAdmin):
+ search_fields = ["project__number", "project__name", "user__email"]
+ list_filter = ["role"]
+ list_display = ["project", "user", "role"]
+ autocomplete_fields = ["project", "user"]
diff --git a/src/nina/apps.py b/src/nina/apps.py
new file mode 100644
index 0000000..66b55b5
--- /dev/null
+++ b/src/nina/apps.py
@@ -0,0 +1,7 @@
+from django.apps import AppConfig as DjangoAppConfig
+from django.utils.translation import gettext_lazy as _
+
+
+class AppConfig(DjangoAppConfig):
+ name = "nina"
+ verbose_name = _("NINA")
diff --git a/src/nina/migrations/0001_initial.py b/src/nina/migrations/0001_initial.py
new file mode 100644
index 0000000..a0b3bc8
--- /dev/null
+++ b/src/nina/migrations/0001_initial.py
@@ -0,0 +1,78 @@
+# Generated by Django 5.0.7 on 2024-07-25 07:58
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+ initial = True
+
+ dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name="Project",
+ fields=[
+ ("number", models.CharField(primary_key=True, serialize=False)),
+ ("name", models.CharField(blank=True, null=True)),
+ ("active", models.BooleanField(default=True)),
+ ],
+ ),
+ migrations.CreateModel(
+ name="ProjectMembership",
+ fields=[
+ (
+ "id",
+ models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ (
+ "role",
+ models.CharField(
+ choices=[
+ ("owner", "Owner"),
+ ("manager", "Manager"),
+ ("member", "Member"),
+ ],
+ default="member",
+ ),
+ ),
+ (
+ "project",
+ models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE, to="nina.project"
+ ),
+ ),
+ (
+ "user",
+ models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ related_name="memberships",
+ to=settings.AUTH_USER_MODEL,
+ ),
+ ),
+ ],
+ ),
+ migrations.AddField(
+ model_name="project",
+ name="memberships",
+ field=models.ManyToManyField(
+ blank=True,
+ through="nina.ProjectMembership",
+ to=settings.AUTH_USER_MODEL,
+ ),
+ ),
+ migrations.AddConstraint(
+ model_name="projectmembership",
+ constraint=models.UniqueConstraint(
+ fields=("project", "user"), name="unique_user_per_project"
+ ),
+ ),
+ ]
diff --git a/src/nina/migrations/__init__.py b/src/nina/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/nina/models.py b/src/nina/models.py
new file mode 100644
index 0000000..1aa41e1
--- /dev/null
+++ b/src/nina/models.py
@@ -0,0 +1,42 @@
+from django.db import models
+
+
+class ProjectMembership(models.Model):
+ class Role(models.TextChoices):
+ OWNER = "owner", "Owner"
+ MANAGER = "manager", "Manager"
+ MEMBER = "member", "Member"
+
+ project = models.ForeignKey("Project", on_delete=models.CASCADE)
+ user = models.ForeignKey(
+ "users.User", on_delete=models.CASCADE, related_name="memberships"
+ )
+ role = models.CharField(
+ choices=Role,
+ default=Role.MEMBER,
+ )
+
+ class Meta:
+ constraints = [
+ models.UniqueConstraint(
+ fields=["project", "user"], name="unique_user_per_project"
+ )
+ ]
+
+ def __str__(self) -> str:
+ return f"{self.project_id} {self.user} - {self.get_role_display()}"
+
+
+class Project(models.Model):
+ number = models.CharField(primary_key=True)
+ name = models.CharField(null=True, blank=True)
+ memberships = models.ManyToManyField(
+ "users.User", through=ProjectMembership, blank=True
+ )
+ active = models.BooleanField(default=True)
+
+ def __str__(self) -> str:
+ if self.name:
+ return "{self.number} {self.name}"
+
+ return self.number
diff --git a/src/nina/urls.py b/src/nina/urls.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/nina/views.py b/src/nina/views.py
new file mode 100644
index 0000000..e69de29