refactor datatables

module_activity/api/views.py

@@ -196,7 +196,7 @@ class IntoleranceListCreateAPIView(APIView):
     model = Intolerance
 
     def get(self, request):
-        obj = self.model.objects.filter(principal=request.user)
+        obj = self.model.objects.filter(principal=request.user, active=True)
         serializer = self.serializer_class(obj, many=True)
         return ApiResponse.success(message=constants.SUCCESS, data=serializer.data)
 
@@ -227,7 +227,7 @@ class SymptomsListCreateAPIView(APIView):
     model = Symptoms
 
     def get(self, request):
-        obj = self.model.objects.filter(principal=request.user)
+        obj = self.model.objects.filter(principal=request.user, active=True)
         serializer = self.serializer_class(obj, many=True)
         return ApiResponse.success(message=constants.SUCCESS, data=serializer.data)
 
@@ -258,7 +258,7 @@ class PastTreatmentListCreateAPIView(APIView):
     model = PastTreatment
 
     def get(self, request):
-        obj = self.model.objects.filter(principal=request.user)
+        obj = self.model.objects.filter(principal=request.user, active=True)
         serializer = self.serializer_class(obj, many=True)
         return ApiResponse.success(message=constants.SUCCESS, data=serializer.data)
 
@@ -289,7 +289,7 @@ class ChronicConditionListCreateAPIView(APIView):
     model = ChronicCondition
 
     def get(self, request):
-        obj = self.model.objects.filter(principal=request.user)
+        obj = self.model.objects.filter(principal=request.user, active=True)
         serializer = self.serializer_class(obj, many=True)
         return ApiResponse.success(message=constants.SUCCESS, data=serializer.data)
 

module_activity/views.py

@@ -259,30 +259,26 @@ class UserActivityRecordView(generic.View):
         }
 
     def get(self, request, *args, **kwargs):
+ 
         try:
             principal_id = self.kwargs.get("principal_id")
-            date = request.GET.get("date")
-            print(
-                f"principal_id is {principal_id} data is {date} and type is {type(date)}"
-            )
-            if not date:
-                return JsonResponseUtil.error(message="Date parameter is missing")
+            date_range = request.GET.get("date_range")
 
-            try:
-                date_obj = datetime.strptime(date, "%Y-%m-%d").date()
-            except ValueError:
-                return JsonResponseUtil.error(message="Invalid date format")
+            if not date_range:
+                return JsonResponseUtil.error(message="Date range parameter is missing")
+
+            start_date, end_date = date_utils.get_date_range(date_range)
 
             # Retrieve data from different models
             meal_records = MealRecord.objects.filter(
-                principal=principal_id, date=date_obj
+                principal=principal_id, date__range=(start_date, end_date)
             )
             medication_records = Medication.objects.filter(
-                principal=principal_id, date=date_obj
+                principal=principal_id, date__range=(start_date, end_date)
             )
-            bowel_records = Bowel.objects.filter(principal=principal_id, date=date_obj)
+            bowel_records = Bowel.objects.filter(principal=principal_id, date__range=(start_date, end_date))
             meal_symptom_records = MealSymptomRecord.objects.filter(
-                principal=principal_id, date=date_obj
+                principal=principal_id, date__range=(start_date, end_date)
             )
             print(f"==================meal record {meal_records}")
             # Prepare combined results