maxplanck-ie · hash-bash · Nov 6, 2023 · Oct 4, 2023 · Oct 6, 2023 · Oct 10, 2023
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
     hostname: parkour2-django
     build:
       dockerfile: ./Dockerfile
-      target: pk2_base
+      target: pk2_dev
     env_file:
       - ./misc/parkour.env
     restart: always

diff --git a/misc/parkour.env b/misc/parkour.env
@@ -4,7 +4,7 @@ [email protected]
 EMAIL_HOST=mail.server.tld
 EMAIL_SUBJECT_PREFIX=[Parkour]
 [email protected]
-CSRF_TRUSTED_ORIGINS=http://127.0.0.1,https://*.server.tld
+CSRF_TRUSTED_ORIGINS=http://127.0.0.1,https://*.server.tld,http://localhost:5173
 POSTGRES_USER=postgres
 POSTGRES_DB=postgres
 POSTGRES_PASSWORD=change_me__stay_safe

diff --git a/parkour_app/common/views.py b/parkour_app/common/views.py
@@ -10,6 +10,7 @@
 from django.http import Http404, HttpResponse, JsonResponse
 from django.shortcuts import get_object_or_404, render
 from request.models import Request
+from django.utils import timezone
 from rest_framework import status, viewsets
 from rest_framework.authentication import SessionAuthentication
 from rest_framework.decorators import action
@@ -209,8 +210,22 @@ def responsibles(self, request, *args, **kwargs):
         )
         return Response(serializer.data, status=status.HTTP_200_OK)
 
-    def get(self, request, *args, **kwargs):
-        serializer = DutySerializer(self.queryset, many=True)
+    def list(self, request, *args, **kwargs):
+        today_var = timezone.now()
+        start_date_var = request.query_params.get('start_date')
+        end_date_var = request.query_params.get('end_date')
+        ongoing_var = request.query_params.get('ongoing')
+        upcoming_var = request.query_params.get('upcoming')
+        queryset_var = self.queryset.filter()
+
+        if str(ongoing_var).lower() in ["true", 't', 'yes','y', '1']:
+            queryset_var = self.queryset.filter(Q(start_date__lte=today_var, end_date__gte=today_var) | Q(start_date__lte=today_var, end_date__isnull=True))
+        elif str(upcoming_var).lower() in ["true", 't', 'yes','y', '1']:
+            queryset_var = self.queryset.filter(start_date__gte=today_var)
+        elif start_date_var and end_date_var:
+            queryset_var = self.queryset.filter(Q(start_date__gte=start_date_var, start_date__lte=end_date_var)| Q(start_date__gte=start_date_var, end_date__isnull=True))
+
+        serializer = DutySerializer(queryset_var, many=True)
         return Response(serializer.data, status=status.HTTP_200_OK)
 
     def post(self, request, *args, **kwargs):

diff --git a/parkour_app/duties/.gitignore b/parkour_app/duties/.gitignore
@@ -0,0 +1,59 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# Yarn Integrity file
+.yarn-integrity
+
+# Yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
diff --git a/parkour_app/duties/index.html b/parkour_app/duties/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Duties</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/src/main.js"></script>
+  </body>
+</html>