new

osinaweb/osinacore/api/serializers.py

@@ -183,4 +183,23 @@ class TaskSerializer(serializers.ModelSerializer):
 
     def get_duration(self, obj):
         hours, minutes, seconds = obj.total_task_time()
-        return f"{str(hours).zfill(2)}:{str(minutes).zfill(2)}:{str(seconds).zfill(2)}"
+        return f"{str(hours).zfill(2)}:{str(minutes).zfill(2)}:{str(seconds).zfill(2)}"
+    
+
+
+class DailyReportSerializer(serializers.ModelSerializer):
+    staff = StaffProfileSerializer(read_only=True)
+    date = serializers.SerializerMethodField()
+
+
+    class Meta:
+        model = DailyReport
+        fields = "__all__"
+
+
+    def get_date(self, obj):
+        try:
+            # Combine the date and time strings into one datetime object
+            return datetime.strptime(f"{obj.date} {obj.time}", "%Y-%m-%d %I:%M %p")
+        except Exception:
+            return None

osinaweb/osinacore/api/urls.py

@@ -10,4 +10,5 @@ urlpatterns = [
   path("milestones/", MileStoneAPIView.as_view(), name="milestones"),
   path("userstories/", UserStoryAPIView.as_view(), name="userstories"),
   path('tasks/<int:project_id>/', TaskAPIView.as_view(), name='project-tasks'),
+  path("reports/", DailyReportAPIView.as_view(), name="reports"),
 ]

osinaweb/osinacore/api/views.py

@@ -130,4 +130,13 @@ class TaskAPIView(APIView):
         tasks = Task.objects.filter(project=project)
         data = TaskSerializer(tasks, many=True).data
 
+        return Response(data, status=status.HTTP_200_OK)
+    
+
+class DailyReportAPIView(APIView):
+    def get(self, request):
+
+        dailyreport = DailyReport.objects.all()
+        data = DailyReportSerializer(dailyreport, many=True).data
+
         return Response(data, status=status.HTTP_200_OK)