From e1f83a204a09ae7d35ca180a42d756610ec61ce7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B0=D1=88=D0=B8=D0=BD=20=D0=9C=D0=B0=D0=BA=D1=81?=
 =?UTF-8?q?=D0=B8=D0=BC?= <kashin20031984@mail.ru>
Date: Tue, 26 Dec 2023 19:42:41 +0400
Subject: [PATCH] =?UTF-8?q?=D0=AF=20=D0=BF=D1=80=D0=BE=D1=84=D1=83=D0=BA?=
 =?UTF-8?q?=D0=B0=D0=BB=20=D0=BF=D1=80=D0=BE=D0=B2=D0=BE=D0=B4,=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BC=D0=B8=D1=87=D1=83=20=D0=B2=D1=81=D0=B5=20=D1=81=20?=
 =?UTF-8?q?=D0=BF=D0=BA=20=D0=BD=D0=B0=20=D0=BD=D0=BE=D1=83=D1=82,=20?=
 =?UTF-8?q?=D1=87=D1=82=D0=BE=D0=B1=D1=8B=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB?=
 =?UTF-8?q?=D1=8E=D1=87=D0=B8=D1=82=D1=8C=D1=81=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../database/entities/composeui/ReportPage.kt         | 11 -----------
 server/data.json                                      | 11 ++++++++++-
 server/router.js                                      |  8 ++++----
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/example/myapplication/database/entities/composeui/ReportPage.kt b/app/src/main/java/com/example/myapplication/database/entities/composeui/ReportPage.kt
index d141136..35a87ea 100644
--- a/app/src/main/java/com/example/myapplication/database/entities/composeui/ReportPage.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/composeui/ReportPage.kt
@@ -273,17 +273,6 @@ fun ReportPage (navController: NavController?, viewModel: ReportViewModel = view
     }
 }
 
-private fun parseDate(dateString: String): Date? {
-    return try {
-        // Use SimpleDateFormat or any other method to parse the string into a Date object
-        // For example:
-        SimpleDateFormat("yyyy", Locale.getDefault()).parse(dateString)
-    } catch (e: ParseException) {
-        // Handle parsing error
-        null
-    }
-}
-
 @Composable
 fun TableScreen(reportData: List<ReportRemote>) {
 
diff --git a/server/data.json b/server/data.json
index f7dd29f..81eb251 100644
--- a/server/data.json
+++ b/server/data.json
@@ -16,13 +16,22 @@
   "rents": [],
   "items": [
     {
-      "dateTime": 2009,
+      "dateTime": 2015,
       "weight": 36.6,
       "radius": 14.5,
       "colorbike": "Красный",
       "maxCount": 10,
       "bikeId": 3,
       "id": 1
+    },
+    {
+      "dateTime": 2009,
+      "weight": 29.6,
+      "radius": 13.5,
+      "colorbike": "Зеленый",
+      "maxCount": 5,
+      "bikeId": 3,
+      "id": 2
     }
   ],
   "bikes": [
diff --git a/server/router.js b/server/router.js
index cbdfe23..ba6f8f5 100644
--- a/server/router.js
+++ b/server/router.js
@@ -20,8 +20,8 @@ module.exports = (req, res, next) => {
       const toDate = req.query.toDate;
       const filteredData = filterByDateTime(data.items, fromDate, toDate);
 
-      // Возвращаем отфильтрованные элементы
-      const reportData = generateReport(filteredData);
+      // Возвращаем отфильтрованные и отсортированные элементы
+      const reportData = generateReport(filteredData, data.bikes).sort((a, b) => a.dateTime - b.dateTime);
       res.json(reportData);
     } catch (error) {
       console.error('Error loading data:', error);
@@ -33,7 +33,7 @@ module.exports = (req, res, next) => {
 };
 
 // Функция generateReport для примера
-function generateReport(items) {
+function generateReport(items, bikes) {
   // Ваш код для генерации отчета
   return items.map((item) => ({
     id: item.id,
@@ -42,7 +42,7 @@ function generateReport(items) {
     radius: item.radius,
     colorbike: item.colorbike,
     maxCount: item.maxCount,
-    bikeId: item.bikeId
+    bikeName: bikes.find((bike) => bike.id === item.bikeId)?.name,
 
     // Другие поля отчета, которые вам нужны
   }));