сервисный журнал, фикс мультиклика на инструменты

api/routers/__init__.py

@@ -114,6 +114,9 @@ async def post_requests(
             if isinstance(endDate, str):
                 endDate = datetime.strptime(endDate, "%Y-%m-%d").date()
 
+            if startDate > endDate:
+                startDate, endDate = endDate, startDate
+
             jurnal_toolkits = await StocksRecordsHandler.getLogs(startDate, endDate)
             if isinstance(jurnal_toolkits, list):
                 if len(jurnal_toolkits) == 0:
@@ -143,10 +146,42 @@ async def post_requests(
                         "endDate": endDate.strftime("%Y-%m-%d"),
                     }
         case "jurnal_service":
-            jurnal_service = await ServiceRecordsHandler.get()
-            if jurnal_service:
-                resultData["status"] = "ok"
-                resultData["data"] = jurnal_service
+            startDate = request_data.get("body").get(
+                "startDate", date.today() - timedelta(days=7)
+            )
+            if isinstance(startDate, str):
+                startDate = datetime.strptime(startDate, "%Y-%m-%d").date()
+
+            endDate = request_data.get("body").get("endDate", date.today())
+            if isinstance(endDate, str):
+                endDate = datetime.strptime(endDate, "%Y-%m-%d").date()
+
+            if startDate > endDate:
+                startDate, endDate = endDate, startDate
+
+            jurnal_service = await ServiceRecordsHandler.getLogs(startDate, endDate)
+            if isinstance(jurnal_service, list):
+                if len(jurnal_service) == 0:
+                    resultData["status"] = "ok"
+                    resultData["data"] = {
+                        "requests": [],
+                        "users": [],
+                        "categories": [],
+                        "startDate": startDate.strftime("%Y-%m-%d"),
+                        "endDate": endDate.strftime("%Y-%m-%d"),
+                    }
+                else:
+                    users = await UserHandler.getAll()
+                    categories = await CategoryHandler.getAll()
+                    resultData["status"] = "ok"
+                    resultData["data"] = {
+                        "requests": jurnal_service,
+                        "users": users,
+                        "categories": categories,
+                        "startDate": startDate.strftime("%Y-%m-%d"),
+                        "endDate": endDate.strftime("%Y-%m-%d"),
+                    }
+            # logger.info(resultData.get("data"))
         case "users":
             users = await UserHandler.getAll()
             if users:

api/routers/toolkit.py

@@ -160,7 +160,7 @@ async def manage_toolkit(reqData: dict = Depends(requestDict)):
     logger.info(f"Управление инструментами")
     response = {"status": "error"}
     action = reqData.get("body").get("action")
-    userId = reqData.get("body").get("UserId")
+    userId = reqData.get("body").get("userId")
     toolkitData = reqData.get("body").get("formData")
     if "category_id" in toolkitData:
         toolkitData["category_id"] = int(toolkitData.get("category_id"))